1272 files changed, 39220 insertions, 78468 deletions

diff --git a/community/0ad/PKGBUILD b/community/0ad/PKGBUILD
index fa23ed236..6325cb3f7 100644
--- a/community/0ad/PKGBUILD
+++ b/community/0ad/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 94012 2013-07-13 12:30:26Z svenstaro $
+# $Id: PKGBUILD 96786 2013-09-05 07:34:19Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: t3ddy  <t3ddy1988 "at" gmail {dot} com>
 # Contributor: Adrián Chaves Fernández (Gallaecio) <adriyetichaves@gmail.com>
 pkgname=0ad
-pkgver=a13
-_pkgver=0.0.13-alpha
-pkgrel=5
+pkgver=a14
+_pkgver=0.0.14-alpha
+pkgrel=1
 pkgdesc="Cross-platform, 3D and historically-based real-time strategy game"
 arch=('i686' 'x86_64')
 url="http://play0ad.com/"
@@ -13,15 +13,12 @@ license=('GPL2' 'CCPL')
 depends=('binutils' 'boost-libs' 'curl' 'enet>=1.3' 'libogg' 'libpng' 'libvorbis' 'libxml2' 'openal' 'sdl' 'wxgtk' 'zlib' 'libgl' '0ad-data' 'glu')
 makedepends=('boost' 'cmake' 'mesa' 'zip' 'python2')
 source=("http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz")
-md5sums=('3075c982c4af41a3586b6b6ef637d2c4')
+md5sums=('5bbaffa02b6e9082cbd5142d43f9b700')
 
 build() {
   cd "$srcdir/$pkgname-$_pkgver/build/workspaces"
 
-  sed -i 's/unix_names = { "boost_filesystem-mt", "boost_system-mt" },/unix_names = { "boost_filesystem", "boost_system" },/g' "${srcdir}/${pkgname}-${_pkgver}/build/premake/extern_libs4.lua"
-  sed -i 's/unix_names = { "boost_signals-mt" },/unix_names = { "boost_signals" },/g' "${srcdir}/${pkgname}-${_pkgver}/build/premake/extern_libs4.lua"
-
-  unset CPPFLAGS
+  unset CPPFLAGS # for le spidermonkey
 
   ./update-workspaces.sh \
       --with-system-enet \
diff --git a/community/9base/PKGBUILD b/community/9base/PKGBUILD
index 4a40a0267..1ebb46e0e 100644
--- a/community/9base/PKGBUILD
+++ b/community/9base/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 68390 2012-03-23 21:00:56Z cbrannon $
+# $Id: PKGBUILD 97894 2013-09-30 20:21:53Z bpiotrowski $
 # Maintainer: Chris Brannon <cmbrannon79@gmail.com>
 # Contributor: Jeff Mickey <j@codemac.net>
 # Contributor: Aaron, phrakture, Griffin <aaron@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=9base
 pkgver=6
-pkgrel=4
+pkgrel=5
 pkgdesc="Port of various original Plan9 tools to unix"
 url="http://tools.suckless.org/9base"
 source=(http://dl.suckless.org/tools/$pkgname-$pkgver.tar.gz 9 plan9.sh)
@@ -16,9 +16,8 @@ provides=('plan9')
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 
-build()
-{
-  cd "$srcdir/$pkgname-$pkgver"
+build() {
+  cd $pkgname-$pkgver
 
   case $CARCH in
 	i686) sed -i 's#^OBJTYPE\s.*$#OBJTYPE = 386#' config.mk ;;
@@ -36,7 +35,7 @@ build()
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
   install -m755 ../9 "$pkgdir/opt/plan9/bin/"
   install -D -m755 ../plan9.sh "$pkgdir/etc/profile.d/plan9.sh"
diff --git a/community/abe/PKGBUILD b/community/abe/PKGBUILD
deleted file mode 100644
index 82568c345..000000000
--- a/community/abe/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Maintainer: jsteel <mail at jsteel dot org>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=abe
-pkgver=1.1
-pkgrel=9
-pkgdesc="A scrolling, platform-jumping, key-collecting, ancient pyramid exploring game"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://abe.sourceforge.net"
-license=('GPL')
-depends=('sdl_mixer')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
-        $pkgname.patch
-        $pkgname.desktop)
-md5sums=('5537920e1746708e1a631d84d3500f5c'
-         '74802a45e21b59d3e3d34f35ade252a4'
-         '6ff678e781290bff780da154a32b9767')
-
-build() {
-  cd "$srcdir"/$pkgname-$pkgver
-
-  patch -Np1 -i "$srcdir"/$pkgname.patch
-
-  ./configure --prefix=/usr --host=$CHOST
-
-  make
-}
-
-package() {
-  cd "$srcdir"/$pkgname-$pkgver
-
-  make DESTDIR="$pkgdir" install
-
-  install -Dm644 "$srcdir"/$pkgname.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop
-  install -dm755 "$pkgdir"/usr/share/$pkgname/images
-
-  cp -r images/ maps/ sounds/ "$pkgdir"/usr/share/$pkgname/
-
-  cd "$pkgdir"/usr/share/$pkgname/images
-  tar -xf "$srcdir"/$pkgname-$pkgver/images/images.tar abe.bmp
-  chown root:root abe.bmp
-}
diff --git a/community/abe/abe.desktop b/community/abe/abe.desktop
deleted file mode 100644
index 8c452e7af..000000000
--- a/community/abe/abe.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Abe
-GenericName=Platform Game
-Comment=Retro Platform Game
-Icon=/usr/share/abe/images/abe.bmp
-Exec=abe
-Categories=Game;
diff --git a/community/abe/abe.patch b/community/abe/abe.patch
deleted file mode 100644
index 33b0b1af0..000000000
--- a/community/abe/abe.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur abe-1.1.orig/src/Directories.h abe-1.1/src/Directories.h
---- abe-1.1.orig/src/Directories.h	2012-08-25 16:43:45.194974618 +0100
-+++ abe-1.1/src/Directories.h	2012-08-25 16:48:07.489030577 +0100
-@@ -27,7 +27,7 @@
- 
- // BASE_DIR has not " arround it.
- #ifndef BASE_DIR
--#define BASE_DIR .
-+#define BASE_DIR /usr/share/abe
- #endif
- 
- #define IMAGES_DIR "images"
-diff -ur abe-1.1.orig/src/Menu.c abe-1.1/src/Menu.c
---- abe-1.1.orig/src/Menu.c	2012-08-25 16:43:45.198307908 +0100
-+++ abe-1.1/src/Menu.c	2012-08-25 16:45:00.319469631 +0100
-@@ -116,7 +116,7 @@
-   if(n == SOUND_ENABLED || n == MUSIC_ENABLED)
-     return sound_loaded;
-   else
--    return 0;
-+    return 1;
- }
- 
- void
diff --git a/community/account-plugins/PKGBUILD b/community/account-plugins/PKGBUILD
deleted file mode 100644
index f49f30d5d..000000000
--- a/community/account-plugins/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 79484 2012-11-06 04:10:50Z bgyorgy $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=account-plugins
-pkgver=0.9
-pkgrel=1
-pkgdesc="Account configuration plugins for credentials preferences"
-arch=('i686' 'x86_64' 'mips64el')
-url="https://launchpad.net/online-accounts-account-plugins"
-license=('GPL')
-depends=('credentials-preferences' 'signon-keyring-extension' 'signon-plugin-oauth2')
-makedepends=('gobject-introspection' 'vala' 'intltool')
-optdepends=('python-gobject: for account-console tool')
-options=('!libtool')
-install=$pkgname.install
-source=(https://launchpad.net/online-accounts-account-plugins/12.10/$pkgver/+download/$pkgname-$pkgver.tar.gz)
-md5sums=('58deed9e3305877bb4db426a51451ec0')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-static
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community/account-plugins/account-plugins.install b/community/account-plugins/account-plugins.install
deleted file mode 100644
index 2c455e952..000000000
--- a/community/account-plugins/account-plugins.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/community/acpid/PKGBUILD b/community/acpid/PKGBUILD
index 0b3ff7969..4ae84bafd 100644
--- a/community/acpid/PKGBUILD
+++ b/community/acpid/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 91937 2013-05-29 23:05:51Z seblu $
+# $Id: PKGBUILD 97250 2013-09-15 20:35:17Z seblu $
 # Maintainer: Sébastien Luttringer
 # Contributor: xduugu
 # Contributor: Manolis Tzanidakis
 # Contributor: Jonathan Schmidt <j.schmidt@archlinux.us
 
 pkgname=acpid
-pkgver=2.0.19
+pkgver=2.0.20
 pkgrel=1
 pkgdesc='A daemon for delivering ACPI power management events with netlink support'
 arch=('i686' 'x86_64')
@@ -20,7 +20,7 @@ source=("http://downloads.sourceforge.net/sourceforge/acpid2/$pkgname-$pkgver.ta
         'acpid.service'
         'anything'
         'handler.sh')
-md5sums=('0b07a982e3e28cf37645f2c6269af72e'
+md5sums=('1b740e6419cf45aaeb2bd78d589f27f9'
          'd11700eb136e0489835ddaf977a7905b'
          '79cc7a9dceacdeffd51f070c2ba5f023'
          '2d37b98d6e74bab815604b8b48c6cfd4'
diff --git a/community/adesklets/PKGBUILD b/community/adesklets/PKGBUILD
deleted file mode 100644
index 7f7e84754..000000000
--- a/community/adesklets/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 59648 2011-11-29 01:35:36Z ebelanger $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Fubar
-
-pkgname=adesklets
-pkgver=0.6.1
-pkgrel=12
-pkgdesc="An imlib2-based system to have interactive 'desklets'."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://adesklets.sourceforge.net/"
-license=('GPL2')
-depends=('imlib2' 'fontconfig' 'python2' 'perl' 'ttf-bitstream-vera' 'libx11')
-install=$pkgname.install
-options=('!emptydirs')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2 \
-        fontconfig-2.4.patch posix_signal.patch)
-md5sums=('cd390c9398449c5566033e2e4792bccb'
-         '0374aec97670c90713fcabc2710e2160'
-         'd9ac15cc92f833f2446218e487e6c607')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -p1 -i "${srcdir}/posix_signal.patch"
-
-  #patch for fontconfig => 2.4
-  patch -Np0 -i "${srcdir}/fontconfig-2.4.patch"
-
-  # Fix linking problems.
-  sed -ri 's/^adesklets_LDFLAGS(.+) \\$/adesklets_LDADD\1 -lm \\/' src/Makefile.am
-
-  autoreconf
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr
-
-  #makefile Fix
-  sed -i 's/\/bin\/sh//' doc/Makefile
-
-  #python2 fix
-  for file in checkin installer submit; do
-      sed -i 's_/usr/bin/env python_/usr/bin/env python2_' utils/${pkgname}_${file}
-  done
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" INSTALLDIRS=vendor install
-
-  #remove the font stuff
-  rm -f "${pkgdir}"/usr/share/adesklets/{FONT_LICENSE,Vera.ttf}
-
-  find "${pkgdir}" -name '.packlist' -exec rm  '{}' \;
-  find "${pkgdir}" -name 'perllocal.pod' -exec rm  '{}' \;
-}
diff --git a/community/adesklets/adesklets.install b/community/adesklets/adesklets.install
deleted file mode 100644
index cae17e499..000000000
--- a/community/adesklets/adesklets.install
+++ /dev/null
@@ -1,31 +0,0 @@
-infodir=/usr/share/info
-filelist=(adesklets.info adesklets_fr.info)
-
-post_install() {
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
-  done
-
-  getent group adesklets > /dev/null || usr/sbin/groupadd -g 107 adesklets
-cat << EOF
-
-==> To be able to save configs of adesklets
-==> add your user to the adesklets group:
-==> # gpasswd -a USERNAME adesklets
-
-EOF
-}
-
-post_upgrade() {
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
-
-post_remove() {
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
-  done
-
-  usr/sbin/groupdel adesklets &>/dev/null
-}
diff --git a/community/adesklets/fontconfig-2.4.patch b/community/adesklets/fontconfig-2.4.patch
deleted file mode 100644
index e7a1ad5ca..000000000
--- a/community/adesklets/fontconfig-2.4.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- configure.ac
-+++ configure.ac
-@@ -1,4 +1,4 @@
--dnl Initialize autoconf and automake
-+nl Initialize autoconf and automake
- AC_INIT
- AC_CONFIG_SRCDIR(src/main.c)
- AC_PREREQ(2.52)
-@@ -428,7 +428,18 @@ AC_TRY_LINK(
- #include <fontconfig/fontconfig.h>
- , FcInit(),
- AC_MSG_RESULT([yes])
--AC_DEFINE(HAVE_FONTCONFIG_FONTCONFIG_H,1,[Define to 1 if you have the <fontconfig/fontconfig.h> header file.]),
-+AC_DEFINE(HAVE_FONTCONFIG_FONTCONFIG_H,1,[Define to 1 if you have the <fontconfig/fontconfig.h> header file.])
-+
-+AC_MSG_CHECKING([For fontconfig FcFini()])
-+AC_TRY_LINK(
-+#include <fontconfig/fontconfig.h>
-+, FcFini(),
-+AC_MSG_RESULT([yes])
-+AC_DEFINE(HAVE_FONTCONFIG_FCFINI,1,[Define to 1 if FcFini() call exists])
-+,
-+AC_MSG_RESULT([no]))
-+
-+,
- AC_MSG_RESULT([no])
- FONTCONFIG_LIBS=
- FONTCONFIG_CFLAGS=
---- src/xwindow.c
-+++ src/xwindow.c
-@@ -123,9 +123,17 @@
- 	  if ((strlen((char*)file)>4) && 
- 	      (strstr((char*)file+strlen((char*)file)-4,".ttf")))
- 	    imlib_add_path_to_font_path(dirname((char*)file));
--      FcFontSetDestroy(fs);
--      FcObjectSetDestroy(os);
-     }
-+#ifdef HAVE_FONTCONFIG_FCFINI
-+    FcFini();
-+#else
-+    /* On FontConfig >= 2.4, this causes a segfault, probably due to the new
-+       caching mechanism: we don't have to care, since FcFini() always exists,
-+       and does the dirty dessalocation job just fine.
-+    */
-+    if (fs) FcFontSetDestroy(fs);
-+    FcObjectSetDestroy(os);
-+#endif
-   }
- #endif
-   imlib_add_path_to_font_path(".");
diff --git a/community/adesklets/posix_signal.patch b/community/adesklets/posix_signal.patch
deleted file mode 100644
index 90b3e8a12..000000000
--- a/community/adesklets/posix_signal.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 92e686badce5c549699a30e82458a42dbcd99183 Mon Sep 17 00:00:00 2001
-From: Sylvain <syfou@users.sourceforge.net>
-Date: Wed, 2 May 2007 13:23:18 -0400
-Subject: [PATCH] Definitive fix for the signal module importation problem
- ...from posix_signal on some amd64 systems. Many thanks to Jason
- Pontious for his support and patience.
-
----
- scripting/python/posix_signal.c |   34 ++++++++++++++++++----------------
- 1 files changed, 18 insertions(+), 16 deletions(-)
-
-diff --git a/scripting/python/posix_signal.c b/scripting/python/posix_signal.c
-index 620248f..7c5ac25 100644
---- a/scripting/python/posix_signal.c
-+++ b/scripting/python/posix_signal.c
-@@ -1,16 +1,17 @@
- /*--- posix_signal.c -----------------------------------------------------------
--This is nothing but a forward port from older python code by Lance Ellinghaus,
--Guido van Rossum & al., reformatted and put back together by Sylvain Fourmanoit <syfou@users.sourceforge.net>
--for recent (2.2.0 final and newer) python implementations.
--
--The ability to temporarily delay signals delivery is a very usefull feature -
--not all C functions are reentrant (in fact, only a few need to be 'safe' 
--according to the POSIX 1003.1-2003 list), so being able to create critical
--code sections is a must. Although I am convinced Python's developpers 
--had good reasons, I do not know myself why 'sigprocmask' and associated 
--functions support was dropped from the signal module on systems which 
--implemented them... Since I needed them in my blissful ignorance, 
--here they are, alive and kicking. :-)
-+This is nothing but a forward port from older python code by Lance
-+Ellinghaus, Guido van Rossum & al., reformatted and put back together
-+by Sylvain Fourmanoit <syfou@users.sourceforge.net> for recent (2.2.0
-+final and newer) python implementations.
-+
-+The ability to temporarily delay signals delivery is a very usefull
-+feature - not all C functions are reentrant (in fact, only a few need
-+to be 'safe' according to the POSIX 1003.1-2003 list), so being able
-+to create critical code sections is a must. Although I am convinced
-+Python's developpers had good reasons, I do not know myself why
-+'sigprocmask' and associated functions support was dropped from the
-+signal module on systems which implemented them... Since I needed them
-+in my blissful ignorance, here they are, alive and kicking. :-)
- 
- ------------------------------------------------------------------------------*/
- #include <Python.h>
-@@ -214,8 +215,9 @@ PyMODINIT_FUNC
- initposix_signal(void)
- {
-   const char * KEYS [] = { "__doc__", "__name__" , NULL};
--  int i, pos=0;
-+  int i;
-   char * key_str, * doc_str , * new_str;
-+  Py_ssize_t pos = 0;
-   PyObject * m, * mDoc, *d,  
-     * pName, * pModule, * pDict,
-     * key, * value, *x;
-@@ -236,7 +238,6 @@ initposix_signal(void)
-   /* The chunk of code below roughly perfoms python equivalent of:
-      'from signal import *' inside what would be a pure python posix_signal
-      module ... */
--  pName=PyString_FromString("signal");
-   if ((pModule=PyImport_Import((pName=PyString_FromString("signal"))))) {
-     pDict=PyModule_GetDict(pModule);
-     while (PyDict_Next(pDict, &pos, &key, &value))
-@@ -246,10 +247,11 @@ initposix_signal(void)
- 	for(i=0;KEYS[i];++i)
- 	  if (strncmp(key_str,KEYS[i],strlen(KEYS[i]))==0)
- 	    break;
--	if (!KEYS[i])
-+	if (!KEYS[i]) {
- 	  /* This needs python 2.2 and up */
-+	  Py_INCREF(value);
- 	  PyModule_AddObject(m,key_str,value);
--	else {
-+	} else {
- 	  if (i==0) {
- 	    /* Append signal module documentation */
- 	    if ((mDoc=PyDict_GetItemString(d,KEYS[0]))) {
--- 
-1.6.5.GIT
-
diff --git a/community/aegisub/PKGBUILD b/community/aegisub/PKGBUILD
index b9f706c40..9852e6f64 100755
--- a/community/aegisub/PKGBUILD
+++ b/community/aegisub/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 96598 2013-09-02 08:35:43Z alucryd $
+# $Id: PKGBUILD 97224 2013-09-15 13:34:01Z alucryd $
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 # Contributor: kozec <kozec@kozec.com>
 # Contributor: Limao Luo <luolimao+AUR@gmail.com>
 
 pkgname=aegisub
 pkgver=3.0.4
-pkgrel=3
+pkgrel=4
 pkgdesc="A general-purpose subtitle editor with ASS/SSA support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.aegisub.org"
 license=('GPL' 'BSD')
-depends=('desktop-file-utils' 'ffmpegsource' 'fftw' 'hicolor-icon-theme' 'hunspell' 'lua51' 'wxgtk2.9')
+depends=('desktop-file-utils' 'ffms2' 'fftw' 'hicolor-icon-theme' 'hunspell' 'lua51' 'wxgtk2.9')
 makedepends=('mesa')
 install="${pkgname}.install"
 source=("http://ftp.aegisub.org/pub/releases/${pkgname}-${pkgver}.tar.xz"
@@ -27,9 +27,7 @@ prepare() {
 build() {
   cd ${pkgname}/${pkgname}
 
-  export ACLOCAL=aclocal
-  export AUTOMAKE=automake
-  ./autogen.sh --prefix='/usr' --without-{portaudio,openal,oss} --with-wxdir='/usr/include/wx-2.9' --with-wx-config='/usr/bin/wx-config-2.9'
+  ./configure --prefix='/usr' --without-{portaudio,openal,oss} --with-wxdir='/usr/include/wx-2.9' --with-wx-config='/usr/bin/wx-config-2.9'
   make
 }
 
diff --git a/community/aircrack-ng/PKGBUILD b/community/aircrack-ng/PKGBUILD
index 5b24b552b..bfac471f6 100644
--- a/community/aircrack-ng/PKGBUILD
+++ b/community/aircrack-ng/PKGBUILD
@@ -1,91 +1,30 @@
-# $Id: PKGBUILD 92023 2013-05-30 23:34:33Z seblu $
-# Maintainer: Brad Fanella <bradfanella@archlinux.us>
+# $Id: PKGBUILD 96850 2013-09-06 16:26:13Z bgyorgy $
+# Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor:  Daenyth <Daenyth+Arch [at] gmail [dot] com>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
 # Contributor: ice-man <icemanf@gmail.com>
 
-pkgbase=aircrack-ng
-pkgname=(aircrack-ng aircrack-ng-scripts)
+pkgname=aircrack-ng
 pkgver=1.1
-pkgrel=9
+pkgrel=10
+pkgdesc="A key cracker for the 802.11 WEP and WPA-PSK protocols"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.aircrack-ng.org"
 license=('GPL2')
-source=("http://download.aircrack-ng.org/${pkgname}-${pkgver}.tar.gz")
+depends=('openssl' 'sqlite' 'iw' 'net-tools' 'wireless_tools')
+conflicts=('aircrack-ng-scripts')
+replaces=('aircrack-ng-scripts')
+provides=('aircrack-ng-scripts')
+source=("http://download.aircrack-ng.org/$pkgname-$pkgver.tar.gz")
 md5sums=('f7a24ed8fad122c4187d06bfd6f998b4')
-depends=('openssl' 'sqlite' 'iw' 'net-tools')
 
 build() {
-	cd ${srcdir}/${pkgbase}-${pkgver}
-	make SQLITE=true unstable=true
+  cd "$srcdir/$pkgname-$pkgver"
+  make SQLITE=true UNSTABLE=true
 }
 
-package_aircrack-ng() {
-	pkgdesc="A key cracker for the 802.11 WEP and WPA-PSK protocols"
-
-	cd ${srcdir}/${pkgname}-${pkgver}
-	make DESTDIR=${pkgdir} SQLITE=true unstable=true bindir=/usr/bin  \
-		mandir=/usr/share/man/man1 sbindir=/usr/bin install
-
-	### Remove installed scripts/corresponding man pages (installed in aircrack-ng-scripts) ###
-	# Scripts
-	rm ${pkgdir}/usr/bin/airdriver-ng
-	rm ${pkgdir}/usr/bin/airodump-ng-oui-update
-	# Man pages
-	mkdir -p ${srcdir}/tmp/
-	mv ${pkgdir}/usr/share/man/man1/airdriver-ng.1 ${srcdir}/tmp/
-}
-
-package_aircrack-ng-scripts() {
-	pkgdesc="Included scripts for a key cracker for the 802.11 WEP and WPA-PSK protocols"
-    depends=('python2' 'graphviz' 'python2-pylorcon')
-
-	cd ${srcdir}/aircrack-ng-${pkgver}/scripts
-	mkdir -p ${pkgdir}/usr/share/man/man1/ \
-		${pkgdir}/usr/bin
-
-	### AIRDRIVER-NG ###
-	# Script
-	install -Dm644 airdriver-ng ${pkgdir}/usr/bin/
-	# Libs
-	mkdir -p ${pkgdir}/usr/lib/airdrop-ng/
-	install -Dm644 airdrop-ng/lib/{colorize.py,libDumpParse.py,libOuiParse.py} \
-		${pkgdir}/usr/lib/airdrop-ng/
-	# Man page
-	mv ${srcdir}/tmp/airdriver-ng.1 ${pkgdir}/usr/share/man/man1/
-
-	### AIRDROP-NG ###
-	# Man page
-	install -Dm644 airdrop-ng/docs/airdrop-ng.1 ${pkgdir}/usr/share/man/man1/ 
-	# Script
-	sed s/python/python2/ -i airdrop-ng/airdrop-ng.py
-	install -Dm644 airdrop-ng/airdrop-ng.py ${pkgdir}/usr/bin/airdrop-ng
-	chmod +x ${pkgdir}/usr/bin/airdrop-ng
-
-	### AIRGRAPH-NG ###
-	# Libs
-	mkdir -p ${pkgdir}/usr/lib/airgraph-ng/
-	install -Dm644 airgraph-ng/lib/lib_Airgraphviz.py \
-		${pkgdir}/usr/lib/airgraph-ng/
-	# Man page
-	install -Dm644 airgraph-ng/man/airgraph-ng.1 ${pkgdir}/usr/share/man/man1/	
-	# Script
-	sed s/python/python2/ -i airgraph-ng/airgraph-ng.py
-	sed s_/usr/local/bin/lib_/usr/lib_ -i airgraph-ng/airgraph-ng.py
-	install -Dm644 airgraph-ng/airgraph-ng.py ${pkgdir}/usr/bin/airgraph-ng
-	chmod +x ${pkgdir}/usr/bin/airgraph-ng
-
-	### DUMP-JOIN.PY ###
-	# Man page
-	install -Dm644 airgraph-ng/man/dump-join.1 ${pkgdir}/usr/share/man/man1/
-	# Script
-	sed s/python/python2/ -i airgraph-ng/dump-join.py
-	install -Dm644 airgraph-ng/dump-join.py ${pkgdir}/usr/bin/dump-join.py
-	chmod +x ${pkgdir}/usr/bin/dump-join.py
-
-	### AIRODUMP-NG-OUI-UPDATE ###
-	# Script
-	install -Dm644 airodump-ng-oui-update ${pkgdir}/usr/bin/
-	chmod +x ${pkgdir}/usr/bin/airodump-ng-oui-update
-
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" SQLITE=true UNSTABLE=true \
+    bindir=/usr/bin sbindir=/usr/bin mandir=/usr/share/man/man1 install
 }
diff --git a/community/almanah/PKGBUILD b/community/almanah/PKGBUILD
index e47861ba1..f9d20b165 100644
--- a/community/almanah/PKGBUILD
+++ b/community/almanah/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 90849 2013-05-14 21:40:34Z andrea $
+# $Id: PKGBUILD 98185 2013-10-07 12:08:18Z jgc $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=almanah
 pkgver=0.10.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Small GTK+ application to allow you to keep a diary of your life"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://live.gnome.org/Almanah_Diary"
diff --git a/community/aria2/PKGBUILD b/community/aria2/PKGBUILD
index 60e5462fd..b6ccfc609 100644
--- a/community/aria2/PKGBUILD
+++ b/community/aria2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 91644 2013-05-26 08:19:25Z bpiotrowski $
+# $Id: PKGBUILD 97034 2013-09-11 06:15:17Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Angel Velasquez <angvp@archlinux.org>
@@ -6,7 +6,7 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=aria2
-pkgver=1.17.1
+pkgver=1.18.0
 pkgrel=1
 pkgdesc='Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink'
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ license=('GPL')
 depends=('gnutls' 'libxml2' 'sqlite' 'c-ares' 'ca-certificates')
 checkdepends=('cppunit')
 source=(http://downloads.sourceforge.net/aria2/aria2-${pkgver}.tar.xz)
-sha256sums=('7e18cf15afa17cf725c2ab4338751bc165e33d41917a4af9927da0855298efc0')
+sha256sums=('431aa6a1ba1cf992d5ac68c2822854a6c6991f03d025608311b5d99227fc0ab7')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/audit/PKGBUILD b/community/audit/PKGBUILD
index 6f27a9088..6a8a24dac 100644
--- a/community/audit/PKGBUILD
+++ b/community/audit/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 94856 2013-07-31 10:33:01Z mtorromeo $
+# $Id: PKGBUILD 96792 2013-09-05 09:31:14Z mtorromeo $
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 # Contributor: Connor Behan <connor.behan@gmail.com>
 # Contributor: henning mueller <henning@orgizm.net>
 
 pkgname=audit
-pkgver=2.2.3
-pkgrel=4
+pkgver=2.3.2
+pkgrel=1
 pkgdesc='User space utilities for storing and searching the audit records generated by the audit subsystem in the Linux kernel.'
-url=http://people.redhat.com/sgrubb/$pkgname
+url="http://people.redhat.com/sgrubb/$pkgname"
 arch=(i686 x86_64 mips64el)
 depends=(krb5 libcap-ng)
 makedepends=(libldap swig linux-headers python2)
@@ -15,7 +15,7 @@ license=(GPL)
 options=(!libtool emptydirs)
 backup=(
 	etc/libaudit.conf
-	etc/audit/audit.rules
+	etc/audit/rules.d/audit.rules
 	etc/audit/auditd.conf
 	etc/audisp/audispd.conf
 	etc/audisp/audisp-remote.conf
@@ -25,14 +25,11 @@ backup=(
 	etc/audisp/plugins.d/au-remote.conf
 	etc/audisp/plugins.d/syslog.conf
 )
-source=(
-	$url/$pkgname-$pkgver.tar.gz
-	python2.patch
-)
+source=("$url/$pkgname-$pkgver.tar.gz")
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
-	patch -p0 -i "$srcdir/python2.patch"
+	export PYTHON=/usr/bin/python2
 	./configure \
 		--prefix=/usr \
 		--sbindir=/usr/bin \
@@ -51,7 +48,7 @@ package() {
 
 	cd "$pkgdir"
 	install -d var/log/audit
-	rm -rf etc/rc.d etc/sysconfig
+	rm -rf etc/rc.d etc/sysconfig usr/lib/audit
 
 	sed -ri 's|/sbin|/usr/bin|' \
 		etc/audit/*.conf \
@@ -61,5 +58,4 @@ package() {
 	chmod 644 usr/lib/systemd/system/auditd.service
 }
 
-sha256sums=('2fc8f97020121593f516dc011ef61f39043c4cea9b2cb9ab3849bf9e41dedf02'
-            '6adadb405bebe99bb6a50e80e7c1a356996626e135d566283448fe4019fff3a4')
+sha256sums=('8872e0b5392888789061db8034164305ef0e1b34543e1e7004d275f039081d29')
diff --git a/community/audit/python2.patch b/community/audit/python2.patch
deleted file mode 100644
index 87286fc5b..000000000
--- a/community/audit/python2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2013-01-16 09:19:32.475800853 +0100
-+++ configure	2013-01-16 09:20:45.764146581 +0100
-@@ -13076,7 +13076,7 @@
- 
-         # Find any Python interpreter.
-     if test -z "$PYTHON"; then
--      for ac_prog in python python2 python3 python3.2 python3.1 python3.0 python2.7  python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0
-+      for ac_prog in python2
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
diff --git a/community/avrdude/PKGBUILD b/community/avrdude/PKGBUILD
index d36c8b1c2..b2c4ecb20 100644
--- a/community/avrdude/PKGBUILD
+++ b/community/avrdude/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 92157 2013-06-01 20:12:04Z jelle $
+# $Id: PKGBUILD 97484 2013-09-21 11:43:49Z jelle $
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
 # Maintainer: Brad Fanella <bradfanella@archlinux.us>
 
 pkgname=avrdude
-pkgver=5.11.1
-pkgrel=4
+pkgver=6.0.1
+pkgrel=1
 pkgdesc="Download/upload/manipulate the ROM and EEPROM contents of AVR microcontrollers"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.nongnu.org/avrdude/"
 license=('GPL')
 depends=('libusbx' 'readline' 'libftdi')
 source=(http://download.savannah.gnu.org/releases/avrdude/${pkgname}-${pkgver}.tar.gz{,.sig})
-md5sums=('3a43e288cb32916703b6945e3f260df9'
-                 '0c23b005d4090aef4e081476aabc1958')
+md5sums=('346ec2e46393a54ac152b95abf1d9850'
+         'SKIP')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/awesome/PKGBUILD b/community/awesome/PKGBUILD
index a55e1c214..a0d0f2b83 100644
--- a/community/awesome/PKGBUILD
+++ b/community/awesome/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 87494 2013-04-01 17:59:30Z seblu $
+# $Id: PKGBUILD 97620 2013-09-25 19:19:38Z seblu $
 # Maintainer: Sébastien Luttringer
 # Contributor: xduugu
 # Contributor: Ronald van Haren <ronald.archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=awesome
 pkgver=3.5.1
-pkgrel=1
+pkgrel=3
 pkgdesc='Highly configurable framework window manager'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://awesome.naquadah.org/'
@@ -42,10 +42,9 @@ optdepends=(
   'vicious: widgets for the Awesome window manager'
 )
 provides=('notification-daemon')
-source=("$url/download/$pkgname-$pkgver.tar.xz"
-        "$pkgname.desktop")
-md5sums=('f528f66ddcdb07f24e6f494837371702'
-         '0fdbeec43d211c6750041d7e37611a6a')
+backup=('etc/xdg/awesome/rc.lua')
+source=("$url/download/$pkgname-$pkgver.tar.xz")
+md5sums=('f528f66ddcdb07f24e6f494837371702')
 
 build() {
   cd $pkgname-$pkgver
@@ -61,7 +60,7 @@ package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
   # install desktop file so you can start awesome from your login manager
-  install -Dm644 ../awesome.desktop "$pkgdir/usr/share/xsessions/awesome.desktop"
+  install -Dm644 awesome.desktop "$pkgdir/usr/share/xsessions/awesome.desktop"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/awesome/awesome.desktop b/community/awesome/awesome.desktop
deleted file mode 100644
index 453399c6e..000000000
--- a/community/awesome/awesome.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Awesome
-Comment=Highly configurable framework window manager
-Type=XSession
-Exec=awesome
-TryExec=awesome
diff --git a/community/bchunk/PKGBUILD b/community/bchunk/PKGBUILD
index 1cbafecce..95f327702 100644
--- a/community/bchunk/PKGBUILD
+++ b/community/bchunk/PKGBUILD
@@ -1,30 +1,29 @@
+# Maintainer: Xyne <ca dot archlinux at xyne, backwards>
 # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
 # Contributor: eric <eric@archlinux.org>
 # Contributor: Markus Meissner <markus@meissna.de>
 
 pkgname=bchunk
 pkgver=1.2.0
-pkgrel=3
+pkgrel=4
 pkgdesc="A Tool to Convert *.raw *.bin files to an ISO file"
-url="http://hes.iki.fi/bchunk/"
+url="http://he.fi/bchunk/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('glibc')
-source=(http://hes.iki.fi/$pkgname/$pkgname-$pkgver.tar.gz)
+source=(http://he.fi/$pkgname/$pkgname-$pkgver.tar.gz)
 md5sums=('6a613da3f34f9a303f202d2e9731d231')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
+  cd "$srcdir/$pkgname-$pkgver"
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  mkdir -p ${pkgdir}/usr/bin ${pkgdir}/usr/share/man/man1
-
-  make PREFIX=${pkgdir}/usr MAN_DIR=${pkgdir}/usr/share/man install
-  chown root.root ${pkgdir}/usr/share/man/man1/bchunk.1
+  cd "$srcdir/$pkgname-$pkgver"
+  install -dm755 "$pkgdir"/usr/{bin,share/man/man1}
+  make PREFIX="$pkgdir/usr" MAN_DIR="$pkgdir/usr/share/man" install
+  chown root:root "$pkgdir/usr/share/man/man1/bchunk.1"
 }
+
 # vim: ts=2 sw=2 et ft=sh
diff --git a/community/bibutils/PKGBUILD b/community/bibutils/PKGBUILD
deleted file mode 100644
index db8dbf2bf..000000000
--- a/community/bibutils/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Daniel Micay <danielmicay@gmail.com>
-# Contributor: Ivy Foster <joyfulgirl (at) archlinux (dot) us>
-
-pkgname=bibutils
-_basename=bibutils
-pkgver=5.0
-pkgrel=1
-pkgdesc="Bibliography conversion tools"
-arch=("i686" "x86_64" "mips64el")
-url="http://sourceforge.net/p/bibutils/home/Bibutils/"
-license=('GPL2')
-makedepends=('tcsh')
-depends=(glibc)
-source=("http://downloads.sourceforge.net/project/${_basename}/${_basename}_${pkgver}_src.tgz")
-md5sums=('c4838bf0d8ae48e4df49ae395bf643d0')
-
-build() {
-  cd ${_basename}_$pkgver
-  ./configure --dynamic --install-dir "$pkgdir/usr/bin" --install-lib "$pkgdir/usr/lib"
-  make
-}
-
-package() {
-  cd ${_basename}_$pkgver
-  mkdir -p "$pkgdir/usr/bin" "$pkgdir/usr/lib"
-  make install
-}
diff --git a/community/bind/PKGBUILD b/community/bind/PKGBUILD
index 1b292d09a..2917f33a7 100644
--- a/community/bind/PKGBUILD
+++ b/community/bind/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 94599 2013-07-27 17:55:53Z seblu $
+# $Id: PKGBUILD 97454 2013-09-20 14:54:34Z seblu $
 # Maintainer: Sébastien Luttringer
 # Contributor: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 # Contributor: Mario Vazquez <mario_vazq@hotmail.com>
 
 pkgname=bind
-_pkgver=9.9.3-P2
+_pkgver=9.9.4
 pkgver=${_pkgver//-/.}
 pkgrel=1
 pkgdesc='The ISC BIND nameserver'
@@ -18,7 +18,7 @@ provides=('dns-server')
 backup=('etc/logrotate.d/named'
         'etc/named.conf')
 install=$pkgname.install
-source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
+source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"{,.asc}
         'root.hint::http://www.internic.net/zones/named.root'
         'tmpfiles.d'
         'named.conf'
@@ -26,7 +26,8 @@ source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
         'named.logrotate'
         'localhost.zone'
         '127.0.0.zone')
-sha1sums=('a0235692c488b3fadf54a15858b1f13ae2ab6979'
+sha1sums=('d7be390e6c2546f37a7280e1975e1cd134565f62'
+          'SKIP'
           '029f89c49550c40ec7a95116b6a33f0e5a041094'
           'c5a2bcd9b0f009ae71f3a03fbdbe012196962a11'
           'c71a7fc02d4bf0d55e8e29d1e014607ac1d58726'
@@ -72,7 +73,7 @@ package() {
   install -D -m600 named.logrotate "$pkgdir/etc/logrotate.d/named"
   install -D -m640 -o 0 -g 40 named.conf "$pkgdir/etc/named.conf"
 
-  install -d -m750 -o 0 -g 40 "$pkgdir/var/named"
+  install -d -m770 -o 0 -g 40 "$pkgdir/var/named"
   install    -m640 -o 0 -g 40 root.hint "$pkgdir/var/named"
   install    -m640 -o 0 -g 40 127.0.0.zone "$pkgdir/var/named"
   install    -m640 -o 0 -g 40 localhost.zone "$pkgdir/var/named"
diff --git a/community/bitcoin/PKGBUILD b/community/bitcoin/PKGBUILD
index 665dd1db8..3a0166376 100644
--- a/community/bitcoin/PKGBUILD
+++ b/community/bitcoin/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 94013 2013-07-13 12:30:36Z svenstaro $
+# $Id: PKGBUILD 97296 2013-09-16 16:48:10Z tredaelli $
 # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor: shahid <helllamer@gmail.com>
 
 pkgbase=bitcoin
 pkgname=('bitcoin-daemon' 'bitcoin-qt')
-pkgver=0.8.3
-pkgrel=2
+pkgver=0.8.5
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.bitcoin.org/"
 makedepends=('boost' 'automoc4' 'qrencode' 'miniupnpc')
 license=('MIT')
 source=(http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-$pkgver/bitcoin-$pkgver-linux.tar.gz)
-sha256sums=('c6003a6af947e6978b13ab55d7bb7ec97aedc55022fb4924d08792a8d4f83a35')
+sha256sums=('84543f10de5e82ce6e88dd5a501db37c6327edf79a2a04f29199c24843e71f63')
 
 build() {
   cd "$srcdir/$pkgbase-$pkgver-linux/src"
@@ -26,7 +26,7 @@ build() {
 
 
 package_bitcoin-qt() {
-  pkgdesc="Bitcoin is a peer-to-peer network based digital currency - QT"
+  pkgdesc="Bitcoin is a peer-to-peer network based digital currency - Qt"
   depends=(boost-libs qt4 miniupnpc qrencode)
   install=bitcoin-qt.install
 
diff --git a/community/cantata/PKGBUILD b/community/cantata/PKGBUILD
index e729f3b0c..15bada28a 100644
--- a/community/cantata/PKGBUILD
+++ b/community/cantata/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 94869 2013-08-01 06:54:42Z bpiotrowski $
+# $Id: PKGBUILD 97316 2013-09-17 09:33:55Z bpiotrowski $
 # Maintainer:  Federico Cinelli <cinelli@aur.archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Mcder3 <mcder3[at]gmail[dot]com>
 # Contributor: MisterFred <mister.fred[at]free[dot]fr>
 
 pkgname=cantata
-pkgver=1.0.3
+pkgver=1.1.2
 pkgdesc="A KDE client for the music player daemon (MPD)"
-pkgrel=2
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://kde-apps.org/content/show.php/Cantata?content=147733"
 license=('GPL')
@@ -15,12 +15,7 @@ depends=('kdebase-runtime' 'taglib-extras' 'mpg123' 'libmtp' 'libcddb' 'libmusic
 makedepends=('cmake' 'automoc4')
 install="$pkgname.install"
 source=("http://cantata.googlecode.com/files/$pkgname-$pkgver.tar.bz2")
-md5sums=('fd942d25127a7936efaf1fe887d66189')
-
-prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-  sed -i 's/AVCODEC_MAX_AUDIO_FRAME_SIZE/192000/' replaygain/ffmpeginput.cpp
-}
+md5sums=('628991865a505284a7ce56e117cd36cc')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/ccid/PKGBUILD b/community/ccid/PKGBUILD
index 35a4a7b7e..a61a9823a 100644
--- a/community/ccid/PKGBUILD
+++ b/community/ccid/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 94187 2013-07-16 14:49:37Z giovanni $
+# $Id: PKGBUILD 98050 2013-10-04 16:09:59Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com>
 
 pkgname=ccid
-pkgver=1.4.11
-pkgrel=1
+pkgver=1.4.12
+pkgrel=2
 pkgdesc="A generic USB Chip/Smart Card Interface Devices driver"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pcsclite.alioth.debian.org/ccid.html"
@@ -12,15 +12,16 @@ license=('LGPL' 'GPL')
 depends=('pcsclite' 'libusbx')
 makedepends=('pkg-config')
 backup=(etc/reader.conf.d/libccidtwin)
-source=("https://alioth.debian.org/frs/download.php/file/3920/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('20e3d6f045c53707a597cbacb86b6c5b')
+source=("https://alioth.debian.org/frs/download.php/file/3937/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('54a314b60b60a9549febc75b6dc516d5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   ./configure --prefix=/usr \
               --sysconfdir=/etc \
-              --enable-twinserial
+              --enable-twinserial \
+              --enable-serialconfdir=/etc/reader.conf.d
   make
 }
 
@@ -28,4 +29,7 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   make DESTDIR="${pkgdir}" install
+  # move the configuration file in /etc and create a symbolic link
+  mv "${pkgdir}/usr/lib/pcsc/drivers/ifd-ccid.bundle/Contents/Info.plist" "${pkgdir}/etc/libccid_Info.plist"
+  ln -s /etc/libccid_Info.plist ${pkgdir}/usr/lib/pcsc/drivers/ifd-ccid.bundle/Contents/Info.plist
 }
diff --git a/community/cclive/PKGBUILD b/community/cclive/PKGBUILD
index cddb91ecf..f3dd9657d 100644
--- a/community/cclive/PKGBUILD
+++ b/community/cclive/PKGBUILD
@@ -1,28 +1,27 @@
-# $Id: PKGBUILD 94015 2013-07-13 12:31:02Z svenstaro $
+# $Id: PKGBUILD 98184 2013-10-07 12:07:00Z jgc $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: joyfulgirl@archlinux.us
 # Contributor: nathan owe ndowens04 at gmail dot com
 
 pkgname=cclive
-pkgver=0.7.13
-pkgrel=2
+pkgver=0.9.2
+pkgrel=1
 pkgdesc='Commandline downloader for popular video websites.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://cclive.sourceforge.net/'
-license=('GPL3')
-depends=('boost-libs' 'pcre' 'curl' 'libquvi')
-makedepends=('boost' 'chrpath')
-source=("http://downloads.sourceforge.net/project/${pkgname}/0.7/${pkgname}-${pkgver}.tar.xz")
-md5sums=('654892be303c2738dd078dbe6c78595d')
+license=('AGPL3')
+depends=('boost-libs' 'pcre' 'curl' 'libquvi' 'glibmm')
+makedepends=('boost')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz")
+md5sums=('b21f2ed68242901dc0439132a4ea6629')
 
 build() {
   cd $pkgname-$pkgver
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr boost_cv_rpath_link_ldflag="-L/usr/lib"
   make
 }
 
 package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
-  chrpath --delete "$pkgdir"/usr/bin/cclive
 }
diff --git a/community/cdck/PKGBUILD b/community/cdck/PKGBUILD
deleted file mode 100644
index f5689fafd..000000000
--- a/community/cdck/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 65681 2012-02-21 21:16:27Z cbrannon $
-# Maintainer: Chris Brannon <chris@the-brannons.com>
-# Contributor: Abhishek Dasgupta <abhidg@gmail.com>
-# Previous Maintainer: Shinlun Hsieh <yngwiexx@yahoo.com.tw>
-# Contributor: Slash <demodevil5[at]yahoo[dot]com>
-
-pkgname=cdck
-pkgver=0.7.0
-pkgrel=4
-pkgdesc="A simple program to verify CD/DVD quality"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://swaj.net/unix/"
-license=('GPL')
-depends=(gcc-libs)
-makedepends=('perl')
-options=('!libtool')
-source=(http://swaj.net/unix/cdck/${pkgname}-${pkgver}.tar.gz)
-md5sums=('15029d54b99f2e5cf8aae28077669d3f')
-
-build() {
-    cd "$srcdir/${pkgname}-${pkgver}"
-
-    ./configure --prefix=/usr --mandir=/usr/share/man --build=$CHOST
-    PATH="/usr/bin/core_perl:$PATH" make
-}
-
-package() {
-    cd "$srcdir/${pkgname}-${pkgver}"
-    make DESTDIR="$pkgdir" install
-}
diff --git a/community/choqok/PKGBUILD b/community/choqok/PKGBUILD
index 0f2ac3b0b..dca30042c 100644
--- a/community/choqok/PKGBUILD
+++ b/community/choqok/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 80665 2012-11-28 22:07:33Z plewis $
+# $Id: PKGBUILD 96780 2013-09-04 22:10:06Z andrea $
 # Maintainer: Peter Richard Lewis <plewis@aur.archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Emanuele Rossi <newdna1510@yahoo.it>
 # Contributor: Bram Schoenmakers <me@bramschoenmakers.nl>
 
 pkgname=choqok
-pkgver=1.3
-pkgrel=4
+pkgver=1.4
+pkgrel=1
 pkgdesc="A Twitter/identi.ca/laconica client for KDE"
 url='http://choqok.gnufolks.org/'
 license=('GPL')
@@ -15,12 +15,14 @@ depends=('kdebase-runtime' 'qjson' 'qoauth' 'qca-ossl')
 makedepends=('cmake' 'automoc4')
 optdepends=('kdebase-konqueror: proxy support')
 install="${pkgname}.install"
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('87eea4f2c23467fb021e3e6b794eb37d')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz")
+md5sums=('2efe34ed903b448a21d9233d8033dbdb')
 
-build() {
-  cd "${srcdir}"
+prepare() {
   mkdir build
+}
+
+build() {
   cd build
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
@@ -29,9 +31,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build
+  cd build
   make DESTDIR="${pkgdir}" install
-
-  # This is already installed by kdepimlibs >= 4.9.80
-  rm "${pkgdir}"/usr/share/apps/cmake/modules/FindQtOAuth.cmake
 }
diff --git a/community/cinnamon-control-center/PKGBUILD b/community/cinnamon-control-center/PKGBUILD
index 25c9a698d..3b59c0a72 100644
--- a/community/cinnamon-control-center/PKGBUILD
+++ b/community/cinnamon-control-center/PKGBUILD
@@ -1,44 +1,28 @@
-# $Id: PKGBUILD 95589 2013-08-14 21:07:27Z bgyorgy $
+# $Id: PKGBUILD 98187 2013-10-07 12:08:21Z jgc $
 # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com
 # Based on gnome-control-center:
 # Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Jan de Groot <jgc@archlinux.org>
 
 pkgname=cinnamon-control-center
-pkgver=1.8.2
-pkgrel=2
+pkgver=2.0.1
+pkgrel=1
 pkgdesc="The Control Center for Cinnamon"
 arch=('i686' 'x86_64' 'mips64el')
-depends=('cinnamon' 'cheese' 'libgnomekbd' 'network-manager-applet')
+depends=('cinnamon' 'cheese' 'libgnomekbd' 'network-manager-applet' 'cinnamon-settings-daemon')
 optdepends=('gnome-color-manager: for color management tasks')
 makedepends=('intltool' 'gnome-common')
 url="https://github.com/linuxmint/cinnamon-control-center"
 install=cinnamon-control-center.install
 license=('GPL')
 options=('!libtool' '!emptydirs')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz"
-        "gnomerrlabeler.patch"
-        "idle-delay.patch"
-        "remove_obex.patch")
-sha256sums=('78effed26a8fdce481cfe467889c9afdb6db78a961aec61b918c83c9781ccf4f'
-            'a01db243251c3da59c969d4538a35a63020d1e20866ff700ef273debd05456db'
-            '98227484162071744b5a336a5b3915c211f5eb1559034b3d40e4a9d790fe0e31'
-            '3df65b1f5e691d4a4634c05698da6df79cb23a0ebf71b201f23c48742b75b6e4')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz")
+sha256sums=('2a8ea5c17e515afd47d0f76127dbc5172281ef2b6aaf8a5c800ff7079d6d80f2')
 
 build() {
   cd $pkgname-$pkgver
 
-  # Build fix for GNOME 3.8
-  patch -Np1 -i "$srcdir/gnomerrlabeler.patch"
-
-  # Runtime fix for GNOME 3.8
-  patch -Np1 -i "$srcdir/idle-delay.patch"
-
-  # Remove "Browse Files..." option as it's gone from gnome-bluetooth 3.8
-  patch -Np1 -i "$srcdir/remove_obex.patch"
-
   autoreconf -fi
-
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --enable-systemd \
diff --git a/community/cinnamon-control-center/gnomerrlabeler.patch b/community/cinnamon-control-center/gnomerrlabeler.patch
deleted file mode 100644
index 7160bc788..000000000
--- a/community/cinnamon-control-center/gnomerrlabeler.patch
+++ /dev/null
@@ -1,766 +0,0 @@
-diff -Naur cinnamon-control-center-1.7.3.orig/panels/display/cc-display-panel.c cinnamon-control-center-1.7.3/panels/display/cc-display-panel.c
---- cinnamon-control-center-1.7.3.orig/panels/display/cc-display-panel.c	2013-04-15 16:04:38.000000000 +0200
-+++ cinnamon-control-center-1.7.3/panels/display/cc-display-panel.c	2013-04-22 03:46:53.499944701 +0200
-@@ -31,12 +31,13 @@
- #define GNOME_DESKTOP_USE_UNSTABLE_API
- #include <libgnome-desktop/gnome-rr.h>
- #include <libgnome-desktop/gnome-rr-config.h>
--#include <libgnome-desktop/gnome-rr-labeler.h>
- #include <gdk/gdkx.h>
- #include <X11/Xlib.h>
- #include <glib/gi18n-lib.h>
- #include <gdesktop-enums.h>
- 
-+#include "cc-rr-labeler.h"
-+
- CC_PANEL_REGISTER (CcDisplayPanel, cc_display_panel)
- 
- #define DISPLAY_PANEL_PRIVATE(o) \
-@@ -75,7 +76,7 @@
- {
-   GnomeRRScreen       *screen;
-   GnomeRRConfig  *current_configuration;
--  GnomeRRLabeler *labeler;
-+  CcRRLabeler *labeler;
-   GnomeRROutputInfo         *current_output;
- 
-   GSettings      *clock_settings;
-@@ -200,7 +201,7 @@
-         g_signal_handler_disconnect (GTK_WIDGET (self), self->priv->focus_id_hide);
-     }
- 
--  gnome_rr_labeler_hide (self->priv->labeler);
-+  cc_rr_labeler_hide (self->priv->labeler);
-   g_object_unref (self->priv->labeler);
- 
-   G_OBJECT_CLASS (cc_display_panel_parent_class)->finalize (object);
-@@ -293,16 +294,16 @@
-   self->priv->current_output = NULL;
- 
-   if (self->priv->labeler) {
--    gnome_rr_labeler_hide (self->priv->labeler);
-+    cc_rr_labeler_hide (self->priv->labeler);
-     g_object_unref (self->priv->labeler);
-   }
- 
--  self->priv->labeler = gnome_rr_labeler_new (self->priv->current_configuration);
-+  self->priv->labeler = cc_rr_labeler_new (self->priv->current_configuration);
- 
-   if (cc_panel_get_shell (CC_PANEL (self)) == NULL)
--    gnome_rr_labeler_hide (self->priv->labeler);
-+    cc_rr_labeler_hide (self->priv->labeler);
-   else
--    gnome_rr_labeler_show (self->priv->labeler);
-+    cc_rr_labeler_show (self->priv->labeler);
- 
-   select_current_output_from_dialog_position (self);
- 
-@@ -2594,9 +2595,9 @@
-   if (self->priv->labeler == NULL)
-     return;
-   if (gtk_window_has_toplevel_focus (window))
--    gnome_rr_labeler_show (self->priv->labeler);
-+    cc_rr_labeler_show (self->priv->labeler);
-   else
--    gnome_rr_labeler_hide (self->priv->labeler);
-+    cc_rr_labeler_hide (self->priv->labeler);
- }
- 
- static void
-@@ -2606,9 +2607,9 @@
-     if (CC_DISPLAY_PANEL(widget)->priv->labeler == NULL)
-         return;
-     if (gtk_widget_get_visible (widget)) {
--        gnome_rr_labeler_show (CC_DISPLAY_PANEL (widget)->priv->labeler);
-+        cc_rr_labeler_show (CC_DISPLAY_PANEL (widget)->priv->labeler);
-     } else {
--        gnome_rr_labeler_hide (CC_DISPLAY_PANEL (widget)->priv->labeler);
-+        cc_rr_labeler_hide (CC_DISPLAY_PANEL (widget)->priv->labeler);
-     }
- }
- 
-diff -Naur cinnamon-control-center-1.7.3.orig/panels/display/cc-rr-labeler.c cinnamon-control-center-1.7.3/panels/display/cc-rr-labeler.c
---- cinnamon-control-center-1.7.3.orig/panels/display/cc-rr-labeler.c	1970-01-01 01:00:00.000000000 +0100
-+++ cinnamon-control-center-1.7.3/panels/display/cc-rr-labeler.c	2013-04-22 03:42:12.379900127 +0200
-@@ -0,0 +1,601 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
-+ *
-+ * cc-rr-labeler.c - Utility to label monitors to identify them
-+ * while they are being configured.
-+ *
-+ * Copyright 2008, Novell, Inc.
-+ *
-+ * This file is part of the Gnome Library.
-+ *
-+ * The Gnome Library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Library General Public License as
-+ * published by the Free Software Foundation; either version 2 of the
-+ * License, or (at your option) any later version.
-+ *
-+ * The Gnome Library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Library General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Library General Public
-+ * License along with the Gnome Library; see the file COPYING.LIB.  If not,
-+ * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+ * Boston, MA 02110-1301, USA.
-+ *
-+ * Author: Federico Mena-Quintero <federico@novell.com>
-+ */
-+
-+#include <config.h>
-+#include <glib/gi18n-lib.h>
-+#include <gtk/gtk.h>
-+
-+#include <X11/Xproto.h>
-+#include <X11/Xlib.h>
-+#include <X11/Xutil.h>
-+#include <X11/Xatom.h>
-+#include <gdk/gdkx.h>
-+
-+#include "cc-rr-labeler.h"
-+
-+struct _CcRRLabelerPrivate {
-+	GnomeRRConfig *config;
-+
-+	int num_outputs;
-+
-+	GdkRGBA *palette;
-+	GtkWidget **windows;
-+
-+	GdkScreen  *screen;
-+	Atom        workarea_atom;
-+};
-+
-+enum {
-+	PROP_0,
-+	PROP_CONFIG,
-+	PROP_LAST
-+};
-+
-+G_DEFINE_TYPE (CcRRLabeler, cc_rr_labeler, G_TYPE_OBJECT);
-+
-+static void cc_rr_labeler_finalize (GObject *object);
-+static void setup_from_config (CcRRLabeler *labeler);
-+
-+static GdkFilterReturn
-+screen_xevent_filter (GdkXEvent      *xevent,
-+		      GdkEvent       *event,
-+		      CcRRLabeler *labeler)
-+{
-+	XEvent *xev;
-+
-+	xev = (XEvent *) xevent;
-+
-+	if (xev->type == PropertyNotify &&
-+	    xev->xproperty.atom == labeler->priv->workarea_atom) {
-+		/* update label positions */
-+		if (labeler->priv->windows != NULL) {
-+			cc_rr_labeler_hide (labeler);
-+			cc_rr_labeler_show (labeler);
-+		}
-+	}
-+
-+	return GDK_FILTER_CONTINUE;
-+}
-+
-+static void
-+cc_rr_labeler_init (CcRRLabeler *labeler)
-+{
-+	GdkWindow *gdkwindow;
-+
-+	labeler->priv = G_TYPE_INSTANCE_GET_PRIVATE (labeler, GNOME_TYPE_RR_LABELER, CcRRLabelerPrivate);
-+
-+	labeler->priv->workarea_atom = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
-+						    "_NET_WORKAREA",
-+						    True);
-+
-+	labeler->priv->screen = gdk_screen_get_default ();
-+	/* code is not really designed to handle multiple screens so *shrug* */
-+	gdkwindow = gdk_screen_get_root_window (labeler->priv->screen);
-+	gdk_window_add_filter (gdkwindow, (GdkFilterFunc) screen_xevent_filter, labeler);
-+	gdk_window_set_events (gdkwindow, gdk_window_get_events (gdkwindow) | GDK_PROPERTY_CHANGE_MASK);
-+}
-+
-+static void
-+cc_rr_labeler_set_property (GObject *gobject, guint property_id, const GValue *value, GParamSpec *param_spec)
-+{
-+	CcRRLabeler *self = CC_RR_LABELER (gobject);
-+
-+	switch (property_id) {
-+	case PROP_CONFIG:
-+		self->priv->config = GNOME_RR_CONFIG (g_value_dup_object (value));
-+		return;
-+	default:
-+		G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, property_id, param_spec);
-+	}
-+}
-+
-+static GObject *
-+cc_rr_labeler_constructor (GType type, guint n_construct_properties, GObjectConstructParam *construct_properties)
-+{
-+	CcRRLabeler *self = (CcRRLabeler*) G_OBJECT_CLASS (cc_rr_labeler_parent_class)->constructor (type, n_construct_properties, construct_properties);
-+
-+	setup_from_config (self);
-+
-+	return (GObject*) self;
-+}
-+
-+static void
-+cc_rr_labeler_class_init (CcRRLabelerClass *klass)
-+{
-+	GObjectClass *object_class;
-+
-+	g_type_class_add_private (klass, sizeof (CcRRLabelerPrivate));
-+
-+	object_class = (GObjectClass *) klass;
-+
-+	object_class->set_property = cc_rr_labeler_set_property;
-+	object_class->finalize = cc_rr_labeler_finalize;
-+	object_class->constructor = cc_rr_labeler_constructor;
-+
-+	g_object_class_install_property (object_class, PROP_CONFIG, g_param_spec_object ("config",
-+											 "Configuration",
-+											 "RandR configuration to label",
-+											 GNOME_TYPE_RR_CONFIG,
-+											 G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY |
-+											 G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
-+}
-+
-+static void
-+cc_rr_labeler_finalize (GObject *object)
-+{
-+	CcRRLabeler *labeler;
-+	GdkWindow      *gdkwindow;
-+
-+	labeler = CC_RR_LABELER (object);
-+
-+	gdkwindow = gdk_screen_get_root_window (labeler->priv->screen);
-+	gdk_window_remove_filter (gdkwindow, (GdkFilterFunc) screen_xevent_filter, labeler);
-+
-+	if (labeler->priv->config != NULL) {
-+		g_object_unref (labeler->priv->config);
-+	}
-+
-+	if (labeler->priv->windows != NULL) {
-+		cc_rr_labeler_hide (labeler);
-+		g_free (labeler->priv->windows);
-+	}
-+
-+	g_free (labeler->priv->palette);
-+
-+	G_OBJECT_CLASS (cc_rr_labeler_parent_class)->finalize (object);
-+}
-+
-+static int
-+count_outputs (GnomeRRConfig *config)
-+{
-+	int i;
-+	GnomeRROutputInfo **outputs = gnome_rr_config_get_outputs (config);
-+
-+	for (i = 0; outputs[i] != NULL; i++)
-+		;
-+
-+	return i;
-+}
-+
-+static void
-+make_palette (CcRRLabeler *labeler)
-+{
-+	/* The idea is that we go around an hue color wheel.  We want to start
-+	 * at red, go around to green/etc. and stop at blue --- because magenta
-+	 * is evil.  Eeeeek, no magenta, please!
-+	 *
-+	 * Purple would be nice, though.  Remember that we are watered down
-+	 * (i.e. low saturation), so that would be like Like berries with cream.
-+	 * Mmmmm, berries.
-+	 */
-+	double start_hue;
-+	double end_hue;
-+	int i;
-+
-+	g_assert (labeler->priv->num_outputs > 0);
-+
-+	labeler->priv->palette = g_new (GdkRGBA, labeler->priv->num_outputs);
-+
-+	start_hue = 0.0; /* red */
-+	end_hue   = 2.0/3; /* blue */
-+
-+	for (i = 0; i < labeler->priv->num_outputs; i++) {
-+		double h, s, v;
-+		double r, g, b;
-+
-+		h = start_hue + (end_hue - start_hue) / labeler->priv->num_outputs * i;
-+		s = 1.0 / 3;
-+		v = 1.0;
-+
-+		gtk_hsv_to_rgb (h, s, v, &r, &g, &b);
-+
-+		labeler->priv->palette[i].red   = r;
-+		labeler->priv->palette[i].green = g;
-+		labeler->priv->palette[i].blue  = b;
-+		labeler->priv->palette[i].alpha  = 1.0;
-+	}
-+}
-+
-+static void
-+rounded_rectangle (cairo_t *cr,
-+                   gint     x,
-+                   gint     y,
-+                   gint     width,
-+                   gint     height,
-+                   gint     x_radius,
-+                   gint     y_radius)
-+{
-+	gint x1, x2;
-+	gint y1, y2;
-+	gint xr1, xr2;
-+	gint yr1, yr2;
-+
-+	x1 = x;
-+	x2 = x1 + width;
-+	y1 = y;
-+	y2 = y1 + height;
-+
-+	x_radius = MIN (x_radius, width / 2.0);
-+	y_radius = MIN (y_radius, width / 2.0);
-+
-+	xr1 = x_radius;
-+	xr2 = x_radius / 2.0;
-+	yr1 = y_radius;
-+	yr2 = y_radius / 2.0;
-+
-+	cairo_move_to    (cr, x1 + xr1, y1);
-+	cairo_line_to    (cr, x2 - xr1, y1);
-+	cairo_curve_to   (cr, x2 - xr2, y1, x2, y1 + yr2, x2, y1 + yr1);
-+	cairo_line_to    (cr, x2, y2 - yr1);
-+	cairo_curve_to   (cr, x2, y2 - yr2, x2 - xr2, y2, x2 - xr1, y2);
-+	cairo_line_to    (cr, x1 + xr1, y2);
-+	cairo_curve_to   (cr, x1 + xr2, y2, x1, y2 - yr2, x1, y2 - yr1);
-+	cairo_line_to    (cr, x1, y1 + yr1);
-+	cairo_curve_to   (cr, x1, y1 + yr2, x1 + xr2, y1, x1 + xr1, y1);
-+	cairo_close_path (cr);
-+}
-+
-+#define LABEL_WINDOW_EDGE_THICKNESS 2
-+#define LABEL_WINDOW_PADDING 12
-+/* Look for panel-corner in:
-+ * http://git.gnome.org/browse/gnome-shell/tree/data/theme/gnome-shell.css
-+ * to match the corner radius */
-+#define LABEL_CORNER_RADIUS 6 + LABEL_WINDOW_EDGE_THICKNESS
-+
-+static void
-+label_draw_background_and_frame (GtkWidget *widget, cairo_t *cr, gboolean for_shape)
-+{
-+	GdkRGBA shape_color = { 0, 0, 0, 1 };
-+	GdkRGBA *rgba;
-+	GtkAllocation allocation;
-+
-+	rgba = g_object_get_data (G_OBJECT (widget), "rgba");
-+	gtk_widget_get_allocation (widget, &allocation);
-+
-+	cairo_save (cr);
-+	cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
-+
-+	/* edge outline */
-+	if (for_shape)
-+		gdk_cairo_set_source_rgba (cr, &shape_color);
-+	else
-+		cairo_set_source_rgba (cr, 0, 0, 0, 0.5);
-+
-+	rounded_rectangle (cr,
-+	                   LABEL_WINDOW_EDGE_THICKNESS / 2.0,
-+	                   LABEL_WINDOW_EDGE_THICKNESS / 2.0,
-+	                   allocation.width - LABEL_WINDOW_EDGE_THICKNESS,
-+	                   allocation.height - LABEL_WINDOW_EDGE_THICKNESS,
-+	                   LABEL_CORNER_RADIUS, LABEL_CORNER_RADIUS);
-+	cairo_set_line_width (cr, LABEL_WINDOW_EDGE_THICKNESS);
-+	cairo_stroke (cr);
-+
-+	/* fill */
-+	if (for_shape) {
-+		gdk_cairo_set_source_rgba (cr, &shape_color);
-+	} else {
-+		rgba->alpha = 0.75;
-+		gdk_cairo_set_source_rgba (cr, rgba);
-+	}
-+
-+	rounded_rectangle (cr,
-+	                   LABEL_WINDOW_EDGE_THICKNESS,
-+	                   LABEL_WINDOW_EDGE_THICKNESS,
-+	                   allocation.width - LABEL_WINDOW_EDGE_THICKNESS * 2,
-+	                   allocation.height - LABEL_WINDOW_EDGE_THICKNESS * 2,
-+	                   LABEL_CORNER_RADIUS - LABEL_WINDOW_EDGE_THICKNESS / 2.0,
-+			   LABEL_CORNER_RADIUS - LABEL_WINDOW_EDGE_THICKNESS / 2.0);
-+	cairo_fill (cr);
-+
-+	cairo_restore (cr);
-+}
-+
-+static void
-+maybe_update_shape (GtkWidget *widget)
-+{
-+	cairo_t *cr;
-+	cairo_surface_t *surface;
-+	cairo_region_t *region;
-+
-+	/* fallback to XShape only for non-composited clients */
-+	if (gtk_widget_is_composited (widget)) {
-+		gtk_widget_shape_combine_region (widget, NULL);
-+		return;
-+	}
-+
-+	surface = gdk_window_create_similar_surface (gtk_widget_get_window (widget),
-+						     CAIRO_CONTENT_COLOR_ALPHA,
-+						     gtk_widget_get_allocated_width (widget),
-+						     gtk_widget_get_allocated_height (widget));
-+
-+	cr = cairo_create (surface);
-+	label_draw_background_and_frame (widget, cr, TRUE);
-+	cairo_destroy (cr);
-+
-+	region = gdk_cairo_region_create_from_surface (surface);
-+	gtk_widget_shape_combine_region (widget, region);
-+
-+	cairo_surface_destroy (surface);
-+	cairo_region_destroy (region);
-+}
-+
-+static gboolean
-+label_window_draw_event_cb (GtkWidget *widget, cairo_t *cr, gpointer data)
-+{
-+	if (gtk_widget_is_composited (widget)) {
-+		/* clear any content */
-+		cairo_save (cr);
-+		cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
-+		cairo_set_source_rgba (cr, 0, 0, 0, 0);
-+		cairo_paint (cr);
-+		cairo_restore (cr);
-+	}
-+
-+	maybe_update_shape (widget);
-+	label_draw_background_and_frame (widget, cr, FALSE);
-+
-+	return FALSE;
-+}
-+
-+static void
-+position_window (CcRRLabeler  *labeler,
-+		 GtkWidget       *window,
-+		 int              x,
-+		 int              y)
-+{
-+	GdkRectangle    workarea;
-+	GdkRectangle    monitor;
-+	int             monitor_num;
-+
-+	monitor_num = gdk_screen_get_monitor_at_point (labeler->priv->screen, x, y);
-+	gdk_screen_get_monitor_workarea (labeler->priv->screen, monitor_num, &workarea);
-+	gdk_screen_get_monitor_geometry (labeler->priv->screen,
-+                                         monitor_num,
-+                                         &monitor);
-+	gdk_rectangle_intersect (&monitor, &workarea, &workarea);
-+
-+	gtk_window_move (GTK_WINDOW (window), workarea.x, workarea.y);
-+}
-+
-+static void
-+label_window_realize_cb (GtkWidget *widget)
-+{
-+	cairo_region_t *region;
-+
-+	/* make the whole window ignore events */
-+	region = cairo_region_create ();
-+	gtk_widget_input_shape_combine_region (widget, region);
-+	cairo_region_destroy (region);
-+
-+	maybe_update_shape (widget);
-+}
-+
-+static void
-+label_window_composited_changed_cb (GtkWidget *widget, CcRRLabeler *labeler)
-+{
-+	if (gtk_widget_get_realized (widget))
-+		maybe_update_shape (widget);
-+}
-+
-+static GtkWidget *
-+create_label_window (CcRRLabeler *labeler, GnomeRROutputInfo *output, GdkRGBA *rgba)
-+{
-+	GtkWidget *window;
-+	GtkWidget *widget;
-+	char *str;
-+	const char *display_name;
-+	GdkRGBA black = { 0, 0, 0, 1.0 };
-+	int x, y;
-+	GdkScreen *screen;
-+	GdkVisual *visual;
-+
-+	window = gtk_window_new (GTK_WINDOW_POPUP);
-+	gtk_window_set_type_hint (GTK_WINDOW (window), GDK_WINDOW_TYPE_HINT_TOOLTIP);
-+	gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-+	gtk_widget_set_app_paintable (window, TRUE);
-+	screen = gtk_widget_get_screen (window);
-+	visual = gdk_screen_get_rgba_visual (screen);
-+
-+	if (visual != NULL)
-+		gtk_widget_set_visual (window, visual);
-+
-+	gtk_container_set_border_width (GTK_CONTAINER (window), LABEL_WINDOW_PADDING + LABEL_WINDOW_EDGE_THICKNESS);
-+
-+	/* This is semi-dangerous.  The color is part of the labeler->palette
-+	 * array.  Note that in cc_rr_labeler_finalize(), we are careful to
-+	 * free the palette only after we free the windows.
-+	 */
-+	g_object_set_data (G_OBJECT (window), "rgba", rgba);
-+
-+	g_signal_connect (window, "draw",
-+			  G_CALLBACK (label_window_draw_event_cb), labeler);
-+	g_signal_connect (window, "realize",
-+			  G_CALLBACK (label_window_realize_cb), labeler);
-+	g_signal_connect (window, "composited-changed",
-+			  G_CALLBACK (label_window_composited_changed_cb), labeler);
-+
-+	if (gnome_rr_config_get_clone (labeler->priv->config)) {
-+		/* Keep this string in sync with gnome-control-center/capplets/display/xrandr-capplet.c:get_display_name() */
-+
-+		/* Translators:  this is the feature where what you see on your
-+		 * laptop's screen is the same as your external projector.
-+		 * Here, "Mirrored" is being used as an adjective.  For example,
-+		 * the Spanish translation could be "Pantallas en Espejo".
-+		 */
-+		display_name = _("Mirrored Displays");
-+	} else
-+		display_name = gnome_rr_output_info_get_display_name (output);
-+
-+	str = g_strdup_printf ("<b>%s</b>", display_name);
-+	widget = gtk_label_new (NULL);
-+	gtk_label_set_markup (GTK_LABEL (widget), str);
-+	g_free (str);
-+
-+	/* Make the label explicitly black.  We don't want it to follow the
-+	 * theme's colors, since the label is always shown against a light
-+	 * pastel background.  See bgo#556050
-+	 */
-+	gtk_widget_override_color (widget,
-+				   gtk_widget_get_state_flags (widget),
-+				   &black);
-+
-+	gtk_container_add (GTK_CONTAINER (window), widget);
-+
-+	/* Should we center this at the top edge of the monitor, instead of using the upper-left corner? */
-+	gnome_rr_output_info_get_geometry (output, &x, &y, NULL, NULL);
-+	position_window (labeler, window, x, y);
-+
-+	gtk_widget_show_all (window);
-+
-+	return window;
-+}
-+
-+static void
-+setup_from_config (CcRRLabeler *labeler)
-+{
-+	labeler->priv->num_outputs = count_outputs (labeler->priv->config);
-+
-+	make_palette (labeler);
-+
-+	cc_rr_labeler_show (labeler);
-+}
-+
-+/**
-+ * cc_rr_labeler_new:
-+ * @config: Configuration of the screens to label
-+ *
-+ * Create a GUI element that will display colored labels on each connected monitor.
-+ * This is useful when users are required to identify which monitor is which, e.g. for
-+ * for configuring multiple monitors.
-+ * The labels will be shown by default, use cc_rr_labeler_hide to hide them.
-+ *
-+ * Returns: A new #CcRRLabeler
-+ */
-+CcRRLabeler *
-+cc_rr_labeler_new (GnomeRRConfig *config)
-+{
-+	g_return_val_if_fail (GNOME_IS_RR_CONFIG (config), NULL);
-+
-+	return g_object_new (GNOME_TYPE_RR_LABELER, "config", config, NULL);
-+}
-+
-+/**
-+ * cc_rr_labeler_show:
-+ * @labeler: A #CcRRLabeler
-+ *
-+ * Show the labels.
-+ */
-+void
-+cc_rr_labeler_show (CcRRLabeler *labeler)
-+{
-+	int i;
-+	gboolean created_window_for_clone;
-+	GnomeRROutputInfo **outputs;
-+
-+	g_return_if_fail (GNOME_IS_RR_LABELER (labeler));
-+
-+	if (labeler->priv->windows != NULL)
-+		return;
-+
-+	labeler->priv->windows = g_new (GtkWidget *, labeler->priv->num_outputs);
-+
-+	created_window_for_clone = FALSE;
-+
-+	outputs = gnome_rr_config_get_outputs (labeler->priv->config);
-+
-+	for (i = 0; i < labeler->priv->num_outputs; i++) {
-+		if (!created_window_for_clone && gnome_rr_output_info_is_active (outputs[i])) {
-+			labeler->priv->windows[i] = create_label_window (labeler, outputs[i], labeler->priv->palette + i);
-+
-+			if (gnome_rr_config_get_clone (labeler->priv->config))
-+				created_window_for_clone = TRUE;
-+		} else
-+			labeler->priv->windows[i] = NULL;
-+	}
-+}
-+
-+/**
-+ * cc_rr_labeler_hide:
-+ * @labeler: A #CcRRLabeler
-+ *
-+ * Hide ouput labels.
-+ */
-+void
-+cc_rr_labeler_hide (CcRRLabeler *labeler)
-+{
-+	int i;
-+	CcRRLabelerPrivate *priv;
-+
-+	g_return_if_fail (GNOME_IS_RR_LABELER (labeler));
-+
-+	priv = labeler->priv;
-+
-+	if (priv->windows == NULL)
-+		return;
-+
-+	for (i = 0; i < priv->num_outputs; i++)
-+		if (priv->windows[i] != NULL) {
-+			gtk_widget_destroy (priv->windows[i]);
-+			priv->windows[i] = NULL;
-+	}
-+	g_free (priv->windows);
-+	priv->windows = NULL;
-+}
-+
-+/**
-+ * cc_rr_labeler_get_rgba_for_output:
-+ * @labeler: A #CcRRLabeler
-+ * @output: Output device (i.e. monitor) to query
-+ * @rgba_out: (out): Color of selected monitor.
-+ *
-+ * Get the color used for the label on a given output (monitor).
-+ */
-+void
-+cc_rr_labeler_get_rgba_for_output (CcRRLabeler *labeler, GnomeRROutputInfo *output, GdkRGBA *rgba_out)
-+{
-+	int i;
-+	GnomeRROutputInfo **outputs;
-+
-+	g_return_if_fail (GNOME_IS_RR_LABELER (labeler));
-+	g_return_if_fail (GNOME_IS_RR_OUTPUT_INFO (output));
-+	g_return_if_fail (rgba_out != NULL);
-+
-+	outputs = gnome_rr_config_get_outputs (labeler->priv->config);
-+
-+	for (i = 0; i < labeler->priv->num_outputs; i++)
-+		if (outputs[i] == output) {
-+			*rgba_out = labeler->priv->palette[i];
-+			return;
-+		}
-+
-+	g_warning ("trying to get the color for unknown GnomeOutputInfo %p; returning magenta!", output);
-+
-+	rgba_out->red   = 1.0;
-+	rgba_out->green = 0;
-+	rgba_out->blue  = 1.0;
-+	rgba_out->alpha  = 1.0;
-+}
-diff -Naur cinnamon-control-center-1.7.3.orig/panels/display/cc-rr-labeler.h cinnamon-control-center-1.7.3/panels/display/cc-rr-labeler.h
---- cinnamon-control-center-1.7.3.orig/panels/display/cc-rr-labeler.h	1970-01-01 01:00:00.000000000 +0100
-+++ cinnamon-control-center-1.7.3/panels/display/cc-rr-labeler.h	2013-04-22 03:42:12.383233540 +0200
-@@ -0,0 +1,64 @@
-+/* gnome-rr-labeler.h - Utility to label monitors to identify them
-+ * while they are being configured.
-+ *
-+ * Copyright 2008, Novell, Inc.
-+ *
-+ * This file is part of the Gnome Library.
-+ *
-+ * The Gnome Library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Library General Public License as
-+ * published by the Free Software Foundation; either version 2 of the
-+ * License, or (at your option) any later version.
-+ *
-+ * The Gnome Library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Library General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Library General Public
-+ * License along with the Gnome Library; see the file COPYING.LIB.  If not,
-+ * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+ * Boston, MA 02110-1301, USA.
-+ *
-+ * Author: Federico Mena-Quintero <federico@novell.com>
-+ */
-+
-+#ifndef CC_RR_LABELER_H
-+#define CC_RR_LABELER_H
-+
-+#define GNOME_DESKTOP_USE_UNSTABLE_API
-+#include <libgnome-desktop/gnome-rr-config.h>
-+
-+#define GNOME_TYPE_RR_LABELER            (cc_rr_labeler_get_type ())
-+#define CC_RR_LABELER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_RR_LABELER, CcRRLabeler))
-+#define CC_RR_LABELER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GNOME_TYPE_RR_LABELER, CcRRLabelerClass))
-+#define GNOME_IS_RR_LABELER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_RR_LABELER))
-+#define GNOME_IS_RR_LABELER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GNOME_TYPE_RR_LABELER))
-+#define CC_RR_LABELER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GNOME_TYPE_RR_LABELER, CcRRLabelerClass))
-+
-+typedef struct _CcRRLabeler CcRRLabeler;
-+typedef struct _CcRRLabelerClass CcRRLabelerClass;
-+typedef struct _CcRRLabelerPrivate CcRRLabelerPrivate;
-+
-+struct _CcRRLabeler {
-+	GObject parent;
-+
-+	/*< private >*/
-+	CcRRLabelerPrivate *priv;
-+};
-+
-+struct _CcRRLabelerClass {
-+	GObjectClass parent_class;
-+};
-+
-+GType cc_rr_labeler_get_type (void);
-+
-+CcRRLabeler *cc_rr_labeler_new (GnomeRRConfig *config);
-+
-+void cc_rr_labeler_show (CcRRLabeler *labeler);
-+
-+void cc_rr_labeler_hide (CcRRLabeler *labeler);
-+
-+void cc_rr_labeler_get_rgba_for_output (CcRRLabeler *labeler, GnomeRROutputInfo *output, GdkRGBA *rgba_out);
-+
-+#endif
-diff -Naur cinnamon-control-center-1.7.3.orig/panels/display/Makefile.am cinnamon-control-center-1.7.3/panels/display/Makefile.am
---- cinnamon-control-center-1.7.3.orig/panels/display/Makefile.am	2013-04-15 16:04:38.000000000 +0200
-+++ cinnamon-control-center-1.7.3/panels/display/Makefile.am	2013-04-22 03:42:12.376566715 +0200
-@@ -19,6 +19,8 @@
- 	display-module.c	\
- 	cc-display-panel.c	\
- 	cc-display-panel.h	\
-+	cc-rr-labeler.c		\
-+	cc-rr-labeler.h		\
- 	scrollarea.c		\
- 	scrollarea.h		\
- 	$(MARSHALFILES)
diff --git a/community/cinnamon-control-center/idle-delay.patch b/community/cinnamon-control-center/idle-delay.patch
deleted file mode 100644
index bdf0a8a4a..000000000
--- a/community/cinnamon-control-center/idle-delay.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-diff -Naur cinnamon-control-center-1.8.2.orig/panels/power/cc-power-panel.c cinnamon-control-center-1.8.2/panels/power/cc-power-panel.c
---- cinnamon-control-center-1.8.2.orig/panels/power/cc-power-panel.c	2013-08-14 22:10:57.491152667 +0200
-+++ cinnamon-control-center-1.8.2/panels/power/cc-power-panel.c	2013-08-14 21:58:36.533247961 +0200
-@@ -978,9 +978,6 @@
-   has_lid = up_client_get_lid_is_present (self->priv->up_client);
- 
- out:
--  gtk_widget_set_visible (WID (priv->builder, "combobox_lid_ac"), has_lid);
--  gtk_widget_set_visible (WID (priv->builder, "label_lid_action"), has_lid);
--  gtk_widget_set_visible (WID (priv->builder, "combobox_lid_battery"), has_batteries && has_lid);    
-   gtk_widget_set_visible (WID (priv->builder, "label_header_battery"), has_batteries);
-   gtk_widget_set_visible (WID (priv->builder, "label_header_ac"), has_batteries);
-   gtk_widget_set_visible (WID (priv->builder, "combobox_sleep_battery"), has_batteries);
-@@ -1067,26 +1064,6 @@
-   g_signal_connect (widget, "changed",
-                     G_CALLBACK (combo_enum_changed_cb),
-                     self);
--
--  value = g_settings_get_enum (self->priv->gsd_settings, "lid-close-ac-action");
--  widget = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
--                                               "combobox_lid_ac"));
--  disable_unavailable_combo_items (self, GTK_COMBO_BOX (widget));
--  set_value_for_combo (GTK_COMBO_BOX (widget), value);
--  g_object_set_data (G_OBJECT(widget), "_gsettings_key", "lid-close-ac-action");
--  g_signal_connect (widget, "changed",
--                    G_CALLBACK (combo_enum_changed_cb),
--                    self);
--
--  value = g_settings_get_enum (self->priv->gsd_settings, "lid-close-battery-action");
--  widget = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
--                                               "combobox_lid_battery"));
--  disable_unavailable_combo_items (self, GTK_COMBO_BOX (widget));
--  set_value_for_combo (GTK_COMBO_BOX (widget), value);
--  g_object_set_data (G_OBJECT(widget), "_gsettings_key", "lid-close-battery-action");
--  g_signal_connect (widget, "changed",
--                    G_CALLBACK (combo_enum_changed_cb),
--                    self);
- 
-   widget = WID (self->priv->builder, "vbox_power");
-   gtk_widget_reparent (widget, (GtkWidget *) self);
-diff -Naur cinnamon-control-center-1.8.2.orig/panels/power/power.ui cinnamon-control-center-1.8.2/panels/power/power.ui
---- cinnamon-control-center-1.8.2.orig/panels/power/power.ui	2013-05-22 18:25:19.000000000 +0200
-+++ cinnamon-control-center-1.8.2/panels/power/power.ui	2013-08-14 21:57:54.872240364 +0200
-@@ -222,50 +222,6 @@
-               </packing>
-             </child>
-             <child>
--              <object class="GtkLabel" id="label_lid_action">
--                <property name="visible">True</property>
--                <property name="can_focus">False</property>
--                <property name="halign">end</property>
--                <property name="label" translatable="yes">When the lid is closed</property>
--              </object>
--              <packing>
--                <property name="left_attach">0</property>
--                <property name="top_attach">3</property>
--              </packing>
--            </child>
--            <child>
--              <object class="GtkComboBox" id="combobox_lid_battery">
--                <property name="visible">True</property>
--                <property name="can_focus">False</property>
--                <property name="model">liststore_lid</property>
--                <property name="hexpand">True</property>
--                <accessibility>
--                  <relation type="labelled-by" target="label_header_battery"/>
--                  <relation type="labelled-by" target="label_lid_action"/>
--                </accessibility>
--              </object>
--              <packing>
--                <property name="left_attach">1</property>
--                <property name="top_attach">3</property>
--              </packing>
--            </child>
--            <child>
--              <object class="GtkComboBox" id="combobox_lid_ac">
--                <property name="visible">True</property>
--                <property name="can_focus">False</property>
--                <property name="model">liststore_lid</property>
--                <property name="hexpand">True</property>
--                <accessibility>
--                  <relation type="labelled-by" target="label_header_ac"/>
--                  <relation type="labelled-by" target="label_lid_action"/>
--                </accessibility>
--              </object>
--              <packing>
--                <property name="left_attach">2</property>
--                <property name="top_attach">3</property>
--              </packing>
--            </child>
--            <child>
-               <object class="GtkSeparator" id="separator_indicator">
-                 <property name="visible">True</property>
-                 <property name="can_focus">False</property>
-@@ -468,12 +424,10 @@
-   </object>
-   <object class="GtkSizeGroup" id="sizegroup_combos">
-     <widgets>
--      <widget name="combobox_lid_battery"/>
--      <widget name="combobox_lid_ac"/>    
-       <widget name="combobox_critical"/>
-       <widget name="combobox_sleep_battery"/>
-       <widget name="combobox_sleep_ac"/>
-       <widget name="combobox_sleep_ac"/>
-     </widgets>
-   </object>
--</interface>
-\ No newline at end of file
-+</interface>
-diff -Naur cinnamon-control-center-1.8.2.orig/panels/screen/cc-screen-panel.c cinnamon-control-center-1.8.2/panels/screen/cc-screen-panel.c
---- cinnamon-control-center-1.8.2.orig/panels/screen/cc-screen-panel.c	2013-08-14 22:10:57.541153876 +0200
-+++ cinnamon-control-center-1.8.2/panels/screen/cc-screen-panel.c	2013-08-14 21:55:41.905692072 +0200
-@@ -352,10 +352,6 @@
-                       1, &value,
-                       -1);
- 
--  /* set both battery and ac keys */
--  g_settings_set_int (self->priv->gsd_settings, "sleep-display-ac", value);
--  g_settings_set_int (self->priv->gsd_settings, "sleep-display-battery", value);
--
-   set_idle_delay_from_dpms (self, value);
- }
- 
-@@ -385,7 +381,7 @@
- {
-   GtkTreeIter iter;
-   GtkTreeModel *model;
--  gint value;
-+  guint value;
-   gint value_tmp, value_prev;
-   gboolean ret;
-   guint i;
-@@ -400,7 +396,7 @@
-   i = 0;
- 
-   /* try to make the UI match the AC setting */
--  value = g_settings_get_int (self->priv->gsd_settings, "sleep-display-ac");
-+  g_settings_get (self->priv->session_settings, "idle-delay", "u", &value);
-   do
-     {
-       gtk_tree_model_get (model, &iter,
-@@ -511,7 +507,7 @@
-   /* bind the auto dim checkbox */
-   widget = WID ("screen_auto_reduce_checkbutton");
-   g_settings_bind (self->priv->gsd_settings,
--                   "idle-dim-battery",
-+                   "idle-dim",
-                    widget, "active",
-                    G_SETTINGS_BIND_DEFAULT);
- 
diff --git a/community/cinnamon-control-center/remove_obex.patch b/community/cinnamon-control-center/remove_obex.patch
deleted file mode 100644
index abcf1be88..000000000
--- a/community/cinnamon-control-center/remove_obex.patch
+++ /dev/null
@@ -1,106 +0,0 @@
---- a/panels/bluetooth/bluetooth.ui
-+++ b/panels/bluetooth/bluetooth.ui
-@@ -543,34 +543,6 @@
-                                 <property name="position">3</property>
-                               </packing>
-                             </child>
--                            <child>
--                              <object class="GtkBox" id="browse_box">
--                                <property name="visible">True</property>
--                                <property name="can_focus">False</property>
--                                <child>
--                                  <placeholder/>
--                                </child>
--                                <child>
--                                  <object class="GtkButton" id="browse_button">
--                                    <property name="label" translatable="yes">Browse Files...</property>
--                                    <property name="can_focus">True</property>
--                                    <property name="receives_default">True</property>
--                                    <property name="use_action_appearance">False</property>
--                                  </object>
--                                  <packing>
--                                    <property name="expand">False</property>
--                                    <property name="fill">False</property>
--                                    <property name="pack_type">end</property>
--                                    <property name="position">1</property>
--                                  </packing>
--                                </child>
--                              </object>
--                              <packing>
--                                <property name="expand">False</property>
--                                <property name="fill">True</property>
--                                <property name="position">4</property>
--                              </packing>
--                            </child>
-                           </object>
-                           <packing>
-                             <property name="expand">False</property>
---- a/panels/bluetooth/cc-bluetooth-panel.c
-+++ b/panels/bluetooth/cc-bluetooth-panel.c
-@@ -311,7 +311,6 @@ cc_bluetooth_panel_update_properties (Cc
- 	gtk_widget_hide (WID ("keyboard_box"));
- 	gtk_widget_hide (WID ("sound_box"));
- 	gtk_widget_hide (WID ("mouse_box"));
--	gtk_widget_hide (WID ("browse_box"));
- 	gtk_widget_hide (WID ("send_box"));
- 
- 	bdaddr = bluetooth_chooser_get_selected_device (BLUETOOTH_CHOOSER (self->priv->chooser));
-@@ -367,10 +366,10 @@ cc_bluetooth_panel_update_properties (Cc
- 
- 			uuids = (const char **) g_value_get_boxed (&value);
- 			for (i = 0; uuids && uuids[i] != NULL; i++) {
--				if (g_str_equal (uuids[i], "OBEXObjectPush"))
-+				if (g_str_equal (uuids[i], "OBEXObjectPush")) {
- 					gtk_widget_show (WID ("send_box"));
--				else if (g_str_equal (uuids[i], "OBEXFileTransfer"))
--					gtk_widget_show (WID ("browse_box"));
-+					break;
-+				}
- 			}
- 			g_value_unset (&value);
- 		}
-@@ -538,34 +537,6 @@ send_callback (GtkButton        *button,
- 	g_free (alias);
- }
- 
--static void
--mount_finish_cb (GObject *source_object,
--		 GAsyncResult *res,
--		 gpointer user_data)
--{
--	GError *error = NULL;
--
--	if (bluetooth_browse_address_finish (source_object, res, &error) == FALSE) {
--		g_printerr ("Failed to mount OBEX volume: %s", error->message);
--		g_error_free (error);
--		return;
--	}
--}
--
--static void
--browse_callback (GtkButton        *button,
--		 CcBluetoothPanel *self)
--{
--	char *bdaddr;
--
--	bdaddr = bluetooth_chooser_get_selected_device (BLUETOOTH_CHOOSER (self->priv->chooser));
--
--	bluetooth_browse_address (G_OBJECT (self), bdaddr,
--				  GDK_CURRENT_TIME, mount_finish_cb, NULL);
--
--	g_free (bdaddr);
--}
--
- /* Visibility/Discoverable */
- static void discoverable_changed (BluetoothClient  *client,
- 				  GParamSpec       *spec,
-@@ -894,8 +865,6 @@ cc_bluetooth_panel_init (CcBluetoothPane
- 			  G_CALLBACK (keyboard_callback), self);
- 	g_signal_connect (G_OBJECT (WID ("sound_link")), "activate-link",
- 			  G_CALLBACK (sound_callback), self);
--	g_signal_connect (G_OBJECT (WID ("browse_button")), "clicked",
--			  G_CALLBACK (browse_callback), self);
- 	g_signal_connect (G_OBJECT (WID ("send_button")), "clicked",
- 			  G_CALLBACK (send_callback), self);
- 	g_signal_connect (G_OBJECT (WID ("switch_connection")), "notify::active",
-                             
diff --git a/community/cinnamon-desktop/PKGBUILD b/community/cinnamon-desktop/PKGBUILD
new file mode 100644
index 000000000..d9d585db2
--- /dev/null
+++ b/community/cinnamon-desktop/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id$
+# Maintainer: Alexandre Filgueria <alexfilgueira@antergos.com>
+# Contributor:  Jan de Groot <jan@archlinux.org>
+
+pkgname=cinnamon-desktop
+pkgver=2.0.0
+pkgrel=1
+pkgdesc="Library with common API for various Cinnamon modules"
+arch=(i686 x86_64)
+license=(GPL LGPL)
+depends=(gsettings-desktop-schemas gtk3 libxkbfile xkeyboard-config iso-codes)
+makedepends=(intltool gobject-introspection itstool gnome-common)
+url="https://github.com/linuxmint/cinnamon-desktop"
+options=(!libtool)
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-desktop/archive/${pkgver}.tar.gz")
+sha256sums=('dd4ef4c14699a0566ae8e7e060a7db8574ef65dcdac80751de350788ea99ff3c')
+
+build() {
+  cd $pkgname-$pkgver
+  ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --libexecdir=/usr/lib/$pkgname --disable-static \
+    --with-gnome-distributor="Arch Linux"
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community/cinnamon-screensaver/PKGBUILD b/community/cinnamon-screensaver/PKGBUILD
index 7b0cfa99c..3a883ec80 100644
--- a/community/cinnamon-screensaver/PKGBUILD
+++ b/community/cinnamon-screensaver/PKGBUILD
@@ -4,34 +4,37 @@
 # Jan de Groot <jgc@archlinux.org>
 
 pkgname=cinnamon-screensaver
-pkgver=1.8.0
-pkgrel=2
+pkgver=2.0.0
+pkgrel=1
 pkgdesc="Screensaver designed to integrate well with the Cinnamon desktop."
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="https://github.com/linuxmint/cinnamon-screensaver"
 backup=(etc/pam.d/cinnamon-screensaver)
-depends=('cinnamon' 'gnome-screensaver')
+depends=('cinnamon' 'cinnamon-desktop')
 makedepends=('intltool' 'gnome-common')
 options=(!emptydirs)
 source=($pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-screensaver/archive/$pkgver.tar.gz
        cinnamon-screensaver.pam
        fix-dbus-compatibility.patch
        lock_screen_on_suspend.patch)
-sha256sums=('e85722d5af2ecbed98f50909285b335d7635214bf8cada49964f60bb5d1339c1'
+sha256sums=('90da7f811892f667202ecd1240091f9c4d253eebe223bbfedb3d544dd68b3fc7'
             'b6ea9e2eb586d94bcabb617a8f1c2958111df87afdbb51f645882bccdc15cbda'
             'eebd1d056c21d2d3f60fb954677b9214fd1d575ed1c2bbb56326cedf41a39eb6'
             '516c479558576c6c5a2509abfcbf4fdafb5953d252e7a4ab972f9db6137daca8')
 
-build() {
+prepare() {
   cd $pkgname-$pkgver
 
-
   # Fix compatibility with gnome-screensaver's D-Bus interface and various fixes
   patch -Np1 -i ${srcdir}/fix-dbus-compatibility.patch
 
   # Lock screen on suspend with systemd
   patch -Np1 -i ${srcdir}/lock_screen_on_suspend.patch
+}
+
+build() {
+  cd $pkgname-$pkgver
 
   ./autogen.sh --prefix=/usr --sysconfdir=/etc \
                --libexecdir=/usr/lib/cinnamon-screensaver \
@@ -45,9 +48,6 @@ package() {
   make DESTDIR="$pkgdir" install
   install -Dm644 ../cinnamon-screensaver.pam "$pkgdir/etc/pam.d/cinnamon-screensaver"
 
-  # Remove conflicts with gnome-screensaver
-  rm "$pkgdir"/usr/bin/gnome-screensaver{,-command}
-
   # Autostart only in Cinnamon
   cp "$pkgdir/etc/xdg/autostart/cinnamon-screensaver.desktop" \
     "$pkgdir/etc/xdg/autostart/cinnamon2d-screensaver.desktop"
diff --git a/community/cinnamon-session/PKGBUILD b/community/cinnamon-session/PKGBUILD
new file mode 100644
index 000000000..c73cb60eb
--- /dev/null
+++ b/community/cinnamon-session/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Alexandre Filgueira <alexfilgueira@antergos.com>
+# Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+
+pkgname=cinnamon-session
+pkgver=2.0.0
+pkgrel=1
+pkgdesc="The Cinnamon Session Handler"
+arch=(i686 x86_64)
+license=(GPL LGPL)
+depends=(systemd dconf gsettings-desktop-schemas gtk3
+         hicolor-icon-theme libgl libsm libxtst upower)
+makedepends=(intltool mesa json-glib gtk-doc xtrans gnome-common)
+options=('!emptydirs')
+install=cinnamon-session.install
+url="https://github.com/linuxmint/cinnamon-session"
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-session/archive/${pkgver}.tar.gz
+        timeout.patch)
+sha256sums=('d1eba64a5484f086f257ee75799d12afd77373fbdb0ced8d3ae48eadcd02a878'
+            'ef421a14814c7858490b3a806568ab4ec8a0dc21d390e94f801771c1261bb24a')
+
+prepare() {
+  cd $pkgname-$pkgver
+
+  # Increase timeout, for slow machines
+  patch -Np1 -i ../timeout.patch
+}
+build() {
+  cd $pkgname-$pkgver
+  ./autogen.sh --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --libexecdir=/usr/lib/cinnamon-session \
+      --disable-schemas-compile --enable-systemd --disable-gconf
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community/cinnamon-session/cinnamon-session.install b/community/cinnamon-session/cinnamon-session.install
new file mode 100644
index 000000000..f7e8c46ac
--- /dev/null
+++ b/community/cinnamon-session/cinnamon-session.install
@@ -0,0 +1,12 @@
+post_install() {
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/community/cinnamon-session/timeout.patch b/community/cinnamon-session/timeout.patch
new file mode 100644
index 000000000..f4f5b64ca
--- /dev/null
+++ b/community/cinnamon-session/timeout.patch
@@ -0,0 +1,24 @@
+diff -u -r cinnamon-session-3.4.2/cinnamon-session/csm-session-fill.c cinnamon-session-3.4.2-timeout/cinnamon-session/csm-session-fill.c
+--- cinnamon-session-3.4.2/cinnamon-session/csm-session-fill.c	2012-02-02 15:33:01.000000000 +0100
++++ cinnamon-session-3.4.2-timeout/cinnamon-session/csm-session-fill.c	2012-06-10 02:39:46.184348462 +0200
+@@ -36,7 +36,7 @@
+ #define CSM_KEYFILE_DEFAULT_PROVIDER_PREFIX "DefaultProvider"
+ 
+ /* See https://bugzilla.gnome.org/show_bug.cgi?id=641992 for discussion */
+-#define CSM_RUNNABLE_HELPER_TIMEOUT 3000 /* ms */
++#define CSM_RUNNABLE_HELPER_TIMEOUT 10000 /* ms */
+ 
+ typedef void (*GsmFillHandleProvider) (const char *provides,
+                                        const char *default_provider,
+diff -u -r cinnamon-session-3.4.2/tools/cinnamon-session-check-accelerated.c cinnamon-session-3.4.2-timeout/tools/cinnamon-session-check-accelerated.c
+--- cinnamon-session-3.4.2/tools/cinnamon-session-check-accelerated.c	2011-03-22 21:31:43.000000000 +0100
++++ cinnamon-session-3.4.2-timeout/tools/cinnamon-session-check-accelerated.c	2012-06-10 02:42:08.013218006 +0200
+@@ -30,7 +30,7 @@
+ #include <X11/Xatom.h>
+ 
+ /* Wait up to this long for a running check to finish */
+-#define PROPERTY_CHANGE_TIMEOUT 5000
++#define PROPERTY_CHANGE_TIMEOUT 12000
+ 
+ /* Values used for the _GNOME_SESSION_ACCELERATED root window property */
+ #define NO_ACCEL            0
diff --git a/community/cinnamon-settings-daemon/PKGBUILD b/community/cinnamon-settings-daemon/PKGBUILD
new file mode 100644
index 000000000..127c715ba
--- /dev/null
+++ b/community/cinnamon-settings-daemon/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Alexandre Filgueira (faidoc) <alexfilgueira@antergos.com>
+# Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+
+pkgname=cinnamon-settings-daemon
+pkgver=2.0.1
+pkgrel=1
+pkgdesc="The Cinnamon Settings daemon"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('dconf' 'cinnamon-desktop' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'libcanberra-pulse' 'libnotify'
+         'libsystemd' 'libwacom' 'pulseaudio' 'pulseaudio-alsa' 'upower' 'ibus' 'librsvg' 'libgweather' 'libxklavier'
+         'libgnomekbd')
+makedepends=('intltool' 'xf86-input-wacom' 'libxslt' 'docbook-xsl' 'gnome-common')
+options=('!emptydirs' '!libtool')
+install=cinnamon-settings-daemon.install
+url="https://github.com/linuxmint/cinnamon-settings-daemon"
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-settings-daemon/archive/${pkgver}.tar.gz")
+sha256sums=('f03f5ea46bec11a6a0ed02b232dab8cb99a84fd8a9b52a76a454a7ba74dc1168')
+
+build() {
+  cd $pkgname-$pkgver
+
+  ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --libexecdir=/usr/lib/$pkgname --disable-static
+
+  #https://bugzilla.gnome.org/show_bug.cgi?id=656231
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community/cinnamon-settings-daemon/cinnamon-settings-daemon.install b/community/cinnamon-settings-daemon/cinnamon-settings-daemon.install
new file mode 100644
index 000000000..f7e8c46ac
--- /dev/null
+++ b/community/cinnamon-settings-daemon/cinnamon-settings-daemon.install
@@ -0,0 +1,12 @@
+post_install() {
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD
index c8d32fbab..fc345c2e4 100644
--- a/community/cinnamon/PKGBUILD
+++ b/community/cinnamon/PKGBUILD
@@ -1,22 +1,21 @@
-# $Id: PKGBUILD 95592 2013-08-14 21:28:25Z bgyorgy $
+# $Id: PKGBUILD 98186 2013-10-07 12:08:20Z jgc $
 # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
 # Contributor: M0Rf30
 # Contributor: unifiedlinux
 # Contributor: CReimer
 
 pkgname=cinnamon
-pkgver=1.8.8
-pkgrel=4
+pkgver=1.9.2
+pkgrel=1
 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cinnamon.linuxmint.com/"
 license=('GPL2')
-depends=('accountsservice' 'caribou' 'clutter-gtk' 'gjs' 'gnome-bluetooth'
-         'gnome-icon-theme' 'gnome-menus' 'gnome-settings-daemon' 'gnome-session'
+depends=('accountsservice' 'caribou' 'clutter-gtk' 'cjs' 'gnome-bluetooth'
+         'gnome-icon-theme' 'gnome-menus' 'cinnamon-settings-daemon' 'cinnamon-session'
          'gnome-themes-standard' 'gstreamer0.10' 'libgnome-keyring' 'librsvg'
-         'networkmanager' 'muffin' 'pygtk' 'python2-dbus' 'python2-imaging'
-         'python2-pyinotify' 'python2-lxml' 'webkitgtk3' 'gnome-settings-daemon-compat'
-         'gnome-panel')
+         'networkmanager' 'muffin' 'pygtk' 'python2-dbus' 'python2-pillow' 'python2-pexpect'
+         'python2-pyinotify' 'python2-lxml' 'webkitgtk' 'gnome-panel' 'python2' 'cinnamon-translations')
 makedepends=('gnome-common' 'intltool')
 optdepends=('cinnamon-control-center: extended configurations for Cinnamon'
             'cinnamon-screensaver: lock screen'
@@ -27,66 +26,38 @@ options=('!libtool' '!emptydirs')
 install=${pkgname}.install
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/archive/$pkgver.tar.gz"
         "remove_GC.patch"
-        "keyboard_applet.patch"
         "fix-control-center-check.patch"
-        "gnome-3.8.patch"
-        "switch-applications.patch"
-        "fallback-helpers.patch"
-        "idle-dim.patch"
-        "background.patch"
-        "bluetooth_obex_transfer.patch"
-        "disable-mpris-support.patch")
-sha256sums=('1bce982e6333e7bd27a1df9f37eb9139360c2fef667c7a998a79f216d4a0921d'
+        "background.patch")
+sha256sums=('0abaa8da02c4d626084aa482adc551af154796c4c35faaebebdac896ce72aa6d'
             '3d362efd15f8cfeca1713f5bcf88d4be787b39d7c7f24b73cd13f867af33a680'
-            'a0c05c995102b16f1060cbd43931eeaefeafd0265a0335e4ca14a143bd4c8c30'
             'ee5694bdc997ffa35a817f691b15bae13747137d35ec2aecd0da298d7edbe426'
-            '01508c4f41664d5e29f700dc77c9f5c5441f128ab759f0ae8325c5fdda70b00e'
-            '921a1f63d2890dd54c149aa27a3d3209ac2fb843be597ae4ef3b4621e76a2262'
-            'fc8e8f5b7772ff331212280b0d4cf624c5ca2a442e8e8defc319cc2f2b060f2e'
-            'b34c30299fb88228c59f36fced90d56346847019a080bc7b8157b72caa659100'
-            '373d80cdb23250fbde846ed493ba422672cc42b03a111c2ce044467ee782df7f'
-            '4497f3e0a97c364845d8a3a3b3b75e7dc9d475dc39f56b2106f8c4b9e5111ac2'
-            'f1eb8110718434e1dc2cf0a308757a787390382dfccd1c8cc80488b93cf6a9f7')
+            '373d80cdb23250fbde846ed493ba422672cc42b03a111c2ce044467ee782df7f')
 
-build() {
+prepare() {
   cd ${srcdir}/Cinnamon*
 
   # Python2 fix
-  sed -i 's|#! /usr/bin/python|#! /usr/bin/python2|' \
-    files/usr/bin/$pkgname-menu-editor \
-    files/usr/share/$pkgname/applets/panel-launchers@$pkgname.org/$pkgname-add-panel-launcher.py
+  sed -i 's:/usr/bin/python :/usr/bin/python2 :' files/usr/bin/cinnamon-menu-editor
   find -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
 
   # Fix crasher when disconnecting from wifi
   patch -Np1 -i ../remove_GC.patch
 
-  # Fix Keyboard applet
-  # https://github.com/linuxmint/Cinnamon/issues/1337
-  patch -Np1 -i ../keyboard_applet.patch
-
   # Check for the cc-panel path, not for the unneeded binary
   patch -Np1 -i ../fix-control-center-check.patch
 
-  # https://github.com/linuxmint/Cinnamon/pull/1888
-  patch -Np1 -i ../gnome-3.8.patch
-
-  # Fix windows switcher keybinding with default settings in GNOME 3.8
-  patch -Np1 -i ../switch-applications.patch
-
-  # Start media keys and mount helpers with the session
-  patch -Np1 -i ../fallback-helpers.patch
-
-  # Fix brightness applet for GNOME 3.8
-  patch -Np1 -i ../idle-dim.patch
-
   # Fix missing backgrounds
   patch -Np1 -i ../background.patch
 
-  # Remove "Browse Files..." option as it's gone from gnome-bluetooth 3.8
-  patch -Np1 -i ../bluetooth_obex_transfer.patch
+  # Prefix 'System Settings' with 'Cinnamon' to avoid confusion with gnome-control-center
+  sed -i 's/^Name\(.*\)=\(.*\)/Name\1=Cinnamon \2/' files/usr/share/applications/cinnamon-settings.desktop
 
-  # Disable MPRIS support (workaround for FS#35282)
-  patch -Np1 -i ../disable-mpris-support.patch
+  # fix for the python2 PAM module  
+  sed -i 's:import PAM:import pam:' files/usr/lib/cinnamon-settings/modules/cs_user.py
+}
+
+build() {
+  cd ${srcdir}/Cinnamon*
 
   ./autogen.sh --prefix=/usr \
                --sysconfdir=/etc \
@@ -96,7 +67,7 @@ build() {
                --disable-schemas-compile \
                --enable-compile-warnings=yes \
                --with-session-tracking=systemd
-  make
+  make CFLAGS="${CFLAGS} -Wno-deprecated -Wno-deprecated-declarations"
 }
 
 package() {
@@ -105,7 +76,4 @@ package() {
 
   # Remove leftover files after patching
   find "$pkgdir" -type f -name *.orig | xargs rm
-
-  # Prefix 'System Settings' with 'Cinnamon' to avoid confusion with gnome-control-center
-  sed -i 's/^Name\(.*\)=\(.*\)/Name\1=Cinnamon \2/' "$pkgdir/usr/share/applications/cinnamon-settings.desktop"
 }
diff --git a/community/cinnamon/bluetooth_obex_transfer.patch b/community/cinnamon/bluetooth_obex_transfer.patch
deleted file mode 100644
index 0e632c48b..000000000
--- a/community/cinnamon/bluetooth_obex_transfer.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/files/usr/share/cinnamon/applets/bluetooth@cinnamon.org/applet.js
-+++ b/files/usr/share/cinnamon/applets/bluetooth@cinnamon.org/applet.js
-@@ -455,22 +455,6 @@ MyApplet.prototype = {
-                 this._applet.send_to_address(device.bdaddr, device.alias);
-             }));
-         }
--        if (device.capabilities & GnomeBluetoothApplet.Capabilities.OBEX_FILE_TRANSFER) {
--            item.menu.addAction(_("Browse Files..."), Lang.bind(this, function(event) {
--                this._applet.browse_address(device.bdaddr, event.get_time(),
--                    Lang.bind(this, function(applet, result) {
--                        try {
--                            applet.browse_address_finish(result);
--                        } catch (e) {
--                            this._ensureSource();
--                            this._source.notify(new MessageTray.Notification(this._source,
--                                 _("Bluetooth"),
--                                 _("Error browsing device"),
--                                 { body: _("The requested device cannot be browsed, error is '%s'").format(e) }));
--                        }
--                    }));
--            }));
--        }
- 
-         switch (device.type) {
-         case GnomeBluetoothApplet.Type.KEYBOARD:
diff --git a/community/cinnamon/disable-mpris-support.patch b/community/cinnamon/disable-mpris-support.patch
deleted file mode 100644
index dff615f4f..000000000
--- a/community/cinnamon/disable-mpris-support.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur Cinnamon-1.8.8.orig/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js Cinnamon-1.8.8/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
---- Cinnamon-1.8.8.orig/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js	2013-08-14 16:44:19.955273614 +0000
-+++ Cinnamon-1.8.8/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js	2013-08-14 16:46:34.171029992 +0000
-@@ -600,13 +600,6 @@
- 
-             // menu not showed by default
-             this._players = {};
--            // watch players
--            for (var p=0; p<compatible_players.length; p++) {
--                Gio.DBus.session.watch_name('org.mpris.MediaPlayer2.'+compatible_players[p], Gio.BusNameWatcherFlags.NONE,
--                    Lang.bind(this, this._addPlayer),
--                    Lang.bind(this, this._removePlayer)
--                );
--            }
- 
-             this._control = new Gvc.MixerControl({ name: 'Cinnamon Volume Control' });
-             this._control.connect('state-changed', Lang.bind(this, this._onControlStateChanged));
diff --git a/community/cinnamon/fallback-helpers.patch b/community/cinnamon/fallback-helpers.patch
deleted file mode 100644
index b6810cdba..000000000
--- a/community/cinnamon/fallback-helpers.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naur linuxmint-Cinnamon-b41bad0.orig/files/usr/share/gnome-session/sessions/cinnamon2d.session linuxmint-Cinnamon-b41bad0/files/usr/share/gnome-session/sessions/cinnamon2d.session
---- linuxmint-Cinnamon-b41bad0.orig/files/usr/share/gnome-session/sessions/cinnamon2d.session	2013-04-15 15:55:01.000000000 +0200
-+++ linuxmint-Cinnamon-b41bad0/files/usr/share/gnome-session/sessions/cinnamon2d.session	2013-04-25 01:30:35.435650613 +0200
-@@ -1,5 +1,5 @@
- [GNOME Session]
- Name=Cinnamon (Software Rendering)
--RequiredComponents=cinnamon2d;gnome-settings-daemon;
-+RequiredComponents=cinnamon2d;gnome-settings-daemon;gnome-fallback-media-keys-helper;gnome-fallback-mount-helper;
- DesktopName=GNOME
- 
-diff -Naur linuxmint-Cinnamon-b41bad0.orig/files/usr/share/gnome-session/sessions/cinnamon.session linuxmint-Cinnamon-b41bad0/files/usr/share/gnome-session/sessions/cinnamon.session
---- linuxmint-Cinnamon-b41bad0.orig/files/usr/share/gnome-session/sessions/cinnamon.session	2013-04-15 15:55:01.000000000 +0200
-+++ linuxmint-Cinnamon-b41bad0/files/usr/share/gnome-session/sessions/cinnamon.session	2013-04-25 01:30:33.645607769 +0200
-@@ -1,5 +1,5 @@
- [GNOME Session]
- Name=Cinnamon
--RequiredComponents=cinnamon;gnome-settings-daemon;
-+RequiredComponents=cinnamon;gnome-settings-daemon;gnome-fallback-media-keys-helper;gnome-fallback-mount-helper;
- DesktopName=GNOME
- 
diff --git a/community/cinnamon/gnome-3.8.patch b/community/cinnamon/gnome-3.8.patch
deleted file mode 100644
index b79ea497a..000000000
--- a/community/cinnamon/gnome-3.8.patch
+++ /dev/null
@@ -1,4186 +0,0 @@
-From 2ba97ed278777fcb96b86cd58e9176536585ad2d Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Fri, 19 Apr 2013 13:19:50 -0400
-Subject: [PATCH 01/16] Disable XInput on cinnamon startup (for 3.8 compat)
- This has no effect on < 1.14 clutter
-
----
- src/main.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/main.c b/src/main.c
-index 418fb60..ac90d91 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -260,6 +260,7 @@
-   meta_plugin_type_register (gnome_cinnamon_plugin_get_type ());
- 
-   /* Prevent meta_init() from causing gtk to load gail and at-bridge */
-+  g_setenv ("CLUTTER_DISABLE_XINPUT", "1", TRUE);
-   g_setenv ("NO_GAIL", "1", TRUE);
-   g_setenv ("NO_AT_BRIDGE", "1", TRUE);
-   meta_init ();
--- 
-1.8.1.6
-
-
-From 72133f97fbd99c78169cec49e18b97da3edba524 Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Fri, 19 Apr 2013 13:21:40 -0400
-Subject: [PATCH 02/16] Explain change
-
----
- src/main.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/main.c b/src/main.c
-index ac90d91..9d37975 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -257,10 +257,12 @@
- 
-   g_option_context_free (ctx);
- 
-+  /* Disable XInput extension - required for 3.8 compatibility */
-+  g_setenv ("CLUTTER_DISABLE_XINPUT", "1", TRUE);
-+
-   meta_plugin_type_register (gnome_cinnamon_plugin_get_type ());
- 
-   /* Prevent meta_init() from causing gtk to load gail and at-bridge */
--  g_setenv ("CLUTTER_DISABLE_XINPUT", "1", TRUE);
-   g_setenv ("NO_GAIL", "1", TRUE);
-   g_setenv ("NO_AT_BRIDGE", "1", TRUE);
-   meta_init ();
--- 
-1.8.1.6
-
-
-From 28210e29e3e0d81c68320b9511574a168f5779e4 Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Tue, 16 Apr 2013 17:01:30 -0400
-Subject: [PATCH 03/16] Add backgroundManager - this is needed for gnome 3.8
- compatibility, as gnome-settings-daemon no longer handles the desktop
- background.
-
----
- configure.ac                                       |   7 +-
- data/org.cinnamon.gschema.xml.in                   |  71 +++-
- .../cinnamon-settings/modules/cs_backgrounds.py    |  31 +-
- js/ui/main.js                                      |   3 +-
- src/Makefile.am                                    |   2 +
- src/cinnamon-background-manager.c                  | 411 +++++++++++++++++++++
- src/cinnamon-background-manager.h                  |  57 +++
- 7 files changed, 562 insertions(+), 20 deletions(-)
- create mode 100644 src/cinnamon-background-manager.c
- create mode 100644 src/cinnamon-background-manager.h
-
-diff --git a/configure.ac b/configure.ac
-index 0aa47c5..a2a9479 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -68,6 +68,7 @@ GTK_MIN_VERSION=3.0.0
- GIO_MIN_VERSION=2.29.10
- POLKIT_MIN_VERSION=0.100
- STARTUP_NOTIFICATION_MIN_VERSION=0.11
-+GNOME_DESKTOP_MIN_VERSION=3.0.0
- 
- # Collect more than 20 libraries for a prize!
- PKG_CHECK_MODULES(CINNAMON, gio-2.0 >= $GIO_MIN_VERSION
-@@ -82,7 +83,8 @@ PKG_CHECK_MODULES(CINNAMON, gio-2.0 >= $GIO_MIN_VERSION
-                                gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION
- 			       libcanberra
-                                polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes
--                               libnm-glib libnm-util gnome-keyring-1)
-+                               libnm-glib libnm-util gnome-keyring-1
-+                               gnome-desktop-3.0 >= GNOME_DESKTOP_MIN_VERSION)
- 
- PKG_CHECK_MODULES(CINNAMON_PERF_HELPER, gtk+-3.0 gio-2.0)
- 
-@@ -106,7 +108,8 @@ AC_CHECK_FUNCS(JS_NewGlobalObject XFixesCreatePointerBarrier)
- CFLAGS=$saved_CFLAGS
- LIBS=$saved_LIBS
- 
--PKG_CHECK_MODULES(ST, clutter-1.0 gtk+-3.0 libcroco-0.6 >= 0.6.2 gnome-desktop-3.0 >= 2.90.0 x11)
-+PKG_CHECK_MODULES(ST, clutter-1.0 gtk+-3.0 libcroco-0.6 >= 0.6.2 
-+                      gnome-desktop-3.0 >= GNOME_DESKTOP_MIN_VERSION x11)
- PKG_CHECK_MODULES(GDMUSER, dbus-glib-1 gtk+-3.0)
- PKG_CHECK_MODULES(TRAY, gtk+-3.0)
- PKG_CHECK_MODULES(GVC, libpulse libpulse-mainloop-glib gobject-2.0)
-diff --git a/data/org.cinnamon.gschema.xml.in b/data/org.cinnamon.gschema.xml.in
-index f12f8c5..939ea70 100644
---- a/data/org.cinnamon.gschema.xml.in
-+++ b/data/org.cinnamon.gschema.xml.in
-@@ -746,6 +746,23 @@
-     </key>
-   </schema>
- 
-+
-+  <enum id="bg_style">
-+    <value nick="none" value="0"/>
-+    <value nick="wallpaper" value="1"/>
-+    <value nick="centered" value="2"/>
-+    <value nick="scaled" value="3"/>
-+    <value nick="stretched" value="4"/>
-+    <value nick="zoom" value="5"/>
-+    <value nick="spanned" value="6"/>
-+  </enum>
-+
-+  <enum id="bg_shading">
-+    <value nick="solid" value="0"/>
-+    <value nick="vertical" value="1"/>
-+    <value nick="horizontal" value="2"/>
-+  </enum>
-+
-   <schema id="org.cinnamon.background" path="/org/cinnamon/background/">
-     <key name="mode" type="s">
-       <default>"wallpaper"</default>
-@@ -776,8 +793,60 @@
-         This key defines the delay for the slideshow.
-       </description>
-     </key>
-+    <key name="draw-background" type="b">
-+      <default>true</default>
-+      <_summary>Draw Desktop Background</_summary>
-+      <_description>Have GNOME draw the desktop background.</_description>
-+    </key>
-+    <key name="picture-options" enum="bg_style">
-+      <default>'zoom'</default>
-+      <_summary>Picture Options</_summary>
-+      <_description>
-+        Determines how the image set by wallpaper_filename is rendered.
-+        Possible values are "none", "wallpaper", "centered", "scaled",
-+        "stretched", "zoom", "spanned".
-+      </_description>
-+    </key>
-+    <key name="picture-uri" type="s">
-+      <default>'file://@datadir@/themes/Adwaita/backgrounds/adwaita-timed.xml'</default>
-+      <_summary>Picture URI</_summary>
-+      <_description>
-+        URI to use for the background image. Not that the backend only supports
-+        local (file://) URIs.
-+      </_description>
-+    </key>
-+    <key name="picture-opacity" type="i">
-+      <range min="0" max="100"/>
-+      <default>100</default>
-+      <_summary>Picture Opacity</_summary>
-+      <_description>
-+        Opacity with which to draw the background picture.
-+      </_description>
-+    </key>
-+    <key name="primary-color" type="s">
-+      <default>'#023c88'</default>
-+      <_summary>Primary Color</_summary>
-+      <_description>
-+        Left or Top color when drawing gradients, or the solid color.
-+      </_description>
-+    </key>
-+    <key name="secondary-color" type="s">
-+      <default>'#5789ca'</default>
-+      <_summary>Secondary Color</_summary>
-+      <_description>
-+        Right or Bottom color when drawing gradients, not used for solid color.
-+      </_description>
-+    </key>
-+    <key name="color-shading-type" enum="bg_shading">
-+      <default>'solid'</default>
-+      <_summary>Color Shading Type</_summary>
-+      <_description>
-+        How to shade the background color. Possible values are "horizontal",
-+        "vertical", and "solid".
-+      </_description>
-+    </key>
-   </schema>
--  
-+
-   <schema id="org.cinnamon.screensaver" path="/org/cinnamon/screensaver/">
-     <key name="default-message" type="s">
-       <default>""</default>
---- linuxmint-Cinnamon-a464dc9.orig/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py 2013-04-30 18:01:56.000000000 +0200
-+++ linuxmint-Cinnamon-a464dc9/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py  2013-04-30 23:36:46.718385152 +0200
-@@ -232,11 +232,11 @@
-     
- 
- class BackgroundWallpaperPane (Gtk.VBox):
--    def __init__(self, sidepage, gnome_background_schema):
-+    def __init__(self, sidepage, cinnamon_background_schema):
-         Gtk.VBox.__init__(self)
-         self.set_spacing(5)
-         
--        self._gnome_background_schema = gnome_background_schema
-+        self._cinnamon_background_schema = cinnamon_background_schema
-         self._sidepage = sidepage
-         
-         scw = Gtk.ScrolledWindow()
-@@ -263,15 +263,15 @@
-         if wallpaper:
-             for key in wallpaper:
-                 if key == "filename":
--                    self._gnome_background_schema.set_string("picture-uri", "file://" + wallpaper[key])
-+                    self._cinnamon_background_schema.set_string("picture-uri", "file://" + wallpaper[key])
-                 elif key == "pcolor":
--                    self._gnome_background_schema.set_string("primary-color", wallpaper[key])
-+                    self._cinnamon_background_schema.set_string("primary-color", wallpaper[key])
-                 elif key == "scolor":
--                    self._gnome_background_schema.set_string("secondary-color", wallpaper[key])
-+                    self._cinnamon_background_schema.set_string("secondary-color", wallpaper[key])
-                 elif key == "shade_type":
--                    self._gnome_background_schema.set_string("color-shading-type", wallpaper[key])
-+                    self._cinnamon_background_schema.set_string("color-shading-type", wallpaper[key])
-                 elif key == "options":
--                    self._gnome_background_schema.set_string("picture-options", wallpaper[key])
-+                    self._cinnamon_background_schema.set_string("picture-options", wallpaper[key])
-             if (not "metadataFile" in wallpaper) or (wallpaper["metadataFile"] == ""):
-                 self._sidepage.remove_wallpaper_button.set_sensitive(True)
-     
-@@ -445,12 +445,11 @@
-             f = open(filename, "w")
-             f.write(xml_data)
-             f.close()
--            Gio.Settings("org.gnome.desktop.background").set_string("picture-uri", "file://" + filename)
-+            Gio.Settings("org.cinnamon.background").set_string("picture-uri", "file://" + filename)
- 
- class BackgroundSidePage (SidePage):
-     def __init__(self, name, icon, keywords, advanced, content_box):
-         SidePage.__init__(self, name, icon, keywords, advanced, content_box, -1)
--        self._gnome_background_schema = Gio.Settings("org.gnome.desktop.background")
-         self._cinnamon_background_schema = Gio.Settings("org.cinnamon.background")
-         self._add_wallpapers_dialog = AddWallpapersDialog()
-         
-@@ -515,8 +514,8 @@
-         self.mainbox.set_visible_window(False)
-         self.content_box.pack_start(self.mainbox, True, True, 3)
-         
--        self.wallpaper_pane = BackgroundWallpaperPane(self, self._gnome_background_schema)
--        self.slideshow_pane = BackgroundSlideshowPane(self, self._gnome_background_schema, self._cinnamon_background_schema)
-+        self.wallpaper_pane = BackgroundWallpaperPane(self, self._cinnamon_background_schema)
-+        self.slideshow_pane = BackgroundSlideshowPane(self, self._cinnamon_background_schema, self._cinnamon_background_schema)
-         if self._cinnamon_background_schema["mode"] == "slideshow":
-             self.mainbox.add(self.slideshow_pane)
-         else:
-@@ -536,21 +535,21 @@
-         l = Gtk.Label(_("Picture aspect"))
-         l.set_alignment(0, 0.5)
-         advanced_options_box.pack_start(l, False, False, 0)
--        self.picture_options = GSettingsComboBox("", "org.gnome.desktop.background", "picture-options", None, BACKGROUND_PICTURE_OPTIONS)
-+        self.picture_options = GSettingsComboBox("", "org.cinnamon.background", "picture-options", None, BACKGROUND_PICTURE_OPTIONS)
-         advanced_options_box.pack_start(self.picture_options, False, False, 0)
-         
-         l = Gtk.Label(_("Gradient"))
-         l.set_alignment(0, 0.5)
-         advanced_options_box.pack_start(l, False, False, 0)
--        self.color_shading_type = GSettingsComboBox("", "org.gnome.desktop.background", "color-shading-type", None, BACKGROUND_COLOR_SHADING_TYPES)
-+        self.color_shading_type = GSettingsComboBox("", "org.cinnamon.background", "color-shading-type", None, BACKGROUND_COLOR_SHADING_TYPES)
-         advanced_options_box.pack_start(self.color_shading_type, False, False, 0)
-         
-         hbox = Gtk.HBox()
-         l = Gtk.Label(_("Colors"))
-         hbox.pack_start(l, False, False, 2)
--        self.primary_color = GSettingsColorChooser("org.gnome.desktop.background", "primary-color", None)
-+        self.primary_color = GSettingsColorChooser("org.cinnamon.background", "primary-color", None)
-         hbox.pack_start(self.primary_color, False, False, 2)
--        self.secondary_color = GSettingsColorChooser("org.gnome.desktop.background", "secondary-color", None)
-+        self.secondary_color = GSettingsColorChooser("org.cinnamon.background", "secondary-color", None)
-         hbox.pack_start(self.secondary_color, False, False, 2)
-         advanced_options_box.pack_start(hbox, False, False, 0)
-         self.content_box.show_all()
-
-diff --git a/js/ui/main.js b/js/ui/main.js
-index 74154ab..99aee95 100644
---- a/js/ui/main.js
-+++ b/js/ui/main.js
-@@ -86,6 +86,7 @@ let _cssStylesheet = null;
- let dynamicWorkspaces = null;
- let nWorks = null;
- let tracker = null;
-+let backgroundManager = null;
- let desktopShown;
- 
- let workspace_names = [];
-@@ -214,7 +215,7 @@ function start() {
-     // be predictable anyways.
-     tracker = Cinnamon.WindowTracker.get_default();
-     Cinnamon.AppUsage.get_default();
--
-+    backgroundManager = Cinnamon.BackgroundManager.get_default();
-     // The stage is always covered so Clutter doesn't need to clear it; however
-     // the color is used as the default contents for the Muffin root background
-     // actor so set it anyways.
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 3bab29c..6bac83c 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -105,6 +105,7 @@ cinnamon_public_headers_h =		\
- 	cinnamon-app-system.h		\
- 	cinnamon-app-usage.h		\
- 	cinnamon-arrow.h			\
-+	cinnamon-background-manager.h	\
- 	cinnamon-doc-system.h		\
- 	cinnamon-embedded-window.h		\
- 	cinnamon-generic-container.h	\
-@@ -142,6 +143,7 @@ libcinnamon_la_SOURCES =		\
- 	cinnamon-app-system.c		\
- 	cinnamon-app-usage.c		\
- 	cinnamon-arrow.c			\
-+	cinnamon-background-manager.c	\
- 	cinnamon-doc-system.c		\
- 	cinnamon-embedded-window.c		\
- 	cinnamon-generic-container.c	\
-diff --git a/src/cinnamon-background-manager.c b/src/cinnamon-background-manager.c
-new file mode 100644
-index 0000000..9d95250
---- /dev/null
-+++ b/src/cinnamon-background-manager.c
-@@ -0,0 +1,411 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-+ *
-+ * Copyright © 2001 Ximian, Inc.
-+ * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
-+ * Copyright 2007 Red Hat, Inc.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+ *
-+ */
-+
-+#include "config.h"
-+
-+#include <sys/types.h>
-+#include <sys/wait.h>
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <unistd.h>
-+#include <string.h>
-+#include <errno.h>
-+
-+#include <locale.h>
-+
-+#include <glib.h>
-+#include <glib/gi18n.h>
-+#include <gio/gio.h>
-+#include <gdk/gdk.h>
-+#include <gdk/gdkx.h>
-+
-+#define GNOME_DESKTOP_USE_UNSTABLE_API
-+#include <libgnome-desktop/gnome-bg.h>
-+#include <X11/Xatom.h>
-+
-+#include "cinnamon-background-manager.h"
-+
-+#define CINNAMON_BACKGROUND_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CINNAMON_TYPE_BACKGROUND_MANAGER, CinnamonBackgroundManagerPrivate))
-+
-+struct CinnamonBackgroundManagerPrivate
-+{
-+        GSettings   *settings;
-+        GnomeBG     *bg;
-+
-+        GnomeBGCrossfade *fade;
-+
-+        GDBusProxy  *proxy;
-+        guint        proxy_signal_id;
-+};
-+
-+static void     cinnamon_background_manager_class_init  (CinnamonBackgroundManagerClass *klass);
-+static void     cinnamon_background_manager_init        (CinnamonBackgroundManager      *background_manager);
-+static void     cinnamon_background_manager_finalize    (GObject             *object);
-+
-+static void setup_bg (CinnamonBackgroundManager *manager);
-+static void connect_screen_signals (CinnamonBackgroundManager *manager);
-+
-+G_DEFINE_TYPE (CinnamonBackgroundManager, cinnamon_background_manager, G_TYPE_OBJECT)
-+
-+static gpointer manager_object = NULL;
-+
-+static gboolean
-+dont_draw_background (CinnamonBackgroundManager *manager)
-+{
-+        return !g_settings_get_boolean (manager->priv->settings,
-+                                        "draw-background");
-+}
-+
-+static void
-+on_crossfade_finished (CinnamonBackgroundManager *manager)
-+{
-+        g_object_unref (manager->priv->fade);
-+        manager->priv->fade = NULL;
-+}
-+
-+static void
-+draw_background (CinnamonBackgroundManager *manager,
-+                 gboolean              use_crossfade)
-+{
-+        GdkDisplay *display;
-+        int         n_screens;
-+        int         i;
-+
-+        display = gdk_display_get_default ();
-+        n_screens = gdk_display_get_n_screens (display);
-+
-+        for (i = 0; i < n_screens; ++i) {
-+                GdkScreen *screen;
-+                GdkWindow *root_window;
-+                cairo_surface_t *surface;
-+
-+                screen = gdk_display_get_screen (display, i);
-+
-+                root_window = gdk_screen_get_root_window (screen);
-+
-+                surface = gnome_bg_create_surface (manager->priv->bg,
-+                                                   root_window,
-+                                                   gdk_screen_get_width (screen),
-+                                                   gdk_screen_get_height (screen),
-+                                                   TRUE);
-+
-+                if (use_crossfade) {
-+
-+                        if (manager->priv->fade != NULL) {
-+                                g_object_unref (manager->priv->fade);
-+                        }
-+
-+                        manager->priv->fade = gnome_bg_set_surface_as_root_with_crossfade (screen, surface);
-+                        g_signal_connect_swapped (manager->priv->fade, "finished",
-+                                                  G_CALLBACK (on_crossfade_finished),
-+                                                  manager);
-+                } else {
-+                        gnome_bg_set_surface_as_root (screen, surface);
-+                }
-+
-+                cairo_surface_destroy (surface);
-+        }
-+}
-+
-+static void
-+on_bg_transitioned (GnomeBG              *bg,
-+                    CinnamonBackgroundManager *manager)
-+{
-+        draw_background (manager, FALSE);
-+}
-+
-+static gboolean
-+settings_change_event_cb (GSettings            *settings,
-+                          gpointer              keys,
-+                          gint                  n_keys,
-+                          CinnamonBackgroundManager *manager)
-+{
-+        gnome_bg_load_from_preferences (manager->priv->bg,
-+                                        manager->priv->settings);
-+        return FALSE;
-+}
-+
-+static void
-+on_screen_size_changed (GdkScreen            *screen,
-+                        CinnamonBackgroundManager *manager)
-+{
-+        draw_background (manager, FALSE);
-+}
-+
-+static void
-+watch_bg_preferences (CinnamonBackgroundManager *manager)
-+{
-+        g_signal_connect (manager->priv->settings,
-+                          "change-event",
-+                          G_CALLBACK (settings_change_event_cb),
-+                          manager);
-+}
-+
-+static void
-+on_bg_changed (GnomeBG              *bg,
-+               CinnamonBackgroundManager *manager)
-+{
-+        draw_background (manager, TRUE);
-+}
-+
-+static void
-+setup_bg (CinnamonBackgroundManager *manager)
-+{
-+        g_return_if_fail (manager->priv->bg == NULL);
-+
-+        manager->priv->bg = gnome_bg_new ();
-+
-+        g_signal_connect (manager->priv->bg,
-+                          "changed",
-+                          G_CALLBACK (on_bg_changed),
-+                          manager);
-+
-+        g_signal_connect (manager->priv->bg,
-+                          "transitioned",
-+                          G_CALLBACK (on_bg_transitioned),
-+                          manager);
-+
-+        connect_screen_signals (manager);
-+        watch_bg_preferences (manager);
-+        gnome_bg_load_from_preferences (manager->priv->bg,
-+                                        manager->priv->settings);
-+}
-+
-+static void
-+setup_bg_and_draw_background (CinnamonBackgroundManager *manager)
-+{
-+        setup_bg (manager);
-+        draw_background (manager, FALSE);
-+}
-+
-+static void
-+disconnect_session_manager_listener (CinnamonBackgroundManager *manager)
-+{
-+        if (manager->priv->proxy && manager->priv->proxy_signal_id) {
-+                g_signal_handler_disconnect (manager->priv->proxy,
-+                                             manager->priv->proxy_signal_id);
-+                manager->priv->proxy_signal_id = 0;
-+        }
-+}
-+
-+static void
-+on_session_manager_signal (GDBusProxy   *proxy,
-+                           const gchar  *sender_name,
-+                           const gchar  *signal_name,
-+                           GVariant     *parameters,
-+                           gpointer      user_data)
-+{
-+        CinnamonBackgroundManager *manager = CINNAMON_BACKGROUND_MANAGER (user_data);
-+
-+        if (g_strcmp0 (signal_name, "SessionRunning") == 0) {
-+                setup_bg_and_draw_background (manager);
-+                disconnect_session_manager_listener (manager);
-+        }
-+}
-+
-+static void
-+draw_background_after_session_loads (CinnamonBackgroundManager *manager)
-+{
-+        GError *error = NULL;
-+        GDBusProxyFlags flags;
-+
-+        flags = G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES |
-+                G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START;
-+        manager->priv->proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
-+                                                              flags,
-+                                                              NULL, /* GDBusInterfaceInfo */
-+                                                              "org.gnome.SessionManager",
-+                                                              "/org/gnome/SessionManager",
-+                                                              "org.gnome.SessionManager",
-+                                                              NULL, /* GCancellable */
-+                                                              &error);
-+        if (manager->priv->proxy == NULL) {
-+                g_warning ("Could not listen to session manager: %s",
-+                           error->message);
-+                g_error_free (error);
-+                return;
-+        }
-+
-+        manager->priv->proxy_signal_id = g_signal_connect (manager->priv->proxy,
-+                                                           "g-signal",
-+                                                           G_CALLBACK (on_session_manager_signal),
-+                                                           manager);
-+}
-+
-+
-+static void
-+disconnect_screen_signals (CinnamonBackgroundManager *manager)
-+{
-+        GdkDisplay *display;
-+        int         i;
-+        int         n_screens;
-+
-+        display = gdk_display_get_default ();
-+        n_screens = gdk_display_get_n_screens (display);
-+
-+        for (i = 0; i < n_screens; ++i) {
-+                GdkScreen *screen;
-+                screen = gdk_display_get_screen (display, i);
-+                g_signal_handlers_disconnect_by_func (screen,
-+                                                      G_CALLBACK (on_screen_size_changed),
-+                                                      manager);
-+        }
-+}
-+
-+static void
-+connect_screen_signals (CinnamonBackgroundManager *manager)
-+{
-+        GdkDisplay *display;
-+        int         i;
-+        int         n_screens;
-+
-+        display = gdk_display_get_default ();
-+        n_screens = gdk_display_get_n_screens (display);
-+
-+        for (i = 0; i < n_screens; ++i) {
-+                GdkScreen *screen;
-+                screen = gdk_display_get_screen (display, i);
-+                g_signal_connect (screen,
-+                                  "monitors-changed",
-+                                  G_CALLBACK (on_screen_size_changed),
-+                                  manager);
-+                g_signal_connect (screen,
-+                                  "size-changed",
-+                                  G_CALLBACK (on_screen_size_changed),
-+                                  manager);
-+        }
-+}
-+
-+static void
-+draw_background_changed (GSettings            *settings,
-+                         const char           *key,
-+                         CinnamonBackgroundManager *manager)
-+{
-+        if (dont_draw_background (manager) == FALSE)
-+                setup_bg_and_draw_background (manager);
-+}
-+
-+gboolean
-+cinnamon_background_manager_start (CinnamonBackgroundManager *manager)
-+{
-+        manager->priv->settings = g_settings_new ("org.cinnamon.background");
-+        g_signal_connect (manager->priv->settings, "changed::draw-background",
-+                          G_CALLBACK (draw_background_changed), manager);
-+
-+        setup_bg_and_draw_background (manager);
-+            //draw_background_after_session_loads (manager);
-+
-+
-+        return TRUE;
-+}
-+
-+void
-+cinnamon_background_manager_stop (CinnamonBackgroundManager *manager)
-+{
-+        CinnamonBackgroundManagerPrivate *p = manager->priv;
-+
-+        g_debug ("Stopping background manager");
-+
-+        disconnect_screen_signals (manager);
-+
-+        if (manager->priv->proxy) {
-+                disconnect_session_manager_listener (manager);
-+                g_object_unref (manager->priv->proxy);
-+        }
-+
-+        g_signal_handlers_disconnect_by_func (manager->priv->settings,
-+                                              settings_change_event_cb,
-+                                              manager);
-+
-+        if (p->settings != NULL) {
-+                g_object_unref (p->settings);
-+                p->settings = NULL;
-+        }
-+
-+        if (p->bg != NULL) {
-+                g_object_unref (p->bg);
-+                p->bg = NULL;
-+        }
-+}
-+
-+/**
-+ * cinnamon_background_manager_get_default:
-+ *
-+ * Return Value: (transfer none): The global #CinnamonBackgroundManager singleton
-+ */
-+CinnamonBackgroundManager *
-+cinnamon_background_manager_get_default ()
-+{
-+  static CinnamonBackgroundManager *instance = NULL;
-+
-+  if (instance == NULL)
-+    instance = g_object_new (CINNAMON_TYPE_BACKGROUND_MANAGER, NULL);
-+
-+  return instance;
-+}
-+
-+static GObject *
-+cinnamon_background_manager_constructor (GType                  type,
-+                                    guint                  n_construct_properties,
-+                                    GObjectConstructParam *construct_properties)
-+{
-+        CinnamonBackgroundManager      *background_manager;
-+
-+        background_manager = CINNAMON_BACKGROUND_MANAGER (G_OBJECT_CLASS (cinnamon_background_manager_parent_class)->constructor (type,
-+                                                                                                                        n_construct_properties,
-+                                                                                                                        construct_properties));
-+
-+        return G_OBJECT (background_manager);
-+}
-+
-+static void
-+cinnamon_background_manager_class_init (CinnamonBackgroundManagerClass *klass)
-+{
-+        GObjectClass   *object_class = G_OBJECT_CLASS (klass);
-+
-+        object_class->constructor = cinnamon_background_manager_constructor;
-+        object_class->finalize = cinnamon_background_manager_finalize;
-+
-+        g_type_class_add_private (klass, sizeof (CinnamonBackgroundManagerPrivate));
-+}
-+
-+static void
-+cinnamon_background_manager_init (CinnamonBackgroundManager *manager)
-+{
-+        manager->priv = CINNAMON_BACKGROUND_MANAGER_GET_PRIVATE (manager);
-+        cinnamon_background_manager_start (manager);
-+}
-+
-+static void
-+cinnamon_background_manager_finalize (GObject *object)
-+{
-+        CinnamonBackgroundManager *background_manager;
-+
-+        g_return_if_fail (object != NULL);
-+        g_return_if_fail (CINNAMON_IS_BACKGROUND_MANAGER (object));
-+
-+        background_manager = CINNAMON_BACKGROUND_MANAGER (object);
-+
-+        g_return_if_fail (background_manager->priv != NULL);
-+
-+        G_OBJECT_CLASS (cinnamon_background_manager_parent_class)->finalize (object);
-+}
-diff --git a/src/cinnamon-background-manager.h b/src/cinnamon-background-manager.h
-new file mode 100644
-index 0000000..9a56e32
---- /dev/null
-+++ b/src/cinnamon-background-manager.h
-@@ -0,0 +1,57 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-+ *
-+ * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+ *
-+ */
-+
-+#ifndef __CINNAMON_BACKGROUND_MANAGER_H
-+#define __CINNAMON_BACKGROUND_MANAGER_H
-+
-+#include <glib-object.h>
-+
-+G_BEGIN_DECLS
-+
-+#define CINNAMON_TYPE_BACKGROUND_MANAGER         (cinnamon_background_manager_get_type ())
-+#define CINNAMON_BACKGROUND_MANAGER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), CINNAMON_TYPE_BACKGROUND_MANAGER, CinnamonBackgroundManager))
-+#define CINNAMON_BACKGROUND_MANAGER_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), CINNAMON_TYPE_BACKGROUND_MANAGER, CinnamonBackgroundManagerClass))
-+#define CINNAMON_IS_BACKGROUND_MANAGER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), CINNAMON_TYPE_BACKGROUND_MANAGER))
-+#define CINNAMON_IS_BACKGROUND_MANAGER_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), CINNAMON_TYPE_BACKGROUND_MANAGER))
-+#define CINNAMON_BACKGROUND_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), CINNAMON_TYPE_BACKGROUND_MANAGER, CinnamonBackgroundManagerClass))
-+
-+typedef struct CinnamonBackgroundManagerPrivate CinnamonBackgroundManagerPrivate;
-+
-+typedef struct
-+{
-+        GObject                     parent;
-+        CinnamonBackgroundManagerPrivate *priv;
-+} CinnamonBackgroundManager;
-+
-+typedef struct
-+{
-+        GObjectClass   parent_class;
-+} CinnamonBackgroundManagerClass;
-+
-+GType                   cinnamon_background_manager_get_type            (void);
-+
-+CinnamonBackgroundManager *cinnamon_background_manager_get_default (void);
-+
-+gboolean                cinnamon_background_manager_start               (CinnamonBackgroundManager *manager);
-+void                    cinnamon_background_manager_stop                (CinnamonBackgroundManager *manager);
-+
-+G_END_DECLS
-+
-+#endif /* __CINNAMON_BACKGROUND_MANAGER_H */
--- 
-1.8.1.6
-
-
-From c971d472a88f8ea725b2bef33715016e111732d9 Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Tue, 16 Apr 2013 18:28:16 -0400
-Subject: [PATCH 04/16] Change default background
-
----
- data/org.cinnamon.gschema.xml.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/org.cinnamon.gschema.xml.in b/data/org.cinnamon.gschema.xml.in
-index 939ea70..6d8c82d 100644
---- a/data/org.cinnamon.gschema.xml.in
-+++ b/data/org.cinnamon.gschema.xml.in
-@@ -808,7 +808,7 @@
-       </_description>
-     </key>
-     <key name="picture-uri" type="s">
--      <default>'file://@datadir@/themes/Adwaita/backgrounds/adwaita-timed.xml'</default>
-+      <default>'file:///usr/share/backgrounds/linuxmint/default_background.jpg'</default>
-       <_summary>Picture URI</_summary>
-       <_description>
-         URI to use for the background image. Not that the backend only supports
--- 
-1.8.1.6
-
-
-From 0147459229b449757bac9a92c173c4bd3c2f9eca Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Tue, 16 Apr 2013 18:41:16 -0400
-Subject: [PATCH 05/16] Use distro-agnostic background..
-
----
- data/org.cinnamon.gschema.xml.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/org.cinnamon.gschema.xml.in b/data/org.cinnamon.gschema.xml.in
-index 6d8c82d..567dca8 100644
---- a/data/org.cinnamon.gschema.xml.in
-+++ b/data/org.cinnamon.gschema.xml.in
-@@ -808,7 +808,7 @@
-       </_description>
-     </key>
-     <key name="picture-uri" type="s">
--      <default>'file:///usr/share/backgrounds/linuxmint/default_background.jpg'</default>
-+      <default>'file:///usr/share/themes/Adwaita/backgrounds/adwaita-timed.xml'</default>
-       <_summary>Picture URI</_summary>
-       <_description>
-         URI to use for the background image. Not that the backend only supports
--- 
-1.8.1.6
-
-
-From 706d244a9dbe2ace9860044e2245a285d8473f47 Mon Sep 17 00:00:00 2001
-From: dalcde <dalcde@yahoo.com.hk>
-Date: Mon, 15 Apr 2013 18:34:48 +0800
-Subject: [PATCH 06/16] [GDbus] Port DBus to GDBus (AltLinux patch)
-
----
- .../applets/brightness@cinnamon.org/applet.js      |  39 +-
- .../cinnamon/applets/power@cinnamon.org/applet.js  | 102 ++--
- .../cinnamon/applets/sound@cinnamon.org/applet.js  | 511 ++++++---------------
- .../cinnamon/applets/xrandr@cinnamon.org/applet.js |  19 +-
- js/misc/gnomeSession.js                            | 147 ++----
- js/misc/modemManager.js                            |  79 ++--
- js/misc/screenSaver.js                             |  89 ++--
- js/ui/appletManager.js                             |   1 -
- js/ui/automountManager.js                          | 106 ++---
- js/ui/autorunManager.js                            |  27 +-
- js/ui/calendar.js                                  |  71 +--
- js/ui/cinnamonDBus.js                              |  96 ++--
- js/ui/endSessionDialog.js                          |  79 ++--
- js/ui/keyboard.js                                  |  48 +-
- js/ui/layout.js                                    |  14 +-
- js/ui/magnifierDBus.js                             | 134 ++++--
- js/ui/main.js                                      |   6 -
- js/ui/messageTray.js                               |  13 +-
- js/ui/notificationDaemon.js                        | 193 ++++----
- js/ui/scripting.js                                 |  34 +-
- 20 files changed, 774 insertions(+), 1034 deletions(-)
-
-diff --git a/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js
-index 9cbda80..9087b25 100644
---- a/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js
-+++ b/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js
-@@ -5,7 +5,6 @@ const St = imports.gi.St;
- const PopupMenu = imports.ui.popupMenu;
- const GLib = imports.gi.GLib;
- const Gio = imports.gi.Gio;
--const DBus = imports.dbus;
- 
- /* constants */
- const DimSettingsSchema = "org.gnome.settings-daemon.plugins.power";
-@@ -14,24 +13,25 @@ const DimSettingsBattery = "idle-dim-battery";
- const PowerBusName = 'org.gnome.SettingsDaemon';
- const PowerObjectPath = '/org/gnome/SettingsDaemon/Power';
- 
--/* DBus interface */
--const PowerManagerInterface = {
--    name: 'org.gnome.SettingsDaemon.Power.Screen',
--    methods:
--        [
--            { name: 'GetPercentage', inSignature: '', outSignature: 'u' },
--            { name: 'SetPercentage', inSignature: 'u', outSignature: 'u' },
--            { name: 'StepUp', inSignature: '', outSignature: 'u' },
--            { name: 'StepDown', inSignature: '', outSignature: 'u' },
--        ],
--    signals:
--        [
--            { name: 'Changed', inSignature: '', outSignature: '' },
--        ]
--};
-+const PowerManagerInterface = <interface name="org.gnome.SettingsDaemon.Power.Screen">
-+<method name="GetPercentage">
-+    <arg type="u" direction="out"/>
-+</method>
-+<method name="SetPercentage">
-+    <arg type="u" direction="in"/>
-+    <arg type="u" direction="out"/>
-+</method>
-+<method name="StepUp">
-+    <arg type="u" direction="out"/>
-+</method>
-+<method name="StepDown">
-+    <arg type="u" direction="out"/>
-+</method>
-+<signal name="Changed" />
-+</interface>;
- 
- /* DBus magic */
--let PowerManagerProxy = DBus.makeProxyClass(PowerManagerInterface);
-+const PowerManagerProxy = Gio.DBusProxy.makeProxyWrapper(PowerManagerInterface);
- 
- /* TextImageMenuItem taken from sound@cinnamon.org applet */
- let icon_path = "/usr/share/cinnamon/theme/";
-@@ -100,7 +100,7 @@ MyApplet.prototype = {
-         Applet.IconApplet.prototype._init.call(this, orientation, panel_height);
-         
-         try {
--            this._proxy = new PowerManagerProxy(DBus.session, PowerBusName, PowerObjectPath);
-+            this._proxy = new PowerManagerProxy(Gio.DBus.session, PowerBusName, PowerObjectPath);
-             
-             this.menuManager = new PopupMenu.PopupMenuManager(this);
-             this.menu = new Applet.AppletPopupMenu(this, orientation);
-@@ -137,7 +137,8 @@ MyApplet.prototype = {
-                     this.menu.addMenuItem(this._settingsMenu);
-                 
-                     //get notified
--                    this._proxy.connect('Changed', Lang.bind(this, this._getBrightness));
-+                    this._proxy.connectSignal('Changed', Lang.bind(this, this._getBrightness));
-+                    
-                     this.actor.connect('scroll-event', Lang.bind(this, this._onScrollEvent));
-                 } else {
-                     this.set_applet_tooltip(_("Brightness"));
-diff --git a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
-index c342fe7..b6b2bcd 100644
---- a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
-+++ b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
-@@ -1,6 +1,5 @@
- const Applet = imports.ui.applet;
- const Gio = imports.gi.Gio;
--const DBus = imports.dbus;
- const Lang = imports.lang;
- const St = imports.gi.St;
- const PopupMenu = imports.ui.popupMenu;
-@@ -42,34 +41,46 @@ const LabelDisplay = {
-     TIME: 'time'
- };
- 
--const PowerManagerInterface = {
--    name: 'org.gnome.SettingsDaemon.Power',
--    methods: [
--        { name: 'GetDevices', inSignature: '', outSignature: 'a(susdut)' },
--        { name: 'GetPrimaryDevice', inSignature: '', outSignature: '(susdut)' },
--        ],
--    signals: [
--        { name: 'PropertiesChanged', inSignature: 's,a{sv},a[s]' },
--        ],
--    properties: [
--        { name: 'Icon', signature: 's', access: 'read' },
--        ]
--};
--let PowerManagerProxy = DBus.makeProxyClass(PowerManagerInterface);
--
--const SettingsManagerInterface = {
--	name: 'org.freedesktop.DBus.Properties',
--	methods: [
--		{ name: 'Get', inSignature: 's,s', outSignature: 'v' },
--		{ name: 'GetAll', inSignature: 's', outSignature: 'a{sv}' },
--		{ name: 'Set', inSignature: 's,s,v', outSignature: '' }
--	],
--	signals: [
--	{name: 'PropertiesChanged', inSignature:'s,a{sv},a[s]', outSignature:''}
--	]
--};
--
--let SettingsManagerProxy = DBus.makeProxyClass(SettingsManagerInterface);
-+const PowerManagerInterface = <interface name="org.gnome.SettingsDaemon.Power">
-+<method name="GetDevices">
-+    <arg type="a(susdut)" direction="out"/>
-+</method>
-+<method name="GetPrimaryDevice">
-+    <arg type="(susdut)" direction="out"/>
-+</method>
-+<signal name="PropertiesChanged">
-+    <arg type="s"/>
-+    <arg type="a{sv}"/>
-+    <arg type="a[s]"/>
-+</signal>
-+<property name="Icon" type="s" access="read" />
-+</interface>;
-+
-+const PowerManagerProxy = Gio.DBusProxy.makeProxyWrapper(PowerManagerInterface);
-+
-+const SettingsManagerInterface = <interface name="org.freedesktop.DBus.Properties">
-+<method name="Get">
-+    <arg type="s" direction="in"/>
-+    <arg type="s" direction="in"/>
-+    <arg type="v" direction="out"/>
-+</method>
-+<method name="GetAll">
-+    <arg type="s" direction="in"/>
-+    <arg type="a{sv}" direction="out"/>
-+</method>
-+<method name="Set">
-+    <arg type="s" direction="in"/>
-+    <arg type="s" direction="in"/>
-+    <arg type="v" direction="in"/>
-+</method>
-+<signal name="PropertiesChanged">
-+    <arg type="s"/>
-+    <arg type="a{sv}"/>
-+    <arg type="a[s]"/>
-+</signal>
-+</interface>;
-+
-+const SettingsManagerProxy = Gio.DBusProxy.makeProxyWrapper(SettingsManagerInterface);
- 
- function DeviceItem() {
-     this._init.apply(this, arguments);
-@@ -143,11 +154,11 @@ MyApplet.prototype = {
-             this.menuManager = new PopupMenu.PopupMenuManager(this);
-             this.menu = new Applet.AppletPopupMenu(this, orientation);
-             this.menuManager.addMenu(this.menu);            
--            
-+
-             //this.set_applet_icon_symbolic_name('battery-missing');            
--            this._proxy = new PowerManagerProxy(DBus.session, BUS_NAME, OBJECT_PATH);
--            this._smProxy = new SettingsManagerProxy(DBus.session, BUS_NAME, OBJECT_PATH);
--            
-+            this._proxy = new PowerManagerProxy(Gio.DBus.session, BUS_NAME, OBJECT_PATH);
-+            this._smProxy = new SettingsManagerProxy(Gio.DBus.session, BUS_NAME, OBJECT_PATH);
-+
-             let icon = this.actor.get_children()[0];
-             this.actor.remove_actor(icon);
-             let box = new St.BoxLayout({ name: 'batteryBox' });
-@@ -306,18 +317,19 @@ MyApplet.prototype = {
-         this._devicesChanged();
-     },
- 
--    _devicesChanged: function() {        
--        this._proxy.GetRemote('Icon', Lang.bind(this, function(icon, error) {
--            if (icon) {    
--                this.set_applet_icon_symbolic_name('battery-missing');
--                let gicon = Gio.icon_new_for_string(icon);
--                this._applet_icon.gicon = gicon;
--                this.actor.show();
--            } else {
--                this.menu.close();
--                this.actor.hide();
--            }
--        }));
-+
-+    _devicesChanged: function() {
-+        this.set_applet_icon_symbolic_name('battery-missing');
-+        let icon = this._proxy.Icon;
-+        if (icon) {
-+            let gicon = Gio.icon_new_for_string(icon);
-+            this.setGIcon(gicon);
-+            this.actor.show();
-+        } else {
-+            this.menu.close();
-+            this.actor.hide();
-+        }
-+
-         this._readPrimaryDevice();
-         this._readOtherDevices();
-         this._updateLabel();
-diff --git a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
-index 50c4e1e..c8427ac 100644
---- a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
-+++ b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
-@@ -1,7 +1,6 @@
- const Applet = imports.ui.applet;
- const Mainloop = imports.mainloop;
- const Gio = imports.gi.Gio;
--const DBus = imports.dbus;
- const Lang = imports.lang;
- const Cinnamon = imports.gi.Cinnamon;
- const Clutter = imports.gi.Clutter;
-@@ -12,95 +11,50 @@ const Gvc = imports.gi.Gvc;
- const Pango = imports.gi.Pango;
- const Tooltips = imports.ui.tooltips;
- 
--const PropIFace = {
--    name: 'org.freedesktop.DBus.Properties',
--    signals: [{ name: 'PropertiesChanged',
--                inSignature: 'a{sv}'}]
--};
--
--const MediaServer2IFace = {
--    name: 'org.mpris.MediaPlayer2',
--    methods: [{ name: 'Raise',
--                inSignature: '',
--                outSignature: '' },
--              { name: 'Quit',
--                inSignature: '',
--                outSignature: '' }],
--    properties: [{ name: 'CanRaise',
--                   signature: 'b',
--                   access: 'read'},
--                 { name: 'CanQuit',
--                   signature: 'b',
--                   access: 'read'}],
--};
--
--const MediaServer2PlayerIFace = {
--    name: 'org.mpris.MediaPlayer2.Player',
--    methods: [{ name: 'PlayPause',
--                inSignature: '',
--                outSignature: '' },
--              { name: 'Pause',
--                inSignature: '',
--                outSignature: '' },
--              { name: 'Play',
--                inSignature: '',
--                outSignature: '' },
--              { name: 'Stop',
--                inSignature: '',
--                outSignature: '' },
--              { name: 'Next',
--                inSignature: '',
--                outSignature: '' },
--              { name: 'Previous',
--                inSignature: '',
--                outSignature: '' },
--              { name: 'SetPosition',
--                inSignature: 'ox',
--                outSignature: '' }],
--    properties: [{ name: 'Metadata',
--                   signature: 'a{sv}',
--                   access: 'read'},
--                 { name: 'Shuffle',
--                   signature: 'b',
--                   access: 'readwrite'},
--                 { name: 'Rate',
--                   signature: 'd',
--                   access: 'readwrite'},
--                 { name: 'LoopStatus',
--                   signature: 'b',
--                   access: 'readwrite'},
--                 { name: 'Volume',
--                   signature: 'd',
--                   access: 'readwrite'},
--                 { name: 'PlaybackStatus',
--                   signature: 's',
--                   access: 'read'},
--                 { name: 'Position',
--                   signature: 'x',
--                   access: 'read'},
--                 { name: 'CanGoNext',
--                   signature: 'b',
--                   access: 'read'},
--                 { name: 'CanGoPrevious',
--                   signature: 'b',
--                   access: 'read'},
--                 { name: 'CanPlay',
--                   signature: 'b',
--                   access: 'read'},
--                 { name: 'CanPause',
--                   signature: 'b',
--                   access: 'read'},
--                 { name: 'CanSeek',
--                   signature: 'b',
--                   access: 'read'}],
--    signals: [{ name: 'Seeked',
--                inSignature: 'x' }]
--};
-+const PropIFace = <interface name="org.freedesktop.DBus.Properties">
-+<signal name="PropertiesChanged">
-+    <arg type="a{sv}"/>
-+</signal>
-+</interface>;
-+
-+const MediaServer2IFace = <interface name="org.mpris.MediaPlayer2">
-+<method name="Raise" />
-+<method name="Quit" />
-+<property name="CanRaise" type="b" access="read" />
-+<property name="CanQuit" type="b" access="read" />
-+</interface>;
-+
-+const MediaServer2PlayerIFace = <interface name="org.mpris.MediaPlayer2.Player">
-+<method name="PlayPause" />
-+<method name="Pause" />
-+<method name="Play" />
-+<method name="Stop" />
-+<method name="Next" />
-+<method name="Previous" />
-+<method name="SetPosition">
-+    <arg type="a{ov}" direction="in"/>
-+</method>
-+<property name='Metadata' access='read' type='a{sv}' />
-+<property name='Shuffle' access='readwrite' type='b' />
-+<property name='Rate' access='readwrite' type='d' />
-+<property name='LoopStatus' access='readwrite' type='s' />
-+<property name='Volume' access='readwrite' type='d' />
-+<property name='PlaybackStatus' access='read' type='s' />
-+<property name='Position' access='read' type='x' />
-+<property name="CanGoNext" type="b" access="read" />
-+<property name="CanGoPrevious" type="b" access="read" />
-+<property name="CanPlay" type="b" access="read" />
-+<property name="CanPause" type="b" access="read" />
-+<property name="CanSeek" type="b" access="read" />
-+<signal name="Seeked">
-+    <arg type="x"/>
-+</signal>
-+</interface>;
- 
- /* global values */
- let icon_path = "/usr/share/cinnamon/theme/";
--let compatible_players = [ "clementine", "mpd", "exaile", "banshee", "rhythmbox", "rhythmbox3", "pragha", "quodlibet", "guayadeque", "amarok", "googlemusicframe", "xbmc", "noise", "xnoise", "gmusicbrowser", "spotify", "audacious", "vlc", "beatbox", "songbird", "pithos", "gnome-mplayer", "nuvolaplayer", "qmmp" ];
--let support_seek = [ "clementine", "banshee", "rhythmbox", "rhythmbox3", "pragha", "quodlibet", "amarok", "noise", "xnoise", "gmusicbrowser", "spotify", "vlc", "beatbox", "gnome-mplayer", "qmmp" ];
-+let compatible_players = [ "clementine", "mpd", "exaile", "banshee", "rhythmbox", "rhythmbox3", "pragha", "quodlibet", "guayadeque", "amarok", "googlemusicframe", "xbmc", "noise", "xnoise", "gmusicbrowser", "spotify", "audacious", "vlc", "beatbox", "songbird", "pithos", "gnome-mplayer", "nuvolaplayer" ];
-+let support_seek = [ "clementine", "banshee", "rhythmbox", "rhythmbox3", "pragha", "quodlibet", "amarok", "noise", "xnoise", "gmusicbrowser", "spotify", "vlc", "beatbox", "gnome-mplayer" ];
- /* dummy vars for translation */
- let x = _("Playing");
- x = _("Paused");
-@@ -112,131 +66,20 @@ const VOLUME_ADJUSTMENT_STEP = 0.05; /* Volume adjustment step in % */
- const ICON_SIZE = 28;
- 
- 
--function Prop() {
--    this._init.apply(this, arguments);
--}
--
--Prop.prototype = {
--    _init: function(owner) {
--        DBus.session.proxifyObject(this, owner, '/org/mpris/MediaPlayer2', this);
--    }
--}
--DBus.proxifyPrototype(Prop.prototype, PropIFace)
--
--function MediaServer2() {
--    this._init.apply(this, arguments);
--}
--
--MediaServer2.prototype = {
--    _init: function(owner) {
--        DBus.session.proxifyObject(this, owner, '/org/mpris/MediaPlayer2', this);
--    },
--    getRaise: function(callback) {
--        this.GetRemote('CanRaise', Lang.bind(this,
--            function(raise, ex) {
--                if (!ex)
--                    callback(this, raise);
--            }));
--    },
--    getQuit: function(callback) {
--        this.GetRemote('CanQuit', Lang.bind(this,
--            function(quit, ex) {
--                if (!ex)
--                    callback(this, quit);
--            }));
--    }
-+var PropProxy = Gio.DBusProxy.makeProxyWrapper(PropIFace);
-+function Prop(owner, initCallback, cancellable) {
-+    return new PropProxy(Gio.DBus.session, owner, '/org/mpris/MediaPlayer2', initCallback, cancellable);
- }
--DBus.proxifyPrototype(MediaServer2.prototype, MediaServer2IFace)
- 
--function MediaServer2Player() {
--    this._init.apply(this, arguments);
-+var MediaServer2Proxy = Gio.DBusProxy.makeProxyWrapper(MediaServer2IFace);
-+function MediaServer2(owner, initCallback, cancellable) {
-+    return new MediaServer2Proxy(Gio.DBus.session, owner, '/org/mpris/MediaPlayer2', initCallback, cancellable);
- }
- 
--MediaServer2Player.prototype = {
--    _init: function(owner) {
--        this._owner = owner;
--        DBus.session.proxifyObject(this, owner, '/org/mpris/MediaPlayer2', this);
--    },
--    getMetadata: function(callback) {
--        this.GetRemote('Metadata', Lang.bind(this,
--            function(metadata, ex) {
--                if (!ex)
--                    callback(this, metadata);
--            }));
--    },
--    getPlaybackStatus: function(callback) {
--        this.GetRemote('PlaybackStatus', Lang.bind(this,
--            function(status, ex) {
--                if (!ex)
--                    callback(this, status);
--            }));
--    },
--    getRate: function(callback) {
--        this.GetRemote('Rate', Lang.bind(this,
--            function(rate, ex) {
--                if (!ex)
--                    callback(this, rate);
--            }));
--    },
--    getPosition: function(callback) {
--        this.GetRemote('Position', Lang.bind(this,
--            function(position, ex) {
--                if (!ex)
--                    callback(this, position);
--            }));
--    },
--    setPosition: function(value) {
--        this.SetRemote('Position', value);
--    },
--    getShuffle: function(callback) {
--        this.GetRemote('Shuffle', Lang.bind(this,
--            function(shuffle, ex) {
--                if (!ex)
--                    callback(this, shuffle);
--            }));
--    },
--    setShuffle: function(value) {
--        this.SetRemote('Shuffle', value);
--    },
--    getVolume: function(callback) {
--        this.GetRemote('Volume', Lang.bind(this,
--            function(volume, ex) {
--                if (!ex)
--                    callback(this, volume);
--            }));
--    },
--    setVolume: function(value) {
--        this.SetRemote('Volume', parseFloat(value));
--    },
--    getRepeat: function(callback) {
--        this.GetRemote('LoopStatus', Lang.bind(this,
--            function(repeat, ex) {
--                if (!ex) {
--                    if (repeat == "None")
--                        repeat = false
--                    else
--                        repeat = true
--                    callback(this, repeat);
--                }
--            }));
--    },
--    setRepeat: function(value) {
--        if (value)
--            value = "Playlist"
--        else
--            value = "None"
--        this.SetRemote('LoopStatus', value);
--    },
--    getCanSeek: function(callback) {
--        this.GetRemote('CanSeek', Lang.bind(this,
--            function(canSeek, err) {
--                if (!err) {
--                    callback(this, canSeek);
--                }
--            }));
--    }
-+var MediaServer2PlayerProxy = Gio.DBusProxy.makeProxyWrapper(MediaServer2PlayerIFace);
-+function MediaServer2Player(owner, initCallback, cancellable) {
-+    return new MediaServer2PlayerProxy(Gio.DBus.session, owner, '/org/mpris/MediaPlayer2', initCallback, cancellable);
- }
--DBus.proxifyPrototype(MediaServer2Player.prototype, MediaServer2PlayerIFace)
- 
- function TrackInfo() {
-     this._init.apply(this, arguments);
-@@ -355,7 +198,6 @@ Player.prototype = {
-     _init: function(system_status_button, owner) {
-         PopupMenu.PopupMenuSection.prototype._init.call(this);
- 
--        this.showPosition = true; // @todo: Get from settings
-         this._owner = owner;
-         this._system_status_button = system_status_button;
-         this._name = this._owner.split('.')[3];
-@@ -389,7 +231,7 @@ Player.prototype = {
-         this.infos_top.add_actor(this._artist.getActor());
-         this.infos_bottom.add_actor(this._album.getActor());
-         this.infos_top.add_actor(this._title.getActor());
--
-+        this.infos_bottom.add_actor(this._time.getActor());
-         this._trackInfosTop.set_child(this.infos_top);
-         this._trackInfosBottom.set_child(this.infos_bottom);
- 
---- a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
-+++ b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
-@@ -414,45 +414,20 @@
-         this._trackControls.set_child(this.controls);
-         this.addActor(this._trackControls);
- 
--        this._seekControls = new St.Bin({style_class: 'sound-seek', x_align: St.Align.START});
--        this.seekControls = new St.BoxLayout({style_class: 'sound-seek-box'});
--        this.seekControls.add_actor(this._time.getActor());
--
--        this._positionSlider = new PopupMenu.PopupSliderMenuItem(0);
--        this._positionSlider.connect('value-changed', Lang.bind(this, function(item) {
--            let time = item._value * this._songLength;
--            this._time.setLabel(this._formatTime(time) + " / " + this._formatTime(this._songLength));
--        }));
--        this._positionSlider.connect('drag-end', Lang.bind(this, function(item) {
--            let time = item._value * this._songLength;
--            this._time.setLabel(this._formatTime(time) + " / " + this._formatTime(this._songLength));
--            this._wantedSeekValue = Math.round(time * 1000000);
--            this._mediaServerPlayer.SetPositionRemote(this._trackObj, time * 1000000);
--        }));
--
--        this.sliderBin = new St.Bin({style_class: 'sound-seek-slider'});
--        this.sliderBin.set_child(this._positionSlider.actor);
--        this.seekControls.add_actor(this.sliderBin);
--        this._seekControls.set_child(this.seekControls);
--        this.addActor(this._seekControls);
--
--        this._mediaServer.getRaise(Lang.bind(this, function(sender, raise) {
--            if (raise) {
--                this._raiseButton = new ControlButton('go-up',
--                    Lang.bind(this, function () { this._mediaServer.RaiseRemote(); this._system_status_button.menu.actor.hide(); }));
--                this._raiseButtonTooltip = new Tooltips.Tooltip(this._raiseButton.button, _("Open Player"));
--                this.controls.add_actor(this._raiseButton.getActor());
--            }
--        }));
--
--        this._mediaServer.getQuit(Lang.bind(this, function(sender, quit) {
--            if (quit) {
--                this._quitButton = new ControlButton('window-close',
--                    Lang.bind(this, function () { this._mediaServer.QuitRemote(); }));
--                this.controls.add_actor(this._quitButton.getActor());
--                this._quitButtonTooltip = new Tooltips.Tooltip(this._quitButton.button, _("Quit Player"));
--            }
--        }));
-+    let CanRaise = this._mediaServer.CanRaise;
-+    let CanQuit = this._mediaServer.CanQuit;
-+    if (CanRaise) {
-+            this._raiseButton = new ControlButton('go-up',
-+                          Lang.bind(this, function () { this._mediaServer.RaiseRemote(); this._system_status_button.menu.actor.hide(); }));
-+            this._raiseButtonTooltip = new Tooltips.Tooltip(this._raiseButton.button, _("Open Player"));
-+            this.controls.add_actor(this._raiseButton.getActor());
-+    }
-+    if (CanQuit) {
-+            this._quitButton = new ControlButton('window-close',
-+                         Lang.bind(this, function () { this._mediaServer.QuitRemote(); }));
-+            this.controls.add_actor(this._quitButton.getActor());
-+            this._quitButtonTooltip = new Tooltips.Tooltip(this._quitButton.button, _("Quit Player"));
-+    }
- 
-         /* this players don't support seek */
-         if (support_seek.indexOf(this._name) == -1) {
-@@ -465,39 +440,23 @@
-         this._getMetadata();
-         this._currentTime = 0;
-         this._getPosition();
--        this._wantedSeekValue = 0;
--        this._updatePositionSlider();
- 
--        this._prop.connect('PropertiesChanged', Lang.bind(this, function(sender, iface, value) {
-+        this._prop.connectSignal('PropertiesChanged', Lang.bind(this, function(sender, iface, value) {
-             if (value["PlaybackStatus"])
--                this._setStatus(iface, value["PlaybackStatus"]);
-+                this._setStatus(value["PlaybackStatus"]);
-             if (value["Metadata"])
--                this._setMetadata(iface, value["Metadata"]);
--            //qmmp
--            if(sender._dbusBusName == 'org.mpris.MediaPlayer2.qmmp') {
-+                this._setMetadata(value["Metadata"]);
-+            // qmmp
-+            if (sender._dbusBusName == 'org.mpris.MediaPlayer2.qmmp') {
-                 if (value["playbackStatus"])
--                    this._setStatus(iface, value["playbackStatus"]);
-+                    this._setStatus(value["playbackStatus"]);
-                 if (value["metadata"])
--                    this._setMetadata(sender, value["metadata"]);
--            } 
--        }));
--
--        this._mediaServerPlayer.connect('Seeked', Lang.bind(this, function(sender, value) {
--            if (value > 0) {
--                this._setPosition(value);
--            }
--            // Seek initiated by the position slider
--            else if (this._wantedSeekValue > 0) {
--                // Some broken gstreamer players (Banshee) reports always 0
--                // when the track is seeked so we set the position at the
--                // value we set on the slider
--                this._setPosition(this._wantedSeekValue);
-+                    this._setMetadata(value["metadata"]);
-             }
--            // Seek value send by the player
--            else
--                this._setPosition(value);
-+        }));
- 
--            this._wantedSeekValue = 0;
-+        this._mediaServerPlayer.connectSignal('Seeked', Lang.bind(this, function(sender, iface, [value]) {
-+            this._setPosition(sender, value);
-         }));
- 
-         Mainloop.timeout_add(1000, Lang.bind(this, this._getPosition));
-
-@@ -512,45 +303,26 @@ Player.prototype = {
-         this._playerInfo.setText(this._getName() + " - " + _(status));
-     },
- 
--    _updatePositionSlider: function(position) {
--        this._mediaServerPlayer.getCanSeek(Lang.bind(this, function(sender, canSeek) {
--            this._canSeek = canSeek;
--            
--            if (this._songLength == 0 || position == false)
--                this._canSeek = false
--
--            // Clem: The following code was commented out. When the next song started, it resulted in hiding the sound menu, making it hard for the user to repeatedly click on the next song button.
--            // There's probably a better fix and this was not tested with players which don't support seeking, but it fixes the regression created by the slider (apparently when the slider is hidden it closes the menu)
--            // if (this._playerStatus == "Playing" && this._canSeek && this.showPosition)
--            //     this._positionSlider.actor.show();
--            // else
--            //     this._positionSlider.actor.hide();
--        }));
--    },
--
--    _setPosition: function(value) {
--        if (value == null && this._playerStatus != 'Stopped') {
--            this._updatePositionSlider(false);
--        }
--        else {
--            this._currentTime = value / 1000000;
--            this._updateTimer();
--        }
-+    _setPosition: function(sender, value) {
-+        this._stopTimer();
-+        this._currentTime = value / 1000000;
-+        this._updateTimer();
-+        if (this._playerStatus == "Playing")
-+            this._runTimer();
-     },
- 
-     _getPosition: function() {
--        this._mediaServerPlayer.getPosition(Lang.bind(this, function(sender, value) {
--            this._setPosition(value);
--        }));
-+    this._setPosition(this._mediaServerPlayer.Position);
-+        Mainloop.timeout_add(1000, Lang.bind(this, this._getPosition));
-     },
- 
--    _setMetadata: function(sender, metadata) {
-+    _setMetadata: function(metadata) {
-         if (metadata["mpris:length"]) {
-             // song length in secs
--            this._songLength = metadata["mpris:length"] / 1000000;
-+            this._songLength = metadata["mpris:length"].unpack() / 1000000;
-             // FIXME upstream
-             if (this._name == "quodlibet")
--                this._songLength = metadata["mpris:length"] / 1000;
-+                this._songLength = metadata["mpris:length"].unpack() / 1000;
-             // reset timer
-             this._stopTimer();
-             if (this._playerStatus == "Playing")
-@@ -559,26 +333,29 @@ Player.prototype = {
-             this._stopTimer();
-         }
-         if (metadata["xesam:artist"])
--            this._artist.setLabel(metadata["xesam:artist"].toString());
-+            this._artist.setLabel(metadata["xesam:artist"].unpack());
-         else
-             this._artist.setLabel(_("Unknown Artist"));
-         if (metadata["xesam:album"])
--            this._album.setLabel(metadata["xesam:album"].toString());
-+            this._album.setLabel(metadata["xesam:album"].unpack());
-         else
-             this._album.setLabel(_("Unknown Album"));
-         if (metadata["xesam:title"])
--            this._title.setLabel(metadata["xesam:title"].toString());
-+            this._title.setLabel(metadata["xesam:title"].unpack());
-         else
-             this._title.setLabel(_("Unknown Title"));
--        
--        if (metadata["mpris:trackid"]) {
--            this._trackObj = metadata["mpris:trackid"];
--        }
-+        /*if (metadata["mpris:trackid"]) {
-+            this._trackId = {
-+                _init: function() {
-+                    DBus.session.proxifyObject(this, this._owner, metadata["mpris:trackid"]);
-+                }
-+            }
-+        }*/
- 
-         let change = false;
-         if (metadata["mpris:artUrl"]) {
--            if (this._trackCoverFile != metadata["mpris:artUrl"].toString()) {
--                this._trackCoverFile = metadata["mpris:artUrl"].toString();
-+            if (this._trackCoverFile != metadata["mpris:artUrl"].unpack()) {
-+                this._trackCoverFile = metadata["mpris:artUrl"].unpack();
-                 change = true;
-             }
-         }
-@@ -600,8 +377,7 @@ Player.prototype = {
-                     cover.read_async(null, null, Lang.bind(this, this._onReadCover));
-                 }
-                 else {
--                    cover_path = decodeURIComponent(this._trackCoverFile);
--                    cover_path = cover_path.replace("file://", "");
-+                    cover_path = decodeURIComponent(this._trackCoverFile.substr(7));
-                     this._showCover(cover_path);
-                 }
-             }
-@@ -611,13 +387,10 @@ Player.prototype = {
-     },
- 
-     _getMetadata: function() {
--        this._mediaServerPlayer.getMetadata(Lang.bind(this,
--            this._setMetadata
--        ));
-+    this._setMetadata(this._mediaServerPlayer.Metadata);
-     },
- 
--    _setStatus: function(sender, status) {
--        this._updatePositionSlider();
-+    _setStatus: function(status) {
-         this._playerStatus = status;
-         if (status == "Playing") {
-             this._playButton.setIcon("media-playback-pause");
-@@ -631,53 +404,39 @@ Player.prototype = {
-             this._playButton.setIcon("media-playback-start");
-             this._stopTimer();
-         }
--
-         this._playerInfo.setImage("player-" + status.toLowerCase());
-         this._setName(status);
-     },
- 
-     _getStatus: function() {
--        this._mediaServerPlayer.getPlaybackStatus(Lang.bind(this,
--            this._setStatus
--        ));
-+    this._setStatus(this._mediaServerPlayer.PlaybackStatus);
-     },
- 
-     _updateRate: function() {
--        this._mediaServerPlayer.getRate(Lang.bind(this, function(sender, rate) {
--            this._rate = rate;
--        }));
-+    this._rate = this._mediaServerPlayer.Rate;
-     },
- 
-     _updateTimer: function() {
--        if (this.showPosition && this._canSeek) {
--            if (!isNaN(this._currentTime) && !isNaN(this._songLength) && this._currentTime > 0)
--                this._positionSlider.setValue(this._currentTime / this._songLength);
--            else
--                this._positionSlider.setValue(0);
--        }
-         this._time.setLabel(this._formatTime(this._currentTime) + " / " + this._formatTime(this._songLength));
-     },
- 
-     _runTimer: function() {
--        if (this._playerStatus == 'Playing') {
--            this._timeoutId = Mainloop.timeout_add_seconds(1, Lang.bind(this, this._runTimer));
--            this._currentTime += 1;
--            this._updateTimer();
--        }
-+        /*if (!Tweener.resumeTweens(this)) {
-+            Tweener.addTween(this,
-+                { time: this._songLength - this._currentTime,
-+                  transition: 'linear',
-+                  onUpdate: Lang.bind(this, this._updateTimer) });
-+        }*/
-     },
- 
-     _pauseTimer: function() {
--        if (this._timeoutId != 0) {
--            Mainloop.source_remove(this._timeoutId);
--            this._timeoutId = 0;
--        }
--        this._updateTimer();
-+        //Tweener.pauseTweens(this);
-     },
- 
-     _stopTimer: function() {
-+        /*Tweener.removeTweens(this);
-         this._currentTime = 0;
--        this._pauseTimer();
--        this._updateTimer();
-+        this._updateTimer();*/
-     },
- 
-     _formatTime: function(s) {
-@@ -771,7 +530,7 @@ MediaPlayerLauncher.prototype = {
-     },
- 
-     activate: function (event) {
--    	this._menu.actor.hide();
-+        this._menu.actor.hide();
-         this._app.activate_full(-1, event.get_time());
-         return true;
-     }
-@@ -799,7 +558,7 @@ MyApplet.prototype = {
-             this._players = {};
-             // watch players
-             for (var p=0; p<compatible_players.length; p++) {
--                DBus.session.watch_name('org.mpris.MediaPlayer2.'+compatible_players[p], false,
-+                Gio.DBus.session.watch_name('org.mpris.MediaPlayer2.'+compatible_players[p], Gio.BusNameWatcherFlags.NONE,
-                     Lang.bind(this, this._addPlayer),
-                     Lang.bind(this, this._removePlayer)
-                 );
-@@ -930,7 +689,7 @@ MyApplet.prototype = {
-         return Object.keys(this._players).length;
-     },
- 
--    _addPlayer: function(owner) {
-+    _addPlayer: function(connection, owner) {
-         // ensure menu is empty
-         this._cleanup();
-         this._volumeControlShown = false;
-@@ -945,12 +704,12 @@ MyApplet.prototype = {
-         this._readOutput();
-     },
- 
--    _removePlayer: function(owner) {
-+    _removePlayer: function(connection, owner) {
-         delete this._players[owner];
-         this._cleanup();
-         this._volumeControlShown = false;
-         for (owner in this._players) {
--            this._addPlayer(owner);
-+            this._addPlayer(connection, owner);
-         }
-         this.menu.emit('players-loaded', true);
- 
-@@ -974,21 +733,21 @@ MyApplet.prototype = {
-         this._volumeControlShown = true;
- 
-         if (this._nbPlayers()==0){
--        	this._availablePlayers = new Array();
-+            this._availablePlayers = new Array();
-             let appsys = Cinnamon.AppSystem.get_default();
-             let allApps = appsys.get_all();
-             let listedDesktopFiles = new Array();
-             for (let y=0; y<allApps.length; y++) {
--            	let app = allApps[y];
--            	let entry = app.get_tree_entry();
--            	let path = entry.get_desktop_file_path();
--            	for (var p=0; p<compatible_players.length; p++) {
-+                let app = allApps[y];
-+                let entry = app.get_tree_entry();
-+                let path = entry.get_desktop_file_path();
-+                for (var p=0; p<compatible_players.length; p++) {
-                     let desktopFile = compatible_players[p]+".desktop";
--            		if (path.indexOf(desktopFile) != -1 && listedDesktopFiles.indexOf(desktopFile) == -1) {
--                		this._availablePlayers.push(app);
-+                    if (path.indexOf(desktopFile) != -1 && listedDesktopFiles.indexOf(desktopFile) == -1) {
-+                        this._availablePlayers.push(app);
-                         listedDesktopFiles.push(desktopFile);
--            		}
--           		}
-+                    }
-+                }
-             }
- 
-             if (this._availablePlayers.length > 0){
-@@ -1137,19 +896,19 @@ MyApplet.prototype = {
-             this._mutedChanged (null, null, '_output');
-             this._volumeChanged (null, null, '_output');
-             let sinks = this._control.get_sinks();
--	        this._selectDeviceItem.menu.removeAll();
--	        for (let i = 0; i < sinks.length; i++) {
--	        	let sink = sinks[i];
--	        	let menuItem = new PopupMenu.PopupMenuItem(sink.get_description());
--	        	if (sinks[i].get_id() == this._output.get_id()) {
--	        		menuItem.setShowDot(true);
--	        	}
--	        	menuItem.connect('activate', Lang.bind(this, function() {
--	        		log('Changing default sink to ' + sink.get_description());
--	                this._control.set_default_sink(sink);
--	            }));
--	            this._selectDeviceItem.menu.addMenuItem(menuItem);
--	        }
-+            this._selectDeviceItem.menu.removeAll();
-+            for (let i = 0; i < sinks.length; i++) {
-+                let sink = sinks[i];
-+                let menuItem = new PopupMenu.PopupMenuItem(sink.get_description());
-+                if (sinks[i].get_id() == this._output.get_id()) {
-+                    menuItem.setShowDot(true);
-+                }
-+                menuItem.connect('activate', Lang.bind(this, function() {
-+                    log('Changing default sink to ' + sink.get_description());
-+                    this._control.set_default_sink(sink);
-+                }));
-+                this._selectDeviceItem.menu.addMenuItem(menuItem);
-+            }
-         } else {
-             this._outputSlider.setValue(0);
-             this.setIconName('audio-volume-muted-symbolic');
-diff --git a/files/usr/share/cinnamon/applets/xrandr@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/xrandr@cinnamon.org/applet.js
-index 0dcf74d..c2d152a 100644
---- a/files/usr/share/cinnamon/applets/xrandr@cinnamon.org/applet.js
-+++ b/files/usr/share/cinnamon/applets/xrandr@cinnamon.org/applet.js
-@@ -1,6 +1,6 @@
- /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
- 
--const DBus = imports.dbus;
-+const Gio = imports.gi.Gio;
- const Gdk = imports.gi.Gdk;
- const GLib = imports.gi.GLib;
- const GnomeDesktop = imports.gi.GnomeDesktop;
-@@ -22,13 +22,14 @@ let rotations = [ [ GnomeDesktop.RRRotation.ROTATION_0, N_("Normal") ],
- 		  [ GnomeDesktop.RRRotation.ROTATION_180, N_("Upside-down") ]
- 		];
- 
--const XRandr2Iface = {
--    name: 'org.gnome.SettingsDaemon.XRANDR_2',
--    methods: [
--	{ name: 'ApplyConfiguration', inSignature: 'xx', outSignature: '' },
--    ]
--};
--let XRandr2 = DBus.makeProxyClass(XRandr2Iface);
-+const XRandr2Iface = <interface name="org.gnome.SettingsDaemon.XRANDR_2">
-+<method name="ApplyConfiguration">
-+    <arg type="x" direction="in"/>
-+    <arg type="x" direction="in"/>
-+</method>
-+</interface>;
-+
-+const XRandr2 = Gio.DBusProxy.makeProxyWrapper(XRandr2Iface);
- 
- function MyApplet(orientation, panel_height) {
-     this._init(orientation, panel_height);
-@@ -48,7 +49,7 @@ MyApplet.prototype = {
-             this.menu = new Applet.AppletPopupMenu(this, orientation);
-             this.menuManager.addMenu(this.menu);            
-                                 
--            this._proxy = new XRandr2(DBus.session, 'org.gnome.SettingsDaemon', '/org/gnome/SettingsDaemon/XRANDR');
-+            this._proxy = new XRandr2(Gio.DBus.session, 'org.gnome.SettingsDaemon', '/org/gnome/SettingsDaemon/XRANDR');
- 
-             try {
-                 this._screen = new GnomeDesktop.RRScreen({ gdk_screen: Gdk.Screen.get_default() });
-diff --git a/js/misc/gnomeSession.js b/js/misc/gnomeSession.js
-index a2b61fd..e21d3a8 100644
---- a/js/misc/gnomeSession.js
-+++ b/js/misc/gnomeSession.js
-@@ -1,20 +1,18 @@
- // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
- 
--const DBus = imports.dbus;
-+const Gio = imports.gi.Gio;
- const Lang = imports.lang;
- const Signals = imports.signals;
- 
--const PresenceIface = {
--    name: 'org.gnome.SessionManager.Presence',
--    methods: [{ name: 'SetStatus',
--                inSignature: 'u',
--                outSignature: '' }],
--    properties: [{ name: 'status',
--                   signature: 'u',
--                   access: 'readwrite' }],
--    signals: [{ name: 'StatusChanged',
--                inSignature: 'u' }]
--};
-+const PresenceIface = <interface name="org.gnome.SessionManager.Presence">
-+<method name="SetStatus">
-+    <arg type="u" direction="in"/>
-+</method>
-+<property name="status" type="u" access="readwrite"/>
-+<signal name="StatusChanged">
-+    <arg type="u" direction="out"/>
-+</signal>
-+</interface>;
- 
- const PresenceStatus = {
-     AVAILABLE: 0,
-@@ -23,104 +21,37 @@ const PresenceStatus = {
-     IDLE: 3
- };
- 
--function Presence() {
--    this._init();
-+var PresenceProxy = Gio.DBusProxy.makeProxyWrapper(PresenceIface);
-+function Presence(initCallback, cancellable) {
-+    return new PresenceProxy(Gio.DBus.session, 'org.gnome.SessionManager',
-+                             '/org/gnome/SessionManager/Presence', initCallback, cancellable);
- }
- 
--Presence.prototype = {
--    _init: function() {
--        DBus.session.proxifyObject(this, 'org.gnome.SessionManager', '/org/gnome/SessionManager/Presence', this);
--    },
--
--    getStatus: function(callback) {
--        this.GetRemote('status', Lang.bind(this,
--            function(status, ex) {
--                if (!ex)
--                    callback(this, status);
--            }));
--    },
--
--    setStatus: function(status) {
--        this.SetStatusRemote(status);
--    }
--};
--DBus.proxifyPrototype(Presence.prototype, PresenceIface);
--
--// Note inhibitors are immutable objects, so they don't
--// change at runtime (changes always come in the form
--// of new inhibitors)
--const InhibitorIface = {
--    name: 'org.gnome.SessionManager.Inhibitor',
--    properties: [{ name: 'app_id',
--                   signature: 's',
--                   access: 'readonly' },
--                 { name: 'client_id',
--                   signature: 's',
--                   access: 'readonly' },
--                 { name: 'reason',
--                   signature: 's',
--                   access: 'readonly' },
--                 { name: 'flags',
--                   signature: 'u',
--                   access: 'readonly' },
--                 { name: 'toplevel_xid',
--                   signature: 'u',
--                   access: 'readonly' },
--                 { name: 'cookie',
--                   signature: 'u',
--                   access: 'readonly' }],
--};
--
--function Inhibitor(objectPath) {
--    this._init(objectPath);
-+const InhibitorIface = <interface name="org.gnome.SessionManager.Inhibitor">
-+<property name="app_id" type="s" access="read" />
-+<property name="client_id" type="s" access="read" />
-+<property name="reason" type="s" access="read" />
-+<property name="flags" type="u" access="read" />
-+<property name="toplevel_xid" type="u" access="read" />
-+<property name="cookie" type="u" access="read" />
-+</interface>;
-+
-+var InhibitorProxy = Gio.DBusProxy.makeProxyWrapper(InhibitorIface);
-+function Inhibitor(objectPath, initCallback, cancellable) {
-+    return new InhibitorProxy(Gio.DBus.session, 'org.gnome.SessionManager', objectPath, initCallback, cancellable);
- }
- 
--Inhibitor.prototype = {
--    _init: function(objectPath) {
--        DBus.session.proxifyObject(this,
--                                   'org.gnome.SessionManager',
--                                   objectPath);
--        this.isLoaded = false;
--        this._loadingPropertiesCount = InhibitorIface.properties.length;
--        for (let i = 0; i < InhibitorIface.properties.length; i++) {
--            let propertyName = InhibitorIface.properties[i].name;
--            this.GetRemote(propertyName, Lang.bind(this,
--                function(value, exception) {
--                    if (exception)
--                        return;
--
--                    this[propertyName] = value;
--                    this._loadingPropertiesCount--;
--
--                    if (this._loadingPropertiesCount == 0) {
--                        this.isLoaded = true;
--                        this.emit('is-loaded');
--                    }
--                }));
--        }
--    },
--};
--DBus.proxifyPrototype(Inhibitor.prototype, InhibitorIface);
--Signals.addSignalMethods(Inhibitor.prototype);
--
--
--// Not the full interface, only the methods we use
--const SessionManagerIface = {
--    name: 'org.gnome.SessionManager',
--    methods: [
--        { name: 'Logout', inSignature: 'u', outSignature: '' },
--        { name: 'Shutdown', inSignature: '', outSignature: '' },
--        { name: 'CanShutdown', inSignature: '', outSignature: 'b' }
--    ]
--};
--
--function SessionManager() {
--    this._init();
-+const SessionManagerIface = <interface name="org.gnome.SessionManager">
-+<method name="Logout">
-+    <arg type="u" direction="in" />
-+</method>
-+<method name="Shutdown" />
-+<method name="CanShutdown">
-+    <arg type="b" direction="out" />
-+</method>
-+</interface>;
-+
-+var SessionManagerProxy = Gio.DBusProxy.makeProxyWrapper(SessionManagerIface);
-+function SessionManager(initCallback, cancellable) {
-+    return new SessionManagerProxy(Gio.DBus.session, 'org.gnome.SessionManager', '/org/gnome/SessionManager', initCallback, cancellable);
- }
--
--SessionManager.prototype = {
--    _init: function() {
--        DBus.session.proxifyObject(this, 'org.gnome.SessionManager', '/org/gnome/SessionManager');
--    }
--};
--DBus.proxifyPrototype(SessionManager.prototype, SessionManagerIface);
-\ No newline at end of file
-diff --git a/js/misc/modemManager.js b/js/misc/modemManager.js
-index befd142..f35f925 100644
---- a/js/misc/modemManager.js
-+++ b/js/misc/modemManager.js
-@@ -1,6 +1,6 @@
- // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
- 
--const DBus = imports.dbus;
-+const Gio = imports.gi.Gio;
- const Lang = imports.lang;
- const Cinnamon = imports.gi.Cinnamon;
- const Signals = imports.signals;
-@@ -8,33 +8,43 @@ const Signals = imports.signals;
- // The following are not the complete interfaces, just the methods we need
- // (or may need in the future)
- 
--const ModemGsmNetworkInterface = {
--    name: 'org.freedesktop.ModemManager.Modem.Gsm.Network',
--    methods: [
--        { name: 'GetRegistrationInfo', inSignature: '', outSignature: 'uss' },
--        { name: 'GetSignalQuality', inSignature: '', outSignature: 'u' }
--    ],
--    properties: [
--        { name: 'AccessTechnology', signature: 'u', access: 'read' }
--    ],
--    signals: [
--        { name: 'SignalQuality', inSignature: 'u' },
--        { name: 'RegistrationInfo', inSignature: 'uss' }
--    ]
--};
--const ModemGsmNetworkProxy = DBus.makeProxyClass(ModemGsmNetworkInterface);
--
--const ModemCdmaInterface = {
--    name: 'org.freedesktop.ModemManager.Modem.Cdma',
--    methods: [
--        { name: 'GetSignalQuality', inSignature: '', outSignature: 'u' },
--        { name: 'GetServingSystem', inSignature: '', outSignature: 'usu' }
--    ],
--    signals: [
--        { name: 'SignalQuality', inSignature: 'u' }
--    ]
--};
--const ModemCdmaProxy = DBus.makeProxyClass(ModemCdmaInterface);
-+const ModemGsmNetworkInterface = <interface name="org.freedesktop.ModemManager.Modem.Gsm.Network">
-+<method name="GetRegistrationInfo">
-+    <arg type="u" direction="out" />
-+    <arg type="s" direction="out" />
-+    <arg type="s" direction="out" />
-+</method>
-+<method name="GetSignalQuality">
-+    <arg type="u" direction="out" />
-+</method>
-+<property name="AccessTechnology" type="u" access="read" />
-+<signal name="SignalQuality">
-+    <arg type="u" direction="out" />
-+</signal>
-+<signal name="RegistrationInfo">
-+    <arg type="u" direction="out" />
-+    <arg type="s" direction="out" />
-+    <arg type="s" direction="out" />
-+</signal>
-+</interface>;
-+
-+const ModemGsmNetworkProxy = Gio.DBusProxy.makeProxyWrapper(ModemGsmNetworkInterface);
-+
-+const ModemCdmaInterface = <interface name="org.freedesktop.ModemManager.Modem.Cdma">
-+<method name="GetSignalQuality">
-+    <arg type="u" direction="out" />
-+</method>
-+<method name="GetServingSystem">
-+    <arg type="u" direction="out" />
-+    <arg type="s" direction="out" />
-+    <arg type="u" direction="out" />
-+</method>
-+<signal name="SignalQuality">
-+    <arg type="u" direction="out" />
-+</signal>
-+</interface>;
-+
-+const ModemCdmaProxy = Gio.DBusProxy.makeProxyWrapper(ModemCdmaInterface);
- 
- let _providersTable;
- function _getProvidersTable() {
-@@ -50,17 +60,17 @@ function ModemGsm() {
- 
- ModemGsm.prototype = {
-     _init: function(path) {
--        this._proxy = new ModemGsmNetworkProxy(DBus.system, 'org.freedesktop.ModemManager', path);
-+        this._proxy = new ModemGsmNetworkProxy(Gio.DBus.system, 'org.freedesktop.ModemManager', path);
- 
-         this.signal_quality = 0;
-         this.operator_name = null;
- 
-         // Code is duplicated because the function have different signatures
--        this._proxy.connect('SignalQuality', Lang.bind(this, function(proxy, quality) {
-+        this._proxy.connectSignal('SignalQuality', Lang.bind(this, function(proxy, sender, [quality]) {
-             this.signal_quality = quality;
-             this.emit('notify::signal-quality');
-         }));
--        this._proxy.connect('RegistrationInfo', Lang.bind(this, function(proxy, status, code, name) {
-+        this._proxy.connectSignal('RegistrationInfo', Lang.bind(this, function(proxy, sender, [status, code, name]) {
-             this.operator_name = this._findOperatorName(name, code);
-             this.emit('notify::operator-name');
-         }));
-@@ -154,12 +164,13 @@ function ModemCdma() {
- }
- 
- ModemCdma.prototype = {
--    _init: function(path) {
--        this._proxy = new ModemCdmaProxy(DBus.system, 'org.freedesktop.ModemManager', path);
-+    _init: function(path) {        
-+        this._proxy = new ModemCdmaProxy(Gio.DBus.system, 'org.freedesktop.ModemManager', path);
- 
-         this.signal_quality = 0;
-         this.operator_name = null;
--        this._proxy.connect('SignalQuality', Lang.bind(this, function(proxy, quality) {
-+        this._proxy.connect('SignalQuality', Lang.bind(this, function(proxy, sender, params) {
-+            this.signal_quality = params[0];
-             this.signal_quality = quality;
-             this.emit('notify::signal-quality');
- 
-diff --git a/js/misc/screenSaver.js b/js/misc/screenSaver.js
-index c471856..aec883f 100644
---- a/js/misc/screenSaver.js
-+++ b/js/misc/screenSaver.js
-@@ -1,53 +1,48 @@
- // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
- 
--const DBus = imports.dbus;
- const Lang = imports.lang;
--
--const ScreenSaverIface = {
--    name: 'org.gnome.ScreenSaver',
--    methods: [{ name: 'GetActive',
--                inSignature: '',
--                outSignature: 'b' },
--              { name: 'Lock',
--                inSignature: '' },
--              { name: 'SetActive',
--                inSignature: 'b' }],
--    signals: [{ name: 'ActiveChanged',
--                inSignature: 'b' }]
--};
-+const Gio = imports.gi.Gio;
-+
-+const ScreenSaverIface = <interface name="org.gnome.ScreenSaver">
-+<method name="GetActive">
-+    <arg type="b" direction="out" />
-+</method>
-+<method name="Lock" />
-+<method name="SetActive">
-+    <arg type="b" direction="in" />
-+</method>
-+<signal name="ActiveChanged">
-+    <arg type="b" direction="out" />
-+</signal>
-+</interface>;
-+
-+const ScreenSaverInfo = Gio.DBusInterfaceInfo.new_for_xml(ScreenSaverIface);
- 
- function ScreenSaverProxy() {
--    this._init();
-+    var self = new Gio.DBusProxy({ g_connection: Gio.DBus.session,
-+                                  g_interface_name: ScreenSaverInfo.name,
-+                                  g_interface_info: ScreenSaverInfo,
-+                                  g_name: 'org.gnome.ScreenSaver',
-+                                  g_object_path: '/org/gnome/ScreenSaver',
-+                                   g_flags: (Gio.DBusProxyFlags.DO_NOT_AUTO_START |
-+                                             Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES) });
-+    self.init(null);
-+    self.screenSaverActive = false;
-+
-+    self.connectSignal('ActiveChanged', function(proxy, senderName, [isActive]) {
-+        self.screenSaverActive = isActive;
-+    });
-+    self.connect('notify::g-name-owner', function() {
-+        if (self.g_name_owner) {
-+            self.GetActiveRemote(function(result, excp) {
-+                if (result) {
-+                    let [isActive] = result;
-+                    self.screenSaverActive = isActive;
-+                }
-+            });
-+        } else
-+            self.screenSaverActive = false;
-+    });
-+
-+    return self;
- }
--
--ScreenSaverProxy.prototype = {
--    _init: function() {
--        DBus.session.proxifyObject(this,
--                                   'org.gnome.ScreenSaver',
--                                   '/org/gnome/ScreenSaver');
--
--        DBus.session.watch_name('org.gnome.ScreenSaver',
--                                false, // do not launch a name-owner if none exists
--                                Lang.bind(this, this._onSSAppeared),
--                                Lang.bind(this, this._onSSVanished));
--
--        this.screenSaverActive = false;
--        this.connect('ActiveChanged',
--                     Lang.bind(this, this._onActiveChanged));
--    },
--
--    _onSSAppeared: function(owner) {
--        this.GetActiveRemote(Lang.bind(this, function(isActive) {
--            this.screenSaverActive = isActive;
--        }))
--    },
--
--    _onSSVanished: function(oldOwner) {
--        this.screenSaverActive = false;
--    },
--
--    _onActiveChanged: function(object, isActive) {
--        this.screenSaverActive = isActive;
--    }
--};
--DBus.proxifyPrototype(ScreenSaverProxy.prototype, ScreenSaverIface);
-diff --git a/js/ui/appletManager.js b/js/ui/appletManager.js
-index abf8136..830d80d 100644
---- a/js/ui/appletManager.js
-+++ b/js/ui/appletManager.js
-@@ -7,7 +7,6 @@ const Cinnamon = imports.gi.Cinnamon;
- const Main = imports.ui.main;
- const Applet = imports.ui.applet;
- const Extension = imports.ui.extension;
--const DBus = imports.dbus;
- 
- // Maps uuid -> metadata object
- var appletMeta;
-diff --git a/js/ui/automountManager.js b/js/ui/automountManager.js
-index fa73bfe..f29f9f3 100644
---- a/js/ui/automountManager.js
-+++ b/js/ui/automountManager.js
-@@ -1,7 +1,6 @@
- // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
- 
- const Lang = imports.lang;
--const DBus = imports.dbus;
- const Mainloop = imports.mainloop;
- const Gio = imports.gi.Gio;
- const Params = imports.misc.params;
-@@ -15,63 +14,57 @@ const SETTING_ENABLE_AUTOMOUNT = 'automount';
- 
- const AUTORUN_EXPIRE_TIMEOUT_SECS = 10;
- 
--const ConsoleKitSessionIface = {
--    name: 'org.freedesktop.ConsoleKit.Session',
--    methods: [{ name: 'IsActive',
--                inSignature: '',
--                outSignature: 'b' }],
--    signals: [{ name: 'ActiveChanged',
--                inSignature: 'b' }]
--};
-+const ConsoleKitSessionIface = <interface name="org.freedesktop.ConsoleKit.Session">
-+<method name="isActive">
-+    <arg type="b" direction="out" />
-+</method>
-+<method name="ActiveChanged">
-+    <arg type="b" direction="in" />
-+</method>
-+</interface>;
- 
--const ConsoleKitSessionProxy = DBus.makeProxyClass(ConsoleKitSessionIface);
-+const ConsoleKitSessionProxy = Gio.DBusProxy.makeProxyWrapper(ConsoleKitSessionIface);
- 
--const ConsoleKitManagerIface = {
--    name: 'org.freedesktop.ConsoleKit.Manager',
--    methods: [{ name: 'GetCurrentSession',
--                inSignature: '',
--                outSignature: 'o' }]
--};
-+const ConsoleKitManagerIface = <interface name="org.freedesktop.ConsoleKit.Manager">
-+<method name="GetCurrentSession">
-+    <arg type="o" direction="out" />
-+</method>
-+</interface>;
- 
--function ConsoleKitManager() {
--    this._init();
--};
--
--ConsoleKitManager.prototype = {
--    _init: function() {
--        this.sessionActive = true;
--
--        DBus.system.proxifyObject(this,
--                                  'org.freedesktop.ConsoleKit',
--                                  '/org/freedesktop/ConsoleKit/Manager');
-+const ConsoleKitManagerInfo = Gio.DBusInterfaceInfo.new_for_xml(ConsoleKitManagerIface);
- 
--        DBus.system.watch_name('org.freedesktop.ConsoleKit',
--                               false, // do not launch a name-owner if none exists
--                               Lang.bind(this, this._onManagerAppeared),
--                               Lang.bind(this, this._onManagerVanished));
--    },
--
--    _onManagerAppeared: function(owner) {
--        this.GetCurrentSessionRemote(Lang.bind(this, this._onCurrentSession));
--    },
--
--    _onManagerVanished: function(oldOwner) {
--        this.sessionActive = true;
--    },
--
--    _onCurrentSession: function(session) {
--        this._ckSession = new ConsoleKitSessionProxy(DBus.system, 'org.freedesktop.ConsoleKit', session);
--
--        this._ckSession.connect
--            ('ActiveChanged', Lang.bind(this, function(object, isActive) {
--                this.sessionActive = isActive;            
--            }));
--        this._ckSession.IsActiveRemote(Lang.bind(this, function(isActive) {
--            this.sessionActive = isActive;            
--        }));
-+function ConsoleKitManager() {
-+    var self = new Gio.DBusProxy({ g_connection: Gio.DBus.system,
-+                                  g_interface_name: ConsoleKitManagerInfo.name,
-+                                  g_interface_info: ConsoleKitManagerInfo,
-+                                  g_name: 'org.freedesktop.ConsoleKit',
-+                                  g_object_path: '/org/freedesktop/ConsoleKit/Manager',
-+                                   g_flags: (Gio.DBusProxyFlags.DO_NOT_AUTO_START |
-+                                             Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES) });
-+    
-+    self._updateSessionActive = function() {
-+        if (self.g_name_owner) {
-+            self.GetCurrentSessionRemote(function([session]) {
-+                self._ckSession = new ConsoleKitSessionProxy(Gio.DBus.system, 'org.freedesktop.ConsoleKit', session);
-+
-+                self._ckSession.connectSignal('ActiveChanged', function(object, senderName, [isActive]) {
-+                    self.sessionActive = isActive;
-+                });
-+                self._ckSession.IsActiveRemote(function([isActive]) {
-+                    self.sessionActive = isActive;
-+                });
-+            });
-+        } else {
-+            self.sessionActive = true;
-+        }
-     }
--};
--DBus.proxifyPrototype(ConsoleKitManager.prototype, ConsoleKitManagerIface);
-+    self.connect('notify::g-name-owner',
-+                 Lang.bind(self, self._updateSessionActive));
-+ 
-+    self._updateSessionActive();
-+    self.init(null);
-+    return self;
-+}
- 
- function AutomountManager() {
-     this._init();
-@@ -85,9 +78,8 @@ AutomountManager.prototype = {
-         this.ckListener = new ConsoleKitManager();
- 
-         this._ssProxy = new ScreenSaver.ScreenSaverProxy();
--        this._ssProxy.connect('ActiveChanged',
--                              Lang.bind(this,
--                                        this._screenSaverActiveChanged));
-+        this._ssProxy.connectSignal('ActiveChanged',
-+                                    Lang.bind(this, this._screenSaverActiveChanged));
- 
-         this._volumeMonitor = Gio.VolumeMonitor.get();
- 
-@@ -110,7 +102,7 @@ AutomountManager.prototype = {
-         Mainloop.idle_add(Lang.bind(this, this._startupMountAll));
-     },
- 
--    _screenSaverActiveChanged: function(object, isActive) {
-+    _screenSaverActiveChanged: function(object, senderName, [isActive]) {
-         if (!isActive) {
-             this._volumeQueue.forEach(Lang.bind(this, function(volume) {
-                 this._checkAndMountVolume(volume);
-diff --git a/js/ui/autorunManager.js b/js/ui/autorunManager.js
-index 02cd4da..99b6fbe 100644
---- a/js/ui/autorunManager.js
-+++ b/js/ui/autorunManager.js
-@@ -1,7 +1,6 @@
- // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
- 
- const Lang = imports.lang;
--const DBus = imports.dbus;
- const Gio = imports.gi.Gio;
- const St = imports.gi.St;
- 
-@@ -61,25 +60,19 @@ function startAppForMount(app, mount) {
- 
- /******************************************/
- 
--const HotplugSnifferIface = {
--    name: 'org.Cinnamon.HotplugSniffer',
--    methods: [{ name: 'SniffURI',
--                inSignature: 's',
--                outSignature: 'as' }]
--};
--
--const HotplugSniffer = function() {
--    this._init();
--};
-+const HotplugSnifferIface = <interface name="org.Cinnamon.HotplugSniffer">
-+<method name="SniffURI">
-+    <arg type="s" direction="in" />
-+    <arg type="as" direction="out" />
-+</method>
-+</interface>;
- 
--HotplugSniffer.prototype = {
--    _init: function() {
--        DBus.session.proxifyObject(this,
-+const HotplugSnifferProxy = Gio.DBusProxy.makeProxyWrapper(HotplugSnifferIface);
-+function HotplugSniffer() {
-+    return new HotplugSnifferProxy(Gio.DBus.session,
-                                    'org.Cinnamon.HotplugSniffer',
-                                    '/org/Cinnamon/HotplugSniffer');
--    },
--};
--DBus.proxifyPrototype(HotplugSniffer.prototype, HotplugSnifferIface);
-+}
- 
- function ContentTypeDiscoverer(callback) {
-     this._init(callback);
-diff --git a/js/ui/calendar.js b/js/ui/calendar.js
-index ff4777a..a97e2a9 100644
---- a/js/ui/calendar.js
-+++ b/js/ui/calendar.js
-@@ -1,6 +1,5 @@
- // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
- 
--const DBus = imports.dbus;
- const Clutter = imports.gi.Clutter;
- const Gio = imports.gi.Gio;
- const Lang = imports.lang;
-@@ -194,30 +193,34 @@ EmptyEventSource.prototype = {
- };
- Signals.addSignalMethods(EmptyEventSource.prototype);
- 
--const CalendarServerIface = {
--    name: 'org.Cinnamon.CalendarServer',
--    methods: [{ name: 'GetEvents',
--                inSignature: 'xxb',
--                outSignature: 'a(sssbxxa{sv})' }],
--    signals: [{ name: 'Changed',
--                inSignature: '' }]
--};
--
--const CalendarServer = function () {
--    this._init();
--};
--
--CalendarServer.prototype = {
--     _init: function() {
--         DBus.session.proxifyObject(this, 'org.Cinnamon.CalendarServer', '/org/Cinnamon/CalendarServer');
--     }
--};
--
--DBus.proxifyPrototype(CalendarServer.prototype, CalendarServerIface);
-+const CalendarServerIface = <interface name="org.Cinnamon.CalendarServer">
-+<method name="GetEvents">
-+    <arg type="x" direction="in" />
-+    <arg type="x" direction="in" />
-+    <arg type="b" direction="in" />
-+    <arg type="a(sssbxxa{sv})" direction="out" />
-+</method>
-+<signal name="Changed" />
-+</interface>;
-+
-+const CalendarServerInfo  = Gio.DBusInterfaceInfo.new_for_xml(CalendarServerIface);
-+
-+function CalendarServer() {
-+    var self = new Gio.DBusProxy({ g_connection: Gio.DBus.session,
-+				   g_interface_name: CalendarServerInfo.name,
-+				   g_interface_info: CalendarServerInfo,
-+				   g_name: 'org.Cinnamon.CalendarServer',
-+				   g_object_path: '/org/Cinnamon/CalendarServer',
-+                                   g_flags: (Gio.DBusProxyFlags.DO_NOT_AUTO_START |
-+                                             Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES) });
-+
-+    self.init(null);
-+    return self;
-+}
- 
- // an implementation that reads data from a session bus service
--function DBusEventSource(owner) {
--    this._init(owner);
-+function DBusEventSource() {
-+    this._init();
- }
- 
- function _datesEqual(a, b) {
-@@ -240,16 +243,18 @@ function _dateIntervalsOverlap(a0, a1, b0, b1)
- 
- 
- DBusEventSource.prototype = {
--    _init: function(owner) {
-+    _init: function() {
-         this._resetCache();
- 
--        this._dbusProxy = new CalendarServer(owner);
--        this._dbusProxy.connect('Changed', Lang.bind(this, this._onChanged));
-+        this._dbusProxy = new CalendarServer();
-+        this._dbusProxy.connectSignal('Changed', Lang.bind(this, this._onChanged));
- 
--        DBus.session.watch_name('org.Cinnamon.CalendarServer',
--                                false, // do not launch a name-owner if none exists
--                                Lang.bind(this, this._onNameAppeared),
--                                Lang.bind(this, this._onNameVanished));
-+        this._dbusProxy.connect('notify::g-name-owner', Lang.bind(this, function() {
-+            if (this._dbusProxy.g_name_owner)
-+                this._onNameAppeared();
-+            else
-+                this._onNameVanished();
-+        }));
-     },
- 
-     _resetCache: function() {
-@@ -272,7 +277,7 @@ DBusEventSource.prototype = {
-         this._loadEvents(false);
-     },
- 
--    _onEventsReceived: function(appointments) {
-+    _onEventsReceived: function([appointments]) {
-         let newEvents = [];
-         if (appointments != null) {
-             for (let n = 0; n < appointments.length; n++) {
-@@ -295,9 +300,9 @@ DBusEventSource.prototype = {
- 
-     _loadEvents: function(forceReload) {
-         if (this._curRequestBegin && this._curRequestEnd){
--            let callFlags = 0;
-+            let callFlags = Gio.DBusCallFlags.NO_AUTO_START;
-             if (forceReload)
--                callFlags |= DBus.CALL_FLAG_START;
-+                callFlags = Gio.DBusCallFlags.NONE;
-             this._dbusProxy.GetEventsRemote(this._curRequestBegin.getTime() / 1000,
-                                             this._curRequestEnd.getTime() / 1000,
-                                             forceReload,
-diff --git a/js/ui/cinnamonDBus.js b/js/ui/cinnamonDBus.js
-index 600e92f..5d4eb1c 100644
---- a/js/ui/cinnamonDBus.js
-+++ b/js/ui/cinnamonDBus.js
-@@ -1,7 +1,7 @@
- // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
- 
--const DBus = imports.dbus;
- const Lang = imports.lang;
-+const Gio = imports.gi.Gio;
- 
- const Config = imports.misc.config;
- const Flashspot = imports.ui.flashspot;
-@@ -9,48 +9,53 @@ const Main = imports.ui.main;
- const AppletManager = imports.ui.appletManager;
- const DeskletManager = imports.ui.deskletManager;
- 
--const CinnamonIface = {
--    name: 'org.Cinnamon',
--    methods: [{ name: 'Eval',
--                inSignature: 's',
--                outSignature: 'bs'
--              },
--              { name: 'ScreenshotArea',
--                inSignature: 'biiiibs',
--                outSignature: ''
--              },
--              { name: 'ScreenshotWindow',
--                inSignature: 'bbbs',
--                outSignature: ''
--              },
--              { name: 'Screenshot',
--                inSignature: 'bbs',
--                outSignature: ''
--              },
--              {
--                name: 'FlashArea',
--                inSignature: 'iiii',
--                outSignature: ''
--              },
--              {
--                name: 'highlightApplet',
--                inSignature: 'sb',
--                outSignature: ''
--              },
--              {
--                name: 'activateCallback',
--                inSignature: 'ssb',
--                outSignature: ''
--              }
--             ],
--    signals: [],
--    properties: [{ name: 'OverviewActive',
--                   signature: 'b',
--                   access: 'readwrite' },
--                 { name: 'CinnamonVersion',
--                   signature: 's',
--                   access: 'read' }]
--};
-+
-+const CinnamonIface = <interface name="org.Cinnamon">
-+<method name="Eval">
-+    <arg type="s" direction="in" name="script" />
-+    <arg type="b" direction="out" name="success" />
-+    <arg type="s" direction="out" name="result" />
-+</method>
-+<method name="ScreenshotArea">
-+include_cursor
-+    <arg type="b" direction="in" name="include_cursor"/>
-+    <arg type="i" direction="in" name="x"/>
-+    <arg type="i" direction="in" name="y"/>
-+    <arg type="i" direction="in" name="width"/>
-+    <arg type="i" direction="in" name="height"/>
-+    <arg type="b" direction="in" name="flash"/>
-+    <arg type="s" direction="in" name="filename"/>
-+</method>
-+<method name="ScreenshotWindow">
-+    <arg type="b" direction="in" name="include_frame"/>
-+    <arg type="b" direction="in" name="include_cursor"/>
-+    <arg type="b" direction="in" name="flash"/>
-+    <arg type="s" direction="in" name="filename"/>
-+</method>
-+<method name="Screenshot">
-+    <arg type="b" direction="in" name="include_frame"/>
-+    <arg type="b" direction="in" name="flash"/>
-+    <arg type="s" direction="in" name="filename"/>
-+</method>
-+<method name="FlashArea">
-+include_cursor
-+    <arg type="i" direction="in" name="x"/>
-+    <arg type="i" direction="in" name="y"/>
-+    <arg type="i" direction="in" name="width"/>
-+    <arg type="i" direction="in" name="height"/>
-+</method>
-+<method name="highlightApplet">
-+    <arg type="s" direction="in" />
-+    <arg type="b" direction="in" />
-+</method>
-+<method name="activateCallback">
-+    <arg type="s" direction="in" />
-+    <arg type="s" direction="in" />
-+    <arg type="b" direction="in" />
-+</method>
-+<property name="OverviewActive" type="b" access="readwrite" />
-+<property name="CinnamonVersion" type="s" access="read" />
-+</interface>;
- 
- function Cinnamon() {
-     this._init();
-@@ -58,7 +63,8 @@ function Cinnamon() {
- 
- Cinnamon.prototype = {
-     _init: function() {
--        DBus.session.exportObject('/org/Cinnamon', this);
-+        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(CinnamonIface, this);
-+        this._dbusImpl.export(Gio.DBus.session, '/org/Cinnamon');
-     },
- 
-     /**
-@@ -215,5 +221,3 @@ Cinnamon.prototype = {
-     CinnamonVersion: Config.PACKAGE_VERSION
- };
- 
--DBus.conformExport(Cinnamon.prototype, CinnamonIface);
--
-diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js
-index e909f5f..4f1f7d0 100644
---- a/js/ui/endSessionDialog.js
-+++ b/js/ui/endSessionDialog.js
-@@ -18,19 +18,19 @@
-  * 02110-1335, USA.
-  */
- 
--const DBus = imports.dbus;
- const Lang = imports.lang;
- const Signals = imports.signals;
- 
- const AccountsService = imports.gi.AccountsService;
- const Clutter = imports.gi.Clutter;
-+const Gio = imports.gi.Gio;
- const GLib = imports.gi.GLib;
- const Gtk = imports.gi.Gtk;
- const Pango = imports.gi.Pango;
- const St = imports.gi.St;
- const Cinnamon = imports.gi.Cinnamon;
- 
--const GnomeSession = imports.misc.gnomeSession
-+const GnomeSession = imports.misc.gnomeSession;
- const ModalDialog = imports.ui.modalDialog;
- const Tweener = imports.ui.tweener;
- 
-@@ -40,20 +40,20 @@ const _ITEM_ICON_SIZE = 48;
- const _DIALOG_ICON_SIZE = 32;
- 
- const GSM_SESSION_MANAGER_LOGOUT_FORCE = 2;
--
--const EndSessionDialogIface = {
--    name: 'org.gnome.SessionManager.EndSessionDialog',
--    methods: [{ name: 'Open',
--                inSignature: 'uuuao',
--                outSignature: ''
--              }
--             ],
--    signals: [{ name: 'Canceled',
--                inSignature: '',
--              }],
--    properties: []
--};
--
-+const EndSessionDialogIface = <interface name="org.gnome.SessionManager.EndSessionDialog">
-+<method name="Open">
-+    <arg type="u" direction="in" />
-+    <arg type="u" direction="in" />
-+    <arg type="u" direction="in" />
-+    <arg type="ao" direction="in" />
-+</method>
-+<signal name="ConfirmedLogout" />
-+<signal name="ConfirmedReboot" />
-+<signal name="ConfirmedShutdown" />
-+<signal name="Canceled" />
-+<signal name="Closed" />
-+</interface>;
-+ 
- const logoutDialogContent = {
-     subjectWithUser: _("Log Out %s"),
-     subject: _("Log Out"),
-@@ -230,8 +230,6 @@ function _setLabelText(label, text) {
- function EndSessionDialog() {
-     if (_endSessionDialog == null) {
-         this._init();
--        DBus.session.exportObject('/org/gnome/SessionManager/EndSessionDialog',
--                                  this);
-         _endSessionDialog = this;
-     }
- 
-@@ -328,6 +326,9 @@ EndSessionDialog.prototype = {
-                                           if (this._applicationList.get_children().length == 0)
-                                               scrollView.hide();
-                                       }));
-+
-+        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(EndSessionDialogIface, this);
-+        this._dbusImpl.export(Gio.DBus.session, '/org/gnome/SessionManager/EndSessionDialog');
-     },
- 
-     _onDestroy: function() {
-@@ -442,25 +443,19 @@ EndSessionDialog.prototype = {
- 
-     close: function() {
-         ModalDialog.ModalDialog.prototype.close.call(this);
--        DBus.session.emit_signal('/org/gnome/SessionManager/EndSessionDialog',
--                                 'org.gnome.SessionManager.EndSessionDialog',
--                                 'Closed', '', []);
-+        this._dbusImpl.emit_signal('Closed', null);
-     },
- 
-     cancel: function() {
-         this._stopTimer();
--        DBus.session.emit_signal('/org/gnome/SessionManager/EndSessionDialog',
--                                 'org.gnome.SessionManager.EndSessionDialog',
--                                 'Canceled', '', []);
-+        this._dbusImpl.emit_signal('Canceled', null);
-         this.close(global.get_current_time());
-     },
- 
-     _confirm: function(signal) {
-         this._fadeOutDialog();
-         this._stopTimer();
--        DBus.session.emit_signal('/org/gnome/SessionManager/EndSessionDialog',
--                                 'org.gnome.SessionManager.EndSessionDialog',
--                                 signal, '', []);
-+        this._dbusImpl.emit_signal(signal, null);
-     },
- 
-     _onOpened: function() {
-@@ -512,39 +507,41 @@ EndSessionDialog.prototype = {
-         this._updateContent();
-     },
- 
--    OpenAsync: function(type, timestamp, totalSecondsToStayOpen, inhibitorObjectPaths, callback) {
-+    OpenAsync: function(parameters, invocation) {
-+        let [type, timestamp, totalSecondsToStayOpen, inhibitorObjectPaths] = parameters;
-         this._totalSecondsToStayOpen = totalSecondsToStayOpen;
-         this._inhibitors = [];
-         this._applicationList.destroy_children();
-         this._type = type;
- 
--        if (!(this._type in DialogContent))
--            throw new DBus.DBusError('org.Cinnamon.ModalDialog.TypeError',
--                                     "Unknown dialog type requested");
-+        if (!(this._type in DialogContent)) {
-+            invocation.report_dbus_error('org.Cinnamon.ModalDialog.TypeError',
-+                                         "Unknown dialog type requested");
-+            return;
-+        }
- 
-         for (let i = 0; i < inhibitorObjectPaths.length; i++) {
--            let inhibitor = new GnomeSession.Inhibitor(inhibitorObjectPaths[i]);
-+            let inhibitor = new GnomeSession.Inhibitor(inhibitorObjectPaths[i], Lang.bind(this, function(proxy, error) {
-+                this._onInhibitorLoaded(proxy);
-+            }));
- 
--            inhibitor.connect('is-loaded',
--                              Lang.bind(this, function() {
--                                  this._onInhibitorLoaded(inhibitor);
--                              }));
-             this._inhibitors.push(inhibitor);
-         }
- 
-         this._updateButtons();
- 
--        if (!this.open(timestamp))
--            throw new DBus.DBusError('org.Cinnamon.ModalDialog.GrabError',
--                                     "Cannot grab pointer and keyboard");
-+        if (!this.open(timestamp)) {
-+            invocation.report_dbus_error('org.Cinnamon.ModalDialog.GrabError',
-+                                         "Cannot grab pointer and keyboard");
-+            return;
-+        }
- 
-         this._updateContent();
- 
-         let signalId = this.connect('opened',
-                                     Lang.bind(this, function() {
--                                        callback();
-+                                        invocation.return_value(null);
-                                         this.disconnect(signalId);
-                                     }));
-     }
- };
--DBus.conformExport(EndSessionDialog.prototype, EndSessionDialogIface);
-diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js
-index f55cf93..69edb51 100644
---- a/js/ui/keyboard.js
-+++ b/js/ui/keyboard.js
-@@ -2,7 +2,6 @@
- 
- const Caribou = imports.gi.Caribou;
- const Clutter = imports.gi.Clutter;
--const DBus = imports.dbus;
- const Gdk = imports.gi.Gdk;
- const Gio = imports.gi.Gio;
- const GLib = imports.gi.GLib;
-@@ -38,28 +37,27 @@ const PRETTY_KEYS = {
-     'Alt_L': 'Alt'
- };
- 
--const CaribouKeyboardIface = {
--    name: 'org.gnome.Caribou.Keyboard',
--    methods:    [ { name: 'Show',
--                    inSignature: 'u',
--                    outSignature: ''
--                  },
--                  { name: 'Hide',
--                    inSignature: 'u',
--                    outSignature: ''
--                  },
--                  { name: 'SetCursorLocation',
--                    inSignature: 'iiii',
--                    outSignature: ''
--                  },
--                  { name: 'SetEntryLocation',
--                    inSignature: 'iiii',
--                    outSignature: ''
--                  } ],
--    properties: [ { name: 'Name',
--                    signature: 's',
--                    access: 'read' } ]
--};
-+const CaribouKeyboardIface = <interface name='org.gnome.Caribou.Keyboard'>
-+<method name='Show'>
-+    <arg type='u' direction='in' />
-+</method>
-+<method name='Hide'>
-+    <arg type='u' direction='in' />
-+</method>
-+<method name='SetCursorLocation'>
-+    <arg type='i' direction='in' />
-+    <arg type='i' direction='in' />
-+    <arg type='i' direction='in' />
-+    <arg type='i' direction='in' />
-+</method>
-+<method name='SetEntryLocation'>
-+    <arg type='i' direction='in' />
-+    <arg type='i' direction='in' />
-+    <arg type='i' direction='in' />
-+    <arg type='i' direction='in' />
-+</method>
-+<property name='Name' access='read' type='s' />
-+</interface>;
- 
- function Key() {
-     this._init.apply(this, arguments);
-@@ -199,7 +197,8 @@ function Keyboard() {
- 
- Keyboard.prototype = {
-     _init: function () {
--        DBus.session.exportObject('/org/gnome/Caribou/Keyboard', this);
-+        this._impl = Gio.DBusExportedObject.wrapJSObject(CaribouKeyboardIface, this);
-+        this._impl.export(Gio.DBus.session, '/org/gnome/Caribou/Keyboard');
- 
-         this.actor = null;
- 
-@@ -541,7 +540,6 @@ Keyboard.prototype = {
-         return 'cinnamon';
-     }
- };
--DBus.conformExport(Keyboard.prototype, CaribouKeyboardIface);
- 
- function KeyboardSource() {
-     this._init.apply(this, arguments);
-diff --git a/js/ui/layout.js b/js/ui/layout.js
-index 3446e7a..7523b6f 100644
---- a/js/ui/layout.js
-+++ b/js/ui/layout.js
-@@ -488,12 +488,14 @@ Chrome.prototype = {
- 
-         this._screenSaverActive = false;
-         this._screenSaverProxy = new ScreenSaver.ScreenSaverProxy();
--        this._screenSaverProxy.connect('ActiveChanged', Lang.bind(this, this._onScreenSaverActiveChanged));
--        this._screenSaverProxy.GetActiveRemote(Lang.bind(this,
--            function(result, err) {
--                if (!err)
--                    this._onScreenSaverActiveChanged(this._screenSaverProxy, result);
--            }));
-+        this._screenSaverProxy.connectSignal('ActiveChanged', Lang.bind(this, function(proxy, senderName, [isActive]) {
-+            this._onScreenSaverActiveChanged(isActive);
-+        }));
-+        this._screenSaverProxy.GetActiveRemote(Lang.bind(this, function(result, err) {
-+            if (!err)
-+                this._onScreenSaverActiveChanged(result[0]);
-+        }));
-+
- 
-         this._relayout();
-     },
-diff --git a/js/ui/magnifierDBus.js b/js/ui/magnifierDBus.js
-index 72bba26..4d21797 100644
---- a/js/ui/magnifierDBus.js
-+++ b/js/ui/magnifierDBus.js
-@@ -1,6 +1,6 @@
- // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
- 
--const DBus = imports.dbus;
-+const Gio = imports.gi.Gio;
- const Main = imports.ui.main;
- 
- const MAG_SERVICE_NAME = 'org.gnome.Magnifier';
-@@ -10,47 +10,85 @@ const ZOOM_SERVICE_PATH = '/org/gnome/Magnifier/ZoomRegion';
- 
- // Subset of gnome-mag's Magnifier dbus interface -- to be expanded.  See:
- // http://git.gnome.org/browse/gnome-mag/tree/xml/...Magnifier.xml
--const MagnifierIface = {
--    name: MAG_SERVICE_NAME,
--    methods: [
--                { name: 'setActive', inSignature: 'b', outSignature: '' },
--                { name: 'isActive', inSignature: '', outSignature: 'b' },
--                { name: 'showCursor', inSignature: '', outSignature: '' },
--                { name: 'hideCursor', inSignature: '', outSignature: ''  },
--                { name: 'createZoomRegion', inSignature: 'ddaiai', outSignature: 'o' },
--                { name: 'addZoomRegion', inSignature: 'o', outSignature: 'b' },
--                { name: 'getZoomRegions', inSignature: '', outSignature: 'ao' },
--                { name: 'clearAllZoomRegions', inSignature: '', outSignature: '' },
--                { name: 'fullScreenCapable', inSignature: '', outSignature: 'b' },
--
--                { name: 'setCrosswireSize', inSignature: 'i', outSignature: '' },
--                { name: 'getCrosswireSize', inSignature: '', outSignature: 'i' },
--                { name: 'setCrosswireLength', inSignature: 'i', outSignature: '' },
--                { name: 'getCrosswireLength', inSignature: '', outSignature: 'i' },
--                { name: 'setCrosswireClip', inSignature: 'b', outSignature: '' },
--                { name: 'getCrosswireClip', inSignature: '', outSignature: 'b' },
--                { name: 'setCrosswireColor', inSignature: 'u', outSignature: '' },
--                { name: 'getCrosswireColor', inSignature: '', outSignature: 'u' }
--             ],
--    signals: [],
--    properties: []
--};
-+const MagnifierIface = <interface name={MAG_SERVICE_NAME}>
-+<method name="setActive">
-+    <arg type="b" direction="in" />
-+</method>
-+<method name="isActive">
-+    <arg type="b" direction="out" />
-+</method>
-+<method name="showCursor" />
-+<method name="hideCursor" />
-+<method name="createZoomRegion">
-+    <arg type="d" direction="in" />
-+    <arg type="d" direction="in" />
-+    <arg type="ai" direction="in" />
-+    <arg type="ai" direction="in" />
-+    <arg type="o" direction="out" />
-+</method>
-+<method name="addZoomRegion">
-+    <arg type="o" direction="in" />
-+    <arg type="b" direction="out" />
-+</method>
-+<method name="getZoomRegions">
-+    <arg type="ao" direction="out" />
-+</method>
-+<method name="clearAllZoomRegions" />
-+<method name="fullScreenCapable">
-+    <arg type="b" direction="out" />
-+</method>
-+<method name="setCrosswireSize">
-+    <arg type="i" direction="in" />
-+</method>
-+<method name="getCrosswireSize">
-+    <arg type="i" direction="out" />
-+</method>
-+<method name="setCrosswireLength">
-+    <arg type="i" direction="in" />
-+</method>
-+<method name="getCrosswireLength">
-+    <arg type="i" direction="out" />
-+</method>
-+<method name="setCrosswireClip">
-+    <arg type="b" direction="in" />
-+</method>
-+<method name="getCrosswireClip">
-+    <arg type="b" direction="out" />
-+</method>
-+<method name="setCrosswireColor">
-+    <arg type="u" direction="in" />
-+</method>
-+<method name="getCrosswireColor">
-+    <arg type="u" direction="out" />
-+</method>
-+</interface>;
- 
- // Subset of gnome-mag's ZoomRegion dbus interface -- to be expanded.  See:
- // http://git.gnome.org/browse/gnome-mag/tree/xml/...ZoomRegion.xml
--const ZoomRegionIface = {
--    name: ZOOM_SERVICE_NAME,
--    methods: [
--                { name: 'setMagFactor', inSignature: 'dd', outSignature: ''},
--                { name: 'getMagFactor', inSignature: '', outSignature: 'dd' },
--                { name: 'setRoi', inSignature: 'ai', outSignature: '' },
--                { name: 'getRoi', inSignature: '', outSignature: 'ai' },
--                { name: 'shiftContentsTo', inSignature: 'ii', outSignature: 'b' },
--                { name: 'moveResize', inSignature: 'ai', outSignature: '' }
--             ],
--    signals: [],
--    properties: []
--};
-+const ZoomRegionIface = <interface name={ZOOM_SERVICE_NAME}>
-+<method name="setMagFactor">
-+    <arg type="d" direction="in" />
-+    <arg type="d" direction="in" />
-+</method>
-+<method name="getMagFactor">
-+    <arg type="d" direction="out" />
-+    <arg type="d" direction="out" />
-+</method>
-+<method name="setRoi">
-+    <arg type="ai" direction="in" />
-+</method>
-+<method name="getRoi">
-+    <arg type="ai" direction="out" />
-+</method>
-+<method name="shiftContentsTo">
-+    <arg type="i" direction="in" />
-+    <arg type="i" direction="in" />
-+    <arg type="b" direction="out" />
-+</method>
-+<method name="moveResize">
-+    <arg type="ai" direction="in" />
-+</method>
-+</interface>;
- 
- // For making unique ZoomRegion DBus proxy object paths of the form:
- // '/org/gnome/Magnifier/ZoomRegion/zoomer0',
-@@ -64,7 +102,9 @@ function CinnamonMagnifier() {
- CinnamonMagnifier.prototype = {
-     _init: function() {
-         this._zoomers = {};
--        DBus.session.exportObject(MAG_SERVICE_PATH, this);
-+
-+        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(MagnifierIface, this);
-+        this._dbusImpl.export(Gio.DBus.session, MAG_SERVICE_PATH);
-     },
- 
-     /**
-@@ -195,10 +235,10 @@ CinnamonMagnifier.prototype = {
-         Main.magnifier.clearAllZoomRegions();
-         for (let objectPath in this._zoomers) {
-             let proxyAndZoomer = this._zoomers[objectPath];
-+            proxyAndZoomer.proxy.destroy();
-             proxyAndZoomer.proxy = null;
-             proxyAndZoomer.zoomRegion = null;
-             delete this._zoomers[objectPath];
--            DBus.session.unexportObject(proxyAndZoomer);
-         }
-         this._zoomers = {};
-     },
-@@ -300,8 +340,9 @@ function CinnamonMagnifierZoomRegion(zoomerObjectPath, zoomRegion) {
- CinnamonMagnifierZoomRegion.prototype = {
-     _init: function(zoomerObjectPath, zoomRegion) {
-         this._zoomRegion = zoomRegion;
--        DBus.session.proxifyObject(this, ZOOM_SERVICE_NAME, zoomerObjectPath);
--        DBus.session.exportObject(zoomerObjectPath, this);
-+
-+        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(ZoomRegionIface, this);
-+        this._dbusImpl.export(Gio.DBus.session, zoomerObjectPath);
-     },
- 
-     /**
-@@ -376,8 +417,9 @@ CinnamonMagnifierZoomRegion.prototype = {
-     moveResize: function(viewPort) {
-         let viewRect = { x: viewPort[0], y: viewPort[1], width: viewPort[2] - viewPort[0], height: viewPort[3] - viewPort[1] };
-         this._zoomRegion.setViewPort(viewRect);
-+    },
-+
-+    destroy: function() {
-+        this._dbusImpl.unexport();
-     }
- };
--
--DBus.conformExport(CinnamonMagnifier.prototype, MagnifierIface);
--DBus.conformExport(CinnamonMagnifierZoomRegion.prototype, ZoomRegionIface);
-diff --git a/js/ui/main.js b/js/ui/main.js
-index 99aee95..b602915 100644
---- a/js/ui/main.js
-+++ b/js/ui/main.js
-@@ -1,7 +1,6 @@
- // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
- 
- const Clutter = imports.gi.Clutter;
--const DBus= imports.dbus;
- const Gio = imports.gi.Gio;
- const GLib = imports.gi.GLib;
- const Gtk = imports.gi.Gtk;
-@@ -199,11 +198,6 @@ function start() {
- 
-     cinnamonDBusService = new CinnamonDBus.Cinnamon();
-     lookingGlassDBusService = new LookingGlassDBus.CinnamonLookingGlass();
--    // Force a connection now; dbus.js will do this internally
--    // if we use its name acquisition stuff but we aren't right
--    // now; to do so we'd need to convert from its async calls
--    // back into sync ones.
--    DBus.session.flush();
- 
-     // Ensure CinnamonWindowTracker and CinnamonAppUsage are initialized; this will
-     // also initialize CinnamonAppSystem first.  CinnamonAppSystem
-diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
-index 18d6615..8bed028 100644
---- a/js/ui/messageTray.js
-+++ b/js/ui/messageTray.js
-@@ -1388,12 +1388,17 @@ function MessageTray() {
- 
- MessageTray.prototype = {
-     _init: function() {
--        this._presence = new GnomeSession.Presence();
-+        this._presence = new GnomeSession.Presence(Lang.bind(this, function(proxy, error) {
-+            this._onStatusChanged(proxy.status);
-+        }));
-+
-         this._userStatus = GnomeSession.PresenceStatus.AVAILABLE;
-         this._busy = false;
-         this._backFromAway = false;
--        this._presence.connect('StatusChanged', Lang.bind(this, this._onStatusChanged));
--        this._presence.getStatus(Lang.bind(this, this._onStatusChanged));
-+        this._presence.connectSignal('StatusChanged', Lang.bind(this, function(proxy, senderName, [status]) {
-+            this._onStatusChanged(status);
-+        }));
-+
- 
-         this._notificationBin = new St.Bin();
-         this._notificationBin.hide();
-@@ -1548,7 +1553,7 @@ MessageTray.prototype = {
-         this._updateState();
-     },
- 
--    _onStatusChanged: function(presence, status) {
-+    _onStatusChanged: function(status) {
-         this._backFromAway = (this._userStatus == GnomeSession.PresenceStatus.IDLE && this._userStatus != status);
-         this._userStatus = status;
- 
-diff --git a/js/ui/notificationDaemon.js b/js/ui/notificationDaemon.js
-index bee8ffd..b037e07 100644
---- a/js/ui/notificationDaemon.js
-+++ b/js/ui/notificationDaemon.js
-@@ -1,7 +1,7 @@
- // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
- 
- const Clutter = imports.gi.Clutter;
--const DBus = imports.dbus;
-+const Gio = imports.gi.Gio;
- const GLib = imports.gi.GLib;
- const Lang = imports.lang;
- const Cinnamon = imports.gi.Cinnamon;
-@@ -14,49 +14,52 @@ const Params = imports.misc.params;
- 
- let nextNotificationId = 1;
- 
--// Should really be defined in dbus.js
--const BusIface = {
--    name: 'org.freedesktop.DBus',
--    methods: [{ name: 'GetConnectionUnixProcessID',
--                inSignature: 's',
--                outSignature: 'i' }]
--};
--
--const Bus = function () {
--    this._init();
--};
--
--Bus.prototype = {
--     _init: function() {
--         DBus.session.proxifyObject(this, 'org.freedesktop.DBus', '/org/freedesktop/DBus');
--     }
--};
-+// Should really be defined in Gio.js
-+const BusIface = <interface name="org.freedesktop.DBus">
-+<method name="GetConnectionUnixProcessID">
-+    <arg type="s" direction="in" />
-+    <arg type="u" direction="out" />
-+</method>
-+</interface>;
-+
-+var BusProxy = Gio.DBusProxy.makeProxyWrapper(BusIface);
-+function Bus() {
-+    return new BusProxy(Gio.DBus.session, 'org.freedesktop.DBus', '/org/freedesktop/DBus');
-+}
- 
--DBus.proxifyPrototype(Bus.prototype, BusIface);
--
--const NotificationDaemonIface = {
--    name: 'org.freedesktop.Notifications',
--    methods: [{ name: 'Notify',
--                inSignature: 'susssasa{sv}i',
--                outSignature: 'u'
--              },
--              { name: 'CloseNotification',
--                inSignature: 'u',
--                outSignature: ''
--              },
--              { name: 'GetCapabilities',
--                inSignature: '',
--                outSignature: 'as'
--              },
--              { name: 'GetServerInformation',
--                inSignature: '',
--                outSignature: 'ssss'
--              }],
--    signals: [{ name: 'NotificationClosed',
--                inSignature: 'uu' },
--              { name: 'ActionInvoked',
--                inSignature: 'us' }]
--};
-+const NotificationDaemonIface = <interface name="org.freedesktop.Notifications">
-+<method name="Notify">
-+    <arg type="s" direction="in"/>
-+    <arg type="u" direction="in"/>
-+    <arg type="s" direction="in"/>
-+    <arg type="s" direction="in"/>
-+    <arg type="s" direction="in"/>
-+    <arg type="as" direction="in"/>
-+    <arg type="a{sv}" direction="in"/>
-+    <arg type="i" direction="in"/>
-+    <arg type="u" direction="out"/>
-+</method>
-+<method name="CloseNotification">
-+    <arg type="u" direction="in"/>
-+</method>
-+<method name="GetCapabilities">
-+    <arg type="as" direction="out"/>
-+</method>
-+<method name="GetServerInformation">
-+    <arg type="s" direction="out"/>
-+    <arg type="s" direction="out"/>
-+    <arg type="s" direction="out"/>
-+    <arg type="s" direction="out"/>
-+</method>
-+<signal name="NotificationClosed">
-+    <arg type="u"/>
-+    <arg type="u"/>
-+</signal>
-+<signal name="ActionInvoked">
-+    <arg type="u"/>
-+    <arg type="s"/>
-+</signal>
-+</interface>;
- 
- const NotificationClosedReason = {
-     EXPIRED: 1,
-@@ -88,7 +91,8 @@ function NotificationDaemon() {
- 
- NotificationDaemon.prototype = {
-     _init: function() {
--        DBus.session.exportObject('/org/freedesktop/Notifications', this);
-+        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(NotificationDaemonIface, this);
-+        this._dbusImpl.export(Gio.DBus.session, '/org/freedesktop/Notifications');
- 
-         this._sources = [];
-         this._senderToPid = {};
-@@ -213,8 +217,8 @@ NotificationDaemon.prototype = {
-         return source;
-     },
- 
--    Notify: function(appName, replacesId, icon, summary, body,
--                     actions, hints, timeout) {
-+    NotifyAsync: function(params, invocation) {
-+        let [appName, replacesId, icon, summary, body, actions, hints, timeout] = params;
-         let id;
-         
-         let rewrites = rewriteRules[appName];
-@@ -257,51 +261,55 @@ NotificationDaemon.prototype = {
-         }
-         this._notifications[id] = ndata;
- 
--        let sender = DBus.getCurrentMessageContext().sender;
-+        let sender = invocation.get_sender();
-         let pid = this._senderToPid[sender];
- 
-         let source = this._getSource(appName, pid, ndata, sender, null);
- 
-         if (source) {
-             this._notifyForSource(source, ndata);
--            return id;
-+            return invocation.return_value(GLib.Variant.new('(u)', [id]));
-         }
- 
-         if (replacesId) {
-             // There's already a pending call to GetConnectionUnixProcessID,
-             // which will see the new notification data when it finishes,
-             // so we don't have to do anything.
--            return id;
-+            return invocation.return_value(GLib.Variant.new('(u)', [id]));
-         }
- 
--        this._busProxy.GetConnectionUnixProcessIDRemote(sender, Lang.bind(this,
--            function (pid, ex) {
--                // The app may have updated or removed the notification
--                ndata = this._notifications[id];
--                if (!ndata)
--                    return;
--
--                source = this._getSource(appName, pid, ndata, sender, null);
--
--                // We only store sender-pid entries for persistent sources.
--                // Removing the entries once the source is destroyed
--                // would result in the entries associated with transient
--                // sources removed once the notification is shown anyway.
--                // However, keeping these pairs would mean that we would
--                // possibly remove an entry associated with a persistent
--                // source when a transient source for the same sender is
--                // distroyed.
--                if (!source.isTransient) {
--                    this._senderToPid[sender] = pid;
--                    source.connect('destroy', Lang.bind(this,
--                        function() {
--                            delete this._senderToPid[sender];
--                        }));
--                }
--                this._notifyForSource(source, ndata);
--            }));
-+        this._busProxy.GetConnectionUnixProcessIDRemote(sender, Lang.bind(this, function (result, excp) {
-+            // The app may have updated or removed the notification
-+            ndata = this._notifications[id];
-+            if (!ndata)
-+                return;
- 
--        return id;
-+            if (excp) {
-+                logError(excp, 'Call to GetConnectionUnixProcessID failed');
-+                return;
-+            }
-+
-+            let [pid] = result;
-+            source = this._getSource(appName, pid, ndata, sender);
-+
-+            // We only store sender-pid entries for persistent sources.
-+            // Removing the entries once the source is destroyed
-+            // would result in the entries associated with transient
-+            // sources removed once the notification is shown anyway.
-+            // However, keeping these pairs would mean that we would
-+            // possibly remove an entry associated with a persistent
-+            // source when a transient source for the same sender is
-+            // distroyed.
-+            if (!source.isTransient) {
-+                this._senderToPid[sender] = pid;
-+                source.connect('destroy', Lang.bind(this, function() {
-+                    delete this._senderToPid[sender];
-+                }));
-+            }
-+            this._notifyForSource(source, ndata);
-+        }));
-+
-+        return invocation.return_value(GLib.Variant.new('(u)', [id]));
-     },
- 
-     _notifyForSource: function(source, ndata) {
-@@ -441,17 +449,13 @@ NotificationDaemon.prototype = {
-     },
- 
-     _emitNotificationClosed: function(id, reason) {
--        DBus.session.emit_signal('/org/freedesktop/Notifications',
--                                 'org.freedesktop.Notifications',
--                                 'NotificationClosed', 'uu',
--                                 [id, reason]);
-+        this._dbusImpl.emit_signal('NotificationClosed',
-+                                   GLib.Variant.new('(uu)', [id, reason]));
-     },
- 
-     _emitActionInvoked: function(id, action) {
--        DBus.session.emit_signal('/org/freedesktop/Notifications',
--                                 'org.freedesktop.Notifications',
--                                 'ActionInvoked', 'us',
--                                 [id, action]);
-+        this._dbusImpl.emit_signal('ActionInvoked',
-+                                   GLib.Variant.new('(us)', [id, action]));
-     },
- 
-     _onTrayIconAdded: function(o, icon) {
-@@ -465,8 +469,6 @@ NotificationDaemon.prototype = {
-     }
- };
- 
--DBus.conformExport(NotificationDaemon.prototype, NotificationDaemonIface);
--
- function Source(title, pid, sender, trayIcon) {
-     this._init(title, pid, sender, trayIcon);
- }
-@@ -481,15 +483,12 @@ Source.prototype = {
- 
-         this.pid = pid;
-         if (sender)
--            // TODO: dbus-glib implementation of watch_name() doesn’t return an id to be used for
--            // unwatch_name() or implement unwatch_name(), however when we move to using GDBus implementation,
--            // we should save the id here and call unwatch_name() with it in destroy().
--            // Moving to GDBus is the work in progress: https://bugzilla.gnome.org/show_bug.cgi?id=648651
--            // and https://bugzilla.gnome.org/show_bug.cgi?id=622921 .
--            DBus.session.watch_name(sender,
--                                    false,
--                                    null,
--                                    Lang.bind(this, this._onNameVanished));
-+            this._nameWatcherId = Gio.DBus.session.watch_name(sender,
-+                                                              Gio.BusNameWatcherFlags.NONE,
-+                                                              null,
-+                                                              Lang.bind(this, this._onNameVanished));
-+        else
-+            this._nameWatcherId = 0;
- 
-         this._setApp();
-         if (this.app)
-@@ -596,6 +595,10 @@ Source.prototype = {
-     },
- 
-     destroy: function() {
-+        if (this._nameWatcherId) {
-+            Gio.DBus.session.unwatch_name(this._nameWatcherId);
-+            this._nameWatcherId = 0;
-+        }
-         MessageTray.Source.prototype.destroy.call(this);
-     }
- };
-diff --git a/js/ui/scripting.js b/js/ui/scripting.js
-index 42c4f6d..9163d29 100644
---- a/js/ui/scripting.js
-+++ b/js/ui/scripting.js
-@@ -1,6 +1,5 @@
- // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
- 
--const DBus = imports.dbus;
- const Gio = imports.gi.Gio;
- const Mainloop = imports.mainloop;
- const Meta = imports.gi.Meta;
-@@ -70,24 +69,21 @@ function waitLeisure() {
-     };
- }
- 
--const PerfHelperIface = {
--    name: 'org.Cinnamon.PerfHelper',
--    methods: [{ name: 'CreateWindow', inSignature: 'iibb', outSignature: '' },
--              { name: 'WaitWindows', inSignature: '', outSignature: '' },
--              { name: 'DestroyWindows', inSignature: '', outSignature: ''}]
--};
--
--const PerfHelper = function () {
--    this._init();
--};
--
--PerfHelper.prototype = {
--     _init: function() {
--         DBus.session.proxifyObject(this, 'org.Cinnamon.PerfHelper', '/org/Cinnamon/PerfHelper');
--     }
--};
--
--DBus.proxifyPrototype(PerfHelper.prototype, PerfHelperIface);
-+const PerfHelperIface = <interface name="org.gnome.Shell.PerfHelper">
-+<method name="CreateWindow">
-+    <arg type="i" direction="in" />
-+    <arg type="i" direction="in" />
-+    <arg type="b" direction="in" />
-+    <arg type="b" direction="in" />
-+</method>
-+<method name="WaitWindows" />
-+<method name="DestroyWindows" />
-+</interface>;
-+
-+var PerfHelperProxy = Gio.DBusProxy.makeProxyWrapper(PerfHelperIface);
-+function PerfHelper() {
-+    return new PerfHelperProxy(Gio.DBus.session, 'org.gnome.Shell.PerfHelper', '/org/gnome/Shell/PerfHelper');
-+}
- 
- let _perfHelper = null;
- function _getPerfHelper() {
--- 
-1.8.1.6
-
-
-From 135d2228bbf6d3b1be5f90e0e599cd3880e06d93 Mon Sep 17 00:00:00 2001
-From: dalcde <dalcde@yahoo.com.hk>
-Date: Tue, 16 Apr 2013 16:58:30 +0800
-Subject: [PATCH 07/16] [GDBus][Sound/Power Applet] Fix dbus port issues
-
----
- files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
-index b6b2bcd..fad39ab 100644
---- a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
-+++ b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
-@@ -212,7 +212,7 @@ MyApplet.prototype = {
-             this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-             this.menu.addSettingsAction(_("Power Settings"), 'power');
- 
--            this._smProxy.connect('PropertiesChanged', Lang.bind(this, this._devicesChanged));
-+            this._smProxy.connectSignal('PropertiesChanged', Lang.bind(this, this._devicesChanged));
-             this._devicesChanged();            
-         }
-         catch (e) {
--- 
-1.8.1.6
-
-
-From 5880ce34538ec2791b5e58cc3ffc07e41c189c82 Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Fri, 19 Apr 2013 19:09:18 -0400
-Subject: [PATCH 08/16] Fix gicon error - power applet
-
----
- files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
-index fad39ab..3a13eab 100644
---- a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
-+++ b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
-@@ -323,7 +323,7 @@ MyApplet.prototype = {
-         let icon = this._proxy.Icon;
-         if (icon) {
-             let gicon = Gio.icon_new_for_string(icon);
--            this.setGIcon(gicon);
-+            this._applet_icon.gicon = gicon
-             this.actor.show();
-         } else {
-             this.menu.close();
--- 
-1.8.1.6
-
-
-From 647bd58c93541acdba11cd11d586d2cb08a0a4eb Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Fri, 19 Apr 2013 19:44:33 -0400
-Subject: [PATCH 09/16] Remove unused
-
----
- src/cinnamon-background-manager.c | 34 ----------------------------------
- 1 file changed, 34 deletions(-)
-
-diff --git a/src/cinnamon-background-manager.c b/src/cinnamon-background-manager.c
-index 9d95250..67427ed 100644
---- a/src/cinnamon-background-manager.c
-+++ b/src/cinnamon-background-manager.c
-@@ -66,8 +66,6 @@ struct CinnamonBackgroundManagerPrivate
- 
- G_DEFINE_TYPE (CinnamonBackgroundManager, cinnamon_background_manager, G_TYPE_OBJECT)
- 
--static gpointer manager_object = NULL;
--
- static gboolean
- dont_draw_background (CinnamonBackgroundManager *manager)
- {
-@@ -223,36 +221,6 @@ struct CinnamonBackgroundManagerPrivate
- }
- 
- static void
--draw_background_after_session_loads (CinnamonBackgroundManager *manager)
--{
--        GError *error = NULL;
--        GDBusProxyFlags flags;
--
--        flags = G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES |
--                G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START;
--        manager->priv->proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
--                                                              flags,
--                                                              NULL, /* GDBusInterfaceInfo */
--                                                              "org.gnome.SessionManager",
--                                                              "/org/gnome/SessionManager",
--                                                              "org.gnome.SessionManager",
--                                                              NULL, /* GCancellable */
--                                                              &error);
--        if (manager->priv->proxy == NULL) {
--                g_warning ("Could not listen to session manager: %s",
--                           error->message);
--                g_error_free (error);
--                return;
--        }
--
--        manager->priv->proxy_signal_id = g_signal_connect (manager->priv->proxy,
--                                                           "g-signal",
--                                                           G_CALLBACK (on_session_manager_signal),
--                                                           manager);
--}
--
--
--static void
- disconnect_screen_signals (CinnamonBackgroundManager *manager)
- {
-         GdkDisplay *display;
-@@ -312,8 +280,6 @@ struct CinnamonBackgroundManagerPrivate
-                           G_CALLBACK (draw_background_changed), manager);
- 
-         setup_bg_and_draw_background (manager);
--            //draw_background_after_session_loads (manager);
--
- 
-         return TRUE;
- }
--- 
-1.8.1.6
-
-
-From 7a8233638187d00798cf3a4b66a27d707eaec804 Mon Sep 17 00:00:00 2001
-From: dalcde <dalcde@yahoo.com.hk>
-Date: Sat, 20 Apr 2013 15:42:13 +0800
-Subject: [PATCH 10/16] [GDBus][Power applet] Some fixes and cleanup
-
----
- .../cinnamon/applets/power@cinnamon.org/applet.js  | 52 ++++++----------------
- 1 file changed, 14 insertions(+), 38 deletions(-)
-
-diff --git a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
-index 3a13eab..5f81d91 100644
---- a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
-+++ b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
-@@ -48,40 +48,11 @@ const PowerManagerInterface = <interface name="org.gnome.SettingsDaemon.Power">
- <method name="GetPrimaryDevice">
-     <arg type="(susdut)" direction="out"/>
- </method>
--<signal name="PropertiesChanged">
--    <arg type="s"/>
--    <arg type="a{sv}"/>
--    <arg type="a[s]"/>
--</signal>
- <property name="Icon" type="s" access="read" />
- </interface>;
- 
- const PowerManagerProxy = Gio.DBusProxy.makeProxyWrapper(PowerManagerInterface);
- 
--const SettingsManagerInterface = <interface name="org.freedesktop.DBus.Properties">
--<method name="Get">
--    <arg type="s" direction="in"/>
--    <arg type="s" direction="in"/>
--    <arg type="v" direction="out"/>
--</method>
--<method name="GetAll">
--    <arg type="s" direction="in"/>
--    <arg type="a{sv}" direction="out"/>
--</method>
--<method name="Set">
--    <arg type="s" direction="in"/>
--    <arg type="s" direction="in"/>
--    <arg type="v" direction="in"/>
--</method>
--<signal name="PropertiesChanged">
--    <arg type="s"/>
--    <arg type="a{sv}"/>
--    <arg type="a[s]"/>
--</signal>
--</interface>;
--
--const SettingsManagerProxy = Gio.DBusProxy.makeProxyWrapper(SettingsManagerInterface);
--
- function DeviceItem() {
-     this._init.apply(this, arguments);
- }
-@@ -156,8 +127,16 @@ MyApplet.prototype = {
-             this.menuManager.addMenu(this.menu);            
- 
-             //this.set_applet_icon_symbolic_name('battery-missing');            
--            this._proxy = new PowerManagerProxy(Gio.DBus.session, BUS_NAME, OBJECT_PATH);
--            this._smProxy = new SettingsManagerProxy(Gio.DBus.session, BUS_NAME, OBJECT_PATH);
-+            this._proxy = new PowerManagerProxy(Gio.DBus.session, BUS_NAME, OBJECT_PATH,
-+                                               Lang.bind(this, function(proxy, error) {
-+                                                             if (error) {
-+                                                                 global.log(error.message);
-+
-+                                                                 return;
-+                                                             }
-+                                                             this._proxy.connect('g-properties-changed', Lang.bind(this, this._devicesChanged));
-+                                                             this._devicesChanged();
-+                                               }));
- 
-             let icon = this.actor.get_children()[0];
-             this.actor.remove_actor(icon);
-@@ -211,9 +190,6 @@ MyApplet.prototype = {
- 
-             this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-             this.menu.addSettingsAction(_("Power Settings"), 'power');
--
--            this._smProxy.connectSignal('PropertiesChanged', Lang.bind(this, this._devicesChanged));
--            this._devicesChanged();            
-         }
-         catch (e) {
-             global.logError(e);
-@@ -245,14 +221,14 @@ MyApplet.prototype = {
-     },
-     
-     _readPrimaryDevice: function() {
--        this._proxy.GetPrimaryDeviceRemote(Lang.bind(this, function(device, error) {
-+        this._proxy.GetPrimaryDeviceRemote(Lang.bind(this, function(result, error) {
-             if (error) {
-                 this._hasPrimary = false;
-                 this._primaryDeviceId = null;
-                 this._batteryItem.actor.hide();                
-                 return;
-             }
--            let [device_id, device_type, icon, percentage, state, seconds] = device;
-+            let [[device_id, device_type, icon, percentage, state, seconds]] = result;
-             if (device_type == UPDeviceType.BATTERY) {
-                 this._hasPrimary = true;
-                 let time = Math.round(seconds / 60);
-@@ -290,7 +266,7 @@ MyApplet.prototype = {
-     },
- 
-     _readOtherDevices: function() {
--        this._proxy.GetDevicesRemote(Lang.bind(this, function(devices, error) {
-+        this._proxy.GetDevicesRemote(Lang.bind(this, function([devices], error) {
-             this._deviceItems.forEach(function(i) { i.destroy(); });
-             this._deviceItems = [];
- 
-@@ -336,7 +312,7 @@ MyApplet.prototype = {
-     },
-     
-     _updateLabel: function() {
--        this._proxy.GetDevicesRemote(Lang.bind(this, function(devices, error) {
-+        this._proxy.GetDevicesRemote(Lang.bind(this, function([devices], error) {
-             if (error) {
-                 this._mainLabel.set_text("");
-                 return;
--- 
-1.8.1.6
-
-
-From 1a74c4a4d010a6ddcd2350b1ea298710bc1c08b1 Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Sat, 20 Apr 2013 10:59:54 -0400
-Subject: [PATCH 11/16] Move CLUTTER_DISABLE_XINPUT to session startup file
-
----
- files/usr/bin/gnome-session-cinnamon | 2 +-
- src/main.c                           | 3 ---
- 2 files changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/files/usr/bin/gnome-session-cinnamon b/files/usr/bin/gnome-session-cinnamon
-index 315f135..56c37f5 100755
---- a/files/usr/bin/gnome-session-cinnamon
-+++ b/files/usr/bin/gnome-session-cinnamon
-@@ -1,3 +1,3 @@
- #! /bin/sh
--exec gnome-session --session cinnamon "$@"
-+exec CLUTTER_DISABLE_XINPUT=1 gnome-session --session cinnamon "$@"
- 
-diff --git a/src/main.c b/src/main.c
-index 9d37975..418fb60 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -257,9 +257,6 @@
- 
-   g_option_context_free (ctx);
- 
--  /* Disable XInput extension - required for 3.8 compatibility */
--  g_setenv ("CLUTTER_DISABLE_XINPUT", "1", TRUE);
--
-   meta_plugin_type_register (gnome_cinnamon_plugin_get_type ());
- 
-   /* Prevent meta_init() from causing gtk to load gail and at-bridge */
--- 
-1.8.1.6
-
-
-From dfa107fd874866da2f634c65a90e2c13a447464c Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Sat, 20 Apr 2013 12:23:29 -0400
-Subject: [PATCH 12/16] Add Xinput disable to cinnamon2d
-
----
- files/usr/bin/cinnamon2d | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/files/usr/bin/cinnamon2d b/files/usr/bin/cinnamon2d
-index 1eced99..7f42517 100755
---- a/files/usr/bin/cinnamon2d
-+++ b/files/usr/bin/cinnamon2d
-@@ -1,2 +1,2 @@
- #!/bin/bash
--CLUTTER_PAINT=disable-clipped-redraws:disable-culling LIBGL_ALWAYS_SOFTWARE=1 CINNAMON_SOFTWARE_RENDERING=1 CINNAMON_SLOWDOWN_FACTOR=0.0001 MUFFIN_NO_SHADOWS=1 CLUTTER_DEFAULT_FPS=15 cinnamon $@
-+CLUTTER_DISABLE_XINPUT=1 CLUTTER_PAINT=disable-clipped-redraws:disable-culling LIBGL_ALWAYS_SOFTWARE=1 CINNAMON_SOFTWARE_RENDERING=1 CINNAMON_SLOWDOWN_FACTOR=0.0001 MUFFIN_NO_SHADOWS=1 CLUTTER_DEFAULT_FPS=15 cinnamon $@
--- 
-1.8.1.6
-
-
-From 28b39b2372a571ddcc1298f34f2d7e653f6b2e96 Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Sat, 20 Apr 2013 12:29:43 -0400
-Subject: [PATCH 13/16] Fix session file
-
----
- files/usr/bin/gnome-session-cinnamon | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/files/usr/bin/gnome-session-cinnamon b/files/usr/bin/gnome-session-cinnamon
-index 56c37f5..31c9eff 100755
---- a/files/usr/bin/gnome-session-cinnamon
-+++ b/files/usr/bin/gnome-session-cinnamon
-@@ -1,3 +1,3 @@
- #! /bin/sh
--exec CLUTTER_DISABLE_XINPUT=1 gnome-session --session cinnamon "$@"
-+CLUTTER_DISABLE_XINPUT=1 exec gnome-session --session cinnamon "$@"
- 
--- 
-1.8.1.6
-
-
-From aba3a7666d3679e5803862af07edc47e7b093b11 Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Sat, 20 Apr 2013 12:36:45 -0400
-Subject: [PATCH 14/16] Add cinnamon3d command
-
----
- files/usr/bin/cinnamon3d | 2 ++
- 1 file changed, 2 insertions(+)
- create mode 100644 files/usr/bin/cinnamon3d
-
-diff --git a/files/usr/bin/cinnamon3d b/files/usr/bin/cinnamon3d
-new file mode 100644
-index 0000000..4891783
---- /dev/null
-+++ b/files/usr/bin/cinnamon3d
-@@ -0,0 +1,2 @@
-+#!/bin/bash
-+CLUTTER_DISABLE_XINPUT=1 cinnamon $@
--- 
-1.8.1.6
-
-
-From 3e1cdf6d88ade9abe5a0b8773b565d345c01f2cb Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Sat, 20 Apr 2013 12:37:26 -0400
-Subject: [PATCH 15/16] Fix perms
-
----
- files/usr/bin/cinnamon3d | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
- mode change 100644 => 100755 files/usr/bin/cinnamon3d
-
-diff --git a/files/usr/bin/cinnamon3d b/files/usr/bin/cinnamon3d
-old mode 100644
-new mode 100755
--- 
-1.8.1.6
-
-
-From 7904eaf179918f4f97b328f2b5f340776544ca49 Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Mon, 22 Apr 2013 18:27:39 -0400
-Subject: [PATCH 16/16] Sledgehammer merge of:
-
-f251f0b77d01cb9a80212b1dce2538c60a5bf59e
-
-Don't ask...
----
- .../share/cinnamon/applets/sound@cinnamon.org/applet.js    | 14 +++++++++++---
- 1 file changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
-index c8427ac..a7b2e09 100644
---- a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
-+++ b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
-@@ -53,8 +53,8 @@ const MediaServer2PlayerIFace = <interface name="org.mpris.MediaPlayer2.Player">
- 
- /* global values */
- let icon_path = "/usr/share/cinnamon/theme/";
--let compatible_players = [ "clementine", "mpd", "exaile", "banshee", "rhythmbox", "rhythmbox3", "pragha", "quodlibet", "guayadeque", "amarok", "googlemusicframe", "xbmc", "noise", "xnoise", "gmusicbrowser", "spotify", "audacious", "vlc", "beatbox", "songbird", "pithos", "gnome-mplayer", "nuvolaplayer" ];
--let support_seek = [ "clementine", "banshee", "rhythmbox", "rhythmbox3", "pragha", "quodlibet", "amarok", "noise", "xnoise", "gmusicbrowser", "spotify", "vlc", "beatbox", "gnome-mplayer" ];
-+let compatible_players = [ "clementine", "mpd", "exaile", "banshee", "rhythmbox", "rhythmbox3", "pragha", "quodlibet", "guayadeque", "amarok", "googlemusicframe", "xbmc", "noise", "xnoise", "gmusicbrowser", "spotify", "audacious", "vlc", "beatbox", "songbird", "pithos", "gnome-mplayer", "nuvolaplayer", "qmmp"];
-+let support_seek = [ "clementine", "banshee", "rhythmbox", "rhythmbox3", "pragha", "quodlibet", "amarok", "noise", "xnoise", "gmusicbrowser", "spotify", "vlc", "beatbox", "gnome-mplayer", "qmmp" ];
- /* dummy vars for translation */
- let x = _("Playing");
- x = _("Paused");
-
-@@ -377,7 +384,8 @@ Player.prototype = {
-                     cover.read_async(null, null, Lang.bind(this, this._onReadCover));
-                 }
-                 else {
--                    cover_path = decodeURIComponent(this._trackCoverFile.substr(7));
-+                    cover_path = decodeURIComponent(this._trackCoverFile);
-+                    cover_path = cover_path.replace("file://", "");
-                     this._showCover(cover_path);
-                 }
-             }
--- 
-1.8.1.6
-
-From 1f209cec0fa0e9d12b3c29884302f4b8e70ff4c9 Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Thu, 9 May 2013 11:48:08 -0400
-Subject: [PATCH] Fix notifications and other stuff
-
----
- .../cinnamon/applets/sound@cinnamon.org/applet.js  |   2 +-
- js/ui/notificationDaemon.js                        |   7 +-
- src/main.c                                         | 169 ++++++++++++---------
- 3 files changed, 103 insertions(+), 75 deletions(-)
-
-diff --git a/js/ui/notificationDaemon.js b/js/ui/notificationDaemon.js
-index b037e07..58b2df3 100644
---- a/js/ui/notificationDaemon.js
-+++ b/js/ui/notificationDaemon.js
-@@ -220,7 +220,12 @@ NotificationDaemon.prototype = {
-     NotifyAsync: function(params, invocation) {
-         let [appName, replacesId, icon, summary, body, actions, hints, timeout] = params;
-         let id;
--        
-+
-+        for (let hint in hints) {
-+            // unpack the variants
-+            hints[hint] = hints[hint].deep_unpack();
-+        }
-+
-         let rewrites = rewriteRules[appName];
-         if (rewrites) {
-             for (let i = 0; i < rewrites.length; i++) {
-diff --git a/src/main.c b/src/main.c
-index 418fb60..773fb65 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -34,99 +34,122 @@
- #define OVERRIDES_SCHEMA "org.cinnamon.overrides"
- 
- static void
-+cinnamon_dbus_acquire_name (GDBusProxy *bus,
-+                         guint32     request_name_flags,
-+                         guint32    *request_name_result,
-+                         gchar      *name,
-+                         gboolean    fatal)
-+{
-+  GError *error = NULL;
-+  GVariant *request_name_variant;
-+
-+  if (!(request_name_variant = g_dbus_proxy_call_sync (bus,
-+                                                       "RequestName",
-+                                                       g_variant_new ("(su)", name, request_name_flags),
-+                                                       0, /* call flags */
-+                                                       -1, /* timeout */
-+                                                       NULL, /* cancellable */
-+                                                       &error)))
-+    {
-+      g_printerr ("failed to acquire %s: %s\n", name, error->message);
-+      if (!fatal)
-+        return;
-+      exit (1);
-+    }
-+  g_variant_get (request_name_variant, "(u)", request_name_result);
-+}
-+
-+static void
-+cinnamon_dbus_acquire_names (GDBusProxy *bus,
-+                          guint32     request_name_flags,
-+                          gchar      *name,
-+                          gboolean    fatal, ...) G_GNUC_NULL_TERMINATED;
-+
-+static void
-+cinnamon_dbus_acquire_names (GDBusProxy *bus,
-+                          guint32     request_name_flags,
-+                          gchar      *name,
-+                          gboolean    fatal, ...)
-+{
-+  va_list al;
-+  guint32 request_name_result;
-+  va_start (al, fatal);
-+  for (;;)
-+  {
-+    cinnamon_dbus_acquire_name (bus,
-+                             request_name_flags,
-+                             &request_name_result,
-+                             name, fatal);
-+    name = va_arg (al, gchar *);
-+    if (!name)
-+      break;
-+    fatal = va_arg (al, gboolean);
-+  }
-+  va_end (al);
-+}
-+
-+static void
- cinnamon_dbus_init (gboolean replace)
- {
-+  GDBusConnection *session;
-+  GDBusProxy *bus;
-   GError *error = NULL;
--  DBusGConnection *session;
--  DBusGProxy *bus;
-   guint32 request_name_flags;
-   guint32 request_name_result;
- 
--  /** TODO:
--   * In the future we should use GDBus for this.  However, in
--   * order to do that, we need to port all of the JavaScript
--   * code.  Otherwise, the name will be claimed on the wrong
--   * connection.
--   */
--  session = dbus_g_bus_get (DBUS_BUS_SESSION, NULL);
-+  session = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
- 
--  bus = dbus_g_proxy_new_for_name (session,
--                                   DBUS_SERVICE_DBUS,
--                                   DBUS_PATH_DBUS,
--                                   DBUS_INTERFACE_DBUS);
-+  if (error) {
-+    g_printerr ("Failed to connect to session bus: %s", error->message);
-+    exit (1);
-+  }
- 
--  request_name_flags = DBUS_NAME_FLAG_DO_NOT_QUEUE | DBUS_NAME_FLAG_ALLOW_REPLACEMENT;
-+  bus = g_dbus_proxy_new_sync (session,
-+                               G_DBUS_PROXY_FLAGS_NONE,
-+                               NULL, /* interface info */
-+                               "org.freedesktop.DBus",
-+                               "/org/freedesktop/DBus",
-+                               "org.freedesktop.DBus",
-+                               NULL, /* cancellable */
-+                               &error);
-+
-+  request_name_flags = G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT;
-   if (replace)
-     request_name_flags |= DBUS_NAME_FLAG_REPLACE_EXISTING;
--  if (!dbus_g_proxy_call (bus, "RequestName", &error,
--                          G_TYPE_STRING, CINNAMON_DBUS_SERVICE,
--                          G_TYPE_UINT, request_name_flags,
--                          G_TYPE_INVALID,
--                          G_TYPE_UINT, &request_name_result,
--                          G_TYPE_INVALID))
--    {
--      g_printerr ("failed to acquire org.Cinnamon: %s\n", error->message);
--      exit (1);
--    }
-+
-+  cinnamon_dbus_acquire_name (bus,
-+                           request_name_flags,
-+                           &request_name_result,
-+                           CINNAMON_DBUS_SERVICE, TRUE);
-   if (!(request_name_result == DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER
-         || request_name_result == DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER))
-     {
--      g_printerr ("%s already exists on bus and --replace not specified\n",
--                  CINNAMON_DBUS_SERVICE);
-+      g_printerr (CINNAMON_DBUS_SERVICE " already exists on bus and --replace not specified\n");
-       exit (1);
-     }
- 
--  /* Also grab org.gnome.Panel to replace any existing panel process */
--  if (!dbus_g_proxy_call (bus, "RequestName", &error, G_TYPE_STRING,
--                          "org.gnome.Panel", G_TYPE_UINT,
--                          DBUS_NAME_FLAG_REPLACE_EXISTING | request_name_flags,
--                          G_TYPE_INVALID, G_TYPE_UINT,
--                          &request_name_result, G_TYPE_INVALID))
--    {
--      g_print ("failed to acquire org.gnome.Panel: %s\n", error->message);
--      exit (1);
--    }
--
--  /* ...and the org.gnome.Magnifier service.
--   */
--  if (!dbus_g_proxy_call (bus, "RequestName", &error,
--                          G_TYPE_STRING, MAGNIFIER_DBUS_SERVICE,
--                          G_TYPE_UINT, DBUS_NAME_FLAG_REPLACE_EXISTING | request_name_flags,
--                          G_TYPE_INVALID,
--                          G_TYPE_UINT, &request_name_result,
--                          G_TYPE_INVALID))
--    {
--      g_print ("failed to acquire %s: %s\n", MAGNIFIER_DBUS_SERVICE, error->message);
--      /* Failing to acquire the magnifer service is not fatal.  Log the error,
--       * but keep going. */
--    }
--
--  /* ...and the org.freedesktop.Notifications service; we always
--   * specify REPLACE_EXISTING to ensure we kill off
--   * notification-daemon if it was running.
-+  /*
-+   * We always specify REPLACE_EXISTING to ensure we kill off
-+   * the existing service if it was running.
-    */
--  if (!dbus_g_proxy_call (bus, "RequestName", &error,
--                          G_TYPE_STRING, "org.freedesktop.Notifications",
--                          G_TYPE_UINT, DBUS_NAME_FLAG_REPLACE_EXISTING | request_name_flags,
--                          G_TYPE_INVALID,
--                          G_TYPE_UINT, &request_name_result,
--                          G_TYPE_INVALID))
--    {
--      g_print ("failed to acquire org.freedesktop.Notifications: %s\n", error->message);
--    }
-+  request_name_flags |= G_BUS_NAME_OWNER_FLAGS_REPLACE;
- 
-+  cinnamon_dbus_acquire_names (bus,
-+                            request_name_flags,
-+  /* Also grab org.gnome.Panel to replace any existing panel process */
-+                            "org.gnome.Panel", TRUE,
-+  /* ...and the org.gnome.Magnifier service. */
-+                            MAGNIFIER_DBUS_SERVICE, FALSE,
-+  /* ...and the org.freedesktop.Notifications service. */
-+                            "org.freedesktop.Notifications", FALSE,
-+                            NULL);
-   /* ...and the on-screen keyboard service */
--  if (!dbus_g_proxy_call (bus, "RequestName", &error,
--                          G_TYPE_STRING, "org.gnome.Caribou.Keyboard",
--                          G_TYPE_UINT, DBUS_NAME_FLAG_REPLACE_EXISTING,
--                          G_TYPE_INVALID,
--                          G_TYPE_UINT, &request_name_result,
--                          G_TYPE_INVALID))
--    {
--      g_print ("failed to acquire org.gnome.Caribou.Keyboard: %s\n", error->message);
--    }
--
-+  cinnamon_dbus_acquire_name (bus,
-+                           DBUS_NAME_FLAG_REPLACE_EXISTING,
-+                           &request_name_result,
-+                           "org.gnome.Caribou.Keyboard", FALSE);
-   g_object_unref (bus);
-+  g_object_unref (session);
- }
- 
- static void
--- 
-1.8.1.6
-
---- a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
-+++ b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
-@@ -801,7 +801,7 @@
-             this._players = {};
-             // watch players
-             for (var p=0; p<compatible_players.length; p++) {
--                DBus.session.watch_name('org.mpris.MediaPlayer2.'+compatible_players[p], false,
-+                Gio.DBus.session.watch_name('org.mpris.MediaPlayer2.'+compatible_players[p], Gio.BusNameWatcherFlags.NONE,
-                     Lang.bind(this, this._addPlayer),
-                     Lang.bind(this, this._removePlayer)
-                 );
--- 
-1.8.1.6
\ No newline at end of file
diff --git a/community/cinnamon/idle-dim.patch b/community/cinnamon/idle-dim.patch
deleted file mode 100644
index 17f5af616..000000000
--- a/community/cinnamon/idle-dim.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -Naur linuxmint-Cinnamon-a464dc9.orig/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js linuxmint-Cinnamon-a464dc9/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js
---- linuxmint-Cinnamon-a464dc9.orig/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js	2013-04-30 18:01:56.000000000 +0200
-+++ linuxmint-Cinnamon-a464dc9/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js	2013-05-02 19:32:12.934254811 +0200
-@@ -9,8 +9,7 @@
- 
- /* constants */
- const DimSettingsSchema = "org.gnome.settings-daemon.plugins.power";
--const DimSettingsAc = "idle-dim-ac";
--const DimSettingsBattery = "idle-dim-battery";
-+const DimSettings = "idle-dim";
- const PowerBusName = 'org.gnome.SettingsDaemon';
- const PowerObjectPath = '/org/gnome/SettingsDaemon/Power';
- 
-@@ -116,10 +115,8 @@
-             
-             this._settingsMenu = new PopupMenu.PopupSubMenuMenuItem(_("Dimming settings"));
-             
--            let dimSwitchAc = this._buildItem(_("Dim screen on AC power"), DimSettingsSchema, DimSettingsAc);
--            this._settingsMenu.menu.addMenuItem(dimSwitchAc);
--            let dimSwitchBattery = this._buildItem(_("Dim screen on battery"), DimSettingsSchema, DimSettingsBattery);
--            this._settingsMenu.menu.addMenuItem(dimSwitchBattery);
-+            let dimSwitch = this._buildItem(_("Dim screen"), DimSettingsSchema, DimSettings);
-+            this._settingsMenu.menu.addMenuItem(dimSwitch);
-                       
-             //initial update.
-             //We have to wait until dbus calls back to decide whether to display brightness controls.
-@@ -145,7 +142,7 @@
-                     this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-                 }
-                 
--                this.menu.addSettingsAction(_("Settings"), "screen");
-+                this.menu.addSettingsAction(_("Settings"), "screensaver");
- 		    }));
-         }
-         catch (e) {
diff --git a/community/cinnamon/keyboard_applet.patch b/community/cinnamon/keyboard_applet.patch
deleted file mode 100644
index 6b3694086..000000000
--- a/community/cinnamon/keyboard_applet.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-diff --git a/applet.js b/applet.js
---- a/files/usr/share/cinnamon/applets/keyboard@cinnamon.org/applet.js
-+++ b/files/usr/share/cinnamon/applets/keyboard@cinnamon.org/applet.js
-@@ -1,9 +1,10 @@
- const Applet = imports.ui.applet;
--const Gkbd = imports.gi.Gkbd;
- const Lang = imports.lang;
--const Cinnamon = imports.gi.Cinnamon;
-+const Gio = imports.gi.Gio;
-+const GLib = imports.gi.GLib;
- const St = imports.gi.St;
- const Gtk = imports.gi.Gtk;
-+const GnomeDesktop = imports.gi.GnomeDesktop;
- const Main = imports.ui.main;
- const PopupMenu = imports.ui.popupMenu;
- const Util = imports.misc.util;
-@@ -15,11 +16,12 @@
- LayoutMenuItem.prototype = {
-     __proto__: PopupMenu.PopupBaseMenuItem.prototype,
- 
--    _init: function(config, id, indicator, long_name) {
-+    _init: function(ipsettings, id, index, indicator, long_name) {
-         PopupMenu.PopupBaseMenuItem.prototype._init.call(this);
- 
--        this._config = config;
-+        this._ipsettings = ipsettings;
-         this._id = id;
-+        this._index = index;
-         this.label = new St.Label({ text: long_name });
-         this.indicator = indicator;
-         this.addActor(this.label);
-@@ -28,7 +30,7 @@
- 
-     activate: function(event) {
-         PopupMenu.PopupBaseMenuItem.prototype.activate.call(this);
--        this._config.lock_group(this._id);
-+        this._ipsettings.set_value('current', GLib.Variant.new_uint32(this._index));
-     }
- };
- 
-@@ -54,18 +56,18 @@
-             this._layoutItems = [ ];
- 
-             this._showFlags = global.settings.get_boolean("keyboard-applet-use-flags");
--            this._config = Gkbd.Configuration.get();
--            this._config.connect('changed', Lang.bind(this, this._syncConfig));
--            this._config.connect('group-changed', Lang.bind(this, this._syncGroup));
-+            this._xkbInfo = new GnomeDesktop.XkbInfo();
-+            this._ipsettings = new Gio.Settings({ schema: 'org.gnome.desktop.input-sources' });
-+            this._ipsettings.connect('changed::sources', Lang.bind(this, this._syncConfig));
-+            this._ipsettings.connect('changed::current', Lang.bind(this, this._syncGroup));
-             global.settings.connect('changed::keyboard-applet-use-flags', Lang.bind(this, this._reload_settings));
--            this._config.start_listen();
- 
-             this._syncConfig();
- 
-             this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-             this.menu.addAction(_("Show Keyboard Layout"), Lang.bind(this, function() {
-                 Main.overview.hide();
--                Util.spawn(['gkbd-keyboard-display', '-g', String(this._config.get_current_group() + 1)]);
-+                Util.spawn(['gkbd-keyboard-display', '-l', this._selectedLayout._id]);
-             }));                                
-             this.menu.addAction(_("Show Character Table"), Lang.bind(this, function() {
-                 Main.overview.hide();
-@@ -98,7 +100,6 @@
-     },
-     
-     _reload_settings: function() {
--        this._showFlags = global.settings.get_boolean("keyboard-applet-use-flags");
-         this._syncConfig();
-     },
-     
-@@ -127,8 +128,8 @@
-     _syncConfig: function() {
-         this._showFlags = global.settings.get_boolean("keyboard-applet-use-flags");
- 
--        let groups = this._config.get_group_names();
--        if (groups.length > 1) {
-+        let sources = this._ipsettings.get_value('sources');
-+        if (sources.n_children() > 1) {
-             this.actor.show();
-         } else {
-             this.menu.close();
-@@ -141,25 +142,29 @@
-         for (let i = 0; i < this._labelActors.length; i++)
-             this._labelActors[i].destroy();
- 
--        let short_names = this._adjustGroupNames(this._config.get_short_group_names());
--
-         this._selectedLayout = null;
-         this._layoutItems = [ ];
-         this._labelActors = [ ];
--        for (let i = 0; i < groups.length; i++) {
--            let icon_name = this._config.get_group_name(i);
-+        for (let i = 0; i < sources.n_children(); i++) {
-+            let [type, id] = sources.get_child_value(i).deep_unpack();
-+            let displayName = id;
-+            let shortName = id;
-+            let xkbLayout = id;
-+            if (type == 'xkb') {
-+                [_exists, displayName, shortName, xkbLayout, _xkbVariant] = this._xkbInfo.get_layout_info(id);
-+            } // TODO: errorhandling, handle 'ibus'
-+            let icon_name = xkbLayout; // FIXME: Really?
-             let actor;
-             if (this._showFlags)
-                 actor = new St.Icon({ icon_name: icon_name, icon_type: St.IconType.FULLCOLOR, style_class: 'popup-menu-icon' });
-             else
--                actor = new St.Label({ text: short_names[i] });
--            let item = new LayoutMenuItem(this._config, i, actor, groups[i]);
--            item._short_group_name = short_names[i];
-+                actor = new St.Label({ text: shortName });
-+            let item = new LayoutMenuItem(this._ipsettings, id, i, actor, displayName);
-             item._icon_name = icon_name;
-             this._layoutItems.push(item);
-             this.menu.addMenuItem(item, i);
- 
--            let shortLabel = new St.Label({ text: short_names[i] });
-+            let shortLabel = new St.Label({ text: shortName });
-             this._labelActors.push(shortLabel);
-         }
- 
-@@ -167,17 +172,17 @@
-     },
- 
-     _syncGroup: function() {
--        let selected = this._config.get_current_group();
-+        let current = this._ipsettings.get_uint('current');
- 
-         if (this._selectedLayout) {
-             this._selectedLayout.setShowDot(false);
-             this._selectedLayout = null;
-         }
- 
--        let item = this._layoutItems[selected];
-+        let item = this._layoutItems[current];
-         item.setShowDot(true);
- 
--        let selectedLabel = this._labelActors[selected];
-+        let selectedLabel = this._labelActors[current];
- 
-         if (this._showFlags) {
-             this.set_applet_icon_name(item._icon_name);
diff --git a/community/cinnamon/switch-applications.patch b/community/cinnamon/switch-applications.patch
deleted file mode 100644
index 1254a7ce4..000000000
--- a/community/cinnamon/switch-applications.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -Naur linuxmint-Cinnamon-b41bad0.orig/files/usr/lib/cinnamon-settings/modules/cs_keyboard.py linuxmint-Cinnamon-b41bad0/files/usr/lib/cinnamon-settings/modules/cs_keyboard.py
---- linuxmint-Cinnamon-b41bad0.orig/files/usr/lib/cinnamon-settings/modules/cs_keyboard.py	2013-04-15 15:55:01.000000000 +0200
-+++ linuxmint-Cinnamon-b41bad0/files/usr/lib/cinnamon-settings/modules/cs_keyboard.py	2013-04-24 21:19:49.262020614 +0200
-@@ -43,8 +43,8 @@
-     # Cinnamon stuff
-     [_("Toggle Scale"), "org.gnome.desktop.wm.keybindings", "switch-to-workspace-down", True, "cinnamon"],
-     [_("Toggle Expo"), "org.gnome.desktop.wm.keybindings", "switch-to-workspace-up", True, "cinnamon"],
--    [_("Cycle through open windows"), "org.gnome.desktop.wm.keybindings", "switch-windows", True, "cinnamon"],
--    [_("Cycle backwards though open windows"), "org.gnome.desktop.wm.keybindings", "switch-windows-backward", True, "cinnamon"],
-+    [_("Cycle through open windows"), "org.gnome.desktop.wm.keybindings", "switch-applications", True, "cinnamon"],
-+    [_("Cycle backwards though open windows"), "org.gnome.desktop.wm.keybindings", "switch-applications-backward", True, "cinnamon"],
-     [_("Run dialog (must restart Cinnamon)"), "org.gnome.desktop.wm.keybindings", "panel-run-dialog", True, "cinnamon"],
-     [_("Menu button (must restart Cinnamon)"), "org.cinnamon.muffin", "overlay-key", False, "cinnamon"],
- 
-diff -Naur linuxmint-Cinnamon-b41bad0.orig/js/ui/windowManager.js linuxmint-Cinnamon-b41bad0/js/ui/windowManager.js
---- linuxmint-Cinnamon-b41bad0.orig/js/ui/windowManager.js	2013-04-15 15:55:01.000000000 +0200
-+++ linuxmint-Cinnamon-b41bad0/js/ui/windowManager.js	2013-04-24 21:21:22.447677094 +0200
-@@ -131,11 +131,11 @@
-                                             Lang.bind(this, this._showWorkspaceSwitcher));
-         Meta.keybindings_set_custom_handler('switch-to-workspace-down',
-                                             Lang.bind(this, this._showWorkspaceSwitcher));
--        Meta.keybindings_set_custom_handler('switch-windows',
-+        Meta.keybindings_set_custom_handler('switch-applications',
-                                             Lang.bind(this, this._startAppSwitcher));
-         Meta.keybindings_set_custom_handler('switch-group',
-                                             Lang.bind(this, this._startAppSwitcher));
--        Meta.keybindings_set_custom_handler('switch-windows-backward',
-+        Meta.keybindings_set_custom_handler('switch-applications-backward',
-                                             Lang.bind(this, this._startAppSwitcher));
-         Meta.keybindings_set_custom_handler('switch-group-backward',
-                                             Lang.bind(this, this._startAppSwitcher));
diff --git a/community/cjs/PKGBUILD b/community/cjs/PKGBUILD
new file mode 100644
index 000000000..7c6439e20
--- /dev/null
+++ b/community/cjs/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Alexandre Filgueira <alexfilgueira@antergos.com>
+# Contributor: Ionut Biru <ibiru@archlinux.org>
+
+pkgname=cjs
+pkgver=2.0.0
+pkgrel=1
+pkgdesc="Javascript Bindings for Cinnamon"
+arch=(i686 x86_64)
+url="https://github.com/linuxmint/cjs"
+license=(GPL)
+depends=(cairo gobject-introspection js185 dbus-glib)
+makedepends=(gnome-common)
+options=('!libtool')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cjs/archive/${pkgver}.tar.gz")
+sha256sums=('2fea6c491e6ce8567201f14c0e926181154d798d4811dd65da477c014bfb2a9a')
+
+build() {
+  cd $pkgname-$pkgver
+
+  # Python2 fix
+  sed -i 's|#! /usr/bin/env python|#! /usr/bin/env python2|' \
+  		scripts/make-tests
+
+  ./autogen.sh --prefix=/usr --disable-static --libexecdir=/usr/lib
+  make
+}
+
+check() {
+  cd $pkgname-$pkgver
+  # Needs a display
+  make -k check || :
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community/clanlib/PKGBUILD b/community/clanlib/PKGBUILD
index a3d3256fe..0a244388f 100644
--- a/community/clanlib/PKGBUILD
+++ b/community/clanlib/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 90010 2013-05-06 19:36:25Z foutrelis $
+# $Id: PKGBUILD 97670 2013-09-27 06:38:16Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 
 pkgname=clanlib
-pkgver=2.3.6
-pkgrel=5
+pkgver=3.0.0
+pkgrel=1
 pkgdesc="A multi-platform game development library."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://clanlib.org/"
@@ -11,24 +11,24 @@ license=('zlib')
 depends=('alsa-lib' 'libjpeg' 'libmikmod' 'libpng' 'libvorbis' 'libxi' 'libxmu' 'sdl_gfx' 'freetype2' 'pcre' 'sqlite' 'libgl')
 makedepends=('doxygen' 'graphviz' 'mesa')
 options=('!libtool')
-source=(http://clanlib.org/download/releases-2.0/ClanLib-${pkgver}.tgz)
-md5sums=('aa037a8a6297fb0b2efd927b1b15e8de')
+source=(clanlib-${pkgver}.tar.gz::https://github.com/sphair/ClanLib/archive/3.0.0.tar.gz)
+md5sums=('bfbfd7cc89be12f02c3994d4fcdd49f3')
 
 build() { 
 	cd ${srcdir}/ClanLib-${pkgver}
 
-	./configure --prefix=/usr --enable-docs --disable-clanGL1
+  ./autogen.sh
+	./configure --prefix=/usr
 
 	make
-  # Somehow this breaks. :(
-	#make html
+	make html
 }
 
 package() {
 	cd ${srcdir}/ClanLib-${pkgver}
 
 	make DESTDIR=${pkgdir} install
-	#make DESTDIR=${pkgdir} install-html
+	make DESTDIR=${pkgdir} install-html
 
 	install -d ${pkgdir}/usr/share/licenses/${pkgname}
 	install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
diff --git a/community/classpath/PKGBUILD b/community/classpath/PKGBUILD
index 61359b1c2..973420ee6 100644
--- a/community/classpath/PKGBUILD
+++ b/community/classpath/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 59865 2011-12-01 13:10:18Z spupykin $
+# $Id: PKGBUILD 97832 2013-09-30 10:02:06Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: tardo <tardo@nagi-fanboi.net>
 # Contributor: Sean Gillespie <Sean.D.Gillespie@gmail.com>
 
 pkgname=classpath
 pkgver=0.98
-pkgrel=4
+pkgrel=5
 pkgdesc="A free replacement for Sun's proprietary core Java class libraries."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/classpath/"
 license=('GPL')
 depends=('gtk2>=2.8' 'libxtst' 'libsm')
-makedepends=('gtk2>=2.8' 'libxtst' 'gconf' 'openjdk6')
+makedepends=('gtk2>=2.8' 'libxtst' 'gconf' 'java-environment')
 optdepends=('file' 'gconf')
 source=(ftp://ftp.gnu.org/gnu/classpath/$pkgname-$pkgver.tar.gz)
 md5sums=('90c6571b8b0309e372faa0f9f6255ea9')
@@ -30,6 +30,10 @@ EOF
 
   ./configure --prefix=/usr --disable-Werror --disable-plugin
   make EXAMPLESDIR=
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make EXAMPLESDIR= DESTDIR=$pkgdir install
 
   rm -f $pkgdir/usr/bin/gappletviewer
diff --git a/community/clusterssh/ChangeLog b/community/clusterssh/ChangeLog
deleted file mode 100644
index f0d985454..000000000
--- a/community/clusterssh/ChangeLog
+++ /dev/null
@@ -1,3 +0,0 @@
-2009-12-26 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Package moved to [community]
-	* version 3.28 - 39 votes in AUR
diff --git a/community/clusterssh/PKGBUILD b/community/clusterssh/PKGBUILD
deleted file mode 100644
index c457b6e6b..000000000
--- a/community/clusterssh/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 67467 2012-03-11 21:44:43Z lcarlier $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Macfly <mmacfly@gmail.com>
-# Contributor: Duncan Ferguson <duncan_ferguson@users.sourceforge.net>
-
-pkgname=clusterssh
-pkgver=3.28
-pkgrel=3
-pkgdesc="Cluster SSH opens terminal windows with connections to specified hosts and an administration console."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://clusterssh.sourceforge.net/"
-license=('GPL')
-depends=('perl-tk' 'perl-x11-protocol' 'xterm')
-source=(http://downloads.sourceforge.net/project/$pkgname/1.%20ClusterSSH%20Series%203/$pkgver/$pkgname-$pkgver.tar.gz)
-md5sums=('11e012329d2c62e1f7b17f3ac517769a')
-
-build() {
-  cd ${srcdir}/$pkgname-$pkgver
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/$pkgname-$pkgver
-
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community/cmus/PKGBUILD b/community/cmus/PKGBUILD
index ef4c77b4b..b611c8908 100644
--- a/community/cmus/PKGBUILD
+++ b/community/cmus/PKGBUILD
@@ -1,18 +1,21 @@
-# $Id: PKGBUILD 94872 2013-08-01 06:54:46Z bpiotrowski $
-# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# $Id: PKGBUILD 97815 2013-09-30 02:36:29Z xyne $
+# Maintainer: Xyne <ca dot archlinux at xyne, backwards>
+# Contributor:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=cmus
 pkgver=2.5.0
-pkgrel=3
+pkgrel=4
 pkgdesc='Very feature-rich ncurses-based music player'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cmus.sourceforge.net/"
 license=('GPL')
 depends=('ncurses')
-makedepends=('faad2' 'ffmpeg' 'flac' 'libao' 'libmad' 'libmodplug'
-             'libmp4v2' 'libmpcdec' 'libpulse' 'libvorbis' 'opusfile' 'wavpack')
+makedepends=(
+  'faad2' 'ffmpeg' 'flac' 'libao' 'libmad' 'libmodplug' 'libcdio-paranoia'
+  'libmp4v2' 'libmpcdec' 'libpulse' 'libvorbis' 'opusfile' 'wavpack'
+)
 optdepends=('alsa-lib: for ALSA output plugin support'
             'libao: for AO output plugin support'
             'libpulse: for PulseAudio output plugin support'
@@ -24,23 +27,32 @@ optdepends=('alsa-lib: for ALSA output plugin support'
             'libmp4v2: for mp4 input plugin support'
             'libmpcdec: for musepack input plugin support'
             'libvorbis: for vorbis input plugin support'
+            'libcdio-paranoia: for cdio support'
             'opusfile: for opus input plugin support'
             'wavpack: for wavpack input plugin support')
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-v$pkgver.tar.bz2
-        cmus-2.5.0-opus-support.patch)
+        cmus-2.5.0-opus-support.patch
+        cdio-git.patch)
 sha1sums=('244975a5ff642567acb047f6bd518e4a3271c25b'
-          '5e524f54d565dfa30760562c223bc0e2e8ed00a0')
+          '5e524f54d565dfa30760562c223bc0e2e8ed00a0'
+          '77738acc7d4e71f6d396a5cd464dbbce0168b6b7')
+
+prepare() {
+  cd "$srcdir/$pkgname-v$pkgver"
+  # Inherited from Bart or earlier.
+  patch -Np1 -i "$srcdir/cmus-2.5.0-opus-support.patch"
+  # Include changes from git for compatibility with new cdio.
+  patch -N -i "$srcdir/cdio-git.patch"
+}
 
 build() {
-  cd $srcdir/$pkgname-v$pkgver
-  patch -Np1 -i $srcdir/cmus-2.5.0-opus-support.patch
+  cd "$srcdir/$pkgname-v$pkgver"
   ./configure prefix=/usr
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-v$pkgver
-  make DESTDIR=$pkgdir install
-
-  install -Dm 644 contrib/_cmus $pkgdir/usr/share/zsh/site-functions/_cmus
+  cd "$srcdir/$pkgname-v$pkgver"
+  make DESTDIR="$pkgdir" install
+  install -Dm644 contrib/_cmus "$pkgdir"/usr/share/zsh/site-functions/_cmus
 }
diff --git a/community/cmus/cdio-git.patch b/community/cmus/cdio-git.patch
new file mode 100644
index 000000000..8c549bee7
--- /dev/null
+++ b/community/cmus/cdio-git.patch
@@ -0,0 +1,137 @@
+*** cdio.c	2012-11-07 08:46:17.000000000 +0000
+--- cmus-git/src/cmus/cdio.c	2013-09-30 02:21:10.518785946 +0000
+***************
+*** 1,5 ****
+  /*
+!  * Copyright 2011 Various Authors
+   * Copyright 2011 Johannes Weißl
+   *
+   * Based on cdda.c from XMMS2.
+--- 1,5 ----
+  /*
+!  * Copyright 2011-2013 Various Authors
+   * Copyright 2011 Johannes Weißl
+   *
+   * Based on cdda.c from XMMS2.
+***************
+*** 27,35 ****
+  #include "comment.h"
+  #include "discid.h"
+  
+- #include <cdio/cdda.h>
+  #include <cdio/cdio.h>
+  #include <cdio/logging.h>
+  #include <stdio.h>
+  #include <stdlib.h>
+  #include <string.h>
+--- 27,40 ----
+  #include "comment.h"
+  #include "discid.h"
+  
+  #include <cdio/cdio.h>
+  #include <cdio/logging.h>
++ #if LIBCDIO_VERSION_NUM >= 90
++ #include <cdio/paranoia/cdda.h>
++ #else
++ #include <cdio/cdda.h>
++ #endif
++ 
+  #include <stdio.h>
+  #include <stdlib.h>
+  #include <string.h>
+***************
+*** 352,375 ****
+  	GROWING_KEYVALS(c);
+  	const char *artist = NULL, *albumartist = NULL, *album = NULL,
+  		*title = NULL, *genre = NULL, *comment = NULL;
+! 	const cdtext_t *cdtext_track, *cdtext_album;
+  #ifdef HAVE_CDDB
+  	cddb_conn_t *cddb_conn = NULL;
+  	cddb_disc_t *cddb_disc = NULL;
+  #endif
+  	char buf[64];
+  
+! 	cdtext_track = cdio_get_cdtext(priv->cdio, priv->track);
+! 	if (cdtext_track) {
+! 		char * const *field = cdtext_track->field;
+  		artist = field[CDTEXT_PERFORMER];
+  		title = field[CDTEXT_TITLE];
+  		genre = field[CDTEXT_GENRE];
+  		comment = field[CDTEXT_MESSAGE];
+  	}
+! 	cdtext_album = cdio_get_cdtext(priv->cdio, 0);
+! 	if (cdtext_album) {
+! 		char * const *field = cdtext_album->field;
+  		album = field[CDTEXT_TITLE];
+  		albumartist = field[CDTEXT_PERFORMER];
+  		if (!artist)
+--- 357,403 ----
+  	GROWING_KEYVALS(c);
+  	const char *artist = NULL, *albumartist = NULL, *album = NULL,
+  		*title = NULL, *genre = NULL, *comment = NULL;
+! 	int track_comments_found = 0;
+! 	const cdtext_t *cdt;
+  #ifdef HAVE_CDDB
+  	cddb_conn_t *cddb_conn = NULL;
+  	cddb_disc_t *cddb_disc = NULL;
+  #endif
+  	char buf[64];
+  
+! #if LIBCDIO_VERSION_NUM >= 90
+! 	cdt = cdio_get_cdtext(priv->cdio);
+! 	if (cdt) {
+! 		artist = cdtext_get(cdt, CDTEXT_FIELD_PERFORMER, priv->track);
+! 		title = cdtext_get(cdt, CDTEXT_FIELD_TITLE, priv->track);
+! 		genre = cdtext_get(cdt, CDTEXT_FIELD_GENRE, priv->track);
+! 		comment = cdtext_get(cdt, CDTEXT_FIELD_MESSAGE, priv->track);
+! 
+! 		if (title)
+! 			track_comments_found = 1;
+! 
+! 		album = cdtext_get(cdt, CDTEXT_FIELD_TITLE, 0);
+! 		albumartist = cdtext_get(cdt, CDTEXT_FIELD_PERFORMER, 0);
+! 		if (!artist)
+! 			artist = albumartist;
+! 		if (!genre)
+! 			genre = cdtext_get(cdt, CDTEXT_FIELD_GENRE, 0);
+! 		if (!comment)
+! 			comment = cdtext_get(cdt, CDTEXT_FIELD_MESSAGE, 0);
+! 	}
+! #else
+! 	cdt = cdio_get_cdtext(priv->cdio, priv->track);
+! 	if (cdt) {
+! 		track_comments_found = 1;
+! 		char * const *field = cdt->field;
+  		artist = field[CDTEXT_PERFORMER];
+  		title = field[CDTEXT_TITLE];
+  		genre = field[CDTEXT_GENRE];
+  		comment = field[CDTEXT_MESSAGE];
+  	}
+! 	cdt = cdio_get_cdtext(priv->cdio, 0);
+! 	if (cdt) {
+! 		char * const *field = cdt->field;
+  		album = field[CDTEXT_TITLE];
+  		albumartist = field[CDTEXT_PERFORMER];
+  		if (!artist)
+***************
+*** 379,387 ****
+  		if (!comment)
+  			comment = field[CDTEXT_MESSAGE];
+  	}
+  
+  #ifdef HAVE_CDDB
+! 	if (!cdtext_track && cddb_url && cddb_url[0]) {
+  		cddb_track_t *cddb_track;
+  		track_t i_tracks = cdio_get_num_tracks(priv->cdio);
+  		track_t i_first_track = cdio_get_first_track_num(priv->cdio);
+--- 407,416 ----
+  		if (!comment)
+  			comment = field[CDTEXT_MESSAGE];
+  	}
++ #endif
+  
+  #ifdef HAVE_CDDB
+! 	if (!track_comments_found && cddb_url && cddb_url[0]) {
+  		cddb_track_t *cddb_track;
+  		track_t i_tracks = cdio_get_num_tracks(priv->cdio);
+  		track_t i_first_track = cdio_get_first_track_num(priv->cdio);
diff --git a/community/connman/PKGBUILD b/community/connman/PKGBUILD
index 4446a1c6f..e75c1a7a9 100644
--- a/community/connman/PKGBUILD
+++ b/community/connman/PKGBUILD
@@ -1,23 +1,24 @@
-#$Id: PKGBUILD 96694 2013-09-03 03:45:40Z dwallace $
+#$Id: PKGBUILD 96945 2013-09-09 02:20:31Z dwallace $
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: Lucas De Marchi <lucas.de.marchi@gmail.com>
 
 pkgname=connman
-pkgver=1.17
-pkgrel=1
+pkgver=1.18
+pkgrel=2
 pkgdesc="Wireless LAN network manager"
 url="http://connman.net/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
-depends=('dbus-core' 'iptables' 'glib2' 'gnutls')
+depends=('dbus-core' 'iptables' 'gnutls' 'glib2')
 conflicts=('openresolv')
 optdepends=('bluez: Support for Bluetooth devices'
-            'wpa_supplicant: For WiFi devices')
-makedepends=('bluez' 'wpa_supplicant' 'openconnect' 'openvpn')
+            'wpa_supplicant: For WiFi devices'
+            'pptpclient: for ppp support')
+makedepends=('bluez' 'wpa_supplicant' 'openconnect' 'openvpn' 'ppp')
 options=('!libtool')
 source=("http://www.kernel.org/pub/linux/network/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
         'allow_group_network.diff')
-md5sums=('21ab8945f84b2ebf5f60bc8591fecdfd'
+md5sums=('cd696bf74512eb644cef6e983ba6c94f'
          'a8d22ee089fb0ed725130d16ad393047')
 
 prepare(){
@@ -33,6 +34,7 @@ build() {
 	  --sbindir=/usr/bin \
       --with-systemdunitdir=/usr/lib/systemd/system \
       --enable-threads \
+      --enable-pptp \
       --enable-openconnect \
       --enable-vpnc \
       --enable-openvpn \
diff --git a/community/consonance/PKGBUILD b/community/consonance/PKGBUILD
deleted file mode 100644
index 2eb1d370c..000000000
--- a/community/consonance/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 82327 2013-01-15 11:34:58Z allan $
-# Maintainer: Jonathan Steel <mail at jsteel dot org>
-# Contributor: Auguste Pop <auguste [at] gmail [dot] com>
-# Contributor: boenki <boenki at gmx dot de>
-# Contributor: sujith_m82 <m.sujith@gmail.com>
-
-pkgname=consonance
-pkgver=0.5.1
-pkgrel=10
-pkgdesc="A lightweight GTK+ music manager that aims to be fast, bloat-free and light on memory consumption"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://sites.google.com/site/consonancemanager"
-license=('GPL')
-depends=('curl' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'libao' 'libmad'
-         'libcdio-paranoia' 'libmodplug' 'libnotify' 'libsndfile' 'sqlite3'
-         'taglib')
-install=$pkgname.install
-source=($url/releases-1/$pkgname-$pkgver.tar.gz
-        libnotify.patch
-        cdio-includes.patch)
-md5sums=('2a195dd2314f7b65cc57cc871a4c5a47'
-         'caa1e8b41723950fd926bfefccbbd8ac'
-         '239b451ba8795f8c287e994a7e32d859')
-
-build() {
-  cd "$srcdir"/$pkgname-$pkgver
-
-  patch -Np1 -i "$srcdir"/libnotify.patch
-  patch -Np1 -i "$srcdir"/cdio-includes.patch
-
-  ./configure --prefix=/usr
-
-  make
-}
-
-package() {
-  cd "$srcdir"/$pkgname-$pkgver
-
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community/consonance/cdio-includes.patch b/community/consonance/cdio-includes.patch
deleted file mode 100644
index c570468b1..000000000
--- a/community/consonance/cdio-includes.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -upr consonance-0.5.1.orig/src/cdda.h consonance-0.5.1/src/cdda.h
---- consonance-0.5.1.orig/src/cdda.h	2013-01-14 05:14:54.000000000 +0200
-+++ consonance-0.5.1/src/cdda.h	2013-01-14 05:15:16.000000000 +0200
-@@ -18,7 +18,7 @@
- #ifndef CDDA_H
- #define CDDA_H
- 
--#include <cdio/cdda.h>
-+#include <cdio/paranoia/cdda.h>
- #include <cdio/cd_types.h>
- 
- struct con_cdda_decoder {
diff --git a/community/consonance/consonance.install b/community/consonance/consonance.install
deleted file mode 100644
index f1474aee3..000000000
--- a/community/consonance/consonance.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install()
-{
-    usr/bin/update-desktop-database -q
-}
-
-post_upgrade()
-{
-    post_install
-}
-
-post_remove()
-{
-    post_install
-}
diff --git a/community/consonance/libnotify.patch b/community/consonance/libnotify.patch
deleted file mode 100644
index f59acbfd9..000000000
--- a/community/consonance/libnotify.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/src/statusicon.c b/src/statusicon.c
-index f72e808..04efa58 100644
---- a/src/statusicon.c
-+++ b/src/statusicon.c
-@@ -47,11 +47,10 @@ void show_osd(struct con_win *cwin)
- 
- 	/* Create notification instance */
- 
--	osd = notify_notification_new_with_status_icon(
-+	osd = notify_notification_new(
- 		cwin->cstate->curr_mobj->tags->title,
- 		(const gchar *)body,
--		NULL,
--		GTK_STATUS_ICON(cwin->status_icon));
-+		gtk_status_icon_get_icon_name(GTK_STATUS_ICON(cwin->status_icon)));
- 	notify_notification_set_timeout(osd, OSD_TIMEOUT);
- 
- 	/* Add album art if set */
diff --git a/community/converseen/PKGBUILD b/community/converseen/PKGBUILD
index c2147b97c..0337063b1 100644
--- a/community/converseen/PKGBUILD
+++ b/community/converseen/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 95471 2013-08-12 20:28:10Z eric $
+# $Id: PKGBUILD 97491 2013-09-21 18:36:28Z eric $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: archtux <antonio.arias99999 at gmail.com>
 
 pkgname=converseen
 pkgver=0.6.4
-pkgrel=2
+pkgrel=3
 pkgdesc="The batch image converter and resizer"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://converseen.sourceforge.net/"
 license=('GPL3')
-depends=('imagemagick' 'qt4' 'libwmf' 'openexr')
+depends=('imagemagick' 'qt4' 'libwmf' 'openexr' 'libwebp')
 makedepends=('cmake')
 install=converseen.install
 source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
diff --git a/community/cppcheck/PKGBUILD b/community/cppcheck/PKGBUILD
index f1b3f07b7..7f645a576 100644
--- a/community/cppcheck/PKGBUILD
+++ b/community/cppcheck/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 95268 2013-08-08 11:40:15Z jelle $
+# $Id: PKGBUILD 97709 2013-09-27 18:17:34Z jelle $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 
 pkgname=cppcheck
 pkgver=1.61
-pkgrel=1
+pkgrel=2
 pkgdesc="A tool for static C/C++ code analysis"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cppcheck.wiki.sourceforge.net/"
 license=('GPL')
-depends=('qt4')
+depends=('qt5-base')
 makedepends=('docbook-xsl')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
 sha1sums=('fd81635612ba74a90b0ebe6d4c8a520826cc077c')
@@ -20,7 +20,7 @@ build() {
 
    cd gui
    export HAVE_RULES=yes 
-   qmake-qt4
+   qmake
    make
 }
 
diff --git a/community/credentials-preferences/PKGBUILD b/community/credentials-preferences/PKGBUILD
deleted file mode 100644
index 73b770b48..000000000
--- a/community/credentials-preferences/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 87397 2013-03-30 21:57:57Z bgyorgy $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=credentials-preferences
-_pkgname=credentials-control-center
-pkgver=0.1.5
-pkgrel=1
-pkgdesc="Control panel for configuring online account credentials and settings"
-arch=('i686' 'x86_64' 'mips64el')
-url="https://launchpad.net/gnome-control-center-signon"
-license=('GPL' 'LGPL')
-depends=('libaccounts-glib' 'libsignon-glib' 'gtk3')
-makedepends=('gobject-introspection' 'vala' 'intltool' 'itstool')
-options=('!libtool')
-install=$pkgname.install
-source=(https://launchpad.net/gnome-control-center-signon/13.04/$pkgver/+download/$_pkgname-$pkgver.tar.xz
-        http://pkgbuild.com/~bgyorgy/sources/$_pkgname-translations-20121018.tar.gz)
-md5sums=('deaa290c89dffee5198f3f0f6f2e1fe1'
-         '702d6b39136e10ba6dfad0afd300b2af')
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  # Install updated language files
-  rename $_pkgname- '' ../po/$_pkgname-*.po
-  mv -f -t po ../po/*
-  printf "%s\n" po/*.po | sed -e 's/po\///g' -e 's/\.po//g' >po/LINGUAS
-
-  # Fix helper script
-  sed -i 's/test/test -e/' online-accounts-preferences.in
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
-              --disable-static
-  make
-}
-
-package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community/credentials-preferences/credentials-preferences.install b/community/credentials-preferences/credentials-preferences.install
deleted file mode 100644
index 2c455e952..000000000
--- a/community/credentials-preferences/credentials-preferences.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/community/cuneiform/PKGBUILD b/community/cuneiform/PKGBUILD
index 39ec847af..a2193f3d4 100644
--- a/community/cuneiform/PKGBUILD
+++ b/community/cuneiform/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 95472 2013-08-12 20:28:12Z eric $
+# $Id: PKGBUILD 97492 2013-09-21 18:36:29Z eric $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Maxim Vuets <maxim.vuets@gmail.com>
 
 pkgname=cuneiform
 pkgver=1.1.0
 _dpkgver=1.1
-pkgrel=9
+pkgrel=10
 pkgdesc="Linux port of an OCR system developed in Russia. Supports more than 20 languages."
 arch=('i686' 'x86_64' 'mips64el')
 url="https://launchpad.net/cuneiform-linux"
@@ -33,7 +33,7 @@ build() {
 }
 
 check() {
-  ldd ${srcdir}/${pkgname}-linux-${pkgver}/builddir/cuneiform | grep Magick >/dev/null
+  ldd "${srcdir}/${pkgname}-linux-${pkgver}/builddir/cuneiform" | grep Magick >/dev/null
 }
 
 package() {
diff --git a/community/curlftpfs/PKGBUILD b/community/curlftpfs/PKGBUILD
index f4442f467..aea11bda9 100644
--- a/community/curlftpfs/PKGBUILD
+++ b/community/curlftpfs/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 65667 2012-02-21 20:28:52Z cbrannon $
+# $Id: PKGBUILD 97936 2013-10-01 16:49:40Z bpiotrowski $
 # Maintainer: Chris Brannon <cmbrannon79@gmail.com>
 # Contributor: Allan McRae <mcrae_allan@hotmail.com>
 # Contributor: Philip Nilsson <leffeman@gmail.com>
 
 pkgname=curlftpfs
 pkgver=0.9.2
-pkgrel=4
+pkgrel=5
 pkgdesc="A filesystem for acessing FTP hosts based on FUSE and libcurl."
 url="http://curlftpfs.sourceforge.net/"
 license=('GPL')
diff --git a/community/curseofwar/PKGBUILD b/community/curseofwar/PKGBUILD
new file mode 100644
index 000000000..c8f11cba7
--- /dev/null
+++ b/community/curseofwar/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 97452 2013-09-20 12:51:17Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: ziggi <xziggix@gmail.com>
+
+pkgname=curseofwar
+pkgver=1.2.0
+pkgrel=1
+pkgdesc='Fast-paced RTS/Action game with ncurses interface'
+arch=('x86_64' 'i686')
+url='https://github.com/a-nikolaev/curseofwar/wiki'
+license=('GPL')
+depends=('ncurses')
+makedepends=('gcc')
+source=("https://github.com/a-nikolaev/curseofwar/archive/v$pkgver.tar.gz")
+sha256sums=('91b7781e26341faa6b6999b6baf6e74ef532fa94303ab6a2bf9ff6d614a3f670')
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  make
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD
index f2bbb332d..705a89271 100644
--- a/community/darktable/PKGBUILD
+++ b/community/darktable/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 94303 2013-07-19 15:21:00Z spupykin $
+# $Id: PKGBUILD 97018 2013-09-10 13:41:22Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:  Christian Himpel <chressie at gmail dot com>
 # Contributor: Johannes Hanika <hanatos at gmail dot com>
 
 pkgname=darktable
-pkgver=1.2.2
+pkgver=1.2.3
 _pkgver=1.2
-pkgrel=2
+pkgrel=1
 pkgdesc="Utility to organize and develop raw images"
 arch=('i686' 'x86_64' 'mips64el')
 url=http://darktable.sf.net/
@@ -19,7 +19,7 @@ optdepends=('librsvg')
 install=darktable.install
 options=(!libtool)
 source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.xz)
-md5sums=('df2a2b02d6d855cfd8f1cf77c7e12995')
+md5sums=('7eaa89aa5257b5f61cc7462db08ce164')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/dbmail/PKGBUILD b/community/dbmail/PKGBUILD
index 0b0580c28..d91d6f79a 100644
--- a/community/dbmail/PKGBUILD
+++ b/community/dbmail/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 96731 2013-09-03 16:12:39Z spupykin $
+# $Id: PKGBUILD 97976 2013-10-02 13:30:38Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sebastian Faltoni <sebastian.faltoni@gmail.com>
 
 pkgname=dbmail
-pkgver=3.1.4
+pkgver=3.1.7
 pkgrel=2
 pkgdesc="Fast and scalable sql based mail services"
 arch=('i686' 'x86_64' 'mips64el')
 depends=('gmime' 'libzdb' 'mhash' 'libevent')
 makedepends=('asciidoc' 'xmlto' 'docbook-xsl' 'docbook-xml' 'postgresql-libs>=8.4.1'
-	     'sqlite' 'libmysqlclient' 'libldap>=2.4.18' 'libsieve')
+	     'sqlite' 'libmysqlclient' 'libldap>=2.4.18' 'libsieve' 'git')
 optdepends=('libldap: for LDAP authentication'
 	    'libsieve: for dbmail-sieve'
 	    'python2-mysql2pgsql: migrate from MySQL to PostreSQL')
@@ -20,51 +20,45 @@ backup=(etc/xinetd.d/dbmail-imapd
 	etc/xinetd.d/dbmail-pop3d
 	etc/xinetd.d/dbmail-lmtpd
 	etc/xinetd.d/dbmail-timsieved)
-source=(http://www.dbmail.org/download/3.1/dbmail-${pkgver/_/-}.tar.gz
-	dbmail.tmpfiles
-	dbmail-imapd.service
-	dbmail-lmtpd.service
-	dbmail-pop3d.service
-	dbmail-timsieved.service
-	dbmail-imapd.xinetd
-	dbmail-lmtpd.xinetd
-	dbmail-pop3d.xinetd
-	dbmail-timsieved.xinetd
-	"boundary.patch::http://git.dbmail.eu/paul/dbmail/patch/?id=fd742e39b13ec45e4ecf2e175113a6a0120af27b"
-	"crlf.patch::http://git.dbmail.eu/paul/dbmail/patch/?id=17a2e61917ae64b1f20039f49b70b9130b678c87")
-md5sums=('0090bb7998469e963d2eb49b7d16ea3f'
-         'c4b5793c5422b62a675d4c66ff7e9300'
-         '5a6297cb03c8d0b424f978ea1d7402de'
-         '070db88538af9833f003f4cb516d337b'
-         '422f0399f97a780b7cab84443e8f429a'
-         '15c7d367d4242aebac5f87649a2250aa'
+#source=("http://www.dbmail.org/download/3.1/dbmail-${pkgver}.tar.gz"
+source=("dbmail-$pkgver::git://git.subdir.eu/paul/dbmail#branch=dbmail_3_1"
+	"dbmail-imapd.xinetd"
+	"dbmail-lmtpd.xinetd"
+	"dbmail-pop3d.xinetd"
+	"dbmail-timsieved.xinetd"
+	"dbmail-6-sieve.patch::http://git.dbmail.eu/paul/dbmail/patch/?id=92b98094a01eda5efe3ba3080e529482d08945a2"
+	"dbmail-7-systemd.diff")
+md5sums=('SKIP'
          '890de13361afbdf4fed12d6d7eb53e66'
          '961593658cd596297d03d25eb9c9e98f'
          '4cb764894abd3914802e90602bf90a0c'
          'e78dc86355f9aaf24590bc7c6611162f'
-         'e9f9c1140e77e3714fd2c3905b1760f1'
-         'c86c4c2a4e9171ae8c0ad5692262b393')
+         'b1063893dd0e74bc0ddee454bb65bf01'
+         'a781a4ebe2dd75ed635c9b4a239b38d8')
 
 prepare() {
-  cd $srcdir/dbmail-${pkgver/_/-}/
-  patch -p1 <$srcdir/boundary.patch
-  patch -p1 <$srcdir/crlf.patch
+  cd $srcdir/dbmail-${pkgver}/
+  patch -p1 <$srcdir/dbmail-6-sieve.patch
+  patch -Rp1 <$srcdir/dbmail-7-systemd.diff
+  aclocal
+  automake --add-missing
+  autoreconf
 }
 
 build() {
-  cd $srcdir/dbmail-${pkgver/_/-}/
+  cd $srcdir/dbmail-${pkgver}/
+  automake
   [ -f Makefile ] || ./configure \
     --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc \
-    --with-ldap --with-sieve
+    --with-ldap --with-sieve \
+    --enable-systemd --enable-manpages
   make
 }
 
 package() {
-  cd $srcdir/dbmail-${pkgver/_/-}/
+  cd $srcdir/dbmail-${pkgver}/
   make DESTDIR=$pkgdir install
-  (cd man && make && make install DESTDIR=$pkgdir)
 
-  mkdir $pkgdir/etc
   install -Dm644 dbmail.conf $pkgdir/etc/dbmail.conf.sample
   mkdir $pkgdir/usr/share/dbmail
   cp -r sql/* $pkgdir/usr/share/dbmail/
@@ -72,9 +66,6 @@ package() {
   cp dbmail.schema $pkgdir/usr/share/dbmail/
 
   for i in dbmail-imapd dbmail-lmtpd dbmail-pop3d dbmail-timsieved; do
-    install -Dm0644 $srcdir/$i.service $pkgdir/usr/lib/systemd/system/$i.service
     install -Dm0644 $srcdir/$i.xinetd $pkgdir/etc/xinetd.d/$i
   done
-
-  install -Dm0644 $srcdir/dbmail.tmpfiles $pkgdir/usr/lib/tmpfiles.d/dbmail.conf
 }
diff --git a/community/dbmail/dbmail-2.2.10-pam-support.patch b/community/dbmail/dbmail-2.2.10-pam-support.patch
deleted file mode 100644
index 805a7f609..000000000
--- a/community/dbmail/dbmail-2.2.10-pam-support.patch
+++ /dev/null
@@ -1,251 +0,0 @@
-diff -wbBur dbmail-2.2.10/configure.in dbmail-2.2.10.pam/configure.in
---- dbmail-2.2.10/configure.in	2008-03-24 17:49:33.000000000 +0300
-+++ dbmail-2.2.10.pam/configure.in	2008-09-18 16:43:04.000000000 +0400
-@@ -78,6 +78,13 @@
- 
- AC_SUBST(CRYPTLIB)
- 
-+dnl Check for PAM
-+AC_SUBST(PAMLIBS,"")
-+AC_CHECK_HEADERS(security/pam_appl.h,
-+    [AC_CHECK_LIB(pam,pam_start,
-+	[AC_DEFINE(HAVE_PAM,1,[Define if you have PAN including devel headers])
-+	 PAMLIBS="-lpam"],,)])
-+
- AC_SUBST(MYSQLLIB)
- AC_SUBST(MYSQLALIB)
- AC_SUBST(MYSQLLTLIB)
-diff -wbBur dbmail-2.2.10/dbmail-user.c dbmail-2.2.10.pam/dbmail-user.c
---- dbmail-2.2.10/dbmail-user.c	2008-03-24 17:49:33.000000000 +0300
-+++ dbmail-2.2.10.pam/dbmail-user.c	2008-09-18 16:43:04.000000000 +0400
-@@ -157,7 +157,7 @@
- 		"md5", 		"md5-raw",		"md5sum",	"md5sum-raw", 
- 		"md5-hash",	"md5-hash-raw",		"md5-digest",	"md5-digest-raw",
- 		"md5-base64",	"md5-base64-raw",	"md5base64",	"md5base64-raw",
--		"shadow", 	"", 	NULL
-+		"shadow", 	"pam",	"", 	NULL
- 	};
- 
- 	/* These must correspond to the easy text names. */
-@@ -166,7 +166,7 @@
- 		MD5_HASH, 	MD5_HASH_RAW,		MD5_DIGEST,	MD5_DIGEST_RAW,
- 		MD5_HASH,	MD5_HASH_RAW,		MD5_DIGEST,	MD5_DIGEST_RAW,
- 		MD5_BASE64,	MD5_BASE64_RAW,		MD5_BASE64,	MD5_BASE64_RAW,
--		SHADOW,		PLAINTEXT,	PWTYPE_NULL
-+		SHADOW,		PWTYPE_PAM,		PLAINTEXT,	PWTYPE_NULL
- 	};
- 
- 	memset(pw, 0, 50);
-@@ -251,6 +251,12 @@
- 				*enctype = "crypt";
- 			}
- 			break;
-+#ifdef HAVE_PAM
-+		case PWTYPE_PAM:
-+			null_strncpy(pw, passwd, 49);
-+			*enctype = "pam";
-+			break;
-+#endif			
- 		default:
- 			qerrorf("Error: password type not supported [%s].\n",
- 				passwdtype);
-diff -wbBur dbmail-2.2.10/dbmail-user.h dbmail-2.2.10.pam/dbmail-user.h
---- dbmail-2.2.10/dbmail-user.h	2008-03-24 17:49:33.000000000 +0300
-+++ dbmail-2.2.10.pam/dbmail-user.h	2008-09-18 16:43:04.000000000 +0400
-@@ -34,7 +34,7 @@
- typedef enum {
- 	PLAINTEXT = 0, PLAINTEXT_RAW, CRYPT, CRYPT_RAW,
- 	MD5_HASH, MD5_HASH_RAW, MD5_DIGEST, MD5_DIGEST_RAW,
--	MD5_BASE64, MD5_BASE64_RAW, SHADOW, PWTYPE_NULL
-+	MD5_BASE64, MD5_BASE64_RAW, SHADOW, PWTYPE_PAM, PWTYPE_NULL
- } pwtype_t;
- 
- int mkpassword(const char * const user, const char * const passwd,
-diff -wbBur dbmail-2.2.10/modules/authsql.c dbmail-2.2.10.pam/modules/authsql.c
---- dbmail-2.2.10/modules/authsql.c	2008-03-24 17:49:33.000000000 +0300
-+++ dbmail-2.2.10.pam/modules/authsql.c	2008-09-18 16:43:04.000000000 +0400
-@@ -27,6 +27,19 @@
- #include "dbmail.h"
- #define THIS_MODULE "auth"
- 
-+#ifdef HAVE_PAM
-+#include <security/pam_appl.h>
-+
-+#ifndef DEFAULT_DBMAIL_PAM_SERVICE
-+#define DEFAULT_DBMAIL_PAM_SERVICE "dbmail"
-+#endif
-+
-+#ifndef DEFAULT_DBMAIL_PAM_TTL
-+#define DEFAULT_DBMAIL_PAM_TTL 60
-+#endif
-+
-+#endif
-+
- extern db_param_t _db_params;
- #define DBPFX _db_params.pfx
- 
-@@ -49,17 +62,80 @@
-  */
- static int __auth_query(const char *thequery);
- 
-+#ifdef HAVE_PAM
-+
-+static char *pam_password = NULL;	/* Workaround for Solaris 2.6 brokenness */
-+static pam_handle_t *pamh = NULL;
-+static int pam_ttl = DEFAULT_DBMAIL_PAM_TTL;
-+static char *pam_service = DEFAULT_DBMAIL_PAM_SERVICE;
-+static time_t pamh_created = 0;
-+/*
-+ * A simple "conversation" function returning the supplied password.
-+ * Has a bit to much error control, but this is my first PAM application
-+ * so I'd rather check everything than make any mistakes. The function
-+ * expects a single converstation message of type PAM_PROMPT_ECHO_OFF.
-+ */
-+static int
-+password_conversation(int num_msg, const struct pam_message **msg, struct pam_response **resp, void *appdata_ptr)
-+{
-+    if (num_msg != 1 || msg[0]->msg_style != PAM_PROMPT_ECHO_OFF) {
-+    	TRACE(TRACE_ERROR, "Unexpected PAM converstaion '%d/%s'", msg[0]->msg_style, msg[0]->msg);
-+		return PAM_CONV_ERR;
-+    }
-+    if (!appdata_ptr) {
-+	/* Workaround for Solaris 2.6 where the PAM library is broken
-+	 * and does not pass appdata_ptr to the conversation routine
-+	 */
-+		appdata_ptr = pam_password;
-+    }
-+    if (!appdata_ptr) {
-+		TRACE(TRACE_ERROR, "ERROR: No password available to password_converstation!");
-+		return PAM_CONV_ERR;
-+    }
-+    *resp = calloc(num_msg, sizeof(struct pam_response));
-+    if (!*resp) {
-+		TRACE(TRACE_ERROR, "Out of memory!");
-+		return PAM_CONV_ERR;
-+    }
-+    (*resp)[0].resp = strdup((char *) appdata_ptr);
-+    (*resp)[0].resp_retcode = 0;
-+
-+    return ((*resp)[0].resp ? PAM_SUCCESS : PAM_CONV_ERR);
-+}
-+
-+static struct pam_conv conv =
-+{
-+    &password_conversation,
-+    NULL
-+};
-+
-+#endif
-+
-+
- int auth_connect()
- {
- 	/* this function is only called after a connection has been made
- 	 * if, in the future this is not the case, db.h should export a 
- 	 * function that enables checking for the database connection
- 	 */
-+#ifdef HAVE_PAM
-+
-+#endif
- 	return 0;
- }
- 
- int auth_disconnect()
- {
-+#ifdef HAVE_PAM
-+	int retval=PAM_SUCCESS;
-+	if (pamh) {
-+		retval = pam_end(pamh, retval);
-+		if (retval != PAM_SUCCESS) {
-+	    	pamh = NULL;
-+	    TRACE(TRACE_ERROR, "failed to release PAM authenticator");
-+		}
-+    }
-+#endif
- 	return 0;
- }
- 
-@@ -458,7 +534,71 @@
- 		is_validated = (strncmp(md5str, query_result, 32) == 0) ? 1 : 0;
- 		g_free(md5str);
- 	}
-+#ifdef HAVE_PAM
-+	else if (strcasecmp(query_result, "pam") == 0) {
-+		int retval=0;
-+		TRACE(TRACE_DEBUG, "validating using pam for user [%s] pass:[%s]",real_username,password);
-+		conv.appdata_ptr = (char *) password;
-+		pam_password= password;
-+		if (pam_ttl == 0) {
-+	    	/* Create PAM connection */
-+	    	retval = pam_start(pam_service, real_username, &conv, &pamh);
-+	    	if (retval != PAM_SUCCESS) {
-+				TRACE(TRACE_ERROR, "failed to create PAM authenticator");
-+				goto pam_error;
-+	    	}
-+		} else if (!pamh || (time(NULL) - pamh_created) >= pam_ttl || pamh_created > time(NULL)) {
-+	    	/* Close previous PAM connection */
-+	    	if (pamh) {
-+				retval = pam_end(pamh, retval);
-+				if (retval != PAM_SUCCESS) {
-+		    		TRACE(TRACE_WARNING, "failed to release PAM authenticator");
-+				}
-+				pamh = NULL;
-+	    	}
-+	    	/* Initialize persistent PAM connection */
-+	    	retval = pam_start(pam_service, "dbmail@", &conv, &pamh);
-+	    	if (retval != PAM_SUCCESS) {
-+				TRACE(TRACE_ERROR, "failed to create PAM authenticator");
-+				goto pam_error;
-+	    	}
-+	    	pamh_created = time(NULL);
-+		}
-+		retval = PAM_SUCCESS;
-+		if (pam_ttl != 0) {
-+	    	if (retval == PAM_SUCCESS)
-+				retval = pam_set_item(pamh, PAM_USER, real_username);
-+	    	if (retval == PAM_SUCCESS)
-+				retval = pam_set_item(pamh, PAM_CONV, &conv);
-+		}
-+		if (retval == PAM_SUCCESS)
-+	    	retval = pam_authenticate(pamh, 0);
-+		if (retval == PAM_SUCCESS ) //&& !no_acct_mgmt
-+	    	retval = pam_acct_mgmt(pamh, 0);
-+		if (retval == PAM_SUCCESS) {
-+	    	is_validated=1;
-+		} else {
-+pam_error:
-+		    is_validated=0;
-+		}
-+		/* cleanup */
-+		retval = PAM_SUCCESS;
-+#ifdef PAM_AUTHTOK
-+		if (pam_ttl != 0) {
-+	    	if (retval == PAM_SUCCESS)
-+				retval = pam_set_item(pamh, PAM_AUTHTOK, NULL);
-+		}
-+#endif
-+		if (pam_ttl == 0 || retval != PAM_SUCCESS) {
-+	    	retval = pam_end(pamh, retval);
-+	    	if (retval != PAM_SUCCESS) {
-+				TRACE(TRACE_WARNING, "failed to release PAM authenticator\n");
-+	    	}
-+	    	pamh = NULL;
-+		}
- 
-+	}
-+#endif
- 	if (is_validated) {
- 		db_user_log_login(*user_idnr);
- 	} else {
-diff -wbBur dbmail-2.2.10/modules/Makefile.am dbmail-2.2.10.pam/modules/Makefile.am
---- dbmail-2.2.10/modules/Makefile.am	2008-03-24 17:49:33.000000000 +0300
-+++ dbmail-2.2.10.pam/modules/Makefile.am	2008-09-18 16:44:53.000000000 +0400
-@@ -60,7 +60,7 @@
- 
- # This one is always built.
- libauth_sql_la_SOURCES = authsql.c
--libauth_sql_la_LIBADD = @CRYPTLIB@
-+libauth_sql_la_LIBADD = @CRYPTLIB@ @PAMLIBS@
- 
- if LDAP
- libauth_ldap_la_SOURCES = authldap.c
diff --git a/community/dbmail/dbmail-7-systemd.diff b/community/dbmail/dbmail-7-systemd.diff
new file mode 100644
index 000000000..097949694
--- /dev/null
+++ b/community/dbmail/dbmail-7-systemd.diff
@@ -0,0 +1,176 @@
+diff -wbBurN dbmail.git/configure.in dbmail-3.1.5/configure.in
+--- dbmail.git/configure.in	2013-09-05 18:07:48.661707165 +0400
++++ dbmail-3.1.5/configure.in	2013-09-09 15:05:17.639600103 +0400
+@@ -44,10 +44,6 @@
+     AS_HELP_STRING([--enable-manpages], [Enable building and installation of man pages]))
+ AM_CONDITIONAL(MANPAGES, [ test "$enable_manpages" = "yes" ])
+ 
+-AC_ARG_ENABLE([systemd],
+-    AS_HELP_STRING([--enable-systemd], [Enable systemd support]))
+-AM_CONDITIONAL(SYSTEMD, [ test "$enable_systemd" = "yes" ])
+-
+ AC_PROG_CC
+ AC_COMPILE_WARNINGS
+ AC_C_CONST
+@@ -82,8 +78,9 @@
+ AC_SUBST(DM_STATEDIR)
+ AC_SUBST(DM_PKGLIBDIR)
+ AC_SUBST(DM_PWD)
++
+ AC_PROG_LIBTOOL
+ 
+-AC_OUTPUT(src/dbmail.h Makefile src/Makefile src/modules/Makefile man/Makefile test/Makefile systemd/Makefile)
++AC_OUTPUT(src/dbmail.h Makefile src/Makefile src/modules/Makefile man/Makefile test/Makefile)
+ 
+ DM_MSG_CONFIGURE_RESULTS
+diff -wbBurN dbmail.git/systemd/dbmail-imapd.service.in dbmail-3.1.5/systemd/dbmail-imapd.service.in
+--- dbmail.git/systemd/dbmail-imapd.service.in	2013-09-05 18:07:48.711707166 +0400
++++ dbmail-3.1.5/systemd/dbmail-imapd.service.in	1970-01-01 03:00:00.000000000 +0300
+@@ -1,11 +0,0 @@
+-[Unit]
+-Description=DBMail Imap Server
+-After=syslog.target network.target mysqld.service postgresql.service
+-
+-[Service]
+-Type=forking
+-PIDFile=@piddir@/dbmail-imapd.pid
+-ExecStart=@sbindir@/dbmail-imapd -p @piddir@/dbmail-imapd.pid
+-
+-[Install]
+-WantedBy=multi-user.target
+diff -wbBurN dbmail.git/systemd/dbmail-lmtpd.service.in dbmail-3.1.5/systemd/dbmail-lmtpd.service.in
+--- dbmail.git/systemd/dbmail-lmtpd.service.in	2013-09-05 18:07:48.711707166 +0400
++++ dbmail-3.1.5/systemd/dbmail-lmtpd.service.in	1970-01-01 03:00:00.000000000 +0300
+@@ -1,11 +0,0 @@
+-[Unit]
+-Description=DBMail LMTP Server
+-After=syslog.target network.target mysqld.service postgresql.service
+-
+-[Service]
+-Type=forking
+-PIDFile=@piddir@/dbmail-lmtpd.pid
+-ExecStart=@sbindir@/dbmail-lmtpd -p @piddir@/dbmail-lmtpd.pid
+-
+-[Install]
+-WantedBy=multi-user.target
+diff -wbBurN dbmail.git/systemd/dbmail-pop3d.service.in dbmail-3.1.5/systemd/dbmail-pop3d.service.in
+--- dbmail.git/systemd/dbmail-pop3d.service.in	2013-09-05 18:07:48.711707166 +0400
++++ dbmail-3.1.5/systemd/dbmail-pop3d.service.in	1970-01-01 03:00:00.000000000 +0300
+@@ -1,11 +0,0 @@
+-[Unit]
+-Description=DBMail pop3 Server
+-After=syslog.target network.target mysqld.service postgresql.service
+-
+-[Service]
+-Type=forking
+-PIDFile=@piddir@/dbmail-pop3d.pid
+-ExecStart=@sbindir@/dbmail-pop3d -p @piddir@/dbmail-pop3d.pid
+-
+-[Install]
+-WantedBy=multi-user.target
+diff -wbBurN dbmail.git/systemd/dbmail-timsieved.service.in dbmail-3.1.5/systemd/dbmail-timsieved.service.in
+--- dbmail.git/systemd/dbmail-timsieved.service.in	2013-09-05 18:07:48.711707166 +0400
++++ dbmail-3.1.5/systemd/dbmail-timsieved.service.in	1970-01-01 03:00:00.000000000 +0300
+@@ -1,11 +0,0 @@
+-[Unit]
+-Description=DBMail Sieve Server
+-After=syslog.target network.target mysqld.service postgresql.service
+-
+-[Service]
+-Type=forking
+-PIDFile=@piddir@/dbmail-timsieved.pid
+-ExecStart=@sbindir@/dbmail-timsieved -p @piddir@/dbmail-timsieved.pid
+-
+-[Install]
+-WantedBy=multi-user.target
+diff -wbBurN dbmail.git/systemd/dbmail.tmpfiles.in dbmail-3.1.5/systemd/dbmail.tmpfiles.in
+--- dbmail.git/systemd/dbmail.tmpfiles.in	2013-09-05 18:07:48.711707166 +0400
++++ dbmail-3.1.5/systemd/dbmail.tmpfiles.in	1970-01-01 03:00:00.000000000 +0300
+@@ -1 +0,0 @@
+-d @piddir@ 0755 nobody nobody -
+diff -wbBurN dbmail.git/systemd/Makefile.am dbmail-3.1.5/systemd/Makefile.am
+--- dbmail.git/systemd/Makefile.am	2013-09-07 16:12:34.840475834 +0400
++++ dbmail-3.1.5/systemd/Makefile.am	1970-01-01 03:00:00.000000000 +0300
+@@ -1,68 +0,0 @@
+-# Copyright (C) 1999-2004 IC & S  dbmail@ic-s.nl
+-# Copyright (c) 2004-2011 NFG Net Facilities Group BV support@nfg.nl
+-#
+-# This program is free software; you can redistribute it and/or 
+-# modify it under the terms of the GNU General Public License 
+-# as published by the Free Software Foundation; either 
+-# version 2 of the License, or (at your option) any later 
+-# version.
+-#
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-# GNU General Public License for more details.
+-#
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+-
+-
+-EXTRA_DIST = dbmail-imapd.service.in  dbmail-lmtpd.service.in  dbmail-pop3d.service.in  dbmail-timsieved.service.in
+-SYSTEMD_UNIT_DIR = /usr/lib/systemd/system
+-SYSTEMD_TMPFILES_DIR = /usr/lib/tmpfiles.d
+-PID_DIR=/run/dbmail
+-
+-if SYSTEMD
+-install-systemd: dbmail-imapd.service dbmail-lmtpd.service dbmail-pop3d.service dbmail-timsieved.service dbmail.tmpfiles
+-	$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
+-	$(INSTALL_DATA) dbmail-imapd.service \
+-	  $(DESTDIR)$(SYSTEMD_UNIT_DIR)/dbmail-imapd.service
+-	$(INSTALL_DATA) dbmail-lmtpd.service \
+-	  $(DESTDIR)$(SYSTEMD_UNIT_DIR)/dbmail-lmtpd.service
+-	$(INSTALL_DATA) dbmail-pop3d.service \
+-	  $(DESTDIR)$(SYSTEMD_UNIT_DIR)/dbmail-pop3d.service
+-	$(INSTALL_DATA) dbmail-timsieved.service \
+-	  $(DESTDIR)$(SYSTEMD_UNIT_DIR)/dbmail-timsieved.service
+-	$(MKDIR_P) $(DESTDIR)$(SYSTEMD_TMPFILES_DIR)
+-	$(INSTALL_DATA) dbmail.tmpfiles \
+-	  $(DESTDIR)$(SYSTEMD_TMPFILES_DIR)/dbmail.conf
+-
+-uninstall-systemd:
+-	rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/dbmail-imapd.service
+-	rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/dbmail-lmtpd.service
+-	rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/dbmail-pop3d.service
+-	rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/dbmail-timsieved.service
+-	rm -f $(DESTDIR)$(SYSTEMD_TMPFILES_DIR)/dbmail.tmpfiles
+-
+-SUFFIXES=.service.in .service .tmpfiles.in .tmpfiles
+-
+-.service.in.service:
+-	$(AM_V_GEN)sed						\
+-	    -e 's|[@]sbindir[@]|$(sbindir)|g'			\
+-	    -e 's|[@]piddir[@]|$(PID_DIR)|g'		\
+-	    < $< > $@-t &&					\
+-	    mv $@-t $@
+-
+-.tmpfiles.in.tmpfiles:
+-	$(AM_V_GEN)sed						\
+-	    -e 's|[@]piddir[@]|$(PID_DIR)|g'		\
+-	    < $< > $@-t &&					\
+-	    mv $@-t $@
+-
+-else
+-install-systemd:
+-uninstall-systemd:
+-endif
+-
+-install-data-local: install-systemd
+-uninstall-local: uninstall-systemd
+diff -wbBurN dbmail.git/Makefile.am dbmail-3.1.5/Makefile.am
+--- dbmail.git/Makefile.am	2013-09-04 19:00:55.000000000 +0400
++++ dbmail-3.1.5/Makefile.am	2013-09-09 15:14:22.549612297 +0400
+@@ -6,10 +6,6 @@
+ SUBDIRS += man
+ endif
+ 
+-if SYSTEMD
+-SUBDIRS += systemd
+-endif
+-
+ testall:
+ 	CK_FORK=no make check
+ 	imaptest user=testuser1 pass=test port=10143 host=localhost test=test-scripts/imap
diff --git a/community/dbmail/dbmail-imapd.service b/community/dbmail/dbmail-imapd.service
deleted file mode 100644
index bc3319fd0..000000000
--- a/community/dbmail/dbmail-imapd.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=DBMail Imap Server
-After=syslog.target network.target mysqld.service postgresql.service
-
-[Service]
-Type=forking
-PIDFile=/run/dbmail/dbmail-imapd.pid
-ExecStart=/usr/bin/dbmail-imapd -p /run/dbmail/dbmail-imapd.pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community/dbmail/dbmail-lmtpd.service b/community/dbmail/dbmail-lmtpd.service
deleted file mode 100644
index 570ba1ec7..000000000
--- a/community/dbmail/dbmail-lmtpd.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=DBMail LMTP Server
-After=syslog.target network.target mysqld.service postgresql.service
-
-[Service]
-Type=forking
-PIDFile=/run/dbmail/dbmail-lmtpd.pid
-ExecStart=/usr/bin/dbmail-lmtpd -p /run/dbmail/dbmail-lmtpd.pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community/dbmail/dbmail-pop3d.service b/community/dbmail/dbmail-pop3d.service
deleted file mode 100644
index edfa2570a..000000000
--- a/community/dbmail/dbmail-pop3d.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=DBMail pop3 Server
-After=syslog.target network.target mysqld.service postgresql.service
-
-[Service]
-Type=forking
-PIDFile=/run/dbmail/dbmail-pop3d.pid
-ExecStart=/usr/bin/dbmail-pop3d -p /run/dbmail/dbmail-pop3d.pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community/dbmail/dbmail-timsieved.service b/community/dbmail/dbmail-timsieved.service
deleted file mode 100644
index 32623e038..000000000
--- a/community/dbmail/dbmail-timsieved.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=DBMail Sieve Server
-After=syslog.target network.target mysqld.service postgresql.service
-
-[Service]
-Type=forking
-PIDFile=/run/dbmail/dbmail-timsieved.pid
-ExecStart=/usr/bin/dbmail-timsieved -p /run/dbmail/dbmail-timsieved.pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community/dbmail/dbmail.tmpfiles b/community/dbmail/dbmail.tmpfiles
deleted file mode 100644
index 4b97c91f5..000000000
--- a/community/dbmail/dbmail.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /run/dbmail 0755 nobody nobody -
diff --git a/community/dee/PKGBUILD b/community/dee/PKGBUILD
deleted file mode 100644
index a78b95e27..000000000
--- a/community/dee/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 87044 2013-03-26 11:49:37Z foutrelis $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=dee
-pkgver=1.0.14
-pkgrel=5
-pkgdesc="Library to provide objects allowing to create Model-View-Controller type programs across DBus"
-arch=('i686' 'x86_64' 'mips64el')
-url="https://launchpad.net/dee"
-license=('LGPL')
-depends=('glib2' 'icu')
-makedepends=('python2' 'gobject-introspection' 'vala')
-options=('!libtool')
-source=(http://launchpad.net/$pkgname/1.0/$pkgver/+download/$pkgname-$pkgver.tar.gz)
-md5sums=('473b4181e26538af0fb753255da7945c')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-static \
-              PYTHON=python2
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-
-  # Install GI overrides for python 3 as well
-  install -dm755 "$pkgdir/usr/lib/python3.3/site-packages/gi/overrides"
-  ln -s ../../../../python2.7/site-packages/gi/overrides/Dee.py "$pkgdir/usr/lib/python3.3/site-packages/gi/overrides/Dee.py"
-}
diff --git a/community/deja-dup/PKGBUILD b/community/deja-dup/PKGBUILD
index f5d469c9f..664239641 100644
--- a/community/deja-dup/PKGBUILD
+++ b/community/deja-dup/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 87385 2013-03-30 14:36:30Z bgyorgy $
+# $Id: PKGBUILD 97723 2013-09-27 20:25:48Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=deja-dup
-pkgver=26.0
+pkgver=28.0
 pkgrel=1
 pkgdesc="Simple backup tool, that hides the complexity of backing up the Right Way and uses duplicity as the backend"
 arch=('i686' 'x86_64' 'mips64el')
@@ -10,25 +10,24 @@ url="https://launchpad.net/deja-dup"
 license=('GPL')
 depends=('duplicity' 'libpeas' 'libnotify' 'python2-gobject' 'gvfs' 'xdg-utils')
 makedepends=('vala' 'intltool' 'itstool' 'nautilus')
-optdepends=('nautilus: backup extension'
+optdepends=('gnome-keyring: save passwords'
+            'nautilus: backup extension'
             'python2-boto: Amazon S3 backend'
-            'python2-oauthlib: Ubuntu One backend'
             'ubuntuone-client: Ubuntu One backend')
 options=('!libtool')
 install=$pkgname.install
-source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz
-        libsecret-1.vapi)
-md5sums=('0430bbf03deac852651599a979a4cc32'
-         '27ca0a3c9efbe93e86ef563c77f6ddf3')
+source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz)
+md5sums=('480516869f49813880f2bbb35700c9af')
 
-build() {
+prepare() {
   cd "$srcdir/$pkgname-$pkgver"
 
   # Python2 fix
-  sed -i 's/\"python\", \"-c\"/\"python2\", \"-c\"/' common/PythonChecker.vala
+  sed -i 's/\"python\", \"-c\"/\"python2\", \"-c\"/' libdeja/PythonChecker.vala
+}
 
-  # Add missing Vala API file
-  cp "$srcdir/libsecret-1.vapi" "vapi/libsecret-1.vapi"
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
               --disable-static --disable-schemas-compile --without-unity
diff --git a/community/dmd/PKGBUILD b/community/dmd/PKGBUILD
index f8c5d7b76..95bed66d6 100644
--- a/community/dmd/PKGBUILD
+++ b/community/dmd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96324 2013-08-25 17:11:08Z dicebot $
+# $Id: PKGBUILD 97970 2013-10-02 11:26:53Z dicebot $
 # Maintainer: Mihails Strasunse <public@dicebot.lv>
 # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Chris Brannon <cmbrannon79@gmail.com>
@@ -10,7 +10,7 @@ pkgname=('dmd' 'libphobos-devel' 'libphobos' 'dtools')
 groups=('dlang' 'dlang-dmd')
 pkgbase=dmd
 pkgver=2.063.2
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://www.dlang.org"
 makedepends=('git' 'gcc' 'make')
@@ -82,6 +82,7 @@ package_dmd() {
 package_libphobos-devel() {
     pkgdesc="The Phobos standard library for D programming language. Modules and static library."
     depends=("dmd")
+    provides=("d-runtime=$pkgver" "d-stdlib=$pkgver")
     license=("custom")
 
     install -Dm644 $srcdir/phobos/generated/linux/release/$_archbits/libphobos2.a $pkgdir/usr/lib/libphobos2.a
diff --git a/community/dnscrypt-proxy/PKGBUILD b/community/dnscrypt-proxy/PKGBUILD
index a4efe727a..8fc4d9fcc 100644
--- a/community/dnscrypt-proxy/PKGBUILD
+++ b/community/dnscrypt-proxy/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 94587 2013-07-27 15:21:05Z fyan $
+# $Id: PKGBUILD 97435 2013-09-20 02:21:56Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Techlive Zheng <techlivezheng at gmail dot com>
 # Contributor: peace4all <markspost at rocketmail dot com>
 
 pkgname=dnscrypt-proxy
-pkgver=1.3.2
-pkgrel=1
+pkgver=1.3.3
+pkgrel=2
 pkgdesc="A tool for securing communications between a client and a DNS resolver"
 arch=('i686' 'x86_64')
 url="http://dnscrypt.org/"
-license=('custom')
+license=('custom:ISC')
 depends=(libsodium)
 source=(http://download.dnscrypt.org/$pkgname/$pkgname-$pkgver.tar.bz2 
 	conf.d.file 
@@ -34,6 +34,6 @@ package() {
   rm -rf "$pkgdir"/usr/{lib/*.{l,}a,include}
 }
 
-sha512sums=('969219c5655ca7bcb8cbfb79d9dae9b27a79489bae7451e6e478ab5cee1bc22f0dc1758e9ff51ac2e80ec4230e6fe4eaba3a5ff98c3ddbde8d9dc24a51050bab'
+sha512sums=('c8e9484485f060aa90a36ef097506b1042348c85b74d0e5bfdeefa8bf8f80e42ae79d4568f524bb6de0754b125ed4f4b39a177f6fdee9e4616e7d0c3641aec0b'
             '2271eab1baf1a7192a8daaa1b271c24a3a3fa498432ac99c2e4fb3c939590f09aab582427ae874fce7969ece365ccb7a2e946566e5a0c650d93c34d23b536b61'
-            '33e8f95c38a10a9e05aadeb369616f6dfaa8b32bc28b9f8ab9ae29dfc3b03514442e7172b1f52c56665317b61cad7d130a0e1dc00d6aceaa59eb465e63d079bc')
+            'bfff47fc9a515a26d835e08dfeeffba07ff66b09fd887df6c961802c2f8d584f9cd05e83bdcd7ccc274215744e4a05a328aec96152dee70e2fdfe12e12b390d3')
diff --git a/community/dnscrypt-proxy/dnscrypt-proxy.service b/community/dnscrypt-proxy/dnscrypt-proxy.service
index 5e30d888e..5d38fd908 100644
--- a/community/dnscrypt-proxy/dnscrypt-proxy.service
+++ b/community/dnscrypt-proxy/dnscrypt-proxy.service
@@ -5,13 +5,8 @@ After=network.target
 #Before=pdnsd.service
 
 [Service]
-Type=forking
-PIDFile=/var/run/dnscrypt-proxy.pid
 EnvironmentFile=/etc/conf.d/dnscrypt-proxy
-ExecStartPre=/bin/rm -f /var/run/dnscrypt-proxy.pid
-ExecStart=/usr/bin/dnscrypt-proxy --daemonize \
-	--pidfile=/var/run/dnscrypt-proxy.pid \
-	--logfile=/var/log/dnscrypt-proxy.log \
+ExecStart=/usr/bin/dnscrypt-proxy \
 	--local-address=${DNSCRYPT_LOCALIP}:${DNSCRYPT_LOCALPORT} \
 	--user=${DNSCRYPT_USER}
 Restart=on-abort
diff --git a/community/dosbox/PKGBUILD b/community/dosbox/PKGBUILD
index 26392438f..69da7343c 100644
--- a/community/dosbox/PKGBUILD
+++ b/community/dosbox/PKGBUILD
@@ -1,48 +1,54 @@
-# $Id: PKGBUILD 90018 2013-05-06 19:36:46Z foutrelis $
-# Maintainer: Jaroslav Lichtblau
+# $Id: PKGBUILD 98144 2013-10-06 16:29:33Z jlichtblau $
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Jelle van der Waa <jelle@vdwaa.nl>
 # Contributor: James Rayner <james@archlinux.org>
 # Contributor: Ben <ben@benmazer.net>
 
 pkgname=dosbox
 pkgver=0.74
-pkgrel=5
-pkgdesc="Emulator with builtin DOS for running DOS Games"
+pkgrel=6
+pkgdesc='Emulator with builtin DOS for running DOS Games'
 arch=('i686' 'x86_64' 'mips64el')
-url="http://dosbox.sourceforge.net/"
+url='http://dosbox.sourceforge.net/'
 license=('GPL')
 depends=('sdl_net' 'zlib' 'sdl_sound' 'libgl' 'libpng' 'alsa-lib' 'gcc-libs' 'glu')
-makedepends=('mesa' 'gendesk')
-source=("http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz"
-	'dosbox.png'
-	'gcc46.patch')
-md5sums=('b9b240fa87104421962d14eee71351e8'
-         '2aac25fc06979e375953fcc36824dc5e'
-         '3fba2e3c7c43290319b2928f40ed30e5')
-
-build(){
+makedepends=('mesa-libgl' 'gendesk')
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
+        dosbox.png
+        gcc46.patch)
+sha256sums=('13f74916e2d4002bad1978e55727f302ff6df3d9be2f9b0e271501bd0a938e05'
+            '491c42d16fc5ef7ee2eca1b736f7801249d4ca8c0b236a001aec0d3e24504f3b'
+            'f4848d22982b47d1f123ff2c68493460e93aca593ea4a122d69d08625755359c')
+
+prepare() {
   cd "$srcdir"
-  gendesk
 
-  cd "${pkgname}-${pkgver}"
+  gendesk --pkgname "$pkgname" --pkgdesc "$pkgdesc"
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
   patch -Np1 -i "$srcdir/gcc46.patch"
   sed -i 's/png_check_sig/png_sig_cmp/' configure 
-  ./configure   --prefix=/usr \
-    --sysconfdir=/etc/dosbox  
+
+  ./configure   --prefix=/usr --sysconfdir=/etc/dosbox  
   make 
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install 
+  cd "$srcdir/$pkgname-$pkgver"
 
+  make DESTDIR="$pkgdir" install 
 
-  # install docs, make does not install them
+# install docs, make does not install them
   install -Dm644 README "$pkgdir"/usr/share/doc/$pkgname/README
   install -Dm644 docs/README.video "$pkgdir"/usr/share/doc/$pkgname/README.video
 
-  install -Dm644 "${srcdir}/${pkgname}.png" \
-    "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
-  install -Dm644 "${srcdir}/${pkgname}.desktop" \
-    "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+  install -Dm644 "$srcdir/$pkgname.png" \
+    "$pkgdir/usr/share/pixmaps/$pkgname.png"
+  install -Dm644 "$srcdir/$pkgname.desktop" \
+    "$pkgdir/usr/share/applications/$pkgname.desktop"
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/doublecmd/PKGBUILD b/community/doublecmd/PKGBUILD
index 366cfdf1c..18bccd8f3 100644
--- a/community/doublecmd/PKGBUILD
+++ b/community/doublecmd/PKGBUILD
@@ -1,11 +1,11 @@
 # vim:set ft=sh:
-# $Id: PKGBUILD 94328 2013-07-20 16:51:21Z idevolder $
+# $Id: PKGBUILD 97499 2013-09-22 18:09:18Z idevolder $
 # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
 # Contributor: (sirocco AT ngs.ru)
 
 pkgbase=doublecmd
 pkgname=('doublecmd-gtk2' 'doublecmd-qt')
-pkgver=0.5.6
+pkgver=0.5.7
 _helpver=0.5.5
 pkgrel=1
 url="http://doublecmd.sourceforge.net/"
@@ -23,7 +23,7 @@ source=(
 	"http://downloads.sourceforge.net/project/$pkgbase/Double%20Commander%20Source/$pkgbase-$pkgver-src.tar.gz"
 	"http://downloads.sourceforge.net/project/$pkgbase/Double%20Commander%20Source/$pkgbase-help-$_helpver-src.tar.gz"
 )
-sha256sums=('b909ee5c57cb2803e4393163f5c44513144cb32e304fa2e1dfee6f33d0999bc5'
+sha256sums=('8e2059f986fff26da5d7b98af95be64b12c5cef6b50fe3cacd9a2805947aa343'
             '5c5d00187df811df0734bf751a581bce7e1bdd4cf4639b2a1101f1da8743daaf')
 
 build() {
diff --git a/community/drbd/01-remove-old-sanity-check.diff b/community/drbd/01-remove-old-sanity-check.diff
deleted file mode 100644
index 04edb7571..000000000
--- a/community/drbd/01-remove-old-sanity-check.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Lars Ellenberg <lars.ellenberg@linbit.com>
-Date: Thu, 3 Nov 2011 09:40:43 +0000 (+0100)
-Subject: build: remove old sanity check to allow build against linux 3.1
-X-Git-Url: http://git.drbd.org/gitweb.cgi?p=drbd-8.3.git;a=commitdiff_plain;h=790c26b09519b9e02b3a7cf7897fb17c2ae339bf
-
-build: remove old sanity check to allow build against linux 3.1
----
-
-diff --git a/drbd/Makefile b/drbd/Makefile
-index 0985340..7a09603 100644
---- a/drbd/Makefile
-+++ b/drbd/Makefile
-@@ -90,11 +90,6 @@ else
-     endif
-   endif
- 
--  KDIR_Makefile_PATCHLEVEL = $(shell test -e $(KDIR)/Makefile && grep "^PATCHLEVEL = " $(KDIR)/Makefile | cut -d " " -f 3)
--  ifneq ($(findstring $(KDIR_Makefile_PATCHLEVEL),12345),)
--    $(error "won't compile with this kernel version")
--  endif
--
-   .PHONY: drbd.o default all greeting clean kbuild install dep tags
- 
-   drbd.o: greeting kbuild
diff --git a/community/drbd/PKGBUILD b/community/drbd/PKGBUILD
index bb150a493..c0b476d33 100644
--- a/community/drbd/PKGBUILD
+++ b/community/drbd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 90502 2013-05-12 23:31:07Z seblu $
+# $Id: PKGBUILD 97092 2013-09-12 13:47:56Z seblu $
 # Maintainer: Sébastien Luttringer
 
 pkgname=drbd
-pkgver=8.4.2
-pkgrel=2
+pkgver=8.4.3
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='Userland tools for Distributed Replicated Block Device'
 url='http://www.drbd.org'
@@ -12,7 +12,7 @@ depends=('perl' 'bash')
 source=("http://oss.linbit.com/drbd/8.4/$pkgname-$pkgver.tar.gz"
         "$pkgname.service")
 backup=('etc/drbd.conf' 'etc/drbd.d/global_common.conf')
-md5sums=('b081f1046adda1d51ba351c40a8b1107'
+md5sums=('0c54a69603fa28b41de5fb33e03fd9e8'
          '7dc909b5895c0b5289d3ee0581d7d333')
 
 prepare() {
diff --git a/community/dtach/PKGBUILD b/community/dtach/PKGBUILD
index dcf0617b4..56a24394b 100644
--- a/community/dtach/PKGBUILD
+++ b/community/dtach/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 65661 2012-02-21 20:25:45Z cbrannon $
+# $Id: PKGBUILD 97940 2013-10-01 16:51:03Z bpiotrowski $
 # Maintainer: Chris Brannon <cmbrannon79@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Adam Vogt <vogt.adam@gmail.com>
 
 pkgname=dtach
 pkgver=0.8
-pkgrel=5
+pkgrel=6
 pkgdesc="emulates the detach feature of screen"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://dtach.sourceforge.net/"
diff --git a/community/dub/PKGBUILD b/community/dub/PKGBUILD
new file mode 100644
index 000000000..b092a0b07
--- /dev/null
+++ b/community/dub/PKGBUILD
@@ -0,0 +1,28 @@
+# Maintainer:  Mihails Strasuns <public@dicebot.lv>
+# Contributor: Moritz Maxeiner <moritz@ucworks.org>
+pkgname=dub
+pkgver=0.9.18
+pkgrel=1
+pkgdesc="Developer package manager for D programming language"
+arch=('i686' 'x86_64')
+url="https://github.com/rejectedsoftware/dub"
+license=('MIT')
+makedepends=('dmd' 'libphobos-devel' 'git')
+depends=('d-compiler' 'd-runtime' 'curl')
+source=("git+http://github.com/rejectedsoftware/dub.git#tag=v$pkgver")
+sha256sums=('SKIP')
+
+build()
+{
+  cd "${srcdir}/${pkgname}"
+  GITVER=$(git describe) || GITVER=unknown
+  echo "module dub.version_; enum dubVersion = \"$GITVER\";" > source/dub/version_.d
+  dmd  -ofbin/dub -g -debug -w -Isource -L-lcurl @build-files.txt
+}
+
+package()
+{
+  cd "${srcdir}/${pkgname}"
+  install -D -m755 bin/dub "${pkgdir}/usr/bin/dub"
+  install -D -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"
+}
diff --git a/community/dvdisaster/PKGBUILD b/community/dvdisaster/PKGBUILD
index 685aca8c0..6a6cda0f3 100644
--- a/community/dvdisaster/PKGBUILD
+++ b/community/dvdisaster/PKGBUILD
@@ -1,21 +1,27 @@
-# $Id: PKGBUILD 70165 2012-05-01 03:12:33Z ebelanger $
+# $Id: PKGBUILD 97061 2013-09-12 03:38:41Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=dvdisaster
 pkgver=0.72.4
-pkgrel=1.1
+pkgrel=2
 pkgdesc="Provides a margin of safety against data loss on CD and DVD media caused by aging or scratches"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.dvdisaster.com/"
 license=('GPL')
-depends=('gtk2')
+depends=('gtk2' 'hicolor-icon-theme')
 options=('!makeflags')
-source=(http://dvdisaster.net/downloads/${pkgname}-${pkgver}.tar.bz2 dvdisaster.desktop)
+install=dvdisaster.install
+source=(http://dvdisaster.net/downloads/${pkgname}-${pkgver}.tar.bz2{,.gpg})
 sha1sums=('2b47fb5a5535d90641f24a599cd8ae8ffd86b972'
-          'a802dfcee3aa35bdc4b0b5ecabcf32760cd8b992')
+          'SKIP')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  sed -i 's/dvdisaster48/dvdisaster/' contrib/dvdisaster.desktop
+}
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr \
     --mandir=/usr/share/man --docdir=/usr/share/doc \
     --localedir=/usr/share/locale \
@@ -24,12 +30,12 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
 
   make BUILDROOT="${pkgdir}" install
   rm -f "${pkgdir}/usr/bin/dvdisaster-uninstall.sh"
-  install -D -m 644 "${srcdir}/dvdisaster.desktop" \
-    "${pkgdir}/usr/share/applications/dvdisaster.desktop"
-  install -D -m 644 icons/create.png \
-    "${pkgdir}/usr/share/pixmaps/dvdisaster.png"
+  install -D -m 644 contrib/dvdisaster.desktop "${pkgdir}/usr/share/applications/dvdisaster.desktop"
+  for i in 16 24 32 48 64 ; do
+    install -D -m 644 contrib/dvdisaster${i}.png "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/dvdisaster.png"
+  done
 }
diff --git a/community/dvdisaster/dvdisaster.desktop b/community/dvdisaster/dvdisaster.desktop
deleted file mode 100644
index 061a53846..000000000
--- a/community/dvdisaster/dvdisaster.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=dvdisaster
-GenericName=DVD Recovery Tool
-Icon=dvdisaster
-Name=dvdisaster
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=AudioVideo;GTK;
diff --git a/community/dvdisaster/dvdisaster.install b/community/dvdisaster/dvdisaster.install
new file mode 100644
index 000000000..1a05f573e
--- /dev/null
+++ b/community/dvdisaster/dvdisaster.install
@@ -0,0 +1,11 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/community/ekg/PKGBUILD b/community/ekg/PKGBUILD
deleted file mode 100644
index 5585c5fc8..000000000
--- a/community/ekg/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 94723 2013-07-29 16:25:52Z bpiotrowski $
-# Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com>
-
-pkgname=ekg
-pkgver=1.8rc2
-pkgrel=1.2
-pkgdesc="A text-mode Gadu-Gadu client"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://ekg.chmurka.net/"
-license=('GPL')
-depends=('libjpeg' 'aspell' 'python2' 'giflib' 'libgadu')
-source=(http://ekg.chmurka.net/$pkgname-$pkgver.tar.gz)
-md5sums=('f697c711da91ddf57c882114539e92fe')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  sed -i 's#gg%s#ekg%s#' src/ekg.c
-  ./configure --prefix=/usr --with-pthread --enable-aspell --with-python
-  make
-}
-
-package() {
-  make DESTDIR=$pkgdir install
-  rm -rf $pkgdir/usr/include $pkgdir/usr/lib
-}
diff --git a/community/ekg2/PKGBUILD b/community/ekg2/PKGBUILD
deleted file mode 100644
index 8e6fd4c8c..000000000
--- a/community/ekg2/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 96537 2013-08-31 09:41:14Z bpiotrowski $
-# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
-# Contributor: Mateusz Herych <heniekk@gmail.com>
-
-pkgname=ekg2
-pkgver=0.3.1
-pkgrel=8
-pkgdesc='Ncurses based Jabber, Gadu-Gadu, Tlen and IRC client'
-arch=('i686' 'x86_64' 'mips64el')
-url="http://ekg2.org/"
-license=('GPL')
-depends=('aspell' 'libjpeg' 'python2' 'libgadu' 'gnutls' 'gpm' 'libidn' 'giflib')
-optdepends=('xosd: xosd support'
-	    'sqlite: sqlite support'
-            'gtk2: gtk support')
-source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.gz
-        ekg2-0.3.1-giflib5.patch)
-md5sums=('68fc05b432c34622df6561eaabef5a40'
-         'e5855316bf7e9b456ebabb7cb9340e98')
-
-prepare() {
-  cd $pkgname-$pkgver
-  sed -i 's|ncursesw/ncurses.h|ncurses.h|g' configure plugins/ncurses/ecurses.h
-  patch -Np1 -i ../ekg2-0.3.1-giflib5.patch
-}
-
-build() {
-  cd $pkgname-$pkgver
-
-  export PYTHON=/usr/bin/python2
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --libexecdir=/usr/lib/ekg2 \
-    --with-libgadu \
-    --with-xosd \
-    --enable-unicode \
-    --enable-shared \
-    --without-gpg \
-
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  rm -rf "$pkgdir"/usr/lib/perl5/core_perl/perllocal.pod
-  rm -rf "$pkgdir"/usr/libexec
-  chmod -R 755 "$pkgdir"/usr/lib/perl5
-  chmod +s "$pkgdir"/usr/lib/ekg2/ioctld
-}
diff --git a/community/ekg2/ekg2-0.3.1-giflib5.patch b/community/ekg2/ekg2-0.3.1-giflib5.patch
deleted file mode 100644
index d11b1ecec..000000000
--- a/community/ekg2/ekg2-0.3.1-giflib5.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -rupN a/plugins/gg/commands.c b/plugins/gg/commands.c
---- a/plugins/gg/commands.c	2011-03-17 18:08:11.000000000 +0100
-+++ b/plugins/gg/commands.c	2013-08-31 11:31:42.521377436 +0200
-@@ -1029,14 +1029,15 @@ static int token_gif_load (char *fname,
- 	GifFileType *file;
- 	int fd;
- 	fd = open(fname, O_RDONLY);
-+	int giferror;
- 	if (fd == -1) {
- 		snprintf(errbuf, sizeof(errbuf), "open(%s): %m", fname);
- 		goto err;
- 	}
- 	
--	if (!(file = DGifOpenFileHandle(fd))) {
-+	if (!(file = DGifOpenFileHandle(fd, giferror))) {
- 		snprintf(errbuf, sizeof(errbuf), "DGifOpenFileHandle(): %d", 
--			GifLastError());
-+			GifErrorString(giferror));
- 		goto err2;
- 	}
- 
-@@ -1046,7 +1047,7 @@ static int token_gif_load (char *fname,
- 	}
- 	
- 	if (DGifSlurp(file) != GIF_OK) {
--		snprintf(errbuf, sizeof(errbuf), "DGifSlurp(): %d", GifLastError());
-+		snprintf(errbuf, sizeof(errbuf), "DGifSlurp(): %d", GifErrorString(GIF_ERROR));
- 		goto err3;
- 	}
- 
diff --git a/community/emelfm2/PKGBUILD b/community/emelfm2/PKGBUILD
index 23356156b..cbacf0464 100644
--- a/community/emelfm2/PKGBUILD
+++ b/community/emelfm2/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 83138 2013-01-27 16:13:32Z pierre $
-# Maintainer: Kevin Piche <kevin@archlinux.org>
+# $Id: PKGBUILD 97298 2013-09-16 17:59:16Z kkeen $
+# Maintainer: Kyle Keen <keenerd@gmail.com>
+# Contributor: Kevin Piche <kevin@archlinux.org>
 # Contributor: contrasutra
 
 pkgname=emelfm2
-pkgver=0.8.2
-pkgrel=1.1
+pkgver=0.9.0
+pkgrel=1
 pkgdesc="A file manager that implements the popular two-pane design"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://emelfm2.net/"
 depends=('gtk2')
 license=('GPL3')
 source=("http://emelfm2.net/rel/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('d4498285ae77f0d524ce9be11d50a0aae9569e5f')
+sha1sums=('322089d0f08d0de80f49313b7912ff5b970adbf3')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/emerillon/PKGBUILD b/community/emerillon/PKGBUILD
index dd4e13bc1..f46c9696e 100644
--- a/community/emerillon/PKGBUILD
+++ b/community/emerillon/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=emerillon
 pkgver=0.1.90
-pkgrel=4
+pkgrel=5
 pkgdesc="Map viewer for OpenStreetMap"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://projects.gnome.org/emerillon/"
@@ -18,7 +18,11 @@ build() {
   cd "$srcdir/$pkgname-$pkgver"
 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-static --disable-schemas-compile
+              --disable-static --disable-schemas-compile --disable-maintainer-mode
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
   make
 }
 
diff --git a/community/epic4/PKGBUILD b/community/epic4/PKGBUILD
index a7c2cd106..9e691eef6 100644
--- a/community/epic4/PKGBUILD
+++ b/community/epic4/PKGBUILD
@@ -1,41 +1,44 @@
-# $Id: PKGBUILD 67602 2012-03-13 13:59:58Z lcarlier $
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
-# Maintainer: dorphell <dorphell@archlinux.org>
+# $Id: PKGBUILD 98155 2013-10-06 18:44:32Z jlichtblau $
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Contributor: Mateusz Herych <heniekk@gmail.com>
+# Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: Chris Brannon <cmbrannon (at) cox.net>
 
 pkgname=epic4
-pkgver=2.10.1
-pkgrel=3
+pkgver=2.10.2
+pkgrel=1
 pkgdesc="It's a new direction in ircII development"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.epicsol.org/"
 license=('custom')
 depends=('openssl' 'ncurses' 'tcl' 'perl')
+options=('!emptydirs')
 source=(ftp://ftp.epicsol.org/pub/epic/EPIC4-PRODUCTION/$pkgname-$pkgver.tar.gz)
-md5sums=('6f08a04494d0f5543b5f8f3c1ac56d11')
+sha256sums=('019e8b9709d806a47c8981e78830ebef132ad2350180d034d1ec2af0582dd249')
 
 build() {
  cd ${srcdir}/$pkgname-$pkgver
 
- ./configure --prefix=/usr \
+#to avoid build fail
+  unset CPPFLAGS
+ 
+  ./configure --prefix=/usr \
        --mandir=/usr/share/man \
        --with-ssl \
        --with-ipv6 \
        --with-perl \
        --with-tcl
 
- make
+  make
 }
 
 package() {
- cd ${srcdir}/$pkgname-$pkgver
+  cd ${srcdir}/$pkgname-$pkgver
 
- make prefix=${pkgdir}/usr install
+  make prefix=${pkgdir}/usr \
+       libexecdir=${pkgdir}/usr/bin \
+       mandir=${pkgdir}/usr/share/man install
 
- install -D -m 644 COPYRIGHT ${pkgdir}/usr/share/licenses/$pkgname/COPYRIGHT
- mkdir -p ${pkgdir}/usr/lib/$pkgname
- mv ${pkgdir}/usr/libexec/wserv4 $pkgdir/usr/lib/$pkgname
- rm -rf ${pkgdir}/usr/libexec
+  install -D -m644 COPYRIGHT ${pkgdir}/usr/share/licenses/$pkgname/COPYRIGHT
 }
-
diff --git a/community/erlang-nox/PKGBUILD b/community/erlang-nox/PKGBUILD
index 2f08af3bc..a3ddb47b3 100644
--- a/community/erlang-nox/PKGBUILD
+++ b/community/erlang-nox/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 95691 2013-08-15 17:07:39Z arodseth $
+# $Id: PKGBUILD 97433 2013-09-19 22:16:37Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Lukas Fleischer <archlinux@cryptocrack.de>
 # Contributor: Vesa Kaihlavirta <vesa@archlinux.org>
@@ -7,8 +7,8 @@
 # Contributor: Ricardo Catalinas Jiménez <jimenezrick@gmail.com>
 
 pkgname=erlang-nox
-pkgver=R16B01
-pkgrel=2
+pkgver=R16B02
+pkgrel=1
 pkgdesc='General-purpose concurrent functional programming language developed by Ericsson (headless version)'
 arch=('x86_64' 'i686')
 url='http://www.erlang.org/'
@@ -21,8 +21,8 @@ optdepends=('erlang-unixodbc: database support'
             'lksctp-tools: for SCTP support')
 source=("http://www.erlang.org/download/otp_src_${pkgver/_/-}.tar.gz"
         "http://www.erlang.org/download/otp_doc_man_${pkgver/_/-}.tar.gz")
-sha256sums=('da388bc07b8ebdd008f5bb6c3d2c280e358bd188b5aac3ea01e3a7436315abc0'
-            '71972049fbac73457fb6868be18068edce9f2c9fc2aeeab15f019d4217b6a8c2')
+sha256sums=('6ab8ad1df8185345554a4b80e10fd8be06c4f2b71b69dcfb8528352787b32f85'
+            'b79ceb0383415088b5f040f2f3705632b425cb3f29c3955ef2219556abec5789')
 
 build() {
   cd "otp_src_${pkgver/_1/}"
diff --git a/community/erlang/PKGBUILD b/community/erlang/PKGBUILD
index 6cfb2265d..d965c6cf0 100644
--- a/community/erlang/PKGBUILD
+++ b/community/erlang/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96358 2013-08-26 11:47:54Z arodseth $
+# $Id: PKGBUILD 97431 2013-09-19 21:08:56Z arodseth $
 # Maintainer: Lukas Fleischer <archlinux@cryptocrack.de>
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Vesa Kaihlavirta <vesa@archlinux.org>
@@ -8,8 +8,8 @@
 
 pkgbase=erlang
 pkgname=('erlang' 'erlang-unixodbc')
-pkgver=R16B01
-pkgrel=2
+pkgver=R16B02
+pkgrel=1
 arch=('x86_64' 'i686' 'mips64el')
 url='http://www.erlang.org/'
 license=('custom')
@@ -19,14 +19,14 @@ source=("http://www.erlang.org/download/otp_src_${pkgver/_/-}.tar.gz"
         'epmd.service'
         'epmd.socket'
         'epmd.conf')
-sha256sums=('da388bc07b8ebdd008f5bb6c3d2c280e358bd188b5aac3ea01e3a7436315abc0'
-            '71972049fbac73457fb6868be18068edce9f2c9fc2aeeab15f019d4217b6a8c2'
+sha256sums=('6ab8ad1df8185345554a4b80e10fd8be06c4f2b71b69dcfb8528352787b32f85'
+            'b79ceb0383415088b5f040f2f3705632b425cb3f29c3955ef2219556abec5789'
             'b121ec9053fb37abca5f910a81c526f93ec30fe13b574a12209223b346886a9e'
             '998a759e4cea4527f9d9b241bf9f32527d7378d63ea40afa38443c6c3ceaea34'
             '78ce5e67b21758c767d727e56b20502f75dc4385ff9b6c6db312d8e8506f2df2')
 
 build() {
-  cd "$srcdir/otp_src_${pkgver/_1/}"
+  cd "otp_src_${pkgver/_1/}"
 
   ./configure --prefix=/usr --enable-smp-support --with-odbc
   make
@@ -41,7 +41,7 @@ package_erlang() {
   provides=('erlang-nox')
   conflicts=('erlang-nox')
 
-  cd "$srcdir/otp_src_${pkgver/_1/}"
+  cd "otp_src_${pkgver/_1/}"
 
   make DESTDIR="$pkgdir" install
 
diff --git a/community/esmtp/PKGBUILD b/community/esmtp/PKGBUILD
index 8c7c59029..55a5f5584 100644
--- a/community/esmtp/PKGBUILD
+++ b/community/esmtp/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=esmtp
 pkgver=1.2
-pkgrel=5
+pkgrel=6
 pkgdesc="An easy SMTP forwarder."
 arch=('i686' 'x86_64' 'mips64el')
 url='http://esmtp.sourceforge.net'
@@ -14,6 +14,7 @@ depends=('libesmtp' 'openssl')
 optdepends=('liblockfile: for esmtp-wrapper script'
             'procmail: for local mail delivery')
 provides=('smtp-forwarder')
+conflicts=('smtp-forwarder')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('79a9c1f9023d53f35bb82bf446150a72')
 
diff --git a/community/ettercap/PKGBUILD b/community/ettercap/PKGBUILD
index e8646e4d6..4dee9d221 100644
--- a/community/ettercap/PKGBUILD
+++ b/community/ettercap/PKGBUILD
@@ -1,21 +1,20 @@
-# $Id: PKGBUILD 88226 2013-04-14 19:02:25Z jelle $
+# $Id: PKGBUILD 97482 2013-09-21 10:35:04Z jelle $
 # Maintainer:
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgbase=ettercap
 pkgname=('ettercap' 'ettercap-gtk')
-pkgver=0.7.6
-pkgrel=2
+pkgver=0.8.0
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ettercap.github.com/ettercap/"
 license=('GPL')
 depends=('openssl' 'libpcap' 'pcre' 'libltdl' 'libnet')
 makedepends=('ghostscript' 'cmake' 'libpcap' 'libltdl' 'libnet' 'gtk2')
 options=('!libtool' '!makeflags' '!emptydirs')
-source=("https://github.com/Ettercap/ettercap/archive/v$pkgver.tar.gz" "ettercap.desktop" "org.archlinux.pkexec.ettercap.policy")
-md5sums=('7c5f5e1fd4002afdfd13765ef92866e1'
-         '51ae9f08e37a0621b3caeedb8e4d47d7'
-         '473867a0ee6da9cfb048b3d332c3d71f')
+source=("https://github.com/Ettercap/ettercap/archive/v$pkgver.tar.gz")
+md5sums=('067514bb53ff76b81d578676e2048319')
+
 build() {
   cd "${srcdir}"
 
@@ -24,13 +23,13 @@ build() {
   cd ${pkgbase}-${pkgver}
   mkdir build
   cd build
-  cmake -D ENABLE_GTK=OFF -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=RELEASE ../
+  cmake -D ENABLE_GTK=OFF -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release ../
   make
 
   cd "$srcdir"/${pkgbase}-${pkgver}-gtk
   mkdir build
   cd build
-  cmake -D ENABLE_GTK=ON -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=RELEASE ../
+  cmake -D ENABLE_GTK=ON -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release ../
   make
 }
 
@@ -45,7 +44,7 @@ package_ettercap() {
 
 package_ettercap-gtk() {
   pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - GTK frontend"
-  depends+=('gtk2' 'polkit')
+  depends+=('gtk2')
   backup=('etc/ettercap/etter.conf')
   conflicts=('ettercap')
   provides=('ettercap')
@@ -56,18 +55,18 @@ package_ettercap-gtk() {
   cd "${srcdir}"/${pkgbase}-${pkgver}-gtk/build
   make DESTDIR="${pkgdir}" install
 
-  install -Dm644 "${srcdir}/ettercap.desktop" "${pkgdir}/usr/share/applications/ettercap.desktop"
-  install -Dm644 "${srcdir}/${pkgbase}-${pkgver}-gtk/desktop/ettercap.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/ettercap.svg"
+#install -Dm644 "${srcdir}/ettercap.desktop" "${pkgdir}/usr/share/applications/ettercap.desktop"
+#install -Dm644 "${srcdir}/${pkgbase}-${pkgver}-gtk/desktop/ettercap.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/ettercap.svg"
 
   # Install policy file
-  install -Dm644 "${srcdir}/org.archlinux.pkexec.ettercap.policy" "${pkgdir}/usr/share/polkit-1/actions/org.archlinux.pkexec.ettercap.policy"
+  #install -Dm644 "${srcdir}/org.archlinux.pkexec.ettercap.policy" "${pkgdir}/usr/share/polkit-1/actions/org.archlinux.pkexec.ettercap.policy"
 
   # We need rename the original script
-  mv "${pkgdir}/usr/bin/ettercap" "${pkgdir}/usr/bin/ettercap.elf"
+  #mv "${pkgdir}/usr/bin/ettercap" "${pkgdir}/usr/bin/ettercap.elf"
 
   # Install launcher script
-  echo '#!/bin/sh' > ${pkgdir}/usr/bin/ettercap
-  echo 'pkexec --disable-internal-agent "/usr/bin/ettercap.elf" "$@"' >> ${pkgdir}/usr/bin/ettercap
-  chmod 755 ${pkgdir}/usr/bin/ettercap
+  #echo '#!/bin/sh' > ${pkgdir}/usr/bin/ettercap
+  #echo 'pkexec --disable-internal-agent "/usr/bin/ettercap.elf" "$@"' >> ${pkgdir}/usr/bin/ettercap
+  #chmod 755 ${pkgdir}/usr/bin/ettercap
 
 }
diff --git a/community/ettercap/ettercap.desktop b/community/ettercap/ettercap.desktop
deleted file mode 100644
index 71f8c8ce8..000000000
--- a/community/ettercap/ettercap.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Ettercap
-Comment=Nework sniffer/analyser
-Exec=ettercap -G
-Icon=ettercap
-Terminal=false
-Type=Application
-Categories=Network;
diff --git a/community/ettercap/org.archlinux.pkexec.ettercap.policy b/community/ettercap/org.archlinux.pkexec.ettercap.policy
deleted file mode 100644
index 7908d7232..000000000
--- a/community/ettercap/org.archlinux.pkexec.ettercap.policy
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE policyconfig PUBLIC
- "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
-<policyconfig>
-
-  <action id="org.archlinux.pkexec.ettercap">
-    <message>Authentication is required to run Ettercap</message>
-    <icon_name>ettercap</icon_name>
-    <defaults>
-      <allow_any>auth_admin</allow_any>
-      <allow_inactive>auth_admin</allow_inactive>
-      <allow_active>auth_admin</allow_active>
-    </defaults>
-    <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/ettercap.elf</annotate>
-    <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
-  </action>
-
-</policyconfig>
diff --git a/community/evilwm/LICENSE b/community/evilwm/LICENSE
deleted file mode 100644
index 6778ede8c..000000000
--- a/community/evilwm/LICENSE
+++ /dev/null
@@ -1,40 +0,0 @@
-LICENCE
-
-evilwm 1.1
-Copyright (C) 1999-2011 Ciaran Anscomb <evilwm@6809.org.uk>
-
-This is free software.  You can do what you want to it, but if it
-breaks something, you get to pay for the counselling.  The code was
-originally based on aewm, so this is distributed under the same terms,
-which follow.
-
-
-AEWM LICENCE
-
-Copyright (c) 1998-2000 Decklin Foster.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS", WITHOUT ANY EXPRESS
-OR IMPLIED WARRANTIES OF ANY KIND. IN NO EVENT SHALL THE AUTHOR BE
-HELD LIABLE FOR ANY DAMAGES CONNECTED WITH THE USE OF THIS PROGRAM.
-
-You are granted permission to copy, publish, distribute, and/or sell
-copies of this program and any modified versions or derived works,
-provided that this copyright and notice are not removed or altered.
-
-Portions of the code were based on 9wm, which contains this license:
-
-> 9wm is free software, and is Copyright (c) 1994 by David Hogan.
-> Permission is granted to all sentient beings to use this software,
-> to make copies of it, and to distribute those copies, provided
-> that:
->
->     (1) the copyright and licence notices are left intact
->     (2) the recipients are aware that it is free software
->     (3) any unapproved changes in functionality are either
->           (i) only distributed as patches
->       or (ii) distributed as a new program which is not called 9wm
->               and whose documentation gives credit where it is due
->     (4) the author is not held responsible for any defects
->         or shortcomings in the software, or damages caused by it.
->
-> There is no warranty for this software.  Have a nice day.
diff --git a/community/evilwm/PKGBUILD b/community/evilwm/PKGBUILD
deleted file mode 100644
index 3b7c0784c..000000000
--- a/community/evilwm/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id$
-# Maintainer: Kevin Piche <kevin@archlinux.org>
-# Contributor: Jochem Kossen <j.kossen@home.nl>
-
-pkgname=evilwm
-pkgver=1.1.0
-pkgrel=1.2
-pkgdesc="A minimalist but usable window manager for the X Window System."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://evilwm.sourceforge.net"
-license=('custom')
-depends=('libxrandr')
-source=(http://www.6809.org.uk/evilwm/$pkgname-$pkgver.tar.gz LICENSE)
-md5sums=('5f14cc3019320860c85bb07c60a76bd7'
-         '0941ad3e96597ef75c6310f43a0342a0')
-
-build() {
-  cd "$srcdir"/$pkgname-$pkgver
-  make
-}
-
-package() {
-  cd "$srcdir"/$pkgname-$pkgver
-  make DESTDIR="$pkgdir" desktopfilesdir=/usr/share/xsessions install
-  install -D -m644 "$srcdir"/LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/community/fatrat/PKGBUILD b/community/fatrat/PKGBUILD
index 36d13afa3..2eaf2f2cf 100644
--- a/community/fatrat/PKGBUILD
+++ b/community/fatrat/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 94068 2013-07-13 16:36:05Z stativ $
+# $Id: PKGBUILD 97703 2013-09-27 17:44:03Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 pkgname=fatrat
 pkgver=1.2.0_beta2
-pkgrel=8
-pkgdesc="QT4 based download manager with support for HTTP, FTP, SFTP, BitTorrent, rapidshare and more"
+pkgrel=9
+pkgdesc="Qt4 based download manager with support for HTTP, FTP, SFTP, BitTorrent, rapidshare and more"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://fatrat.dolezel.info/"
 license=('GPL')
diff --git a/community/fb-client/PKGBUILD b/community/fb-client/PKGBUILD
index a3977275c..d6e3a5743 100644
--- a/community/fb-client/PKGBUILD
+++ b/community/fb-client/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Florian "Bluewind" Pritz <flo@xssn.at>
 
 pkgname=fb-client
-pkgver=1.3.0
+pkgver=1.3.1
 pkgrel=1
 pkgdesc="Client for paste.xinu.at"
 arch=('i686' 'x86_64' 'mips64el')
@@ -10,7 +10,7 @@ license=('GPL3')
 depends=('curl' 'bash')
 optdepends=('xclip: for automatically copying the URL into the clipboard')
 source=(http://paste.xinu.at/data/client/fb-$pkgver.tar.gz{,.sig})
-md5sums=('e715b53883a7f9e3fc5942c78618dbdf'
+md5sums=('6938cff329e7965593f270747e94539f'
          'SKIP')
 
 build() {
diff --git a/community/fbv/PKGBUILD b/community/fbv/PKGBUILD
index e3dfa3770..62d65d3be 100644
--- a/community/fbv/PKGBUILD
+++ b/community/fbv/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 94921 2013-08-01 07:01:11Z bpiotrowski $
+# $Id: PKGBUILD 98028 2013-10-04 09:54:24Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Aectann <aectann@infoline.su>
 
 pkgname=fbv
 pkgver=1.0b
-pkgrel=7
+pkgrel=8
 pkgdesc="FrameBuffer image viewer"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://s-tech.elsat.net.pl/fbv/"
 license=('GPL')
-depends=('libpng' 'libungif' 'libjpeg')
+depends=('libpng' 'giflib' 'libjpeg')
 source=(http://s-tech.elsat.net.pl/fbv/$pkgname-$pkgver.tar.gz
         giflib-5.0.patch)
 md5sums=('3e466375b930ec22be44f1041e77b55d'
@@ -18,7 +18,7 @@ md5sums=('3e466375b930ec22be44f1041e77b55d'
 build() {
   cd $srcdir/$pkgname-$pkgver
   ./configure --prefix=/usr --mandir=/usr/share/man
-  sed -i 's|LIBS.*|LIBS=-lpng -ljpeg -lungif -lgif|' Make.conf
+  sed -i 's|LIBS.*|LIBS=-lpng -ljpeg -lgif|' Make.conf
   sed -i 's|setjmp(png_ptr->jmpbuf)|setjmp(png_jmpbuf(png_ptr))|' png.c
   patch -Np1 -i ../giflib-5.0.patch
   make
diff --git a/community/fceux/PKGBUILD b/community/fceux/PKGBUILD
index 842c10c81..b9f2718f1 100644
--- a/community/fceux/PKGBUILD
+++ b/community/fceux/PKGBUILD
@@ -1,44 +1,40 @@
-# $Id: PKGBUILD 93772 2013-07-10 07:27:12Z bpiotrowski $
+# $Id: PKGBUILD 97759 2013-09-28 13:37:37Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contriutor: Eric Belanger <eric@archlinux.org>
 # Contributor: Jo Christian Bergskås <jcberg@gmail.com>
 
 pkgname=fceux
-pkgver=2.2.1.1
-pkgrel=2
+pkgver=2.2.2
+pkgrel=1
 url='http://www.fceux.com/'
 pkgdesc='Fast and ultra-compatible NES/Famicom emulator'
 arch=('x86_64' 'i686' 'mips64el')
 license=('GPL')
-depends=('sdl' 'gtk2' 'gd' 'desktop-file-utils' 'lua51' 'libgl')
+depends=('sdl' 'gtk2' 'gd' 'desktop-file-utils' 'lua51' 'libgl' 'shared-mime-info')
 makedepends=('scons' 'mesa-libgl' 'glu')
-optdepends=('xchm: for viewing the manual')
-install="$pkgname.install"
-source=("https://downloads.sourceforge.net/project/fceultra/Source%20Code/2.2.1%20src/$pkgname-$pkgver.src.tar.gz")
-sha256sums=('afb0b3b8e1d2eea40c59777ef538b69b16164ae53c406106e541099534db828c')
+install='fceux.install'
+source=("https://downloads.sourceforge.net/project/fceultra/Source%20Code/$pkgver%20src/$pkgname-$pkgver.src.tar.gz")
+sha256sums=('804d11bdb4a195f3a580ce5d2d01be877582763378637e16186a22459f5fe5e1')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
-  msg2 'Compiling...'
   scons
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
-  msg2 'Packaging binaries, data and man-pages...'
-  scons install --prefix="$pkgdir/usr"
+  scons install -i --prefix="$pkgdir/usr"
 
-  msg2 'Packaging documentation...'
-  install -Dm644 "src/drivers/win/help/$pkgname.chm" \
-    "$pkgdir/usr/share/doc/$pkgname/$pkgname.chm"
+  # scons install creates usr/share/pixmaps as a regular file, wtf?
+  rm -f "$pkgdir/usr/share/pixmaps"
+
+  install -d "$pkgdir/usr/share/doc/$pkgname"
   cp -r documentation/* "$pkgdir/usr/share/doc/$pkgname/"
-  # Removing manpages that are already placed in the right location
-  rm -f "$pkgdir/usr/share/doc/$pkgname/*.6"
   install -Dm644 changelog.txt "$pkgdir/usr/share/doc/$pkgname/"
 
-  msg2 'Packaging desktop shortcut and icon...'
+  # desktop shortcut
   install -Dm644 "$pkgname.desktop" \
     "$pkgdir/usr/share/applications/$pkgname.desktop"
   install -Dm644 "$pkgname.png" \
diff --git a/community/fceux/fceux.install b/community/fceux/fceux.install
index ad97d7bab..6af331ec0 100644
--- a/community/fceux/fceux.install
+++ b/community/fceux/fceux.install
@@ -1,13 +1,15 @@
-post_upgrade() {
+post_install() {
   update-desktop-database -q
+  update-mime-database usr/share/mime &> /dev/null
+#  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
 }
 
-post_install() {
-  post_upgrade
+post_upgrade() {
+  post_install
 }
 
 post_remove() {
-  post_upgrade
+  post_install
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/fcitx-mozc/PKGBUILD b/community/fcitx-mozc/PKGBUILD
index f814fd257..bc714998a 100644
--- a/community/fcitx-mozc/PKGBUILD
+++ b/community/fcitx-mozc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96696 2013-09-03 03:55:15Z fyan $
+# $Id: PKGBUILD 97633 2013-09-26 06:11:29Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com>
 
@@ -14,7 +14,7 @@ pkgname=fcitx-mozc
 pkgdesc="Fcitx Module of A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)"
 pkgver=1.11.1522.102
 _patchver=${pkgver}.1
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/mozc/"
 license=('custom')
diff --git a/community/fcitx/PKGBUILD b/community/fcitx/PKGBUILD
index e4a06047b..3a75e6938 100644
--- a/community/fcitx/PKGBUILD
+++ b/community/fcitx/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 94235 2013-07-17 12:26:33Z fyan $
+# $Id: PKGBUILD 97747 2013-09-28 08:49:25Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: csslayer <wengxt AT gmail com>
 
 pkgbase=fcitx
 pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt4')
-pkgver=4.2.8.1
-pkgrel=2
+pkgver=4.2.8.3
+pkgrel=1
 groups=('fcitx-im')
 arch=('i686' 'x86_64' 'mips64el')
 url="http://fcitx-im.org"
@@ -23,6 +23,7 @@ build() {
   cmake ../${pkgbase}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
+    -DSYSCONFDIR=/etc \
     -DFORCE_OPENCC=ON \
     -DFORCE_PRESAGE=ON \
     -DFORCE_ENCHANT=ON \
@@ -102,7 +103,7 @@ package_fcitx-gtk3() {
 }
 
 package_fcitx-qt4() {
-  pkgdesc='QT4 IM Module for fcitx'
+  pkgdesc='Qt4 IM Module for fcitx'
   depends=('qt4' "fcitx>=$pkgver")
   replaces=('fcitx-qt')
   provides=('fcitx-qt')
@@ -118,4 +119,4 @@ package_fcitx-qt4() {
   make DESTDIR="${pkgdir}" install
 }
 
-sha512sums=('981e07830693b9525f8f8c7f18579477c066a19ae9358d8aa96ae5439cc3d40f7af2ad24b8cbd24410a5472d002a02eccb8c9d042019cd8459fd094e302d5a72')
+sha512sums=('93c7aa5209f344e1e89addb1dca7a76cde884e4467c0db5f79e758ea8ffb0fe1207ba1c507fb6574fe8223fa873ed5d1dd44835b70cf9254f5149df8e242e92d')
diff --git a/community/fcrackzip/ChangeLog b/community/fcrackzip/ChangeLog
deleted file mode 100644
index 811f87d4f..000000000
--- a/community/fcrackzip/ChangeLog
+++ /dev/null
@@ -1,3 +0,0 @@
-2007-06-28 tardo <tardo@nagi-fanboi.net>
-* Built for x86_64
-
diff --git a/community/fcrackzip/PKGBUILD b/community/fcrackzip/PKGBUILD
index e46ebb839..4cd7f756a 100644
--- a/community/fcrackzip/PKGBUILD
+++ b/community/fcrackzip/PKGBUILD
@@ -1,28 +1,31 @@
-# $Id: PKGBUILD 67610 2012-03-13 14:10:18Z lcarlier $
+# $Id: PKGBUILD 97775 2013-09-29 15:22:35Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
-# Maintainer: Daenyth <Daenyth+Arch at gmail dot com>
+# Contributor: Daenyth <Daenyth+Arch at gmail dot com>
 
 pkgname=fcrackzip
 pkgver=1.0
-pkgrel=3
-pkgdesc="A zip file password cracker"
+pkgrel=4
+pkgdesc='Zip file password cracker'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://oldhome.schmorp.de/marc/$pkgname.html"
 license=('GPL')
-depends=(glibc)
-source=(http://oldhome.schmorp.de/marc/data/$pkgname-$pkgver.tar.gz)
-md5sums=('254941f51759f9425965f4b05fe7ac2c')
+depends=('glibc')
+source=("http://oldhome.schmorp.de/marc/data/$pkgname-$pkgver.tar.gz")
+sha256sums=('4a58c8cb98177514ba17ee30d28d4927918bf0bdc3c94d260adfee44d2d43850')
 
 build() {
-  cd ${srcdir}/$pkgname-$pkgver
+  cd "$pkgname-$pkgver"
 
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd ${srcdir}/$pkgname-$pkgver
+  cd "$pkgname-$pkgver"
 
-  make DESTDIR=${pkgdir} install
-  mv ${pkgdir}/usr/bin/zipinfo ${pkgdir}/usr/bin/fzipinfo
+  make DESTDIR="$pkgdir" install
+  mv "$pkgdir/usr/bin/zipinfo" "$pkgdir/usr/bin/fzipinfo"
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/fdupes/PKGBUILD b/community/fdupes/PKGBUILD
index cbae5b25e..86e64c544 100644
--- a/community/fdupes/PKGBUILD
+++ b/community/fdupes/PKGBUILD
@@ -1,29 +1,35 @@
-# $Id: PKGBUILD 90262 2013-05-10 16:06:17Z jelle $
-# Maintainer: Daenyth <Daenyth+Arch at gmail dot com>
+# $Id: PKGBUILD 97904 2013-10-01 01:21:32Z xyne $
+# Maintainer: Xyne <ca dot archlinux at xyne, backwards>
+# Contributor: Daenyth <Daenyth+Arch at gmail dot com>
 # Contributor: Chris Winter <twidds at gmail dot com>
 
 pkgname=fdupes
 pkgver=1.51
-pkgrel=1
+pkgrel=2
 pkgdesc="a program for identifying or deleting duplicate files residing within specified directories"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/fdupes/"
 license=('MIT')
 depends=(glibc)
 source=(http://fdupes.googlecode.com/files/$pkgname-$pkgver.tar.gz LICENSE)
-md5sums=('47d0410c90c9e51e450933ba35a32b62'
-         '47f17890218f832f870bf7a02eaeb017')
+sha256sums=('87dbc85b7b9cdb9626e713dd8078bd7487bceb58d47ceaff5404a9e6fd062881'
+            '6300e5a838d8a0f08b412742cb755c22708970aef420dbad5dc65ca7de677e39')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-
+  cd "$srcdir/$pkgname-$pkgver"
   make  PREFIX=/usr
 }
-package(){
-  cd $srcdir/$pkgname-$pkgver
-
-  install -d ${pkgdir}/usr/{share/man/man1,bin}
 
-  make PREFIX=$pkgdir/usr DESTDIR=${pkgdir}/usr/bin INSTALLDIR=${pkgdir}/usr/bin MAN_DIR=${pkgdir}/usr/share/man/man1 install
-  install -D -m644 $srcdir/LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
+package(){
+  cd "$srcdir/$pkgname-$pkgver"
+  install -d "$pkgdir"/usr/{share/man/man1,bin}
+  make \
+    PREFIX="$pkgdir/usr" \
+    DESTDIR="$pkgdir/usr/bin" \
+    INSTALLDIR="$pkgdir"/usr/bin \
+    MAN_DIR="$pkgdir"/usr/share/man/man1 \
+    install
+  install -D -m644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
+
+# vim: set ts=2 sw=2 et:
diff --git a/community/ffmpegsource/PKGBUILD b/community/ffmpegsource/PKGBUILD
deleted file mode 100755
index 872078081..000000000
--- a/community/ffmpegsource/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 94878 2013-08-01 06:54:52Z bpiotrowski $
-# Maintainer: Maxime Gauduin <alucryd@gmail.com>
-
-pkgname=ffmpegsource
-pkgver=755
-pkgrel=1
-pkgdesc="A libav/ffmpeg based source library and Avisynth plugin for easy frame accurate access"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://code.google.com/p/ffmpegsource/"
-license=('MIT')
-depends=('ffmpeg')
-makedepends=('svn')
-options=('!libtool')
-source=("${pkgname}::svn+http://ffmpegsource.googlecode.com/svn/trunk/"
-        'autoconf.patch')
-sha256sums=('SKIP'
-            '2cfa7d2e0219a5c8df9a50fe2460a1a1e6b69df10e6d9eee1d723766e62535e7')
-
-pkgver() {
-  cd "${SRCDEST}"/${pkgname}
-
-  svnversion | tr -d [A-z]
-}
-
-prepare() {
-  cd "${srcdir}"/${pkgname}
-
-  patch -Np1 -i ../autoconf.patch
-}
-
-build() {
-  cd "${srcdir}"/${pkgname}
-
-  ./autogen.sh --prefix=/usr --enable-shared --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}"/${pkgname}
-
-  make DESTDIR="${pkgdir}" install
-
-  install -dm 755 "${pkgdir}"/usr/share/licenses/ffmpegsource
-  install -m 644 COPYING "${pkgdir}"/usr/share/licenses/ffmpegsource/LICENSE
-}
-
-# vim: ts=2 sw=2 et:
diff --git a/community/ffmpegsource/autoconf.patch b/community/ffmpegsource/autoconf.patch
deleted file mode 100755
index 2ed0d0f6e..000000000
--- a/community/ffmpegsource/autoconf.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -6,7 +6,7 @@ pkgconfig_DATA = ffms2.pc
- 
- dist_doc_DATA = doc/ffms2-api.html doc/ffms2-changelog.html doc/style.css
- 
--INCLUDES = -I. -I$(top_srcdir)/include -I$(top_srcdir)/src/config @LIBAV_CFLAGS@ @ZLIB_CPPFLAGS@ -include config.h
-+AM_CPPFLAGS = -I. -I$(top_srcdir)/include -I$(top_srcdir)/src/config @LIBAV_CFLAGS@ @ZLIB_CPPFLAGS@ -include config.h
- 
- lib_LTLIBRARIES = src/core/libffms2.la
- src_core_libffms2_la_LIBADD = @LIBAV_LIBS@ @ZLIB_LDFLAGS@ -lz @LTUNDEF@
diff --git a/community/ffms2/PKGBUILD b/community/ffms2/PKGBUILD
new file mode 100644
index 000000000..bb2c78517
--- /dev/null
+++ b/community/ffms2/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 97223 2013-09-15 13:32:52Z alucryd $$
+# Maintainer: Maxime Gauduin <alucryd@gmail.com>
+
+pkgname=ffms2
+pkgver=2.19
+pkgrel=1
+pkgdesc="A libav/ffmpeg based source library and Avisynth plugin for easy frame accurate access"
+arch=('i686' 'x86_64')
+url="https://github.com/FFMS/ffms2"
+license=('MIT')
+depends=('ffmpeg')
+replaces=('ffmpegsource')
+options=('!libtool')
+source=("https://github.com/FFMS/ffms2/archive/${pkgver}.tar.gz")
+sha256sums=('6f1379514f03a14092fdfc9941960a9b86f5b78d86f9e000eeddf3bf50d42811')
+
+build() {
+  cd ${pkgname}-${pkgver}
+
+  ./configure --prefix='/usr' --enable-shared --disable-static
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+
+  make DESTDIR="${pkgdir}" install
+
+# License
+  install -dm 755 "${pkgdir}"/usr/share/licenses/${pkgname}
+  install -m 644 {,"${pkgdir}"/usr/share/licenses/${pkgname}/}COPYING
+}
+
+# vim: ts=2 sw=2 et:
diff --git a/community/flightgear/PKGBUILD b/community/flightgear/PKGBUILD
index 61709421f..d38942ee4 100644
--- a/community/flightgear/PKGBUILD
+++ b/community/flightgear/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 94473 2013-07-25 13:17:05Z spupykin $
+# $Id: PKGBUILD 97537 2013-09-23 17:38:40Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: William Rea <sillywilly@gmail.com>
 # Contributor: Hans Janssen <hans@janserv.xs4all.nl>
 
 pkgname=flightgear
-pkgver=2.10.0
-pkgrel=4
+pkgver=2.12.0
+pkgrel=1
 pkgdesc="An open-source, multi-platform flight simulator"
 arch=(i686 x86_64)
 depends=('simgear' 'libxmu' 'libxi' 'zlib' 'openscenegraph' 'subversion' 'libxrandr' 'glu')
@@ -16,7 +16,7 @@ options=('!makeflags')
 #source=("$pkgname-$pkgver.tar.gz::https://gitorious.org/fg/flightgear/archive-tarball/release/$pkgver")
 #source=("ftp://ftp.de.flightgear.org/pub/fgfs/Source/flightgear-$pkgver.tar.bz2")
 source=("http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Source/flightgear-$pkgver.tar.bz2")
-md5sums=('ae7fc8d1e446c5d1fe2aa82ee41dcac5')
+md5sums=('23e2de5f311f4cbe94ec3386736ee8a5')
 
 build() {
   cd $srcdir/flightgear-$pkgver
diff --git a/community/freemat/PKGBUILD b/community/freemat/PKGBUILD
index 568c14d97..7f7684b4c 100644
--- a/community/freemat/PKGBUILD
+++ b/community/freemat/PKGBUILD
@@ -1,21 +1,19 @@
-# $Id: PKGBUILD 85346 2013-03-01 10:30:37Z andrea $
+# $Id: PKGBUILD 97998 2013-10-02 21:37:00Z bgyorgy $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=freemat
-pkgver=4.1
-pkgrel=7
+pkgver=4.2
+pkgrel=3
 pkgdesc="A free environment for rapid engineering, scientific prototyping and data processing"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://freemat.sourceforge.net"
 license=('GPL')
-depends=('qt4' 'ffcall' 'fftw' 'portaudio' 'libffi' 'glu')
-makedepends=('arpack' 'lapack' 'umfpack' 'blas' 'libmatio' 'cmake' 'python2' 'mesa')
+depends=('arpack' 'fftw' 'glu' 'portaudio' 'qtwebkit')
+makedepends=('cmake' 'python2' 'suitesparse')
 install=freemat.install
-source=(http://downloads.sourceforge.net/project/freemat/FreeMat4/FreeMat-$pkgver-Source.tar.gz
-	build-fix.patch)
-md5sums=('929d31e2310feaff5d380fc2f7b4d1a2'
-         '2d11a28aa2a7df89c4618ed1c4be5973')
+source=(http://downloads.sourceforge.net/project/freemat/FreeMat4/FreeMat-$pkgver-Source.tar.gz)
+md5sums=('ace147e49273ae935d363da8e2a56d4d')
 
 build() {
   cd $srcdir/FreeMat-$pkgver-Source
@@ -24,7 +22,6 @@ build() {
   rm -f CMakeCache.txt
   find . -type f -name '*.moc.cpp' -exec rm -f {} \;
   find . -type f -name 'add.so' -exec rm -f {} \;
-  patch -p1 <$srcdir/build-fix.patch
   echo >libs/libMatC/CJitFuncClang.hpp
   echo >libs/libMatC/CJitFuncClang.cpp
 
diff --git a/community/freemat/build-fix.patch b/community/freemat/build-fix.patch
deleted file mode 100644
index c1ea63088..000000000
--- a/community/freemat/build-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -wbBur FreeMat-4.1-Source/libs/libGraphics/GLRenderEngine.cpp FreeMat-4.1-Source.my/libs/libGraphics/GLRenderEngine.cpp
---- FreeMat-4.1-Source/libs/libGraphics/GLRenderEngine.cpp	2011-11-27 04:27:43.000000000 +0400
-+++ FreeMat-4.1-Source.my/libs/libGraphics/GLRenderEngine.cpp	2012-01-20 19:07:48.000000000 +0400
-@@ -20,6 +20,7 @@
- #include <qimage.h>
- #include <qpainter.h>
- #include <QtOpenGL>
-+#include <GL/glu.h>
- #include <math.h>
- #include "IEEEFP.hpp"
- 
diff --git a/community/freeradius/PKGBUILD b/community/freeradius/PKGBUILD
index 164d97d3b..83a269fb7 100644
--- a/community/freeradius/PKGBUILD
+++ b/community/freeradius/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 91902 2013-05-29 10:03:34Z spupykin $
+# $Id: PKGBUILD 96844 2013-09-06 12:39:09Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jason R Begley (jayray@digitalgoat.com>
 
 pkgname=freeradius
 pkgver=2.2.0
-pkgrel=8
+pkgrel=9
 pkgdesc="The premier open source RADIUS server"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freeradius.org/"
diff --git a/community/freeradius/freeradius.install b/community/freeradius/freeradius.install
index cb7590e77..8ec764b81 100644
--- a/community/freeradius/freeradius.install
+++ b/community/freeradius/freeradius.install
@@ -5,13 +5,17 @@ post_install() {
     touch var/log/radius/radius.log
     chown -R radiusd:radiusd var/log/radius/radius.log
 
-    [ -d etc/raddb ] || cp -a etc/raddb.default etc/raddb
+    [ -d etc/raddb ] || {
+      cp -a etc/raddb.default etc/raddb
+      chown -R radiusd:radiusd etc/raddb
+    }
 
-    true
+    systemd-tmpfiles --create freeradius.conf
 }
 
 post_remove() {
     userdel radiusd
-    groupdel radiusd
-    true
+    grep "^radiusd:" etc/group >/dev/null && groupdel radiusd
+    systemd-tmpfiles --create freeradius.conf
+    echo "-- You may want to remove /var/lib/radiusd and /etc/raddb"
 }
diff --git a/community/freerdp/PKGBUILD b/community/freerdp/PKGBUILD
index 024423a26..112481899 100644
--- a/community/freerdp/PKGBUILD
+++ b/community/freerdp/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 94879 2013-08-01 06:54:53Z bpiotrowski $
+# $Id: PKGBUILD 97610 2013-09-25 13:56:48Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Stijn Segers <francesco dot borromini at gmail dot com>
 
 pkgname=freerdp
 pkgver=1.0.2
-pkgrel=3
+pkgrel=4
 pkgdesc="Free RDP client"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://freerdp.sourceforge.net"
@@ -16,13 +16,16 @@ conflicts=('freerdp-git')
 changelog=${pkgname}.changelog
 options=('!libtool')
 source=($pkgname-$pkgver.tar.gz::https://github.com/FreeRDP/FreeRDP/archive/$pkgver.tar.gz
-        ffmpeg2.0.patch)
+        ffmpeg2.0.patch
+        patch_numblock.patch)
 md5sums=('c260051a94caff590def5caa4fcf59d6'
-         '1260eecf01ea5212e2db8ac9c5e7fa6d')
+         '1260eecf01ea5212e2db8ac9c5e7fa6d'
+         'ac581d445ded7cdbd59082a48d9c28ac')
 
 prepare() {
   cd $srcdir/FreeRDP-$pkgver
   patch -Np1 -i ../ffmpeg2.0.patch
+  patch -Np1 -i ../patch_numblock.patch
 }
 
 build() {
diff --git a/community/freerdp/patch_numblock.patch b/community/freerdp/patch_numblock.patch
new file mode 100644
index 000000000..62a23d582
--- /dev/null
+++ b/community/freerdp/patch_numblock.patch
@@ -0,0 +1,12 @@
+diff -u -r -N old/include/freerdp/kbd/vkcodes.h new/include/freerdp/kbd/vkcodes.h
+--- old/include/freerdp/kbd/vkcodes.h	2013-09-19 12:46:07.124339712 +0200
++++ new/include/freerdp/kbd/vkcodes.h	2013-09-19 12:45:51.621005583 +0200
+@@ -434,7 +434,7 @@
+ 	{ 0x00, 0, "VK_SEPARATOR"        , NULL   },
+ 	{ 0x4A, 0, "VK_SUBTRACT"         , "KPSU" },
+ 	{ 0x53, 0, "VK_DECIMAL"          , "KPDL" },
+-	{ 0x35, 0, "VK_DIVIDE"           , "KPDV" },
++	{ 0x35, 1, "VK_DIVIDE"           , "KPDV" },
+ 	{ 0x3B, 0, "VK_F1"               , "FK01" },
+ 	{ 0x3C, 0, "VK_F2"               , "FK02" },
+ 	{ 0x3D, 0, "VK_F3"               , "FK03" },
diff --git a/community/fssos-nsvs/PKGBUILD b/community/fssos-nsvs/PKGBUILD
deleted file mode 100644
index 537141a1c..000000000
--- a/community/fssos-nsvs/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 90505 2013-05-12 23:35:37Z eric $
-# Maintainer: Dale Blount <dale@archlinux.org>
-
-pkgname=fssos-nsvs
-pkgver=0.5
-pkgrel=11
-pkgdesc="NSVS for FSSOS"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://fssos.sourceforge.net/"
-license=('GPL')
-depends=('bash' 'mariadb')
-backup=('etc/nsvsd.conf')
-options=('!libtool' '!makeflags')
-install=$pkgname.install
-source=("http://downloads.sourceforge.net/sourceforge/fssos/nsvs-$pkgver.tar.gz"
-        'nsvsd.service')
-md5sums=('3f17c2f6339f1a322b712b467023d825'
-         '9c791d2086e13f774548d9d6ba2cf9d5')
-
-build() {
-  cd nsvs-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin
-  make CFLAGS="${CFLAGS} -D_GNU_SOURCE"
-}
-
-package() {
-  cd nsvs-$pkgver
-  make DESTDIR="$pkgdir" install
-  install -D -m644 "$srcdir/nsvsd.service" "$pkgdir/usr/lib/systemd/system/nsvsd.service"
-}
diff --git a/community/fssos-nsvs/fssos-nsvs.install b/community/fssos-nsvs/fssos-nsvs.install
deleted file mode 100644
index 253ae64d2..000000000
--- a/community/fssos-nsvs/fssos-nsvs.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-    if [ -z "`grep '^nsvsd::' /etc/group`" ]; then
-	groupadd -g 83 nsvsd
-    fi
-    if [ -z "`grep '^nsvsd:' /etc/passwd`" ]; then
-	useradd -u 83 -d /tmp -g nsvsd -s /bin/false nsvsd
-    fi
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-pre_remove() {
-    userdel nsvsd &> /dev/null
-    groupdel nsvsd &> /dev/null
-}
diff --git a/community/fssos-nsvs/nsvsd.service b/community/fssos-nsvs/nsvsd.service
deleted file mode 100644
index 8c3d12b67..000000000
--- a/community/fssos-nsvs/nsvsd.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Name Service Via Sockets Daemon
-
-[Service]
-ExecStart=/usr/bin/nsvsd -f /etc/nsvsd.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community/garmindev/PKGBUILD b/community/garmindev/PKGBUILD
index 5934b338e..9e7f12efd 100644
--- a/community/garmindev/PKGBUILD
+++ b/community/garmindev/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 58914 2011-11-20 11:01:56Z jlichtblau $
+# $Id: PKGBUILD 97782 2013-09-29 17:08:41Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Matthias Maennich <arch@maennich.net>
 
 pkgname=garmindev
 pkgver=0.3.4
-pkgrel=5
+pkgrel=6
 pkgdesc="Garmin Device Drivers for QlandkarteGT"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.qlandkarte.org/"
 license=('GPL')
-depends=('libusb')
+depends=('libusb-compat')
 makedepends=('cmake')
 changelog=$pkgname.changelog
 install=$pkgname.install
diff --git a/community/garmindev/garmindev.changelog b/community/garmindev/garmindev.changelog
index ef19de70d..64bb867ea 100644
--- a/community/garmindev/garmindev.changelog
+++ b/community/garmindev/garmindev.changelog
@@ -1,3 +1,6 @@
+2013-09-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* garmindev 0.3.4-6 install file update FS#36141
+
 2011-11-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* garmindev 0.3.4-5
 	* udev rule updated for Linux 3.1.1
diff --git a/community/garmindev/garmindev.install b/community/garmindev/garmindev.install
index 691e9370d..24c51e51d 100644
--- a/community/garmindev/garmindev.install
+++ b/community/garmindev/garmindev.install
@@ -3,6 +3,8 @@ cat << EOF
 Note:
 ==> In case you experience access permission error for the attached Garmin GPS device,
 ==> see http://wiki.openstreetmap.org/wiki/USB_Garmin_on_GNU/Linux for more details.
-==> Disable garmin_gps module in /etc/rc.conf and see included example udev rule.
+==> Disable garmin_gps module and see included example udev rule:
+==> echo "blacklist garmin_gps" > /etc/modprobe.d/garmindev.conf
+==> cd /etc/udev/rules.d ; ln -s /usr/share/garmindev/51-garmin.rules 51-garmin.rules
 EOF
 }
diff --git a/community/gdc/PKGBUILD b/community/gdc/PKGBUILD
index 31230ed9b..34a1a0d52 100644
--- a/community/gdc/PKGBUILD
+++ b/community/gdc/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=('gdc' 'libgphobos-devel')
 pkgver=4.8.1
-pkgrel=2
+pkgrel=6
 arch=('i686' 'x86_64')
 url="https://github.com/D-Programming-GDC/GDC"
 license=('GPL')
@@ -69,9 +69,10 @@ build()
 
 package_gdc()
 {
-    depends=('libmpc' 'zlib')
+    depends=('gcc' 'binutils')
     optdepends=('libgphobos-devel: D standard library, GDC version')
-    description="Compiler for D programming language wich uses gcc backend"
+    provides=("d-compiler")
+    pkgdesc="Compiler for D programming language wich uses gcc backend"
  
     install -D -m755 $srcdir/gcc-build/gcc/gdc $pkgdir/usr/bin/gdc
     install -D -m755 $srcdir/gcc-build/gcc/cc1d $pkgdir/usr/lib/gcc/$CHOST/4.8.1/cc1d
@@ -79,7 +80,8 @@ package_gdc()
 
 package_libgphobos-devel()
 {
-    description="Standard library for D programming language, GDC port"
+    pkgdesc="Standard library for D programming language, GDC port"
+    provides=("d-runtime" "d-stdlib")
     depends=('gdc')
 
     # druntime
@@ -93,5 +95,4 @@ package_libgphobos-devel()
     cp -r $srcdir/gdc/libphobos/src/etc ${pkgdir}/usr/include/dlang/gdc/$pkgver/etc
 
     install -D -m644 $srcdir/gcc-build/$CHOST/libphobos/src/libgphobos2.a $pkgdir/usr/lib/libgphobos2.a
-    install -D -m644 $srcdir/gcc-build/$CHOST/libatomic/.libs/libatomic.a $pkgdir/usr/lib/libatomic.a
 }
diff --git a/community/geary/PKGBUILD b/community/geary/PKGBUILD
index 7b8b90f54..4fdcbe03c 100755
--- a/community/geary/PKGBUILD
+++ b/community/geary/PKGBUILD
@@ -1,30 +1,35 @@
-# $Id: PKGBUILD 89890 2013-05-04 23:09:02Z alucryd $
+# $Id: PKGBUILD 98024 2013-10-04 08:12:31Z alucryd $
 # Maintainer: Maxime Gauduin <alucryd at gmail dot com>
 # Contributor : sebikul <sebikul@gmail.com>
 # Contributor : Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 
 pkgname=geary
-pkgver=0.3.1
-pkgrel=4
+pkgver=0.4.0
+pkgrel=1
 pkgdesc="A lightweight email client for the GNOME desktop"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.yorba.org/projects/geary/"
 license=('GPL3')
-depends=('desktop-file-utils' 'gmime' 'hicolor-icon-theme' 'libcanberra' 'libgee06' 'libgnome-keyring' 'libnotify' 'libunique3' 'webkitgtk3')
+depends=('desktop-file-utils' 'gmime' 'hicolor-icon-theme' 'libcanberra' 'libgee' 'libnotify' 'libunique3' 'webkitgtk3')
 makedepends=('cmake' 'gobject-introspection' 'intltool' 'vala')
-install=${pkgname}.install
+install="${pkgname}.install"
 source=("http://www.yorba.org/download/${pkgname}/${pkgver%.?}/${pkgname}-${pkgver}.tar.xz")
-sha256sums=('a1bf8cc95022ce0894a340dea0ab94047ac7a7ea0066b8602b136c74e93ffaed')
+sha256sums=('eb6418fe48ee2d25350999e6fc8fd23de15da5670569f4c2478f9435fe2a2ae1')
 
 build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
 
-  ./configure --prefix=/usr --disable-{desktop-update,icon-update,schemas-compile}
+  if [[ -d build ]]; then
+    rm -rf build
+  fi
+  mkdir build && cd build
+
+  cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -D{DESKTOP_UPDATE,GSETTINGS_COMPILE{,_IN_PLACE},ICON_UPDATE}='OFF'
   make
 }
 
 package() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}/build
 
   make DESTDIR="${pkgdir}" install
 }
diff --git a/community/geda-gaf/ChangeLog b/community/geda-gaf/ChangeLog
index 29717fa61..e5b3226a9 100644
--- a/community/geda-gaf/ChangeLog
+++ b/community/geda-gaf/ChangeLog
@@ -1,3 +1,11 @@
+2013-09-17 Kyle Keen <keenerd@gmail.com>
+	* 1.8.1-3
+	- Update url
+
+2013-06-04 Bartłomiej Piotrowski <barthalion@gmail.com>
+	* 1.8.1-2
+	- ???
+
 2012-01-19 Kyle Keen <keenerd@gmail.com>
 	* 1.8.1-1
 	- Version bump
diff --git a/community/geda-gaf/PKGBUILD b/community/geda-gaf/PKGBUILD
index ebe9d1365..6fb9a1e0a 100644
--- a/community/geda-gaf/PKGBUILD
+++ b/community/geda-gaf/PKGBUILD
@@ -1,13 +1,14 @@
+# $Id: PKGBUILD 97320 2013-09-17 11:15:31Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: Jared Casper <jaredcasper@gmail.com>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 
 pkgname=geda-gaf
 pkgver=1.8.1
-pkgrel=2
+pkgrel=3
 pkgdesc="gEDA/gaf suite - Contains gschem, gnetlist, gsymcheck, gattrib, utilities and documentation from the gEDA project"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://www.gpleda.org"
+url="http://geda-project.org/"
 license=('GPL')
 depends=('gtk2' 'guile' 'libstroke' 'shared-mime-info' 'hicolor-icon-theme')
 makedepends=('pkgconfig' 'perlxml' 'flex' 'gawk')
diff --git a/community/gedit-plugins/PKGBUILD b/community/gedit-plugins/PKGBUILD
index 0041e3414..6dff065ec 100644
--- a/community/gedit-plugins/PKGBUILD
+++ b/community/gedit-plugins/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 92909 2013-06-18 13:47:52Z heftig $
+# $Id: PKGBUILD 98198 2013-10-07 12:11:31Z jgc $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Hugo Doria <hugo@archlinux.org>
@@ -6,21 +6,21 @@
 # Contributor: zhuqin <zhuqin83@gmail.com>
 
 pkgname=gedit-plugins
-pkgver=3.8.3
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Plugins for gedit"
 arch=('x86_64' 'i686' 'mips64el')
 license=(GPL)
 url="http://live.gnome.org/GeditPlugins"
 depends=(gedit python-dbus)
-makedepends=(intltool gnome-doc-utils vte3 libgit2-glib)
+makedepends=(intltool gnome-doc-utils vte3 libgit2-glib itstool)
 optdepends=('gucharmap: for charmap plugin'
             'vte3: for embedded terminal'
             'libgit2-glib: for git plugin')
 options=('!libtool' '!emptydirs')
 install=gedit-plugins.install
-source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz")
-sha256sums=('2340910ed49acfaab7e8d30142e087f70e55c1a55f8b755d4f9014bce3923c80')
+source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz")
+sha256sums=('17cb703a09a0346b6a73d0e34eec87cde9073ffd5e0168741f0830a419ab57cd')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/gendesk/PKGBUILD b/community/gendesk/PKGBUILD
index 753284cd4..c8b0d9211 100644
--- a/community/gendesk/PKGBUILD
+++ b/community/gendesk/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 96278 2013-08-23 11:35:11Z arodseth $
+# $Id: PKGBUILD 97501 2013-09-22 21:35:55Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 
 pkgname=gendesk
-pkgver=0.5.3
+pkgver=0.5.5
 pkgrel=1
 pkgdesc='Utility to generate .desktop files and download icons'
 arch=('x86_64' 'i686')
@@ -12,17 +12,17 @@ makedepends=('go')
 depends=('glibc')
 source=("http://roboticoverlords.org/$pkgname/$pkgname-$pkgver.tar.xz"
         'http://roboticoverlords.org/images/default.png')
-sha256sums=('f6f2db255bd5ea978c00f165cfd8e298a1427ec79e7ec265d50b84a8d45d0144'
+sha256sums=('52a13d3952f0c00a65f05d01a9ca0fc1f5337f3379ff6017aafb686e5caf0942'
             '4d96eded48e536d02e35727c36dc20844c2e44654e81baf78e10aee4eb48e837')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
   go build
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
   install -Dm755 "$pkgname-$pkgver" "$pkgdir/usr/bin/$pkgname"
   install -Dm644 "$srcdir/default.png" "$pkgdir/usr/share/pixmaps/default.png"
diff --git a/community/gerbv/ChangeLog b/community/gerbv/ChangeLog
index 3653de9c5..b23801ba3 100644
--- a/community/gerbv/ChangeLog
+++ b/community/gerbv/ChangeLog
@@ -1,3 +1,7 @@
+2013-07-24 Kyle Keen <keenerd@gmail.com>
+	* 2.6.1-1
+	- Version bump
+
 2011-12-31 Kyle Keen <keenerd@gmail.com>
 	* 2.6.0-1
 	- Version bump
diff --git a/community/gerbv/PKGBUILD b/community/gerbv/PKGBUILD
index e5666533a..6ac556b08 100644
--- a/community/gerbv/PKGBUILD
+++ b/community/gerbv/PKGBUILD
@@ -1,24 +1,33 @@
-# $Id: PKGBUILD 61469 2012-01-01 00:58:06Z kkeen $
+# $Id: PKGBUILD 97318 2013-09-17 10:57:59Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: Jared Casper <jaredcasper@gmail.com>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 
 pkgname=gerbv
-pkgver=2.6.0
+pkgver=2.6.1
 pkgrel=1
 pkgdesc="An open source Gerber file (RS-274X only) viewer"
-url="http://gerbv.gpleda.org/"
+#url="http://gerbv.gpleda.org/"
+url="http://gerbv.geda-project.org/"
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('gtk2' 'shared-mime-info' 'hicolor-icon-theme')
 optdepends=('gdk-pixbuf: export of images' 'cairo: for better graphics')
+makedepends=('cvs' 'gettext')
+# cvs for autopoint
 install=$pkgname.install
-source=("http://downloads.sourceforge.net/gerbv/$pkgname-$pkgver.tar.gz")
-md5sums=('44a37dd202bc60fab54cbc298a477572')
+source=("http://downloads.sourceforge.net/gerbv/$pkgname-$pkgver.tar.gz"
+        "reautopointissues.diff")
+md5sums=('9a8af19574025fb15f987c3df610f8ae'
+         '55c3aac2af1f99a88dfa7b1508594e49')
 
 build ()
 {
   cd "$srcdir/$pkgname-$pkgver"
+  # remove patches on 2.6.2
+  patch -Np1 -i ../reautopointissues.diff
+  ./autogen.sh
+  sed -i 's|am_aux_dir=`cd $ac_aux_dir|am_aux_dir=`cd $srcdir|' configure
   ./configure --prefix=/usr \
               --disable-update-desktop-database 
   make 
diff --git a/community/gerbv/reautopointissues.diff b/community/gerbv/reautopointissues.diff
new file mode 100644
index 000000000..1f0b83a7f
--- /dev/null
+++ b/community/gerbv/reautopointissues.diff
@@ -0,0 +1,4118 @@
+diff --git a/po/ru.po b/po/ru.po
+new file mode 100644
+index 0000000..1cc07ec
+--- /dev/null
++++ b/po/ru.po
+@@ -0,0 +1,3144 @@
++# Gerbv Russian translation
++# Copyright (C) 2012 gEDA Developers
++# This file is distributed under the same license as the Gerbv package.
++#
++# Sergey Alyoshin <alyoshin.s@gmail.com>, 2012, 2013
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: gerbv 2.6A ru\n"
++"Report-Msgid-Bugs-To: gerbv-devel@lists.sourceforge.net\n"
++"POT-Creation-Date: 2013-08-25 23:16+0400\n"
++"PO-Revision-Date: 2013-08-25 23:20+0400\n"
++"Last-Translator: Sergey Alyoshin <alyoshin.s@gmail.com>\n"
++"Language-Team: gEDA user <geda-user@delorie.com>\n"
++"Language: ru\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=UTF-8\n"
++"Content-Transfer-Encoding: 8bit\n"
++"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
++"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
++
++#: src/attribute.c:305
++#, c-format
++msgid "%s():  malloc failed for an array of size %d\n"
++msgstr "%s(): не удалось выделить память для массива размера %d\n"
++
++#: src/attribute.c:323
++msgid "gerbv"
++msgstr "Gerbv"
++
++#: src/attribute.c:341
++#, c-format
++msgid "%s():  Adding attribute #%d\n"
++msgstr "%s(): добавление атрибута №%d\n"
++
++#: src/attribute.c:507
++#, c-format
++msgid "%s: unknown type of HID attribute\n"
++msgstr "%s: неизвестный тип HID-атрибута\n"
++
++#: src/authors.c:2
++msgid "Andreas Andersson aka Pitch"
++msgstr "Andreas Andersson aka Pitch"
++
++#: src/authors.c:3
++msgid "Trevor Blackwell"
++msgstr "Trevor Blackwell"
++
++#: src/authors.c:4
++msgid "Stuart Brorson "
++msgstr "Stuart Brorson"
++
++#: src/authors.c:5
++msgid "David Carr"
++msgstr "David Carr"
++
++#: src/authors.c:6
++msgid "Anders Eriksson"
++msgstr "Anders Eriksson"
++
++#: src/authors.c:7
++msgid "Juergen Haas"
++msgstr "Juergen Haas"
++
++#: src/authors.c:8
++msgid "Julian Lamb "
++msgstr "Julian Lamb"
++
++#: src/authors.c:9
++msgid "Dan McMahill "
++msgstr "Dan McMahill"
++
++#: src/authors.c:10
++msgid "Tomasz Motylewski"
++msgstr "Tomasz Motylewski"
++
++#: src/authors.c:11
++msgid "Stefan Petersen"
++msgstr "Stefan Petersen"
++
++#: src/authors.c:12
++msgid "Joost Witteveen"
++msgstr "Joost Witteveen"
++
++#: src/authors.c:13
++msgid "Joerg Wunsch"
++msgstr "Joerg Wunsch"
++
++#: src/authors.c:14
++msgid "... and many others."
++msgstr "... и многие другие."
++
++#: src/bugs.c:2
++msgid "Currently KNOWN BUGS"
++msgstr "Известные ошибки"
++
++#: src/bugs.c:4
++msgid "All OS:"
++msgstr "Для всех ОС:"
++
++#: src/bugs.c:6
++msgid ""
++"If layer orientation modified with rotation and rendering mode is 'Fast' or"
++msgstr ""
++"Если для слоя выполнен поворот и выбрано «Быстрое» или «Искл. ИЛИ» "
++"отображение"
++
++#: src/bugs.c:7
++msgid ""
++"'Fast, with XOR' (GDK rendering) rectangular and oval apertures are not "
++"rotated"
++msgstr ""
++"(режим GDK), то прямоугольные и овальные апертуры не будут повёрнуты и "
++
++#: src/bugs.c:8
++msgid "and not correctly displayed."
++msgstr "будут отображены некорректно."
++
++#: src/bugs.c:10
++msgid ""
++"Reporting about macro parameters (obtained via analyze -> analyze visible"
++msgstr ""
++"Данные о макропараметрах (получаемые по «Анализ → Анализировать видимые"
++
++#: src/bugs.c:11
++msgid "Gerber layers, and found in the Aperture definitions tab) incorrectly"
++msgstr ""
++"слои Gerber», и отображаемые во вкладке «Определение апертур») не "
++"соответствуют"
++
++#: src/bugs.c:12
++msgid "reports the macro parameters found."
++msgstr "найденным макропараметрам."
++
++#: src/callbacks.c:84
++msgid "Gerbv Project"
++msgstr "Проект Gerbv"
++
++#: src/callbacks.c:152
++msgid "No layers are currently loaded. A layer must be loaded first."
++msgstr "Не открыто ни одного слоя."
++
++#: src/callbacks.c:189
++msgid "Do you want to close any open layers and start a new project?"
++msgstr "Закрыть все открытые слои и начать новый проект?"
++
++#: src/callbacks.c:190
++msgid ""
++"Starting a new project will cause all currently open layers to be closed. "
++"Any unsaved changes will be lost."
++msgstr ""
++"Все открытые слои будут закрыты. Все не сохранённые изменения будут потеряны."
++
++#: src/callbacks.c:224
++msgid "Do you want to close any open layers and load an existing project?"
++msgstr "Закрыть все открытые слои и открыть существующий проект?"
++
++#: src/callbacks.c:225
++msgid ""
++"Loading a project will cause all currently open layers to be closed. Any "
++"unsaved changes will be lost."
++msgstr ""
++"При открытии проекта все текущие слои будут закрыты. Все не сохранённые "
++"изменения будут потеряны."
++
++#: src/callbacks.c:232
++msgid "Open project file..."
++msgstr "Открыть файл проекта"
++
++#: src/callbacks.c:248 src/callbacks.c:534
++msgid "All"
++msgstr "Все"
++
++#: src/callbacks.c:289
++msgid "Open Gerber, drill, or pick & place file(s)..."
++msgstr "Открыть файлы Gerber, сверловки или расположения"
++
++#: src/callbacks.c:358
++msgid "Gerbv cannot export this file type"
++msgstr "Gerbv не может экспортировать этот формат файла"
++
++#: src/callbacks.c:400
++msgid "Unknown Layer type for merge\n"
++msgstr "Неизвестный тип слоя для объединения\n"
++
++#: src/callbacks.c:403
++msgid "Looking for matching files\n"
++msgstr "Поиск соответствующих файлов\n"
++
++#: src/callbacks.c:408
++#, c-format
++msgid "Adding '%s'\n"
++msgstr "Добавление «%s»\n"
++
++#: src/callbacks.c:418
++msgid "Not Enough Files of same type to merge\n"
++msgstr "Недостаточно слоёв одного типа для объединения\n"
++
++#: src/callbacks.c:421
++msgid "Now merging files\n"
++msgstr "Объединение файлов\n"
++
++#: src/callbacks.c:455
++msgid "No layer is currently selected"
++msgstr "Слой не выделен"
++
++#: src/callbacks.c:456
++msgid "Please select a layer and try again."
++msgstr "Выберите слой и попробуйте снова."
++
++#: src/callbacks.c:479 src/interface.c:337
++msgid "Save project as..."
++msgstr "Сохранить проект как..."
++
++#: src/callbacks.c:481
++msgid "Export PS file as..."
++msgstr "Экспортировать в формат PS"
++
++#: src/callbacks.c:483
++msgid "Export PDF file as..."
++msgstr "Экспортировать в формат PDF"
++
++#: src/callbacks.c:485
++msgid "Export SVG file as..."
++msgstr "Экспортировать в формат SVG"
++
++#: src/callbacks.c:487
++msgid "Export PNG file as..."
++msgstr "Экспортировать в формат PNG"
++
++#: src/callbacks.c:488
++msgid "DPI:"
++msgstr "DPI:"
++
++#: src/callbacks.c:492 src/callbacks.c:494
++msgid "DPI value, autoscaling if 0"
++msgstr "Значение DPI, 0 для автомасштабирования"
++
++#: src/callbacks.c:498
++msgid "Export RS-274X file as..."
++msgstr "Экспортировать в формат RS-274X"
++
++#: src/callbacks.c:500
++msgid "Export Excellon drill file as..."
++msgstr "Экспортировать в формат Excellon"
++
++#: src/callbacks.c:502
++msgid "Export RS-274Xm file as..."
++msgstr "Экспортировать объединение в формат RS-274X"
++
++#: src/callbacks.c:504
++msgid "Export Excellon drillm file as..."
++msgstr "Экспортировать объединение в формат Excellon"
++
++#: src/callbacks.c:506
++msgid "Save layer as..."
++msgstr "Сохранить слой как..."
++
++#: src/callbacks.c:610
++#, c-format
++msgid "Merged visible gerber layers and placed in '%s'\n"
++msgstr "Видимые слои Gerber объединены и сохранены в «%s»\n"
++
++#: src/callbacks.c:619
++#, c-format
++msgid "Merged visible drill layers and placed in '%s'\n"
++msgstr "Видимые слои сверловки объединены и сохранены в «%s»\n"
++
++#: src/callbacks.c:814 src/callbacks.c:1255
++msgid "General information\n"
++msgstr "Общая информация\n"
++
++#: src/callbacks.c:816 src/callbacks.c:1257
++#, c-format
++msgid "  Active layer count = %d\n"
++msgstr "  Видимых слоёв: %d\n"
++
++#: src/callbacks.c:820
++msgid "Files processed"
++msgstr "Обработанный слой"
++
++#: src/callbacks.c:821
++msgid "Layer number"
++msgstr "Номер слоя"
++
++#: src/callbacks.c:834
++msgid ""
++"\n"
++"\n"
++"No Gerber files active (visible)!\n"
++msgstr ""
++"\n"
++"\n"
++"Нет видимых слоёв Gerber!\n"
++
++#: src/callbacks.c:837
++msgid ""
++"\n"
++"\n"
++"No errors found in active Gerber file(s)!\n"
++msgstr ""
++"\n"
++"\n"
++"В видимых слоях Gerber ошибок не найдено!\n"
++
++#: src/callbacks.c:840
++msgid ""
++"\n"
++"\n"
++"Errors found in active Gerber file(s):\n"
++msgstr ""
++"\n"
++"\n"
++"Найдены ошибки в видимых слоях Gerber:\n"
++
++#: src/callbacks.c:847 src/callbacks.c:1287
++msgid "FATAL: "
++msgstr "ФАТАЛЬНАЯ ОШИБКА: "
++
++#: src/callbacks.c:850 src/callbacks.c:1290
++msgid "ERROR: "
++msgstr "ОШИБКА: "
++
++#: src/callbacks.c:853 src/callbacks.c:1293
++msgid "WARNING: "
++msgstr "Предупреждение: "
++
++#: src/callbacks.c:856 src/callbacks.c:1296
++msgid "NOTE: "
++msgstr "Замечание: "
++
++#: src/callbacks.c:860 src/callbacks.c:1300
++#, c-format
++msgid "  Layer %d: %s %s"
++msgstr "  Слой %d: %s %s"
++
++#: src/callbacks.c:876 src/callbacks.c:1313
++msgid "G code statistics (all active layers)\n"
++msgstr "Статистика G-кодов на видимых слоях\n"
++
++#: src/callbacks.c:878 src/callbacks.c:958 src/callbacks.c:981
++#: src/callbacks.c:1001 src/callbacks.c:1315 src/callbacks.c:1359
++#: src/callbacks.c:1424
++msgid "<code> = <number of incidences>\n"
++msgstr "<код> = <количество>\n"
++
++#: src/callbacks.c:882
++msgid "Move"
++msgstr "Переход"
++
++#: src/callbacks.c:886 src/callbacks.c:1323
++msgid "1X linear interpolation"
++msgstr "1× линейная интерполяция"
++
++#: src/callbacks.c:890 src/callbacks.c:1327
++msgid "CW interpolation"
++msgstr "Интерполяция по часовой стрелки"
++
++#: src/callbacks.c:894 src/callbacks.c:1331
++msgid "CCW interpolation"
++msgstr "Интерполяция против часовой стрелки"
++
++#: src/callbacks.c:898
++msgid "Comment/ignore block"
++msgstr "Блок комментария"
++
++#: src/callbacks.c:902
++msgid "10X linear interpolation"
++msgstr "10× линейная интерполяция"
++
++#: src/callbacks.c:906
++msgid "0.1X linear interpolation"
++msgstr "0.1× линейная интерполяция"
++
++#: src/callbacks.c:910
++msgid "0.01X linear interpolation"
++msgstr "0.01× линейная интерполяция"
++
++#: src/callbacks.c:914
++msgid "Poly fill on"
++msgstr "Заполненный полигон"
++
++#: src/callbacks.c:918
++msgid "Poly fill off"
++msgstr "Незаполненный полигон"
++
++#: src/callbacks.c:922
++msgid "Tool prepare"
++msgstr "Подготовка инструмента"
++
++#: src/callbacks.c:926
++msgid "Flash prepare"
++msgstr "Подготовка экспозиции"
++
++#: src/callbacks.c:930
++msgid "Units = inches"
++msgstr "Единицы изменения: дюймы"
++
++#: src/callbacks.c:934
++msgid "Units = mm"
++msgstr "Единицы измерения: мм"
++
++#: src/callbacks.c:938
++msgid "Disable 360 circ. interpolation"
++msgstr "Откл. 360° интерполяции"
++
++#: src/callbacks.c:942
++msgid "Enable 360 circ. interpolation"
++msgstr "Вкл. 360° интерполяции"
++
++#: src/callbacks.c:946 src/callbacks.c:1343
++msgid "Absolute units"
++msgstr "Абсолютные единицы"
++
++#: src/callbacks.c:950 src/callbacks.c:1347
++msgid "Incremental units"
++msgstr "Инкрементальные единицы"
++
++#: src/callbacks.c:952 src/callbacks.c:1353
++#, c-format
++msgid "Unknown G codes = %d\n"
++msgstr "Неизвестные G-коды: %d\n"
++
++#: src/callbacks.c:956
++msgid "D code statistics (all active layers)\n"
++msgstr "Статистика D-кодов на видимых слоях\n"
++
++#: src/callbacks.c:962
++msgid "Exposure on"
++msgstr "Вкл. экспозиции"
++
++#: src/callbacks.c:966
++msgid "Exposure off"
++msgstr "Откл. экспозиции"
++
++#: src/callbacks.c:970
++msgid "Flash aperture"
++msgstr "Апертура экспозиции"
++
++#: src/callbacks.c:972
++#, c-format
++msgid "Undefined D codes = %d\n"
++msgstr "Неопределённые D-коды: %d\n"
++
++#: src/callbacks.c:975
++#, c-format
++msgid "D code Errors = %d\n"
++msgstr "Ошибки D-кодов: %d\n"
++
++#: src/callbacks.c:979 src/callbacks.c:1357
++msgid "M code statistics (all active layers)\n"
++msgstr "Статистика M-кодов на видимых слоях\n"
++
++#: src/callbacks.c:985
++msgid "Program start"
++msgstr "Начало программы"
++
++#: src/callbacks.c:989
++msgid "Program stop"
++msgstr "Останов программы"
++
++#: src/callbacks.c:993
++msgid "Program end"
++msgstr "Конец программы"
++
++#: src/callbacks.c:995 src/callbacks.c:1417
++#, c-format
++msgid "Unknown M codes = %d\n"
++msgstr "Неизвестные M-коды: %d\n"
++
++#: src/callbacks.c:999 src/callbacks.c:1422
++msgid "Misc code statistics (all active layers)\n"
++msgstr "Статистика прочих кодов на видимых слоях\n"
++
++#: src/callbacks.c:1013 src/callbacks.c:1429
++#, c-format
++msgid "Unknown codes = %d\n"
++msgstr "Неизвестные коды: %d\n"
++
++#: src/callbacks.c:1020
++msgid "No aperture definitions found in Gerber file(s)!\n"
++msgstr "Нет определения апертур в слоях Gerber!\n"
++
++#: src/callbacks.c:1023
++msgid "Apertures defined in Gerber file(s) (by layer)\n"
++msgstr "Апертуры определённые в слоях Gerber\n"
++
++#: src/callbacks.c:1026
++msgid "Layer"
++msgstr "Слой"
++
++#: src/callbacks.c:1027
++msgid "D code"
++msgstr "D-код"
++
++#: src/callbacks.c:1028
++msgid "Aperture"
++msgstr "Апертура"
++
++#: src/callbacks.c:1029
++msgid "Param[0]"
++msgstr "Параметр[0]"
++
++#: src/callbacks.c:1030
++msgid "Param[1]"
++msgstr "Параметр[1]"
++
++#: src/callbacks.c:1031
++msgid "Param[2]"
++msgstr "Параметр[2]"
++
++#: src/callbacks.c:1052
++msgid "No apertures used in Gerber file(s)!\n"
++msgstr "Нет используемых апертур в видимых слоях Gerber!\n"
++
++#: src/callbacks.c:1058
++msgid "Apertures used in Gerber file(s) (all active layers)\n"
++msgstr "Используемые апертуры в видимых слоях Gerber\n"
++
++#: src/callbacks.c:1060
++msgid "<aperture code> = <number of uses>\n"
++msgstr "<код апертуры> = <используемое количество>\n"
++
++#: src/callbacks.c:1074
++#, c-format
++msgid ""
++"\n"
++"Total number of aperture uses: %d\n"
++msgstr ""
++"\n"
++"Всего используемых апертур: %d\n"
++
++#: src/callbacks.c:1079
++msgid "Gerber codes report"
++msgstr "Отчёт по кодам Gerber"
++
++#: src/callbacks.c:1190 src/callbacks.c:1531
++msgid "General"
++msgstr "Общая информация"
++
++#: src/callbacks.c:1194 src/callbacks.c:1535
++msgid "G codes"
++msgstr "G-коды"
++
++#: src/callbacks.c:1198
++msgid "D codes"
++msgstr "D-коды"
++
++#: src/callbacks.c:1202 src/callbacks.c:1539
++msgid "M codes"
++msgstr "M-коды"
++
++#: src/callbacks.c:1206 src/callbacks.c:1543
++msgid "Misc. codes"
++msgstr "Прочие коды"
++
++#: src/callbacks.c:1210
++msgid "Aperture definitions"
++msgstr "Определение апертур"
++
++#: src/callbacks.c:1214
++msgid "Aperture usage"
++msgstr "Использование апертур"
++
++#: src/callbacks.c:1261
++msgid ""
++"\n"
++"\n"
++"Files processed:\n"
++msgstr ""
++"\n"
++"\n"
++"Обработаны слои:\n"
++
++#: src/callbacks.c:1274
++msgid ""
++"\n"
++"\n"
++"No drill files active (visible)!\n"
++msgstr ""
++"\n"
++"\n"
++"Нет видимых слоёв сверловки!\n"
++
++#: src/callbacks.c:1277
++msgid ""
++"\n"
++"\n"
++"No errors found in active drill file(s)!\n"
++msgstr ""
++"\n"
++"\n"
++"В видимых слоях сверловки ошибок не найдено.\n"
++
++#: src/callbacks.c:1280
++msgid ""
++"\n"
++"\n"
++"Errors found in active drill file(s):\n"
++msgstr ""
++"\n"
++"\n"
++"Найдены ошибки в следующих слоях сверловки:\n"
++
++#: src/callbacks.c:1319
++msgid "Rout mode"
++msgstr "Холостой ход"
++
++#: src/callbacks.c:1335
++msgid "Variable dwell"
++msgstr "Переменная задержка"
++
++#: src/callbacks.c:1339
++msgid "Drill mode"
++msgstr "Режим сверловки"
++
++#: src/callbacks.c:1351
++msgid "Zero set"
++msgstr "Установка нуля"
++
++#: src/callbacks.c:1363
++msgid "End of program"
++msgstr "Конец программы"
++
++#: src/callbacks.c:1367
++msgid "End of pattern"
++msgstr "Конец комбинации"
++
++#: src/callbacks.c:1371
++msgid "Tool tip check"
++msgstr "Проверка инструмента"
++
++#: src/callbacks.c:1375 src/callbacks.c:1383
++msgid "Begin pattern"
++msgstr "Начало комбинации"
++
++#: src/callbacks.c:1379
++msgid "End program rewind"
++msgstr "Конец программы со сбросом"
++
++#: src/callbacks.c:1387
++msgid "Long message"
++msgstr "Длинное сообщение"
++
++#: src/callbacks.c:1391
++msgid "Operator message"
++msgstr "Сообщение оператора"
++
++#: src/callbacks.c:1395
++msgid "Begin program header"
++msgstr "Начало заголовка программы"
++
++#: src/callbacks.c:1399
++msgid "Metric units"
++msgstr "Метрические единицы измерения"
++
++#: src/callbacks.c:1403
++msgid "English units"
++msgstr "Английские единицы измерения"
++
++#: src/callbacks.c:1407
++msgid "End program header"
++msgstr "Конец заголовка программы"
++
++#: src/callbacks.c:1411 src/callbacks.c:1415
++msgid "Canned text"
++msgstr "Высверленный текст"
++
++#: src/callbacks.c:1426
++#, c-format
++msgid "comments = %d\n"
++msgstr "комментарии: %d\n"
++
++#: src/callbacks.c:1435
++msgid "Repeat hole"
++msgstr "повтор"
++
++#: src/callbacks.c:1443
++msgid "Drills used (all active layers)\n"
++msgstr "Используемые отверстия на видимых слоях\n"
++
++#: src/callbacks.c:1445
++msgid "Drill no."
++msgstr "№ отв."
++
++#: src/callbacks.c:1445
++msgid "Dia."
++msgstr "Диаметр"
++
++#: src/callbacks.c:1445 src/drill.c:187
++msgid "Units"
++msgstr "Единицы измерения"
++
++#: src/callbacks.c:1445
++msgid "Count"
++msgstr "Количество"
++
++#: src/callbacks.c:1458
++#, c-format
++msgid "Total drill count %d\n"
++msgstr "Всего отверстий: %d\n"
++
++#: src/callbacks.c:1467
++msgid "Drill file codes report"
++msgstr "Отчёт по кодам сверловки"
++
++#: src/callbacks.c:1547
++msgid "Drills used"
++msgstr "Используемые отверстия"
++
++#: src/callbacks.c:1594
++msgid "Do you want to close all open layers and quit the program?"
++msgstr "Закрыть все открытые слои и выйти из программы?"
++
++#: src/callbacks.c:1595
++msgid "Quitting the program will cause any unsaved changes to be lost."
++msgstr "Выход из программы приведёт к потере всех не сохранённых изменений."
++
++#. TRANSLATORS: Replace this string with your names, one name per line.
++#: src/callbacks.c:1618
++msgid "translator-credits"
++msgstr "Сергей Алёшин <alyoshin.s@gmail.com>"
++
++#: src/callbacks.c:1620
++#, c-format
++msgid ""
++"gerbv -- a Gerber (RS-274/X) viewer.\n"
++"\n"
++"This is gerbv version %s\n"
++"Compiled on %s at %s\n"
++"\n"
++"gerbv is part of the gEDA Project.\n"
++"\n"
++"For more information see:\n"
++"  gEDA homepage: http://geda-project.org/\n"
++"  gEDA Wiki: http://wiki.geda-project.org/"
++msgstr ""
++"Gerbv — просмотр файлов Gerber (RS-274/X).\n"
++"\n"
++"Версия программы %s\n"
++"Собрана %s в %s\n"
++"Gerbv является частью проекта gEDA.\n"
++"\n"
++"Для дальнейшей информации, см.:\n"
++"  Домашняя страница gEDA: http://geda-project.org/\n"
++"  gEDA Wiki: http://wiki.geda-project.org/"
++
++#: src/callbacks.c:1631
++msgid ""
++"gerbv -- a Gerber (RS-274/X) viewer.\n"
++"\n"
++"Copyright (C) 2000-2007 Stefan Petersen\n"
++"\n"
++"This program is free software: you can redistribute it and/or modify\n"
++"it under the terms of the GNU General Public License as published by\n"
++"the Free Software Foundation, either version 2 of the License, or\n"
++"(at your option) any later version.\n"
++"\n"
++"This program is distributed in the hope that it will be useful,\n"
++"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
++"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
++"GNU General Public License for more details.\n"
++"\n"
++"You should have received a copy of the GNU General Public License\n"
++"along with this program.  If not, see <http://www.gnu.org/licenses/>."
++msgstr ""
++"Gerbv — просмотр файлов Gerber (RS-274/X)\n"
++"\n"
++"Copyright © 2000—2007 Stefan Petersen\n"
++"\n"
++"Это свободное программное обеспечение: вы можете распространять и/или\n"
++"изменять его на условиях универсальной общественной лицензии (GPL) GNU,\n"
++"опубликованной фондом свободного программного обеспечения (FSF), версии 2\n"
++"или (по вашему усмотрению) более поздней версии.\n"
++"\n"
++"Эта программа распространяется в надежде, что она будет полезна,\n"
++"но БЕЗ КАКИХ-ЛИБО ГАРАНТИЙ; в том числе БЕЗ ГАРАНТИИ ПРИГОДНОСТИ ДЛЯ\n"
++"ПРОДАЖИ или БЕЗ ГАРАНТИИ ПРИГОДНОСТИ ДЛЯ КАКОЙ-ЛИБО ЦЕЛИ. Для\n"
++"подробностей см. лицензию GNU GPL.\n"
++"\n"
++"Вы должны были получить копию лицензии GNU GPL вместе с этой программой\n"
++"Если вы её не получили, см. <http://www.gnu.org/licenses/>."
++
++#: src/callbacks.c:1650
++msgid "Gerbv"
++msgstr "Gerbv"
++
++#: src/callbacks.c:1679
++msgid "About Gerbv"
++msgstr "О программе"
++
++#: src/callbacks.c:1706
++msgid "Known bugs in gerbv"
++msgstr "Известные ошибки в Gerbv"
++
++#: src/callbacks.c:2056 src/callbacks.c:3071
++msgid ""
++"Click to select objects in the current layer. Middle click and drag to pan."
++msgstr "Выделите объекты в текущем слое. Средняя кнопка для масштабирования."
++
++#: src/callbacks.c:2064
++msgid "Click and drag to pan. Right click and drag to zoom."
++msgstr "Перетащите для прокрутки. Правая кнопка для масштабирования."
++
++#: src/callbacks.c:2072
++msgid "Click and drag to zoom in. Shift+click to zoom out."
++msgstr "Перетащите для увеличения. Удерживайте клавишу Shift для уменьшения."
++
++#: src/callbacks.c:2080
++msgid "Click and drag to measure a distance."
++msgstr "Перетащите для измерения расстояния."
++
++#: src/callbacks.c:2256
++msgid "Select a color"
++msgstr "Выберите цвет"
++
++#: src/callbacks.c:2370
++msgid "Unknown"
++msgstr "Неизвестный тип"
++
++#: src/callbacks.c:2374
++msgid "This file type does not currently have any editable features"
++msgstr "В настоящее время этот формат не имеет изменяемых свойств"
++
++#: src/callbacks.c:2375
++msgid ""
++"Format editing is currently only supported for Excellon drill file formats."
++msgstr "Изменение формата возможно только для сверловки Excellon."
++
++#: src/callbacks.c:2385
++msgid "This layer has changed!"
++msgstr "Слой изменён!"
++
++#: src/callbacks.c:2386
++msgid ""
++"Editing the file type will reload the layer, destroying your changes.  Click "
++"OK to edit the file type and destroy your changes, or Cancel to leave."
++msgstr ""
++"Изменение формата файла приведёт к перезагрузке слоя и потере всех его "
++"изменений. При нажатии OK изменения будут потеряны."
++
++#: src/callbacks.c:2401
++msgid "Edit file format"
++msgstr "Изменить формат"
++
++#: src/callbacks.c:2409
++#, c-format
++msgid "%s():  Reloading layer\n"
++msgstr "%s(): перезагрузка слоя\n"
++
++#: src/callbacks.c:2633 src/callbacks.c:2834
++msgid "No object is currently selected"
++msgstr "Нет выделенных объектов"
++
++#: src/callbacks.c:2634
++msgid ""
++"Objects must be selected using the pointer tool before you can view the "
++"object properties."
++msgstr "Объект должен быть выделен для просмотра его свойств."
++
++#: src/callbacks.c:2658
++msgid "<unnamed layer>"
++msgstr "<безымянный>"
++
++#: src/callbacks.c:2664
++msgid "<unlabeled net>"
++msgstr "<безымянное>"
++
++#: src/callbacks.c:2669
++msgid "Object type: Polygon\n"
++msgstr "Тип объекта: полигон\n"
++
++#: src/callbacks.c:2683
++msgid "Object type: Line\n"
++msgstr "Тип объекта: линия\n"
++
++#: src/callbacks.c:2689
++msgid "Object type: Arc\n"
++msgstr "Тип объекта: дуга\n"
++
++#: src/callbacks.c:2698
++msgid "Object type: Unknown\n"
++msgstr "Тип объекта: неизвестный\n"
++
++#: src/callbacks.c:2701
++msgid "    Exposure: On\n"
++msgstr "    Экспозиция: вкл.\n"
++
++#: src/callbacks.c:2705
++#, c-format
++msgid "    Start location: (%g, %g)\n"
++msgstr "    Начало: %g; %g\n"
++
++#: src/callbacks.c:2707
++#, c-format
++msgid "    Stop location: (%g, %g)\n"
++msgstr "    Конец: %g; %g\n"
++
++#: src/callbacks.c:2711
++#, c-format
++msgid "    Length: %g (sum: %g)\n"
++msgstr "    Длина: %g (сумма: %g)\n"
++
++#: src/callbacks.c:2714 src/callbacks.c:2726
++#, c-format
++msgid "    Layer name: %s\n"
++msgstr "    Слой: %s\n"
++
++#: src/callbacks.c:2715 src/callbacks.c:2727
++#, c-format
++msgid "    Net label: %s\n"
++msgstr "    Соединение: %s\n"
++
++#: src/callbacks.c:2716 src/callbacks.c:2728
++#, c-format
++msgid "    In file: %s\n"
++msgstr "    Файл: %s\n"
++
++#: src/callbacks.c:2720
++msgid "Object type: Flashed aperture\n"
++msgstr "Тип объекта: апертура экспозиции\n"
++
++#: src/callbacks.c:2724
++#, c-format
++msgid "    Location: (%g, %g)\n"
++msgstr "    Расположение: %g; %g\n"
++
++#: src/callbacks.c:2752 src/callbacks.c:2768
++#, c-format
++msgid "Benchmark():  Starting redraw #%d\n"
++msgstr "Проверка производительности: начало перерисовки №%d\n"
++
++#: src/callbacks.c:2755 src/callbacks.c:2776
++#, c-format
++msgid "Elapsed time = %ld seconds\n"
++msgstr "Затраченное время: %ld с\n"
++
++#: src/callbacks.c:2757
++#, c-format
++msgid ""
++"FAST (=GDK) mode benchmark: %d redraws in %ld seconds (%g redraws/second)\n"
++msgstr ""
++"Проверка производительности БЫСТРОГО (GDK) режима: %d отрисовок за %ld с (%g "
++"отрисовок/c)\n"
++
++#: src/callbacks.c:2778
++#, c-format
++msgid ""
++"NORMAL (=Cairo) mode benchmark: %d redraws in %ld seconds (%g redraws/"
++"second)\n"
++msgstr ""
++"Проверка производительности ОБЫЧНОГО (Cairo) режима: %d отрисовок за %ld с "
++"(%g отрисовок/c)\n"
++
++#: src/callbacks.c:2792
++msgid "Full zoom benchmarks\n"
++msgstr "Проверка производительности полного увеличения\n"
++
++#: src/callbacks.c:2796
++msgid "x5 zoom benchmarks\n"
++msgstr "Проверка производительности x5 увеличения\n"
++
++#: src/callbacks.c:2835
++msgid ""
++"Objects must be selected using the pointer tool before they can be deleted."
++msgstr "Для того чтобы удалить объекты, они должны быть выделены указателем"
++
++#: src/callbacks.c:2847
++msgid "Do you want to permanently delete the selected objects?"
++msgstr "Удалить выделенные объекты?"
++
++#: src/callbacks.c:2848
++msgid ""
++"Gerbv currently has no undo function, so this action cannot be undone. This "
++"action will not change the saved file unless you save the file afterwards."
++msgstr ""
++"В настоящее время Gerbv не имеет функции отмены, поэтому это действие нельзя "
++"будет отменить. Файл не будет изменён, если изменения не будут сохранены."
++
++#: src/callbacks.c:3040
++#, c-format
++msgid "(%8.2f, %8.2f)"
++msgstr "(%.2f; %.2f)"
++
++#: src/callbacks.c:3044
++#, c-format
++msgid "(%8.3f, %8.3f)"
++msgstr "(%.3f; %.3f)"
++
++#: src/callbacks.c:3048
++#, c-format
++msgid "(%4.5f, %4.5f)"
++msgstr "(%.4f; %.5f)"
++
++#: src/callbacks.c:3064
++msgid "No object selected. Objects can only be selected in the active layer."
++msgstr ""
++"Нет выделенных объектов. Они могут быть выделены только на видимом слое."
++
++#: src/callbacks.c:3076
++msgid "1 object is currently selected"
++msgstr "Выделен 1 объект"
++
++#: src/callbacks.c:3081
++#, c-format
++msgid "%d object are currently selected"
++msgid_plural "%d objects are currently selected"
++msgstr[0] "Выделен %d объект"
++msgstr[1] "Выделено %d объекта"
++msgstr[2] "Выделено %d объектов"
++
++#: src/callbacks.c:3313
++msgid "No objects are currently selected"
++msgstr "Нет выделенных объектов"
++
++#: src/callbacks.c:3387
++#, c-format
++msgid "Measured distance: %8.2f mils (%8.2f x, %8.2f y)"
++msgstr "Расстояние: %.2f мил (x: %.2f; y: %.2f)"
++
++#: src/callbacks.c:3392
++#, c-format
++msgid "Measured distance: %8.3f mms (%8.3f x, %8.3f y)"
++msgstr "Расстояние: %.3f мм (x: %.3f; y: %.3f)"
++
++#: src/callbacks.c:3397
++#, c-format
++msgid "Measured distance: %4.5f inches (%4.5f x, %4.5f y)"
++msgstr "Расстояние: %.5f дюйм (x: %.5f; y: %.5f)"
++
++#: src/callbacks.c:3562
++#, c-format
++msgid "Fatal error : %s\n"
++msgstr "Фатальная ошибка: %s\n"
++
++#: src/callbacks.c:3626
++#, c-format
++msgid "    Aperture used: D%d\n"
++msgstr "    Апертура: D%d\n"
++
++#: src/callbacks.c:3627
++#, c-format
++msgid "    Aperture type: %s\n"
++msgstr "    Тип апертуры: %s\n"
++
++#: src/callbacks.c:3631
++#, c-format
++msgid "    Diameter: %g\n"
++msgstr "    Диаметр: %g\n"
++
++#: src/callbacks.c:3636
++#, c-format
++msgid "    Dimensions: %gx%g\n"
++msgstr "    Размер: %g×%g\n"
++
++#: src/csv.c:167 src/csv.c:288
++#, c-format
++msgid "%d: unexpected quote in element"
++msgstr "%d: неожиданная кавычка в элементе"
++
++#: src/csv.c:198
++#, c-format
++msgid "%d: bad end quote in element"
++msgstr "%d: ошибочная закрывающая кавычка в элементе"
++
++#: src/csv.c:319
++#, c-format
++msgid "%d: bad end quote in element "
++msgstr "%d: ошибочная закрывающая кавычка в элементе "
++
++#: src/draw-gdk.c:572 src/draw.c:317
++msgid "Drawing simplified aperture macros:\n"
++msgstr "Отрисовка макроса упрощённой апертуры:\n"
++
++#: src/draw-gdk.c:578
++msgid "  Circle\n"
++msgstr "  Круг\n"
++
++#: src/draw-gdk.c:582
++msgid "  Outline\n"
++msgstr "  Контур\n"
++
++#: src/draw-gdk.c:586
++msgid "  Polygon\n"
++msgstr "  Полигон\n"
++
++#: src/draw-gdk.c:590
++msgid "  Moire\n"
++msgstr "  Муар\n"
++
++#: src/draw-gdk.c:594
++msgid "  Thermal\n"
++msgstr "  Термобарьер\n"
++
++#: src/draw-gdk.c:598
++msgid "  Line 20\n"
++msgstr "  Линия 20\n"
++
++#: src/draw-gdk.c:602
++msgid "  Line 21\n"
++msgstr "  Линия 21\n"
++
++#: src/draw-gdk.c:606
++msgid "  Line 22\n"
++msgstr "  Линия 22\n"
++
++#: src/draw-gdk.c:609
++msgid "Unknown simplified aperture macro"
++msgstr "Неизвестный макрос упрощённой апертуры"
++
++#: src/draw-gdk.c:1116
++msgid "Linear != x1\n"
++msgstr "Линейный != ×1\n"
++
++#: src/draw-gdk.c:1219 src/draw.c:954
++msgid "Unknown aperture type\n"
++msgstr "Неизвестный тип апертуры\n"
++
++#: src/draw-gdk.c:1224 src/draw.c:962
++msgid "Unknown aperture state\n"
++msgstr "Неизвестное состояние апертуры\n"
++
++#: src/drill.c:155 src/interface.c:1862
++msgid "None"
++msgstr "Нет"
++
++#: src/drill.c:157
++msgid "Leading"
++msgstr "Спереди"
++
++#: src/drill.c:159
++msgid "Trailing"
++msgstr "Сзади"
++
++#: src/drill.c:165 src/drill.c:1125 src/drill.c:1207
++msgid "inch"
++msgstr "дюймы"
++
++#: src/drill.c:172 src/drill.c:1125 src/drill.c:1207 src/interface.c:1094
++msgid "mm"
++msgstr "мм"
++
++#: src/drill.c:179
++msgid "autodetect"
++msgstr "Автоопределение"
++
++#: src/drill.c:179
++msgid "Try to autodetect the file format"
++msgstr "Попытаться автоматически определить формат"
++
++#: src/drill.c:183
++msgid "zero_supression"
++msgstr "Отбрасывать нули"
++
++#: src/drill.c:183
++msgid "Zero supression"
++msgstr "Отбрасывать нули"
++
++#: src/drill.c:187
++msgid "units"
++msgstr "Единицы измерения"
++
++#: src/drill.c:197
++msgid "digits"
++msgstr "Цифры"
++
++#: src/drill.c:197
++msgid ""
++"Number of digits.  For trailing zero supression, this is the number of "
++"digits before the decimal point.  Otherwise this is the number of digits "
++"after the decimal point."
++msgstr ""
++"Количество цифр перед десятичной точкой, при отбрасывании нулей сзади; и "
++"после, при отбрасывании спереди."
++
++#: src/drill.c:241
++msgid "malloc curr_net->next failed\n"
++msgstr "Ошибка выделения памяти для curr_net->next\n"
++
++#: src/drill.c:324 src/gerber.c:770 src/pick-and-place.c:582
++msgid "malloc image failed\n"
++msgstr "Ошибка выделения памяти для изображения\n"
++
++#: src/drill.c:352
++msgid "malloc stats failed\n"
++msgstr "Ошибка выделения памяти для статуса\n"
++
++#: src/drill.c:358
++msgid "malloc state failed\n"
++msgstr "Ошибка выделения памяти для состояния\n"
++
++#: src/drill.c:362 src/drill_stats.c:314 src/pick-and-place.c:587
++msgid "malloc format failed\n"
++msgstr "Ошибка выделения памяти\n"
++
++#: src/drill.c:417 src/drill.c:431 src/drill.c:727 src/drill.c:730
++#: src/drill.c:763
++#, c-format
++msgid "Undefined header line = '%s'\n"
++msgstr "Неопределённая строка заголовка «%s»\n"
++
++#: src/drill.c:447
++msgid "Rout mode data is not supported\n"
++msgstr "Данные режима быстрого позиционирования не поддерживаются\n"
++
++#: src/drill.c:462 src/gerber.c:1488
++msgid "Unexpected EOF found.\n"
++msgstr "Неожиданный код конца файла.\n"
++
++#: src/drill.c:510 src/drill.c:517
++msgid "Found junk after INCH command\n"
++msgstr "Ненужный текст после команды INCH\n"
++
++#: src/drill.c:561
++msgid ""
++"End of Excellon header reached but no leading/trailing zero handling "
++"specified.\n"
++msgstr ""
++"В заголовке файла Excellon не указана обработка ведущих/младших нулей.\n"
++
++#: src/drill.c:565
++msgid "Assuming leading zeros.\n"
++msgstr "Предполагаются ведущие нули.\n"
++
++#: src/drill.c:575
++msgid "M71 code found but no METRIC specification in header.\n"
++msgstr "Найден код M71, но в заголовке не указано METRIC.\n"
++
++#: src/drill.c:579
++msgid "Assuming all tool sizes are MM.\n"
++msgstr "Предполагается размер всех инструментов в мм.\n"
++
++#: src/drill.c:620
++#, c-format
++msgid "Message embedded in drill file: '%s'\n"
++msgstr "Текст встроенный в файл сверловки: «%s»\n"
++
++#: src/drill.c:644
++msgid "Undefined M code found.\n"
++msgstr "Неопределённый M-код.\n"
++
++#: src/drill.c:653
++msgid "R codes are not allowed in the header.\n"
++msgstr "R-коды не допустимы в заголовке.\n"
++
++#: src/drill.c:715
++msgid "Drill file sets spindle speed -- ignoring.\n"
++msgstr "Пропуск установки скорости шпинделя в файле сверловки.\n"
++
++#: src/drill.c:759
++msgid "Undefined codes found in header.\n"
++msgstr "Неопределённые коды в заголовке.\n"
++
++#: src/drill.c:772
++#, c-format
++msgid "Undefined character '%c' [0x%02x] found inside data, ignoring\n"
++msgstr "Пропуск неопределённого символа ‘%c’ [0x%02x] в данных\n"
++
++#: src/drill.c:784
++msgid "No EOF found in drill file.\n"
++msgstr "В файле сверловки отсутствует код конца файла.\n"
++
++#: src/drill.c:870
++msgid "malloc buf failed while checking for drill file.\n"
++msgstr "Ошибка выделения памяти при проверке является ли файл сверловкой.\n"
++
++#: src/drill.c:989
++#, c-format
++msgid "Tool change stop switch found: %s\n"
++msgstr "Смена инструмента: %s\n"
++
++#: src/drill.c:1007
++msgid "Orcad bug: Junk text found in place of tool definition.\n"
++msgstr "Ошибка Orcad: ненужный текст вместо определения инструмента.\n"
++
++#: src/drill.c:1010
++#, c-format
++msgid "Junk text = %s\n"
++msgstr "Ненужный текст: %s\n"
++
++#: src/drill.c:1020
++msgid "Ignorning junk text.\n"
++msgstr "Пропуск ненужного текста.\n"
++
++#: src/drill.c:1034
++#, c-format
++msgid "Drill number out of bounds: %d.\n"
++msgstr "Номер отверстия %d не входит в границы.\n"
++
++#: src/drill.c:1065
++#, c-format
++msgid "Read a drill of diameter %g inches.\n"
++msgstr "Прочитано отверстие диаметром %g дюймов.\n"
++
++#: src/drill.c:1071
++msgid "Assuming units are mils.\n"
++msgstr "Предполагаются единицы измерения мил.\n"
++
++#: src/drill.c:1081
++#, c-format
++msgid "Unreasonable drill size found for drill %d: %g\n"
++msgstr "Бессмысленный размер отверстия %d: %g\n"
++
++#: src/drill.c:1097
++#, c-format
++msgid "Found redefinition of drill %d.\n"
++msgstr "Переопределение отверстия %d.\n"
++
++#: src/drill.c:1108 src/drill.c:1163
++msgid "malloc tool failed\n"
++msgstr "Ошибка выделения памяти для инструмента\n"
++
++#: src/drill.c:1150
++msgid "Unexpected EOF encountered header of drill file.\n"
++msgstr "Неожиданный код конца файла в заголовке файла сверловки.\n"
++
++#: src/drill.c:1182
++#, c-format
++msgid "Tool %02d used without being defined\n"
++msgstr "Инструмент %02d используется без определения\n"
++
++#: src/drill.c:1188
++#, c-format
++msgid "Setting a default size of %g\"\n"
++msgstr "Установка размера по умолчанию %g\"\n"
++
++#: src/drill.c:1237
++msgid "Unexpected EOF found while parsing M code.\n"
++msgstr "Неожиданный код конца файла при разборе M-кода.\n"
++
++#: src/drill.c:1391
++msgid "Found junk after METRIC command\n"
++msgstr "Ненужный текст после команды METRIC\n"
++
++#: src/drill.c:1431
++msgid "Unexpected EOF found while parsing G code.\n"
++msgstr "Неожиданный код конца файла при разборе G-кода.\n"
++
++#: src/drill.c:1605
++#, c-format
++msgid ""
++"%s():  omit_zeros == GERBV_OMIT_ZEROS_TRAILING but fmt = %d.\n"
++"This should never have happened\n"
++msgstr ""
++"%s():  omit_zeros == GERBV_OMIT_ZEROS_TRAILING но fmt = %d.\n"
++"Этого никогда не должно случиться\n"
++
++#: src/drill.c:1620
++#, c-format
++msgid "%s():  wantdigits = %d which exceeds the maximum allowed size\n"
++msgstr "%s(): wantdigits = %d превышает максимально допустимое значение\n"
++
++#: src/drill.c:1675
++#, c-format
++msgid "%s(): Unhandled fmt ` %d\n"
++msgstr "%s(): формат %d не обработан\n"
++
++#: src/drill_stats.c:68
++msgid "malloc drill_list failed\n"
++msgstr "Ошибка выделения памяти для списка отверстий сверловки\n"
++
++#: src/drill_stats.c:74 src/drill_stats.c:469 src/gerb_stats.c:68
++#: src/gerb_stats.c:290
++msgid "malloc error_list failed\n"
++msgstr "Ошибка выделения памяти для списка ошибок\n"
++
++#: src/drill_stats.c:199
++#, c-format
++msgid "Broken tool detect %s (layer %d)"
++msgstr "Обнаружена неисправность инструмента %s (слой %d)"
++
++#: src/dynload.c:49
++#, c-format
++msgid "scheme load-extension: %s: %s"
++msgstr "scheme расширение для загрузки: %s: %s"
++
++#: src/dynload.c:79
++#, c-format
++msgid "Error loading scheme extension \"%s\": %s\n"
++msgstr "Ошибка загрузки расширения scheme «%s»: %s\n"
++
++#: src/dynload.c:90
++#, c-format
++msgid "Error initializing scheme module \"%s\": %s\n"
++msgstr "Ошибка инициализации модуля scheme «%s»: %s\n"
++
++#: src/export-drill.c:56 src/export-rs274x.c:217
++#, c-format
++msgid "Can't open file for writing: %s\n"
++msgstr "Невозможно открыть файл «%s» для записи\n"
++
++#: src/exportimage.c:97
++#, c-format
++msgid "Exporting error to file \"%s\"\n"
++msgstr "Ошибка экспорта в файл «%s»\n"
++
++#: src/gerb_file.c:182
++msgid "Failed to read integer"
++msgstr "Ошибка чтения целого числа"
++
++#: src/gerb_file.c:208
++msgid "Failed to read double"
++msgstr "Ошибка чтения вещественного числа двойной точности"
++
++#: src/gerb_image.c:100 src/gerb_image.c:272 src/gerb_image.c:325
++#, c-format
++msgid "unknown"
++msgstr "неизвестный тип"
++
++#: src/gerb_image.c:248
++#, c-format
++msgid "linearX1"
++msgstr "линейная×1"
++
++#: src/gerb_image.c:251
++#, c-format
++msgid "linearX10"
++msgstr "линейная×10"
++
++#: src/gerb_image.c:254
++#, c-format
++msgid "linearX01"
++msgstr "линейная×01"
++
++#: src/gerb_image.c:257
++#, c-format
++msgid "linearX001"
++msgstr "линейная×001"
++
++#: src/gerb_image.c:260
++#, c-format
++msgid "CW circular"
++msgstr "круговая по часовой"
++
++#: src/gerb_image.c:263
++#, c-format
++msgid "CCW circular"
++msgstr "круговая против часовой"
++
++#: src/gerb_image.c:266
++#, c-format
++msgid "polygon area start"
++msgstr "начало полигональной области"
++
++#: src/gerb_image.c:269
++#, c-format
++msgid "polygon area end"
++msgstr "конец полигональной области"
++
++#: src/gerb_image.c:281
++#, c-format
++msgid "..state off"
++msgstr "..выключенное состояние"
++
++#: src/gerb_image.c:284
++#, c-format
++msgid "..state on"
++msgstr "..включенное состояние"
++
++#: src/gerb_image.c:287
++#, c-format
++msgid "..state flash"
++msgstr "..состояние экспозиции"
++
++#: src/gerb_image.c:290
++#, c-format
++msgid "..state unknown"
++msgstr "..состояние неизвестно"
++
++#: src/gerb_image.c:303
++#, c-format
++msgid "Apertures:\n"
++msgstr "Апертуры:\n"
++
++#: src/gerb_image.c:307
++#, c-format
++msgid " Aperture no:%d is an "
++msgstr "Апертура №%d — "
++
++#: src/gerb_image.c:310
++#, c-format
++msgid "circle"
++msgstr "круг"
++
++#: src/gerb_image.c:313
++#, c-format
++msgid "rectangle"
++msgstr "прямоугольник"
++
++#: src/gerb_image.c:316
++#, c-format
++msgid "oval"
++msgstr "овал"
++
++#: src/gerb_image.c:319
++#, c-format
++msgid "polygon"
++msgstr "полигон"
++
++#: src/gerb_image.c:322
++#, c-format
++msgid "macro"
++msgstr "макрос"
++
++#: src/gerb_image.c:337
++#, c-format
++msgid "(%f,%f)->(%f,%f) with %d ("
++msgstr "(%f,%f)->(%f,%f) с %d ("
++
++#: src/gerb_stats.c:74 src/gerb_stats.c:376
++msgid "malloc aperture_list failed\n"
++msgstr "Ошибка выделения памяти для списка апертур\n"
++
++#: src/gerb_stats.c:80
++msgid "malloc D_code_list failed\n"
++msgstr "Ошибка выделения памяти для списка D-кодов\n"
++
++#: src/gerb_stats.c:434
++msgid "malloc D_list failed\n"
++msgstr "Ошибка выделения памяти для списка D-кодов\n"
++
++#: src/gerb_stats.c:476
++msgid "Undefined aperture number called out in D code.\n"
++msgstr "В D-коде указан неизвестный номер апертуры.\n"
++
++#: src/gerber.c:179
++msgid "Unknown M code found.\n"
++msgstr "Неизвестный M-код.\n"
++
++#: src/gerber.c:489
++#, c-format
++msgid ""
++"Found undefined D code D%d in file\n"
++"%s\n"
++msgstr "Неопределённый D-код D%d в файле «%s»\n"
++
++#: src/gerber.c:723
++#, c-format
++msgid "Found unknown character (whitespace?) [%d]%c\n"
++msgstr "Неизвестный символ (пробел?) [%d]%c\n"
++
++#: src/gerber.c:775
++msgid "malloc gerbv_stats failed\n"
++msgstr "Ошибка выделения памяти для структуры статистики\n"
++
++#: src/gerber.c:792
++#, c-format
++msgid "File %s is missing Gerber EOF code.\n"
++msgstr "Файл «%s» не содержит код конца Gerber-файла.\n"
++
++#: src/gerber.c:833
++msgid "malloc buf failed while checking for rs274x.\n"
++msgstr "Ошибка выделения памяти при проверке RS274X.\n"
++
++#: src/gerber.c:927
++msgid "malloc buf failed while checking for rs274d.\n"
++msgstr "Ошибка выделения памяти при проверке RS274D.\n"
++
++#: src/gerber.c:1060
++#, c-format
++msgid ""
++"Found aperture D%d out of bounds while parsing G code in file\n"
++"%s\n"
++msgstr "Апертура D%d превышает границы при разборе G-кода в файле «%s»\n"
++
++#: src/gerber.c:1069
++#, c-format
++msgid ""
++"Found unexpected code after G54 in file\n"
++"%s\n"
++msgstr "Неизвестный код после G54 в файле «%s»\n"
++
++#: src/gerber.c:1109
++#, c-format
++msgid ""
++"Encountered unknown G code G%d in file\n"
++"%s\n"
++msgstr "Неизвестный G-код G%d в файле «%s»\n"
++
++#: src/gerber.c:1115
++#, c-format
++msgid "Ignorning unknown G code G%d\n"
++msgstr "Пропуск неизвестного G-кода G%d\n"
++
++#: src/gerber.c:1145
++#, c-format
++msgid ""
++"Found invalid D00 code in file\n"
++"%s\n"
++msgstr "Недопустимый код D00 в файле «%s»\n"
++
++#: src/gerber.c:1173
++#, c-format
++msgid ""
++"Found out of bounds aperture D%d in file\n"
++"%s\n"
++msgstr "Превышающая границы апертура D%d в файле «%s»\n"
++
++#: src/gerber.c:1211
++#, c-format
++msgid ""
++"Encountered unknown M code M%d in file\n"
++"%s\n"
++msgstr "Неизвестный M-код M%d в файле «%s»\n"
++
++#: src/gerber.c:1218
++#, c-format
++msgid "Ignorning unknown M code M%d\n"
++msgstr "Пропуск неизвестного M-кода M%d\n"
++
++#: src/gerber.c:1252 src/gerber.c:1271 src/gerber.c:1290 src/gerber.c:1614
++#, c-format
++msgid ""
++"Unexpected EOF found in file\n"
++"%s\n"
++msgstr "Неожиданный код конца файла в «%s»\n"
++
++#: src/gerber.c:1320
++#, c-format
++msgid ""
++"EagleCad bug detected: Undefined handling of zeros in format code in file\n"
++"%s\n"
++msgstr "Ошибка EagleCad: формат не определяет обработку нулей в файле «%s»\n"
++
++#: src/gerber.c:1327
++msgid "Defaulting to omitting leading zeros.\n"
++msgstr "Пропуск ведущих нулей, по умолчанию.\n"
++
++#: src/gerber.c:1345
++#, c-format
++msgid ""
++"Invalid coordinate type defined in format code in file\n"
++"%s\n"
++msgstr "Недопустимый тип координат в коде формата файла «%s»\n"
++
++#: src/gerber.c:1352
++msgid "Defaulting to absolute coordinates.\n"
++msgstr "Установка по умолчанию абсолютных координат.\n"
++
++#: src/gerber.c:1382 src/gerber.c:1393 src/gerber.c:1406 src/gerber.c:1417
++#, c-format
++msgid ""
++"Illegal format size %c in file\n"
++"%s\n"
++msgstr "Недопустимый размер формата %c в файле «%s»\n"
++
++#: src/gerber.c:1428
++#, c-format
++msgid ""
++"Illegal format statement [%c] in file\n"
++"%s\n"
++msgstr "Недопустимое выражение формата [%c] в файле «%s»\n"
++
++#: src/gerber.c:1435
++msgid "Ignoring invalid format statement.\n"
++msgstr "Пропуск недопустимого выражения формата.\n"
++
++#: src/gerber.c:1471
++#, c-format
++msgid "Wrong character in mirror:%c\n"
++msgstr "Недопустимый символ зеркального отражения: %c\n"
++
++#: src/gerber.c:1500
++#, c-format
++msgid "Illegal unit: %c%c\n"
++msgstr "Недопустимые единицы измерения: %c%c\n"
++
++#: src/gerber.c:1520
++#, c-format
++msgid "Wrong character in offset: %c\n"
++msgstr "Недопустимый символ в смещении: %c\n"
++
++#: src/gerber.c:1549
++#, c-format
++msgid ""
++"In file %s,\n"
++"included file %s cannot be found\n"
++msgstr "В файле «%s» не может быть найден включённый файл «%s»\n"
++
++#: src/gerber.c:1559
++msgid ""
++"Parser encountered more than 10 levels of include file recursion which is "
++"not allowed by the RS-274X spec\n"
++msgstr ""
++"Более чем 10 уровней рекурсии включения файлов не допускается спецификацией "
++"RS-274X\n"
++
++#: src/gerber.c:1582
++#, c-format
++msgid ""
++"In file %s,\n"
++"wrong character in image offset %c\n"
++msgstr "В файле «%s» недопустимый символ %c смещения изображения\n"
++
++#: src/gerber.c:1638
++#, c-format
++msgid ""
++"In file %s,\n"
++"unknown input code (IC): %c%c\n"
++msgstr "В файле «%s» неизвестный входной код (IC): %c%c\n"
++
++#: src/gerber.c:1680
++#, c-format
++msgid ""
++"In file %s,\n"
++"wrong character in image justify:%c\n"
++msgstr "В файле «%s» недопустимый символ выравнивания изображения: %c\n"
++
++#: src/gerber.c:1699
++#, c-format
++msgid ""
++"In file %s,\n"
++"unexpected EOF while reading image polarity (IP)\n"
++msgstr ""
++"В файле «%s» неожиданный код конца файла при чтении полярности изображения "
++"(IP)\n"
++
++#: src/gerber.c:1715
++#, c-format
++msgid "Unknown polarity: %c%c%c\n"
++msgstr "Неизвестная полярность: %c%c%c\n"
++
++#: src/gerber.c:1734
++#, c-format
++msgid "Image rotation must be 0, 90, 180 or 270 (is actually %d)\n"
++msgstr ""
++"Изображение должно быть повёрнуто на 0°, 90°, 180° или 270° (указано %d°)\n"
++
++#: src/gerber.c:1765 src/gerber.c:1770
++#, c-format
++msgid ""
++"In file %s,\n"
++"aperture number out of bounds: %d\n"
++msgstr "В файле «%s» номер апертуры выходит за границы: %d\n"
++
++#: src/gerber.c:1790
++#, c-format
++msgid ""
++"In file %s,\n"
++"failed to parse aperture macro\n"
++msgstr "В файле «%s» ошибка разбора макроса апертуры\n"
++
++#: src/gerber.c:1815
++#, c-format
++msgid ""
++"In file %s,\n"
++"unknown Layer Polarity: %c\n"
++msgstr "В файле «%s» неизвестная полярность слоя: %c\n"
++
++#: src/gerber.c:1838
++#, c-format
++msgid ""
++"In file %s,\n"
++"knockout must supply a polarity (C, D, or *)\n"
++msgstr "Врезка должна содержать полярность (C, D или *) в файле «%s»\n"
++
++#: src/gerber.c:1884
++#, c-format
++msgid ""
++"In file %s,\n"
++"unknown variable in knockout"
++msgstr "Неизвестная переменная врезки в файле «%s»"
++
++#: src/gerber.c:1921
++#, c-format
++msgid ""
++"In file %s,\n"
++"step-and-repeat parameter error\n"
++msgstr ""
++"Ошибка параметра многократного экспонирования с шаговым перемещением в файле "
++"«%s»\n"
++
++#: src/gerber.c:1950
++#, c-format
++msgid ""
++"In file %s,\n"
++"error in layer rotation command\n"
++msgstr "Ошибка в команде поворота слоя в файле «%s»\n"
++
++#: src/gerber.c:1960
++#, c-format
++msgid ""
++"In file %s,\n"
++"unknown RS-274X extension found %%%c%c%%\n"
++msgstr "В файле «%s» найдено неизвестное расширение RS-274X %%%c%c%%\n"
++
++#: src/gerber.c:2048
++msgid "aperture NULL in simplify aperture macro\n"
++msgstr "Отсутствует апертура в макросе упрощения апертуры\n"
++
++#: src/gerber.c:2051
++msgid "aperture->amacro NULL in simplify aperture macro\n"
++msgstr "Отсутствует структура amacro в макросе упрощения апертуры\n"
++
++#: src/gerber.c:2056
++msgid "malloc stack failed\n"
++msgstr "Ошибка выделения памяти для стека\n"
++
++#: src/gerber.c:2075 src/gerber.c:2080 src/gerber.c:2082 src/gerber.c:2087
++#: src/gerber.c:2089 src/gerber.c:2094 src/gerber.c:2096 src/gerber.c:2101
++#: src/gerber.c:2103
++msgid "Tried to pop an empty stack"
++msgstr "Попытка удаления из пустого стека"
++
++#: src/gerber.c:2168
++#, c-format
++msgid ""
++"Number of parameters to aperture macro (%d) are more than gerbv is able to "
++"store (%d)\n"
++msgstr ""
++"Количество параметров макроса апертуры (%d) больше чем допускает Gerbv (%d)\n"
++
++#: src/gerber.c:2307
++#, c-format
++msgid ""
++"Found AD code with no following 'D' in file\n"
++"%s\n"
++msgstr "AD-код без последующего ‘D’ в файле «%s»\n"
++
++#: src/gerber.c:2329
++#, c-format
++msgid ""
++"Invalid aperture definition in file\n"
++"%s\n"
++msgstr "Недопустимое определение апертуры в файле «%s»\n"
++
++#: src/gerber.c:2377
++#, c-format
++msgid ""
++"In file %s,\n"
++"maximum number of allowed parameters exceeded in aperture %d\n"
++msgstr ""
++"В файле «%s» превышено максимальное количество параметров для апертуры %d\n"
++
++#: src/gerber.c:2398
++#, c-format
++msgid "Failed to read all parameters exceeded in aperture %d\n"
++msgstr "Не удалось прочитать все параметры апертуры %d\n"
++
++#: src/gerber.c:2473
++msgid "Unknow quadrant value while converting to cw\n"
++msgstr "Неизвестное значение квадранта при преобразовании по часовой стрелке\n"
++
++#: src/gerber.c:2498 src/gerber.c:2544
++#, c-format
++msgid "Strange quadrant: %d\n"
++msgstr "Неизвестный квадрант: %d\n"
++
++#: src/gerber.c:2548
++#, c-format
++msgid "Negative width [%f] in quadrant %d [%f][%f]\n"
++msgstr "Отрицательная ширина (%f) в квадранте %d [%f][%f]\n"
++
++#: src/gerber.c:2552
++#, c-format
++msgid "Negative height [%f] in quadrant %d [%f][%f]\n"
++msgstr "Отрицательная высота (%f) в квадранте %d [%f][%f]\n"
++
++#: src/gerbv.c:185 src/gerbv.c:204 src/main.c:247
++#, c-format
++msgid "could not read %s[%d]\n"
++msgstr "Невозможно прочитать «%s»[%d]\n"
++
++#: src/gerbv.c:328
++msgid "Missing netlist - aborting file read\n"
++msgstr "Список соединений отсутствует, чтение файла прервано\n"
++
++#: src/gerbv.c:336
++msgid "Missing format in file...trying to load anyways\n"
++msgstr "Формат файла отсутствует, загрузка продолжена\n"
++
++#: src/gerbv.c:338
++msgid "Missing apertures/drill sizes...trying to load anyways\n"
++msgstr "Размеры апертур/отверстий отсутствуют, загрузка продолжена\n"
++
++#: src/gerbv.c:344
++msgid "Missing info...trying to load anyways\n"
++msgstr "Информация отсутствует, загрузка продолжена\n"
++
++#: src/gerbv.c:428 src/gerbv.c:522
++#, c-format
++msgid "Trying to open %s:%s\n"
++msgstr "Открытие «%s»: %s\n"
++
++#: src/gerbv.c:464
++msgid "Most likely found a RS-274D file...trying to open anyways\n"
++msgstr "Вероятно, файл RS-274D... открытие\n"
++
++#: src/gerbv.c:475
++#, c-format
++msgid "%s: Unknown file type.\n"
++msgstr "Неизвестный тип файла «%s»\n"
++
++#: src/gerbv.c:489
++msgid " (top)"
++msgstr " (верх)"
++
++#: src/gerbv.c:506
++msgid " (bottom)"
++msgstr " (низ)"
++
++#: src/gerbv.c:880 src/project.c:373 src/project.c:422 src/project.c:432
++#, c-format
++msgid "%s():  malloc failed\n"
++msgstr "%s(): ошибка выделения памяти\n"
++
++#: src/interface.c:57
++msgid "Gerbv -- gEDA's Gerber Viewer"
++msgstr "Gerbv — gEDA просмотр Gerber-файлов"
++
++#: src/interface.c:73
++#, c-format
++msgid "%s version %s: %s"
++msgstr "%s версии %s: %s"
++
++#: src/interface.c:310
++msgid "_File"
++msgstr "_Файл"
++
++#: src/interface.c:321 src/interface.c:862
++msgid "Close all layers and start a new project"
++msgstr "Закрыть все слои и начать новый проект"
++
++#: src/interface.c:324
++msgid "_Open project..."
++msgstr "_Открыть проект..."
++
++#: src/interface.c:326
++msgid "Open an existing Gerbv project"
++msgstr "Открыть существующий проект Gerbv"
++
++#: src/interface.c:330
++msgid "Save project"
++msgstr "Сохранить проект"
++
++#: src/interface.c:332 src/interface.c:874
++msgid "Save the current project"
++msgstr "Сохранить текущий проект"
++
++#: src/interface.c:339
++msgid "Save the current project to a new file"
++msgstr "Сохранить текущий проект в указанный файл"
++
++#: src/interface.c:347
++msgid "Reload all layers"
++msgstr "Перезагрузить все слои"
++
++#: src/interface.c:355
++msgid "Open _layer(s)..."
++msgstr "Открыть с_лой..."
++
++#: src/interface.c:358 src/interface.c:995
++msgid "Open Gerber, drill, or pick and place file(s)"
++msgstr "Открыть файлы Gerber, сверловки или расположения"
++
++#: src/interface.c:360
++msgid "_Save active layer"
++msgstr "_Сохранить активный слой"
++
++#: src/interface.c:362
++msgid "Save the active layer"
++msgstr "Сохранить активный слой"
++
++#: src/interface.c:366
++msgid "Save active layer _as..."
++msgstr "Сохранить _активный слой как..."
++
++#: src/interface.c:368
++msgid "Save the active layer to a new file"
++msgstr "Сохранить активный слой в указанный файл"
++
++#: src/interface.c:377
++msgid "_Export"
++msgstr "_Экспорт"
++
++#: src/interface.c:379
++msgid "Export all visible layers to a new format"
++msgstr "Экспортировать видимые слои в указанный формат"
++
++#: src/interface.c:387
++msgid "P_NG..."
++msgstr "P_NG..."
++
++#: src/interface.c:389
++msgid "Export project to a PNG file..."
++msgstr "Экспортировать проект в формат PNG"
++
++#: src/interface.c:391
++msgid "P_DF..."
++msgstr "P_DF..."
++
++#: src/interface.c:393
++msgid "Export project to a PDF file..."
++msgstr "Экспортировать проект в формат PDF"
++
++#: src/interface.c:395
++msgid "_SVG..."
++msgstr "_SVG..."
++
++#: src/interface.c:397
++msgid "Export project to a SVG file"
++msgstr "Экспортировать проект в формат SVG"
++
++#: src/interface.c:399
++msgid "_PostScript..."
++msgstr "_PostScript..."
++
++#: src/interface.c:401
++msgid "Export project to a PostScript file"
++msgstr "Экспортировать проект в формат PostScript"
++
++#: src/interface.c:403
++msgid "RS-274X (_Gerber)..."
++msgstr "RS-274X (_Gerber)..."
++
++#: src/interface.c:405
++msgid "Export layer to a RS-274X (Gerber) file"
++msgstr "Экспортировать проект в формат RS-274X (Gerber)"
++
++#: src/interface.c:407
++msgid "_Excellon drill..."
++msgstr "Сверловка _Excellon... "
++
++#: src/interface.c:409
++msgid "Export layer to an Excellon drill file"
++msgstr "Экспортировать проект в формат сверловки Excellon)"
++
++#: src/interface.c:411
++msgid "RS-274X Merge (Gerber)..."
++msgstr "Объединить в RS-274X (Gerber)..."
++
++#: src/interface.c:413
++msgid "Export (merge visible gerber layers) to a RS-274X (Gerber) file"
++msgstr ""
++"Экспортировать проект в формат RS-274X (Gerber), объединив видимые слои "
++"Gerber"
++
++#: src/interface.c:415
++msgid "Excellon drill Merge..."
++msgstr "Объединить в сверловку Excellon..."
++
++#: src/interface.c:417
++msgid "Export (merge visible drill layers) to an Excellon drill file"
++msgstr ""
++"Экспортировать проект в формат сверловки Excellon, объединив видимые слои "
++"сверловки"
++
++#: src/interface.c:426
++msgid "_Print..."
++msgstr "_Печать..."
++
++#: src/interface.c:434 src/interface.c:881
++msgid "Print the visible layers"
++msgstr "Печатать видимые слои"
++
++#: src/interface.c:443
++msgid "Quit Gerbv"
++msgstr "Выйти из Gerbv"
++
++#: src/interface.c:447
++msgid "_Edit"
++msgstr "_Правка"
++
++#: src/interface.c:456
++msgid "Display _properties of selected object(s)"
++msgstr "_Свойства объектов"
++
++#: src/interface.c:458
++msgid "Examine the properties of the selected object"
++msgstr "Показать свойства выделенных объектов"
++
++#: src/interface.c:463
++msgid "_Delete selected object(s)"
++msgstr "_Удалить объекты"
++
++#: src/interface.c:465
++msgid "Delete selected objects"
++msgstr "Удалить выделенные объекты"
++
++#: src/interface.c:494
++msgid "_View"
++msgstr "_Вид"
++
++#: src/interface.c:502
++msgid "Fullscr_een"
++msgstr "Во в_есь экран"
++
++#: src/interface.c:504
++msgid "Toggle between fullscreen and normal view"
++msgstr "Переключить между полноэкранным и обычным режимами"
++
++#: src/interface.c:508
++msgid "Show _Toolbar"
++msgstr "_Панель инструментов"
++
++#: src/interface.c:510
++msgid "Toggle visibility of the toolbar"
++msgstr "Показать панель инструментов"
++
++#: src/interface.c:514
++msgid "Show _Sidepane"
++msgstr "_Боковая панель"
++
++#: src/interface.c:516
++msgid "Toggle visibility of the sidepane"
++msgstr "Показать боковую панель"
++
++#: src/interface.c:524
++msgid "Toggle layer _visibility"
++msgstr "Изменить _видимость слоя"
++
++#: src/interface.c:532
++msgid "Toggle visibility of layer 1"
++msgstr "№1"
++
++#: src/interface.c:536
++msgid "Toggle visibility of layer 2"
++msgstr "№2"
++
++#: src/interface.c:540
++msgid "Toggle visibility of layer 3"
++msgstr "№3"
++
++#: src/interface.c:544
++msgid "Toggle visibility of layer 4"
++msgstr "№4"
++
++#: src/interface.c:548
++msgid "Toggle visibility of layer 5"
++msgstr "№5"
++
++#: src/interface.c:552
++msgid "Toggle visibility of layer 6"
++msgstr "№6"
++
++#: src/interface.c:556
++msgid "Toggle visibility of layer 7"
++msgstr "№7"
++
++#: src/interface.c:560
++msgid "Toggle visibility of layer 8"
++msgstr "№8"
++
++#: src/interface.c:564
++msgid "Toggle visibility of layer 9"
++msgstr "№9"
++
++#: src/interface.c:568
++msgid "Toggle visibility of layer 10"
++msgstr "№10"
++
++#: src/interface.c:578 src/interface.c:888
++msgid "Zoom in"
++msgstr "Увеличить"
++
++#: src/interface.c:583 src/interface.c:892
++msgid "Zoom out"
++msgstr "Уменьшить"
++
++#: src/interface.c:587 src/interface.c:896
++msgid "Zoom to fit all visible layers in the window"
++msgstr "Масштабировать для отображения видимых слоёв на всё окно"
++
++#: src/interface.c:595
++msgid "Change background color"
++msgstr "Изменить цвет фона"
++
++#: src/interface.c:596
++msgid "Change the background color"
++msgstr "Изменить цвет фона"
++
++#: src/interface.c:602
++msgid "_Rendering"
++msgstr "_Отображение"
++
++#: src/interface.c:612
++msgid "_Fast"
++msgstr "_Быстрое"
++
++#: src/interface.c:616
++msgid "Fast (_XOR)"
++msgstr "_Искл. ИЛИ"
++
++#: src/interface.c:620
++msgid "_Normal"
++msgstr "_Обычное"
++
++#: src/interface.c:624
++msgid "High _Quality"
++msgstr "_Качественное"
++
++#: src/interface.c:630
++msgid "malloc for rendering type synchronization failed.\n"
++msgstr "ошибка выделения памяти для элемента типа отображения.\n"
++
++#: src/interface.c:641
++msgid "U_nits"
++msgstr "_Единицы измерения"
++
++#: src/interface.c:651
++msgid "mi_l"
++msgstr "ми_л"
++
++#: src/interface.c:655
++msgid "_mm"
++msgstr "_мм"
++
++#: src/interface.c:659
++msgid "_in"
++msgstr "_дюймы"
++
++#: src/interface.c:665
++msgid "malloc for display unit synchronization failed.\n"
++msgstr "ошибка выделения памяти для элемента единиц измерения.\n"
++
++#: src/interface.c:673
++msgid "_Layer"
++msgstr "_Слой"
++
++#: src/interface.c:681
++msgid "Toggle _visibility"
++msgstr "Изменить ви_димость"
++
++#: src/interface.c:682
++msgid "Toggles the visibility of the layer currently selected in the sidepane"
++msgstr "Изменить видимость выделенного слоя"
++
++#: src/interface.c:685
++msgid "All o_n"
++msgstr "В_ключить все"
++
++#: src/interface.c:686
++msgid "Turn on visibility of all layers"
++msgstr "Включить видимость всех слоёв"
++
++#: src/interface.c:691
++msgid "All _off"
++msgstr "В_ыключить все"
++
++#: src/interface.c:692
++msgid "Turn off visibility of all layers"
++msgstr "Выключить видимость всех слоёв"
++
++#: src/interface.c:697
++msgid "_Invert color"
++msgstr "_Инвертировать"
++
++#: src/interface.c:698
++msgid ""
++"Invert the display polarity of the layer currently selected in the sidepane"
++msgstr "Инвертировать полярность выделенного слоя"
++
++#: src/interface.c:701
++msgid "_Change color"
++msgstr "Изменить _цвет"
++
++#: src/interface.c:703
++msgid ""
++"Change the display color of the layer currently selected in the sidepane"
++msgstr "Изменить цвет выделенного слоя"
++
++#: src/interface.c:711
++msgid "_Reload layer"
++msgstr "_Перезагрузить слой"
++
++#: src/interface.c:712
++msgid "Reload the layer from disk"
++msgstr "Перезагрузить данные слоя из файла"
++
++#: src/interface.c:717
++msgid "_Modify orientation"
++msgstr "Изменить с_лой"
++
++#: src/interface.c:719
++msgid ""
++"Translate, scale, rotate, or mirror the layer currently selected in the "
++"sidepane"
++msgstr "Переместить, масштабировать, повернуть или отразить выделенный слой"
++
++#: src/interface.c:721
++msgid "Edit file _format"
++msgstr "Изменить _формат"
++
++#: src/interface.c:722
++msgid ""
++"View and edit the numerical format used to parse this layer currently "
++"selected in the sidepane"
++msgstr ""
++"Просмотр и изменение формата используемого для слоя выделенного в боковой "
++"панели"
++
++#: src/interface.c:730
++msgid "Move u_p"
++msgstr "Перенести в_верх"
++
++#: src/interface.c:731 src/interface.c:1009
++msgid "Move the layer currently selected in the sidepane one step up"
++msgstr "Перенести выделенный слой выше"
++
++#: src/interface.c:737
++msgid "Move dow_n"
++msgstr "Перенести в_низ"
++
++#: src/interface.c:738 src/interface.c:1002
++msgid "Move the layer currently selected in the sidepane one step down"
++msgstr "Перенести выделенный слой ниже"
++
++#: src/interface.c:744
++msgid "_Delete"
++msgstr "_Удалить"
++
++#: src/interface.c:746 src/interface.c:1016
++msgid "Remove the layer currently selected in the sidepane"
++msgstr "Удалить выделенный слой"
++
++#: src/interface.c:757
++msgid "_Analyze"
++msgstr "_Анализ"
++
++#: src/interface.c:766
++msgid "Analyze visible _Gerber layers"
++msgstr "_Gerber"
++
++#: src/interface.c:768
++msgid ""
++"Examine a detailed anaylsis of the contents of all visible Gerber layers"
++msgstr "Выполнить детальный анализ содержимого всех видимых слоёв Gerber"
++
++#: src/interface.c:771
++msgid "Analyze visible _drill layers"
++msgstr "_Сверловки"
++
++#: src/interface.c:773
++msgid "Examine a detailed anaylsis of the contents of all visible drill layers"
++msgstr "Выполнить детальный анализ содержимого всех видимых слоёв сверловки"
++
++#: src/interface.c:776
++msgid "_Benchmark (1 min)"
++msgstr "_Производительности (1 мин)"
++
++#: src/interface.c:778
++msgid ""
++"Benchmark different rendering methods. Will make the application "
++"unresponsive for 1 minute!"
++msgstr ""
++"Проверить производительность различных способов отрисовки. Программа не "
++"будет отвечать в течение одной минуты!"
++
++#: src/interface.c:787
++msgid "_Tools"
++msgstr "_Инструменты"
++
++#: src/interface.c:794
++msgid "_Pointer Tool"
++msgstr "_Указатель"
++
++#: src/interface.c:799 src/interface.c:920
++msgid "Select objects on the screen"
++msgstr "Выделить объекты на экране"
++
++#: src/interface.c:800
++msgid "Pa_n Tool"
++msgstr "_Прокрутка"
++
++#: src/interface.c:805 src/interface.c:926
++msgid "Pan by left clicking and dragging"
++msgstr "Выполнить прокрутку перетаскиванием"
++
++#: src/interface.c:807
++msgid "_Zoom Tool"
++msgstr "_Масштаб"
++
++#: src/interface.c:812 src/interface.c:934
++msgid "Zoom by left clicking or dragging"
++msgstr "Масштабировать щелчком или перетаскиванием"
++
++#: src/interface.c:814
++msgid "_Measure Tool"
++msgstr "_Измерение"
++
++#: src/interface.c:819 src/interface.c:941
++msgid "Measure distances on the screen"
++msgstr "Измерить расстояние на экране"
++
++#: src/interface.c:821
++msgid "_Help"
++msgstr "_Помощь"
++
++#: src/interface.c:835
++msgid "_About Gerbv..."
++msgstr "_О программе..."
++
++#: src/interface.c:837
++msgid "View information about gerbv"
++msgstr "Показать информацию о Gerbv"
++
++#: src/interface.c:841
++msgid "Known _bugs in this version..."
++msgstr "_Известные ошибки в этой версии..."
++
++#: src/interface.c:844
++msgid "View list of known gerbv bugs"
++msgstr "Показать список известных ошибок в Gerbv"
++
++#: src/interface.c:866
++msgid "Open a previously saved gerbv project"
++msgstr "Открыть предыдущий сохранённый проект Gerbv"
++
++#: src/interface.c:870
++msgid "Reload all layers in project"
++msgstr "Перезагрузить все слои в проекте"
++
++#: src/interface.c:966
++msgid "Rendering: "
++msgstr "Отображение: "
++
++#: src/interface.c:972
++msgid "Fast"
++msgstr "Быстрое"
++
++#: src/interface.c:973
++msgid "Fast, with XOR"
++msgstr "Быстрое искл. ИЛИ"
++
++#: src/interface.c:974
++msgid "Normal"
++msgstr "Обычное"
++
++#: src/interface.c:975
++msgid "High quality"
++msgstr "Качественное"
++
++#: src/interface.c:1018
++msgid "Layers"
++msgstr "Слои"
++
++#: src/interface.c:1041
++msgid "Messages"
++msgstr "Журнал"
++
++#: src/interface.c:1093
++msgid "mil"
++msgstr "мил"
++
++#: src/interface.c:1095
++msgid "in"
++msgstr "дюймы"
++
++#: src/interface.c:1646 src/interface.c:1739
++msgid "Do not show this dialog again."
++msgstr "Больше не показывать этот диалог."
++
++#: src/interface.c:1779
++msgid "Modify layer orientation"
++msgstr "Изменить слой"
++
++#: src/interface.c:1794
++msgid "<span weight=\"bold\">Translation</span>"
++msgstr "<span weight=\"bold\">Перемещение</span>"
++
++#: src/interface.c:1803
++msgid "X (mils):"
++msgstr "X, мил:"
++
++#: src/interface.c:1804
++msgid "Y (mils):"
++msgstr "Y, мил:"
++
++#: src/interface.c:1809
++msgid "X (mms):"
++msgstr "X, мм:"
++
++#: src/interface.c:1810
++msgid "Y (mms):"
++msgstr "Y, мм:"
++
++#: src/interface.c:1815
++msgid "X (inches):"
++msgstr "X, дюймы:"
++
++#: src/interface.c:1816
++msgid "Y (inches):"
++msgstr "Y, дюймы:"
++
++#: src/interface.c:1834
++msgid "<span weight=\"bold\">Scale</span>"
++msgstr "<span weight=\"bold\">Масштаб</span>"
++
++#: src/interface.c:1838
++msgid "X direction:"
++msgstr "X-направление:"
++
++#: src/interface.c:1841
++msgid "Y direction:"
++msgstr "Y-направление:"
++
++#: src/interface.c:1854
++msgid "<span weight=\"bold\">Rotation</span>"
++msgstr "<span weight=\"bold\">Поворот</span>"
++
++#: src/interface.c:1858
++msgid "Rotation (degrees):   "
++msgstr "Поворот: "
++
++#: src/interface.c:1863
++msgid "90 deg CCW"
++msgstr "90°"
++
++#: src/interface.c:1864
++msgid "180 deg CCW"
++msgstr "180°"
++
++#: src/interface.c:1865
++msgid "270 deg CCW"
++msgstr "270°"
++
++#: src/interface.c:1885
++msgid "<span weight=\"bold\">Mirroring</span>"
++msgstr "<span weight=\"bold\">Отражение</span>"
++
++#: src/interface.c:1889
++msgid "About X axis:"
++msgstr "Ось X:"
++
++#: src/interface.c:1896
++msgid "About Y axis:"
++msgstr "Ось Y:"
++
++#: src/main.c:178
++#, c-format
++msgid "Opening project = %s\n"
++msgstr "Открывается проект %s\n"
++
++#: src/main.c:217
++#, c-format
++msgid "could not read file: %s\n"
++msgstr "Невозможно прочитать файл «%s»\n"
++
++#: src/main.c:244 src/main.c:317
++msgid "malloc gerbvProject->project failed\n"
++msgstr "Ошибка выделения памяти для gerbvProject->project\n"
++
++#: src/main.c:297
++msgid "Failed to write project\n"
++msgstr "Ошибка при сохранении проекта\n"
++
++#: src/main.c:390
++#, c-format
++msgid "Not handled option %s\n"
++msgstr "Необработанный параметр %s\n"
++
++#: src/main.c:396
++msgid "Width"
++msgstr "Ширина"
++
++#: src/main.c:400
++#, c-format
++msgid "Split X and Y parameters with an x\n"
++msgstr "Параметры X и Y должны быть разделены символом x\n"
++
++#: src/main.c:407
++msgid "Height"
++msgstr "Высота"
++
++#: src/main.c:436
++#, c-format
++msgid "You must specify the border in the format <alpha>.\n"
++msgstr "Для границы должно быть указано значение.\n"
++
++#: src/main.c:440
++#, c-format
++msgid "Specified border is not recognized.\n"
++msgstr "Указанное значение границы не распознано.\n"
++
++#: src/main.c:445
++#, c-format
++msgid "Specified border is smaller than zero!\n"
++msgstr "Указанное значение границы меньше нуля!\n"
++
++#: src/main.c:452
++#, c-format
++msgid ""
++"You must give an resolution in the format <DPI_XxDPI_Y> or <DPI_X_and_Y>.\n"
++msgstr ""
++"Разрешение должно быть указано в формате <DPI_XxDPI_Y> или <DPI_по_X_и_Y>.\n"
++
++#: src/main.c:456
++#, c-format
++msgid "Specified resolution is not recognized.\n"
++msgstr "Указанное значение разрешения не распознано.\n"
++
++#: src/main.c:466
++#, c-format
++msgid "Specified resolution should be greater than 0.\n"
++msgstr "Указанное значение разрешения должно быть больше нуля.\n"
++
++#: src/main.c:473
++#, c-format
++msgid "You must give an origin in the format <lower_left_X x lower_left_Y>.\n"
++msgstr ""
++"Начало координат должно быть указано в формате <X x Y> координаты левой "
++"нижней точки.\n"
++
++#: src/main.c:477
++#, c-format
++msgid "Specified origin is not recognized.\n"
++msgstr "Указанное значение начала координат не распознано.\n"
++
++#: src/main.c:484
++#, c-format
++msgid "gerbv version %s\n"
++msgstr "Gerbv версии %s\n"
++
++#: src/main.c:485
++#, c-format
++msgid ""
++"Copyright (C) 2001 -- 2008 by Stefan Petersen\n"
++"and the respective original authors listed in the source files.\n"
++msgstr ""
++"Copyright © 2001—2008 Stefan Petersen\n"
++"и соответствующие оригинальные авторы указанные в файлах исходных кодов.\n"
++
++#: src/main.c:493
++#, c-format
++msgid "You must give an background color in the hex-format <#RRGGBB>.\n"
++msgstr "Цвет фона должен быть указан в шестнадцатеричном формате <#RRGGBB>.\n"
++
++#: src/main.c:497 src/main.c:517
++#, c-format
++msgid "Specified color format is not recognized.\n"
++msgstr "Указанный формат значения цвета не распознан.\n"
++
++#: src/main.c:504
++#, c-format
++msgid "Specified color values should be between 00 and FF.\n"
++msgstr "Указанные значение цветов должны быть от 00 до FF.\n"
++
++#: src/main.c:513
++#, c-format
++msgid ""
++"You must give an foreground color in the hex-format <#RRGGBB> or "
++"<#RRGGBBAA>.\n"
++msgstr ""
++"Цвет элементов должен быть указан в шестнадцатеричном формате <#RRGGBB> или "
++"<#RRGGBBAA>.\n"
++
++#: src/main.c:531
++#, c-format
++msgid "Specified color values should be between 0x00 (0) and 0xFF (255).\n"
++msgstr "Указанное значение цвета должно быть от 0x00 (0) до 0xFF (255).\n"
++
++#: src/main.c:545
++#, c-format
++msgid "You must give the initial rotation angle\n"
++msgstr "Должен быть указан угол начального поворота\n"
++
++#: src/main.c:551
++msgid "Rotate"
++msgstr "Поворот"
++
++#: src/main.c:555
++#, c-format
++msgid "Failed parsing rotate value\n"
++msgstr "Невозможно разобрать значение поворота\n"
++
++#: src/main.c:561
++#, c-format
++msgid "You must give the axis to mirror about\n"
++msgstr "Должна быть указана ось для отражения\n"
++
++#: src/main.c:571
++#, c-format
++msgid "Failed parsing mirror axis\n"
++msgstr "Невозможно разобрать ось для отражения\n"
++
++#: src/main.c:577
++#, c-format
++msgid "You must give a filename to send log to\n"
++msgstr "Должно быть указано имя файла для журнала\n"
++
++#: src/main.c:585
++#, c-format
++msgid "You must give a filename to export to.\n"
++msgstr "Должно быть указано имя файла для экспорта.\n"
++
++#: src/main.c:592
++#, c-format
++msgid "You must give a project filename\n"
++msgstr "Должно быть указано имя файла проекта.\n"
++
++#: src/main.c:599
++#, c-format
++msgid "You must give a filename to read the tools from.\n"
++msgstr "Должно быть указано имя файла инструментов.\n"
++
++#: src/main.c:603
++#, c-format
++msgid "*** ERROR processing tools file \"%s\".\n"
++msgstr "*** ОШИБКА обработки файла инструментов «%s».\n"
++
++#: src/main.c:604
++#, c-format
++msgid ""
++"Make sure all lines of the file are formatted like this:\n"
++"T01 0.024\n"
++"T02 0.032\n"
++"T03 0.040\n"
++"...\n"
++"*** EXITING to prevent erroneous display.\n"
++msgstr ""
++"Удостоверьтесь, что все строки этого файла имеют похожий формат:\n"
++"T01 0.024\n"
++"T02 0.032\n"
++"T03 0.040\n"
++"...\n"
++"*** ВЫХОД для предотвращения ошибочного отображения.\n"
++
++#: src/main.c:612
++#, c-format
++msgid "You must give a translation in the format <X,Y>.\n"
++msgstr "Сдвиг должен быть задан в формате <X,Y>.\n"
++
++#: src/main.c:616
++#, c-format
++msgid "The translation format is not recognized.\n"
++msgstr "Указанный формат сдвига не распознан.\n"
++
++#: src/main.c:633
++#, c-format
++msgid "You must give a window size in the format <width x height>.\n"
++msgstr "Размер окна должен быть указан в формате <ширина x высота>.\n"
++
++#: src/main.c:637
++#, c-format
++msgid "Specified window size is not recognized.\n"
++msgstr "Указанный формат значения размера окна не распознан.\n"
++
++#: src/main.c:643
++#, c-format
++msgid "Specified window size is out of bounds.\n"
++msgstr "Указанный размер окна вне допустимых границ.\n"
++
++#: src/main.c:650
++#, c-format
++msgid "You must supply an export type.\n"
++msgstr "Должен быть указан тип формата для экспорта.\n"
++
++#: src/main.c:676
++#, c-format
++msgid "Unrecognized export type.\n"
++msgstr "Тип экспорта не распознан.\n"
++
++#: src/main.c:686
++#, c-format
++msgid ""
++"Usage: gerbv [OPTIONS...] [FILE...]\n"
++"\n"
++"Available options:\n"
++"  -B, --border=<b>                Border around the image in percent of the\n"
++"                                  width/height. Defaults to 5%%.\n"
++"  -D, --dpi=<XxY>or<R>            Resolution (Dots per inch) for the output\n"
++"                                  bitmap. With the format <XxY>, different\n"
++"                                  resolutions for X- and Y-direction are "
++"used.\n"
++"                                  With the format <R>, both are the same.\n"
++"  -O, --origin=<XxY>              Use the specified coordinates (in "
++"inches).\n"
++"                                  for the lower left corner.\n"
++"  -V, --version                   Print version of gerbv.\n"
++"  -a, --antialias                 Use antialiasing for generated bitmap "
++"output.\n"
++"  -b, --background=<hex>          Use background color <hex> (like "
++"#RRGGBB).\n"
++"  -f, --foreground=<hex>          Use foreground color <hex> (like #RRGGBB "
++"or\n"
++"                                  #RRGGBBAA for setting the alpha).\n"
++"                                  Use multiple -f flags to set the color "
++"for\n"
++"                                  multiple layers.\n"
++"  -r, --rotate=<degree>           Set initial orientation for all layers.\n"
++"  -m, --mirror=<axis>             Set initial mirroring axis (X or Y).\n"
++"  -h, --help                      Print this help message.\n"
++"  -l, --log=<logfile>             Send error messages to <logfile>.\n"
++"  -o, --output=<filename>         Export to <filename>.\n"
++"  -p, --project=<prjfile>         Load project file <prjfile>.\n"
++"  -W, --window_inch=<WxH>         Window size in inches <WxH> for the\n"
++"                                  exported image.\n"
++"  -w, --window=<WxH>              Window size in pixels <WxH> for the\n"
++"                                  exported image. Autoscales to fit\n"
++"                                  if no resolution is specified. If a\n"
++"                                  resolution is specified, it will clip.\n"
++"  -t, --tools=<toolfile>          Read Excellon tools from file <toolfile>.\n"
++"  -T, --translate=<X,Y>           Translate the image by <X,Y> (useful for\n"
++"                                  arranging panels). Use multiple -T flags\n"
++"                                  for multiple layers.\n"
++"  -x, --export=<png/pdf/ps/svg/   Export a rendered picture to a file with\n"
++"                rs274x/drill>     the specified format.\n"
++msgstr ""
++"Использование: gerbv [ПАРАМЕТРЫ...] [ФАЙЛ...]\n"
++"\n"
++"Допустимые параметры:\n"
++"  -B, --border=<b>           Граница вокруг изображения в процентах от "
++"ширины\n"
++"                             или высоты, по умолчанию 5%%.\n"
++"  -D, --dpi=<XxY>или<R>      Разрешение (в точках на дюйм) выводимого\n"
++"                             изображения. Различные разрешения по X- и\n"
++"                             Y-направлению задаются в формате <XxY>.\n"
++"                             Для задания одинакового разрешения "
++"используется\n"
++"                             формат <R>.\n"
++"  -O, --origin=<XxY>         Использовать указанные координаты (в дюймах) "
++"для\n"
++"                             начала координат (левый нижний угол).\n"
++"  -V, --version              Отобразить версию Gerbv.\n"
++"  -a, --antialias            Использовать сглаживание для выводимых "
++"изображений.\n"
++"  -b, --background=<hex>     Цвет фона в шестнадцатеричном виде в формате\n"
++"                             #RRGGBB.\n"
++"  -f, --foreground=<hex>     Цвет элементов в шестнадцатеричном виде в "
++"формате\n"
++"                             #RRGGBB. Используйте повторно для задания "
++"цвета\n"
++"                             каждого следующего слоя.\n"
++"  -r, --rotate=<градусы>     Задать начальный поворот для всех слоёв.\n"
++"  -m, --mirror=<оси>         Задать начальное отражение по осям X или Y.\n"
++"  -h, --help                 Отобразить эту справку.\n"
++"  -l, --log=<лог-файл>       Отправлять сообщения об ошибках в файл <лог-"
++"файл>.\n"
++"  -o, --output=<имя-файла>   Экспортировать в файл <имя-файла>.\n"
++"  -p, --project=<файл-проекта> Открыть проект из фала <файл-проекта>.\n"
++"  -W, --window_inch=<ШxВ>    Размер окна в дюймах <ШxВ> для экспортируемого\n"
++"                             изображения.\n"
++"  -w, --window=<ШxВ>         Размер окна в пикселях <ШxВ> для "
++"экспортируемого\n"
++"                             изображения. Если разрешение не указано, то\n"
++"                             выполняется масштабирование, иначе, "
++"изображение\n"
++"                             обрезается.\n"
++"  -t, --tools=<файл-инструментов> Использовать <файл-инструментов> для "
++"задания\n"
++"                             инструментов Excellon.\n"
++"  -T, --translate=<X,Y>      Переместить изображение на <X,Y> (для "
++"выравнивания\n"
++"                             слоёв панели друг с другом). Используйте "
++"повторно\n"
++"                             для каждого следующего слоя.\n"
++"  -x, --export=<png/pdf/ps/  Экспортировать изображение в файл указанного\n"
++"          svg/rs274x/drill>  формата.\n"
++
++#: src/main.c:722
++#, c-format
++msgid ""
++"Usage: gerbv [OPTIONS...] [FILE...]\n"
++"\n"
++"Available options:\n"
++"  -B<b>                   Border around the image in percent of the\n"
++"                          width/height. Defaults to 5%%.\n"
++"  -D<XxY>or<R>            Resolution (Dots per inch) for the output\n"
++"                          bitmap. With the format <XxY>, different\n"
++"                          resolutions for X- and Y-direction are used.\n"
++"                          With the format <R>, both are the same.\n"
++"  -O<XxY>                 Use the specified coordinates (in inches)\n"
++"                          for the lower left corner.\n"
++"  -V                      Print version of gerbv.\n"
++"  -a                      Use antialiasing for generated bitmap output.\n"
++"  -b<hexcolor>\t           Use background color <hexcolor> (like #RRGGBB).\n"
++"  -f<hexcolor>            Use foreground color <hexcolor> (like #RRGGBB or\n"
++"                          #RRGGBBAA for setting the alpha).\n"
++"                          Use multiple -f flags to set the color for\n"
++"                          multiple layers.\n"
++"  -r<degree>              Set initial orientation for all layers.\n"
++"  -m<axis>                Set initial mirroring axis (X or Y).\n"
++"  -h                      Print this help message.\n"
++"  -l<logfile>             Send error messages to <logfile>.\n"
++"  -o<filename>            Export to <filename>.\n"
++"  -p<prjfile>             Load project file <prjfile>.\n"
++"  -W<WxH>                 Window size in inches <WxH> for the\n"
++"                          exported image.\n"
++"  -w<WxH>                 Window size in pixels <WxH> for the\n"
++"                          exported image. Autoscales to fit\n"
++"                          if no resolution is specified. If a\n"
++"                          resolution is specified, it will clip.\n"
++"                          exported image.\n"
++"  -t<toolfile>            Read Excellon tools from file <toolfile>\n"
++"  -T<X,Y>                 Translate the image by <X,Y> (useful for\n"
++"                          arranging panels). Use multiple -T flags\n"
++"                          for multiple layers.\n"
++"  -x <png/pdf/ps/svg/     Export a rendered picture to a file with\n"
++"      rs274x/drill>       the specified format.\n"
++msgstr ""
++"Использование: gerbv [ПАРАМЕТРЫ...] [ФАЙЛ...]\n"
++"\n"
++"Допустимые параметры:\n"
++"  -B<b>                      Граница вокруг изображения в процентах от "
++"ширины\n"
++"                             или высоты, по умолчанию 5%%.\n"
++"  -D<XxY>или<R>              Разрешение (в точках на дюйм) выводимого\n"
++"                             изображения. Различные разрешения по X- и\n"
++"                             Y-направлению задаются в формате <XxY>.\n"
++"                             Для задания одинакового разрешения "
++"используется\n"
++"                             формат <R>.\n"
++"  -O<XxY>                    Использовать указанные координаты (в дюймах) "
++"для\n"
++"                             начала координат (левый нижний угол).\n"
++"  -V                         Отобразить версию Gerbv.\n"
++"  -a                         Использовать сглаживание для выводимых "
++"изображений.\n"
++"  -b<hex>                    Цвет фона в шестнадцатеричном виде в формате\n"
++"                             #RRGGBB.\n"
++"  -f<hex>                    Цвет элементов в шестнадцатеричном виде в "
++"формате\n"
++"                             #RRGGBB. Используйте повторно для задания "
++"цвета\n"
++"                             каждого следующего слоя.\n"
++"  -r<градусы>                Задать начальный поворот для всех слоёв.\n"
++"  -m<оси>                    Задать начальное отражение по осям X или Y.\n"
++"  -h                         Отобразить эту справку.\n"
++"  -l<лог-файл>               Отправлять сообщения об ошибках в файл <лог-"
++"файл>.\n"
++"  -o<имя-файла>              Экспортировать в файл <имя-файла>.\n"
++"  -p<файл-проекта>           Открыть проект из фала <файл-проекта>.\n"
++"  -W<ШxВ>                    Размер окна в дюймах <ШxВ> для экспортируемого\n"
++"                             изображения.\n"
++"  -w<ШxВ>                    Размер окна в пикселях <ШxВ> для "
++"экспортируемого\n"
++"                             изображения. Если разрешение не указано, то\n"
++"                             выполняется масштабирование, иначе, "
++"изображение\n"
++"                             обрезается.\n"
++"  -t<файл-инструментов>      Использовать <файл-инструментов> для задания\n"
++"                             инструментов Excellon.\n"
++"  -T<X,Y>                    Переместить изображение на <X,Y> (для "
++"выравнивания\n"
++"                             слоёв панели друг с другом). Используйте "
++"повторно\n"
++"                             для каждого следующего слоя.\n"
++"  -x<png/pdf/ps/             Экспортировать изображение в файл указанного\n"
++"     svg/rs274x/drill>       формата.\n"
++
++#: src/main.c:763
++#, c-format
++msgid "Not handled option [%d=%c]\n"
++msgstr "Необработанный параметр [%d=%c]\n"
++
++#: src/main.c:774
++#, c-format
++msgid "Loading project %s...\n"
++msgstr "Открывается проект %s...\n"
++
++#: src/main.c:950 src/main.c:968
++#, c-format
++msgid "A valid file was not loaded.\n"
++msgstr "Не был загружен допустимый файл.\n"
++
++#: src/pick-and-place.c:449
++msgid "malloc buf failed while checking for pick-place file.\n"
++msgstr "Ошибка выделения памяти при проверке является ли файл расположением.\n"
++
++#: src/pick-and-place.c:594
++msgid "malloc pick_place_stats failed\n"
++msgstr "Ошибка выделения памяти для статистики расположения\n"
++
++#: src/project.c:256
++msgid "Color parameter not a vector\n"
++msgstr "Параметр цвета не является вектором\n"
++
++#: src/project.c:260
++msgid "Color vector of incorrect length\n"
++msgstr "Недопустимая длина вектора цвета\n"
++
++#: src/project.c:270
++msgid "Illegal color in projectfile\n"
++msgstr "Недопустимый цвет в файле проекта\n"
++
++#: src/project.c:495
++msgid "define-layer!: Too few arguments\n"
++msgstr "define-layer(): слишком мало аргументов\n"
++
++#: src/project.c:503
++msgid "define-layer!: Layer number missing/incorrect\n"
++msgstr "define-layer(): номер слоя пропущен или недопустим\n"
++
++#: src/project.c:528
++msgid "define-layer!:non-symbol found, ignoring\n"
++msgstr "define-layer(): пропуск не символа\n"
++
++#: src/project.c:552
++msgid "Argument to inverted must be #t or #f\n"
++msgstr "Аргумент для инвертирования должен быть #t или #f\n"
++
++#: src/project.c:560
++msgid "Argument to visible must be #t or #f\n"
++msgstr "Аргумент для видимости должен быть #t или #f\n"
++
++#: src/project.c:578
++#, c-format
++msgid "%s():  realloc failed\n"
++msgstr "%s(): ошибка перевыделения памяти\n"
++
++#: src/project.c:641
++#, c-format
++msgid "%s():  WARNING:  HID_Mixed is not yet supported\n"
++msgstr "%s(): предупреждение: HID_Mixed ещё не поддерживается\n"
++
++#: src/project.c:650
++#, c-format
++msgid "%s():  Unknown attribute type: \"%s\"\n"
++msgstr "%s(): неизвестный тип атрибута «%s»\n"
++
++#: src/project.c:678
++msgid "set-render-type!: Too few arguments\n"
++msgstr "set-render-type(): слишком мало аргументов\n"
++
++#: src/project.c:702
++msgid "gerbv-file-version!: Too few arguments\n"
++msgstr "gerbv-file-version(): слишком мало аргументов\n"
++
++#: src/project.c:714
++#, c-format
++msgid ""
++"The project file you are attempting to load has specified that it\n"
++"uses project file version \"%s\" but this string is not\n"
++"a valid version.  Gerbv will attempt to load the file using\n"
++"version \"%s\".  You may experience unexpected results.\n"
++msgstr ""
++"В загружаемом файле проекта указана недействительная версия «%s».\n"
++"Gerbv попытается загрузить этот файл как версии «%s». Могут быть\n"
++"получены неожиданные результаты.\n"
++
++#: src/project.c:723
++#, c-format
++msgid "%s():  Read a project file version of %s (%d)\n"
++msgstr "%s(): чтение файла проекта версии %s (%d)\n"
++
++#: src/project.c:724
++#, c-format
++msgid "      Translated back to \"%s\"\n"
++msgstr "      Перевод обратно к «%s»\n"
++
++#: src/project.c:732
++#, c-format
++msgid ""
++"The project file you are attempting to load is version \"%s\"\n"
++"but this copy of gerbv is only capable of loading project files\n"
++"using version \"%s\" or older.  You may experience unexpected results."
++msgstr ""
++"Версия загружаемого файла проекта «%s», но эта версия Gerbv способна\n"
++"загружать файлы проектов версий «%s» или старше. Могут быть получены\n"
++"неожиданные результаты."
++
++#: src/project.c:751
++#, c-format
++msgid ""
++"The project file you are attempting to load is version \"%s\"\n"
++"which is an unknown version.\n"
++"You may experience unexpected results."
++msgstr ""
++"Версия «%s» загружаемого файла проекта неизвестна.\n"
++"Могут быть получены неожиданные результаты."
++
++#: src/project.c:824 src/project.c:829
++#, c-format
++msgid "Failed to read %s\n"
++msgstr "Невозможно прочитать «%s»\n"
++
++#: src/project.c:837
++msgid "Couldn't init scheme\n"
++msgstr "Невозможно инициализировать scheme\n"
++
++#: src/project.c:845
++#, c-format
++msgid "Problem loading init.scm (%s)\n"
++msgstr "Проблема при загрузке init.scm: %s\n"
++
++#: src/project.c:852
++#, c-format
++msgid "Couldn't open %s (%s)\n"
++msgstr "Невозможно открыть «%s»: %s\n"
++
++#: src/project.c:872
++#, c-format
++msgid "Couldn't open project file %s (%s)\n"
++msgstr "Невозможно открыть файл проекта «%s»: %s\n"
++
++#: src/project.c:916
++#, c-format
++msgid "Couldn't save project %s\n"
++msgstr "Невозможно сохранить проект %s\n"
++
++#: src/project.c:986
++#, c-format
++msgid "%s():  WARNING:  HID_Mixed is not yet supported.\n"
++msgstr "%s(): предупреждение: HID_Mixed ещё не поддерживается.\n"
++
++#: src/project.c:996
++#, c-format
++msgid "%s: unknown type of HID attribute (%d)\n"
++msgstr "%s: неизвестный тип HID-атрибута (%d)\n"
++
++#: src/render.c:159
++#, c-format
++msgid "Illegal zoom direction %d\n"
++msgstr "Недопустимый тип масштабирования %d\n"
++
++#: src/tooltable.c:57
++#, c-format
++msgid "*** WARNING: Strange tool \"%s\" ignored.\n"
++msgstr "*** Предупреждение: проигнорирован неизвестный инструмент «%s».\n"
++
++#: src/tooltable.c:61
++#, c-format
++msgid "*** WARNING: No tool number in \"%s\".\n"
++msgstr "*** Предупреждение: отсутствуют номера инструментов в «%s».\n"
++
++#: src/tooltable.c:71
++#, c-format
++msgid "*** WARNING: Can't parse tool number in \"%s\".\n"
++msgstr "*** Предупреждение: невозможно разобрать номера инструментов в «%s».\n"
++
++#: src/tooltable.c:88
++#, c-format
++msgid "*** WARNING: Tool T%02d diameter is impossible.\n"
++msgstr "*** Предупреждение: невозможен инструмент диаметром T%02d.\n"
++
++#: src/tooltable.c:92
++#, c-format
++msgid "*** WARNING: Tool T%02d diameter is very small - are you sure?\n"
++msgstr "*** Предупреждение: слишком малый диаметр T%02d инструмента.\n"
++
++#: src/tooltable.c:97
++#, c-format
++msgid "*** ERROR: Tool T%02d is already defined.\n"
++msgstr "*** ОШИБКА: инструмент T%02d уже определён.\n"
++
++#: src/tooltable.c:98
++#, c-format
++msgid "*** Exiting because this is a HOLD error at any board house.\n"
++msgstr "*** Выход, так как любой изготовитель плат считает это ошибкой.\n"
++
++#: src/tooltable.c:121
++#, c-format
++msgid "*** ERROR: Failed to open file \"%s\" to read.\n"
++msgstr "*** ОШИБКА: невозможно открыть для чтения файл «%s».\n"
+diff --git a/configure.ac b/configure.ac
+index ba65be5..346c9f4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -40,6 +40,28 @@ AM_GNU_GETTEXT
+ AM_GNU_GETTEXT_VERSION([0.16])
+ #AX_DESKTOP_I18N
+ 
++dnl man-page internationalization
++AC_PATH_PROG([po4a_gettextize],[po4a-gettextize])
++AC_PATH_PROG([po4a_translate],[po4a-translate])
++if test -z "$po4a_gettextize" -o -z "$po4a_translate" ; then
++	AC_MSG_WARN([po4a was not found. If you want to change and compile \
++internationalized documentation, please install po4a])
++else
++	have_po4a=yes
++fi
++
++dnl po4a depend on nsgmls
++AC_PATH_PROG([nsgmls],[nsgmls])
++if test -z "$nsgmls" ; then
++	AC_MSG_WARN([nsgmls was not found. If you want to change and compile \
++internationalized documentation, please install sp])
++else
++	have_nsgmls=yes
++fi
++
++AM_CONDITIONAL(HAVE_PO4A,
++		test "x$have_po4a" = "xyes" -a "x$have_nsgmls" = "xyes")
++
+ ############################################################
+ #
+ # Checks for cygwin/mingw32
+diff --git a/man/Makefile.am b/man/Makefile.am
+index 4870e71..0be0ca4 100644
+--- a/man/Makefile.am
++++ b/man/Makefile.am
+@@ -19,8 +19,19 @@
+ ##  along with this program; if not, write to the Free Software
+ ##  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ 
++if HAVE_PO4A
+ man_MANS = gerbv.1 gerbv.ru.1
+-PO_FILES= gerbv.ru.1.in.po
++else
++man_MANS = gerbv.1
++
++all:
++	@ echo
++	@ echo "WARNING: missing po4a or sp (nsgmls). Rerun configure and" \
++		"check for 'checking for po4a-*' and 'checking for nsgmls'"
++	@ echo
++endif
++
++PO_FILES = gerbv.ru.1.in.po
+ 
+ MOSTLYCLEANFILES = *~
+ CLEANFILES = *~  *.pot $(man_MANS)
+@@ -35,15 +46,15 @@ SUFFIXES = .1 .1.in .in .in.po
+ 
+ # .in << .in.po
+ .in.po.in:
+-	po4a-translate -k 70 -M UTF-8 -f man -m gerbv.1.in -p $< -l $@
++	$(po4a_translate) -k 70 -M UTF-8 -f man -m gerbv.1.in -p $< -l $@
+ 
+ $(PO_FILES): gerbv.1.in.pot
+-	msgmerge --width=76 $@ $< -o $@.new
++	$(MSGMERGE) --width=76 $@ $< -o $@.new
+ 	mv $@.new $@
+ 
+ gerbv.1.in.pot: gerbv.1.in
+-	po4a-gettextize -M UTF-8 -f man -m $< -p $@
++	$(po4a_gettextize) -M UTF-8 -f man -m $< -p $@
+ 
+ update-po:
+-	@touch gerbv.1.in.pot
+-	make $(PO_FILES)
++	@ touch -c gerbv.1.in.pot
++	$(MAKE) $(PO_FILES)
+
+diff --git a/man/gerbv.ru.1.in.po b/man/gerbv.ru.1.in.po
+new file mode 100644
+index 0000000..0e0ed7e
+--- /dev/null
++++ b/man/gerbv.ru.1.in.po
+@@ -0,0 +1,853 @@
++# Translation of man 1 gerbv to Russian
++#
++# This file is distributed under the same license as the gerbv package.
++#
++# Sergey Alyoshin <alyoshin.s@gmail.com>, 2012, 2013
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: gerbv man ru\n"
++"POT-Creation-Date: 2013-08-03 14:08+0400\n"
++"PO-Revision-Date: 2013-08-03 14:09+0400\n"
++"Last-Translator: Sergey Alyoshin <alyoshin.s@gmail.com>\n"
++"Language-Team: LANGUAGE <LL@li.org>\n"
++"Language: \n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=UTF-8\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++#. type: TH
++#: gerbv.1.in:1
++#, no-wrap
++msgid "gerbv"
++msgstr "gerbv"
++
++#. type: TH
++#: gerbv.1.in:1
++#, no-wrap
++msgid "Jule 13, 2013"
++msgstr "13 июля 2013"
++
++#. type: TH
++#: gerbv.1.in:1
++#, no-wrap
++msgid "Version"
++msgstr "Версия"
++
++#. type: TH
++#: gerbv.1.in:1
++#, no-wrap
++msgid "@version@"
++msgstr "@version@"
++
++#. type: SH
++#: gerbv.1.in:2
++#, no-wrap
++msgid "NAME"
++msgstr "НАЗВАНИЕ"
++
++#. type: Plain text
++#: gerbv.1.in:4
++msgid "gerbv - Gerber Viewer"
++msgstr "gerbv — просмотр Gerber-файлов"
++
++#. type: SH
++#: gerbv.1.in:4
++#, no-wrap
++msgid "SYNOPSIS"
++msgstr "ОБЗОР"
++
++#. type: Plain text
++#: gerbv.1.in:6
++msgid "B<gerbv [OPTIONS] [gerberfile[s]]>"
++msgstr "B<gerbv [ПАРАМЕТРЫ] [gerber-файл[ы]]>"
++
++#. type: SH
++#: gerbv.1.in:6
++#, no-wrap
++msgid "DESCRIPTION"
++msgstr "ОПИСАНИЕ"
++
++#. type: Plain text
++#: gerbv.1.in:13
++msgid ""
++"I<gerbv> is a viewer for RS274-X, commonly known as Gerber, files.  RS274-"
++"X files are generated from different PCB CAD programs and are used in the "
++"printed circuit board manufacturing process.  I<gerbv> also supports "
++"Excellon/NC drill files as well as XY (centroid)  files produced by the "
++"program PCB (http://pcb.geda-project.org/)."
++msgstr ""
++"I<gerbv> — это программа для просмотра файлов RS274-X, более известных "
++"как Gerber. Файлы RS274-X создаются различными программами "
++"автоматизированного проектирования печатных плат и используются при их "
++"изготовлении на производстве. I<gerbv> также поддерживает файлы сверловки "
++"Excellon/NC drill и файлы расположения (координаты центров элементов), "
++"создаваемые программой PCB (http://pcb.geda-project.org/)."
++
++#. type: SH
++#: gerbv.1.in:14
++#, no-wrap
++msgid "OPTIONS"
++msgstr "ПАРАМЕТРЫ"
++
++#. type: Plain text
++#: gerbv.1.in:19
++msgid ""
++"B<Warning!> On some platforms, which hasn't long option available, only "
++"short options are available."
++msgstr ""
++"B<Внимание!> На некоторых платформах, не имеющих поддержку длинных "
++"параметров, доступны только короткие параметры."
++
++#. type: SS
++#: gerbv.1.in:20
++#, no-wrap
++msgid "gerbv General options:"
++msgstr "Общие параметры gerbv:"
++
++#. type: Plain text
++#: gerbv.1.in:23
++msgid "B<-V|--version> Print the version number of gerbv and exit."
++msgstr "B<-V|--version> Вывести версию gerbv и выйти."
++
++#. type: TP
++#: gerbv.1.in:23
++#, no-wrap
++msgid "B<-h|--help>"
++msgstr "B<-h|--help>"
++
++#. type: Plain text
++#: gerbv.1.in:26
++msgid "Print a brief usage guide and exit."
++msgstr "Вывести краткое руководство и выйти."
++
++#. type: TP
++#: gerbv.1.in:26
++#, no-wrap
++msgid "B<-bE<lt>hexE<gt>|--background=E<lt>hexE<gt>>"
++msgstr "B<-bE<lt>hexE<gt>|--background=E<lt>hexE<gt>>"
++
++#. type: Plain text
++#: gerbv.1.in:30
++msgid ""
++"Use background color E<lt>hexE<gt>. E<lt>hexE<gt> is specified as an html-"
++"color code, e.g. #FF0000 for Red."
++msgstr ""
++"Задать цвет фона E<lt>hexE<gt>. Код цвета E<lt>hexE<gt> должен быть "
++"указан как в HTML, например, #FF0000 для красного."
++
++#. type: TP
++#: gerbv.1.in:30
++#, no-wrap
++msgid "B<-fE<lt>hexE<gt>|--foreground=E<lt>hexE<gt>>"
++msgstr "B<-fE<lt>hexE<gt>|--foreground=E<lt>hexE<gt>>"
++
++#. type: Plain text
++#: gerbv.1.in:36
++msgid ""
++"Use foreground color E<lt>hexE<gt>. E<lt>hexE<gt> is specified as an html-"
++"color code, e.g. #00FF00 for Green. If a user also wants to set the alpha "
++"(rendering with Cairo) it can be specified as an #RRGGBBAA code. Use "
++"multiple -f flags to set the color for multiple layers."
++msgstr ""
++"Задать цвет элементов E<lt>hexE<gt>. Код цвета E<lt>hexE<gt> должен быть "
++"указан как в HTML, например, #00FF00 для зелёного. Прозрачность (при "
++"отображении средствами Cairo) указывается в виде кода #RRGGBBAA (A — "
++"alpha). Для задания цвета нескольких слоёв используйте флаг -f несколько "
++"раз."
++
++#. type: TP
++#: gerbv.1.in:36
++#, no-wrap
++msgid "B<-l\\ E<lt>filenameE<gt>|--log=E<lt>filenameE<gt>>"
++msgstr "B<-l\\ E<lt>имя-файлаE<gt>|--log=E<lt>имя-файлаE<gt>>"
++
++#. type: Plain text
++#: gerbv.1.in:39
++msgid ""
++"All error messages etc are stored in a file with filename "
++"I<E<lt>filenameE<gt>>."
++msgstr "Записывать все сообщения об ошибках в файл I<E<lt>имя-файлаE<gt>>."
++
++#. type: TP
++#: gerbv.1.in:39
++#, no-wrap
++msgid "B<-t\\ E<lt>filenameE<gt>|--tools=E<lt>filenameE<gt>>"
++msgstr "B<-t\\ E<lt>имя-файлаE<gt>|--tools=E<lt>имя-файлаE<gt>>"
++
++#. type: Plain text
++#: gerbv.1.in:42
++msgid "Read Excellon tools from the file I<E<lt>filenameE<gt>>."
++msgstr "Прочитать инструменты Excellon из файла I<E<lt>имя-файлаE<gt>>."
++
++#. type: TP
++#: gerbv.1.in:42
++#, no-wrap
++msgid "B<-p\\ E<lt>project\\ filenameE<gt>|--project=E<lt>project\\ filenameE<gt>>"
++msgstr "B<-p\\ E<lt>имя-файла\\ проектаE<gt>|--project=E<lt>имя-файла\\ проектаE<gt>>"
++
++#. type: Plain text
++#: gerbv.1.in:46
++msgid ""
++"Load a stored project. Please note that the project file must be stored "
++"in the same directory as the gerber files."
++msgstr ""
++"Загрузить проект. Заметьте, что файл проекта должен находиться в том же "
++"каталоге, что и файлы Gerber."
++
++#. type: SS
++#: gerbv.1.in:47
++#, no-wrap
++msgid "gerbv Export-specific options:"
++msgstr "Параметры экспорта gerbv:"
++
++#. type: Plain text
++#: gerbv.1.in:49
++msgid "The following commands can be used in combination with the -x flag:"
++msgstr "Вместе с флагом -x могут быть использованы следующие команды:"
++
++#. type: TP
++#: gerbv.1.in:49
++#, no-wrap
++msgid "B<-BE<lt>bE<gt>|--border=E<lt>bE<gt>>"
++msgstr "B<-BE<lt>bE<gt>|--border=E<lt>bE<gt>>"
++
++#. type: Plain text
++#: gerbv.1.in:53
++msgid ""
++"Set the border around the image E<lt>bE<gt> percent of the width and "
++"height.  Default E<lt>bE<gt> is 5%."
++msgstr ""
++"Установить рамку вокруг изображения размером E<lt>bE<gt> процентов от "
++"ширины и высоты. По умолчанию, E<lt>bE<gt> равно 5%."
++
++#. type: TP
++#: gerbv.1.in:53
++#, no-wrap
++msgid "B<-DE<lt>XxYE<gt>orE<lt>RE<gt>|--dpi=E<lt>XxYE<gt>orE<lt>RE<gt>>"
++msgstr "B<-DE<lt>XxYE<gt>илиE<lt>RE<gt>|--dpi=E<lt>XxYE<gt>илиE<lt>RE<gt>>"
++
++#. type: Plain text
++#: gerbv.1.in:59
++msgid ""
++"Resolution (Dots per inch) for the output bitmap. Use E<lt>XxYE<gt> for "
++"different resolutions for the width and height (only when compiled with "
++"Cairo as render engine). Use E<lt>RE<gt> to have the same resolution in "
++"both directions.  Defaults to 72 DPI in both directions."
++msgstr ""
++"Разрешение (в точках на дюйм, DPI) выводимого bitmap-изображения. Для "
++"различного разрешения по ширине и высоте используйте E<lt>XxYE<gt> "
++"(только при сборке с Cairo). Используйте E<lt>RE<gt> для одинакового "
++"разрешения по двум измерениям. По умолчанию, E<lt>RE<gt> равно 72 DPI."
++
++#. type: TP
++#: gerbv.1.in:59
++#, no-wrap
++msgid "B<-TE<lt>X,YE<gt>|--translate=E<lt>X,YE<gt>>"
++msgstr "B<-TE<lt>X,YE<gt>|--translate=E<lt>X,YE<gt>>"
++
++#. type: Plain text
++#: gerbv.1.in:63
++msgid ""
++"Translate the image by the distance E<lt>X,YE<gt>. Use multiple -T flags "
++"to translate multiple files."
++msgstr ""
++"Переместить изображение на расстояние E<lt>X,YE<gt>. Для задания "
++"перемещения нескольких слоёв используйте флаг -T несколько раз."
++
++#. type: TP
++#: gerbv.1.in:63
++#, no-wrap
++msgid "B<-OE<lt>XxYE<gt>|--origin=E<lt>XxYE<gt>>"
++msgstr "B<-OE<lt>XxYE<gt>|--origin=E<lt>XxYE<gt>>"
++
++#. type: Plain text
++#: gerbv.1.in:67
++msgid ""
++"Set the lower left corner of the exported image to coordinate "
++"E<lt>XxYE<gt>.  Coordinates are in inches."
++msgstr ""
++"Установить координаты E<lt>XxYE<gt> левого нижнего угла экспортируемого "
++"изображения. Значение в дюймах."
++
++#. type: TP
++#: gerbv.1.in:67
++#, no-wrap
++msgid "B<-a|--antialias>"
++msgstr "B<-a|--antialias>"
++
++#. type: Plain text
++#: gerbv.1.in:70
++msgid "Use antialiasing for the generated output-bitmap."
++msgstr "Использовать антиалиасинг для выходного bitmap-файла."
++
++#. type: TP
++#: gerbv.1.in:70
++#, no-wrap
++msgid "B<-o\\ E<lt>filenameE<gt>|--output=E<lt>filenameE<gt>>"
++msgstr "B<-o\\ E<lt>имя-файлаE<gt>|--output=E<lt>имя-файлаE<gt>>"
++
++#. type: Plain text
++#: gerbv.1.in:73
++msgid "Export to E<lt>filenameE<gt>."
++msgstr "Экспортировать в файл E<lt>имя-файлаE<gt>."
++
++#. type: TP
++#: gerbv.1.in:73
++#, no-wrap
++msgid "B<-WE<lt>WxHE<gt>|--window_inch=E<lt>WxHE<gt>>"
++msgstr "B<-WE<lt>ШxВE<gt>|--window_inch=E<lt>ШxВE<gt>>"
++
++#. type: Plain text
++#: gerbv.1.in:76
++msgid "Window size in inches E<lt>WxHE<gt> for the exported image."
++msgstr "Размер окна в дюймах E<lt>ШxВE<gt> для экспортируемого изображения."
++
++#. type: TP
++#: gerbv.1.in:76
++#, no-wrap
++msgid "B<-wE<lt>WxHE<gt>|--window=WxHE<gt>>"
++msgstr "B<-wE<lt>ШxВE<gt>|--window=E<lt>ШxВE<gt>>"
++
++#. type: Plain text
++#: gerbv.1.in:82
++msgid ""
++"Window size in pixels E<lt>WxHE<gt> for the exported image. Autoscales to "
++"fit if no resolution is specified (note that the default 72 DPI also "
++"changes in that case). If a resolution is specified, it will clip the "
++"image to this size."
++msgstr ""
++"Размер окна E<lt>ШxВE<gt> в пикселях экспортируемого изображения. Если "
++"разрешение не указано, то выполняется масштабирование (заметьте, что в "
++"этом случае разрешение по умолчанию 72 DPI также изменяется). Если "
++"разрешение указано, то изображение обрезается."
++
++#. type: TP
++#: gerbv.1.in:82
++#, no-wrap
++msgid "B<-xE<lt>png/pdf/ps/svg/rs274x/drillE<gt>|--export=E<lt>png/pdf/ps/svg/rs274x/drillE<gt>>"
++msgstr "B<-xE<lt>png/pdf/ps/svg/rs274x/drillE<gt>|--export=E<lt>png/pdf/ps/svg/rs274x/drillE<gt>>"
++
++#. type: Plain text
++#: gerbv.1.in:85
++msgid "Export to a file and set the format for the output file."
++msgstr "Экспортировать в файл и установить формат выходного файла."
++
++#. type: SS
++#: gerbv.1.in:86
++#, no-wrap
++msgid "GTK Options"
++msgstr "Параметры GTK"
++
++#. type: Plain text
++#: gerbv.1.in:89
++msgid "B<--gtk-module=>I<MODULE> Load an additional GTK module"
++msgstr "B<--gtk-module=>I<МОДУЛЬ> Загрузить дополнительный модуль GTK"
++
++#. type: TP
++#: gerbv.1.in:89
++#, no-wrap
++msgid "B<--g-fatal-warnings>"
++msgstr "B<--g-fatal-warnings>"
++
++#. type: Plain text
++#: gerbv.1.in:92
++msgid "Make all warnings fatal"
++msgstr "Сделать все предупреждения фатальными"
++
++#. type: TP
++#: gerbv.1.in:92
++#, no-wrap
++msgid "B<--gtk-debug=>I<FLAGS>"
++msgstr "B<--gtk-debug=>I<ФЛАГИ>"
++
++#. type: Plain text
++#: gerbv.1.in:95
++msgid "GTK debugging flags to set"
++msgstr "Установить флаги отладки GTK"
++
++#. type: TP
++#: gerbv.1.in:95
++#, no-wrap
++msgid "B<--gtk-no-debug=>I<FLAGS>"
++msgstr "B<--gtk-no-debug=>I<ФЛАГИ>"
++
++#. type: Plain text
++#: gerbv.1.in:98
++msgid "GTK debugging flags to unset"
++msgstr "Снять флаги отладки GTK"
++
++#. type: TP
++#: gerbv.1.in:98
++#, no-wrap
++msgid "B<--gdk-debug=>I<FLAGS>"
++msgstr "B<--gdk-debug=>I<ФЛАГИ>"
++
++#. type: Plain text
++#: gerbv.1.in:101
++msgid "GDK debugging flags to set"
++msgstr "Установить флаги отладки GDK"
++
++#. type: TP
++#: gerbv.1.in:101
++#, no-wrap
++msgid "B<--gdk-no-debug=>I<FLAGS>"
++msgstr "B<--gdk-no-debug=>I<ФЛАГИ>"
++
++#. type: Plain text
++#: gerbv.1.in:104
++msgid "GDK debugging flags to unset"
++msgstr "Снять флаги отладки GDK"
++
++#. type: TP
++#: gerbv.1.in:104
++#, no-wrap
++msgid "B<--display=>I<DISPLAY>"
++msgstr "B<--display=>I<ДИСПЛЕЙ>"
++
++#. type: Plain text
++#: gerbv.1.in:107
++msgid "X display to use"
++msgstr "Использовать X-дисплей"
++
++#. type: TP
++#: gerbv.1.in:107
++#, no-wrap
++msgid "B<--sync>"
++msgstr "B<--sync>"
++
++#. type: Plain text
++#: gerbv.1.in:110
++msgid "Make X call synchronous"
++msgstr "Сделать синхронными X-вызовы"
++
++#. type: TP
++#: gerbv.1.in:110
++#, no-wrap
++msgid "B<--no-xshm>"
++msgstr "B<--no-xshm>"
++
++#. type: Plain text
++#: gerbv.1.in:113
++msgid "Don't use X shared memory extension"
++msgstr "Не использовать расширение разделяемой памяти X"
++
++#. type: TP
++#: gerbv.1.in:113
++#, no-wrap
++msgid "B<--name=>I<NAME>"
++msgstr "B<--name=>I<НАЗВАНИЕ>"
++
++#. type: Plain text
++#: gerbv.1.in:116
++msgid "Program name as used by the window manager"
++msgstr "Название программы используемое оконным менеджером"
++
++#. type: TP
++#: gerbv.1.in:116
++#, no-wrap
++msgid "B<--class=>I<CLASS>"
++msgstr "B<--class=>I<КЛАСС>"
++
++#. type: Plain text
++#: gerbv.1.in:119
++msgid "Program class as used by the window manager"
++msgstr "Класс программы используемый оконным менеджером"
++
++#. type: SH
++#: gerbv.1.in:120
++#, no-wrap
++msgid "GENERAL"
++msgstr "ОБЩИЕ ЗАМЕЧАНИЯ"
++
++#. type: Plain text
++#: gerbv.1.in:123
++msgid ""
++"When you start gerbv you can give the files to be loaded on the command "
++"line, either as each file separated with a space or by using wildcards."
++msgstr ""
++"Вы можете указать в командной строке файлы для открытия в I<gerbv> при "
++"запуске: или все файлы разделённые пробелами, или применяя в названии "
++"файлов шаблоны."
++
++#. type: Plain text
++#: gerbv.1.in:129
++msgid ""
++"The user interface is graphical. Simply press and drag middle mouse "
++"button (scroll wheel) and the image will pan as you move the mouse. To "
++"manipulate a layer, right-click on one of the rightmost list items. That "
++"will bring up a pop-up menu where you can select what you want to do with "
++"that layer (reload file, change color, etc)."
++msgstr ""
++"Gerbv использует графический пользовательский интерфейс. Для прокрутки "
++"перемещайте мышь удерживая среднюю кнопку (колесо прокрутки) или "
++"используйте инструмент Прокрутка. Для изменения свойств слоя выберите "
++"название слоя и откройте контекстное меню правой кнопкой мыши, через "
++"которое можно изменить цвет слоя, перезагрузить слой и т.д."
++
++#. type: Plain text
++#: gerbv.1.in:132
++msgid ""
++"If you hold the mouse button over one the rightmost button a tooltips "
++"will show you the name of the file loaded on that layer."
++msgstr ""
++"При удержании курсора мыши над названием слоя появится всплывающая "
++"подсказка с именем файла, который соответствует этому слою."
++
++#. type: SH
++#: gerbv.1.in:134
++#, no-wrap
++msgid "ACTIVATION AND DEACTIVATION OF LAYERS"
++msgstr "ВКЛЮЧЕНИЕ И ВЫКЛЮЧЕНИЕ СЛОЁВ"
++
++#. type: Plain text
++#: gerbv.1.in:137
++msgid ""
++"You can load several files at one time. You can then turn displaying of "
++"the layers on and off by clicking on one of check boxes near the layer "
++"names."
++msgstr ""
++"Несколько файлов могут быть загружены одновременно. Отображение слоёв "
++"выключается и включается галочкой рядом с названием слоя."
++
++#. type: Plain text
++#: gerbv.1.in:141
++msgid ""
++"You can also control this from the keyboard. Press Ctrl, enter the number "
++"on the layer you want activate/deactivate on the numerical keypad and "
++"then release the Ctrl key."
++msgstr ""
++"Отображением слоёв можно управлять с клавиатуры. Удерживая Ctrl, нажмите "
++"номер слоя на клавиатуре и отпустите Ctrl."
++
++#. type: SH
++#: gerbv.1.in:142
++#, no-wrap
++msgid "ZOOMING"
++msgstr "МАСШТАБИРОВАНИЕ"
++
++#. type: Plain text
++#: gerbv.1.in:150
++msgid ""
++"Zooming can be handled by either menu choices, keypressing or mouse "
++"scroll wheel. If you press z you will zoom in and if you press Shift+z (i."
++"e. Z) you will zoom out. Scroll wheel works if you enabled that in your X "
++"server and mapped it to button 4 and 5. You can make the image fit by "
++"pressing f (there is also a menu alternative for this). If Pan, Zoom, or "
++"Measure Tool is selected you can press right mouse button for zoom in, "
++"and if you press Shift and right mouse button you will zoom out."
++msgstr ""
++"Масштабирование может быть выполнено через меню, клавиатуру или колесо "
++"мыши. Для увеличения нажмите клавишу z и Shift+z (т.е. Z) для уменьшения. "
++"Колесо прокрутки мыши также используется для масштабирования. Для "
++"масштаба наилучшего заполнения нажмите клавишу f или используйте меню. "
++"Если выбраны инструменты Прокрутка, Масштаб или Измерение, то для "
++"увеличения можно использовать правую кнопку мыши, а для уменьшения правую "
++"кнопку мыши с удерживаемой клавишей Shift."
++
++#. type: Plain text
++#: gerbv.1.in:158
++msgid ""
++"You can also do zooming by outline. Select Zoom Tool, press mouse button, "
++"draw, release. The dashed line shows how the zooming will be dependent on "
++"the resolution of the window. The non-dashed outline will show what you "
++"actually selected. If you change your mind when started to mark outline, "
++"you can always abort by pressing escape. By holding down the Shift key "
++"when you press the mouse button, you will select an area where the point "
++"you started at will be the center of your selection."
++msgstr ""
++"Для увеличения контуром выберите инструмент Масштаб, нажмите кнопку мыши "
++"и, удерживая её, укажите контур. Пунктирная линия отображает зависимость "
++"масштабирования от разрешения окна. Сплошная линия соответствует "
++"указанному контуру. Отменить указание контура можно клавишей Esc. Для "
++"указания контура относительно центра, удерживайте нажатой клавишу Shift."
++
++#. type: SH
++#: gerbv.1.in:159
++#, no-wrap
++msgid "MEASUREMENTS"
++msgstr "ИЗМЕРЕНИЕ"
++
++#. type: Plain text
++#: gerbv.1.in:164
++msgid ""
++"You can do measurement on the image displayed. Select Measure Tool, the "
++"cursor changes to a plus. By using left mouse button you can draw the "
++"lines that you want to measure. The result of the last measurement is "
++"also displayed on the statusbar. All measurements are in the drawing "
++"until you select other Tool."
++msgstr ""
++"Для измерения элементов изображения слоя выберите инструмент Измерение "
++"(курсор изменится на перекрестие), нажмите левую кнопку мыши для точки "
++"начала измерения и, удерживая её, укажите точку окончания измерения. "
++"Результат в выбранных единицах измерения отображается в строке статуса. "
++"Линия измерения отображается до тех пор, пока не выбран другой инструмент."
++
++#. type: Plain text
++#: gerbv.1.in:168
++msgid ""
++"The statusbar shows the current mouse position on the layer in the same "
++"coordinates as in the file. I.e. if you have (0,0) in the middle of the "
++"image in the gerber files, the statusbar will show (0,0) at the same "
++"place."
++msgstr ""
++"Текущие координаты указателя мыши (соответствующие координатам в файле) "
++"отображаются в строке статуса в выбранных единицах измерения. Т.е. если "
++"центр изображения Gerber-файла имеет координаты (0; 0), то в этом месте "
++"изображения слоя в строке статуса будут отображены координаты (0; 0)."
++
++#. type: SH
++#: gerbv.1.in:169
++#, no-wrap
++msgid "SUPERIMPOSING"
++msgstr "НАЛОЖЕНИЕ"
++
++#. type: Plain text
++#: gerbv.1.in:173
++msgid ""
++"When you load several Gerber files, you can display them \"on top of each "
++"other\", i.e. superimposing. The general way to display them are that "
++"upper layers cover the layers beneath, which is called copy (GTK+ terms)."
++msgstr ""
++"Если открыто несколько файлов, вы можете отображать слои \"один поверх "
++"другого\", т.е. наложением. По умолчанию верхний слой закрывает собой "
++"нижние слои."
++
++#. type: Plain text
++#: gerbv.1.in:178
++msgid ""
++"The other ways selectable are and, or, xor and invert. They map directly "
++"to corresponding functions in GTK. In GTK they are described as: \"For "
++"colored images, only GDK_COPY, GDK_XOR and GDK_INVERT are generally "
++"useful. For bitmaps, GDK_AND and GDK_OR are also useful.\""
++msgstr ""
++"Также можно выбрать отображение исключающим ИЛИ (XOR) или инвертированным "
++"из контекстного меню слоя."
++
++#. type: SH
++#: gerbv.1.in:179
++#, no-wrap
++msgid "PROJECTS"
++msgstr "ПРОЕКТЫ"
++
++#. type: Plain text
++#: gerbv.1.in:184
++msgid ""
++"gerbv can also handle projects. A project consist of bunch of loaded "
++"layers with their resp. color and the background color. The easiest way "
++"to create a project is to load all files you want into the layer you "
++"want, set all the colors etc and do a \"Save Project As...\"."
++msgstr ""
++"gerbv может работать с проектами. Файл проекта состоит из списка слоёв, "
++"их цвета и цвета фона. Для создания файла проекта, откройте желаемые "
++"файлы, организуйте порядок слоёв, задайте их цвет и выберите пункт меню "
++"\"Сохранить проект как...\""
++
++#. type: Plain text
++#: gerbv.1.in:187
++msgid ""
++"You load a project either from the menu bar or by using the commandline "
++"switches -p or --project."
++msgstr ""
++"Загрузить проект можно через меню или параметром командной строки -p или "
++"--project."
++
++#. type: Plain text
++#: gerbv.1.in:190
++msgid ""
++"Currently there is a limit in that the project file must be in the same "
++"directory as the gerber files to be loaded."
++msgstr ""
++"В настоящее время существует ограничение: файл проекта должен "
++"располагаться в том же каталоге, что и загружаемые gerber-файлы."
++
++#. type: SH
++#: gerbv.1.in:191
++#, no-wrap
++msgid "SCHEME"
++msgstr "SCHEME"
++
++#. type: Plain text
++#: gerbv.1.in:199
++msgid ""
++"The project files are simple Scheme programs that is interpreted by a "
++"built in Scheme interpreter. The Scheme interpreter is TinyScheme and "
++"needs a Scheme program called init.scm to initialize itself. The search "
++"path for init.scm is (in the following order)  @scmdir@, the directory "
++"with the executable gerbv, the directory gerbv was invoked from and "
++"finally according to the environment variable GERBV_SCHEMEINIT."
++msgstr ""
++"Файл проекта это сценарий Scheme, обрабатываемый встроенным Scheme-"
++"интерпретатором TinyScheme. Для инициализации TinyScheme необходим файл "
++"init.scm, поиск расположения которого выполняется в следующей "
++"последовательности: @scmdir@, каталог исполняемого файла gerbv, каталог "
++"запуска gerbv, значение переменной окружения GERBV_SCHEMEINIT."
++
++#. type: SH
++#: gerbv.1.in:200
++#, no-wrap
++msgid "TOOLS FILE"
++msgstr "ФАЙЛ ИНСТРУМЕНТОВ"
++
++#. type: Plain text
++#: gerbv.1.in:205
++msgid ""
++"Not every Excellon drill file is self-sufficient. Some CADs produce .drd "
++"files where tools are only referenced, but never defined (such as what "
++"diameter of the tool is.) Eagle CAD is one of such CADs, and there are "
++"more since many board houses require Tools files."
++msgstr ""
++"Не все файлы Excellon самодостаточны. Некоторые программы "
++"автоматизированного проектирования создают файлы \".drd\" содержащие "
++"только обозначение инструментов, а не их определение (т.е. не указывают "
++"их диаметр). Eagle — одна из таких программ, но есть и другие, поэтому "
++"многие производители печатных плат требуют файлы инструментов."
++
++#. type: Plain text
++#: gerbv.1.in:208
++msgid ""
++"A Tools file is a plain text file which you create in an editor. Each "
++"line of the file describes one tool (the name and the diameter, in "
++"inches):"
++msgstr ""
++"Файл инструментов — это обычный текстовый файл, который можно создать в "
++"текстовом редакторе. Каждая строка файла описывает один инструмент "
++"(название и диаметр в дюймах):"
++
++#. type: Plain text
++#: gerbv.1.in:213
++#, no-wrap
++msgid ""
++"\tT01 0.024\n"
++"\tT02 0.040\n"
++"\t...\n"
++msgstr ""
++"\tT01 0.024\n"
++"\tT02 0.040\n"
++"\t...\n"
++
++#. type: Plain text
++#: gerbv.1.in:219
++msgid ""
++"These are the same tools (T01 etc.) that are used in the Drill file.  A "
++"standard practice with Eagle is to create an empty Tools file, run the "
++"CAM processor, and the error report tells you which tools you \"forgot"
++"\".  Then you put these tools into the file and rerun the CAM processor."
++msgstr ""
++"Это те же инструменты (T01 и т.д.), которые используются в файле "
++"сверловки. Обычная практика в Eagle — создавать пустой файл инструментов, "
++"запускать CAM-обработчик и по сообщениям об ошибках выяснять какие "
++"инструменты \"отсутствуют\". Затем эти инструменты добавляются в файл и "
++"CAM-процессор запускается повторно."
++
++#. type: Plain text
++#: gerbv.1.in:225
++msgid ""
++"You load a tool file by using the commandline switches -t or --tools.  "
++"The file can have any name you wish, but Eagle expects the file type to "
++"be \".drl\", so it makes sense to keep it this way. Some board houses are "
++"still using CAM software from DOS era, so you may want to excercise "
++"caution before going beyond the 8.3 naming convention."
++msgstr ""
++"Для загрузки файла инструментов используйте флаг командной строки -t или "
++"--tools. Имя файла может быть любым (Eagle предполагает расширение \".drl"
++"\" для таких файлов). Некоторые производители печатных плат до сих пор "
++"используют программное обеспечение из эры DOS, что может накладывать "
++"ограничение 8.3 на длину имён файлов."
++
++#. type: Plain text
++#: gerbv.1.in:235
++msgid ""
++"When I<gerbv> reads the Tools file it also checks that there are no "
++"duplicate definitions of tools. This does happen from time to time as you "
++"edit the file by hand, especially if you, during design, add or remove "
++"parts from the board and then have to add new tools into the Tools file. "
++"The duplicate tools are a very serious error which will stop (HOLD) your "
++"board until you fix the Tools file and maybe the Excellon file. I<gerbv> "
++"will detect duplicate tools if they are present, and will exit "
++"immediately to indicate such a fatal error in a very obvious way. A "
++"message will also be printed to standard error."
++msgstr ""
++"При чтении файла инструментов I<gerbv> проверяет отсутствие повторяющихся "
++"определений инструментов. Это может случиться при редактировании файла "
++"инструментов вручную. Повторяющиеся определения инструментов — серьёзная "
++"ошибка, которая приостановит производство вашей печатной платы до "
++"исправления файла инструментов и, возможно, файла сверловки Excellon. При "
++"обнаружении повторяющихся определений инструментов I<gerbv> немедленно "
++"сообщает об ошибке и завершает работу."
++
++#. type: Plain text
++#: gerbv.1.in:240
++msgid ""
++"If your Excellon file does not contain tool definitions then I<gerbv> "
++"will preconfigure the tools by deriving the diameter of the drill bit "
++"from the tool number. This is probably not what you want, and you will "
++"see warnings printed on the console."
++msgstr ""
++"Если файл Excellon не содержит определения инструментов, то I<gerbv> "
++"установит диаметр инструментов по номеру инструмента. Вероятно, это не "
++"то, что вы хотите, поэтому будет выведено предупреждение."
++
++#. type: SH
++#: gerbv.1.in:241
++#, no-wrap
++msgid "ENVIRONMENT"
++msgstr "ОКРУЖЕНИЕ"
++
++#. type: IP
++#: gerbv.1.in:242
++#, no-wrap
++msgid "GERBV_SCHEMEINIT"
++msgstr "GERBV_SCHEMEINIT"
++
++#. type: Plain text
++#: gerbv.1.in:245
++msgid ""
++"Defines where the init.scm file is stored. Used by scheme interpreter, "
++"which is used by the project reader."
++msgstr ""
++"Задаёт расположение файла init.scm, используемого Scheme-интерпретатором "
++"для чтения файла проекта."
++
++#. type: SH
++#: gerbv.1.in:246
++#, no-wrap
++msgid "AUTHOR"
++msgstr "АВТОРЫ"
++
++#. type: Plain text
++#: gerbv.1.in:251
++#, no-wrap
++msgid ""
++"Stefan Petersen (spetm at users.sourceforge.net): Overall hacker and project leader\n"
++"Andreas Andersson (e92_aan at e.kth.se): Drill file support and general hacking\n"
++"Anders Eriksson (aenfaldor at users.sourceforge.net): X and GTK+ ideas and hacking\n"
++msgstr ""
++"Stefan Petersen (spetm at users.sourceforge.net):\n"
++"\tобщее программирование и ведение проекта\n"
++"Andreas Andersson (e92_aan at e.kth.se):\n"
++"\tподдержка файла сверловки и общее программирование\n"
++"Anders Eriksson (aenfaldor at users.sourceforge.net):\n"
++"\tидеи X и GTK+ и программирование\n"
++
++#. type: SH
++#: gerbv.1.in:252
++#, no-wrap
++msgid "COPYRIGHT"
++msgstr "COPYRIGHT"
++
++#. type: Plain text
++#: gerbv.1.in:255
++#, no-wrap
++msgid "Copyright \\(co  2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Stefan Petersen\n"
++msgstr "Copyright \\(co  2001—2008 Stefan Petersen\n"
++
++#. type: Plain text
++#: gerbv.1.in:257
++#, no-wrap
++msgid ""
++"This document can be freely redistributed according to the terms of the \n"
++"GNU General Public License version 2.0\n"
++msgstr ""
++"Данный документ может свободно распространяться в соответствии с \n"
++"требованиями GNU Универсальной общественной лицензии (GPL) версии 2.0\n"
+-- 
+1.7.10.4
+
+diff --git a/autogen.sh b/autogen.sh
+index 3a589dd..11598b5 100755
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -80,7 +80,7 @@ acl_ver=`aclocal --version | awk '{print $NF; exit}'`
+ echo "    $acl_ver"
+ 
+ echo "Running aclocal..."
+-aclocal $ACLOCAL_FLAGS || exit 1
++aclocal -I m4 $ACLOCAL_FLAGS || exit 1
+ echo "... done with aclocal."
+ 
+ ############################################################################
+diff --git a/configure.ac b/configure.ac
+index 2826ed6..f8c3e4d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -27,6 +27,7 @@ AC_CONFIG_SRCDIR([src/gerbv.c])
+ AC_GNU_SOURCE
+ AC_PREREQ([2.59])
+ AM_INIT_AUTOMAKE([1.9])
++AC_CONFIG_MACRO_DIR([m4])
+ 
+ dnl Create a configuration header 
+ AM_CONFIG_HEADER([config.h])
+
diff --git a/community/ginac/PKGBUILD b/community/ginac/PKGBUILD
index b8491a756..325cb37d5 100644
--- a/community/ginac/PKGBUILD
+++ b/community/ginac/PKGBUILD
@@ -1,26 +1,26 @@
-# $Id: PKGBUILD 81849 2013-01-02 03:07:05Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
+# $Id: PKGBUILD 97794 2013-09-29 19:22:18Z jlichtblau $
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 
 pkgname=ginac
 pkgver=1.6.2
-pkgrel=2
+pkgrel=3
 pkgdesc="C++ library for symbolic calculations"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.ginac.de/'
 license=('GPL')
 depends=('cln')
 makedepends=('transfig' 'doxygen' 'texlive-bin')
-source=(http://www.ginac.de/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('c93913c4c543874b2ade4f0390030641be7e0c41')
 install=${pkgname}.install
+source=(http://www.ginac.de/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('0f34d255024b3fb258e44da84f9e82dfb3dc9bc15f0999b7a18204a730663bde')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   ./configure --prefix=/usr --disable-static
-
   make
 }
 
diff --git a/community/glabels/PKGBUILD b/community/glabels/PKGBUILD
index 906690383..6afffeccb 100644
--- a/community/glabels/PKGBUILD
+++ b/community/glabels/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 79126 2012-10-30 23:07:20Z heftig $
+# $Id: PKGBUILD 98190 2013-10-07 12:08:24Z jgc $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 # Contributor: yugrotavele <yugrotavele at archlinux dot us>
 # Contributor: Damir Perisa <damir@archlinux.org>
 
 pkgname=glabels
 pkgver=3.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Creating labels and business cards the very easy way"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://glabels.org/"
 license=('GPL' 'LGPL')
-depends=('librsvg' 'evolution-data-server>=3.6.0' 'qrencode' 'iec16022' 'dconf' 'desktop-file-utils' 'xdg-utils')
+depends=('librsvg' 'evolution-data-server' 'qrencode' 'iec16022' 'dconf' 'desktop-file-utils' 'xdg-utils')
 makedepends=('barcode' 'intltool' 'gnome-doc-utils')
 options=('!libtool')
 install=$pkgname.install
diff --git a/community/glfw/PKGBUILD b/community/glfw/PKGBUILD
index 7b0cecc9e..80f832fe0 100644
--- a/community/glfw/PKGBUILD
+++ b/community/glfw/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96501 2013-08-30 19:17:19Z svenstaro $
+# $Id: PKGBUILD 98064 2013-10-05 08:59:45Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: philefou <tuxication AT gmail DOT com>
 # Contributor: lindquist <tomas@famolsen.dk>
@@ -7,7 +7,7 @@
 # Contributor: SpepS <dreamspepser at yahoo dot it>
 
 pkgname=glfw
-pkgver=3.0.2
+pkgver=3.0.3
 pkgrel=1
 pkgdesc="A free, open source, portable framework for OpenGL application development"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ license=('custom:ZLIB')
 depends=('libgl' 'libxrandr' 'glu' 'xorg-xinput')
 makedepends=('mesa' 'cmake' 'doxygen')
 source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2")
-md5sums=('35a3ef5e0a8137e6984c5fb892edb06c')
+md5sums=('623977c096b28c25528e3c958e9fb3fd')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/glom/PKGBUILD b/community/glom/PKGBUILD
index bb691a69f..001cbc542 100644
--- a/community/glom/PKGBUILD
+++ b/community/glom/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 94024 2013-07-13 12:32:26Z svenstaro $
+# $Id: PKGBUILD 97732 2013-09-28 07:17:42Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 
 pkgname=glom
-pkgver=1.24.0
-pkgrel=2
+pkgver=1.24.1
+pkgrel=1
 pkgdesc="An easy-to-use database designer and user interface"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.glom.org/"
@@ -16,7 +16,7 @@ makedepends=('intltool' 'gnome-doc-utils' 'python-sphinx' 'boost')
 options=('!libtool')
 install=$pkgname.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/1.24/$pkgname-$pkgver.tar.xz)
-sha256sums=('83ff79610ffdede48536c0d07d5288ad84ec26c86aa2aa1db98b46abdebbdcc2')
+sha256sums=('eae586be8d3fc36ee80e5ca0ef5d877e76d346cbfe451c9abff5be27692030d1')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/gloox/PKGBUILD b/community/gloox/PKGBUILD
index b0dfe7f6a..b9f46d36f 100644
--- a/community/gloox/PKGBUILD
+++ b/community/gloox/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 93658 2013-07-08 11:17:28Z spupykin $
+# $Id: PKGBUILD 97518 2013-09-23 16:14:07Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: William Rea <sillywilly@gmail.com>
 
 pkgname=gloox
-pkgver=1.0.2
+pkgver=1.0.6
 pkgrel=1
 pkgdesc="C++ libraries for development of Jabber client/component/server"
 arch=(i686 x86_64 'mips64el')
@@ -12,7 +12,7 @@ options=('!libtool')
 license=("GPL")
 depends=('libidn' 'gnutls')
 source=(http://camaya.net/download/gloox-$pkgver.tar.bz2)
-md5sums=('4c446ee186406c3b3a24402418127faa')
+md5sums=('80ba7fa1220913a9f67bf6f3183aafbd')
 
 build() {
   cd $srcdir/gloox-$pkgver
diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD
index 956c5997d..b5465c5b7 100644
--- a/community/gmic/PKGBUILD
+++ b/community/gmic/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 93486 2013-07-04 10:12:04Z spupykin $
+# $Id: PKGBUILD 97134 2013-09-13 13:41:46Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: farid <farid at archlinuc-br.org>
@@ -6,7 +6,7 @@
 
 pkgbase=gmic
 pkgname=("gmic" "gimp-plugin-gmic" "zart")
-pkgver=1.5.6.1
+pkgver=1.5.7.0
 pkgrel=1
 arch=("i686" "x86_64" "mips64el")
 url="http://gmic.sourceforge.net"
@@ -15,7 +15,7 @@ makedepends=('gimp' 'qt4' 'fftw' 'openexr' 'opencv' 'mesa' 'gtk2')
 #options=('!emptydirs')
 source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_${pkgver}.tar.gz"
         "opencv-buildfix.patch")
-md5sums=('06545a7c2f73b55b0d35e5f5544dce88'
+md5sums=('76e4cc4847afb7fe8afa4d7f8690d4dc'
          '120319b0d6c81c5af186abe2281b79ca')
 
 prepare() {
diff --git a/community/gnome-applets/01_battstat_upower.patch b/community/gnome-applets/01_battstat_upower.patch
deleted file mode 100644
index fa31e720b..000000000
--- a/community/gnome-applets/01_battstat_upower.patch
+++ /dev/null
@@ -1,622 +0,0 @@
-From 18a2f4aa3ba2c8c9fc3718b15a9ab366fdd35f05 Mon Sep 17 00:00:00 2001
-From: Joachim Breitner <mail@joachim-breitner.de>
-Date: Mon, 5 Jul 2010 12:20:04 +0200
-Subject: [PATCH] [battstat applet] upower support
-
-As HAL is being deprecated, the battstat applet is adjusted to talk to
-upower, using libupower-glib. (Bug #607254)
----
- battstat/Makefile.am          |    6 +-
- battstat/battstat-upower.c    |  330 +++++++++++++++++++++++++++++++++++++++++
- battstat/battstat-upower.h    |   33 ++++
- battstat/battstat_applet.c    |    7 +-
- battstat/docs/C/battstat.xml  |   18 ++-
- battstat/docs/de/battstat.xml |   22 +++-
- battstat/docs/eu/battstat.xml |   20 ++-
- battstat/power-management.c   |   66 +++++++--
- configure.in                  |   22 +++
- 9 files changed, 493 insertions(+), 31 deletions(-)
- create mode 100644 battstat/battstat-upower.c
- create mode 100644 battstat/battstat-upower.h
-
-Index: gnome-applets-3.4.1/battstat/Makefile.am
-===================================================================
---- gnome-applets-3.4.1.orig/battstat/Makefile.am	2012-04-13 19:02:29.000000000 +0200
-+++ gnome-applets-3.4.1/battstat/Makefile.am	2012-04-19 00:28:17.246029051 +0200
-@@ -27,6 +27,7 @@
- 	$(GNOME_APPLETS_CFLAGS)			\
- 	$(LIBNOTIFY_CFLAGS)			\
- 	$(HAL_CFLAGS)				\
-+	$(UPOWER_CFLAGS)			\
- 	$(APMINC)				\
- 	$(ACPIINC)				\
- 	$(WARN_CFLAGS)				\
-@@ -48,13 +49,17 @@
- 	acpi-freebsd.c \
- 	acpi-freebsd.h \
- 	battstat-hal.c \
--	battstat-hal.h
-+	battstat-hal.h \
-+	battstat-upower.c \
-+	battstat-upower.h
- 
- 
- battstat_applet_2_LDADD = \
- 		     $(GNOME_APPLETS_LIBS) \
- 		     $(LIBNOTIFY_LIBS) \
- 		     $(HAL_LIBS) \
-+		     $(UPOWER_LIBS) \
-+		     $(LIBM) \
- 		     $(APMLIB)
- 
- schemasdir   = @GCONF_SCHEMA_FILE_DIR@
-Index: gnome-applets-3.4.1/battstat/battstat-upower.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gnome-applets-3.4.1/battstat/battstat-upower.c	2012-04-19 00:28:17.246029051 +0200
-@@ -0,0 +1,301 @@
-+/*
-+ *  Copyright (C) 2010 by Joachim Breitner <mail@joachim-breitner.de>
-+ *
-+ * Based on battstat-hal.c:
-+ * Copyright (C) 2005 by Ryan Lortie <desrt@desrt.ca>
-+ *
-+ *  This program is free software; you can redistribute it and/or modify
-+ *  it under the terms of the GNU General Public License as published by
-+ *  the Free Software Foundation; either version 2 of the License, or
-+ *  (at your option) any later version.
-+ *
-+ *  This program is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU General Public License
-+ *  along with this program; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
-+ *
-+ * $Id$
-+ */
-+
-+#include <config.h>
-+
-+#ifdef HAVE_UPOWER
-+
-+#include <upower.h>
-+#include <math.h>
-+
-+#include "battstat-upower.h"
-+
-+static UpClient *upc;
-+static void (*status_updated_callback) (void);
-+
-+
-+/* status_updated_callback() can not be called directly because at the time of
-+ * the device-remove signal, the device is not actually removed from the list
-+ * of devices known to the up_client object (see libupower-glib/up-client.c in
-+ * upower). Waiting for the next idle timer works around this issue and has has
-+ * the additionaly benefit of possibly running status_updated_callback only
-+ * once when several events happen very soon after each other.
-+ */
-+static gboolean status_update_scheduled;
-+
-+static gboolean
-+update_status_idle (gpointer junk)
-+{
-+  if (status_updated_callback)
-+    status_updated_callback ();
-+
-+  return status_update_scheduled = FALSE;
-+}
-+
-+static void
-+schedule_status_callback (void)
-+{
-+  if (status_update_scheduled)
-+    return;
-+
-+  status_update_scheduled = TRUE;
-+  g_idle_add (update_status_idle, NULL);
-+}
-+
-+static void
-+device_cb (UpClient *client, UpDevice *device, gpointer user_data) {
-+  schedule_status_callback();
-+}
-+
-+/* ---- public functions ---- */
-+
-+char *
-+battstat_upower_initialise (void (*callback) (void))
-+{
-+  status_updated_callback = callback;
-+
-+  if( upc != NULL )
-+    return g_strdup( "Already initialised!" );
-+
-+  if( (upc = up_client_new() ) == NULL )
-+    goto error_out;
-+
-+  if (! up_client_enumerate_devices_sync( upc, NULL, NULL ) ) {
-+    goto error_shutdownclient;
-+  }
-+
-+  g_signal_connect_after( upc, "device-changed", device_cb, NULL );
-+  g_signal_connect_after( upc, "device-added", device_cb, NULL );
-+  g_signal_connect_after( upc, "device-removed", device_cb, NULL );
-+
-+  return NULL;
-+
-+error_shutdownclient:
-+  g_object_unref( upc );
-+  upc = NULL;
-+
-+error_out:
-+  return "Can not initialize upower";
-+}
-+
-+void
-+battstat_upower_cleanup( void )
-+{
-+  if( upc == NULL )
-+    return;
-+  
-+  g_object_unref( upc );
-+  upc = NULL;
-+}
-+
-+#include "battstat.h"
-+
-+/* This function currently exists to allow the multiple batteries supported
-+ * by the upower backend to appear as a single composite battery device (since
-+ * at the current time this is all that battstat supports).
-+ *
-+ * This entire function is filled with logic to make multiple batteries
-+ * appear as one "composite" battery.  Comments included as appropriate.
-+ *
-+ * For more information about some of the assumptions made in the following
-+ * code please see the following mailing list post and the resulting thread:
-+ *
-+ *   http://lists.freedesktop.org/archives/hal/2005-July/002841.html
-+ */
-+void
-+battstat_upower_get_battery_info( BatteryStatus *status )
-+{
-+
-+  GPtrArray *devices = up_client_get_devices( upc );
-+
-+  /* The calculation to get overall percentage power remaining is as follows:
-+   *
-+   *    Sum( Current charges ) / Sum( Full Capacities )
-+   *
-+   * We can't just take an average of all of the percentages since this
-+   * doesn't deal with the case that one battery might have a larger
-+   * capacity than the other.
-+   *
-+   * In order to do this calculation, we need to keep a running total of
-+   * current charge and full capacities.
-+   */
-+  double current_charge_total = 0, full_capacity_total = 0;
-+
-+  /* Record the time remaining as reported by upower.  This is used in the event
-+   * that the system has exactly one battery (since, then, upower is capable
-+   * of providing an accurate time remaining report and we should trust it.)
-+   */
-+  gint64 remaining_time = 0;
-+
-+  /* The total (dis)charge rate of the system is the sum of the rates of
-+   * the individual batteries.
-+   */
-+  double rate_total = 0;
-+
-+  /* We need to know if we should report the composite battery as present
-+   * at all.  The logic is that if at least one actual battery is installed
-+   * then the composite battery will be reported to exist.
-+   */
-+  int present = 0;
-+
-+  /* We need to know if we are on AC power or not.  Eventually, we can look
-+   * at the AC adaptor upower devices to determine that.  For now, we assume that
-+   * if any battery is discharging then we must not be on AC power.  Else, by
-+   * default, we must be on AC.
-+   */
-+  int on_ac_power = 1;
-+
-+  /* Finally, we consider the composite battery to be "charging" if at least
-+   * one of the actual batteries in the system is charging.
-+   */
-+  int charging = 0;
-+
-+  /* For each physical battery bay... */
-+  int i;
-+  for( i = 0; i < devices->len; i++ )
-+  {
-+    UpDevice *upd = g_ptr_array_index( devices, i );
-+
-+    int type, state;
-+    double current_charge, full_capacity, rate;
-+    gint64 time_to_full, time_to_empty;
-+    
-+    g_object_get( upd,
-+      "kind", &type,
-+      "state", &state,
-+      "energy", &current_charge,
-+      "energy-full", &full_capacity,
-+      "energy-rate", &rate,
-+      "time-to-full", &time_to_full,
-+      "time-to-empty", &time_to_empty,
-+      NULL );
-+
-+    /* Only count batteries here */
-+
-+    if (type != UP_DEVICE_KIND_BATTERY)
-+      continue;
-+
-+    /* At least one battery present -> composite battery is present. */
-+    present++;
-+
-+    /* At least one battery charging -> composite battery is charging. */
-+    if( state == UP_DEVICE_STATE_CHARGING )
-+      charging = 1;
-+
-+    /* At least one battery is discharging -> we're not on AC. */
-+    if( state == UP_DEVICE_STATE_DISCHARGING )
-+      on_ac_power = 0;
-+
-+    /* Sum the totals for current charge, design capacity, (dis)charge rate. */
-+    current_charge_total += current_charge;
-+    full_capacity_total += full_capacity;
-+    rate_total += rate;
-+
-+    /* Record remaining time too, incase this is the only battery. */
-+    remaining_time = (state == UP_DEVICE_STATE_DISCHARGING ? time_to_empty : time_to_full);
-+  }
-+
-+  if( !present || full_capacity_total <= 0 || (charging && !on_ac_power) )
-+  {
-+    /* Either no battery is present or something has gone horribly wrong.
-+     * In either case we must return that the composite battery is not
-+     * present.
-+     */
-+    status->present = FALSE;
-+    status->percent = 0;
-+    status->minutes = -1;
-+    status->on_ac_power = TRUE;
-+    status->charging = FALSE;
-+
-+    g_ptr_array_unref( devices );
-+    return;
-+  }
-+
-+  /* Else, our composite battery is present. */
-+  status->present = TRUE;
-+
-+  /* As per above, overall charge is:
-+   *
-+   *    Sum( Current charges ) / Sum( Full Capacities )
-+   */
-+  status->percent = ( current_charge_total / full_capacity_total ) * 100.0 + 0.5;
-+
-+  if( present == 1 )
-+  {
-+    /* In the case of exactly one battery, report the time remaining figure
-+     * from upower directly since it might have come from an authorative source
-+     * (ie: the PMU or APM subsystem).
-+     *
-+     * upower gives remaining time in seconds with a 0 to mean that the
-+     * remaining time is unknown.  Battstat uses minutes and -1 for 
-+     * unknown time remaining.
-+     */
-+
-+    if( remaining_time == 0 )
-+      status->minutes = -1;
-+    else
-+      status->minutes = (remaining_time + 30) / 60;
-+  }
-+  /* Rest of cases to deal with multiple battery systems... */
-+  else if( !on_ac_power && rate_total != 0 )
-+  {
-+    /* Then we're discharging.  Calculate time remaining until at zero. */
-+
-+    double remaining;
-+
-+    remaining = current_charge_total;
-+    remaining /= rate_total;
-+    status->minutes = (int) floor( remaining * 60.0 + 0.5 );
-+  }
-+  else if( charging && rate_total != 0 )
-+  {
-+    /* Calculate time remaining until charged.  For systems with more than
-+     * one battery, this code is very approximate.  The assumption is that if
-+     * one battery reaches full charge before the other that the other will
-+     * start charging faster due to the increase in available power (similar
-+     * to how a laptop will charge faster if you're not using it).
-+     */
-+
-+    double remaining;
-+
-+    remaining = full_capacity_total - current_charge_total;
-+    if( remaining < 0 )
-+      remaining = 0;
-+    remaining /= rate_total;
-+
-+    status->minutes = (int) floor( remaining * 60.0 + 0.5 );
-+  }
-+  else
-+  {
-+    /* On AC power and not charging -or- rate is unknown. */
-+    status->minutes = -1;
-+  }
-+
-+  /* These are simple and well-explained above. */
-+  status->charging = charging;
-+  status->on_ac_power = on_ac_power;
-+  
-+  g_ptr_array_unref( devices );
-+}
-+
-+#endif /* HAVE_UPOWER */
-Index: gnome-applets-3.4.1/battstat/battstat-upower.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gnome-applets-3.4.1/battstat/battstat-upower.h	2012-04-19 00:28:17.254029051 +0200
-@@ -0,0 +1,33 @@
-+/*
-+ * Copyright (C) 2010 by Joachim Breitner <mail@joachim-breitner.de>
-+ *
-+ * Based on battstat-hal.h:
-+ * Copyright (C) 2005 by Ryan Lortie <desrt@desrt.ca>
-+ *
-+ *  This program is free software; you can redistribute it and/or modify
-+ *  it under the terms of the GNU General Public License as published by
-+ *  the Free Software Foundation; either version 2 of the License, or
-+ *  (at your option) any later version.
-+ *
-+ *  This program is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU General Public License
-+ *  along with this program; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
-+ *
-+ * $Id$
-+ */
-+
-+#ifndef _battstat_upower_h_
-+#define _battstat_upower_h_
-+
-+char *battstat_upower_initialise (void (*) (void));
-+void battstat_upower_cleanup (void);
-+
-+#include "battstat.h"
-+void battstat_upower_get_battery_info (BatteryStatus *status);
-+
-+#endif /* _battstat_upower_h_ */
-Index: gnome-applets-3.4.1/battstat/battstat_applet.c
-===================================================================
---- gnome-applets-3.4.1.orig/battstat/battstat_applet.c	2012-04-13 19:02:29.000000000 +0200
-+++ gnome-applets-3.4.1/battstat/battstat_applet.c	2012-04-19 00:28:17.254029051 +0200
-@@ -1188,9 +1188,12 @@
- 
-   char *comments = g_strdup_printf ("%s\n\n%s",
- 		  _("This utility shows the status of your laptop battery."),
--		  power_management_using_hal () ?
-+		  power_management_using_upower () ?
-+		  	/* true */ _("upower backend enabled.") :
-+		  (power_management_using_hal () ?
- 		  	/* true */ _("HAL backend enabled.") :
--			/* false */ _("Legacy (non-HAL) backend enabled."));
-+			/* false */ _("Legacy (non-HAL) backend enabled.")
-+		  ));
- 
-   gtk_show_about_dialog( NULL,
-     "version",             VERSION,
-Index: gnome-applets-3.4.1/battstat/docs/C/battstat.xml
-===================================================================
---- gnome-applets-3.4.1.orig/battstat/docs/C/battstat.xml	2012-04-15 15:49:58.000000000 +0200
-+++ gnome-applets-3.4.1/battstat/docs/C/battstat.xml	2012-04-19 00:28:17.254029051 +0200
-@@ -226,10 +226,13 @@
-      <title>Power Management Backends</title>
- 
-      <para>
--      The battery monitor supports a number of power management backends. If it
--      is available, the monitor will attempt to use the freedesktop.org
--      <ulink url="http://freedesktop.org/Software/hal">HAL (Hardware Abstraction
--      Layer)</ulink>. If it is unavailable or unsupported on your platform, the
-+      The battery monitor supports a number of power management backends.
-+      If it is available, the monitor will attempt to use the freedesktop.org
-+      <ulink url="http://upower.freedesktop.org/">upower</ulink> interface.
-+      If it is unavailable or unsupported on your platform, it will fall back
-+      to the freedesktop.org
-+      <ulink url="http://freedesktop.org/Software/hal">HAL (Hardware
-+      Abstraction Layer)</ulink>. If that is also not availble, the
-       battery monitor will attempt direct access to the power management system.
-      </para>
-      <para>
-@@ -410,10 +413,10 @@
-     <sect2 id="battstat-troubleshooting-backends">
-      <title>Determining the backend</title>
-      <para>
--       If you are using the Hardware Abstraction Layer
--       (see <xref linkend="battstat-power-backends"/>) then that will be
--       indicated in the about dialog by placing a star next to the author of the
--       HAL backend.
-+       If you are using the upower interface, or the the Hardware
-+       Abstraction Layer (see <xref linkend="battstat-power-backends"/>) then
-+       that will be indicated in the about dialog by placing a star next to the
-+       author of the HAL backend.
-     <figure id="battstat-credits-hal"> 
-       <title>Check you're using the HAL backend</title> 
-       <screenshot> 
-Index: gnome-applets-3.4.1/battstat/power-management.c
-===================================================================
---- gnome-applets-3.4.1.orig/battstat/power-management.c	2012-04-13 19:02:29.000000000 +0200
-+++ gnome-applets-3.4.1/battstat/power-management.c	2012-04-19 00:28:17.254029051 +0200
-@@ -41,6 +41,7 @@
- 
- #include "battstat.h"
- #include "battstat-hal.h"
-+#include "battstat-upower.h"
- 
- #define ERR_ACPID _("Can't access ACPI events in /var/run/acpid.socket! "    \
-                     "Make sure the ACPI subsystem is working and "           \
-@@ -66,6 +67,9 @@
- #ifdef HAVE_HAL
- static int using_hal;
- #endif
-+#ifdef HAVE_UPOWER
-+static int using_upower;
-+#endif
- 
- /*
-  * What follows is a series of platform-specific apm_readinfo functions
-@@ -390,6 +394,14 @@
-     return NULL;
-   }
- 
-+#ifdef HAVE_UPOWER
-+  if( using_upower )
-+  {
-+    battstat_upower_get_battery_info( status );
-+    return NULL;
-+  }
-+#endif
-+
- #ifdef HAVE_HAL
-   if( using_hal )
-   {
-@@ -430,27 +442,36 @@
- const char *
- power_management_initialise (int no_hal, void (*callback) (void))
- {
-+  char *err;
-+  err = g_strdup( ":(" );
- #ifdef __linux__
-   struct stat statbuf;
- #endif
--#ifdef HAVE_HAL
--  char *err;
-+#ifdef HAVE_UPOWER
-+  err = battstat_upower_initialise (callback);
- 
--  if( no_hal )
--    err = g_strdup( ":(" );
--  else
--    err = battstat_hal_initialise (callback);
--
--
--  if( err == NULL ) /* HAL is up */
-+  if( err == NULL ) /* UPOWER is up */
-   {
-     pm_initialised = 1;
--    using_hal = TRUE;
-+    using_upower = TRUE;
-     return NULL;
-+  } 
-+#endif
-+
-+#ifdef HAVE_HAL
-+  if(! no_hal ) {
-+    err = battstat_hal_initialise (callback);
-+
-+    if( err == NULL ) /* HAL is up */
-+    {
-+      pm_initialised = 1;
-+      using_hal = TRUE;
-+      return NULL;
-+    }
-   }
--  else
--    /* fallback to legacy methods */
--    g_free( err );
-+
-+  /* fallback to legacy methods */
-+  g_free( err );
- #endif
-     
- #ifdef __linux__
-@@ -498,6 +519,15 @@
- void
- power_management_cleanup( void )
- {
-+#ifdef HAVE_UPOWER
-+  if( using_upower )
-+  {
-+    battstat_upower_cleanup();
-+    pm_initialised = 1;
-+    return;
-+  }
-+#endif
-+
- #ifdef HAVE_HAL
-   if( using_hal )
-   {
-@@ -525,6 +555,16 @@
- }
- 
- int
-+power_management_using_upower( void )
-+{
-+#ifdef HAVE_UPOWER
-+  return using_upower;
-+#else
-+  return 0;
-+#endif
-+}
-+
-+int
- power_management_using_hal( void )
- {
- #ifdef HAVE_HAL
-Index: gnome-applets-3.4.1/configure.in
-===================================================================
---- gnome-applets-3.4.1.orig/configure.in	2012-04-15 15:45:36.000000000 +0200
-+++ gnome-applets-3.4.1/configure.in	2012-04-19 00:28:17.254029051 +0200
-@@ -23,6 +23,7 @@
- LIBWNCK_REQUIRED=2.91.0
- LIBNOTIFY_REQUIRED=0.7
- HAL_REQUIRED=0.5.3
-+UPOWER_REQUIRED=0.9.4
- DBUS_REQUIRED=1.1.2
- DBUS_GLIB_REQUIRED=0.74
- PYGOBJECT_REQUIRED=2.26
-@@ -223,6 +224,30 @@
- AC_SUBST(HAL_CFLAGS)
- AC_SUBST(HAL_LIBS)
- 
-+dnl -- check for libupower-glib (optional) --------------------------------------------
-+UPOWER_CFLAGS=
-+UPOWER_LIBS=
-+AC_ARG_WITH(upower,[  --without-upower           build without upower support])
-+
-+if test "x$with_upower" != xno; then
-+	PKG_CHECK_MODULES(UPOWER, upower-glib >= $UPOWER_REQUIRED,
-+		  HAVE_UPOWER="yes",
-+		  HAVE_UPOWER="no")
-+
-+	LT_LIB_M
-+	if test "x$HAVE_UPOWER" = "xyes"; then
-+		AC_DEFINE(HAVE_UPOWER, 1, [UPOWER available])
-+	fi
-+else
-+	AC_MSG_WARN(["upower support disabled"])
-+fi
-+
-+AC_SUBST(UPOWER_CFLAGS)
-+AC_SUBST(UPOWER_LIBS)
-+AC_SUBST(LIBM)
-+
-+
-+
- dnl -- check for gucharmap (optional) -----------------------------------------
- 
- PKG_CHECK_MODULES([GUCHARMAP],[gucharmap-2.90 >= $GUCHARMAP3_REQUIRED],
-@@ -739,5 +764,6 @@
- 	Using DBUS:			$HAVE_DBUS
- 	Using NetworkManager:		$HAVE_NETWORKMANAGER
- 	Using HAL:			$HAVE_HAL
-+	Using UPOWER:			$HAVE_UPOWER
- 	Enabling IPv6:			$have_ipv6
- " >&2
diff --git a/community/gnome-applets/PKGBUILD b/community/gnome-applets/PKGBUILD
deleted file mode 100644
index a9b2165c5..000000000
--- a/community/gnome-applets/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 88683 2013-04-21 22:16:53Z heftig $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-applets
-pkgver=3.5.92
-pkgrel=3
-pkgdesc="Small applications for the GNOME panel"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-depends=('cpupower' 'gucharmap' 'gstreamer0.10-base-plugins' 'gnome-panel' 'libgtop' 'upower')
-makedepends=('gnome-common' 'gnome-doc-utils' 'intltool' 'networkmanager' 'rarian')
-url="https://live.gnome.org/GnomeApplets"
-install=$pkgname.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        gnome-applets-cpupower.patch
-        disable-gweather-applet.patch
-        fix-autoconf.patch
-        01_battstat_upower.patch)
-sha256sums=('f6178cb702a39a4103fcb97e9a266bf6d05f05ac5064818f119c023d76170e83'
-            '942276d7cc18224d9f5b1b57314746ad4d713ee0dcf4aedb25fa72e92db75e65'
-            '47f6b477c0f76ebb1e8ffc6fe9bd2fac9ac7f511f059cf4bb2687f8425bfb4a8'
-            '0acd58aee458345e378d5f77256e04b13e3a4c06b166aac390a92309b864e8a4'
-            '364c9264c76721b42e85eecc48443852ead1bd730d9de937dd2ae00889db836a')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  sed -i 's@^#!.*python$@#!/usr/bin/python2@' invest-applet/invest/*
-
-  # Use cpupower instead of cpufreq
-  patch -Np1 -i "$srcdir/gnome-applets-cpupower.patch"
-
-  # Add UPower support
-  patch -Np1 -i "$srcdir/01_battstat_upower.patch"
-
-  # Disable gweather applet, because it's not compatible with libgweather 3.8
-  patch -Np1 -i "$srcdir/disable-gweather-applet.patch"
-
-  # Fix build
-  patch -Np1 -i "$srcdir/fix-autoconf.patch"
-
-  # Turn off unneeded warnings
-  CFLAGS="$CFLAGS -w"
-
-  autoreconf -fi
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
-              --disable-static --disable-schemas-install --disable-scrollkeeper \
-              --enable-mixer-applet \
-              PYTHON=/usr/bin/python2
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  mkdir -m755 -p "$pkgdir/usr/share/gconf/schemas"
-  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" "$pkgdir"/etc/gconf/schemas/*.schemas
-  rm -r "$pkgdir"/etc/gconf
-}
diff --git a/community/gnome-applets/disable-gweather-applet.patch b/community/gnome-applets/disable-gweather-applet.patch
deleted file mode 100644
index 26f7e4d6b..000000000
--- a/community/gnome-applets/disable-gweather-applet.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur gnome-applets-3.5.92.orig/configure.in gnome-applets-3.5.92/configure.in
---- gnome-applets-3.5.92.orig/configure.in	2012-09-20 03:07:34.000000000 +0200
-+++ gnome-applets-3.5.92/configure.in	2013-04-09 10:39:54.214243015 +0200
-@@ -251,7 +251,7 @@
- 
-  dnl -- check for libgweather (required for gweather applet) ------------------
- build_libgweather_applets=false
--PKG_CHECK_MODULES(LIBGWEATHER, gweather-3.0 >= $GWEATHER_REQUIRED,
-+PKG_CHECK_MODULES(LIBGWEATHER, gweather-3.0 >= $GWEATHER_REQUIRED gweather-3.0 <= 3.7,
- 	          build_libgweather_applets=true,
- 		  AC_MSG_WARN([libgweather not found. Not building the weather applet.]))
- AC_SUBST(LIBGWEATHER_CFLAGS)
diff --git a/community/gnome-applets/fix-autoconf.patch b/community/gnome-applets/fix-autoconf.patch
deleted file mode 100644
index fc36c743c..000000000
--- a/community/gnome-applets/fix-autoconf.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur gnome-applets-3.5.92.orig/configure.in gnome-applets-3.5.92/configure.in
---- gnome-applets-3.5.92.orig/configure.in	2012-09-20 03:07:34.000000000 +0200
-+++ gnome-applets-3.5.92/configure.in	2013-04-09 09:48:48.427334056 +0200
-@@ -4,7 +4,7 @@
- AC_INIT(gnome-applets, 3.5.92)
- AC_PREREQ(2.59)
- 
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz tar-ustar])
- AC_CONFIG_MACRO_DIR(m4)
- m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
diff --git a/community/gnome-applets/gnome-applets-cpupower.patch b/community/gnome-applets/gnome-applets-cpupower.patch
deleted file mode 100644
index 134a617fc..000000000
--- a/community/gnome-applets/gnome-applets-cpupower.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up gnome-applets-3.1.90/configure.in.cpupower gnome-applets-3.1.90/configure.in
---- gnome-applets-3.1.90/configure.in.cpupower	2011-08-31 18:49:00.628945807 -0400
-+++ gnome-applets-3.1.90/configure.in	2011-08-31 18:49:17.397946966 -0400
-@@ -518,7 +518,7 @@ AC_CHECK_HEADER(cpufreq.h, have_libcpufr
- LIBCPUFREQ_LIBS=
- if test "x$have_libcpufreq" = "xyes"; then
-    AC_DEFINE([HAVE_LIBCPUFREQ], [1], [Have libcpufreq.])
--   LIBCPUFREQ_LIBS=-lcpufreq
-+   LIBCPUFREQ_LIBS=-lcpupower
- fi
- AM_CONDITIONAL(HAVE_LIBCPUFREQ, test x$have_libcpufreq = xyes)
- AC_SUBST(LIBCPUFREQ_LIBS)
diff --git a/community/gnome-applets/gnome-applets.install b/community/gnome-applets/gnome-applets.install
deleted file mode 100644
index e3441e722..000000000
--- a/community/gnome-applets/gnome-applets.install
+++ /dev/null
@@ -1,24 +0,0 @@
-pkgname=gnome-applets
-
-post_install() {
-  gconfpkg --install ${pkgname}
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/community/gnome-panel/0001-Add-the-GNOME-Flashback-session.patch b/community/gnome-panel/0001-Add-the-GNOME-Flashback-session.patch
deleted file mode 100644
index c06949310..000000000
--- a/community/gnome-panel/0001-Add-the-GNOME-Flashback-session.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From a5b951654b856d899e8c6a4116b4ccc4f18aac91 Mon Sep 17 00:00:00 2001
-From: Jeremy Bicha <jbicha@ubuntu.com>
-Date: Sun, 24 Feb 2013 17:22:29 -0500
-Subject: [PATCH] Add the GNOME Flashback session
-
-This was removed from gnome-session 3.7.4 so let's it add it back here
-(under new name)
-
-https://bugzilla.gnome.org/show_bug.cgi?id=694625
----
- data/Makefile.am                        |   18 +++++++++++++++++-
- data/gnome-flashback.desktop.in         |    7 +++++++
- data/gnome-flashback.session.desktop.in |    3 +++
- po/POTFILES.in                          |    2 ++
- 4 files changed, 29 insertions(+), 1 deletion(-)
- create mode 100644 data/gnome-flashback.desktop.in
- create mode 100644 data/gnome-flashback.session.desktop.in
-
-diff --git a/data/Makefile.am b/data/Makefile.am
-index 83f82e2..84e1954 100644
---- a/data/Makefile.am
-+++ b/data/Makefile.am
-@@ -30,17 +30,33 @@ gsettings_SCHEMAS = $(gsettings_schemas_in:.xml.in=.xml)
- 
- @GSETTINGS_RULES@
- 
-+sessiondir = $(datadir)/gnome-session/sessions
-+session_in_files = gnome-flashback.session.desktop.in
-+session_DATA = $(session_in_files:.session.desktop.in=.session)
-+
-+xsessiondir = $(datadir)/xsessions
-+xsession_in_files = gnome-flashback.desktop.in
-+xsession_DATA = $(xsession_in_files:.desktop.in=.desktop)
-+
-+%.session: %.session.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
-+
-+@INTLTOOL_DESKTOP_RULE@
-+
- default_layoutdir   = $(datadir)/gnome-panel
- default_layout_DATA = panel-default-layout.layout
- 
- EXTRA_DIST =				\
- 	$(gsettings_schemas_in_in)	\
-+	$(session_in_files)		\
-+	$(xsession_in_files)		\
- 	$(default_layout_DATA)
- 
- CLEANFILES =			\
- 	$(gsettings__enum_file)	\
- 	$(gsettings_SCHEMAS_in)	\
- 	$(gsettings_SCHEMAS)	\
--	*.gschema.valid
-+	*.gschema.valid		\
-+	$(session_DATA)		\
-+	$(xsession_DATA)
- 
- -include $(top_srcdir)/git.mk
-diff --git a/data/gnome-flashback.desktop.in b/data/gnome-flashback.desktop.in
-new file mode 100644
-index 0000000..4856f75
---- /dev/null
-+++ b/data/gnome-flashback.desktop.in
-@@ -0,0 +1,7 @@
-+[Desktop Entry]
-+_Name=GNOME Flashback
-+_Comment=This session logs you into GNOME with the traditional panel
-+Exec=gnome-session --session=gnome-flashback
-+TryExec=gnome-session
-+Icon=
-+Type=Application
-diff --git a/data/gnome-flashback.session.desktop.in b/data/gnome-flashback.session.desktop.in
-new file mode 100644
-index 0000000..c012c58
---- /dev/null
-+++ b/data/gnome-flashback.session.desktop.in
-@@ -0,0 +1,3 @@
-+[GNOME Session]
-+_Name=GNOME Flashback
-+RequiredComponents=gnome-panel;gnome-settings-daemon;gnome-screensaver;metacity;notification-daemon;polkit-gnome-authentication-agent-1;gnome-fallback-background-helper;gnome-fallback-media-keys-helper;gnome-fallback-mount-helper;
-diff --git a/po/POTFILES.in b/po/POTFILES.in
-index bc65c4c..a6aa6c7 100644
---- a/po/POTFILES.in
-+++ b/po/POTFILES.in
-@@ -23,6 +23,8 @@ applets/wncklet/window-menu.c
- applets/wncklet/wncklet.c
- applets/wncklet/workspace-switcher.c
- [type: gettext/glade]applets/wncklet/workspace-switcher.ui
-+data/gnome-flashback.desktop.in
-+data/gnome-flashback.session.desktop.in
- data/org.gnome.gnome-panel.applet.clock.gschema.xml.in.in
- data/org.gnome.gnome-panel.applet.fish.gschema.xml.in.in
- data/org.gnome.gnome-panel.applet.window-list.gschema.xml.in.in
--- 
-1.7.10.4
-
diff --git a/community/gnome-panel/18_fix_force_quit_applet.patch b/community/gnome-panel/18_fix_force_quit_applet.patch
deleted file mode 100644
index 8a72c9262..000000000
--- a/community/gnome-panel/18_fix_force_quit_applet.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-Description: Fix Force-Quit panel applet
- This patch implements handling of XInput2 extension events in the applet.
- Without this patch, the applet fails to recognize such events (either mouse
- click for killing application, or escape key for exiting), hence freezing the
- desktop.
- .
- Also fix the event mask in call of gdk_device_grab() for keyboard.
-Author: Sébastien Villemot <sebastien@debian.org>
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698740
-Forwarded: no
-Last-Update: 2013-01-28
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/gnome-panel/panel-force-quit.c
-+++ b/gnome-panel/panel-force-quit.c
-@@ -32,6 +32,8 @@
- #include <X11/Xlib.h>
- #include <X11/keysym.h>
- 
-+#include <X11/extensions/XInput2.h>
-+
- #include "panel-icon-names.h"
- #include "panel-stock-icons.h"
- 
-@@ -246,22 +248,23 @@
- 
- static void 
- handle_button_press_event (GtkWidget *popup,
--			   XKeyEvent *event)
-+			   Display *display,
-+			   Window subwindow)
- {
- 	Window window;
- 
- 	remove_popup (popup);
- 
--	if (event->subwindow == None)
-+	if (subwindow == None)
- 		return;
- 
- 	if (wm_state_atom == None)
--		wm_state_atom = XInternAtom (event->display, "WM_STATE", FALSE);
-+		wm_state_atom = XInternAtom (display, "WM_STATE", FALSE);
- 
--	window = find_managed_window (event->display, event->subwindow);
-+	window = find_managed_window (display, subwindow);
- 
- 	if (window != None) {
--		if (!gdk_x11_window_lookup_for_display (gdk_x11_lookup_xdisplay (event->display), window))
-+		if (!gdk_x11_window_lookup_for_display (gdk_x11_lookup_xdisplay (display), window))
- 			kill_window_question ((gpointer) window);
- 	}
- }
-@@ -272,10 +275,12 @@
- 	      GtkWidget *popup)
- {
- 	XEvent *xevent = (XEvent *) gdk_xevent;
-+	XIEvent *xiev;
-+	XIDeviceEvent *xidev;
- 
- 	switch (xevent->type) {
- 	case ButtonPress:
--		handle_button_press_event (popup, &xevent->xkey);
-+		handle_button_press_event (popup, xevent->xbutton.display, xevent->xbutton.subwindow);
- 		return GDK_FILTER_REMOVE;
- 	case KeyPress:
- 		if (xevent->xkey.keycode == XKeysymToKeycode (xevent->xany.display, XK_Escape)) {
-@@ -283,6 +288,21 @@
- 			return GDK_FILTER_REMOVE;
- 		}
- 		break;
-+	case GenericEvent:
-+		xiev = (XIEvent *) xevent->xcookie.data;
-+		xidev = (XIDeviceEvent *) xiev;
-+		switch (xiev->evtype) {
-+		case XI_KeyPress:
-+			if (xidev->detail == XKeysymToKeycode (xevent->xany.display, XK_Escape)) {
-+				remove_popup (popup);
-+				return GDK_FILTER_REMOVE;
-+			}
-+			break;
-+		case XI_ButtonPress:
-+			handle_button_press_event (popup, xidev->display, xidev->child);
-+			return GDK_FILTER_REMOVE;
-+		}
-+		break;
- 	default:
- 		break;
- 	}
-@@ -331,7 +351,7 @@
- 
- 	status = gdk_device_grab (keyboard, root,
- 				  GDK_OWNERSHIP_NONE, FALSE,
--				  GDK_KEY_PRESS | GDK_KEY_RELEASE,
-+				  GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK,
- 				  NULL, time);
- 	if (status != GDK_GRAB_SUCCESS) {
- 		g_warning ("Keyboard grab failed\n");
diff --git a/community/gnome-panel/PKGBUILD b/community/gnome-panel/PKGBUILD
index 4740091d5..3081043f6 100644
--- a/community/gnome-panel/PKGBUILD
+++ b/community/gnome-panel/PKGBUILD
@@ -1,53 +1,40 @@
-# $Id: PKGBUILD 96624 2013-09-02 13:22:45Z bgyorgy $
+# $Id: PKGBUILD 98191 2013-10-07 12:08:25Z jgc $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gnome-panel
 pkgname=('gnome-panel' 'gnome-flashback-session')
-pkgver=3.6.2
-pkgrel=7
+pkgver=3.8.0
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 pkgdesc="Legacy GNOME panel"
 url="https://live.gnome.org/GnomePanel"
 depends=('dconf' 'evolution-data-server' 'gconf' 'gnome-desktop' 'gnome-menus' 'librsvg'
          'libwnck3' 'telepathy-glib')
-makedepends=('gobject-introspection' 'intltool' 'yelp-tools' 'networkmanager' 'gnome-common')
+makedepends=('gobject-introspection' 'intltool' 'itstool' 'networkmanager')
 install=$pkgbase.install
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver:0:3}/$pkgbase-$pkgver.tar.xz
-        gnome-desktop-3.8.patch
-        drop-gweather-xml-include.patch
-        18_fix_force_quit_applet.patch
-        0001-Add-the-GNOME-Flashback-session.patch
-        fix-autoconf.patch)
-sha256sums=('a41c45c5512e796b8602ce50bf0d205993eab364c860aae31afa582d77b77079'
-            '3a67f4b07a7dd356fad6b40a43983f3945123ed40080eb153396a481b34efc0c'
-            'e3298c62bc577969817c5d6752be83a5129004fd344e4f7998a0d8aa61874305'
-            '9d742f675d9e09a032bfe00e0523a4ef7e234589a74a6086243bf335ce212775'
-            '79b6aab33bde167446ddea7f5c1a815dee150ba4a0678577464acbd2ba4a7504'
-            '6828c097505d2dbbf465ed7ff694adbd646a0af2105c8dd864d1061bf0afea71')
+        libgweather-3.10.patch
+        session.patch)
+sha256sums=('d1cda458a38cb4f7d2a50c61b1a72f4bf4c39cab65ae0e6cfdc4e0c122252e7a'
+            'd9e21449fc6c5f235673fe47e5b817ac7597490518a557908b14ca875263d90e'
+            'cd4c21cf394ea5a702c660bb0d31cae31260bec1cee4e7ca8ee6c8aec2707ebb')
 
-build() {
+prepare() {
   cd "$pkgbase-$pkgver"
 
-  # Port to gnome-desktop 3.8
-  patch -Np1 -i "$srcdir/gnome-desktop-3.8.patch"
-
-  # Fix build with libgweather 3.8
-  patch -Np0 -i "$srcdir/drop-gweather-xml-include.patch"
+  # Fix build with libgweather 3.10
+  patch -Np1 -i "$srcdir/libgweather-3.10.patch"
 
-  # Fix force quit applet to avoid freeze
-  patch -Np1 -i "$srcdir/18_fix_force_quit_applet.patch"
-
-  # Add GNOME Flashback session
-  # https://bugzilla.gnome.org/show_bug.cgi?id=694625
-  patch -Np1 -i "$srcdir/0001-Add-the-GNOME-Flashback-session.patch"
+  # Add more required components to the session file
+  patch -Np1 -i "$srcdir/session.patch"
+}
 
-  # Fix build
-  patch -Np1 -i "$srcdir/fix-autoconf.patch"
+build() {
+  cd "$pkgbase-$pkgver"
 
-  autoreconf -fi
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgbase \
               --disable-static --disable-schemas-compile \
               PYTHON=/usr/bin/python2 
@@ -58,11 +45,8 @@ package_gnome-panel() {
   cd "$pkgbase-$pkgver"
   make DESTDIR="$pkgdir" install
 
-  # Remove unneeded script
-  rm "$pkgdir/usr/lib/gnome-panel/gnome-panel-add"
-
   # Split out the session files
-  rm -r "$pkgdir"/usr/share/{gnome-session,xsessions}
+  rm -r "$pkgdir"/usr/{lib/gnome-panel/gnome-*,share/{gnome-session,xsessions}}
 }
 
 package_gnome-flashback-session() {
@@ -74,6 +58,7 @@ package_gnome-flashback-session() {
   install=
 
   cd "$pkgbase-$pkgver"
+  make -C gnome-panel DESTDIR="$pkgdir" install-libexecSCRIPTS
   make -C data DESTDIR="$pkgdir" install-sessionDATA
   make -C data DESTDIR="$pkgdir" install-xsessionDATA
 }
diff --git a/community/gnome-panel/drop-gweather-xml-include.patch b/community/gnome-panel/drop-gweather-xml-include.patch
deleted file mode 100644
index 3b3a559f0..000000000
--- a/community/gnome-panel/drop-gweather-xml-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- applets/clock/clock.c.orig	2012-12-25 14:38:00.101601746 -0600
-+++ applets/clock/clock.c	2012-12-25 14:38:30.331443803 -0600
-@@ -54,7 +54,6 @@
- #define GNOME_DESKTOP_USE_UNSTABLE_API
- #include <libgnome-desktop/gnome-wall-clock.h>
- 
--#include <libgweather/gweather-xml.h>
- #include <libgweather/location-entry.h>
- #include <libgweather/timezone-menu.h>
- #include <libgweather/gweather-enum-types.h>
diff --git a/community/gnome-panel/fix-autoconf.patch b/community/gnome-panel/fix-autoconf.patch
deleted file mode 100644
index 17d9e025c..000000000
--- a/community/gnome-panel/fix-autoconf.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur gnome-panel-3.6.2.orig/configure.ac gnome-panel-3.6.2/configure.ac
---- gnome-panel-3.6.2.orig/configure.ac	2012-11-12 18:51:14.000000000 +0100
-+++ gnome-panel-3.6.2/configure.ac	2013-04-10 14:50:14.132509059 +0200
-@@ -1,6 +1,6 @@
- AC_INIT([gnome-panel], [3.6.2],
-         [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-panel])
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz tar-ustar -Wno-portability])
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
- 
diff --git a/community/gnome-panel/gnome-desktop-3.8.patch b/community/gnome-panel/gnome-desktop-3.8.patch
deleted file mode 100644
index 3c8823cd2..000000000
--- a/community/gnome-panel/gnome-desktop-3.8.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-diff -Naur gnome-panel-3.6.2.orig/applets/clock/calendar-window.c gnome-panel-3.6.2/applets/clock/calendar-window.c
---- gnome-panel-3.6.2.orig/applets/clock/calendar-window.c	2012-11-12 18:35:17.000000000 +0100
-+++ gnome-panel-3.6.2/applets/clock/calendar-window.c	2013-04-08 23:10:30.451012763 +0200
-@@ -42,9 +42,6 @@
- #include <glib/gi18n.h>
- #include <gio/gio.h>
- 
--#define GNOME_DESKTOP_USE_UNSTABLE_API
--#include <libgnome-desktop/gnome-desktop-utils.h>
--
- #include "calendar-window.h"
- 
- #include "clock.h"
-@@ -168,6 +165,13 @@
- 		return;
- 	}
- 
-+	/* FIXME: reintroduce terminal support if a proper GAppInfo port of gnome-panel is ever done */
-+	if (terminal) {
-+		g_printerr ("Terminal-based calendar/tasks applications are no longer supported, sorry. "
-+		            "Please configure a different application.\n");
-+		return;
-+	}
-+
- 	command_line = g_find_program_in_path (program);
- 	if (command_line == NULL) {
- 		g_printerr ("Cannot launch calendar/tasks application: %s in path\n", program);
-@@ -189,9 +193,6 @@
- 	screen = gtk_widget_get_screen (calwin->priv->calendar);
- 	error = NULL;
- 
--	if (terminal)
--		gnome_desktop_prepend_terminal_to_vector (&argc, &argv);
--
- 	display = gdk_screen_make_display_name (screen);
- 
- 	result = g_spawn_async (NULL, /* working directory */
-diff -Naur gnome-panel-3.6.2.orig/gnome-panel/panel-run-dialog.c gnome-panel-3.6.2/gnome-panel/panel-run-dialog.c
---- gnome-panel-3.6.2.orig/gnome-panel/panel-run-dialog.c	2012-11-12 18:35:17.000000000 +0100
-+++ gnome-panel-3.6.2/gnome-panel/panel-run-dialog.c	2013-04-08 23:10:52.408175181 +0200
-@@ -25,6 +25,7 @@
-  *	Havoc Pennington <hp@pobox.com>
-  *      George Lebl <jirka@5z.com>
-  *	Mark McLoughlin <mark@skynet.ie>
-+ *	Tom Tromey (Copyright (C) 1998)
-  */
- 
- #include <config.h>
-@@ -42,8 +43,6 @@
- #include <gdk/gdkkeysyms.h>
- #include <gmenu-tree.h>
- 
--#include <libgnome-desktop/gnome-desktop-utils.h>
--
- #include <libpanel-util/panel-error.h>
- #include <libpanel-util/panel-glib.h>
- #include <libpanel-util/panel-gtk.h>
-@@ -335,6 +334,132 @@
- 	 */
- }
- 
-+
-+/**
-+ * panel_run_dialog_prepend_terminal_to_vector:
-+ * @argc: a pointer to the vector size
-+ * @argv: a pointer to the vector
-+ *
-+ * Description:  Prepends a terminal (either the one configured as default in
-+ * the user's GNOME setup, or one of the common xterm emulators) to the passed
-+ * in vector, modifying it in the process.  The vector should be allocated with
-+ * #g_malloc, as this will #g_free the original vector.  Also all elements must
-+ * have been allocated separately.  That is the standard glib/GNOME way of
-+ * doing vectors however.  If the integer that @argc points to is negative, the
-+ * size will first be computed.  Also note that passing in pointers to a vector
-+ * that is empty, will just create a new vector for you.
-+ **/
-+/* TODO: throw out this function if there ever is a proper GAppInfo port */
-+static void
-+panel_run_dialog_prepend_terminal_to_vector (int *argc, char ***argv)
-+{
-+        char **real_argv;
-+        int real_argc;
-+        int i, j;
-+	char **term_argv = NULL;
-+	int term_argc = 0;
-+	GSettings *settings;
-+
-+	gchar *terminal = NULL;
-+
-+	char **the_argv;
-+
-+        g_return_if_fail (argc != NULL);
-+        g_return_if_fail (argv != NULL);
-+
-+	/* sanity */
-+        if(*argv == NULL)
-+                *argc = 0;
-+
-+	the_argv = *argv;
-+
-+	/* compute size if not given */
-+	if (*argc < 0) {
-+		for (i = 0; the_argv[i] != NULL; i++)
-+			;
-+		*argc = i;
-+	}
-+
-+	settings = g_settings_new ("org.gnome.desktop.default-applications.terminal");
-+	terminal = g_settings_get_string (settings, "exec");
-+
-+	if (terminal) {
-+		gchar *command_line;
-+		gchar *exec_flag;
-+
-+		exec_flag = g_settings_get_string (settings, "exec-arg");
-+
-+		if (exec_flag == NULL)
-+			command_line = g_strdup (terminal);
-+		else
-+			command_line = g_strdup_printf ("%s %s", terminal,
-+							exec_flag);
-+
-+		g_shell_parse_argv (command_line,
-+				    &term_argc,
-+				    &term_argv,
-+				    NULL /* error */);
-+
-+		g_free (command_line);
-+		g_free (exec_flag);
-+		g_free (terminal);
-+	}
-+
-+	g_object_unref (settings);
-+
-+	if (term_argv == NULL) {
-+		char *check;
-+
-+		term_argc = 2;
-+		term_argv = g_new0 (char *, 3);
-+
-+		check = g_find_program_in_path ("gnome-terminal");
-+		if (check != NULL) {
-+			term_argv[0] = check;
-+			/* Note that gnome-terminal takes -x and
-+			 * as -e in gnome-terminal is broken we use that. */
-+			term_argv[1] = g_strdup ("-x");
-+		} else {
-+			if (check == NULL)
-+				check = g_find_program_in_path ("nxterm");
-+			if (check == NULL)
-+				check = g_find_program_in_path ("color-xterm");
-+			if (check == NULL)
-+				check = g_find_program_in_path ("rxvt");
-+			if (check == NULL)
-+				check = g_find_program_in_path ("xterm");
-+			if (check == NULL)
-+				check = g_find_program_in_path ("dtterm");
-+			if (check == NULL) {
-+				g_warning (_("Cannot find a terminal, using "
-+					     "xterm, even if it may not work"));
-+				check = g_strdup ("xterm");
-+			}
-+			term_argv[0] = check;
-+			term_argv[1] = g_strdup ("-e");
-+		}
-+	}
-+
-+        real_argc = term_argc + *argc;
-+        real_argv = g_new (char *, real_argc + 1);
-+
-+        for (i = 0; i < term_argc; i++)
-+                real_argv[i] = term_argv[i];
-+
-+        for (j = 0; j < *argc; j++, i++)
-+                real_argv[i] = (char *)the_argv[j];
-+
-+	real_argv[i] = NULL;
-+
-+	g_free (*argv);
-+	*argv = real_argv;
-+	*argc = real_argc;
-+
-+	/* we use g_free here as we sucked all the inner strings
-+	 * out from it into real_argv */
-+	g_free (term_argv);
-+}
-+
- static gboolean
- panel_run_dialog_launch_command (PanelRunDialog *dialog,
- 				 const char     *command,
-@@ -354,7 +479,7 @@
- 	screen = gtk_window_get_screen (GTK_WINDOW (dialog->run_dialog));
- 
- 	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->terminal_checkbox)))
--		gnome_desktop_prepend_terminal_to_vector (&argc, &argv);
-+		panel_run_dialog_prepend_terminal_to_vector (&argc, &argv);
- 
- 	display = gdk_screen_make_display_name (screen);
- 
diff --git a/community/gnome-panel/libgweather-3.10.patch b/community/gnome-panel/libgweather-3.10.patch
new file mode 100644
index 000000000..0a6e0e4e4
--- /dev/null
+++ b/community/gnome-panel/libgweather-3.10.patch
@@ -0,0 +1,15 @@
+diff -Naur gnome-panel-3.6.2.orig/applets/clock/clock-location.c gnome-panel-3.6.2/applets/clock/clock-location.c
+--- gnome-panel-3.6.2.orig/applets/clock/clock-location.c	2013-09-27 02:39:03.315952789 +0000
++++ gnome-panel-3.6.2/applets/clock/clock-location.c	2013-09-27 02:40:24.552036953 +0000
+@@ -542,9 +542,8 @@
+ 	}
+ 
+ 	priv->weather_info =
+-		gweather_info_new_for_world (priv->world,
+-					     priv->loc,
+-					     GWEATHER_FORECAST_LIST);
++		gweather_info_new (priv->loc,
++				   GWEATHER_FORECAST_LIST);
+ 	g_signal_connect (priv->weather_info, "updated",
+ 			  G_CALLBACK (weather_info_updated), loc);
+ 
diff --git a/community/gnome-panel/session.patch b/community/gnome-panel/session.patch
new file mode 100644
index 000000000..d288b41bb
--- /dev/null
+++ b/community/gnome-panel/session.patch
@@ -0,0 +1,8 @@
+diff -Naur gnome-panel-3.8.0.orig/data/gnome-flashback.session.desktop.in gnome-panel-3.8.0/data/gnome-flashback.session.desktop.in
+--- gnome-panel-3.8.0.orig/data/gnome-flashback.session.desktop.in	2013-09-27 03:12:58.291413318 +0000
++++ gnome-panel-3.8.0/data/gnome-flashback.session.desktop.in	2013-09-27 03:15:34.183583841 +0000
+@@ -1,3 +1,3 @@
+ [GNOME Session]
+ _Name=GNOME Flashback
+-RequiredComponents=gnome-panel;gnome-settings-daemon;gnome-screensaver;metacity;
++RequiredComponents=gnome-panel;gnome-settings-daemon;gnome-screensaver;metacity;notification-daemon;polkit-gnome-authentication-agent-1;gnome-fallback-background-helper;gnome-fallback-media-keys-helper;gnome-fallback-mount-helper;
diff --git a/community/gnome-phone-manager/PKGBUILD b/community/gnome-phone-manager/PKGBUILD
index 131815c10..d254b3110 100644
--- a/community/gnome-phone-manager/PKGBUILD
+++ b/community/gnome-phone-manager/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 95475 2013-08-12 20:33:04Z bgyorgy $
+# $Id: PKGBUILD 98192 2013-10-07 12:08:26Z jgc $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 
 pkgname=gnome-phone-manager
 pkgver=0.69
-pkgrel=2
+pkgrel=3
 pkgdesc="Control your mobile phone from your GNOME desktop"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://live.gnome.org/PhoneManager"
diff --git a/community/gnome-screensaver/PKGBUILD b/community/gnome-screensaver/PKGBUILD
index 5e75a441d..b7cd44c95 100644
--- a/community/gnome-screensaver/PKGBUILD
+++ b/community/gnome-screensaver/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 96399 2013-08-27 14:10:08Z bgyorgy $
+# $Id: PKGBUILD 98193 2013-10-07 12:08:28Z jgc $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 # Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-screensaver
 pkgver=3.6.1
-pkgrel=5
+pkgrel=6
 pkgdesc="Legacy GNOME screensaver"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -25,7 +25,7 @@ sha256sums=('f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0'
             'c4da9c18b543ecbc781c1f103321b324a855bdd0979fd36b437f6033736ad4bb'
             '516c479558576c6c5a2509abfcbf4fdafb5953d252e7a4ab972f9db6137daca8')
 
-build() {
+prepare() {
   cd "$pkgname-$pkgver"
 
   # Upstream patch that moves gnome-screensaver desktop file out of autostart
@@ -36,6 +36,10 @@ build() {
 
   # Lock screen on suspend with systemd
   patch -Np1 -i "$srcdir/lock_screen_on_suspend.patch"
+}
+
+build() {
+  cd "$pkgname-$pkgver"
 
   autoreconf -fi
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
diff --git a/community/gnome-settings-daemon-compat/PKGBUILD b/community/gnome-settings-daemon-compat/PKGBUILD
deleted file mode 100644
index 8c2ae9f43..000000000
--- a/community/gnome-settings-daemon-compat/PKGBUILD
+++ /dev/null
@@ -1,75 +0,0 @@
-# $Id: PKGBUILD 88930 2013-04-24 22:24:31Z bgyorgy $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=gnome-settings-daemon-compat
-_pkgname=gnome-settings-daemon
-pkgver=3.6.4
-pkgrel=3
-pkgdesc="Compatibility package that provides background, media keys and mount helpers for the Gnome Flashback session"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gnome-settings-daemon')
-makedepends=('docbook-xsl' 'intltool' 'xf86-input-wacom')
-url="https://live.gnome.org/GnomeFlashback"
-source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz
-        standalone-background-helper.patch
-        standalone-media-keys-helper.patch
-        draw-background-unconditionally.patch
-        sessionisactive-port.patch
-        revert-input-sources.patch
-        xinput.patch 
-        remove-libgsd-dependency.patch
-        move-desktop-file.patch)
-sha256sums=('3db993f2dbabc0c9d06a309bb12c9a7104b9cdda414ac4b1c301f5114a441c15'
-            '2e7e40175533556493bb58795a2c1b4e53b4baba35d151e632b933c6077456d9'
-            'ddc4dfaa8083ff24a7d2fb6138b8c3fee5d4e6c60c24b4e80a39392d0c8f2162'
-            '1b6b8216434b766e1389e876cba5d6ab61498c5824f6d2cc5d67dcf58a07842a'
-            '0821f469cd168f3a131da513a5f9dd352c06f9bc31d57d79de4dc063fa2de915'
-            '02da2467e287620c3b717c7ff5ffea7403cce714d5aa32e27d051b6571451e2a'
-            'fe8cafee074e36a7a393c9ae7f65db1c13a0959213aaae94ab8a3543bf20a25d'
-            '730f11d5689892fbab9aa2896f3720e813d17e2455f34fd3a0751e49f5b4c26c'
-            'c58ace67581a1e14dc21efc8d22dd1f385cd05483d67e8a385b0767a8daf9fb4')
-
-build() {
-  cd $_pkgname-$pkgver
-
-  # Build background and media keys helpers as a stand alone binary
-  patch -Np1 -i ../standalone-background-helper.patch
-  patch -Np1 -i ../standalone-media-keys-helper.patch
-
-  # Always draw background
-  patch -Np1 -i ../draw-background-unconditionally.patch
-
-  # Port to gnome-session's SessionIsActive property
-  patch -Np1 -i ../sessionisactive-port.patch
-
-  # Add compatibility patches for media keys plugin
-  patch -Np1 -i ../revert-input-sources.patch
-  patch -Np1 -i ../xinput.patch
-
-  # Remove libgsd dependency
-  patch -Np1 -i ../remove-libgsd-dependency.patch
-
-  # Move desktop files out of autostart, so they can be easily reusable in custom sessions
-  patch -Np1 -i ../move-desktop-file.patch
-
-  autoreconf -fi
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$_pkgname \
-              --disable-static --enable-systemd
-
-  # https://bugzilla.gnome.org/show_bug.cgi?id=656231
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-  make -C plugins/common
-  make -C plugins/automount
-  make -C plugins/background
-  make -C plugins/media-keys
-}
-
-package() {
-  cd $_pkgname-$pkgver
-  make -C plugins/automount DESTDIR="$pkgdir" install
-  make -C plugins/background DESTDIR="$pkgdir" install
-  make -C plugins/media-keys DESTDIR="$pkgdir" install
-}
diff --git a/community/gnome-settings-daemon-compat/draw-background-unconditionally.patch b/community/gnome-settings-daemon-compat/draw-background-unconditionally.patch
deleted file mode 100644
index c279420de..000000000
--- a/community/gnome-settings-daemon-compat/draw-background-unconditionally.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gsd-background-manager.c gnome-settings-daemon-3.6.4/plugins/background/gsd-background-manager.c
---- gnome-settings-daemon-3.6.4.orig/plugins/background/gsd-background-manager.c	2013-01-10 14:37:58.000000000 +0100
-+++ gnome-settings-daemon-3.6.4/plugins/background/gsd-background-manager.c	2013-04-10 16:33:15.858860586 +0200
-@@ -69,110 +69,6 @@
- 
- static gpointer manager_object = NULL;
- 
--static gboolean
--dont_draw_background (GsdBackgroundManager *manager)
--{
--        return !g_settings_get_boolean (manager->priv->settings,
--                                        "draw-background");
--}
--
--static gboolean
--nautilus_is_drawing_background (GsdBackgroundManager *manager)
--{
--       Atom           window_id_atom;
--       Window         nautilus_xid;
--       Atom           actual_type;
--       int            actual_format;
--       unsigned long  nitems;
--       unsigned long  bytes_after;
--       unsigned char *data;
--       Atom           wmclass_atom;
--       gboolean       running;
--       gint           error;
--       gboolean       show_desktop_icons;
--
--       show_desktop_icons = g_settings_get_boolean (manager->priv->settings,
--                                                     "show-desktop-icons");
--       if (! show_desktop_icons) {
--               return FALSE;
--       }
--
--       window_id_atom = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
--                                     "NAUTILUS_DESKTOP_WINDOW_ID", True);
--
--       if (window_id_atom == None) {
--               return FALSE;
--       }
--
--       XGetWindowProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
--                           GDK_ROOT_WINDOW (),
--                           window_id_atom,
--                           0,
--                           1,
--                           False,
--                           XA_WINDOW,
--                           &actual_type,
--                           &actual_format,
--                           &nitems,
--                           &bytes_after,
--                           &data);
--
--       if (data != NULL) {
--               nautilus_xid = *(Window *) data;
--               XFree (data);
--       } else {
--               return FALSE;
--       }
--
--       if (actual_type != XA_WINDOW) {
--               return FALSE;
--       }
--       if (actual_format != 32) {
--               return FALSE;
--       }
--
--       wmclass_atom = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), "WM_CLASS", False);
--
--       gdk_error_trap_push ();
--
--       XGetWindowProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
--                           nautilus_xid,
--                           wmclass_atom,
--                           0,
--                           24,
--                           False,
--                           XA_STRING,
--                           &actual_type,
--                           &actual_format,
--                           &nitems,
--                           &bytes_after,
--                           &data);
--
--       error = gdk_error_trap_pop ();
--
--       if (error == BadWindow) {
--               return FALSE;
--       }
--
--       if (actual_type == XA_STRING &&
--           nitems == 24 &&
--           bytes_after == 0 &&
--           actual_format == 8 &&
--           data != NULL &&
--           !strcmp ((char *)data, "desktop_window") &&
--           !strcmp ((char *)data + strlen ((char *)data) + 1, "Nautilus")) {
--               running = TRUE;
--       } else {
--               running = FALSE;
--       }
--
--       if (data != NULL) {
--               XFree (data);
--       }
--
--       return running;
--}
--
- static void
- on_crossfade_finished (GsdBackgroundManager *manager)
- {
-@@ -189,11 +85,6 @@
-         int         i;
- 
- 
--        if (nautilus_is_drawing_background (manager) ||
--            dont_draw_background (manager)) {
--                return;
--        }
--
-         gnome_settings_profile_start (NULL);
- 
-         display = gdk_display_get_default ();
-@@ -408,8 +299,7 @@
-                          const char           *key,
-                          GsdBackgroundManager *manager)
- {
--        if (dont_draw_background (manager) == FALSE)
--                setup_bg_and_draw_background (manager);
-+        setup_bg_and_draw_background (manager);
- }
- 
- gboolean
-@@ -422,24 +312,8 @@
-         gnome_settings_profile_start (NULL);
- 
-         manager->priv->settings = g_settings_new ("org.gnome.desktop.background");
--        g_signal_connect (manager->priv->settings, "changed::draw-background",
--                          G_CALLBACK (draw_background_changed), manager);
- 
--        /* If this is set, nautilus will draw the background and is
--	 * almost definitely in our session.  however, it may not be
--	 * running yet (so is_nautilus_running() will fail).  so, on
--	 * startup, just don't do anything if this key is set so we
--	 * don't waste time setting the background only to have
--	 * nautilus overwrite it.
--	 */
--        show_desktop_icons = g_settings_get_boolean (manager->priv->settings,
--                                                     "show-desktop-icons");
--
--        if (!show_desktop_icons) {
--                setup_bg (manager);
--        } else {
--                draw_background_after_session_loads (manager);
--        }
-+        setup_bg (manager);
- 
-         gnome_settings_profile_end (NULL);
- 
diff --git a/community/gnome-settings-daemon-compat/move-desktop-file.patch b/community/gnome-settings-daemon-compat/move-desktop-file.patch
deleted file mode 100644
index fe9272767..000000000
--- a/community/gnome-settings-daemon-compat/move-desktop-file.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/automount/gnome-fallback-mount-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/automount/gnome-fallback-mount-helper.desktop.in.in
---- gnome-settings-daemon-3.6.4.orig/plugins/automount/gnome-fallback-mount-helper.desktop.in.in	2013-04-24 23:13:10.169941000 +0200
-+++ gnome-settings-daemon-3.6.4/plugins/automount/gnome-fallback-mount-helper.desktop.in.in	2013-04-24 23:13:41.064001562 +0200
-@@ -9,4 +9,3 @@
- NoDisplay=true
- OnlyShowIn=GNOME;Unity;
- X-GNOME-Autostart-Notify=true
--AutostartCondition=GNOME3 if-session gnome-fallback
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/automount/Makefile.am gnome-settings-daemon-3.6.4/plugins/automount/Makefile.am
---- gnome-settings-daemon-3.6.4.orig/plugins/automount/Makefile.am	2013-04-24 23:13:12.830004000 +0200
-+++ gnome-settings-daemon-3.6.4/plugins/automount/Makefile.am	2013-04-24 23:13:36.613896914 +0200
-@@ -21,7 +21,7 @@
- 	$(SYSTEMD_LIBS)			\
- 	$(AUTOMOUNT_LIBS)
- 
--autostartdir = $(sysconfdir)/xdg/autostart
-+autostartdir = $(datadir)/applications
- autostart_in_files = gnome-fallback-mount-helper.desktop.in
- autostart_in_in_files = gnome-fallback-mount-helper.desktop.in.in
- autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.desktop.in.in
---- gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.desktop.in.in	2013-04-24 23:13:07.229872000 +0200
-+++ gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.desktop.in.in	2013-04-24 23:13:43.670729520 +0200
-@@ -9,4 +9,3 @@
- NoDisplay=true
- OnlyShowIn=GNOME;Unity;
- X-GNOME-Autostart-Notify=true
--AutostartCondition=GNOME3 if-session gnome-fallback
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/Makefile.am gnome-settings-daemon-3.6.4/plugins/background/Makefile.am
---- gnome-settings-daemon-3.6.4.orig/plugins/background/Makefile.am	2013-04-24 23:13:04.913151000 +0200
-+++ gnome-settings-daemon-3.6.4/plugins/background/Makefile.am	2013-04-24 23:13:47.907495798 +0200
-@@ -17,7 +17,7 @@
- 	$(SETTINGS_PLUGIN_LIBS)		\
- 	$(BACKGROUND_LIBS)
- 
--autostartdir = $(sysconfdir)/xdg/autostart
-+autostartdir = $(datadir)/applications
- autostart_in_files = gnome-fallback-background-helper.desktop.in
- autostart_in_in_files = gnome-fallback-background-helper.desktop.in.in
- autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in
---- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in	2013-04-24 23:12:58.579668000 +0200
-+++ gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in	2013-04-24 23:13:51.747586073 +0200
-@@ -9,4 +9,3 @@
- NoDisplay=true
- OnlyShowIn=GNOME;Unity;
- X-GNOME-Autostart-Notify=true
--AutostartCondition=GNOME3 if-session gnome-fallback
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/Makefile.am gnome-settings-daemon-3.6.4/plugins/media-keys/Makefile.am
---- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/Makefile.am	2013-04-24 23:13:02.026416000 +0200
-+++ gnome-settings-daemon-3.6.4/plugins/media-keys/Makefile.am	2013-04-24 23:13:54.570985777 +0200
-@@ -75,7 +75,7 @@
- 	$(MEDIA_KEYS_LIBS)			\
- 	-lm
- 
--autostartdir = $(sysconfdir)/xdg/autostart
-+autostartdir = $(datadir)/applications
- autostart_in_files = gnome-fallback-media-keys-helper.desktop.in
- autostart_in_in_files = gnome-fallback-media-keys-helper.desktop.in.in
- autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
diff --git a/community/gnome-settings-daemon-compat/remove-libgsd-dependency.patch b/community/gnome-settings-daemon-compat/remove-libgsd-dependency.patch
deleted file mode 100644
index b843ac2ce..000000000
--- a/community/gnome-settings-daemon-compat/remove-libgsd-dependency.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/automount/gsd-automount-manager.c gnome-settings-daemon-3.6.4/plugins/automount/gsd-automount-manager.c
---- gnome-settings-daemon-3.6.4.orig/plugins/automount/gsd-automount-manager.c	2013-04-10 17:19:51.796298000 +0200
-+++ gnome-settings-daemon-3.6.4/plugins/automount/gsd-automount-manager.c	2013-04-10 17:31:27.382311947 +0200
-@@ -28,13 +28,43 @@
- #include <glib/gi18n.h>
- #include <gio/gio.h>
- 
--#include "gnome-settings-profile.h"
--#include "gnome-settings-session.h"
- #include "gsd-automount-manager.h"
- #include "gsd-autorun.h"
- 
- #define GSD_AUTOMOUNT_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_AUTOMOUNT_MANAGER, GsdAutomountManagerPrivate))
- 
-+#define GNOME_SESSION_DBUS_NAME      "org.gnome.SessionManager"
-+#define GNOME_SESSION_DBUS_OBJECT    "/org/gnome/SessionManager"
-+#define GNOME_SESSION_DBUS_INTERFACE "org.gnome.SessionManager"
-+
-+GDBusProxy *
-+get_session_proxy (void)
-+{
-+        static GDBusProxy *session_proxy;
-+        GError *error =  NULL;
-+
-+        if (session_proxy != NULL) {
-+                g_object_ref (session_proxy);
-+        } else {
-+                session_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
-+                                                               G_DBUS_PROXY_FLAGS_NONE,
-+                                                               NULL,
-+                                                               GNOME_SESSION_DBUS_NAME,
-+                                                               GNOME_SESSION_DBUS_OBJECT,
-+                                                               GNOME_SESSION_DBUS_INTERFACE,
-+                                                               NULL,
-+                                                               &error);
-+                if (error) {
-+                        g_warning ("Failed to connect to the session manager: %s", error->message);
-+                        g_error_free (error);
-+                } else {
-+                        g_object_add_weak_pointer (G_OBJECT (session_proxy), (gpointer*)&session_proxy);
-+                }
-+        }
-+
-+        return session_proxy;
-+}
-+
- struct GsdAutomountManagerPrivate
- {
-         GSettings   *settings;
-@@ -315,7 +345,7 @@
- static void
- do_initialize_session (GsdAutomountManager *manager)
- {
--        manager->priv->session = gnome_settings_session_get_session_proxy ();
-+        manager->priv->session = get_session_proxy ();
-         g_signal_connect (manager->priv->session, "g-properties-changed",
-                           G_CALLBACK (session_props_changed), manager);
-         session_props_changed (manager->priv->session, NULL, NULL, manager);
-@@ -490,13 +520,10 @@
-                                        GError              **error)
- {
-         g_debug ("Starting automounting manager");
--        gnome_settings_profile_start (NULL);
- 
-         manager->priv->settings = g_settings_new ("org.gnome.desktop.media-handling");
-         setup_automounter (manager);
- 
--        gnome_settings_profile_end (NULL);
--
-         return TRUE;
- }
- 
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/automount/Makefile.am gnome-settings-daemon-3.6.4/plugins/automount/Makefile.am
---- gnome-settings-daemon-3.6.4.orig/plugins/automount/Makefile.am	2013-01-10 14:37:58.000000000 +0100
-+++ gnome-settings-daemon-3.6.4/plugins/automount/Makefile.am	2013-04-10 17:33:09.697997021 +0200
-@@ -8,7 +8,6 @@
- 	gsd-autorun.h
- 
- gnome_fallback_mount_helper_CPPFLAGS = \
--	-I$(top_srcdir)/gnome-settings-daemon		\
- 	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
- 	$(AM_CPPFLAGS)
- 
-@@ -20,8 +19,7 @@
- gnome_fallback_mount_helper_LDADD =	\
- 	$(SETTINGS_PLUGIN_LIBS)		\
- 	$(SYSTEMD_LIBS)			\
--	$(AUTOMOUNT_LIBS)		\
--	$(top_builddir)/gnome-settings-daemon/libgsd.la
-+	$(AUTOMOUNT_LIBS)
- 
- autostartdir = $(sysconfdir)/xdg/autostart
- autostart_in_files = gnome-fallback-mount-helper.desktop.in
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gsd-background-manager.c gnome-settings-daemon-3.6.4/plugins/background/gsd-background-manager.c
---- gnome-settings-daemon-3.6.4.orig/plugins/background/gsd-background-manager.c	2013-04-10 17:19:51.792965000 +0200
-+++ gnome-settings-daemon-3.6.4/plugins/background/gsd-background-manager.c	2013-04-10 17:22:46.930334951 +0200
-@@ -42,7 +42,6 @@
- #include <libgnome-desktop/gnome-bg.h>
- #include <X11/Xatom.h>
- 
--#include "gnome-settings-profile.h"
- #include "gsd-background-manager.h"
- 
- #define GSD_BACKGROUND_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_BACKGROUND_MANAGER, GsdBackgroundManagerPrivate))
-@@ -85,8 +84,6 @@
-         int         i;
- 
- 
--        gnome_settings_profile_start (NULL);
--
-         display = gdk_display_get_default ();
-         n_screens = gdk_display_get_n_screens (display);
- 
-@@ -121,8 +118,6 @@
- 
-                 cairo_surface_destroy (surface);
-         }
--
--        gnome_settings_profile_end (NULL);
- }
- 
- static void
-@@ -309,14 +304,11 @@
-         gboolean show_desktop_icons;
- 
-         g_debug ("Starting background manager");
--        gnome_settings_profile_start (NULL);
- 
-         manager->priv->settings = g_settings_new ("org.gnome.desktop.background");
- 
-         setup_bg (manager);
- 
--        gnome_settings_profile_end (NULL);
--
-         return TRUE;
- }
- 
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/Makefile.am gnome-settings-daemon-3.6.4/plugins/background/Makefile.am
---- gnome-settings-daemon-3.6.4.orig/plugins/background/Makefile.am	2013-04-10 17:43:32.768975155 +0200
-+++ gnome-settings-daemon-3.6.4/plugins/background/Makefile.am	2013-04-10 17:43:19.115328380 +0200
-@@ -6,18 +6,16 @@
- 	gsd-background-manager.h
- 
- gnome_fallback_background_helper_CPPFLAGS = \
--	-I$(top_srcdir)/gnome-settings-daemon		\
- 	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
- 	$(AM_CPPFLAGS)
- 
- gnome_fallback_background_helper_CFLAGS =	\
- 	$(SETTINGS_PLUGIN_CFLAGS)	\
- 	$(BACKGROUND_CFLAGS)
- 
- gnome_fallback_background_helper_LDADD =	\
- 	$(SETTINGS_PLUGIN_LIBS)		\
--	$(BACKGROUND_LIBS)		\
--	$(top_builddir)/gnome-settings-daemon/libgsd.la
-+	$(BACKGROUND_LIBS)
- 
- autostartdir = $(sysconfdir)/xdg/autostart
- autostart_in_files = gnome-fallback-background-helper.desktop.in
diff --git a/community/gnome-settings-daemon-compat/revert-input-sources.patch b/community/gnome-settings-daemon-compat/revert-input-sources.patch
deleted file mode 100644
index dc769de4e..000000000
--- a/community/gnome-settings-daemon-compat/revert-input-sources.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-From cc45fec342713745f391533a202976e97670f9e5 Mon Sep 17 00:00:00 2001
-From: Rui Matos <tiagomatos@gmail.com>
-Date: Wed, 12 Dec 2012 09:31:40 +0000
-Subject: Revert "media-keys: Add key bindings to switch input sources"
-
-These are now provided by gnome-shell.
-
-This reverts commit fc58c347900f906e304591135ca6c13d9950ab4d.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=690106
----
-diff --git a/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in b/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
-index b56b5d1..25e5f3e 100644
---- a/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
-+++ b/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
-@@ -175,16 +175,6 @@
-       <_summary>Magnifier zoom out</_summary>
-       <_description>Binding for the magnifier to zoom out</_description>
-     </key>
--    <key name="switch-input-source" type="s">
--      <default>''</default>
--      <_summary>Switch input source</_summary>
--      <_description>Binding to select the next input source</_description>
--    </key>
--    <key name="switch-input-source-backward" type="s">
--      <default>''</default>
--      <_summary>Switch input source backward</_summary>
--      <_description>Binding to select the previous input source</_description>
--    </key>
-   </schema>
- 
-   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.media-keys.custom-keybinding">
-diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
-index e5977d0..cd6fbc2 100644
---- a/plugins/media-keys/gsd-media-keys-manager.c
-+++ b/plugins/media-keys/gsd-media-keys-manager.c
-@@ -98,10 +98,6 @@ static const gchar introspection_xml[] =
- #define VOLUME_STEP 6           /* percents for one volume button press */
- #define MAX_VOLUME 65536.0
- 
--#define GNOME_DESKTOP_INPUT_SOURCES_DIR "org.gnome.desktop.input-sources"
--#define KEY_CURRENT_INPUT_SOURCE "current"
--#define KEY_INPUT_SOURCES        "sources"
--
- #define GSD_MEDIA_KEYS_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_MEDIA_KEYS_MANAGER, GsdMediaKeysManagerPrivate))
- 
- typedef struct {
-@@ -1807,40 +1803,6 @@ do_keyboard_brightness_action (GsdMediaKeysManager *manager,
- }
- 
- static void
--do_switch_input_source_action (GsdMediaKeysManager *manager,
--                               MediaKeyType         type)
--{
--        GSettings *settings;
--        GVariant *sources;
--        gint i, n;
--
--        settings = g_settings_new (GNOME_DESKTOP_INPUT_SOURCES_DIR);
--        sources = g_settings_get_value (settings, KEY_INPUT_SOURCES);
--
--        n = g_variant_n_children (sources);
--        if (n < 2)
--                goto out;
--
--        i = g_settings_get_uint (settings, KEY_CURRENT_INPUT_SOURCE);
--
--        if (type == SWITCH_INPUT_SOURCE_KEY)
--                i += 1;
--        else
--                i -= 1;
--
--        if (i < 0)
--                i = n - 1;
--        else if (i >= n)
--                i = 0;
--
--        g_settings_set_uint (settings, KEY_CURRENT_INPUT_SOURCE, i);
--
-- out:
--        g_variant_unref (sources);
--        g_object_unref (settings);
--}
--
--static void
- do_custom_action (GsdMediaKeysManager *manager,
-                   MediaKey            *key,
-                   gint64               timestamp)
-@@ -1999,10 +1961,6 @@ do_action (GsdMediaKeysManager *manager,
-         case BATTERY_KEY:
-                 do_execute_desktop (manager, "gnome-power-statistics.desktop", timestamp);
-                 break;
--        case SWITCH_INPUT_SOURCE_KEY:
--        case SWITCH_INPUT_SOURCE_BACKWARD_KEY:
--                do_switch_input_source_action (manager, type);
--                break;
-         /* Note, no default so compiler catches missing keys */
-         case CUSTOM_KEY:
-                 g_assert_not_reached ();
-diff --git a/plugins/media-keys/shortcuts-list.h b/plugins/media-keys/shortcuts-list.h
-index a16d0e7..437ed2c 100644
---- a/plugins/media-keys/shortcuts-list.h
-+++ b/plugins/media-keys/shortcuts-list.h
-@@ -80,8 +80,6 @@ typedef enum {
-         KEYBOARD_BRIGHTNESS_DOWN_KEY,
-         KEYBOARD_BRIGHTNESS_TOGGLE_KEY,
-         BATTERY_KEY,
--        SWITCH_INPUT_SOURCE_KEY,
--        SWITCH_INPUT_SOURCE_BACKWARD_KEY,
-         CUSTOM_KEY
- } MediaKeyType;
- 
-@@ -148,8 +146,6 @@ static struct {
-         { KEYBOARD_BRIGHTNESS_UP_KEY, NULL, "XF86KbdBrightnessUp" },
-         { KEYBOARD_BRIGHTNESS_DOWN_KEY, NULL, "XF86KbdBrightnessDown" },
-         { KEYBOARD_BRIGHTNESS_TOGGLE_KEY, NULL, "XF86KbdLightOnOff" },
--        { SWITCH_INPUT_SOURCE_KEY, "switch-input-source", NULL },
--        { SWITCH_INPUT_SOURCE_BACKWARD_KEY, "switch-input-source-backward", NULL },
-         { BATTERY_KEY, NULL, "XF86Battery" },
- };
- 
---
-cgit v0.9.1
diff --git a/community/gnome-settings-daemon-compat/sessionisactive-port.patch b/community/gnome-settings-daemon-compat/sessionisactive-port.patch
deleted file mode 100644
index dc5fd260e..000000000
--- a/community/gnome-settings-daemon-compat/sessionisactive-port.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 32b0b2d85629ae765543df1d940a5ca3c37dcec1 Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters@verbum.org>
-Date: Tue, 06 Nov 2012 22:47:05 +0000
-Subject: [wip] Port to gnome-session's SessionIsActive property
-
-Rather than maintaining the systemd code here, monitor gnome-session's
-SessionIsActive property.  This allows us to drop the compile-time
-dependency on systemd.
-
-The power plugin is declared dependent on systemd at runtime, but the
-rest of the code should operate in more "basic functionality" mode.
----
-(limited to 'plugins/automount')
-
-diff --git a/plugins/automount/gsd-automount-manager.c b/plugins/automount/gsd-automount-manager.c
-index 7912f19..d8e9e07 100644
---- a/plugins/automount/gsd-automount-manager.c
-+++ b/plugins/automount/gsd-automount-manager.c
-@@ -42,7 +42,7 @@ struct GsdAutomountManagerPrivate
- 	GVolumeMonitor *volume_monitor;
- 	unsigned int automount_idle_id;
- 
--        GnomeSettingsSession *session;
-+        GDBusProxy *session;
-         gboolean session_is_active;
-         gboolean screensaver_active;
-         guint ss_watch_id;
-@@ -288,17 +288,21 @@ mount_added_callback (GVolumeMonitor *monitor,
- 
- 
- static void
--session_state_changed (GnomeSettingsSession *session, GParamSpec *pspec, gpointer user_data)
-+session_props_changed (GDBusProxy *session, GVariant *v, char **props, gpointer user_data)
- {
-         GsdAutomountManager *manager = user_data;
-         GsdAutomountManagerPrivate *p = manager->priv;
-+        GVariant *active_v = NULL;
-+        gboolean is_active;
- 
--        if (gnome_settings_session_get_state (session) == GNOME_SETTINGS_SESSION_STATE_ACTIVE) {
--                p->session_is_active = TRUE;
--        }
--        else {
--                p->session_is_active = FALSE;
--        }
-+        active_v = g_dbus_proxy_get_cached_property (session, "SessionIsActive");
-+        if (!active_v)
-+                return;
-+
-+        g_variant_get (active_v, "b", &is_active);
-+        g_variant_unref (active_v);
-+        g_printerr ("AUTOMOUNT: session is active: %d -> %d\n", p->session_is_active, is_active);
-+        p->session_is_active = is_active;
- 
-         if (!p->session_is_active) {
-                 if (p->volume_queue != NULL) {
-@@ -311,10 +315,10 @@ session_state_changed (GnomeSettingsSession *session, GParamSpec *pspec, gpointe
- static void
- do_initialize_session (GsdAutomountManager *manager)
- {
--        manager->priv->session = gnome_settings_session_new ();
--        g_signal_connect (manager->priv->session, "notify::state",
--                          G_CALLBACK (session_state_changed), manager);
--        session_state_changed (manager->priv->session, NULL, manager);
-+        manager->priv->session = gnome_settings_session_get_session_proxy ();
-+        g_signal_connect (manager->priv->session, "g-properties-changed",
-+                          G_CALLBACK (session_props_changed), manager);
-+        session_props_changed (manager->priv->session, NULL, NULL, manager);
- }
- 
- #define SCREENSAVER_NAME "org.gnome.ScreenSaver"
---
-cgit v0.9.1
diff --git a/community/gnome-settings-daemon-compat/standalone-background-helper.patch b/community/gnome-settings-daemon-compat/standalone-background-helper.patch
deleted file mode 100644
index b52de042f..000000000
--- a/community/gnome-settings-daemon-compat/standalone-background-helper.patch
+++ /dev/null
@@ -1,437 +0,0 @@
-diff -Naur gnome-settings-daemon-3.6.4.orig/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in gnome-settings-daemon-3.6.4/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
---- gnome-settings-daemon-3.6.4.orig/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in	2013-01-10 14:37:58.000000000 +0100
-+++ gnome-settings-daemon-3.6.4/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in	2013-04-10 17:39:36.446882275 +0200
-@@ -2,7 +2,6 @@
-   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins" path="/org/gnome/settings-daemon/plugins/">
-     <child name="a11y-keyboard" schema="org.gnome.settings-daemon.plugins.a11y-keyboard"/>
-     <child name="a11y-settings" schema="org.gnome.settings-daemon.plugins.a11y-settings"/>
--    <child name="background" schema="org.gnome.settings-daemon.plugins.background"/>
-     <child name="clipboard" schema="org.gnome.settings-daemon.plugins.clipboard"/>
-     <child name="color" schema="org.gnome.settings-daemon.plugins.color"/>
-     <child name="cursor" schema="org.gnome.settings-daemon.plugins.cursor"/>
-@@ -45,18 +44,6 @@
-       <_summary>Priority to use for this plugin</_summary>
-       <_description>Priority to use for this plugin in gnome-settings-daemon startup queue</_description>
-     </key>
--  </schema>
--  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.background" path="/org/gnome/settings-daemon/plugins/background/">
--    <key name="active" type="b">
--      <default>true</default>
--      <_summary>Activation of this plugin</_summary>
--      <_description>Whether this plugin would be activated by gnome-settings-daemon or not</_description>
--    </key>
--    <key name="priority" type="i">
--      <default>97</default>
--      <_summary>Priority to use for this plugin</_summary>
--      <_description>Priority to use for this plugin in gnome-settings-daemon startup queue</_description>
--    </key>
-   </schema>
-   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.clipboard" path="/org/gnome/settings-daemon/plugins/clipboard/">
-     <key name="active" type="b">
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/background.gnome-settings-plugin.in gnome-settings-daemon-3.6.4/plugins/background/background.gnome-settings-plugin.in
---- gnome-settings-daemon-3.6.4.orig/plugins/background/background.gnome-settings-plugin.in	2012-04-07 15:21:20.000000000 +0200
-+++ gnome-settings-daemon-3.6.4/plugins/background/background.gnome-settings-plugin.in	1970-01-01 01:00:00.000000000 +0100
-@@ -1,8 +0,0 @@
--[GNOME Settings Plugin]
--Module=background
--IAge=0
--_Name=Background
--_Description=Background plugin
--Authors=
--Copyright=Copyright © 2007
--Website=
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.c gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.c
---- gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.c	1970-01-01 01:00:00.000000000 +0100
-+++ gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.c	2013-04-10 17:39:36.450215685 +0200
-@@ -0,0 +1,65 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-+ *
-+ * Copyright (C) 2010 Red Hat, Inc.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ * Author: Tomas Bzatek <tbzatek@redhat.com>
-+ */
-+
-+#include "config.h"
-+
-+#include <glib.h>
-+#include <glib/gi18n.h>
-+#include <unistd.h>
-+#include <gtk/gtk.h>
-+
-+#include "gsd-background-manager.h"
-+
-+int
-+main (int argc,
-+      char **argv)
-+{
-+        GMainLoop *loop;
-+        GsdBackgroundManager *manager;
-+        GError *error = NULL;
-+
-+        g_type_init ();
-+        gtk_init (&argc, &argv);
-+
-+        bindtextdomain (GETTEXT_PACKAGE, GNOME_SETTINGS_LOCALEDIR);
-+        bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-+        textdomain (GETTEXT_PACKAGE);
-+
-+        loop = g_main_loop_new (NULL, FALSE);
-+        manager = gsd_background_manager_new ();
-+
-+        gsd_background_manager_start (manager, &error);
-+
-+        if (error != NULL) {
-+                g_printerr ("Unable to start the background manager: %s",
-+                            error->message);
-+
-+                g_error_free (error);
-+                _exit (1);
-+        }
-+
-+        g_main_loop_run (loop);
-+
-+        gsd_background_manager_stop (manager);
-+        g_main_loop_unref (loop);
-+
-+        return 0;
-+}
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.desktop.in.in
---- gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.desktop.in.in	1970-01-01 01:00:00.000000000 +0100
-+++ gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.desktop.in.in	2013-04-10 17:39:36.450215685 +0200
-@@ -0,0 +1,12 @@
-+[Desktop Entry]
-+_Name=Background
-+_Comment=Background plugin
-+Exec=@LIBEXECDIR@/gnome-fallback-background-helper
-+Icon=desktop
-+Terminal=false
-+Type=Application
-+Categories=
-+NoDisplay=true
-+OnlyShowIn=GNOME;Unity;
-+X-GNOME-Autostart-Notify=true
-+AutostartCondition=GNOME3 if-session gnome-fallback
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gsd-background-plugin.c gnome-settings-daemon-3.6.4/plugins/background/gsd-background-plugin.c
---- gnome-settings-daemon-3.6.4.orig/plugins/background/gsd-background-plugin.c	2013-01-10 14:37:58.000000000 +0100
-+++ gnome-settings-daemon-3.6.4/plugins/background/gsd-background-plugin.c	1970-01-01 01:00:00.000000000 +0100
-@@ -1,104 +0,0 @@
--/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-- *
-- * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; either version 2, or (at your option)
-- * any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- *
-- */
--
--#include "config.h"
--
--#include <glib/gi18n-lib.h>
--#include <gmodule.h>
--
--#include "gnome-settings-plugin.h"
--#include "gsd-background-plugin.h"
--#include "gsd-background-manager.h"
--
--struct GsdBackgroundPluginPrivate {
--        GsdBackgroundManager *manager;
--};
--
--#define GSD_BACKGROUND_PLUGIN_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), GSD_TYPE_BACKGROUND_PLUGIN, GsdBackgroundPluginPrivate))
--
--GNOME_SETTINGS_PLUGIN_REGISTER (GsdBackgroundPlugin, gsd_background_plugin)
--
--static void
--gsd_background_plugin_init (GsdBackgroundPlugin *plugin)
--{
--        plugin->priv = GSD_BACKGROUND_PLUGIN_GET_PRIVATE (plugin);
--
--        g_debug ("GsdBackgroundPlugin initializing");
--
--        plugin->priv->manager = gsd_background_manager_new ();
--}
--
--static void
--gsd_background_plugin_finalize (GObject *object)
--{
--        GsdBackgroundPlugin *plugin;
--
--        g_return_if_fail (object != NULL);
--        g_return_if_fail (GSD_IS_BACKGROUND_PLUGIN (object));
--
--        g_debug ("GsdBackgroundPlugin finalizing");
--
--        plugin = GSD_BACKGROUND_PLUGIN (object);
--
--        g_return_if_fail (plugin->priv != NULL);
--
--        if (plugin->priv->manager != NULL) {
--                g_object_unref (plugin->priv->manager);
--        }
--
--        G_OBJECT_CLASS (gsd_background_plugin_parent_class)->finalize (object);
--}
--
--static void
--impl_activate (GnomeSettingsPlugin *plugin)
--{
--        gboolean res;
--        GError  *error;
--
--        g_debug ("Activating background plugin");
--
--        error = NULL;
--        res = gsd_background_manager_start (GSD_BACKGROUND_PLUGIN (plugin)->priv->manager, &error);
--        if (! res) {
--                g_warning ("Unable to start background manager: %s", error->message);
--                g_error_free (error);
--        }
--}
--
--static void
--impl_deactivate (GnomeSettingsPlugin *plugin)
--{
--        g_debug ("Deactivating background plugin");
--        gsd_background_manager_stop (GSD_BACKGROUND_PLUGIN (plugin)->priv->manager);
--}
--
--static void
--gsd_background_plugin_class_init (GsdBackgroundPluginClass *klass)
--{
--        GObjectClass           *object_class = G_OBJECT_CLASS (klass);
--        GnomeSettingsPluginClass *plugin_class = GNOME_SETTINGS_PLUGIN_CLASS (klass);
--
--        object_class->finalize = gsd_background_plugin_finalize;
--
--        plugin_class->activate = impl_activate;
--        plugin_class->deactivate = impl_deactivate;
--
--        g_type_class_add_private (klass, sizeof (GsdBackgroundPluginPrivate));
--}
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gsd-background-plugin.h gnome-settings-daemon-3.6.4/plugins/background/gsd-background-plugin.h
---- gnome-settings-daemon-3.6.4.orig/plugins/background/gsd-background-plugin.h	2013-01-10 14:37:58.000000000 +0100
-+++ gnome-settings-daemon-3.6.4/plugins/background/gsd-background-plugin.h	1970-01-01 01:00:00.000000000 +0100
-@@ -1,59 +0,0 @@
--/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-- *
-- * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; either version 2, or (at your option)
-- * any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- *
-- */
--
--#ifndef __GSD_BACKGROUND_PLUGIN_H__
--#define __GSD_BACKGROUND_PLUGIN_H__
--
--#include <glib.h>
--#include <glib-object.h>
--#include <gmodule.h>
--
--#include "gnome-settings-plugin.h"
--
--G_BEGIN_DECLS
--
--#define GSD_TYPE_BACKGROUND_PLUGIN                (gsd_background_plugin_get_type ())
--#define GSD_BACKGROUND_PLUGIN(o)                  (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_BACKGROUND_PLUGIN, GsdBackgroundPlugin))
--#define GSD_BACKGROUND_PLUGIN_CLASS(k)            (G_TYPE_CHECK_CLASS_CAST((k), GSD_TYPE_BACKGROUND_PLUGIN, GsdBackgroundPluginClass))
--#define GSD_IS_BACKGROUND_PLUGIN(o)               (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_BACKGROUND_PLUGIN))
--#define GSD_IS_BACKGROUND_PLUGIN_CLASS(k)         (G_TYPE_CHECK_CLASS_TYPE ((k), GSD_TYPE_BACKGROUND_PLUGIN))
--#define GSD_BACKGROUND_PLUGIN_GET_CLASS(o)        (G_TYPE_INSTANCE_GET_CLASS ((o), GSD_TYPE_BACKGROUND_PLUGIN, GsdBackgroundPluginClass))
--
--typedef struct GsdBackgroundPluginPrivate GsdBackgroundPluginPrivate;
--
--typedef struct
--{
--        GnomeSettingsPlugin    parent;
--        GsdBackgroundPluginPrivate *priv;
--} GsdBackgroundPlugin;
--
--typedef struct
--{
--        GnomeSettingsPluginClass parent_class;
--} GsdBackgroundPluginClass;
--
--GType   gsd_background_plugin_get_type            (void) G_GNUC_CONST;
--
--/* All the plugins must implement this function */
--G_MODULE_EXPORT GType register_gnome_settings_plugin (GTypeModule *module);
--
--G_END_DECLS
--
--#endif /* __GSD_BACKGROUND_PLUGIN_H__ */
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/Makefile.am gnome-settings-daemon-3.6.4/plugins/background/Makefile.am
---- gnome-settings-daemon-3.6.4.orig/plugins/background/Makefile.am	2013-01-10 14:37:58.000000000 +0100
-+++ gnome-settings-daemon-3.6.4/plugins/background/Makefile.am	2013-04-10 17:40:20.117885180 +0200
-@@ -1,80 +1,34 @@
--NULL =
-+libexec_PROGRAMS = gnome-fallback-background-helper
- 
--plugin_name = background
-+gnome_fallback_background_helper_SOURCES = \
-+	gnome-fallback-background-helper.c \
-+	gsd-background-manager.c \
-+	gsd-background-manager.h
- 
--libexec_PROGRAMS = gsd-test-background
--
--gsd_test_background_SOURCES =		\
--	test-background.c		\
--	gsd-background-manager.h	\
--	gsd-background-manager.c	\
--	$(NULL)
--
--gsd_test_background_CPPFLAGS =				\
-+gnome_fallback_background_helper_CPPFLAGS = \
- 	-I$(top_srcdir)/gnome-settings-daemon		\
--	-I$(top_srcdir)/plugins/common			\
- 	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
- 	$(AM_CPPFLAGS)
- 
--gsd_test_background_CFLAGS = \
--	$(PLUGIN_CFLAGS)		\
-+gnome_fallback_background_helper_CFLAGS =	\
- 	$(SETTINGS_PLUGIN_CFLAGS)	\
--	$(BACKGROUND_CFLAGS)		\
--	$(AM_CFLAGS)
--
--gsd_test_background_LDADD =				\
--	$(top_builddir)/gnome-settings-daemon/libgsd.la	\
--	$(SETTINGS_PLUGIN_LIBS)				\
--	$(BACKGROUND_LIBS)				\
--	$(NULL)
--
--plugin_LTLIBRARIES = \
--	libbackground.la		\
--	$(NULL)
--
--libbackground_la_SOURCES =		\
--	gsd-background-plugin.h		\
--	gsd-background-plugin.c		\
--	gsd-background-manager.h	\
--	gsd-background-manager.c	\
--	$(NULL)
-+	$(BACKGROUND_CFLAGS)
- 
--libbackground_la_CPPFLAGS = \
--	-I$(top_srcdir)/gnome-settings-daemon		\
--	-I$(top_srcdir)/plugins/background/libbackground   \
--	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
--	$(AM_CPPFLAGS)
--
--libbackground_la_CFLAGS = \
--	$(SETTINGS_PLUGIN_CFLAGS)	\
--	$(BACKGROUND_CFLAGS)		\
--	$(AM_CFLAGS)
--
--libbackground_la_LDFLAGS =		\
--	$(GSD_PLUGIN_LDFLAGS)		\
--	$(NULL)
--
--libbackground_la_LIBADD  =		\
-+gnome_fallback_background_helper_LDADD =	\
- 	$(SETTINGS_PLUGIN_LIBS)		\
- 	$(BACKGROUND_LIBS)		\
--	$(NULL)
--
--plugin_in_files =		\
--	background.gnome-settings-plugin.in	\
--	$(NULL)
-+	$(top_builddir)/gnome-settings-daemon/libgsd.la
- 
--plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
-+autostartdir = $(sysconfdir)/xdg/autostart
-+autostart_in_files = gnome-fallback-background-helper.desktop.in
-+autostart_in_in_files = gnome-fallback-background-helper.desktop.in.in
-+autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
- 
--EXTRA_DIST = 			\
--	$(plugin_in_files)	\
--	$(NULL)
-+$(autostart_in_files): $(autostart_in_in_files)
-+	@sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
- 
--CLEANFILES = 			\
--	$(plugin_DATA)		\
--	$(NULL)
-+@INTLTOOL_DESKTOP_RULE@
- 
--DISTCLEANFILES =		\
--	$(plugin_DATA)		\
--	$(NULL)
-+EXTRA_DIST = $(autostart_in_in_files)
- 
--@GSD_INTLTOOL_PLUGIN_RULE@
-+CLEANFILES = $(autostart_DATA) $(autostart_in_files)
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/test-background.c gnome-settings-daemon-3.6.4/plugins/background/test-background.c
---- gnome-settings-daemon-3.6.4.orig/plugins/background/test-background.c	2012-06-01 22:02:53.000000000 +0200
-+++ gnome-settings-daemon-3.6.4/plugins/background/test-background.c	1970-01-01 01:00:00.000000000 +0100
-@@ -1,7 +0,0 @@
--#define NEW gsd_background_manager_new
--#define START gsd_background_manager_start
--#define STOP gsd_background_manager_stop
--#define MANAGER GsdBackgroundManager
--#include "gsd-background-manager.h"
--
--#include "test-plugin.h"
-diff -Naur gnome-settings-daemon-3.6.4.orig/po/POTFILES.in gnome-settings-daemon-3.6.4/po/POTFILES.in
---- gnome-settings-daemon-3.6.4.orig/po/POTFILES.in	2013-01-10 14:37:58.000000000 +0100
-+++ gnome-settings-daemon-3.6.4/po/POTFILES.in	2013-04-10 17:39:36.450215685 +0200
-@@ -21,9 +21,9 @@
- [type: gettext/glade]plugins/a11y-keyboard/gsd-a11y-preferences-dialog.ui
- [type: gettext/ini]plugins/a11y-settings/a11y-settings.gnome-settings-plugin.in
- plugins/automount/gnome-fallback-mount-helper.desktop.in.in
-+plugins/background/gnome-fallback-background-helper.desktop.in.in
- plugins/automount/gsd-automount-manager.c
- plugins/automount/gsd-autorun.c
--[type: gettext/ini]plugins/background/background.gnome-settings-plugin.in
- [type: gettext/ini]plugins/clipboard/clipboard.gnome-settings-plugin.in
- [type: gettext/ini]plugins/color/color.gnome-settings-plugin.in
- plugins/color/gsd-color-manager.c
-diff -Naur gnome-settings-daemon-3.6.4.orig/po/POTFILES.skip gnome-settings-daemon-3.6.4/po/POTFILES.skip
---- gnome-settings-daemon-3.6.4.orig/po/POTFILES.skip	2012-04-07 18:58:07.000000000 +0200
-+++ gnome-settings-daemon-3.6.4/po/POTFILES.skip	2013-04-10 17:39:36.453549095 +0200
-@@ -20,6 +20,7 @@
- data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in
- data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in
- data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in
-+plugins/background/gnome-fallback-background-helper.desktop.in
- plugins/automount/gnome-fallback-mount-helper.desktop.in
- plugins/power/org.gnome.settings-daemon.plugins.power.policy.in
- plugins/wacom/org.gnome.settings-daemon.plugins.wacom.policy.in
diff --git a/community/gnome-settings-daemon-compat/standalone-media-keys-helper.patch b/community/gnome-settings-daemon-compat/standalone-media-keys-helper.patch
deleted file mode 100644
index 61be1737e..000000000
--- a/community/gnome-settings-daemon-compat/standalone-media-keys-helper.patch
+++ /dev/null
@@ -1,564 +0,0 @@
-diff -Naur gnome-settings-daemon-3.6.4.orig/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in gnome-settings-daemon-3.6.4/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
---- gnome-settings-daemon-3.6.4.orig/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in	2013-04-24 03:11:02.893859531 +0200
-+++ gnome-settings-daemon-3.6.4/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in	2013-04-24 13:43:11.128884064 +0200
-@@ -9,7 +9,6 @@
-     <child name="gsdwacom" schema="org.gnome.settings-daemon.plugins.gsdwacom"/>
-     <child name="housekeeping" schema="org.gnome.settings-daemon.plugins.housekeeping"/>
-     <child name="keyboard" schema="org.gnome.settings-daemon.plugins.keyboard"/>
--    <child name="media-keys" schema="org.gnome.settings-daemon.plugins.media-keys"/>
-     <child name="mouse" schema="org.gnome.settings-daemon.plugins.mouse"/>
-     <child name="orientation" schema="org.gnome.settings-daemon.plugins.orientation"/>
-     <child name="power" schema="org.gnome.settings-daemon.plugins.power"/>
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.c gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.c
---- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.c	1970-01-01 01:00:00.000000000 +0100
-+++ gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.c	2013-04-24 13:43:11.132217470 +0200
-@@ -0,0 +1,65 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-+ *
-+ * Copyright (C) 2010 Red Hat, Inc.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ * Author: Tomas Bzatek <tbzatek@redhat.com>
-+ */
-+
-+#include "config.h"
-+
-+#include <glib.h>
-+#include <glib/gi18n.h>
-+#include <unistd.h>
-+#include <gtk/gtk.h>
-+
-+#include "gsd-media-keys-manager.h"
-+
-+int
-+main (int argc,
-+      char **argv)
-+{
-+        GMainLoop *loop;
-+        GsdMediaKeysManager *manager;
-+        GError *error = NULL;
-+
-+        g_type_init ();
-+        gtk_init (&argc, &argv);
-+
-+        bindtextdomain (GETTEXT_PACKAGE, GNOME_SETTINGS_LOCALEDIR);
-+        bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-+        textdomain (GETTEXT_PACKAGE);
-+
-+        loop = g_main_loop_new (NULL, FALSE);
-+        manager = gsd_media_keys_manager_new ();
-+
-+        gsd_media_keys_manager_start (manager, &error);
-+
-+        if (error != NULL) {
-+                g_printerr ("Unable to start the media-keys manager: %s",
-+                            error->message);
-+
-+                g_error_free (error);
-+                _exit (1);
-+        }
-+
-+        g_main_loop_run (loop);
-+
-+        gsd_media_keys_manager_stop (manager);
-+        g_main_loop_unref (loop);
-+
-+        return 0;
-+}
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in
---- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in	1970-01-01 01:00:00.000000000 +0100
-+++ gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in	2013-04-24 13:43:11.132217470 +0200
-@@ -0,0 +1,12 @@
-+[Desktop Entry]
-+_Name=Media keys
-+_Comment=Media keys plugin
-+Exec=@LIBEXECDIR@/gnome-fallback-media-keys-helper
-+Icon=multimedia
-+Terminal=false
-+Type=Application
-+Categories=
-+NoDisplay=true
-+OnlyShowIn=GNOME;Unity;
-+X-GNOME-Autostart-Notify=true
-+AutostartCondition=GNOME3 if-session gnome-fallback
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gsd-media-keys-manager.c gnome-settings-daemon-3.6.4/plugins/media-keys/gsd-media-keys-manager.c
---- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gsd-media-keys-manager.c	2013-01-10 14:37:58.000000000 +0100
-+++ gnome-settings-daemon-3.6.4/plugins/media-keys/gsd-media-keys-manager.c	2013-04-24 13:43:11.132217470 +0200
-@@ -44,7 +44,6 @@
- #include <gudev/gudev.h>
- #endif
- 
--#include "gnome-settings-profile.h"
- #include "gsd-marshal.h"
- #include "gsd-media-keys-manager.h"
- 
-@@ -622,8 +621,6 @@
-         char **custom_paths;
-         int i;
- 
--        gnome_settings_profile_start (NULL);
--
-         gdk_error_trap_push ();
- 
-         manager->priv->keys = g_ptr_array_new_with_free_func ((GDestroyNotify) media_key_free);
-@@ -661,8 +658,6 @@
-         gdk_flush ();
-         if (gdk_error_trap_pop ())
-                 g_warning ("Grab failed for some keys, another application may already have access the them.");
--
--        gnome_settings_profile_end (NULL);
- }
- 
- static void
-@@ -2090,7 +2085,6 @@
-         char *theme_name;
- 
-         g_debug ("Starting media_keys manager");
--        gnome_settings_profile_start (NULL);
- 
-         manager->priv->settings = g_settings_new (SETTINGS_BINDING_DIR);
-         g_signal_connect (G_OBJECT (manager->priv->settings), "changed",
-@@ -2137,19 +2131,14 @@
- 
-         /* Start filtering the events */
-         for (l = manager->priv->screens; l != NULL; l = l->next) {
--                gnome_settings_profile_start ("gdk_window_add_filter");
--
-                 g_debug ("adding key filter for screen: %d",
-                          gdk_screen_get_number (l->data));
- 
-                 gdk_window_add_filter (gdk_screen_get_root_window (l->data),
-                                        (GdkFilterFunc) filter_key_events,
-                                        manager);
--                gnome_settings_profile_end ("gdk_window_add_filter");
-         }
- 
--        gnome_settings_profile_end (NULL);
--
-         manager->priv->start_idle_id = 0;
- 
-         return FALSE;
-@@ -2161,8 +2150,6 @@
- {
-         const char * const subsystems[] = { "input", "usb", "sound", NULL };
- 
--        gnome_settings_profile_start (NULL);
--
-         if (supports_xinput2_devices (&manager->priv->opcode) == FALSE) {
-                 g_debug ("No Xinput2 support, disabling plugin");
-                 return TRUE;
-@@ -2179,8 +2166,6 @@
-          * The rest (grabbing and setting the keys) can happen in an
-          * idle.
-          */
--        gnome_settings_profile_start ("gvc_mixer_control_new");
--
-         manager->priv->volume = gvc_mixer_control_new ("GNOME Volume Control Media Keys");
- 
-         g_signal_connect (manager->priv->volume,
-@@ -2198,14 +2183,10 @@
- 
-         gvc_mixer_control_open (manager->priv->volume);
- 
--        gnome_settings_profile_end ("gvc_mixer_control_new");
--
-         manager->priv->start_idle_id = g_idle_add ((GSourceFunc) start_media_keys_idle_cb, manager);
- 
-         register_manager (manager_object);
- 
--        gnome_settings_profile_end (NULL);
--
-         return TRUE;
- }
- 
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gsd-media-keys-plugin.c gnome-settings-daemon-3.6.4/plugins/media-keys/gsd-media-keys-plugin.c
---- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gsd-media-keys-plugin.c	2013-01-10 14:37:58.000000000 +0100
-+++ gnome-settings-daemon-3.6.4/plugins/media-keys/gsd-media-keys-plugin.c	1970-01-01 01:00:00.000000000 +0100
-@@ -1,104 +0,0 @@
--/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-- *
-- * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; either version 2, or (at your option)
-- * any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- *
-- */
--
--#include "config.h"
--
--#include <glib/gi18n-lib.h>
--#include <gmodule.h>
--
--#include "gnome-settings-plugin.h"
--#include "gsd-media-keys-plugin.h"
--#include "gsd-media-keys-manager.h"
--
--struct GsdMediaKeysPluginPrivate {
--        GsdMediaKeysManager *manager;
--};
--
--#define GSD_MEDIA_KEYS_PLUGIN_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), GSD_TYPE_MEDIA_KEYS_PLUGIN, GsdMediaKeysPluginPrivate))
--
--GNOME_SETTINGS_PLUGIN_REGISTER (GsdMediaKeysPlugin, gsd_media_keys_plugin)
--
--static void
--gsd_media_keys_plugin_init (GsdMediaKeysPlugin *plugin)
--{
--        plugin->priv = GSD_MEDIA_KEYS_PLUGIN_GET_PRIVATE (plugin);
--
--        g_debug ("GsdMediaKeysPlugin initializing");
--
--        plugin->priv->manager = gsd_media_keys_manager_new ();
--}
--
--static void
--gsd_media_keys_plugin_finalize (GObject *object)
--{
--        GsdMediaKeysPlugin *plugin;
--
--        g_return_if_fail (object != NULL);
--        g_return_if_fail (GSD_IS_MEDIA_KEYS_PLUGIN (object));
--
--        g_debug ("GsdMediaKeysPlugin finalizing");
--
--        plugin = GSD_MEDIA_KEYS_PLUGIN (object);
--
--        g_return_if_fail (plugin->priv != NULL);
--
--        if (plugin->priv->manager != NULL) {
--                g_object_unref (plugin->priv->manager);
--        }
--
--        G_OBJECT_CLASS (gsd_media_keys_plugin_parent_class)->finalize (object);
--}
--
--static void
--impl_activate (GnomeSettingsPlugin *plugin)
--{
--        gboolean res;
--        GError  *error;
--
--        g_debug ("Activating media_keys plugin");
--
--        error = NULL;
--        res = gsd_media_keys_manager_start (GSD_MEDIA_KEYS_PLUGIN (plugin)->priv->manager, &error);
--        if (! res) {
--                g_warning ("Unable to start media_keys manager: %s", error->message);
--                g_error_free (error);
--        }
--}
--
--static void
--impl_deactivate (GnomeSettingsPlugin *plugin)
--{
--        g_debug ("Deactivating media_keys plugin");
--        gsd_media_keys_manager_stop (GSD_MEDIA_KEYS_PLUGIN (plugin)->priv->manager);
--}
--
--static void
--gsd_media_keys_plugin_class_init (GsdMediaKeysPluginClass *klass)
--{
--        GObjectClass           *object_class = G_OBJECT_CLASS (klass);
--        GnomeSettingsPluginClass *plugin_class = GNOME_SETTINGS_PLUGIN_CLASS (klass);
--
--        object_class->finalize = gsd_media_keys_plugin_finalize;
--
--        plugin_class->activate = impl_activate;
--        plugin_class->deactivate = impl_deactivate;
--
--        g_type_class_add_private (klass, sizeof (GsdMediaKeysPluginPrivate));
--}
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gsd-media-keys-plugin.h gnome-settings-daemon-3.6.4/plugins/media-keys/gsd-media-keys-plugin.h
---- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gsd-media-keys-plugin.h	2013-01-10 14:37:58.000000000 +0100
-+++ gnome-settings-daemon-3.6.4/plugins/media-keys/gsd-media-keys-plugin.h	1970-01-01 01:00:00.000000000 +0100
-@@ -1,59 +0,0 @@
--/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-- *
-- * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; either version 2, or (at your option)
-- * any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- *
-- */
--
--#ifndef __GSD_MEDIA_KEYS_PLUGIN_H__
--#define __GSD_MEDIA_KEYS_PLUGIN_H__
--
--#include <glib.h>
--#include <glib-object.h>
--#include <gmodule.h>
--
--#include "gnome-settings-plugin.h"
--
--G_BEGIN_DECLS
--
--#define GSD_TYPE_MEDIA_KEYS_PLUGIN                (gsd_media_keys_plugin_get_type ())
--#define GSD_MEDIA_KEYS_PLUGIN(o)                  (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_MEDIA_KEYS_PLUGIN, GsdMediaKeysPlugin))
--#define GSD_MEDIA_KEYS_PLUGIN_CLASS(k)            (G_TYPE_CHECK_CLASS_CAST((k), GSD_TYPE_MEDIA_KEYS_PLUGIN, GsdMediaKeysPluginClass))
--#define GSD_IS_MEDIA_KEYS_PLUGIN(o)               (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_MEDIA_KEYS_PLUGIN))
--#define GSD_IS_MEDIA_KEYS_PLUGIN_CLASS(k)         (G_TYPE_CHECK_CLASS_TYPE ((k), GSD_TYPE_MEDIA_KEYS_PLUGIN))
--#define GSD_MEDIA_KEYS_PLUGIN_GET_CLASS(o)        (G_TYPE_INSTANCE_GET_CLASS ((o), GSD_TYPE_MEDIA_KEYS_PLUGIN, GsdMediaKeysPluginClass))
--
--typedef struct GsdMediaKeysPluginPrivate GsdMediaKeysPluginPrivate;
--
--typedef struct
--{
--        GnomeSettingsPlugin    parent;
--        GsdMediaKeysPluginPrivate *priv;
--} GsdMediaKeysPlugin;
--
--typedef struct
--{
--        GnomeSettingsPluginClass parent_class;
--} GsdMediaKeysPluginClass;
--
--GType   gsd_media_keys_plugin_get_type            (void) G_GNUC_CONST;
--
--/* All the plugins must implement this function */
--G_MODULE_EXPORT GType register_gnome_settings_plugin (GTypeModule *module);
--
--G_END_DECLS
--
--#endif /* __GSD_MEDIA_KEYS_PLUGIN_H__ */
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/Makefile.am gnome-settings-daemon-3.6.4/plugins/media-keys/Makefile.am
---- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/Makefile.am	2013-01-10 14:37:58.000000000 +0100
-+++ gnome-settings-daemon-3.6.4/plugins/media-keys/Makefile.am	2013-04-24 14:26:01.414463895 +0200
-@@ -1,17 +1,11 @@
- icondir = $(datadir)/icons/hicolor
- context = actions
- 
--plugin_name = media-keys
--
--NULL =
--
- SUBDIRS = cut-n-paste
--plugin_LTLIBRARIES = libmedia-keys.la
- 
- BUILT_SOURCES = 			\
- 	gsd-marshal.h			\
--	gsd-marshal.c			\
--	$(NULL)
-+	gsd-marshal.c
- 
- gsd-marshal.c: gsd-marshal.list
- 	$(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=gsd_marshal $< --header --body --internal > $@
-@@ -19,62 +13,16 @@
- gsd-marshal.h: gsd-marshal.list
- 	$(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=gsd_marshal $< --header --internal > $@
- 
--libmedia_keys_la_SOURCES = 		\
--	gsd-media-keys-plugin.h		\
--	gsd-media-keys-plugin.c		\
--	gsd-media-keys-manager.h	\
--	gsd-media-keys-manager.c	\
--	gsd-osd-window.c		\
--	gsd-osd-window.h		\
--	gsd-osd-window-private.h	\
--	shortcuts-list.h		\
--	$(BUILT_SOURCES)		\
--	$(NULL)
--
--libmedia_keys_la_CPPFLAGS = \
--	-I$(top_srcdir)/data/					\
--	-I$(top_srcdir)/gnome-settings-daemon			\
--	-I$(top_srcdir)/plugins/common				\
--	-I$(top_srcdir)/plugins/media-keys/cut-n-paste		\
--	-DBINDIR=\"$(bindir)\"					\
--	-DPIXMAPDIR=\""$(pkgdatadir)"\"				\
--	-DGTKBUILDERDIR=\""$(pkgdatadir)"\"			\
--	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"	\
--	$(AM_CPPFLAGS)
--
--libmedia_keys_la_CFLAGS = \
--	$(PLUGIN_CFLAGS)		\
--	$(SETTINGS_PLUGIN_CFLAGS)	\
--	$(MEDIA_KEYS_CFLAGS)		\
--	$(AM_CFLAGS)
--
--libmedia_keys_la_LDFLAGS = 		\
--	$(GSD_PLUGIN_LDFLAGS)
--
--libmedia_keys_la_LIBADD  = 		\
--	$(top_builddir)/plugins/common/libcommon.la			\
--	$(top_builddir)/plugins/media-keys/cut-n-paste/libgvc.la	\
--	$(MEDIA_KEYS_LIBS)						\
--	$(SETTINGS_PLUGIN_LIBS)						\
--	-lm
--
--plugin_in_files = 		\
--	media-keys.gnome-settings-plugin.in
--
--plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
--
- noinst_PROGRAMS = test-media-window
- 
- test_media_window_SOURCES =			\
- 	gsd-osd-window.c			\
- 	gsd-osd-window.h			\
- 	gsd-osd-window-private.h		\
--	test-media-window.c			\
--	$(NULL)
-+	test-media-window.c
- 
- test_media_window_CPPFLAGS = \
- 	-I$(top_srcdir)/data/					\
--	-I$(top_srcdir)/gnome-settings-daemon			\
- 	-I$(top_srcdir)/plugins/common				\
- 	-I$(top_srcdir)/plugins/media-keys/cut-n-paste		\
- 	-DDATADIR=\""$(datadir)"\"				\
-@@ -93,21 +41,19 @@
- 	$(SETTINGS_PLUGIN_LIBS)			\
- 	-lm
- 
--libexec_PROGRAMS = gsd-test-media-keys
-+libexec_PROGRAMS = gnome-fallback-media-keys-helper
- 
--gsd_test_media_keys_SOURCES =			\
-+gnome_fallback_media_keys_helper_SOURCES =	\
- 	gsd-media-keys-manager.c		\
- 	gsd-media-keys-manager.h		\
- 	gsd-osd-window.c			\
- 	gsd-osd-window.h			\
- 	gsd-osd-window-private.h		\
--	test-media-keys.c			\
--	$(BUILT_SOURCES)			\
--	$(NULL)
-+	gnome-fallback-media-keys-helper.c	\
-+	$(BUILT_SOURCES)
- 
--gsd_test_media_keys_CPPFLAGS = \
-+gnome_fallback_media_keys_helper_CPPFLAGS = \
- 	-I$(top_srcdir)/data/					\
--	-I$(top_srcdir)/gnome-settings-daemon			\
- 	-I$(top_srcdir)/plugins/common				\
- 	-I$(top_srcdir)/plugins/media-keys/cut-n-paste		\
- 	-DBINDIR=\"$(bindir)\"					\
-@@ -116,14 +62,12 @@
- 	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"	\
- 	$(AM_CPPFLAGS)
- 
--gsd_test_media_keys_CFLAGS = \
-+gnome_fallback_media_keys_helper_CFLAGS = \
- 	$(PLUGIN_CFLAGS)		\
- 	$(SETTINGS_PLUGIN_CFLAGS)	\
--	$(MEDIA_KEYS_CFLAGS)		\
--	$(AM_CFLAGS)
-+	$(MEDIA_KEYS_CFLAGS)
- 
--gsd_test_media_keys_LDADD = \
--	$(top_builddir)/gnome-settings-daemon/libgsd.la		\
-+gnome_fallback_media_keys_helper_LDADD = \
- 	$(top_builddir)/plugins/common/libcommon.la			\
- 	$(top_builddir)/plugins/media-keys/cut-n-paste/libgvc.la	\
- 	$(SETTINGS_DAEMON_LIBS)			\
-@@ -131,17 +75,24 @@
- 	$(MEDIA_KEYS_LIBS)			\
- 	-lm
- 
-+autostartdir = $(sysconfdir)/xdg/autostart
-+autostart_in_files = gnome-fallback-media-keys-helper.desktop.in
-+autostart_in_in_files = gnome-fallback-media-keys-helper.desktop.in.in
-+autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
-+
-+$(autostart_in_files): $(autostart_in_in_files)
-+	@sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
-+ 
-+@INTLTOOL_DESKTOP_RULE@
-+
- EXTRA_DIST = 				\
- 	gsd-marshal.list		\
- 	README.media-keys-API		\
- 	test-media-window-clutter.c	\
--	$(plugin_in_files)
-+	$(autostart_in_in_files)
- 
- CLEANFILES = 			\
- 	$(BUILT_SOURCES)	\
--	$(plugin_DATA)
--
--DISTCLEANFILES =		\
--	$(plugin_DATA)
-+	$(autostart_DATA)	\
-+	$(autostart_in_files)
- 
--@GSD_INTLTOOL_PLUGIN_RULE@
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/media-keys.gnome-settings-plugin.in gnome-settings-daemon-3.6.4/plugins/media-keys/media-keys.gnome-settings-plugin.in
---- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/media-keys.gnome-settings-plugin.in	2012-04-07 15:21:20.000000000 +0200
-+++ gnome-settings-daemon-3.6.4/plugins/media-keys/media-keys.gnome-settings-plugin.in	1970-01-01 01:00:00.000000000 +0100
-@@ -1,8 +0,0 @@
--[GNOME Settings Plugin]
--Module=media-keys
--IAge=0
--_Name=Media keys
--_Description=Media keys plugin
--Authors=
--Copyright=Copyright © 2007
--Website=
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/test-media-keys.c gnome-settings-daemon-3.6.4/plugins/media-keys/test-media-keys.c
---- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/test-media-keys.c	2012-06-01 22:02:53.000000000 +0200
-+++ gnome-settings-daemon-3.6.4/plugins/media-keys/test-media-keys.c	1970-01-01 01:00:00.000000000 +0100
-@@ -1,7 +0,0 @@
--#define NEW gsd_media_keys_manager_new
--#define START gsd_media_keys_manager_start
--#define STOP gsd_media_keys_manager_stop
--#define MANAGER GsdMediaKeysManager
--#include "gsd-media-keys-manager.h"
--
--#include "test-plugin.h"
-diff -Naur gnome-settings-daemon-3.6.4.orig/po/POTFILES.in gnome-settings-daemon-3.6.4/po/POTFILES.in
---- gnome-settings-daemon-3.6.4.orig/po/POTFILES.in	2013-04-24 03:11:02.897192946 +0200
-+++ gnome-settings-daemon-3.6.4/po/POTFILES.in	2013-04-24 13:43:11.132217470 +0200
-@@ -34,7 +34,7 @@
- [type: gettext/ini]plugins/keyboard/keyboard.gnome-settings-plugin.in
- plugins/media-keys/cut-n-paste/gvc-mixer-control.c
- plugins/media-keys/gsd-media-keys-manager.c
--[type: gettext/ini]plugins/media-keys/media-keys.gnome-settings-plugin.in
-+plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in
- plugins/mouse/gsd-mouse-manager.c
- [type: gettext/ini]plugins/mouse/mouse.gnome-settings-plugin.in
- plugins/power/gpm-common.c
-diff -Naur gnome-settings-daemon-3.6.4.orig/po/POTFILES.skip gnome-settings-daemon-3.6.4/po/POTFILES.skip
---- gnome-settings-daemon-3.6.4.orig/po/POTFILES.skip	2013-04-24 03:11:02.897192946 +0200
-+++ gnome-settings-daemon-3.6.4/po/POTFILES.skip	2013-04-24 13:43:11.132217470 +0200
-@@ -22,5 +22,6 @@
- data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in
- plugins/background/gnome-fallback-background-helper.desktop.in
- plugins/automount/gnome-fallback-mount-helper.desktop.in
-+plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in
- plugins/power/org.gnome.settings-daemon.plugins.power.policy.in
- plugins/wacom/org.gnome.settings-daemon.plugins.wacom.policy.in
diff --git a/community/gnome-settings-daemon-compat/xinput.patch b/community/gnome-settings-daemon-compat/xinput.patch
deleted file mode 100644
index 67c8082cb..000000000
--- a/community/gnome-settings-daemon-compat/xinput.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 14f92b1479aa065edf3f0aa86b87d4c4ff1fe2ba Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Thu, 07 Feb 2013 04:14:22 +0000
-Subject: Fix media-keys handling with GTK+ 3.7.8
-
-GDK now requests XI 2.3 and if the X server supports that
-version, subsequent requests for a lower version yield
-a BadValue. Therefore, we need to change the code in
-gsd-input-helper.c to request 2.3 as well.
----
-diff --git a/plugins/common/gsd-input-helper.c b/plugins/common/gsd-input-helper.c
-index 54427af..d5d2a2a 100644
---- a/plugins/common/gsd-input-helper.c
-+++ b/plugins/common/gsd-input-helper.c
-@@ -144,18 +144,11 @@ supports_xinput2_devices (int *opcode)
-         gdk_error_trap_push ();
- 
-         major = 2;
--        minor = 0;
-+        minor = 3;
- 
-         if (XIQueryVersion (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &major, &minor) != Success) {
-                 gdk_error_trap_pop_ignored ();
--                /* try for 2.2, maybe gtk has already announced 2.2 support */
--                gdk_error_trap_push ();
--                major = 2;
--                minor = 2;
--                if (XIQueryVersion (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &major, &minor) != Success) {
--                    gdk_error_trap_pop_ignored ();
-                     return FALSE;
--                }
-         }
-         gdk_error_trap_pop_ignored ();
- 
---
-cgit v0.9.1
diff --git a/community/gnonlin/PKGBUILD b/community/gnonlin/PKGBUILD
index 92b298cc3..38b16959f 100644
--- a/community/gnonlin/PKGBUILD
+++ b/community/gnonlin/PKGBUILD
@@ -1,21 +1,22 @@
-# $Id: PKGBUILD 76165 2012-09-12 12:34:14Z arodseth $
+# $Id: PKGBUILD 98219 2013-10-07 15:43:14Z spupykin $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Abhishek Dasgupta <abhidg@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=gnonlin
-pkgver=0.10.17
+pkgver=1.1.90
 pkgrel=1
 pkgdesc='Library for creating non-linear video editors'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://gnonlin.sourceforge.net/'
-depends=('gstreamer0.10>=0.10.36')
-makedepends=('python' 'gstreamer0.10-base-plugins>=0.10.36' 'pkgconfig')
+depends=('gstreamer')
+makedepends=('python' 'gst-plugins-base' 'pkgconfig')
 options=('!libtool')
 license=('LGPL')
-source=("http://gstreamer.freedesktop.org/src/$pkgname/$pkgname-$pkgver.tar.bz2")
+source=("http://gstreamer.freedesktop.org/src/$pkgname/$pkgname-$pkgver.tar.xz")
 sha256sums=('e4a2dd8af1c0c97f2f63e918a25c26e871c896e88b7ee85948509f68f29e8935')
+sha256sums=('b2214ee45583a4532d110e852e2aecf787cefa8fe50f44c8234fb55713feba61')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/gnunet-gtk/PKGBUILD b/community/gnunet-gtk/PKGBUILD
index 5df0d8411..fa8d3e7c7 100644
--- a/community/gnunet-gtk/PKGBUILD
+++ b/community/gnunet-gtk/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 81579 2012-12-24 15:01:10Z spupykin $
+# $Id: PKGBUILD 98195 2013-10-07 12:08:31Z jgc $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: wahnby <wahnby@yahoo.fr>
 
 pkgname=gnunet-gtk
 pkgver=0.9.5
-pkgrel=1
+pkgrel=2
 pkgdesc="A frontend for GNUnet"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gnunet.org"
diff --git a/community/gnustep-back/PKGBUILD b/community/gnustep-back/PKGBUILD
index f09db2909..f10250f97 100644
--- a/community/gnustep-back/PKGBUILD
+++ b/community/gnustep-back/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 90152 2013-05-07 13:33:45Z spupykin $
+# $Id: PKGBUILD 96988 2013-09-09 20:00:16Z bgyorgy $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Sebastian Sareyko <public@nooms.de>
 
 pkgname=gnustep-back
 pkgver=0.23.0
-pkgrel=1
+pkgrel=2
 pkgdesc="The GNUstep GUI Backend"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnustep.org/"
diff --git a/community/gnustep-base/PKGBUILD b/community/gnustep-base/PKGBUILD
index be49f8bec..385a1aa33 100644
--- a/community/gnustep-base/PKGBUILD
+++ b/community/gnustep-base/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 96475 2013-08-30 14:07:55Z spupykin $
+# $Id: PKGBUILD 96986 2013-09-09 19:51:14Z bgyorgy $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Sebastian Sareyko <public@nooms.de>
 
 pkgname=gnustep-base
 pkgver=1.24.5
-pkgrel=1
+pkgrel=2
 pkgdesc="The GNUstep base package"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnustep.org/"
diff --git a/community/gnustep-gui/PKGBUILD b/community/gnustep-gui/PKGBUILD
index c13045c9f..83a323edb 100644
--- a/community/gnustep-gui/PKGBUILD
+++ b/community/gnustep-gui/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 94925 2013-08-01 07:01:18Z bpiotrowski $
+# $Id: PKGBUILD 96990 2013-09-09 20:20:00Z bgyorgy $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Sebastian Sareyko <public@nooms.de>
 
 pkgname=gnustep-gui
 pkgver=0.23.1
-pkgrel=2
+pkgrel=3
 pkgdesc="The GNUstep GUI class library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnustep.org/"
diff --git a/community/gnustep-make/ChangeLog b/community/gnustep-make/ChangeLog
new file mode 100644
index 000000000..15622ab88
--- /dev/null
+++ b/community/gnustep-make/ChangeLog
@@ -0,0 +1,2 @@
+2007-06-27 tardo <tardo@nagi-fanboi.net>
+* version upgrade
diff --git a/community/gnustep-make/PKGBUILD b/community/gnustep-make/PKGBUILD
index 4afbd0cc9..c33c4a79f 100644
--- a/community/gnustep-make/PKGBUILD
+++ b/community/gnustep-make/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 69454 2012-04-16 13:51:34Z spupykin $
+# $Id: PKGBUILD 96982 2013-09-09 19:40:39Z bgyorgy $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Sebastian Sareyko <public@nooms.de>
 
 pkgname=gnustep-make
-pkgver=2.6.4
-pkgrel=1.1
+pkgver=2.6.5
+pkgrel=2
 pkgdesc="The GNUstep make package"
-arch=('mips64el')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnustep.org/"
 license=('GPL')
 depends=()
 conflicts=('gnustep-make-svn')
 groups=('gnustep-core')
 source=(ftp://ftp.gnustep.org/pub/gnustep/core/$pkgname-$pkgver.tar.gz)
-md5sums=('c5617da024add87ce9b09726bb9328a6')
+md5sums=('1e143d2c920cef02535ab533af8b1846')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -25,8 +25,11 @@ package() {
   cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
 
-  sed -i 's|GNUSTEP_HOST_CPU=.*|GNUSTEP_HOST_CPU=mips64el|' $pkgdir/usr/share/GNUstep/Makefiles/GNUstep.sh
-  sed -i 's|GNUSTEP_HOST=.*|GNUSTEP_HOST=mips64el-unknown-linux-gnu|' $pkgdir/usr/share/GNUstep/Makefiles/GNUstep.sh
+  if [ "$CARCH" = "mips64el" ]; then
+    sed -i 's|GNUSTEP_HOST_CPU=.*|GNUSTEP_HOST_CPU=mips64el|' $pkgdir/usr/share/GNUstep/Makefiles/GNUstep.sh
+    sed -i 's|GNUSTEP_HOST=.*|GNUSTEP_HOST=mips64el-unknown-linux-gnu|' $pkgdir/usr/share/GNUstep/Makefiles/GNUstep.sh
+  fi
+
   install -D -m755 \
     $pkgdir/usr/share/GNUstep/Makefiles/GNUstep.sh \
     $pkgdir/etc/profile.d/GNUstep.sh
diff --git a/community/goaccess/PKGBUILD b/community/goaccess/PKGBUILD
index 4af762a6f..54b43ad5b 100644
--- a/community/goaccess/PKGBUILD
+++ b/community/goaccess/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 95903 2013-08-18 15:28:38Z fyan $
+# $Id: PKGBUILD 98175 2013-10-07 01:47:21Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Josh VanderLinden <arch@cloudlery.com>
 # Contributor: Nicolas Storme <nicolas@atelier-web.com>
 
 pkgname=goaccess
-pkgver=0.6
+pkgver=0.6.1
 pkgrel=1
 pkgdesc="An open source real-time web log analyzer and interactive viewer"
 arch=('i686' 'x86_64' 'mips64el')
@@ -24,4 +24,4 @@ package() {
   make prefix="$pkgdir/usr" install
 }
 
-sha512sums=('cd3fb241a9d84f2f9023c179a96d441f7f7d52e9c7227b31a3a18761c60ae6abdbfc70799c0a2c5ceb8788afd36eeaaf55ed7944310fb5809dd403d7fe09dfbd')
+sha512sums=('67712e4af16c6e039ca46f6f8d8302a58be1e0cfd0c76930068c03a9989c35b58b61f7b1e6a9e79cbb978c8f492b80782b8c7b894abc2e067f0a520e2981f98b')
diff --git a/community/goldendict/PKGBUILD b/community/goldendict/PKGBUILD
index a615d0664..75788ba61 100644
--- a/community/goldendict/PKGBUILD
+++ b/community/goldendict/PKGBUILD
@@ -1,30 +1,36 @@
-# $Id: PKGBUILD 85453 2013-03-01 19:08:27Z andrea $
+# $Id: PKGBUILD 96817 2013-09-05 20:34:32Z bgyorgy $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: m0rph <m0rph.mailbox@gmail.com>
 
 pkgname=goldendict
 pkgver=1.0.1
-pkgrel=6
+pkgrel=7
 pkgdesc="Feature-rich dictionary lookup program"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://goldendict.berlios.de/"
 license=('GPL3')
 depends=('hunspell' 'libvorbis' 'libxtst' 'libzip' 'qtwebkit' 'phonon')
-makedepends=('patch')
 provides=('stardict')
 changelog=$pkgname.changelog
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-src.tar.bz2
         $pkgname-paths.diff
-        gcc47.patch)
+        gcc47.patch
+        fix-wikipedia-images.patch)
 sha256sums=('b3fb0405a5edb38f02ef881b48c36e46e2eacf641b0caf8d99403f595a4be9a6'
             '1dacae7b7a7d7c20a22b4595c07dbd65fdad134a0d4cf283312ea3bdb5f42589'
-            '2e13857d047186e781c3bd9de3cfdf794f4d44e8e28f9d18dda8df50cfe13c6e')
+            '2e13857d047186e781c3bd9de3cfdf794f4d44e8e28f9d18dda8df50cfe13c6e'
+            'ab669d96db0cb750d4c865b123474d655b6caca9242457c044a60f1fee5b7dc7')
 
-build(){
+prepare(){
   cd ${srcdir}
 
   patch -Np0 -i ${srcdir}/$pkgname-paths.diff
   patch -p1 -i ${srcdir}/gcc47.patch
+  patch -Np1 -i ${srcdir}/fix-wikipedia-images.patch
+}
+
+build(){
+  cd ${srcdir}
 
   qmake-qt4
   make
diff --git a/community/goldendict/fix-wikipedia-images.patch b/community/goldendict/fix-wikipedia-images.patch
new file mode 100644
index 000000000..ea28bcd91
--- /dev/null
+++ b/community/goldendict/fix-wikipedia-images.patch
@@ -0,0 +1,26 @@
+From 8c056589e989781c6ed5aac7491c802414489ae9 Mon Sep 17 00:00:00 2001
+From: Abs62 <ottomann@yandex.ru>
+Date: Sat, 22 Oct 2011 15:52:52 +0400
+Subject: [PATCH] Fix Wikipedia images loading
+
+---
+ mediawiki.cc | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/mediawiki.cc b/mediawiki.cc
+index e67fdb3..9fff3dc 100644
+--- a/mediawiki.cc
++++ b/mediawiki.cc
+@@ -293,6 +293,9 @@ void MediaWikiArticleRequest::requestFinished( QNetworkReply * r )
+             // Replace the href="/foo/bar/Baz" to just href="Baz".
+             articleString.replace( QRegExp( "<a\\shref=\"/([\\w\\.]*/)*" ), "<a href=\"" );
+   
++            // Add "http:" to image source urls
++            articleString.replace( " src=\"//", " src=\"http://" );
++
+             // In those strings, change any underscores to spaces
+             for( ; ; )
+             {
+-- 
+1.8.4
+
diff --git a/community/gst-editing-services/PKGBUILD b/community/gst-editing-services/PKGBUILD
new file mode 100644
index 000000000..c7c38a563
--- /dev/null
+++ b/community/gst-editing-services/PKGBUILD
@@ -0,0 +1,37 @@
+# $Id: PKGBUILD 98225 2013-10-07 15:51:20Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Lubosz Sarnecki <lubosz@gmail.com>
+# Contributor: Kerrick Staley <mail@kerrickstaley.com>
+# Contributor: Thijs Vermeir <thijsvermeir@gmail.com>
+
+pkgname=gst-editing-services
+pkgver=1.1.90.1.1774.fb6aabf
+pkgrel=1
+pkgdesc='GStreamer editing services (Git version)'
+arch=('i686' 'x86_64')
+license=('LGPL')
+url='http://gstreamer.freedesktop.org/modules/gst-editing-services.html'
+depends=('gst-plugins-base')
+makedepends=('git' 'intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection')
+options=('!libtool')
+source=('git://anongit.freedesktop.org/gstreamer/gst-editing-services')
+sha256sums=('SKIP')
+
+pkgver() {
+  cd $srcdir/gst-editing-services
+  version=$(grep AC_INIT configure.ac | sed 's/AC_INIT(GStreamer Editing Services, //' | sed 's/,//')
+  hash=$(git log --pretty=format:'%h' -n 1)
+  revision=$(git rev-list --count HEAD)
+  echo $version.$revision.$hash
+}
+
+build() {
+  cd $srcdir/gst-editing-services
+  ./autogen.sh --prefix=/usr
+  make
+}
+
+package() {
+  cd $srcdir/gst-editing-services
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community/gst-python/PKGBUILD b/community/gst-python/PKGBUILD
new file mode 100644
index 000000000..c18cf9d9e
--- /dev/null
+++ b/community/gst-python/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 98229 2013-10-07 15:57:05Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gst-python
+pkgver=1.1.90
+pkgrel=2
+pkgdesc="Python bindings for GStreamer"
+arch=('i686' 'x86_64')
+license=('LGPL')
+url="http://gstreamer.freedesktop.org/"
+depends=('python2-gobject' 'gst-plugins-base')
+makedepends=('pkgconfig')
+options=('!libtool')
+source=(http://gstreamer.freedesktop.org/src/gst-python/gst-python-${pkgver}.tar.bz2)
+md5sums=('16d85442b98fab61bab66a53eb571d6a')
+
+build() {
+  cd "${srcdir}/gst-python-${pkgver}"
+  export PYTHON=python2
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/gst-python-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/community/gtest/PKGBUILD b/community/gtest/PKGBUILD
index c77f111ed..c19a0a435 100644
--- a/community/gtest/PKGBUILD
+++ b/community/gtest/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 80934 2012-12-07 06:58:41Z fyan $
+# $Id: PKGBUILD 97632 2013-09-26 06:11:28Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Alexandre Bique <bique.alexandre@gmail.com>
 # Contributor: Louis R. Marascio <lrm@fitnr.com>
 # Contributor: Cody Maloney <cmaloney@theoreticalchaos.com>
 
 pkgname=gtest
-pkgver=1.6.0
-pkgrel=7
+pkgver=1.7.0
+pkgrel=1
 pkgdesc="Google Test - C++ testing utility based on the xUnit framework (like JUnit)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/googletest/"
@@ -15,7 +15,6 @@ options=('!libtool')
 depends=('gcc-libs' 'sh')
 makedepends=('python2' 'cmake')
 source=("http://googletest.googlecode.com/files/$pkgname-$pkgver.zip")
-sha1sums=('00d6be170eb9fc3b2198ffdcb1f1d6ba7fc6e621')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -30,14 +29,15 @@ build() {
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
-  mkdir -pm 0755 $pkgdir/usr/{lib,include/gtest/internal,share/licenses/$pkgname,src/gtest/src,src/gtest/cmake}
-  install -m 0644 build/libgtest{,_main}.so $pkgdir/usr/lib/
-  install -m 0644 include/gtest/*.h $pkgdir/usr/include/gtest/
-  install -m 0644 include/gtest/internal/*.h $pkgdir/usr/include/gtest/internal/
-  install -m 0644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-  install -m 0644 $srcdir/$pkgname-$pkgver/fused-src/gtest/* $pkgdir/usr/src/gtest/src
-  install -m 0644 $srcdir/$pkgname-$pkgver/CMakeLists.txt $pkgdir/usr/src/gtest
-  install -m 0644 $srcdir/$pkgname-$pkgver/cmake/* $pkgdir/usr/src/gtest/cmake
+  mkdir -pm 0755 "$pkgdir"/usr/{lib,include/gtest/internal,share/licenses/$pkgname,src/gtest/src,src/gtest/cmake}
+  install -m 0644 build/libgtest{,_main}.so "$pkgdir"/usr/lib
+  install -m 0644 include/gtest/*.h "$pkgdir"/usr/include/gtest
+  install -m 0644 include/gtest/internal/*.h "$pkgdir"/usr/include/gtest/internal/
+  install -m 0644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/
+  install -m 0644 "$srcdir/$pkgname-$pkgver/fused-src/gtest"/* "$pkgdir"/usr/src/gtest/src/
+  install -m 0644 "$srcdir/$pkgname-$pkgver/CMakeLists.txt" "$pkgdir"/usr/src/gtest/
+  install -m 0644 "$srcdir/$pkgname-$pkgver/cmake"/* "$pkgdir"/usr/src/gtest/cmake/
 }
 
 # vim:set ts=2 sw=2 et:
+sha512sums=('8859369f2dd32cbc2ac01aba029aa3ff20a321f40658b9643aff442d34c33468221866b801b28c66a28af47dbcd362d26941fc98db92b6efb7e41ea5b7be1a07')
diff --git a/community/gtk2fontsel/PKGBUILD b/community/gtk2fontsel/PKGBUILD
index f92378248..2f9ae73e6 100644
--- a/community/gtk2fontsel/PKGBUILD
+++ b/community/gtk2fontsel/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 67937 2012-03-16 10:28:59Z giovanni $
+# $Id: PKGBUILD 97789 2013-09-29 18:17:04Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 
 pkgname=gtk2fontsel
 pkgver=0.1
-pkgrel=4
+pkgrel=5
 pkgdesc="Font selection and preview tool"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gtk2fontsel.sourceforge.net/"
 license=('GPL')
 depends=('gtk2')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('f344018b19b6a818795a4c702770cd9d')
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz gtk2fontsel.desktop)
+sha256sums=('5cd6396fc3c6e7f9bc358cc5ad30592ba446cdb0138a811216497b6453905a68'
+            'b827567c26b929256c5df3837019d7f9531ecf5ba5d7ba4a16f339ea0288d332')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
@@ -24,4 +25,6 @@ package() {
   cd ${srcdir}/$pkgname-$pkgver
 
   make prefix=${pkgdir}/usr install
+  install -D -m644 ${srcdir}/gtk2fontsel.desktop \
+    ${pkgdir}/usr/share/applications/gtk2fontsel.desktop
 }
diff --git a/community/gtk2fontsel/gtk2fontsel.desktop b/community/gtk2fontsel/gtk2fontsel.desktop
new file mode 100644
index 000000000..db6da5f4f
--- /dev/null
+++ b/community/gtk2fontsel/gtk2fontsel.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=1.0
+Name=gtk2fontsel
+GenericName=gtk2fontsel
+Exec=gtk2fontsel
+Terminal=false
+Type=Application
+Categories=System;GTK;
+Comment=Font selection and preview tool
diff --git a/community/gtkglarea/PKGBUILD b/community/gtkglarea/PKGBUILD
new file mode 100644
index 000000000..11d03fa3e
--- /dev/null
+++ b/community/gtkglarea/PKGBUILD
@@ -0,0 +1,32 @@
+# Maintainer: Connor Behan <connor.behan@gmail.com>
+# Contributor: Andreas B. Wagner <AndreasBWagner@pointfree.net>
+# Contributor: arjan <arjan@archlinux.org>
+# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+# Contributor: SpepS <dreamspepser at yahoo dot it>
+
+pkgname=gtkglarea
+pkgver=2.0.1
+pkgrel=3
+pkgdesc="GTK/GL Area libraries"
+arch=('i686' 'x86_64')
+url="http://mono-project.com/GtkGLArea"
+license=('GPL')
+depends=('gtk2' 'glu')
+options=('!libtool')
+source=("http://ftp.gnome.org/pub/GNOME/sources/$pkgname/2.0/$pkgname-$pkgver.tar.gz")
+md5sums=('2a81a86cfa80a920a5454dd00fad2e1d')
+
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+
+	# DSO link fix
+	LDFLAGS+=" -lm" \
+		./configure --prefix=/usr \
+		--enable-static=no
+	make
+}
+
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
+	make DESTDIR="$pkgdir/" install
+}
diff --git a/community/gtkspell3/PKGBUILD b/community/gtkspell3/PKGBUILD
index 9f9206da1..8db090a6d 100644
--- a/community/gtkspell3/PKGBUILD
+++ b/community/gtkspell3/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 92677 2013-06-12 04:09:55Z bgyorgy $
+# $Id: PKGBUILD 97714 2013-09-27 20:04:38Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 # Contributor: Ben <ben@benmazer.net>
 
 pkgname=gtkspell3
-pkgver=3.0.3
+pkgver=3.0.4
 pkgrel=1
 url="http://gtkspell.sourceforge.net/"
 pkgdesc="Provides word-processor-style highlighting and replacement of misspelled words in a GtkTextView widget"
@@ -14,7 +14,7 @@ depends=('gtk3' 'enchant')
 makedepends=('intltool' 'gobject-introspection' 'vala')
 options=('!libtool')
 source=(http://gtkspell.sourceforge.net/download/$pkgname-$pkgver.tar.gz)
-md5sums=('58f68a0fe9007d9a3d6092b222689320')
+md5sums=('d25b547507940738cf016936c3452113')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/gwibber/PKGBUILD b/community/gwibber/PKGBUILD
deleted file mode 100644
index 1bb2f3054..000000000
--- a/community/gwibber/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 88679 2013-04-21 22:16:47Z heftig $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=gwibber
-pkgver=3.6.0
-pkgrel=4
-pkgdesc="Microblogging client for GNOME, which supports Facebook, Identi.ca, Twitter, Flickr, Foursquare, Sina and Sohu"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://gwibber.com/"
-license=('GPL')
-depends=('libgee06' 'account-plugins' 'libnotify' 'libsoup' 'dee' 'json-glib' 'gtkspell3' 'python2-dbus' 'python2-gobject' 'python2-gobject2' 'python2-httplib2' 'python2-oauth' 'python2-imaging' 'python2-xdg' 'dconf')
-makedepends=('intltool' 'vala')
-options=('!libtool')
-install=$pkgname.install
-source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz
-        lp_934530.patch
-        lp_1051801.patch
-        lp_1088775.patch
-        gtkspell3-port.patch)
-md5sums=('5988e36e9f592c6eca6537ba6878307a'
-         '8c43ae0ed96c52602befeff640a8672a'
-         '0eb53f4f248a6c600b6c6dfaac12341f'
-         '5698a3b1699c018719b193362486c9b5'
-         'e8c657543542d8141fdfe4b87a24d7fe')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  find . -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
-
-  # Apply some fixes from Ubuntu
-  patch -Np1 -i "$srcdir/lp_934530.patch"
-  patch -Np1 -i "$srcdir/lp_1051801.patch"
-  patch -Np1 -i "$srcdir/lp_1088775.patch"
-
-  # Port to the new gtkspell3
-  patch -Np1 -i "$srcdir/gtkspell3-port.patch"
-
-  # Use the standalone accounts configuration panel
-  sed -i 's/"gnome-control-center", "credentials", "application=gwibber"/"credentials-preferences"/' client/gwibber-client.vala
-  sed -i 's/"gnome-control-center", "credentials"/"credentials-preferences"/' gwibber/microblog/dispatcher.py
-
-  # Remove unneeded dependency on libdbusmenu
-  sed -i '/Dbusmenu-0.4/ d' client/Makefile.{am,in}
-
-  autoreconf -fi
-  intltoolize --force
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
-              --disable-static --disable-schemas-compile --disable-unity
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community/gwibber/gtkspell3-port.patch b/community/gwibber/gtkspell3-port.patch
deleted file mode 100644
index a7cc5da37..000000000
--- a/community/gwibber/gtkspell3-port.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Naur gwibber-3.6.0.orig/configure.ac gwibber-3.6.0/configure.ac
---- gwibber-3.6.0.orig/configure.ac	2012-10-03 02:09:08.000000000 +0200
-+++ gwibber-3.6.0/configure.ac	2013-03-28 21:34:39.227995294 +0100
-@@ -159,10 +159,10 @@
- 
- if test "x$enable_spell" = "xyes"; then
-         PKG_CHECK_MODULES(GTKSPELL,
--                  gtkspell-3.0)
-+                  gtkspell3-3.0)
-         AC_SUBST(GTKSPELL_CFLAGS)
-         AC_SUBST(GTKSPELL_CFLAGS)
--	GTKSPELL_PKG="--pkg gtkspell-3.0"
-+	GTKSPELL_PKG="--pkg gtkspell3-3.0"
-         AC_SUBST(GTKSPELL_PKG)
- fi
- 
-diff -Naur gwibber-3.6.0.orig/libgwibber-gtk/entry.vala gwibber-3.6.0/libgwibber-gtk/entry.vala
---- gwibber-3.6.0.orig/libgwibber-gtk/entry.vala	2012-08-21 06:14:19.000000000 +0200
-+++ gwibber-3.6.0/libgwibber-gtk/entry.vala	2013-03-28 21:36:32.830637428 +0100
-@@ -141,7 +141,8 @@
- #if HAVE_GTKSPELL
-             try
-             {
--              var spell = new Gtk.Spell.attach(this, null);
-+              var spell = new GtkSpell.Checker();
-+              spell.attach(this);
-             }
-             catch (Error e)
-             {
diff --git a/community/gwibber/gwibber.install b/community/gwibber/gwibber.install
deleted file mode 100644
index d973d53f7..000000000
--- a/community/gwibber/gwibber.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate
-  glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/community/gwibber/lp_1051801.patch b/community/gwibber/lp_1051801.patch
deleted file mode 100644
index 706c79e54..000000000
--- a/community/gwibber/lp_1051801.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-=== modified file 'bin/gwibber-service'
---- old/bin/gwibber-service	2012-02-13 20:39:02 +0000
-+++ new/bin/gwibber-service	2012-09-20 06:35:40 +0000
-@@ -74,6 +74,7 @@
- message_monitor = dispatcher.MessagesMonitor()
- """
- 
-+dbus.mainloop.glib.threads_init()
- logger.debug("Setting up monitors")
- connection_monitor = dispatcher.ConnectionMonitor()
- urlshortener = dispatcher.URLShorten()
-
diff --git a/community/gwibber/lp_1088775.patch b/community/gwibber/lp_1088775.patch
deleted file mode 100644
index 2f3b318d0..000000000
--- a/community/gwibber/lp_1088775.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-=== modified file 'gwibber/microblog/plugins/facebook/__init__.py'
---- old/gwibber/microblog/plugins/facebook/__init__.py	2012-09-24 20:55:20 +0000
-+++ new/gwibber/microblog/plugins/facebook/__init__.py	2013-01-14 15:41:35 +0000
-@@ -326,7 +326,10 @@
-     
-     if data.has_key("privacy"):
-       m["privacy"] = {}
--      m["privacy"]["description"] = data["privacy"]["description"]
-+      if data["privacy"].has_key("description"):
-+        m["privacy"]["description"] = data["privacy"]["description"]
-+      else:
-+        m["privacy"]["description"] = ""
-       m["privacy"]["value"] = data["privacy"]["value"]
- 
-     # Handle target for wall posts with a specific recipient
-
diff --git a/community/gwibber/lp_934530.patch b/community/gwibber/lp_934530.patch
deleted file mode 100644
index 6f2bd4302..000000000
--- a/community/gwibber/lp_934530.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-=== modified file 'gwibber/microblog/network.py'
---- old/gwibber/microblog/network.py	2012-03-31 15:02:54 +0000
-+++ new/gwibber/microblog/network.py	2012-06-13 16:48:52 +0000
-@@ -37,8 +37,14 @@
-       logger.error("HTTP Error for %s - error code: %s", e.geturl().split("?")[0], e.getcode())
-       self.res = "HTTP error: {0}".format(e.getcode())
-     except urllib2.URLError, e:
--      logger.error("Network failure: %s", e.reason)
--      self.res = "Network error: {0}".format(e.reason)
-+      logger.error("Network failure: %s", e.message)
-+      self.res = "Network error: {0}".format(e.message)
-+    except IOError, e:
-+      logger.error("Network failure: %s", e.message)
-+      self.res = "Network error: {0}".format(e.message)
-+    except:
-+      logger.error("Network failure: UNKNOWN")
-+      self.res = "Network error: UNKNOWN"
- 
-   def get_json(self):
-     try:
-
diff --git a/community/haskell-base64-bytestring/PKGBUILD b/community/haskell-base64-bytestring/PKGBUILD
deleted file mode 100644
index f74265df9..000000000
--- a/community/haskell-base64-bytestring/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Maintainer: Daniel Micay <danielmicay@gmail.com>
-# Contributor: Arch Haskell Team <>
-# Contributor: Lex Black <autumn-wind at web dot de>
-
-_hkgname=base64-bytestring
-pkgname=haskell-base64-bytestring
-pkgver=1.0.0.1
-pkgrel=2
-pkgdesc="Fast base64 encoding and deconding for ByteStrings"
-url="https://github.com/bos/base64-bytestring"
-license=(custom:BSD3)
-arch=('i686' 'x86_64')
-makedepends=('ghc')
-depends=('haskell-bytestring')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install="$pkgname.install"
-sha256sums=('ab25abf4b00a2f52b270bc3ed43f1d59f16c8eec9d7dffb14df1e9265b233b50')
-
-build() {
-  cd "$srcdir/$_hkgname-$pkgver"
-  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-    --prefix=/usr --docdir=/usr/share/doc/$pkgname \
-    --libsubdir=\$compiler/site-local/\$pkgid
-  runhaskell Setup build
-  runhaskell Setup haddock
-  runhaskell Setup register --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd "$srcdir/$_hkgname-$pkgver"
-  install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh"
-  install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
-  install -d -m755 "$pkgdir/usr/share/doc/ghc/html/libraries"
-  ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname"
-  runhaskell Setup copy --destdir="$pkgdir"
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
-}
diff --git a/community/haskell-base64-bytestring/haskell-base64-bytestring.install b/community/haskell-base64-bytestring/haskell-base64-bytestring.install
deleted file mode 100644
index 434874e99..000000000
--- a/community/haskell-base64-bytestring/haskell-base64-bytestring.install
+++ /dev/null
@@ -1,23 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-base64-bytestring
-
-post_install() {
-  $HS_DIR/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_upgrade() {
-  $HS_DIR/unregister.sh
-}
-
-post_upgrade() {
-  $HS_DIR/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_remove() {
-  $HS_DIR/unregister.sh
-}
-
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community/haskell-blaze-builder/PKGBUILD b/community/haskell-blaze-builder/PKGBUILD
deleted file mode 100644
index 03ca1928d..000000000
--- a/community/haskell-blaze-builder/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# Maintainer: Daniel Micay <danielmicay@gmail.com>
-# Contributor: Arch Haskell Team <>
-# Contributor: Lex Black <autumn-wind at web dot de>
-
-pkgname=haskell-blaze-builder
-_hkgname=blaze-builder
-pkgver=0.3.1.1
-pkgrel=2
-pkgdesc="Efficient buffered output."
-url="http://github.com/meiersi/blaze-builder"
-license=(custom:BSD3)
-arch=('i686' 'x86_64')
-makedepends=('ghc')
-depends=('haskell-bytestring' 'haskell-text')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install="$pkgname.install"
-sha256sums=('a12506f8afd650e4ed90e1e2379750035f8e83032a2d260eacc3757fe52cdcde')
-
-build() {
-  cd "$srcdir/$_hkgname-$pkgver"
-
-  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-    --prefix=/usr --docdir=/usr/share/doc/$pkgname \
-    --libsubdir=\$compiler/site-local/\$pkgid
-  runhaskell Setup build
-  runhaskell Setup haddock
-  runhaskell Setup register --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd "$srcdir/$_hkgname-$pkgver"
-  install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh"
-  install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
-  install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries"
-  ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname"
-  runhaskell Setup copy --destdir="$pkgdir"
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
-}
diff --git a/community/haskell-blaze-builder/haskell-blaze-builder.install b/community/haskell-blaze-builder/haskell-blaze-builder.install
deleted file mode 100644
index 1f2b9ed67..000000000
--- a/community/haskell-blaze-builder/haskell-blaze-builder.install
+++ /dev/null
@@ -1,24 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-blaze-builder
-
-# functions
-post_install() {
-  $HS_DIR/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_upgrade() {
-  $HS_DIR/unregister.sh
-}
-
-post_upgrade() {
-  $HS_DIR/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_remove() {
-  $HS_DIR/unregister.sh
-}
-
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community/haskell-blaze-html/PKGBUILD b/community/haskell-blaze-html/PKGBUILD
deleted file mode 100644
index 28b88312c..000000000
--- a/community/haskell-blaze-html/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Maintainer: Daniel Micay <danielmicay@gmail.com>
-# Contributor: Aleksandar Micovic <metaleks@gmail.com>
-_hkgname=blaze-html
-pkgname=haskell-blaze-html
-pkgver=0.6.1.1
-pkgrel=2
-pkgdesc="A blazingly fast HTML combinator library for Haskell"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-makedepends=()
-depends=('ghc' 'haskell-blaze-builder<0.4' 'haskell-blaze-markup<0.6' 'haskell-bytestring-show' 'haskell-text>=0.11.0.5')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=$pkgname.install
-md5sums=('f9eda0a990cda190538b9e6ff73b05f3')
-
-build() {
-  cd "${srcdir}/${_hkgname}-${pkgver}"
-  runhaskell Setup configure -O ${PKGBUILD_HASKELL_ENABLE_PROFILING:+-p } --enable-split-objs --enable-shared \
-    --prefix=/usr --docdir=/usr/share/doc/$pkgname --libsubdir=\$compiler/site-local/\$pkgid
-  runhaskell Setup build
-  runhaskell Setup haddock
-  runhaskell Setup register   --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-package() {
-  cd "${srcdir}/${_hkgname}-${pkgver}"
-  install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh"
-  install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
-  install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries"
-  ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/${_hkgname}"
-  runhaskell Setup copy --destdir="$pkgdir"
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
-}
diff --git a/community/haskell-blaze-html/haskell-blaze-html.install b/community/haskell-blaze-html/haskell-blaze-html.install
deleted file mode 100644
index 9887d3a8d..000000000
--- a/community/haskell-blaze-html/haskell-blaze-html.install
+++ /dev/null
@@ -1,23 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-blaze-html
-
-post_install() {
-  $HS_DIR/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_upgrade() {
-  $HS_DIR/unregister.sh
-}
-
-post_upgrade() {
-  $HS_DIR/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_remove() {
-  $HS_DIR/unregister.sh
-}
-
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community/haskell-blaze-markup/PKGBUILD b/community/haskell-blaze-markup/PKGBUILD
deleted file mode 100644
index 6c0d5e4a9..000000000
--- a/community/haskell-blaze-markup/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Daniel Micay <danielmicay@gmail.com>
-# Contributor: Lex Black <autumn-wind at web dot de>
-
-_hkgname=blaze-markup
-pkgname=haskell-blaze-markup
-pkgver=0.5.1.5
-pkgrel=2
-pkgdesc="Core modules of a blazingly fast markup combinator library for the Haskell programming language"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=(custom:BSD3)
-arch=('i686' 'x86_64')
-makedepends=('ghc')
-depends=('haskell-blaze-builder' 'haskell-bytestring-show' 'haskell-text')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=$pkgname.install
-md5sums=('faf0c80851b34987e74541b23cef3218')
-
-build() {
-  cd "$srcdir/$_hkgname-$pkgver"
-  runhaskell Setup configure -O ${PKGBUILD_HASKELL_ENABLE_PROFILING:+-p } --enable-split-objs --enable-shared \
-    --prefix=/usr --docdir=/usr/share/doc/$pkgname --libsubdir=\$compiler/site-local/\$pkgid
-  runhaskell Setup build
-  runhaskell Setup haddock
-  runhaskell Setup register   --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd "$srcdir/$_hkgname-$pkgver"
-  install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh"
-  install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
-  install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries"
-  ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname"
-  runhaskell Setup copy --destdir="$pkgdir"
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
-}
diff --git a/community/haskell-blaze-markup/haskell-blaze-markup.install b/community/haskell-blaze-markup/haskell-blaze-markup.install
deleted file mode 100644
index fa5fb8064..000000000
--- a/community/haskell-blaze-markup/haskell-blaze-markup.install
+++ /dev/null
@@ -1,22 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-blaze-markup
-
-post_install() {
-  $HS_DIR/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_upgrade() {
-  $HS_DIR/unregister.sh
-}
-
-post_upgrade() {
-  $HS_DIR/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_remove() {
-  $HS_DIR/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community/haskell-citeproc-hs/PKGBUILD b/community/haskell-citeproc-hs/PKGBUILD
deleted file mode 100644
index f66d18870..000000000
--- a/community/haskell-citeproc-hs/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Maintainer: Daniel Micay <danielmicay@gmail.com>
-# Contributor: Arch Haskell Team <>
-# Contributor: Lex Black <autumn-wind at web dot de>
-
-_hkgname=citeproc-hs
-pkgname=haskell-citeproc-hs
-pkgver=0.3.8
-pkgrel=3
-pkgdesc="A Citation Style Language implementation in Haskell"
-url="http://gorgias.mine.nu/repos/citeproc-hs/"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-makedepends=('ghc')
-depends=(haskell-http haskell-bytestring haskell-containers haskell-directory
-         haskell-filepath haskell-json haskell-mtl haskell-old-locale haskell-hs-bibutils
-         haskell-pandoc-types haskell-parsec haskell-syb haskell-time haskell-utf8-string haskell-xml)
-source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/${_hkgname}-${pkgver}.tar.gz")
-install=$pkgname.install
-sha256sums=('e873673b2960d0eebbcede9d8c18e2acea0e4fed295552fa635814f4bae48e72')
-
-build() {
-  cd "$srcdir/$_hkgname-$pkgver"
-  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-    --prefix=/usr --docdir=/usr/share/doc/$pkgname \
-    --libsubdir=\$compiler/site-local/\$pkgid -f bibutils
-  runhaskell Setup build
-  runhaskell Setup haddock
-  runhaskell Setup register --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd "$srcdir/$_hkgname-$pkgver"
-  install -D -m744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh"
-  install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
-  install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries"
-  ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname"
-  runhaskell Setup copy --destdir="$pkgdir"
-  install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
-}
diff --git a/community/haskell-citeproc-hs/haskell-citeproc-hs.install b/community/haskell-citeproc-hs/haskell-citeproc-hs.install
deleted file mode 100644
index b2c962877..000000000
--- a/community/haskell-citeproc-hs/haskell-citeproc-hs.install
+++ /dev/null
@@ -1,23 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-citeproc-hs
-
-post_install() {
-  $HS_DIR/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_upgrade() {
-  $HS_DIR/unregister.sh
-}
-
-post_upgrade() {
-  $HS_DIR/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_remove() {
-  $HS_DIR/unregister.sh
-}
-
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community/haskell-digest/PKGBUILD b/community/haskell-digest/PKGBUILD
deleted file mode 100644
index 3293c8322..000000000
--- a/community/haskell-digest/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Daniel Micay <danielmicay@gmail.com>
-# Contributor: Arch Haskell Team <>
-# Contributor: Lex Black <autumn-wind at web dot de>
-
-_hkgname=digest
-pkgname=haskell-digest
-pkgver=0.0.1.2
-pkgrel=1
-pkgdesc='Various cryptographic hashes for bytestrings; CRC32 and Adler32 for now.'
-url="http://hackage.haskell.org/package/$_hkgname"
-license=(custom:BSD3)
-arch=('i686' 'x86_64')
-depends=('ghc' 'zlib')
-source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-${pkgver}.tar.gz")
-install=$pkgname.install
-sha256sums=('641717eb16392abf8965986a9e8dc21eebf1d97775bbb6923c7b7f8fee17fe11')
-
-build() {
-  cd "$srcdir/$_hkgname-$pkgver"
-  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-    --prefix=/usr --docdir=/usr/share/doc/$pkgname \
-    --libsubdir=\$compiler/site-local/\$pkgid
-  runhaskell Setup build
-  runhaskell Setup haddock
-  runhaskell Setup register --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd "$srcdir/$_hkgname-$pkgver"
-  install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh"
-  install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
-  install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries"
-  ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/${_hkgname}"
-  runhaskell Setup copy --destdir="$pkgdir"
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
-}
diff --git a/community/haskell-digest/haskell-digest.install b/community/haskell-digest/haskell-digest.install
deleted file mode 100644
index d0637a0cb..000000000
--- a/community/haskell-digest/haskell-digest.install
+++ /dev/null
@@ -1,23 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-digest
-
-post_install() {
-  $HS_DIR/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_upgrade() {
-  $HS_DIR/unregister.sh
-}
-
-post_upgrade() {
-  $HS_DIR/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_remove() {
-  $HS_DIR/unregister.sh
-}
-
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community/haskell-highlighting-kate/PKGBUILD b/community/haskell-highlighting-kate/PKGBUILD
deleted file mode 100644
index 1a3c0b7d1..000000000
--- a/community/haskell-highlighting-kate/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Daniel Micay <danielmicay@gmail.com>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Contributor: Lex Black <autumn-wind at web dot de>
-
-_hkgname=highlighting-kate
-pkgname=haskell-highlighting-kate
-pkgver=0.5.3.9
-pkgrel=1
-pkgdesc="Syntax highlighting"
-url="http://hackage.haskell.org/package/$_hkgname"
-license=('GPL')
-arch=('i686' 'x86_64')
-makedepends=('ghc')
-depends=('haskell-blaze-html>=0.4.2' 'haskell-containers' 'haskell-filepath' 'haskell-mtl' 'haskell-parsec' 'haskell-pcre-light')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=$pkgname.install
-md5sums=('fa274eb5d1f7002b16a312693ad9eef0')
-
-build() {
-  cd $_hkgname-$pkgver
-  runhaskell Setup configure -O --enable-split-objs --enable-shared \
-    --prefix=/usr --docdir=/usr/share/doc/$pkgname --libsubdir=\$compiler/site-local/\$pkgid
-  runhaskell Setup build
-  runhaskell Setup haddock
-  runhaskell Setup register   --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd $_hkgname-$pkgver
-  install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh"
-  install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
-  install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries"
-  ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname"
-  runhaskell Setup copy --destdir="$pkgdir"
-}
diff --git a/community/haskell-highlighting-kate/haskell-highlighting-kate.install b/community/haskell-highlighting-kate/haskell-highlighting-kate.install
deleted file mode 100644
index c03138b71..000000000
--- a/community/haskell-highlighting-kate/haskell-highlighting-kate.install
+++ /dev/null
@@ -1,23 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-highlighting-kate
-
-post_install() {
-  $HS_DIR/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_upgrade() {
-  $HS_DIR/unregister.sh
-}
-
-post_upgrade() {
-  $HS_DIR/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_remove() {
-  $HS_DIR/unregister.sh
-}
-
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community/haskell-hs-bibutils/PKGBUILD b/community/haskell-hs-bibutils/PKGBUILD
deleted file mode 100644
index 85a7a74c7..000000000
--- a/community/haskell-hs-bibutils/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Maintainer: Daniel Micay <danielmicay@gmail.com>
-# Contributor: Ivy Foster <joyfulgirl (at) archlinux (dot) # us>
-# Contributor: Alexander Dunlap <alexander.dunlap at gmail # dot com>
-
-_hkgname=hs-bibutils
-pkgname=haskell-hs-bibutils
-pkgver=5.0
-pkgrel=2
-pkgdesc="Haskell bindings to bibutils, the bibliography conversion utilities."
-url="http://hackage.haskell.org/package/$_hkgname"
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('ghc' 'haskell-syb>=0.3' 'bibutils')
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-$pkgver.tar.gz)
-install=$pkgname.install
-md5sums=('611e02005ad8bbb69218ebf15f3587c6')
-
-build() {
-  cd "$_hkgname-$pkgver"
-  runhaskell Setup configure -O \
-    --enable-split-objs \
-    --enable-shared \
-    --prefix=/usr \
-    --docdir=/usr/share/doc/$pkgname \
-    --libsubdir=\$compiler/site-local/\$pkgid \
-    --enable-library-profiling
-  runhaskell Setup build
-  runhaskell Setup haddock
-  runhaskell Setup register --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r \
-    -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" \
-    unregister.sh
-}
-
-package() {
-  cd "$_hkgname-$pkgver"
-  install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh"
-  install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
-  install -dm755  "$pkgdir/usr/share/doc/ghc/html/libraries"
-  ln -s /usr/share/doc/${pkgname}/html "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname"
-  runhaskell Setup copy --destdir="$pkgdir"
-}
diff --git a/community/haskell-hs-bibutils/haskell-hs-bibutils.install b/community/haskell-hs-bibutils/haskell-hs-bibutils.install
deleted file mode 100644
index 7b5f4d635..000000000
--- a/community/haskell-hs-bibutils/haskell-hs-bibutils.install
+++ /dev/null
@@ -1,23 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-hs-bibutils
-
-post_install() {
-  $HS_DIR/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_upgrade() {
-  $HS_DIR/unregister.sh
-}
-
-post_upgrade() {
-  $HS_DIR/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_remove() {
-  $HS_DIR/unregister.sh
-}
-
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community/haskell-json/PKGBUILD b/community/haskell-json/PKGBUILD
deleted file mode 100644
index b1ed11582..000000000
--- a/community/haskell-json/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Daniel Micay <danielmicay@gmail.com>
-
-_hkgname=json
-pkgname=haskell-json
-pkgver=0.7
-pkgrel=5
-pkgdesc="Support for serialising Haskell to and from JSON"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=(custom:BSD3)
-arch=('i686' 'x86_64')
-depends=(ghc haskell-array 'haskell-base>=4' haskell-bytestring
-         haskell-containers haskell-text haskell-mtl 'haskell-syb>=0.3.3')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install=$pkgname.install
-sha256sums=("d3654272caa269bc65f6f2af82b583ef05434613fe5272d57053fb3bfada68a3")
-
-build() {
-  cd "$srcdir/$_hkgname-$pkgver"
-
-  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-    --prefix=/usr --docdir=/usr/share/doc/$pkgname \
-    --libsubdir=\$compiler/site-local/\$pkgid
-  runhaskell Setup build
-  runhaskell Setup haddock
-  runhaskell Setup register --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd "$srcdir/$_hkgname-$pkgver"
-  install -D -m744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh"
-  install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
-  install -d -m755 "$pkgdir/usr/share/doc/ghc/html/libraries"
-  ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/${_hkgname}"
-  runhaskell Setup copy --destdir="$pkgdir"
-  install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
-}
diff --git a/community/haskell-json/haskell-json.install b/community/haskell-json/haskell-json.install
deleted file mode 100644
index 5be36b5cc..000000000
--- a/community/haskell-json/haskell-json.install
+++ /dev/null
@@ -1,23 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-json
-
-post_install() {
-    $HS_DIR/register.sh
-    (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_upgrade() {
-    $HS_DIR/unregister.sh
-}
-
-post_upgrade() {
-    $HS_DIR/register.sh
-    (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_remove() {
-    $HS_DIR/unregister.sh
-}
-
-post_remove() {
-    (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community/haskell-pandoc-types/PKGBUILD b/community/haskell-pandoc-types/PKGBUILD
deleted file mode 100644
index a459b125a..000000000
--- a/community/haskell-pandoc-types/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Daniel Micay <danielmicay@gmail.com>
-# Contributor: Arch Haskell Team <>
-# Contributor: Lex Black <autumn-wind at web dot de>
-
-_hkgname=pandoc-types
-pkgname=haskell-pandoc-types
-pkgver=1.10
-pkgrel=3
-pkgdesc="Types for representing a structured document"
-url="http://johnmacfarlane.net/pandoc"
-license=("GPL")
-arch=('i686' 'x86_64')
-makedepends=('ghc')
-depends=('haskell-containers' 'haskell-syb')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install=$pkgname.install
-sha256sums=('e65b983aece74d57db53c6f611f92b9df9dd876e5f022f3a8612c092d6db78f5')
-
-build() {
-  cd "$srcdir/$_hkgname-$pkgver"
-  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-    --prefix=/usr --docdir=/usr/share/doc/$pkgname \
-    --libsubdir=\$compiler/site-local/\$pkgid
-  runhaskell Setup build
-  runhaskell Setup haddock
-  runhaskell Setup register --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd "$srcdir/$_hkgname-$pkgver"
-  install -D -m744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh"
-  install    -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
-  install -d -m755 "$pkgdir/usr/share/doc/ghc/html/libraries"
-  ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname"
-  runhaskell Setup copy --destdir="$pkgdir"
-  rm -f "$pkgdir/usr/share/doc/$pkgname/COPYING"
-}
diff --git a/community/haskell-pandoc-types/haskell-pandoc-types.install b/community/haskell-pandoc-types/haskell-pandoc-types.install
deleted file mode 100644
index 72e17a9e2..000000000
--- a/community/haskell-pandoc-types/haskell-pandoc-types.install
+++ /dev/null
@@ -1,23 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-pandoc-types
-
-post_install() {
-  $HS_DIR/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_upgrade() {
-  $HS_DIR/unregister.sh
-}
-
-post_upgrade() {
-  $HS_DIR/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_remove() {
-  $HS_DIR/unregister.sh
-}
-
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community/haskell-pandoc/PKGBUILD b/community/haskell-pandoc/PKGBUILD
deleted file mode 100644
index dfbf6df4b..000000000
--- a/community/haskell-pandoc/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Maintainer: Daniel Micay <danielmicay@gmail.com>
-# Contributor: Aleksandar Micovic <metaleks@gmail.com>
-# Contributor: Lex Black <autumn-wind at web dot de>
-
-_hkgname=pandoc
-pkgname=haskell-pandoc
-pkgver=1.11.1
-pkgrel=8
-pkgdesc="Conversion between markup formats"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('GPL')
-arch=('i686' 'x86_64')
-makedepends=('ghc')
-depends=('haskell-base64-bytestring' 'haskell-blaze-html' 'haskell-blaze-markup' 'haskell-bytestring' 'haskell-citeproc-hs' 'haskell-containers' 'haskell-directory' 'haskell-extensible-exceptions' 'haskell-filepath' 'haskell-highlighting-kate' 'haskell-http' 'haskell-json' 'haskell-mtl' 'haskell-network' 'haskell-old-locale' 'haskell-pandoc-types' 'haskell-parsec' 'haskell-process' 'haskell-random' 'haskell-syb' 'haskell-tagsoup' 'haskell-temporary' 'haskell-texmath' 'haskell-time' 'haskell-utf8-string' 'haskell-xml' 'haskell-zip-archive' 'haskell-zlib' haskell-data-default)
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=$pkgname.install
-md5sums=('e895b22745affba37c0ba5e6e6d0f17c')
-provides=(pandoc)
-conflicts=(pandoc)
-replaces=(pandoc)
-
-build() {
-  cd $_hkgname-$pkgver
-  runhaskell Setup configure -O ${PKGBUILD_HASKELL_ENABLE_PROFILING:+-p } --enable-split-objs --enable-shared \
-    --prefix=/usr --docdir=/usr/share/doc/$pkgname --libsubdir=\$compiler/site-local/\$pkgid
-  runhaskell Setup build
-  runhaskell Setup haddock
-  runhaskell Setup register --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd $_hkgname-$pkgver
-  install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh"
-  install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
-  install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries"
-  ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname"
-  runhaskell Setup copy --destdir="$pkgdir"
-}
diff --git a/community/haskell-pandoc/haskell-pandoc.install b/community/haskell-pandoc/haskell-pandoc.install
deleted file mode 100644
index 24a22db9c..000000000
--- a/community/haskell-pandoc/haskell-pandoc.install
+++ /dev/null
@@ -1,23 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-pandoc
-
-post_install() {
-  $HS_DIR/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_upgrade() {
-  $HS_DIR/unregister.sh
-}
-
-post_upgrade() {
-  $HS_DIR/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_remove() {
-  $HS_DIR/unregister.sh
-}
-
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community/haskell-pcre-light/PKGBUILD b/community/haskell-pcre-light/PKGBUILD
deleted file mode 100644
index bbd9e0173..000000000
--- a/community/haskell-pcre-light/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Maintainer: Daniel Micay <danielmicay@gmail.com>
-
-_hkgname=pcre-light
-pkgname=haskell-pcre-light
-pkgver=0.4
-pkgrel=22
-pkgdesc="A small, efficient and portable regex library for Perl 5 compatible regular expressions"
-url="http://code.haskell.org/~dons/code/pcre-light"
-license=(custom:BSD3)
-arch=('i686' 'x86_64')
-makedepends=()
-depends=("ghc>=7.0.3-2"
-         "sh"
-         "haskell-bytestring-show"
-         "pcre")
-options=('strip')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install="$pkgname.install"
-sha256sums=("b37f6ffab07b56540ba4cc410f3ad3c4e0e6e226c610c33f4b7daf70559c31f6")
-
-build() {
-  cd "$srcdir/$_hkgname-$pkgver"
-  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-    --prefix=/usr --docdir=/usr/share/doc/$pkgname \
-    --libsubdir=\$compiler/site-local/\$pkgid
-  runhaskell Setup build
-  runhaskell Setup haddock
-  runhaskell Setup register --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd "$srcdir/$_hkgname-$pkgver"
-  install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh"
-  install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
-  install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries"
-  ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname"
-  runhaskell Setup copy --destdir="$pkgdir"
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
-}
diff --git a/community/haskell-pcre-light/haskell-pcre-light.install b/community/haskell-pcre-light/haskell-pcre-light.install
deleted file mode 100644
index 0a9d80b19..000000000
--- a/community/haskell-pcre-light/haskell-pcre-light.install
+++ /dev/null
@@ -1,23 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-pcre-light
-
-post_install() {
-  $HS_DIR/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_upgrade() {
-  $HS_DIR/unregister.sh
-}
-
-post_upgrade() {
-  $HS_DIR/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_remove() {
-  $HS_DIR/unregister.sh
-}
-
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community/haskell-tagsoup/PKGBUILD b/community/haskell-tagsoup/PKGBUILD
deleted file mode 100644
index 5f7712866..000000000
--- a/community/haskell-tagsoup/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Maintainer: Daniel Micay <danielmicay@gmail.com>
-_hkgname=tagsoup
-pkgname=haskell-tagsoup
-pkgver=0.12.8
-pkgrel=3
-pkgdesc="Parsing and extracting information from (possibly malformed) HTML/XML documents"
-url="http://community.haskell.org/~ndm/tagsoup/"
-license=(custom:BSD3)
-arch=('i686' 'x86_64')
-depends=("ghc" "haskell-text")
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install=$pkgname.install
-sha256sums=('a31e49133690b546a6b948a9ab9f924aaf5bd94f9e3e0afb99bb570c104c9515')
-
-build() {
-  cd $srcdir/${_hkgname}-${pkgver}
-  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-    --prefix=/usr --docdir=/usr/share/doc/$pkgname \
-    --libsubdir=\$compiler/site-local/\$pkgid
-  runhaskell Setup build
-  runhaskell Setup haddock
-  runhaskell Setup register --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd $srcdir/${_hkgname}-${pkgver}
-  install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh"
-  install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
-  install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries"
-  ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname"
-  runhaskell Setup copy --destdir="$pkgdir"
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
-}
diff --git a/community/haskell-tagsoup/haskell-tagsoup.install b/community/haskell-tagsoup/haskell-tagsoup.install
deleted file mode 100644
index 2e0c845a5..000000000
--- a/community/haskell-tagsoup/haskell-tagsoup.install
+++ /dev/null
@@ -1,23 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-tagsoup
-
-post_install() {
-  $HS_DIR/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_upgrade() {
-  $HS_DIR/unregister.sh
-}
-
-post_upgrade() {
-  $HS_DIR/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_remove() {
-  $HS_DIR/unregister.sh
-}
-
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community/haskell-temporary/PKGBUILD b/community/haskell-temporary/PKGBUILD
deleted file mode 100644
index af3453656..000000000
--- a/community/haskell-temporary/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Maintainer: Daniel Micay <danielmicay@gmail.com>
-_hkgname=temporary
-pkgname=haskell-temporary
-pkgver=1.1.2.4
-pkgrel=3
-pkgdesc="Portable temporary file and directory support for Windows and Unix, based on code from Cabal"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-makedepends=()
-depends=('ghc' 'haskell-directory' 'haskell-filepath' 'haskell-unix')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=$pkgname.install
-sha1sums=('310b6d07014064b2ecafb794393c1bba76286a33')
-
-build() {
-  cd "$srcdir/$_hkgname-$pkgver"
-  runhaskell Setup configure -O ${PKGBUILD_HASKELL_ENABLE_PROFILING:+-p } --enable-split-objs --enable-shared \
-    --prefix=/usr --docdir=/usr/share/doc/$pkgname --libsubdir=\$compiler/site-local/\$pkgid
-  runhaskell Setup build
-  runhaskell Setup haddock
-  runhaskell Setup register   --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-package() {
-  cd "$srcdir/$_hkgname-$pkgver"
-  install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh"
-  install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
-  install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries"
-  ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/${_hkgname}"
-  runhaskell Setup copy --destdir="$pkgdir"
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
-}
diff --git a/community/haskell-temporary/haskell-temporary.install b/community/haskell-temporary/haskell-temporary.install
deleted file mode 100644
index 39a0a49ff..000000000
--- a/community/haskell-temporary/haskell-temporary.install
+++ /dev/null
@@ -1,23 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-temporary
-
-post_install() {
-  $HS_DIR/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_upgrade() {
-  $HS_DIR/unregister.sh
-}
-
-post_upgrade() {
-  $HS_DIR/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_remove() {
-  $HS_DIR/unregister.sh
-}
-
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community/haskell-texmath/PKGBUILD b/community/haskell-texmath/PKGBUILD
deleted file mode 100644
index 183dab329..000000000
--- a/community/haskell-texmath/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Daniel Micay <danielmicay@gmail.com>
-# Contributor: Arch Haskell Team <>
-# Contributor: Lex Black <autumn-wind at web dot de>
-
-pkgname=haskell-texmath
-_hkgname=texmath
-pkgver=0.6.3
-pkgrel=1
-pkgdesc="Conversion of LaTeX math formulas to MathML."
-url="https://github.com/jgm/texmath"
-license=("GPL")
-arch=('i686' 'x86_64')
-makedepends=('ghc')
-depends=(haskell-containers haskell-parsec haskell-syb haskell-xml)
-source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-${pkgver}.tar.gz")
-install=$pkgname.install
-md5sums=('51a759ddfc114c5b3b7abc76644bceb1')
-
-build() {
-  cd "$srcdir/$_hkgname-$pkgver"
-  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-    --prefix=/usr --docdir=/usr/share/doc/$pkgname \
-    --libsubdir=\$compiler/site-local/\$pkgid
-  runhaskell Setup build
-  runhaskell Setup haddock
-  runhaskell Setup register --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd "$srcdir/$_hkgname-$pkgver"
-  install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh"
-  install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
-  install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries"
-  ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname"
-  runhaskell Setup copy --destdir="$pkgdir"
-  rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
-}
diff --git a/community/haskell-texmath/haskell-texmath.install b/community/haskell-texmath/haskell-texmath.install
deleted file mode 100644
index a442219ec..000000000
--- a/community/haskell-texmath/haskell-texmath.install
+++ /dev/null
@@ -1,23 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-texmath
-
-post_install() {
-  $HS_DIR/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_upgrade() {
-  $HS_DIR/unregister.sh
-}
-
-post_upgrade() {
-  $HS_DIR/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_remove() {
-  $HS_DIR/unregister.sh
-}
-
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community/haskell-xml/PKGBUILD b/community/haskell-xml/PKGBUILD
deleted file mode 100644
index 1dbd9f84a..000000000
--- a/community/haskell-xml/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# Maintainer: Daniel Micay <danielmicay@gmail.com>
-# Contributor: Don Stewart <dons@galois.com>
-# Contributor: Lex Black <autumn-wind at web dot de>
-
-_hkgname=xml
-pkgname=haskell-xml
-pkgver=1.3.13
-pkgrel=2
-pkgdesc="A simple XML library."
-url="http://code.galois.com"
-license=(custom:BSD3)
-arch=('i686' 'x86_64')
-makedepends=()
-depends=("ghc" "haskell-bytestring" "haskell-text")
-options=('strip')
-source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-${pkgver}.tar.gz")
-install=$pkgname.install
-sha256sums=('c33607cef8a48d878b0e617e115135fc6f025fe43dcb65c2c7afb8285415b813')
-
-build() {
-  cd "$srcdir/$_hkgname-$pkgver"
-  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-    --prefix=/usr --docdir=/usr/share/doc/$pkgname \
-    --libsubdir=\$compiler/site-local/\$pkgid
-  runhaskell Setup build
-  runhaskell Setup haddock
-  runhaskell Setup register --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd "$srcdir/$_hkgname-$pkgver"
-  install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh"
-  install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
-  install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries"
-  ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname"
-  runhaskell Setup copy --destdir="$pkgdir"
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
-}
diff --git a/community/haskell-xml/haskell-xml.install b/community/haskell-xml/haskell-xml.install
deleted file mode 100644
index 8ab99b5b7..000000000
--- a/community/haskell-xml/haskell-xml.install
+++ /dev/null
@@ -1,23 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-xml
-
-post_install() {
-  $HS_DIR/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_upgrade() {
-  $HS_DIR/unregister.sh
-}
-
-post_upgrade() {
-  $HS_DIR/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_remove() {
-  $HS_DIR/unregister.sh
-}
-
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community/haskell-zip-archive/PKGBUILD b/community/haskell-zip-archive/PKGBUILD
deleted file mode 100644
index af589729e..000000000
--- a/community/haskell-zip-archive/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# Maintainer: Daniel Micay <danielmicay@gmail.com>
-# Contributor: Arch Haskell Team <>
-# Contributor: Lex Black <autumn-wind at web dot de>
-
-pkgname=haskell-zip-archive
-_hkgname=zip-archive
-pkgver=0.1.3.4
-pkgrel=3
-pkgdesc="Library for creating and modifying zip archives."
-url="http://github.com/jgm/zip-archive"
-license=(custom:BSD3)
-arch=('i686' 'x86_64')
-makedepends=('ghc')
-depends=(haskell-array haskell-binary haskell-bytestring haskell-containers
-         haskell-digest haskell-directory haskell-filepath haskell-mtl
-         haskell-old-time haskell-pretty haskell-utf8-string haskell-zlib)
-source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/${_hkgname}-${pkgver}.tar.gz")
-install=$pkgname.install
-sha256sums=('cbef41120d995a87702f7bb0c1ed8107f3f36a61714b2e31d9d19df5466e7643')
-
-build() {
-  cd "$srcdir/$_hkgname-$pkgver"
-
-  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-    --prefix=/usr --docdir=/usr/share/doc/$pkgname \
-    --libsubdir=\$compiler/site-local/\$pkgid
-  runhaskell Setup build
-  runhaskell Setup haddock
-  runhaskell Setup register --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd ${srcdir}/${_hkgname}-${pkgver}
-  install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh"
-  install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
-  install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries"
-  ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname"
-  runhaskell Setup copy --destdir="$pkgdir"
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
-}
diff --git a/community/haskell-zip-archive/haskell-zip-archive.install b/community/haskell-zip-archive/haskell-zip-archive.install
deleted file mode 100644
index 3fc2845ef..000000000
--- a/community/haskell-zip-archive/haskell-zip-archive.install
+++ /dev/null
@@ -1,23 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-zip-archive
-
-post_install() {
-  $HS_DIR/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_upgrade() {
-  $HS_DIR/unregister.sh
-}
-
-post_upgrade() {
-  $HS_DIR/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_remove() {
-  $HS_DIR/unregister.sh
-}
-
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community/hedgewars/PKGBUILD b/community/hedgewars/PKGBUILD
index a67916ef4..db7c957a7 100644
--- a/community/hedgewars/PKGBUILD
+++ b/community/hedgewars/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 94887 2013-08-01 06:55:02Z bpiotrowski $
+# $Id: PKGBUILD 97071 2013-09-12 10:11:10Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=hedgewars
 pkgver=0.9.19
-pkgrel=2
+pkgrel=4
 pkgdesc="Free Worms-like turn based strategy game"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://hedgewars.org"
@@ -20,12 +20,10 @@ makedepends=('fpc' 'cmake'
 	     'haskell-vector'
 	     'haskell-random')
 source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver.tar.bz2
-	hedgewars.desktop
 	hedgewars.png
 	build-fix.patch
 	ffmpeg2.0.patch)
 md5sums=('51d84ad6ea00e9894e6119b118b4a523'
-         '48c66a3204d4fa0a69e9aa46f7c31e0c'
          'eeb14d50df39063549ac5eca9dbc65d1'
          'a9d7b0ba72cbeb7fc74fce459db9dd90'
          'da84d64a252579236d3ff0cc6e008e72')
@@ -54,5 +52,5 @@ package() {
 
   install -D -m644 Fonts_LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/Fonts_LICENSE.txt
   install -D -m644 $srcdir/hedgewars.png $pkgdir/usr/share/pixmaps/hedgewars.png
-  install -D -m644 $srcdir/hedgewars.desktop $pkgdir/usr/share/applications/hedgewars.desktop
+  install -D -m644 share/hedgewars/Data/misc/hedgewars.desktop $pkgdir/usr/share/applications/hedgewars.desktop
 }
diff --git a/community/hedgewars/hedgewars.desktop b/community/hedgewars/hedgewars.desktop
deleted file mode 100644
index 9d74ed3f1..000000000
--- a/community/hedgewars/hedgewars.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Hedgewars
-GenericName=Platform Game
-Comment=Worms style game
-Exec=hedgewars
-Icon=hedgewars
-Categories=Game;ArcadeGame;
\ No newline at end of file
diff --git a/community/highlight/PKGBUILD b/community/highlight/PKGBUILD
index 1b7669eb2..880fa3218 100644
--- a/community/highlight/PKGBUILD
+++ b/community/highlight/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 95716 2013-08-15 21:40:32Z bluewind $
+# $Id: PKGBUILD 98015 2013-10-03 17:42:09Z bluewind $
 # Maintainer: Florian Pritz <flo@xinu.at>
 # Contributor: Jan Fader <jan.fader@web.de>
 pkgbase=highlight
 pkgname=(highlight highlight-gui)
-pkgver=3.15
+pkgver=3.16
 pkgrel=1
 url="http://www.andre-simon.de/doku/highlight/highlight.html"
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
 makedepends=(qt4 lua boost)
 source=(http://www.andre-simon.de/zip/$pkgname-$pkgver.tar.bz2{,.asc})
-md5sums=('ca89c1f01449059459d8cb173a9cf2dc'
+md5sums=('88558766efc5109f07b7f5b78e62aea2'
          'SKIP')
 
 build() {
@@ -29,7 +29,7 @@ package_highlight() {
 }
 
 package_highlight-gui() {
-  pkgdesc="Fast and flexible source code highlighter (QT version)"
+  pkgdesc="Fast and flexible source code highlighter (Qt version)"
   depends=('qt4' 'highlight')
   cd "$srcdir/$pkgbase-$pkgver"
 
diff --git a/community/homebank/PKGBUILD b/community/homebank/PKGBUILD
index affa75351..e17d1f4a8 100644
--- a/community/homebank/PKGBUILD
+++ b/community/homebank/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 96645 2013-09-02 18:43:17Z jlichtblau $
+# $Id: PKGBUILD 98074 2013-10-05 17:19:13Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=homebank
-pkgver=4.5.2
+pkgver=4.5.4
 pkgrel=1
 pkgdesc="Free, easy, personal accounting for everyone"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ makedepends=('intltool')
 install=$pkgname.install
 changelog=$pkgname.changelog
 source=(http://homebank.free.fr/public/$pkgname-$pkgver.tar.gz)
-sha256sums=('f539d27758d864802d5d63a06864fcc992d2d7b7d9e872621786a83c3d672f5f')
+sha256sums=('b3dd7df29d1de38b04c3bce3ade1f6266c1dc91aefa1106e37852edeab39b083')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
@@ -28,4 +28,3 @@ package() {
 
   make DESTDIR="${pkgdir}" install
 }
-sha256sums=('b3318255676a09e7d6f26a8d750f77f40cfeb1b54dffaff8765f14a85f98ae74')
diff --git a/community/homebank/homebank.changelog b/community/homebank/homebank.changelog
index 2866e49a6..f2e6255c2 100644
--- a/community/homebank/homebank.changelog
+++ b/community/homebank/homebank.changelog
@@ -1,3 +1,9 @@
+2013-10-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* homebank 4.5.4-1
+
+2013-09-28 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* homebank 4.5.3-1
+
 2013-09-02 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* homebank 4.5.2-1
 
diff --git a/community/html2text/PKGBUILD b/community/html2text/PKGBUILD
index db2a328ce..c74801236 100644
--- a/community/html2text/PKGBUILD
+++ b/community/html2text/PKGBUILD
@@ -1,22 +1,28 @@
-# $Id: PKGBUILD 60804 2011-12-18 13:31:52Z jlichtblau $
+# $Id: PKGBUILD 97779 2013-09-29 16:22:26Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=html2text
 pkgver=1.3.2a
-pkgrel=9.1
+pkgrel=10
 pkgdesc="A HTML to text converter"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.mbayer.de/html2text"
 license=('GPL2')
 depends=('gcc-libs')
-source=(http://ftp.ibiblio.org/pub/linux/apps/www/converters/${pkgname}-${pkgver}.tar.gz)
-sha256sums=('000b39d5d910b867ff7e087177b470a1e26e2819920dcffd5991c33f6d480392')
+makedepends=('patch')
+source=(http://ftp.ibiblio.org/pub/linux/apps/www/converters/${pkgname}-${pkgver}.tar.gz \
+        http://www.mbayer.de/html2text/downloads/patch-amd64-html2text-1.3.2a.diff)
+sha256sums=('000b39d5d910b867ff7e087177b470a1e26e2819920dcffd5991c33f6d480392'
+            'b05c425ce431de104dc0c506786f07590895195911e09c9cba62a64974ca05a0')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
+#FS#35920 fix
+  patch -Np1 < ${srcdir}/patch-amd64-html2text-1.3.2a.diff
+  
   ./configure
   make
 }
diff --git a/community/ibam/03acpi-check.dpatch b/community/ibam/03acpi-check.dpatch
new file mode 100644
index 000000000..7a688fe20
--- /dev/null
+++ b/community/ibam/03acpi-check.dpatch
@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03acpi-check.dpatch by Martin Wuertele <maxx@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: change detection for sysfs and sysfs variable names for 2.6.30+ kernels
+
+@DPATCH@
+--- ibam-0.5.2/ibam.inl.orig    2010-01-03 12:17:10.000000000 +0100
++++ ibam-0.5.2/ibam.inl 2010-01-03 12:17:19.000000000 +0100
+@@ -945,7 +945,7 @@
+    string sysfs_path = "/sys/class/power_supply"; // ...
+    ifstream pmu,acpi,sysfs;
+    pmu.open((pmu_path+"/info").c_str());
+-   acpi.open((acpi_path+"/info").c_str());
++   acpi.open((acpi_path+"/event").c_str());
+    if (pmu.is_open()) {
+ #ifdef IBAM_DEBUG
+       cout << "using pmu" << endl;
+@@ -959,7 +959,7 @@
+       acpi.close();
+       apm = new acpi_status();
+    } else {
+-      sysfs.open((sysfs_path+"/BAT1/charge_full").c_str());
++      sysfs.open((sysfs_path+"/BAT0/present").c_str());
+       if(sysfs.is_open()) {
+ #ifdef IBAM_DEBUG
+       cout << "using sysfs" << endl;
+
diff --git a/community/ibam/PKGBUILD b/community/ibam/PKGBUILD
index f5a1b9c1d..b2d22e403 100644
--- a/community/ibam/PKGBUILD
+++ b/community/ibam/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 65562 2012-02-21 08:57:40Z spupykin $
+# $Id: PKGBUILD 96802 2013-09-05 18:01:44Z bgyorgy $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com>
 # Contributor: Penguin <TGates81.at.gmail.dot.com>
 
 pkgname=ibam
 pkgver=0.5.2
-pkgrel=5
+pkgrel=6
 pkgdesc="An intelligent battery monitor"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ibam.sourceforge.net/"
@@ -15,20 +15,24 @@ makedepends=('sed' 'make')
 optdepends=('gnuplot: graphs support')
 install="ibam.install"
 source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"
-	ibam-0.5.2-sysfs.patch)
+	03acpi-check.dpatch)
 md5sums=('2d5222ff504dd19e7c1ea8acc2f13cf5'
-         'c3aafebd5ad9159c89f71beab4a0f414')
+         '2f27fc97932bd59cabacbad063a13f0e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  install -m0755 -d ${pkgdir}/usr/bin
 
   sed -i \
 	-e "s|/local/bin|/bin|g" \
 	-e "s|^CFLAGS=-O3|CFLAGS=${CFLAGS}|g" \
 	Makefile
-  patch -p1 <$srcdir/ibam-0.5.2-sysfs.patch
+  patch -p1 <$srcdir/03acpi-check.dpatch
 
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  install -m0755 -d ${pkgdir}/usr/bin
   install -m0755 -D ${srcdir}/${pkgname}-${pkgver}/ibam ${pkgdir}/usr/bin/ibam
 }
diff --git a/community/ibus-anthy/PKGBUILD b/community/ibus-anthy/PKGBUILD
index 4521e4873..ec3e113a2 100644
--- a/community/ibus-anthy/PKGBUILD
+++ b/community/ibus-anthy/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 90641 2013-05-13 13:18:31Z fyan $
+# $Id: PKGBUILD 96949 2013-09-09 05:39:55Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Rainy <rainylau(at)gmail(dot)com>
 # Contributor: Lee.MaRS <leemars at gmail dot com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=ibus-anthy
-pkgver=1.5.3
+pkgver=1.5.4
 pkgrel=1
 pkgdesc='Japanese input method Anthy IMEngine for IBus Framework'
 arch=('i686' 'x86_64' 'mips64el')
@@ -34,4 +34,4 @@ package() {
   make DESTDIR=$pkgdir/ install
 }
 
-sha512sums=('490a89ef78e31ad9e0f61aadd1d93b7a670852a765cc784cbfa307a208aab4344e851dceee316dd04bdf004e901a1b23bf40ff505e55fa18ab9dafdf097263d3')
+sha512sums=('8478e9ea14472d0153cc7a35feae4edea791476dc98cfc266b598f915376d267bd5db48ea0a676209d7a6fa680628116a30fec59afaf696477cfaa14082aad8d')
diff --git a/community/ibus-kkc/PKGBUILD b/community/ibus-kkc/PKGBUILD
index 9580b97e5..75c2c22d1 100644
--- a/community/ibus-kkc/PKGBUILD
+++ b/community/ibus-kkc/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com>
 
 pkgname=ibus-kkc
-pkgver=1.5.16
+pkgver=1.5.18
 pkgrel=1
 pkgdesc="libkkc (Japanese Kana Kanji input method) engine for ibus"
 arch=('i686' 'x86_64' 'mips64el')
@@ -24,4 +24,4 @@ package() {
   make DESTDIR="$pkgdir" install
 }
 
-sha512sums=('e4106f4e40c5de807489f7c27b730dc7f29db6c89c30207d797e1bcced75a195fedd9ae48a5c70821d7357a2b2fad66748f75c74d959f3cdea9444bd1305e267')
+sha512sums=('06212fd6d851ab68ad2ca003d52d67c87d65a2cd776d575e5110c5d39d9feb8f3648608024823bfd2caed6e536e250a1416f186b3e702f5398dd9afe60a07756')
diff --git a/community/ibus-libpinyin/PKGBUILD b/community/ibus-libpinyin/PKGBUILD
index 551020f0b..1597f0ebd 100644
--- a/community/ibus-libpinyin/PKGBUILD
+++ b/community/ibus-libpinyin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 89875 2013-05-04 04:07:03Z fyan $
+# $Id: PKGBUILD 97726 2013-09-28 04:15:21Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor:  Yangtse Su<yangtsesu@gmail.com>
 # Contributor:  Jekyll Wu<adaptee [at] gmail [dot] com>
@@ -8,12 +8,12 @@
 
 pkgname=ibus-libpinyin
 pkgver=1.6.91
-pkgrel=1
+pkgrel=2
 pkgdesc="Intelligent Pinyin engine based on libpinyin for IBus"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="https://github.com/libpinyin/ibus-libpinyin"
-depends=('ibus' 'libpinyin')
+depends=('ibus' 'libpinyin' 'python2-xdg')
 makedepends=('git' 'intltool' 'gnome-common')
 source=(https://github.com/libpinyin/ibus-libpinyin/archive/$pkgver.tar.gz
 	automake-1.13.patch)
diff --git a/community/intel-gpu-tools/PKGBUILD b/community/intel-gpu-tools/PKGBUILD
index 605221109..e0d17e5f8 100644
--- a/community/intel-gpu-tools/PKGBUILD
+++ b/community/intel-gpu-tools/PKGBUILD
@@ -1,18 +1,20 @@
-# $Id: PKGBUILD 82424 2013-01-17 10:47:47Z thestinger $
+# $Id: PKGBUILD 97300 2013-09-17 05:47:11Z thestinger $
 # Maintainer: Daniel Micay <danielmicay@gmail.com>
 # Contributor: Mikael Eriksson <mikael_eriksson@miffe.org>
 # Originally by: Denis Smirnov <detanator@gmail.com>
 
 pkgname=intel-gpu-tools
-pkgver=1.3
-pkgrel=2
+pkgver=1.4
+pkgrel=1
 pkgdesc="Tools for development and testing of the Intel DRM driver"
 arch=(i686 x86_64)
 license=(MIT)
 url="http://cgit.freedesktop.org/xorg/app/intel-gpu-tools/"
-depends=('libdrm' 'libpciaccess' 'cairo')
+depends=('libdrm' 'libpciaccess' 'cairo' python)
+makedepends=(swig)
+options=(!libtool)
 source=(http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar.bz2)
-md5sums=('67facd6241e26e2c68614728e3a932e9')
+md5sums=('bfa2ff70c09c95fcad46e7d332e08d28')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/intellij-idea-libs/PKGBUILD b/community/intellij-idea-libs/PKGBUILD
index 9efdcecde..e5311bcef 100644
--- a/community/intellij-idea-libs/PKGBUILD
+++ b/community/intellij-idea-libs/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 92669 2013-06-11 16:29:42Z andrea $
+# $Id: PKGBUILD 97952 2013-10-01 19:32:08Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 pkgname=intellij-idea-libs
-pkgver=12.1.4
-_pkgver=129.713
+pkgver=12.1.5
+_pkgver=129.1328
 pkgrel=1
-pkgdesc="Architecture dependend libraries needed by the Intellij Idea IDE"
+pkgdesc="Architecture dependent libraries needed by the Intellij Idea IDE"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.jetbrains.org/"
-license=('apache')
+license=('Apache')
 depends=('glibc')
 options=(!strip)
 source=(http://download.jetbrains.com/idea/ideaIC-$pkgver.tar.gz)
-md5sums=('573815dd7dbb6a66c19f7f77a1bb048f')
+md5sums=('1eadced44ba3dca58f909f9178833a21')
 
 package() {
   install -d -m755 "$pkgdir/usr/share/intellijidea-ce/bin"
diff --git a/community/ipvsadm/01-fix-not-showing-all-server.patch b/community/ipvsadm/01-fix-not-showing-all-server.patch
deleted file mode 100644
index dea23bf76..000000000
--- a/community/ipvsadm/01-fix-not-showing-all-server.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -urN ipvsadm-1.26.vanilla/libipvs/ip_vs.h ipvsadm-1.26/libipvs/ip_vs.h
---- ipvsadm-1.26.vanilla/libipvs/ip_vs.h	2011-02-06 18:38:57.000000000 -0800
-+++ ipvsadm-1.26/libipvs/ip_vs.h	2011-08-23 15:03:59.000000000 -0700
-@@ -413,7 +413,7 @@
- 	__IPVS_CMD_ATTR_MAX,
- };
-
--#define IPVS_CMD_ATTR_MAX (__IPVS_SVC_ATTR_MAX - 1)
-+#define IPVS_CMD_ATTR_MAX (__IPVS_CMD_ATTR_MAX - 1)
-
- /*
-  * Attributes used to describe a service
-diff -urN ipvsadm-1.26.vanilla/libipvs/ip_vs_nl_policy.c
-ipvsadm-1.26/libipvs/ip_vs_nl_policy.c
---- ipvsadm-1.26.vanilla/libipvs/ip_vs_nl_policy.c	2008-09-18
-08:57:37.000000000 -0700
-+++ ipvsadm-1.26/libipvs/ip_vs_nl_policy.c	2011-08-23 14:45:34.000000000 -0700
-@@ -26,6 +26,8 @@
- 	[IPVS_SVC_ATTR_TIMEOUT]		= { .type = NLA_U32 },
- 	[IPVS_SVC_ATTR_NETMASK]		= { .type = NLA_U32 },
- 	[IPVS_SVC_ATTR_STATS]		= { .type = NLA_NESTED },
-+	[IPVS_SVC_ATTR_PE_NAME]		= { .type = NLA_STRING,
-+					    .maxlen = IP_VS_PENAME_MAXLEN},
- };
diff --git a/community/ipvsadm/PKGBUILD b/community/ipvsadm/PKGBUILD
index 7a3279978..f3a016dbc 100644
--- a/community/ipvsadm/PKGBUILD
+++ b/community/ipvsadm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 90518 2013-05-12 23:51:34Z seblu $
+# $Id: PKGBUILD 97090 2013-09-12 12:47:32Z seblu $
 # Maintainer: Sébastien Luttringer
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=ipvsadm
-pkgver=1.26
-pkgrel=8
+pkgver=1.27
+pkgrel=1
 pkgdesc='The IP Virtual Server administration utility'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.linuxvirtualserver.org/software/ipvs.html'
@@ -13,18 +13,17 @@ depends=('libnl1' 'popt' 'bash')
 backup=("etc/$pkgname.conf")
 options=('!makeflags')
 install=$pkgname.install
-source=("http://www.linuxvirtualserver.org/software/kernel-2.6/$pkgname-$pkgver.tar.gz"
+source=("https://kernel.org/pub/linux/utils/kernel/ipvsadm/$pkgname-$pkgver.tar.xz"
         "$pkgname.systemd"
-        "$pkgname.service"
-        '01-fix-not-showing-all-server.patch')
-md5sums=('eac3ba3f62cd4dea2da353aeddd353a8'
-         'b45ef25d384a7a68b51ff80d0fe81dd2'
-         'dc87684064f85b64c1e79c1eac336303'
-         'e9fb77d2fbe2d3f41d60257316338543')
+        "$pkgname.service")
+# upstream provides sha256sums of release
+sha256sums=('d360fb4dcf591e0a8a918831e2c02b1dc03e3c17ee1e60d0d70de9455238b3f8'
+            '4960ea254128347b03665d51817f29cb643cf2ebca13f5f46649257552ad3ceb'
+            '25506d07f412cccab6f2f3a2a1900d5eeda27bc58602d14f44910c4e036b5341')
 
-prepare() {
-  patch -p1 -d $pkgname-$pkgver < 01-fix-not-showing-all-server.patch
-}
+#prepare() {
+  #patch -p1 -d $pkgname-$pkgver < 01-fix-not-showing-all-server.patch
+#}
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/jansson/PKGBUILD b/community/jansson/PKGBUILD
index e5803b06d..695218e3b 100644
--- a/community/jansson/PKGBUILD
+++ b/community/jansson/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 76779 2012-09-29 19:28:30Z kkeen $
+# $Id: PKGBUILD 97810 2013-09-30 00:05:41Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: Dave Reisner <d@falconindy.com>
 
 pkgname=jansson
-pkgver=2.4
+pkgver=2.5
 pkgrel=1
 pkgdesc='C library for encoding, decoding and manipulating JSON data'
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('glibc')
 license=('MIT')
 options=('!libtool')
 source=("http://www.digip.org/$pkgname/releases/$pkgname-$pkgver.tar.bz2")
-md5sums=('3aaa1bb1195d705fac602b7504c9b945')
+md5sums=('ab239be8c08871c8463b27cf7610947c')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/keepalived/PKGBUILD b/community/keepalived/PKGBUILD
index 54c750779..a3cae7c4b 100644
--- a/community/keepalived/PKGBUILD
+++ b/community/keepalived/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 90520 2013-05-12 23:55:17Z seblu $
+# $Id: PKGBUILD 96808 2013-09-05 18:47:07Z seblu $
 # Maintainer: Sébastien Luttringer
 # Contributor: Andrea Zucchelli <zukka77@gmail.com>
 
 pkgname=keepalived
-pkgver=1.2.7
-pkgrel=3
+pkgver=1.2.8
+pkgrel=1
 pkgdesc='Failover and monitoring daemon for LVS clusters'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.keepalived.org/'
@@ -13,7 +13,7 @@ backup=('etc/keepalived/keepalived.conf')
 depends=('openssl' 'popt' 'libnl1')
 source=("http://www.keepalived.org/software/$pkgname-$pkgver.tar.gz"
         'keepalived.service')
-md5sums=('8551a34ee048895dbe5350a031ff29c1'
+md5sums=('8a362b6cea145fd4393bf004d09b4057'
          '0a5171f4298528315e8a8004b55befb7')
 
 build() {
diff --git a/community/klavaro/PKGBUILD b/community/klavaro/PKGBUILD
index 04945b84e..9448a2af0 100644
--- a/community/klavaro/PKGBUILD
+++ b/community/klavaro/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 95139 2013-08-06 07:59:09Z stativ $
+# $Id: PKGBUILD 98040 2013-10-04 13:46:45Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 pkgname=klavaro
-pkgver=1.9.8
+pkgver=2.00
 pkgrel=1
 pkgdesc="Free touch typing tutor program"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ makedepends=('intltool')
 optdepends=('espeakup: voice output')
 install=$pkgname.install
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('62ad2c6bec1c2bafab4bdd29227433ac')
+md5sums=('f7c804fbad7f9a053dfcfbea6d91dce6')
 
 build() {
   cd "$srcdir"/$pkgname-$pkgver
diff --git a/community/kmess/PKGBUILD b/community/kmess/PKGBUILD
index f845cf74c..293e964d8 100644
--- a/community/kmess/PKGBUILD
+++ b/community/kmess/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 94926 2013-08-01 07:01:20Z bpiotrowski $
+# $Id: PKGBUILD 97032 2013-09-11 02:13:11Z bgyorgy $
 # Maintainer:
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Stefano Zamprogno <stefano.zamprogno@gmail.com>
 
 pkgname=kmess
 pkgver=2.0.6.2
-pkgrel=3
+pkgrel=4
 pkgdesc="A MSN Messenger client for Linux"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://kmess.sourceforge.net/'
@@ -15,9 +15,11 @@ makedepends=('automoc4' 'cmake' 'optipng')
 optdepends=('cabextract: provides winks support')
 install=${pkgname}.install
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.bz2"
-        giflib-5.0.patch)
+        giflib-5.0.patch
+        fix-crash-in-contactlistmodel.patch)
 md5sums=('a2e57911713308bef81b9347135cc5dd'
-         '97734b073bf4a45ed3612d7626541cee')
+         '97734b073bf4a45ed3612d7626541cee'
+         'fdfe837f4bd64a5123edc63019bd5cf2')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -26,6 +28,9 @@ prepare() {
   find -name '*.png' -exec optipng -quiet -force -fix {} +
 
   patch -Np1 -i ../giflib-5.0.patch
+
+  # Fix crash in ContactListModel (FS#32402)
+  patch -Np1 -i ../fix-crash-in-contactlistmodel.patch
 }
 
 build() {
diff --git a/community/kmess/fix-crash-in-contactlistmodel.patch b/community/kmess/fix-crash-in-contactlistmodel.patch
new file mode 100644
index 000000000..c72659bc6
--- /dev/null
+++ b/community/kmess/fix-crash-in-contactlistmodel.patch
@@ -0,0 +1,29 @@
+commit e10ebb8bd33cf807e2edfa56c465b40f3237102e
+Author: Ruben Vandamme <ruben@kmess.org>
+Date:   Sun Jul 8 10:56:37 2012 +0200
+
+    Fix crash in ContactListModel.
+    
+    * Individually delete every child instead of using qDeleteAll.
+    * Crash only happens in combination with Qt 4.8.
+    * See https://bugs.kde.org/show_bug.cgi?id=285951 for similar issue in Amarok.
+    * See https://bugreports.qt-project.org/browse/QTBUG-22037 for Qt report.
+    * Many thanks to Bob ("badjar" on kmess.org/board) for providing the fix.
+
+diff --git a/src/model/contactlistmodelitem.cpp b/src/model/contactlistmodelitem.cpp
+index 462d555..ac5a6ca 100644
+--- a/src/model/contactlistmodelitem.cpp
++++ b/src/model/contactlistmodelitem.cpp
+@@ -79,7 +79,11 @@ ContactListModelItem::ContactListModelItem( Group *group, ContactListModelItem *
+  */
+ ContactListModelItem::~ContactListModelItem()
+ {
+-  qDeleteAll( childItems_ );
++  while( !childItems_.isEmpty() )
++  {
++    delete childItems_.takeFirst();
++  }
++
+   childItems_.clear();
+ 
+   // Delete this item from the parent's children
diff --git a/community/kmymoney/PKGBUILD b/community/kmymoney/PKGBUILD
index 4d5dd3cb0..60ea59808 100644
--- a/community/kmymoney/PKGBUILD
+++ b/community/kmymoney/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 94028 2013-07-13 12:33:04Z svenstaro $
+# $Id: PKGBUILD 98121 2013-10-06 08:45:27Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Vamp898 <vamp898@web.de>
@@ -7,8 +7,8 @@
 # Contributor: Todd Maynard <arch@toddmaynard.com>
 
 pkgname=kmymoney
-pkgver=4.6.3
-pkgrel=3
+pkgver=4.6.4
+pkgrel=1
 pkgdesc="Personal finance manager for KDE which operates similarly to MS-Money or Quicken"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://kmymoney2.sourceforge.net/"
@@ -19,16 +19,8 @@ replaces=('kmymoney2')
 install=$pkgname.install
 changelog=$pkgname.changelog
 options=('!makeflags')
-source=(http://downloads.sourceforge.net/project/kmymoney2/KMyMoney-KDE4/$pkgver/$pkgname-$pkgver.tar.bz2
-        git-fixes.diff)
-sha256sums=('94e109992b7e9ebb066b608d56c168216b8a944d62538c95176bc36ea4db542e'
-            'e618cc5531f00c14171c5cae837d8b5fb58bccaac363a5b09eed863355c242d3')
-
-prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -Np1 -i ../git-fixes.diff
-}
+source=(http://downloads.sourceforge.net/project/kmymoney2/KMyMoney-KDE4/$pkgver/$pkgname-$pkgver.tar.xz)
+sha256sums=('89522fadb4a9f06f3f20e2d6ac47a147f70b4265abad2fdf3aa6672fe2a3c012')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/kmymoney/git-fixes.diff b/community/kmymoney/git-fixes.diff
deleted file mode 100644
index 21b0e2330..000000000
--- a/community/kmymoney/git-fixes.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-commit 77209f84a85360e98d2e805d412956a8f2a77db3
-Author: Alex Merry <kde@randomguy3.me.uk>
-Date:   Fri Feb 1 15:31:54 2013 +0000
-
-    Fix build with GMP 5.1.0
-    
-    GMP 5.1.0 no longer has implicit conversions to mpz_class from mpq_class
-    or mpf_class.  So we have to have an explicit conversion.
-    
-    BUG: 312481
-
-diff --git a/kmymoney/mymoney/mymoneymoney.cpp b/kmymoney/mymoney/mymoneymoney.cpp
-index aeed135..5de7fa9 100644
---- a/kmymoney/mymoney/mymoneymoney.cpp
-+++ b/kmymoney/mymoney/mymoneymoney.cpp
-@@ -158,7 +158,7 @@ QString MyMoneyMoney::formatMoney(const QString& currency, const int prec, bool
-   // be much better than using KGlobal::locale()->formatMoney.
-   bool bNegative = false;
-   mpz_class left = value / static_cast<MyMoneyMoney>(convertDenominator(d)).valueRef().get_den();
--  mpz_class right = (valueRef() - mpq_class(left)) * denom;
-+  mpz_class right = mpz_class((valueRef() - mpq_class(left)) * denom);
- 
-   if (right < 0) {
-     right = -right;
-commit 9b6f96a38b8c84cb87bb07165b503acbe5ea81ff
-Author: Christoph Feck <christoph@maxiom.de>
-Date:   Fri Mar 23 23:05:19 2012 +0100
-
-    Fix includes
-
-diff --git a/kmymoney/mymoney/storage/mymoneydatabasemgrtest.cpp b/kmymoney/mymoney/storage/mymoneydatabasemgrtest.cpp
-index ff217e3..d31bb02 100644
---- a/kmymoney/mymoney/storage/mymoneydatabasemgrtest.cpp
-+++ b/kmymoney/mymoney/storage/mymoneydatabasemgrtest.cpp
-@@ -16,6 +16,7 @@
- 
- #include "mymoneydatabasemgrtest.h"
- #include <pwd.h>
-+#include <unistd.h>
- #include <iostream>
- 
- #include <QtTest/QtTest>
-
diff --git a/community/kmymoney/kmymoney.changelog b/community/kmymoney/kmymoney.changelog
index 30290a6f8..c57d5a2c0 100644
--- a/community/kmymoney/kmymoney.changelog
+++ b/community/kmymoney/kmymoney.changelog
@@ -1,3 +1,6 @@
+2013-10-06 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* kmymoney 4.6.4-1
+
 2012-09-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* kmymoney 4.6.3-1
 
diff --git a/community/ldc/PKGBUILD b/community/ldc/PKGBUILD
index 035275fed..df83c72ca 100644
--- a/community/ldc/PKGBUILD
+++ b/community/ldc/PKGBUILD
@@ -1,18 +1,17 @@
-# $Id: PKGBUILD 96332 2013-08-25 18:27:42Z dicebot $
+# $Id: PKGBUILD 97980 2013-10-02 14:03:48Z dicebot $
 # Maintainer: Mihails Strasuns <public@dicebot.lv>
 # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
 pkgname=('ldc' 'liblphobos-devel')
 groups=('dlang' 'dlang-ldc')
 pkgver=0.11.0
 epoch=1
-pkgrel=2
+pkgrel=4
 pkgdesc="A D Compiler based on the LLVM Compiler Infrastructure including D runtime and libphobos2"
 arch=('i686' 'x86_64')
 url="https://github.com/ldc-developers/ldc"
 license=('BSD')
 depends=('libconfig')
 makedepends=('git' 'cmake' 'llvm')
-backup=('etc/ldc2.conf')
 source=("git://github.com/ldc-developers/ldc.git#tag=v${pkgver}"
         "ldc2.conf"
         "ldc2.rebuild.conf"
@@ -40,6 +39,7 @@ package_ldc() {
     backup=("etc/ldc2.conf"
             "etc/ldc2.rebuild.conf"
            )
+    provides=("d-compiler")
 
     # binaries
     install -D -m755 $srcdir/ldc/build/bin/ldmd2 $pkgdir/usr/bin/ldmd2 
@@ -58,6 +58,7 @@ package_ldc() {
 
 package_liblphobos-devel() {
     depends=("ldc")
+    provides=("d-runtime" "d-stdlib")
 
     # libraries
     install -D -m644 $srcdir/ldc/build/lib/libphobos-ldc.a $pkgdir/usr/lib/liblphobos.a
@@ -67,6 +68,7 @@ package_liblphobos-devel() {
     mkdir -p $pkgdir/usr/include/dlang/ldc
     cp -r $srcdir/ldc/build/import/* $pkgdir/usr/include/dlang/ldc/
     cp -r $srcdir/ldc/runtime/phobos/std $pkgdir/usr/include/dlang/ldc/
+    cp -r $srcdir/ldc/runtime/phobos/etc $pkgdir/usr/include/dlang/ldc/
 
     # licenses
     install -D -m644 $srcdir/ldc/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE    
diff --git a/community/libaccounts-glib/PKGBUILD b/community/libaccounts-glib/PKGBUILD
index 339560038..eee7fa588 100644
--- a/community/libaccounts-glib/PKGBUILD
+++ b/community/libaccounts-glib/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 92686 2013-06-12 04:53:53Z bgyorgy $
+# $Id: PKGBUILD 96927 2013-09-08 17:56:34Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=libaccounts-glib
-pkgver=1.11
+pkgver=1.12
 pkgrel=1
 pkgdesc="Glib-based client library for accessing the online accounts database"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('dbus-glib' 'libxml2' 'sqlite3')
 makedepends=('python2-gobject')
 options=('!libtool')
 source=(http://accounts-sso.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-sha1sums=('467480fc800c6d22d8d53373f67d49f8a1e4d970')
+sha1sums=('165e0b89a0bc47459711b1e7e077fb9e14848503')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/libaccounts-qt/PKGBUILD b/community/libaccounts-qt/PKGBUILD
index 56638ce72..957e8403a 100644
--- a/community/libaccounts-qt/PKGBUILD
+++ b/community/libaccounts-qt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 93073 2013-06-23 22:18:28Z bgyorgy $
+# $Id: PKGBUILD 96784 2013-09-04 22:27:13Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgbase=libaccounts-qt
 _pkgbase=accounts-qt
 pkgname=('libaccounts-qt' 'libaccounts-qt-doc')
-pkgver=1.8
+pkgver=1.9
 pkgrel=1
 pkgdesc="Qt-based client library for accessing the online accounts database"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ depends=('qt4' 'libaccounts-glib')
 makedepends=('doxygen' 'graphviz' 'ttf-dejavu')
 options=('!emptydirs')
 source=(http://accounts-sso.googlecode.com/files/$_pkgbase-$pkgver.tar.bz2)
-sha1sums=('f5a29ef1d1e66049bbe5d809d6dbfcf0c1a39b41')
+sha1sums=('86d7bbaa7bdd18f80a28c2617653707d763d1984')
 
 build() {
   cd "$srcdir/$_pkgbase-$pkgver"
diff --git a/community/libcgns2/PKGBUILD b/community/libcgns2/PKGBUILD
deleted file mode 100644
index 6dd015a46..000000000
--- a/community/libcgns2/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 83543 2013-02-02 15:55:58Z stephane $
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Klimov Max <cleemmi@gmail.com>
-
-pkgname=libcgns2
-_basever=2.5
-_relver=5
-pkgver=${_basever}.${_relver}
-pkgrel=3
-pkgdesc='General purpose library for the storage and retrieval of computational fluid dynamics analysis data by CGNS standard'
-arch=('i686' 'x86_64' 'mips64el')
-url='http://www.cgns.org'
-license=('custom')
-conflicts=('libcgns')
-depends=('glibc')
-makedepends=('chrpath')
-source=("http://downloads.sourceforge.net/project/cgns/cgnslib_${_basever}/Release%205/cgnslib_${_basever}-${_relver}.tar.gz")
-md5sums=('ae2a2e79b99d41c63e5ed5f661f70fd9')
-
-[[ "$CARCH" == "x86_64" ]] && _64bits="--enable-64bit"
-
-build() {
-  cd cgnslib_${_basever}
-
-  ./configure \
-    --prefix=/usr \
-    --enable-shared \
-    ${_64bits}
-
-  make
-}
-
-package() {
-  cd cgnslib_${_basever}
-
-  install -d ${pkgdir}/usr/include
-  install -d ${pkgdir}/usr/lib
-
-  make install LIBDIR=${pkgdir}/usr/lib INCLUDEDIR=${pkgdir}/usr/include
-
-  # install license
-  install -d ${pkgdir}/usr/share/licenses/libcgns2
-  install -m644 LICENSE \
-    ${pkgdir}/usr/share/licenses/libcgns2
-
-  chrpath --delete ${pkgdir}/usr/lib/libcgns.so
-}
diff --git a/community/libfm/PKGBUILD b/community/libfm/PKGBUILD
index fc81a7243..bb388197f 100644
--- a/community/libfm/PKGBUILD
+++ b/community/libfm/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 96686 2013-09-03 02:30:19Z bgyorgy $
+# $Id: PKGBUILD 97020 2013-09-10 14:26:57Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Unknown47 <unknown47r@gmail.com>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 
 pkgname=libfm
-pkgver=1.1.2
+pkgver=1.1.2.2
 pkgrel=1
 pkgdesc='Library for file management'
 url='http://pcmanfm.sourceforge.net/'
@@ -17,7 +17,7 @@ install=libfm.install
 depends=('gtk2' 'menu-cache' 'shared-mime-info' 'udisks' 'desktop-file-utils')
 makedepends=('intltool')
 source=(http://downloads.sourceforge.net/pcmanfm/$pkgname-$pkgver.tar.gz)
-md5sums=('c09072e26b9688a7d171843c0da9b33f')
+md5sums=('ea3d09b23ef4c37cb84ae57ea16b8f08')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/libkkc/PKGBUILD b/community/libkkc/PKGBUILD
index 91970093b..133589843 100644
--- a/community/libkkc/PKGBUILD
+++ b/community/libkkc/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 94838 2013-07-31 03:58:39Z fyan $
+# $Id: PKGBUILD 97217 2013-09-15 11:42:40Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com>
 
 pkgname=libkkc
-pkgver=0.2.7
+pkgver=0.3.1
 pkgrel=1
 pkgdesc="Japanese Kana Kanji conversion library"
 arch=('i686' 'x86_64')
@@ -31,4 +31,4 @@ package() {
     "${pkgdir}/usr/share/doc/${pkgname}-${pkgver}/"  
 }
 
-sha512sums=('2bb056cf00b6212a18462a5f952d4557944b29f49a92b0701abed5f5d6601fdb3b57c4e09a0b3db8ff39be01e91ab658656b89f576663046e53478ed07fe87af')
+sha512sums=('6b237930ec0fd0f788364a301b2cf97a0607d708c109cf619b73321255ec50f08c396afde767856a9db6f8e8ceb0117a95eda3a17f3c9c8065a32843b1e97fc0')
diff --git a/community/libmatio/PKGBUILD b/community/libmatio/PKGBUILD
deleted file mode 100644
index 308190675..000000000
--- a/community/libmatio/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 88815 2013-04-23 01:03:57Z eric $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=libmatio
-pkgver=1.5.1
-pkgrel=1
-pkgdesc='C library with a fortran 90/95 module interface for reading/writing MATLAB MAT-files'
-arch=('x86_64' 'i686' 'mips64el')
-license=('LGPL')
-url='http://sourceforge.net/projects/matio'
-depends=('zlib')
-options=('!libtool' '!emptydirs')
-source=("http://downloads.sourceforge.net/matio/matio-$pkgver.tar.bz2")
-sha1sums=('12b8ed59688b2f41903ddc3e7975f21f10fe42bb')
-
-build() {
-  cd matio-$pkgver
-  ./configure --prefix=/usr --enable-shared 
-  make
-}
-
-check() {
-  cd matio-$pkgver
-  make check
-}
- 
-package() {
-  cd matio-$pkgver
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/librcc/PKGBUILD b/community/librcc/PKGBUILD
index 702a69f29..14cf05865 100644
--- a/community/librcc/PKGBUILD
+++ b/community/librcc/PKGBUILD
@@ -1,29 +1,23 @@
-# $Id: PKGBUILD 83682 2013-02-04 11:06:09Z spupykin $
+# $Id: PKGBUILD 97710 2013-09-27 19:26:53Z bgyorgy $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=librcc
-pkgver=0.2.6
-pkgrel=5
+pkgver=0.2.10
+pkgrel=2
 pkgdesc="Charset Conversion Library"
 arch=(i686 x86_64 'mips64el')
 url="http://rusxmms.sourceforge.net/"
 license=('GPL')
-depends=(aspell enca libxml2 db librcd)
-makedepends=(patch gtk gtk2)
+depends=('aspell' 'enca' 'libxml2' 'librcd')
+makedepends=('patch' 'gtk' 'gtk2')
 install=librcc.install
 options=('!libtool')
-source=(http://downloads.sourceforge.net/rusxmms/${pkgname}-${pkgver}.tar.bz2
-        librcc-strnlen.patch
-	librcc-0.2.6-glib.patch)
-md5sums=('9bbf248c7312c73c0b6ca19b9c5a2af1'
-         '040313d1d8f166ccf2b128cea4c05f21'
-	 '214aef7764131252620892b56c09de9d')
+source=(http://downloads.sourceforge.net/rusxmms/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('077260cf58ae9624c964652b79fbb5fb')
 
 build() {
   cd $srcdir/$pkgname-${pkgver}
-  patch -Np1 -i ${srcdir}/librcc-0.2.6-glib.patch
-  ./configure --prefix=/usr
-  patch -p1 <$srcdir/librcc-strnlen.patch
+  ./configure --prefix=/usr --disable-bdb
   make
 }
 
diff --git a/community/librcc/librcc-strnlen.patch b/community/librcc/librcc-strnlen.patch
deleted file mode 100644
index 9fc0e8b0b..000000000
--- a/community/librcc/librcc-strnlen.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -wbBur librcc-0.2.6/src/rccstring.h librcc-0.2.6.qwe/src/rccstring.h
---- librcc-0.2.6/src/rccstring.h	2006-01-08 15:42:59.000000000 +0000
-+++ librcc-0.2.6.qwe/src/rccstring.h	2009-09-28 08:45:37.000000000 +0000
-@@ -18,13 +18,6 @@
- int rccStringFixID(rcc_string string, rcc_context ctx);
- int rccStringChangeID(rcc_string string, rcc_language_id language_id);
- 
--#ifdef HAVE_STRNLEN
--# ifndef strnlen
--int strnlen(const char *str, size_t size);
--# endif /* !strnlen */
--#else
--int rccStrnlen(const char *str, size_t size);
--#endif /* HAVE_STRNLEN */
- int rccIsASCII(const char *str);
- size_t rccStringSizedGetChars(const char *str, size_t size);
- 
diff --git a/community/libsignon-glib/PKGBUILD b/community/libsignon-glib/PKGBUILD
deleted file mode 100644
index 9b4e65ca6..000000000
--- a/community/libsignon-glib/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 92688 2013-06-12 04:57:26Z bgyorgy $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=libsignon-glib
-pkgver=1.10
-pkgrel=1
-pkgdesc="GLib-based client library for applications handling account authentication through the Online Accounts Single Sign-On service"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://code.google.com/p/accounts-sso/"
-license=('LGPL')
-depends=('signon')
-makedepends=('python2-gobject')
-options=('!libtool')
-source=(http://accounts-sso.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-sha1sums=('224f66c9662843705da4b35d781a50d6aeb8ca5f')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-static \
-              PYTHON=python2
-  make -j1
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  # Install GI overrides for python 3 as well
-  install -dm755 "$pkgdir/usr/lib/python3.3/site-packages/gi/overrides"
-  ln -s ../../../../python2.7/site-packages/gi/overrides/Signon.py "$pkgdir/usr/lib/python3.3/site-packages/gi/overrides/Signon.py"
-}
diff --git a/community/libsodium/PKGBUILD b/community/libsodium/PKGBUILD
index 5a5d3b097..3cef1c18a 100644
--- a/community/libsodium/PKGBUILD
+++ b/community/libsodium/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 94581 2013-07-27 14:32:50Z fyan $
+# $Id: PKGBUILD 96998 2013-09-10 02:39:45Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: namelessjon <jonathan.stott@gmail.com>
 # Contributor: Alessio Sergi <asergi at archlinux dot us>
 
 pkgname=libsodium
-pkgver=0.4.2
-pkgrel=2
+pkgver=0.4.3
+pkgrel=1
 pkgdesc="P(ortable|ackageable) NaCl-based crypto library"
 arch=('i686' 'x86_64')
 url="https://github.com/jedisct1/libsodium"
@@ -13,7 +13,6 @@ license=('custom:ISC')
 depends=('glibc')
 options=('!libtool')
 source=(http://download.dnscrypt.org/$pkgname/releases/$pkgname-${pkgver}.tar.gz)
-sha256sums=('1a7901cdd127471724e854a8eb478247dc0ca67be549345c75fc6f2d4e05ed39')
 
 build() {
   cd "$pkgname-$pkgver"
@@ -32,7 +31,8 @@ package() {
 
   # install license
   install -d -m 755 "$pkgdir/usr/share/licenses/$pkgname"
-  install -m 644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+  install -m 644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
 # vim:set ts=2 sw=2 et:
+sha512sums=('479016922fa522409eac80e65046129b4ea3a34642483e6f56331c430c9cb21cf69ec4650a6717560283096d1416bf15035dbf56eba3c35259ddfc8feccda331')
diff --git a/community/libvirt/0001-Also-store-user-group-ID-values-in-virIdentity.patch b/community/libvirt/0001-Also-store-user-group-ID-values-in-virIdentity.patch
new file mode 100644
index 000000000..70a613820
--- /dev/null
+++ b/community/libvirt/0001-Also-store-user-group-ID-values-in-virIdentity.patch
@@ -0,0 +1,156 @@
+From 02432e3afa32e9866fbf1317069b422ef552d1d4 Mon Sep 17 00:00:00 2001

+From: "Daniel P. Berrange" <berrange@redhat.com>

+Date: Thu, 22 Aug 2013 16:00:01 +0100

+Subject: [PATCH 1/3] Also store user & group ID values in virIdentity

+

+Future improvements to the polkit code will require access to

+the numeric user ID, not merely user name.

+

+Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

+---

+ src/rpc/virnetserverclient.c | 18 ++++++++++++++++++

+ src/util/viridentity.c       | 23 +++++++++++++++++++----

+ src/util/viridentity.h       |  2 ++

+ 3 files changed, 39 insertions(+), 4 deletions(-)

+

+diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c

+index 83d5cf1..f30dd08 100644

+--- a/src/rpc/virnetserverclient.c

++++ b/src/rpc/virnetserverclient.c

+@@ -652,7 +652,9 @@ virNetServerClientCreateIdentity(virNetServerClientPtr client)

+     char *processid = NULL;

+     char *processtime = NULL;

+     char *username = NULL;

++    char *userid = NULL;

+     char *groupname = NULL;

++    char *groupid = NULL;

+ #if WITH_SASL

+     char *saslname = NULL;

+ #endif

+@@ -672,8 +674,12 @@ virNetServerClientCreateIdentity(virNetServerClientPtr client)

+ 

+         if (!(username = virGetUserName(uid)))

+             goto cleanup;

++        if (virAsprintf(&userid, "%d", uid) < 0)

++            goto cleanup;

+         if (!(groupname = virGetGroupName(gid)))

+             goto cleanup;

++        if (virAsprintf(&userid, "%d", gid) < 0)

++            goto cleanup;

+         if (virAsprintf(&processid, "%llu",

+                         (unsigned long long)pid) < 0)

+             goto cleanup;

+@@ -710,11 +716,21 @@ virNetServerClientCreateIdentity(virNetServerClientPtr client)

+                            VIR_IDENTITY_ATTR_UNIX_USER_NAME,

+                            username) < 0)

+         goto error;

++    if (userid &&

++        virIdentitySetAttr(ret,

++                           VIR_IDENTITY_ATTR_UNIX_USER_ID,

++                           userid) < 0)

++        goto error;

+     if (groupname &&

+         virIdentitySetAttr(ret,

+                            VIR_IDENTITY_ATTR_UNIX_GROUP_NAME,

+                            groupname) < 0)

+         goto error;

++    if (groupid &&

++        virIdentitySetAttr(ret,

++                           VIR_IDENTITY_ATTR_UNIX_GROUP_ID,

++                           groupid) < 0)

++        goto error;

+     if (processid &&

+         virIdentitySetAttr(ret,

+                            VIR_IDENTITY_ATTR_UNIX_PROCESS_ID,

+@@ -745,7 +761,9 @@ virNetServerClientCreateIdentity(virNetServerClientPtr client)

+ 

+ cleanup:

+     VIR_FREE(username);

++    VIR_FREE(userid);

+     VIR_FREE(groupname);

++    VIR_FREE(groupid);

+     VIR_FREE(processid);

+     VIR_FREE(processtime);

+     VIR_FREE(seccontext);

+diff --git a/src/util/viridentity.c b/src/util/viridentity.c

+index 781f660..03c375b 100644

+--- a/src/util/viridentity.c

++++ b/src/util/viridentity.c

+@@ -133,7 +133,9 @@ int virIdentitySetCurrent(virIdentityPtr ident)

+ virIdentityPtr virIdentityGetSystem(void)

+ {

+     char *username = NULL;

++    char *userid = NULL;

+     char *groupname = NULL;

++    char *groupid = NULL;

+     char *seccontext = NULL;

+     virIdentityPtr ret = NULL;

+ #if WITH_SELINUX

+@@ -147,8 +149,13 @@ virIdentityPtr virIdentityGetSystem(void)

+ 

+     if (!(username = virGetUserName(getuid())))

+         goto cleanup;

++    if (virAsprintf(&userid, "%d", (int)getuid()) < 0)

++        goto cleanup;

++

+     if (!(groupname = virGetGroupName(getgid())))

+         goto cleanup;

++    if (virAsprintf(&groupid, "%d", (int)getgid()) < 0)

++        goto cleanup;

+ 

+ #if WITH_SELINUX

+     if (getcon(&con) < 0) {

+@@ -166,16 +173,22 @@ virIdentityPtr virIdentityGetSystem(void)

+     if (!(ret = virIdentityNew()))

+         goto cleanup;

+ 

+-    if (username &&

+-        virIdentitySetAttr(ret,

++    if (virIdentitySetAttr(ret,

+                            VIR_IDENTITY_ATTR_UNIX_USER_NAME,

+                            username) < 0)

+         goto error;

+-    if (groupname &&

+-        virIdentitySetAttr(ret,

++    if (virIdentitySetAttr(ret,

++                           VIR_IDENTITY_ATTR_UNIX_USER_ID,

++                           userid) < 0)

++        goto error;

++    if (virIdentitySetAttr(ret,

+                            VIR_IDENTITY_ATTR_UNIX_GROUP_NAME,

+                            groupname) < 0)

+         goto error;

++    if (virIdentitySetAttr(ret,

++                           VIR_IDENTITY_ATTR_UNIX_GROUP_ID,

++                           groupid) < 0)

++        goto error;

+     if (seccontext &&

+         virIdentitySetAttr(ret,

+                            VIR_IDENTITY_ATTR_SELINUX_CONTEXT,

+@@ -188,7 +201,9 @@ virIdentityPtr virIdentityGetSystem(void)

+ 

+ cleanup:

+     VIR_FREE(username);

++    VIR_FREE(userid);

+     VIR_FREE(groupname);

++    VIR_FREE(groupid);

+     VIR_FREE(seccontext);

+     VIR_FREE(processid);

+     return ret;

+diff --git a/src/util/viridentity.h b/src/util/viridentity.h

+index 4bae8d6..a240c2d 100644

+--- a/src/util/viridentity.h

++++ b/src/util/viridentity.h

+@@ -29,7 +29,9 @@ typedef virIdentity *virIdentityPtr;

+ 

+ typedef enum {

+       VIR_IDENTITY_ATTR_UNIX_USER_NAME,

++      VIR_IDENTITY_ATTR_UNIX_USER_ID,

+       VIR_IDENTITY_ATTR_UNIX_GROUP_NAME,

++      VIR_IDENTITY_ATTR_UNIX_GROUP_ID,

+       VIR_IDENTITY_ATTR_UNIX_PROCESS_ID,

+       VIR_IDENTITY_ATTR_UNIX_PROCESS_TIME,

+       VIR_IDENTITY_ATTR_SASL_USER_NAME,

+-- 

+1.8.3.1

+

diff --git a/community/libvirt/0002-Ensure-system-identity-includes-process-start-time.patch b/community/libvirt/0002-Ensure-system-identity-includes-process-start-time.patch
new file mode 100644
index 000000000..1fba7d56c
--- /dev/null
+++ b/community/libvirt/0002-Ensure-system-identity-includes-process-start-time.patch
@@ -0,0 +1,70 @@
+From f26b6e44bf0c3efe8167a528141224ccb7623b4a Mon Sep 17 00:00:00 2001

+From: "Daniel P. Berrange" <berrange@redhat.com>

+Date: Wed, 28 Aug 2013 15:22:05 +0100

+Subject: [PATCH 2/3] Ensure system identity includes process start time

+

+The polkit access driver will want to use the process start

+time field. This was already set for network identities, but

+not for the system identity.

+

+Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

+---

+ src/util/viridentity.c | 16 ++++++++++++++++

+ 1 file changed, 16 insertions(+)

+

+diff --git a/src/util/viridentity.c b/src/util/viridentity.c

+index 03c375b..f681f85 100644

+--- a/src/util/viridentity.c

++++ b/src/util/viridentity.c

+@@ -35,6 +35,7 @@

+ #include "virthread.h"

+ #include "virutil.h"

+ #include "virstring.h"

++#include "virprocess.h"

+ 

+ #define VIR_FROM_THIS VIR_FROM_IDENTITY

+ 

+@@ -142,11 +143,20 @@ virIdentityPtr virIdentityGetSystem(void)

+     security_context_t con;

+ #endif

+     char *processid = NULL;

++    unsigned long long timestamp;

++    char *processtime = NULL;

+ 

+     if (virAsprintf(&processid, "%llu",

+                     (unsigned long long)getpid()) < 0)

+         goto cleanup;

+ 

++    if (virProcessGetStartTime(getpid(), &timestamp) < 0)

++        goto cleanup;

++

++    if (timestamp != 0 &&

++        virAsprintf(&processtime, "%llu", timestamp) < 0)

++        goto cleanup;

++

+     if (!(username = virGetUserName(getuid())))

+         goto cleanup;

+     if (virAsprintf(&userid, "%d", (int)getuid()) < 0)

+@@ -198,6 +208,11 @@ virIdentityPtr virIdentityGetSystem(void)

+                            VIR_IDENTITY_ATTR_UNIX_PROCESS_ID,

+                            processid) < 0)

+         goto error;

++    if (processtime &&

++        virIdentitySetAttr(ret,

++                           VIR_IDENTITY_ATTR_UNIX_PROCESS_TIME,

++                           processtime) < 0)

++        goto error;

+ 

+ cleanup:

+     VIR_FREE(username);

+@@ -206,6 +221,7 @@ cleanup:

+     VIR_FREE(groupid);

+     VIR_FREE(seccontext);

+     VIR_FREE(processid);

++    VIR_FREE(processtime);

+     return ret;

+ 

+ error:

+-- 

+1.8.3.1

+

diff --git a/community/libvirt/0003-Add-support-for-using-3-arg-pkcheck-syntax-for-proce.patch b/community/libvirt/0003-Add-support-for-using-3-arg-pkcheck-syntax-for-proce.patch
new file mode 100644
index 000000000..8882f1227
--- /dev/null
+++ b/community/libvirt/0003-Add-support-for-using-3-arg-pkcheck-syntax-for-proce.patch
@@ -0,0 +1,159 @@
+From 4a061ec8fe94857dd21acf401c66195ec51b1234 Mon Sep 17 00:00:00 2001

+From: "Daniel P. Berrange" <berrange@redhat.com>

+Date: Wed, 28 Aug 2013 15:25:40 +0100

+Subject: [PATCH 3/3] Add support for using 3-arg pkcheck syntax for process

+

+With the existing pkcheck (pid, start time) tuple for identifying

+the process, there is a race condition, where a process can make

+a libvirt RPC call and in another thread exec a setuid application,

+causing it to change to effective UID 0. This in turn causes polkit

+to do its permission check based on the wrong UID.

+

+To address this, libvirt must get the UID the caller had at time

+of connect() (from SO_PEERCRED) and pass a (pid, start time, uid)

+triple to the pkcheck program.

+

+Signed-off-by: Colin Walters <walters@redhat.com>

+Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

+---

+ configure.ac                       |  8 ++++++++

+ daemon/remote.c                    | 21 +++++++++++++++++---

+ src/access/viraccessdriverpolkit.c | 40 +++++++++++++++++++++++++++++++++-----

+ 3 files changed, 61 insertions(+), 8 deletions(-)

+

+diff --git a/configure.ac b/configure.ac

+index 94a2e19..3dfbb4d 100644

+--- a/configure.ac

++++ b/configure.ac

+@@ -1184,6 +1184,14 @@ if test "x$with_polkit" = "xyes" || test "x$with_polkit" = "xcheck"; then

+   AC_PATH_PROG([PKCHECK_PATH],[pkcheck], [], [/usr/sbin:$PATH])

+   if test "x$PKCHECK_PATH" != "x" ; then

+     AC_DEFINE_UNQUOTED([PKCHECK_PATH],["$PKCHECK_PATH"],[Location of pkcheck program])

++    AC_MSG_CHECKING([whether pkcheck supports uid value])

++    pkcheck_supports_uid=$($PKG_CONFIG --variable pkcheck_supports_uid polkit-gobject-1)

++    if test "x$pkcheck_supports_uid" = "xtrue"; then

++      AC_MSG_RESULT([yes])

++      AC_DEFINE_UNQUOTED([PKCHECK_SUPPORTS_UID], 1, [Pass uid to pkcheck])

++    else

++      AC_MSG_RESULT([no])

++    fi

+     AC_DEFINE_UNQUOTED([WITH_POLKIT], 1,

+         [use PolicyKit for UNIX socket access checks])

+     AC_DEFINE_UNQUOTED([WITH_POLKIT1], 1,

+diff --git a/daemon/remote.c b/daemon/remote.c

+index 03d5557..6132091 100644

+--- a/daemon/remote.c

++++ b/daemon/remote.c

+@@ -2731,10 +2731,12 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED,

+     int status = -1;

+     char *ident = NULL;

+     bool authdismissed = 0;

++    bool supportsuid = 0;

+     char *pkout = NULL;

+     struct daemonClientPrivate *priv =

+         virNetServerClientGetPrivateData(client);

+     virCommandPtr cmd = NULL;

++    static bool polkitInsecureWarned = false;

+ 

+     virMutexLock(&priv->lock);

+     action = virNetServerClientGetReadonly(client) ?

+@@ -2756,14 +2758,27 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED,

+         goto authfail;

+     }

+ 

++    if (timestamp == 0) {

++        VIR_WARN("Failing polkit auth due to missing client (pid=%lld) start time",

++                 (long long)callerPid);

++        goto authfail;

++    }

++

+     VIR_INFO("Checking PID %lld running as %d",

+              (long long) callerPid, callerUid);

+ 

+     virCommandAddArg(cmd, "--process");

+-    if (timestamp != 0) {

+-        virCommandAddArgFormat(cmd, "%lld,%llu", (long long) callerPid, timestamp);

++# ifdef PKCHECK_SUPPORTS_UID

++    supportsuid = 1;

++# endif

++    if (supportsuid) {

++        virCommandAddArgFormat(cmd, "%lld,%llu,%lu", (long long) callerPid, timestamp, (unsigned long) callerUid);

+     } else {

+-        virCommandAddArgFormat(cmd, "%lld", (long long) callerPid);

++        if (!polkitInsecureWarned) {

++            VIR_WARN("No support for caller UID with pkcheck. This deployment is known to be insecure.");

++            polkitInsecureWarned = true;

++        }

++        virCommandAddArgFormat(cmd, "%lld,%llu", (long long) callerPid, timestamp);

+     }

+     virCommandAddArg(cmd, "--allow-user-interaction");

+ 

+diff --git a/src/access/viraccessdriverpolkit.c b/src/access/viraccessdriverpolkit.c

+index 4c76e64..d980820 100644

+--- a/src/access/viraccessdriverpolkit.c

++++ b/src/access/viraccessdriverpolkit.c

+@@ -72,8 +72,12 @@ static char *

+ virAccessDriverPolkitFormatProcess(const char *actionid)

+ {

+     virIdentityPtr identity = virIdentityGetCurrent();

+-    const char *process = NULL;

++    const char *callerPid = NULL;

++    const char *callerTime = NULL;

++    const char *callerUid = NULL;

+     char *ret = NULL;

++    bool supportsuid = 0;

++    static bool polkitInsecureWarned = false;

+ 

+     if (!identity) {

+         virAccessError(VIR_ERR_ACCESS_DENIED,

+@@ -81,17 +85,43 @@ virAccessDriverPolkitFormatProcess(const char *actionid)

+                        actionid);

+         return NULL;

+     }

+-    if (virIdentityGetAttr(identity, VIR_IDENTITY_ATTR_UNIX_PROCESS_ID, &process) < 0)

++    if (virIdentityGetAttr(identity, VIR_IDENTITY_ATTR_UNIX_PROCESS_ID, &callerPid) < 0)

++        goto cleanup;

++    if (virIdentityGetAttr(identity, VIR_IDENTITY_ATTR_UNIX_PROCESS_TIME, &callerTime) < 0)

++        goto cleanup;

++    if (virIdentityGetAttr(identity, VIR_IDENTITY_ATTR_UNIX_USER_ID, &callerUid) < 0)

+         goto cleanup;

+ 

+-    if (!process) {

++    if (!callerPid) {

+         virAccessError(VIR_ERR_INTERNAL_ERROR, "%s",

+                        _("No UNIX process ID available"));

+         goto cleanup;

+     }

+-

+-    if (VIR_STRDUP(ret, process) < 0)

++    if (!callerTime) {

++        virAccessError(VIR_ERR_INTERNAL_ERROR, "%s",

++                       _("No UNIX process start time available"));

++        goto cleanup;

++    }

++    if (!callerUid) {

++        virAccessError(VIR_ERR_INTERNAL_ERROR, "%s",

++                       _("No UNIX caller UID available"));

+         goto cleanup;

++    }

++

++#ifdef PKCHECK_SUPPORTS_UID

++    supportsuid = 1;

++#endif

++    if (supportsuid) {

++        if (virAsprintf(&ret, "%s,%s,%s", callerPid, callerTime, callerUid) < 0)

++            goto cleanup;

++    } else {

++        if (!polkitInsecureWarned) {

++            VIR_WARN("No support for caller UID with pkcheck. This deployment is known to be insecure.");

++            polkitInsecureWarned = true;

++        }

++        if (virAsprintf(&ret, "%s,%s", callerPid, callerTime) < 0)

++            goto cleanup;

++    }

+ 

+ cleanup:

+     virObjectUnref(identity);

+-- 

+1.8.3.1

+

diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD
index dad79163c..a1aff7e55 100644
--- a/community/libvirt/PKGBUILD
+++ b/community/libvirt/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 96612 2013-09-02 10:46:37Z spupykin $
+# $Id: PKGBUILD 98038 2013-10-04 13:33:02Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jonathan Wiersma <archaur at jonw dot org>
 
 pkgname=libvirt
-pkgver=1.1.2
+pkgver=1.1.3
 pkgrel=1
 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
 arch=('i686' 'x86_64' 'mips64el')
@@ -33,7 +33,7 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz"
 	libvirtd.conf.d
 	libvirtd-guests.conf.d
 	libvirt.tmpfiles.d)
-md5sums=('1835bbfa492099bce12e2934870e5611'
+md5sums=('b0dfe373ebe0c588b42a28c14d36a3e6'
          '3ed0e24f5b5e25bf553f5427d64915e6'
          '0a96ed876ffb1fcb9dff5a9b3a609c1e'
          '020971887442ebbf1b6949e031c8dd3f')
diff --git a/community/libzdb/PKGBUILD b/community/libzdb/PKGBUILD
index 6df859ede..21be84187 100644
--- a/community/libzdb/PKGBUILD
+++ b/community/libzdb/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 96630 2013-09-02 14:51:26Z spupykin $
+# $Id: PKGBUILD 97586 2013-09-24 15:30:59Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=libzdb
-pkgver=2.11.3
+pkgver=2.12
 pkgrel=1
 pkgdesc="Zild Database Library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('GPL')
 depends=('postgresql-libs' 'sqlite' 'libmariadbclient')
 options=('!libtool')
 source=(http://www.tildeslash.com/libzdb/dist/libzdb-$pkgver.tar.gz)
-md5sums=('49c55f02e5b82110cd9007e215d58468')
+md5sums=('dd95114cae471d1b5dfda1f263b222c1')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/lightdm/PKGBUILD b/community/lightdm/PKGBUILD
index 64a60c64c..9cb3a37ff 100755
--- a/community/lightdm/PKGBUILD
+++ b/community/lightdm/PKGBUILD
@@ -1,52 +1,56 @@
-# $Id: PKGBUILD 96356 2013-08-26 09:25:31Z alucryd $
+# $Id: PKGBUILD 98119 2013-10-06 08:35:43Z alucryd $
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 # Contributor: Morfeo <morfeo89@hotmail.it>
 
 pkgbase=lightdm
 pkgname=('lightdm' 'liblightdm-qt4' 'liblightdm-qt5')
-pkgver=1.6.0
-pkgrel=7
+pkgver=1.6.2
+pkgrel=2
 epoch=1
 pkgdesc="A lightweight display manager"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://launchpad.net/lightdm"
 license=('GPL3' 'LGPL3')
-makedepends=('gobject-introspection' 'gtk-doc' 'intltool' 'itstool' 'libxklavier' 'polkit' 'qt4' 'qt5-base' 'yelp-tools')
-options=('!emptydirs' '!libtool')
+makedepends=('gobject-introspection' 'gtk-doc' 'intltool' 'itstool' 'libxklavier' 'polkit' 'qt4' 'qt5-base')
+options=('!libtool')
 source=("https://launchpad.net/lightdm/1.6/${pkgver}/+download/${pkgbase}-${pkgver}.tar.xz"
         'lightdm.service'
         'lightdm.tmpfiles'
         'lightdm.pam'
         'lightdm-autologin.pam'
         'lightdm.rules'
+        'lightdm-corrupt-x-authority.patch'
         'lightdm-default-config.patch'
         'lightdm-lock-screen-before-switch.patch'
         'lightdm-use-login1.patch'
-        'xsession')
-sha256sums=('882ece568df0d81c0b6e399ff00b3f89eee6d50efc09ad1c52c61d8753efb419'
-            '3daf2f7e1b751415eab9b2aa92d78d8e00c3447a77fa31f7e75863136286a86f'
+        'Xsession')
+sha256sums=('b0de1dc81bb5ce81800feafb9fbc7806ef4dfc83733f0df058568e55b8a045f3'
+            '0d2adba25cdbe59e97ffd302083db9d5e23920780f41e04f64512cd6b633289a'
             'b29521fbd7a48a8f60b93ecca3b30c30bcb71560de8033c8d39b25c22c6f696f'
             'e8c4c5fd3b801a390d201166fd1fb9730e78a5c62928768103b870b6bd980ea0'
             '33e3c3d6e16c8d30756754ea3f31f5457c5be0343686aad287692be34958984a'
             'a89566307e1c81c24f037d854cbd472d2f94f8a4b759877a01563a332319f7d6'
-            '6d5a754f41e9c7e52c51d2ff018b926ddaabb807e9a0b88c4a7bde1acffa3b1c'
+            '420aac58151bc441696db0bf234123b934ca8a8798e90db8a59252258e82b5d5'
+            '15f75ffe122fa86c0c4b3558b9d73e151ba89355093036ffc64110c5e306216b'
             '4793eaee5915f5c519f569a4cd9158822d4c57c8b6e405895d2eddf82fa00822'
-            '3247aa1e5e7c2c2f8653cfbb22e1f74252c556b6159ff4ec47c1c7d5ea6883ac'
+            'a760c7b4d8c0b54bb204b5d6e574c82360a90464ac06042409a17f950d2c1194'
             '7fb85a1b54406032a922e8fd6f45d869fcfe5681df630e74e8e50c040b786ee4')
 
 prepare() {
   cd ${pkgbase}-${pkgver}
 
+  patch -Np0 -i ../lightdm-corrupt-x-authority.patch
   patch -Np1 -i ../lightdm-default-config.patch
   patch -Np1 -i ../lightdm-lock-screen-before-switch.patch
   patch -Np0 -i ../lightdm-use-login1.patch
-  sed -i 's/MOC5 --qt=qt5/MOC5/' configure
 }
 
 build() {
   cd ${pkgbase}-${pkgver}
 
-   ./configure --prefix='/usr' --sbindir='/usr/bin' --sysconfdir='/etc' --localstatedir='/var' --libexecdir="/usr/lib/${pkgbase}" --with-greeter-user='lightdm' --with-greeter-session='lightdm-gtk-greeter' --disable-{static,tests}
+  export MOC4='moc-qt4'
+  export MOC5='moc-qt5'
+  ./configure --prefix='/usr' --sbindir='/usr/bin' --sysconfdir='/etc' --localstatedir='/var' --libexecdir="/usr/lib/${pkgbase}" --with-greeter-user='lightdm' --with-greeter-session='lightdm-gtk-greeter' --disable-{static,tests}
    make
 }
 
@@ -58,26 +62,26 @@ backup=('etc/apparmor.d/lightdm-guest-session'
         'etc/lightdm/keys.conf'
         'etc/lightdm/lightdm.conf'
         'etc/lightdm/users.conf'
-        'etc/lightdm/xsession'
+        'etc/lightdm/Xsession'
         'etc/pam.d/lightdm'
         'etc/pam.d/lightdm-autologin'
         'etc/pam.d/lightdm-greeter')
-install=${pkgbase}.install
+install="${pkgbase}.install"
 
   cd ${pkgbase}-${pkgver}
 
   make DESTDIR="${pkgdir}" install
   make DESTDIR="${pkgdir}" -C liblightdm-qt uninstall
+  install -m 755 ../Xsession "${pkgdir}"/etc/lightdm/Xsession
   rm -rf "${pkgdir}"/etc/init
+  rm -rf "${pkgdir}"/usr/include/lightdm-qt{,5}-2
 
-# Persistent home
   install -dm 770 "${pkgdir}"/var/lib/lightdm
+  install -dm 711 "${pkgdir}"/var/log/lightdm
   chmod +t "${pkgdir}"/var/lib/lightdm
   echo 'GDK_CORE_DEVICE_EVENTS=true' > "${pkgdir}"/var/lib/lightdm/.pam_environment
   chmod 644 "${pkgdir}"/var/lib/lightdm/.pam_environment
-
-# Session wrapper
-  install -m 755 ../xsession "${pkgdir}"/etc/lightdm/xsession
+  chown 620:620 -R "${pkgdir}"/var/{lib,log}/lightdm
 
 # PAM
   install -m 644 ../lightdm.pam "${pkgdir}"/etc/pam.d/lightdm
@@ -96,6 +100,7 @@ install=${pkgbase}.install
 package_liblightdm-qt4() {
 pkgdesc=('LightDM Qt client library')
 depends=('lightdm' 'qt4')
+options+=('!emptydirs')
 
   cd ${pkgbase}-${pkgver}
 
@@ -110,6 +115,7 @@ depends=('lightdm' 'qt4')
 package_liblightdm-qt5() {
 pkgdesc=('LightDM Qt client library')
 depends=('lightdm' 'qt5-base')
+options+=('!emptydirs')
 
   cd ${pkgbase}-${pkgver}
 
diff --git a/community/lightdm/xsession b/community/lightdm/Xsession
index 589205342..589205342 100755..100644
--- a/community/lightdm/xsession
+++ b/community/lightdm/Xsession
diff --git a/community/lightdm/lightdm-corrupt-x-authority.patch b/community/lightdm/lightdm-corrupt-x-authority.patch
new file mode 100755
index 000000000..f994b394c
--- /dev/null
+++ b/community/lightdm/lightdm-corrupt-x-authority.patch
@@ -0,0 +1,21 @@
+=== modified file 'src/xauthority.c'
+--- src/xauthority.c	2013-09-10 23:14:12 +0000
++++ src/xauthority.c	2013-09-30 02:59:01 +0000
+@@ -237,7 +237,7 @@
+ gboolean
+ x_authority_write (XAuthority *auth, XAuthWriteMode mode, const gchar *filename, GError **error)
+ {
+-    gchar *input;
++    gchar *input = NULL;
+     gsize input_length = 0, input_offset = 0;
+     GList *link, *records = NULL;
+     XAuthority *a;
+@@ -328,6 +328,7 @@
+     }
+ 
+     errno = 0;
++    result = TRUE;
+     for (link = records; link && result; link = link->next)
+     {
+         XAuthority *a = link->data;
+
diff --git a/community/lightdm/lightdm-default-config.patch b/community/lightdm/lightdm-default-config.patch
index 42d49536d..7c7b421b6 100755
--- a/community/lightdm/lightdm-default-config.patch
+++ b/community/lightdm/lightdm-default-config.patch
@@ -1,42 +1,57 @@
-diff -rupN lightdm-1.5.1.orig/data/lightdm.conf lightdm-1.5.1/data/lightdm.conf
---- lightdm-1.5.1.orig/data/lightdm.conf	2013-03-06 03:40:10.000000000 +0100
-+++ lightdm-1.5.1/data/lightdm.conf	2013-03-12 22:59:22.494743200 +0100
-@@ -24,7 +24,7 @@
+--- a/data/lightdm.conf	2013-09-02 17:17:41.167211771 +0200
++++ b/data/lightdm.conf	2013-09-02 17:20:41.278613565 +0200
+@@ -18,14 +18,14 @@
+ #
+ [LightDM]
+ #start-default-seat=true
+-#greeter-user=lightdm
++greeter-user=lightdm
+ #minimum-display-number=0
+-#minimum-vt=7
++minimum-vt=1
+ #lock-memory=true
  #user-authority-in-system-dir=false
  #guest-account-script=guest-account
- #log-directory=/var/log/lightdm
+-#log-directory=/var/log/lightdm
 -#run-directory=/var/run/lightdm
++log-directory=/var/log/lightdm
 +run-directory=/run/lightdm
  #cache-directory=/var/cache/lightdm
  #xsessions-directory=/usr/share/xsessions
  #remote-sessions-directory=/usr/share/lightdm/remote-sessions
-@@ -77,7 +77,7 @@
+@@ -71,7 +71,7 @@
+ #xdmcp-manager=
+ #xdmcp-port=177
+ #xdmcp-key=
+-#greeter-session=example-gtk-gnome
++greeter-session=lightdm-gtk-greeter
+ #greeter-hide-users=false
+ #greeter-allow-guest=true
+ #greeter-show-manual-login=false
+@@ -79,7 +79,7 @@
  #user-session=default
  #allow-guest=true
  #guest-session=UNIMPLEMENTED
 -#session-wrapper=lightdm-session
-+session-wrapper=/etc/lightdm/xsession
++session-wrapper=/etc/lightdm/Xsession
  #display-setup-script=
  #greeter-setup-script=
  #session-setup-script=
-@@ -86,6 +86,7 @@
+@@ -88,6 +88,7 @@
  #autologin-user=
  #autologin-user-timeout=0
  #autologin-session=UNIMPLEMENTED
 +pam-service=lightdm-autologin
  #exit-on-failure=false
-
+ 
  #
-diff -rupN lightdm-1.5.1.orig/data/users.conf lightdm-1.5.1/data/users.conf
---- lightdm-1.5.1.orig/data/users.conf	2013-03-06 03:40:10.000000000 +0100
-+++ lightdm-1.5.1/data/users.conf	2013-03-12 22:54:29.398854700 +0100
-@@ -8,7 +8,7 @@
- # hidden-users = Users that are not shown to the user
+--- a/data/users.conf	2013-09-02 17:17:41.167211771 +0200
++++ b/data/users.conf	2013-09-02 17:21:27.955545717 +0200
+@@ -9,6 +9,6 @@
  # hidden-shells = Shells that indicate a user cannot login
  #
--[UserAccounts]
+ [UserAccounts]
 -minimum-uid=500
-+[UserList]
 +minimum-uid=1000
  hidden-users=nobody nobody4 noaccess
 -hidden-shells=/bin/false /usr/sbin/nologin
diff --git a/community/lightdm/lightdm-use-login1.patch b/community/lightdm/lightdm-use-login1.patch
index 89adbdbb7..cc3d5a5fd 100755
--- a/community/lightdm/lightdm-use-login1.patch
+++ b/community/lightdm/lightdm-use-login1.patch
@@ -386,7 +386,7 @@
 === modified file 'tests/src/test-runner.c'
 --- tests/src/test-runner.c	2013-03-27 00:48:48 +0000
 +++ tests/src/test-runner.c	2013-04-14 22:54:54 +0000
-@@ -838,6 +838,101 @@
+@@ -1464,6 +1464,101 @@ accounts_user_set_hidden (AccountsUser *
  }
  
  static void
@@ -485,18 +485,9 @@
 +}
 +
 +static void
- load_passwd_file ()
+ load_passwd_file (void)
  {
      gchar *path, *data, **lines;
-@@ -1474,6 +1569,8 @@
-     /* Start D-Bus services */
-     if (!g_key_file_get_boolean (config, "test-runner-config", "disable-console-kit", NULL))
-         start_console_kit_daemon ();
-+    if (!g_key_file_get_boolean (config, "test-runner-config", "disable-login1", NULL))
-+        start_login1_daemon ();
-     if (!g_key_file_get_boolean (config, "test-runner-config", "disable-accounts-service", NULL))
-         start_accounts_service_daemon ();
- 
 
 === added file 'tests/test-no-console-kit-or-login1'
 --- tests/test-no-console-kit-or-login1	1970-01-01 00:00:00 +0000
diff --git a/community/lightdm/lightdm.install b/community/lightdm/lightdm.install
index 7d9d99a26..14f66f02f 100755
--- a/community/lightdm/lightdm.install
+++ b/community/lightdm/lightdm.install
@@ -1,18 +1,23 @@
 post_install() {
-  getent group lightdm > /dev/null 2>&1 || groupadd -g 620 lightdm
-  getent passwd lightdm > /dev/null 2>&1 || useradd -c 'Light Display Manager' -u 620 -g lightdm -d /var/lib/lightdm -s /sbin/nologin lightdm
-  passwd -l lightdm > /dev/null
-  chown -R lightdm:lightdm /var/lib/lightdm > /dev/null
-  systemd-tmpfiles --create lightdm.conf
+    getent group lightdm > /dev/null 2>&1 || groupadd -g 620 lightdm
+    getent passwd lightdm > /dev/null 2>&1 || useradd -c 'Light Display Manager' -u 620 -g lightdm -d /var/lib/lightdm -s /sbin/nologin lightdm
+    passwd -l lightdm > /dev/null
+    systemd-tmpfiles --create /usr/lib/tmpfiles.d/lightdm.conf
 }
 
 post_upgrade() {
-  post_install
+    post_install
+    if [[ $(vercmp $2 1:1.6.1-1) == -1 ]]; then
+      cat << EOF
+The file /etc/lightdm/xsession has been renamed to /etc/lightdm/Xsession.
+Please update your lightdm.conf with the new path.
+EOF
+    fi
 }
 
 post_remove() {
-  getent passwd lightdm > /dev/null 2>&1 && userdel lightdm
-  getent group lightdm > /dev/null 2>&1 && groupdel lightdm
+    getent passwd lightdm > /dev/null 2>&1 && userdel lightdm
+    getent group lightdm > /dev/null 2>&1 && groupdel lightdm
 }
 
 # vim: ts=2 sw=2 et:
diff --git a/community/lightdm/lightdm.service b/community/lightdm/lightdm.service
index a5556c7ca..9b22f034c 100755
--- a/community/lightdm/lightdm.service
+++ b/community/lightdm/lightdm.service
@@ -1,11 +1,11 @@
 [Unit]
 Description=Light Display Manager
 Documentation=man:lightdm(1)
-After=systemd-user-sessions.service
+Conflicts=getty@tty1.service
+After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service
 
 [Service]
 ExecStart=/usr/bin/lightdm
-StandardOutput=syslog
 Restart=always
 IgnoreSIGPIPE=no
 BusName=org.freedesktop.DisplayManager
diff --git a/community/lockdev/PKGBUILD b/community/lockdev/PKGBUILD
index 875474ad5..24dc14c8f 100644
--- a/community/lockdev/PKGBUILD
+++ b/community/lockdev/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 83333 2013-01-29 17:40:17Z spupykin $
+# $Id: PKGBUILD 97056 2013-09-11 21:00:47Z bgyorgy $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Andreas Wagner <a.wagner@stud.uni-frankfurt.de>
@@ -6,22 +6,27 @@
 pkgname=lockdev
 pkgver=1.0.3_1.5
 _pkgver=1.0.3
-pkgrel=2
+pkgrel=3
 pkgdesc='Run-time shared library for locking devices, using _both_ FSSTND and SVr4 methods.'
 url='http://packages.qa.debian.org/l/lockdev.html'
 license=("GPL")
 arch=('i686' 'x86_64' 'mips64el')
 source=("http://ftp.debian.org/debian/pool/main/l/${pkgname}/${pkgname}_${_pkgver}.orig.tar.gz"
-	      "http://ftp.debian.org/debian/pool/main/l/${pkgname}/${pkgname}_${pkgver/_/-}.diff.gz")
+	"http://ftp.debian.org/debian/pool/main/l/${pkgname}/${pkgname}_${pkgver/_/-}.diff.gz"
+	'build.patch')
 md5sums=('64b9c1b87b125fc348e892e24625524a'
-         'c4e8a5a2e46b76b48339c232b358f579')
+         'c4e8a5a2e46b76b48339c232b358f579'
+         '2db93cadf6670ddcd01de4bfc22a35e1')
 
-build() {
+prepare() {
   cd "${pkgname}-${_pkgver}"
-
   patch -p1 -i "../${pkgname}_${pkgver/_/-}.diff"
   sed -i "s|CFLAGS	= -g|CFLAGS	= -g -fPIC|" Makefile
+  patch -p1 -i ../build.patch # FS#33280
+}
 
+build() {
+  cd "${pkgname}-${_pkgver}"
   make shared CFLAGS="${CFLAGS} -D_PATH_LOCK=\\\"/run/lock/lockdev\\\" -fPIC"
   make static CFLAGS="${CFLAGS} -D_PATH_LOCK=\\\"/run/lock/lockdev\\\" -fPIC"
 }
diff --git a/community/lockdev/build.patch b/community/lockdev/build.patch
new file mode 100644
index 000000000..f1053d032
--- /dev/null
+++ b/community/lockdev/build.patch
@@ -0,0 +1,30 @@
+commit 0dd47123655c52d68185f06b9da8fb0e1b925400
+Author: Ludwig Nussel <ludwig.nussel@suse.de>
+Date:   Tue Feb 9 14:56:23 2010 +0100
+
+    RedHat patch 2
+    
+    - change library file name
+    - install devel symlink
+
+diff --git a/Makefile b/Makefile
+index b7b4d1f..3b351dd 100644
+--- a/Makefile
++++ b/Makefile
+@@ -11,7 +11,7 @@ VER	= $(shell expr `pwd` : '.*-\([0-9.]*\)')
+ MVER	= ${shell expr `pwd` : '.*-\([0-9]*\).[0-9]*'}
+ 
+ static	= ${libname}.a
+-shared	= ${libname}.${VER}.so
++shared	= ${libname}.so.${VER}
+ soname	= ${libname}.so.${MVER}
+ 
+ # overwritten by caller (e.g.: debian/rules)
+@@ -76,6 +76,7 @@ install_doc:	docs/lockdev.3
+ install_run:	${shared}
+ 	install -m755 -d	${libdir}
+ 	install -m644 ${shared}	${libdir}
++	ln -s ${shared}		${libdir}/liblockdev.so
+ 
+ .PHONY: clean distclean perl-clean mostyclean 
+ perl-clean:	clean
diff --git a/community/lrzip/PKGBUILD b/community/lrzip/PKGBUILD
index f7368a40a..31645276e 100644
--- a/community/lrzip/PKGBUILD
+++ b/community/lrzip/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 96603 2013-09-02 09:08:52Z arodseth $
+# $Id: PKGBUILD 96966 2013-09-09 13:06:19Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: graysky <graysky AT archlinux DOT us>
 # Contributor: kastor@fobos.org.ar
 
 pkgname=lrzip
-pkgver=0.615
+pkgver=0.616
 pkgrel=1
 pkgdesc='Multi-threaded compression using the rzip/lzma, lzo, and zpaq algorithms'
 url='http://lrzip.kolivas.org/'
@@ -18,7 +18,7 @@ then
 fi
 options=('!libtool')
 source=("http://ck.kolivas.org/apps/$pkgname/$pkgname-$pkgver.tar.bz2")
-sha256sums=('c419662bf840bea2e4bd5ebef2585849ee1c85cec370fda423907e4514ee427d')
+sha256sums=('982d5a8db4d8bbbced6e33fbbcd589c9b3fc4275110155d7bd71cbeff4a235ae')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/lxdm/PKGBUILD b/community/lxdm/PKGBUILD
index b488cbe03..d75f5715a 100644
--- a/community/lxdm/PKGBUILD
+++ b/community/lxdm/PKGBUILD
@@ -1,82 +1,63 @@
-# $Id: PKGBUILD 95338 2013-08-09 22:46:10Z dwallace $
+# $Id: PKGBUILD 97132 2013-09-13 13:17:58Z bgyorgy $
 # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: AndyRTR <andyrtr@archlinux.org>
 # Contributor: kiefer <jorgelmadrid@gmail.com>
 
 pkgname=lxdm
 pkgver=0.4.1
-pkgrel=23
+pkgrel=27
 pkgdesc='Lightweight X11 Display Manager'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/lxdm/"
 license=('GPL')
 groups=('lxde')
-depends=('gtk2' 'xorg-server')
+depends=('gtk2' 'xorg-server' 'iso-codes')
 makedepends=('intltool')
-optdepends=('librsvg: display the default background')
-install=${pkgname}.install
+optdepends=('gtk-engines: default GTK+ theme'
+            'librsvg: display the default background')
+install=$pkgname.install
 backup=('etc/lxdm/lxdm.conf' 'etc/pam.d/lxdm' 'etc/lxdm/Xsession'
         'etc/lxdm/PreLogin' 'etc/lxdm/LoginReady' 'etc/lxdm/PostLogin'
         'etc/lxdm/PostLogout' 'etc/lxdm/PreReboot' 'etc/lxdm/PreShutdown')
 source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz
-		lxdm.pam  lxdm.service
-		lxdm-0.4.1-Xsession-source-profile.patch
-		lxdm-0.4.1-conf.patch
-		lxdm-0.4.1-event-check-bug.patch
-		lxdm-0.4.1-industrial-greeter-ui.patch
-		lxdm-0.4.1-modern-systems.patch
-		lxdm-0.4.1-nolang-show-sessions.patch
-		lxdm-0.4.1-pam-env-vars.patch
-        lxdm-0.4.1-kill_user_processes.patch
-        )
+        git-fixes.patch
+        default-config.patch)
 md5sums=('8da1cfc2be6dc9217c85a7cf51e1e821'
-         '9cc734228696a3c6f06d91bba61b03c1'
-         'b86317143ae44d7ed38c150fe4f25502'
-         'd2e4a4a22ee2aa1a986be154c647b6c6'
-         'c50dd01b715b0a236407d48066191601'
-         'a1e3c46a8bef691bc544028f5b6cfe22'
-         '2c4afdbe3532be4f90d8f6240d352766'
-         'baed9055e8825a5511712bc095197519'
-         '28475239d0c8b4fd778ec49f5ec72962'
-         '4c1d43e81e9a256e8d1ea7686c24b3d3'
-         '3ac63085f9df9296dfa645fa623af0e2')
+         '03d0779fbac1a9964776c82e69fbc53e'
+         'c61ec8ffd3fe8bd2a6a9178393622f4c')
 
 prepare(){
-    cd $srcdir/$pkgname-$pkgver
-    patch -Np1 -i $srcdir/lxdm-0.4.1-event-check-bug.patch
-    patch -Np1 -i $srcdir/lxdm-0.4.1-nolang-show-sessions.patch
-    patch -Np1 -i $srcdir/lxdm-0.4.1-pam-env-vars.patch
-    patch -Np1 -i $srcdir/lxdm-0.4.1-kill_user_processes.patch
-}
+  cd "$srcdir/$pkgname-$pkgver"
 
-build() {
-    cd $srcdir/$pkgname-$pkgver
+  # Apply various fixes from git
+  patch -Np1 -i ../git-fixes.patch
 
+  # Adjust Arch-specific settings
+  patch -Np1 -i ../default-config.patch
 
-    ./configure --sysconfdir=/etc --prefix=/usr --libexecdir=/usr/lib/lxdm \
-		--bindir=/usr/bin \
-		--sbindir=/usr/bin
-    make
-  	
-    patch -Np0 -i $srcdir/lxdm-0.4.1-modern-systems.patch
-    patch -Np0 -i $srcdir/lxdm-0.4.1-conf.patch
-    patch -Np0 -i $srcdir/lxdm-0.4.1-Xsession-source-profile.patch
-    patch -Np0 -i $srcdir/lxdm-0.4.1-industrial-greeter-ui.patch
+  # Fix version number
+  sed -i 's/3.6.0/3.8/' gnome-shell/LXDM_User_Switch@dgod/metadata.json
 }
 
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  autoreconf -fi
+  ./configure --prefix=/usr --sbindir=/usr/bin --libexecdir=/usr/lib/lxdm \
+              --sysconfdir=/etc --localstatedir=/var
+  make
+}
 
 package() {
-    cd $srcdir/$pkgname-$pkgver
-    make DESTDIR=$pkgdir sbindir=/usr/bin install
-
-    install -m644 $srcdir/lxdm.pam $pkgdir/etc/pam.d/lxdm
-    install -Dm644 $srcdir/lxdm.service $pkgdir/usr/lib/systemd/system/lxdm.service
-    install -d $pkgdir/var/lib/lxdm
-    echo "GDK_CORE_DEVICE_EVENTS\t\t\tDEFAULT=1" > $pkgdir/var/lib/lxdm/.pam_environment
-    chmod 644 $pkgdir/var/lib/lxdm/.pam_environment
-
-    # fix the greeter location
-    sed -i -e 's/local\/libexec/lib\/lxdm/' $pkgdir/etc/lxdm/lxdm.conf
-	sed -i 's:sbin:bin:' $pkgdir/usr/bin/lxdm
-
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+  chmod 644 "$pkgdir/etc/lxdm/lxdm.conf"
+
+  # Home directory
+  install -dm 755 "$pkgdir/var/lib/lxdm"
+  echo 'GDK_CORE_DEVICE_EVENTS=true' > "$pkgdir"/var/lib/lxdm/.pam_environment
+  chown -R 121:121 "$pkgdir/var/lib/lxdm"
+
+  # GNOME Shell extension
+  mkdir -p "$pkgdir/usr/share/gnome-shell/extensions"
+  cp -r gnome-shell/LXDM_User_Switch@dgod "$pkgdir/usr/share/gnome-shell/extensions"
 }
diff --git a/community/lxdm/default-config.patch b/community/lxdm/default-config.patch
new file mode 100644
index 000000000..78c9bc00b
--- /dev/null
+++ b/community/lxdm/default-config.patch
@@ -0,0 +1,79 @@
+diff -Naur lxdm.orig/data/lxdm.conf.in lxdm/data/lxdm.conf.in
+--- lxdm.orig/data/lxdm.conf.in	2013-08-30 17:56:16.097006000 +0200
++++ lxdm/data/lxdm.conf.in	2013-09-04 01:54:12.942117085 +0200
+@@ -23,7 +23,7 @@
+ 
+ [server]
+ ## arg used to start xserver, not fully function
+-# arg=/usr/bin/X -background vt1
++arg=/usr/bin/X -background vt1
+ # uncomment this if you really want xserver listen to tcp
+ # tcp_listen=1
+ # uncoment this if you want reset the xserver after logou
+@@ -34,7 +34,7 @@
+ gtk_theme=Clearlooks
+ 
+ ## background of the greeter
+-bg=/usr/share/backgrounds/default.png
++# bg=/usr/share/backgrounds/default.png
+ 
+ ## if show bottom pane
+ bottom_pane=1
+diff -Naur lxdm.orig/data/lxdm.in lxdm/data/lxdm.in
+--- lxdm.orig/data/lxdm.in	2013-08-30 17:56:16.097006000 +0200
++++ lxdm/data/lxdm.in	2013-09-04 01:57:56.950799946 +0200
+@@ -1,21 +1,13 @@
+ #!/bin/sh
+ 
+-[ -f /etc/sysconfig/i18n ] && . /etc/sysconfig/i18n
+-
+-if [ -z "$LANG" -a -e /etc/sysconfig/language ]; then
+-	. /etc/sysconfig/language
+-	if [ -n "$RC_LANG"]; then
+-		LANG=$RC_LANG
+-	fi
++if [ -r /etc/profile.d/locale.sh ]; then
++	. /etc/profile.d/locale.sh
+ fi
+ 
+ if [ -n "$LANG" ]; then
+ 	export LANG
+ fi
+ 
+-[ -f /etc/sysconfig/desktop ] && . /etc/sysconfig/desktop
+-[ -f /etc/sysconfig/windowmanager ] && . /etc/sysconfig/windowmanager
+-
+ if [ -n "$DEFAULT_WM" ]; then
+ 	PREFERRED=$DEFAULT_WM
+ fi
+diff -Naur lxdm.orig/data/Xsession lxdm/data/Xsession
+--- lxdm.orig/data/Xsession	2013-08-30 17:56:16.097006000 +0200
++++ lxdm/data/Xsession	2013-09-04 01:58:19.941348762 +0200
+@@ -9,6 +9,8 @@
+ 	LXSESSION=/usr/bin/startlxde
+ fi
+ 
++[ -f /etc/profile ] && . /etc/profile
++[ -f ~/.profile ] && . ~/.profile
+ [ -f /etc/xprofile ] && . /etc/xprofile
+ [ -f ~/.xprofile ] && . ~/.xprofile
+ 
+diff -Naur lxdm.orig/pam/lxdm lxdm/pam/lxdm
+--- lxdm.orig/pam/lxdm	2013-08-30 17:56:16.100339000 +0200
++++ lxdm/pam/lxdm	2013-08-30 17:58:35.543771605 +0200
+@@ -1,9 +1,7 @@
+ #%PAM-1.0
+-auth       substack	system-auth
+-auth       optional	pam_gnome_keyring.so
+-account    include	system-auth
+-session    optional	pam_keyinit.so force revoke
+-session    include	system-auth
+-session    optional	pam_console.so
+-session    optional	pam_gnome_keyring.so auto_start
+-session    optional	pam_selinux.so
++auth        include     system-login
++-auth       optional    pam_gnome_keyring.so
++account     include     system-login
++password    include     system-login
++session     include     system-login
++-session    optional    pam_gnome_keyring.so auto_start
diff --git a/community/lxdm/git-fixes.patch b/community/lxdm/git-fixes.patch
new file mode 100644
index 000000000..6a331cf0b
--- /dev/null
+++ b/community/lxdm/git-fixes.patch
@@ -0,0 +1,3702 @@
+diff --git a/Makefile.am b/Makefile.am
+index bfac56b..6f997b8 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,4 +1,5 @@
+ NULL =
++
+ SUBDIRS= \
+ 	src \
+ 	po \
+@@ -6,6 +7,10 @@ SUBDIRS= \
+ 	data \
+ 	$(NULL)
+ 
++if HAVE_SYSTEMD
++SUBDIRS += systemd
++endif
++
+ rpm: dist @PACKAGE_NAME@.spec
+ 	rpmbuild -bb \
+ 	--define "_sourcedir `pwd`" \
+diff --git a/configure.ac b/configure.ac
+index e952473..8958c9c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2,8 +2,8 @@
+ # Process this file with autoconf to produce a configure script.
+ 
+ AC_PREREQ([2.63])
+-AC_INIT([lxdm], [0.4.1], [http://lxde.org/])
+-AM_INIT_AUTOMAKE([-Wall -Werror foreign])
++AC_INIT([lxdm], [0.5.0], [http://lxde.org/])
++AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
+ 
+ AC_CONFIG_SRCDIR([src/lxdm.c])
+ AC_CONFIG_HEADERS([config.h])
+@@ -16,10 +16,17 @@ AM_PROG_CC_C_O
+ # Checks for libraries.
+ AC_CHECK_LIB([crypt], [crypt])
+ 
+-AC_ARG_WITH(pam,AC_HELP_STRING([--without-pam],[build without pam]),
+-[],[AC_CHECK_LIB([pam], [pam_open_session])])
+-
+-AC_CHECK_LIB([ck-connector],[ck_connector_open_session])
++# Check for PAM support
++AC_ARG_WITH(pam, AC_HELP_STRING([--with-pam],[Use PAM for authentication]),
++	[USE_PAM=$withval], [USE_PAM=$use_pam_default])
++if test "x$USE_PAM" != "xno" ; then
++	AC_SEARCH_LIBS(pam_open_session,[pam])
++	AC_CHECK_FUNC(pam_open_session, 
++		[AC_DEFINE(USE_PAM,1,[Use PAM for authentication])],
++		[if test "x$USE_PAM" != "xtry" ; then
++			AC_MSG_ERROR(["PAM support requested, but pam_open_session not found."])
++		 fi])
++fi
+ 
+ # Checks for header files.
+ AC_PATH_X
+@@ -80,11 +87,22 @@ PKG_CHECK_MODULES(GTK, [$pkg_modules])
+ AC_SUBST(GTK_CFLAGS)
+ AC_SUBST(GTK_LIBS)
+ 
+-PKG_CHECK_MODULES(CONSOLEKIT, "ck-connector",[
++
++AC_ARG_ENABLE(consolekit,
++	AC_HELP_STRING([--disable-consolekit],[disable ConsoleKit support]),
++	[enable_consolekit=$enableval],
++	[enable_consolekit=yes]
++)
++
++if test "x$enable_consolekit" = "xyes" ; then
++  PKG_CHECK_MODULES(CONSOLEKIT, "ck-connector",[
+ 	AC_SUBST(CONSOLEKIT_CFLAGS)
+ 	AC_SUBST(CONSOLEKIT_LIBS)],[
+ 	echo "ConsoleKit devel package not found"
+ 	])
++  AC_CHECK_LIB([ck-connector],[ck_connector_open_session])
++fi
++
+ 
+ AC_ARG_ENABLE(password,
+ AC_HELP_STRING([--enable-password],[enable to load autologin password store at config file]),
+@@ -118,7 +136,7 @@ if test "x$enable_debug" = "x$yes" ; then
+ fi
+ 
+ AC_ARG_WITH(xconn,
+-	[AC_HELP_STRING([-with-xconn=@<:@xlib/xcb@:>@],[use xlib or xcb to use])],
++	[AC_HELP_STRING([--with-xconn=@<:@xlib/xcb@:>@],[use xlib or xcb to use])],
+ 	[if test "x$with_xconn" = "xxlib"; then
+ 		PKG_CHECK_MODULES(XCONN,"x11")
+ 		AC_SUBST(XCONN_CFLAGS)
+@@ -138,6 +156,14 @@ AC_ARG_WITH(xconn,
+ 	]
+ )
+ 
++AC_ARG_WITH([systemdsystemunitdir],
++        AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
++        [], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
++if test "x$with_systemdsystemunitdir" != xno; then
++        AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
++fi
++AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ])
++
+ GETTEXT_PACKAGE=lxdm
+ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
+@@ -148,6 +174,7 @@ AC_CONFIG_FILES([
+ 	src/Makefile
+ 	po/Makefile.in
+ 	pam/Makefile
++	systemd/Makefile
+ 	data/Makefile
+ 	data/PostLogin
+ 	data/PostLogout
+diff --git a/data/Makefile.am b/data/Makefile.am
+index 6d3fad6..9500da9 100644
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -1,6 +1,6 @@
+ FULL_LIBEXECDIR=$(libexecdir)
+ 
+-lxdm.conf : lxdm.conf.in
++lxdm.conf: lxdm.conf.in
+ 	cat lxdm.conf.in | sed 's,@FULL_LIBEXECDIR@,$(FULL_LIBEXECDIR),' > $@
+ 
+ NULL=
+diff --git a/data/Xsession b/data/Xsession
+index 287db71..fe76de0 100755
+--- a/data/Xsession
++++ b/data/Xsession
+@@ -15,12 +15,7 @@ fi
+ if [ -f /etc/X11/xinit/xinitrc-common ]; then
+ # fedora
+ 	. /etc/X11/xinit/xinitrc-common
+-	if ! [ -z "$XDG_SESSION_COOKIE" ]; then
+-		CK_XINIT_SESSION=
+-	elif [ -x /usr/bin/ck-launch-session -a -z "$CK_XINIT_SESSION" ]; then
+-		CK_XINIT_SESSION="/usr/bin/ck-launch-session"
+-	fi
+-	exec -l $SHELL -c "$CK_XINIT_SESSION \"$LXSESSION\""
++	exec -l bash -c "$LXSESSION"
+ elif [ -x /etc/X11/xinit/Xsession ]; then
+ # fedora
+ 	exec /etc/X11/xinit/Xsession "$LXSESSION"
+@@ -30,17 +25,24 @@ elif [ -x /etc/X11/Xsession ]; then
+ elif [ -x /etc/X11/xinit/xinitrc ]; then
+ #suse
+ 	export WINDOWMANAGER=$LXSESSION
+-	exec -l $SHELL -c /etc/X11/xinit/xinitrc
++	exec -l bash -c /etc/X11/xinit/xinitrc
+ else
+ # unknown, user should custom /etc/lxdm/xinitrc self
+ 	if [ -x /etc/lxdm/xinitrc ]; then
+-		. /etc/lxdm/xinitrc
++		. /etc/lxdm/xinitrc "$LXSESSION"
++	fi
++	if [ -d /etc/X11/xinit/xinitrc.d ] ; then
++		for f in /etc/X11/xinit/xinitrc.d/* ; do
++			[ -x "$f" ] && . "$f"
++		done
++		unset f
+ 	fi
+-	if ! [ -z "$XDG_SESSION_COOKIE" ]; then
+-		CK_XINIT_SESSION=
+-	elif [ -x /usr/bin/ck-launch-session ]; then
+-		CK_XINIT_SESSION="/usr/bin/ck-launch-session"
++
++	if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS";
++	then
++		eval "$(dbus-launch --sh-syntax --exit-with-session)"
+ 	fi
+-	exec -l $SHELL -c "$CK_XINIT_SESSION \"$LXSESSION\""
++
++	exec -l bash -c "$LXSESSION"
+ fi
+ 
+diff --git a/data/config.ui b/data/config.ui
+index 423fe56..b6d724d 100644
+--- a/data/config.ui
++++ b/data/config.ui
+@@ -175,8 +175,99 @@
+           </packing>
+         </child>
+         <child>
++          <object class="GtkHBox" id="hbox3">
++            <property name="visible">True</property>
++            <property name="can_focus">False</property>
++			<child>
++              <object class="GtkCheckButton" id="lxdm-enable-bottom-pane">
++                <property name="label" translatable="yes">Enable bottom panel</property>
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">False</property>
++                <property name="use_action_appearance">False</property>
++                <property name="xalign">0</property>
++                <property name="draw_indicator">True</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
++                <property name="position">0</property>
++              </packing>
++            </child>
++          </object>
++          <packing>
++            <property name="expand">False</property>
++            <property name="fill">True</property>
++            <property name="position">3</property>
++          </packing>
++		</child>
++		<child>
++		  <object class="GtkAlignment" id="alignment3">
++		  <property name="visible">True</property>
++		  <property name="xscale">0</property>
++		  <property name="yscale">0</property>
++		  <child>
++            <object class="GtkHBox" id="hbox4">
++              <property name="visible">True</property>
++              <property name="can_focus">False</property>
++              <child>
++                <object class="GtkLabel" id="label3">
++                  <property name="visible">True</property>
++                  <property name="can_focus">False</property>
++                  <property name="label" translatable="yes">Bottom Panel Options</property>
++		  <attributes>
++                    <attribute name="underline" value="True"/>
++		  </attributes>
++                </object>
++                <packing>
++                  <property name="expand">False</property>
++                  <property name="fill">True</property>
++                  <property name="position">0</property>
++                </packing>
++              </child>
++            </object>
++		  </child>
++		  </object>
++		</child>
++		<child>
++          <object class="GtkVBox" id="vbox2">
++            <property name="visible">True</property>
++            <property name="can_focus">False</property>
++			<child>
++              <object class="GtkCheckButton" id="lxdm-transparent-pane">
++                <property name="label" translatable="yes">Transparent panel</property>
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">False</property>
++                <property name="use_action_appearance">False</property>
++                <property name="xalign">0</property>
++                <property name="draw_indicator">True</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
++                <property name="position">0</property>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkCheckButton" id="lxdm-hide-sessions">
++                <property name="label" translatable="yes">Hide sessions</property>
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">False</property>
++                <property name="use_action_appearance">False</property>
++                <property name="xalign">0</property>
++                <property name="draw_indicator">True</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
++                <property name="position">1</property>
++              </packing>
++            </child>
++            <child>
+           <object class="GtkCheckButton" id="lxdm-show-lang">
+-            <property name="label" translatable="yes">Show languanges menu</property>
++            <property name="label" translatable="yes">Show languages menu</property>
+             <property name="visible">True</property>
+             <property name="can_focus">True</property>
+             <property name="receives_default">False</property>
+@@ -187,7 +278,7 @@
+           <packing>
+             <property name="expand">False</property>
+             <property name="fill">True</property>
+-            <property name="position">3</property>
++                <property name="position">2</property>
+           </packing>
+         </child>
+         <child>
+@@ -203,9 +294,60 @@
+           <packing>
+             <property name="expand">False</property>
+             <property name="fill">True</property>
++                <property name="position">3</property>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkCheckButton" id="lxdm-hide-exit">
++                <property name="label" translatable="yes">Hide quit button</property>
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">False</property>
++                <property name="use_action_appearance">False</property>
++                <property name="xalign">0</property>
++                <property name="draw_indicator">True</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
+             <property name="position">4</property>
+           </packing>
+         </child>
++          </object>
++          <packing>
++            <property name="expand">False</property>
++            <property name="fill">True</property>
++            <property name="position">5</property>
++          </packing>
++		</child>
++                <child>
++                  <object class="GtkAlignment" id="alignment4">
++                  <property name="visible">True</property>
++                  <property name="xscale">0</property>
++                  <property name="yscale">0</property>
++                  <child>
++            <object class="GtkHBox" id="hbox5">
++              <property name="visible">True</property>
++              <property name="can_focus">False</property>
++              <child>
++                <object class="GtkLabel" id="label4">
++                  <property name="visible">True</property>
++                  <property name="can_focus">False</property>
++                  <property name="label" translatable="yes">Other Options</property>
++                  <attributes>
++                    <attribute name="underline" value="True"/>
++                  </attributes>
++                </object>
++                <packing>
++                  <property name="expand">False</property>
++                  <property name="fill">True</property>
++                  <property name="position">0</property>
++                </packing>
++              </child>
++            </object>
++                  </child>
++                  </object>
++                </child>
+         <child>
+           <object class="GtkCheckButton" id="lxdm-user-list">
+             <property name="label" translatable="yes">Show user list</property>
+@@ -219,7 +361,23 @@
+           <packing>
+             <property name="expand">False</property>
+             <property name="fill">True</property>
+-            <property name="position">5</property>
++            <property name="position">7</property>
++          </packing>
++		</child>
++        <child>
++          <object class="GtkCheckButton" id="lxdm-hide-time">
++            <property name="label" translatable="yes">Hide time</property>
++            <property name="visible">True</property>
++            <property name="can_focus">True</property>
++            <property name="receives_default">False</property>
++            <property name="use_action_appearance">False</property>
++            <property name="xalign">0</property>
++            <property name="draw_indicator">True</property>
++          </object>
++          <packing>
++            <property name="expand">False</property>
++            <property name="fill">True</property>
++            <property name="position">8</property>
+           </packing>
+         </child>
+         <child>
+diff --git a/data/lxdm.conf.in b/data/lxdm.conf.in
+index dd94686..d93f280 100644
+--- a/data/lxdm.conf.in
++++ b/data/lxdm.conf.in
+@@ -15,12 +15,19 @@
+ ## set this if you don't want to put xauth file at ~/.Xauthority
+ # xauth_path=/tmp
+ 
++# not ask password for users who have empty password
++# skip_password=1
++
+ ## greeter used to welcome the user
+ greeter=@FULL_LIBEXECDIR@/lxdm-greeter-gtk
+ 
+ [server]
+ ## arg used to start xserver, not fully function
+ # arg=/usr/bin/X -background vt1
++# uncomment this if you really want xserver listen to tcp
++# tcp_listen=1
++# uncoment this if you want reset the xserver after logou
++# reset=1
+ 
+ [display]
+ ## gtk theme used by greeter
+diff --git a/data/lxdm.glade b/data/lxdm.glade
+index 81175e8..221c2a3 100644
+--- a/data/lxdm.glade
++++ b/data/lxdm.glade
+@@ -125,7 +125,9 @@
+                   </packing>
+                 </child>
+                 <child>
+-                  <object class="GtkComboBoxEntry" id="keyboard"/>
++                  <object class="GtkComboBoxEntry" id="keyboard">
++                  <property name="text_column">0</property>
++                  </object>
+                   <packing>
+                     <property name="expand">False</property>
+                     <property name="position">3</property>
+diff --git a/data/themes/Industrial/greeter-gtk3.ui b/data/themes/Industrial/greeter-gtk3.ui
+index 483809c..2f4e631 100644
+--- a/data/themes/Industrial/greeter-gtk3.ui
++++ b/data/themes/Industrial/greeter-gtk3.ui
+@@ -1,7 +1,5 @@
+ <?xml version="1.0"?>
+ <interface>
+-  <!-- interface-requires gtk+ 2.12 -->
+-  <!-- interface-naming-policy project-wide -->
+   <object class="GtkWindow" id="lxdm">
+     <property name="decorated">False</property>
+     <child>
+@@ -25,7 +23,7 @@
+           <object class="GtkAlignment" id="alignment1">
+             <property name="visible">True</property>
+             <property name="xscale">0</property>
+-            <property name="yscale">0</property>
++            <property name="yscale">1</property>
+             <child>
+               <object class="GtkVBox" id="vbox2">
+                 <property name="visible">True</property>
+@@ -34,6 +32,7 @@
+                   <object class="GtkImage" id="image1">
+                     <property name="visible">True</property>
+                     <property name="pixbuf">login.png</property>
++                    <property name="yalign">0.8</property>
+                   </object>
+                   <packing>
+                     <property name="position">0</property>
+@@ -42,6 +41,7 @@
+                 <child>
+                   <object class="GtkAlignment" id="alignment2">
+                     <property name="visible">True</property>
++                    <property name="yalign">0.1</property>
+                     <property name="xscale">0</property>
+                     <property name="yscale">0</property>
+                     <child>
+@@ -61,19 +61,22 @@
+                           </packing>
+                         </child>
+                         <child>
+-                          <object class="GtkIconView" id="user_list">
++                          <object class="GtkScrolledWindow" id="user_list_scrolled">
+                             <property name="visible">True</property>
+-                            <property name="can_focus">True</property>
+-                            <property name="item-padding">1</property>
+-                            <property name="margin">2</property>
+-                            <property name="column-spacing">0</property>
+-                            <property name="row-spacing">1</property>
++                            <property name="can_focus">False</property>
++                            <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
++                            <property name="vscrollbar_policy">GTK_POLICY_NEVER</property>
++                            <child>
++                              <object class="GtkIconView" id="user_list">
++                                <property name="visible">True</property>
++                                <property name="can_focus">True</property>
++                                <property name="item-padding">1</property>
++                                <property name="margin">2</property>
++                                <property name="column-spacing">0</property>
++                                <property name="row-spacing">1</property>
++                              </object>
++                            </child>
+                           </object>
+-                          <packing>
+-                            <property name="expand">False</property>
+-                            <property name="fill">False</property>
+-                            <property name="position">1</property>
+-                          </packing>
+                         </child>
+                         <child>
+                           <object class="GtkEntry" id="login_entry">
+diff --git a/data/themes/Industrial/greeter.ui b/data/themes/Industrial/greeter.ui
+index 77a4f8d..3413922 100644
+--- a/data/themes/Industrial/greeter.ui
++++ b/data/themes/Industrial/greeter.ui
+@@ -25,7 +25,7 @@
+           <object class="GtkAlignment" id="alignment1">
+             <property name="visible">True</property>
+             <property name="xscale">0</property>
+-            <property name="yscale">0</property>
++            <property name="yscale">1</property>
+             <child>
+               <object class="GtkVBox" id="vbox2">
+                 <property name="visible">True</property>
+@@ -34,6 +34,7 @@
+                   <object class="GtkImage" id="image1">
+                     <property name="visible">True</property>
+                     <property name="pixbuf">login.png</property>
++                    <property name="yalign">0.8</property>
+                   </object>
+                   <packing>
+                     <property name="position">0</property>
+@@ -42,6 +43,7 @@
+                 <child>
+                   <object class="GtkAlignment" id="alignment2">
+                     <property name="visible">True</property>
++                    <property name="yalign">0.1</property>
+                     <property name="xscale">0</property>
+                     <property name="yscale">0</property>
+                     <child>
+@@ -61,19 +63,22 @@
+                           </packing>
+                         </child>
+                         <child>
+-                          <object class="GtkIconView" id="user_list">
++                          <object class="GtkScrolledWindow" id="user_list_scrolled">
+                             <property name="visible">True</property>
+-                            <property name="can_focus">True</property>
+-                            <property name="item-padding">1</property>
+-                            <property name="margin">2</property>
+-                            <property name="column-spacing">0</property>
+-                            <property name="row-spacing">1</property>
++                            <property name="can_focus">False</property>
++                            <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
++                            <property name="vscrollbar_policy">GTK_POLICY_NEVER</property>
++                            <child>
++                              <object class="GtkIconView" id="user_list">
++                                <property name="visible">True</property>
++                                <property name="can_focus">True</property>
++                                <property name="item-padding">1</property>
++                                <property name="margin">2</property>
++                                <property name="column-spacing">0</property>
++                                <property name="row-spacing">1</property>
++                              </object>
++                            </child>
+                           </object>
+-                          <packing>
+-                            <property name="expand">False</property>
+-                            <property name="fill">False</property>
+-                            <property name="position">1</property>
+-                          </packing>
+                         </child>
+                         <child>
+                           <object class="GtkEntry" id="login_entry">
+@@ -201,7 +206,9 @@
+                   </packing>
+                 </child>
+                 <child>
+-                  <object class="GtkComboBoxEntry" id="keyboard"/>
++                  <object class="GtkComboBoxEntry" id="keyboard">
++                  <property name="text_column">0</property>
++                  </object>
+                   <packing>
+                     <property name="expand">False</property>
+                     <property name="position">3</property>
+diff --git a/data/themes/Industrial/gtk.css b/data/themes/Industrial/gtk.css
+index eefe846..7621345 100644
+--- a/data/themes/Industrial/gtk.css
++++ b/data/themes/Industrial/gtk.css
+@@ -1,20 +1,21 @@
+ #lxdm {
+-	background-image: url("wave.svg")
++	background-image: url("wave.svg");
++	background-size: 100%;
+ }
+ 
+ #bottom_pane {
+-	background-image: url("shade.png")
++	background-color: rgba(0,0,0,0.24);
+ }
+ 
+ #time {
+ 	font: Sans 12;
+-	color: #ffffff
++	color: #ffffff;
+ }
+ 
+ #user_list, #login_entry {
+-	background-image: none
++	background-image: none;
+ }
+ 
+ #prompt, #bottom_pane GtkLabel {
+-	color: #ffffff
++	color: #ffffff;
+ }
+diff --git a/data/themes/Industrial/gtkrc b/data/themes/Industrial/gtkrc
+index 9ee55d5..8f1d810 100644
+--- a/data/themes/Industrial/gtkrc
++++ b/data/themes/Industrial/gtkrc
+@@ -45,6 +45,6 @@ style "bottom"
+ 
+ widget "lxdm" style "back"
+ widget "lxdm.*.time" style "time"
+-widget "lxdm.*.prompt" style "prompt"
++widget "*.prompt" style "prompt"
+ widget "lxdm.*.bottom_pane" style "bottom"
+ widget_class "GtkWindow.*.GtkEventBox.*.<GtkLabel>" style "bottom"
+diff --git a/gnome-shell/LXDM_User_Switch@dgod/extension.js b/gnome-shell/LXDM_User_Switch@dgod/extension.js
+new file mode 100644
+index 0000000..5c0498f
+--- /dev/null
++++ b/gnome-shell/LXDM_User_Switch@dgod/extension.js
+@@ -0,0 +1,28 @@
++const Main = imports.ui.main;
++const GLib = imports.gi.GLib;
++const PopupMenu = imports.ui.popupMenu;
++
++let button, menu, evt;
++
++function _buttonActivate() {
++	Main.overview.hide();
++	GLib.spawn_command_line_async("lxdm -c USER_SWITCH");
++}
++
++function init() {
++}
++
++function enable() {
++	menu = Main.panel["statusArea"].userMenu;
++	button = menu._loginScreenItem;
++	evt=button.connect('activate', function(){GLib.spawn_command_line_async("lxdm -c USER_SWITCH");});
++	button.actor.visible=true;
++}
++
++function disable() {
++	if(evt && button)
++		button.disconnect(evt);
++	evt=undefined;
++	button=undefined;
++	menu=undefined;
++}
+diff --git a/gnome-shell/LXDM_User_Switch@dgod/metadata.json b/gnome-shell/LXDM_User_Switch@dgod/metadata.json
+new file mode 100644
+index 0000000..a5a19f7
+--- /dev/null
++++ b/gnome-shell/LXDM_User_Switch@dgod/metadata.json
+@@ -0,0 +1 @@
++{"shell-version": ["3.6.0"], "uuid": "LXDM_User_Switch@dgod", "name": "LXDM User Switch", "description": "LXDM User Switch"}
+\ No newline at end of file
+diff --git a/gnome-shell/LXDM_User_Switch@dgod/stylesheet.css b/gnome-shell/LXDM_User_Switch@dgod/stylesheet.css
+new file mode 100644
+index 0000000..e69de29
+diff --git a/lxdm.spec.in b/lxdm.spec.in
+index ae5b345..3033d74 100644
+--- a/lxdm.spec.in
++++ b/lxdm.spec.in
+@@ -14,7 +14,8 @@ Source0:	lxdm-%{version}.tar.gz
+ 
+ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}
+ 
+-BuildRequires:	gtk2-devel pam-devel intltool
++BuildRequires:	gtk3-devel pam-devel intltool
++Provides:       service(graphical-login) = lxdm
+ 
+ %description
+ Light weight X11 display manager
+@@ -26,7 +27,7 @@ Light weight X11 display manager
+ export CFLAGS="$RPM_OPT_FLAGS"
+ export CXXFLAGS="$RPM_OPT_FLAGS"
+ 
+-%configure
++%configure --enable-gtk3
+ 
+ %__make
+ 
+@@ -64,6 +65,7 @@ rm -rf $RPM_BUILD_ROOT
+ %{_sysconfdir}/lxdm/Xsession
+ %config %{_sysconfdir}/lxdm/lxdm.conf
+ %{_sysconfdir}/pam.d/lxdm
++%{_unitdir}/lxdm.service
+ 
+ %changelog
+ 
+diff --git a/pam/lxdm b/pam/lxdm
+index 51ffda4..41c95f4 100644
+--- a/pam/lxdm
++++ b/pam/lxdm
+@@ -4,6 +4,6 @@ auth       optional	pam_gnome_keyring.so
+ account    include	system-auth
+ session    optional	pam_keyinit.so force revoke
+ session    include	system-auth
+-session    required	pam_loginuid.so
+ session    optional	pam_console.so
+ session    optional	pam_gnome_keyring.so auto_start
++session    optional	pam_selinux.so
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 7fdfd99..4f9a11c 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -8,6 +8,7 @@ lxdm_binary_CFLAGS = \
+ 	-DXSESSIONS_DIR=\"@datarootdir@/xsessions\" \
+ 	-DLXDM_DATA_DIR=@datadir@/@PACKAGE@ \
+ 	-DLXDM_NUMLOCK_PATH=\"@libexecdir@/lxdm-numlock\" \
++	-DLXDM_SESSION_PATH=\"@libexecdir@/lxdm-session\" \
+ 	$(CONSOLEKIT_CFLAGS) \
+ 	-Werror-implicit-function-declaration \
+ 	-Wall \
+@@ -20,10 +21,10 @@ lxdm_binary_LDADD = \
+ 	$(NULL)
+ 
+ lxdm_binary_SOURCES = \
+-	lxdm.c lxdm.h ui.c lxcom.c lxcom.h xconn.c xconn.h \
++	lxdm.c lxdm.h ui.c lxcom.c lxcom.h xconn.c xconn.h auth.c lxcommon.h \
+ 	$(NULL)
+ 
+-libexec_PROGRAMS = lxdm-greeter-gdk lxdm-numlock lxdm-greeter-gtk
++libexec_PROGRAMS = lxdm-greeter-gdk lxdm-numlock lxdm-greeter-gtk lxdm-session
+ 
+ lxdm_greeter_gtk_CFLAGS = \
+ 	$(GTK_CFLAGS) \
+@@ -49,6 +50,7 @@ lxdm_greeter_gtk_SOURCES = \
+ 	gdm/locarchive.h \
+ 	lxcom.c lxcom.h \
+ 	greeter-utils.c greeter-utils.h \
++	lxcommon.h \
+ 	$(NULL)
+ 
+ lxdm_greeter_gdk_CFLAGS = \
+@@ -84,6 +86,18 @@ lxdm_numlock_LDADD = \
+ 	$(XLIB_LIBS) \
+ 	$(NULL)
+ 
++lxdm_session_SOURCES = \
++	pam.c \
++	$(NULL)
++
++lxdm_session_CFLAGS = \
++	$(GLIB_CFLAGS) \
++	$(NULL)
++
++lxdm_session_LDFLAGS = \
++	$(GLIB_LIBS) \
++	$(NULL)
++
+ bin_PROGRAMS = lxdm-config
+ 
+ lxdm_config_CFLAGS = \
+@@ -100,3 +114,4 @@ lxdm_config_SOURCES = \
+ 	config.c \
+ 	$(NULL)
+ 
++
+diff --git a/src/auth.c b/src/auth.c
+new file mode 100644
+index 0000000..10c047c
+--- /dev/null
++++ b/src/auth.c
+@@ -0,0 +1,632 @@
++/*
++ *      lxdm.c - main entry of lxdm
++ *
++ *      Copyright 2009 dgod <dgod.osa@gmail.com>
++ *
++ *      This program is free software; you can redistribute it and/or modify
++ *      it under the terms of the GNU General Public License as published by
++ *      the Free Software Foundation; either version 3 of the License, or
++ *      (at your option) any later version.
++ *
++ *      This program is distributed in the hope that it will be useful,
++ *      but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *      GNU General Public License for more details.
++ *
++ *      You should have received a copy of the GNU General Public License
++ *      along with this program; if not, write to the Free Software
++ *      Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
++ *      MA 02110-1301, USA.
++ */
++
++#define _GNU_SOURCE
++
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++#ifndef HAVE_LIBPAM
++#ifdef USE_PAM
++#define HAVE_LIBPAM 1
++#else
++#define HAVE_LIBPAM 0
++#endif
++#endif
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <stdarg.h>
++
++#include <pwd.h>
++#include <grp.h>
++#include <shadow.h>
++#include <unistd.h>
++#include <errno.h>
++
++#include <glib.h>
++
++#include "lxdm.h"
++#include "auth.h"
++
++#if HAVE_LIBPAM
++
++#define PAM_MP	1
++
++#endif
++
++void switch_user(struct passwd *pw, const char *run, char **env);
++
++static void passwd_clean(struct passwd *pw)
++{
++	g_free(pw->pw_name);
++	g_free(pw->pw_gecos);
++	g_free(pw->pw_dir);
++	g_free(pw->pw_shell);
++	memset(pw,0,sizeof(*pw));
++}
++
++#if !PAM_MP
++static void passwd_copy(struct passwd *dst,struct passwd *src)
++{
++	dst->pw_name=g_strdup(src->pw_name);
++	dst->pw_uid=src->pw_uid;
++	dst->pw_gid=src->pw_gid;
++	if(src->pw_gecos)
++		dst->pw_gecos=g_strdup(src->pw_gecos);
++	dst->pw_dir=g_strdup(src->pw_dir);
++	dst->pw_shell=g_strdup(src->pw_shell);
++}
++#endif
++
++#if !HAVE_LIBPAM
++
++
++int lxdm_auth_init(LXDM_AUTH *a)
++{
++	memset(a,0m,sizeof(*a));
++	return 0;
++}
++
++int lxdm_auth_cleanup(LXDM_AUTH *a)
++{
++	passwd_clean(&a->pw);
++	return 0;
++}
++
++int lxdm_auth_user_authenticate(LXDM_AUTH *a,const char *user,const char *pass,int type)
++{
++	struct passwd *pw;
++	struct spwd *sp;
++    char *real;
++    char *enc;
++	if(!user || !user[0])
++	{
++		g_debug("user==NULL\n");
++		return AUTH_ERROR;
++	}
++	pw = getpwnam(user);
++	endpwent();
++	if(!pw)
++	{
++		g_debug("user %s not found\n",user);
++		return AUTH_BAD_USER;
++	}
++	if(strstr(pw->pw_shell, "nologin"))
++    {
++        g_debug("user %s have nologin shell\n",user);
++        return AUTH_PRIV;
++    }
++    if(type==AUTH_TYPE_AUTO_LOGIN && !pass)
++    {
++		goto out;
++	}
++    sp = getspnam(user);
++    if( !sp )
++    {
++		return AUTH_FAIL;
++	}
++    endspent();
++    real = sp->sp_pwdp;
++    if( !real || !real[0] )
++    {
++        if( !pass || !pass[0] )
++        {
++            *ppw = pw;
++            g_debug("user %s auth with no password ok\n",user);
++            return AUTH_SUCCESS;
++        }
++        else
++        {
++            g_debug("user %s password not match\n",user);
++            return AUTH_FAIL;
++        }
++    }
++    enc = crypt(pass, real);
++    if( strcmp(real, enc) )
++    {
++        g_debug("user %s password not match\n",user);
++        return AUTH_FAIL;
++    }
++out:
++    g_debug("user %s auth ok\n",pw->pw_name);
++	passwd_copy(&a->pw,pw);
++    return AUTH_SUCCESS;
++}
++
++int lxdm_auth_session_begin(LXDM_AUTH *a,int tty,int display,char mcookie[16])
++{
++	return 0;
++}
++
++int lxdm_auth_session_end(LXDM_AUTH *a)
++{
++	return 0;
++}
++
++int lxdm_auth_clean_for_child(LXDM_AUTH *a)
++{
++	return 0;
++}
++
++char **lxdm_auth_append_env(LXDM_AUTH *a,char **env)
++{
++	return env;
++}
++
++int lxdm_auth_session_run(LXDM_AUTH *a,const char *session_exec,char **env)
++{
++	int pid;
++	pid = fork();
++	if(pid==0)
++	{
++		env=lxdm_auth_append_env(a,env);
++		lxdm_auth_clean_for_child(a);
++		switch_user(&a->pw, session_exec, env);
++		lxdm_quit_self(4);
++	}
++	return pid;
++}
++
++#elif !PAM_MP
++
++#include <security/pam_appl.h>
++
++static char *user_pass[2];
++
++static int do_conv(int num, const struct pam_message **msg,struct pam_response **resp, void *arg)
++{
++	int result = PAM_SUCCESS;
++	int i;
++	*resp = (struct pam_response *) calloc(num, sizeof(struct pam_response));
++	for(i=0;i<num;i++)
++	{
++		//printf("MSG: %d %s\n",msg[i]->msg_style,msg[i]->msg);
++		switch(msg[i]->msg_style){
++		case PAM_PROMPT_ECHO_ON:
++			resp[i]->resp=strdup(user_pass[0]?user_pass[0]:"");
++			break;
++		case PAM_PROMPT_ECHO_OFF:
++			//resp[i]->resp=strdup(user_pass[1]?user_pass[1]:"");
++			resp[i]->resp=user_pass[1]?strdup(user_pass[1]):NULL;
++			break;
++		case PAM_ERROR_MSG:
++		case PAM_TEXT_INFO:
++			//printf("PAM: %s\n",msg[i]->msg);
++			break;
++		default:
++			break;
++		}
++	}
++	return result;
++}
++
++static struct pam_conv conv={.conv=do_conv,.appdata_ptr=user_pass};
++
++int lxdm_auth_init(LXDM_AUTH *a)
++{
++	memset(a,0,sizeof(*a));
++	return 0;
++}
++
++int lxdm_auth_cleanup(LXDM_AUTH *a)
++{
++	passwd_clean(&a->pw);
++	return 0;
++}
++
++int lxdm_auth_user_authenticate(LXDM_AUTH *a,const char *user,const char *pass,int type)
++{
++	struct passwd *pw;
++	if(!user || !user[0])
++	{
++		g_debug("user==NULL\n");
++		return AUTH_ERROR;
++	}
++	pw = getpwnam(user);
++	endpwent();
++	if(!pw)
++	{
++		g_debug("user %s not found\n",user);
++		return AUTH_BAD_USER;
++	}
++	if(strstr(pw->pw_shell, "nologin"))
++    {
++        g_debug("user %s have nologin shell\n",user);
++        return AUTH_PRIV;
++    }
++	if(a->handle) pam_end(a->handle,0);
++	if(PAM_SUCCESS != pam_start("lxdm", pw->pw_name, &conv, (pam_handle_t**)&a->handle))
++	{
++		a->handle=NULL;
++		g_debug("user %s start pam fail\n",user);
++		return AUTH_FAIL;
++	}
++	else
++	{
++		int ret;
++		if(type==AUTH_TYPE_AUTO_LOGIN && !pass)
++			goto out;
++		user_pass[0]=(char*)user;user_pass[1]=(char*)pass;
++		ret=pam_authenticate(a->handle,PAM_SILENT);
++		user_pass[0]=0;user_pass[1]=0;
++		if(ret!=PAM_SUCCESS)
++		{
++			g_debug("user %s auth fail with %d\n",user,ret);
++			return AUTH_FAIL;
++		}
++		ret=pam_acct_mgmt(a->handle,PAM_SILENT);
++		if(ret!=PAM_SUCCESS)
++		{
++			g_debug("user %s acct mgmt fail with %d\n",user,ret);
++			return AUTH_FAIL;
++		}
++	}
++out:
++	passwd_copy(&a->pw,pw);
++	return AUTH_SUCCESS;
++}
++
++int lxdm_auth_session_begin(LXDM_AUTH *a,const char *name,int tty,int display,char mcookie[16])
++{
++	int err;
++	char x[256];
++	
++	if(!a->handle)
++    {
++        g_message("begin session without auth\n");
++        return -1;
++    }
++	sprintf(x, "tty%d", tty);
++    pam_set_item(a->handle, PAM_TTY, x);
++#ifdef PAM_XDISPLAY
++	sprintf(x,":%d",display);
++    pam_set_item(a->handle, PAM_XDISPLAY, x);
++#endif
++#if !defined(DISABLE_XAUTH) && defined(PAM_XAUTHDATA)
++	struct pam_xauth_data value;
++	value.name="MIT-MAGIC-COOKIE-1";
++	value.namelen=18;
++	value.data=mcookie;
++	value.datalen=16;
++	pam_set_item (a->handle, PAM_XAUTHDATA, &value);
++#endif
++    if(name && name[0])
++    {
++        char *env;
++        env = g_strdup_printf ("DESKTOP_SESSION=%s", name);
++        pam_putenv (a->handle, env);
++        g_free (env);
++    }
++	err = pam_open_session(a->handle, 0); /* FIXME pam session failed */
++    if( err != PAM_SUCCESS )
++        g_warning( "pam open session error \"%s\"\n", pam_strerror(a->handle, err));
++	return 0;
++}
++
++int lxdm_auth_session_end(LXDM_AUTH *a)
++{
++	int err;
++    if(!a->handle)
++		return 0;
++    err = pam_close_session(a->handle, 0);
++    pam_end(a->handle, err);
++    a->handle = NULL;
++    passwd_clean(&a->pw);
++	return 0;
++}
++
++int lxdm_auth_clean_for_child(LXDM_AUTH *a)
++{
++	pam_end(a->handle,0);
++	return 0;
++}
++
++char **lxdm_auth_append_env(LXDM_AUTH *a,char **env)
++{
++	int i,j,n,pa;
++	char **penv;
++	if(!a->handle) return env;
++	penv=pam_getenvlist(a->handle);
++	if(!penv) return env;
++	pa=g_strv_length(penv);
++	if(pa==0)
++	{
++		free(penv);
++		return env;
++	}
++	env=g_renew(char *,env,g_strv_length(env)+1+pa+10);
++	for(i=0;penv[i]!=NULL;i++)
++	{
++		fprintf(stderr,"PAM %s\n",penv[i]);
++		n=strcspn(penv[i],"=")+1;
++		for(j=0;env[j]!=NULL;j++)
++		{
++			if(!strncmp(penv[i],env[j],n))
++				break;
++			if(env[j+1]==NULL)
++			{
++				env[j+1]=g_strdup(penv[i]);
++				env[j+2]=NULL;
++				break;
++			}
++		}
++		free(penv[i]);
++	}
++	free(penv);
++	return env;
++}
++
++int lxdm_auth_session_run(LXDM_AUTH *a,const char *session_exec,char **env)
++{
++	int pid;
++	pid = fork();
++	if(pid==0)
++	{
++		env=lxdm_auth_append_env(a,env);
++		lxdm_auth_clean_for_child(a);
++		switch_user(&a->pw, session_exec, env);
++		lxdm_quit_self(4);
++	}
++	return pid;
++}
++
++#else
++
++static void xwrite(int fd,const void *buf,size_t size)
++{
++	int ret;
++	do{
++		ret=write(fd,buf,size);
++	}while(ret==-1 && errno==EINTR);
++}
++
++static int xreadline(int fd,char *buf,size_t size)
++{
++	int i;
++	for(i=0;i<size-1;i++)
++	{
++		int ret;
++		do{
++			ret=read(fd,buf+i,1);
++		}while(ret==-1 && errno==EINTR);
++		if(buf[i]==-1 || buf[i]=='\n')
++			break;
++	}
++	buf[i]=0;
++	return i;
++}
++
++int lxdm_auth_init(LXDM_AUTH *a)
++{
++	memset(a,0,sizeof(*a));
++	a->pipe[0]=a->pipe[1]=-1;
++	return 0;
++}
++
++int lxdm_auth_cleanup(LXDM_AUTH *a)
++{
++	passwd_clean(&a->pw);
++	if(a->pipe[0]!=-1)
++	{
++		close(a->pipe[0]);
++		a->pipe[0]=-1;
++	}
++	if(a->pipe[1]!=-1)
++	{
++		close(a->pipe[1]);
++		a->pipe[1]=-1;
++	}
++	return 0;
++}
++
++//#undef LXDM_SESSION_PATH
++//#define LXDM_SESSION_PATH "./lxdm-session"
++static int check_child(LXDM_AUTH *a)
++{
++	if(a->pipe[0]!=-1)
++		return 0;
++	char *argv[3]={LXDM_SESSION_PATH,NULL,NULL};
++	GPid pid;
++	gboolean ret;
++	ret = g_spawn_async_with_pipes(NULL, argv, NULL,
++				   G_SPAWN_DO_NOT_REAP_CHILD, NULL,NULL,
++				   &pid, a->pipe + 0, a->pipe + 1, NULL, NULL);
++	if(ret==FALSE)
++	{
++		g_message("spawn lxdm-auth fail\n");
++		return -1;
++	}
++	a->child=(int)pid;
++	return 0;
++}
++
++int lxdm_auth_user_authenticate(LXDM_AUTH *a,const char *user,const char *pass,int type)
++{
++	char temp[128];
++	char res[8];
++	int ret;
++	if(check_child(a)!=0)
++	{
++		printf("check child fail\n");
++		return -1;
++	}
++	if(type==AUTH_TYPE_AUTO_LOGIN && pass)
++		type=AUTH_TYPE_NORMAL;
++	else if(type==AUTH_TYPE_NORMAL && !pass)
++		type=AUTH_TYPE_NULL_PASS;
++	xwrite(a->pipe[0],"auth\n",5);
++	ret=sprintf(temp,"%d\n",type);
++	xwrite(a->pipe[0],temp,ret);
++	ret=sprintf(temp,"%s\n",user);
++	xwrite(a->pipe[0],temp,ret);
++	if(pass!=NULL)
++		ret=sprintf(temp,"%s\n",pass);
++	xwrite(a->pipe[0],temp,ret);
++	ret=xreadline(a->pipe[1],res,sizeof(res));
++	if(ret<=0)
++	{
++		g_message("read user auth result fail\n");
++		return -1;
++	}
++	ret=atoi(res);
++	if(ret==AUTH_SUCCESS)
++	{
++		passwd_clean(&a->pw);
++		a->pw.pw_name=g_strdup(user);
++		ret=xreadline(a->pipe[1],temp,sizeof(temp));
++		if(ret==-1) return -1;
++		a->pw.pw_uid=atoi(temp);
++		ret=xreadline(a->pipe[1],temp,sizeof(temp));
++		if(ret==-1) return -1;
++		a->pw.pw_gid=atoi(temp);
++		ret=xreadline(a->pipe[1],temp,sizeof(temp));
++		if(ret==-1) return -1;
++		a->pw.pw_gecos=g_strdup(temp);
++		ret=xreadline(a->pipe[1],temp,sizeof(temp));
++		if(ret==-1) return -1;
++		a->pw.pw_dir=g_strdup(temp);
++		ret=xreadline(a->pipe[1],temp,sizeof(temp));
++		if(ret==-1) return -1;
++		a->pw.pw_shell=g_strdup(temp);
++	}
++	return atoi(res);
++}
++#include <assert.h>
++int lxdm_auth_session_begin(LXDM_AUTH *a,const char *name,int tty,int display,char mcookie[16])
++{
++	char temp[32];
++	char res[8];
++	gchar *b64;
++	int ret;
++
++	if(check_child(a)!=0)
++		return -1;
++	xwrite(a->pipe[0],"begin\n",6);
++	ret=sprintf(temp,"%s\n",name?:"");
++	xwrite(a->pipe[0],temp,ret);
++	ret=sprintf(temp,"%d\n",tty);
++	xwrite(a->pipe[0],temp,ret);
++	ret=sprintf(temp,"%d\n",display);
++	xwrite(a->pipe[0],temp,ret);
++	b64=g_base64_encode((const guchar*)mcookie,16);
++	assert(b64!=NULL);
++	ret=sprintf(temp,"%s\n",b64);
++	g_free(b64);
++	xwrite(a->pipe[0],temp,ret);
++	ret=xreadline(a->pipe[1],res,sizeof(res));
++	if(ret<=0)
++	{
++		g_message("pam session begin fail\n");
++		return -1;
++	}
++	ret=atoi(res);
++	return ret;
++}
++
++int lxdm_auth_session_end(LXDM_AUTH *a)
++{
++	passwd_clean(&a->pw);
++	if(a->pipe[0]!=-1)
++	{
++		xwrite(a->pipe[0],"exit\n",5);
++		close(a->pipe[0]);
++		a->pipe[0]=-1;
++	}
++	if(a->pipe[1]!=-1)
++	{
++		close(a->pipe[1]);
++		a->pipe[1]=-1;
++	}
++	return 0;
++}
++
++int lxdm_auth_clean_for_child(LXDM_AUTH *a)
++{
++	return 0;
++}
++
++char **lxdm_auth_append_env(LXDM_AUTH *a,char **env)
++{
++	int i,j,n,pa;
++	char temp[1024];
++	int ret;
++	char **penv;
++	
++	if(check_child(a)!=0)
++		return env;
++	xwrite(a->pipe[0],"env\n",4);
++	ret=xreadline(a->pipe[1],temp,sizeof(temp));
++	if(ret<=0) return env;
++	penv=g_strsplit(temp," ",-1);
++	pa=g_strv_length(penv);
++	if(pa==0)
++	{
++		g_strfreev(penv);
++		return env;
++	}
++	env=g_renew(char *,env,g_strv_length(env)+1+pa+10);
++	for(i=0;penv[i]!=NULL;i++)
++	{
++		g_debug("PAM %s\n",penv[i]);
++		n=strcspn(penv[i],"=")+1;
++		for(j=0;env[j]!=NULL;j++)
++		{
++			if(!strncmp(penv[i],env[j],n))
++				break;
++			if(env[j+1]==NULL)
++			{
++				env[j+1]=g_strdup(penv[i]);
++				env[j+2]=NULL;
++				break;
++			}
++		}
++	}
++	g_strfreev(penv);
++	return env;
++}
++
++int lxdm_auth_session_run(LXDM_AUTH *a,const char *session_exec,char **env)
++{
++	int fd;
++	if(check_child(a)!=0)
++		return -1;
++	fd=a->pipe[0];
++	if(env!=NULL)
++	{
++		int i;
++		xwrite(fd,"putenv\n",7);
++		for(i=0;env[i]!=NULL;i++)
++		{
++			xwrite(fd,env[i],strlen(env[i]));
++			xwrite(fd,"\n",1);
++		}
++		xwrite(a->pipe[0],"\n",1);
++	}
++	xwrite(fd,"exec\n",5);
++	xwrite(fd,session_exec,strlen(session_exec));
++	xwrite(fd,"\n",1);
++	return a->child;
++}
++
++#endif
++
+diff --git a/src/auth.h b/src/auth.h
+new file mode 100644
+index 0000000..84d2267
+--- /dev/null
++++ b/src/auth.h
+@@ -0,0 +1,44 @@
++/*
++ *      lxdm.c - main entry of lxdm
++ *
++ *      Copyright 2009 dgod <dgod.osa@gmail.com>
++ *
++ *      This program is free software; you can redistribute it and/or modify
++ *      it under the terms of the GNU General Public License as published by
++ *      the Free Software Foundation; either version 3 of the License, or
++ *      (at your option) any later version.
++ *
++ *      This program is distributed in the hope that it will be useful,
++ *      but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *      GNU General Public License for more details.
++ *
++ *      You should have received a copy of the GNU General Public License
++ *      along with this program; if not, write to the Free Software
++ *      Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
++ *      MA 02110-1301, USA.
++ */
++
++#pragma once
++
++typedef struct{
++	void *handle;
++	struct passwd pw;
++	int pipe[2];
++	int child;
++}LXDM_AUTH;
++
++enum{
++	AUTH_TYPE_NORMAL=0,
++	AUTH_TYPE_AUTO_LOGIN,
++	AUTH_TYPE_NULL_PASS
++};
++
++int lxdm_auth_init(LXDM_AUTH *a);
++int lxdm_auth_cleanup(LXDM_AUTH *a);
++int lxdm_auth_user_authenticate(LXDM_AUTH *a,const char *user,const char *pass,int type);
++int lxdm_auth_session_begin(LXDM_AUTH *a,const char *name,int tty,int display,char mcookie[16]);
++int lxdm_auth_session_end(LXDM_AUTH *a);
++int lxdm_auth_clean_for_child(LXDM_AUTH *a);
++char **lxdm_auth_append_env(LXDM_AUTH *a,char **env);
++int lxdm_auth_session_run(LXDM_AUTH *a,const char *session_exec,char **env);
+diff --git a/src/config.c b/src/config.c
+index 3f92f7b..bee826d 100644
+--- a/src/config.c
++++ b/src/config.c
+@@ -125,24 +125,19 @@ static gboolean image_file_valid(const char *filename)
+ static void update_face_image(GtkWidget *w)
+ {
+ 	GdkPixbuf *pixbuf;
+-	char *path;
+-	path=g_build_filename(user->pw_dir,".face",NULL);
+-	if(access(path,R_OK))
+-	{
+-		g_free(path);
+-		if(ui_nobody)
+-			pixbuf=gdk_pixbuf_new_from_file_at_scale(ui_nobody,48,48,FALSE,NULL);
+-		if(!pixbuf)
+-			pixbuf=gtk_icon_theme_load_icon(gtk_icon_theme_get_default(),
++	char *path=g_build_filename(user->pw_dir,".face",NULL);
++	pixbuf=gdk_pixbuf_new_from_file_at_scale(path,48,48,FALSE,NULL);
++	g_free(path);
++	if(!pixbuf && ui_nobody)
++		pixbuf=gdk_pixbuf_new_from_file_at_scale(ui_nobody,48,48,FALSE,NULL);
++	if(!pixbuf)
++		pixbuf=gtk_icon_theme_load_icon(gtk_icon_theme_get_default(),
+ 						"avatar-default", 48,GTK_ICON_LOOKUP_FORCE_SIZE,NULL);
+-	}
+-	else
++	if(pixbuf)
+ 	{
+-		pixbuf=gdk_pixbuf_new_from_file_at_scale(path,48,48,FALSE,NULL);
+-		g_free(path);
++		gtk_image_set_from_pixbuf(GTK_IMAGE(w),pixbuf);
++		g_object_unref(pixbuf);
+ 	}
+-	gtk_image_set_from_pixbuf(GTK_IMAGE(w),pixbuf);
+-	g_object_unref(pixbuf);
+ }
+ 
+ static void set_face_file(const char *filename)
+@@ -484,6 +479,82 @@ void prepare_bg(GtkBuilder *builder)
+ 	g_signal_connect(w,"toggled",on_bg_type_toggled,NULL);
+ }
+ 
++static void on_enable_pane_toggled(GtkToggleButton *button)
++{
++        int val;
++        val=gtk_toggle_button_get_active(button);
++        g_key_file_set_integer(config,"display","bottom_pane",val);
++        GtkWidget *w;
++        w=(GtkWidget*)gtk_builder_get_object(builder,"vbox2");
++        gtk_widget_set_sensitive(w,val?TRUE:FALSE);
++	dirty++;
++}
++
++static void prepare_enable_pane(GtkBuilder *builder)
++{
++        gint val;
++        GtkWidget *w;
++        w=(GtkWidget*)gtk_builder_get_object(builder,"lxdm-enable-bottom-pane");
++        val=g_key_file_get_integer(config,"display","bottom_pane",NULL);
++        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),val?TRUE:FALSE);
++        if(!root) gtk_widget_set_sensitive(w,FALSE);
++        g_signal_connect(w,"toggled",G_CALLBACK(on_enable_pane_toggled),NULL);
++}
++
++static void prepare_vbox2(GtkBuilder *builder)
++{
++        gint val;
++        GtkWidget *w;
++        w=(GtkWidget*)gtk_builder_get_object(builder,"vbox2");
++        val=g_key_file_get_integer(config,"display","bottom_pane",NULL);
++        if(!root) 
++	{
++		gtk_widget_set_sensitive(w,FALSE);
++	}
++	else
++	{
++		gtk_widget_set_sensitive(w,val?TRUE:FALSE);
++	}
++}
++
++static void on_transparent_pane_toggled(GtkToggleButton *button)
++{
++        int val;
++        val=gtk_toggle_button_get_active(button);
++        g_key_file_set_integer(config,"display","transparent_pane",val);
++        dirty++;
++}
++
++static void prepare_transparent_pane(GtkBuilder *builder)
++{
++        gint val;
++        GtkWidget *w;
++        w=(GtkWidget*)gtk_builder_get_object(builder,"lxdm-transparent-pane");
++        val=g_key_file_get_integer(config,"display","transparent_pane",NULL);
++        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),val?TRUE:FALSE);
++        if(!root) gtk_widget_set_sensitive(w,FALSE);
++        g_signal_connect(w,"toggled",G_CALLBACK(on_transparent_pane_toggled),NULL);
++}
++
++static void on_hide_sessions_toggled(GtkToggleButton *button)
++{
++        int val;
++        val=gtk_toggle_button_get_active(button);
++        g_key_file_set_integer(config,"display","hide_sessions",val);
++        dirty++;
++}
++
++static void prepare_hide_sessions(GtkBuilder *builder)
++{
++        gint val;
++        GtkWidget *w;
++        w=(GtkWidget*)gtk_builder_get_object(builder,"lxdm-hide-sessions");
++        val=g_key_file_get_integer(config,"display","hide_sessions",NULL);
++        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),val?TRUE:FALSE);
++        if(!root) gtk_widget_set_sensitive(w,FALSE);
++        g_signal_connect(w,"toggled",G_CALLBACK(on_hide_sessions_toggled),NULL);
++}
++
+ static void on_show_lang_toggled(GtkToggleButton *button)
+ {
+ 	int val;
+@@ -522,6 +593,44 @@ static void prepare_show_keyboard(GtkBuilder *builder)
+ 	g_signal_connect(w,"toggled",G_CALLBACK(on_show_keyboard_toggled),NULL);
+ }
+ 
++static void on_hide_exit_toggled(GtkToggleButton *button)
++{
++        int val;
++        val=gtk_toggle_button_get_active(button);
++        g_key_file_set_integer(config,"display","hide_exit",val);
++        dirty++;
++}
++
++static void prepare_hide_exit(GtkBuilder *builder)
++{
++        gint val;
++        GtkWidget *w;
++        w=(GtkWidget*)gtk_builder_get_object(builder,"lxdm-hide-exit");
++        val=g_key_file_get_integer(config,"display","hide_exit",NULL);
++        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),val?TRUE:FALSE);
++        if(!root) gtk_widget_set_sensitive(w,FALSE);
++        g_signal_connect(w,"toggled",G_CALLBACK(on_hide_exit_toggled),NULL);
++}
++
++static void on_hide_time_toggled(GtkToggleButton *button)
++{
++        int val;
++        val=gtk_toggle_button_get_active(button);
++        g_key_file_set_integer(config,"display","hide_time",val);
++        dirty++;
++}
++
++static void prepare_hide_time(GtkBuilder *builder)
++{
++        gint val;
++        GtkWidget *w;
++        w=(GtkWidget*)gtk_builder_get_object(builder,"lxdm-hide-time");
++        val=g_key_file_get_integer(config,"display","hide_time",NULL);
++        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),val?TRUE:FALSE);
++        if(!root) gtk_widget_set_sensitive(w,FALSE);
++        g_signal_connect(w,"toggled",G_CALLBACK(on_hide_time_toggled),NULL);
++}
++
+ static void on_show_userlist_toggled(GtkToggleButton *button)
+ {
+ 	int val;
+@@ -553,8 +662,14 @@ GtkDialog *dialog_create(void)
+ 	prepare_user_name(builder);
+ 	prepare_user_autologin(builder);
+ 	prepare_bg(builder);
++	prepare_enable_pane(builder);
++	prepare_vbox2(builder);
++	prepare_transparent_pane(builder);
++	prepare_hide_sessions(builder);
+ 	prepare_show_lang(builder);
+ 	prepare_show_keyboard(builder);
++	prepare_hide_exit(builder);
++	prepare_hide_time(builder);
+ 	prepare_show_userlist(builder);
+ 
+ 	return dlg;
+diff --git a/src/greeter-utils.c b/src/greeter-utils.c
+index 78b71dd..6d7055a 100644
+--- a/src/greeter-utils.c
++++ b/src/greeter-utils.c
+@@ -42,17 +42,29 @@ int ui_get_geometry(GdkWindow *win,GdkRectangle *rc)
+ void ui_set_bg(GdkWindow *win,GKeyFile *config)
+ {
+ 	GdkPixbuf *bg_img=NULL;
++#if GTK_CHECK_VERSION(3,4,0)
++	GdkRGBA bg_color;
++#else
+ 	GdkColor bg_color;
++#endif
+ 	GdkWindow *root=gdk_get_default_root_window();
+ 	char *p=g_key_file_get_string(config,"display","bg",NULL);
++#if GTK_CHECK_VERSION(3,4,0)
++	gdk_rgba_parse(&bg_color,"#222E45");
++#else
+ 	gdk_color_parse("#222E45",&bg_color);
++#endif
+ 	if( p && p[0] != '#' )
+ 	{
+ 		bg_img = gdk_pixbuf_new_from_file(p, 0);
+ 	}
+ 	if( p && p[0] == '#' )
+ 	{
+-		gdk_color_parse(p, &bg_color);
++#if GTK_CHECK_VERSION(3,4,0)
++		gdk_rgba_parse(&bg_color,p);
++#else
++		gdk_color_parse(p,&bg_color);
++#endif
+ 	}
+ 	g_free(p);
+ 
+@@ -95,8 +107,13 @@ void ui_set_bg(GdkWindow *win,GKeyFile *config)
+ 	else
+ 	{
+ #ifdef ENABLE_GTK3
++#if GTK_CHECK_VERSION(3,4,0)
++		if(win) gdk_window_set_background_rgba(win,&bg_color);
++		gdk_window_set_background_rgba(root,&bg_color);
++#else
+ 		if(win) gdk_window_set_background(win,&bg_color);
+ 		gdk_window_set_background(root,&bg_color);
++#endif	
+ #else
+ 		GdkColormap *map;
+ 		if(win)
+@@ -139,12 +156,20 @@ void ui_add_cursor(void)
+     XDefineCursor(gdk_x11_get_default_xdisplay(),
+     	GDK_WINDOW_XID(gdk_get_default_root_window()),
+     	GDK_CURSOR_XCURSOR(cur));
++#if GTK_CHECK_VERSION(3,0,0)
++	g_object_unref(cur);
++#else
+     gdk_cursor_unref(cur);
++#endif
+ }
+ 
+ void ui_set_cursor(GdkWindow *win,int which)
+ {
+ 	GdkCursor *cursor=gdk_cursor_new(which);
+ 	gdk_window_set_cursor (win,cursor);
++#if GTK_CHECK_VERSION(3,0,0)
++	g_object_unref(cursor);
++#else
+ 	gdk_cursor_unref(cursor);
++#endif
+ }
+diff --git a/src/greeter.c b/src/greeter.c
+index 095227b..2c6e5be 100644
+--- a/src/greeter.c
++++ b/src/greeter.c
+@@ -25,6 +25,10 @@
+ 
+ #include <gtk/gtk.h>
+ #include <gdk/gdkx.h>
++#include <gdk/gdkkeysyms.h>
++#ifdef ENABLE_GTK3
++#include <gdk/gdkkeysyms-compat.h>
++#endif
+ #include <glib/gi18n.h>
+ #include <X11/XKBlib.h>
+ 
+@@ -36,6 +40,7 @@
+ 
+ #include "lxcom.h"
+ #include "greeter-utils.h"
++#include "lxcommon.h"
+ 
+ enum {
+     COL_SESSION_NAME,
+@@ -50,15 +55,16 @@ enum {
+     N_LANG_COLS
+ };
+ 
+-#define VCONFIG_FILE 		"/var/lib/lxdm/lxdm.conf"
+ #define XKB_SYMBOL_DIR		"/usr/share/X11/xkb/symbols.dir"
+ 
+ static GtkBuilder* builder;
+ static GKeyFile *config;
+ static GKeyFile * var_config;
+ static GtkWidget* win;
++static GtkWidget* alignment2;
+ static GtkWidget* prompt;
+ static GtkWidget* login_entry;
++static GtkWidget* user_list_scrolled;
+ static GtkWidget* user_list;
+ 
+ static GtkWidget* sessions;
+@@ -110,7 +116,7 @@ static char *get_session_exec(void)
+ 	GtkTreeModel* model;
+ 	GtkTreeIter it;
+ 	gchar *res;
+-	if(!lang)
++	if(!sessions)
+ 		return g_strdup("");
+ 	
+ 	if(!gtk_combo_box_get_active_iter(GTK_COMBO_BOX(sessions), &it))
+@@ -120,12 +126,73 @@ static char *get_session_exec(void)
+ 	return res;
+ }
+ 
++static void switch_to_input_user(void)
++{
++	if(user)
++	{
++		g_free(user);
++		user=NULL;
++	}
++	if(pass)
++	{
++		g_free(pass);
++		pass=NULL;
++	}
++	gtk_label_set_text( GTK_LABEL(prompt), _("User:"));
++	gtk_widget_show(prompt);
++	if(user_list)
++	{
++		gtk_widget_hide(login_entry);
++		if(user_list_scrolled)
++			gtk_widget_show(user_list_scrolled);
++		else
++			gtk_widget_hide(user_list);
++		gtk_widget_grab_focus(user_list);
++	}
++	else
++	{
++		gtk_widget_show(login_entry);
++		gtk_widget_grab_focus(login_entry);
++	}
++}
++
++static void switch_to_input_passwd(void)
++{
++	if(user_list!=NULL)
++	{
++		if(user_list_scrolled)
++			gtk_widget_hide(user_list_scrolled);
++		else
++			gtk_widget_hide(user_list);
++	}
++	gtk_label_set_text( GTK_LABEL(prompt), _("Password:") );
++	gtk_entry_set_text(GTK_ENTRY(login_entry), "");
++	gtk_entry_set_visibility(GTK_ENTRY(login_entry), FALSE);
++	gtk_widget_show(login_entry);
++	gtk_widget_grab_focus(login_entry);
++}
++
++static void try_login_user(const char *user)
++{
++	char *session_exec=get_session_exec();
++	char *session_lang=get_session_lang();
++	
++	printf("login user=%s session=%s lang=%s\n",
++			user, session_exec, session_lang);
++			
++	g_free(session_lang);
++	g_free(session_exec);
++			
++}	
++
+ static void on_entry_activate(GtkEntry* entry)
+ {
+ 	char* tmp;
+ 	if( !user )
+ 	{
+ 		user = g_strdup( gtk_entry_get_text( GTK_ENTRY(entry) ) );
++		
++#if 0
+ 		gtk_entry_set_text(GTK_ENTRY(entry), "");
+ 		gtk_label_set_text( GTK_LABEL(prompt), _("Password:") );
+ 		if(strchr(user, ' '))
+@@ -135,6 +202,16 @@ static void on_entry_activate(GtkEntry* entry)
+ 			return;
+ 		}
+ 		gtk_entry_set_visibility(entry, FALSE);
++#endif
++		if(g_key_file_get_integer(config,"base","skip_password",NULL)!=0)
++		{
++			gtk_label_set_text( GTK_LABEL(prompt), "");
++			try_login_user(user);
++		}
++		else
++		{
++			switch_to_input_passwd();
++		}
+ 	}
+ 	else
+ 	{
+@@ -805,7 +882,10 @@ static void on_user_select(GtkIconView *iconview)
+ 	g_list_foreach (list, (GFunc)gtk_tree_path_free, NULL);
+ 	g_list_free (list);
+ 	gtk_tree_model_get(model,&iter,2,&name,-1);
+-	gtk_widget_hide(user_list);
++	if(user_list_scrolled)
++		gtk_widget_hide(user_list_scrolled);
++	else
++		gtk_widget_hide(user_list);
+ 	if(name && name[0])
+ 	{
+ 		if(auto_login && is_autologin_user(name))
+@@ -825,6 +905,13 @@ static void on_user_select(GtkIconView *iconview)
+ 			gtk_widget_hide( GTK_WIDGET(login_entry) );
+ 			return;
+ 		}
++		if(g_key_file_get_integer(config,"base","skip_password",NULL)!=0)
++		{
++			gtk_label_set_text( GTK_LABEL(prompt), "");
++			user=name;
++			try_login_user(user);
++			return;
++		}
+ 		gtk_entry_set_text(GTK_ENTRY(login_entry),name);
+ 		g_free(name);
+ 		on_entry_activate(GTK_ENTRY(login_entry));
+@@ -890,6 +977,10 @@ static gboolean load_user_list(GtkWidget *widget)
+ #else
+ 	gtk_icon_view_set_orientation(GTK_ICON_VIEW(widget),GTK_ORIENTATION_HORIZONTAL);
+ #endif
++	// FIXME: this should be done at greeter-gtk3.ui
++	// but set there will cause "Floating point exception"
++	gtk_icon_view_set_columns(GTK_ICON_VIEW(widget),1);
++	
+ 	model=gtk_list_store_new(5,GDK_TYPE_PIXBUF,G_TYPE_STRING,
+ 			G_TYPE_STRING,G_TYPE_STRING,G_TYPE_BOOLEAN);
+ 	gtk_icon_view_set_model(GTK_ICON_VIEW(widget),GTK_TREE_MODEL(model));
+@@ -906,18 +997,30 @@ static gboolean load_user_list(GtkWidget *widget)
+ 	}
+ 	if(count>3)
+ 	{
+-		// TODO: better ui needed
+-		count=3;
++		if(user_list_scrolled)
++		{
++			gtk_alignment_set(GTK_ALIGNMENT(alignment2), 0.5, 0.1, 0, 0.3);
++			gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(user_list_scrolled), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
++		}
++		else
++			count=3;
+ 	}
+ 	for(i=0;i<count;i++)
+ 	{		
+ 		char *gecos,*face_path,*display;
++		gchar *gecos_escape;
+ 		gboolean login;
+ 		GdkPixbuf *face=NULL;
+ 		gtk_list_store_append(model,&iter);
+ 		gecos=g_key_file_get_string(kf,users[i],"gecos",0);
+ 		face_path=g_key_file_get_string(kf,users[i],"face",0);
+ 		login=g_key_file_get_boolean(kf,users[i],"login",0);
++		if(gecos!=NULL)
++		{
++			char *comma=gecos?strchr(gecos,','):NULL;
++			if (comma)
++				*comma='\0';
++		}
+ 		if(face_path)
+ 			face=gdk_pixbuf_new_from_file_at_scale(face_path,48,48,TRUE,NULL);
+ 		if(!face)
+@@ -929,13 +1032,15 @@ static gboolean load_user_list(GtkWidget *widget)
+ 				face=gtk_icon_theme_load_icon(gtk_icon_theme_get_default(),
+ 						"avatar-default", 48,GTK_ICON_LOOKUP_FORCE_SIZE,NULL);
+ 		}
++		gecos_escape=g_markup_escape_text(gecos?gecos:users[i],-1);
+ 		display=g_strdup_printf("<span font_size=\"x-large\">%s</span>%s%s%s%s",
+-			gecos?gecos:users[i],
+-			(gecos&&strcmp(gecos,users[i]))?"(":"",
++			gecos_escape,
++			(gecos&&strcmp(gecos,users[i]))?" (":"",
+ 			(gecos&&strcmp(gecos,users[i]))?users[i]:"",
+ 			(gecos&&strcmp(gecos,users[i]))?")":"",
+ 			login?_("\n<i>logged in</i>"):"");
+ 		// don't translate it now, not freeze
++		g_free(gecos_escape);
+ 		gtk_list_store_set(model,&iter,0,face,1,display,2,users[i],3,gecos,4,login,-1);
+ 		if(face) g_object_unref(G_OBJECT(face));
+ 		g_free(display);
+@@ -944,16 +1049,17 @@ static gboolean load_user_list(GtkWidget *widget)
+ 	}
+ 	g_strfreev(users);
+ 	g_key_file_free(kf);
+-	
++
+ 	// add "More ..."
+ 	gtk_list_store_append(model,&iter);
+ 	gtk_list_store_set(model,&iter,1,_("More ..."),2,"",3,"",4,FALSE,-1);
+-	
++
+ 	path=gtk_tree_path_new_from_string("0");
+ 	gtk_icon_view_select_path(GTK_ICON_VIEW(widget),path);
+ 	gtk_widget_grab_focus(widget);
+ 	gtk_icon_view_set_cursor(GTK_ICON_VIEW(widget),path,NULL,FALSE);
+ 	gtk_tree_path_free(path);
++		
+ 	return TRUE;
+ }
+ 
+@@ -981,6 +1087,13 @@ static void on_screen_size_changed(GdkScreen *screen,GtkWidget *win)
+ 	ui_set_bg(window,config);
+ }
+ 
++static gint login_entry_on_key_press (GtkWidget *widget,GdkEventKey *event)
++{
++	if(event->keyval == GDK_Escape)
++		switch_to_input_user();
++	return FALSE;
++}		     
++
+ static void create_win()
+ {
+     GSList* objs, *l;
+@@ -1029,63 +1142,91 @@ static void create_win()
+         
+     } /* otherwise, let gtk theme paint it. */
+ 
++    alignment2=(GtkWidget*)gtk_builder_get_object(builder,"alignment2");
++    user_list_scrolled=(GtkWidget*)gtk_builder_get_object(builder,"user_list_scrolled");
+     user_list=(GtkWidget*)gtk_builder_get_object(builder,"user_list");
+ 
+     prompt = (GtkWidget*)gtk_builder_get_object(builder, "prompt");
+     login_entry = (GtkWidget*)gtk_builder_get_object(builder, "login_entry");
++    if(login_entry!=NULL)
++    {
++		g_signal_connect_after(login_entry,"key-press-event",G_CALLBACK(login_entry_on_key_press),NULL);
++	}
+ 
+     g_signal_connect(login_entry, "activate", G_CALLBACK(on_entry_activate), NULL);
+ 
+-    sessions = (GtkWidget*)gtk_builder_get_object(builder, "sessions");
+-    gtk_widget_set_name(sessions, "sessions");
+-    fix_combobox_entry(sessions);
+-    load_sessions();
+-
+-    w = (GtkWidget*)gtk_builder_get_object(builder, "bottom_pane");
+-    if( g_key_file_get_integer(config, "display", "bottom_pane", 0) )
++    if( g_key_file_get_integer(config, "display", "bottom_pane", 0)==1)
+     {
+         /* hacks to let GtkEventBox paintable with gtk pixmap engine. */
++        w = (GtkWidget*)gtk_builder_get_object(builder, "bottom_pane");
++        if(g_key_file_get_integer(config, "display", "transparent_pane", 0)==1)
++		{
++		}
++        else
++		{
+ #if GTK_CHECK_VERSION(2,18,0)
+-        if(gtk_widget_get_app_paintable(w))
++			if(gtk_widget_get_app_paintable(w))
+ #else
+-        if(GTK_WIDGET_APP_PAINTABLE(w))
++			if(GTK_WIDGET_APP_PAINTABLE(w))
+ #endif
+ 
+ #if GTK_CHECK_VERSION(3,0,0)
+-		g_signal_connect(w,"draw",G_CALLBACK(on_evt_box_draw),NULL);
++				g_signal_connect(w,"draw",G_CALLBACK(on_evt_box_draw),NULL);
+ #else
+-		g_signal_connect(w, "expose-event", G_CALLBACK(on_evt_box_expose), NULL);
++				g_signal_connect(w, "expose-event", G_CALLBACK(on_evt_box_expose), NULL);
+ #endif
++		}
++        if( g_key_file_get_integer(config, "display", "hide_sessions", 0)==1)
++        {
++            w = (GtkWidget*)gtk_builder_get_object(builder, "sessions_box");
++            if(w) gtk_widget_hide(w);
++		}
++		else
++		{
++			sessions = (GtkWidget*)gtk_builder_get_object(builder, "sessions");
++			gtk_widget_set_name(sessions, "sessions");
++			fix_combobox_entry(sessions);
++			load_sessions();
++		}
++
++		if( g_key_file_get_integer(config, "display", "lang", 0) == 0 )
++		{
++			w = (GtkWidget*)gtk_builder_get_object(builder, "lang_box");
++			if(w) gtk_widget_hide(w);
++		}
++		else
++		{
++			lang = (GtkWidget*)gtk_builder_get_object(builder, "lang");
++			gtk_widget_set_name(lang, "lang");
++			fix_combobox_entry(lang);
++			load_langs();
++		}
++
++		if(g_key_file_get_integer(config, "display", "keyboard", 0)==1)
++		{
++			w=(GtkWidget*)gtk_builder_get_object(builder, "keyboard");
++			if((load_keyboards(w))!=FALSE)
++			{
++				fix_combobox_entry(w);
++				gtk_widget_show(w);
++				w=(GtkWidget*)gtk_builder_get_object(builder, "label_keyboard");
++				if(w) gtk_widget_show(w);
++			}
++		}
+     }
+     else
+-        gtk_event_box_set_visible_window(GTK_EVENT_BOX(w), FALSE);
+-
+-    if( g_key_file_get_integer(config, "display", "lang", 0) == 0 )
+     {
+-        w = (GtkWidget*)gtk_builder_get_object(builder, "lang_box");
+-        if( w )
+-            gtk_widget_hide(w);
++    	w = (GtkWidget*)gtk_builder_get_object(builder, "bottom_pane");
++	gtk_widget_hide(w);
+     }
+-    else
++
++    if(g_key_file_get_integer(config, "display", "hide_time", 0)==1)
+     {
+-        lang = (GtkWidget*)gtk_builder_get_object(builder, "lang");
+-        gtk_widget_set_name(lang, "lang");
+-        fix_combobox_entry(lang);
+-        load_langs();
++        w = (GtkWidget*)gtk_builder_get_object(builder, "time");
++        gtk_widget_hide(w);
+     }
+-    
+-    if(g_key_file_get_integer(config, "display", "keyboard", 0)==1)
++    else
+     {
+-		w=(GtkWidget*)gtk_builder_get_object(builder, "keyboard");
+-		if((load_keyboards(w))!=FALSE)
+-		{
+-			fix_combobox_entry(w);
+-			gtk_widget_show(w);
+-			w=(GtkWidget*)gtk_builder_get_object(builder, "label_keyboard");
+-			if(w) gtk_widget_show(w);
+-		}
+-	}
+-
+ 	if( (w = (GtkWidget*)gtk_builder_get_object(builder, "time"))!=NULL )
+ 	{
+ 		guint timeout = g_timeout_add(1000, (GSourceFunc)on_timeout, w);
+@@ -1093,14 +1234,22 @@ static void create_win()
+ 			G_CALLBACK(g_source_remove), GUINT_TO_POINTER(timeout));
+ 		on_timeout((GtkLabel*)w);
+ 	}
++    }
+ 
+-	exit_btn = (GtkWidget*)gtk_builder_get_object(builder, "exit");
+-	load_exit();
++    if(g_key_file_get_integer(config, "display", "hide_exit", 0)==1)
++    {
++		w=(GtkWidget*)gtk_builder_get_object(builder, "exit");
++        gtk_widget_hide(w);
++    }
++    else
++    {
++		exit_btn = (GtkWidget*)gtk_builder_get_object(builder, "exit");
++		load_exit();
++    }
+ 
+ 	ui_get_geometry(window,&rc);
+ 	gtk_window_move(GTK_WINDOW(win),rc.x,rc.y);
+ 	gtk_window_set_default_size(GTK_WINDOW(win),rc.width,rc.height);
+-	ui_set_bg(window,config);
+ 
+ 	if(user_list && !g_key_file_get_integer(config,"userlist","disable",NULL) && 
+ 			load_user_list(user_list))
+@@ -1111,7 +1260,10 @@ static void create_win()
+ 	{
+ 		if(user_list)
+ 		{
+-			gtk_widget_hide(user_list);
++			if(user_list_scrolled)
++				gtk_widget_hide(user_list_scrolled);
++			else
++				gtk_widget_hide(user_list);
+ 			user_list=NULL;
+ 		}
+ 	}
+@@ -1119,6 +1271,8 @@ static void create_win()
+ 	ui_add_cursor();
+ 	ui_set_cursor(gtk_widget_get_window(win),GDK_LEFT_PTR);
+ 	gtk_widget_show(win);
++	ui_set_bg(window,config);
++	
+ 	ui_set_focus(window);
+ 	if(!user_list)
+ 		gtk_widget_grab_focus(login_entry);
+@@ -1142,29 +1296,11 @@ static gboolean on_lxdm_command(GIOChannel *source, GIOCondition condition, gpoi
+ 	gtk_main_quit();
+ 	else if( !strncmp(str, "reset", 5) )
+ 	{
+-		if(user)
+-		{
+-			g_free(user);
+-			user=NULL;
+-		}
+-		if(pass)
+-		{
+-			g_free(pass);
+-			pass=NULL;
+-		}
+-		gtk_label_set_text( GTK_LABEL(prompt), _("User:"));
+-		gtk_widget_show(prompt);
+-		if(user_list)
+-		{
+-			gtk_widget_hide(login_entry);
+-			gtk_widget_show(user_list);
+-			gtk_widget_grab_focus(user_list);
+-		}
+-		else
+-		{
+-			gtk_widget_show(login_entry);
+-			gtk_widget_grab_focus(login_entry);
+-		}
++		switch_to_input_user();
++	}
++	else if( !strncmp(str, "password", 8))
++	{
++		switch_to_input_passwd();
+ 	}
+ 	g_free(str);
+ 	return TRUE;
+diff --git a/src/lxcom.c b/src/lxcom.c
+index 02763eb..eef3d1b 100644
+--- a/src/lxcom.c
++++ b/src/lxcom.c
+@@ -89,7 +89,7 @@ static gboolean lxcom_prepare (GSource *source,gint *timeout)
+ 
+ static gboolean lxcom_check(GSource *source)
+ {
+-	return TRUE;
++	return (((LXComSource*)source)->poll.revents&G_IO_IN)?TRUE:FALSE;
+ }
+ 
+ static gboolean lxcom_dispatch (GSource *source,GSourceFunc callback,gpointer user_data)
+@@ -272,6 +272,7 @@ void lxcom_init(const char *sock)
+ 
+ 	s->poll.fd=self_server_fd;
+ 	s->poll.events=G_IO_IN;
++	s->poll.revents=0;
+ 	g_source_add_poll((GSource*)s,&s->poll);	
+ 	self_source_id=g_source_attach((GSource*)s,NULL);
+ 
+diff --git a/src/lxcommon.h b/src/lxcommon.h
+new file mode 100644
+index 0000000..24a6c38
+--- /dev/null
++++ b/src/lxcommon.h
+@@ -0,0 +1,7 @@
++#ifndef _LXCOMMON_H_
++#define _LXCOMMON_H_
++
++#define VCONFIG_FILE 		"/var/lib/lxdm/lxdm.conf"
++
++#endif /*_LXCOMMON_H_*/
++
+diff --git a/src/lxdm.c b/src/lxdm.c
+index 5c279af..8ac8478 100644
+--- a/src/lxdm.c
++++ b/src/lxdm.c
+@@ -24,9 +24,6 @@
+ #ifdef HAVE_CONFIG_H
+ #include <config.h>
+ #endif
+-#ifndef HAVE_LIBPAM
+-#define HAVE_LIBPAM 0
+-#endif
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -58,17 +55,27 @@
+ #include <utmpx.h>
+ #endif
+ 
+-#if HAVE_LIBPAM
+-#include <security/pam_appl.h>
+-#endif
+-
+ #if HAVE_LIBCK_CONNECTOR
+ #include <ck-connector.h>
+ #endif
+ 
++#ifndef HAVE_LIBPAM
++#ifdef USE_PAM
++#define HAVE_LIBPAM 1
++#else
++#define HAVE_LIBPAM 0
++#endif
++#endif
++
++#if HAVE_LIBPAM
++#include <security/pam_appl.h>
++#endif
++
+ #include "lxdm.h"
+ #include "lxcom.h"
+ #include "xconn.h"
++#include "lxcommon.h"
++#include "auth.h"
+ 
+ #define LOGFILE "/var/log/lxdm.log"
+ 
+@@ -82,9 +89,7 @@ typedef struct{
+ 	int display;
+ 	char *option;	/* hold option in config file */
+ 	xconn_t dpy;	/* hold this, or X crack */
+-#if HAVE_LIBPAM
+-	pam_handle_t *pamh;
+-#endif
++	LXDM_AUTH auth;
+ #if HAVE_LIBCK_CONNECTOR
+ 	CkConnector *ckc;
+ #endif
+@@ -96,6 +101,7 @@ typedef struct{
+ 
+ GKeyFile *config;
+ static int old_tty=1,def_tty = 7,nr_tty=0;
++static int def_display=0;
+ static GSList *session_list;
+ 
+ static void lxdm_startx(LXSession *s);
+@@ -128,7 +134,7 @@ static void set_active_vt(int vt)
+ 	if( fd < 0 )
+ 		fd = 0;
+ 	ioctl(fd, VT_ACTIVATE, vt);
+-	if( fd != 0 )
++	if(fd!=0)
+ 		close(fd);
+ }
+ 
+@@ -142,28 +148,19 @@ void stop_pid(int pid)
+     {
+         if( kill(pid, SIGTERM) )
+             kill(pid, SIGKILL);
+-        while( 1 )
+-        {
+-            int wpid, status;
+-            wpid = waitpid(pid,&status,0);
+-            if(wpid<0 || pid == wpid)
+-            	break;
+-        }
+     }
+-    while( waitpid(-1, 0, WNOHANG) > 0 ) ;
+-}
++    while( 1 )
++    {
++        int wpid, status;
++        wpid = waitpid(pid,&status,0);
++        if(pid == wpid)
++            break;
++	if(wpid<0 && errno!=EINTR)
++		break;
++    }
+ 
+-#if HAVE_LIBPAM
+-static void close_pam_session(pam_handle_t *pamh)
+-{
+-    int err;
+-    if( !pamh ) return;
+-    err = pam_close_session(pamh, 0);
+-    //err=pam_setcred(pamh, PAM_DELETE_CRED);
+-    pam_end(pamh, err);
+-    pamh = NULL;
++    while( waitpid(-1, 0, WNOHANG) > 0 ) ;
+ }
+-#endif
+ 
+ static LXSession *lxsession_find_greeter(void)
+ {
+@@ -271,7 +268,7 @@ static int lxsession_alloc_tty(void)
+ static int lxsession_alloc_display(void)
+ {
+ 	int i;
+-	for(i=0;i<11;i++)
++	for(i=def_display;i<11;i++)
+ 	{
+ 		if(!display_is_used(i))
+ 			return i;
+@@ -299,6 +296,7 @@ static LXSession *lxsession_add(void)
+ 		return NULL;
+ 	}
+ 	s->env=NULL;
++	lxdm_auth_init(&s->auth);
+ 	session_list=g_slist_prepend(session_list,s);
+ 	lxdm_startx(s);
+ 	return s;
+@@ -354,10 +352,7 @@ static void lxsession_stop(LXSession *s)
+ 	{
+ 		xconn_clean(s->dpy);
+ 	}
+-#if HAVE_LIBPAM
+-	close_pam_session(s->pamh);
+-	s->pamh=NULL;
+-#endif
++	lxdm_auth_session_end(&s->auth);
+ #if HAVE_LIBCK_CONNECTOR
+ 	if( s->ckc != NULL )
+ 	{
+@@ -427,6 +422,7 @@ static char *lxsession_xserver_command(LXSession *s)
+ 	int arc;
+ 	char **arg;
+ 	int i;
++	int novtswitch=0;
+ 	
+ 	if(s->option)
+ 	{
+@@ -462,12 +458,16 @@ static char *lxsession_xserver_command(LXSession *s)
+ 			g_free(arg[i]);
+ 			arc--;memcpy(arg+i,arg+i+1,(arc-i)*sizeof(char*));
+ 		}
++		else if(!strcmp(p,"-novtswitch"))
++		{
++			novtswitch=1;
++		}
+ 		else
+ 		{
+ 			i++;
+ 		}
+ 	}
+-printf("arc %d\n",arc);
++
+ 	arg = g_renew(char *, arg, arc + 10);
+ 	if(nr_tty)
+ 	{
+@@ -477,8 +477,15 @@ printf("arc %d\n",arc);
+ 	arg[arc++] = g_strdup_printf(":%d",s->display);
+ 	if(s->tty>0)
+ 		arg[arc++] = g_strdup_printf("vt%02d", s->tty);
+-	arg[arc++] = g_strdup("-nolisten");
+-	arg[arc++] = g_strdup("tcp");
++	if(g_key_file_get_integer(config,"server","tcp_listen",0)!=1)
++	{
++		arg[arc++] = g_strdup("-nolisten");
++		arg[arc++] = g_strdup("tcp");
++	}
++	if(!novtswitch)
++	{
++		arg[arc++] = g_strdup("-novtswitch");
++	}
+ 	arg[arc] = NULL;
+ 	p=g_strjoinv(" ", arg);
+ 	g_strfreev(arg);
+@@ -518,15 +525,17 @@ void lxdm_get_tty(void)
+ 		{
+ 			nr_tty=1;
+ 		}
++		else if(p[0]==':' && isdigit(p[1]))
++		{
++			def_display=atoi(p+1);
++		}
+ 	}
+ 	if(!gotvtarg)
+ 	{
+ 		/* support plymouth */
+-		nr_tty = g_file_test("/var/spool/gdm/force-display-on-active-vt", G_FILE_TEST_EXISTS);
+-		if( nr_tty || g_key_file_get_integer(config, "server", "active_vt", 0) )
++		if(g_key_file_get_integer(config, "server", "active_vt", 0) )
+ 			/* use the active vt */
+ 			def_tty = old_tty;
+-		if( nr_tty ) unlink("/var/spool/gdm/force-display-on-active-vt");
+ 		if(plymouth)
+ 		{
+ 			nr_tty=1;
+@@ -550,13 +559,13 @@ void lxdm_quit_self(int code)
+ static void log_init(void)
+ {
+ 	int fd_log;
+-
+ 	g_unlink(LOGFILE ".old");
+ 	g_rename(LOGFILE, LOGFILE ".old");
+ 	fd_log = open(LOGFILE, O_CREAT|O_APPEND|O_TRUNC|O_WRONLY|O_EXCL, 0640);
+ 	if(fd_log == -1) return;
+ 	dup2(fd_log, 1);
+ 	dup2(fd_log, 2);
++	close(fd_log);
+ }
+ 
+ static void log_ignore(const gchar *log_domain, GLogLevelFlags log_level,
+@@ -647,6 +656,19 @@ static void replace_env(char** env, const char* name, const char* new_val)
+     *(penv + 1) = NULL;
+ }
+ 
++static const char *get_env(char **env, const char *name)
++{
++	register char** penv;
++    for(penv = env; *penv; ++penv)
++    {
++        if(g_str_has_prefix(*penv, name))
++        {
++            return *penv+strlen(name);
++        }
++    }
++    return NULL;
++}
++
+ #ifndef DISABLE_XAUTH
+ 
+ static inline void xauth_write_uint16(int fd,uint16_t data)
+@@ -665,15 +687,20 @@ static inline void xauth_write_string(int fd,const char *s)
+ 	write(fd,s,len);
+ }
+ 
+-static void xauth_write_file(const char *file,char data[16])
++static void xauth_write_file(const char *file,int dpy,char data[16])
+ {
+ 	int fd;
++	char addr[128];
++	char buf[16];
++	
++	sprintf(buf,"%d",dpy);
++	gethostname(addr,sizeof(addr));
+ 	
+ 	fd=open(file,O_CREAT|O_TRUNC|O_WRONLY,0600);
+ 	if(!fd==-1) return;
+-	xauth_write_uint16(fd,252);		//FamilyLocalHost
+-	xauth_write_string(fd,"");
+-	xauth_write_string(fd,"");
++	xauth_write_uint16(fd,256);		//FamilyLocalHost
++	xauth_write_string(fd,addr);
++	xauth_write_string(fd,buf);
+ 	xauth_write_string(fd,"MIT-MAGIC-COOKIE-1");
+ 	xauth_write_uint16(fd,16);
+ 	write(fd,data,16);
+@@ -695,139 +722,55 @@ static void create_server_auth(LXSession *s)
+ 
+ 	authfile = g_strdup_printf("/var/run/lxdm/lxdm-:%d.auth",s->display);
+ 
+-	setenv("XAUTHORITY",authfile,1);
++	//setenv("XAUTHORITY",authfile,1);
+ 	remove(authfile);
+-	xauth_write_file(authfile,s->mcookie);
++	xauth_write_file(authfile,s->display,s->mcookie);
+ 	g_free(authfile);
+ }
+ 
+-static void create_client_auth(char *home,char **env)
++static void create_client_auth(struct passwd *pw,char **env)
+ {
+ 	LXSession *s;
+ 	char *authfile;
+-	uid_t user;
+-	char *path;
+ 	
+-	if((user=getuid())== 0 ) /* root don't need it */
++	if(pw->pw_uid==0) /* root don't need it */
+ 		return;
+         
+-	s=lxsession_find_user(user);
++	s=lxsession_find_user(pw->pw_uid);
+ 	if(!s)
+ 		return;
+-
+-	path=g_key_file_get_string(config,"base","xauth_path",NULL);
+-	if(path)
++	
++	/* pam_mktemp may provide XAUTHORITY to DM, just use it */
++	if((authfile=(char*)get_env(env,"XAUTHORITY="))!=NULL)
+ 	{
+-		authfile = g_strdup_printf("%s/.Xauth%d", path,getuid());
+-		g_free(path);
++		authfile=g_strdup(authfile);
+ 	}
+ 	else
+ 	{
+-		authfile = g_strdup_printf("%s/.Xauthority", home);
++		char *path;
++		path=g_key_file_get_string(config,"base","xauth_path",NULL);
++		if(path)
++		{
++			authfile = g_strdup_printf("%s/.Xauth%d", path,pw->pw_uid);
++			g_free(path);
++		}
++		else
++		{
++			authfile = g_strdup_printf("%s/.Xauthority", pw->pw_dir);
++		}
+ 	}
+ 	remove(authfile);
+-	xauth_write_file(authfile,s->mcookie);
++	xauth_write_file(authfile,s->display,s->mcookie);
+ 	replace_env(env,"XAUTHORITY=",authfile);
++	chown(authfile,pw->pw_uid,pw->pw_gid);
+ 	g_free(authfile);
+ }
+ #endif
+ 
+-#if HAVE_LIBPAM
+-static char *user_pass[2];
+-
+-static int do_conv(int num, const struct pam_message **msg,struct pam_response **resp, void *arg)
++int lxdm_auth_user(int type,char *user, char *pass, struct passwd **ppw)
+ {
+-	int result = PAM_SUCCESS;
+-	int i;
+-	*resp = (struct pam_response *) calloc(num, sizeof(struct pam_response));
+-	for(i=0;i<num;i++)
+-	{
+-		//printf("MSG: %d %s\n",msg[i]->msg_style,msg[i]->msg);
+-		switch(msg[i]->msg_style){
+-		case PAM_PROMPT_ECHO_ON:
+-			resp[i]->resp=strdup(user_pass[0]?user_pass[0]:"");
+-			break;
+-		case PAM_PROMPT_ECHO_OFF:
+-			resp[i]->resp=strdup(user_pass[1]?user_pass[1]:"");
+-			break;
+-		case PAM_ERROR_MSG:
+-		case PAM_TEXT_INFO:
+-			//printf("PAM: %s\n",msg[i]->msg);
+-			break;
+-		default:
+-			break;
+-		}
+-	}
+-	return result;
+-}
+-
+-static struct pam_conv conv={.conv=do_conv,.appdata_ptr=user_pass};
+-#endif
+-
+-int lxdm_auth_user(char *user, char *pass, struct passwd **ppw)
+-{
+-    struct passwd *pw;
+-#if !HAVE_LIBPAM
+-    struct spwd *sp;
+-    char *real;
+-    char *enc;
+-#endif
+-    if( !user )
+-    {
+-        g_debug("user==NULL\n");
+-        return AUTH_ERROR;
+-    }
+-    if( !user[0] )
+-    {
+-        g_debug("user[0]==0\n");
+-        return AUTH_BAD_USER;
+-    }
+-    pw = getpwnam(user);
+-    endpwent();
+-    if( !pw )
+-    {
+-        g_debug("user %s not found\n",user);
+-        return AUTH_BAD_USER;
+-    }
+-    if( !pass )
+-    {
+-        *ppw = pw;
+-        g_debug("user %s auth ok\n",user);
+-        return AUTH_SUCCESS;
+-    }
+-    if(strstr(pw->pw_shell, "nologin"))
+-    {
+-        g_debug("user %s have nologin shell\n",user);
+-        return AUTH_PRIV;
+-    }
+-#if !HAVE_LIBPAM
+-    sp = getspnam(user);
+-    if( !sp )
+-        return AUTH_FAIL;
+-    endspent();
+-    real = sp->sp_pwdp;
+-    if( !real || !real[0] )
+-    {
+-        if( !pass[0] )
+-        {
+-            *ppw = pw;
+-            g_debug("user %s auth with no password ok\n",user);
+-            return AUTH_SUCCESS;
+-        }
+-        else
+-        {
+-            g_debug("user %s password not match\n",user);
+-            return AUTH_FAIL;
+-        }
+-    }
+-    enc = crypt(pass, real);
+-    if( strcmp(real, enc) )
+-    {
+-        g_debug("user %s password not match\n",user);
+-        return AUTH_FAIL;
+-    }
+-#else
+     LXSession *s;
++    int ret;
+     s=lxsession_find_greeter();
+     if(!s) s=lxsession_find_idle();
+     if(!s) s=lxsession_add();
+@@ -836,97 +779,12 @@ int lxdm_auth_user(char *user, char *pass, struct passwd **ppw)
+         g_critical("lxsession_add fail\n");
+         exit(0);
+     }
+-	if(s->pamh) pam_end(s->pamh,0);
+-	if(PAM_SUCCESS != pam_start("lxdm", pw->pw_name, &conv, &s->pamh))
+-	{
+-		s->pamh=NULL;
+-		g_debug("user %s start pam fail\n",user);
+-		return AUTH_FAIL;
+-	}
+-	else
+-	{
+-		int ret;
+-		user_pass[0]=user;user_pass[1]=pass;
+-		ret=pam_authenticate(s->pamh,PAM_SILENT);
+-		user_pass[0]=0;user_pass[1]=0;
+-		if(ret!=PAM_SUCCESS)
+-		{
+-			g_debug("user %s auth fail with %d\n",user,ret);
+-			return AUTH_FAIL;
+-		}
+-		ret=pam_acct_mgmt(s->pamh,PAM_SILENT);
+-		if(ret!=PAM_SUCCESS)
+-		{
+-			g_debug("user %s acct mgmt fail with %d\n",user,ret);
+-			return AUTH_FAIL;
+-		}
+-		//ret=pam_setcred(s->pamh, PAM_ESTABLISH_CRED);
+-	}
+-#endif
+-    *ppw = pw;
+-    g_debug("user %s auth ok\n",pw->pw_name);
+-    return AUTH_SUCCESS;
++	ret=lxdm_auth_user_authenticate(&s->auth,user,pass,type);
++	if(ret==AUTH_SUCCESS)
++		*ppw=&s->auth.pw;
++	return ret;
+ }
+ 
+-#if HAVE_LIBPAM
+-void setup_pam_session(LXSession *s,struct passwd *pw,char *session_name)
+-{
+-    int err;
+-    char x[256];
+- 
+-    if(!s->pamh && PAM_SUCCESS != pam_start("lxdm", pw->pw_name, &conv, &s->pamh))
+-    {
+-        s->pamh = NULL;
+-        return;
+-    }
+-    if(!s->pamh) return;
+-    sprintf(x, "tty%d", s->tty);
+-    pam_set_item(s->pamh, PAM_TTY, x);
+-#ifdef PAM_XDISPLAY
+-    pam_set_item(s->pamh, PAM_XDISPLAY, getenv("DISPLAY") );
+-#endif
+-
+-    if(session_name && session_name[0])
+-    {
+-        char *env;
+-        env = g_strdup_printf ("DESKTOP_SESSION=%s", session_name);
+-        pam_putenv (s->pamh, env);
+-        g_free (env);
+-    }
+-    err = pam_open_session(s->pamh, 0); /* FIXME pam session failed */
+-    if( err != PAM_SUCCESS )
+-        g_warning( "pam open session error \"%s\"\n", pam_strerror(s->pamh, err));
+-}
+-
+-void append_pam_environ(pam_handle_t *pamh,char **env)
+-{
+-	int i,j,n;
+-	char **penv;
+-	if(!pamh) return;
+-	penv=pam_getenvlist(pamh);
+-	if(!penv) return;
+-	for(i=0;penv[i]!=NULL;i++)
+-	{
+-		//printf("PAM %s\n",penv[i]);
+-		n=strcspn(penv[i],"=")+1;
+-		for(j=0;env[j]!=NULL;j++)
+-		{
+-			if(!strncmp(penv[i],env[j],n))
+-				break;
+-			if(env[j+1]==NULL)
+-			{
+-				env[j+1]=g_strdup(penv[i]);
+-				env[j+2]=NULL;
+-				break;
+-			}
+-		}
+-		free(penv[i]);
+-	}
+-	free(penv);
+-}
+-
+-#endif
+-
+ static void close_left_fds(void)
+ {
+ 	struct dirent **list;
+@@ -945,9 +803,15 @@ static void close_left_fds(void)
+ 		close(fd);
+ 	}
+ 	free(list);
++	
++	int fd = open("/dev/null", O_WRONLY);
++	if(fd == -1) return;
++	dup2(fd, 1);
++	dup2(fd, 2);
++	close(fd);
+ }
+ 
+-void switch_user(struct passwd *pw, char *run, char **env)
++void switch_user(struct passwd *pw, const char *run, char **env)
+ {
+     int fd;
+     
+@@ -968,9 +832,6 @@ void switch_user(struct passwd *pw, char *run, char **env)
+         dup2(fd,STDERR_FILENO);
+         close(fd);
+     }
+-#ifndef DISABLE_XAUTH
+-    create_client_auth(pw->pw_dir,env);
+-#endif
+ 
+ 	/* reset signal */
+ 	signal(SIGCHLD, SIG_DFL);
+@@ -1114,7 +975,7 @@ void lxdm_startx(LXSession *s)
+ 	g_strfreev(args);
+ 	lxcom_add_child_watch(s->server, on_xserver_stop, s);
+ 
+-	g_message("add xserver watch\n");
++	g_message("%ld: add xserver watch\n",time(NULL));
+ 	for( i = 0; i < 100; i++ )
+ 	{
+ 		if(lxcom_last_sig==SIGINT || lxcom_last_sig==SIGTERM)
+@@ -1124,6 +985,7 @@ void lxdm_startx(LXSession *s)
+ 		g_usleep(50 * 1000);
+ 		//g_message("retry %d\n",i);
+ 	}
++	g_message("%ld: start xserver in %d retry",time(NULL),i);
+ 	if(s->dpy==NULL)
+ 		exit(EXIT_FAILURE);
+ 	
+@@ -1200,6 +1062,11 @@ static void on_session_stop(void *data,int pid, int status)
+ 	{
+ 		lxsession_free(s);
+ 	}
++	else if(g_key_file_get_integer(config,"server","reset",NULL)==1)
++	{
++		lxsession_free(s);
++		lxsession_greeter();
++	}
+ 	gchar *argv[] = { "/etc/lxdm/PostLogout", NULL };
+ 	g_spawn_async(NULL, argv, s->env, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL);
+ }
+@@ -1212,7 +1079,7 @@ gboolean lxdm_get_session_info(char *session,char **pname,char **pexec)
+ 		name=g_key_file_get_string(config, "base", "session", 0);
+ 		if(!name && getenv("PREFERRED"))
+ 			name = g_strdup(getenv("PREFERRED"));
+-		if(!session && getenv("DESKTOP"))
++		if(!name && getenv("DESKTOP"))
+ 			name = g_strdup(getenv("DESKTOP"));
+ 		if(!name) name=g_strdup("LXDE");
+ 	}
+@@ -1291,7 +1158,7 @@ static void lxdm_save_login(char *session,char *lang)
+ 		lang="";
+ 	var=g_key_file_new();
+ 	g_key_file_set_list_separator(var, ' ');
+-	g_key_file_load_from_file(var,"/var/lib/lxdm/lxdm.conf",0,NULL);
++	g_key_file_load_from_file(var,VCONFIG_FILE,0,NULL);
+ 	old=g_key_file_get_string(var,"base","last_session",0);
+ 	if(0!=g_strcmp0(old,session))
+ 	{
+@@ -1343,7 +1210,7 @@ static void lxdm_save_login(char *session,char *lang)
+         char* data = g_key_file_to_data(var, &len, NULL);
+ 		mkdir("/var/lib/lxdm",0755);
+ 		chmod("/var/lib/lxdm",0755);
+-        g_file_set_contents("/var/lib/lxdm/lxdm.conf", data, len, NULL);
++        g_file_set_contents(VCONFIG_FILE, data, len, NULL);
+         g_free(data);
+ 	}
+ 	g_key_file_free(var);
+@@ -1357,6 +1224,8 @@ void lxdm_do_login(struct passwd *pw, char *session, char *lang, char *option)
+ 	LXSession *s,*prev;
+ 	
+ 	lxdm_save_login(session,lang);
++	if(!strcmp(session,"__default__"))
++		session=NULL;
+ 
+ 	if(!session ||!session[0] || !lang || !lang[0])
+ 	{
+@@ -1423,12 +1292,10 @@ void lxdm_do_login(struct passwd *pw, char *session, char *lang, char *option)
+ 		s->ckc=NULL;
+ 	}
+ #endif
+-#if HAVE_LIBPAM
+-	setup_pam_session(s,pw,session_name);
+-#endif
++	lxdm_auth_session_begin(&s->auth,session_name,s->tty,s->display,s->mcookie);
+ #if HAVE_LIBCK_CONNECTOR
+ #if HAVE_LIBPAM
+-	if(!s->ckc && (!s->pamh || !pam_getenv(s->pamh,"XDG_SESSION_COOKIE")))
++	if(!s->ckc && (!s->auth.handle || !pam_getenv(s->auth.handle,"XDG_SESSION_COOKIE")))
+ #else
+ 	if(!s->ckc)
+ #endif
+@@ -1451,9 +1318,20 @@ void lxdm_do_login(struct passwd *pw, char *session, char *lang, char *option)
+ 							  "x11-display", &n,
+ 							  "is-local",&is_local,
+ 							  NULL))
+-		setenv("XDG_SESSION_COOKIE", ck_connector_get_cookie(s->ckc), 1);
++		{
++			setenv("XDG_SESSION_COOKIE", ck_connector_get_cookie(s->ckc), 1);
++		}
++		else
++		{
++			g_message("create ConsoleKit session fail\n");
++		}
++	}
++	else
++	{
++		g_message("create ConsoleKit connector fail\n");
+ 	}
+ #endif
++
+ 	char** env, *path;
+ 	int n_env,i;
+ 	n_env  = g_strv_length(environ);
+@@ -1483,17 +1361,22 @@ void lxdm_do_login(struct passwd *pw, char *session, char *lang, char *option)
+ 		replace_env(env, "LANGUAGE=", lang);
+ 	}
+ 	s->env = env;
++	
++#ifndef DISABLE_XAUTH
++	create_client_auth(pw,env);
++#endif
+ 
+-	s->child = pid = fork();
++	/*s->child = pid = fork();
+ 	if(s->child==0)
+ 	{
+-#if HAVE_LIBPAM
+-		append_pam_environ(s->pamh,env);
+-		pam_end(s->pamh,0);
+-#endif
++		env=lxdm_auth_append_env(&s->auth,env);
++		lxdm_auth_clean_for_child(&s->auth);
+ 		switch_user(pw, session_exec, env);
+ 		lxdm_quit_self(4);
+-	}
++	}*/
++	
++	s->child = pid = lxdm_auth_session_run(&s->auth,session_exec,env);
++	
+ 	g_free(session_name);
+ 	g_free(session_exec);
+ 	if(alloc_session)
+@@ -1519,7 +1402,7 @@ void lxdm_do_shutdown(void)
+ 	char *cmd;
+ 	cmd = g_key_file_get_string(config, "cmd", "shutdown", 0);
+ 	if( !cmd ) cmd = g_strdup("shutdown -h now");
+-	g_spawn_command_line_sync("/etc/lxdm/PreReboot",0,0,0,0);
++	g_spawn_command_line_sync("/etc/lxdm/PreShutdown",0,0,0,0);
+ 	g_spawn_command_line_async(cmd,0);
+ 	g_free(cmd);
+ 	lxdm_quit_self(0);
+@@ -1548,10 +1431,30 @@ int lxdm_do_auto_login(void)
+ 	if(count==1)
+ 		pass = g_key_file_get_string(config, "base", "password", 0);
+ 	#endif
++
++	/* get defaults from last login */
++	GKeyFile *var_config = g_key_file_new();
++	g_key_file_set_list_separator(var_config, ' ');
++	g_key_file_load_from_file(var_config,VCONFIG_FILE,G_KEY_FILE_KEEP_COMMENTS, NULL);
++
++	char* last_session = g_key_file_get_string(var_config, "base", "last_session", NULL);
++	if(last_session != NULL && last_session[0] == 0)
++	{
++		g_free(last_session);
++		last_session = NULL;
++	}
++
++	char* last_lang = g_key_file_get_string(var_config, "base", "last_lang", NULL);
++
++	g_key_file_free(var_config);
++
+ 	for(i=0;i<count;i++)
+ 	{
+ 		char *user,*session=NULL,*lang=NULL,*option=NULL;
+ 		p=users[i];
++		/* autologin users starting with '@' get own config section with
++		 * user=, session= and lang= entry
++		 */
+ 		if(p[0]=='@')	
+ 		{
+ 			option=p+1;
+@@ -1559,11 +1462,16 @@ int lxdm_do_auto_login(void)
+ 			session=g_key_file_get_string(config,option,"session",0);
+ 			lang=g_key_file_get_string(config,option,"lang",0);
+ 		}
++		/* autologin users not starting with '@' get user, session, lang section
++                 * from last login
++                 */
+ 		else
+ 		{
+ 			user=g_strdup(p);
++			session=g_strdup(last_session);
++			lang=g_strdup(last_lang);
+ 		}
+-		ret=lxdm_auth_user(user, pass, &pw);
++		ret=lxdm_auth_user(AUTH_TYPE_AUTO_LOGIN, user, pass, &pw);
+ 		if(ret==AUTH_SUCCESS)
+ 		{
+ 			lxdm_do_login(pw,session,lang,option);
+@@ -1571,9 +1479,11 @@ int lxdm_do_auto_login(void)
+ 		}
+ 		g_free(user);g_free(session);g_free(lang);
+ 	}
++	g_free(last_lang);
++	g_free(last_session);
+ 	g_strfreev(users);
+ 	g_free(pass);
+-	return success;;
++	return success;
+ }
+ 
+ static void log_sigsegv(void)
+@@ -1677,8 +1587,23 @@ GKeyFile *lxdm_user_list(void)
+ 	g_key_file_set_comment(kf,NULL,NULL,"lxdm user list",NULL);
+ 	while((pw=getpwent())!=NULL)
+ 	{
++		char *valid_shell;
++		gboolean ret;
++	
+ 		if(strstr(pw->pw_shell, "nologin"))
+ 			continue;
++
++		ret = FALSE;
++		setusershell();
++		while ((valid_shell = getusershell()) != NULL) {
++			if (g_strcmp0 (pw->pw_shell, valid_shell) != 0)
++				continue;
++			ret = TRUE;
++		}
++		endusershell();
++		if(!ret)
++			continue;
++
+ 		if(strncmp(pw->pw_dir,"/home/",6))
+ 		{
+ 			if(!strv_find(white,pw->pw_name))
+@@ -1780,21 +1705,21 @@ int main(int arc, char *arg[])
+ 			return res?0:-1;
+ 		}
+ 	}
+-	if( getuid() != 0 )
++	if(getuid() != 0)
+ 	{
+ 		fprintf(stderr, "only root is allowed to use this program\n");
+ 		exit(EXIT_FAILURE);
+ 	}
+ 
+-	if( daemonmode )
++	if(daemonmode)
+ 	{
+ 		(void)daemon(1, 1);
+ 	}
+ 	log_init();
+ 
+-	if( debugmode )
++	if(!debugmode)
+ 	{
+-		/* turn of debug output */
++		/* turn off debug output */
+ 		g_log_set_handler(NULL, G_LOG_LEVEL_DEBUG, log_ignore, NULL);
+ 	}
+ 
+@@ -1832,3 +1757,4 @@ int main(int arc, char *arg[])
+ 
+ 	return 0;
+ }
++
+diff --git a/src/lxdm.h b/src/lxdm.h
+index 4c79ca3..568573f 100644
+--- a/src/lxdm.h
++++ b/src/lxdm.h
+@@ -29,11 +29,12 @@ G_BEGIN_DECLS
+ 
+ extern GKeyFile *config;
+ 
+-int lxdm_auth_user(char *user,char *pass,struct passwd **ppw);
++int lxdm_auth_user(int type,char *user,char *pass,struct passwd **ppw);
+ void lxdm_do_login(struct passwd *pw,char *session,char *lang,char *option);
+ void lxdm_do_reboot(void);
+ void lxdm_do_shutdown(void);
+ int lxdm_do_auto_login(void);
++void lxdm_quit_self(int code);
+ 
+ enum AuthResult
+ {
+diff --git a/src/pam.c b/src/pam.c
+new file mode 100644
+index 0000000..810e44f
+--- /dev/null
++++ b/src/pam.c
+@@ -0,0 +1,578 @@
++/*
++ *      lxdm.c - main entry of lxdm
++ *
++ *      Copyright 2009 dgod <dgod.osa@gmail.com>
++ *
++ *      This program is free software; you can redistribute it and/or modify
++ *      it under the terms of the GNU General Public License as published by
++ *      the Free Software Foundation; either version 3 of the License, or
++ *      (at your option) any later version.
++ *
++ *      This program is distributed in the hope that it will be useful,
++ *      but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *      GNU General Public License for more details.
++ *
++ *      You should have received a copy of the GNU General Public License
++ *      along with this program; if not, write to the Free Software
++ *      Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
++ *      MA 02110-1301, USA.
++ */
++
++#define _GNU_SOURCE
++
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++#ifndef HAVE_LIBPAM
++#ifdef USE_PAM
++#define HAVE_LIBPAM 1
++#else
++#define HAVE_LIBPAM 0
++#endif
++#endif
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <stdarg.h>
++#include <unistd.h>
++#include <fcntl.h>
++#include <dirent.h>
++#include <errno.h>
++#include <poll.h>
++
++#include <pwd.h>
++#include <grp.h>
++#include <shadow.h>
++
++#include <glib.h>
++
++#include "lxdm.h"
++#include "auth.h"
++
++static void passwd_copy(struct passwd *dst,struct passwd *src)
++{
++	dst->pw_name=g_strdup(src->pw_name);
++	dst->pw_uid=src->pw_uid;
++	dst->pw_gid=src->pw_gid;
++	if(src->pw_gecos)
++		dst->pw_gecos=g_strdup(src->pw_gecos);
++	dst->pw_dir=g_strdup(src->pw_dir);
++	dst->pw_shell=g_strdup(src->pw_shell);
++}
++
++static void passwd_clean(struct passwd *pw)
++{
++	g_free(pw->pw_name);
++	g_free(pw->pw_gecos);
++	g_free(pw->pw_dir);
++	g_free(pw->pw_shell);
++	memset(pw,0,sizeof(*pw));
++}
++
++#if !HAVE_LIBPAM
++
++int lxdm_auth_init(LXDM_AUTH *a)
++{
++	memset(a,0m,sizeof(*a));
++	return 0;
++}
++
++int lxdm_auth_cleanup(LXDM_AUTH *a)
++{
++	passwd_clean(&a->pw);
++	return 0;
++}
++
++int lxdm_auth_user_authenticate(LXDM_AUTH *a,const char *user,const char *pass,int type)
++{
++	struct passwd *pw;
++	struct spwd *sp;
++    char *real;
++    char *enc;
++	if(!user || !user[0])
++	{
++		g_debug("user==NULL\n");
++		return AUTH_ERROR;
++	}
++	pw = getpwnam(user);
++	endpwent();
++	if(!pw)
++	{
++		g_debug("user %s not found\n",user);
++		return AUTH_BAD_USER;
++	}
++	if(strstr(pw->pw_shell, "nologin"))
++    {
++        g_debug("user %s have nologin shell\n",user);
++        return AUTH_PRIV;
++    }
++    if(type==AUTH_TYPE_AUTO_LOGIN && !pass)
++    {
++		goto out;
++	}
++    sp = getspnam(user);
++    if( !sp )
++    {
++		return AUTH_FAIL;
++	}
++    endspent();
++    real = sp->sp_pwdp;
++    if( !real || !real[0] )
++    {
++        if( !pass || !pass[0] )
++        {
++            *ppw = pw;
++            g_debug("user %s auth with no password ok\n",user);
++            return AUTH_SUCCESS;
++        }
++        else
++        {
++            g_debug("user %s password not match\n",user);
++            return AUTH_FAIL;
++        }
++    }
++    enc = crypt(pass, real);
++    if( strcmp(real, enc) )
++    {
++        g_debug("user %s password not match\n",user);
++        return AUTH_FAIL;
++    }
++    g_debug("user %s auth ok\n",pw->pw_name);
++	passwd_copy(&a->pw,pw);
++    return AUTH_SUCCESS;
++}
++
++int lxdm_auth_session_begin(LXDM_AUTH *a,int tty,int display,char mcookie[16])
++{
++	return 0;
++}
++
++int lxdm_auth_session_end(LXDM_AUTH *a)
++{
++	return 0;
++}
++
++int lxdm_auth_clean_for_child(LXDM_AUTH *a)
++{
++	return 0;
++}
++
++void lxdm_auth_print_env(LXDM_AUTH *a)
++{
++}
++
++#else
++
++#include <security/pam_appl.h>
++
++static char *user_pass[2];
++
++static int do_conv(int num, const struct pam_message **msg,struct pam_response **resp, void *arg)
++{
++	int result = PAM_SUCCESS;
++	int i;
++	*resp = (struct pam_response *) calloc(num, sizeof(struct pam_response));
++	for(i=0;i<num;i++)
++	{
++		//printf("MSG: %d %s\n",msg[i]->msg_style,msg[i]->msg);
++		switch(msg[i]->msg_style){
++		case PAM_PROMPT_ECHO_ON:
++			resp[i]->resp=strdup(user_pass[0]?user_pass[0]:"");
++			break;
++		case PAM_PROMPT_ECHO_OFF:
++			//resp[i]->resp=strdup(user_pass[1]?user_pass[1]:"");
++			resp[i]->resp=user_pass[1]?strdup(user_pass[1]):NULL;
++			break;
++		case PAM_ERROR_MSG:
++		case PAM_TEXT_INFO:
++			//printf("PAM: %s\n",msg[i]->msg);
++			break;
++		default:
++			break;
++		}
++	}
++	return result;
++}
++
++static struct pam_conv conv={.conv=do_conv,.appdata_ptr=user_pass};
++
++int lxdm_auth_init(LXDM_AUTH *a)
++{
++	memset(a,0,sizeof(*a));
++	return 0;
++}
++
++int lxdm_auth_cleanup(LXDM_AUTH *a)
++{
++	passwd_clean(&a->pw);
++	return 0;
++}
++
++int lxdm_auth_user_authenticate(LXDM_AUTH *a,const char *user,const char *pass,int type)
++{
++	struct passwd *pw;
++	if(!user || !user[0])
++	{
++		g_debug("user==NULL\n");
++		return AUTH_ERROR;
++	}
++	pw = getpwnam(user);
++	endpwent();
++	if(!pw)
++	{
++		g_debug("user %s not found\n",user);
++		return AUTH_BAD_USER;
++	}
++	if(strstr(pw->pw_shell, "nologin"))
++	{
++		g_debug("user %s have nologin shell\n",user);
++		return AUTH_PRIV;
++	}
++	if(a->handle) pam_end(a->handle,0);
++	if(PAM_SUCCESS != pam_start("lxdm", pw->pw_name, &conv, (pam_handle_t**)&a->handle))
++	{
++		a->handle=NULL;
++		g_debug("user %s start pam fail\n",user);
++		return AUTH_FAIL;
++	}
++	else
++	{
++		int ret;
++		if(type==AUTH_TYPE_AUTO_LOGIN && !pass)
++			goto out;
++		user_pass[0]=(char*)user;user_pass[1]=(char*)pass;
++		ret=pam_authenticate(a->handle,PAM_SILENT);
++		user_pass[0]=0;user_pass[1]=0;
++		if(ret!=PAM_SUCCESS)
++		{
++			g_debug("user %s auth fail with %d\n",user,ret);
++			return AUTH_FAIL;
++		}
++		ret=pam_acct_mgmt(a->handle,PAM_SILENT);
++		if(ret!=PAM_SUCCESS)
++		{
++			g_debug("user %s acct mgmt fail with %d\n",user,ret);
++			return AUTH_FAIL;
++		}
++	}
++out:
++	passwd_copy(&a->pw,pw);
++	return AUTH_SUCCESS;
++}
++
++int lxdm_auth_session_begin(LXDM_AUTH *a,const char *name,int tty,int display,char mcookie[16])
++{
++	int err;
++	char x[256];
++	
++	if(!a->handle)
++	{
++		return -1;
++	}
++	sprintf(x, "tty%d", tty);
++	pam_set_item(a->handle, PAM_TTY, x);
++#ifdef PAM_XDISPLAY
++	sprintf(x,":%d",display);
++	pam_set_item(a->handle, PAM_XDISPLAY, x);
++#endif
++#if !defined(DISABLE_XAUTH) && defined(PAM_XAUTHDATA)
++	struct pam_xauth_data value;
++	value.name="MIT-MAGIC-COOKIE-1";
++	value.namelen=18;
++	value.data=mcookie;
++	value.datalen=16;
++	pam_set_item (a->handle, PAM_XAUTHDATA, &value);
++#endif
++	if(name && name[0])
++	{
++		char *env;
++		env = g_strdup_printf ("DESKTOP_SESSION=%s", name);
++		pam_putenv (a->handle, env);
++		g_free (env);
++	}
++	err = pam_open_session(a->handle, 0); /* FIXME pam session failed */
++	if( err != PAM_SUCCESS )
++		g_warning( "pam open session error \"%s\"\n", pam_strerror(a->handle, err));
++	return 0;
++}
++
++int lxdm_auth_session_end(LXDM_AUTH *a)
++{
++	int err;
++	if(!a->handle)
++		return 0;
++	err = pam_close_session(a->handle, 0);
++	pam_end(a->handle, err);
++	a->handle = NULL;
++	passwd_clean(&a->pw);
++	return 0;
++}
++
++int lxdm_auth_clean_for_child(LXDM_AUTH *a)
++{
++	pam_end(a->handle,0);
++	return 0;
++}
++
++void lxdm_auth_print_env(LXDM_AUTH *a)
++{
++	int i;
++	char **penv;
++	if(!a->handle) return;
++	penv=pam_getenvlist(a->handle);
++	if(!penv) return;
++	for(i=0;penv[i]!=NULL;i++)
++	{
++		if(i!=0) printf(" ");
++		printf("%s",penv[i]);
++	}
++	free(penv);
++}
++
++void lxdm_auth_put_env(LXDM_AUTH *a)
++{
++	int i;
++	char **penv;
++
++	if(!a->handle) return;
++	penv=pam_getenvlist(a->handle);
++	if(!penv) return;
++	for(i=0;penv[i]!=NULL;i++)
++	{
++		if(i!=0) printf(" ");
++		if(0!=putenv(penv[i]))
++			perror("putenv");
++	}
++	free(penv);
++}
++
++#endif
++
++static void close_left_fds(void)
++{
++	struct dirent **list;
++	char path[256];
++	int n;
++
++	snprintf(path,sizeof(path),"/proc/%d/fd",getpid());
++	n=scandir(path,&list,0,0);
++	if(n<0) return;
++	while(n--)
++	{
++		int fd=atoi(list[n]->d_name);
++		free(list[n]);
++		if(fd<=STDERR_FILENO)
++			continue;
++		close(fd);
++	}
++	free(list);
++	
++	int fd = open("/dev/null", O_WRONLY);
++	if(fd == -1) return;
++	dup2(fd, 1);
++	dup2(fd, 2);
++	close(fd);
++}
++
++void switch_user(struct passwd *pw, const char *run, char **env)
++{
++	int fd;
++    
++	setenv("USER",pw->pw_name,1);
++	setenv("LOGNAME",pw->pw_name,1);
++	setenv("SHELL",pw->pw_shell,1);
++	setenv("HOME",pw->pw_dir,1);
++
++	g_spawn_command_line_sync ("/etc/lxdm/PreLogin",NULL,NULL,NULL,NULL);
++
++	if( !pw || initgroups(pw->pw_name, pw->pw_gid) ||
++			setgid(pw->pw_gid) || setuid(pw->pw_uid)/* || setsid() == -1 */)
++		exit(EXIT_FAILURE);
++    chdir(pw->pw_dir);
++    fd=open(".xsession-errors",O_WRONLY|O_CREAT|O_TRUNC,S_IRUSR|S_IWUSR);
++    if(fd!=-1)
++    {
++        dup2(fd,STDERR_FILENO);
++        close(fd);
++    }
++
++	/* reset signal */
++	signal(SIGCHLD, SIG_DFL);
++	signal(SIGTERM, SIG_DFL);
++	signal(SIGPIPE, SIG_DFL);
++	signal(SIGALRM, SIG_DFL);
++	signal(SIGHUP, SIG_DFL);
++	close_left_fds();
++
++	g_spawn_command_line_async ("/etc/lxdm/PostLogin",NULL);
++	execle("/etc/lxdm/Xsession", "/etc/lxdm/Xsession", run, NULL, environ);
++	perror("execle");
++	exit(EXIT_FAILURE);
++}
++
++void run_session(LXDM_AUTH *a,const char *run)
++{
++	setsid();
++	a->child=fork();
++	if(a->child==0)
++	{
++		lxdm_auth_put_env(a);
++		lxdm_auth_clean_for_child(a);
++		switch_user(&a->pw,run,NULL);
++		_exit(EXIT_FAILURE);
++	}
++}
++
++LXDM_AUTH a;
++static int session_exit=0;
++
++static int xreadline(int fd,char *buf,size_t size)
++{
++	int i;
++	for(i=0;i<size-1;i++)
++	{
++		int ret;
++		do{
++			ret=read(fd,buf+i,1);
++		}while(ret==-1 && errno==EINTR);
++		if(buf[i]==-1 || buf[i]=='\n')
++			break;
++	}
++	buf[i]=0;
++	return i;
++}
++
++int file_get_line(char *line, size_t n, FILE *fp)
++{
++	int len;
++	
++	if(session_exit)
++		return -1;
++/*	
++	if(!fgets(line,n,fp))
++		return -1;
++	len=strcspn(line,"\r\n");
++	line[len]=0;
++*/
++
++	struct pollfd fds;
++	fds.fd=fileno(fp);
++	fds.events=POLLIN;
++	poll(&fds,1,-1);
++	if(session_exit)
++		return -1;
++
++	len=xreadline(fileno(fp),line,n);
++	return len;
++}
++
++void sig_handler(int sig)
++{
++	if(sig==SIGCHLD)
++	{
++		int wpid, status;
++		while(1)
++		{
++			wpid = waitpid(-1,&status,0);
++			if(wpid==a.child)
++			{
++				session_exit=1;
++			}
++			if(wpid<0) break;
++		}
++	}
++}
++
++int main(int arc,char *arg[])
++{
++	char cmd[128];
++	int ret;
++
++	setvbuf(stdout, NULL, _IOLBF, 0 );
++	signal(SIGCHLD,sig_handler);
++	
++	lxdm_auth_init(&a);
++	while(file_get_line(cmd,sizeof(cmd),stdin)>=0)
++	{
++		//fprintf(stderr,"begin %s\n",cmd);
++		if(!strcmp(cmd,"auth"))
++		{
++			char temp[8],user[64],pass[64];
++			int type;
++			ret=file_get_line(temp,sizeof(temp),stdin);
++			if(ret<0) break;
++			type=atoi(temp);
++			ret=file_get_line(user,sizeof(user),stdin);
++			if(ret<0) break;
++			if(type==AUTH_TYPE_NORMAL)
++			{
++				ret=file_get_line(pass,sizeof(pass),stdin);
++				if(ret<0) break;
++				ret=lxdm_auth_user_authenticate(&a,user,pass,type);
++			}
++			else
++			{
++				ret=lxdm_auth_user_authenticate(&a,user,NULL,type);
++			}
++			printf("%d\n",ret);
++			if(ret==AUTH_SUCCESS)
++			{
++				printf("%d\n",a.pw.pw_uid);
++				printf("%d\n",a.pw.pw_gid);
++				printf("%s\n",a.pw.pw_gecos?:"");
++				printf("%s\n",a.pw.pw_dir);
++				printf("%s\n",a.pw.pw_shell);
++			}
++		}
++		else if(!strcmp(cmd,"begin"))
++		{
++			char name[128],tty[8],display[8],mcookie[32];
++			gsize out_len;
++			ret=file_get_line(name,sizeof(name),stdin);
++			if(ret<0) break;
++			ret=file_get_line(tty,sizeof(tty),stdin);
++			if(ret<0) break;
++			ret=file_get_line(display,sizeof(display),stdin);
++			if(ret<0) break;
++			ret=file_get_line(mcookie,sizeof(mcookie),stdin);
++			if(ret<0) break;
++			g_base64_decode_inplace(mcookie,&out_len);
++			ret=lxdm_auth_session_begin(&a,name,atoi(tty),atoi(display),mcookie);
++			printf("%d\n",ret);
++		}
++		else if(!strcmp(cmd,"end"))
++		{
++			ret=lxdm_auth_session_end(&a);
++			printf("%d\n",ret);
++		}
++		else if(!strcmp(cmd,"env"))
++		{
++			lxdm_auth_print_env(&a);
++			printf("\n");
++		}
++		else if(!strcmp(cmd,"putenv"))
++		{
++			char env[1024];
++			while(file_get_line(env,sizeof(env),stdin)>0)
++			{
++				putenv(env);
++			}
++		}
++		else if(!strcmp(cmd,"exec"))
++		{
++			char run[256];
++			if(file_get_line(run,sizeof(run),stdin)>0)
++				run_session(&a,run);
++		}
++		else if(!strcmp(cmd,"exit"))
++		{
++			break;
++		}
++		//fprintf(stderr,"end\n");
++	}
++	lxdm_auth_cleanup(&a);
++	return 0;
++}
++
+diff --git a/src/ui.c b/src/ui.c
+index 2691a03..f233589 100644
+--- a/src/ui.c
++++ b/src/ui.c
+@@ -20,8 +20,6 @@
+  */
+ 
+ 
+-#include <X11/Xlib.h>
+-
+ #include <string.h>
+ #include <poll.h>
+ #include <grp.h>
+@@ -34,6 +32,7 @@
+ 
+ #include "lxdm.h"
+ #include "lxcom.h"
++#include "auth.h"
+ 
+ static pid_t greeter = -1;
+ static int greeter_pipe[2];
+@@ -153,17 +152,22 @@ static gboolean on_greeter_input(GIOChannel *source, GIOCondition condition, gpo
+ 		char *pass = greeter_param(str, "pass");
+ 		char *session = greeter_param(str, "session");
+ 		char *lang = greeter_param(str, "lang");
+-		if( user && pass )
++		if( user/* && pass */)
+ 		{
+ 			struct passwd *pw;
+-			int ret = lxdm_auth_user(user, pass, &pw);
++			int ret = lxdm_auth_user(AUTH_TYPE_NORMAL, user, pass, &pw);
+ 			if( AUTH_SUCCESS == ret && pw != NULL )
+ 			{
+ 				ui_drop();
+ 				lxdm_do_login(pw, session, lang,NULL);
+ 			}
+ 			else
+-				xwrite(greeter_pipe[0], "reset\n", 6);
++			{
++				if(pass!=NULL)
++					xwrite(greeter_pipe[0], "reset\n", 6);
++				else
++					xwrite(greeter_pipe[0], "password\n", 9);
++			}
+ 		}
+ 		g_free(user);
+ 		g_free(pass);
+@@ -180,7 +184,7 @@ static gboolean on_greeter_input(GIOChannel *source, GIOCondition condition, gpo
+ 		if(user)
+ 		{
+ 			struct passwd *pw;
+-			int ret = lxdm_auth_user(user, pass, &pw);
++			int ret = lxdm_auth_user(AUTH_TYPE_AUTO_LOGIN, user, pass, &pw);
+ 			if( AUTH_SUCCESS == ret && pw != NULL )
+ 			{
+ 				ui_drop();
+diff --git a/systemd/Makefile.am b/systemd/Makefile.am
+new file mode 100644
+index 0000000..b568c5a
+--- /dev/null
++++ b/systemd/Makefile.am
+@@ -0,0 +1,10 @@
++NULL= 
++
++lxdm_systemddir = @systemdsystemunitdir@
++lxdm_systemd_DATA = \
++	lxdm.service \
++	$(NULL)
++
++EXTRA_DIST = \
++	$(lxdm_systemd_DATA) \
++	$(NULL)
+diff --git a/systemd/lxdm.service b/systemd/lxdm.service
+new file mode 100644
+index 0000000..bf4a0a8
+--- /dev/null
++++ b/systemd/lxdm.service
+@@ -0,0 +1,12 @@
++[Unit]
++Description=LXDE Display Manager
++Conflicts=getty@tty1.service plymouth-quit.service
++After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service
++
++[Service]
++ExecStart=/usr/sbin/lxdm
++Restart=always
++IgnoreSIGPIPE=no
++
++[Install]
++Alias=display-manager.service
diff --git a/community/lxdm/lxdm-0.4.1-Xsession-source-profile.patch b/community/lxdm/lxdm-0.4.1-Xsession-source-profile.patch
deleted file mode 100644
index 035ff0383..000000000
--- a/community/lxdm/lxdm-0.4.1-Xsession-source-profile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- data/Xsession.orig	2011-07-29 15:42:33.000000000 +0200
-+++ data/Xsession	2011-12-03 09:09:14.592876087 +0100
-@@ -9,6 +9,8 @@
- 	LXSESSION=/usr/bin/startlxde
- fi
- 
-+[ -f /etc/profile ] && . /etc/profile
-+[ -f ~/.profile ] && . ~/.profile
- [ -f /etc/xprofile ] && . /etc/xprofile
- [ -f ~/.xprofile ] && . ~/.xprofile
- 
diff --git a/community/lxdm/lxdm-0.4.1-conf.patch b/community/lxdm/lxdm-0.4.1-conf.patch
deleted file mode 100644
index 1744e557e..000000000
--- a/community/lxdm/lxdm-0.4.1-conf.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- data/lxdm.conf.orig	2011-11-01 17:57:59.208757577 +0100
-+++ data/lxdm.conf	2011-11-01 18:03:55.608741945 +0100
-@@ -27,7 +27,7 @@
- gtk_theme=Clearlooks
- 
- ## background of the greeter
--bg=/usr/share/backgrounds/default.png
-+# bg=/usr/share/backgrounds/default.png
- 
- ## if show bottom pane
- bottom_pane=1
diff --git a/community/lxdm/lxdm-0.4.1-event-check-bug.patch b/community/lxdm/lxdm-0.4.1-event-check-bug.patch
deleted file mode 100644
index cebfc6133..000000000
--- a/community/lxdm/lxdm-0.4.1-event-check-bug.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: dgod <dgod.osa@gmail.com>
-Date: Sun, 25 Dec 2011 07:23:19 +0000 (+0800)
-Subject: fix event check bug caused cpu 100%
-X-Git-Url: http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde%2Flxdm;a=commitdiff_plain;h=d4e41ecb;hp=f0951bdf736026b041001e846d2cb93f7f2852e1
-
-fix event check bug caused cpu 100%
----
-
-diff --git a/src/lxcom.c b/src/lxcom.c
-index 02763eb..18ee12e 100644
---- a/src/lxcom.c
-+++ b/src/lxcom.c
-@@ -89,7 +89,7 @@ static gboolean lxcom_prepare (GSource *source,gint *timeout)
- 
- static gboolean lxcom_check(GSource *source)
- {
--	return TRUE;
-+	return (((LXComSource*)source)->poll.revents&G_IO_IN)?TRUE:FALSE;
- }
- 
- static gboolean lxcom_dispatch (GSource *source,GSourceFunc callback,gpointer user_data)
diff --git a/community/lxdm/lxdm-0.4.1-industrial-greeter-ui.patch b/community/lxdm/lxdm-0.4.1-industrial-greeter-ui.patch
deleted file mode 100644
index a2a366809..000000000
--- a/community/lxdm/lxdm-0.4.1-industrial-greeter-ui.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- data/themes/Industrial/greeter.ui.orig	2012-05-09 23:54:03.743980613 -0300
-+++ data/themes/Industrial/greeter.ui	2012-05-10 00:26:20.340687396 -0300
-@@ -201,7 +201,9 @@
-                   </packing>
-                 </child>
-                 <child>
--                  <object class="GtkComboBoxEntry" id="keyboard"/>
-+                  <object class="GtkComboBoxEntry" id="keyboard">
-+                    <property name="text_column">0</property>
-+                  </object>
-                   <packing>
-                     <property name="expand">False</property>
-                     <property name="position">3</property>
diff --git a/community/lxdm/lxdm-0.4.1-kill_user_processes.patch b/community/lxdm/lxdm-0.4.1-kill_user_processes.patch
deleted file mode 100644
index f267b105a..000000000
--- a/community/lxdm/lxdm-0.4.1-kill_user_processes.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -aur lxdm/src/xconn.c lxdm.modified/src/xconn.c
---- lxdm/src/xconn.c	2012-12-23 19:27:04.512531088 -0800
-+++ lxdm/src/xconn.c	2012-12-23 19:28:31.659227448 -0800
-@@ -172,7 +172,7 @@
- 	free(c);
- }
- 
--#if 0
-+//#if 0
- static xcb_window_t xconn_get_root(xconn_t c)
- {
- 	const xcb_setup_t *setup;
-@@ -181,11 +181,11 @@
- 	xcb_screen_t *screen = iter.data;
- 	return screen->root;
- }
--#endif
-+//#endif
- 
- void xconn_clean(xconn_t c)
- {
--#if 0
-+//#if 0
- 	xcb_query_tree_cookie_t wintree;
- 	xcb_query_tree_reply_t *rep;
- 	xcb_window_t *children;
-@@ -202,7 +202,7 @@
- 		xcb_kill_client(c->c,children[i]);
- 	free(rep);
- 	xcb_flush(c->c);
--#endif
-+//#endif
- }
- 
- #endif
diff --git a/community/lxdm/lxdm-0.4.1-modern-systems.patch b/community/lxdm/lxdm-0.4.1-modern-systems.patch
deleted file mode 100644
index a703a386d..000000000
--- a/community/lxdm/lxdm-0.4.1-modern-systems.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- data/lxdm.orig	2010-01-24 16:58:42.262866825 -0200
-+++ data/lxdm	2010-01-19 11:56:34.308668692 -0200
-@@ -1,21 +1,13 @@
- #!/bin/sh
-
--[ -f /etc/sysconfig/i18n ] && . /etc/sysconfig/i18n
--
--if [ -z "$LANG" -a -e /etc/sysconfig/language ]; then
--	. /etc/sysconfig/language
--	if [ -n "$RC_LANG"]; then
--		LANG=$RC_LANG
--	fi
-+if [ -r /etc/profile.d/locale.sh ]; then
-+	. /etc/profile.d/locale.sh
- fi
-
- if [ -n "$LANG" ]; then
- 	export LANG
- fi
-
--[ -f /etc/sysconfig/desktop ] && . /etc/sysconfig/desktop
--[ -f /etc/sysconfig/windowmanager ] && . /etc/sysconfig/windowmanager
--
- if [ -n "$DEFAULT_WM" ]; then
- 	PREFERRED=$DEFAULT_WM
- fi
diff --git a/community/lxdm/lxdm-0.4.1-nolang-show-sessions.patch b/community/lxdm/lxdm-0.4.1-nolang-show-sessions.patch
deleted file mode 100644
index f3b94a57a..000000000
--- a/community/lxdm/lxdm-0.4.1-nolang-show-sessions.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/greeter.c b/src/greeter.c
-index c0c150d..1f6b88e 100644
---- a/src/greeter.c
-+++ b/src/greeter.c
-@@ -114,7 +114,7 @@ static char *get_session_exec(void)
- 	GtkTreeModel* model;
- 	GtkTreeIter it;
- 	gchar *res;
--	if(!lang)
-+	if(!sessions)
- 		return g_strdup("");
- 	
- 	if(!gtk_combo_box_get_active_iter(GTK_COMBO_BOX(sessions), &it))
diff --git a/community/lxdm/lxdm-0.4.1-pam-env-vars.patch b/community/lxdm/lxdm-0.4.1-pam-env-vars.patch
deleted file mode 100644
index ab8605ff1..000000000
--- a/community/lxdm/lxdm-0.4.1-pam-env-vars.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/src/lxdm.c b/src/lxdm.c
-index 369aedf..cd1d486 100644
---- a/src/lxdm.c
-+++ b/src/lxdm.c
-@@ -935,16 +935,23 @@ void setup_pam_session(LXSession *s,struct passwd *pw,char *session_name)
-         g_warning( "pam open session error \"%s\"\n", pam_strerror(s->pamh, err));
- }
- 
--void append_pam_environ(pam_handle_t *pamh,char **env)
-+static char **append_pam_environ(pam_handle_t *pamh,char **env)
- {
--	int i,j,n;
-+	int i,j,n,a;
- 	char **penv;
--	if(!pamh) return;
-+	if(!pamh) return env;
- 	penv=pam_getenvlist(pamh);
--	if(!penv) return;
-+	if(!penv) return env;
-+	a=g_strv_length(penv);
-+	if(a==0)
-+	{
-+		free(penv);
-+		return env;
-+	}
-+	env=g_renew(char *,env,g_strv_length(env)+1+a+10);
- 	for(i=0;penv[i]!=NULL;i++)
- 	{
--		//printf("PAM %s\n",penv[i]);
-+		fprintf(stderr,"PAM %s\n",penv[i]);
- 		n=strcspn(penv[i],"=")+1;
- 		for(j=0;env[j]!=NULL;j++)
- 		{
-@@ -960,6 +967,7 @@ void append_pam_environ(pam_handle_t *pamh,char **env)
- 		free(penv[i]);
- 	}
- 	free(penv);
-+	return env;
- }
- 
- #endif
-@@ -1540,7 +1548,7 @@ void lxdm_do_login(struct passwd *pw, char *session, char *lang, char *option)
- 	if(s->child==0)
- 	{
- #if HAVE_LIBPAM
--		append_pam_environ(s->pamh,env);
-+		env=append_pam_environ(s->pamh,env);
- 		pam_end(s->pamh,0);
- #endif
- 		switch_user(pw, session_exec, env);
diff --git a/community/lxdm/lxdm.install b/community/lxdm/lxdm.install
index 3bbb59a2e..a8bc882dc 100644
--- a/community/lxdm/lxdm.install
+++ b/community/lxdm/lxdm.install
@@ -1,22 +1,17 @@
 post_install() {
-  getent group lxdm >/dev/null && groupmod -g 121 lxdm || groupadd -g 121 lxdm
-  getent passwd lxdm >/dev/null && usermod -u 121 -g 121 lxdm || useradd -r -d /var/lib/lxdm -u 121 -g 121 lxdm
-  chown -R 121:121 /var/lib/lxdm
-  chgrp 121 /etc/lxdm/lxdm.conf
-  chmod +r /etc/lxdm/lxdm.conf
-  systemd-tmpfiles --create lxdm.conf
+  getent group lxdm > /dev/null 2>&1 && \
+    groupmod -g 121 lxdm > /dev/null 2>&1 || \
+    groupadd -g 121 lxdm
+  getent passwd lxdm > /dev/null 2>&1 && \
+    usermod -c 'Lightweight X11 Display Manager' -u 121 -g 121 -d /var/lib/lxdm -s /sbin/nologin lxdm > /dev/null 2>&1 || \
+    useradd -c 'Lightweight X11 Display Manager' -u 121 -g 121 -d /var/lib/lxdm -s /sbin/nologin lxdm
+  passwd -l lxdm > /dev/null
 }
 
 post_upgrade() {
-  post_install $1
-  if [[ $(vercmp $2 0.4.1-22) < 0 ]]; then
-    groupmod -g 121 lxdm
-    usermod -g 121 -u 121 lxdm
-  fi
+  post_install
 }
 
 post_remove() {
-  userdel -f lxdm
-  groupdel lxdm
-  true
+  getent passwd lxdm > /dev/null 2>&1 && userdel lxdm
 }
diff --git a/community/lxdm/lxdm.pam b/community/lxdm/lxdm.pam
deleted file mode 100644
index 57f33b221..000000000
--- a/community/lxdm/lxdm.pam
+++ /dev/null
@@ -1,10 +0,0 @@
-#%PAM-1.0
-auth            requisite       pam_nologin.so
-auth            required        pam_env.so
-auth            required        pam_unix.so
-account         required        pam_unix.so
-session         required        pam_limits.so
-session         required        pam_unix.so
-password        required        pam_unix.so
--session        optional        pam_loginuid.so
--session        optional        pam_systemd.so
diff --git a/community/lxdm/lxdm.service b/community/lxdm/lxdm.service
deleted file mode 100644
index 026d62b50..000000000
--- a/community/lxdm/lxdm.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=LXDE Display Manager
-After=systemd-user-sessions.service
-
-[Service]
-ExecStart=/usr/bin/lxdm
-
-[Install]
-Alias=display-manager.service
diff --git a/community/lxpanel/PKGBUILD b/community/lxpanel/PKGBUILD
index 2206d41ec..36bdde8c8 100644
--- a/community/lxpanel/PKGBUILD
+++ b/community/lxpanel/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 96687 2013-09-03 02:37:13Z bgyorgy $
+# $Id: PKGBUILD 98054 2013-10-04 17:26:39Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 
 pkgname=lxpanel
-pkgver=0.5.12
-pkgrel=2
+pkgver=0.6.1
+pkgrel=1
 pkgdesc='Lightweight X11 desktop panel for LXDE'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
@@ -14,16 +14,8 @@ groups=('lxde')
 depends=('gtk2' 'alsa-lib' 'menu-cache' 'lxmenu-data' 'libwnck')
 makedepends=('intltool' 'docbook-xml' 'docbook-xsl' 'wireless_tools')
 optdepends=('wireless_tools: netstat plugin')
-source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz
-        lxpanel-0.5.12-automake-1.14-support.patch)
-sha256sums=('c29997c522f138e4beb02fc549c84136fc840a836c1f69b400d90d2d4e91de1b'
-            'ce5bf608374188da00ce3f0a1c74d1ddebd160555db4119eebd85f64731fe1d1')
-
-prepare() {
-  cd $pkgname-$pkgver
-  patch -Np0 -i ../lxpanel-0.5.12-automake-1.14-support.patch
-  ./autogen.sh
-}
+source=(http://downloads.sourceforge.net/sourceforge/lxde/lxpanel-$pkgver.tar.gz)
+sha256sums=('a16a21b2186218c70ed98dc7875c54d6bb12ae7271825ff5060feb8d2a4e86cb')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/lz4/PKGBUILD b/community/lz4/PKGBUILD
index e305c8c70..127a04730 100644
--- a/community/lz4/PKGBUILD
+++ b/community/lz4/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 96146 2013-08-20 10:35:29Z seblu $
+# $Id: PKGBUILD 98004 2013-10-03 00:48:10Z seblu $
 # Maintainer: Sébastien Luttringer
 
 # Contacted by mail, author use svn commit as release version.
 # He only push tested release code into svn and support using revision as version
 
 pkgname=lz4
-pkgver=102
-pkgrel=2
+pkgver=106
+pkgrel=1
 pkgdesc='Very fast lossless compression algorithm'
 arch=('i686' 'x86_64')
 url='https://code.google.com/p/lz4/'
@@ -18,11 +18,12 @@ md5sums=('SKIP')
 
 build() {
   cd $pkgname
-  make
+  make lz4 lz4c
 }
 
 package() {
   cd $pkgname
+  install -Dm755 lz4 "$pkgdir/usr/bin/lz4"
   install -Dm755 lz4c "$pkgdir/usr/bin/lz4c"
   install -Dm644 cmake/pack/release_COPYING.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
diff --git a/community/mednafen/PKGBUILD b/community/mednafen/PKGBUILD
index 04b1abb13..b00f681b3 100644
--- a/community/mednafen/PKGBUILD
+++ b/community/mednafen/PKGBUILD
@@ -1,5 +1,5 @@
-# $Id: PKGBUILD 83342 2013-01-29 21:58:18Z jsteel $
-# Maintainer: Jonathan Steel <mail at jsteel dot org>
+# $Id: PKGBUILD 97157 2013-09-14 14:43:41Z jsteel $
+# Maintainer: Jonathan Steel <jsteel@aur.archlinux.org>
 # Contributor: megadriver <megadriver at gmx dot com>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Daenyth <Daenyth+Arch [at] gmail [dot] com>
@@ -7,8 +7,8 @@
 # Contributor: Hans-Kristian Arntzen <maister@archlinux.us>
 
 pkgname=mednafen
-pkgver=0.9.28
-_pkgver=0.9.28-wip
+pkgver=0.9.32
+_pkgver=$pkgver-wip
 pkgrel=1
 pkgdesc="A command-line multi-system gaming emulator"
 url="http://mednafen.sourceforge.net"
@@ -19,7 +19,7 @@ makedepends=('mesa' 'glu')
 replaces=('mednafen-wip')
 install="$pkgname.install"
 source=(http://downloads.sourceforge.net/mednafen/$pkgname-$_pkgver.tar.bz2)
-md5sums=('2b9f0be9f77a6e1b5d26093e30b24e77')
+md5sums=('ffdf4f4bb4498df38e6aaaf316be40f5')
 
 build() {
   cd "$srcdir"/$pkgname
diff --git a/community/ming/PKGBUILD b/community/ming/PKGBUILD
index 8473f04d3..2037b0efe 100644
--- a/community/ming/PKGBUILD
+++ b/community/ming/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: mar77i <mysatyre at gmail dot com>
 
 pkgname=ming
-pkgver=0.4.4
-pkgrel=2
+pkgver=0.4.5
+pkgrel=1
 pkgdesc="SWF output library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.libming.net/"
@@ -12,11 +12,10 @@ depends=('freetype2' 'libpng' 'flex')
 makedepends=('bison' 'pkg-config' 'python2')
 options=('!libtool' '!emptydirs')
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('9e780f93670eaf68b1eefa6cdfc1d1e2')
+md5sums=('73bcbcb837f3872ef1a936c539a2513c')
 
 build() {
   cd "$srcdir"/$pkgname-$pkgver/
-  sed -i -e 's/ifndef HAVE_VASPRINTF/ifdef HAVE_VASPRINTF/' util/decompile.c util/makeswf.c
   LDFLAGS="${LDFLAGS/ -Wl,--as-needed/}"
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr --enable-python
   make
@@ -26,3 +25,4 @@ package() {
   cd "$srcdir"/$pkgname-$pkgver/
   make DESTDIR="$pkgdir" install
 }
+
diff --git a/community/minitube/PKGBUILD b/community/minitube/PKGBUILD
index ed80bc65e..ce08d5b60 100644
--- a/community/minitube/PKGBUILD
+++ b/community/minitube/PKGBUILD
@@ -1,25 +1,25 @@
-# $Id: PKGBUILD 83577 2013-02-03 13:21:39Z speps $
+# $Id: PKGBUILD 97545 2013-09-23 20:44:05Z speps $
 # Maintainer : speps <speps at aur dot archlinux dot org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=minitube
-pkgver=2.0
+pkgver=2.1.3
 pkgrel=1
-pkgdesc="A native YouTube client in QT. Watch YouTube videos without Flash Player"
+pkgdesc="A native YouTube client in Qt. Watch YouTube videos without Flash Player"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://flavio.tordini.org/minitube'
-license=('GPL')
+license=('GPL3')
 depends=('phonon')
 install="$pkgname.install"
 source=("http://flavio.tordini.org/files/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('0da4cb8940034aad832e41acc52df365')
+md5sums=('b43df4358de2e170d7e22370b39bd1ec')
 
 build() {
-  cd "$srcdir/$pkgname"
-  qmake
+  cd $pkgname
+  qmake-qt4
 }
 
 package() {
-  cd "$srcdir/$pkgname"
+  cd $pkgname
   make install INSTALL_ROOT="$pkgdir/"
 }
diff --git a/community/mlt/PKGBUILD b/community/mlt/PKGBUILD
index b3770a264..83f8b024c 100644
--- a/community/mlt/PKGBUILD
+++ b/community/mlt/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96457 2013-08-29 15:10:58Z spupykin $
+# $Id: PKGBUILD 97836 2013-09-30 10:02:55Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Fabian Schoelzel <myfirstname.mylastname@googlemail.com>
 # Contributor: funkyou <spamopfer@nickname.berlin.de>
@@ -8,7 +8,7 @@
 pkgbase=mlt
 pkgname=('mlt' 'mlt-python-bindings')
 pkgver=0.9.0
-pkgrel=4
+pkgrel=5
 pkgdesc="An open source multimedia framework"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.mltframework.org"
@@ -25,7 +25,7 @@ build() {
   cd "$srcdir/mlt-$pkgver"
 
   msg "SSE2=$SSE2"
-  ./configure --prefix=/usr --disable-gtk2 \
+  ./configure --prefix=/usr \
 	--avformat-swscale \
 	--enable-gpl --enable-gpl3
   make
diff --git a/community/monit/PKGBUILD b/community/monit/PKGBUILD
index 318e5e1b9..0b7bbe9a7 100644
--- a/community/monit/PKGBUILD
+++ b/community/monit/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 92063 2013-05-31 02:32:07Z seblu $
+# $Id: PKGBUILD 97739 2013-09-28 07:54:08Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org>
 # Contributor: Marco Bartholomew <marco@marcobartholomew.com>
 
 pkgname=monit
-pkgver=5.5
-pkgrel=3
+pkgver=5.6
+pkgrel=1
 pkgdesc="Utility for managing and monitoring, processes, files, directories and devices on a *NIX system"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://mmonit.com/monit/"
@@ -15,14 +15,13 @@ backup=('etc/monitrc')
 changelog=$pkgname.changelog
 source=(http://mmonit.com/$pkgname/dist/$pkgname-$pkgver.tar.gz \
         monit.service)
-sha256sums=('8276b060b3f0e6453c9748d421dec044ddae09d3e4c4666e13472aab294d7c53'
+sha256sums=('38e09bd8b39abc59e6b9a9bb7a78f7eac2b02a92f4de1f3a6dc24e84dfedae0d'
             'cf607209e9e5d39e708152dc181525570371fab750f828e890e2b6a00b81ebc4')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
 
   ./configure --prefix=/usr
-
   make
 }
 
@@ -30,8 +29,6 @@ package() {
   cd ${srcdir}/$pkgname-$pkgver
 
   make DESTDIR=${pkgdir} install
-
   install -D -m700 monitrc ${pkgdir}/etc/monitrc
-
   install -D -m644 ${srcdir}/$pkgname.service ${pkgdir}/usr/lib/systemd/system/$pkgname.service
 }
diff --git a/community/monit/monit.changelog b/community/monit/monit.changelog
index 07cea8e3d..ddc3eac05 100644
--- a/community/monit/monit.changelog
+++ b/community/monit/monit.changelog
@@ -1,4 +1,7 @@
-2012-10-02 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+2013-09-28 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* monit 5.6-1
+
+2012-10-28 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* monit 5.5-2 systemd .service file added
 
 2012-10-02 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
diff --git a/community/mpdscribble/PKGBUILD b/community/mpdscribble/PKGBUILD
deleted file mode 100644
index 854edd47b..000000000
--- a/community/mpdscribble/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 82753 2013-01-23 20:52:45Z bpiotrowski $
-# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowwski.pl>
-# Contributor: Thomas Dziedzic < gostrc at gmail >
-# Contributor: evr <evanroman at gmail>
-# Contributor: Luiz Ribeiro <luizribeiro@gmail.com>
-
-pkgname=mpdscribble
-pkgver=0.22
-pkgrel=6
-pkgdesc='MPD client which submits track info to Last.fm'
-url='http://mpd.wikia.com/wiki/Client:Mpdscribble'
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-depends=('libsoup' 'glib2' 'libmpdclient')
-install=$pkgname.install
-source=(http://downloads.sourceforge.net/musicpd/mpdscribble-${pkgver}.tar.bz2
-        service)
-sha256sums=('1cde2b5f8c70f0e3e6f059d01bf0b0f2eac2b29fbcd14b01a8a5103e603feb41'
-            '8a6568235e8b2ac7535a6f99f4401450a4162bac0cacb938af2ec39a808e1132')
-
-build() {
-  cd mpdscribble-$pkgver
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --with-http-client=soup
-
-  make
-}
-
-package() {
-  cd mpdscribble-$pkgver
-
-  make DESTDIR="${pkgdir}" install
-
-  install -Dm644 "${srcdir}"/service \
-    "${pkgdir}"/usr/lib/systemd/system/mpdscribble.service
-
-  # default config is really an example
-  install -D -m644 "${pkgdir}"/etc/mpdscribble.conf \
-    "${pkgdir}"/usr/share/mpdscribble/mpdscribble.conf.example
-  rm -f "${pkgdir}"/etc/mpdscribble.conf
-
-  install -d "${pkgdir}"/var/cache/mpdscribble
-  touch "${pkgdir}"/var/cache/mpdscribble/mpdscribble.cache
-}
diff --git a/community/mpdscribble/mpdscribble.install b/community/mpdscribble/mpdscribble.install
deleted file mode 100644
index e7038d5d8..000000000
--- a/community/mpdscribble/mpdscribble.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
-  echo 'An example config is provided in /usr/share/mpdscribble/mpdscribble.conf.example'
-  echo
-  echo 'For system-wide config copy this file to /etc/mpdscribble.conf'
-  echo 'For per-user config copy this file to ~/.mpdscribble/mpdscribble.conf'
-}
-
-## arg 1:  the new package version
-## arg 2:  the old package version
-pre_upgrade() {
-  # removed /etc/mpdscribble.conf on FEB 19 2011
-  # only display warning for people with mpdscribble older then 0.21
-  if (( "$(vercmp 0.21-1 $2)" > 0 )) && [[ -f /etc/mpdscribble.conf ]]
-  then
-    echo "$1 is new $2 is old"
-    cp /etc/mpdscribble.conf /etc/mpdscribble.conf.oldbackup
-    echo 'The package does not provide /etc/mpdscribble.conf anymore.'
-    echo 'Copied /etc/mpdscribble.conf to /etc/mpdscribble.conf.oldbackup'
-    echo
-    echo 'The example file is now located at /etc/mpdscribble.conf.example'
-  fi
-}
diff --git a/community/mpdscribble/service b/community/mpdscribble/service
deleted file mode 100644
index 25f64d7d5..000000000
--- a/community/mpdscribble/service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=last.fm updater for MPD
-After=mpd.service
-
-[Service]
-ExecStart=/usr/bin/mpdscribble --no-daemon
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community/mplayer2/PKGBUILD b/community/mplayer2/PKGBUILD
deleted file mode 100644
index 4711ca200..000000000
--- a/community/mplayer2/PKGBUILD
+++ /dev/null
@@ -1,73 +0,0 @@
-# $Id: PKGBUILD 94896 2013-08-01 06:55:15Z bpiotrowski $
-# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
-# Contributor: Martin Panter <vadmium+aur@gmail.com>
-# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
-
-pkgname=mplayer2
-pkgver=20130428
-pkgrel=4
-pkgdesc='Advanced general-purpose media player. A fork of the original MPlayer project'
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-url='http://www.mplayer2.org/'
-install=$pkgname.install
-depends=('a52dec' 'aalib' 'cdparanoia' 'desktop-file-utils' 'enca' 'faad2' 'ffmpeg'
-         'fontconfig' 'freetype2' 'jack' 'ladspa' 'lame' 'libass' 'libbluray'
-         'libcaca' 'libcdio-paranoia' 'libdca' 'libdvdcss' 'libdvdnav' 'libdvdread'
-         'libjpeg' 'libmad' 'libpulse' 'libquvi' 'libtheora'
-         'libxinerama' 'libxss' 'libxv' 'libxxf86dga' 'libxxf86vm'
-         'mpg123' 'ncurses' 'sdl' 'ttf-dejavu' 'giflib')
-makedepends=('unzip' 'python' 'python-docutils' 'git')
-if [ "$CARCH" != "mips64el" ]; then
-  depends+=('libgl' 'libvdpau' 'lirc-utils')
-  makedepends+=('mesa' 'mesa-libgl' 'yasm')
-fi
-backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
-provides=('mplayer')
-conflicts=('mplayer')
-options=(!emptydirs)
-source=(git://git.mplayer2.org/mplayer2.git#commit=6c87a981baa
-        giflib-5.0.patch)
-sha256sums=('SKIP'
-            '20706ebb35e7c1935ae263c48d623a878db3b634ca575927913f56d9ce059c7a')
-
-pkgver() {
-  cd $pkgname
-  git log -1 --format="%cd" --date=short | sed 's|-||g'
-}
-
-prepare() {
-  cd $pkgname
-  sed 's/gmplayer/mplayer/g' -i etc/mplayer.desktop
-  find -type f -exec sed -e 's/python3/python/' -i {} \;
-  patch -Np1 -i ../giflib-5.0.patch
-}
-
-build() {
-  cd $pkgname
-
-  [ "$CARCH" != "mips64el" ] && extra="--enable-runtime-cpudetection"
-
-  ./configure --prefix=/usr --confdir=/etc/mplayer \
-              --enable-translation --language=all \
-              --enable-joystick \
-              --enable-gif \
-              --disable-speex \
-              --disable-openal \
-              --disable-libdv \
-              --disable-musepack \
-              $extra
-  make
-}
-
-package() {
-  cd $pkgname
-  make DESTDIR=$pkgdir install
-
-  install -Dm644 etc/{codecs.conf,input.conf,example.conf} $pkgdir/etc/mplayer/
-  install -dm755 $pkgdir/usr/share/mplayer/
-  ln -s /usr/share/fonts/TTF/DejaVuSans.ttf $pkgdir/usr/share/mplayer/subfont.ttf
-
-  install -dm755 $pkgdir/usr/share/applications/
-  install -m 644 etc/mplayer.desktop $pkgdir/usr/share/applications/
-}
diff --git a/community/mplayer2/giflib-5.0.patch b/community/mplayer2/giflib-5.0.patch
deleted file mode 100644
index 9eaa6e98e..000000000
--- a/community/mplayer2/giflib-5.0.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-diff --git a/libvo/vo_gif89a.c b/libvo/vo_gif89a.c
-index b808f81..c61d86c 100644
---- a/libvo/vo_gif89a.c
-+++ b/libvo/vo_gif89a.c
-@@ -196,7 +196,11 @@ static int config(uint32_t s_width, uint32_t s_height, uint32_t d_width,
- 	mp_msg(MSGT_VO, MSGL_ERR, "GIF89a: Some functionality has been disabled.\n");
- #endif
- 
-+#if GIFLIB_MAJOR > 4
-+	new_gif = EGifOpenFileName(gif_filename, 0, NULL);
-+#else
- 	new_gif = EGifOpenFileName(gif_filename, 0);
-+#endif
- 	if (new_gif == NULL) {
- 		mp_msg(MSGT_VO, MSGL_ERR, "GIF89a: error opening file \"%s\" for output.\n", gif_filename);
- 		return 1;
-@@ -215,7 +219,11 @@ static int config(uint32_t s_width, uint32_t s_height, uint32_t d_width,
- 		return 1;
- 	}
- 
-+#if GIFLIB_MAJOR > 4
-+	reduce_cmap = GifMakeMapObject(256, NULL);
-+#else
- 	reduce_cmap = MakeMapObject(256, NULL);
-+#endif
- 	if (reduce_cmap == NULL) {
- 		free(slice_data); slice_data = NULL;
- 		free(reduce_data); reduce_data = NULL;
-@@ -267,7 +275,11 @@ static int gif_reduce(int width, int height, uint8_t *src, uint8_t *dst, GifColo
- 	}
- 
- 	R = Ra; G = Ga; B = Ba;
-+#if GIFLIB_MAJOR > 4
-+	return GifQuantizeBuffer(width, height, &size, R, G, B, dst, colors);
-+#else
- 	return QuantizeBuffer(width, height, &size, R, G, B, dst, colors);
-+#endif
- }
- 
- static void flip_page(void)
-@@ -365,8 +377,11 @@ static void uninit(void)
- 	free(gif_filename);
- 	free(slice_data);
- 	free(reduce_data);
-+#if GIFLIB_MAJOR > 4
-+	if (reduce_cmap != NULL) GifFreeMapObject(reduce_cmap);
-+#else
- 	if (reduce_cmap != NULL) FreeMapObject(reduce_cmap);
--
-+#endif
- 	// set the pointers back to null.
- 	new_gif = NULL;
- 	gif_filename = NULL;
-
-diff --git a/configure b/configure
-index 95a5ae8..d9c826f 100755
---- a/configure
-+++ b/configure
-@@ -3659,6 +3659,7 @@ if test "$_gif" = auto ; then
-   _gif=no
-   for _ld_gif in "-lungif" "-lgif" ; do
-     statement_check gif_lib.h 'QuantizeBuffer(0, 0, 0, 0, 0, 0, 0, 0)' $_ld_gif && _gif=yes && break
-+    statement_check gif_lib.h 'GifQuantizeBuffer(0, 0, 0, 0, 0, 0, 0, 0)' $_ld_gif && _gif=yes && break
-   done
- fi
-
-diff --git a/libmpdemux/demux_gif.c b/libmpdemux/demux_gif.c
-index eee7a85..a764474 100644
---- a/libmpdemux/demux_gif.c
-+++ b/libmpdemux/demux_gif.c
-@@ -44,6 +44,16 @@ typedef struct {
- 
- #define GIF_SIGNATURE (('G' << 16) | ('I' << 8) | 'F')
- 
-+static void PrintGifError(errcode)
-+{
-+  char *Err = GifErrorString(errcode);
-+
-+  if (Err != NULL)
-+    fprintf(stderr, "\nGIF-LIB error: %s.\n", Err);
-+  else
-+    fprintf(stderr, "\nGIF-LIB undefined error %d.\n", errcode);
-+}
-+
- #ifndef CONFIG_GIF_TVT_HACK
- // not supported by certain versions of the library
- static int my_read_gif(GifFileType *gif, uint8_t *buf, int len)
-@@ -240,6 +250,7 @@ static demuxer_t* demux_open_gif(demuxer_t* demuxer)
-   gif_priv_t *priv = calloc(1, sizeof(gif_priv_t));
-   sh_video_t *sh_video = NULL;
-   GifFileType *gif = NULL;
-+  int GifError;
- 
-   priv->current_pts = 0;
-   demuxer->seekable = 0; // FIXME
-@@ -254,12 +265,12 @@ static demuxer_t* demux_open_gif(demuxer_t* demuxer)
-   // not read from the beginning of the file and the command will fail.
-   // with this hack enabled, you will lose the ability to stream a GIF.
-   lseek(demuxer->stream->fd, 0, SEEK_SET);
--  gif = DGifOpenFileHandle(demuxer->stream->fd);
-+  gif = DGifOpenFileHandle(demuxer->stream->fd, &GifError);
- #else
--  gif = DGifOpen(demuxer->stream, my_read_gif);
-+  gif = DGifOpen(demuxer->stream, my_read_gif, &GifError);
- #endif
-   if (!gif) {
--    PrintGifError();
-+    PrintGifError(GifError);
-     free(priv);
-     return NULL;
-   }
diff --git a/community/mpv/PKGBUILD b/community/mpv/PKGBUILD
index 87eb5686c..1b211fb4f 100644
--- a/community/mpv/PKGBUILD
+++ b/community/mpv/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 96700 2013-09-03 06:44:12Z bpiotrowski $
+# $Id: PKGBUILD 98183 2013-10-07 12:06:59Z jgc $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Eivind Uggedal <eivind@uggedal.com>
 
 pkgname=mpv
-pkgver=0.1.4
-pkgrel=4
+pkgver=0.1.7
+pkgrel=2
 pkgdesc='Video player based on MPlayer/mplayer2'
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -13,7 +13,7 @@ depends=('portaudio' 'ffmpeg' 'lcms2' 'libxinerama' 'libquvi' 'mpg123' 'libxv' '
 makedepends=('mesa' 'python-docutils')
 options=(!emptydirs)
 source=("https://github.com/mpv-player/$pkgname/archive/v$pkgver.tar.gz")
-md5sums=('7a0ff10fb0c6a2a8c176d40883eb09d4')
+md5sums=('69185e255fe6e8b6b13dcf6ea9b2fefb')
 
 build() {
   unset CFLAGS
@@ -41,7 +41,7 @@ package() {
   cd $pkgname-$pkgver
   make -j1 DESTDIR="$pkgdir" install
 
-  install -d $pkgdir/usr/share/doc/mpv/examples
+  install -d "$pkgdir"/usr/share/doc/mpv/examples
   install -m644 etc/{input,example,encoding-example-profiles}.conf \
     "$pkgdir"/usr/share/doc/mpv/examples
   install -m644 DOCS/{encoding.rst,tech-overview.txt} \
diff --git a/community/mtpaint/PKGBUILD b/community/mtpaint/PKGBUILD
index 12fa8741e..3e4f4886b 100644
--- a/community/mtpaint/PKGBUILD
+++ b/community/mtpaint/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 96739 2013-09-03 19:46:20Z arodseth $
+# $Id: PKGBUILD 96840 2013-09-06 11:15:47Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 # Contributor: yosh64 <yosh64.at.gmail.dot.com>
 
 pkgname=mtpaint
 pkgver=3.40
-pkgrel=12
+pkgrel=13
 pkgdesc='Simple paint program for creating icons and pixel based artwork'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://mtpaint.sourceforge.net/'
 license=('GPL3')
 depends=('gtk2' 'giflib' 'libjpeg' 'openjpeg' 'desktop-file-utils' 'lcms2'
-         'jasper' 'libtiff' 'libpng' 'freetype2')
-makedepends=('gtk2' 'giflib' 'libjpeg' 'openjpeg' 'lcms2' 'jasper' 'libtiff'
-             'libpng' 'freetype2')
+         'libtiff' 'libpng' 'freetype2')
+makedepends=('gtk2' 'giflib' 'libjpeg' 'openjpeg' 'lcms2' 'libtiff' 'libpng'
+             'freetype2')
 install='mtpaint.install'
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2")
 sha256sums=('ef321d2b404839c7b909bdf5283eb22a37fbdd35b4cc9e380ddc400573d7c890')
@@ -21,6 +21,10 @@ sha256sums=('ef321d2b404839c7b909bdf5283eb22a37fbdd35b4cc9e380ddc400573d7c890')
 prepare() {
   cd "$pkgname-$pkgver"
 
+  # Recommended by Mark Tyler himself
+  sed -i 's:$LIBS $LDFLAGS:$LDFLAGS $LIBS:' configure
+
+  # Needed for giflib 5. Not needed for mtpaint>3.40.
   sed -i 's:EGifOpenFileName(file_name, FALSE):EGifOpenFileName(file_name, FALSE, NULL):' src/png.c
   sed -i 's:DGifOpenFileName(file_name):DGifOpenFileName(file_name, NULL):g' src/png.c
   sed -i 's:MakeMapObject(:GifMakeMapObject(:g' src/png.c
diff --git a/community/muffin/PKGBUILD b/community/muffin/PKGBUILD
index 8d71d1522..06619942b 100644
--- a/community/muffin/PKGBUILD
+++ b/community/muffin/PKGBUILD
@@ -1,32 +1,26 @@
-# $Id: PKGBUILD 91466 2013-05-23 00:58:44Z faidoc $
+# $Id: PKGBUILD 98231 2013-10-07 17:24:18Z faidoc $
 # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
 # Contributor: Adam Hani Schakaki <adam@schakaki.net>
 # Contributor: Ner0
 
 pkgname=muffin
-pkgver=1.8.2
+pkgver=2.0.0
 pkgrel=1
 pkgdesc="Cinnamon window manager based on Mutter"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://github.com/linuxmint/muffin"
 license=('GPL')
 depends=('clutter' 'gobject-introspection' 'gsettings-desktop-schemas' \
-		 'libcanberra' 'startup-notification' 'zenity' 'dconf')
+		 'libcanberra' 'startup-notification' 'zenity' 'dconf' 'cinnamon-desktop')
 makedepends=('intltool' 'gnome-doc-utils' 'gnome-common')
 options=('!libtool' '!emptydirs')
 install=$pkgname.install
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz"
-        "switch-applications.patch")
-sha256sums=('903c6ab5e228c8a1b8e05f460ba34c111e8a92ce9382ebd0b014416af4dd7049'
-            '206eefac342b08e061c4eedfb6b9e0c96e2eae8fb9535f52f20bf50464381a96')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz")
+sha256sums=('e16efc49d7629141d0d784ca855b9276c83deee0669b7053d457e9f7676dc028')
 
 build() {
   cd ${pkgname}-${pkgver}
 
-  # Fix windows switcher keybinding with default settings in GNOME 3.8
-  patch -Np1 -i ../switch-applications.patch
-
-
   PYTHON=python2 ./autogen.sh --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/muffin \
   				 			 --localstatedir=/var --disable-static --disable-schemas-compile
   make
diff --git a/community/muffin/switch-applications.patch b/community/muffin/switch-applications.patch
deleted file mode 100644
index 61b727b57..000000000
--- a/community/muffin/switch-applications.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naur linuxmint-muffin-1ad6bd4.orig/src/core/keybindings.c linuxmint-muffin-1ad6bd4/src/core/keybindings.c
---- linuxmint-muffin-1ad6bd4.orig/src/core/keybindings.c	2013-04-15 15:53:35.000000000 +0200
-+++ linuxmint-muffin-1ad6bd4/src/core/keybindings.c	2013-04-24 18:37:54.028549911 +0200
-@@ -3774,14 +3774,14 @@
-                           handle_switch, META_TAB_LIST_GROUP);
- 
-   add_builtin_keybinding (display,
--                          "switch-windows",
-+                          "switch-applications",
-                           SCHEMA_COMMON_KEYBINDINGS,
-                           META_KEY_BINDING_REVERSES,
-                           META_KEYBINDING_ACTION_SWITCH_WINDOWS,
-                           handle_switch, META_TAB_LIST_NORMAL);
- 
-   add_builtin_keybinding (display,
--                          "switch-windows-backward",
-+                          "switch-applications-backward",
-                           SCHEMA_COMMON_KEYBINDINGS,
-                           REVERSES_AND_REVERSED,
-                           META_KEYBINDING_ACTION_SWITCH_WINDOWS_BACKWARD,
diff --git a/community/mupdf/PKGBUILD b/community/mupdf/PKGBUILD
index 4e2669b9f..ef5bb739a 100644
--- a/community/mupdf/PKGBUILD
+++ b/community/mupdf/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96533 2013-08-31 09:24:59Z bpiotrowski $
+# $Id: PKGBUILD 96830 2013-09-06 06:55:21Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
@@ -7,7 +7,7 @@
 
 pkgname=mupdf
 pkgver=1.3
-pkgrel=4
+pkgrel=5
 pkgdesc='Lightweight PDF and XPS viewer'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://mupdf.com'
@@ -44,6 +44,7 @@ package() {
   sed -i -e 's/mupdf.xpm/mupdf/' \
          -e 's/application\/x-pdf/application\/x-pdf/' \
          -e 's/mupdf-select-file/mupdf/' \
+         -e 's/^$/NoDisplay=true/' \
             mupdf.desktop
   install -Dm644 mupdf.desktop "$pkgdir"/usr/share/applications/mupdf.desktop
   install -Dm644 mupdf.xpm "$pkgdir"/usr/share/pixmaps/mupdf.xpm
diff --git a/community/musepack-tools/PKGBUILD b/community/musepack-tools/PKGBUILD
deleted file mode 100644
index 36883b709..000000000
--- a/community/musepack-tools/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 67972 2012-03-16 13:24:52Z giovanni $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Corrado Primier <bardo@aur.archlinux.org>
-# Contributor: Eric Belanger <belanger@astro.umontreal.ca>
-
-pkgname=musepack-tools
-pkgver=475
-pkgrel=2
-pkgdesc="Musepack decoder/encoder"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.musepack.net/"
-license=('LGPL')
-depends=('libcuefile' 'libreplaygain')
-makedepends=('cmake')
-source=("http://files.musepack.net/source/musepack_src_r$pkgver.tar.gz"
-        'math.patch')
-md5sums=('754d67be67f713e54baf70fcfdb2817e'
-         '9de31f07a3492c7b1db1248b055fbdc8')
-
-build() {
-  cd "$srcdir/musepack_src_r$pkgver"
-
-  #export LDFLAGS+="-lm"
-
-  patch -Np1 -i "$srcdir/math.patch"
-
-  cmake . -DCMAKE_INSTALL_PREFIX=/usr \
-          -DCMAKE_SKIP_RPATH=ON
-}
-
-package() {
-  cd "$srcdir/musepack_src_r$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  for bin in chap cut dec enc gain 2sv8; do
-    install -Dm755 mpc$bin/mpc$bin "$pkgdir/usr/bin/mpc$bin"
-  done
-
-  find ${pkgdir} -depth -type d -name .svn -exec rm -rf {} \;
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/musepack-tools/math.patch b/community/musepack-tools/math.patch
deleted file mode 100644
index 61b3d07ec..000000000
--- a/community/musepack-tools/math.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur musepack_src_r475.old/CMakeLists.txt musepack_src_r475/CMakeLists.txt
---- musepack_src_r475.old/CMakeLists.txt	2011-10-14 16:31:05.536450109 +0800
-+++ musepack_src_r475/CMakeLists.txt	2011-10-14 16:31:34.022962450 +0800
-@@ -16,7 +16,7 @@
- add_definitions(-DFAST_MATH -DCVD_FASTLOG)
- 
- if(NOT MSVC)
--  set(CMAKE_C_FLAGS "-O3 -Wall -fomit-frame-pointer -pipe")
-+  set(CMAKE_C_FLAGS "-O3 -Wall -fomit-frame-pointer -pipe -lm")
- endif(NOT MSVC)
- 
- add_subdirectory(libmpcdec)
diff --git a/community/musescore/PKGBUILD b/community/musescore/PKGBUILD
new file mode 100755
index 000000000..f2e8fe475
--- /dev/null
+++ b/community/musescore/PKGBUILD
@@ -0,0 +1,64 @@
+# $Id: PKGBUILD 97939 2013-10-01 16:51:03Z alucryd $
+# Maintainer: Maxime Gauduin <alucryd@gmail.com>
+# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
+# Contributor: Cristian Maureira <saint@archlinux.cl>
+# Contributor: Dr.Egg <rwhite@archlinux.us>
+
+pkgbase=musescore
+pkgname=('musescore' 'musescore-docs')
+pkgver=1.3
+pkgrel=5
+pkgdesc="Create, play and print beautiful sheet music"
+arch=('i686' 'x86_64')
+url="http://musescore.org/"
+license=('GPL')
+makedepends=('cmake' 'doxygen' 'portaudio' 'qtscriptgenerator' 'texlive-core')
+source=("http://downloads.sourceforge.net/mscore/mscore-${pkgver}.tar.bz2"
+        'mscore-docs.patch')
+sha256sums=('a0b60cc892ac0266c58fc6392be72c0a21c3aa7fd0b6e4f1dddad1c8b36be683'
+            'ea4c25e8998c1666103d48fb3bcb5a8d7c9601e971195ef23c2f535c1191585d')
+
+prepare() {
+  cd mscore-${pkgver}/mscore
+
+  patch -Np1 -i ../../mscore-docs.patch
+  sed 's/COMMAND lupdate/COMMAND lupdate-qt4/g
+       s/COMMAND lrelease/COMMAND lrelease-qt4/g
+       s/set(BUILD_SCRIPTGEN TRUE)/set(BUILD_SCRIPTGEN FALSE)/' -i CMakeLists.txt
+}
+
+build() {
+  cd mscore-${pkgver}/mscore
+
+  if [[ -d build ]]; then
+    rm -rf build
+  fi
+  mkdir build && cd build
+
+  cmake .. -DCMAKE_INSTALL_PREFIX='/usr'
+  make lupdate
+  make lrelease
+  make
+}
+
+package_musescore() {
+  depends=('portaudio' 'qtscriptgenerator')
+  optdepends=('musescore-docs: Documentation')
+  install="${pkgname}.install"
+
+  cd mscore-${pkgver}/mscore/build
+
+  make DESTDIR="${pkgdir}" install
+  rm -rf "${pkgdir}"/usr/share/mscore-${pkgver}/man
+}
+
+package_musescore-docs() {
+  pkgdesc="Documentation for MuseScore"
+
+  cd mscore-${pkgver}/mscore
+
+  install -dm 755 "${pkgdir}"/usr/share/doc/${pkgbase}
+  install -m 644 manual/*.pdf "${pkgdir}"/usr/share/doc/${pkgbase}/
+}
+
+# vim: ts=2 sw=2 et:
diff --git a/community/musescore/mscore-docs.patch b/community/musescore/mscore-docs.patch
new file mode 100755
index 000000000..544dffd86
--- /dev/null
+++ b/community/musescore/mscore-docs.patch
@@ -0,0 +1,21 @@
+--- a/mscore/mscore.cpp
++++ b/mscore/mscore.cpp
+@@ -919,15 +919,15 @@
+       if (debugMode)
+             printf("open handbook for language <%s>\n", qPrintable(lang));
+
+-      QFileInfo mscoreHelp(mscoreGlobalShare + QString("man/MuseScore-") + lang + QString(".pdf"));
++      QFileInfo mscoreHelp(("/usr/share/doc/musescore/MuseScore-") + lang + QString(".pdf"));
+       if (!mscoreHelp.isReadable()) {
+             if (debugMode) {
+                   printf("cannot open doc <%s>\n", qPrintable(mscoreHelp.filePath()));
+                   }
+             lang = lang.left(2);
+-            mscoreHelp.setFile(mscoreGlobalShare + QString("man/MuseScore-") + lang + QString(".pdf"));
++            mscoreHelp.setFile(("/usr/share/doc/musescore/MuseScore-") + lang + QString(".pdf"));
+             if(!mscoreHelp.isReadable()){
+-                mscoreHelp.setFile(mscoreGlobalShare + QString("man/MuseScore-en.pdf"));
++                mscoreHelp.setFile(("/usr/share/doc/musescore/MuseScore-en.pdf"));
+                 if (!mscoreHelp.isReadable()) {
+                       QString info(tr("MuseScore handbook not found at: \n"));
+                       info += mscoreHelp.filePath();
diff --git a/community/musescore/musescore.install b/community/musescore/musescore.install
new file mode 100755
index 000000000..c4f528da9
--- /dev/null
+++ b/community/musescore/musescore.install
@@ -0,0 +1,13 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
+
+# vim: ts=2 sw=2 et:
diff --git a/community/mythplugins/PKGBUILD b/community/mythplugins/PKGBUILD
index b52ba6c15..0ef3c338a 100644
--- a/community/mythplugins/PKGBUILD
+++ b/community/mythplugins/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96153 2013-08-20 11:49:57Z jconder $
+# $Id: PKGBUILD 97427 2013-09-19 14:38:19Z jconder $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
@@ -13,7 +13,7 @@ pkgname=('mythplugins-mytharchive'
          'mythplugins-mythweather'
          'mythplugins-mythweb'
          'mythplugins-mythzoneminder')
-pkgver=0.26.1
+pkgver=0.27
 pkgrel=1
 epoch=1
 arch=('i686' 'x86_64' 'mips64el')
@@ -21,28 +21,30 @@ url="http://www.mythtv.org"
 license=('GPL')
 makedepends=('cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'flac' 'libexif'
              'libvorbis' 'mesa' 'mesa-libgl' 'mplayer' 'mythtv'
-	     'perl-datetime-format-iso8601' 'perl-date-manip' 'perl-image-size'
-	     'perl-json' 'perl-libwww' 'perl-soap-lite' 'perl-xml-sax'
-	     'perl-xml-simple' 'perl-xml-xpath' 'python2-oauth' 'python-imaging'
-	     'python2-pycurl' 'taglib' 'zlib')
-source=("ftp://ftp.osuosl.org/pub/mythtv/$pkgbase-$pkgver.tar.bz2"
-        'cdparanoia.patch'
-        'php55.patch'
-        'mtd.rc')
-md5sums=('d896d9f9313ba5dd95e2e977bf9c0f8f'
-         '5de8dd79d0b8a2b006f3c3258938b6b7'
-         'a6df720ef22fe6bef8c650b1bd5948cb'
-         '476c12ba074794ad7f4ae092bdf949d6')
+             'perl-datetime-format-iso8601' 'perl-date-manip' 'perl-image-size'
+             'perl-json' 'perl-libwww' 'perl-soap-lite' 'perl-xml-sax'
+             'perl-xml-simple' 'perl-xml-xpath' 'python2-oauth' 'python-imaging'
+             'python2-pycurl' 'zlib')
+source=("mythtv-$pkgver.tar.gz::http://www.mythtv.org/download/mythtv/$pkgver"
+        "mythweb-$pkgver.tar.gz::http://www.mythtv.org/download/mythweb/$pkgver"
+	'cdparanoia.patch')
+sha256sums=('670b378e379df05a4f2ac28cc3cb2578587b42cb03710e0b230b75d692f8e2b8'
+            'fe135281c4828a96762ea22a8a4cf622988b12e7f2189dce9273f1ce7bb367d3'
+	    '004f1e4734830709d2ab5ebb804560514f2bf525abc2f11142501a81eba0754c')
+
+prepare() {
+  cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase"
 
-build() {
-  cd "$srcdir/$pkgbase-$pkgver"
   find . -name '*.py' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
+  patch -Np1 -i "$srcdir/cdparanoia.patch"
 
-  sed -re 's@/usr/local.*/usr/share@/usr/share@' -i 'mythweb/mythweb.php'
-  sed -re 's@cstdio@cstdio>\n#include <unistd.h@' -i 'mythzoneminder/mythzmserver/zmserver.cpp'
+  cd "$srcdir/mythweb-fixes-$pkgver"
 
-  patch -Np1 -i "$srcdir/cdparanoia.patch"
-  patch -Np1 -i "$srcdir/php55.patch"
+  sed -re 's@/usr/local.*/usr/share@/usr/share@' -i 'mythweb.php'
+}
+
+build() {
+  cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase"
 
   ./configure --prefix=/usr \
               --enable-all \
@@ -56,7 +58,7 @@ package_mythplugins-mytharchive() {
   depends=('cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'mythtv'
            'python-imaging')
 
-  cd "$srcdir/$pkgbase-$pkgver/mytharchive"
+  cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mytharchive"
   make INSTALL_ROOT="$pkgdir" install
 }
 
@@ -64,7 +66,7 @@ package_mythplugins-mythbrowser() {
   pkgdesc="Mini web browser for MythTV"
   depends=('mythtv')
 
-  cd "$srcdir/$pkgbase-$pkgver/mythbrowser"
+  cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythbrowser"
   make INSTALL_ROOT="$pkgdir" install
 }
 
@@ -72,7 +74,7 @@ package_mythplugins-mythgallery() {
   pkgdesc="Image gallery plugin for MythTV"
   depends=('libexif' 'mythtv')
 
-  cd "$srcdir/$pkgbase-$pkgver/mythgallery"
+  cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythgallery"
   make INSTALL_ROOT="$pkgdir" install
 }
 
@@ -80,15 +82,15 @@ package_mythplugins-mythgame() {
   pkgdesc="Game emulator plugin for MythTV"
   depends=('mythtv')
 
-  cd "$srcdir/$pkgbase-$pkgver/mythgame"
+  cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythgame"
   make INSTALL_ROOT="$pkgdir" install
 }
 
 package_mythplugins-mythmusic() {
   pkgdesc="Music playing plugin for MythTV"
-  depends=('mythtv' 'libcdio-paranoia' 'taglib')
+  depends=('mythtv' 'libcdio-paranoia')
 
-  cd "$srcdir/$pkgbase-$pkgver/mythmusic"
+  cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythmusic"
   make INSTALL_ROOT="$pkgdir" install
 }
 
@@ -96,7 +98,7 @@ package_mythplugins-mythnetvision() {
   pkgdesc="MythNetvision plugin for MythTV"
   depends=('mythtv' 'python2-oauth')
 
-  cd "$srcdir/$pkgbase-$pkgver/mythnetvision"
+  cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythnetvision"
   make INSTALL_ROOT="$pkgdir" install
 }
 
@@ -104,7 +106,7 @@ package_mythplugins-mythnews() {
   pkgdesc="News checking plugin for MythTV"
   depends=('mythtv')
 
-  cd "$srcdir/$pkgbase-$pkgver/mythnews"
+  cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythnews"
   make INSTALL_ROOT="$pkgdir" install
 }
 
@@ -114,7 +116,7 @@ package_mythplugins-mythweather() {
            'perl-xml-sax' 'perl-xml-simple' 'perl-xml-xpath' 'perl-image-size'
            'perl-datetime-format-iso8601')
 
-  cd "$srcdir/$pkgbase-$pkgver/mythweather"
+  cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythweather"
   make INSTALL_ROOT="$pkgdir" install
 }
 
@@ -126,7 +128,7 @@ package_mythplugins-mythweb() {
   install='mythplugins-mythweb.install'
 
   mkdir -p "$pkgdir/var/lib/mythtv/mythweb"/{image_cache,php_sessions}
-  cp -R "$srcdir/$pkgbase-$pkgver/mythweb"/* "$pkgdir/var/lib/mythtv/mythweb"
+  cp -R "$srcdir/mythweb-fixes-$pkgver"/* "$pkgdir/var/lib/mythtv/mythweb"
   chown -R http:http "$pkgdir/var/lib/mythtv/mythweb"
   chmod g+rw "$pkgdir/var/lib/mythtv/mythweb"/{image_cache,php_sessions}
 }
@@ -136,6 +138,6 @@ package_mythplugins-mythzoneminder() {
   depends=('mythtv')
   install='mythplugins-mythzoneminder.install'
 
-  cd "$srcdir/$pkgbase-$pkgver/mythzoneminder"
+  cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythzoneminder"
   make INSTALL_ROOT="$pkgdir" install
 }
diff --git a/community/mythplugins/mtd.rc b/community/mythplugins/mtd.rc
deleted file mode 100644
index 1f46dfed1..000000000
--- a/community/mythplugins/mtd.rc
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/mtd`
-case "$1" in
-  start)
-    stat_busy "Starting Myth Transcoding Daemon"
-    [ -z "$PID" ] && /usr/bin/mtd -d
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      echo $PID > /var/run/mtd.pid
-      add_daemon mythtranscode
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Myth Transcoding Daemon"
-    [ ! -z "$PID" ]  && kill $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon mtd 
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/mythplugins/php55.patch b/community/mythplugins/php55.patch
deleted file mode 100644
index eba7fd696..000000000
--- a/community/mythplugins/php55.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/mythweb/includes/errors.php
-+++ b/mythweb/includes/errors.php
-@@ -103,6 +103,9 @@
- /**/
-     function error_handler($errno, $errstr, $errfile, $errline, $vars) {
-         global $db;
-+    // Leave early if we haven't requested reports from this kind of error
-+        if (!($errno & error_reporting()))
-+            return;
-         if (class_exists('Translate'))
-             $errstr = Translate::find()->string($errstr);
-     // Try to auto-repair damaged SQL tables
-@@ -113,9 +116,6 @@
-             add_error('Regular Expression Error:  '.$match[1]);
-             return;
-         }
--    // Leave early if we haven't requested reports from this kind of error
--        if (!($errno & error_reporting()))
--            return;
-     // Fatal errors should report considerably more detail
-         if (in_array($errno, array(E_USER_ERROR, E_ERROR))) {
-         // What type of error?
diff --git a/community/mythtv/PKGBUILD b/community/mythtv/PKGBUILD
index f3c23c0cc..a61dbdd84 100644
--- a/community/mythtv/PKGBUILD
+++ b/community/mythtv/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96148 2013-08-20 11:25:49Z jconder $
+# $Id: PKGBUILD 97419 2013-09-19 04:04:04Z jconder $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
@@ -6,7 +6,7 @@
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=mythtv
-pkgver=0.26.1
+pkgver=0.27
 pkgrel=1
 epoch=1
 pkgdesc="A Homebrew PVR project"
@@ -14,56 +14,54 @@ arch=('i686' 'x86_64')
 url="http://www.mythtv.org/"
 license=('GPL')
 depends=('avahi' 'fftw' 'lame' 'libass' 'libavc1394' 'libcdio' 'libiec61883'
-         'libpulse' 'libva' 'libvdpau' 'libxinerama' 'lirc-utils'
-	 'mariadb-clients' 'mysql-python' 'perl-dbd-mysql' 'perl-io-socket-inet6'
-	 'perl-libwww' 'perl-net-upnp' 'python2-lxml' 'qtwebkit' 'urlgrabber'
-	 'x264')
+         'libpulse' 'libva' 'libvpx' 'libxinerama' 'lirc-utils' 'mariadb-clients'
+         'mysql-python' 'perl-dbd-mysql' 'perl-io-socket-inet6' 'perl-libwww'
+         'perl-net-upnp' 'python2-lxml' 'qtwebkit' 'taglib' 'urlgrabber' 'x264')
 makedepends=('glew' 'libcec' 'libxml2' 'mesa' 'mesa-libgl' 'openssl' 'yasm')
 optdepends=('glew: for GPU commercial flagging'
             'libcec: for consumer electronics control capabilities'
-	    'libxml2: to read blu-ray metadata'
-	    'openssl: for AirTunes (RAOP) support'
+            'libxml2: to read blu-ray metadata'
+            'openssl: for AirTunes (RAOP) support'
             'xmltv: to download tv listings')
 conflicts=('myththemes' 'mythplugins-mythvideo')
 replaces=('myththemes' 'mythplugins-mythvideo')
 backup=()
 install='mythtv.install'
-source=("ftp://ftp.osuosl.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2"
-        'alsa.patch'
-	'mythbackend.service'
-	'libva-compat.patch::https://github.com/garybuhrmaster/mythtv/commit/2add868d2f18b8b47d9747e043f052e88869bfc3.patch'
-	'http://code.mythtv.org/trac/raw-attachment/ticket/11338/libcec-2-support.patch')
-md5sums=('ef25a9b86f4a23d6f07d83791a1e5c9e'
-         'f64b8219e3d27a2edf96733b851e576b'
-         'e4d572dcc307d6d8ae26bee5aebf9f3a'
-         'ae88a16e9f42a913f395bf71af18e931'
-         '6e156c9fc0b369346d93ccafad46cba3')
+source=("http://www.$pkgname.org/download/$pkgname/$pkgver"
+        'mythbackend.service'
+        'http://code.mythtv.org/trac/raw-attachment/ticket/11338/libcec-2-support.2.patch')
+sha256sums=('670b378e379df05a4f2ac28cc3cb2578587b42cb03710e0b230b75d692f8e2b8'
+            'f628f44164ce773ae54d320fb2f65353cacf9deec16981e4e56316ac33000a2f'
+            '8270407c2074b305e0c32151f89c84f6bf980a32665a2da8e4727405fa3911f3')
+
+prepare() {
+  cd "$srcdir/$pkgname-fixes-$pkgver/$pkgname"
 
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
   find 'bindings/python' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
+  patch -Np2 -i "$srcdir/libcec-2-support.2.patch"
+}
 
-  patch -Np1 -i "$srcdir/alsa.patch"
-  patch -Np2 -i "$srcdir/libva-compat.patch"
-  patch -Np2 -i "$srcdir/libcec-2-support.patch"
+build() {
+  cd "$srcdir/$pkgname-fixes-$pkgver/$pkgname"
 
   ARCH="${CARCH/_/-}"
   ./configure --prefix=/usr \
               --cpu="$ARCH" \
-	      --disable-altivec \
-	      --disable-audio-jack \
-	      --disable-ccache \
-	      --disable-distcc \
-	      --enable-libfftw3 \
-	      --enable-libmp3lame \
-	      --enable-libx264 \
-	      --enable-vaapi \
-	      --python=python2
+              --disable-altivec \
+              --disable-audio-jack \
+              --disable-ccache \
+              --disable-distcc \
+              --enable-libfftw3 \
+              --enable-libmp3lame \
+              --enable-libvpx \
+              --enable-libx264 \
+              --enable-vaapi \
+              --python=python2
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$pkgname-fixes-$pkgver/$pkgname"
   make INSTALL_ROOT="$pkgdir" install
 
   install -D -m644 "$srcdir/mythbackend.service" "$pkgdir/usr/lib/systemd/system/mythbackend.service"
diff --git a/community/mythtv/alsa.patch b/community/mythtv/alsa.patch
deleted file mode 100644
index 07cf1c3a9..000000000
--- a/community/mythtv/alsa.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -Nru a/external/FFmpeg/libavdevice/alsa-audio-common.c b/external/FFmpeg/libavdevice/alsa-audio-common.c
---- a/external/FFmpeg/libavdevice/alsa-audio-common.c	2012-10-02 23:30:24.000000000 +1300
-+++ b/external/FFmpeg/libavdevice/alsa-audio-common.c	2013-01-09 13:23:49.704360811 +1300
-@@ -28,6 +28,7 @@
-  * @author Nicolas George ( nicolas george normalesup org )
-  */
- 
-+#include <sys/types.h>
- #include <alsa/asoundlib.h>
- #include "avdevice.h"
- #include "libavutil/avassert.h"
-diff -Nru a/external/FFmpeg/libavdevice/alsa-audio-dec.c b/external/FFmpeg/libavdevice/alsa-audio-dec.c
---- a/external/FFmpeg/libavdevice/alsa-audio-dec.c	2012-10-02 23:30:24.000000000 +1300
-+++ b/external/FFmpeg/libavdevice/alsa-audio-dec.c	2013-01-09 13:23:47.911005108 +1300
-@@ -45,6 +45,7 @@
-  * plugin.
-  */
- 
-+#include <sys/types.h>
- #include <alsa/asoundlib.h>
- #include "libavformat/internal.h"
- #include "libavutil/opt.h"
-diff -Nru a/external/FFmpeg/libavdevice/alsa-audio-enc.c b/external/FFmpeg/libavdevice/alsa-audio-enc.c
---- a/external/FFmpeg/libavdevice/alsa-audio-enc.c	2012-10-02 23:30:24.000000000 +1300
-+++ b/external/FFmpeg/libavdevice/alsa-audio-enc.c	2013-01-09 13:23:46.880992286 +1300
-@@ -37,6 +37,7 @@
-  * which gives a low latency suitable for real-time playback.
-  */
- 
-+#include <sys/types.h>
- #include <alsa/asoundlib.h>
- 
- #include "libavformat/internal.h"
-diff -Nru a/external/FFmpeg/libavdevice/alsa-audio.h b/external/FFmpeg/libavdevice/alsa-audio.h
---- a/external/FFmpeg/libavdevice/alsa-audio.h	2012-10-02 23:30:24.000000000 +1300
-+++ b/external/FFmpeg/libavdevice/alsa-audio.h	2013-01-09 13:23:51.121045145 +1300
-@@ -30,6 +30,7 @@
- #ifndef AVDEVICE_ALSA_AUDIO_H
- #define AVDEVICE_ALSA_AUDIO_H
- 
-+#include <sys/types.h>
- #include <alsa/asoundlib.h>
- #include "config.h"
- #include "libavutil/log.h"
-diff -Nru a/libs/libmyth/audio/audiooutputalsa.h b/libs/libmyth/audio/audiooutputalsa.h
---- a/libs/libmyth/audio/audiooutputalsa.h	2012-10-02 23:30:24.000000000 +1300
-+++ b/libs/libmyth/audio/audiooutputalsa.h	2013-01-09 13:22:13.313180438 +1300
-@@ -1,6 +1,7 @@
- #ifndef AUDIOOUTPUTALSA
- #define AUDIOOUTPUTALSA
- 
-+#include <sys/types.h>
- #define ALSA_PCM_NEW_HW_PARAMS_API
- #define ALSA_PCM_NEW_SW_PARAMS_API
- #include <alsa/asoundlib.h>
-diff -Nru a/libs/libmythtv/audioinputalsa.h b/libs/libmythtv/audioinputalsa.h
---- a/libs/libmythtv/audioinputalsa.h	2012-10-02 23:30:24.000000000 +1300
-+++ b/libs/libmythtv/audioinputalsa.h	2013-01-09 13:22:44.470223553 +1300
-@@ -24,6 +24,7 @@
- #include "audioinput.h"
- 
- #ifdef USING_ALSA
-+#include <sys/types.h>
- #include <alsa/asoundlib.h>
- #else
- typedef int snd_pcm_t;
diff --git a/community/nemo/PKGBUILD b/community/nemo/PKGBUILD
index 4f4700e96..99fd5d13d 100644
--- a/community/nemo/PKGBUILD
+++ b/community/nemo/PKGBUILD
@@ -1,38 +1,39 @@
-# $Id: PKGBUILD 96434 2013-08-28 19:54:26Z faidoc $
+# $Id: PKGBUILD 98197 2013-10-07 12:08:32Z jgc $
 # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
 # Contributor: Ner0
 
 pkgname=nemo
-pkgver=1.8.5
-pkgrel=1
+pkgver=2.0.0
+pkgrel=2
 pkgdesc="Cinnamon file manager (Nautilus fork)"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://github.com/linuxmint/nemo"
 license=('GPL')
 depends=('libexif' 'gvfs' 'dconf' 'desktop-file-utils' 'exempi' 'python2'
-         'gnome-desktop' 'gnome-icon-theme' 'libnotify' 'libtracker-sparql')
+         'cinnamon-desktop' 'gnome-icon-theme' 'libnotify' 'libtracker-sparql' 'libxml2'
+         'cinnamon-translations')
 makedepends=('gtk-doc' 'gobject-introspection' 'intltool' 'gnome-common')
 optdepends=('gksu: Open as Root')
 options=('!emptydirs' '!libtool')
 install=nemo.install
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver"
-        "tracker-0.16.patch"
-        "remove-desktop-background.patch")
-sha256sums=('ba43794293c66ebc31a9c4145d6e7a8326321a4f0e58b28fe4f3d56a8fe39874'
-            '2b86f486add84e3affb0b14eb84425443e7cf5e593738d10d02e9c2ac0f17626'
-            '0bd07fd931ad701442358cdcbd26e0c5d57717ffadfd39a1cba137e36def1aa5')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver")
+sha256sums=('3848d55a20134826aa6512898c78b05a953f5d2f353817e7003c1a4f6286e31c')
 
-build() {
+prepare() {
   cd linuxmint-nemo-*
 
   # Python2 fix
   sed -i 's/bin\/python/bin\/python2/g' files/usr/share/nemo/actions/myaction.py
 
-  # https://github.com/linuxmint/nemo/pull/258
-  patch -Np1 -i ../tracker-0.16.patch
+  # Fix build
+  sed -i '/AC_SUBST(DISABLE_DEPRECATED_CFLAGS)/d' configure.in
+
+  # Rename 'Files' app name to avoid having the same as nautilus
+  sed -i 's/^Name\(.*\)=.*/Name\1=Nemo/' data/nemo.desktop.in.in
+}
 
-  # https://github.com/linuxmint/nemo/pull/263
-  patch -Np1 -i ../remove-desktop-background.patch
+build() {
+  cd linuxmint-nemo-*
 
   ./autogen.sh --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
@@ -49,9 +50,6 @@ package() {
 
   make DESTDIR="$pkgdir/" install
 
-  # Rename 'Files' app name to avoid having the same as nautilus
-  sed -i 's/^Name\(.*\)=.*/Name\1=Nemo/' "$pkgdir/usr/share/applications/nemo.desktop"
-
   # Autostart only in Cinnamon to avoid conflict with GNOME Classic session
   cp "$pkgdir/etc/xdg/autostart/nemo-autostart.desktop" \
     "$pkgdir/etc/xdg/autostart/nemo-autostart2d.desktop"
diff --git a/community/nemo/remove-desktop-background.patch b/community/nemo/remove-desktop-background.patch
deleted file mode 100644
index 0301cc820..000000000
--- a/community/nemo/remove-desktop-background.patch
+++ /dev/null
@@ -1,1050 +0,0 @@
-From 5f82ebba474f6c1068a21f51ded2b0e26869ecaf Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Mon, 15 Apr 2013 18:44:35 -0400
-Subject: [PATCH 1/6] Don't render the background.  Need to fix selected icon
- style
-
----
- src/nemo-desktop-icon-view.c | 18 +++---------------
- src/nemo-desktop-window.c    | 15 ++++++++++++++-
- 2 files changed, 17 insertions(+), 16 deletions(-)
-
-diff --git a/src/nemo-desktop-icon-view.c b/src/nemo-desktop-icon-view.c
-index b903c5b..37cd8cb 100644
---- a/src/nemo-desktop-icon-view.c
-+++ b/src/nemo-desktop-icon-view.c
-@@ -243,16 +243,6 @@ struct NemoDesktopIconViewDetails
- static void
- real_begin_loading (NemoView *object)
- {
--	NemoIconContainer *icon_container;
--	NemoDesktopIconView *view;
--
--	view = NEMO_DESKTOP_ICON_VIEW (object);
--
--	icon_container = get_icon_container (view);
--	if (view->details->background == NULL) {
--		view->details->background = nemo_desktop_background_new (icon_container);
--	}
--
- 	NEMO_VIEW_CLASS (nemo_desktop_icon_view_parent_class)->begin_loading (object);
- }
- 
-@@ -298,11 +288,6 @@ struct NemoDesktopIconViewDetails
- 					      nemo_view_update_menus,
- 					      icon_view);
- 
--	if (icon_view->details->background != NULL) {
--		g_object_unref (icon_view->details->background);
--		icon_view->details->background = NULL;
--	}
--
- 	G_OBJECT_CLASS (nemo_desktop_icon_view_parent_class)->dispose (object);
- }
- 
-@@ -652,6 +637,9 @@ struct NemoDesktopIconViewDetails
- 				  G_CALLBACK (nemo_view_update_menus),
- 				  desktop_icon_view);
- 
-+    GdkRGBA transparent = { 0, 0, 0, 0 };
-+    gtk_widget_override_background_color (GTK_WIDGET (icon_container), GTK_STATE_FLAG_NORMAL, &transparent);
-+
-     have_cinnamon_settings = g_find_program_in_path ("cinnamon-settings") != NULL;
- }
- 
-diff --git a/src/nemo-desktop-window.c b/src/nemo-desktop-window.c
-index 9c80c62..2d5c4e8 100644
---- a/src/nemo-desktop-window.c
-+++ b/src/nemo-desktop-window.c
-@@ -97,6 +97,7 @@ struct NemoDesktopWindowDetails {
- 	g_signal_connect_swapped (nemo_preferences, "changed::" NEMO_PREFERENCES_DESKTOP_IS_HOME_DIR,
- 				  G_CALLBACK (nemo_desktop_window_update_directory),
- 				  window);
-+
- }
- 
- static void
-@@ -189,6 +190,12 @@ struct NemoDesktopWindowDetails {
- 	/* Chain up to realize our children */
- 	GTK_WIDGET_CLASS (nemo_desktop_window_parent_class)->map (widget);
- 	gdk_window_lower (gtk_widget_get_window (widget));
-+
-+    GdkWindow *window;
-+    GdkRGBA transparent = { 0, 0, 0, 0 };
-+
-+    window = gtk_widget_get_window (widget);
-+    gdk_window_set_background_rgba (window, &transparent);
- }
- 
- static void
-@@ -254,6 +261,7 @@ struct NemoDesktopWindowDetails {
- {
- 	NemoDesktopWindow *window;
- 	NemoDesktopWindowDetails *details;
-+    GdkVisual *visual;
- 
- 	window = NEMO_DESKTOP_WINDOW (widget);
- 	details = window->details;
-@@ -261,7 +269,12 @@ struct NemoDesktopWindowDetails {
- 	/* Make sure we get keyboard events */
- 	gtk_widget_set_events (widget, gtk_widget_get_events (widget) 
- 			      | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK);
--			      
-+
-+    visual = gdk_screen_get_rgba_visual (gtk_widget_get_screen (widget));
-+    if (visual) {
-+        gtk_widget_set_visual (widget, visual);
-+    }
-+
- 	/* Do the work of realizing. */
- 	GTK_WIDGET_CLASS (nemo_desktop_window_parent_class)->realize (widget);
- 
--- 
-1.8.1.6
-
-
-From 6b013acb8f0ad855d042d0e8d51350c539a37c21 Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Mon, 15 Apr 2013 20:03:03 -0400
-Subject: [PATCH 2/6] Remove nemo-desktop-background, the desktop window makes
- a transparent background and just uses the existing rendered background from
- muffin/g-s-d
-
----
- libnemo-private/Makefile.am               |   2 -
- libnemo-private/nemo-desktop-background.c | 578 ------------------------------
- libnemo-private/nemo-desktop-background.h |  65 ----
- src/nemo-desktop-icon-view.c              |  26 +-
- 4 files changed, 13 insertions(+), 658 deletions(-)
- delete mode 100644 libnemo-private/nemo-desktop-background.c
- delete mode 100644 libnemo-private/nemo-desktop-background.h
-
-diff --git a/libnemo-private/Makefile.am b/libnemo-private/Makefile.am
-index 3b46318..5fd797c 100644
---- a/libnemo-private/Makefile.am
-+++ b/libnemo-private/Makefile.am
-@@ -81,8 +81,6 @@ libnemo_private_la_SOURCES = \
- 	nemo-debug.h \
- 	nemo-default-file-icon.c \
- 	nemo-default-file-icon.h \
--	nemo-desktop-background.c \
--	nemo-desktop-background.h \
- 	nemo-desktop-directory-file.c \
- 	nemo-desktop-directory-file.h \
- 	nemo-desktop-directory.c \
-diff --git a/libnemo-private/nemo-desktop-background.c b/libnemo-private/nemo-desktop-background.c
-deleted file mode 100644
-index f8dc979..0000000
---- a/libnemo-private/nemo-desktop-background.c
-+++ /dev/null
-@@ -1,578 +0,0 @@
--/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
--
--/*
-- * nemo-desktop-background.c: Helper object to handle desktop background
-- *                                changes.
-- *
-- * Copyright (C) 2000 Eazel, Inc.
-- * Copyright (C) 2010 Cosimo Cecchi <cosimoc@gnome.org>
-- *
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU General Public License as
-- * published by the Free Software Foundation; either version 2 of the
-- * License, or (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public
-- * License along with this program; if not, write to the
-- * Free Software Foundation, Inc., 51 Franklin Street - Suite 500,
-- * Boston, MA 02110-1335, USA.
-- *
-- * Authors: Darin Adler <darin@bentspoon.com>
-- *          Cosimo Cecchi <cosimoc@gnome.org>
-- */
--
--#include <config.h>
--
--#include "nemo-desktop-background.h"
--
--#include <eel/eel-gdk-extensions.h>
--#include <eel/eel-gtk-extensions.h>
--
--#include "nemo-global-preferences.h"
--
--#define GNOME_DESKTOP_USE_UNSTABLE_API
--#include <libgnome-desktop/gnome-bg.h>
--#include <gdesktop-enums.h>
--
--#include <gtk/gtk.h>
--#include <string.h>
--
--static void init_fade (NemoDesktopBackground *self);
--static void free_fade (NemoDesktopBackground *self);
--static void queue_background_change (NemoDesktopBackground *self);
--
--static NemoDesktopBackground *singleton = NULL;
--
--G_DEFINE_TYPE (NemoDesktopBackground, nemo_desktop_background, G_TYPE_OBJECT);
--
--enum {
--        PROP_WIDGET = 1,
--        NUM_PROPERTIES,
--};
--
--struct NemoDesktopBackgroundDetails {
--
--	GtkWidget *widget;
--        GnomeBG *bg;
--
--	/* Realized data: */
--	cairo_surface_t *background_surface;
--	GnomeBGCrossfade *fade;
--	int background_entire_width;
--	int background_entire_height;
--	GdkColor default_color;
--
--	/* Desktop screen size watcher */
--	gulong screen_size_handler;
--	/* Desktop monitors configuration watcher */
--	gulong screen_monitors_handler;
--	guint change_idle_id;
--};
--
--
--static gboolean
--background_settings_change_event_cb (GSettings *settings,
--                                     gpointer   keys,
--                                     gint       n_keys,
--                                     gpointer   user_data);
--
--
--static void
--free_fade (NemoDesktopBackground *self)
--{
--	if (self->details->fade != NULL) {
--		g_object_unref (self->details->fade);
--		self->details->fade = NULL;
--	}
--}
--
--static void
--free_background_surface (NemoDesktopBackground *self)
--{
--	cairo_surface_t *surface;
--
--	surface = self->details->background_surface;
--	if (surface != NULL) {
--		cairo_surface_destroy (surface);
--		self->details->background_surface = NULL;
--	}
--}
--
--static void
--nemo_desktop_background_finalize (GObject *object)
--{
--	NemoDesktopBackground *self;
--
--	self = NEMO_DESKTOP_BACKGROUND (object);
--
--	g_signal_handlers_disconnect_by_func (gnome_background_preferences,
--					      background_settings_change_event_cb,
--					      self);
--
--	free_background_surface (self);
--	free_fade (self);
--
--	g_clear_object (&self->details->bg);
--
--	G_OBJECT_CLASS (nemo_desktop_background_parent_class)->finalize (object);
--}
--
--static void
--nemo_desktop_background_unrealize (NemoDesktopBackground *self)
--{
--	free_background_surface (self);
--
--	self->details->background_entire_width = 0;
--	self->details->background_entire_height = 0;
--	self->details->default_color.red = 0xffff;
--	self->details->default_color.green = 0xffff;
--	self->details->default_color.blue = 0xffff;
--}
--
--static void
--nemo_desktop_background_set_image_uri (NemoDesktopBackground *self,
--                                           const char *image_uri)
--{
--	char *filename;
--
--	if (image_uri != NULL) {
--		filename = g_filename_from_uri (image_uri, NULL, NULL);
--	}
--	else {
--		filename = NULL;
--	}
--
--	gnome_bg_set_filename (self->details->bg, filename);
--
--	g_free (filename);
--}
--
--static void
--init_fade (NemoDesktopBackground *self)
--{
--	GtkWidget *widget;
--	gboolean do_fade;
--
--	widget = self->details->widget;
--
--	if (widget == NULL || !gtk_widget_get_realized (widget))
--		return;
--
--	do_fade = g_settings_get_boolean (nemo_desktop_preferences,
--					  NEMO_PREFERENCES_DESKTOP_BACKGROUND_FADE);
--
--	if (!do_fade) {
--		return;
--	}
--
--	if (self->details->fade == NULL) {
--		GdkWindow *window;
--		GdkScreen *screen;
--		int old_width, old_height, width, height;
--
--		/* If this was the result of a screen size change,
--		 * we don't want to crossfade
--		 */
--		window = gtk_widget_get_window (widget);
--		old_width = gdk_window_get_width (window);
--		old_height = gdk_window_get_height (window);
--
--		screen = gtk_widget_get_screen (widget);
--		width = gdk_screen_get_width (screen);
--		height = gdk_screen_get_height (screen);
--
--		if (old_width == width && old_height == height) {
--			self->details->fade = gnome_bg_crossfade_new (width, height);
--			g_signal_connect_swapped (self->details->fade,
--                                                  "finished",
--                                                  G_CALLBACK (free_fade),
--                                                  self);
--		}
--	}
--
--	if (self->details->fade != NULL && !gnome_bg_crossfade_is_started (self->details->fade)) {
--		cairo_surface_t *start_surface;
--
--		if (self->details->background_surface == NULL) {
--			start_surface = gnome_bg_get_surface_from_root (gtk_widget_get_screen (widget));
--		} else {
--			start_surface = cairo_surface_reference (self->details->background_surface);
--		}
--		gnome_bg_crossfade_set_start_surface (self->details->fade,
--						      start_surface);
--                cairo_surface_destroy (start_surface);
--	}
--}
--
--static void
--screen_size_changed (GdkScreen *screen,
--                     NemoDesktopBackground *self)
--{
--	queue_background_change (self);
--}
--
--static gboolean
--nemo_desktop_background_ensure_realized (NemoDesktopBackground *self)
--{
--	int entire_width;
--	int entire_height;
--	GdkScreen *screen;
--	GdkWindow *window;
--
--	screen = gtk_widget_get_screen (self->details->widget);
--	entire_height = gdk_screen_get_height (screen);
--	entire_width = gdk_screen_get_width (screen);
--
--	/* If the window size is the same as last time, don't update */
--	if (entire_width == self->details->background_entire_width &&
--	    entire_height == self->details->background_entire_height) {
--		return FALSE;
--	}
--
--	free_background_surface (self);
--
--	window = gtk_widget_get_window (self->details->widget);
--	self->details->background_surface = gnome_bg_create_surface (self->details->bg,
--                                                                     window,
--                                                                     entire_width, entire_height,
--                                                                     TRUE);
--
--	/* We got the surface and everything, so we don't care about a change
--	   that is pending (unless things actually change after this time) */
--	g_object_set_data (G_OBJECT (self),
--			   "ignore-pending-change", GINT_TO_POINTER (TRUE));
--
--	self->details->background_entire_width = entire_width;
--	self->details->background_entire_height = entire_height;
--
--	return TRUE;
--}
--
--static void
--on_fade_finished (GnomeBGCrossfade *fade,
--		  GdkWindow *window,
--		  gpointer user_data)
--{
--        NemoDesktopBackground *self = user_data;
--
--	nemo_desktop_background_ensure_realized (self);
--	gnome_bg_set_surface_as_root (gdk_window_get_screen (window),
--                                      self->details->background_surface);
--}
--
--static gboolean
--fade_to_surface (NemoDesktopBackground *self,
--		 GdkWindow     *window,
--		 cairo_surface_t *surface)
--{
--	if (self->details->fade == NULL) {
--		return FALSE;
--	}
--
--	if (!gnome_bg_crossfade_set_end_surface (self->details->fade,
--				                 surface)) {
--		return FALSE;
--	}
--
--	if (!gnome_bg_crossfade_is_started (self->details->fade)) {
--		gnome_bg_crossfade_start (self->details->fade, window);
--		g_signal_connect (self->details->fade,
--				  "finished",
--				  G_CALLBACK (on_fade_finished), self);
--	}
--
--	return gnome_bg_crossfade_is_started (self->details->fade);
--}
--
--static void
--nemo_desktop_background_set_up_widget (NemoDesktopBackground *self)
--{
--	GdkWindow *window;
--	gboolean in_fade = FALSE;
--        GtkWidget *widget;
--
--        widget = self->details->widget;
--
--	if (!gtk_widget_get_realized (widget)) {
--		return;
--	}
--
--	nemo_desktop_background_ensure_realized (self);
--        window = gtk_layout_get_bin_window (GTK_LAYOUT (widget));
--
--	in_fade = fade_to_surface (self, window,
--				   self->details->background_surface);
--
--	if (!in_fade) {
--		cairo_pattern_t *pattern;
--
--		pattern = cairo_pattern_create_for_surface (self->details->background_surface);
--		gdk_window_set_background_pattern (window, pattern);
--		cairo_pattern_destroy (pattern);
--
--                gnome_bg_set_surface_as_root (gtk_widget_get_screen (widget),
--                                              self->details->background_surface);
--	}
--}
--
--static gboolean
--background_changed_cb (NemoDesktopBackground *self)
--{
--	self->details->change_idle_id = 0;
--
--	nemo_desktop_background_unrealize (self);
--	nemo_desktop_background_set_up_widget (self);
--
--	gtk_widget_queue_draw (self->details->widget);
--
--	return FALSE;
--}
--
--static void
--queue_background_change (NemoDesktopBackground *self)
--{
--	if (self->details->change_idle_id != 0) {
--                g_source_remove (self->details->change_idle_id);
--	}
--
--	self->details->change_idle_id =
--                g_idle_add ((GSourceFunc) background_changed_cb, self);
--}
--
--static void
--nemo_desktop_background_changed (GnomeBG *bg,
--                                     gpointer user_data)
--{
--        NemoDesktopBackground *self;
--
--        self = user_data;
--	init_fade (self);
--	queue_background_change (self);
--}
--
--static void
--nemo_desktop_background_transitioned (GnomeBG *bg,
--                                          gpointer user_data)
--{
--        NemoDesktopBackground *self;
--
--        self = user_data;
--	free_fade (self);
--	queue_background_change (self);
--}
--
--static void
--widget_realize_cb (GtkWidget *widget,
--                   gpointer user_data)
--{
--	GdkScreen *screen;
--        NemoDesktopBackground *self = user_data;
--
--	screen = gtk_widget_get_screen (widget);
--
--	if (self->details->screen_size_handler > 0) {
--		g_signal_handler_disconnect (screen,
--					     self->details->screen_size_handler);
--	}
--	self->details->screen_size_handler = 
--		g_signal_connect (screen, "size_changed",
--				  G_CALLBACK (screen_size_changed), self);
--
--	if (self->details->screen_monitors_handler > 0) {
--		g_signal_handler_disconnect (screen,
--					     self->details->screen_monitors_handler);
--	}
--	self->details->screen_monitors_handler =
--		g_signal_connect (screen, "monitors-changed",
--				  G_CALLBACK (screen_size_changed), self);
--	nemo_desktop_background_set_up_widget (self);
--}
--
--static void
--widget_unrealize_cb (GtkWidget *widget,
--                     gpointer user_data)
--{
--        NemoDesktopBackground *self = user_data;
--
--	if (self->details->screen_size_handler > 0) {
--		        g_signal_handler_disconnect (gtk_widget_get_screen (GTK_WIDGET (widget)),
--				                     self->details->screen_size_handler);
--			self->details->screen_size_handler = 0;
--	}
--	if (self->details->screen_monitors_handler > 0) {
--		        g_signal_handler_disconnect (gtk_widget_get_screen (GTK_WIDGET (widget)),
--				                     self->details->screen_monitors_handler);
--			self->details->screen_monitors_handler = 0;
--	}
--}
--
--static void
--on_widget_destroyed (GtkWidget *widget,
--                     gpointer user_data)
--{
--        NemoDesktopBackground *self = user_data;
--
--	if (self->details->change_idle_id != 0) {
--		g_source_remove (self->details->change_idle_id);
--		self->details->change_idle_id = 0;
--	}
--
--	free_fade (self);
--	self->details->widget = NULL;
--}
--
--static gboolean
--background_change_event_idle_cb (NemoDesktopBackground *self)
--{
--	gnome_bg_load_from_preferences (self->details->bg,
--					gnome_background_preferences);
--
--	g_object_unref (self);
--
--	return FALSE;
--}
--
--static gboolean
--background_settings_change_event_cb (GSettings *settings,
--                                     gpointer   keys,
--                                     gint       n_keys,
--                                     gpointer   user_data)
--{
--	NemoDesktopBackground *self = user_data;
--
--	/* Need to defer signal processing otherwise
--	 * we would make the dconf backend deadlock.
--	 */
--	g_idle_add ((GSourceFunc) background_change_event_idle_cb,
--		    g_object_ref (self));
--
--	return FALSE;
--}
--
--static void
--nemo_desktop_background_constructed (GObject *obj)
--{
--        NemoDesktopBackground *self;
--        GtkWidget *widget;
--
--        self = NEMO_DESKTOP_BACKGROUND (obj);
--
--        if (G_OBJECT_CLASS (nemo_desktop_background_parent_class)->constructed != NULL) {
--                G_OBJECT_CLASS (nemo_desktop_background_parent_class)->constructed (obj);
--        }
--
--        widget = self->details->widget;
--
--        g_assert (widget != NULL);
--
-- 	g_signal_connect_object (widget, "destroy",
--                                 G_CALLBACK (on_widget_destroyed), self, 0);
--	g_signal_connect_object (widget, "realize",
--				 G_CALLBACK (widget_realize_cb), self, 0);
--	g_signal_connect_object (widget, "unrealize",
--				 G_CALLBACK (widget_unrealize_cb), self, 0);
--
--        gnome_bg_load_from_preferences (self->details->bg,
--                                        gnome_background_preferences);
--
--        /* Let's receive batch change events instead of every single one */
--        g_signal_connect (gnome_background_preferences,
--                          "change-event",
--                          G_CALLBACK (background_settings_change_event_cb),
--                          self);
--
--	queue_background_change (self);
--}
--
--static void
--nemo_desktop_background_set_property (GObject *object,
--                                          guint property_id,
--                                          const GValue *value,
--                                          GParamSpec *pspec)
--{
--        NemoDesktopBackground *self;
--
--        self = NEMO_DESKTOP_BACKGROUND (object);
--
--        switch (property_id) {
--        case PROP_WIDGET:
--                self->details->widget = g_value_get_object (value);
--                break;
--        default:
--                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
--                break;
--        }
--}
--
--static GObject *
--nemo_desktop_background_constructor (GType type,
--                                         guint n_construct_params,
--                                         GObjectConstructParam *construct_params)
--{
--        GObject *retval;
--
--        if (singleton != NULL) {
--                return g_object_ref (singleton);
--        }
--
--        retval = G_OBJECT_CLASS (nemo_desktop_background_parent_class)->constructor
--                (type, n_construct_params, construct_params);
--
--        singleton = NEMO_DESKTOP_BACKGROUND (retval);
--        g_object_add_weak_pointer (retval, (gpointer) &singleton);
--
--        return retval;
--}
--
--static void
--nemo_desktop_background_class_init (NemoDesktopBackgroundClass *klass)
--{
--	GObjectClass *object_class;
--        GParamSpec *pspec;
--
--	object_class = G_OBJECT_CLASS (klass);
--	object_class->finalize = nemo_desktop_background_finalize;
--        object_class->set_property = nemo_desktop_background_set_property;
--        object_class->constructor = nemo_desktop_background_constructor;
--        object_class->constructed = nemo_desktop_background_constructed;
--
--        pspec = g_param_spec_object ("widget", "The widget for this background",
--                                     "The widget that gets its background set",
--                                     NEMO_TYPE_ICON_CONTAINER,
--                                     G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
--        g_object_class_install_property (object_class, PROP_WIDGET, pspec);
--
--	g_type_class_add_private (klass, sizeof (NemoDesktopBackgroundDetails));
--}
--
--static void
--nemo_desktop_background_init (NemoDesktopBackground *self)
--{
--	self->details =
--		G_TYPE_INSTANCE_GET_PRIVATE (self,
--					     NEMO_TYPE_DESKTOP_BACKGROUND,
--					     NemoDesktopBackgroundDetails);
--
--        self->details->bg = gnome_bg_new ();
--	self->details->default_color.red = 0xffff;
--	self->details->default_color.green = 0xffff;
--	self->details->default_color.blue = 0xffff;
--
--	g_signal_connect (self->details->bg, "changed",
--			  G_CALLBACK (nemo_desktop_background_changed), self);
--	g_signal_connect (self->details->bg, "transitioned",
--			  G_CALLBACK (nemo_desktop_background_transitioned), self);
--}
--
--NemoDesktopBackground *
--nemo_desktop_background_new (NemoIconContainer *container)
--{
--        return g_object_new (NEMO_TYPE_DESKTOP_BACKGROUND,
--                             "widget", container,
--                             NULL);
--}
-diff --git a/libnemo-private/nemo-desktop-background.h b/libnemo-private/nemo-desktop-background.h
-deleted file mode 100644
-index 8755cb1..0000000
---- a/libnemo-private/nemo-desktop-background.h
-+++ /dev/null
-@@ -1,65 +0,0 @@
--/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
--
--/*
-- * nemo-desktop-background.c: Helper object to handle desktop background
-- *                                changes.
-- *
-- * Copyright (C) 2000 Eazel, Inc.
-- * Copyright (C) 2010 Cosimo Cecchi <cosimoc@gnome.org>
-- *
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU General Public License as
-- * published by the Free Software Foundation; either version 2 of the
-- * License, or (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public
-- * License along with this program; if not, write to the
-- * Free Software Foundation, Inc., 51 Franklin Street - Suite 500,
-- * Boston, MA 02110-1335, USA.
-- *
-- * Authors: Darin Adler <darin@bentspoon.com>
-- *          Cosimo Cecchi <cosimoc@gnome.org>
-- */
--
--#ifndef __NAUTILIUS_DESKTOP_BACKGROUND_H__
--#define __NAUTILIUS_DESKTOP_BACKGROUND_H__
--
--#include <gtk/gtk.h>
--
--#include "nemo-icon-container.h"
--
--typedef struct NemoDesktopBackground NemoDesktopBackground;
--typedef struct NemoDesktopBackgroundClass NemoDesktopBackgroundClass;
--
--#define NEMO_TYPE_DESKTOP_BACKGROUND nemo_desktop_background_get_type()
--#define NEMO_DESKTOP_BACKGROUND(obj) \
--  (G_TYPE_CHECK_INSTANCE_CAST ((obj), NEMO_TYPE_DESKTOP_BACKGROUND, NemoDesktopBackground))
--#define NEMO_DESKTOP_BACKGROUND_CLASS(klass) \
--  (G_TYPE_CHECK_CLASS_CAST ((klass), NEMO_TYPE_DESKTOP_BACKGROUND, NemoDesktopBackgroundClass))
--#define NEMO_IS_DESKTOP_BACKGROUND(obj) \
--  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NEMO_TYPE_DESKTOP_BACKGROUND))
--#define NEMO_IS_DESKTOP_BACKGROUND_CLASS(klass) \
--  (G_TYPE_CHECK_CLASS_TYPE ((klass), NEMO_TYPE_DESKTOP_BACKGROUND))
--#define NEMO_DESKTOP_BACKGROUND_GET_CLASS(obj) \
--  (G_TYPE_INSTANCE_GET_CLASS ((obj), NEMO_TYPE_DESKTOP_BACKGROUND, NemoDesktopBackgroundClass))
--
--GType nemo_desktop_background_get_type (void);
--NemoDesktopBackground * nemo_desktop_background_new (NemoIconContainer *container);
--
--typedef struct NemoDesktopBackgroundDetails NemoDesktopBackgroundDetails;
--
--struct NemoDesktopBackground {
--	GObject parent;
--	NemoDesktopBackgroundDetails *details;
--};
--
--struct NemoDesktopBackgroundClass {
--	GObjectClass parent_class;
--};
--
--#endif /* __NAUTILIUS_DESKTOP_BACKGROUND_H__ */
-diff --git a/src/nemo-desktop-icon-view.c b/src/nemo-desktop-icon-view.c
-index 37cd8cb..5dec8b5 100644
---- a/src/nemo-desktop-icon-view.c
-+++ b/src/nemo-desktop-icon-view.c
-@@ -41,7 +41,6 @@
- #include <fcntl.h>
- #include <gdk/gdkx.h>
- #include <glib/gi18n.h>
--#include <libnemo-private/nemo-desktop-background.h>
- #include <libnemo-private/nemo-desktop-icon-file.h>
- #include <libnemo-private/nemo-directory-notify.h>
- #include <libnemo-private/nemo-file-changes-queue.h>
-@@ -76,8 +75,6 @@ struct NemoDesktopIconViewDetails
- 	gulong delayed_init_signal;
- 	guint reload_desktop_timeout;
- 	gboolean pending_rescan;
--
--	NemoDesktopBackground *background;
- };
- 
- static void     default_zoom_level_changed                        (gpointer                user_data);
-@@ -240,12 +237,6 @@ struct NemoDesktopIconViewDetails
- 	return GDK_FILTER_CONTINUE;
- }
- 
--static void
--real_begin_loading (NemoView *object)
--{
--	NEMO_VIEW_CLASS (nemo_desktop_icon_view_parent_class)->begin_loading (object);
--}
--
- static const char *
- real_get_id (NemoView *view)
- {
-@@ -300,7 +291,6 @@ struct NemoDesktopIconViewDetails
- 
- 	G_OBJECT_CLASS (class)->dispose = nemo_desktop_icon_view_dispose;
- 
--	vclass->begin_loading = real_begin_loading;
- 	vclass->merge_menus = real_merge_menus;
- 	vclass->update_menus = real_update_menus;
- 	vclass->get_view_id = real_get_id;
-@@ -428,6 +418,17 @@ struct NemoDesktopIconViewDetails
- 			       desktop_icon_view);
- }
- 
-+static void
-+desktop_icon_container_realize (GtkWidget *widget,
-+                                NemoDesktopIconView *desktop_icon_view)
-+{
-+    GdkWindow *bin_window;
-+    GdkRGBA transparent = { 0, 0, 0, 0 };
-+
-+    bin_window = gtk_layout_get_bin_window (GTK_LAYOUT (widget));
-+    gdk_window_set_background_rgba (bin_window, &transparent);
-+}
-+
- static NemoZoomLevel
- get_default_zoom_level (void)
- {
-@@ -614,6 +615,8 @@ struct NemoDesktopIconViewDetails
- 
- 	g_signal_connect_object (icon_container, "middle_click",
- 				 G_CALLBACK (nemo_desktop_icon_view_handle_middle_click), desktop_icon_view, 0);
-+    g_signal_connect_object (icon_container, "realize",
-+                 G_CALLBACK (desktop_icon_container_realize), desktop_icon_view, 0);
- 	g_signal_connect_object (desktop_icon_view, "realize",
- 				 G_CALLBACK (realized_callback), desktop_icon_view, 0);
- 	g_signal_connect_object (desktop_icon_view, "unrealize",
-@@ -637,9 +640,6 @@ struct NemoDesktopIconViewDetails
- 				  G_CALLBACK (nemo_view_update_menus),
- 				  desktop_icon_view);
- 
--    GdkRGBA transparent = { 0, 0, 0, 0 };
--    gtk_widget_override_background_color (GTK_WIDGET (icon_container), GTK_STATE_FLAG_NORMAL, &transparent);
--
-     have_cinnamon_settings = g_find_program_in_path ("cinnamon-settings") != NULL;
- }
- 
--- 
-1.8.1.6
-
-
-From b40990397b6fff55878481a806a1b5574e43951f Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Mon, 15 Apr 2013 20:14:40 -0400
-Subject: [PATCH 3/6] Forgot an include
-
----
- libnemo-private/nemo-icon-dnd.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/libnemo-private/nemo-icon-dnd.c b/libnemo-private/nemo-icon-dnd.c
-index 017c6a7..2ed073c 100644
---- a/libnemo-private/nemo-icon-dnd.c
-+++ b/libnemo-private/nemo-icon-dnd.c
-@@ -52,7 +52,6 @@
- #include <gtk/gtk.h>
- #include <glib/gi18n.h>
- 
--#include <libnemo-private/nemo-desktop-background.h>
- #include <libnemo-private/nemo-file-utilities.h>
- #include <libnemo-private/nemo-file-changes-queue.h>
- #include <stdio.h>
--- 
-1.8.1.6
-
-
-From 020d4dc15fa9c0e1303cef7795e45e688ede7726 Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Tue, 16 Apr 2013 18:00:01 -0400
-Subject: [PATCH 4/6] Change to use cinnamon background keys
-
----
- libnemo-private/nemo-global-preferences.c | 2 +-
- libnemo-private/nemo-global-preferences.h | 2 +-
- src/nemo-places-sidebar.c                 | 2 +-
- src/nemo-view.c                           | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/libnemo-private/nemo-global-preferences.c b/libnemo-private/nemo-global-preferences.c
-index d3ad20a..336afc3 100644
---- a/libnemo-private/nemo-global-preferences.c
-+++ b/libnemo-private/nemo-global-preferences.c
-@@ -76,7 +76,7 @@
- 	nemo_desktop_preferences = g_settings_new("org.nemo.desktop");
- 	nemo_tree_sidebar_preferences = g_settings_new("org.nemo.sidebar-panels.tree");
- 	gnome_lockdown_preferences = g_settings_new("org.gnome.desktop.lockdown");
--	gnome_background_preferences = g_settings_new("org.gnome.desktop.background");
-+	cinnamon_background_preferences = g_settings_new("org.cinnamon.background");
- 	gnome_media_handling_preferences = g_settings_new("org.gnome.desktop.media-handling");
- 	gnome_terminal_preferences = g_settings_new("org.gnome.desktop.default-applications.terminal");
- }
-diff --git a/libnemo-private/nemo-global-preferences.h b/libnemo-private/nemo-global-preferences.h
-index 2b9c56a..c1ec61a 100644
---- a/libnemo-private/nemo-global-preferences.h
-+++ b/libnemo-private/nemo-global-preferences.h
-@@ -226,7 +226,7 @@ enum
- GSettings *nemo_tree_sidebar_preferences;
- GSettings *nemo_window_state;
- GSettings *gnome_lockdown_preferences;
--GSettings *gnome_background_preferences;
-+GSettings *cinnamon_background_preferences;
- GSettings *gnome_media_handling_preferences;
- GSettings *gnome_terminal_preferences;
- 
-diff --git a/src/nemo-places-sidebar.c b/src/nemo-places-sidebar.c
-index a0bc4d4..ca32193 100644
---- a/src/nemo-places-sidebar.c
-+++ b/src/nemo-places-sidebar.c
-@@ -3825,7 +3825,7 @@ static void expand_or_collapse_category (NemoPlacesSidebar *sidebar,
- 					      bookmarks_popup_menu_detach_cb,
- 					      sidebar);
- 
--	g_signal_handlers_disconnect_by_func (gnome_background_preferences,
-+	g_signal_handlers_disconnect_by_func (cinnamon_background_preferences,
- 					      desktop_setting_changed_callback,
- 					      sidebar);
- 
-diff --git a/src/nemo-view.c b/src/nemo-view.c
-index ab03b44..3ece32a 100644
---- a/src/nemo-view.c
-+++ b/src/nemo-view.c
-@@ -6945,7 +6945,7 @@ static void slot_changed_pane (NemoWindowSlot *slot,
- 
-     uri = nemo_file_info_get_uri (file);
- 
--    g_settings_set_string (gnome_background_preferences,
-+    g_settings_set_string (cinnamon_background_preferences,
-                                     "picture-uri", uri);
-     g_free (uri);
- }
--- 
-1.8.1.6
-
-
-From f487954ebce3f564744e9c83b5dd40fa8f8fad6d Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Mon, 22 Apr 2013 08:33:41 -0400
-Subject: [PATCH 5/6] Fall back to org.gnome.desktop.background schema when
- cinnamon is not installed
-
----
- libnemo-private/nemo-global-preferences.c | 20 +++++++++++++++++++-
- 1 file changed, 19 insertions(+), 1 deletion(-)
-
-diff --git a/libnemo-private/nemo-global-preferences.c b/libnemo-private/nemo-global-preferences.c
-index 336afc3..7eb04ef 100644
---- a/libnemo-private/nemo-global-preferences.c
-+++ b/libnemo-private/nemo-global-preferences.c
-@@ -76,7 +76,25 @@
- 	nemo_desktop_preferences = g_settings_new("org.nemo.desktop");
- 	nemo_tree_sidebar_preferences = g_settings_new("org.nemo.sidebar-panels.tree");
- 	gnome_lockdown_preferences = g_settings_new("org.gnome.desktop.lockdown");
--	cinnamon_background_preferences = g_settings_new("org.cinnamon.background");
- 	gnome_media_handling_preferences = g_settings_new("org.gnome.desktop.media-handling");
- 	gnome_terminal_preferences = g_settings_new("org.gnome.desktop.default-applications.terminal");
-+
-+    const gchar * const *schema_list = g_settings_list_schemas ();
-+    int i = 0;
-+    gboolean has_cinnamon = FALSE;
-+    if (schema_list != NULL) {
-+        while (schema_list[i] != NULL) {
-+            if (g_strcmp0 (schema_list[i], "org.cinnamon.background") == 0) {
-+                has_cinnamon = TRUE;
-+                break;
-+            }
-+            i++;
-+        }
-+    }
-+
-+    if (has_cinnamon) {
-+        cinnamon_background_preferences = g_settings_new ("org.cinnamon.background");
-+    } else {
-+        cinnamon_background_preferences = g_settings_new ("org.gnome.desktop.background");
-+    }
- }
--- 
-1.8.1.6
-
-
-From 9739a1b30603868ea6b8b12cf7aeb167be5aea22 Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Mon, 22 Apr 2013 09:31:49 -0400
-Subject: [PATCH 6/6] simplify schema check
-
----
- libnemo-private/nemo-global-preferences.c | 17 +++--------------
- 1 file changed, 3 insertions(+), 14 deletions(-)
-
-diff --git a/libnemo-private/nemo-global-preferences.c b/libnemo-private/nemo-global-preferences.c
-index 7eb04ef..0470595 100644
---- a/libnemo-private/nemo-global-preferences.c
-+++ b/libnemo-private/nemo-global-preferences.c
-@@ -79,20 +79,9 @@
- 	gnome_media_handling_preferences = g_settings_new("org.gnome.desktop.media-handling");
- 	gnome_terminal_preferences = g_settings_new("org.gnome.desktop.default-applications.terminal");
- 
--    const gchar * const *schema_list = g_settings_list_schemas ();
--    int i = 0;
--    gboolean has_cinnamon = FALSE;
--    if (schema_list != NULL) {
--        while (schema_list[i] != NULL) {
--            if (g_strcmp0 (schema_list[i], "org.cinnamon.background") == 0) {
--                has_cinnamon = TRUE;
--                break;
--            }
--            i++;
--        }
--    }
--
--    if (has_cinnamon) {
-+    GSettingsSchemaSource *schema_source;
-+    schema_source = g_settings_schema_source_get_default();
-+    if (g_settings_schema_source_lookup (schema_source, "org.cinnamon.background", FALSE)) {
-         cinnamon_background_preferences = g_settings_new ("org.cinnamon.background");
-     } else {
-         cinnamon_background_preferences = g_settings_new ("org.gnome.desktop.background");
--- 
-1.8.1.6
-
diff --git a/community/nemo/tracker-0.16.patch b/community/nemo/tracker-0.16.patch
deleted file mode 100644
index 49964678d..000000000
--- a/community/nemo/tracker-0.16.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 88459a57ac2fcf06400ade5c6d0189bf1aa2334d Mon Sep 17 00:00:00 2001
-From: Nick Black <nick.black@sprezzatech.com>
-Date: Fri, 12 Apr 2013 17:10:46 -0400
-Subject: [PATCH] build with tracker 0.16
-
----
- configure.in | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index ec72f73..21afbe4 100644
---- a/configure.in
-+++ b/configure.in
-@@ -249,11 +249,13 @@ AC_ARG_ENABLE(tracker,
- 
- build_tracker=no
- if test "x$enable_tracker" != "xno"; then
--  PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.14,
-+  PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.16,
-                     [build_tracker=yes],
--                    [PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.12,
-+  		    [PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.14,
-+                    	[build_tracker=yes],
-+                    	[PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.12,
- 		                       [build_tracker=yes],
--                                       [build_tracker=no])])
-+                                       [build_tracker=no])])])
-   if test "x$build_tracker" = "xyes"; then
-     AC_DEFINE(ENABLE_TRACKER, 1, [Define to enable Tracker support])
-   fi
--- 
-1.8.1.5
-
diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD
index cc8f0ca4b..c28463a87 100644
--- a/community/nginx/PKGBUILD
+++ b/community/nginx/PKGBUILD
@@ -1,102 +1,96 @@
-# $Id: PKGBUILD 94240 2013-07-17 19:28:57Z bpiotrowski $
-# Maintainer:  Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# $Id: PKGBUILD 96815 2013-09-05 20:15:59Z seblu $
+# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# Maintainer: Sébastien Luttringer
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl>
 
-_cfgdir=/etc/nginx
-_tmpdir=/var/lib/nginx
-
 pkgname=nginx
 pkgver=1.4.2
-pkgrel=1
+pkgrel=4
 pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server'
 arch=('i686' 'x86_64' 'mips64el')
-depends=('pcre' 'zlib' 'openssl' 'geoip')
-makedepends=('passenger')
-url="http://nginx.org"
+url='http://nginx.org'
 license=('custom')
-install=nginx.install
-backup=(${_cfgdir:1}/fastcgi.conf
-		${_cfgdir:1}/fastcgi_params
-		${_cfgdir:1}/koi-win
-		${_cfgdir:1}/koi-utf
-		${_cfgdir:1}/mime.types
-		${_cfgdir:1}/nginx.conf
-		${_cfgdir:1}/scgi_params
-		${_cfgdir:1}/uwsgi_params
-		${_cfgdir:1}/win-utf
-		etc/logrotate.d/nginx)
-source=(http://nginx.org/download/nginx-$pkgver.tar.gz
-		service
-		logrotate)
+depends=('pcre' 'zlib' 'openssl')
+backup=('etc/nginx/fastcgi.conf'
+        'etc/nginx/fastcgi_params'
+        'etc/nginx/koi-win'
+        'etc/nginx/koi-utf'
+        'etc/nginx/mime.types'
+        'etc/nginx/nginx.conf'
+        'etc/nginx/scgi_params'
+        'etc/nginx/uwsgi_params'
+        'etc/nginx/win-utf'
+        'etc/logrotate.d/nginx')
+install=install
+source=("http://nginx.org/download/nginx-$pkgver.tar.gz"
+        'service'
+        'logrotate')
 sha256sums=('5361ffb7b0ebf8b1a04369bc3d1295eaed091680c1c58115f88d56c8e51f3611'
             '05fdc0c0483410944b988d7f4beabb00bec4a44a41bd13ebc9b78585da7d3f9b'
-            '9523a1fdd5eb61bf62f3049f6ee088b198e36d5edcce2d9b08bbeb2930aa5a16')
+            '272907d3213d69dac3bd6024d6d150caa23cb67d4f121e4171f34ba5581f9e98')
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
-
-	./configure \
-        --prefix=$_cfgdir \
-        --conf-path=$_cfgdir/nginx.conf \
+    cd $pkgname-$pkgver
+    ./configure \
+        --prefix=/etc/nginx \
+        --conf-path=/etc/nginx/nginx.conf \
         --sbin-path=/usr/bin/nginx \
-        --pid-path=/var/run/nginx.pid \
-        --lock-path=/var/lock/nginx.lock \
-        --user=http --group=http \
+        --pid-path=/run/nginx.pid \
+        --lock-path=/run/lock/nginx.lock \
+        --user=http \
+        --group=http \
         --http-log-path=/var/log/nginx/access.log \
         --error-log-path=/var/log/nginx/error.log \
-        --http-client-body-temp-path=$_tmpdir/client-body \
-        --http-proxy-temp-path=$_tmpdir/proxy \
-        --http-fastcgi-temp-path=$_tmpdir/fastcgi \
-        --http-scgi-temp-path=$_tmpdir/scgi \
-        --http-uwsgi-temp-path=$_tmpdir/uwsgi \
-        --with-imap --with-imap_ssl_module \
-        --with-ipv6 --with-pcre-jit \
+        --http-client-body-temp-path=/var/lib/nginx/client-body \
+        --http-proxy-temp-path=/var/lib/nginx/proxy \
+        --http-fastcgi-temp-path=/var/lib/nginx/fastcgi \
+        --http-scgi-temp-path=/var/lib/nginx/scgi \
+        --http-uwsgi-temp-path=/var/lib/nginx/uwsgi \
+        --with-imap \
+        --with-imap_ssl_module \
+        --with-ipv6 \
+        --with-pcre-jit \
         --with-file-aio \
         --with-http_dav_module \
-        --with-http_geoip_module \
         --with-http_gunzip_module \
         --with-http_gzip_static_module \
         --with-http_realip_module \
         --with-http_spdy_module \
         --with-http_ssl_module \
         --with-http_stub_status_module \
-        --add-module=/usr/lib/passenger/ext/nginx \
-        #--with-http_mp4_module \
-        #--with-http_addition_module \
-        #--with-http_xslt_module \
-        #--with-http_image_filter_module \
-        #--with-http_sub_module \
-        #--with-http_flv_module \
-        #--with-http_random_index_module \
-        #--with-http_secure_link_module \
-        #--with-http_degradation_module \
-        #--with-http_perl_module \
-
-	make
+        --with-http_addition_module \
+        --with-http_degradation_module \
+        --with-http_flv_module \
+        --with-http_mp4_module \
+        --with-http_secure_link_module \
+        --with-http_sub_module
+    make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install
+    cd $pkgname-$pkgver
+    make DESTDIR="$pkgdir" install
 
-	sed -e 's|\<user\s\+\w\+;|user html;|g' \
-		-e '44s|html|/usr/share/nginx/html|' \
-		-e '54s|html|/usr/share/nginx/html|' \
-		-i "$pkgdir"/etc/nginx/nginx.conf
-	rm "$pkgdir"/etc/nginx/*.default
+    sed -e 's|\<user\s\+\w\+;|user html;|g' \
+        -e '44s|html|/usr/share/nginx/html|' \
+        -e '54s|html|/usr/share/nginx/html|' \
+        -i "$pkgdir"/etc/nginx/nginx.conf
+    rm "$pkgdir"/etc/nginx/*.default
 
-	install -d "$pkgdir"/$_tmpdir
-	install -dm700 "$pkgdir"/$_tmpdir/proxy
+    install -d "$pkgdir"/var/lib/nginx
+    install -dm700 "$pkgdir"/var/lib/nginx/proxy
 
-	chmod 750 "$pkgdir"/var/log/nginx
-	chown http:log "$pkgdir"/var/log/nginx
+    chmod 750 "$pkgdir"/var/log/nginx
+    chown http:log "$pkgdir"/var/log/nginx
 
-	install -d "$pkgdir"/usr/share/nginx
-	mv "$pkgdir"/etc/nginx/html/ "$pkgdir"/usr/share/nginx
+    install -d "$pkgdir"/usr/share/nginx
+    mv "$pkgdir"/etc/nginx/html/ "$pkgdir"/usr/share/nginx
 
-	install -Dm644 "$srcdir"/logrotate "$pkgdir"/etc/logrotate.d/nginx
-	install -Dm644 "$srcdir"/service "$pkgdir"/usr/lib/systemd/system/nginx.service
-	install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/nginx/LICENSE
-	rm -rf "$pkgdir"/var/run
+    install -Dm644 "$srcdir"/logrotate "$pkgdir"/etc/logrotate.d/nginx
+    install -Dm644 "$srcdir"/service "$pkgdir"/usr/lib/systemd/system/nginx.service
+    install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+    rmdir "$pkgdir/run"
 }
+
+# vim:set ts=4 sw=4 et:
diff --git a/community/nginx/install b/community/nginx/install
new file mode 100644
index 000000000..7c4adf14b
--- /dev/null
+++ b/community/nginx/install
@@ -0,0 +1,21 @@
+post_upgrade() {
+    if (( $(vercmp $2 1.2.7-4) <= 0 )); then
+        chmod 750 var/log/nginx
+        chown http:log var/log/nginx
+    fi
+    if (( $(vercmp $2 1.2.1-2) <= 0 )); then
+        echo ' >>> Since 1.2.1-2 several changes has been made in package:'
+        echo '      - *.conf files have been moved to /etc/nginx'
+        echo '      - /etc/conf.d/nginx has been removed'
+        echo '        Main configuration file is set to /etc/nginx/nginx.conf'
+        echo '      - access.log and error.log can be found in /var/log/nginx by default'
+        echo '      - bundled *.html files have been moved to /usr/share/nginx/html'
+        echo '      - /etc/nginx/{html,logs} symbolic links and *.default files have been removed'
+    fi
+    if (( $(vercmp $2 1.4.2-4) < 0 )); then
+        echo 'Nginx now includes only upstream bundled modules.'
+        echo 'Thus, passenger module support was dropped.'
+    fi
+}
+
+# vim:set ts=4 sw=4 et:
diff --git a/community/nginx/logrotate b/community/nginx/logrotate
index 3d082bcf8..e0fa9ec4c 100644
--- a/community/nginx/logrotate
+++ b/community/nginx/logrotate
@@ -4,6 +4,6 @@
 	sharedscripts
 	compress
 	postrotate
-		test -r /var/run/nginx.pid && kill -USR1 `cat /var/run/nginx.pid`
+		test ! -r /var/run/nginx.pid || kill -USR1 `cat /var/run/nginx.pid`
 	endscript
 }
diff --git a/community/nginx/nginx.install b/community/nginx/nginx.install
deleted file mode 100644
index 0daccc639..000000000
--- a/community/nginx/nginx.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_upgrade() {
-    if [[ $(vercmp $2 1.2.7-4) -le 0 ]]; then
-        chmod 750 var/log/nginx
-        chown http:log var/log/nginx
-    fi
-    if [[ $(vercmp $2 1.2.1-2) -le 0 ]]; then
-        echo " >>> Since 1.2.1-2 several changes has been made in package:"
-        echo "      - *.conf files have been moved to /etc/nginx"
-        echo "      - /etc/conf.d/nginx has been removed"
-        echo "        Main configuration file is set to /etc/nginx/nginx.conf"
-        echo "      - access.log and error.log can be found in /var/log/nginx by default" 
-        echo "      - bundled *.html files have been moved to /usr/share/nginx/html"
-        echo "      - /etc/nginx/{html,logs} symbolic links and *.default files have been removed"
-    fi
-}
diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD
index 953550047..3f4a845f0 100644
--- a/community/nodejs/PKGBUILD
+++ b/community/nodejs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96776 2013-09-04 21:38:52Z bpiotrowski $
+# $Id: PKGBUILD 97916 2013-10-01 05:49:26Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: James Campos <james.r.campos@gmail.com>
@@ -8,7 +8,7 @@
 # Contributor: TIanyi Cui <tianyicui@gmail.com>
 
 pkgname=nodejs
-pkgver=0.10.18
+pkgver=0.10.20
 pkgrel=1
 pkgdesc='Evented I/O for V8 javascript'
 arch=('i686' 'x86_64' 'mips64el')
@@ -19,7 +19,7 @@ makedepends=('python2')
 checkdepends=('curl')
 options=('!emptydirs')
 source=(http://nodejs.org/dist/v$pkgver/node-v$pkgver.tar.gz)
-sha256sums=('3ee4436473869d4d84bb5cad4352b09ace00656467eca7d6db7cd7da5b8c5495')
+sha256sums=('b5af00d4d43644f37caa2dad5fa81e6f898ebb7b238f02a1cddfcff11c81e649')
 
 prepare() {
   cd node-v$pkgver
diff --git a/community/ntop/PKGBUILD b/community/ntop/PKGBUILD
index c30bc8a73..94e93fe5f 100644
--- a/community/ntop/PKGBUILD
+++ b/community/ntop/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 92109 2013-05-31 15:39:41Z foutrelis $
+# $Id: PKGBUILD 96996 2013-09-10 01:53:10Z bgyorgy $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=ntop
 pkgver=5.0.1
-pkgrel=3
+pkgrel=4
 pkgdesc='A network traffic probe that shows the network usage.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.ntop.org/'
 license=('GPL')
-depends=('libevent' 'libpcap' 'gd' 'glibc' 'libxml2' 'openssl' 'rrdtool' 'pcre' 'geoip' 'lua')
+depends=('libevent' 'libpcap' 'gd' 'glibc' 'libxml2' 'openssl' 'rrdtool' 'pcre' 'geoip' 'lua' 'python2')
 makedepends=('subversion' 'wget' 'ca-certificates')
 options=('!libtool' '!makeflags')
 install='ntop.install'
@@ -18,6 +18,14 @@ source=("http://sourceforge.net/projects/${pkgname}/files/${pkgname}/Stable/${pk
 md5sums=('01710b6925a8a5ffe1a41b8b512ebd69'
          '0e149d20f881600e8387d850ac268483')
 
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # Python2 fix
+  find . -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
+  sed -i 's/python-config/python2-config/' configure.in
+}
+
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
diff --git a/community/oolite/PKGBUILD b/community/oolite/PKGBUILD
index ee1726eb2..6d3ca4b2f 100644
--- a/community/oolite/PKGBUILD
+++ b/community/oolite/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 90332 2013-05-11 15:38:55Z alucryd $
+# $Id: PKGBUILD 96992 2013-09-09 20:32:19Z bgyorgy $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Lone_Wolf <lonewolf@xs4all.nl>
 pkgname=oolite
 pkgver=1.77
-pkgrel=2
+pkgrel=3
 pkgdesc="A space-sim based on the classic Elite"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://oolite-linux.berlios.de"
diff --git a/community/openclonk/PKGBUILD b/community/openclonk/PKGBUILD
deleted file mode 100644
index 1157c0a30..000000000
--- a/community/openclonk/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 94898 2013-08-01 06:55:20Z bpiotrowski $
-# Maintainer: Jonathan Steel <mail at jsteel dot org>
-# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Wesley <rudirennsau at hotmail dot com>
-
-pkgname=openclonk
-pkgver=5.3.3
-pkgrel=2
-pkgdesc="A multiplayer-action-tactic-skill game"
-arch=('i686' 'x86_64')
-url="http://openclonk.org"
-license=('custom')
-depends=('gtk2' 'glew' 'sdl_mixer' 'libxpm'  'hicolor-icon-theme' 'libupnp')
-makedepends=('cmake' 'boost' 'imagemagick' 'mesa')
-install=$pkgname.install
-source=(http://hg.openclonk.org/$pkgname/archive/$pkgname-release-$pkgver-src.tar.gz)
-md5sums=('a61d8a7d7c41bcc8d85a647c25095658')
-
-build() {
-  [[ -d build ]] && rm -rf build
-  mkdir build && cd build
-
-  cmake ../ -DCMAKE_INSTALL_PREFIX=/usr
-
-  make
-}
-
-package() {
-  cd build
-
-  make DESTDIR="$pkgdir"/ install
-
-  install -Dm644 clonk.png "$pkgdir"/usr/share/pixmaps/clonk.png
-  install -dm755 "$pkgdir"/usr/share/licenses/$pkgname
-  install -m644 ../licenses/*.txt "$pkgdir"/usr/share/licenses/$pkgname
-}
-
-# vim: ts=2 sw=2 et:
diff --git a/community/opendkim/PKGBUILD b/community/opendkim/PKGBUILD
index d88c3a5f1..16596caec 100644
--- a/community/opendkim/PKGBUILD
+++ b/community/opendkim/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 91498 2013-05-23 10:14:14Z spupykin $
+# $Id: PKGBUILD 97519 2013-09-23 16:14:28Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Thomas Jost <schnouki@schnouki.net>
 
 pkgname=opendkim
-pkgver=2.8.3
-pkgrel=3
+pkgver=2.8.4
+pkgrel=1
 pkgdesc="An open source implementation of the DKIM sender authentication system. Based on a fork of dkim-milter."
 arch=(i686 x86_64)
 url="http://www.opendkim.org/"
@@ -17,7 +17,7 @@ install=opendkim.install
 source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.gz
 	opendkim.conf
 	opendkim.service)
-md5sums=('0ae9d37e3221a244eb34c3e0e2d665cc'
+md5sums=('17f667d022c167c7874a993e928d4a6d'
          '3e2bb1058ac0662f01e675aa6ac7ee8f'
          '85010750a21954e2d3cf5d57fe210d3f')
 
diff --git a/community/opus-tools/PKGBUILD b/community/opus-tools/PKGBUILD
index f32d5af1f..404f7c376 100644
--- a/community/opus-tools/PKGBUILD
+++ b/community/opus-tools/PKGBUILD
@@ -1,29 +1,28 @@
-# $Id: PKGBUILD 81947 2013-01-04 06:03:54Z bpiotrowski $
+# $Id: PKGBUILD 96976 2013-09-09 15:45:45Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Michael Düll <mail@akurei.me>
 # Contributor: pumbur
 
 pkgname=opus-tools
-pkgver=0.1.6
+pkgver=0.1.7
 pkgrel=1
 pkgdesc='Collection of tools for Opus audio codec'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://wiki.xiph.org/Opus-tools'
 license=('BSD')
-depends=('opus' 'libogg')
+depends=('flac' 'libogg' 'opus')
 source=(http://downloads.xiph.org/releases/opus/$pkgname-$pkgver.tar.gz)
+md5sums=('62af32d1669bcabf1aabaf7187a377f6')
 
 build(){
-  cd $srcdir/$pkgname-$pkgver
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
 
-  install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE
+  install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 } 
-
-sha512sums=('547828082c4838643eeda513f65316b60b0e44c4a0826ef39cbfa3fe81df71b30651c03ceee7729aeb74258c259014bf95ca5f01aba097a4de8334e58c8e7ce6')
diff --git a/community/pam_pwcheck/PKGBUILD b/community/pam_pwcheck/PKGBUILD
deleted file mode 100644
index deee1070c..000000000
--- a/community/pam_pwcheck/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD 90578 2013-05-13 09:54:52Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=pam_pwcheck
-pkgver=3.12.1
-pkgrel=1
-pkgdesc="A password strength checking module for PAM-aware password changing programs"
-arch=(i686 x86_64 'mips64el')
-url="http://www.thkukuk.de/pam/pam_pwcheck/"
-depends=('pam')
-license=('GPL')
-source=(ftp://ftp.suse.com/pub/people/kukuk/pam/pam_pwcheck/pam_pwcheck-$pkgver.tar.bz2)
-md5sums=('85cd0d48500c160abcb0b9902e5594ce')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --mandir=/usr/share/man --libdir=/usr/lib
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-}
diff --git a/community/pari/PKGBUILD b/community/pari/PKGBUILD
index c61e08f6a..2433d00bd 100644
--- a/community/pari/PKGBUILD
+++ b/community/pari/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 90928 2013-05-15 13:56:58Z bisson $
+# $Id: PKGBUILD 97765 2013-09-29 05:06:21Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=pari
-pkgver=2.5.4
+pkgver=2.5.5
 pkgrel=1
 pkgdesc='Computer algebra system designed for fast computations in number theory'
 url='http://pari.math.u-bordeaux.fr/'
@@ -12,7 +12,7 @@ depends=('gmp' 'readline' 'libx11')
 makedepends=('perl' 'texlive-core')
 optdepends=('perl: gphelp, tex2mail')
 source=("${url}pub/pari/unix/${pkgname}-${pkgver}.tar.gz"{,.asc})
-sha1sums=('471226fd86fea0ad1f236249a49bdaee16aa34bf' 'SKIP')
+sha1sums=('77637f935ee4a3b78e7015cef00146bd2f7e96bc' 'SKIP')
 
 prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/parrot/PKGBUILD b/community/parrot/PKGBUILD
index eba0b90dc..fb8cdeaf3 100644
--- a/community/parrot/PKGBUILD
+++ b/community/parrot/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 94711 2013-07-29 10:19:02Z spupykin $
+# $Id: PKGBUILD 97838 2013-09-30 10:03:17Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: mpie <michael.kyne-phillips1@ntlworld.com>
 
 pkgname=parrot
-pkgver=5.6.0
+pkgver=5.7.0
 #_rel=stable
 _rel=devel
 pkgrel=1
@@ -16,7 +16,7 @@ makedepends=('perl-json')
 optdepends=('freeglut')
 options=('!makeflags')
 source=(ftp://ftp.parrot.org/pub/parrot/releases/$_rel/$pkgver/$pkgname-$pkgver.tar.bz2)
-md5sums=('7bf098790c5772bb45480abe3e425f3c')
+md5sums=('3fcb1b21a3d71be8c4a4111fcac56278')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/pcmanfm/PKGBUILD b/community/pcmanfm/PKGBUILD
index 0000be2ca..0823d454b 100644
--- a/community/pcmanfm/PKGBUILD
+++ b/community/pcmanfm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 95467 2013-08-12 19:57:14Z bpiotrowski $
+# $Id: PKGBUILD 97022 2013-09-10 14:32:02Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
 # Contributor: Unknown47 <unknown47r@gmail.com>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
@@ -6,14 +6,15 @@
 
 pkgname=pcmanfm
 pkgver=1.1.2
-pkgrel=1
+pkgrel=2
 pkgdesc="An extremely fast and lightweight file manager"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pcmanfm.sourceforge.net/"
 license=('GPL')
 groups=('lxde')
 depends=('gtk2' 'desktop-file-utils' 'libfm' 'lxmenu-data')
-makedepends=('intltool' 'pkgconfig')
+makedepends=('intltool')
+optdepends=('gvfs: for trash support, mounting with udisk and remote filesystems')
 install=$pkgname.install
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.gz)
 md5sums=('41104699e653ff2b0a9a9e80a257d6a2')
diff --git a/community/pcsxr/PKGBUILD b/community/pcsxr/PKGBUILD
index 71bb22650..984dfac74 100644
--- a/community/pcsxr/PKGBUILD
+++ b/community/pcsxr/PKGBUILD
@@ -1,17 +1,19 @@
-# $Id: PKGBUILD 96557 2013-08-31 16:57:39Z schuay $
+# $Id: PKGBUILD 97005 2013-09-10 08:52:26Z schuay $
 # Maintainer: schuay <jakob.gruber@gmail.com>
 # Contributor: quantax -- contact via Arch Linux forum or AUR
 # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
 
 pkgname=pcsxr
 pkgver=1.9.93
-pkgrel=1
+pkgrel=2
 pkgdesc='A Sony PlayStation (PSX) emulator based on the PCSX-df project'
 arch=('i686' 'x86_64')
 url='http://pcsxr.codeplex.com/'
 license=('GPL')
-depends=('libcdio' 'libgl' 'libglade' 'libxtst' 'libxv' 'sdl' 'gtk3')
+options=('!libtool')
+depends=('libcdio' 'libxv' 'sdl' 'gtk3')
 makedepends=('mesa' 'intltool')
+[[ $CARCH == 'i686' ]] && makedepends+=('nasm')
 
 # Accessible through /srv/ftp/other/community on nymeria.
 source=("ftp://ftp.archlinux.org/other/community/pcsxr/pcsxr-${pkgver}.tar.bz2")
diff --git a/community/percona-server/0001-MDEV-4902-sql_yacc.yy-incompatible-with-bison-3.patch b/community/percona-server/0001-MDEV-4902-sql_yacc.yy-incompatible-with-bison-3.patch
new file mode 100644
index 000000000..fda79cff3
--- /dev/null
+++ b/community/percona-server/0001-MDEV-4902-sql_yacc.yy-incompatible-with-bison-3.patch
@@ -0,0 +1,3539 @@
+From 6325837d6abf272b8c3dfac664f18435f8a2abf8 Mon Sep 17 00:00:00 2001
+From: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
+Date: Thu, 5 Sep 2013 09:52:54 +0200
+Subject: [PATCH] MDEV-4902 - sql_yacc.yy incompatible with bison 3
+
+- YYPARSE_PARAM and YYLEX_PARAM are removed in Bison 3.0. Deprecated
+  since Bison 1.875 in favor of %lex-param, %parse-param.
+- %pure_parser is deprecated in favor of %define api.pure.
+- %parse-param adds an argument to yyerror() as well, updated
+  MYSQLerror() accordingly.
+- %parse-param allows to declare proper type for argument. That's
+  what 99% of this patch is about.
+---
+ sql/sql_lex.cc   |  12 +-
+ sql/sql_lex.h    |   2 +-
+ sql/sql_parse.cc |   2 +-
+ sql/sql_yacc.yy  | 799 ++++++++++++++++++++++++-------------------------------
+ 4 files changed, 361 insertions(+), 454 deletions(-)
+
+diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
+index 18323f8..b01d451 100644
+--- a/sql/sql_lex.cc
++++ b/sql/sql_lex.cc
+@@ -29,7 +29,7 @@
+ #include "sp.h"
+ #include "sp_head.h"
+ 
+-static int lex_one_token(void *arg, void *yythd);
++static int lex_one_token(void *arg, THD *thd);
+ 
+ /*
+   We are using pointer to this variable for distinguishing between assignment
+@@ -869,9 +869,8 @@ bool consume_comment(Lex_input_stream *lip, int remaining_recursions_permitted)
+ 				(which can't be followed by a signed number)
+ */
+ 
+-int MYSQLlex(void *arg, void *yythd)
++int MYSQLlex(void *arg, THD *thd)
+ {
+-  THD *thd= (THD *)yythd;
+   Lex_input_stream *lip= & thd->m_parser_state->m_lip;
+   YYSTYPE *yylval=(YYSTYPE*) arg;
+   int token;
+@@ -889,7 +888,7 @@ int MYSQLlex(void *arg, void *yythd)
+     return token;
+   }
+ 
+-  token= lex_one_token(arg, yythd);
++  token= lex_one_token(arg, thd);
+ 
+   switch(token) {
+   case WITH:
+@@ -900,7 +899,7 @@ int MYSQLlex(void *arg, void *yythd)
+       to transform the grammar into a LALR(1) grammar,
+       which sql_yacc.yy can process.
+     */
+-    token= lex_one_token(arg, yythd);
++    token= lex_one_token(arg, thd);
+     switch(token) {
+     case CUBE_SYM:
+       return WITH_CUBE_SYM;
+@@ -923,14 +922,13 @@ int MYSQLlex(void *arg, void *yythd)
+   return token;
+ }
+ 
+-int lex_one_token(void *arg, void *yythd)
++int lex_one_token(void *arg, THD *thd)
+ {
+   reg1	uchar c= 0;
+   bool comment_closed;
+   int	tokval, result_state;
+   uint length;
+   enum my_lex_states state;
+-  THD *thd= (THD *)yythd;
+   Lex_input_stream *lip= & thd->m_parser_state->m_lip;
+   LEX *lex= thd->lex;
+   YYSTYPE *yylval=(YYSTYPE*) arg;
+diff --git a/sql/sql_lex.h b/sql/sql_lex.h
+index 8648b32..ba37127 100644
+--- a/sql/sql_lex.h
++++ b/sql/sql_lex.h
+@@ -2820,7 +2820,7 @@ extern void lex_init(void);
+ extern void lex_free(void);
+ extern void lex_start(THD *thd);
+ extern void lex_end(LEX *lex);
+-extern int MYSQLlex(void *arg, void *yythd);
++extern int MYSQLlex(void *arg, THD *thd);
+ 
+ extern void trim_whitespace(CHARSET_INFO *cs, LEX_STRING *str);
+ 
+diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
+index a1a79fd..d826b77 100644
+--- a/sql/sql_parse.cc
++++ b/sql/sql_parse.cc
+@@ -7636,7 +7636,7 @@ bool check_host_name(LEX_STRING *str)
+ }
+ 
+ 
+-extern int MYSQLparse(void *thd); // from sql_yacc.cc
++extern int MYSQLparse(THD *thd); // from sql_yacc.cc
+ 
+ 
+ /**
+diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
+index 34ae03b..2a6d9aa 100644
+--- a/sql/sql_yacc.yy
++++ b/sql/sql_yacc.yy
+@@ -22,20 +22,13 @@
+ */
+ 
+ %{
+-/* thd is passed as an argument to yyparse(), and subsequently to yylex().
+-** The type will be void*, so it must be  cast to (THD*) when used.
+-** Use the YYTHD macro for this.
+-*/
+-#define YYPARSE_PARAM yythd
+-#define YYLEX_PARAM yythd
+-#define YYTHD ((THD *)yythd)
+-#define YYLIP (& YYTHD->m_parser_state->m_lip)
+-#define YYPS (& YYTHD->m_parser_state->m_yacc)
++#define YYLIP (& thd->m_parser_state->m_lip)
++#define YYPS (& thd->m_parser_state->m_yacc)
+ 
+ #define MYSQL_YACC
+ #define YYINITDEPTH 100
+ #define YYMAXDEPTH 3200                        /* Because of 64K stack */
+-#define Lex (YYTHD->lex)
++#define Lex (thd->lex)
+ #define Select Lex->current_select
+ #include "sql_priv.h"
+ #include "unireg.h"                    // REQUIRED: for other includes
+@@ -69,14 +62,14 @@
+ #pragma warning (disable : 4065)
+ #endif
+ 
+-int yylex(void *yylval, void *yythd);
++int yylex(void *yylval, THD *thd);
+ 
+ #define yyoverflow(A,B,C,D,E,F)               \
+   {                                           \
+     ulong val= *(F);                          \
+     if (my_yyoverflow((B), (D), &val))        \
+     {                                         \
+-      yyerror((char*) (A));                   \
++      yyerror(current_thd, (char*) (A));                   \
+       return 2;                               \
+     }                                         \
+     else                                      \
+@@ -88,7 +81,7 @@ int yylex(void *yylval, void *yythd);
+ #define MYSQL_YYABORT                         \
+   do                                          \
+   {                                           \
+-    LEX::cleanup_lex_after_parse_error(YYTHD);\
++    LEX::cleanup_lex_after_parse_error(thd);\
+     YYABORT;                                  \
+   } while (0)
+ 
+@@ -174,10 +167,8 @@ void my_parse_error(const char *s)
+   to abort from the parser.
+ */
+ 
+-void MYSQLerror(const char *s)
++void MYSQLerror(THD *thd, const char *s)
+ {
+-  THD *thd= current_thd;
+-
+   /*
+     Restore the original LEX if it was replaced when parsing
+     a stored procedure. We must ensure that a parsing error
+@@ -780,7 +771,10 @@ static bool add_create_index (LEX *lex, Key::Keytype type,
+ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
+ %}
+ 
+-%pure_parser                                    /* We have threads */
++/* We have threads */
++%define api.pure
++%parse-param { THD *thd }
++%lex-param { THD *thd }
+ /*
+   Currently there are 168 shift/reduce conflicts.
+   We should not introduce new conflicts any more.
+@@ -1668,7 +1662,6 @@ rule: <-- starts at col 1
+ query:
+           END_OF_INPUT
+           {
+-            THD *thd= YYTHD;
+             if (!thd->bootstrap &&
+               (!(thd->lex->select_lex.options & OPTION_FOUND_COMMENT)))
+             {
+@@ -1682,7 +1675,7 @@ query:
+           {
+             Lex_input_stream *lip = YYLIP;
+ 
+-            if ((YYTHD->client_capabilities & CLIENT_MULTI_QUERIES) &&
++            if ((thd->client_capabilities & CLIENT_MULTI_QUERIES) &&
+                 lip->multi_statements &&
+                 ! lip->eof())
+             {
+@@ -1778,7 +1771,6 @@ statement:
+ deallocate:
+           deallocate_or_drop PREPARE_SYM ident
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             lex->sql_command= SQLCOM_DEALLOCATE_PREPARE;
+             lex->prepared_stmt_name= $3;
+@@ -1793,7 +1785,6 @@ deallocate_or_drop:
+ prepare:
+           PREPARE_SYM ident FROM prepare_src
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             lex->sql_command= SQLCOM_PREPARE;
+             lex->prepared_stmt_name= $2;
+@@ -1803,14 +1794,12 @@ prepare:
+ prepare_src:
+           TEXT_STRING_sys
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             lex->prepared_stmt_code= $1;
+             lex->prepared_stmt_code_is_varref= FALSE;
+           }
+         | '@' ident_or_text
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             lex->prepared_stmt_code= $2;
+             lex->prepared_stmt_code_is_varref= TRUE;
+@@ -1820,7 +1809,6 @@ prepare_src:
+ execute:
+           EXECUTE_SYM ident
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             lex->sql_command= SQLCOM_EXECUTE;
+             lex->prepared_stmt_name= $2;
+@@ -1955,7 +1943,7 @@ master_def:
+             }
+             if (Lex->mi.heartbeat_period > slave_net_timeout)
+             {
+-              push_warning_printf(YYTHD, MYSQL_ERROR::WARN_LEVEL_WARN,
++              push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
+                                   ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE_MAX,
+                                   ER(ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE_MAX));
+             }
+@@ -1963,7 +1951,7 @@ master_def:
+             {
+               if (Lex->mi.heartbeat_period != 0.0)
+               {
+-                push_warning_printf(YYTHD, MYSQL_ERROR::WARN_LEVEL_WARN,
++                push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
+                                     ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE_MIN,
+                                     ER(ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE_MIN));
+                 Lex->mi.heartbeat_period= 0.0;
+@@ -2038,7 +2026,6 @@ master_file_def:
+ create:
+           CREATE opt_table_options TABLE_SYM opt_if_not_exists table_ident
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             lex->sql_command= SQLCOM_CREATE_TABLE;
+             if (!lex->select_lex.add_table_to_list(thd, $5, NULL,
+@@ -2063,13 +2050,13 @@ create:
+           }
+           create2
+           {
+-            LEX *lex= YYTHD->lex;
++            LEX *lex= thd->lex;
+             lex->current_select= &lex->select_lex; 
+             if ((lex->create_info.used_fields & HA_CREATE_USED_ENGINE) &&
+                 !lex->create_info.db_type)
+             {
+-              lex->create_info.db_type= ha_default_handlerton(YYTHD);
+-              push_warning_printf(YYTHD, MYSQL_ERROR::WARN_LEVEL_WARN,
++              lex->create_info.db_type= ha_default_handlerton(thd);
++              push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
+                                   ER_WARN_USING_OTHER_HANDLER,
+                                   ER(ER_WARN_USING_OTHER_HANDLER),
+                                   ha_resolve_storage_engine_name(lex->create_info.db_type),
+@@ -2199,7 +2186,6 @@ server_option:
+ event_tail:
+           remember_name EVENT_SYM opt_if_not_exists sp_name
+           {
+-            THD *thd= YYTHD;
+             LEX *lex=Lex;
+ 
+             lex->stmt_definition_begin= $1;
+@@ -2266,7 +2252,7 @@ opt_ev_status:
+ ev_starts:
+           /* empty */
+           {
+-            Item *item= new (YYTHD->mem_root) Item_func_now_local();
++            Item *item= new (thd->mem_root) Item_func_now_local();
+             if (item == NULL)
+               MYSQL_YYABORT;
+             Lex->event_parse_data->item_starts= item;
+@@ -2316,7 +2302,6 @@ opt_ev_comment:
+ 
+ ev_sql_stmt:
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             Lex_input_stream *lip= YYLIP;
+ 
+@@ -2359,7 +2344,6 @@ ev_sql_stmt:
+           }
+           ev_sql_stmt_inner
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+ 
+             /* return back to the original memory root ASAP */
+@@ -2418,11 +2402,10 @@ sp_name:
+             $$= new sp_name($1, $3, true);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+-            $$->init_qname(YYTHD);
++            $$->init_qname(thd);
+           }
+         | ident
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             LEX_STRING db;
+             if (check_routine_name(&$1))
+@@ -2492,7 +2475,7 @@ call:
+             lex->sql_command= SQLCOM_CALL;
+             lex->spname= $2;
+             lex->value_list.empty();
+-            sp_add_used_routine(lex, YYTHD, $2, TYPE_ENUM_PROCEDURE);
++            sp_add_used_routine(lex, thd, $2, TYPE_ENUM_PROCEDURE);
+           }
+           opt_sp_cparam_list {}
+         ;
+@@ -2565,7 +2548,7 @@ sp_fdparam:
+                                                      (enum enum_field_types)$3,
+                                                      sp_param_in);
+ 
+-            if (lex->sphead->fill_field_definition(YYTHD, lex,
++            if (lex->sphead->fill_field_definition(thd, lex,
+                                                    (enum enum_field_types) $3,
+                                                    &spvar->field_def))
+             {
+@@ -2602,7 +2585,7 @@ sp_pdparam:
+                                                      (enum enum_field_types)$4,
+                                                      (sp_param_mode_t)$1);
+ 
+-            if (lex->sphead->fill_field_definition(YYTHD, lex,
++            if (lex->sphead->fill_field_definition(thd, lex,
+                                                    (enum enum_field_types) $4,
+                                                    &spvar->field_def))
+             {
+@@ -2665,13 +2648,12 @@ sp_decl:
+           {
+             LEX *lex= Lex;
+ 
+-            lex->sphead->reset_lex(YYTHD);
++            lex->sphead->reset_lex(thd);
+             lex->spcont->declare_var_boundary($2);
+           }
+           type_with_opt_collate
+           sp_opt_default
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= Lex;
+             sp_pcontext *pctx= lex->spcont;
+             uint num_vars= pctx->context_var_count();
+@@ -2697,7 +2679,7 @@ sp_decl:
+               spvar->type= var_type;
+               spvar->dflt= dflt_value_item;
+             
+-              if (lex->sphead->fill_field_definition(YYTHD, lex, var_type,
++              if (lex->sphead->fill_field_definition(thd, lex, var_type,
+                                                      &spvar->field_def))
+               {
+                 MYSQL_YYABORT;
+@@ -2721,7 +2703,7 @@ sp_decl:
+             }
+ 
+             pctx->declare_var_boundary(0);
+-            if (lex->sphead->restore_lex(YYTHD))
++            if (lex->sphead->restore_lex(thd))
+               MYSQL_YYABORT;
+             $$.vars= $2;
+             $$.conds= $$.hndlrs= $$.curs= 0;
+@@ -2736,7 +2718,7 @@ sp_decl:
+               my_error(ER_SP_DUP_COND, MYF(0), $2.str);
+               MYSQL_YYABORT;
+             }
+-            if(YYTHD->lex->spcont->push_cond(&$2, $5))
++            if(thd->lex->spcont->push_cond(&$2, $5))
+               MYSQL_YYABORT;
+             $$.vars= $$.hndlrs= $$.curs= 0;
+             $$.conds= 1;
+@@ -2822,7 +2804,7 @@ sp_decl:
+ 
+ sp_cursor_stmt:
+           {
+-            Lex->sphead->reset_lex(YYTHD);
++            Lex->sphead->reset_lex(thd);
+           }
+           select
+           {
+@@ -2838,7 +2820,7 @@ sp_cursor_stmt:
+             }
+             lex->sp_lex_in_use= TRUE;
+             $$= lex;
+-            if (lex->sphead->restore_lex(YYTHD))
++            if (lex->sphead->restore_lex(thd))
+               MYSQL_YYABORT;
+           }
+         ;
+@@ -2887,7 +2869,7 @@ sp_cond:
+               my_error(ER_WRONG_VALUE, MYF(0), "CONDITION", "0");
+               MYSQL_YYABORT;
+             }
+-            $$= (sp_cond_type_t *)YYTHD->alloc(sizeof(sp_cond_type_t));
++            $$= (sp_cond_type_t *)thd->alloc(sizeof(sp_cond_type_t));
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+             $$->type= sp_cond_type_t::number;
+@@ -2904,7 +2886,7 @@ sqlstate:
+               my_error(ER_SP_BAD_SQLSTATE, MYF(0), $3.str);
+               MYSQL_YYABORT;
+             }
+-            $$= (sp_cond_type_t *)YYTHD->alloc(sizeof(sp_cond_type_t));
++            $$= (sp_cond_type_t *)thd->alloc(sizeof(sp_cond_type_t));
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+             $$->type= sp_cond_type_t::state;
+@@ -2934,21 +2916,21 @@ sp_hcond:
+           }
+         | SQLWARNING_SYM /* SQLSTATEs 01??? */
+           {
+-            $$= (sp_cond_type_t *)YYTHD->alloc(sizeof(sp_cond_type_t));
++            $$= (sp_cond_type_t *)thd->alloc(sizeof(sp_cond_type_t));
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+             $$->type= sp_cond_type_t::warning;
+           }
+         | not FOUND_SYM /* SQLSTATEs 02??? */
+           {
+-            $$= (sp_cond_type_t *)YYTHD->alloc(sizeof(sp_cond_type_t));
++            $$= (sp_cond_type_t *)thd->alloc(sizeof(sp_cond_type_t));
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+             $$->type= sp_cond_type_t::notfound;
+           }
+         | SQLEXCEPTION_SYM /* All other SQLSTATEs */
+           {
+-            $$= (sp_cond_type_t *)YYTHD->alloc(sizeof(sp_cond_type_t));
++            $$= (sp_cond_type_t *)thd->alloc(sizeof(sp_cond_type_t));
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+             $$->type= sp_cond_type_t::exception;
+@@ -2958,7 +2940,6 @@ sp_hcond:
+ signal_stmt:
+           SIGNAL_SYM signal_value opt_set_signal_information
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             Yacc_state *state= & thd->m_parser_state->m_yacc;
+ 
+@@ -3008,7 +2989,7 @@ opt_signal_value:
+ opt_set_signal_information:
+           /* empty */
+           {
+-            YYTHD->m_parser_state->m_yacc.m_set_signal_info.clear();
++            thd->m_parser_state->m_yacc.m_set_signal_info.clear();
+           }
+         | SET signal_information_item_list
+         ;
+@@ -3017,7 +2998,7 @@ signal_information_item_list:
+           signal_condition_information_item_name EQ signal_allowed_expr
+           {
+             Set_signal_information *info;
+-            info= & YYTHD->m_parser_state->m_yacc.m_set_signal_info;
++            info= & thd->m_parser_state->m_yacc.m_set_signal_info;
+             int index= (int) $1;
+             info->clear();
+             info->m_item[index]= $3;
+@@ -3026,7 +3007,7 @@ signal_information_item_list:
+           signal_condition_information_item_name EQ signal_allowed_expr
+           {
+             Set_signal_information *info;
+-            info= & YYTHD->m_parser_state->m_yacc.m_set_signal_info;
++            info= & thd->m_parser_state->m_yacc.m_set_signal_info;
+             int index= (int) $3;
+             if (info->m_item[index] != NULL)
+             {
+@@ -3097,7 +3078,6 @@ signal_condition_information_item_name:
+ resignal_stmt:
+           RESIGNAL_SYM opt_signal_value opt_set_signal_information
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             Yacc_state *state= & thd->m_parser_state->m_yacc;
+ 
+@@ -3172,7 +3152,6 @@ sp_proc_stmt_if:
+         
+ sp_proc_stmt_statement:
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             Lex_input_stream *lip= YYLIP;
+ 
+@@ -3181,7 +3160,6 @@ sp_proc_stmt_statement:
+           }
+           statement
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             Lex_input_stream *lip= YYLIP;
+             sp_head *sp= lex->sphead;
+@@ -3228,7 +3206,7 @@ sp_proc_stmt_statement:
+ 
+ sp_proc_stmt_return:
+           RETURN_SYM 
+-          { Lex->sphead->reset_lex(YYTHD); }
++          { Lex->sphead->reset_lex(thd); }
+           expr
+           {
+             LEX *lex= Lex;
+@@ -3250,7 +3228,7 @@ sp_proc_stmt_return:
+                 MYSQL_YYABORT;
+               sp->m_flags|= sp_head::HAS_RETURN;
+             }
+-            if (sp->restore_lex(YYTHD))
++            if (sp->restore_lex(thd))
+               MYSQL_YYABORT;
+           }
+         ;
+@@ -3477,7 +3455,7 @@ sp_fetch_list:
+         ;
+ 
+ sp_if:
+-          { Lex->sphead->reset_lex(YYTHD); }
++          { Lex->sphead->reset_lex(thd); }
+           expr THEN_SYM
+           {
+             LEX *lex= Lex;
+@@ -3491,7 +3469,7 @@ sp_if:
+                 sp->add_cont_backpatch(i) ||
+                 sp->add_instr(i))
+               MYSQL_YYABORT;
+-            if (sp->restore_lex(YYTHD))
++            if (sp->restore_lex(thd))
+               MYSQL_YYABORT;
+           }
+           sp_proc_stmts1
+@@ -3530,7 +3508,7 @@ simple_case_stmt:
+           {
+             LEX *lex= Lex;
+             case_stmt_action_case(lex);
+-            lex->sphead->reset_lex(YYTHD); /* For expr $3 */
++            lex->sphead->reset_lex(thd); /* For expr $3 */
+           }
+           expr
+           {
+@@ -3539,7 +3517,7 @@ simple_case_stmt:
+               MYSQL_YYABORT;
+ 
+             /* For expr $3 */
+-            if (lex->sphead->restore_lex(YYTHD))
++            if (lex->sphead->restore_lex(thd))
+               MYSQL_YYABORT;
+           }
+           simple_when_clause_list
+@@ -3581,7 +3559,7 @@ searched_when_clause_list:
+ simple_when_clause:
+           WHEN_SYM
+           {
+-            Lex->sphead->reset_lex(YYTHD); /* For expr $3 */
++            Lex->sphead->reset_lex(thd); /* For expr $3 */
+           }
+           expr
+           {
+@@ -3591,7 +3569,7 @@ simple_when_clause:
+             if (case_stmt_action_when(lex, $3, true))
+               MYSQL_YYABORT;
+             /* For expr $3 */
+-            if (lex->sphead->restore_lex(YYTHD))
++            if (lex->sphead->restore_lex(thd))
+               MYSQL_YYABORT;
+           }
+           THEN_SYM
+@@ -3606,7 +3584,7 @@ simple_when_clause:
+ searched_when_clause:
+           WHEN_SYM
+           {
+-            Lex->sphead->reset_lex(YYTHD); /* For expr $3 */
++            Lex->sphead->reset_lex(thd); /* For expr $3 */
+           }
+           expr
+           {
+@@ -3614,7 +3592,7 @@ searched_when_clause:
+             if (case_stmt_action_when(lex, $3, false))
+               MYSQL_YYABORT;
+             /* For expr $3 */
+-            if (lex->sphead->restore_lex(YYTHD))
++            if (lex->sphead->restore_lex(thd))
+               MYSQL_YYABORT;
+           }
+           THEN_SYM
+@@ -3778,7 +3756,7 @@ sp_unlabeled_control:
+               MYSQL_YYABORT;
+           }
+         | WHILE_SYM 
+-          { Lex->sphead->reset_lex(YYTHD); }
++          { Lex->sphead->reset_lex(thd); }
+           expr DO_SYM
+           {
+             LEX *lex= Lex;
+@@ -3792,7 +3770,7 @@ sp_unlabeled_control:
+                 sp->new_cont_backpatch(i) ||
+                 sp->add_instr(i))
+               MYSQL_YYABORT;
+-            if (sp->restore_lex(YYTHD))
++            if (sp->restore_lex(thd))
+               MYSQL_YYABORT;
+           }
+           sp_proc_stmts1 END WHILE_SYM
+@@ -3807,7 +3785,7 @@ sp_unlabeled_control:
+             lex->sphead->do_cont_backpatch();
+           }
+         | REPEAT_SYM sp_proc_stmts1 UNTIL_SYM 
+-          { Lex->sphead->reset_lex(YYTHD); }
++          { Lex->sphead->reset_lex(thd); }
+           expr END REPEAT_SYM
+           {
+             LEX *lex= Lex;
+@@ -3819,7 +3797,7 @@ sp_unlabeled_control:
+             if (i == NULL ||
+                 lex->sphead->add_instr(i))
+               MYSQL_YYABORT;
+-            if (lex->sphead->restore_lex(YYTHD))
++            if (lex->sphead->restore_lex(thd))
+               MYSQL_YYABORT;
+             /* We can shortcut the cont_backpatch here */
+             i->m_cont_dest= ip+1;
+@@ -4242,7 +4220,6 @@ create2:
+           create3 {}
+         | LIKE table_ident
+           {
+-            THD *thd= YYTHD;
+             TABLE_LIST *src_table;
+             LEX *lex= thd->lex;
+ 
+@@ -4257,7 +4234,6 @@ create2:
+           }
+         | '(' LIKE table_ident ')'
+           {
+-            THD *thd= YYTHD;
+             TABLE_LIST *src_table;
+             LEX *lex= thd->lex;
+ 
+@@ -4858,7 +4834,7 @@ part_value_expr_item:
+               my_parse_error(ER(ER_WRONG_EXPR_IN_PARTITION_FUNC_ERROR));
+               MYSQL_YYABORT;
+             }
+-            if (part_info->add_column_list_value(YYTHD, part_expr))
++            if (part_info->add_column_list_value(thd, part_expr))
+             {
+               MYSQL_YYABORT;
+             }
+@@ -5252,19 +5228,19 @@ default_collation:
+ storage_engines:
+           ident_or_text
+           {
+-            plugin_ref plugin= ha_resolve_by_name(YYTHD, &$1);
++            plugin_ref plugin= ha_resolve_by_name(thd, &$1);
+ 
+             if (plugin)
+               $$= plugin_data(plugin, handlerton*);
+             else
+             {
+-              if (YYTHD->variables.sql_mode & MODE_NO_ENGINE_SUBSTITUTION)
++              if (thd->variables.sql_mode & MODE_NO_ENGINE_SUBSTITUTION)
+               {
+                 my_error(ER_UNKNOWN_STORAGE_ENGINE, MYF(0), $1.str);
+                 MYSQL_YYABORT;
+               }
+               $$= 0;
+-              push_warning_printf(YYTHD, MYSQL_ERROR::WARN_LEVEL_WARN,
++              push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
+                                   ER_UNKNOWN_STORAGE_ENGINE,
+                                   ER(ER_UNKNOWN_STORAGE_ENGINE),
+                                   $1.str);
+@@ -5276,7 +5252,7 @@ known_storage_engines:
+           ident_or_text
+           {
+             plugin_ref plugin;
+-            if ((plugin= ha_resolve_by_name(YYTHD, &$1)))
++            if ((plugin= ha_resolve_by_name(thd, &$1)))
+               $$= plugin_data(plugin, handlerton*);
+             else
+             {
+@@ -5506,7 +5482,7 @@ type:
+               {
+                 char buff[sizeof("YEAR()") + MY_INT64_NUM_DECIMAL_DIGITS + 1];
+                 my_snprintf(buff, sizeof(buff), "YEAR(%lu)", length);
+-                push_warning_printf(YYTHD, MYSQL_ERROR::WARN_LEVEL_NOTE,
++                push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
+                                     ER_WARN_DEPRECATED_SYNTAX,
+                                     ER(ER_WARN_DEPRECATED_SYNTAX),
+                                     buff, "YEAR(4)");
+@@ -5520,7 +5496,7 @@ type:
+           { $$=MYSQL_TYPE_TIME; }
+         | TIMESTAMP
+           {
+-            if (YYTHD->variables.sql_mode & MODE_MAXDB)
++            if (thd->variables.sql_mode & MODE_MAXDB)
+               $$=MYSQL_TYPE_DATETIME;
+             else
+             {
+@@ -5652,7 +5628,7 @@ int_type:
+ real_type:
+           REAL
+           {
+-            $$= YYTHD->variables.sql_mode & MODE_REAL_AS_FLOAT ?
++            $$= thd->variables.sql_mode & MODE_REAL_AS_FLOAT ?
+               MYSQL_TYPE_FLOAT : MYSQL_TYPE_DOUBLE;
+           }
+         | DOUBLE_SYM
+@@ -5727,7 +5703,7 @@ attribute:
+         | DEFAULT now_or_signed_literal { Lex->default_value=$2; }
+         | ON UPDATE_SYM NOW_SYM optional_braces
+           {
+-            Item *item= new (YYTHD->mem_root) Item_func_now_local();
++            Item *item= new (thd->mem_root) Item_func_now_local();
+             if (item == NULL)
+               MYSQL_YYABORT;
+             Lex->on_update_value= item;
+@@ -5798,7 +5774,7 @@ type_with_opt_collate:
+ now_or_signed_literal:
+           NOW_SYM optional_braces
+           {
+-            $$= new (YYTHD->mem_root) Item_func_now_local();
++            $$= new (thd->mem_root) Item_func_now_local();
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+@@ -6217,7 +6193,6 @@ string_list:
+ alter:
+           ALTER opt_ignore TABLE_SYM table_ident
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             lex->name.str= 0;
+             lex->name.length= 0;
+@@ -6243,7 +6218,6 @@ alter:
+           }
+           alter_commands
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             if (!lex->m_stmt)
+             {
+@@ -6356,7 +6330,7 @@ alter:
+               Event_parse_data.
+             */
+ 
+-            if (!(Lex->event_parse_data= Event_parse_data::new_instance(YYTHD)))
++            if (!(Lex->event_parse_data= Event_parse_data::new_instance(thd)))
+               MYSQL_YYABORT;
+             Lex->event_parse_data->identifier= $4;
+ 
+@@ -6471,7 +6445,6 @@ alter_commands:
+         | OPTIMIZE PARTITION_SYM opt_no_write_to_binlog
+           all_or_alt_part_name_list
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             lex->no_write_to_binlog= $3;
+             lex->check_opt.init();
+@@ -6485,7 +6458,6 @@ alter_commands:
+         | ANALYZE_SYM PARTITION_SYM opt_no_write_to_binlog
+           all_or_alt_part_name_list
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             lex->no_write_to_binlog= $3;
+             lex->check_opt.init();
+@@ -6497,7 +6469,6 @@ alter_commands:
+           }
+         | CHECK_SYM PARTITION_SYM all_or_alt_part_name_list
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             lex->check_opt.init();
+             DBUG_ASSERT(!lex->m_stmt);
+@@ -6510,7 +6481,6 @@ alter_commands:
+         | REPAIR PARTITION_SYM opt_no_write_to_binlog
+           all_or_alt_part_name_list
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             lex->no_write_to_binlog= $3;
+             lex->check_opt.init();
+@@ -6530,7 +6500,6 @@ alter_commands:
+           }
+         | TRUNCATE_SYM PARTITION_SYM all_or_alt_part_name_list
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             lex->check_opt.init();
+             DBUG_ASSERT(!lex->m_stmt);
+@@ -6785,7 +6754,6 @@ alter_list_item:
+           {
+             if (!$4)
+             {
+-              THD *thd= YYTHD;
+               $4= thd->variables.collation_database;
+             }
+             $5= $5 ? $5 : $4;
+@@ -6980,7 +6948,6 @@ repair:
+           }
+           table_list opt_mi_repair_type
+           {
+-            THD *thd= YYTHD;
+             LEX* lex= thd->lex;
+             DBUG_ASSERT(!lex->m_stmt);
+             lex->m_stmt= new (thd->mem_root) Repair_table_statement(lex);
+@@ -7018,7 +6985,6 @@ analyze:
+           }
+           table_list
+           {
+-            THD *thd= YYTHD;
+             LEX* lex= thd->lex;
+             DBUG_ASSERT(!lex->m_stmt);
+             lex->m_stmt= new (thd->mem_root) Analyze_table_statement(lex);
+@@ -7053,7 +7019,6 @@ check:
+           }
+           table_list opt_mi_check_type
+           {
+-            THD *thd= YYTHD;
+             LEX* lex= thd->lex;
+             DBUG_ASSERT(!lex->m_stmt);
+             lex->m_stmt= new (thd->mem_root) Check_table_statement(lex);
+@@ -7094,7 +7059,6 @@ optimize:
+           }
+           table_list
+           {
+-            THD *thd= YYTHD;
+             LEX* lex= thd->lex;
+             DBUG_ASSERT(!lex->m_stmt);
+             lex->m_stmt= new (thd->mem_root) Optimize_table_statement(lex);
+@@ -7179,7 +7143,7 @@ keycache_list:
+ assign_to_keycache:
+           table_ident cache_keys_spec
+           {
+-            if (!Select->add_table_to_list(YYTHD, $1, NULL, 0, TL_READ,
++            if (!Select->add_table_to_list(thd, $1, NULL, 0, TL_READ,
+                                            MDL_SHARED_READ,
+                                            Select->pop_index_hints()))
+               MYSQL_YYABORT;
+@@ -7189,7 +7153,7 @@ assign_to_keycache:
+ assign_to_keycache_parts:
+           table_ident adm_partition cache_keys_spec
+           {
+-            if (!Select->add_table_to_list(YYTHD, $1, NULL, 0, TL_READ, 
++            if (!Select->add_table_to_list(thd, $1, NULL, 0, TL_READ,
+                                            MDL_SHARED_READ,
+                                            Select->pop_index_hints()))
+               MYSQL_YYABORT;
+@@ -7225,7 +7189,7 @@ preload_list:
+ preload_keys:
+           table_ident cache_keys_spec opt_ignore_leaves
+           {
+-            if (!Select->add_table_to_list(YYTHD, $1, NULL, $3, TL_READ,
++            if (!Select->add_table_to_list(thd, $1, NULL, $3, TL_READ,
+                                            MDL_SHARED_READ,
+                                            Select->pop_index_hints()))
+               MYSQL_YYABORT;
+@@ -7235,7 +7199,7 @@ preload_keys:
+ preload_keys_parts:
+           table_ident adm_partition cache_keys_spec opt_ignore_leaves
+           {
+-            if (!Select->add_table_to_list(YYTHD, $1, NULL, $4, TL_READ,
++            if (!Select->add_table_to_list(thd, $1, NULL, $4, TL_READ,
+                                            MDL_SHARED_READ,
+                                            Select->pop_index_hints()))
+               MYSQL_YYABORT;
+@@ -7252,7 +7216,7 @@ adm_partition:
+ 
+ cache_keys_spec:
+           {
+-            Lex->select_lex.alloc_index_hints(YYTHD);
++            Lex->select_lex.alloc_index_hints(thd);
+             Select->set_index_hint_type(INDEX_HINT_USE, 
+                                         old_mode ? 
+                                         INDEX_HINT_MASK_JOIN : 
+@@ -7471,7 +7435,6 @@ select_item_list:
+         | select_item
+         | '*'
+           {
+-            THD *thd= YYTHD;
+             Item *item= new (thd->mem_root)
+                           Item_field(&thd->lex->current_select->context,
+                                      NULL, NULL, "*");
+@@ -7486,14 +7449,12 @@ select_item_list:
+ select_item:
+           remember_name table_wild remember_end
+           {
+-            THD *thd= YYTHD;
+ 
+             if (add_item_to_list(thd, $2))
+               MYSQL_YYABORT;
+           }
+         | remember_name expr remember_end select_alias
+           {
+-            THD *thd= YYTHD;
+             DBUG_ASSERT($1 < $3);
+ 
+             if (add_item_to_list(thd, $2))
+@@ -7589,7 +7550,7 @@ expr:
+             else
+             {
+               /* X OR Y */
+-              $$ = new (YYTHD->mem_root) Item_cond_or($1, $3);
++              $$ = new (thd->mem_root) Item_cond_or($1, $3);
+               if ($$ == NULL)
+                 MYSQL_YYABORT;
+             }
+@@ -7597,7 +7558,7 @@ expr:
+         | expr XOR expr %prec XOR
+           {
+             /* XOR is a proprietary extension */
+-            $$ = new (YYTHD->mem_root) Item_cond_xor($1, $3);
++            $$ = new (thd->mem_root) Item_cond_xor($1, $3);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+@@ -7639,50 +7600,50 @@ expr:
+             else
+             {
+               /* X AND Y */
+-              $$ = new (YYTHD->mem_root) Item_cond_and($1, $3);
++              $$ = new (thd->mem_root) Item_cond_and($1, $3);
+               if ($$ == NULL)
+                 MYSQL_YYABORT;
+             }
+           }
+         | NOT_SYM expr %prec NOT_SYM
+           {
+-            $$= negate_expression(YYTHD, $2);
++            $$= negate_expression(thd, $2);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | bool_pri IS TRUE_SYM %prec IS
+           {
+-            $$= new (YYTHD->mem_root) Item_func_istrue($1);
++            $$= new (thd->mem_root) Item_func_istrue($1);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | bool_pri IS not TRUE_SYM %prec IS
+           {
+-            $$= new (YYTHD->mem_root) Item_func_isnottrue($1);
++            $$= new (thd->mem_root) Item_func_isnottrue($1);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | bool_pri IS FALSE_SYM %prec IS
+           {
+-            $$= new (YYTHD->mem_root) Item_func_isfalse($1);
++            $$= new (thd->mem_root) Item_func_isfalse($1);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | bool_pri IS not FALSE_SYM %prec IS
+           {
+-            $$= new (YYTHD->mem_root) Item_func_isnotfalse($1);
++            $$= new (thd->mem_root) Item_func_isnotfalse($1);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | bool_pri IS UNKNOWN_SYM %prec IS
+           {
+-            $$= new (YYTHD->mem_root) Item_func_isnull($1);
++            $$= new (thd->mem_root) Item_func_isnull($1);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | bool_pri IS not UNKNOWN_SYM %prec IS
+           {
+-            $$= new (YYTHD->mem_root) Item_func_isnotnull($1);
++            $$= new (thd->mem_root) Item_func_isnotnull($1);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+@@ -7692,19 +7653,19 @@ expr:
+ bool_pri:
+           bool_pri IS NULL_SYM %prec IS
+           {
+-            $$= new (YYTHD->mem_root) Item_func_isnull($1);
++            $$= new (thd->mem_root) Item_func_isnull($1);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | bool_pri IS not NULL_SYM %prec IS
+           {
+-            $$= new (YYTHD->mem_root) Item_func_isnotnull($1);
++            $$= new (thd->mem_root) Item_func_isnotnull($1);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | bool_pri EQUAL_SYM predicate %prec EQUAL_SYM
+           {
+-            $$= new (YYTHD->mem_root) Item_func_equal($1,$3);
++            $$= new (thd->mem_root) Item_func_equal($1,$3);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+@@ -7726,13 +7687,12 @@ bool_pri:
+ predicate:
+           bit_expr IN_SYM '(' subselect ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_in_subselect($1, $4);
++            $$= new (thd->mem_root) Item_in_subselect($1, $4);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | bit_expr not IN_SYM '(' subselect ')'
+           {
+-            THD *thd= YYTHD;
+             Item *item= new (thd->mem_root) Item_in_subselect($1, $5);
+             if (item == NULL)
+               MYSQL_YYABORT;
+@@ -7742,7 +7702,7 @@ predicate:
+           }
+         | bit_expr IN_SYM '(' expr ')'
+           {
+-            $$= handle_sql2003_note184_exception(YYTHD, $1, true, $4);
++            $$= handle_sql2003_note184_exception(thd, $1, true, $4);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+@@ -7750,13 +7710,13 @@ predicate:
+           { 
+             $6->push_front($4);
+             $6->push_front($1);
+-            $$= new (YYTHD->mem_root) Item_func_in(*$6);
++            $$= new (thd->mem_root) Item_func_in(*$6);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | bit_expr not IN_SYM '(' expr ')'
+           {
+-            $$= handle_sql2003_note184_exception(YYTHD, $1, false, $5);
++            $$= handle_sql2003_note184_exception(thd, $1, false, $5);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+@@ -7764,7 +7724,7 @@ predicate:
+           {
+             $7->push_front($5);
+             $7->push_front($1);
+-            Item_func_in *item = new (YYTHD->mem_root) Item_func_in(*$7);
++            Item_func_in *item = new (thd->mem_root) Item_func_in(*$7);
+             if (item == NULL)
+               MYSQL_YYABORT;
+             item->negate();
+@@ -7772,14 +7732,14 @@ predicate:
+           }
+         | bit_expr BETWEEN_SYM bit_expr AND_SYM predicate
+           {
+-            $$= new (YYTHD->mem_root) Item_func_between($1,$3,$5);
++            $$= new (thd->mem_root) Item_func_between($1,$3,$5);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | bit_expr not BETWEEN_SYM bit_expr AND_SYM predicate
+           {
+             Item_func_between *item;
+-            item= new (YYTHD->mem_root) Item_func_between($1,$4,$6);
++            item= new (thd->mem_root) Item_func_between($1,$4,$6);
+             if (item == NULL)
+               MYSQL_YYABORT;
+             item->negate();
+@@ -7787,42 +7747,42 @@ predicate:
+           }
+         | bit_expr SOUNDS_SYM LIKE bit_expr
+           {
+-            Item *item1= new (YYTHD->mem_root) Item_func_soundex($1);
+-            Item *item4= new (YYTHD->mem_root) Item_func_soundex($4);
++            Item *item1= new (thd->mem_root) Item_func_soundex($1);
++            Item *item4= new (thd->mem_root) Item_func_soundex($4);
+             if ((item1 == NULL) || (item4 == NULL))
+               MYSQL_YYABORT;
+-            $$= new (YYTHD->mem_root) Item_func_eq(item1, item4);
++            $$= new (thd->mem_root) Item_func_eq(item1, item4);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | bit_expr LIKE simple_expr opt_escape
+           {
+-            $$= new (YYTHD->mem_root) Item_func_like($1,$3,$4,Lex->escape_used);
++            $$= new (thd->mem_root) Item_func_like($1,$3,$4,Lex->escape_used);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | bit_expr not LIKE simple_expr opt_escape
+           {
+-            Item *item= new (YYTHD->mem_root) Item_func_like($1,$4,$5,
++            Item *item= new (thd->mem_root) Item_func_like($1,$4,$5,
+                                                              Lex->escape_used);
+             if (item == NULL)
+               MYSQL_YYABORT;
+-            $$= new (YYTHD->mem_root) Item_func_not(item);
++            $$= new (thd->mem_root) Item_func_not(item);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | bit_expr REGEXP bit_expr
+           {
+-            $$= new (YYTHD->mem_root) Item_func_regex($1,$3);
++            $$= new (thd->mem_root) Item_func_regex($1,$3);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | bit_expr not REGEXP bit_expr
+           {
+-            Item *item= new (YYTHD->mem_root) Item_func_regex($1,$4);
++            Item *item= new (thd->mem_root) Item_func_regex($1,$4);
+             if (item == NULL)
+               MYSQL_YYABORT;
+-            $$= negate_expression(YYTHD, item);
++            $$= negate_expression(thd, item);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+@@ -7832,85 +7792,85 @@ predicate:
+ bit_expr:
+           bit_expr '|' bit_expr %prec '|'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_bit_or($1,$3);
++            $$= new (thd->mem_root) Item_func_bit_or($1,$3);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | bit_expr '&' bit_expr %prec '&'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_bit_and($1,$3);
++            $$= new (thd->mem_root) Item_func_bit_and($1,$3);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | bit_expr SHIFT_LEFT bit_expr %prec SHIFT_LEFT
+           {
+-            $$= new (YYTHD->mem_root) Item_func_shift_left($1,$3);
++            $$= new (thd->mem_root) Item_func_shift_left($1,$3);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | bit_expr SHIFT_RIGHT bit_expr %prec SHIFT_RIGHT
+           {
+-            $$= new (YYTHD->mem_root) Item_func_shift_right($1,$3);
++            $$= new (thd->mem_root) Item_func_shift_right($1,$3);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | bit_expr '+' bit_expr %prec '+'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_plus($1,$3);
++            $$= new (thd->mem_root) Item_func_plus($1,$3);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | bit_expr '-' bit_expr %prec '-'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_minus($1,$3);
++            $$= new (thd->mem_root) Item_func_minus($1,$3);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | bit_expr '+' INTERVAL_SYM expr interval %prec '+'
+           {
+-            $$= new (YYTHD->mem_root) Item_date_add_interval($1,$4,$5,0);
++            $$= new (thd->mem_root) Item_date_add_interval($1,$4,$5,0);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | bit_expr '-' INTERVAL_SYM expr interval %prec '-'
+           {
+-            $$= new (YYTHD->mem_root) Item_date_add_interval($1,$4,$5,1);
++            $$= new (thd->mem_root) Item_date_add_interval($1,$4,$5,1);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | bit_expr '*' bit_expr %prec '*'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_mul($1,$3);
++            $$= new (thd->mem_root) Item_func_mul($1,$3);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | bit_expr '/' bit_expr %prec '/'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_div($1,$3);
++            $$= new (thd->mem_root) Item_func_div($1,$3);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | bit_expr '%' bit_expr %prec '%'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_mod($1,$3);
++            $$= new (thd->mem_root) Item_func_mod($1,$3);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | bit_expr DIV_SYM bit_expr %prec DIV_SYM
+           {
+-            $$= new (YYTHD->mem_root) Item_func_int_div($1,$3);
++            $$= new (thd->mem_root) Item_func_int_div($1,$3);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | bit_expr MOD_SYM bit_expr %prec MOD_SYM
+           {
+-            $$= new (YYTHD->mem_root) Item_func_mod($1,$3);
++            $$= new (thd->mem_root) Item_func_mod($1,$3);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | bit_expr '^' bit_expr
+           {
+-            $$= new (YYTHD->mem_root) Item_func_bit_xor($1,$3);
++            $$= new (thd->mem_root) Item_func_bit_xor($1,$3);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+@@ -7959,7 +7919,6 @@ simple_expr:
+         | function_call_conflict
+         | simple_expr COLLATE_SYM ident_or_text %prec NEG
+           {
+-            THD *thd= YYTHD;
+             Item *i1= new (thd->mem_root) Item_string($3.str,
+                                                       $3.length,
+                                                       thd->charset());
+@@ -7975,7 +7934,7 @@ simple_expr:
+         | sum_expr
+         | simple_expr OR_OR_SYM simple_expr
+           {
+-            $$= new (YYTHD->mem_root) Item_func_concat($1, $3);
++            $$= new (thd->mem_root) Item_func_concat($1, $3);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+@@ -7985,25 +7944,25 @@ simple_expr:
+           }
+         | '-' simple_expr %prec NEG
+           {
+-            $$= new (YYTHD->mem_root) Item_func_neg($2);
++            $$= new (thd->mem_root) Item_func_neg($2);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | '~' simple_expr %prec NEG
+           {
+-            $$= new (YYTHD->mem_root) Item_func_bit_neg($2);
++            $$= new (thd->mem_root) Item_func_bit_neg($2);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | not2 simple_expr %prec NEG
+           {
+-            $$= negate_expression(YYTHD, $2);
++            $$= negate_expression(thd, $2);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | '(' subselect ')'
+           { 
+-            $$= new (YYTHD->mem_root) Item_singlerow_subselect($2);
++            $$= new (thd->mem_root) Item_singlerow_subselect($2);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+@@ -8012,20 +7971,20 @@ simple_expr:
+         | '(' expr ',' expr_list ')'
+           {
+             $4->push_front($2);
+-            $$= new (YYTHD->mem_root) Item_row(*$4);
++            $$= new (thd->mem_root) Item_row(*$4);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | ROW_SYM '(' expr ',' expr_list ')'
+           {
+             $5->push_front($3);
+-            $$= new (YYTHD->mem_root) Item_row(*$5);
++            $$= new (thd->mem_root) Item_row(*$5);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | EXISTS '(' subselect ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_exists_subselect($3);
++            $$= new (thd->mem_root) Item_exists_subselect($3);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+@@ -8034,7 +7993,7 @@ simple_expr:
+         | MATCH ident_list_arg AGAINST '(' bit_expr fulltext_options ')'
+           {
+             $2->push_front($5);
+-            Item_func_match *i1= new (YYTHD->mem_root) Item_func_match(*$2, $6);
++            Item_func_match *i1= new (thd->mem_root) Item_func_match(*$2, $6);
+             if (i1 == NULL)
+               MYSQL_YYABORT;
+             Select->add_ftfunc_to_list(i1);
+@@ -8042,7 +8001,7 @@ simple_expr:
+           }
+         | BINARY simple_expr %prec NEG
+           {
+-            $$= create_func_cast(YYTHD, $2, ITEM_CAST_CHAR, NULL, NULL,
++            $$= create_func_cast(thd, $2, ITEM_CAST_CHAR, NULL, NULL,
+                                  &my_charset_bin);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+@@ -8050,27 +8009,27 @@ simple_expr:
+         | CAST_SYM '(' expr AS cast_type ')'
+           {
+             LEX *lex= Lex;
+-            $$= create_func_cast(YYTHD, $3, $5, lex->length, lex->dec,
++            $$= create_func_cast(thd, $3, $5, lex->length, lex->dec,
+                                  lex->charset);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | CASE_SYM opt_expr when_list opt_else END
+           {
+-            $$= new (YYTHD->mem_root) Item_func_case(* $3, $2, $4 );
++            $$= new (thd->mem_root) Item_func_case(* $3, $2, $4 );
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | CONVERT_SYM '(' expr ',' cast_type ')'
+           {
+-            $$= create_func_cast(YYTHD, $3, $5, Lex->length, Lex->dec,
++            $$= create_func_cast(thd, $3, $5, Lex->length, Lex->dec,
+                                  Lex->charset);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | CONVERT_SYM '(' expr USING charset_name ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_conv_charset($3,$5);
++            $$= new (thd->mem_root) Item_func_conv_charset($3,$5);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+@@ -8083,14 +8042,14 @@ simple_expr:
+               my_error(ER_WRONG_COLUMN_NAME, MYF(0), il->my_name()->str);
+               MYSQL_YYABORT;
+             }
+-            $$= new (YYTHD->mem_root) Item_default_value(Lex->current_context(),
++            $$= new (thd->mem_root) Item_default_value(Lex->current_context(),
+                                                          $3);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | VALUES '(' simple_ident_nospvar ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_insert_value(Lex->current_context(),
++            $$= new (thd->mem_root) Item_insert_value(Lex->current_context(),
+                                                         $3);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+@@ -8098,7 +8057,7 @@ simple_expr:
+         | INTERVAL_SYM expr interval '+' expr %prec INTERVAL_SYM
+           /* we cannot put interval before - */
+           {
+-            $$= new (YYTHD->mem_root) Item_date_add_interval($5,$2,$3,0);
++            $$= new (thd->mem_root) Item_date_add_interval($5,$2,$3,0);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+@@ -8113,19 +8072,19 @@ simple_expr:
+ function_call_keyword:
+           CHAR_SYM '(' expr_list ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_char(*$3);
++            $$= new (thd->mem_root) Item_func_char(*$3);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | CHAR_SYM '(' expr_list USING charset_name ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_char(*$3, $5);
++            $$= new (thd->mem_root) Item_func_char(*$3, $5);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | CURRENT_USER optional_braces
+           {
+-            $$= new (YYTHD->mem_root) Item_func_current_user(Lex->current_context());
++            $$= new (thd->mem_root) Item_func_current_user(Lex->current_context());
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+             Lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_SYSTEM_FUNCTION);
+@@ -8133,31 +8092,30 @@ function_call_keyword:
+           }
+         | DATE_SYM '(' expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_date_typecast($3);
++            $$= new (thd->mem_root) Item_date_typecast($3);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | DAY_SYM '(' expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_dayofmonth($3);
++            $$= new (thd->mem_root) Item_func_dayofmonth($3);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | HOUR_SYM '(' expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_hour($3);
++            $$= new (thd->mem_root) Item_func_hour($3);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | INSERT '(' expr ',' expr ',' expr ',' expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_insert($3,$5,$7,$9);
++            $$= new (thd->mem_root) Item_func_insert($3,$5,$7,$9);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | INTERVAL_SYM '(' expr ',' expr ')' %prec INTERVAL_SYM
+           {
+-            THD *thd= YYTHD;
+             List<Item> *list= new (thd->mem_root) List<Item>;
+             if (list == NULL)
+               MYSQL_YYABORT;
+@@ -8172,7 +8130,6 @@ function_call_keyword:
+           }
+         | INTERVAL_SYM '(' expr ',' expr ',' expr_list ')' %prec INTERVAL_SYM
+           {
+-            THD *thd= YYTHD;
+             $7->push_front($5);
+             $7->push_front($3);
+             Item_row *item= new (thd->mem_root) Item_row(*$7);
+@@ -8184,103 +8141,103 @@ function_call_keyword:
+           }
+         | LEFT '(' expr ',' expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_left($3,$5);
++            $$= new (thd->mem_root) Item_func_left($3,$5);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | MINUTE_SYM '(' expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_minute($3);
++            $$= new (thd->mem_root) Item_func_minute($3);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | MONTH_SYM '(' expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_month($3);
++            $$= new (thd->mem_root) Item_func_month($3);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | RIGHT '(' expr ',' expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_right($3,$5);
++            $$= new (thd->mem_root) Item_func_right($3,$5);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | SECOND_SYM '(' expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_second($3);
++            $$= new (thd->mem_root) Item_func_second($3);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | TIME_SYM '(' expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_time_typecast($3);
++            $$= new (thd->mem_root) Item_time_typecast($3);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | TIMESTAMP '(' expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_datetime_typecast($3);
++            $$= new (thd->mem_root) Item_datetime_typecast($3);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | TIMESTAMP '(' expr ',' expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_add_time($3, $5, 1, 0);
++            $$= new (thd->mem_root) Item_func_add_time($3, $5, 1, 0);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | TRIM '(' expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_trim($3);
++            $$= new (thd->mem_root) Item_func_trim($3);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | TRIM '(' LEADING expr FROM expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_ltrim($6,$4);
++            $$= new (thd->mem_root) Item_func_ltrim($6,$4);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | TRIM '(' TRAILING expr FROM expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_rtrim($6,$4);
++            $$= new (thd->mem_root) Item_func_rtrim($6,$4);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | TRIM '(' BOTH expr FROM expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_trim($6,$4);
++            $$= new (thd->mem_root) Item_func_trim($6,$4);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | TRIM '(' LEADING FROM expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_ltrim($5);
++            $$= new (thd->mem_root) Item_func_ltrim($5);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | TRIM '(' TRAILING FROM expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_rtrim($5);
++            $$= new (thd->mem_root) Item_func_rtrim($5);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | TRIM '(' BOTH FROM expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_trim($5);
++            $$= new (thd->mem_root) Item_func_trim($5);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | TRIM '(' expr FROM expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_trim($5,$3);
++            $$= new (thd->mem_root) Item_func_trim($5,$3);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | USER '(' ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_user();
++            $$= new (thd->mem_root) Item_func_user();
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+             Lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_SYSTEM_FUNCTION);
+@@ -8288,7 +8245,7 @@ function_call_keyword:
+           }
+         | YEAR_SYM '(' expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_year($3);
++            $$= new (thd->mem_root) Item_func_year($3);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+@@ -8309,34 +8266,34 @@ function_call_keyword:
+ function_call_nonkeyword:
+           ADDDATE_SYM '(' expr ',' expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_date_add_interval($3, $5,
++            $$= new (thd->mem_root) Item_date_add_interval($3, $5,
+                                                              INTERVAL_DAY, 0);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | ADDDATE_SYM '(' expr ',' INTERVAL_SYM expr interval ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_date_add_interval($3, $6, $7, 0);
++            $$= new (thd->mem_root) Item_date_add_interval($3, $6, $7, 0);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | CURDATE optional_braces
+           {
+-            $$= new (YYTHD->mem_root) Item_func_curdate_local();
++            $$= new (thd->mem_root) Item_func_curdate_local();
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+             Lex->safe_to_cache_query=0;
+           }
+         | CURTIME optional_braces
+           {
+-            $$= new (YYTHD->mem_root) Item_func_curtime_local();
++            $$= new (thd->mem_root) Item_func_curtime_local();
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+             Lex->safe_to_cache_query=0;
+           }
+         | CURTIME '(' expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_curtime_local($3);
++            $$= new (thd->mem_root) Item_func_curtime_local($3);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+             Lex->safe_to_cache_query=0;
+@@ -8344,83 +8301,83 @@ function_call_nonkeyword:
+         | DATE_ADD_INTERVAL '(' expr ',' INTERVAL_SYM expr interval ')'
+           %prec INTERVAL_SYM
+           {
+-            $$= new (YYTHD->mem_root) Item_date_add_interval($3,$6,$7,0);
++            $$= new (thd->mem_root) Item_date_add_interval($3,$6,$7,0);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | DATE_SUB_INTERVAL '(' expr ',' INTERVAL_SYM expr interval ')'
+           %prec INTERVAL_SYM
+           {
+-            $$= new (YYTHD->mem_root) Item_date_add_interval($3,$6,$7,1);
++            $$= new (thd->mem_root) Item_date_add_interval($3,$6,$7,1);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | EXTRACT_SYM '(' interval FROM expr ')'
+           {
+-            $$=new (YYTHD->mem_root) Item_extract( $3, $5);
++            $$=new (thd->mem_root) Item_extract( $3, $5);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | GET_FORMAT '(' date_time_type  ',' expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_get_format($3, $5);
++            $$= new (thd->mem_root) Item_func_get_format($3, $5);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | NOW_SYM optional_braces
+           {
+-            $$= new (YYTHD->mem_root) Item_func_now_local();
++            $$= new (thd->mem_root) Item_func_now_local();
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+             Lex->safe_to_cache_query=0;
+           }
+         | NOW_SYM '(' expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_now_local($3);
++            $$= new (thd->mem_root) Item_func_now_local($3);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+             Lex->safe_to_cache_query=0;
+           }
+         | POSITION_SYM '(' bit_expr IN_SYM expr ')'
+           {
+-            $$ = new (YYTHD->mem_root) Item_func_locate($5,$3);
++            $$ = new (thd->mem_root) Item_func_locate($5,$3);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | SUBDATE_SYM '(' expr ',' expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_date_add_interval($3, $5,
++            $$= new (thd->mem_root) Item_date_add_interval($3, $5,
+                                                              INTERVAL_DAY, 1);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | SUBDATE_SYM '(' expr ',' INTERVAL_SYM expr interval ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_date_add_interval($3, $6, $7, 1);
++            $$= new (thd->mem_root) Item_date_add_interval($3, $6, $7, 1);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | SUBSTRING '(' expr ',' expr ',' expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_substr($3,$5,$7);
++            $$= new (thd->mem_root) Item_func_substr($3,$5,$7);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | SUBSTRING '(' expr ',' expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_substr($3,$5);
++            $$= new (thd->mem_root) Item_func_substr($3,$5);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | SUBSTRING '(' expr FROM expr FOR_SYM expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_substr($3,$5,$7);
++            $$= new (thd->mem_root) Item_func_substr($3,$5,$7);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | SUBSTRING '(' expr FROM expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_substr($3,$5);
++            $$= new (thd->mem_root) Item_func_substr($3,$5);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+@@ -8435,9 +8392,9 @@ function_call_nonkeyword:
+             */
+             Lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_SYSTEM_FUNCTION);
+             if (global_system_variables.sysdate_is_now == 0)
+-              $$= new (YYTHD->mem_root) Item_func_sysdate_local();
++              $$= new (thd->mem_root) Item_func_sysdate_local();
+             else
+-              $$= new (YYTHD->mem_root) Item_func_now_local();
++              $$= new (thd->mem_root) Item_func_now_local();
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+             Lex->safe_to_cache_query=0;
+@@ -8445,42 +8402,42 @@ function_call_nonkeyword:
+         | SYSDATE '(' expr ')'
+           {
+             if (global_system_variables.sysdate_is_now == 0)
+-              $$= new (YYTHD->mem_root) Item_func_sysdate_local($3);
++              $$= new (thd->mem_root) Item_func_sysdate_local($3);
+             else
+-              $$= new (YYTHD->mem_root) Item_func_now_local($3);
++              $$= new (thd->mem_root) Item_func_now_local($3);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+             Lex->safe_to_cache_query=0;
+           }
+         | TIMESTAMP_ADD '(' interval_time_stamp ',' expr ',' expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_date_add_interval($7,$5,$3,0);
++            $$= new (thd->mem_root) Item_date_add_interval($7,$5,$3,0);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | TIMESTAMP_DIFF '(' interval_time_stamp ',' expr ',' expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_timestamp_diff($5,$7,$3);
++            $$= new (thd->mem_root) Item_func_timestamp_diff($5,$7,$3);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | UTC_DATE_SYM optional_braces
+           {
+-            $$= new (YYTHD->mem_root) Item_func_curdate_utc();
++            $$= new (thd->mem_root) Item_func_curdate_utc();
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+             Lex->safe_to_cache_query=0;
+           }
+         | UTC_TIME_SYM optional_braces
+           {
+-            $$= new (YYTHD->mem_root) Item_func_curtime_utc();
++            $$= new (thd->mem_root) Item_func_curtime_utc();
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+             Lex->safe_to_cache_query=0;
+           }
+         | UTC_TIMESTAMP_SYM optional_braces
+           {
+-            $$= new (YYTHD->mem_root) Item_func_now_utc();
++            $$= new (thd->mem_root) Item_func_now_utc();
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+             Lex->safe_to_cache_query=0;
+@@ -8495,62 +8452,61 @@ function_call_nonkeyword:
+ function_call_conflict:
+           ASCII_SYM '(' expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_ascii($3);
++            $$= new (thd->mem_root) Item_func_ascii($3);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | CHARSET '(' expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_charset($3);
++            $$= new (thd->mem_root) Item_func_charset($3);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | COALESCE '(' expr_list ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_coalesce(* $3);
++            $$= new (thd->mem_root) Item_func_coalesce(* $3);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | COLLATION_SYM '(' expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_collation($3);
++            $$= new (thd->mem_root) Item_func_collation($3);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | DATABASE '(' ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_database();
++            $$= new (thd->mem_root) Item_func_database();
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+             Lex->safe_to_cache_query=0;
+           }
+         | IF '(' expr ',' expr ',' expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_if($3,$5,$7);
++            $$= new (thd->mem_root) Item_func_if($3,$5,$7);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | MICROSECOND_SYM '(' expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_microsecond($3);
++            $$= new (thd->mem_root) Item_func_microsecond($3);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | MOD_SYM '(' expr ',' expr ')'
+           {
+-            $$ = new (YYTHD->mem_root) Item_func_mod($3, $5);
++            $$ = new (thd->mem_root) Item_func_mod($3, $5);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | OLD_PASSWORD '(' expr ')'
+           {
+-            $$=  new (YYTHD->mem_root) Item_func_old_password($3);
++            $$=  new (thd->mem_root) Item_func_old_password($3);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | PASSWORD '(' expr ')'
+           {
+-            THD *thd= YYTHD;
+             Item* i1;
+             if (thd->variables.old_passwords)
+               i1= new (thd->mem_root) Item_func_old_password($3);
+@@ -8562,31 +8518,30 @@ function_call_conflict:
+           }
+         | QUARTER_SYM '(' expr ')'
+           {
+-            $$ = new (YYTHD->mem_root) Item_func_quarter($3);
++            $$ = new (thd->mem_root) Item_func_quarter($3);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | REPEAT_SYM '(' expr ',' expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_repeat($3,$5);
++            $$= new (thd->mem_root) Item_func_repeat($3,$5);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | REPLACE '(' expr ',' expr ',' expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_replace($3,$5,$7);
++            $$= new (thd->mem_root) Item_func_replace($3,$5,$7);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | TRUNCATE_SYM '(' expr ',' expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_round($3,$5,1);
++            $$= new (thd->mem_root) Item_func_round($3,$5,1);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | WEEK_SYM '(' expr ')'
+           {
+-            THD *thd= YYTHD;
+             Item *i1= new (thd->mem_root) Item_int((char*) "0",
+                                            thd->variables.default_week_format,
+                                                    1);
+@@ -8598,7 +8553,7 @@ function_call_conflict:
+           }
+         | WEEK_SYM '(' expr ',' expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_week($3,$5);
++            $$= new (thd->mem_root) Item_func_week($3,$5);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+@@ -8620,52 +8575,52 @@ function_call_conflict:
+ geometry_function:
+           CONTAINS_SYM '(' expr ',' expr ')'
+           {
+-            $$= GEOM_NEW(YYTHD,
++            $$= GEOM_NEW(thd,
+                          Item_func_spatial_rel($3, $5,
+                                                Item_func::SP_CONTAINS_FUNC));
+           }
+         | GEOMETRYCOLLECTION '(' expr_list ')'
+           {
+-            $$= GEOM_NEW(YYTHD,
++            $$= GEOM_NEW(thd,
+                          Item_func_spatial_collection(* $3,
+                            Geometry::wkb_geometrycollection,
+                            Geometry::wkb_point));
+           }
+         | LINESTRING '(' expr_list ')'
+           {
+-            $$= GEOM_NEW(YYTHD,
++            $$= GEOM_NEW(thd,
+                          Item_func_spatial_collection(* $3,
+                            Geometry::wkb_linestring,
+                            Geometry::wkb_point));
+           }
+         | MULTILINESTRING '(' expr_list ')'
+           {
+-            $$= GEOM_NEW(YYTHD,
++            $$= GEOM_NEW(thd,
+                          Item_func_spatial_collection(* $3,
+                            Geometry::wkb_multilinestring,
+                            Geometry::wkb_linestring));
+           }
+         | MULTIPOINT '(' expr_list ')'
+           {
+-            $$= GEOM_NEW(YYTHD,
++            $$= GEOM_NEW(thd,
+                          Item_func_spatial_collection(* $3,
+                            Geometry::wkb_multipoint,
+                            Geometry::wkb_point));
+           }
+         | MULTIPOLYGON '(' expr_list ')'
+           {
+-            $$= GEOM_NEW(YYTHD,
++            $$= GEOM_NEW(thd,
+                          Item_func_spatial_collection(* $3,
+                            Geometry::wkb_multipolygon,
+                            Geometry::wkb_polygon));
+           }
+         | POINT_SYM '(' expr ',' expr ')'
+           {
+-            $$= GEOM_NEW(YYTHD, Item_func_point($3,$5));
++            $$= GEOM_NEW(thd, Item_func_point($3,$5));
+           }
+         | POLYGON '(' expr_list ')'
+           {
+-            $$= GEOM_NEW(YYTHD,
++            $$= GEOM_NEW(thd,
+                          Item_func_spatial_collection(* $3,
+                            Geometry::wkb_polygon,
+                            Geometry::wkb_linestring));
+@@ -8703,7 +8658,6 @@ function_call_generic:
+           }
+           opt_udf_expr_list ')'
+           {
+-            THD *thd= YYTHD;
+             Create_func *builder;
+             Item *item= NULL;
+ 
+@@ -8757,7 +8711,6 @@ function_call_generic:
+           }
+         | ident '.' ident '(' opt_expr_list ')'
+           {
+-            THD *thd= YYTHD;
+             Create_qfunc *builder;
+             Item *item= NULL;
+ 
+@@ -8821,7 +8774,7 @@ opt_udf_expr_list:
+ udf_expr_list:
+           udf_expr
+           {
+-            $$= new (YYTHD->mem_root) List<Item>;
++            $$= new (thd->mem_root) List<Item>;
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+             $$->push_back($1);
+@@ -8854,7 +8807,7 @@ udf_expr:
+                remember_name we may get quoted or escaped names.
+             */
+             else if ($2->type() != Item::FIELD_ITEM)
+-              $2->set_name($1, (uint) ($3 - $1), YYTHD->charset());
++              $2->set_name($1, (uint) ($3 - $1), thd->charset());
+             $$= $2;
+           }
+         ;
+@@ -8862,46 +8815,46 @@ udf_expr:
+ sum_expr:
+           AVG_SYM '(' in_sum_expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_sum_avg($3, FALSE);
++            $$= new (thd->mem_root) Item_sum_avg($3, FALSE);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | AVG_SYM '(' DISTINCT in_sum_expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_sum_avg($4, TRUE);
++            $$= new (thd->mem_root) Item_sum_avg($4, TRUE);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | BIT_AND  '(' in_sum_expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_sum_and($3);
++            $$= new (thd->mem_root) Item_sum_and($3);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | BIT_OR  '(' in_sum_expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_sum_or($3);
++            $$= new (thd->mem_root) Item_sum_or($3);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | BIT_XOR  '(' in_sum_expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_sum_xor($3);
++            $$= new (thd->mem_root) Item_sum_xor($3);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | COUNT_SYM '(' opt_all '*' ')'
+           {
+-            Item *item= new (YYTHD->mem_root) Item_int((int32) 0L,1);
++            Item *item= new (thd->mem_root) Item_int((int32) 0L,1);
+             if (item == NULL)
+               MYSQL_YYABORT;
+-            $$= new (YYTHD->mem_root) Item_sum_count(item);
++            $$= new (thd->mem_root) Item_sum_count(item);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | COUNT_SYM '(' in_sum_expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_sum_count($3);
++            $$= new (thd->mem_root) Item_sum_count($3);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+@@ -8911,13 +8864,13 @@ sum_expr:
+           { Select->in_sum_expr--; }
+           ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_sum_count(* $5);
++            $$= new (thd->mem_root) Item_sum_count(* $5);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | MIN_SYM '(' in_sum_expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_sum_min($3);
++            $$= new (thd->mem_root) Item_sum_min($3);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+@@ -8928,55 +8881,55 @@ sum_expr:
+         */
+         | MIN_SYM '(' DISTINCT in_sum_expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_sum_min($4);
++            $$= new (thd->mem_root) Item_sum_min($4);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | MAX_SYM '(' in_sum_expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_sum_max($3);
++            $$= new (thd->mem_root) Item_sum_max($3);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | MAX_SYM '(' DISTINCT in_sum_expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_sum_max($4);
++            $$= new (thd->mem_root) Item_sum_max($4);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | STD_SYM '(' in_sum_expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_sum_std($3, 0);
++            $$= new (thd->mem_root) Item_sum_std($3, 0);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | VARIANCE_SYM '(' in_sum_expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_sum_variance($3, 0);
++            $$= new (thd->mem_root) Item_sum_variance($3, 0);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | STDDEV_SAMP_SYM '(' in_sum_expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_sum_std($3, 1);
++            $$= new (thd->mem_root) Item_sum_std($3, 1);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | VAR_SAMP_SYM '(' in_sum_expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_sum_variance($3, 1);
++            $$= new (thd->mem_root) Item_sum_variance($3, 1);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | SUM_SYM '(' in_sum_expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_sum_sum($3, FALSE);
++            $$= new (thd->mem_root) Item_sum_sum($3, FALSE);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | SUM_SYM '(' DISTINCT in_sum_expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_sum_sum($4, TRUE);
++            $$= new (thd->mem_root) Item_sum_sum($4, TRUE);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+@@ -8988,7 +8941,7 @@ sum_expr:
+           {
+             SELECT_LEX *sel= Select;
+             sel->in_sum_expr--;
+-            $$= new (YYTHD->mem_root)
++            $$= new (thd->mem_root)
+                   Item_func_group_concat(Lex->current_context(), $3, $5,
+                                          sel->gorder_list, $7);
+             if ($$ == NULL)
+@@ -9017,7 +8970,7 @@ variable_aux:
+           ident_or_text SET_VAR expr
+           {
+             Item_func_set_user_var *item;
+-            $$= item= new (YYTHD->mem_root) Item_func_set_user_var($1, $3, false);
++            $$= item= new (thd->mem_root) Item_func_set_user_var($1, $3, false);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+             LEX *lex= Lex;
+@@ -9026,7 +8979,7 @@ variable_aux:
+           }
+         | ident_or_text
+           {
+-            $$= new (YYTHD->mem_root) Item_func_get_user_var($1);
++            $$= new (thd->mem_root) Item_func_get_user_var($1);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+             LEX *lex= Lex;
+@@ -9040,7 +8993,7 @@ variable_aux:
+               my_parse_error(ER(ER_SYNTAX_ERROR));
+               MYSQL_YYABORT;
+             }
+-            if (!($$= get_system_var(YYTHD, $2, $3, $4)))
++            if (!($$= get_system_var(thd, $2, $3, $4)))
+               MYSQL_YYABORT;
+             if (!((Item_func_get_system_var*) $$)->is_written_to_binlog())
+               Lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_SYSTEM_VARIABLE);
+@@ -9055,7 +9008,7 @@ opt_distinct:
+ opt_gconcat_separator:
+           /* empty */
+           {
+-            $$= new (YYTHD->mem_root) String(",", 1, &my_charset_latin1);
++            $$= new (thd->mem_root) String(",", 1, &my_charset_latin1);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+@@ -9082,9 +9035,9 @@ opt_gorder_clause:
+ 
+ gorder_list:
+           gorder_list ',' order_ident order_dir
+-          { if (add_gorder_to_list(YYTHD, $3,(bool) $4)) MYSQL_YYABORT; }
++          { if (add_gorder_to_list(thd, $3,(bool) $4)) MYSQL_YYABORT; }
+         | order_ident order_dir
+-          { if (add_gorder_to_list(YYTHD, $1,(bool) $2)) MYSQL_YYABORT; }
++          { if (add_gorder_to_list(thd, $1,(bool) $2)) MYSQL_YYABORT; }
+         ;
+ 
+ in_sum_expr:
+@@ -9137,7 +9090,7 @@ opt_expr_list:
+ expr_list:
+           expr
+           {
+-            $$= new (YYTHD->mem_root) List<Item>;
++            $$= new (thd->mem_root) List<Item>;
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+             $$->push_back($1);
+@@ -9157,7 +9110,7 @@ ident_list_arg:
+ ident_list:
+           simple_ident
+           {
+-            $$= new (YYTHD->mem_root) List<Item>;
++            $$= new (thd->mem_root) List<Item>;
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+             $$->push_back($1);
+@@ -9257,7 +9210,7 @@ join_table:
+           {
+             MYSQL_YYABORT_UNLESS($1 && $3);
+             /* Change the current name resolution context to a local context. */
+-            if (push_new_name_resolution_context(YYTHD, $1, $3))
++            if (push_new_name_resolution_context(thd, $1, $3))
+               MYSQL_YYABORT;
+             Select->parsing_place= IN_ON;
+           }
+@@ -9272,7 +9225,7 @@ join_table:
+           {
+             MYSQL_YYABORT_UNLESS($1 && $3);
+             /* Change the current name resolution context to a local context. */
+-            if (push_new_name_resolution_context(YYTHD, $1, $3))
++            if (push_new_name_resolution_context(thd, $1, $3))
+               MYSQL_YYABORT;
+             Select->parsing_place= IN_ON;
+           }
+@@ -9302,7 +9255,7 @@ join_table:
+           {
+             MYSQL_YYABORT_UNLESS($1 && $5);
+             /* Change the current name resolution context to a local context. */
+-            if (push_new_name_resolution_context(YYTHD, $1, $5))
++            if (push_new_name_resolution_context(thd, $1, $5))
+               MYSQL_YYABORT;
+             Select->parsing_place= IN_ON;
+           }
+@@ -9338,7 +9291,7 @@ join_table:
+           {
+             MYSQL_YYABORT_UNLESS($1 && $5);
+             /* Change the current name resolution context to a local context. */
+-            if (push_new_name_resolution_context(YYTHD, $1, $5))
++            if (push_new_name_resolution_context(thd, $1, $5))
+               MYSQL_YYABORT;
+             Select->parsing_place= IN_ON;
+           }
+@@ -9393,7 +9346,7 @@ table_factor:
+           }
+           table_ident opt_table_alias opt_key_definition
+           {
+-            if (!($$= Select->add_table_to_list(YYTHD, $2, $3,
++            if (!($$= Select->add_table_to_list(thd, $2, $3,
+                                                 Select->get_table_join_options(),
+                                                 YYPS->m_lock_type,
+                                                 YYPS->m_mdl_type,
+@@ -9700,7 +9653,7 @@ index_hints_list:
+ 
+ opt_index_hints_list:
+           /* empty */
+-        | { Select->alloc_index_hints(YYTHD); } index_hints_list
++        | { Select->alloc_index_hints(thd); } index_hints_list
+         ;
+ 
+ opt_key_definition:
+@@ -9709,15 +9662,15 @@ opt_key_definition:
+         ;
+ 
+ opt_key_usage_list:
+-          /* empty */ { Select->add_index_hint(YYTHD, NULL, 0); }
++          /* empty */ { Select->add_index_hint(thd, NULL, 0); }
+         | key_usage_list {}
+         ;
+ 
+ key_usage_element:
+           ident
+-          { Select->add_index_hint(YYTHD, $1.str, $1.length); }
++          { Select->add_index_hint(thd, $1.str, $1.length); }
+         | PRIMARY_SYM
+-          { Select->add_index_hint(YYTHD, (char *)"PRIMARY", 7); }
++          { Select->add_index_hint(thd, (char *)"PRIMARY", 7); }
+         ;
+ 
+ key_usage_list:
+@@ -9730,7 +9683,7 @@ using_list:
+           {
+             if (!($$= new List<String>))
+               MYSQL_YYABORT;
+-            String *s= new (YYTHD->mem_root) String((const char *) $1.str,
++            String *s= new (thd->mem_root) String((const char *) $1.str,
+                                                     $1.length,
+                                                     system_charset_info);
+             if (s == NULL)
+@@ -9739,7 +9692,7 @@ using_list:
+           }
+         | using_list ',' ident
+           {
+-            String *s= new (YYTHD->mem_root) String((const char *) $3.str,
++            String *s= new (thd->mem_root) String((const char *) $3.str,
+                                                     $3.length,
+                                                     system_charset_info);
+             if (s == NULL)
+@@ -9844,7 +9797,6 @@ opt_escape:
+           }
+         | /* empty */
+           {
+-            THD *thd= YYTHD;
+             Lex->escape_used= FALSE;
+             $$= ((thd->variables.sql_mode & MODE_NO_BACKSLASH_ESCAPES) ?
+                  new (thd->mem_root) Item_string("", 0, &my_charset_latin1) :
+@@ -9865,9 +9817,9 @@ group_clause:
+ 
+ group_list:
+           group_list ',' order_ident order_dir
+-          { if (add_group_to_list(YYTHD, $3,(bool) $4)) MYSQL_YYABORT; }
++          { if (add_group_to_list(thd, $3,(bool) $4)) MYSQL_YYABORT; }
+         | order_ident order_dir
+-          { if (add_group_to_list(YYTHD, $1,(bool) $2)) MYSQL_YYABORT; }
++          { if (add_group_to_list(thd, $1,(bool) $2)) MYSQL_YYABORT; }
+         ;
+ 
+ olap_opt:
+@@ -9928,7 +9880,6 @@ alter_order_list:
+ alter_order_item:
+           simple_ident_nospvar order_dir
+           {
+-            THD *thd= YYTHD;
+             bool ascending= ($2 == 1) ? true : false;
+             if (add_order_to_list(thd, $1, ascending))
+               MYSQL_YYABORT;
+@@ -9981,9 +9932,9 @@ order_clause:
+ 
+ order_list:
+           order_list ',' order_ident order_dir
+-          { if (add_order_to_list(YYTHD, $3,(bool) $4)) MYSQL_YYABORT; }
++          { if (add_order_to_list(thd, $3,(bool) $4)) MYSQL_YYABORT; }
+         | order_ident order_dir
+-          { if (add_order_to_list(YYTHD, $1,(bool) $2)) MYSQL_YYABORT; }
++          { if (add_order_to_list(thd, $1,(bool) $2)) MYSQL_YYABORT; }
+         ;
+ 
+ order_dir:
+@@ -10047,7 +9998,6 @@ limit_option:
+         ident
+         {
+           Item_splocal *splocal;
+-          THD *thd= YYTHD;
+           LEX *lex= thd->lex;
+           Lex_input_stream *lip= & thd->m_parser_state->m_lip;
+           sp_variable_t *spv;
+@@ -10084,19 +10034,19 @@ limit_option:
+         }
+         | ULONGLONG_NUM
+           {
+-            $$= new (YYTHD->mem_root) Item_uint($1.str, $1.length);
++            $$= new (thd->mem_root) Item_uint($1.str, $1.length);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | LONG_NUM
+           {
+-            $$= new (YYTHD->mem_root) Item_uint($1.str, $1.length);
++            $$= new (thd->mem_root) Item_uint($1.str, $1.length);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | NUM
+           {
+-            $$= new (YYTHD->mem_root) Item_uint($1.str, $1.length);
++            $$= new (thd->mem_root) Item_uint($1.str, $1.length);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+@@ -10183,7 +10133,7 @@ procedure_clause:
+             lex->proc_list.elements=0;
+             lex->proc_list.first=0;
+             lex->proc_list.next= &lex->proc_list.first;
+-            Item_field *item= new (YYTHD->mem_root)
++            Item_field *item= new (thd->mem_root)
+                                 Item_field(&lex->current_select->context,
+                                            NULL, NULL, $2.str);
+             if (item == NULL)
+@@ -10208,7 +10158,6 @@ procedure_list2:
+ procedure_item:
+           remember_name expr remember_end
+           {
+-            THD *thd= YYTHD;
+ 
+             if (add_proc_to_list(thd, $2))
+               MYSQL_YYABORT;
+@@ -10383,7 +10332,6 @@ drop:
+           }
+         | DROP FUNCTION_SYM if_exists ident '.' ident
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             sp_name *spname;
+             if ($4.str && check_db_name(&$4))
+@@ -10406,7 +10354,6 @@ drop:
+           }
+         | DROP FUNCTION_SYM if_exists ident
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             LEX_STRING db= {0, 0};
+             sp_name *spname;
+@@ -10491,7 +10438,7 @@ table_list:
+ table_name:
+           table_ident
+           {
+-            if (!Select->add_table_to_list(YYTHD, $1, NULL,
++            if (!Select->add_table_to_list(thd, $1, NULL,
+                                            TL_OPTION_UPDATING,
+                                            YYPS->m_lock_type,
+                                            YYPS->m_mdl_type))
+@@ -10507,7 +10454,7 @@ table_alias_ref_list:
+ table_alias_ref:
+           table_ident_opt_wild
+           {
+-            if (!Select->add_table_to_list(YYTHD, $1, NULL,
++            if (!Select->add_table_to_list(thd, $1, NULL,
+                                            TL_OPTION_UPDATING | TL_OPTION_ALIAS,
+                                            YYPS->m_lock_type,
+                                            YYPS->m_mdl_type))
+@@ -10581,7 +10528,7 @@ insert_lock_option:
+         | DELAYED_SYM
+         {
+           Lex->keyword_delayed_begin_offset= (uint)(YYLIP->get_tok_start() -
+-                                                    YYTHD->query());
++                                                    thd->query());
+           Lex->keyword_delayed_end_offset= Lex->keyword_delayed_begin_offset +
+                                            YYLIP->yyLength() + 1;
+           $$= TL_WRITE_DELAYED;
+@@ -10594,7 +10541,7 @@ replace_lock_option:
+         | DELAYED_SYM
+         {
+           Lex->keyword_delayed_begin_offset= (uint)(YYLIP->get_tok_start() -
+-                                                    YYTHD->query());
++                                                    thd->query());
+           Lex->keyword_delayed_end_offset= Lex->keyword_delayed_begin_offset +
+                                            YYLIP->yyLength() + 1;
+           $$= TL_WRITE_DELAYED;
+@@ -10711,7 +10658,7 @@ expr_or_default:
+           expr { $$= $1;}
+         | DEFAULT
+           {
+-            $$= new (YYTHD->mem_root) Item_default_value(Lex->current_context());
++            $$= new (thd->mem_root) Item_default_value(Lex->current_context());
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+@@ -10764,7 +10711,7 @@ update_list:
+ update_elem:
+           simple_ident_nospvar equal expr_or_default
+           {
+-            if (add_item_to_list(YYTHD, $1) || add_value_to_list(YYTHD, $3))
++            if (add_item_to_list(thd, $1) || add_value_to_list(thd, $3))
+               MYSQL_YYABORT;
+           }
+         ;
+@@ -10809,7 +10756,7 @@ delete:
+ single_multi:
+           FROM table_ident
+           {
+-            if (!Select->add_table_to_list(YYTHD, $2, NULL, TL_OPTION_UPDATING,
++            if (!Select->add_table_to_list(thd, $2, NULL, TL_OPTION_UPDATING,
+                                            YYPS->m_lock_type,
+                                            YYPS->m_mdl_type))
+               MYSQL_YYABORT;
+@@ -10853,7 +10800,7 @@ table_wild_one:
+             Table_ident *ti= new Table_ident($1);
+             if (ti == NULL)
+               MYSQL_YYABORT;
+-            if (!Select->add_table_to_list(YYTHD,
++            if (!Select->add_table_to_list(thd,
+                                            ti,
+                                            NULL,
+                                            TL_OPTION_UPDATING | TL_OPTION_ALIAS,
+@@ -10863,10 +10810,10 @@ table_wild_one:
+           }
+         | ident '.' ident opt_wild
+           {
+-            Table_ident *ti= new Table_ident(YYTHD, $1, $3, 0);
++            Table_ident *ti= new Table_ident(thd, $1, $3, 0);
+             if (ti == NULL)
+               MYSQL_YYABORT;
+-            if (!Select->add_table_to_list(YYTHD,
++            if (!Select->add_table_to_list(thd,
+                                            ti,
+                                            NULL,
+                                            TL_OPTION_UPDATING | TL_OPTION_ALIAS,
+@@ -10906,7 +10853,6 @@ truncate:
+           }
+           table_name
+           {
+-            THD *thd= YYTHD;
+             LEX* lex= thd->lex;
+             DBUG_ASSERT(!lex->m_stmt);
+             lex->m_stmt= new (thd->mem_root) Truncate_statement(lex);
+@@ -11000,7 +10946,7 @@ show_param:
+            {
+              LEX *lex= Lex;
+              lex->sql_command= SQLCOM_SHOW_DATABASES;
+-             if (prepare_schema_table(YYTHD, lex, 0, SCH_SCHEMATA))
++             if (prepare_schema_table(thd, lex, 0, SCH_SCHEMATA))
+                MYSQL_YYABORT;
+            }
+          | opt_full TABLES opt_db wild_and_where
+@@ -11008,7 +10954,7 @@ show_param:
+              LEX *lex= Lex;
+              lex->sql_command= SQLCOM_SHOW_TABLES;
+              lex->select_lex.db= $3;
+-             if (prepare_schema_table(YYTHD, lex, 0, SCH_TABLE_NAMES))
++             if (prepare_schema_table(thd, lex, 0, SCH_TABLE_NAMES))
+                MYSQL_YYABORT;
+            }
+          | opt_var_type TEMPORARY TABLES opt_db
+@@ -11017,7 +10963,7 @@ show_param:
+              lex->sql_command= SQLCOM_SHOW_TEMPORARY_TABLES;
+              lex->option_type= $1;
+              lex->select_lex.db= $4;
+-             if (prepare_schema_table(YYTHD, lex, 0, SCH_TEMPORARY_TABLES))
++             if (prepare_schema_table(thd, lex, 0, SCH_TEMPORARY_TABLES))
+                MYSQL_YYABORT;
+            }
+          | opt_full TRIGGERS_SYM opt_db wild_and_where
+@@ -11025,7 +10971,7 @@ show_param:
+              LEX *lex= Lex;
+              lex->sql_command= SQLCOM_SHOW_TRIGGERS;
+              lex->select_lex.db= $3;
+-             if (prepare_schema_table(YYTHD, lex, 0, SCH_TRIGGERS))
++             if (prepare_schema_table(thd, lex, 0, SCH_TRIGGERS))
+                MYSQL_YYABORT;
+            }
+          | EVENTS_SYM opt_db wild_and_where
+@@ -11033,7 +10979,7 @@ show_param:
+              LEX *lex= Lex;
+              lex->sql_command= SQLCOM_SHOW_EVENTS;
+              lex->select_lex.db= $2;
+-             if (prepare_schema_table(YYTHD, lex, 0, SCH_EVENTS))
++             if (prepare_schema_table(thd, lex, 0, SCH_EVENTS))
+                MYSQL_YYABORT;
+            }
+          | TABLE_SYM STATUS_SYM opt_db wild_and_where
+@@ -11041,7 +10987,7 @@ show_param:
+              LEX *lex= Lex;
+              lex->sql_command= SQLCOM_SHOW_TABLE_STATUS;
+              lex->select_lex.db= $3;
+-             if (prepare_schema_table(YYTHD, lex, 0, SCH_TABLES))
++             if (prepare_schema_table(thd, lex, 0, SCH_TABLES))
+                MYSQL_YYABORT;
+            }
+         | OPEN_SYM TABLES opt_db wild_and_where
+@@ -11049,14 +10995,14 @@ show_param:
+             LEX *lex= Lex;
+             lex->sql_command= SQLCOM_SHOW_OPEN_TABLES;
+             lex->select_lex.db= $3;
+-            if (prepare_schema_table(YYTHD, lex, 0, SCH_OPEN_TABLES))
++            if (prepare_schema_table(thd, lex, 0, SCH_OPEN_TABLES))
+               MYSQL_YYABORT;
+           }
+         | PLUGINS_SYM
+           {
+             LEX *lex= Lex;
+             lex->sql_command= SQLCOM_SHOW_PLUGINS;
+-            if (prepare_schema_table(YYTHD, lex, 0, SCH_PLUGINS))
++            if (prepare_schema_table(thd, lex, 0, SCH_PLUGINS))
+               MYSQL_YYABORT;
+           }
+         | ENGINE_SYM known_storage_engines show_engine_param
+@@ -11069,7 +11015,7 @@ show_param:
+             lex->sql_command= SQLCOM_SHOW_FIELDS;
+             if ($5)
+               $4->change_db($5);
+-            if (prepare_schema_table(YYTHD, lex, $4, SCH_COLUMNS))
++            if (prepare_schema_table(thd, lex, $4, SCH_COLUMNS))
+               MYSQL_YYABORT;
+           }
+         | master_or_binary LOGS_SYM
+@@ -11096,21 +11042,21 @@ show_param:
+             lex->sql_command= SQLCOM_SHOW_KEYS;
+             if ($4)
+               $3->change_db($4);
+-            if (prepare_schema_table(YYTHD, lex, $3, SCH_STATISTICS))
++            if (prepare_schema_table(thd, lex, $3, SCH_STATISTICS))
+               MYSQL_YYABORT;
+           }
+         | opt_storage ENGINES_SYM
+           {
+             LEX *lex=Lex;
+             lex->sql_command= SQLCOM_SHOW_STORAGE_ENGINES;
+-            if (prepare_schema_table(YYTHD, lex, 0, SCH_ENGINES))
++            if (prepare_schema_table(thd, lex, 0, SCH_ENGINES))
+               MYSQL_YYABORT;
+           }
+         | AUTHORS_SYM
+           {
+             LEX *lex=Lex;
+             lex->sql_command= SQLCOM_SHOW_AUTHORS;
+-            push_warning_printf(YYTHD, MYSQL_ERROR::WARN_LEVEL_WARN,
++            push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
+                                 ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT,
+                                 ER(ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT),
+                                 "SHOW AUTHORS");
+@@ -11119,7 +11065,7 @@ show_param:
+           {
+             LEX *lex=Lex;
+             lex->sql_command= SQLCOM_SHOW_CONTRIBUTORS;
+-            push_warning_printf(YYTHD, MYSQL_ERROR::WARN_LEVEL_WARN,
++            push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
+                                 ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT,
+                                 ER(ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT),
+                                 "SHOW CONTRIBUTORS");
+@@ -11143,7 +11089,7 @@ show_param:
+           { 
+             LEX *lex= Lex;
+             lex->sql_command= SQLCOM_SHOW_PROFILE;
+-            if (prepare_schema_table(YYTHD, lex, NULL, SCH_PROFILES) != 0)
++            if (prepare_schema_table(thd, lex, NULL, SCH_PROFILES) != 0)
+               YYABORT;
+           }
+         | opt_var_type STATUS_SYM wild_and_where
+@@ -11151,7 +11097,7 @@ show_param:
+             LEX *lex= Lex;
+             lex->sql_command= SQLCOM_SHOW_STATUS;
+             lex->option_type= $1;
+-            if (prepare_schema_table(YYTHD, lex, 0, SCH_STATUS))
++            if (prepare_schema_table(thd, lex, 0, SCH_STATUS))
+               MYSQL_YYABORT;
+           }
+         | opt_full PROCESSLIST_SYM
+@@ -11161,21 +11107,21 @@ show_param:
+             LEX *lex= Lex;
+             lex->sql_command= SQLCOM_SHOW_VARIABLES;
+             lex->option_type= $1;
+-            if (prepare_schema_table(YYTHD, lex, 0, SCH_VARIABLES))
++            if (prepare_schema_table(thd, lex, 0, SCH_VARIABLES))
+               MYSQL_YYABORT;
+           }
+         | charset wild_and_where
+           {
+             LEX *lex= Lex;
+             lex->sql_command= SQLCOM_SHOW_CHARSETS;
+-            if (prepare_schema_table(YYTHD, lex, 0, SCH_CHARSETS))
++            if (prepare_schema_table(thd, lex, 0, SCH_CHARSETS))
+               MYSQL_YYABORT;
+           }
+         | COLLATION_SYM wild_and_where
+           {
+             LEX *lex= Lex;
+             lex->sql_command= SQLCOM_SHOW_COLLATIONS;
+-            if (prepare_schema_table(YYTHD, lex, 0, SCH_COLLATIONS))
++            if (prepare_schema_table(thd, lex, 0, SCH_COLLATIONS))
+               MYSQL_YYABORT;
+           }
+         | GRANTS
+@@ -11205,7 +11151,7 @@ show_param:
+           {
+             LEX *lex= Lex;
+             lex->sql_command = SQLCOM_SHOW_CREATE;
+-            if (!lex->select_lex.add_table_to_list(YYTHD, $3, NULL,0))
++            if (!lex->select_lex.add_table_to_list(thd, $3, NULL,0))
+               MYSQL_YYABORT;
+             lex->only_view= 0;
+             lex->create_info.storage_media= HA_SM_DEFAULT;
+@@ -11214,7 +11160,7 @@ show_param:
+           {
+             LEX *lex= Lex;
+             lex->sql_command = SQLCOM_SHOW_CREATE;
+-            if (!lex->select_lex.add_table_to_list(YYTHD, $3, NULL, 0))
++            if (!lex->select_lex.add_table_to_list(thd, $3, NULL, 0))
+               MYSQL_YYABORT;
+             lex->only_view= 1;
+           }
+@@ -11236,7 +11182,7 @@ show_param:
+ #ifdef HAVE_RESPONSE_TIME_DISTRIBUTION
+            LEX *lex= Lex;
+            lex->sql_command= SQLCOM_SELECT;
+-           if (prepare_schema_table(YYTHD, lex, 0, SCH_QUERY_RESPONSE_TIME))
++           if (prepare_schema_table(thd, lex, 0, SCH_QUERY_RESPONSE_TIME))
+              MYSQL_YYABORT;
+ #endif // HAVE_RESPONSE_TIME_DISTRIBUTION
+          }
+@@ -11244,35 +11190,35 @@ show_param:
+           {
+            LEX *lex= Lex;
+            Lex->sql_command= SQLCOM_SELECT;
+-           if (prepare_schema_table(YYTHD, lex, 0, SCH_CLIENT_STATS))
++           if (prepare_schema_table(thd, lex, 0, SCH_CLIENT_STATS))
+              MYSQL_YYABORT;
+           }
+         | USER_STATS_SYM wild_and_where
+           {
+            LEX *lex= Lex;
+            lex->sql_command= SQLCOM_SELECT;
+-           if (prepare_schema_table(YYTHD, lex, 0, SCH_USER_STATS))
++           if (prepare_schema_table(thd, lex, 0, SCH_USER_STATS))
+              MYSQL_YYABORT;
+           }
+         | THREAD_STATS_SYM wild_and_where
+           {
+            LEX *lex= Lex;
+            Lex->sql_command= SQLCOM_SELECT;
+-           if (prepare_schema_table(YYTHD, lex, 0, SCH_THREAD_STATS))
++           if (prepare_schema_table(thd, lex, 0, SCH_THREAD_STATS))
+              MYSQL_YYABORT;
+           }
+         | TABLE_STATS_SYM wild_and_where
+           {
+            LEX *lex= Lex;
+            lex->sql_command= SQLCOM_SELECT;
+-           if (prepare_schema_table(YYTHD, lex, 0, SCH_TABLE_STATS))
++           if (prepare_schema_table(thd, lex, 0, SCH_TABLE_STATS))
+              MYSQL_YYABORT;
+           }
+         | INDEX_STATS_SYM wild_and_where
+           {
+            LEX *lex= Lex;
+            lex->sql_command= SQLCOM_SELECT;
+-           if (prepare_schema_table(YYTHD, lex, 0, SCH_INDEX_STATS))
++           if (prepare_schema_table(thd, lex, 0, SCH_INDEX_STATS))
+              MYSQL_YYABORT;
+           }
+         | CREATE PROCEDURE_SYM sp_name
+@@ -11299,14 +11245,14 @@ show_param:
+           {
+             LEX *lex= Lex;
+             lex->sql_command= SQLCOM_SHOW_STATUS_PROC;
+-            if (prepare_schema_table(YYTHD, lex, 0, SCH_PROCEDURES))
++            if (prepare_schema_table(thd, lex, 0, SCH_PROCEDURES))
+               MYSQL_YYABORT;
+           }
+         | FUNCTION_SYM STATUS_SYM wild_and_where
+           {
+             LEX *lex= Lex;
+             lex->sql_command= SQLCOM_SHOW_STATUS_FUNC;
+-            if (prepare_schema_table(YYTHD, lex, 0, SCH_PROCEDURES))
++            if (prepare_schema_table(thd, lex, 0, SCH_PROCEDURES))
+               MYSQL_YYABORT;
+           }
+         | PROCEDURE_SYM CODE_SYM sp_name
+@@ -11374,7 +11320,7 @@ wild_and_where:
+           /* empty */
+         | LIKE TEXT_STRING_sys
+           {
+-            Lex->wild= new (YYTHD->mem_root) String($2.str, $2.length,
++            Lex->wild= new (thd->mem_root) String($2.str, $2.length,
+                                                     system_charset_info);
+             if (Lex->wild == NULL)
+               MYSQL_YYABORT;
+@@ -11397,7 +11343,7 @@ describe:
+             lex->sql_command= SQLCOM_SHOW_FIELDS;
+             lex->select_lex.db= 0;
+             lex->verbose= 0;
+-            if (prepare_schema_table(YYTHD, lex, $2, SCH_COLUMNS))
++            if (prepare_schema_table(thd, lex, $2, SCH_COLUMNS))
+               MYSQL_YYABORT;
+           }
+           opt_describe_column
+@@ -11429,7 +11375,7 @@ opt_describe_column:
+         | text_string { Lex->wild= $1; }
+         | ident
+           {
+-            Lex->wild= new (YYTHD->mem_root) String((const char*) $1.str,
++            Lex->wild= new (thd->mem_root) String((const char*) $1.str,
+                                                     $1.length,
+                                                     system_charset_info);
+             if (Lex->wild == NULL)
+@@ -11647,7 +11593,6 @@ use:
+ load:
+           LOAD data_or_xml
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+ 
+             if (lex->sphead)
+@@ -11670,7 +11615,7 @@ load:
+           opt_duplicate INTO TABLE_SYM table_ident
+           {
+             LEX *lex=Lex;
+-            if (!Select->add_table_to_list(YYTHD, $12, NULL, TL_OPTION_UPDATING,
++            if (!Select->add_table_to_list(thd, $12, NULL, TL_OPTION_UPDATING,
+                                            $4, MDL_SHARED_WRITE))
+               MYSQL_YYABORT;
+             lex->field_list.empty();
+@@ -11813,7 +11758,7 @@ field_or_var:
+           simple_ident_nospvar {$$= $1;}
+         | '@' ident_or_text
+           {
+-            $$= new (YYTHD->mem_root) Item_user_var_as_out_param($2);
++            $$= new (thd->mem_root) Item_user_var_as_out_param($2);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+@@ -11834,16 +11779,16 @@ load_data_set_elem:
+           {
+             LEX *lex= Lex;
+             uint length= (uint) ($5 - $3);
+-            String *val= new (YYTHD->mem_root) String($3,
++            String *val= new (thd->mem_root) String($3,
+                                                       length,
+-                                                      YYTHD->charset());
++                                                      thd->charset());
+             if (val == NULL)
+               MYSQL_YYABORT;
+             if (lex->update_list.push_back($1) ||
+                 lex->value_list.push_back($4) ||
+                 lex->load_set_str_list.push_back(val))
+                 MYSQL_YYABORT;
+-            $4->set_name_no_truncate($3, length, YYTHD->charset());
++            $4->set_name_no_truncate($3, length, thd->charset());
+           }
+         ;
+ 
+@@ -11853,7 +11798,6 @@ text_literal:
+           TEXT_STRING
+           {
+             LEX_STRING tmp;
+-            THD *thd= YYTHD;
+             CHARSET_INFO *cs_con= thd->variables.collation_connection;
+             CHARSET_INFO *cs_cli= thd->variables.character_set_client;
+             uint repertoire= thd->lex->text_string_is_7bit &&
+@@ -11879,7 +11823,7 @@ text_literal:
+             uint repertoire= Lex->text_string_is_7bit ?
+                              MY_REPERTOIRE_ASCII : MY_REPERTOIRE_UNICODE30;
+             DBUG_ASSERT(my_charset_is_ascii_based(national_charset_info));
+-            $$= new (YYTHD->mem_root) Item_string($1.str, $1.length,
++            $$= new (thd->mem_root) Item_string($1.str, $1.length,
+                                                   national_charset_info,
+                                                   DERIVATION_COERCIBLE,
+                                                   repertoire);
+@@ -11888,7 +11832,7 @@ text_literal:
+           }
+         | UNDERSCORE_CHARSET TEXT_STRING
+           {
+-            Item_string *str= new (YYTHD->mem_root) Item_string($2.str,
++            Item_string *str= new (thd->mem_root) Item_string($2.str,
+                                                                 $2.length, $1);
+             if (str == NULL)
+               MYSQL_YYABORT;
+@@ -11907,7 +11851,7 @@ text_literal:
+                  If the string has been pure ASCII so far,
+                  check the new part.
+               */
+-              CHARSET_INFO *cs= YYTHD->variables.collation_connection;
++              CHARSET_INFO *cs= thd->variables.collation_connection;
+               item->collation.repertoire|= my_string_repertoire(cs,
+                                                                 $2.str,
+                                                                 $2.length);
+@@ -11918,15 +11862,15 @@ text_literal:
+ text_string:
+           TEXT_STRING_literal
+           {
+-            $$= new (YYTHD->mem_root) String($1.str,
++            $$= new (thd->mem_root) String($1.str,
+                                              $1.length,
+-                                             YYTHD->variables.collation_connection);
++                                             thd->variables.collation_connection);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | HEX_NUM
+           {
+-            Item *tmp= new (YYTHD->mem_root) Item_hex_string($1.str, $1.length);
++            Item *tmp= new (thd->mem_root) Item_hex_string($1.str, $1.length);
+             if (tmp == NULL)
+               MYSQL_YYABORT;
+             /*
+@@ -11938,7 +11882,7 @@ text_string:
+           }
+         | BIN_NUM
+           {
+-            Item *tmp= new (YYTHD->mem_root) Item_bin_string($1.str, $1.length);
++            Item *tmp= new (thd->mem_root) Item_bin_string($1.str, $1.length);
+             if (tmp == NULL)
+               MYSQL_YYABORT;
+             /*
+@@ -11953,7 +11897,6 @@ text_string:
+ param_marker:
+           PARAM_MARKER
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             Lex_input_stream *lip= YYLIP;
+             Item_param *item;
+@@ -11986,38 +11929,38 @@ literal:
+         | NUM_literal { $$ = $1; }
+         | NULL_SYM
+           {
+-            $$ = new (YYTHD->mem_root) Item_null();
++            $$ = new (thd->mem_root) Item_null();
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+             YYLIP->next_state= MY_LEX_OPERATOR_OR_IDENT;
+           }
+         | FALSE_SYM
+           {
+-            $$= new (YYTHD->mem_root) Item_int((char*) "FALSE",0,1);
++            $$= new (thd->mem_root) Item_int((char*) "FALSE",0,1);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | TRUE_SYM
+           {
+-            $$= new (YYTHD->mem_root) Item_int((char*) "TRUE",1,1);
++            $$= new (thd->mem_root) Item_int((char*) "TRUE",1,1);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | HEX_NUM
+           {
+-            $$ = new (YYTHD->mem_root) Item_hex_string($1.str, $1.length);
++            $$ = new (thd->mem_root) Item_hex_string($1.str, $1.length);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | BIN_NUM
+           {
+-            $$= new (YYTHD->mem_root) Item_bin_string($1.str, $1.length);
++            $$= new (thd->mem_root) Item_bin_string($1.str, $1.length);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | UNDERSCORE_CHARSET HEX_NUM
+           {
+-            Item *tmp= new (YYTHD->mem_root) Item_hex_string($2.str, $2.length);
++            Item *tmp= new (thd->mem_root) Item_hex_string($2.str, $2.length);
+             if (tmp == NULL)
+               MYSQL_YYABORT;
+             /*
+@@ -12028,7 +11971,7 @@ literal:
+             String *str= tmp->val_str((String*) 0);
+ 
+             Item_string *item_str;
+-            item_str= new (YYTHD->mem_root)
++            item_str= new (thd->mem_root)
+                         Item_string(NULL, /* name will be set in select_item */
+                                     str ? str->ptr() : "",
+                                     str ? str->length() : 0,
+@@ -12046,7 +11989,7 @@ literal:
+           }
+         | UNDERSCORE_CHARSET BIN_NUM
+           {
+-            Item *tmp= new (YYTHD->mem_root) Item_bin_string($2.str, $2.length);
++            Item *tmp= new (thd->mem_root) Item_bin_string($2.str, $2.length);
+             if (tmp == NULL)
+               MYSQL_YYABORT;
+             /*
+@@ -12057,7 +12000,7 @@ literal:
+             String *str= tmp->val_str((String*) 0);
+ 
+             Item_string *item_str;
+-            item_str= new (YYTHD->mem_root)
++            item_str= new (thd->mem_root)
+                         Item_string(NULL, /* name will be set in select_item */
+                                     str ? str->ptr() : "",
+                                     str ? str->length() : 0,
+@@ -12081,7 +12024,7 @@ NUM_literal:
+           NUM
+           {
+             int error;
+-            $$= new (YYTHD->mem_root)
++            $$= new (thd->mem_root)
+                   Item_int($1.str,
+                            (longlong) my_strtoll10($1.str, NULL, &error),
+                            $1.length);
+@@ -12091,7 +12034,7 @@ NUM_literal:
+         | LONG_NUM
+           {
+             int error;
+-            $$= new (YYTHD->mem_root)
++            $$= new (thd->mem_root)
+                   Item_int($1.str,
+                            (longlong) my_strtoll10($1.str, NULL, &error),
+                            $1.length);
+@@ -12100,23 +12043,23 @@ NUM_literal:
+           }
+         | ULONGLONG_NUM
+           {
+-            $$= new (YYTHD->mem_root) Item_uint($1.str, $1.length);
++            $$= new (thd->mem_root) Item_uint($1.str, $1.length);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | DECIMAL_NUM
+           {
+-            $$= new (YYTHD->mem_root) Item_decimal($1.str, $1.length,
+-                                                   YYTHD->charset());
+-            if (($$ == NULL) || (YYTHD->is_error()))
++            $$= new (thd->mem_root) Item_decimal($1.str, $1.length,
++                                                   thd->charset());
++            if (($$ == NULL) || (thd->is_error()))
+             {
+               MYSQL_YYABORT;
+             }
+           }
+         | FLOAT_NUM
+           {
+-            $$= new (YYTHD->mem_root) Item_float($1.str, $1.length);
+-            if (($$ == NULL) || (YYTHD->is_error()))
++            $$= new (thd->mem_root) Item_float($1.str, $1.length);
++            if (($$ == NULL) || (thd->is_error()))
+             {
+               MYSQL_YYABORT;
+             }
+@@ -12136,7 +12079,7 @@ table_wild:
+           ident '.' '*'
+           {
+             SELECT_LEX *sel= Select;
+-            $$= new (YYTHD->mem_root) Item_field(Lex->current_context(),
++            $$= new (thd->mem_root) Item_field(Lex->current_context(),
+                                                  NullS, $1.str, "*");
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+@@ -12144,7 +12087,6 @@ table_wild:
+           }
+         | ident '.' ident '.' '*'
+           {
+-            THD *thd= YYTHD;
+             SELECT_LEX *sel= Select;
+             const char* schema= thd->client_capabilities & CLIENT_NO_SCHEMA ?
+                                   NullS : $1.str;
+@@ -12164,7 +12106,6 @@ order_ident:
+ simple_ident:
+           ident
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             Lex_input_stream *lip= YYLIP;
+             sp_variable_t *spv;
+@@ -12215,7 +12156,6 @@ simple_ident:
+ simple_ident_nospvar:
+           ident
+           {
+-            THD *thd= YYTHD;
+             SELECT_LEX *sel=Select;
+             if ((sel->parsing_place != IN_HAVING) ||
+                 (sel->get_in_sum_expr() > 0))
+@@ -12237,7 +12177,6 @@ simple_ident_nospvar:
+ simple_ident_q:
+           ident '.' ident
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+ 
+             /*
+@@ -12316,7 +12255,6 @@ simple_ident_q:
+           }
+         | '.' ident '.' ident
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             SELECT_LEX *sel= lex->current_select;
+             if (sel->no_table_names_allowed)
+@@ -12341,7 +12279,6 @@ simple_ident_q:
+           }
+         | ident '.' ident '.' ident
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             SELECT_LEX *sel= lex->current_select;
+             const char* schema= (thd->client_capabilities & CLIENT_NO_SCHEMA ?
+@@ -12409,7 +12346,7 @@ table_ident:
+           }
+         | ident '.' ident
+           {
+-            $$= new Table_ident(YYTHD, $1,$3,0);
++            $$= new Table_ident(thd, $1,$3,0);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+@@ -12431,7 +12368,7 @@ table_ident_opt_wild:
+           }
+         | ident '.' ident opt_wild
+           {
+-            $$= new Table_ident(YYTHD, $1,$3,0);
++            $$= new Table_ident(thd, $1,$3,0);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+@@ -12441,7 +12378,7 @@ table_ident_nodb:
+           ident
+           {
+             LEX_STRING db={(char*) any_db,3};
+-            $$= new Table_ident(YYTHD, db,$1,0);
++            $$= new Table_ident(thd, db,$1,0);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+@@ -12451,7 +12388,6 @@ IDENT_sys:
+           IDENT { $$= $1; }
+         | IDENT_QUOTED
+           {
+-            THD *thd= YYTHD;
+ 
+             if (thd->charset_is_system_charset)
+             {
+@@ -12481,7 +12417,6 @@ IDENT_sys:
+ TEXT_STRING_sys:
+           TEXT_STRING
+           {
+-            THD *thd= YYTHD;
+ 
+             if (thd->charset_is_system_charset)
+               $$= $1;
+@@ -12497,7 +12432,6 @@ TEXT_STRING_sys:
+ TEXT_STRING_literal:
+           TEXT_STRING
+           {
+-            THD *thd= YYTHD;
+ 
+             if (thd->charset_is_collation_connection)
+               $$= $1;
+@@ -12513,7 +12447,6 @@ TEXT_STRING_literal:
+ TEXT_STRING_filesystem:
+           TEXT_STRING
+           {
+-            THD *thd= YYTHD;
+ 
+             if (thd->charset_is_character_set_filesystem)
+               $$= $1;
+@@ -12531,7 +12464,6 @@ ident:
+           IDENT_sys    { $$=$1; }
+         | keyword
+           {
+-            THD *thd= YYTHD;
+             $$.str= thd->strmake($1.str, $1.length);
+             if ($$.str == NULL)
+               MYSQL_YYABORT;
+@@ -12543,7 +12475,6 @@ label_ident:
+           IDENT_sys    { $$=$1; }
+         | keyword_sp
+           {
+-            THD *thd= YYTHD;
+             $$.str= thd->strmake($1.str, $1.length);
+             if ($$.str == NULL)
+               MYSQL_YYABORT;
+@@ -12560,7 +12491,6 @@ ident_or_text:
+ user:
+           ident_or_text
+           {
+-            THD *thd= YYTHD;
+             if (!($$=(LEX_USER*) thd->alloc(sizeof(st_lex_user))))
+               MYSQL_YYABORT;
+             $$->user = $1;
+@@ -12577,7 +12507,6 @@ user:
+           }
+         | ident_or_text '@' ident_or_text
+           {
+-            THD *thd= YYTHD;
+             if (!($$=(LEX_USER*) thd->alloc(sizeof(st_lex_user))))
+               MYSQL_YYABORT;
+             $$->user = $1; $$->host=$3;
+@@ -12599,7 +12528,7 @@ user:
+           }
+         | CURRENT_USER optional_braces
+           {
+-            if (!($$=(LEX_USER*) YYTHD->alloc(sizeof(st_lex_user))))
++            if (!($$=(LEX_USER*) thd->alloc(sizeof(st_lex_user))))
+               MYSQL_YYABORT;
+             /* 
+               empty LEX_USER means current_user and 
+@@ -12987,7 +12916,6 @@ option_value_list:
+ 
+ option_type_value:
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             Lex_input_stream *lip= YYLIP;
+ 
+@@ -13018,7 +12946,6 @@ option_type_value:
+           }
+           ext_option_value
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             Lex_input_stream *lip= YYLIP;
+ 
+@@ -13101,7 +13028,6 @@ ext_option_value:
+ sys_option_value:
+           option_type internal_variable_name equal set_expr_or_default
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= Lex;
+             LEX_STRING *name= &$2.base_name;
+ 
+@@ -13113,7 +13039,7 @@ sys_option_value:
+                 my_parse_error(ER(ER_SYNTAX_ERROR));
+                 MYSQL_YYABORT;
+               }
+-              if (set_trigger_new_row(YYTHD, name, $4))
++              if (set_trigger_new_row(thd, name, $4))
+                 MYSQL_YYABORT;
+             }
+             else if ($2.var)
+@@ -13143,7 +13069,6 @@ sys_option_value:
+           }
+         | option_type TRANSACTION_SYM ISOLATION LEVEL_SYM isolation_types
+           {
+-            THD *thd= YYTHD;
+             LEX *lex=Lex;
+             lex->option_type= $1;
+             Item *item= new (thd->mem_root) Item_int((int32) $5);
+@@ -13163,7 +13088,7 @@ option_value:
+           '@' ident_or_text equal expr
+           {
+             Item_func_set_user_var *item;
+-            item= new (YYTHD->mem_root) Item_func_set_user_var($2, $4, false);
++            item= new (thd->mem_root) Item_func_set_user_var($2, $4, false);
+             if (item == NULL)
+               MYSQL_YYABORT;
+             set_var_user *var= new set_var_user(item);
+@@ -13173,7 +13098,6 @@ option_value:
+           }
+         | '@' '@' opt_var_ident_type internal_variable_name equal set_expr_or_default
+           {
+-            THD *thd= YYTHD;
+             struct sys_var_with_base tmp= $4;
+             /* Lookup if necessary: must be a system variable. */
+             if (tmp.var == NULL)
+@@ -13186,7 +13110,6 @@ option_value:
+           }
+         | charset old_or_new_charset_name_or_default
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             CHARSET_INFO *cs2;
+             cs2= $2 ? $2: global_system_variables.character_set_client;
+@@ -13234,7 +13157,6 @@ option_value:
+           }
+         | PASSWORD equal text_or_password
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             LEX_USER *user;
+             sp_pcontext *spc= lex->spcont;
+@@ -13274,7 +13196,6 @@ option_value:
+ internal_variable_name:
+           ident
+           {
+-            THD *thd= YYTHD;
+             sp_pcontext *spc= thd->lex->spcont;
+             sp_variable_t *spv;
+ 
+@@ -13333,7 +13254,7 @@ internal_variable_name:
+             }
+             else
+             {
+-              sys_var *tmp=find_sys_var(YYTHD, $3.str, $3.length);
++              sys_var *tmp=find_sys_var(thd, $3.str, $3.length);
+               if (!tmp)
+                 MYSQL_YYABORT;
+               if (!tmp->is_struct())
+@@ -13344,7 +13265,7 @@ internal_variable_name:
+           }
+         | DEFAULT '.' ident
+           {
+-            sys_var *tmp=find_sys_var(YYTHD, $3.str, $3.length);
++            sys_var *tmp=find_sys_var(thd, $3.str, $3.length);
+             if (!tmp)
+               MYSQL_YYABORT;
+             if (!tmp->is_struct())
+@@ -13366,16 +13287,16 @@ text_or_password:
+           TEXT_STRING { $$=$1.str;}
+         | PASSWORD '(' TEXT_STRING ')'
+           {
+-            $$= $3.length ? YYTHD->variables.old_passwords ?
+-              Item_func_old_password::alloc(YYTHD, $3.str, $3.length) :
+-              Item_func_password::alloc(YYTHD, $3.str, $3.length) :
++            $$= $3.length ? thd->variables.old_passwords ?
++              Item_func_old_password::alloc(thd, $3.str, $3.length) :
++              Item_func_password::alloc(thd, $3.str, $3.length) :
+               $3.str;
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | OLD_PASSWORD '(' TEXT_STRING ')'
+           {
+-            $$= $3.length ? Item_func_old_password::alloc(YYTHD, $3.str,
++            $$= $3.length ? Item_func_old_password::alloc(thd, $3.str,
+                                                           $3.length) :
+               $3.str;
+             if ($$ == NULL)
+@@ -13389,19 +13310,19 @@ set_expr_or_default:
+         | DEFAULT { $$=0; }
+         | ON
+           {
+-            $$=new (YYTHD->mem_root) Item_string("ON",  2, system_charset_info);
++            $$=new (thd->mem_root) Item_string("ON",  2, system_charset_info);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | ALL
+           {
+-            $$=new (YYTHD->mem_root) Item_string("ALL", 3, system_charset_info);
++            $$=new (thd->mem_root) Item_string("ALL", 3, system_charset_info);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | BINARY
+           {
+-            $$=new (YYTHD->mem_root) Item_string("binary", 6, system_charset_info);
++            $$=new (thd->mem_root) Item_string("binary", 6, system_charset_info);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+@@ -13440,7 +13361,7 @@ table_lock:
+           {
+             thr_lock_type lock_type= (thr_lock_type) $3;
+             bool lock_for_write= (lock_type >= TL_WRITE_ALLOW_WRITE);
+-            if (!Select->add_table_to_list(YYTHD, $1, $2, 0, lock_type,
++            if (!Select->add_table_to_list(thd, $1, $2, 0, lock_type,
+                                            (lock_for_write ?
+                                             MDL_SHARED_NO_READ_WRITE :
+                                             MDL_SHARED_READ)))
+@@ -13511,7 +13432,7 @@ handler:
+             lex->expr_allows_subselect= FALSE;
+             lex->sql_command = SQLCOM_HA_READ;
+             lex->ha_rkey_mode= HA_READ_KEY_EXACT; /* Avoid purify warnings */
+-            Item *one= new (YYTHD->mem_root) Item_int((int32) 1);
++            Item *one= new (thd->mem_root) Item_int((int32) 1);
+             if (one == NULL)
+               MYSQL_YYABORT;
+             lex->current_select->select_limit= one;
+@@ -13857,10 +13778,10 @@ grant_user:
+               MYSQL_YYABORT;
+             if ($4.length)
+             {
+-              if (YYTHD->variables.old_passwords)
++              if (thd->variables.old_passwords)
+               {
+                 char *buff= 
+-                  (char *) YYTHD->alloc(SCRAMBLED_PASSWORD_CHAR_LENGTH_323+1);
++                  (char *) thd->alloc(SCRAMBLED_PASSWORD_CHAR_LENGTH_323+1);
+                 if (buff == NULL)
+                   MYSQL_YYABORT;
+                 my_make_scrambled_password_323(buff, $4.str, $4.length);
+@@ -13870,7 +13791,7 @@ grant_user:
+               else
+               {
+                 char *buff= 
+-                  (char *) YYTHD->alloc(SCRAMBLED_PASSWORD_CHAR_LENGTH+1);
++                  (char *) thd->alloc(SCRAMBLED_PASSWORD_CHAR_LENGTH+1);
+                 if (buff == NULL)
+                   MYSQL_YYABORT;
+                 my_make_scrambled_password(buff, $4.str, $4.length);
+@@ -13923,7 +13844,7 @@ column_list:
+ column_list_id:
+           ident
+           {
+-            String *new_str = new (YYTHD->mem_root) String((const char*) $1.str,$1.length,system_charset_info);
++            String *new_str = new (thd->mem_root) String((const char*) $1.str,$1.length,system_charset_info);
+             if (new_str == NULL)
+               MYSQL_YYABORT;
+             List_iterator <LEX_COLUMN> iter(Lex->columns);
+@@ -14133,7 +14054,6 @@ opt_union_order_or_limit:
+ 
+ union_order_or_limit:
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             DBUG_ASSERT(lex->current_select->linkage != GLOBAL_OPTIONS_TYPE);
+             SELECT_LEX *sel= lex->current_select;
+@@ -14149,7 +14069,6 @@ union_order_or_limit:
+           }
+           order_or_limit
+           {
+-            THD *thd= YYTHD;
+             thd->lex->current_select->no_table_names_allowed= 0;
+             thd->where= "";
+           }
+@@ -14331,14 +14250,14 @@ no_definer:
+               from older master servers (i.e. to create non-suid trigger in this
+               case).
+             */
+-            YYTHD->lex->definer= 0;
++            thd->lex->definer= 0;
+           }
+         ;
+ 
+ definer:
+           DEFINER_SYM EQ user
+           {
+-            YYTHD->lex->definer= get_current_user(YYTHD, $3);
++            thd->lex->definer= get_current_user(thd, $3);
+           }
+         ;
+ 
+@@ -14383,7 +14302,6 @@ view_suid:
+ view_tail:
+           view_suid VIEW_SYM table_ident
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             lex->sql_command= SQLCOM_CREATE_VIEW;
+             /* first table in list is target VIEW name */
+@@ -14427,7 +14345,6 @@ view_select:
+           }
+           view_select_aux view_check_option
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= Lex;
+             uint len= YYLIP->get_cpp_ptr() - lex->create_view_select.str;
+             void *create_view_select= thd->memdup(lex->create_view_select.str, len);
+@@ -14483,7 +14400,6 @@ trigger_tail:
+           EACH_SYM
+           ROW_SYM
+           { /* $15 */
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             Lex_input_stream *lip= YYLIP;
+             sp_head *sp;
+@@ -14517,8 +14433,8 @@ trigger_tail:
+             sp_head *sp= lex->sphead;
+ 
+             lex->sql_command= SQLCOM_CREATE_TRIGGER;
+-            sp->set_stmt_end(YYTHD);
+-            sp->restore_thd_mem_root(YYTHD);
++            sp->set_stmt_end(thd);
++            sp->restore_thd_mem_root(thd);
+ 
+             if (sp->is_not_allowed_in_function("trigger"))
+               MYSQL_YYABORT;
+@@ -14528,7 +14444,7 @@ trigger_tail:
+               sp_proc_stmt alternatives are not saving/restoring LEX, so
+               lex->query_tables can be wiped out.
+             */
+-            if (!lex->select_lex.add_table_to_list(YYTHD, $9,
++            if (!lex->select_lex.add_table_to_list(thd, $9,
+                                                    (LEX_STRING*) 0,
+                                                    TL_OPTION_UPDATING,
+                                                    TL_READ_NO_INSERT,
+@@ -14547,7 +14463,6 @@ udf_tail:
+           AGGREGATE_SYM remember_name FUNCTION_SYM ident
+           RETURNS_SYM udf_type SONAME_SYM TEXT_STRING_sys
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             if (is_native_function(thd, & $4))
+             {
+@@ -14565,7 +14480,6 @@ udf_tail:
+         | remember_name FUNCTION_SYM ident
+           RETURNS_SYM udf_type SONAME_SYM TEXT_STRING_sys
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             if (is_native_function(thd, & $3))
+             {
+@@ -14588,7 +14502,6 @@ sf_tail:
+           sp_name /* $3 */
+           '(' /* $4 */
+           { /* $5 */
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             Lex_input_stream *lip= YYLIP;
+             sp_head *sp;
+@@ -14646,7 +14559,7 @@ sf_tail:
+               MYSQL_YYABORT;
+             }
+ 
+-            if (sp->fill_field_definition(YYTHD, lex,
++            if (sp->fill_field_definition(thd, lex,
+                                           (enum enum_field_types) $11,
+                                           &sp->m_return_field_def))
+               MYSQL_YYABORT;
+@@ -14655,7 +14568,6 @@ sf_tail:
+           }
+           sp_c_chistics /* $13 */
+           { /* $14 */
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             Lex_input_stream *lip= YYLIP;
+ 
+@@ -14664,7 +14576,6 @@ sf_tail:
+           }
+           sp_proc_stmt /* $15 */
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             sp_head *sp= lex->sphead;
+ 
+@@ -14735,10 +14646,10 @@ sp_tail:
+             sp= new sp_head();
+             if (sp == NULL)
+               MYSQL_YYABORT;
+-            sp->reset_thd_mem_root(YYTHD);
++            sp->reset_thd_mem_root(thd);
+             sp->init(lex);
+             sp->m_type= TYPE_ENUM_PROCEDURE;
+-            sp->init_sp_name(YYTHD, $3);
++            sp->init_sp_name(thd, $3);
+ 
+             lex->sphead= sp;
+           }
+@@ -14753,7 +14664,6 @@ sp_tail:
+           sp_pdparam_list
+           ')'
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+ 
+             lex->sphead->m_param_end= YYLIP->get_cpp_tok_start();
+@@ -14761,7 +14671,6 @@ sp_tail:
+           }
+           sp_c_chistics
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+ 
+             lex->sphead->m_chistics= &lex->sp_chistics;
+@@ -14772,9 +14681,9 @@ sp_tail:
+             LEX *lex= Lex;
+             sp_head *sp= lex->sphead;
+ 
+-            sp->set_stmt_end(YYTHD);
++            sp->set_stmt_end(thd);
+             lex->sql_command= SQLCOM_CREATE_PROCEDURE;
+-            sp->restore_thd_mem_root(YYTHD);
++            sp->restore_thd_mem_root(thd);
+           }
+         ;
+ 
+@@ -14811,21 +14720,21 @@ xid:
+           text_string
+           {
+             MYSQL_YYABORT_UNLESS($1->length() <= MAXGTRIDSIZE);
+-            if (!(Lex->xid=(XID *)YYTHD->alloc(sizeof(XID))))
++            if (!(Lex->xid=(XID *)thd->alloc(sizeof(XID))))
+               MYSQL_YYABORT;
+             Lex->xid->set(1L, $1->ptr(), $1->length(), 0, 0);
+           }
+           | text_string ',' text_string
+           {
+             MYSQL_YYABORT_UNLESS($1->length() <= MAXGTRIDSIZE && $3->length() <= MAXBQUALSIZE);
+-            if (!(Lex->xid=(XID *)YYTHD->alloc(sizeof(XID))))
++            if (!(Lex->xid=(XID *)thd->alloc(sizeof(XID))))
+               MYSQL_YYABORT;
+             Lex->xid->set(1L, $1->ptr(), $1->length(), $3->ptr(), $3->length());
+           }
+           | text_string ',' text_string ',' ulong_num
+           {
+             MYSQL_YYABORT_UNLESS($1->length() <= MAXGTRIDSIZE && $3->length() <= MAXBQUALSIZE);
+-            if (!(Lex->xid=(XID *)YYTHD->alloc(sizeof(XID))))
++            if (!(Lex->xid=(XID *)thd->alloc(sizeof(XID))))
+               MYSQL_YYABORT;
+             Lex->xid->set($5, $1->ptr(), $1->length(), $3->ptr(), $3->length());
+           }
+-- 
+1.8.4
+
diff --git a/community/percona-server/PKGBUILD b/community/percona-server/PKGBUILD
index 0aee6e562..6a4f9f549 100644
--- a/community/percona-server/PKGBUILD
+++ b/community/percona-server/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 93544 2013-07-05 09:53:28Z mtorromeo $
+# $Id: PKGBUILD 96790 2013-09-05 08:50:02Z mtorromeo $
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 
 pkgname=percona-server
-pkgver=5.5.32_rel31.0
+pkgver=5.5.33_rel31.1
 pkgrel=1
 pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation"
 arch=('i686' 'x86_64' 'mips64el')
@@ -19,14 +19,18 @@ options=('!libtool' 'emptydirs')
 backup=('etc/mysql/my.cnf')
 install=percona.install
 source=("http://www.percona.com/downloads/Percona-Server-${pkgver%.*_*}/Percona-Server-${pkgver/_rel/-}/source/Percona-Server-${pkgver/_/-}.tar.gz"
+        '0001-MDEV-4902-sql_yacc.yy-incompatible-with-bison-3.patch'
         'mysqld-post.sh'
         'mysqld.service'
         'mysqld-tmpfile.conf')
 
-build() {
+prepare() {
 	cd "${srcdir}/Percona-Server-${pkgver/_/-}"
 	sed -i 's|ADD_SUBDIRECTORY(libmysqld/examples)|# ADD_SUBDIRECTORY(libmysqld/examples)|' CMakeLists.txt
+	patch -p1 -i "$srcdir/0001-MDEV-4902-sql_yacc.yy-incompatible-with-bison-3.patch"
+}
 
+build() {
 	cd "${srcdir}"
 	rm -rf build
 	mkdir build
@@ -97,7 +101,8 @@ package() {
 	rm "${pkgdir}"/usr/share/man/man1/mysql-test-run.pl.1
 }
 
-sha256sums=('e34676cea5ceb398258408e31e8527724845f83bbbf1f22308f5069304118e8f'
+sha256sums=('2039ae974d0973b765a4cdc7ffa1dc75ebd93540769fb134b3a8dc521dfc0b3a'
+            '35f5e7819d6c24863f3319462676ea989fd58f8a334925432444b6bf5c42fdaf'
             '82a241d9fa4032187a26597d044e94ba810b209b53a7ce14bb6eb92555993a48'
             '9bc66470f3f80534c0bb62f9f8325ccf60b164f421f74ad74a963f065d7b1869'
             'badf6a701d9dc6ea3b4ddca26cb0f42b6236432ccdbc14c64962147802594a60')
diff --git a/community/perl-clone/PKGBUILD b/community/perl-clone/PKGBUILD
index 4830160de..31ddf15e9 100644
--- a/community/perl-clone/PKGBUILD
+++ b/community/perl-clone/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: Alex Dioso <adioso->gmail*com>
 
 pkgname=perl-clone
-pkgver=0.34
-pkgrel=2
+pkgver=0.35
+pkgrel=1
 pkgdesc='Recursive copy of nested objects.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://search.cpan.org/~RDF/Clone'
@@ -12,7 +12,7 @@ license=('GPL' 'PerlArtistic')
 depends=('perl>=5.10.0')
 options=('!emptydirs')
 source=("http://search.cpan.org/CPAN/authors/id/G/GA/GARU/Clone-$pkgver.tar.gz")
-md5sums=('6475432d91b1820eff1ae877ea5c8e3b')
+md5sums=('22175ef74a6e5f5604cb74d1e4af456e')
 
 build() {
   cd  Clone-${pkgver}
diff --git a/community/perl-xml-libxml/PKGBUILD b/community/perl-xml-libxml/PKGBUILD
index 927542dcf..c7e3231a6 100644
--- a/community/perl-xml-libxml/PKGBUILD
+++ b/community/perl-xml-libxml/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 96253 2013-08-22 17:25:25Z jsteel $
+# $Id: PKGBUILD 97592 2013-09-24 21:06:57Z jsteel $
 # Maintainer: Jonathan Steel <jsteel@aur.archlinux.org>
 # Contributor: Justin "juster" Davis <jrcd83@gmail.com>
 # Contributor: François Charette <francois.archlinux.org>
 
 pkgname=perl-xml-libxml
-pkgver=2.0103
+pkgver=2.0106
 pkgrel=1
 pkgdesc="Interface to the libxml library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ conflicts=('perl-libxml' 'perl-xml-libxml-common')
 options=('!emptydirs')
 install=$pkgname.install
 source=(http://www.cpan.org/authors/id/S/SH/SHLOMIF/XML-LibXML-$pkgver.tar.gz)
-md5sums=('77184192598ea59389b76dfea2a23b7c')
+md5sums=('5da8ecfdedccca81fe0821e9935fe11c')
 
 build() {
   cd XML-LibXML-$pkgver
diff --git a/community/pgadmin3/PKGBUILD b/community/pgadmin3/PKGBUILD
index a86cc84ef..e363630e3 100644
--- a/community/pgadmin3/PKGBUILD
+++ b/community/pgadmin3/PKGBUILD
@@ -1,27 +1,26 @@
-# $Id: PKGBUILD 92722 2013-06-13 12:58:46Z spupykin $
+# $Id: PKGBUILD 97840 2013-09-30 10:03:39Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 # Contributor: Benjamin Andresen <benny@klapmuetz.org>
 # Contributor: bekks <eduard.warkentin@gmx.de>
 
 pkgname=pgadmin3
-pkgver=1.16.1
+pkgver=1.18.0
 pkgrel=2
 pkgdesc="Comprehensive design and management interface for PostgreSQL"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.pgadmin.org"
 license=('custom')
 depends=('wxgtk' 'postgresql-libs' 'libxslt')
-makedepends=('libpqxx' 'krb5' 'postgresql' 'gendesk' 'imagemagick')
+makedepends=('libpqxx' 'krb5' 'postgresql' 'imagemagick')
 _categories="Development;Application"
 source=(http://ftp.postgresql.org/pub/pgadmin3/release/v${pkgver}/src/pgadmin3-${pkgver}.tar.gz)
-md5sums=('f3bc59630f0dc9600d4ad125097ce2fa')
+md5sums=('ed1968a9abda0064be68bf57d7ccad43')
 
 build() {
   cd "$srcdir"
   convert pgadmin3-${pkgver}/pgadmin/include/images/pgAdmin3.ico pgadmin3.png
   cp pgadmin3-3.png pgadmin3.png
-  gendesk $startdir/PKGBUILD
 
   cd "pgadmin3-${pkgver}"
   [ -f Makefile ] || ./configure --prefix=/usr
@@ -36,5 +35,5 @@ package() {
   install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
   install -Dm644 pgadmin/include/images/pgAdmin3.ico $pkgdir/usr/share/pgadmin3/pixmaps/pgAdmin3.ico
   install -Dm644 "$srcdir/pgadmin3.png" "$pkgdir/usr/share/pixmaps/pgadmin3.png"
-  install -Dm644 "$srcdir/pgadmin3.desktop" "$pkgdir/usr/share/applications/pgadmin3.desktop"
+  install -Dm644 "pkg/pgadmin3.desktop" "$pkgdir/usr/share/applications/pgadmin3.desktop"
 }
diff --git a/community/phantomjs/PKGBUILD b/community/phantomjs/PKGBUILD
index 46ba64245..9bbf6f5cc 100644
--- a/community/phantomjs/PKGBUILD
+++ b/community/phantomjs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 92506 2013-06-07 11:18:15Z fyan $
+# $Id: PKGBUILD 97046 2013-09-11 13:42:10Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: grimsock <lord.grimsock at gmail dot com>
 # Contributor: Dieter Plaetinck <dieter@plaetinck.be>
@@ -6,8 +6,8 @@
 # Contributor: Henry Tang <henryykt@gmail.com>
 
 pkgname=phantomjs
-pkgver=1.9.1
-pkgrel=2
+pkgver=1.9.2
+pkgrel=1
 pkgdesc="Headless WebKit with JavaScript API"
 url="http://www.phantomjs.org/"
 license=('BSD' 'LGPL' 'MIT')
@@ -16,7 +16,6 @@ depends=('gstreamer0.10-base' 'fontconfig' 'freetype2')
 makedepends=('unzip')
 source=("http://phantomjs.googlecode.com/files/${pkgname}-${pkgver}-source.zip")
 noextract=("${pkgname}-${pkgver}-source.zip")
-md5sums=('93a0043d4ff8cd83e23e9d261c93830d')
 
 build() {
   # workaround for https://code.google.com/p/libarchive/issues/detail?id=271
@@ -40,3 +39,4 @@ package() {
   install -Dm644 "$srcdir/$pkgname-$pkgver/third-party.txt" "$pkgdir/usr/share/licenses/$pkgname/third-party.txt"
 }
 
+sha512sums=('ada4010a1ba43950f25bcf42bc41f158c8dc91320edff18efece68c69cd16d1246512fbd66e2dcbe9d0ecd71d8587252570072e2499ec9dfce0ac871c0ce2720')
diff --git a/community/pianobar/PKGBUILD b/community/pianobar/PKGBUILD
index 43facc006..ca792101e 100644
--- a/community/pianobar/PKGBUILD
+++ b/community/pianobar/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 93512 2013-07-04 21:18:29Z dwallace $
+# $Id: PKGBUILD 98105 2013-10-06 00:35:49Z dwallace $
 # Maintainer: Daniel Wallace < danielwallace at gtmanfred dot com>
 # Contributor: Mitch Bigelow <ipha00@gmail.com>
 # Contributor: Patrick Palka <patrick@parcs.ath.cx>
 
 pkgname=pianobar
-pkgver=2013.05.19
+pkgver=2013.09.15
 pkgrel=1
 pkgdesc="console-based frontend for Pandora"
 url="http://6xq.net/0017"
@@ -12,7 +12,7 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('MIT')
 depends=('libao' 'faad2' 'libmad' 'gnutls' 'json-c' 'libgcrypt')
 source=(http://6xq.net/projects/pianobar/$pkgname-$pkgver.tar.bz2)
-sha256sums=('cf88e82663d2b0aa4d73e761506eac4f3e7bc789b57d92377acd994d785e1046')
+sha256sums=('3f8cf25ef054acf46e519d02453a6e214cfa09661b3adc03da99ace1c6f10066')
 
 build() {
     make -C "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/pidgin-lwqq/PKGBUILD b/community/pidgin-lwqq/PKGBUILD
index f2e876d91..cc2c65dff 100644
--- a/community/pidgin-lwqq/PKGBUILD
+++ b/community/pidgin-lwqq/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 96467 2013-08-30 08:55:39Z fyan $
+# $Id: PKGBUILD 98142 2013-10-06 16:28:12Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 
 pkgname=pidgin-lwqq
-pkgver=0.2a.20130824
-_commit=b2208aaa0c622e7daf1e9e78af7b1e04277f99a5
+pkgver=0.2c
+_commit=41f9151c2273e8d3321458a1bbabf918b4e050c6
 pkgrel=1
 pkgdesc="A pidgin plugin based on lwqq, a excellent safe useful library for webqq protocol"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,8 +14,9 @@ optdepends=('pidgin: Multi-protocol instant messaging client'
 	    'telepathy-haze: Empathy plugin support')
 makedepends=('git' 'cmake')
 install=$pkgname.install
-source=("git://github.com/xiehuc/pidgin-lwqq.git#commit=$_commit"
-#source=("git://github.com/xiehuc/pidgin-lwqq.git#tag=$pkgver"
+options=(debug)
+#source=("git://github.com/xiehuc/pidgin-lwqq.git#commit=$_commit"
+source=("git://github.com/xiehuc/pidgin-lwqq.git#tag=$pkgver"
         "git://github.com/xiehuc/lwqq.git")
 
 prepare() {
diff --git a/community/plan9port/PKGBUILD b/community/plan9port/PKGBUILD
index eddc8f90e..fc2519b76 100644
--- a/community/plan9port/PKGBUILD
+++ b/community/plan9port/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 88636 2013-04-20 19:00:12Z arodseth $
+# $Id: PKGBUILD 98017 2013-10-03 19:11:32Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: phrakture <aaronmgriffin--gmail--com>
 # Contributor: Fazlul Shahriar
 # Contributor: Chris Brannon <cmbrannon79@gmail.com>
 
 pkgname=plan9port
-pkgver=20130320
-pkgrel=1
+pkgver=20130927
+pkgrel=2
 pkgdesc='Port of many programs from Plan 9 to Unix-like operating systems'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://swtch.com/plan9port/'
@@ -18,19 +18,21 @@ install='plan9.install'
 options=('!zipman')
 source=("http://swtch.com/$pkgname/$pkgname-$pkgver.tgz"
         'plan9.sh')
-sha256sums=('49a5e6c97c76f0846c45791bda10d6b3ba5c4453855e401980e8e04f92e830fa'
-            '0247c4446497359d305aaec069b07180fbf79ce4fa5191464cd9ebb8c7f0228d')
+sha256sums=('580927688ae2df295bf7f78d0ba19588104c6b0403558ffa3cd9ed0b7b110542'
+            'c216efa3455ba0b22b1723ae62e4c1e21b3a776a760d8fcedb902ff994b701c1')
 
 package() {
-  cd "$srcdir/plan9"
+  cd plan9
+
+  d=/usr/local # /opt
 
-  # Package
   ./INSTALL -b
   install -Dm755 ../plan9.sh "$pkgdir/etc/profile.d/plan9.sh"
-  mkdir -p "$pkgdir/opt" "$pkgdir/usr/share/doc/$pkgname"
-  cp -r "$srcdir/plan9" "$pkgdir/opt/"
-  cd "$pkgdir/opt/plan9"
-  ./INSTALL -c -r "$pkgdir/opt/plan9"
+  install -d "$pkgdir$d"
+  install -d "$pkgdir/usr/share/doc/$pkgname"
+  cp -r "$srcdir/plan9" "$pkgdir/$d/"
+  cd "$pkgdir$d/plan9"
+  ./INSTALL -c -r "$pkgdir$d/plan9"
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
   # Clean up
@@ -41,9 +43,9 @@ package() {
     LICENSE
 
   # Fix hardcoded paths
-  for f in `grep -H -r "$pkgdir/opt/plan9" | cut -d: -f1`; do
+  for f in `grep -H -r "$pkgdir$d/plan9" | cut -d: -f1`; do
     echo -n "\t$f"
-    [ -e "$f" ] && sed -i "s:$pkgdir/opt/plan9:/opt/plan9:" "$f" || true
+    [ -e "$f" ] && sed -i "s:$pkgdir$d/plan9:$d/plan9:" "$f" || true
   done
 
   # Fix python scripts
@@ -58,7 +60,7 @@ package() {
   done
 
   # Decompress the plan9 man pages
-  for i in `find /opt/plan9/man -type f`; do
+  for i in `find $pkgdir$d/plan9/man -type f`; do
     if [ ${i##*.} = "gz" ]; then
       gunzip "$i"
     fi
diff --git a/community/plan9port/plan9.sh b/community/plan9port/plan9.sh
index 84c3d7ef4..86109fc57 100644
--- a/community/plan9port/plan9.sh
+++ b/community/plan9port/plan9.sh
@@ -1,2 +1,2 @@
-export PLAN9=/opt/plan9
+export PLAN9=/usr/local/plan9
 export PATH=$PATH:$PLAN9/bin
diff --git a/community/portaudio/PKGBUILD b/community/portaudio/PKGBUILD
index dcda13503..fac6fb857 100644
--- a/community/portaudio/PKGBUILD
+++ b/community/portaudio/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 66382 2012-02-24 12:03:33Z lfleischer $
+# $Id: PKGBUILD 96889 2013-09-07 11:45:00Z bgyorgy $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: Darwin Bautista <djclue917@gmail.com>
@@ -6,12 +6,15 @@
 
 pkgname=portaudio
 pkgver=19_20111121
-pkgrel=1.1
+pkgrel=2
 pkgdesc='A free, cross-platform, open source, audio I/O library.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.portaudio.com/'
 license=('custom')
-depends=('jack')
+depends=('gcc-libs' 'jack')
+conflicts=('portaudio_cpp')
+provides=('portaudio_cpp')
+replaces=('portaudio_cpp')
 options=('!libtool')
 source=("http://www.portaudio.com/archives/pa_stable_v$pkgver.tgz")
 md5sums=('25c85c1cc5e9e657486cbc299c6c035a')
@@ -19,8 +22,8 @@ md5sums=('25c85c1cc5e9e657486cbc299c6c035a')
 build() {
   cd "$srcdir/$pkgname"
 
-  ./configure --prefix=/usr
-  make
+  ./configure --prefix=/usr --enable-cxx
+  make -j1
 }
 
 package() {
diff --git a/community/portaudio_cpp/PKGBUILD b/community/portaudio_cpp/PKGBUILD
deleted file mode 100644
index b3f9f7eaa..000000000
--- a/community/portaudio_cpp/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 69618 2012-04-20 13:57:47Z lfleischer $
-# Maintainer: Bob Finch <w9ya@qrparci.net>
-
-pkgname=portaudio_cpp
-pkgver=19_20111121
-pkgrel=1
-pkgdesc='PortAudio C++ bindings'
-arch=('i686' 'x86_64' 'mips64el')
-url='http://www.portaudio.com/'
-license=('custom')
-depends=("portaudio=${pkgver}" 'gcc-libs')
-options=('!libtool')
-source=("http://www.portaudio.com/archives/pa_stable_v$pkgver.tgz")
-md5sums=('25c85c1cc5e9e657486cbc299c6c035a')
-
-build() {
-  cd "$srcdir/portaudio"
-
-  ./configure --prefix=/usr --enable-cxx
-  make 
-}
-
-package() {
-  cd "$srcdir/portaudio/bindings/cpp"
-
-  make DESTDIR="$pkgdir" install
-  install -Dm0644 ../../LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt"
-}
diff --git a/community/prelink/PKGBUILD b/community/prelink/PKGBUILD
index a302459ee..33b84d17c 100644
--- a/community/prelink/PKGBUILD
+++ b/community/prelink/PKGBUILD
@@ -1,28 +1,21 @@
-# $Id: PKGBUILD 90944 2013-05-16 03:44:23Z eric $
+# $Id: PKGBUILD 96818 2013-09-05 20:51:50Z eric $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Rouslan Solomakhin <rouslan@localnet.com>
 
 pkgname=prelink
-pkgver=20111012
-pkgrel=2
-pkgdesc='ELF prelinking utility to speed up dynamic linking.'
+pkgver=20130503
+pkgrel=1
+pkgdesc='ELF prelinking utility to speed up dynamic linking'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://people.redhat.com/jakub/prelink/'
 license=('GPL')
 depends=('elfutils')
 backup=('etc/prelink.conf')
 source=("http://people.redhat.com/jakub/prelink/${pkgname}-${pkgver}.tar.bz2"
-        'prelink.conf'
-        'arch-x86_64-dynamic_linker.patch')
-md5sums=('f5aaf347432d677c293e5e3399ba4fdf'
-         '0793ed49e9b31c125cba4d936c333cf6'
-         'b347580536e078b34c547742d36a3e9d')
-
-prepare() {
-  cd ${pkgname}
-  patch -Np0 -i ../arch-x86_64-dynamic_linker.patch
-}
+        'prelink.conf')
+sha1sums=('eff86cb26f0cc174486769527286cc388d5216b0'
+          'b83bd2d3505076151aa13d40de3d5c08a04440c7')
 
 build() {
   cd ${pkgname}
@@ -30,6 +23,11 @@ build() {
   make
 }
 
+check() {
+  cd ${pkgname}
+  make check
+}
+
 package() {
   cd ${pkgname}
   make DESTDIR="${pkgdir}" install
diff --git a/community/prelink/arch-x86_64-dynamic_linker.patch b/community/prelink/arch-x86_64-dynamic_linker.patch
deleted file mode 100644
index bceb9b2dc..000000000
--- a/community/prelink/arch-x86_64-dynamic_linker.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rup ../prelink.orig/src/arch-x86_64.c ./src/arch-x86_64.c
---- ../prelink.orig/src/arch-x86_64.c	2010-12-22 12:03:06.725004002 +0100
-+++ ./src/arch-x86_64.c	2010-12-22 12:04:08.193712039 +0100
-@@ -532,7 +532,7 @@ PL_ARCH = {
-   .R_COPY = R_X86_64_COPY,
-   .R_RELATIVE = R_X86_64_RELATIVE,
-   .rtype_class_valid = RTYPE_CLASS_VALID,
--  .dynamic_linker = "/lib64/ld-linux-x86-64.so.2",
-+  .dynamic_linker = "/lib/ld-linux-x86-64.so.2",
-   .adjust_dyn = x86_64_adjust_dyn,
-   .adjust_rel = x86_64_adjust_rel,
-   .adjust_rela = x86_64_adjust_rela,
diff --git a/community/prelink/prelink.conf b/community/prelink/prelink.conf
index a242269ad..f48d7f9f8 100644
--- a/community/prelink/prelink.conf
+++ b/community/prelink/prelink.conf
@@ -1,24 +1,8 @@
 # System
 /usr/lib
 /usr/bin
-/lib
-/bin
-/usr/sbin
 
-# Gnome
-/opt/gnome/lib
-/opt/gnome/bin
-/opt/gnome/share
-
-# KDE/Qt
-/opt/qt/lib
-/opt/qt/bin
-/opt/qt/share
+# KDE3
 /opt/kde/lib
 /opt/kde/bin
 /opt/kde/share
-
-# XFCE
-/opt/xfce4/lib
-/opt/xfce4/bin
-/opt/xfce4/share
diff --git a/community/processing/PKGBUILD b/community/processing/PKGBUILD
index e0ce5595d..aac018b62 100644
--- a/community/processing/PKGBUILD
+++ b/community/processing/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 95710 2013-08-15 20:52:28Z arodseth $
+# $Id: PKGBUILD 96894 2013-09-07 11:57:50Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 
 pkgname=processing
-pkgver=2.0.2
+pkgver=2.0.3
 pkgrel=1
 arch=('x86_64' 'i686')
 pkgdesc='Programming environment for creating images, animations and interactions'
@@ -15,12 +15,12 @@ options=(!strip)
 if [ "$CARCH" == "x86_64" ]; then
   source=("http://download.$pkgname.org/$pkgname-$pkgver-linux64.tgz"
           "$pkgname.png::http://wiki.$pkgname.org/skins/${pkgname}skin/${pkgname}_wiki_logo.png")
-  sha256sums=('78cbe5d855bc8eeead821513bc345440988d2954b4ef23264edf234a21b41f12'
+  sha256sums=('8d36995fb1ea0390fe6c3110372316c4b3f86e81af6a34d4e0227f4bb109f707'
             '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a')
 else
   source=("http://download.$pkgname.org/$pkgname-$pkgver-linux32.tgz"
           "$pkgname.png::http://wiki.$pkgname.org/skins/${pkgname}skin/${pkgname}_wiki_logo.png")
-  sha256sums=('7ae2abf81bbaaa2aad7498a7c85da14a7df48329383c0159d2611b02d306b47f'
+  sha256sums=('4dc0700fabce04465f1183c87939076655b9b055263cd0c5900d41bb4fa284e3'
             '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a')
 fi
 
diff --git a/community/projectm/PKGBUILD b/community/projectm/PKGBUILD
index fa7f74367..9440ce0f6 100644
--- a/community/projectm/PKGBUILD
+++ b/community/projectm/PKGBUILD
@@ -1,37 +1,40 @@
-# $Id: PKGBUILD 94903 2013-08-01 06:55:29Z bpiotrowski $
+# $Id: PKGBUILD 97763 2013-09-28 21:30:38Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 # Contributor: Denis A. Altoe Falqueto <denisfalqueto@gmail.com>
 
 pkgbase=projectm
-pkgname=('projectm' 'projectm-libvisual' 'projectm-pulseaudio' 'projectm-qt' 'projectm-test')
+pkgname=('projectm' 'projectm-libvisual' 'projectm-pulseaudio' 'projectm-jack' 'projectm-qt' 'projectm-test')
 pkgver=2.1.0
-pkgrel=6
+pkgrel=8
 arch=('i686' 'x86_64' 'mips64el')
 url='http://projectm.sourceforge.net/'
 license=('LGPL')
-makedepends=('mesa-libgl' 'qt4' 'cmake' 'ftgl' 'glew' 'gtkglext' 'libvisual' 'sdl' 'libxext' 'pulseaudio')
+makedepends=('mesa-libgl' 'qt4' 'cmake' 'ftgl' 'glew' 'gtkglext' 'libvisual' 'sdl' 'libxext' 'pulseaudio' 'jack')
 source=("http://downloads.sourceforge.net/$pkgname/projectM-complete-$pkgver-Source.tar.gz"
         'projectm-test-opengl.patch'
         'projectm-install-vera-ttf.patch')
 sha256sums=('513204f033006bd3dcdf8aada196d816d6b7187266ddcbb1594d0285cc9406ee'
             'c577d8356be011a3b3ee9f9b389db55f47804d100f690d8ea12f2920cdd432d1'
             '7d67aad0b210edf25a527274504c9efdf3e9d5b737235b938fec361ac5a8b110')
-_projectmdir="projectM-complete-$pkgver-Source"
 
-build() {
-  cd "$srcdir/projectM-complete-$pkgver-Source"
+prepare() {
+  cd "projectM-complete-$pkgver-Source"
+
   patch -p1 -i "$srcdir/projectm-test-opengl.patch"
   patch -p1 -i "$srcdir/projectm-install-vera-ttf.patch"
-
   mkdir -p "$srcdir/build"
-  cd "$srcdir/build"
+}
+
+build() {
+  cd build
 
   cmake \
     -Wno-dev \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release \
+    -DINCLUDE-PROJECTM-JACK=ON \
     "../projectM-complete-$pkgver-Source"
   make
 }
@@ -41,7 +44,6 @@ package_projectm() {
   depends=('ftgl' 'glew' 'libgl')
 
   cd "$srcdir/build"
-  
   for dirs in src/{NativePresets,libprojectM}; do
     make -C "$dirs" DESTDIR="$pkgdir" install
   done
@@ -65,6 +67,14 @@ package_projectm-pulseaudio() {
   make DESTDIR="$pkgdir" install
 }
 
+package_projectm-jack() {
+  pkgdesc='ProjectM support for Jack'
+  depends=('projectm-qt' 'jack')
+  
+  cd "$srcdir/build/src/projectM-jack"
+  make DESTDIR="$pkgdir" install
+}
+
 package_projectm-qt() {
   pkgdesc='Qt bindings for ProjectM'
   depends=('projectm' 'qt4' 'libgl')
diff --git a/community/prosody/PKGBUILD b/community/prosody/PKGBUILD
index 78a7aae01..2ab0743cc 100644
--- a/community/prosody/PKGBUILD
+++ b/community/prosody/PKGBUILD
@@ -1,59 +1,72 @@
-# $Id: PKGBUILD 96186 2013-08-21 12:28:21Z spupykin $
+# $Id: PKGBUILD 97026 2013-09-10 15:54:28Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Dwayne Bent <dbb.0@liqd.org>
+# Maintainer: Dwayne Bent <dbb@dbb.io>
 # Contributor: Paul-Sebastian Manole <brokenthorn@gmail.com>
+# Contributor: Timothée Ravier <tim@siosm.fr>
 
 pkgname=prosody
-pkgver=0.9.0
+pkgver=0.9.1
 pkgrel=1
-pkgdesc="Lightweight and extensible Jabber/XMPP server written in Lua."
+pkgdesc="Lightweight and extensible Jabber/XMPP server written in Lua"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://prosody.im/"
 license=('MIT')
-depends=('lua51' 'lua51-socket' 'lua51-expat' 'lua51-filesystem' 'libidn' 'openssl')
+depends=('lua51' 'lua51-socket' 'lua51-expat' 'lua51-filesystem' 'libidn'
+         'openssl')
 optdepends=('lua51-sec: TLS encryption support')
 install=prosody.install
 backup=('etc/logrotate.d/prosody'
-	'etc/prosody/prosody.cfg.lua')
-source=("http://prosody.im/depot/${pkgver}/prosody-${pkgver}.tar.gz"
-	'prosody.logrotated'
-	'fix-config.patch'
-	'prosody.tmpfile.d'
-	'prosody.service')
-md5sums=('cf0dd4f3389ab666d2d2b3a43464afc4'
-         '5b44aee99f1fa9e7f055e067688cafbd'
-         'a21d6a6efef8a08ae21109c2aa9c2fc7'
-         'e2f5a1df410b05696a30dcb058841084'
-         'e74045f27cb60908d535969906781f75')
+        'etc/prosody/prosody.cfg.lua')
+source=("http://prosody.im/downloads/source/${pkgname}-${pkgver}.tar.gz"{,.asc}
+        'prosody.logrotated'
+        'fix-config.patch'
+        'prosody.tmpfile.d'
+        'prosody.service')
+sha256sums=('f0e5e5fa27aa3ffec326b6c212adf2d86fb438133739d45e1232082ff0fbe06f'
+            'SKIP'
+            '5a2466b73bd069fb73be97a4e23b24e4c8dd1adb7db871cb8f5ab4094c1f967f'
+            '1b461d860b584c09ba4c16300a245f2580f1d0b74d774ae7567b7aac0f249587'
+            '3f5cc5db2cfe74c4edf91f60e692e04c3504025e893d0880114d52728a2c4bc4'
+            '16fbfb54bf21bb73ce9d9acacb60d47f237c35e842c5a00f1153f72f0d2f7f6b')
+sha256sums=('6cdea6fd6027bec621f7995709ca825a29aa5e066b321bfbb7785925c9f32cd5'
+            'SKIP'
+            '5a2466b73bd069fb73be97a4e23b24e4c8dd1adb7db871cb8f5ab4094c1f967f'
+            'db37b1b6bcd648f264164c5db5e754fc077671c74df6079c101384e146f4d6da'
+            '3f5cc5db2cfe74c4edf91f60e692e04c3504025e893d0880114d52728a2c4bc4'
+            '16fbfb54bf21bb73ce9d9acacb60d47f237c35e842c5a00f1153f72f0d2f7f6b')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -p1 < ../fix-config.patch
+  find . -type f -exec \
+    sed -i '1s,^#! \?/usr/bin/\(env \|\)lua$,#!/usr/bin/lua5.1,' {} \;
+}
 
 build() {
-    cd "$srcdir/prosody-$pkgver"
-    patch -p1 <$srcdir/fix-config.patch
-    find . -type f -exec \
-      sed -i '1s,^#! \?/usr/bin/\(env \|\)lua$,#!/usr/bin/lua5.1,' {} \;
-    ./configure --prefix=/usr --sysconfdir=/etc/prosody \
-        --datadir=/var/lib/prosody --with-lua-include=/usr/include/lua5.1
-    make
+  cd ${pkgname}-${pkgver}
+  ./configure --ostype=linux --prefix=/usr --sysconfdir=/etc/prosody \
+    --datadir=/var/lib/prosody --with-lua-include=/usr/include/lua5.1 \
+    --cflags="${CFLAGS} -fPIC -Wall -Wextra -D_GNU_SOURCE" \
+    --ldflags="${LDFLAGS} -shared"
+  make
 }
 
 package() {
-    cd "$srcdir/prosody-$pkgver"
-
-    make DESTDIR="$pkgdir" install
-    make DESTDIR="$pkgdir" install -C tools/migration
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+  make DESTDIR="${pkgdir}" install -C tools/migration
 
-    rm $pkgdir/etc/prosody/certs/*
+  install -Dm 0644 $srcdir/prosody.logrotated "${pkgdir}"/etc/logrotate.d/prosody
+  install -Dm 0644 $srcdir/prosody.tmpfile.d "${pkgdir}"/usr/lib/tmpfiles.d/prosody.conf
+  install -Dm 0644 $srcdir/prosody.service "${pkgdir}"/usr/lib/systemd/system/prosody.service
 
-    install -d "$pkgdir/etc/logrotate.d"
-    install -d "$pkgdir/var/log/prosody"
-    for i in tools/*.lua; do
-      install -Dm0644 $i $pkgdir/usr/share/prosody/$i
-    done
+  for i in tools/*.lua; do
+    install -Dm 0644 ${i} "${pkgdir}"/usr/share/prosody/${i}
+  done
 
-    install -o root -g root -m 644 "$srcdir/prosody.logrotated" \
-        "$pkgdir/etc/logrotate.d/prosody"
-
-    install -Dm0644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
-    install -Dm0644 $srcdir/prosody.tmpfile.d $pkgdir/usr/lib/tmpfiles.d/prosody.conf
-    install -Dm0644 $srcdir/prosody.service $pkgdir/usr/lib/systemd/system/prosody.service
+  install -Dm 0644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/COPYING
+  install -dm 755 "${pkgdir}"/var/log/prosody
+  rm "${pkgdir}"/etc/prosody/certs/*
 }
+
+# vim: ft=sh syn=sh ts=2 sw=2
diff --git a/community/pv/PKGBUILD b/community/pv/PKGBUILD
index 525dc8f3e..00761c7a0 100644
--- a/community/pv/PKGBUILD
+++ b/community/pv/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 84287 2013-02-15 14:40:03Z lfleischer $
+# $Id: PKGBUILD 98158 2013-10-06 19:15:22Z jlichtblau $
 # Maintainer: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Aaron Schaefer <aaron@elasticdog.com>
 
 pkgname=pv
-pkgver=1.4.6
+pkgver=1.4.12
 pkgrel=1
 pkgdesc='A terminal-based tool for monitoring the progress of data through a pipeline.'
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ url='http://www.ivarch.com/programs/pv.shtml'
 license=('custom:Artistic 2.0')
 depends=('glibc')
 source=("http://www.ivarch.com/programs/sources/$pkgname-$pkgver.tar.bz2")
-md5sums=('d55ff76f5caa83efc23aa527dbb0b191')
+md5sums=('605adc0f369496bca92b0656cf86b25e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/python-basemap/PKGBUILD b/community/python-basemap/PKGBUILD
index f9345de0e..33e38db5e 100644
--- a/community/python-basemap/PKGBUILD
+++ b/community/python-basemap/PKGBUILD
@@ -1,12 +1,13 @@
-# $Id: PKGBUILD 87032 2013-03-26 01:43:08Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
+# $Id: PKGBUILD 97800 2013-09-29 19:59:55Z jlichtblau $
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Matthias Ellmer <ellmer.matthias@gmail.com>
 # Contributor: Julien Morin <jmorin@cp.dias.ie>
 
 pkgbase=python-basemap
 pkgname=('python-basemap' 'python2-basemap' 'python-basemap-common')
 pkgver=1.0.6
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64' 'mips64el')
 url="http://matplotlib.org/basemap/"
 license=('custom')
diff --git a/community/python-numexpr/PKGBUILD b/community/python-numexpr/PKGBUILD
index 379a16e6d..d381c2e8a 100644
--- a/community/python-numexpr/PKGBUILD
+++ b/community/python-numexpr/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 96119 2013-08-20 06:32:53Z lcarlier $
+# $Id: PKGBUILD 96812 2013-09-05 18:53:58Z aginiewicz $
 # Maintainer: Andrzej Giniewicz <gginiu@gmail.com>
 # Contributor: Sebastien Binet <binet@lblbox>
 
 pkgbase=python-numexpr
 pkgname=('python2-numexpr' 'python-numexpr')
-pkgver=2.1
-pkgrel=2
+pkgver=2.2
+pkgrel=1
 pkgdesc="A JIT compiler for Python expressions"
 url="http://code.google.com/p/numexpr/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('MIT')
 makedepends=('python2-setuptools' 'python-setuptools' 'python-numpy' 'python2-numpy')
 source=(http://numexpr.googlecode.com/files/numexpr-$pkgver.tar.gz)
-md5sums=('8c138e81fb4214d05453da0fc88bf0d5')
+md5sums=('1d83b13e69fff897a5bc588b7119506c')
 
 build() {
   cd "$srcdir"
diff --git a/community/python-pillow/PKGBUILD b/community/python-pillow/PKGBUILD
new file mode 100644
index 000000000..6ef3cd700
--- /dev/null
+++ b/community/python-pillow/PKGBUILD
@@ -0,0 +1,64 @@
+# $Id: PKGBUILD 98021 2013-10-04 01:35:36Z kkeen $
+# Maintainer: Kyle Keen <keenerd@gmail.com>
+# Contributor: minder
+
+pkgbase=python-pillow
+pkgname=(python-pillow python2-pillow)
+_appname=Pillow
+pkgver=2.2.1
+pkgrel=1
+pkgdesc="Python Imaging Library (PIL) fork. Python3 version."
+arch=('i686' 'x86_64')
+url="http://python-imaging.github.io/"
+license=('BSD')
+makedepends=('python-setuptools' 'python2-setuptools' 'lcms' 'libwebp' 'tk' 'sane')
+source=("http://pypi.python.org/packages/source/P/$_appname/$_appname-$pkgver.zip")
+md5sums=('d1d20d3db5d1ab312da0951ff061e6bf')
+
+build() {
+  cd "$srcdir"
+  cp -r "$srcdir/$_appname-$pkgver" "$srcdir/${_appname}2-$pkgver"
+}  
+
+package_python-pillow() {
+  depends=('python' 'lcms' 'libwebp')
+  optdepends=('tk: for the ImageTK module'
+              'sane: for the Sane module'
+              'python-pyqt4: for the ImageQt module')
+  cd "$srcdir/$_appname-$pkgver"
+  python3 setup.py install --root="$pkgdir/" --optimize=0
+  pushd Sane
+    python3 setup.py install --root="$pkgdir/" --optimize=0
+  popd
+  install -Dm644 docs/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+  # clean up bins
+  cd "$pkgdir/usr/bin"
+  for f in *.py; do
+    mv "$f" "${f%.py}"
+  done
+}
+
+package_python2-pillow() {
+  pkgdesc="Python Imaging Library (PIL) fork. Python2 version."
+  depends=('python2' 'lcms' 'libwebp')
+  optdepends=('tk: for the ImageTK module'
+              'sane: for the Sane module'
+              'python2-pyqt4: for the ImageQt module')
+  provides=('python-imaging' 'python2-imaging')
+  conflicts=('python-imaging' 'python2-imaging')
+  replaces=('python2-imaging')
+  cd "$srcdir/${_appname}2-$pkgver"
+  python2 setup.py install --root="$pkgdir/" --optimize=0
+  pushd Sane
+    python2 setup.py install --root="$pkgdir/" --optimize=0
+  popd
+  install -Dm644 docs/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+  # clean up bins
+  cd "$pkgdir/usr/bin"
+  for f in *.py; do
+    mv "$f" "${f%.py}2"
+  done
+}
+
diff --git a/community/python-pymongo/PKGBUILD b/community/python-pymongo/PKGBUILD
index d6fb7d73b..f3481c83d 100644
--- a/community/python-pymongo/PKGBUILD
+++ b/community/python-pymongo/PKGBUILD
@@ -1,11 +1,12 @@
-# $Id: PKGBUILD 96198 2013-08-21 15:11:15Z arodseth $
+# $Id: PKGBUILD 96885 2013-09-07 02:44:43Z fyan $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Thomas S Hatch <thatch45@gmail.com>
 # Contributor: Jelle van der Waa <jelle@vdwaa.nl>
 
 pkgbase=python-pymongo
 pkgname=('python-pymongo' 'python2-pymongo')
-pkgver=2.6
+pkgver=2.6.2
 pkgrel=1
 pkgdesc='Python driver for MongoDB'
 arch=('x86_64' 'i686' 'mips64el')
@@ -13,7 +14,7 @@ license=('APACHE')
 url='http://pypi.python.org/pypi/pymongo/'
 makedepends=('python-setuptools' 'python2-setuptools')
 source=("http://pypi.python.org/packages/source/p/pymongo/pymongo-$pkgver.tar.gz")
-sha256sums=('0397584348e5b9efa678878ef686ea3bb77f9b83e634480033ce67467d43675a')
+sha256sums=('091d584f7b5d8de60bf6152d9269ec9a29ae7fa34415862b2f092af393233c4e')
 
 build() {
   cd "$srcdir"
diff --git a/community/python-pyproj/PKGBUILD b/community/python-pyproj/PKGBUILD
index 83bdaefff..ed0fba2c4 100644
--- a/community/python-pyproj/PKGBUILD
+++ b/community/python-pyproj/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 87227 2013-03-28 19:33:14Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
+# $Id: PKGBUILD 97803 2013-09-29 20:15:06Z jlichtblau $
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
 
 pkgbase=python-pyproj
 pkgname=('python-pyproj' 'python2-pyproj')
 pkgver=1.9.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Python interfaces to PROJ.4 library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/pyproj"
diff --git a/community/python-reportlab/PKGBUILD b/community/python-reportlab/PKGBUILD
index 6e44f03d6..7b4873f45 100644
--- a/community/python-reportlab/PKGBUILD
+++ b/community/python-reportlab/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 78251 2012-10-17 10:27:06Z allan $
+# $Id: PKGBUILD 97429 2013-09-19 20:25:51Z jelle $
 # Maintainer:
 # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
 # Contributor: William Rea <sillywilly@gmail.com>
@@ -6,7 +6,7 @@
 pkgbase=python-reportlab
 pkgname=python2-reportlab
 _origname=reportlab
-pkgver=2.6
+pkgver=2.7
 pkgrel=1
 pkgdesc="A proven industry-strength PDF generating solution"
 arch=('i686' 'x86_64')
@@ -15,8 +15,8 @@ depends=('python2' 'freetype2')
 conflicts=('python-reportlab<=2.5-2')
 replaces=('python-reportlab<=2.5-2')
 license=('CUSTOM')
-source=(http://www.reportlab.org/ftp/${_origname}-$pkgver.tar.gz)
-md5sums=('e5d27a24a2c8456b168913242aa1940f')
+source=(http://www.reportlab.com/ftp/reportlab-$pkgver.tar.gz)
+md5sums=('78300e6fe8a0d020fc16734a3de80cc4')
 
 build() {
     cd $srcdir/${_origname}-$pkgver
@@ -33,3 +33,8 @@ package_python2-reportlab() {
     python2 setup.py install --root=$pkgdir --optimize=1
     install -D -m644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/license.txt
 }
+
+check() {
+    cd ${srcdir}/${_origname}-${pkgver}
+#    python2 setup.py tests
+}
diff --git a/community/python-scikit-learn/LICENSE b/community/python-scikit-learn/LICENSE
new file mode 100644
index 000000000..9827e0f0c
--- /dev/null
+++ b/community/python-scikit-learn/LICENSE
@@ -0,0 +1,24 @@
+Copyright (c) 2010–2011, scikit-learn developers
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the <organization> nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/community/python-scikit-learn/PKGBUILD b/community/python-scikit-learn/PKGBUILD
new file mode 100644
index 000000000..ae64bf4d2
--- /dev/null
+++ b/community/python-scikit-learn/PKGBUILD
@@ -0,0 +1,54 @@
+# $Id: PKGBUILD 96814 2013-09-05 19:19:46Z aginiewicz $
+# Maintainer: Andrzej Giniewicz <gginiu@gmail.com>
+
+pkgbase=python-scikit-learn
+pkgname=('python2-scikit-learn' 'python-scikit-learn')
+pkgver=0.14.1
+pkgrel=1
+pkgdesc="A set of python modules for machine learning and data mining"
+arch=('i686' 'x86_64')
+url="http://scikit-learn.sourceforge.net/"
+license=('BSD')
+makedepends=('python2-scipy' 'python-scipy' 'python2-setuptools' 'python-setuptools')
+options=(!emptydirs)
+
+source=("http://downloads.sourceforge.net/project/scikit-learn/scikit-learn-${pkgver}.tar.gz" 
+        "LICENSE")
+md5sums=('790ad23547bb7f428060636628e13491'
+         '327083d2576cc0aad1b8f10b2bcd2974')
+
+build() {
+  cd "$srcdir"
+  cp -a scikit-learn-$pkgver scikit-learn-py2-$pkgver
+
+  msg "Building Python2"
+  cd "$srcdir"/scikit-learn-py2-$pkgver
+  python2 setup.py build
+
+  msg "Building Python3"
+  cd "$srcdir"/scikit-learn-$pkgver
+  python setup.py build
+}
+
+package_python2-scikit-learn() {
+  depends=('python2-scipy')
+  cd "$srcdir"/scikit-learn-py2-$pkgver
+
+  python2 setup.py install --root="$pkgdir"/ --optimize=1
+
+  sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
+         -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
+    $(find "${pkgdir}" -name '*.py')
+
+  install -D "$srcdir"/LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
+
+package_python-scikit-learn() {
+  depends=('python-scipy')
+  cd "$srcdir"/scikit-learn-$pkgver
+
+  python setup.py install --root="$pkgdir"/ --optimize=1
+
+  install -D "$srcdir"/LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
+
diff --git a/community/python2-gevent-beta/PKGBUILD b/community/python2-gevent-beta/PKGBUILD
index 6d727edbc..820a03cb6 100644
--- a/community/python2-gevent-beta/PKGBUILD
+++ b/community/python2-gevent-beta/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 95610 2013-08-15 01:52:53Z fyan $
+# $Id: PKGBUILD 97219 2013-09-15 11:50:12Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 
 _pkgbase=gevent
 pkgname=python2-${_pkgbase}-beta
-pkgver=1.0rc2
-pkgrel=4
+pkgver=1.0rc3
+pkgrel=1
 pkgdesc="Python networking library based on greenlet and libev - Beta version"
 arch=('i686' 'x86_64')
 url="http://www.gevent.org/"
@@ -19,9 +19,6 @@ package() {
   cd "$srcdir/${_pkgbase}-${pkgver}"
   msg "Starting make..."
   
-  # Workaround
-  unset MAKEFLAGS
-
   LIBEV_EMBED=1 \
   CARES_EMBED=1 \
   CYTHON=cython2 \
@@ -33,4 +30,4 @@ package() {
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
-md5sums=('e1bce8e15c7ebb08788978c0f4860f9d')
+sha512sums=('b0c978a7d3690051175edb862ab5a3132ba31e58c6aaa12ea2715d16679650ec05b239c1fb776a410749dc60ff32f53882c2810789f4e89e1bcb76a7a32b1f48')
diff --git a/community/qcad/PKGBUILD b/community/qcad/PKGBUILD
index c22bd0225..916069472 100644
--- a/community/qcad/PKGBUILD
+++ b/community/qcad/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 96151 2013-08-20 11:37:41Z spupykin $
+# $Id: PKGBUILD 97523 2013-09-23 16:15:04Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: Giovanni Scafora <linuxmania@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=qcad
-pkgver=3.2.0.0
-pkgrel=2
+pkgver=3.3.1.0
+pkgrel=1
 pkgdesc="A 2D CAD package based upon Qt"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.ribbonsoft.com/qcad.html"
@@ -16,7 +16,7 @@ makedepends=('glu')
 options=(libtool)
 source=($pkgname-$pkgver.tar.gz::https://github.com/qcad/qcad/archive/v${pkgver}.tar.gz
         QCad.desktop)
-md5sums=('6dd9c47742a0193a739d390e81ca67d0'
+md5sums=('e6e469482b40515980c416e61482abc2'
          '35100eaedbdf6625f6e6a09b177854cd')
 
 prepare() {
@@ -64,6 +64,7 @@ package() {
   install -Dm644 $srcdir/QCad.desktop ${pkgdir}/usr/share/applications/QCad.desktop
 
   install -dm0755 $pkgdir/usr/bin
-  echo -e '#!/bin/sh\ncd /usr/share/qcad\nLD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH exec ./qcad-bin' >$pkgdir/usr/bin/qcad
+  echo -e '#!/bin/sh\ncd /usr/share/qcad\nLD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"/usr/share/qcad" exec /usr/share/qcad/qcad-bin "$@"' >$pkgdir/usr/bin/qcad
+
   chmod 0755 $pkgdir/usr/bin/qcad
 }
diff --git a/community/qgit/0001-Cause-qgit-to-use-git-config-everywhere.patch b/community/qgit/0001-Cause-qgit-to-use-git-config-everywhere.patch
deleted file mode 100644
index a0c7e6c4d..000000000
--- a/community/qgit/0001-Cause-qgit-to-use-git-config-everywhere.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 50b7344bc2cc941a43b3adfaebdc96dd1935e747 Mon Sep 17 00:00:00 2001
-From: Jonathan Ross Rogers <jrogers@socialserve.com>
-Date: Mon, 9 May 2011 18:16:29 -0400
-Subject: [PATCH] Cause qgit to use "git config" everywhere.
-
-Whenever starting up qgit, it pops up a dialog showing that git
-complained about the obsolete command "repo-config". This patch
-replaces remaining calls to "git repo-config" with "git config".
-
-Signed-off-by: Jonathan Ross Rogers <jrogers@socialserve.com>
----
- src/git.cpp |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/git.cpp b/src/git.cpp
-index 50e6dd3..8e9365c 100644
---- a/src/git.cpp
-+++ b/src/git.cpp
-@@ -427,7 +427,7 @@ void Git::setTextCodec(QTextCodec* tc) {
- 	if (name == "Big5-HKSCS")
- 		name = "Big5";
- 
--	run("git repo-config i18n.commitencoding " + name);
-+	run("git config i18n.commitencoding " + name);
- }
- 
- QTextCodec* Git::getTextCodec(bool* isGitArchive) {
-@@ -437,7 +437,7 @@ QTextCodec* Git::getTextCodec(bool* isGitArchive) {
- 		return NULL;
- 
- 	QString runOutput;
--	if (!run("git repo-config --get i18n.commitencoding", &runOutput))
-+	if (!run("git config --get i18n.commitencoding", &runOutput))
- 		return NULL;
- 
- 	if (runOutput.isEmpty()) // git docs says default is utf-8
--- 
-1.7.5
-
diff --git a/community/qgit/PKGBUILD b/community/qgit/PKGBUILD
index 84f9a7da4..b7d170b3d 100644
--- a/community/qgit/PKGBUILD
+++ b/community/qgit/PKGBUILD
@@ -1,36 +1,33 @@
-# $Id: PKGBUILD 85388 2013-03-01 10:37:43Z andrea $
+# $Id: PKGBUILD 97768 2013-09-29 11:31:51Z schuay $
 # Maintainer: schuay <jakob.gruber@gmail.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Dan McGee <dan@archlinux.org>
 
 pkgname=qgit
-pkgver=2.3
-pkgrel=4
+pkgver=2.5
+pkgrel=1
 pkgdesc="A GIT GUI viewer built on Qt/C++"
-url="http://digilander.libero.it/mcostalba/"
+url='http://libre.tibirna.org/projects/qgit/wiki/QGit'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('qt4' 'git')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-        'qgit.desktop' 'qgit.png'
-		'0001-Cause-qgit-to-use-git-config-everywhere.patch')
-md5sums=('1f6cd60cc1b92973718b108d542e3270'
-         'ecb8b35e17163a7ec6893ffa71445c40'
-         '85138f44d577b03dfc738d3f27e04992'
-		 '8b8eda62d6f4d04ed57f87d4dbda9fa9')
+source=("http://libre.tibirna.org/attachments/download/9/${pkgname}-${pkgver}.tar.gz"
+        'qgit.desktop' 'qgit.png')
 
 build() {
-  cd ${srcdir}/${pkgname}
-  # patch taken from http://sourceforge.net/tracker/?func=detail&aid=3299672&group_id=139897&atid=744829
-  patch -Np1 < ${srcdir}/0001-Cause-qgit-to-use-git-config-everywhere.patch
-  qmake qgit.pro
+  cd ${srcdir}/redivivus
+  qmake-qt4 qgit.pro
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}
+  cd ${srcdir}/redivivus
   install -Dm755 bin/qgit ${pkgdir}/usr/bin/qgit
   install -Dm644 ${srcdir}/qgit.desktop ${pkgdir}/usr/share/applications/qgit.desktop
   install -Dm644 ${srcdir}/qgit.png ${pkgdir}/usr/share/pixmaps/qgit.png
 }
+
+md5sums=('0e70fc4468b060ab042933497f6a6f3c'
+         'ecb8b35e17163a7ec6893ffa71445c40'
+         '85138f44d577b03dfc738d3f27e04992')
diff --git a/community/qlandkartegt/PKGBUILD b/community/qlandkartegt/PKGBUILD
index d5b316af4..39b925f01 100644
--- a/community/qlandkartegt/PKGBUILD
+++ b/community/qlandkartegt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 96652 2013-09-02 19:19:45Z jlichtblau $
+# $Id: PKGBUILD 97737 2013-09-28 07:46:07Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Matthias Maennich <arch@maennich.net>
 # Contributor: <boenki@gmx.de>
 
 pkgname=qlandkartegt
-pkgver=1.7.3
+pkgver=1.7.4
 pkgrel=1
 pkgdesc="Use your GPS with Linux"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +18,7 @@ install=$pkgname.install
 changelog=$pkgname.changelog
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
         $pkgname-mimetypes.xml)
-sha256sums=('156ae80bda0e7004f63867f0880b8737fb4e175388fc9edf6d541f2901686737'
+sha256sums=('d6412ae6b34c2ec8a5f929f7aa8b4d1a660f913f16ea52096f93b42d4f271daf'
             'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0')
 
 build() {
@@ -40,5 +40,3 @@ package(){
   install -D -m644 "${srcdir}/$pkgname-mimetypes.xml" \
     "${pkgdir}/usr/share/mime/packages/$pkgname-mimetypes.xml"
 }
-sha256sums=('dbfc9636f4a8cc88737dff8cbd3b411e4b1ac17c552516396b55d1e680ad953c'
-            'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0')
diff --git a/community/qlandkartegt/qlandkartegt.changelog b/community/qlandkartegt/qlandkartegt.changelog
index 01b841a7d..4630d2591 100644
--- a/community/qlandkartegt/qlandkartegt.changelog
+++ b/community/qlandkartegt/qlandkartegt.changelog
@@ -1,3 +1,6 @@
+2013-09-28 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* qlandkartegt 1.7.4-1
+
 2013-09-02 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* qlandkartegt 1.7.3-1
 
diff --git a/community/qmmp/PKGBUILD b/community/qmmp/PKGBUILD
index 7a6b39148..2872d3f50 100644
--- a/community/qmmp/PKGBUILD
+++ b/community/qmmp/PKGBUILD
@@ -1,9 +1,9 @@
-#$Id: PKGBUILD 94904 2013-08-01 06:55:31Z bpiotrowski $
+#$Id: PKGBUILD 98072 2013-10-05 17:15:55Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 
 pkgname=qmmp
-pkgver=0.7.1
-pkgrel=2
+pkgver=0.7.3
+pkgrel=1
 pkgdesc="Qt4 based audio-player"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://qmmp.ylsoftware.com/"
@@ -24,7 +24,7 @@ optdepends=('flac: native FLAC support'
 install=$pkgname.install
 changelog=$pkgname.changelog
 source=(http://qmmp.ylsoftware.com/files/$pkgname-$pkgver.tar.bz2)
-sha256sums=('5e86c3c783bffa384d4c5c8731ebaff7a1589f56b6e0ad69ec6f82a8da160671')
+sha256sums=('57e4e1a00450a5a094b290df5410f8ab5a80da364ad3f1402835573cb0b75562')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
diff --git a/community/qmmp/qmmp.changelog b/community/qmmp/qmmp.changelog
index cec0d2b97..d279bfb82 100644
--- a/community/qmmp/qmmp.changelog
+++ b/community/qmmp/qmmp.changelog
@@ -1,3 +1,9 @@
+2013-10-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* qmmp 0.7.3-1
+
+2013-09-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* qmmp 0.7.2-1
+
 2013-06-15 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* qmmp 0.7.1-1
 
diff --git a/community/qtcurve-kde3/PKGBUILD b/community/qtcurve-kde3/PKGBUILD
deleted file mode 100644
index f5e057cfb..000000000
--- a/community/qtcurve-kde3/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 65718 2012-02-22 11:48:53Z andrea $
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=qtcurve-kde3
-pkgver=1.8.5
-pkgrel=3
-arch=('i686' 'x86_64')
-groups=('qtcurve')
-license=('GPL')
-pkgdesc='A configurable set of widget styles for KDE and Gtk'
-url='http://www.kde-look.org/content/show.php?content=40492'
-depends=('kdelibs3')
-makedepends=('cmake' 'kdelibs')
-source=("http://craigd.wikispaces.com/file/view/QtCurve-KDE3-${pkgver}.tar.bz2"
-	'kdeglobals'
-	'bypass-kde-config.patch')
-md5sums=('d9cca99526079782f9fc7bd7ba432582'
-         '05a6294c7f0e239e698e7e5224fc8e7f'
-         'e1ab2c0995e412b2cbfe804fba75517e')
-
-build() {
-  . /etc/profile.d/qt3.sh
-  . /etc/profile.d/kde3.sh
-
-  cd ${srcdir}/QtCurve-KDE3-${pkgver}
-  # Bypass KDE prefix detection by kde4-config, see:
-  # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=541667
-  patch -Np1 -i ${srcdir}/bypass-kde-config.patch
-
-  cd ${srcdir}
-  mkdir build
-  cd build
-  cmake ../QtCurve-KDE3-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/opt/kde
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-
-  # remove kcontrol plugins
-  rm -f $pkgdir/opt/kde/lib/kde3/kstyle_qtcurve_config.*
-
-  # set default theme
-  install -D -m644 $srcdir/kdeglobals $pkgdir/opt/kde/share/config/kdeglobals
-}
diff --git a/community/qtcurve-kde3/bypass-kde-config.patch b/community/qtcurve-kde3/bypass-kde-config.patch
deleted file mode 100644
index 113fb93b8..000000000
--- a/community/qtcurve-kde3/bypass-kde-config.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- QtCurve-KDE3-1.6.0/CMakeLists.txt~	2010-09-14 16:19:36.543333337 +0200
-+++ QtCurve-KDE3-1.6.0/CMakeLists.txt	2010-09-14 16:22:18.160000003 +0200
-@@ -44,6 +44,12 @@
-     endif (QT_PLUGINS_DIR MATCHES NOTFOUND)
- endif (NOT QTC_QT_ONLY)
- 
-+# Comment the kde3/kde4 prefix detection as a whole as it wants to run
-+# kde-config and kde4-config, which in turn can create stuff in ~/.kde.
-+# This cannot work on read-only homes.
-+# So, the "fallback" prefixes ("/usr" for both) will be used.
-+if (BRAINDEAD_DETECTION)
-+
- if (NOT QTC_QT_ONLY)
- exec_program(kde-config
-              ARGS --prefix --expandvars
-@@ -71,6 +77,8 @@
-                  OUTPUT_VARIABLE KDE4PREFIX)
- endif(KDE4_KDECONFIG_EXECUTABLE)
- 
-+endif (BRAINDEAD_DETECTION)
-+
- if(NOT KDE4PREFIX)
-     set(KDE4PREFIX ${KDE3PREFIX})
- endif(NOT KDE4PREFIX)
diff --git a/community/qtcurve-kde3/kdeglobals b/community/qtcurve-kde3/kdeglobals
deleted file mode 100644
index ffbe26579..000000000
--- a/community/qtcurve-kde3/kdeglobals
+++ /dev/null
@@ -1,2 +0,0 @@
-[General]
-widgetStyle=qtcurve
diff --git a/community/qtcurve/PKGBUILD b/community/qtcurve/PKGBUILD
new file mode 100644
index 000000000..815c9d945
--- /dev/null
+++ b/community/qtcurve/PKGBUILD
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Pierre Schmitz <pierre@archlinux.de>
+
+pkgbase=qtcurve
+pkgname=('qtcurve-qt4' 'qtcurve-kde4')
+pkgver=1.8.15
+pkgrel=2
+arch=('i686' 'x86_64')
+groups=('qtcurve')
+license=('GPL')
+pkgdesc='A configurable set of widget styles for KDE and Gtk'
+url='https://github.com/QtCurve/qtcurve-qt4'
+makedepends=('cmake' 'automoc4' 'kdebase-workspace')
+source=("$pkgbase-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz")
+md5sums=('ee0b35fe428807b0dc2b0c57e5eb4f38')
+
+build() {
+  cd "qtcurve-qt4-$pkgver"
+
+  sed -i "s/QApplication/QCoreApplication/g" tools/gen_image_header_qt4.cpp
+
+  mkdir build-{qt,kde}4
+
+  cd build-qt4
+  cmake .. -DCMAKE_BUILD_TYPE=Release \
+           -DCMAKE_INSTALL_PREFIX=/usr \
+           -DQTC_QT4_ENABLE_KDE=false
+  make
+
+  cd ../build-kde4
+  cmake .. -DCMAKE_BUILD_TYPE=Release \
+           -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package_qtcurve-qt4() {
+  depends=('qt4')
+  cd "qtcurve-qt4-$pkgver/build-qt4/qt4/style"
+  make DESTDIR="$pkgdir" install
+}
+
+package_qtcurve-kde4() {
+  depends=('kdebase-workspace')
+  cd "qtcurve-qt4-$pkgver/build-kde4"
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community/quvi/PKGBUILD b/community/quvi/PKGBUILD
index 6aa010178..e45e1a451 100644
--- a/community/quvi/PKGBUILD
+++ b/community/quvi/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 70446 2012-05-07 08:29:18Z lfleischer $
+# $Id: PKGBUILD 98182 2013-10-07 12:06:30Z jgc $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: joyfulgirl@archlinux.us
 
 pkgname=quvi
-pkgver=0.4.2
-pkgrel=1
+pkgver=0.9.3.1
+pkgrel=2
 pkgdesc='Command-line tool for parsing video download links.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://quvi.sourceforge.net/'
-license=('LGPL')
+license=('AGPL3')
 depends=('libquvi')
 options=('!libtool')
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig})
-md5sums=('05f1e2c711d1ca9d4bc68b8de553941d'
-         '523b17d5a9024c8b0a1636917d79e792')
+source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.sig})
+md5sums=('24b3173f8662a6bb33d9a8a58662764f'
+         'SKIP')
 
 build() {
   cd "${pkgname}-${pkgver}"
diff --git a/community/radvd/PKGBUILD b/community/radvd/PKGBUILD
index 6dd3df121..52d45b620 100644
--- a/community/radvd/PKGBUILD
+++ b/community/radvd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 90532 2013-05-13 00:28:44Z seblu $
+# $Id: PKGBUILD 98000 2013-10-02 23:02:19Z seblu $
 # Maintainer: Sébastien Luttringer
 # Contributor: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Mark Smith <markzzzsmith@yahoo.com.au>
 
 pkgname=radvd
-pkgver=1.9.3
-pkgrel=2
+pkgver=1.9.5
+pkgrel=1
 pkgdesc='IPv6 Router Advertisement Daemon'
 url='http://www.litech.org/radvd/'
 license=('custom')
@@ -14,7 +14,7 @@ arch=('i686' 'x86_64' 'mips64el')
 backup=('etc/radvd.conf')
 source=("http://www.litech.org/radvd/dist/$pkgname-$pkgver.tar.gz"
         "$pkgname.service")
-sha1sums=('14b025bdcec77ea7278cd8ee2a32af3f81d26f4d'
+sha1sums=('0e65206803ab2bcb4e6012a0d11ecdad4f64ce9c'
           '2fdba3b0ed28c67dc1c04bfd1439fa4dece88bbc')
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/community/raptor1/PKGBUILD b/community/raptor1/PKGBUILD
deleted file mode 100644
index b6a8bed1d..000000000
--- a/community/raptor1/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 72968 2012-06-25 18:19:15Z andrea $
-# Maintainer:
-# Contributor: Andreas Radke <andyrtr at archlinux.org>
-# Contributor: eric <eric@archlinux.org>
-# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
-
-pkgname=raptor1
-pkgver=1.4.21
-pkgrel=4.1
-pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples - old V1 api for compatibility"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://librdf.org/raptor"
-depends=('curl' 'libxslt')
-license=('LGPL')
-options=('!libtool' '!docs')
-source=("http://librdf.org/dist/source/raptor-$pkgver.tar.gz"
-        'curl.patch')
-md5sums=('992061488af7a9e2d933df6b694bb876'
-         '8fe28761645d6a6607b25c94f9ada964')
-
-build() {
-  cd "${srcdir}"/raptor-${pkgver}
-  patch -p1 -i "${srcdir}"/curl.patch
-
-  ./configure --prefix=/usr \
-    --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/raptor-${pkgver}"
-  make prefix="${pkgdir}"/usr install
-  
-  mv "${pkgdir}"/usr/bin/rapper "${pkgdir}"/usr/bin/rapperV1
-  rm -f "${pkgdir}"/usr/share/man/man1/rapper.1
-}
diff --git a/community/raptor1/curl.patch b/community/raptor1/curl.patch
deleted file mode 100644
index 590140536..000000000
--- a/community/raptor1/curl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up raptor-1.4.21/src/raptor_internal.h.curl raptor-1.4.21/src/raptor_internal.h
---- raptor-1.4.21/src/raptor_internal.h.curl	2010-01-29 17:54:42.000000000 -0600
-+++ raptor-1.4.21/src/raptor_internal.h	2011-07-31 11:02:44.182465296 -0500
-@@ -852,7 +852,6 @@ int raptor_utf8_is_nfc(const unsigned ch
- 
- #ifdef RAPTOR_WWW_LIBCURL
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- #endif
- 
diff --git a/community/rawstudio/PKGBUILD b/community/rawstudio/PKGBUILD
index 5695a8399..6a5e9b989 100644
--- a/community/rawstudio/PKGBUILD
+++ b/community/rawstudio/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 81067 2012-12-11 14:37:23Z allan $
+# $Id: PKGBUILD 98046 2013-10-04 15:27:57Z bgyorgy $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
@@ -6,13 +6,13 @@
 
 pkgname=rawstudio
 pkgver=2.0
-pkgrel=8
+pkgrel=9
 pkgdesc="An open source raw-image converter written in GTK+"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://rawstudio.org/"
-depends=('exiv2' 'libgphoto2' 'flickcurl' 'libjpeg' 'fftw' 'gconf' 'lensfun'
-	 'raptor1' 'lcms' 'gtk2')
+depends=('gconf' 'lcms' 'exiv2' 'fftw' 'lensfun' 'flickcurl' 'sqlite'
+	 'libgphoto2' 'gtk-engines' 'desktop-file-utils')
 install=${pkgname}.install
 options=('!libtool')
 source=(http://rawstudio.org/files/release/${pkgname}-${pkgver}.tar.gz
@@ -20,11 +20,15 @@ source=(http://rawstudio.org/files/release/${pkgname}-${pkgver}.tar.gz
 md5sums=('b2f86b8ca6b83ad954e3104c4cb89e9b'
          '2f8b7acbe10d8096ce613cbea7986fd3')
 
-build() {
+prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -p1 <$srcdir/libpng15.patch
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   export LDFLAGS="$LDFLAGS `pkg-config --libs gthread-2.0`"
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --disable-static
   make
 }
 
diff --git a/community/recoll/PKGBUILD b/community/recoll/PKGBUILD
index 73c967da2..0d25aaaae 100644
--- a/community/recoll/PKGBUILD
+++ b/community/recoll/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 93674 2013-07-08 11:20:28Z spupykin $
+# $Id: PKGBUILD 96952 2013-09-09 09:19:39Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -16,7 +16,7 @@ depends=('xapian-core>=1.0.15-1' 'qt4' 'openssl' 'hicolor-icon-theme' 'qtwebkit'
 makedepends=('python2')
 optdepends=('libxslt: for XML based formats (fb2,etc)'
 	    'unzip: for the OpenOffice.org documents'
-	    'xpdf: for pdf'
+	    'poppler: for pdf'
 	    'pstotext: for postscipt'
 	    'antiword: for msword'
 	    'catdoc: for ms excel and powerpoint'
diff --git a/community/recorditnow/PKGBUILD b/community/recorditnow/PKGBUILD
index c7a493fb1..f9bc87caf 100644
--- a/community/recorditnow/PKGBUILD
+++ b/community/recorditnow/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 93279 2013-07-01 05:44:50Z fyan $
+# $Id: PKGBUILD 97147 2013-09-14 07:29:00Z bpiotrowski $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Yichao Yu <yyc1992@gmail.com>
 # Contributor: Weng Xuetian <wengxt@gmail.com>
@@ -7,26 +7,32 @@
 
 pkgname=recorditnow
 pkgver=0.8.1
-pkgrel=5
+pkgrel=7
 pkgdesc="A plugin based desktop recorder for KDE SC 4"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://kde-apps.org/content/show.php/RecordItNow?content=114610"
 license=('GPL')
 depends=('kdebase-runtime' 'ffmpeg' 'xdg-utils')
-makedepends=('cmake' 'automoc4' 'recordmydesktop')
+makedepends=('cmake' 'automoc4' 'recordmydesktop' 'mencoder')
 optdepends=('mencoder: for mencoder encoder plugin'
             'recordmydesktop')
 provides=('joschy')
-conflicts=('joschy-git')
 install=recorditnow.install
 source=("http://downloads.sourceforge.net/project/recorditnow/${pkgname}-${pkgver}.tar.bz2"
-        "cmake.patch")
+        "cmake.patch"
+        "ffmpeg.patch")
 md5sums=('6619b4048545adbab1d13a790189e80f'
-         '74ea0ababc2291e2a62e5d045c62616a')
+         '74ea0ababc2291e2a62e5d045c62616a'
+         '867f30a0cba692c7dad56195fd64b092')
+
+prepare() {
+  cd "${srcdir}/$pkgname-$pkgver"
+  patch -p0 -i "${srcdir}/cmake.patch"
+  patch -p0 -i "${srcdir}/ffmpeg.patch"
+}
 
 build() {
   cd "${srcdir}/$pkgname-$pkgver"
-  patch -i "${srcdir}/cmake.patch" -p0
 
   mkdir -p build
   cd build
diff --git a/community/recorditnow/ffmpeg.patch b/community/recorditnow/ffmpeg.patch
new file mode 100644
index 000000000..6247cbafe
--- /dev/null
+++ b/community/recorditnow/ffmpeg.patch
@@ -0,0 +1,16 @@
+--- src/plugins/recorder/ffmpegrecorder/ffmpegrecorder.cpp.orig	2010-03-04 17:39:20.000000000 +0100
++++ src/plugins/recorder/ffmpegrecorder/ffmpegrecorder.cpp	2013-09-10 18:17:26.193834681 +0200
+@@ -120,11 +120,10 @@
+             videoQuality = 2;
+         }
+ 
+-        args << "-f" << "x11grab" << "-qscale" << QString::number(videoQuality) << "-r" << QString::number(d.fps);
++        args << "-f" << "x11grab" << "-r" << QString::number(d.fps);
+         args << "-s" << QString("%1x%2").arg(geometry.width()).arg(geometry.height());
+         args << "-i" << DisplayString(QX11Info::display())+QString("+%1,%2").arg(geometry.x()).arg(geometry.y());
+-        args << "-s" << QString("%1x%2").arg(geometry.width()).arg(geometry.height());
+-        args << m_tmpFile;
++        args << "-qscale" << QString::number(videoQuality) << m_tmpFile;
+         //ffmpeg -f x11grab -qscale 2 -r 20 -s 1440x900 -i :0.0 -s 1440x900 x11grab.avi
+     } else {
+ 
diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD
index d4de2b60b..2d16fcbbd 100644
--- a/community/redis/PKGBUILD
+++ b/community/redis/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 96458 2013-08-29 15:11:24Z spupykin $
+# $Id: PKGBUILD 97559 2013-09-24 10:30:40Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jan-Erik Rediger <badboy at archlinux dot us>
 # Contributor: nofxx <x@<nick>.com>
 
 pkgname=redis
 pkgver=2.6.16
-pkgrel=1
+pkgrel=2
 pkgdesc="Advanced key-value store"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://redis.io/"
@@ -27,12 +27,15 @@ md5sums=('ca1b81bd56fe0c5e2c8ec443a95c908d'
 prepare() {
   cd "$srcdir/${pkgname}-${pkgver}"
   sed -i 's|# bind 127.0.0.1|bind 127.0.0.1|' redis.conf
+  sed -i 's|daemonize no|daemonize yes|' redis.conf
+  sed -i 's|dir \./|dir /var/lib/redis/|' redis.conf
   sed -i 's|pidfile .*|pidfile /run/redis/redis.pid|' redis.conf
+  sed -i 's|logfile stdout|logfile /var/log/redis.log|' redis.conf
 }
 
 build() {
   cd "$srcdir/${pkgname}-${pkgver}"
-  make MALLOC=libc
+  make
 }
 
 package() {
@@ -40,10 +43,9 @@ package() {
   mkdir -p $pkgdir/usr/bin
   make INSTALL_BIN="$pkgdir/usr/bin" PREFIX=/usr install
 
-  install -D -m755 "$srcdir/${pkgname}-${pkgver}/COPYING" "$pkgdir/usr/share/licenses/redis/COPYING"
+  install -Dm755 "$srcdir/${pkgname}-${pkgver}/COPYING" "$pkgdir/usr/share/licenses/redis/COPYING"
   install -Dm644 "$srcdir"/redis.service "$pkgdir"/usr/lib/systemd/system/redis.service
   install -Dm644 "$srcdir/redis.logrotate" "$pkgdir/etc/logrotate.d/redis"
-  sed -i 's|daemonize no|daemonize yes|;s|dir \./|dir /var/lib/redis/|;s|logfile stdout|logfile /var/log/redis.log| ' $srcdir/${pkgname}-${pkgver}/redis.conf
-  install -D -m644 "$srcdir/${pkgname}-${pkgver}/redis.conf" "$pkgdir/etc/redis.conf"
+  install -Dm644 "$srcdir/${pkgname}-${pkgver}/redis.conf" "$pkgdir/etc/redis.conf"
   install -Dm644 "$srcdir/redis.tmpfiles.d" "$pkgdir/usr/lib/tmpfiles.d/redis.conf"
 }
diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD
index e3083daf9..5348ccc9f 100644
--- a/community/rsyslog/PKGBUILD
+++ b/community/rsyslog/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 93676 2013-07-08 11:20:55Z spupykin $
+# $Id: PKGBUILD 97525 2013-09-23 16:15:36Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=rsyslog
-pkgver=7.4.2
+pkgver=7.4.4
 pkgrel=1
 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability"
 url="http://www.rsyslog.com/"
@@ -22,7 +22,7 @@ options=('strip' 'zipman' '!libtool')
 source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz"
 	'rsyslog.logrotate'
 	'rsyslog.conf')
-md5sums=('52ba87ddce153625ec4e4a2e60c4ec0e'
+md5sums=('ebcc010a6205c28eb505c0fe862f32c6'
          '0d990373f5c70ddee989296007b4df5b'
          'd61dd424e660eb16401121eed20d98bc')
 
diff --git a/community/ruby-iconv/PKGBUILD b/community/ruby-iconv/PKGBUILD
index a1a2f6071..0f43dd6ab 100755
--- a/community/ruby-iconv/PKGBUILD
+++ b/community/ruby-iconv/PKGBUILD
@@ -1,24 +1,40 @@
-# $Id: PKGBUILD 89242 2013-04-28 10:01:07Z alucryd $
-# Maintainer: Alucryd <alucryd at gmail dot com>
+# $Id: PKGBUILD 97686 2013-09-27 08:51:25Z alucryd $
+# Maintainer: Maxime Gauduin <alucryd@gmail.com>
 
 pkgname=ruby-iconv
 pkgver=1.0.3
-pkgrel=2
+pkgrel=4
 pkgdesc="Wrapper library for iconv"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://github.com/nurse/iconv"
-license=('GPL3')
+license=('BSD')
 depends=('ruby')
-makedepends=('rubygems')
-options=('!emptydirs')
-source=("https://rubygems.org/downloads/${pkgname#*-}-${pkgver}.gem")
+source=("http://rubygems.org/downloads/${pkgname#*-}-${pkgver}.gem")
+noextract=("${pkgname#*-}-${pkgver}.gem")
 sha256sums=('94a9b62a56c96226b62b787cd45fdc48c03f4517f1e36e64db113b010fb012da')
 
+prepare() {
+  gem install --no-{document,user-install} --ignore-dependencies -i . ${pkgname#*-}-${pkgver}.gem
+}
+
 package() {
-  cd "${srcdir}"
+  cd gems/${pkgname#*-}-${pkgver}
+
+  local _rubyver="$(ruby --version | sed 's/.* \(.*\..*\..*\)p.*/\1/')"
+
+  install -dm 755 "${pkgdir}"/usr/lib/ruby/{gems/${_rubyver},vendor_ruby}
+  mv lib "${pkgdir}"/usr/lib/ruby/vendor_ruby/${_rubyver}
+
+# Native extension
+  install -dm 755 "${pkgdir}"/usr/lib/ruby/vendor_ruby/${_rubyver}/$CARCH-linux
+  mv "${pkgdir}"/usr/lib/ruby/vendor_ruby/${_rubyver}/{iconv,$CARCH-linux}/iconv.so
+
+# Gem compatibility
+  mv ../../specifications "${pkgdir}"/usr/lib/ruby/gems/${_rubyver}/
 
-  local _gemdir="$(ruby -rubygems -e 'puts Gem.default_dir')"
-  gem install --no-user-install --ignore-dependencies -i "${pkgdir}"${_gemdir} ${pkgname#*-}-${pkgver}.gem
+# License
+  install -dm 755 "${pkgdir}"/usr/share/licenses/${pkgname}
+  install -m 644 {,"${pkgdir}"/usr/share/licenses/${pkgname}/}BSDL
 }
 
 # vim: ts=2 sw=2 et:
diff --git a/community/rust/PKGBUILD b/community/rust/PKGBUILD
index c9530fd58..b6831ab5d 100644
--- a/community/rust/PKGBUILD
+++ b/community/rust/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 93472 2013-07-04 02:25:38Z thestinger $
+# $Id: PKGBUILD 97658 2013-09-27 01:45:47Z thestinger $
 # Maintainer: Daniel Micay <danielmicay@gmail.com>
 pkgname=rust
-pkgver=0.7
+pkgver=0.8
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc='A safe, concurrent, practical language'
 url='http://www.rust-lang.org/'
 license=('MIT' 'Apache')
 depends=(gcc shared-mime-info)
-makedepends=(libffi perl python2 curl chrpath emacs-nox)
-optdepends=('haskell-pandoc: documentation generator (rustdoc)')
-source=("http://static.rust-lang.org/dist/rust-${pkgver}.tar.gz")
-sha256sums=('0b88b8a4489382e0a69214eaab88e2e7c316ec33c164af0d3b53630b17590df0')
+makedepends=(libffi perl python2 curl chrpath)
+source=("http://static.rust-lang.org/dist/rust-${pkgver}.tar.gz"
+        "http://static.rust-lang.org/dist/rust-${pkgver}.tar.gz.asc")
+sha256sums=('42f791ab1537357fe0f63d67ffe6bcb64ecf16b2bd3f1484ab589823f5914182'
+            'SKIP')
 install=rust.install
 
 build() {
@@ -51,12 +52,13 @@ package() {
   install -m644 LICENSE-MIT "$pkgdir/usr/share/licenses/$pkgname"
 
   cd src/etc/emacs
-  make
-  mkdir -p "$pkgdir/usr/share/emacs/site-lisp/"
-  install -Dm644 cm-mode.el{,c} rust-mode.el{,c} "$pkgdir/usr/share/emacs/site-lisp/"
+  install -Dm644 rust-mode.el "$pkgdir/usr/share/emacs/site-lisp/rust-mode.el"
 
   cd "$pkgdir/usr"
 
   # https://github.com/mozilla/rust/issues/5219
   chrpath -d bin/* lib/*.so lib/rustc/*/lib/*.so
+
+  cd lib
+  ln -sf rustc/$CARCH-unknown-linux-gnu/lib/* .
 }
diff --git a/community/sage-mathematics/PKGBUILD b/community/sage-mathematics/PKGBUILD
index c4ddb2d10..3046bc23a 100644
--- a/community/sage-mathematics/PKGBUILD
+++ b/community/sage-mathematics/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 93777 2013-07-10 07:27:17Z bpiotrowski $
+# $Id: PKGBUILD 96935 2013-09-09 01:33:22Z dwallace $
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: Antonio Rojas < nqn1976 @ gmail.com >
 # Contributor: Thomas Dziedzic < gostrc at gmail >
@@ -7,7 +7,7 @@
 # Special thanks to Nareto for moving the compile from the .install to the PKGBUILD
 
 pkgname=sage-mathematics
-pkgver=5.10
+pkgver=5.11
 pkgrel=1
 pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab.'
 url='http://www.sagemath.org'
@@ -103,6 +103,9 @@ package() {
 }
 
 # vim :set ts=2 sw=2 et:
-md5sums=('bfca3afc9030e63c7e7200287ee0135e'
+md5sums=('ceeccaa83f45a4fb674acf10f76543d8'
+         'b82f94383829eee26648feb977e2d89b'
+         '985da1c1d1dcdc3ea9aa73035cb7996b')
+md5sums=('ceeccaa83f45a4fb674acf10f76543d8'
          'b82f94383829eee26648feb977e2d89b'
          '985da1c1d1dcdc3ea9aa73035cb7996b')
diff --git a/community/seahorse-nautilus/glib236.patch b/community/seahorse-nautilus/glib236.patch
deleted file mode 100644
index d0ab03046..000000000
--- a/community/seahorse-nautilus/glib236.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur seahorse-nautilus-3.8.0.orig/tool/seahorse-tool-progress.c seahorse-nautilus-3.8.0/tool/seahorse-tool-progress.c
---- seahorse-nautilus-3.8.0.orig/tool/seahorse-tool-progress.c	2011-10-24 09:25:37.000000000 +0200
-+++ seahorse-nautilus-3.8.0/tool/seahorse-tool-progress.c	2013-04-28 22:26:54.483276592 +0200
-@@ -226,8 +226,6 @@
-         progress_fd = -1;
-         return;
-     }
--
--    g_child_watch_add (progress_pid, progress_cancel, NULL);
- }
- 
- void
diff --git a/community/sensors-applet/PKGBUILD b/community/sensors-applet/PKGBUILD
deleted file mode 100644
index dd99e1c0d..000000000
--- a/community/sensors-applet/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 89360 2013-04-28 20:21:26Z bgyorgy $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=sensors-applet
-pkgver=3.0.0
-pkgrel=3
-pkgdesc="Applet for GNOME Panel to display readings from hardware sensors, including CPU temperature, fan speeds and voltage readings"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://sensors-applet.sourceforge.net/"
-license=('GPL')
-depends=('gnome-panel' 'libatasmart' 'lm_sensors' 'xdg-utils')
-makedepends=('intltool' 'gnome-doc-utils')
-optdepends=('hddtemp: get HDD temperatures'
-            'udisks: get HDD temperatures')
-options=('!libtool')
-install=$pkgname.install
-source=(http://downloads.sourceforge.net/sensors-applet/$pkgname-$pkgver.tar.gz
-        gtk38.patch)
-md5sums=('425078fc1ff5a98af1547e039002a73f'
-         '7289cb0acd5c05daf824df6a90967240')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # Enable reprecations
-  sed -i '/CFLAGS+=/d' configure{,.ac}
-
-  # Fix compatibility with GTK+ 3.8
-  patch -Np1 -i "$srcdir/gtk38.patch"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
-              --disable-static --disable-scrollkeeper --with-nvidia=no
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/community/sensors-applet/gtk38.patch b/community/sensors-applet/gtk38.patch
deleted file mode 100644
index 530d756a3..000000000
--- a/community/sensors-applet/gtk38.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-diff -Naur sensors-applet-3.0.0.orig/sensors-applet/sensors-applet.c sensors-applet-3.0.0/sensors-applet/sensors-applet.c
---- sensors-applet-3.0.0.orig/sensors-applet/sensors-applet.c	2011-11-03 12:33:36.000000000 +0100
-+++ sensors-applet-3.0.0/sensors-applet/sensors-applet.c	2013-04-28 20:08:31.002620583 +0200
-@@ -641,122 +641,8 @@
-         /* get the first active sensor */
-         first_sensor = (ActiveSensor *)sensors_applet->active_sensors->data;
- 
--        switch (display_mode) {
--        case DISPLAY_VALUE:
--                gtk_widget_size_request(GTK_WIDGET(first_sensor->value),
--                                        &req);
--                value_width = req.width + COLUMN_SPACING;
--                value_height = req.height + ROW_SPACING;
-+        num_sensors_per_group = 1;
- 
--                /* make sure all widths and heights are non zero,
--                 * otherwise will get a divide by zero exception below
--                 * - is a non critical error since can happen when
--                 * elements first added to list, so simply return - is
--                 * not a programming error */
--                if (value_width == 0 && value_height == 0) {
--                        return;
--                }
--
--                num_sensors_per_group = (sensors_applet->size / 
--                                         (horizontal ? value_height : 
--                                          value_width));
--                break;
--
--        case DISPLAY_LABEL_WITH_VALUE:
--                /* even though we end up packing the event boxes into the
--                 * panel, these dont give back request sizes, so need to ask
--                 * widgets directly */
--                gtk_widget_size_request(GTK_WIDGET(first_sensor->value),
--                                        &req);
--                value_width = req.width + COLUMN_SPACING;
--                value_height = req.height + ROW_SPACING;
--
--                gtk_widget_size_request(GTK_WIDGET(first_sensor->label),
--                                        &req);
--                label_width = req.width + COLUMN_SPACING;
--                label_height = req.height + ROW_SPACING;
--        
--                /* make sure all widths and heights are non zero, otherwise
--                 * will get a divide by zero exception below 
--                 * - is a non critical error since can happen when
--                 * elements first added to list, so simply return - is
--                 * not a programming error */
--                if (!(label_width && label_height &&
--                      value_width && value_height)) {
--                        return;
--                }
--
--                switch (layout_mode) {
--                case VALUE_BESIDE_LABEL:
--                        num_sensors_per_group = (sensors_applet->size / 
--                                                 (horizontal ? MAX(label_height, value_height) : 
--                                                  (label_width + value_width)));
--                        break;
--                case VALUE_BELOW_LABEL:
--                        num_sensors_per_group = (sensors_applet->size / 
--                                                 (horizontal ? (label_height + value_height) : 
--                                                  MAX(label_width, value_width)));
--
--
--                        break;
--                }
--                break;
--
--        case DISPLAY_ICON_WITH_VALUE:
--                gtk_widget_size_request(GTK_WIDGET(first_sensor->value),
--                                        &req);
--                value_width = req.width + COLUMN_SPACING;
--                value_height = req.height + ROW_SPACING;
--
--                gtk_widget_size_request(GTK_WIDGET(first_sensor->icon),
--                                        &req);
--                icon_width = req.width + COLUMN_SPACING;
--                icon_height = req.height + ROW_SPACING;
--                
--                //watch out if num_sensors_per_group is correctly computed
--		//while icon_height is 0
--                if (!(icon_width &&
--                      value_width && value_height)) {
--                        return;
--                }
--
--                
--                switch (layout_mode) {
--                case VALUE_BESIDE_LABEL:
--                        num_sensors_per_group = (sensors_applet->size / 
--                                                 (horizontal ? MAX(icon_height, value_height) : 
--                                                  (icon_width + value_width)));
--                        break;
--                case VALUE_BELOW_LABEL:
--                        num_sensors_per_group = (sensors_applet->size / 
--                                                 (horizontal ? (icon_height + value_height) : 
--                                                  MAX(icon_width, value_width)));
--
--
--                        break;
--                }
--                break;
--
--        case DISPLAY_ICON:
--                gtk_widget_size_request(GTK_WIDGET(first_sensor->icon),
--                                        &req);
--                icon_width = req.width + COLUMN_SPACING;
--                icon_height = req.height + ROW_SPACING;
--                if (!(icon_width && icon_height)) {
--                        return;
--                }
--
--                num_sensors_per_group = (sensors_applet->size / 
--                                         (horizontal ? icon_height : 
--                                          icon_width));
--                break;
--
--        case DISPLAY_GRAPH:
--                /* only show graphs in a line like System Monitor
--                 * applet */
--                num_sensors_per_group = 1;
--                break;
--        }
-         /* ensure always atleast 1 sensor per group */
-         if (num_sensors_per_group < 1) {
-                 /* force a better layout */
diff --git a/community/sensors-applet/sensors-applet.install b/community/sensors-applet/sensors-applet.install
deleted file mode 100644
index a23a623cc..000000000
--- a/community/sensors-applet/sensors-applet.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-
-post_remove() {
-  post_install $1
-}
diff --git a/community/shapelib/PKGBUILD b/community/shapelib/PKGBUILD
index da73f52d4..ad4ccf6ec 100644
--- a/community/shapelib/PKGBUILD
+++ b/community/shapelib/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 93041 2013-06-23 03:50:51Z foutrelis $
-# Maintainer:  Federico Cinelli <cinelli@aur.archlinux.org>
-# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# $Id: PKGBUILD 97796 2013-09-29 19:27:30Z jlichtblau $
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Contributor: Federico Cinelli <cinelli@aur.archlinux.org>
 # Contributor: Bob Finch <w9ya@arrl.net>
 
 pkgname=shapelib
 pkgver=1.3.0
-pkgrel=2
+pkgrel=3
 pkgdesc='simple C API for reading and writing ESRI Shapefiles'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://shapelib.maptools.org/'
 license=('LGPL' 'MIT')
 options=('!libtool')
-source=("http://download.osgeo.org/$pkgname/$pkgname-$pkgver.tar.gz"
-        "LICENSE")
+source=(http://download.osgeo.org/$pkgname/$pkgname-$pkgver.tar.gz
+        LICENSE)
 sha256sums=('23d474016158ab5077db2f599527631706ba5c0dc7c4178a6a1d685bb014f68f'
             '67e45b04045e27a9d6f64f92b295831b8739b32668ce497d3fa02999e349a789')
 
diff --git a/community/shotwell/PKGBUILD b/community/shotwell/PKGBUILD
index 7d8805616..a9ce6c61e 100644
--- a/community/shotwell/PKGBUILD
+++ b/community/shotwell/PKGBUILD
@@ -1,39 +1,26 @@
-# $Id: PKGBUILD 96421 2013-08-28 11:35:15Z spupykin $
+# $Id: PKGBUILD 98032 2013-10-04 09:55:22Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com>
 
 pkgname=shotwell
-pkgver=0.14.1
-pkgrel=5
+pkgver=0.15.0
+pkgrel=1
 pkgdesc="A digital photo organizer designed for the GNOME desktop environment"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://yorba.org/shotwell/"
 license=('LGPL2.1')
-depends=('libgee06' 'webkitgtk' 'libgexiv2' 'libraw' 'rest'
+depends=('libgee' 'webkitgtk' 'libgexiv2' 'libraw' 'rest'
 	 'desktop-file-utils' 'dconf' 'hicolor-icon-theme' 'json-glib'
 	 'gst-plugins-base' 'libgphoto2')
 makedepends=('intltool' 'vala>=0.17.2' 'libunique3')
 install=shotwell.install
-source=("http://yorba.org/download/shotwell/stable/shotwell-$pkgver.tar.xz"
-	"no-libexec.patch"
-	"libraw-0.15.2.patch"
-	"FS35899.patch::http://redmine.yorba.org/projects/shotwell/repository/revisions/4f635ba4236dbbb8cb3f8b7bdd201432961fb283/diff/src/AppDirs.vala?format=diff")
-md5sums=('bb5783f9265e1ce2d4c9f354987c3ab1'
-         'b4124e022c98b4382530e6fbcef965e2'
-         '3ad21364f82229122f48452f5c74dfde'
-         '9f9690f4b860f52ffd44f8ab6d4fd3b5')
-
-prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 <$srcdir/no-libexec.patch
-  patch -Rp1 <$srcdir/libraw-0.15.2.patch
-  patch -p1 <$srcdir/FS35899.patch
-}
+source=("http://yorba.org/download/shotwell/stable/shotwell-$pkgver.tar.xz")
+md5sums=('8b33dd5df51f49e7f4f451b431d7c133')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
+  ./configure --prefix=/usr --libexec=/usr/lib/shotwell \
 	--disable-schemas-compile \
 	--disable-desktop-update \
 	--disable-icon-update
diff --git a/community/shotwell/libraw-0.15.2.patch b/community/shotwell/libraw-0.15.2.patch
deleted file mode 100644
index 248c5f236..000000000
--- a/community/shotwell/libraw-0.15.2.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -wbBur shotwell-0.14.1/src/photos/GRaw.vala shotwell-0.14.1/src/photos/GRaw.vala
---- /home/sergej/tmp/BUILD/staging-i686/sergej/build/shotwell/src/shotwell-0.14.1/src/photos/GRaw.vala	2013-06-17 16:26:12.247179310 +0400
-+++ shotwell-0.14.1/src/photos/GRaw.vala	2013-04-03 04:54:23.000000000 +0400
-@@ -168,7 +168,7 @@
-     }
-     
-     public void document_mode_processing() throws Exception {
--        throw_exception("document_mode_processing", 0);
-+        throw_exception("document_mode_processing", proc.document_mode_processing());
-     }
-     
-     public unowned LibRaw.ImageOther get_image_other() {
-@@ -244,7 +244,7 @@
-         // threshold
-         output_params->half_size = half_size;
-         // four_color_rgb
--//        output_params->document_mode = GRaw.DocMode.STANDARD;
-+        output_params->document_mode = GRaw.DocMode.STANDARD;
-         output_params->highlight = GRaw.HighlightMode.CLIP;
-         output_params->use_auto_wb = true;
-         output_params->use_camera_wb = true;
-diff -wbBur shotwell-0.14.1/vapi/libraw.vapi shotwell-0.14.1/vapi/libraw.vapi
---- /home/sergej/tmp/BUILD/staging-i686/sergej/build/shotwell/src/shotwell-0.14.1/vapi/libraw.vapi	2013-06-17 16:25:23.623846536 +0400
-+++ shotwell-0.14.1/vapi/libraw.vapi	2013-04-03 04:54:23.000000000 +0400
-@@ -184,6 +184,8 @@
-     public Processor(Options flags = Options.NONE);
-     
-     public Result adjust_sizes_info_only();
-+    [CCode (cname="libraw_dcraw_document_mode_processing")]
-+    public Result document_mode_processing();
-     public unowned ImageOther get_image_other() { return other; }
-     public unowned ImageParams get_image_params() { return idata; }
-     public Progress get_progress_flags() { return progress_flags; }
diff --git a/community/shotwell/no-libexec.patch b/community/shotwell/no-libexec.patch
deleted file mode 100644
index fe8960719..000000000
--- a/community/shotwell/no-libexec.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur shotwell-0.13.1.orig/Makefile shotwell-0.13.1/Makefile
---- shotwell-0.13.1.orig/Makefile	2012-10-05 20:07:37.000000000 +0200
-+++ shotwell-0.13.1/Makefile	2012-10-31 22:27:30.382869896 +0100
-@@ -558,8 +558,8 @@
- 	mkdir -p $(DESTDIR)$(PREFIX)/bin
- 	$(INSTALL_PROGRAM) $(PROGRAM) $(DESTDIR)$(PREFIX)/bin
- 	$(INSTALL_PROGRAM) $(THUMBNAILER_BIN) $(DESTDIR)$(PREFIX)/bin
--	mkdir -p $(DESTDIR)$(PREFIX)/libexec/shotwell
--	$(INSTALL_PROGRAM) $(MIGRATOR_BIN) $(DESTDIR)$(PREFIX)/libexec/shotwell
-+	mkdir -p $(DESTDIR)$(PREFIX)/lib/shotwell
-+	$(INSTALL_PROGRAM) $(MIGRATOR_BIN) $(DESTDIR)$(PREFIX)/lib/shotwell
- 	mkdir -p $(DESTDIR)$(PREFIX)/share/shotwell/icons
- 	$(INSTALL_DATA) icons/* $(DESTDIR)$(PREFIX)/share/shotwell/icons
- 	mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps
-diff -Naur shotwell-0.13.1.orig/src/AppDirs.vala shotwell-0.13.1/src/AppDirs.vala
---- shotwell-0.13.1.orig/src/AppDirs.vala	2012-10-05 19:56:07.000000000 +0200
-+++ shotwell-0.13.1/src/AppDirs.vala	2012-10-31 22:28:17.634388872 +0100
-@@ -109,7 +109,7 @@
-                 // not installed yet - use wherever we were run from
-                 libexec_dir = get_exec_dir();
-             } else {
--                libexec_dir = File.new_for_path(Resources.PREFIX + "/libexec/shotwell");
-+                libexec_dir = File.new_for_path(Resources.PREFIX + "/lib/shotwell");
-             }
-         }
- 
diff --git a/community/siege/PKGBUILD b/community/siege/PKGBUILD
index edc6ace43..5f42d1094 100644
--- a/community/siege/PKGBUILD
+++ b/community/siege/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 95093 2013-08-05 14:00:41Z bluewind $
+# $Id: PKGBUILD 97337 2013-09-18 09:31:58Z bluewind $
 # Maintainer: Florian Pritz <flo@xinu.at>
 # Contributor: Sven Kauber <celeon@gmail.com>
 
 pkgname=siege
-pkgver=3.0.2
+pkgver=3.0.4
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -29,4 +29,4 @@ package() {
   sed -i 's/^# file =$/file = \/etc\/urls.txt/' "$pkgdir/etc/siegerc"
 }
 
-md5sums=('116bcedf8a6663c1d42ce958e2cdd3ca')
+md5sums=('ea4180f0b02b99d0f43cf676a697c999')
diff --git a/community/sigil/PKGBUILD b/community/sigil/PKGBUILD
index 972735efd..ecdfdff9e 100644
--- a/community/sigil/PKGBUILD
+++ b/community/sigil/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 94050 2013-07-13 12:37:15Z svenstaro $
+# $Id: PKGBUILD 97088 2013-09-12 10:47:29Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com>
 
 pkgname=sigil
-pkgver=0.7.2
-pkgrel=2
+pkgver=0.7.3
+pkgrel=1
 pkgdesc="WYSIWYG ebook editor"
 arch=('i686' 'x86_64') 
 url="http://code.google.com/p/sigil/"
@@ -13,7 +13,7 @@ depends=('qt5-webkit' 'boost-libs')
 makedepends=('qt5-tools' 'qt5-svg' 'cmake' 'gendesk' 'boost')
 install=sigil.install
 source=("http://sigil.googlecode.com/files/Sigil-${pkgver}-Code.zip")
-md5sums=('540745983db57a2150cc2f4057455b19')
+md5sums=('13630c59bd85e91b96e312b4d39e5087')
 
 build() {
   cd "${srcdir}"
diff --git a/community/signon-keyring-extension/PKGBUILD b/community/signon-keyring-extension/PKGBUILD
deleted file mode 100644
index 7a7c1c182..000000000
--- a/community/signon-keyring-extension/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 79491 2012-11-06 04:11:27Z bgyorgy $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=signon-keyring-extension
-_pkgname=keyring
-pkgver=0.4
-pkgrel=1
-pkgdesc="GNOME keyring extension for signond"
-arch=('i686' 'x86_64' 'mips64el')
-url="https://launchpad.net/online-accounts-keyring-extension"
-license=('LGPL')
-depends=('signon' 'libgnome-keyring')
-source=(https://launchpad.net/online-accounts-keyring-extension/trunk/$pkgver/+download/$_pkgname-$pkgver.tar.bz2)
-md5sums=('4bbe5840cf0d5cfd142ba5ef262a38ed')
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  # Do not install tests
-  echo 'INSTALLS =' >>tests/tests.pro
-
-  qmake PREFIX=/usr LIBDIR=/usr/lib
-  make
-}
-
-package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  make INSTALL_ROOT="$pkgdir" install
-}
diff --git a/community/signon-plugin-oauth2/PKGBUILD b/community/signon-plugin-oauth2/PKGBUILD
deleted file mode 100644
index 9165da106..000000000
--- a/community/signon-plugin-oauth2/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 93075 2013-06-23 22:20:48Z bgyorgy $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=signon-plugin-oauth2
-_pkgname=signon-oauth2
-pkgver=0.18
-pkgrel=1
-pkgdesc="OAuth 2 plugin for signon"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://code.google.com/p/accounts-sso/"
-license=('LGPL')
-depends=('signon-ui' 'qjson')
-makedepends=('signon')
-source=(http://accounts-sso.googlecode.com/files/$_pkgname-$pkgver.tar.bz2)
-sha1sums=('4b7aabd69a67814b19447215b6466a93523d5dce')
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  sed -i '/-Werror/d' common-project-config.pri
-
-  # Do not install tests and example
-  echo 'INSTALLS =' >>tests/tests.pro
-  echo 'INSTALLS =' >>example/example.pro
-
-  qmake-qt4 PREFIX=/usr LIBDIR=/usr/lib
-  make
-}
-
-package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  make INSTALL_ROOT="$pkgdir" install
-}
diff --git a/community/signon-ui/Makefile b/community/signon-ui/Makefile
deleted file mode 100644
index 3ede78507..000000000
--- a/community/signon-ui/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# Add here the language codes for the translated .po files:
-LINGUAS =
-
-I18N_DOMAIN = signon-ui
-
-PO_FILES = $(addsuffix .po, $(LINGUAS))
-MO_FILES = $(addsuffix .mo, $(LINGUAS))
-
-DEL_FILE = rm -f
-INSTALL = /usr/bin/install -c -m 644
-MKDIR = mkdir -p
-
-all: $(MO_FILES)
-
-install: all
-	for lang in $(LINGUAS); do \
-		dir=$(INSTALL_ROOT)/usr/share/locale/$$lang/LC_MESSAGES; \
-		$(MKDIR) $$dir; \
-		$(INSTALL) $$lang.mo $$dir/$(I18N_DOMAIN).mo; \
-	done
-
-%.mo: %.po
-	msgfmt -o "$@" "$<"
-
-clean:
-	-$(DEL_FILE) $(MO_FILES)
-
-distclean: clean
-
-check: all
-
diff --git a/community/signon-ui/PKGBUILD b/community/signon-ui/PKGBUILD
deleted file mode 100644
index 7be5dfc66..000000000
--- a/community/signon-ui/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 92692 2013-06-12 05:09:15Z bgyorgy $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=signon-ui
-pkgver=0.15
-pkgrel=1
-pkgdesc="UI component that responsible for handling the user interactions which can happen during the login process of an online account"
-arch=('i686' 'x86_64' 'mips64el')
-url="https://launchpad.net/online-accounts-signon-ui"
-license=('GPL')
-depends=('libaccounts-qt' 'qtwebkit' 'signon' 'libnotify')
-source=(https://launchpad.net/online-accounts-signon-ui/trunk/$pkgver/+download/$pkgname-$pkgver.tar.bz2)
-md5sums=('67ac8ce4cc85b69ec6ff67ae892fda90')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # Do not install tests
-  echo 'INSTALLS =' >>tests/unit/tst_inactivity_timer.pro
-  echo 'INSTALLS =' >>tests/unit/tst_signon_ui.pro
-
-  qmake-qt4 PREFIX=/usr LIBDIR=/usr/lib
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make INSTALL_ROOT="$pkgdir" install
-}
diff --git a/community/signon/PKGBUILD b/community/signon/PKGBUILD
index af1ac68ad..c4d0840d1 100644
--- a/community/signon/PKGBUILD
+++ b/community/signon/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 96589 2013-09-02 00:00:14Z bgyorgy $
+# $Id: PKGBUILD 96925 2013-09-08 17:54:00Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgbase=signon
 pkgname=('signon' 'signon-doc')
-pkgver=8.53
+pkgver=8.54
 pkgrel=1
 pkgdesc="Framework to provide credential storage and authentication service"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ backup=(etc/signond.conf)
 install=$pkgname.install
 source=(http://accounts-sso.googlecode.com/files/$pkgbase-$pkgver.tar.bz2
         use_keyring.patch)
-sha1sums=('7148cf6cac0d5e56c5b697836f18aeb8cfce3734'
+sha1sums=('a29a12d6fe3747930e94932f6e1b1339b471d108'
           'cfdd48b494ad267654ceba23f1b81bcb8f56b9a1')
 
 build() {
diff --git a/community/simgear/PKGBUILD b/community/simgear/PKGBUILD
index af8420930..00b0628cf 100644
--- a/community/simgear/PKGBUILD
+++ b/community/simgear/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 94470 2013-07-25 12:34:11Z spupykin $
+# $Id: PKGBUILD 97539 2013-09-23 17:39:01Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: William Rea <sillywilly@gmail.com>
 # Contributor: Hans Janssen <hans@janserv.xs4all.nl>
 
 pkgname=simgear
-pkgver=2.10.0
-pkgrel=2
+pkgver=2.12.0
+pkgrel=1
 pkgdesc="A set of open-source libraries designed to be used as building blocks for quickly assembling 3d simulations, games, and visualization applications."
 arch=(i686 x86_64)
 depends=('glut' 'freealut' 'plib' 'openscenegraph')
@@ -17,12 +17,12 @@ options=('!makeflags')
 #source=("SimGear-$pkgver.tar.gz::https://gitorious.org/fg/simgear/archive-tarball/release/$pkgver")
 source=("http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/simgear-$pkgver.tar.bz2"
 	"osg-3.2.patch")
-md5sums=('0ec974d3778f777d5c99c89db671fcc7'
+md5sums=('dfc752f4759a2f795b7cdc9dad28411e'
          'd7f35f02d88c6ef9c58e07b8431811e6')
 
 prepare() {
   cd $srcdir/simgear-$pkgver
-  patch -p1 <$srcdir/osg-3.2.patch
+#  patch -p1 <$srcdir/osg-3.2.patch
 }
 
 build() {
diff --git a/community/sk1/PKGBUILD b/community/sk1/PKGBUILD
index 64b1b7032..6da48a5d6 100644
--- a/community/sk1/PKGBUILD
+++ b/community/sk1/PKGBUILD
@@ -1,29 +1,30 @@
-# $Id: PKGBUILD 81608 2012-12-25 00:34:13Z foutrelis $
+# $Id: PKGBUILD 97887 2013-09-30 13:21:30Z bgyorgy $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: ConnorBehan <connor.behan@gmail.com>
 
 pkgname=sk1
 pkgver=0.9.1
-pkgrel=9
+pkgrel=11
 pkgdesc="Fork of skencil with improved CMYK support"
 arch=(i686 x86_64 'mips64el')
 url="http://sk1project.org/modules.php?name=Products&product=sk1"
-depends=('tcl' 'tk' 'python2-lcms' 'pil>=1.0' 'pyxml' 'zenity' 'sk1libs')
+depends=('tcl' 'tk' 'python2-lcms' 'python2-pillow' 'pyxml' 'zenity' 'sk1libs')
 license=('GPL' 'LGPL')
 source=(http://sk1project.org/downloads/sk1/${pkgver}pre_rev905/sK1-${pkgver}pre_rev905.tar.gz
 	sk1.desktop
+        fix_pillow_import.patch
 	build-fix.patch)
-md5sums=('43b82fd85049b078dcf98e9dd81fdc6a'
-         'bbf6f10b8155838eede93b5abed724f5'
-         'b22c3c7b6a979c0a4e59ecaa2bd2182b')
 
-build() {
+package() {
   local _tclver=`pacman -Q tcl`
   local _tclnum=${tclver:4:3}
   local _tcldir='tcl'${tclnum}
 
   cd $srcdir/sK1-${pkgver}pre
 
+  # pillow import fix
+  patch -Np1 -i $srcdir/fix_pillow_import.patch
+
   # python2 fix
   sed -i 's_#! /usr/bin/python_#! /usr/bin/python2_' src/__init__.py
 
@@ -44,3 +45,7 @@ build() {
 
   sed -i 's#^python#python2#' $pkgdir/usr/bin/sk1
 }
+md5sums=('43b82fd85049b078dcf98e9dd81fdc6a'
+         'bbf6f10b8155838eede93b5abed724f5'
+         '4a44dd89707b19fe58f4c124ed321236'
+         'b22c3c7b6a979c0a4e59ecaa2bd2182b')
diff --git a/community/sk1/fix_pillow_import.patch b/community/sk1/fix_pillow_import.patch
new file mode 100644
index 000000000..7306dd3b6
--- /dev/null
+++ b/community/sk1/fix_pillow_import.patch
@@ -0,0 +1,35 @@
+diff -aur sK1-0.9.1pre/src/app/UI/pluginpanels/properties/gradient_fill.py sK1-0.9.1pre.new/src/app/UI/pluginpanels/properties/gradient_fill.py
+--- sK1-0.9.1pre/src/app/UI/pluginpanels/properties/gradient_fill.py	2009-07-16 23:26:15.000000000 +0000
++++ sK1-0.9.1pre.new/src/app/UI/pluginpanels/properties/gradient_fill.py	2013-09-22 09:52:26.543457833 +0000
+@@ -24,7 +24,7 @@
+ 
+ import tooltips
+ 
+-import Image, ImageTk, ImageDraw
++from PIL import Image, ImageTk, ImageDraw
+ 
+ DEFAULT_WIDTH=0.283286
+ DEFAULT_CORNER=const.JoinMiter
+diff -aur sK1-0.9.1pre/src/app/UI/pluginpanels/properties/outlineprop.py sK1-0.9.1pre.new/src/app/UI/pluginpanels/properties/outlineprop.py
+--- sK1-0.9.1pre/src/app/UI/pluginpanels/properties/outlineprop.py	2009-05-15 22:11:39.000000000 +0000
++++ sK1-0.9.1pre.new/src/app/UI/pluginpanels/properties/outlineprop.py	2013-09-22 09:52:13.216885815 +0000
+@@ -24,7 +24,7 @@
+ 
+ import tooltips
+ 
+-import Image, ImageTk, ImageDraw
++from PIL import Image, ImageTk, ImageDraw
+ 
+ DEFAULT_WIDTH=0.283286
+ DEFAULT_CORNER=const.JoinMiter
+diff -aur sK1-0.9.1pre/src/app/UI/widgets/colorbutton.py sK1-0.9.1pre.new/src/app/UI/widgets/colorbutton.py
+--- sK1-0.9.1pre/src/app/UI/widgets/colorbutton.py	2009-04-30 02:58:41.000000000 +0000
++++ sK1-0.9.1pre.new/src/app/UI/widgets/colorbutton.py	2013-09-22 09:52:38.150044124 +0000
+@@ -8,7 +8,7 @@
+ # The color sample size is 31x20 px
+ 
+ from Ttk import TButton
+-import Image, ImageTk
++from PIL import Image, ImageTk
+ 
+ class TColorButton(TButton):
diff --git a/community/skrooge/PKGBUILD b/community/skrooge/PKGBUILD
index f89d77c77..82dc1baf5 100644
--- a/community/skrooge/PKGBUILD
+++ b/community/skrooge/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 91047 2013-05-18 14:03:22Z jlichtblau $
+# $Id: PKGBUILD 98131 2013-10-06 15:36:48Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Ray Rashif <schiv@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: neuromante <lorenzo.nizzi.grifi@gmail.com>
 
 pkgname=skrooge
-pkgver=1.7.1
+pkgver=1.8.0
 pkgrel=1
 pkgdesc="A personal finances manager for KDE"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,8 +16,8 @@ makedepends=('cmake' 'automoc4' 'docbook-xsl' 'boost' 'kdepim-libkdepim')
 optdepends=('kdepim-libkdepim: for KDE PIM integration')
 install=$pkgname.install
 changelog=$pkgname.changelog
-source=(http://skrooge.org/files/$pkgname-$pkgver.tar.bz2)
-sha256sums=('7427c9c4a93a9c6794e6419ef225c8f512548217ab2eac7abf217f5802cd6a88')
+source=(http://download.kde.org/stable/$pkgname/$pkgname-$pkgver.tar.bz2)
+sha256sums=('98c0ed6cfefd4c6c92a010a1ab9afc1ef230eacc391a45aa200901ba6fb3bf08')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
diff --git a/community/skrooge/skrooge.changelog b/community/skrooge/skrooge.changelog
index 862db7099..b689eae6d 100644
--- a/community/skrooge/skrooge.changelog
+++ b/community/skrooge/skrooge.changelog
@@ -1,3 +1,6 @@
+2013-10-06 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* skrooge 1.8.0-1
+
 2013-05-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* skrooge 1.7.1-1
 
diff --git a/community/spice-gtk3/PKGBUILD b/community/spice-gtk3/PKGBUILD
index 803951dfc..bd7afb102 100644
--- a/community/spice-gtk3/PKGBUILD
+++ b/community/spice-gtk3/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 93453 2013-07-03 13:44:50Z spupykin $
+# $Id: PKGBUILD 97529 2013-09-23 16:16:35Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Stefano Facchini <stefano.facchini@gmail.com>
 # Contributor: Jonathan Lestrelin <zanko@daemontux.org>
@@ -6,8 +6,8 @@
 # Contributor: Lucio Zara <pennega@gmail.com>
 
 pkgname=spice-gtk3
-pkgver=0.20
-pkgrel=2
+pkgver=0.21
+pkgrel=1
 pkgdesc="A Gtk client and libraries for SPICE remote desktop servers (gtk3 version)."
 arch=('x86_64' 'i686')
 url="http://spice-space.org"
@@ -18,6 +18,7 @@ conflicts=('spice-gtk')
 options=('!libtool')
 source=("http://www.spice-space.org/download/gtk/spice-gtk-$pkgver.tar.bz2")
 sha256sums=('b1355823b0ceb2e118c1f9a9a602ccab78e1e2edf2d93f71fa42d3bc85ca75df')
+sha256sums=('73d418ffa97d6cf5edb1920d46f1d51fc40d14a8d4edfab3be6041e25062c564')
 
 build() {
   cd "$srcdir/spice-gtk-$pkgver"
diff --git a/community/squid/PKGBUILD b/community/squid/PKGBUILD
index b8d843509..d520a8094 100644
--- a/community/squid/PKGBUILD
+++ b/community/squid/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 94128 2013-07-14 18:31:46Z spupykin $
+# $Id: PKGBUILD 97531 2013-09-23 16:17:02Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Mark Coolen <mark.coolen@gmail.com>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: Kevin Piche <kevin@archlinux.org>
 
 pkgname=squid
-pkgver=3.3.8
+pkgver=3.3.9
 pkgrel=1
 pkgdesc='Full-featured Web proxy cache server'
 arch=('x86_64' 'i686' 'mips64el')
@@ -21,7 +21,7 @@ source=("http://www.squid-cache.org/Versions/v3/3.3/$pkgname-$pkgver.tar.bz2"
         'squid.pam'
         'squid.cron'
         'squid.service')
-md5sums=('ec1654d28e29bdd2ee342ffb655ecc72'
+md5sums=('f08bffe795260cecca828331c579e0c4'
          '270977cdd9b47ef44c0c427ab9034777'
          'a71425c4951f2e5b640d19e6a5048531'
          'ceeb57c69ebb165676219222f109a24e')
diff --git a/community/sshguard/PKGBUILD b/community/sshguard/PKGBUILD
index 276987c87..0e81c4e9a 100644
--- a/community/sshguard/PKGBUILD
+++ b/community/sshguard/PKGBUILD
@@ -1,13 +1,12 @@
-# $Id: PKGBUILD 92088 2013-05-31 11:33:59Z mtorromeo $
+# $Id: PKGBUILD 96970 2013-09-09 14:29:18Z mtorromeo $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 
 pkgname=sshguard
 pkgver=1.5
-pkgrel=13
+pkgrel=15
 pkgdesc="Brute force detector for SSH, Exim, VSFTPD and more. Blocks by ip with iptables"
 arch=('i686' 'x86_64' 'mips64el')
-#url="http://sourceforge.net/projects/sshguard/"
 url="http://www.sshguard.net/"
 license=('GPL')
 depends=('iptables')
@@ -17,12 +16,16 @@ source=("http://downloads.sourceforge.net/sourceforge/sshguard/sshguard-$pkgver.
 	sshguard.service
 	sshguard-journalctl)
 sha256sums=('b537f8765455fdf8424f87d4bd695e5b675b88e5d164865452137947093e7e19'
-            'e9713a067b33b8ea91d203853a033c0b9f6d40ebebd77f2e72903ed4fd355ebd'
-            '7423224107b28cabb69489056968581f1c9e94f3edc6a1d189e56a9df0bab4f7')
+            '3185cd3ceeee0bbb1f1df54baf025857200f39bd1eb747a59d6f46c562be4a51'
+            'f7b307fe9dbbe8c18fe91ca751679d62b2a3ade03cfe164e76ca411cfafffca6')
 
-build() {
+prepare() {
   cd "$srcdir/$pkgname-$pkgver"
   sed -i 's|^DAYNO.*|DAYNO       [0-9]?[1-9]|' src/parser/attack_scanner.l
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
   ./configure --prefix=/usr --sbindir=/usr/bin --with-firewall=iptables
   make
 }
diff --git a/community/sshguard/sshguard-journalctl b/community/sshguard/sshguard-journalctl
index fb106f5b6..e9bb14c5f 100644
--- a/community/sshguard/sshguard-journalctl
+++ b/community/sshguard/sshguard-journalctl
@@ -1,2 +1,4 @@
 #!/bin/sh
-/usr/bin/journalctl -afbp info -n1 SYSLOG_FACILITY=4 SYSLOG_FACILITY=10 | /usr/bin/sshguard -l- "$@"
+DBFILE=$1
+shift
+/usr/bin/journalctl -afb -p info -n1 "$@" | /usr/bin/sshguard -l- -b $DBFILE
diff --git a/community/sshguard/sshguard.service b/community/sshguard/sshguard.service
index d6324d459..11115727b 100644
--- a/community/sshguard/sshguard.service
+++ b/community/sshguard/sshguard.service
@@ -4,7 +4,7 @@ After=iptables.service ip6tables.service network.target
 Wants=iptables.service ip6tables.service
 
 [Service]
-ExecStart=/usr/lib/systemd/scripts/sshguard-journalctl -b /var/db/sshguard/blacklist.db
+ExecStart=/usr/lib/systemd/scripts/sshguard-journalctl /var/db/sshguard/blacklist.db SYSLOG_FACILITY=4 SYSLOG_FACILITY=10
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/sxiv/PKGBUILD b/community/sxiv/PKGBUILD
index 1307067fd..93103cc2f 100644
--- a/community/sxiv/PKGBUILD
+++ b/community/sxiv/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 94931 2013-08-01 07:01:27Z bpiotrowski $
+# $Id: PKGBUILD 97145 2013-09-14 07:15:14Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Bert Muennich <muennich at informatik.hu-berlin.de>
@@ -14,10 +14,8 @@ install=sxiv.install
 url='https://github.com/muennich/sxiv'
 depends=('libx11' 'xproto' 'imlib2' 'giflib' 'desktop-file-utils')
 source=(https://github.com/muennich/sxiv/archive/v$pkgver.tar.gz
-        sxiv.desktop
         config.h)
 sha256sums=('30569b7cb1568a7f60d102f6eb21f25c93de42243a1c8ac3c1a521d58b08281f'
-            'bd14b9b6bc6d78f18cdff8535b4d1c13b3c76e35091dd6bc675011d42a01bb47'
             '61515a87692849c942bfc3cce8b4c0f19139b4a1e9b6375a994cc541c64aab5c')
 
 build() {
@@ -30,6 +28,6 @@ package() {
   cd sxiv-$pkgver
 
   make PREFIX="$pkgdir"/usr install
-  install -D -m644 "$srcdir"/sxiv.desktop \
-                   "$pkgdir"/usr/share/applications/sxiv.desktop
+  install -D -m644 sxiv.desktop \
+    "$pkgdir"/usr/share/applications/sxiv.desktop
 }
diff --git a/community/sxiv/sxiv.desktop b/community/sxiv/sxiv.desktop
deleted file mode 100644
index a981171c5..000000000
--- a/community/sxiv/sxiv.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=sxiv
-GenericName=Image Viewer
-Exec=sxiv %F
-MimeType=image/bmp;image/gif;image/jpeg;image/jpg;image/png;image/tiff;image/x-bmp;
-NoDisplay=true
diff --git a/community/sysstat/PKGBUILD b/community/sysstat/PKGBUILD
index f93b63f4a..cc704560c 100644
--- a/community/sysstat/PKGBUILD
+++ b/community/sysstat/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 92869 2013-06-17 10:57:15Z spupykin $
+# $Id: PKGBUILD 97533 2013-09-23 16:17:24Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Martin Devera <devik@cdi.cz>
 
 pkgname=sysstat
-pkgver=10.1.6
-pkgrel=2
+pkgver=10.1.7
+pkgrel=1
 pkgdesc="a collection of performance monitoring tools (iostat,isag,mpstat,pidstat,sadf,sar)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pagesperso-orange.fr/sebastien.godard/"
@@ -18,7 +18,7 @@ backup=('etc/conf.d/sysstat'
 source=(http://pagesperso-orange.fr/sebastien.godard/$pkgname-$pkgver.tar.gz
 	sysstat.service
 	lib64-fix.patch)
-md5sums=('909135c84e36d780d501274e7450f924'
+md5sums=('112c8cc92114c961709d09f6afa537bd'
          '12ba479c606620193e8b7c6e982d5088'
          '7ffa6bf990609d85367070f71b40a34b')
 
diff --git a/community/tea/PKGBUILD b/community/tea/PKGBUILD
index fa4c88209..dc4597f9f 100644
--- a/community/tea/PKGBUILD
+++ b/community/tea/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 93973 2013-07-12 10:33:33Z spupykin $
+# $Id: PKGBUILD 97073 2013-09-12 10:15:01Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
@@ -6,9 +6,9 @@
 # Contributor: Zsolt Varadi <sysop_xxl@fibermail.hu>
 
 pkgname=tea
-pkgver=36.0.2
+pkgver=36.0.3
 pkgrel=1
-pkgdesc="A QT-based text editor for Linux and *BSD. With an ultimate small size TEA provides you hundreds of functions."
+pkgdesc="A Qt-based text editor for Linux and *BSD. With an ultimate small size TEA provides you hundreds of functions."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://semiletov.org/tea/"
 license=('GPL')
@@ -16,7 +16,7 @@ depends=('qt4' 'aspell' 'hunspell')
 install=tea.install
 source=(http://semiletov.org/tea/dloads/tea-$pkgver.tar.bz2
         tea.desktop)
-md5sums=('c8657c664af35d2032a78c645cb38d16'
+md5sums=('2e33f9a150f17eea62d9a805033fe16b'
          '377ace3363124f4c086de0babb820761')
 
 build() {
diff --git a/community/the_silver_searcher/PKGBUILD b/community/the_silver_searcher/PKGBUILD
index 0649939ee..0d1663b0f 100644
--- a/community/the_silver_searcher/PKGBUILD
+++ b/community/the_silver_searcher/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 94746 2013-07-29 21:17:53Z arodseth $
+# $Id: PKGBUILD 96848 2013-09-06 14:29:02Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Jeff Horelick <jdhore1@gmail.com>
 # Contributor: skydrome <skydrome@i2pmail.org>
 
 pkgname=the_silver_searcher
-pkgver=0.15
+pkgver=0.16
 pkgrel=1
 pkgdesc='Code searching tool similar to Ack, but faster'
 url='https://github.com/ggreer/the_silver_searcher'
@@ -12,17 +12,22 @@ license=('Apache')
 depends=('pcre' 'zlib' 'xz')
 arch=('x86_64' 'i686' 'mips64el')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/ggreer/$pkgname/archive/$pkgver.tar.gz")
-sha256sums=('bb05e329148315a9791cfa5cc1f7db4681e44476729971b4b3b7c2845a635748')
+sha256sums=('2be261b18a74adf4354515544a7e7bfdb970005ce1f0fc78f56a6801e629ada7')
+
+prepare() {
+  cd "$pkgname-$pkgver"
+  
+  sed -i 's:configure:configure --prefix=/usr:' build.sh
+}
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
-  sed -i 's:configure:configure --prefix=/usr:' build.sh
   ./build.sh
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
   make DESTDIR="$pkgdir" install
 }
diff --git a/community/tigervnc/PKGBUILD b/community/tigervnc/PKGBUILD
index a37192c1e..ef059484d 100644
--- a/community/tigervnc/PKGBUILD
+++ b/community/tigervnc/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 94384 2013-07-22 13:59:43Z spupykin $
+# $Id: PKGBUILD 97561 2013-09-24 10:31:09Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Uroš Vampl <mobile.leecher at gmail dot com>
 
 pkgname=tigervnc
 pkgver=1.3.0
-pkgrel=2
+pkgrel=3
 _xorgver=1.14.2
 pkgdesc="suite of VNC servers and clients. VNC 4 branch of TightVNC."
 arch=('i686' 'x86_64')
diff --git a/community/tint2/PKGBUILD b/community/tint2/PKGBUILD
index c45639ddb..80cb4575b 100644
--- a/community/tint2/PKGBUILD
+++ b/community/tint2/PKGBUILD
@@ -1,43 +1,50 @@
-# $Id: PKGBUILD 64903 2012-02-18 20:04:04Z bpiotrowski $
+# $Id: PKGBUILD 97618 2013-09-25 18:19:34Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Blue Peppers <bluepeppers@archlinux.us>
 # Contributor: Stefan Husmann< stefan-husmann@t-online.de>
 
 pkgname=tint2
 pkgver=0.11
-pkgrel=5
-pkgdesc="A basic, good-looking task manager for WMs"
+pkgrel=6
+pkgdesc='Basic, good-looking task manager for WMs'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/tint2/"
 license=('GPL2')
 conflicts=('ttm-svn' 'tint')
 replaces=('tint')
 depends=('gtk2' 'imlib2')
-optdepends=('pygtk: for using tint2conf')
+optdepends=('pygtk: for tint2wizard')
 makedepends=('pygtk' 'cmake')
 provides=('tint')
-source=("http://$pkgname.googlecode.com/files/$pkgname-${pkgver}.tar.bz2"
-        'add-power-now-support.patch')
+source=(http://tint2.googlecode.com/files/tint2-$pkgver.tar.bz2
+        add-power-now-support.patch
+        fix_defunct_processes.patch
+        middle_click_on_clock.patch)
 md5sums=('6fc5731e7425125fa84a2add5cef4bff'
-         '6cfcad028f1bd2f69812167f5395f890')
+         '6cfcad028f1bd2f69812167f5395f890'
+         'b3d052ac5ada81c56e36133b1ecdee8c'
+         'f7918d29a87422aab6fb9d922867d8f8')
 
-build() {
-  cd "$srcdir/$pkgname-${pkgver}"
+prepare() {
+  cd $pkgname-$pkgver
 
-  # add support for power_now battery attribute (fixes FS#21954)
   patch -Np0 -i ../add-power-now-support.patch
+  patch -Np0 -i ../fix_defunct_processes.patch
+  patch -Np0 -i ../middle_click_on_clock.patch
 
   # python2 fix
   sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' src/tint2conf/tintwizard.py
   sed -i 's_python _python2 _' src/tint2conf/main.c
+}
+
+build() {
+  cd $pkgname-$pkgver
 
-  [ -d build ] || mkdir build
-  cd build
-  cmake -DCMAKE_INSTALL_PREFIX=/usr ../
+  cmake -DCMAKE_INSTALL_PREFIX=/usr .
   make 
 }
 
 package() {
-  cd "$srcdir/$pkgname-${pkgver}/build"
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }
diff --git a/community/tint2/fix_defunct_processes.patch b/community/tint2/fix_defunct_processes.patch
new file mode 100644
index 000000000..28ea6c27a
--- /dev/null
+++ b/community/tint2/fix_defunct_processes.patch
@@ -0,0 +1,31 @@
+http://code.google.com/p/tint2/issues/detail?id=430
+Submitted By: David B. Cortarello (Nomius) <dcortarello at gmail dot com>
+Date: 18-05-2013
+Initial Package Version: subversion trunk (revision 652)
+Description: Fix zombie (defunct) processes created in clock_action.
+This patch provides the following bugfixes:
+   * This patch uses waitpid with WNOHANG to eliminate all zombie processes created by tint2 (in particular by the clock -right or left- click). This is done by a small hack in the update_clocks_min, called to "redraw" that area.
+
+--- src/clock/clock.c	(revision 652)
++++ src/clock/clock.c	(working copy)
+@@ -23,6 +23,8 @@
+ #include <cairo-xlib.h>
+ #include <pango/pangocairo.h>
+ #include <stdlib.h>
++#include <sys/types.h>
++#include <sys/wait.h>
+ 
+ #include "window.h"
+ #include "server.h"
+@@ -98,6 +103,10 @@
+ 	// remember old_sec because after suspend/hibernate the clock should be updated directly, and not
+ 	// on next minute change
+ 	time_t old_sec = time_clock.tv_sec;
++
++	// Little hack to wait executed commands in clock_action avoiding zombies
++	waitpid(-1, NULL, WNOHANG);
++
+ 	gettimeofday(&time_clock, 0);
+ 	if (time_clock.tv_sec % 60 == 0 || time_clock.tv_sec - old_sec > 60) {
+ 		int i;
+
diff --git a/community/tint2/middle_click_on_clock.patch b/community/tint2/middle_click_on_clock.patch
new file mode 100644
index 000000000..800c15c44
--- /dev/null
+++ b/community/tint2/middle_click_on_clock.patch
@@ -0,0 +1,75 @@
+http://code.google.com/p/tint2/issues/detail?id=430
+Submitted By: David B. Cortarello (Nomius) <dcortarello at gmail dot com>
+Date: 18-05-2013
+Initial Package Version: subversion trunk (revision 652)
+Description: Implemented middle click mouse button in the clock to execute tasks.
+* Implemented middle click mouse button over the clock by accepting the button 2 in the clock_action. 
+* A new configuration parameter was created called clock_mclick_command, which works in the same way 
+* clock_lclick_command and clock_rclick_command does.
+
+Index: src/clock/clock.c
+===================================================================
+--- src/clock/clock.c	(revision 652)
++++ src/clock/clock.c	(working copy)
+@@ -39,6 +41,7 @@
+ char *time_tooltip_format;
+ char *time_tooltip_timezone;
+ char *clock_lclick_command;
++char *clock_mclick_command;
+ char *clock_rclick_command;
+ struct timeval time_clock;
+ PangoFontDescription *time1_font_desc;
+@@ -61,6 +64,7 @@
+ 	time_tooltip_format = 0;
+ 	time_tooltip_timezone = 0;
+ 	clock_lclick_command = 0;
++	clock_mclick_command = 0;
+ 	clock_rclick_command = 0;
+ 	time1_font_desc = 0;
+ 	time2_font_desc = 0;
+@@ -77,6 +81,7 @@
+ 	if (time2_timezone) g_free(time2_timezone);
+ 	if (time_tooltip_timezone) g_free(time_tooltip_timezone);
+ 	if (clock_lclick_command) g_free(clock_lclick_command);
++	if (clock_mclick_command) g_free(clock_mclick_command);
+ 	if (clock_rclick_command) g_free(clock_rclick_command);
+ 	if (clock_timeout) stop_timeout(clock_timeout);
+ }
+@@ -254,6 +263,9 @@
+ 		case 1:
+ 		command = clock_lclick_command;
+ 		break;
++        case 2:
++        command = clock_mclick_command;
++		break;
+ 		case 3:
+ 		command = clock_rclick_command;
+ 		break;
+Index: src/clock/clock.h
+===================================================================
+--- src/clock/clock.h	(revision 652)
++++ src/clock/clock.h	(working copy)
+@@ -33,6 +33,7 @@
+ extern PangoFontDescription *time1_font_desc;
+ extern PangoFontDescription *time2_font_desc;
+ extern char *clock_lclick_command;
++extern char *clock_mclick_command;
+ extern char *clock_rclick_command;
+ extern int clock_enabled;
+ 
+Index: src/config.c
+===================================================================
+--- src/config.c	(revision 652)
++++ src/config.c	(working copy)
+@@ -396,6 +396,10 @@
+ 		if (strlen(value) > 0)
+ 			clock_lclick_command = strdup(value);
+ 	}
++	else if (strcmp(key, "clock_mclick_command") == 0) {
++		if (strlen(value) > 0)
++			clock_mclick_command = strdup(value);
++	}
+ 	else if (strcmp(key, "clock_rclick_command") == 0) {
+ 		if (strlen(value) > 0)
+ 			clock_rclick_command = strdup(value);
+
diff --git a/community/tix/PKGBUILD b/community/tix/PKGBUILD
index a8696e4e8..09f40e5cc 100644
--- a/community/tix/PKGBUILD
+++ b/community/tix/PKGBUILD
@@ -1,28 +1,41 @@
-# $Id: PKGBUILD 78264 2012-10-17 10:27:42Z allan $
+# $Id: PKGBUILD 97075 2013-09-12 10:15:40Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Brice Méalier <mealier_brice@yahoo.fr>
 
 pkgname=tix
 pkgver=8.4.3
-pkgrel=4
+pkgrel=5
 pkgdesc="Tk Interface eXtension, a powerful set of user interface components"
 arch=(i686 'x86_64' 'mips64el')
 url="http://tix.sourceforge.net/"
 license=("BSD")
 depends=('tk' 'libx11')
-source=(http://downloads.sourceforge.net/tix/Tix$pkgver-src.tar.gz
-	tcl-tk-path.patch)
+source=("http://downloads.sourceforge.net/tix/Tix$pkgver-src.tar.gz"
+	"tix-8.4.3-tcl8.6.patch::https://bugs.archlinux.org/task/36882?getfile=10973"
+	"tcl-tk-path.patch")
 md5sums=('2b8bf4b10a852264678182652f477e59'
+         'c26297f9e1744dc38308a062ef00549e'
          'd4df48da39dd51872d58706a51bab505')
 
-build() {
+prepare() {
   cd $srcdir/Tix$pkgver
+  sed -i -e 's:-Os::g' -i configure tclconfig/tcl.m4
+  patch -Np1 -i "${srcdir}/tix-8.4.3-tcl8.6.patch"
+  sed -i -e 's:generic/tclInt.h:tclInt.h:g' configure
+  sed -i -e 's:generic/tkInt.h:tkInt.h:g' configure
+}
 
-  patch -p1 <$srcdir/tcl-tk-path.patch
+build() {
+  cd $srcdir/Tix$pkgver
 
   export CFLAGS="$CFLAGS -DERR_IN_PROGRESS=2"
+  [[ $CARCH == "x86_64" ]] && BIT="--enable-64bit"
+
+  ./configure --prefix=/usr \
+    --with-tcl=/usr/lib \
+    --with-tk=/usr/lib \
+    $BIT \
 
-  ./configure --prefix=/usr
   make
   make DESTDIR=$pkgdir install
   # move things around
@@ -37,10 +50,9 @@ build() {
   cp -p man/tixwish.1 $pkgdir/usr/share/man/man1
   cd $srcdir/Tix$pkgver/man
   for i in *.n; do
-	  cp -p $i $pkgdir/usr/share/man/man3/${i%n}3
+    cp -p $i $pkgdir/usr/share/man/man3/${i%n}3
   done
 
   mkdir -p $pkgdir/usr/share/licenses/tix
   cp $srcdir/Tix$pkgver/license.terms  $pkgdir/usr/share/licenses/tix/
 }
-
diff --git a/community/torcs/PKGBUILD b/community/torcs/PKGBUILD
index 6d70f0e29..104f5ec15 100644
--- a/community/torcs/PKGBUILD
+++ b/community/torcs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 90096 2013-05-06 19:39:45Z foutrelis $
+# $Id: PKGBUILD 97077 2013-09-12 10:16:00Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Shahar Weiss <sweiss4@gmx.net>
 
 pkgname=torcs
 pkgver=1.3.4
-pkgrel=2
+pkgrel=4
 pkgdesc="A 3D racing cars simulator using OpenGL"
 url="http://torcs.sourceforge.net"
 license=("GPL")
@@ -12,10 +12,8 @@ arch=('i686' 'x86_64' 'mips64el')
 depends=('freeglut' 'libpng' 'freealut' 'libxi' 'libxmu' 'libxrandr' 'libvorbis' 'glu')
 makedepends=('plib' 'mesa')
 options=('!makeflags')
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver/_/-}.tar.bz2
-        torcs.desktop)
-md5sums=('07dbc9c53e2b177be1f53fe97d53d039'
-         '328e419e9f985c3e7b69924fe299330d')
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver/_/-}.tar.bz2)
+md5sums=('07dbc9c53e2b177be1f53fe97d53d039')
 
 build() {
   cd $srcdir/$pkgname-${pkgver/_/-}
@@ -29,6 +27,6 @@ package() {
   cd $srcdir/$pkgname-${pkgver/_/-}
   make DESTDIR=${pkgdir} install
   install -D -m644 Ticon.png ${pkgdir}/usr/share/pixmaps/torcs.png
-  install -D -m644 ../torcs.desktop ${pkgdir}/usr/share/applications/torcs.desktop
+  install -D -m644 torcs.desktop ${pkgdir}/usr/share/applications/torcs.desktop
   find ${pkgdir} -type d -exec chmod 755 {} \;
 }
diff --git a/community/torcs/torcs.desktop b/community/torcs/torcs.desktop
deleted file mode 100644
index 03d1ba010..000000000
--- a/community/torcs/torcs.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=TORCS
-Comment=The Open Racing Car Simulator
-Exec=torcs
-Icon=torcs.png
-Terminal=false
-Type=Application
-Encoding=UTF-8
-Categories=Application;Game;
diff --git a/community/tremulous/PKGBUILD b/community/tremulous/PKGBUILD
deleted file mode 100644
index 454f5f257..000000000
--- a/community/tremulous/PKGBUILD
+++ /dev/null
@@ -1,77 +0,0 @@
-# $Id: PKGBUILD 86782 2013-03-22 00:57:25Z eric $
-#Contributor: Daenyth <Daenyth+arch [AT] gmail [dot] com>
-
-pkgname=tremulous
-pkgver=1.1.0
-pkgrel=9
-pkgdesc="A free team based FPS/RTS hybrid built on the ioq3 engine. Includes community updates."
-url="http://tremulous.net"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-depends=('sdl' 'openal>=1.7.411' 'libgl' "tremulous-data=$pkgver" "freetype2")
-makedepends=(mesa)
-provides=("tremulous-updated=$pkgver-$pkgrel")
-conflicts=('tremulous-updated')
-replaces=('trem-backport' 'tremulous-updated')
-source=(http://releases.mercenariesguild.net/client/mg-client-manual.txt
-        http://releases.mercenariesguild.net/client/mgclient_source_Release_1.011.tar.gz
-        http://releases.mercenariesguild.net/tremded/mg_tremded_source_1.01.tar.gz
-        http://projects.mercenariesguild.net/attachments/download/109/game.qvm
-        http://projects.mercenariesguild.net/attachments/download/111/lakitu7_qvm.txt
-        tremdedrc
-        tremulous.desktop
-        tremded.sh
-        tremulous.sh
-        tremulous.xpm
-        fix_fs26749.patch)
-
-backup=('etc/tremdedrc')
-noextract=(mg_tremded_source_1.01.tar.gz)
-
-md5sums=('e0e1b6e03e7596da00a77fe638560402'
-         '95e526b961f875ba66b6fdd4842c913b'
-         '938bdf944dff667b74e2132a87a49780'
-         '90343619d140557d0c481a61ffa5756c'
-         'a0b8970b33a27798c125f9152049013c'
-         'f0056120d0192a0d4d591d1114439c52'
-         'aef37632a2edcf74a53503a49530bad2'
-         'b755d7c022cddc449ca2de508dfeee30'
-         '8e89473f9fdb481ad44e5cea5f6f681e'
-         '7e3a881608f1c7c0ccece1e07fcf92d8'
-         'e85511d8a9e7309dc24fb90917463900')
-
-build() {
-  local _arch=${CARCH/i686/x86}
-
-  # Build the server
-  mkdir -p "$srcdir/tremded"
-  bsdtar -x -C "$srcdir/tremded" -f "$srcdir/mg_tremded_source_1.01.tar.gz"
-  cd "$srcdir/tremded"
-  make
-# Build the client
-  cd "$srcdir/Release_1.011"
-  patch -Np1 -i "$srcdir/fix_fs26749.patch"
-  make
-}
-
-package() {
-  cd "$srcdir/tremded"
-  install -D -m755 build/release-linux-$_arch/tremded.$_arch "$pkgdir/opt/tremulous/tremded.$_arch"
-  install -D -m644 "$srcdir/tremdedrc"                         "$pkgdir/etc/tremdedrc"
-  install -D -m644 "$srcdir/game.qvm"                          "$pkgdir/opt/tremulous/game.qvm"
-  install -D -m755 "$srcdir/tremded.sh"                        "$pkgdir/usr/bin/tremded"
-
-  cd "$srcdir/Release_1.011"
-  install -Dm755 build/release-linux-$_arch/tremulous.$_arch "$pkgdir/opt/tremulous/tremulous.$_arch"
-  install -D -m755 "$srcdir/tremulous.sh"                      "$pkgdir/usr/bin/tremulous"
-
-  # Install the documentation
-  install -Dm644 "$srcdir/mg-client-manual.txt" "$pkgdir/usr/share/tremulous/mg-client-manual.txt"
-  install -Dm644 "$srcdir/lakitu7_qvm.txt"      "$pkgdir/usr/share/tremulous/lakitu7_qvm.txt"
-
-  # Install the .desktop and icon files
-  install -D -m644 "$srcdir/tremulous.xpm"     "$pkgdir/usr/share/pixmaps/tremulous.xpm"
-  install -D -m644 "$srcdir/tremulous.desktop" "$pkgdir/usr/share/applications/tremulous.desktop"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/tremulous/fix_fs26749.patch b/community/tremulous/fix_fs26749.patch
deleted file mode 100644
index 12a73138c..000000000
--- a/community/tremulous/fix_fs26749.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ruN Release_1.011-old/src/qcommon/parse.c Release_1.011/src/qcommon/parse.c
---- Release_1.011-old/src/qcommon/parse.c	2011-12-02 19:11:49.307368651 -0500
-+++ Release_1.011/src/qcommon/parse.c	2011-12-02 19:13:27.556836387 -0500
-@@ -981,7 +981,7 @@
- {
-   if (*string == '\"')
-   {
--    strcpy(string, string+1);
-+    memmove(string, string+1, strlen(string));
-   }
-   if (string[strlen(string)-1] == '\"')
-   {
-@@ -1784,7 +1784,7 @@
-     if ((*ptr == '\\' || *ptr == '/') &&
-         (*(ptr+1) == '\\' || *(ptr+1) == '/'))
-     {
--      strcpy(ptr, ptr+1);
-+      memmove(ptr, ptr+1, strlen(ptr));
-     }
-     else
-     {
diff --git a/community/tremulous/tremded.sh b/community/tremulous/tremded.sh
deleted file mode 100644
index 339bdd501..000000000
--- a/community/tremulous/tremded.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-CARCH=`uname -m`
-ext=x86; [ "$CARCH" = 'x86_64' ] && ext=x86_64
-
-[ -f /etc/tremdedrc ] && . /etc/tremdedrc
-[ -f "$HOME/.tremdedrc" ] && . "$HOME/.tremdedrc"
-
-if [ ! -r "$HOME/.tremulous/base/vm/game.qvm" ]; then
-	echo "Cannot find game.qvm -- linking to installed version."
-	if [ ! -d "$HOME/.tremulous/base/vm" ]; then
-		mkdir -p "$HOME/.tremulous/base/vm/" || exit 1
-	fi
-	ln -s /opt/tremulous/game.qvm "$HOME/.tremulous/base/vm/game.qvm" || exit 1
-fi
-
-cd /opt/tremulous/
-./tremded.$ext "$TREM_ARGS" "$@"
diff --git a/community/tremulous/tremdedrc b/community/tremulous/tremdedrc
deleted file mode 100644
index 7fbe122f6..000000000
--- a/community/tremulous/tremdedrc
+++ /dev/null
@@ -1 +0,0 @@
-TREM_ARGS="+set dedicated 1 +exec server.cfg"
diff --git a/community/tremulous/tremulous.desktop b/community/tremulous/tremulous.desktop
deleted file mode 100644
index 357c357bd..000000000
--- a/community/tremulous/tremulous.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Tremulous
-Comment=A free team based FPS/RTS hybrid built on the ioq3 engine. Includes community updates.
-Icon=/usr/share/pixmaps/tremulous.xpm
-Exec=tremulous
-Terminal=false
-Categories=Game;ActionGame;
diff --git a/community/tremulous/tremulous.sh b/community/tremulous/tremulous.sh
deleted file mode 100644
index 01575befc..000000000
--- a/community/tremulous/tremulous.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-CARCH=`uname -m`
-ext=x86; [ "$CARCH" = 'x86_64' ] && ext=x86_64
-
-if [ ! -r "$HOME/.tremulous/base/vm/game.qvm" ]; then
-	echo "Cannot find game.qvm -- linking to installed version."
-	if [ ! -d "$HOME/.tremulous/base/vm" ]; then
-		mkdir -p "$HOME/.tremulous/base/vm/" || exit 1
-	fi
-	ln -s /opt/tremulous/game.qvm "$HOME/.tremulous/base/vm/game.qvm" || exit 1
-fi
-
-cd /opt/tremulous/
-./tremulous.$ext "$@"
diff --git a/community/tremulous/tremulous.xpm b/community/tremulous/tremulous.xpm
deleted file mode 100644
index 5e070c862..000000000
--- a/community/tremulous/tremulous.xpm
+++ /dev/null
@@ -1,90 +0,0 @@
-/* XPM */
-static char * tremulous_xpm[] = {
-"48 48 39 1",
-" 	c None",
-".	c #0F0F0F",
-"+	c #181818",
-"@	c #000000",
-"#	c #282828",
-"$	c #212121",
-"%	c #060606",
-"&	c #1D1D1D",
-"*	c #252525",
-"=	c #080808",
-"-	c #0E0E0E",
-";	c #050505",
-">	c #0B0B0B",
-",	c #0C0C0C",
-"'	c #232323",
-")	c #1F1F1F",
-"!	c #030303",
-"~	c #0D0D0D",
-"{	c #040404",
-"]	c #020202",
-"^	c #141414",
-"/	c #1E1E1E",
-"(	c #131313",
-"_	c #111111",
-":	c #010101",
-"<	c #191919",
-"[	c #090909",
-"}	c #292929",
-"|	c #070707",
-"1	c #121212",
-"2	c #1B1B1B",
-"3	c #161616",
-"4	c #0A0A0A",
-"5	c #222222",
-"6	c #242424",
-"7	c #1A1A1A",
-"8	c #151515",
-"9	c #101010",
-"0	c #171717",
-"                                                ",
-"                         ...                    ",
-"                       +@@@@@#                  ",
-"                      $@@@@@@%                  ",
-"                     &@@@@@@@@               *  ",
-"  =-                 ;@@@@@@@@>             ,@- ",
-"  @@'                ;@@@@@@@@@            ,@@  ",
-"  )@!                ;@@@@@@@@@           ~@@;  ",
-"   ;@{               ]@@@@@@@@@~         ,@@;   ",
-"   ^@@]             /@@@@@@@@@@@(       -@@;    ",
-"    .@@;            /@@@@@@@@@@@       -@@@/    ",
-"     _@@]           /@@@@@@@@@@@     #:@@@_     ",
-"      @@@;          /@@@@@@@@@@<     :@@@-      ",
-"       :@@!          ]@@@@@@@@@     @@@@-       ",
-"       $@@@;         ;@@@@@@@@[   ~]@@@-        ",
-"        %@@@;       }!@@@@@@@@- }|@@@@,         ",
-"         !@@@;     1@@@@@@@@@@ 2@@@@@~          ",
-"          ;@@@%    [@@@@@@@@@@@@@@@@,           ",
-"           @@@@{|||:@@@@@@@@@@@@@@!-            ",
-"           -@@@@@@@@@@@@@@@@@@@@@]              ",
-"            .@@@@@@@@@@@@@@@@@@@{               ",
-"              ]@@@@@@@@@@@@@@@@@                ",
-"               .@@@@@@@@@@@@@@@@                ",
-"                +@@@@@@@@@@@@@@@@@@@@@@@@@@/    ",
-"                 =@@@@@@@@@@@@@@@@@@@@@@@@@/    ",
-"               .=@@@@@@@@@@@@@@@@@@%            ",
-"             ,@@@@@@@@@@@@@@@@@@@@@             ",
-"        2>]@@@@@@@@@@@@@@@@@@@@@@@3             ",
-"      *:@@@@@@@@@@@@@@@@@@@@@@@@@^              ",
-"      @@@|||  4]@@@@@@@@@@@@@@@@@               ",
-"      556       _@@@@@@@@@@@@@@@@3              ",
-"                 >@@@@@@@@@@@@@@@@+             ",
-"                 ;@@@@@@@@@@@@@@@@@7            ",
-"                &@@@@@@@@@@@@@@@@@@@+           ",
-"                @@@@@@@@@@@@@@@@@@@@@/          ",
-"               8@@@@@@@@@@@@@@@[  =@@|          ",
-"               ;@@:::@@@@@@@@@[    %@@[         ",
-"               @@9   (@@@@@@@4      =@@         ",
-"              ,@@      {:@@:         {@!        ",
-"              !@@        <<          3@@0       ",
-"              !@-                     3@@6      ",
-"              ]@(                      (@[      ",
-"             7@@                        ]@      ",
-"             7@@                         *      ",
-"             7@}                                ",
-"             7@                                 ",
-"              .                                 ",
-"                                                "};
diff --git a/community/ulogd/PKGBUILD b/community/ulogd/PKGBUILD
index 5d44fd6d2..8d3798210 100644
--- a/community/ulogd/PKGBUILD
+++ b/community/ulogd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90538 2013-05-13 00:36:03Z seblu $
+# $Id: PKGBUILD 98179 2013-10-07 10:07:11Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Sébastien Luttringer
 # Contributor: Dale Blount <dale@archlinux.org>
@@ -6,17 +6,18 @@
 
 pkgname=ulogd
 pkgver=2.0.2
-pkgrel=2
+pkgrel=3
 pkgdesc='Userspace Packet Logging for netfilter'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.netfilter.org/projects/ulogd/index.html'
 license=('GPL2')
-depends=('libmnl' 'libnfnetlink')
+depends=('libmnl'
+         'libnetfilter_acct'
+         'libnetfilter_conntrack'
+         'libnetfilter_log'
+         'libnfnetlink')
 backup=('etc/ulogd.conf')
 makedepends=('libmariadbclient'
-             'libnetfilter_acct'
-             'libnetfilter_conntrack'
-             'libnetfilter_log'
              'libpcap'
              'libdbi'
              'postgresql-libs'
@@ -24,15 +25,14 @@ makedepends=('libmariadbclient'
 optdepends=("${makedepends[@]}")
 options=('!libtool')
 source=("ftp://ftp.netfilter.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2"
-	      "$pkgname.logrotate"
-	      "$pkgname.conf"
-	      "$pkgname.service")
+        "$pkgname.logrotate"
+        "$pkgname.conf"
+        "$pkgname.service")
 md5sums=('660516de4b5b1e110c12dae414619e0f'
-         'dd32eeee0949adff4188544419acd17e'
-         'c21531312f95e790ed19aa267a17d35a'
+         '95f05af0a0c8f5fdea5bd92ccb2fd465'
+         '7ccdb48cd152ff502334d3f6b2a4daab'
          '092d72209e30c132e0a08112e4062772')
 
-
 build() {
   cd $pkgname-$pkgver
   ./configure \
diff --git a/community/ulogd/ulogd.conf b/community/ulogd/ulogd.conf
index 822575613..f96bd1d2c 100644
--- a/community/ulogd/ulogd.conf
+++ b/community/ulogd/ulogd.conf
@@ -1,20 +1,19 @@
 [global]
-nlgroup=1
 logfile="/var/log/ulogd.log"
 loglevel=5
 rmem=131071
 bufsize=150000
 
-plugin="/usr/lib/ulogd/ulogd_inppkt_ULOG.so"
+plugin="/usr/lib/ulogd/ulogd_inppkt_NFLOG.so"
 plugin="/usr/lib/ulogd/ulogd_raw2packet_BASE.so"
 plugin="/usr/lib/ulogd/ulogd_filter_IP2STR.so"
 plugin="/usr/lib/ulogd/ulogd_filter_PRINTPKT.so"
 plugin="/usr/lib/ulogd/ulogd_output_LOGEMU.so"
 
-stack=ulog1:ULOG,base1:BASE,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU
+stack=log1:NFLOG,base1:BASE,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU
 
-[ulog1]
-nlgroup=1
+[log1]
+group=1
 
 [emu1]
 file=/var/log/ulogd.syslogemu
diff --git a/community/ulogd/ulogd.logrotate b/community/ulogd/ulogd.logrotate
index 312c71acb..299e93d02 100644
--- a/community/ulogd/ulogd.logrotate
+++ b/community/ulogd/ulogd.logrotate
@@ -5,6 +5,6 @@
   create 0640 root root
 
   postrotate
-    [ -e /var/run/ulogd.pid ] && /etc/rc.d/ulogd restart > /dev/null
+    systemctl kill --signal=SIGHUP ulogd.service || true
   endscript
 }
diff --git a/community/unbound/PKGBUILD b/community/unbound/PKGBUILD
index 2631f77cc..3eb3da923 100644
--- a/community/unbound/PKGBUILD
+++ b/community/unbound/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 96581 2013-09-01 20:52:28Z bisson $
+# $Id: PKGBUILD 97464 2013-09-20 18:55:05Z 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=3
+pkgver=1.4.21
+pkgrel=1
 pkgdesc='Validating, recursive, and caching DNS resolver'
 url='http://unbound.net/'
 license=('custom:BSD')
@@ -17,7 +17,7 @@ backup=('etc/unbound/unbound.conf')
 source=("http://unbound.net/downloads/${pkgname}-${pkgver}.tar.gz"
         'service'
         'conf')
-sha1sums=('1752976533be2a4f0c9cdbab9d2cbb67d4f27c43'
+sha1sums=('3ef4ea626e5284368d48ab618fe2207d43f2cee1'
           'b543ae6f8b87423bec095fca6b335a9ee43739a8'
           '5d473ec2943fd85367cdb653fcd58e186f07383f')
 
diff --git a/community/uniconvertor/PKGBUILD b/community/uniconvertor/PKGBUILD
index e1ee5d1d0..d8804685f 100644
--- a/community/uniconvertor/PKGBUILD
+++ b/community/uniconvertor/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 78268 2012-10-17 10:27:59Z allan $
+# $Id: PKGBUILD 97864 2013-09-30 10:28:08Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Roberto Alsina <ralsina@kde.org>
 
 pkgname=uniconvertor
 pkgver=1.1.5
-pkgrel=6
+pkgrel=7
 pkgdesc="A universal vector graphics translator using sK1 engine."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sk1project.org/modules.php?name=Products&product=uniconvertor"
 license=('GPL')
-depends=('python2' 'python2-imaging' 'python2-reportlab' 'sk1libs')
+depends=('python2' 'python2-pillow' 'python2-reportlab' 'sk1libs')
 makedepends=('gcc')
 source=(http://uniconvertor.googlecode.com/files/uniconvertor-$pkgver.tar.gz)
 md5sums=('d1272315a58304ece2ff588834e23f72')
diff --git a/community/usb_modeswitch/PKGBUILD b/community/usb_modeswitch/PKGBUILD
index 6e2ee8b72..0a3607bcb 100644
--- a/community/usb_modeswitch/PKGBUILD
+++ b/community/usb_modeswitch/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 95443 2013-08-12 08:50:29Z spupykin $
+# $Id: PKGBUILD 98181 2013-10-07 10:07:44Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=usb_modeswitch
-pkgver=1.2.7
+pkgver=2.0.1
 pkgrel=1
 _pkgdata=20130807
 pkgdesc="Activating switchable USB devices on Linux."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.draisberghof.de/usb_modeswitch/"
 license=('GPL')
-depends=('libusb-compat' 'tcl')
+depends=('libusb' 'tcl')
 makedepends=('gcc' 'make')
 backup=("etc/$pkgname.conf")
 source=("http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-${pkgver}.tar.bz2"
 	"http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-${_pkgdata}.tar.bz2"
 	"usb-modeswitch-${pkgver}-device_reference.txt::http://www.draisberghof.de/usb_modeswitch/device_reference.txt")
-md5sums=('18d889d72195534ae9133a8181cad42b'
+md5sums=('e48d4419d0574d342bb183f7465556d0'
          '91feff51deba6e48e78506b8f4db2274'
          'dd14f254f6c3642ce16fd7c2f43ee112')
 
diff --git a/community/uwsgi/PKGBUILD b/community/uwsgi/PKGBUILD
index 9ccc64750..a785dc9bb 100644
--- a/community/uwsgi/PKGBUILD
+++ b/community/uwsgi/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 95003 2013-08-03 02:02:14Z dwallace $
+# $Id: PKGBUILD 98108 2013-10-06 00:44:23Z dwallace $
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: Valentin Hăloiu <vially.ichb+aur@gmail.com>
 # Contributor: Angel Velasquez <angvp@archlinux.org>  
@@ -9,6 +9,7 @@ pkgbase=uwsgi
 pkgname=(uwsgi
         uwsgi-plugin-common
         uwsgi-plugin-rack
+        uwsgi-plugin-psgi
         uwsgi-plugin-python2
         uwsgi-plugin-python
         uwsgi-plugin-nagios
@@ -22,8 +23,8 @@ pkgname=(uwsgi
         uwsgi-plugin-pam
         uwsgi-plugin-zergpool
         )
-pkgver=1.9.14
-pkgrel=3
+pkgver=1.9.17.1
+pkgrel=1
 arch=(i686 x86_64)
 url="http://projects.unbit.it/$pkgbase"
 license=(GPL2)
@@ -39,10 +40,11 @@ source=(http://projects.unbit.it/downloads/$pkgbase-$pkgver.tar.gz
         uwsgi_fix_rpath.patch
         uwsgi_ruby20_compatibility.patch
         uwsgi_trick_chroot.patch)
-md5sums=('ec9cf333534604f17ef4e24051d9d65d'
-         '899e61d6957bec57e148b92dcb1bec6d'
+
+md5sums=('501f29ad4538193c0ef585b4cef46bcf'
+         'fcd57c37372e6afe5b1fae151dd43bc9'
          'b05ba1d796e1ea608a40635bc4f3ec67'
-         '0b79320fbae92715c96086cf51e60bc8'
+         '740a7718bd341b03d916a13ddbbbe694'
          'db70315bbc8cb886a278ba59d5fd8d57'
          '1a4516d5cdcf5b95b036f4eae2d0c152'
          '4d09535ce379c8acd76160f35d5d6b55'
@@ -89,6 +91,8 @@ package_uwsgi-plugin-common(){
         install -Dm755 $pkgbase-$pkgver/${plugin}_plugin.so $pkgdir/usr/lib/uwsgi/${plugin}_plugin.so
         ln -s uwsgi $pkgdir/usr/bin/uwsgi_$plugin
     done
+    install -Dm755 $pkgbase-$pkgver/corerouter_plugin.so $pkgdir/usr/lib/uwsgi/
+
 }
 
 package_uwsgi-plugin-rack(){
@@ -101,6 +105,14 @@ package_uwsgi-plugin-rack(){
     install -Dm755 $pkgbase-$pkgver/rbthreads_plugin.so $pkgdir/usr/lib/uwsgi/rbthreads_plugin.so
 }
 
+package_uwsgi-plugin-psgi(){
+    depends=(perl uwsgi-plugin-common)
+    pkgdesc="Perl psgi plugin"
+    install -dm755 $pkgdir/usr/bin
+    install -Dm755 $pkgbase-$pkgver/psgi_plugin.so $pkgdir/usr/lib/uwsgi/psgi_plugin.so
+    ln -s uwsgi $pkgdir/usr/bin/uwsgi_${pkgname#uwsgi-plugin-}
+}
+
 package_uwsgi-plugin-python2(){
     depends=(uwsgi-plugin-common python2-gevent python2-gevent)
     pkgdesc="Plugin for Python2 support"
@@ -138,8 +150,9 @@ package_uwsgi-plugin-router(){
     cd $pkgbase-$pkgver
 
     for file in router_*_plugin.so fastrouter_plugin.so sslrouter_plugin.so rawrouter_plugin.so; do
-        install -Dm644 $file $pkgdir/usr/lib/uwsgi/$file
+        install -Dm755 $file $pkgdir/usr/lib/uwsgi/$file
     done
+    install -Dm755 router_basicauth_plugin.so $pkgdir/usr/lib/uwsgi/basicauth_plugin.so
 }
 
 package_uwsgi-plugin-admin(){
diff --git a/community/uwsgi/archlinux.ini b/community/uwsgi/archlinux.ini
index 4512b301a..e3770bf5b 100644
--- a/community/uwsgi/archlinux.ini
+++ b/community/uwsgi/archlinux.ini
@@ -14,4 +14,4 @@ yaml_implementation = auto
 malloc_implementation = libc
 embedded_plugins = echo, ping, http, corerouter
 plugin_dir = /usr/lib/uwsgi
-plugins = rack, rbthreads, fiber, python, nagios,  admin, lua, cache, cgi, rpc, ugreen, carbon, rrdtool, erlang, pam, systemd_logger, php, fastrouter, router_uwsgi, router_redirect, router_basicauth, zergpool, router_rewrite, router_http, router_cache, rawrouter, router_static, sslrouter
+plugins = echo, ping, http, rack, psgi, corerouter, rbthreads, fiber, python, nagios,  admin, lua, cache, cgi, rpc, ugreen, carbon, rrdtool, erlang, pam, systemd_logger, php, fastrouter, router_uwsgi, router_redirect, router_basicauth, zergpool, router_rewrite, router_http, router_cache, rawrouter, router_static, sslrouter
diff --git a/community/uwsgi/uwsgi@.service b/community/uwsgi/uwsgi@.service
index c9e9789a0..08941b507 100644
--- a/community/uwsgi/uwsgi@.service
+++ b/community/uwsgi/uwsgi@.service
@@ -8,6 +8,7 @@ Restart=always
 Type=notify
 StandardError=syslog
 NotifyAccess=main
+KillSignal=SIGQUIT
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/v8/PKGBUILD b/community/v8/PKGBUILD
deleted file mode 100644
index 8c1820d0b..000000000
--- a/community/v8/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# $Id: PKGBUILD 94324 2013-07-20 14:19:20Z bpiotrowski $
-# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
-# Contributor: Kaiting Chen <kaitocracy@gmail.com>
-# Contributor: tocer <tocer.deng@gmail.com>
-
-pkgname=v8
-pkgver=3.19.18.4
-pkgrel=1
-pkgdesc='Fast and modern Javascript engine'
-arch=('i686' 'x86_64')
-url='http://code.google.com/p/v8'
-license=('BSD')
-depends=('gcc-libs' 'readline')
-makedepends=('subversion' 'python2')
-source=(http://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$pkgver.tar.bz2)
-sha256sums=('10d7a51ed2769b1c2a6311a30ed1967d0a1da3f522c90b9c00f25fbe0b1aba02')
-
-[[ "$CARCH" = 'i686' ]]   && ARCH=ia32
-[[ "$CARCH" = 'x86_64' ]] && ARCH=x64
-
-prepare() {
-  cd $pkgname-$pkgver
-
-  make dependencies
-
-  export PYTHON=python2
-  find build/ test/ tools/ src/ -type f \
-    -exec sed -e 's_^#!/usr/bin/env python$_&2_' \
-              -e 's_^\(#!/usr/bin/python2\).[45]$_\1_' \
-              -e 's_^#!/usr/bin/python$_&2_' \
-              -e "s_'python'_'python2'_" -i {} \;
-  sed -i 's/python /python2 /' Makefile
-}
-
-build() {
-  cd $pkgname-$pkgver
-
-  make $ARCH.release library=shared console=readline werror=no
-
-  cd "$srcdir" && cp -r $pkgname-$pkgver d8-static-$pkgver
-  cd d8-static-$pkgver
-  make $ARCH.release library=static console=readline werror=no
-}
-
-package() {
-  cd $pkgname-$pkgver
-
-  install -Dm755 "$srcdir"/d8-static-$pkgver/out/$ARCH.release/d8 "$pkgdir"/usr/bin/d8
-  install -Dm755 out/$ARCH.release/lib.target/libv8.so "$pkgdir"/usr/lib/libv8.so
-
-  install -d "$pkgdir"/usr/include
-  install -Dm644 include/*.h "$pkgdir"/usr/include
-
-  install -d "$pkgdir"/usr/share/licenses/v8
-  install -m644 LICENSE* ${pkgdir}/usr/share/licenses/v8
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/viking/PKGBUILD b/community/viking/PKGBUILD
index 6be683faa..64196d9eb 100644
--- a/community/viking/PKGBUILD
+++ b/community/viking/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 91039 2013-05-18 13:32:51Z jlichtblau $
+# $Id: PKGBUILD 97743 2013-09-28 08:12:47Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Nick Østergaard <oe.nick@gmail.com>
 # Contributor: Jonny Gerold <jonny@fsk141.com>
 
 pkgname=viking
-pkgver=1.4.1
+pkgver=1.4.2
 pkgrel=1
 pkgdesc="GTK+2 application to manage GPS data"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ options=('!emptydirs')
 install=$pkgname.install
 changelog=$pkgname.changelog
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
-sha256sums=('20d91b048d2bfbb33498af4da5dc120a3a9232ed05a4a87a3ce6e341445ef640')
+sha256sums=('58e85c9792d0df62c3c9b583869bc40d6218ca01c117c05599d45e6d6b254bf1')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
diff --git a/community/viking/viking.changelog b/community/viking/viking.changelog
index 6f22365fd..78255a931 100644
--- a/community/viking/viking.changelog
+++ b/community/viking/viking.changelog
@@ -1,3 +1,6 @@
+2013-09-28 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* viking 1.4.2-1
+
 2013-05-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* viking 1.4.1-1
 
diff --git a/community/virtualbox-modules-lts/PKGBUILD b/community/virtualbox-modules-lts/PKGBUILD
index 2790b0a30..eae92f3b6 100644
--- a/community/virtualbox-modules-lts/PKGBUILD
+++ b/community/virtualbox-modules-lts/PKGBUILD
@@ -1,25 +1,22 @@
-# $Id: PKGBUILD 95971 2013-08-19 07:53:19Z tpowa $
+# $Id: PKGBUILD 98211 2013-10-07 14:38:11Z andyrtr $
 # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Sébastien Luttringer
 
 pkgbase=virtualbox-modules-lts
 pkgname=('virtualbox-host-modules-lts' 'virtualbox-guest-modules-lts')
-pkgver=4.2.16
-pkgrel=2
+pkgver=4.2.18
+pkgrel=8
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
-makedepends=('linux-lts>=3.0' 'linux-lts<3.1'
-             'linux-lts-headers>=3.0' 'linux-lts-headers<3.1'
+makedepends=('linux-lts>=3.10' 'linux-lts<3.11'
+             'linux-lts-headers>=3.10' 'linux-lts-headers<3.11'
              "virtualbox-host-dkms>=$pkgver"
-             "virtualbox-guest-dkms>=$pkgver"
-             'expac'
-             'sed'
-             'bc')
+             "virtualbox-guest-dkms>=$pkgver")
 
 # remember to also adjust the .install files and the package deps below
-_extramodules=extramodules-3.0-lts
+_extramodules=extramodules-3.10-lts
 
 build() {
   _kernver=$(cat /usr/lib/modules/$_extramodules/version)
@@ -37,7 +34,7 @@ build() {
 package_virtualbox-host-modules-lts(){
   _kernver=$(cat /usr/lib/modules/$_extramodules/version)
   pkgdesc='Host kernel modules for VirtualBox'
-  depends=('linux-lts>=3.0' 'linux-lts<3.1')
+  depends=('linux-lts>=3.10' 'linux-lts<3.11')
   replaces=('virtualbox-modules-lts')
   conflicts=('virtualbox-modules-lts')
   provides=("virtualbox-host-modules=$pkgver")
@@ -53,10 +50,10 @@ package_virtualbox-guest-modules-lts(){
   _kernver=$(cat /usr/lib/modules/$_extramodules/version)
   pkgdesc='Guest kernel modules for VirtualBox'
   license=('GPL')
-  depends=('linux-lts>=3.0' 'linux-lts<3.1')
+  depends=('linux-lts>=3.10' 'linux-lts<3.11')
   replaces=('virtualbox-archlinux-modules-lts')
   conflicts=('virtualbox-archlinux-modules-lts')
-  provides=("virtualbox-host-modules=$pkgver")
+  provides=("virtualbox-guest-modules=$pkgver")
   install=virtualbox-guest-modules-lts.install
 
   cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module"
diff --git a/community/virtualbox-modules-lts/build.sh b/community/virtualbox-modules-lts/build.sh
index 744f18330..b5c163db9 100755
--- a/community/virtualbox-modules-lts/build.sh
+++ b/community/virtualbox-modules-lts/build.sh
@@ -1,25 +1,60 @@
 #!/bin/bash
+# lazyness can be enhanced everyday
 
-set -e
-
-if (( $# != 1 )); then
+usage() {
   echo "usage: $0 extra"
   echo "       $0 testing"
   exit 1
-fi
+}
+
+# $1: reference package
+update() {
+  url="https://www.archlinux.org/packages/$1/x86_64/$2/"
+  curkernel=$(wget -qO- "$url"|sed -nr "s/.*<h2>$2 ([0-9]+)\.([0-9]+).*<\/h2>.*/\1.\2/p")
+  nextkernel=${curkernel%.*}.$(( ${curkernel#*.}+1))
+
+  echo "** Current kernel: $curkernel"
+  echo "** Next kernel: $nextkernel"
+
+  sed -ri \
+    -e "s/(_?extramodules=).*-(ARCH|lts).*/\1extramodules-$curkernel-\2/i" \
+    -e "s/(linux.*>=)[0-9]+.[0-9]+/\1$curkernel/" \
+    -e "s/(linux.*<)[0-9]+.[0-9]+/\1$nextkernel/" \
+    PKGBUILD *.install
+}
+
+# $1: repo
+# $2: arch
+build() {
+  _pwd=$PWD
+  cd /var/empty
+  makechrootpkg -cu -I "$_pwd"/../../virtualbox/trunk/virtualbox-host-dkms-*-$arch.pkg.tar.xz -r "$1"
+  makechrootpkg -I "$_pwd"/../../virtualbox/trunk/virtualbox-guest-dkms-*-$arch.pkg.tar.xz  -r "$1"
+  cd "$_pwd"
+  makechrootpkg -n -r "$1"
+}
 
-here=$PWD
-cd /var/empty
-linux32 makechrootpkg -cu -I "$here"/../../virtualbox/trunk/virtualbox-host-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686
-linux32 makechrootpkg -I "$here"/../../virtualbox/trunk/virtualbox-guest-dkms-*-i686.pkg.tar.xz  -r /var/lib/archbuild/$1-i686
-cd "$here"
-linux32 makechrootpkg -n -r /var/lib/archbuild/$1-i686
+(( $# == 1 )) || usage
 
-cd /var/empty
-makechrootpkg -cu -I "$here"/../../virtualbox/trunk/virtualbox-host-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64
-makechrootpkg -I "$here"/../../virtualbox/trunk/virtualbox-guest-dkms-*-x86_64.pkg.tar.xz  -r /var/lib/archbuild/$1-x86_64
-cd "$here"
-makechrootpkg -n -r /var/lib/archbuild/$1-x86_64
+# detect lts case
+grep -q linux-lts PKGBUILD && suf=-lts
 
+case $1 in
+  extra)
+    update core linux$suf-headers
+    for arch in i686 x86_64; do
+      build /var/lib/archbuild/extra-$arch $arch
+    done
+  ;;
+  testing)
+    update testing linux$suf-headers
+    for arch in i686 x86_64; do
+      build /var/lib/archbuild/testing-$arch $arch
+    done
+  ;;
+  *)
+    usage
+  ;;
+esac
 
 # vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/virtualbox-modules-lts/virtualbox-guest-modules-lts.install b/community/virtualbox-modules-lts/virtualbox-guest-modules-lts.install
index f7526e308..c1dd43431 100644
--- a/community/virtualbox-modules-lts/virtualbox-guest-modules-lts.install
+++ b/community/virtualbox-modules-lts/virtualbox-guest-modules-lts.install
@@ -1,5 +1,5 @@
 _depmod() {
-  EXTRAMODULES='extramodules-3.0-lts'
+  EXTRAMODULES=extramodules-3.10-lts
   depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
diff --git a/community/virtualbox-modules-lts/virtualbox-host-modules-lts.install b/community/virtualbox-modules-lts/virtualbox-host-modules-lts.install
index cddbffb43..70a6478de 100644
--- a/community/virtualbox-modules-lts/virtualbox-host-modules-lts.install
+++ b/community/virtualbox-modules-lts/virtualbox-host-modules-lts.install
@@ -1,5 +1,5 @@
 _depmod() {
-  EXTRAMODULES='extramodules-3.0-lts'
+  EXTRAMODULES=extramodules-3.10-lts
   depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD
index 30da87a87..f3670841a 100644
--- a/community/virtualbox-modules/PKGBUILD
+++ b/community/virtualbox-modules/PKGBUILD
@@ -1,24 +1,21 @@
-# $Id: PKGBUILD 96546 2013-08-31 16:05:06Z foutrelis $
+# $Id: PKGBUILD 98153 2013-10-06 16:52:44Z tpowa $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Maintainer: Sébastien Luttringer
 
 pkgbase=virtualbox-modules
 pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules')
-pkgver=4.2.16
-pkgrel=9
+pkgver=4.2.18
+pkgrel=6
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
-makedepends=('linux>=3.10' 'linux<3.11'
-             'linux-headers>=3.10' 'linux-headers<3.11'
+makedepends=('linux>=3.11' 'linux<3.12'
+             'linux-headers>=3.11' 'linux-headers<3.12'
              "virtualbox-host-dkms>=$pkgver"
-             "virtualbox-guest-dkms>=$pkgver"
-             'expac'
-             'sed'
-             'bc')
+             "virtualbox-guest-dkms>=$pkgver")
 
 # remember to also adjust the .install files and the package deps below
-_extramodules=extramodules-3.10-ARCH
+_extramodules=extramodules-3.11-ARCH
 
 build() {
   _kernver="$(cat /usr/lib/modules/$_extramodules/version)"
@@ -36,7 +33,7 @@ build() {
 package_virtualbox-host-modules(){
   _kernver="$(cat /usr/lib/modules/$_extramodules/version)"
   pkgdesc='Host kernel modules for VirtualBox'
-  depends=('linux>=3.10' 'linux<3.11')
+  depends=('linux>=3.11' 'linux<3.12')
   replaces=('virtualbox-modules')
   conflicts=('virtualbox-modules')
   install=virtualbox-host-modules.install
@@ -51,7 +48,7 @@ package_virtualbox-guest-modules(){
   _kernver="$(cat /usr/lib/modules/$_extramodules/version)"
   pkgdesc='Guest kernel modules for VirtualBox'
   license=('GPL')
-  depends=('linux>=3.10' 'linux<3.11')
+  depends=('linux>=3.11' 'linux<3.12')
   replaces=('virtualbox-archlinux-modules')
   conflicts=('virtualbox-archlinux-modules')
   install=virtualbox-guest-modules.install
diff --git a/community/virtualbox-modules/build.sh b/community/virtualbox-modules/build.sh
index 744f18330..b5c163db9 100755
--- a/community/virtualbox-modules/build.sh
+++ b/community/virtualbox-modules/build.sh
@@ -1,25 +1,60 @@
 #!/bin/bash
+# lazyness can be enhanced everyday
 
-set -e
-
-if (( $# != 1 )); then
+usage() {
   echo "usage: $0 extra"
   echo "       $0 testing"
   exit 1
-fi
+}
+
+# $1: reference package
+update() {
+  url="https://www.archlinux.org/packages/$1/x86_64/$2/"
+  curkernel=$(wget -qO- "$url"|sed -nr "s/.*<h2>$2 ([0-9]+)\.([0-9]+).*<\/h2>.*/\1.\2/p")
+  nextkernel=${curkernel%.*}.$(( ${curkernel#*.}+1))
+
+  echo "** Current kernel: $curkernel"
+  echo "** Next kernel: $nextkernel"
+
+  sed -ri \
+    -e "s/(_?extramodules=).*-(ARCH|lts).*/\1extramodules-$curkernel-\2/i" \
+    -e "s/(linux.*>=)[0-9]+.[0-9]+/\1$curkernel/" \
+    -e "s/(linux.*<)[0-9]+.[0-9]+/\1$nextkernel/" \
+    PKGBUILD *.install
+}
+
+# $1: repo
+# $2: arch
+build() {
+  _pwd=$PWD
+  cd /var/empty
+  makechrootpkg -cu -I "$_pwd"/../../virtualbox/trunk/virtualbox-host-dkms-*-$arch.pkg.tar.xz -r "$1"
+  makechrootpkg -I "$_pwd"/../../virtualbox/trunk/virtualbox-guest-dkms-*-$arch.pkg.tar.xz  -r "$1"
+  cd "$_pwd"
+  makechrootpkg -n -r "$1"
+}
 
-here=$PWD
-cd /var/empty
-linux32 makechrootpkg -cu -I "$here"/../../virtualbox/trunk/virtualbox-host-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686
-linux32 makechrootpkg -I "$here"/../../virtualbox/trunk/virtualbox-guest-dkms-*-i686.pkg.tar.xz  -r /var/lib/archbuild/$1-i686
-cd "$here"
-linux32 makechrootpkg -n -r /var/lib/archbuild/$1-i686
+(( $# == 1 )) || usage
 
-cd /var/empty
-makechrootpkg -cu -I "$here"/../../virtualbox/trunk/virtualbox-host-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64
-makechrootpkg -I "$here"/../../virtualbox/trunk/virtualbox-guest-dkms-*-x86_64.pkg.tar.xz  -r /var/lib/archbuild/$1-x86_64
-cd "$here"
-makechrootpkg -n -r /var/lib/archbuild/$1-x86_64
+# detect lts case
+grep -q linux-lts PKGBUILD && suf=-lts
 
+case $1 in
+  extra)
+    update core linux$suf-headers
+    for arch in i686 x86_64; do
+      build /var/lib/archbuild/extra-$arch $arch
+    done
+  ;;
+  testing)
+    update testing linux$suf-headers
+    for arch in i686 x86_64; do
+      build /var/lib/archbuild/testing-$arch $arch
+    done
+  ;;
+  *)
+    usage
+  ;;
+esac
 
 # vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/virtualbox-modules/virtualbox-guest-modules.install b/community/virtualbox-modules/virtualbox-guest-modules.install
index ed1762c21..af7f5b278 100644
--- a/community/virtualbox-modules/virtualbox-guest-modules.install
+++ b/community/virtualbox-modules/virtualbox-guest-modules.install
@@ -1,5 +1,5 @@
 _depmod() {
-  EXTRAMODULES='extramodules-3.10-ARCH'
+  EXTRAMODULES=extramodules-3.11-ARCH
   depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
diff --git a/community/virtualbox-modules/virtualbox-host-modules.install b/community/virtualbox-modules/virtualbox-host-modules.install
index 2f7f00d9e..cfbefde89 100644
--- a/community/virtualbox-modules/virtualbox-host-modules.install
+++ b/community/virtualbox-modules/virtualbox-host-modules.install
@@ -1,5 +1,5 @@
 _depmod() {
-  EXTRAMODULES='extramodules-3.10-ARCH'
+  EXTRAMODULES=extramodules-3.11-ARCH
   depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
diff --git a/community/vobcopy/PKGBUILD b/community/vobcopy/PKGBUILD
deleted file mode 100644
index 6760ee59c..000000000
--- a/community/vobcopy/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 66897 2012-02-29 23:21:33Z giovanni $
-# Maintainer: Daenyth
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Tino Reichardt <milky-archlinux@mcmilk.de>
-
-pkgname=vobcopy
-pkgver=1.2.0
-pkgrel=4
-pkgdesc="Copies DVD .vob files to harddisk, decrypting them on the way"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.vobcopy.org"
-license=('GPL2')
-depends=('libdvdread' 'libdvdcss')
-options=('!docs')
-source=(http://www.vobcopy.org/download/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('88f735ccd051093ff40dab4597bc586e')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="$pkgdir" PREFIX=/usr/ MANDIR=/usr/share/man install
-}
diff --git a/community/windowlab/PKGBUILD b/community/windowlab/PKGBUILD
index 7dec691b1..febeb0aca 100644
--- a/community/windowlab/PKGBUILD
+++ b/community/windowlab/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 69029 2012-04-08 11:16:33Z giovanni $
+# $Id: PKGBUILD 96907 2013-09-07 17:50:24Z bgyorgy $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Jeff Mickey <jeff@archlinux.org>
 # Contributor: phrakture <aaronmgriffin -at- gmail.dot.com>
@@ -6,14 +6,22 @@
 
 pkgname=windowlab
 pkgver=1.40
-pkgrel=3
+pkgrel=4
 pkgdesc="A small and simple window manager."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.nickgravgaard.com/windowlab"
 license=('GPL')
 depends=('xorg-server' 'libxft' 'libxext')
-source=("http://www.nickgravgaard.com/windowlab/${pkgname}-${pkgver}.tar")
-md5sums=('7fcf770b3da932ac7d252572974b0d54')
+source=("http://www.nickgravgaard.com/windowlab/${pkgname}-${pkgver}.tar"
+        'xft.patch')
+md5sums=('7fcf770b3da932ac7d252572974b0d54'
+         '51e5a2d48c6d5837786f2571ccc1ce72')
+
+prepare() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  patch -Np1 -i ../xft.patch
+}
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/community/windowlab/xft.patch b/community/windowlab/xft.patch
new file mode 100644
index 000000000..8fb1eba57
--- /dev/null
+++ b/community/windowlab/xft.patch
@@ -0,0 +1,14 @@
+--- aaa/Makefile	2009-11-06 10:04:45.000000000 +1300
++++ bbb/Makefile	2012-08-04 20:33:35.197529653 +1200
+@@ -35,11 +35,11 @@
+ # Uncomment to add freetype support (requires XFree86 4.0.2 or later)
+ # This needs -lXext above, even if you have disabled shape support
+-#DEFINES += -DXFT
+-#EXTRA_INC += `pkg-config --cflags xft`
+-#EXTRA_LIBS += `pkg-config --libs xft`
++DEFINES += -DXFT
++EXTRA_INC += `pkg-config --cflags xft`
++EXTRA_LIBS += `pkg-config --libs xft`
+ 
+ # Uncomment for debugging info (abandon all hope, ye who enter here)
+ #DEFINES += -DDEBUG
diff --git a/community/xboard/PKGBUILD b/community/xboard/PKGBUILD
index 40b6c260a..943912d3b 100644
--- a/community/xboard/PKGBUILD
+++ b/community/xboard/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 90592 2013-05-13 10:00:14Z spupykin $
+# $Id: PKGBUILD 97844 2013-09-30 10:04:25Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jason Chu <jason@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=xboard
-pkgver=4.7.1
-pkgrel=1
+pkgver=4.7.2
+pkgrel=3
 pkgdesc="Graphical user interfaces for chess"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/xboard/"
@@ -13,34 +13,26 @@ license=('GPL3')
 depends=('gnuchess' 'texinfo' 'xdg-utils'
 	 'xorg-fonts-75dpi' 'xorg-fonts-100dpi'
 	 'gtk2' 'cairo' 'librsvg')
-makedepends=('gendesk')
 optdepends=('perl')
 install=${pkgname}.install
 source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('e42383c4594c24ebf2f9fdc5dc89e255')
+md5sums=('83ec086cbf5c4bc362a188654a9332fc')
 
 build() {
-  cd "${srcdir}"
-  gendesk
-
   cd "${pkgname}-${pkgver}"
   sed -i 's/fairymax/gnuchess/g' {xaw,gtk}/xboard.h xboard.conf.in
   ./configure \
     --prefix=/usr \
     --mandir=/usr/share/man \
     --sysconfdir=/etc \
-    --with-gtk
+    --with-gtk \
+    --enable-zippy
   make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-
   make DESTDIR="${pkgdir}" install
-  install -Dm644 ${srcdir}/${pkgname}.desktop \
-    ${pkgdir}/usr/share/applications/${pkgname}.desktop
-  install -Dm644 ${srcdir}/${pkgname}.png \
-    ${pkgdir}/usr/share/pixmaps/${pkgname}.png
   install -Dm755 ${srcdir}/${pkgname}-${pkgver}/cmail \
     ${pkgdir}/usr/bin/cmail
 }
diff --git a/community/xboard/xboard.desktop b/community/xboard/xboard.desktop
deleted file mode 100644
index 4bdfdbe15..000000000
--- a/community/xboard/xboard.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=Xboard
-Comment=A graphical user interfaces for chess
-Exec=xboard
-Icon=xboard.png
-Terminal=false
-StartupNotify=false
-Categories=Application;
diff --git a/community/xcircuit/PKGBUILD b/community/xcircuit/PKGBUILD
index f0f6e4a00..35e51165d 100644
--- a/community/xcircuit/PKGBUILD
+++ b/community/xcircuit/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 94361 2013-07-22 11:21:13Z spupykin $
+# $Id: PKGBUILD 97641 2013-09-26 10:52:31Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Giovanni Scafora <linuxmania@gmail.com>
 # Contributor: simo <simo@archlinux.org>
 
 pkgname=xcircuit
-pkgver=3.7.51
+pkgver=3.7.52
 pkgrel=1
 pkgdesc="A program for drawing publishable-quality electrical circuit schematic diagrams"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ license=('GPL2')
 depends=('tk' 'libxpm' 'zlib')
 makedepends=('chrpath')
 source=(http://opencircuitdesign.com/xcircuit/archive/$pkgname-$pkgver.tgz)
-md5sums=('a3f5d10f6f96a6298505801f4d0f6190')
+md5sums=('b39a2dcce9c3844ee2e6f9b477c501f5')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/community/xdelta/PKGBUILD b/community/xdelta/PKGBUILD
deleted file mode 100644
index 3933f9a48..000000000
--- a/community/xdelta/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 83064 2013-01-27 09:58:41Z andrea $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=xdelta
-pkgver=1.1.4
-pkgrel=4.1
-pkgdesc="binary file delta generator"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://sourceforge.net/projects/xdelta/"
-license=('GPL')
-depends=('glib' 'zlib')
-options=('!libtool')
-source=(http://xdelta.googlecode.com/files/$pkgname-$pkgver.tar.gz
-        xdelta-1.1.4-aclocal.patch)
-md5sums=('1b896c01ebf0e353b7e3c3071b05f496'
-         '1d8ab5909bdf977a2783c164b66906fd')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  patch -Np1 -i $srcdir/xdelta-1.1.4-aclocal.patch
-  ./configure --prefix=/usr --mandir=/usr/share/man
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-}
diff --git a/community/xdelta/xdelta-1.1.4-aclocal.patch b/community/xdelta/xdelta-1.1.4-aclocal.patch
deleted file mode 100644
index ad8c99de5..000000000
--- a/community/xdelta/xdelta-1.1.4-aclocal.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xdelta-1.1.3/xdelta.m4.aclocal	2004-10-20 00:20:47.875648144 +0200
-+++ xdelta-1.1.3/xdelta.m4	2004-10-20 00:21:47.205628616 +0200
-@@ -4,7 +4,7 @@
- dnl AM_PATH_XDELTA([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
- dnl Test for XDELTA, and define XDELTA_CFLAGS and XDELTA_LIBS, if "gmodule" or
- dnl
--AC_DEFUN(AM_PATH_XDELTA,
-+AC_DEFUN([AM_PATH_XDELTA],
- [dnl
- dnl Get the cflags and libraries from the xdelta-config script
- dnl
diff --git a/community/xmms2/PKGBUILD b/community/xmms2/PKGBUILD
index e5b0be472..1fcca5cd7 100644
--- a/community/xmms2/PKGBUILD
+++ b/community/xmms2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 94916 2013-08-01 06:55:59Z bpiotrowski $
+# $Id: PKGBUILD 97846 2013-09-30 10:05:03Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=xmms2
 pkgver=0.8DrO_o
-pkgrel=19
+pkgrel=20
 pkgdesc="complete rewrite of the popular music player"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xmms2.org/"
@@ -37,15 +37,16 @@ optdepends=('alsa-lib: ALSA audio output'
 	    'libshout: Icecast audio output'
 	    'libvorbis: Ogg Vorbis support'
 	    'libxml2: XSPF and podcast support'
-	    'mpg123: alternative MP3 plugin')
-[ "$CARCH" = "mips64el" ] || optdepends+=('oss: OSS audio output')
-optdepends+=('perl: Perl language bindings'
+      'perl: Perl language bindings'
+	    'mpg123: alternative MP3 plugin'
+	    'perl: Perl language bindings'
 	    'pulseaudio: PulseAudio audio output'
 	    'pyrex: Python language bindings'
 	    'ruby: Ruby language bindings'
 	    'smbclient: direct CIFS/SMB access'
 	    'speex: Speex support'
 	    'wavpack: WavPack support')
+[ "$CARCH" = "mips64el" ] || optdepends+=('oss: OSS audio output')
 #	    'sidplay: to play a Commodore 64 music files AKA zaks'
 # we do not have sidplay 2 series in repos; also it's
 # somehow connected with resid i guess(not in repos also)
diff --git a/community/xmonad-contrib/PKGBUILD b/community/xmonad-contrib/PKGBUILD
index 13fd01fa0..898a7b6da 100644
--- a/community/xmonad-contrib/PKGBUILD
+++ b/community/xmonad-contrib/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 94529 2013-07-26 11:27:17Z jelle $
+# $Id: PKGBUILD 96822 2013-09-06 02:46:41Z bgyorgy $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: orbisvicis <gmail.com>
 
 pkgname=xmonad-contrib
 pkgver=0.11.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Add-ons for xmonad"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xmonad.org/"
 license=('BSD')
-depends=('ghc=7.6.3-1' 'xmonad=0.11-6' 'sh' 'haskell-x11=1.6.1.1-3' 'haskell-x11-xft=0.3.1-9' 'haskell-utf8-string=0.3.7-5' 'haskell-random=1.0.1.1-5')
+depends=('ghc=7.6.3-1' 'xmonad=0.11-7' 'sh' 'haskell-x11=1.6.1.1-3' 'haskell-x11-xft=0.3.1-9' 'haskell-utf8-string=0.3.7-5' 'haskell-random=1.0.1.1-5')
 install='xmonad-contrib.install'
 source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz)
 md5sums=('415a7ed9449198b0e93d49ab0a4a0f72')
diff --git a/community/xmonad/PKGBUILD b/community/xmonad/PKGBUILD
index 08c578503..12b88e26f 100644
--- a/community/xmonad/PKGBUILD
+++ b/community/xmonad/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 89334 2013-04-28 16:53:06Z td123 $
+# $Id: PKGBUILD 96798 2013-09-05 16:17:45Z bgyorgy $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: shild <shildv@gmail.com>
 
 pkgname=xmonad
 pkgver=0.11
-pkgrel=6
+pkgrel=7
 pkgdesc="Lightweight X11 tiled window manager written in Haskell"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xmonad.org/"
@@ -22,7 +22,7 @@ md5sums=('5ac9dc1dae5e85dcbdfb9f70cbe312c1'
 build() {
   cd "$srcdir"
   ghc-pkg list
-  gendesk
+  gendesk --pkgname "$pkgname" --pkgdesc "$pkgdesc"
 
   cd $srcdir/$pkgname-$pkgver
 
@@ -47,4 +47,6 @@ package() {
   install -D -m644 LICENSE $pkgdir/usr/share/licenses/xmonad/LICENSE
 
   install -D -m644 $srcdir/xmonad.svg $pkgdir/usr/share/pixmaps/xmonad.svg
+
+  install -D -m644 $srcdir/xmonad.desktop $pkgdir/usr/share/xsessions/xmonad.desktop
 }
diff --git a/community/xmonad/xmonad-gnome-session.session b/community/xmonad/xmonad-gnome-session.session
deleted file mode 100644
index c0bd16781..000000000
--- a/community/xmonad/xmonad-gnome-session.session
+++ /dev/null
@@ -1,6 +0,0 @@
-[GNOME Session]
-Name=Xmonad session
-RequiredComponents=gnome-panel;gnome-settings-daemon;
-RequiredProviders=windowmanager;notifications;
-DefaultProvider-windowmanager=xmonad
-DefaultProvider-notifications=notification-daemon
diff --git a/community/xmonad/xmonad.install b/community/xmonad/xmonad.install
index 6659247db..96b94dc02 100644
--- a/community/xmonad/xmonad.install
+++ b/community/xmonad/xmonad.install
@@ -4,9 +4,6 @@ post_install() {
     ${HS_DIR}/register.sh
     echo "xmonad now has dynamic configuration via ~/.xmonad/xmonad.hs"
     echo "See http://haskell.org/haskellwiki/Xmonad/Config_archive for examples"
-    echo 
-    echo "If you would like to run xmonad as a window manager inside GNOME, please see"
-    echo "http://www.haskell.org/haskellwiki/Xmonad/Using_xmonad_in_Gnome#Setting_up_Gnome_to_use_Xmonad"
 }
 
 pre_upgrade() {
diff --git a/community/xnoise/PKGBUILD b/community/xnoise/PKGBUILD
index cbb286493..7328b31d2 100755
--- a/community/xnoise/PKGBUILD
+++ b/community/xnoise/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 90300 2013-05-11 05:30:04Z fyan $
+# $Id: PKGBUILD 97326 2013-09-18 04:04:28Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: archtux <antonio dot arias99999 at gmail dot com>
 
 pkgname=xnoise
-pkgver=0.2.18
+pkgver=0.2.19
 pkgrel=1
 pkgdesc="Media player with a slick GUI, great speed and lots of features."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xnoise-media-player.com/"
 license=('GPL2')
-depends=('desktop-file-utils' 'gnome-icon-theme' 'gst-plugins-base-libs' 'gst-plugins-good' 'gtk3' 'libsoup' 'sqlite' 'libtaginfo' 'librsvg')
+depends=('desktop-file-utils' 'gnome-icon-theme' 'gst-plugins-base-libs' 'gst-plugins-good' 'gtk3' 'libsoup' 'sqlite' 'libtaginfo' 'librsvg' 'vala')
 optdepends=('gst-plugins-base: Basic media codecs'
             'gst-plugins-bad: Extra media codecs'
             'gst-plugins-ugly: Extra media codecs'
@@ -34,4 +34,5 @@ package() {
   # Remove obsolete files
   rm -rf "$pkgdir/usr/include" "$pkgdir/usr/share/vala"
 }
-sha512sums=('afe6d380f84c96d3612ed6a01a31b279b06d101252304a83be081eb25d4342e3487aa0f1955c3aa6b70297f8858d3c01be5f708a37c3741a1c2b6afd76127e9b')
+
+sha512sums=('3c3a735d005704342d2c27c36738b91f850e2630b431edfc1def5d26f836dc0df1ef752ca8d1eec3e90702eb27f78e46970a147a64c2156fbe53c8471eb978cb')
diff --git a/community/xosd/PKGBUILD b/community/xosd/PKGBUILD
index c712242af..a9de83583 100644
--- a/community/xosd/PKGBUILD
+++ b/community/xosd/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 61859 2012-01-09 10:23:17Z spupykin $
+# $Id: PKGBUILD 97848 2013-09-30 10:05:25Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=xosd
 pkgver=2.2.14
-pkgrel=5.2
+pkgrel=6
 pkgdesc="Displays text on your screen. On-Screen-Display-libs for some tools"
 arch=("i686" "x86_64" 'mips64el')
 license=('GPL2')
 url="http://www.ignavus.net/software.html"
 depends=('libxt' 'libxinerama' 'sh')
-makedepends=('xmms' 'bmp' 'gdk-pixbuf')
-optdepends=('gdk-pixbuf: for using the bmp or xmms plugin')
+makedepends=('xmms' 'gdk-pixbuf')
+optdepends=('gdk-pixbuf: for using the xmms plugin')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/libxosd/${pkgname}-${pkgver}.tar.gz"
 	"http://ftp.de.debian.org/debian/pool/main/x/xosd/xosd_$pkgver-2.debian.tar.gz")
diff --git a/community/xsensors/PKGBUILD b/community/xsensors/PKGBUILD
index c061523d2..aa973e745 100644
--- a/community/xsensors/PKGBUILD
+++ b/community/xsensors/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 59264 2011-11-22 07:31:16Z lcarlier $
+# $Id: PKGBUILD 96904 2013-09-07 16:53:18Z bgyorgy $
 # Maintainer : Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Ray Rashif <schivmeister@gmail.com>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
@@ -6,24 +6,27 @@
 
 pkgname=xsensors
 pkgver=0.70
-pkgrel=3
+pkgrel=5
 pkgdesc="X11 interface to lm_sensors"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.linuxhardware.org/xsensors/"
 license=('GPL')
 depends=('gtk2' 'lm_sensors')
+makedepends=('imagemagick' 'gendesk')
 changelog=$pkgname.changelog
 source=(http://www.linuxhardware.org/xsensors/$pkgname-$pkgver.tar.gz
 	remove-unused-variables.patch
-	replace-deprecated-gtk.patch
-	xsensors.desktop)
+	replace-deprecated-gtk.patch)
 md5sums=('4f8fb83cfd03c0cc34967a73c6021531'
          '8ca558b7f7e4a5f83f63498668c4ad8f'
-         'd9ee6799d45adc7c62273f32085bec5f'
-         'fe1369d2b61eed1a25002e2247617357')
+         'd9ee6799d45adc7c62273f32085bec5f')
 
 build() {
-  cd ${srcdir}/$pkgname-$pkgver
+  cd "$srcdir"
+  gendesk -n --pkgname "$pkgname" --genericname="Hardware Monitor" \
+          --comment="View hardware health" --categories="System;Monitor;GTK"
+
+  cd "$pkgname-$pkgver"
 
   # patches from debian
   patch -Np1 -i ${srcdir}/remove-unused-variables.patch
@@ -37,6 +40,9 @@ package() {
   cd ${srcdir}/$pkgname-$pkgver
 
   make DESTDIR="${pkgdir}" install
-  install -D ${srcdir}/xsensors.desktop \
-    ${pkgdir}/usr/share/applications/xsensors.desktop
+
+  convert "$pkgdir/usr/share/pixmaps/xsensors/default.xpm" \
+    "$pkgdir/usr/share/pixmaps/xsensors.png"
+  install -Dm644 "$srcdir/xsensors.desktop" \
+    "$pkgdir/usr/share/applications/xsensors.desktop"
 }
diff --git a/community/xsensors/xsensors.desktop b/community/xsensors/xsensors.desktop
deleted file mode 100644
index a516b5437..000000000
--- a/community/xsensors/xsensors.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=XSensors
-GenericName=Hardware Monitor
-Comment=View hardware health
-Icon=/usr/share/pixmaps/xsensors/default.xpm
-Exec=/usr/bin/xsensors
-Terminal=false
-Categories=System;
diff --git a/core/btrfs-progs/PKGBUILD b/core/btrfs-progs/PKGBUILD
index b55347e34..d811d7f49 100644
--- a/core/btrfs-progs/PKGBUILD
+++ b/core/btrfs-progs/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 186631 2013-05-30 10:13:30Z tomegun $
+# $Id: PKGBUILD 195489 2013-10-01 11:32:32Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=btrfs-progs
-pkgver=0.20rc1.2
+pkgver=0.20rc1.3
 pkgrel=1
 pkgdesc="btrfs filesystem utilities"
 arch=(i686 x86_64 mips64el)
@@ -14,7 +14,7 @@ replaces=('btrfs-progs-unstable')
 conflicts=('btrfs-progs-unstable')
 provides=('btrfs-progs-unstable')
 license=('GPL2')
-source=("git://git.kernel.org/pub/scm/linux/kernel/git/mason/${pkgname}.git#commit=7854c8b667"
+source=("git://git.kernel.org/pub/scm/linux/kernel/git/mason/${pkgname}.git#commit=194aa4a1bd6447bb545286d0bcb0b0be8204d79f"
 	initcpio-install-btrfs
 	initcpio-hook-btrfs)
 install=btrfs-progs.install
@@ -23,13 +23,14 @@ options=(!staticlibs)
 build() {
    cd $pkgname
    make CFLAGS="$CFLAGS"
-
+   make CFLAGS="$CFLAGS" btrfs-select-super
 }
 
 package() {
    cd $pkgname
 
    make prefix=$pkgdir/usr install
+   install -Dm755 btrfs-select-super $pkgdir/usr/bin
 
    # fix manpage
    mkdir -p $pkgdir/usr/share/
diff --git a/core/cryptsetup/PKGBUILD b/core/cryptsetup/PKGBUILD
index ad10778b7..e86517e26 100644
--- a/core/cryptsetup/PKGBUILD
+++ b/core/cryptsetup/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193404 2013-08-19 17:24:16Z thomas $
+# $Id: PKGBUILD 195910 2013-10-05 07:30:48Z thomas $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 pkgname=cryptsetup
 pkgver=1.6.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt"
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
@@ -13,11 +13,13 @@ options=('!libtool' '!emptydirs')
 source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2
         http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2.asc
         encrypt_hook
-        encrypt_install)
+        encrypt_install
+        sd-encrypt)
 md5sums=('cd834da49fbe92dd66df02cc5c61280f'
          'SKIP'
          'c279d86d6dc18322c054d2272ebb9e90'
-         '21c45f9cab3e0b5165f68358884fbd0f')
+         '21c45f9cab3e0b5165f68358884fbd0f'
+         '6cf7e170ecd13e42fe829209628fdb4d')
 
 build() {
   cd "${srcdir}"/$pkgname-${pkgver}
@@ -31,6 +33,7 @@ package() {
   # install hook
   install -D -m644 "${srcdir}"/encrypt_hook "${pkgdir}"/usr/lib/initcpio/hooks/encrypt
   install -D -m644 "${srcdir}"/encrypt_install "${pkgdir}"/usr/lib/initcpio/install/encrypt
+  install -D -m644 "${srcdir}"/sd-encrypt "${pkgdir}"/usr/lib/initcpio/install/sd-encrypt
 
   # usrmove
   cd "$pkgdir"/usr
diff --git a/core/cryptsetup/sd-encrypt b/core/cryptsetup/sd-encrypt
new file mode 100644
index 000000000..c18fd2f24
--- /dev/null
+++ b/core/cryptsetup/sd-encrypt
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+build() {
+    local mod
+
+    add_module dm-crypt
+    if [[ $CRYPTO_MODULES ]]; then
+        for mod in $CRYPTO_MODULES; do
+            add_module "$mod"
+        done
+    else
+        add_all_modules '/crypto/'
+    fi
+
+    add_binary "dmsetup"
+    add_file "/usr/lib/udev/rules.d/10-dm.rules"
+    add_file "/usr/lib/udev/rules.d/13-dm-disk.rules"
+    add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
+    add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules"
+
+    add_systemd_unit cryptsetup.target
+    add_binary /usr/lib/systemd/system-generators/systemd-cryptsetup-generator
+    add_binary /usr/lib/systemd/systemd-cryptsetup
+
+    add_systemd_unit systemd-ask-password-console.path
+    add_systemd_unit systemd-ask-password-console.service
+
+    [[ -f /etc/crypttab.initramfs ]] && add_file /etc/crypttab.initramfs /etc/crypttab
+}
+
+help() {
+    cat <<HELPEOF
+This hook allows for an encrypted root device with systemd initramfs.
+
+See the manpage of systemd-cryptsetup-generator(8) for available kernel
+command line options. Alternatively, if the file /etc/crypttab.initramfs
+exists, it will be added to the initramfs as /etc/crypttab. See the
+crypttab(5) manpage for more information on crypttab syntax.
+HELPEOF
+}
+
+# vim: set ft=sh ts=4 sw=4 et:
diff --git a/core/curl/0001-curl_multi_remove_handle-allow-multiple-removes.patch b/core/curl/0001-curl_multi_remove_handle-allow-multiple-removes.patch
new file mode 100644
index 000000000..73b23ea12
--- /dev/null
+++ b/core/curl/0001-curl_multi_remove_handle-allow-multiple-removes.patch
@@ -0,0 +1,29 @@
+From 84f3b3dd448399f9548468676e1bd1475dba8de5 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <daniel@haxx.se>
+Date: Thu, 29 Aug 2013 22:08:01 +0200
+Subject: [PATCH] curl_multi_remove_handle: allow multiple removes
+
+When removing an already removed handle, avoid that to ruin the
+internals and just return OK instead.
+---
+ lib/multi.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/lib/multi.c b/lib/multi.c
+index fb495e0..e723a3e 100644
+--- a/lib/multi.c
++++ b/lib/multi.c
+@@ -483,6 +483,10 @@ CURLMcode curl_multi_remove_handle(CURLM *multi_handle,
+   if(!GOOD_EASY_HANDLE(curl_handle))
+     return CURLM_BAD_EASY_HANDLE;
+ 
++  /* Prevent users from trying to remove same easy handle more than once */
++  if(!data->multi)
++    return CURLM_OK; /* it is already removed so let's say it is fine! */
++
+   if(easy) {
+     bool premature = (data->mstate < CURLM_STATE_COMPLETED) ? TRUE : FALSE;
+     bool easy_owns_conn = (data->easy_conn &&
+-- 
+1.8.4
+
diff --git a/core/curl/PKGBUILD b/core/curl/PKGBUILD
index 15de2cadf..af22269df 100644
--- a/core/curl/PKGBUILD
+++ b/core/curl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193070 2013-08-15 13:17:43Z dreisner $
+# $Id: PKGBUILD 193944 2013-09-07 15:30:07Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Eric Belanger <eric@archlinux.org>
@@ -7,7 +7,7 @@
 
 pkgname=curl
 pkgver=7.32.0
-pkgrel=1
+pkgrel=2
 pkgdesc="An URL retrieval utility and library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://curl.haxx.se"
@@ -16,11 +16,19 @@ depends=('ca-certificates' 'libssh2' 'openssl' 'zlib')
 provides=('libcurl.so')
 options=('!libtool')
 source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
+        0001-curl_multi_remove_handle-allow-multiple-removes.patch
         curlbuild.h)
 md5sums=('f77cf3cb59cf2bfe686b80338323fd40'
          'SKIP'
+         '589a2ccdf90e198fca398809e9d16128'
          '751bd433ede935c8fae727377625a8ae')
 
+prepare() {
+  cd "$pkgname-$pkgver"
+
+  patch -Np1 <"$srcdir"/0001-curl_multi_remove_handle-allow-multiple-removes.patch 
+}
+
 build() {
   cd "$pkgname-$pkgver"
 
diff --git a/core/db/PKGBUILD b/core/db/PKGBUILD
index 5e10221b5..0d5a9dc20 100644
--- a/core/db/PKGBUILD
+++ b/core/db/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 160636 2012-06-02 22:25:49Z allan $
+# $Id: PKGBUILD 195826 2013-10-01 16:41:14Z bpiotrowski $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=db
 pkgver=5.3.21
-pkgrel=1
+pkgrel=2
 pkgdesc="The Berkeley DB embedded database system"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.oracle.com/technology/software/products/berkeley-db/index.html"
diff --git a/core/dbus/PKGBUILD b/core/dbus/PKGBUILD
index 4c49dc4f1..d61465f41 100644
--- a/core/dbus/PKGBUILD
+++ b/core/dbus/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 188480 2013-06-14 20:26:05Z tomegun $
+# $Id: PKGBUILD 194433 2013-09-16 10:42:42Z jgc $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Link Dupont <link@subpop.net>
 #
 pkgname=dbus
-pkgver=1.6.12
+pkgver=1.6.14
 pkgrel=1
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
@@ -48,6 +48,6 @@ package(){
 
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/dbus/COPYING"
 }
-md5sums=('a70edc50524f258eaf5c9a9994ed8748'
+md5sums=('1c22aebdf952e92908800f1ec2aeb0c4'
          '3314d727fa57fc443fce25b5cbeebbcc'
          'd8a1bd529b3ddca671ee1a695a143db9')
diff --git a/core/dialog/PKGBUILD b/core/dialog/PKGBUILD
index d27f184be..c0322bebd 100644
--- a/core/dialog/PKGBUILD
+++ b/core/dialog/PKGBUILD
@@ -1,19 +1,20 @@
-# $Id: PKGBUILD 187873 2013-06-07 13:39:39Z foutrelis $
+# $Id: PKGBUILD 195853 2013-10-02 13:25:41Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=dialog
-pkgver=1.2_20130523
-pkgrel=2
+pkgver=1.2_20131001
+pkgrel=1
 pkgdesc="A tool to display dialog boxes from shell scripts"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://invisible-island.net/dialog/"
 license=('LGPL2.1')
 depends=('ncurses')
+options=('staticlibs')
 source=(ftp://invisible-island.net/$pkgname/$pkgname-${pkgver/_/-}.tgz)
-sha256sums=('c8d114b7698022bcbd6c88f3c0b2296b0e846c60c5ed6bd28f86dd72b94fd36d')
+sha256sums=('b22215d56dfbfa7f025092759e8f144b17321e14829b2a273f68d745a1f0dca5')
 
 build() {
   cd "$srcdir/$pkgname-${pkgver/_/-}"
diff --git a/core/efibootmgr/PKGBUILD b/core/efibootmgr/PKGBUILD
index 2a42dea3a..28cb02ea6 100755
--- a/core/efibootmgr/PKGBUILD
+++ b/core/efibootmgr/PKGBUILD
@@ -1,49 +1,59 @@
-# $Id: PKGBUILD 188652 2013-06-17 10:52:28Z tpowa $
+# $Id: PKGBUILD 194435 2013-09-16 12:11:58Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor : Murtuza Akhtari <inxsible at gmail dot com>
-# Contributor: Keshav P R <skodabenz at rocketmail dot com>
+# Contributor: Murtuza Akhtari <inxsible at gmail dot com>
+# Contributor: Keshav Padram Amburay <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
 
-pkgname=efibootmgr
-pkgver=0.6.0
-pkgrel=3
-pkgdesc="Tool to modify UEFI Firmware Boot Manager Variables."
-arch=('i686' 'x86_64')
-url="http://linux.dell.com/efibootmgr/"
+pkgname="efibootmgr"
+
+_gitroot="git://github.com/vathpela/efibootmgr.git"
+_gitname="${pkgname}-pjones"
+_gitbranch="libefivars"
+
+pkgver=0.6.0.138.1132342
+pkgrel=1
+pkgdesc="Tool to modify UEFI Firmware Boot Manager Variables"
+arch=('x86_64' 'i686')
+url="https://github.com/vathpela/efibootmgr"
 license=('GPL2')
-depends=('zlib' 'pciutils')
-makedepends=()
-provides=()
-options=(strip purge docs zipman !emptydirs)
+makedepends=('git')
+depends=('pciutils' 'efivar' 'zlib')
+options=('strip' 'zipman' '!emptydirs' '!libtool')
 
-source=("http://linux.dell.com/efibootmgr/permalink/${pkgname}-${pkgver}.tar.gz"
-        "efibootmgr-tilt_slashes-func.patch"
-)
+source=("${_gitname}::git+${_gitroot}#branch=${_gitbranch}")
+sha1sums=('SKIP')
 
-build () {	
-	rm -rf ${srcdir}/efibootmgr-${pkgver}_build/ || true
+pkgver() {
+	cd "${srcdir}/${_gitname}/"
 	
-	cp -r ${srcdir}/efibootmgr-${pkgver} ${srcdir}/efibootmgr-${pkgver}_build
+	_RELEASE_MAJOR="$(grep 'RELEASE_MAJOR' "${srcdir}/${_gitname}/Makefile" | head -1 | sed -e 's|RELEASE_MAJOR := ||g')"
+	_RELEASE_MINOR="$(grep 'RELEASE_MINOR' "${srcdir}/${_gitname}/Makefile" | head -1 | sed -e 's|RELEASE_MINOR := ||g')"
+	_RELEASE_SUBLEVEL="$(grep 'RELEASE_SUBLEVEL' "${srcdir}/${_gitname}/Makefile" | head -1 | sed -e 's|RELEASE_SUBLEVEL := ||g')"
 	
-	cd ${srcdir}/efibootmgr-${pkgver}_build/
-	patch -Np1 -i ${srcdir}/efibootmgr-tilt_slashes-func.patch
-	echo
+	_ACTUAL_VER="$(echo ${_RELEASE_MAJOR}.${_RELEASE_MINOR}.${_RELEASE_SUBLEVEL} | sed 's| ||g')"
 	
-	CFLAGS= make
+	echo "${_ACTUAL_VER}.$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
+}
+
+build() {
+	
+	rm -rf "${srcdir}/${_gitname}_build/" || true
+	cp -r "${srcdir}/${_gitname}" "${srcdir}/${_gitname}_build"
+	
+	cd "${srcdir}/${_gitname}_build/"
+	
+	make EXTRA_CFLAGS="-Os"
 	echo
 	
 }
 
-
 package() {
 	
-	mkdir -p ${pkgdir}/usr/bin/
-	mkdir -p ${pkgdir}/usr/share/man/man8/
+	cd "${srcdir}/${_gitname}_build/"
 	
-	cd ${srcdir}/efibootmgr-${pkgver}_build/
+	install -d "${pkgdir}/usr/bin/"
+	install -D -m0755 "${srcdir}/${_gitname}_build/src/efibootmgr/efibootmgr" "${pkgdir}/usr/bin/efibootmgr"
 	
-	install -D -m755 ${srcdir}/efibootmgr-${pkgver}_build/src/efibootmgr/efibootmgr ${pkgdir}/usr/bin/efibootmgr
-	install -D -m644 ${srcdir}/efibootmgr-${pkgver}_build/src/man/man8/efibootmgr.8 ${pkgdir}/usr/share/man/man8/efibootmgr.8
+	install -d "${pkgdir}/usr/share/man/man8/"
+	install -D -m0644 "${srcdir}/${_gitname}_build/src/man/man8/efibootmgr.8" "${pkgdir}/usr/share/man/man8/efibootmgr.8"
 	
 }
-md5sums=('9e9a31d79e579644de83a14139b66d10'
-         '3622c0e978cf859cae60803a6b6a0c5e')
diff --git a/extra/efivar/PKGBUILD b/core/efivar/PKGBUILD
index fcbcca915..849868267 100644
--- a/extra/efivar/PKGBUILD
+++ b/core/efivar/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188788 2013-06-20 17:50:47Z tpowa $
+# $Id: PKGBUILD 194436 2013-09-16 12:12:17Z tpowa $
 # Maintainer : Tobias Powalowski <tpowa@archlinux.org>
 # Contributor : Keshav Padram <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
 
@@ -9,24 +9,23 @@ _gitbranch="master"
 _pkgname="efivar"
 pkgname="${_pkgname}"
 
-pkgdesc="Library to manipulate EFI variables - GIT Version"
-
-pkgver=0.4_18_gb8c524c
+pkgdesc="Library to manipulate EFI variables"
+pkgver=0.6
 pkgrel=1
 arch=('x86_64' 'i686')
 url="https://github.com/vathpela/efivar"
 license=('LGPL2.1')
 depends=('popt')
-conflicts=("${_pkgname}" 'libefivar' 'libefivar-git')
-provides=("${_pkgname}" 'libefivar' 'libefivar-git')
-options=('strip' 'emptydirs' 'zipman' 'libtool' 'docs')
+conflicts=('libefivar')
+provides=('libefivar')
+options=('zipman' 'docs' '!makeflags')
 
 source=("${_gitname}::git+${_gitroot}#branch=${_gitbranch}")
 sha1sums=('SKIP')
 
 pkgver() {
 	cd "${srcdir}/${_gitname}/"
-	echo "$(git describe --tags)" | sed 's|-|_|g'
+        echo "$(git describe --tags)" | sed 's|-|\.|g'
 }
 
 build() {
diff --git a/core/fakeroot/PKGBUILD b/core/fakeroot/PKGBUILD
index 447c2c22f..254049c41 100644
--- a/core/fakeroot/PKGBUILD
+++ b/core/fakeroot/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 186069 2013-05-20 23:10:56Z allan $
+# $Id: PKGBUILD 194710 2013-09-23 00:56:24Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Jochem Kossen <j.kossen@home.nl>
 
 pkgname=fakeroot
-pkgver=1.19
+pkgver=1.20
 pkgrel=1
 pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ install=fakeroot.install
 depends=('glibc' 'filesystem' 'sed' 'util-linux' 'sh')
 options=('!libtool')
 source=(http://ftp.debian.org/debian/pool/main/f/${pkgname}/${pkgname}_${pkgver}.orig.tar.bz2)
-md5sums=('3a00a1264cb31a815552050ef0c2468b')
+md5sums=('9777a81d4d1878422447a1d0030c1f9f')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/core/file/PKGBUILD b/core/file/PKGBUILD
index 95acdcdb3..ba6f0439f 100644
--- a/core/file/PKGBUILD
+++ b/core/file/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 180851 2013-03-27 01:10:50Z allan $
+# $Id: PKGBUILD 195182 2013-09-26 23:59:54Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=file
-pkgver=5.14
+pkgver=5.15
 pkgrel=1
 pkgdesc="File type identification utility"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ url="http://www.darwinsys.com/file/"
 depends=('glibc' 'zlib')
 options=('!libtool')
 source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('c26625f1d6773ad4bc5a87c0e315632c')
+md5sums=('3f99565532f548d7540912c4642d1ede')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/core/gdbm/PKGBUILD b/core/gdbm/PKGBUILD
index 0e806f3de..71da45002 100644
--- a/core/gdbm/PKGBUILD
+++ b/core/gdbm/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 143800 2011-11-29 13:32:53Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
+# $Id: PKGBUILD 195488 2013-10-01 06:09:23Z bpiotrowski $
+# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=gdbm
 pkgver=1.10
-pkgrel=1.1
+pkgrel=2
 pkgdesc="GNU database library"
 url="http://www.gnu.org/software/gdbm/gdbm.html"
 license=('GPL')
@@ -17,7 +17,8 @@ options=('!libtool' '!makeflags')
 install=gdbm.install
 md5sums=('88770493c2559dc80b561293e39d3570'
          'ac255b10452005237836cd2d3a470733')
-build() {
+
+prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   # Prevent gdbm from storing uninitialized memory content
@@ -27,6 +28,10 @@ build() {
   # https://bugzilla.redhat.com/show_bug.cgi?id=4457
   # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=208927
   patch -Np1 -i ../gdbm-1.10-zeroheaders.patch
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   ./configure --prefix=/usr \
               --mandir=/usr/share/man \
diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD
index 8b3c27845..dbe30c874 100644
--- a/core/glib2/PKGBUILD
+++ b/core/glib2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 193184 2013-08-18 08:13:38Z heftig $
+# $Id: PKGBUILD 196009 2013-10-07 11:50:04Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=glib2
 pkgname=(glib2 glib2-docs)
-pkgver=2.36.4
+pkgver=2.38.0
 pkgrel=1
 pkgdesc="Common C routines used by GTK+ and other libs"
 url="http://www.gtk.org/"
@@ -11,13 +11,12 @@ arch=(i686 x86_64 mips64el)
 makedepends=('pkg-config' 'python2' 'libxslt' 'docbook-xml' 'pcre' 'libffi' 'elfutils')
 source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz
         revert-warn-glib-compile-schemas.patch)
-sha256sums=('f654d2542329012d8475736a165dfbf82fadf3ee940c2e0e6ddd4b2fde5cad7e'
+sha256sums=('7513a7de5e814ccb48206340a8773ea523d6a7bf04dc74565de69b899bc2ff32'
             '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97')
 
 prepare() {
   cd glib-$pkgver
   patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch
-  touch -r NEWS gtk-doc.make
 }
   
 build() {
diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD
index c8d7a0bb8..b77a6eaa5 100644
--- a/core/glibc/PKGBUILD
+++ b/core/glibc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193742 2013-08-30 03:37:09Z allan $
+# $Id: PKGBUILD 195163 2013-09-26 03:20:58Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -6,7 +6,7 @@
 
 pkgname=glibc
 pkgver=2.18
-pkgrel=3
+pkgrel=5
 pkgdesc="GNU C Library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/libc"
@@ -21,6 +21,9 @@ options=('!strip')
 install=glibc.install
 source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig}
         glibc-2.18-readdir_r-CVE-2013-4237.patch
+	glibc-2.18-malloc-corrupt-CVE-2013-4332.patch
+	glibc-2.18-strcoll-CVE-2012-4412+4424.patch
+	glibc-2.18-ptr-mangle-CVE-2013-4788.patch
         glibc-2.18-strstr-hackfix.patch
         nscd.service
         nscd.tmpfiles
@@ -29,19 +32,32 @@ source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig}
 md5sums=('88fbbceafee809e82efd52efa1e3c58f'
          'SKIP'
          '154da6bf5a5248f42a7bf5bf08e01a47'
+         'b79561ab9dce900e9bbeaf0d49927c2b'
+         'c7264b99d0f7e51922a4d3126182c40a'
+         '9749ba386b08a8fe53e7ecede9bf2dfb'
          '4441f6dfe7d75ced1fa75e54dd21d36e'
          'd5fab2cd3abea65aa5ae696ea4a47d6b'
          'da662ca76e7c8d7efbc7986ab7acea2d'
          '07ac979b6ab5eeb778d55f041529d623'
          '476e9113489f93b348b21e144b6a8fcf')
 
-
 prepare() {
   cd ${srcdir}/${pkgname}-${pkgver}
   
   # upstream commit 91ce4085
   patch -p1 -i $srcdir/glibc-2.18-readdir_r-CVE-2013-4237.patch
-  
+
+  # upstream commits 1159a193, 55e17aad and b73ed247
+  patch -p1 -i $srcdir/glibc-2.18-malloc-corrupt-CVE-2013-4332.patch
+
+  # upstream commits 1326ba1a, 141f3a77 and 303e567a
+  # https://sourceware.org/ml/libc-alpha/2013-08/msg00394.html
+  # https://sourceware.org/ml/libc-alpha/2013-08/msg00462.html
+  patch -p1 -i $srcdir/glibc-2.18-strcoll-CVE-2012-4412+4424.patch
+
+  # upstream commits c61b4d41 and 0b1f8e35
+  patch -p1 -i $srcdir/glibc-2.18-ptr-mangle-CVE-2013-4788.patch
+
   # hack fix for strstr issues on x86
   patch -p1 -i $srcdir/glibc-2.18-strstr-hackfix.patch
 
diff --git a/core/glibc/glibc-2.18-malloc-corrupt-CVE-2013-4332.patch b/core/glibc/glibc-2.18-malloc-corrupt-CVE-2013-4332.patch
new file mode 100644
index 000000000..093db86c9
--- /dev/null
+++ b/core/glibc/glibc-2.18-malloc-corrupt-CVE-2013-4332.patch
@@ -0,0 +1,54 @@
+diff --git a/malloc/malloc.c b/malloc/malloc.c
+index dd295f5..7f43ba3 100644
+--- a/malloc/malloc.c
++++ b/malloc/malloc.c
+@@ -3082,6 +3082,13 @@ __libc_pvalloc(size_t bytes)
+   size_t page_mask = GLRO(dl_pagesize) - 1;
+   size_t rounded_bytes = (bytes + page_mask) & ~(page_mask);
+ 
++  /* Check for overflow.  */
++  if (bytes > SIZE_MAX - 2*pagesz - MINSIZE)
++    {
++      __set_errno (ENOMEM);
++      return 0;
++    }
++
+   void *(*hook) (size_t, size_t, const void *) =
+     force_reg (__memalign_hook);
+   if (__builtin_expect (hook != NULL, 0))
+diff --git a/malloc/malloc.c b/malloc/malloc.c
+index 7f43ba3..3148c5f 100644
+--- a/malloc/malloc.c
++++ b/malloc/malloc.c
+@@ -3046,6 +3046,13 @@ __libc_valloc(size_t bytes)
+ 
+   size_t pagesz = GLRO(dl_pagesize);
+ 
++  /* Check for overflow.  */
++  if (bytes > SIZE_MAX - pagesz - MINSIZE)
++    {
++      __set_errno (ENOMEM);
++      return 0;
++    }
++
+   void *(*hook) (size_t, size_t, const void *) =
+     force_reg (__memalign_hook);
+   if (__builtin_expect (hook != NULL, 0))
+diff --git a/malloc/malloc.c b/malloc/malloc.c
+index 3148c5f..f7718a9 100644
+--- a/malloc/malloc.c
++++ b/malloc/malloc.c
+@@ -3015,6 +3015,13 @@ __libc_memalign(size_t alignment, size_t bytes)
+   /* Otherwise, ensure that it is at least a minimum chunk size */
+   if (alignment <  MINSIZE) alignment = MINSIZE;
+ 
++  /* Check for overflow.  */
++  if (bytes > SIZE_MAX - alignment - MINSIZE)
++    {
++      __set_errno (ENOMEM);
++      return 0;
++    }
++
+   arena_get(ar_ptr, bytes + alignment + MINSIZE);
+   if(!ar_ptr)
+     return 0;
diff --git a/core/glibc/glibc-2.18-ptr-mangle-CVE-2013-4788.patch b/core/glibc/glibc-2.18-ptr-mangle-CVE-2013-4788.patch
new file mode 100644
index 000000000..09a439440
--- /dev/null
+++ b/core/glibc/glibc-2.18-ptr-mangle-CVE-2013-4788.patch
@@ -0,0 +1,485 @@
+diff --git a/csu/libc-start.c b/csu/libc-start.c
+index e5da3ef..c898d06 100644
+--- a/csu/libc-start.c
++++ b/csu/libc-start.c
+@@ -37,6 +37,12 @@ extern void __pthread_initialize_minimal (void);
+    in thread local area.  */
+ uintptr_t __stack_chk_guard attribute_relro;
+ # endif
++# ifndef  THREAD_SET_POINTER_GUARD
++/* Only exported for architectures that don't store the pointer guard
++   value in thread local area.  */
++uintptr_t __pointer_chk_guard_local
++	attribute_relro attribute_hidden __attribute__ ((nocommon));
++# endif
+ #endif
+ 
+ #ifdef HAVE_PTR_NTHREADS
+@@ -195,6 +201,16 @@ LIBC_START_MAIN (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL),
+ # else
+   __stack_chk_guard = stack_chk_guard;
+ # endif
++
++  /* Set up the pointer guard value.  */
++  uintptr_t pointer_chk_guard = _dl_setup_pointer_guard (_dl_random,
++							 stack_chk_guard);
++# ifdef THREAD_SET_POINTER_GUARD
++  THREAD_SET_POINTER_GUARD (pointer_chk_guard);
++# else
++  __pointer_chk_guard_local = pointer_chk_guard;
++# endif
++
+ #endif
+ 
+   /* Register the destructor of the dynamic linker if there is any.  */
+diff --git a/elf/Makefile b/elf/Makefile
+index aaa9534..cb8da93 100644
+--- a/elf/Makefile
++++ b/elf/Makefile
+@@ -121,7 +121,8 @@ endif
+ tests = tst-tls1 tst-tls2 tst-tls9 tst-leaks1 \
+ 	tst-array1 tst-array2 tst-array3 tst-array4 tst-array5
+ tests-static = tst-tls1-static tst-tls2-static tst-stackguard1-static \
+-	       tst-leaks1-static tst-array1-static tst-array5-static
++	       tst-leaks1-static tst-array1-static tst-array5-static \
++	       tst-ptrguard1-static
+ ifeq (yes,$(build-shared))
+ tests-static += tst-tls9-static
+ tst-tls9-static-ENV = \
+@@ -145,7 +146,8 @@ tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \
+ 	 tst-audit1 tst-audit2 tst-audit8 \
+ 	 tst-stackguard1 tst-addr1 tst-thrlock \
+ 	 tst-unique1 tst-unique2 tst-unique3 tst-unique4 \
+-	 tst-initorder tst-initorder2 tst-relsort1 tst-null-argv
++	 tst-initorder tst-initorder2 tst-relsort1 tst-null-argv \
++	 tst-ptrguard1
+ #	 reldep9
+ test-srcs = tst-pathopt
+ selinux-enabled := $(shell cat /selinux/enforce 2> /dev/null)
+@@ -1016,6 +1018,9 @@ LDFLAGS-order2mod2.so = $(no-as-needed)
+ tst-stackguard1-ARGS = --command "$(host-test-program-cmd) --child"
+ tst-stackguard1-static-ARGS = --command "$(objpfx)tst-stackguard1-static --child"
+ 
++tst-ptrguard1-ARGS = --command "$(host-test-program-cmd) --child"
++tst-ptrguard1-static-ARGS = --command "$(objpfx)tst-ptrguard1-static --child"
++
+ $(objpfx)tst-leaks1: $(libdl)
+ $(objpfx)tst-leaks1-mem: $(objpfx)tst-leaks1.out
+ 	$(common-objpfx)malloc/mtrace $(objpfx)tst-leaks1.mtrace > $@
+diff --git a/elf/tst-ptrguard1-static.c b/elf/tst-ptrguard1-static.c
+new file mode 100644
+index 0000000..7aff3b7
+--- /dev/null
++++ b/elf/tst-ptrguard1-static.c
+@@ -0,0 +1 @@
++#include "tst-ptrguard1.c"
+diff --git a/elf/tst-ptrguard1.c b/elf/tst-ptrguard1.c
+new file mode 100644
+index 0000000..c344a04
+--- /dev/null
++++ b/elf/tst-ptrguard1.c
+@@ -0,0 +1,202 @@
++/* Copyright (C) 2013 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#include <errno.h>
++#include <stdbool.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <sys/wait.h>
++#include <stackguard-macros.h>
++#include <tls.h>
++#include <unistd.h>
++
++#ifndef POINTER_CHK_GUARD
++extern uintptr_t __pointer_chk_guard;
++# define POINTER_CHK_GUARD __pointer_chk_guard
++#endif
++
++static const char *command;
++static bool child;
++static uintptr_t ptr_chk_guard_copy;
++static bool ptr_chk_guard_copy_set;
++static int fds[2];
++
++static void __attribute__ ((constructor))
++con (void)
++{
++  ptr_chk_guard_copy = POINTER_CHK_GUARD;
++  ptr_chk_guard_copy_set = true;
++}
++
++static int
++uintptr_t_cmp (const void *a, const void *b)
++{
++  if (*(uintptr_t *) a < *(uintptr_t *) b)
++    return 1;
++  if (*(uintptr_t *) a > *(uintptr_t *) b)
++    return -1;
++  return 0;
++}
++
++static int
++do_test (void)
++{
++  if (!ptr_chk_guard_copy_set)
++    {
++      puts ("constructor has not been run");
++      return 1;
++    }
++
++  if (ptr_chk_guard_copy != POINTER_CHK_GUARD)
++    {
++      puts ("POINTER_CHK_GUARD changed between constructor and do_test");
++      return 1;
++    }
++
++  if (child)
++    {
++      write (2, &ptr_chk_guard_copy, sizeof (ptr_chk_guard_copy));
++      return 0;
++    }
++
++  if (command == NULL)
++    {
++      puts ("missing --command or --child argument");
++      return 1;
++    }
++
++#define N 16
++  uintptr_t child_ptr_chk_guards[N + 1];
++  child_ptr_chk_guards[N] = ptr_chk_guard_copy;
++  int i;
++  for (i = 0; i < N; ++i)
++    {
++      if (pipe (fds) < 0)
++	{
++	  printf ("couldn't create pipe: %m\n");
++	  return 1;
++	}
++
++      pid_t pid = fork ();
++      if (pid < 0)
++	{
++	  printf ("fork failed: %m\n");
++	  return 1;
++	}
++
++      if (!pid)
++	{
++	  if (ptr_chk_guard_copy != POINTER_CHK_GUARD)
++	    {
++	      puts ("POINTER_CHK_GUARD changed after fork");
++	      exit (1);
++	    }
++
++	  close (fds[0]);
++	  close (2);
++	  dup2 (fds[1], 2);
++	  close (fds[1]);
++
++	  system (command);
++	  exit (0);
++	}
++
++      close (fds[1]);
++
++      if (TEMP_FAILURE_RETRY (read (fds[0], &child_ptr_chk_guards[i],
++				    sizeof (uintptr_t))) != sizeof (uintptr_t))
++	{
++	  puts ("could not read ptr_chk_guard value from child");
++	  return 1;
++	}
++
++      close (fds[0]);
++
++      pid_t termpid;
++      int status;
++      termpid = TEMP_FAILURE_RETRY (waitpid (pid, &status, 0));
++      if (termpid == -1)
++	{
++	  printf ("waitpid failed: %m\n");
++	  return 1;
++	}
++      else if (termpid != pid)
++	{
++	  printf ("waitpid returned %ld != %ld\n",
++		  (long int) termpid, (long int) pid);
++	  return 1;
++	}
++      else if (!WIFEXITED (status) || WEXITSTATUS (status))
++	{
++	  puts ("child hasn't exited with exit status 0");
++	  return 1;
++	}
++    }
++
++  qsort (child_ptr_chk_guards, N + 1, sizeof (uintptr_t), uintptr_t_cmp);
++
++  /* The default pointer guard is the same as the default stack guard.
++     They are only set to default if dl_random is NULL.  */
++  uintptr_t default_guard = 0;
++  unsigned char *p = (unsigned char *) &default_guard;
++  p[sizeof (uintptr_t) - 1] = 255;
++  p[sizeof (uintptr_t) - 2] = '\n';
++  p[0] = 0;
++
++  /* Test if the pointer guard canaries are either randomized,
++     or equal to the default pointer guard value.
++     Even with randomized pointer guards it might happen
++     that the random number generator generates the same
++     values, but if that happens in more than half from
++     the 16 runs, something is very wrong.  */
++  int ndifferences = 0;
++  int ndefaults = 0;
++  for (i = 0; i < N; ++i)
++    {
++      if (child_ptr_chk_guards[i] != child_ptr_chk_guards[i+1])
++	ndifferences++;
++      else if (child_ptr_chk_guards[i] == default_guard)
++	ndefaults++;
++    }
++
++  printf ("differences %d defaults %d\n", ndifferences, ndefaults);
++
++  if (ndifferences < N / 2 && ndefaults < N / 2)
++    {
++      puts ("pointer guard values are not randomized enough");
++      puts ("nor equal to the default value");
++      return 1;
++    }
++
++  return 0;
++}
++
++#define OPT_COMMAND	10000
++#define OPT_CHILD	10001
++#define CMDLINE_OPTIONS	\
++  { "command", required_argument, NULL, OPT_COMMAND },  \
++  { "child", no_argument, NULL, OPT_CHILD },
++#define CMDLINE_PROCESS	\
++  case OPT_COMMAND:	\
++    command = optarg;	\
++    break;		\
++  case OPT_CHILD:	\
++    child = true;	\
++    break;
++#define TEST_FUNCTION do_test ()
++#include "../test-skeleton.c"
+diff --git a/ports/sysdeps/ia64/stackguard-macros.h b/ports/sysdeps/ia64/stackguard-macros.h
+index dc683c2..3907293 100644
+--- a/ports/sysdeps/ia64/stackguard-macros.h
++++ b/ports/sysdeps/ia64/stackguard-macros.h
+@@ -2,3 +2,6 @@
+ 
+ #define STACK_CHK_GUARD \
+   ({ uintptr_t x; asm ("adds %0 = -8, r13;; ld8 %0 = [%0]" : "=r" (x)); x; })
++
++#define POINTER_CHK_GUARD \
++  ({ uintptr_t x; asm ("adds %0 = -16, r13;; ld8 %0 = [%0]" : "=r" (x)); x; })
+diff --git a/ports/sysdeps/tile/stackguard-macros.h b/ports/sysdeps/tile/stackguard-macros.h
+index 589ea2b..f2e041b 100644
+--- a/ports/sysdeps/tile/stackguard-macros.h
++++ b/ports/sysdeps/tile/stackguard-macros.h
+@@ -4,11 +4,17 @@
+ # if __WORDSIZE == 64
+ #  define STACK_CHK_GUARD \
+   ({ uintptr_t x; asm ("addi %0, tp, -16; ld %0, %0" : "=r" (x)); x; })
++#  define POINTER_CHK_GUARD \
++  ({ uintptr_t x; asm ("addi %0, tp, -24; ld %0, %0" : "=r" (x)); x; })
+ # else
+ #  define STACK_CHK_GUARD \
+   ({ uintptr_t x; asm ("addi %0, tp, -8; ld4s %0, %0" : "=r" (x)); x; })
++#  define POINTER_CHK_GUARD \
++  ({ uintptr_t x; asm ("addi %0, tp, -12; ld4s %0, %0" : "=r" (x)); x; })
+ # endif
+ #else
+ # define STACK_CHK_GUARD \
+   ({ uintptr_t x; asm ("addi %0, tp, -8; lw %0, %0" : "=r" (x)); x; })
++# define POINTER_CHK_GUARD \
++  ({ uintptr_t x; asm ("addi %0, tp, -12; lw %0, %0" : "=r" (x)); x; })
+ #endif
+diff --git a/sysdeps/generic/stackguard-macros.h b/sysdeps/generic/stackguard-macros.h
+index ababf65..4fa3d96 100644
+--- a/sysdeps/generic/stackguard-macros.h
++++ b/sysdeps/generic/stackguard-macros.h
+@@ -2,3 +2,6 @@
+ 
+ extern uintptr_t __stack_chk_guard;
+ #define STACK_CHK_GUARD __stack_chk_guard
++
++extern uintptr_t __pointer_chk_guard_local;
++#define POINTER_CHK_GUARD __pointer_chk_guard_local
+diff --git a/sysdeps/i386/stackguard-macros.h b/sysdeps/i386/stackguard-macros.h
+index 8c31e19..0397629 100644
+--- a/sysdeps/i386/stackguard-macros.h
++++ b/sysdeps/i386/stackguard-macros.h
+@@ -2,3 +2,11 @@
+ 
+ #define STACK_CHK_GUARD \
+   ({ uintptr_t x; asm ("movl %%gs:0x14, %0" : "=r" (x)); x; })
++
++#define POINTER_CHK_GUARD \
++  ({							\
++     uintptr_t x;					\
++     asm ("movl %%gs:%c1, %0" : "=r" (x)		\
++	  : "i" (offsetof (tcbhead_t, pointer_guard)));	\
++     x;							\
++   })
+diff --git a/sysdeps/powerpc/powerpc32/stackguard-macros.h b/sysdeps/powerpc/powerpc32/stackguard-macros.h
+index 839f6a4..b3d0af8 100644
+--- a/sysdeps/powerpc/powerpc32/stackguard-macros.h
++++ b/sysdeps/powerpc/powerpc32/stackguard-macros.h
+@@ -2,3 +2,13 @@
+ 
+ #define STACK_CHK_GUARD \
+   ({ uintptr_t x; asm ("lwz %0,-28680(2)" : "=r" (x)); x; })
++
++#define POINTER_CHK_GUARD \
++  ({												\
++     uintptr_t x;										\
++     asm ("lwz %0,%1(2)"									\
++	  : "=r" (x)										\
++	  : "i" (offsetof (tcbhead_t, pointer_guard) - TLS_TCB_OFFSET - sizeof (tcbhead_t))	\
++         );											\
++     x;												\
++   })
+diff --git a/sysdeps/powerpc/powerpc64/stackguard-macros.h b/sysdeps/powerpc/powerpc64/stackguard-macros.h
+index 9da879c..4620f96 100644
+--- a/sysdeps/powerpc/powerpc64/stackguard-macros.h
++++ b/sysdeps/powerpc/powerpc64/stackguard-macros.h
+@@ -2,3 +2,13 @@
+ 
+ #define STACK_CHK_GUARD \
+   ({ uintptr_t x; asm ("ld %0,-28688(13)" : "=r" (x)); x; })
++
++#define POINTER_CHK_GUARD \
++  ({												\
++     uintptr_t x;										\
++     asm ("ld %0,%1(2)"										\
++	  : "=r" (x)										\
++	  : "i" (offsetof (tcbhead_t, pointer_guard) - TLS_TCB_OFFSET - sizeof (tcbhead_t))	\
++         );											\
++     x;												\
++   })
+diff --git a/sysdeps/s390/s390-32/stackguard-macros.h b/sysdeps/s390/s390-32/stackguard-macros.h
+index b74c579..449e8d4 100644
+--- a/sysdeps/s390/s390-32/stackguard-macros.h
++++ b/sysdeps/s390/s390-32/stackguard-macros.h
+@@ -2,3 +2,14 @@
+ 
+ #define STACK_CHK_GUARD \
+   ({ uintptr_t x; asm ("ear %0,%%a0; l %0,0x14(%0)" : "=a" (x)); x; })
++
++/* On s390/s390x there is no unique pointer guard, instead we use the
++   same value as the stack guard.  */
++#define POINTER_CHK_GUARD \
++  ({							\
++     uintptr_t x;					\
++     asm ("ear %0,%%a0; l %0,%1(%0)"			\
++	  : "=a" (x)					\
++	  : "i" (offsetof (tcbhead_t, stack_guard)));	\
++     x;							\
++   })
+diff --git a/sysdeps/s390/s390-64/stackguard-macros.h b/sysdeps/s390/s390-64/stackguard-macros.h
+index 0cebb5f..c8270fb 100644
+--- a/sysdeps/s390/s390-64/stackguard-macros.h
++++ b/sysdeps/s390/s390-64/stackguard-macros.h
+@@ -2,3 +2,17 @@
+ 
+ #define STACK_CHK_GUARD \
+   ({ uintptr_t x; asm ("ear %0,%%a0; sllg %0,%0,32; ear %0,%%a1; lg %0,0x28(%0)" : "=a" (x)); x; })
++
++/* On s390/s390x there is no unique pointer guard, instead we use the
++   same value as the stack guard.  */
++#define POINTER_CHK_GUARD \
++  ({							\
++     uintptr_t x;					\
++     asm ("ear %0,%%a0;"				\
++	  "sllg %0,%0,32;"				\
++	  "ear %0,%%a1;"				\
++	  "lg %0,%1(%0)"				\
++	 : "=a" (x)					\
++	 : "i" (offsetof (tcbhead_t, stack_guard)));	\
++     x;							\
++   })
+diff --git a/sysdeps/sparc/sparc32/stackguard-macros.h b/sysdeps/sparc/sparc32/stackguard-macros.h
+index c0b02b0..1eef0f1 100644
+--- a/sysdeps/sparc/sparc32/stackguard-macros.h
++++ b/sysdeps/sparc/sparc32/stackguard-macros.h
+@@ -2,3 +2,6 @@
+ 
+ #define STACK_CHK_GUARD \
+   ({ uintptr_t x; asm ("ld [%%g7+0x14], %0" : "=r" (x)); x; })
++
++#define POINTER_CHK_GUARD \
++  ({ uintptr_t x; asm ("ld [%%g7+0x18], %0" : "=r" (x)); x; })
+diff --git a/sysdeps/sparc/sparc64/stackguard-macros.h b/sysdeps/sparc/sparc64/stackguard-macros.h
+index 80f0635..cc0c12c 100644
+--- a/sysdeps/sparc/sparc64/stackguard-macros.h
++++ b/sysdeps/sparc/sparc64/stackguard-macros.h
+@@ -2,3 +2,6 @@
+ 
+ #define STACK_CHK_GUARD \
+   ({ uintptr_t x; asm ("ldx [%%g7+0x28], %0" : "=r" (x)); x; })
++
++#define POINTER_CHK_GUARD \
++  ({ uintptr_t x; asm ("ldx [%%g7+0x30], %0" : "=r" (x)); x; })
+diff --git a/sysdeps/x86_64/stackguard-macros.h b/sysdeps/x86_64/stackguard-macros.h
+index d7fedb3..1948800 100644
+--- a/sysdeps/x86_64/stackguard-macros.h
++++ b/sysdeps/x86_64/stackguard-macros.h
+@@ -4,3 +4,8 @@
+   ({ uintptr_t x;						\
+      asm ("mov %%fs:%c1, %0" : "=r" (x)				\
+ 	  : "i" (offsetof (tcbhead_t, stack_guard))); x; })
++
++#define POINTER_CHK_GUARD \
++  ({ uintptr_t x;						\
++     asm ("mov %%fs:%c1, %0" : "=r" (x)				\
++	  : "i" (offsetof (tcbhead_t, pointer_guard))); x; })
+diff --git a/elf/Makefile b/elf/Makefile
+index cb8da93..27d249b 100644
+--- a/elf/Makefile
++++ b/elf/Makefile
+@@ -1019,6 +1019,9 @@ tst-stackguard1-ARGS = --command "$(host-test-program-cmd) --child"
+ tst-stackguard1-static-ARGS = --command "$(objpfx)tst-stackguard1-static --child"
+ 
+ tst-ptrguard1-ARGS = --command "$(host-test-program-cmd) --child"
++# When built statically, the pointer guard interface uses
++# __pointer_chk_guard_local.
++CFLAGS-tst-ptrguard1-static.c = -DPTRGUARD_LOCAL
+ tst-ptrguard1-static-ARGS = --command "$(objpfx)tst-ptrguard1-static --child"
+ 
+ $(objpfx)tst-leaks1: $(libdl)
+diff --git a/sysdeps/generic/stackguard-macros.h b/sysdeps/generic/stackguard-macros.h
+index 4fa3d96..b4a6b23 100644
+--- a/sysdeps/generic/stackguard-macros.h
++++ b/sysdeps/generic/stackguard-macros.h
+@@ -3,5 +3,10 @@
+ extern uintptr_t __stack_chk_guard;
+ #define STACK_CHK_GUARD __stack_chk_guard
+ 
++#ifdef PTRGUARD_LOCAL
+ extern uintptr_t __pointer_chk_guard_local;
+-#define POINTER_CHK_GUARD __pointer_chk_guard_local
++# define POINTER_CHK_GUARD __pointer_chk_guard_local
++#else
++extern uintptr_t __pointer_chk_guard;
++# define POINTER_CHK_GUARD __pointer_chk_guard
++#endif
diff --git a/core/glibc/glibc-2.18-strcoll-CVE-2012-4412+4424.patch b/core/glibc/glibc-2.18-strcoll-CVE-2012-4412+4424.patch
new file mode 100644
index 000000000..5558c1fe9
--- /dev/null
+++ b/core/glibc/glibc-2.18-strcoll-CVE-2012-4412+4424.patch
@@ -0,0 +1,1004 @@
+diff --git a/string/strcoll_l.c b/string/strcoll_l.c
+index ecda08f..bb34a72 100644
+--- a/string/strcoll_l.c
++++ b/string/strcoll_l.c
+@@ -41,11 +41,434 @@
+ 
+ #include "../locale/localeinfo.h"
+ 
++/* Track status while looking for sequences in a string.  */
++typedef struct
++{
++  int len;			/* Length of the current sequence.  */
++  size_t val;			/* Position of the sequence relative to the
++				   previous non-ignored sequence.  */
++  size_t idxnow;		/* Current index in sequences.  */
++  size_t idxmax;		/* Maximum index in sequences.  */
++  size_t idxcnt;		/* Current count of indices.  */
++  size_t backw;			/* Current Backward sequence index.  */
++  size_t backw_stop;		/* Index where the backward sequences stop.  */
++  const USTRING_TYPE *us;	/* The string.  */
++  int32_t *idxarr;		/* Array to cache weight indices.  */
++  unsigned char *rulearr;	/* Array to cache rules.  */
++  unsigned char rule;		/* Saved rule for the first sequence.  */
++  int32_t idx;			/* Index to weight of the current sequence.  */
++  int32_t save_idx;		/* Save looked up index of a forward
++				   sequence after the last backward
++				   sequence.  */
++  const USTRING_TYPE *back_us;	/* Beginning of the backward sequence.  */
++} coll_seq;
++
++/* Get next sequence.  The weight indices are cached, so we don't need to
++   traverse the string.  */
++static void
++get_next_seq_cached (coll_seq *seq, int nrules, int pass,
++		     const unsigned char *rulesets,
++		     const USTRING_TYPE *weights)
++{
++  size_t val = seq->val = 0;
++  int len = seq->len;
++  size_t backw_stop = seq->backw_stop;
++  size_t backw = seq->backw;
++  size_t idxcnt = seq->idxcnt;
++  size_t idxmax = seq->idxmax;
++  size_t idxnow = seq->idxnow;
++  unsigned char *rulearr = seq->rulearr;
++  int32_t *idxarr = seq->idxarr;
++
++  while (len == 0)
++    {
++      ++val;
++      if (backw_stop != ~0ul)
++	{
++	  /* There is something pushed.  */
++	  if (backw == backw_stop)
++	    {
++	      /* The last pushed character was handled.  Continue
++		 with forward characters.  */
++	      if (idxcnt < idxmax)
++		{
++		  idxnow = idxcnt;
++		  backw_stop = ~0ul;
++		}
++	      else
++		{
++		  /* Nothing any more.  The backward sequence
++		     ended with the last sequence in the string.  */
++		  idxnow = ~0ul;
++		  break;
++		}
++	    }
++	  else
++	    idxnow = --backw;
++	}
++      else
++	{
++	  backw_stop = idxcnt;
++
++	  while (idxcnt < idxmax)
++	    {
++	      if ((rulesets[rulearr[idxcnt] * nrules + pass]
++		   & sort_backward) == 0)
++		/* No more backward characters to push.  */
++		break;
++	      ++idxcnt;
++	    }
++
++	  if (backw_stop == idxcnt)
++	    {
++	      /* No sequence at all or just one.  */
++	      if (idxcnt == idxmax)
++		/* Note that LEN is still zero.  */
++		break;
++
++	      backw_stop = ~0ul;
++	      idxnow = idxcnt++;
++	    }
++	  else
++	    /* We pushed backward sequences.  */
++	    idxnow = backw = idxcnt - 1;
++	}
++      len = weights[idxarr[idxnow]++];
++    }
++
++  /* Update the structure.  */
++  seq->val = val;
++  seq->len = len;
++  seq->backw_stop = backw_stop;
++  seq->backw = backw;
++  seq->idxcnt = idxcnt;
++  seq->idxnow = idxnow;
++}
++
++/* Get next sequence.  Traverse the string as required.  */
++static void
++get_next_seq (coll_seq *seq, int nrules, const unsigned char *rulesets,
++	      const USTRING_TYPE *weights, const int32_t *table,
++	      const USTRING_TYPE *extra, const int32_t *indirect)
++{
++#include WEIGHT_H
++  size_t val = seq->val = 0;
++  int len = seq->len;
++  size_t backw_stop = seq->backw_stop;
++  size_t backw = seq->backw;
++  size_t idxcnt = seq->idxcnt;
++  size_t idxmax = seq->idxmax;
++  size_t idxnow = seq->idxnow;
++  unsigned char *rulearr = seq->rulearr;
++  int32_t *idxarr = seq->idxarr;
++  const USTRING_TYPE *us = seq->us;
++
++  while (len == 0)
++    {
++      ++val;
++      if (backw_stop != ~0ul)
++	{
++	  /* There is something pushed.  */
++	  if (backw == backw_stop)
++	    {
++	      /* The last pushed character was handled.  Continue
++		 with forward characters.  */
++	      if (idxcnt < idxmax)
++		{
++		  idxnow = idxcnt;
++		  backw_stop = ~0ul;
++		}
++	      else
++		/* Nothing any more.  The backward sequence ended with
++		   the last sequence in the string.  Note that LEN
++		   is still zero.  */
++		break;
++	    }
++	  else
++	    idxnow = --backw;
++	}
++      else
++	{
++	  backw_stop = idxmax;
++
++	  while (*us != L('\0'))
++	    {
++	      int32_t tmp = findidx (&us, -1);
++	      rulearr[idxmax] = tmp >> 24;
++	      idxarr[idxmax] = tmp & 0xffffff;
++	      idxcnt = idxmax++;
++
++	      if ((rulesets[rulearr[idxcnt] * nrules]
++		   & sort_backward) == 0)
++		/* No more backward characters to push.  */
++		break;
++	      ++idxcnt;
++	    }
++
++	  if (backw_stop >= idxcnt)
++	    {
++	      /* No sequence at all or just one.  */
++	      if (idxcnt == idxmax || backw_stop > idxcnt)
++		/* Note that LEN is still zero.  */
++		break;
++
++	      backw_stop = ~0ul;
++	      idxnow = idxcnt;
++	    }
++	  else
++	    /* We pushed backward sequences.  */
++	    idxnow = backw = idxcnt - 1;
++	}
++      len = weights[idxarr[idxnow]++];
++    }
++
++  /* Update the structure.  */
++  seq->val = val;
++  seq->len = len;
++  seq->backw_stop = backw_stop;
++  seq->backw = backw;
++  seq->idxcnt = idxcnt;
++  seq->idxmax = idxmax;
++  seq->idxnow = idxnow;
++  seq->us = us;
++}
++
++/* Get next sequence.  Traverse the string as required.  This function does not
++   set or use any index or rule cache.  */
++static void
++get_next_seq_nocache (coll_seq *seq, int nrules, const unsigned char *rulesets,
++		      const USTRING_TYPE *weights, const int32_t *table,
++		      const USTRING_TYPE *extra, const int32_t *indirect,
++		      int pass)
++{
++#include WEIGHT_H
++  size_t val = seq->val = 0;
++  int len = seq->len;
++  size_t backw_stop = seq->backw_stop;
++  size_t backw = seq->backw;
++  size_t idxcnt = seq->idxcnt;
++  size_t idxmax = seq->idxmax;
++  int32_t idx = seq->idx;
++  const USTRING_TYPE *us = seq->us;
++
++  while (len == 0)
++    {
++      ++val;
++      if (backw_stop != ~0ul)
++	{
++	  /* There is something pushed.  */
++	  if (backw == backw_stop)
++	    {
++	      /* The last pushed character was handled.  Continue
++		 with forward characters.  */
++	      if (idxcnt < idxmax)
++		{
++		  idx = seq->save_idx;
++		  backw_stop = ~0ul;
++		}
++	      else
++		{
++		  /* Nothing anymore.  The backward sequence ended with
++		     the last sequence in the string.  Note that len is
++		     still zero.  */
++		  idx = 0;
++		  break;
++	        }
++	    }
++	  else
++	    {
++	      /* XXX Traverse BACKW sequences from the beginning of
++		 BACKW_STOP to get the next sequence.  Is ther a quicker way
++	         to do this?  */
++	      size_t i = backw_stop;
++	      us = seq->back_us;
++	      while (i < backw)
++		{
++		  int32_t tmp = findidx (&us, -1);
++		  idx = tmp & 0xffffff;
++		  i++;
++		}
++	      --backw;
++	      us = seq->us;
++	    }
++	}
++      else
++	{
++	  backw_stop = idxmax;
++	  int32_t prev_idx = idx;
++
++	  while (*us != L('\0'))
++	    {
++	      int32_t tmp = findidx (&us, -1);
++	      unsigned char rule = tmp >> 24;
++	      prev_idx = idx;
++	      idx = tmp & 0xffffff;
++	      idxcnt = idxmax++;
++
++	      /* Save the rule for the first sequence.  */
++	      if (__glibc_unlikely (idxcnt == 0))
++	        seq->rule = rule;
++
++	      if ((rulesets[rule * nrules + pass]
++		   & sort_backward) == 0)
++		/* No more backward characters to push.  */
++		break;
++	      ++idxcnt;
++	    }
++
++	  if (backw_stop >= idxcnt)
++	    {
++	      /* No sequence at all or just one.  */
++	      if (idxcnt == idxmax || backw_stop > idxcnt)
++		/* Note that len is still zero.  */
++		break;
++
++	      backw_stop = ~0ul;
++	    }
++	  else
++	    {
++	      /* We pushed backward sequences.  If the stream ended with the
++		 backward sequence, then we process the last sequence we
++		 found.  Otherwise we process the sequence before the last
++		 one since the last one was a forward sequence.  */
++	      seq->back_us = seq->us;
++	      seq->us = us;
++	      backw = idxcnt;
++	      if (idxmax > idxcnt)
++		{
++		  backw--;
++		  seq->save_idx = idx;
++		  idx = prev_idx;
++		}
++	      if (backw > backw_stop)
++		backw--;
++	    }
++	}
++
++      len = weights[idx++];
++      /* Skip over indices of previous levels.  */
++      for (int i = 0; i < pass; i++)
++	{
++	  idx += len;
++	  len = weights[idx];
++	  idx++;
++	}
++    }
++
++  /* Update the structure.  */
++  seq->val = val;
++  seq->len = len;
++  seq->backw_stop = backw_stop;
++  seq->backw = backw;
++  seq->idxcnt = idxcnt;
++  seq->idxmax = idxmax;
++  seq->us = us;
++  seq->idx = idx;
++}
++
++/* Compare two sequences.  This version does not use the index and rules
++   cache.  */
++static int
++do_compare_nocache (coll_seq *seq1, coll_seq *seq2, int position,
++		    const USTRING_TYPE *weights)
++{
++  int seq1len = seq1->len;
++  int seq2len = seq2->len;
++  size_t val1 = seq1->val;
++  size_t val2 = seq2->val;
++  int idx1 = seq1->idx;
++  int idx2 = seq2->idx;
++  int result = 0;
++
++  /* Test for position if necessary.  */
++  if (position && val1 != val2)
++    {
++      result = val1 > val2 ? 1 : -1;
++      goto out;
++    }
++
++  /* Compare the two sequences.  */
++  do
++    {
++      if (weights[idx1] != weights[idx2])
++	{
++	  /* The sequences differ.  */
++	  result = weights[idx1] - weights[idx2];
++	  goto out;
++	}
++
++      /* Increment the offsets.  */
++      ++idx1;
++      ++idx2;
++
++      --seq1len;
++      --seq2len;
++    }
++  while (seq1len > 0 && seq2len > 0);
++
++  if (position && seq1len != seq2len)
++    result = seq1len - seq2len;
++
++out:
++  seq1->len = seq1len;
++  seq2->len = seq2len;
++  seq1->idx = idx1;
++  seq2->idx = idx2;
++  return result;
++}
++
++/* Compare two sequences using the index cache.  */
++static int
++do_compare (coll_seq *seq1, coll_seq *seq2, int position,
++	    const USTRING_TYPE *weights)
++{
++  int seq1len = seq1->len;
++  int seq2len = seq2->len;
++  size_t val1 = seq1->val;
++  size_t val2 = seq2->val;
++  int32_t *idx1arr = seq1->idxarr;
++  int32_t *idx2arr = seq2->idxarr;
++  int idx1now = seq1->idxnow;
++  int idx2now = seq2->idxnow;
++  int result = 0;
++
++  /* Test for position if necessary.  */
++  if (position && val1 != val2)
++    {
++      result = val1 > val2 ? 1 : -1;
++      goto out;
++    }
++
++  /* Compare the two sequences.  */
++  do
++    {
++      if (weights[idx1arr[idx1now]] != weights[idx2arr[idx2now]])
++	{
++	  /* The sequences differ.  */
++	  result = weights[idx1arr[idx1now]] - weights[idx2arr[idx2now]];
++	  goto out;
++	}
++
++      /* Increment the offsets.  */
++      ++idx1arr[idx1now];
++      ++idx2arr[idx2now];
++
++      --seq1len;
++      --seq2len;
++    }
++  while (seq1len > 0 && seq2len > 0);
++
++  if (position && seq1len != seq2len)
++    result = seq1len - seq2len;
++
++out:
++  seq1->len = seq1len;
++  seq2->len = seq2len;
++  return result;
++}
++
+ int
+-STRCOLL (s1, s2, l)
+-     const STRING_TYPE *s1;
+-     const STRING_TYPE *s2;
+-     __locale_t l;
++STRCOLL (const STRING_TYPE *s1, const STRING_TYPE *s2, __locale_t l)
+ {
+   struct __locale_data *current = l->__locales[LC_COLLATE];
+   uint_fast32_t nrules = current->values[_NL_ITEM_INDEX (_NL_COLLATE_NRULES)].word;
+@@ -56,34 +479,6 @@ STRCOLL (s1, s2, l)
+   const USTRING_TYPE *weights;
+   const USTRING_TYPE *extra;
+   const int32_t *indirect;
+-  uint_fast32_t pass;
+-  int result = 0;
+-  const USTRING_TYPE *us1;
+-  const USTRING_TYPE *us2;
+-  size_t s1len;
+-  size_t s2len;
+-  int32_t *idx1arr;
+-  int32_t *idx2arr;
+-  unsigned char *rule1arr;
+-  unsigned char *rule2arr;
+-  size_t idx1max;
+-  size_t idx2max;
+-  size_t idx1cnt;
+-  size_t idx2cnt;
+-  size_t idx1now;
+-  size_t idx2now;
+-  size_t backw1_stop;
+-  size_t backw2_stop;
+-  size_t backw1;
+-  size_t backw2;
+-  int val1;
+-  int val2;
+-  int position;
+-  int seq1len;
+-  int seq2len;
+-  int use_malloc;
+-
+-#include WEIGHT_H
+ 
+   if (nrules == 0)
+     return STRCMP (s1, s2);
+@@ -98,7 +493,6 @@ STRCOLL (s1, s2, l)
+     current->values[_NL_ITEM_INDEX (CONCAT(_NL_COLLATE_EXTRA,SUFFIX))].string;
+   indirect = (const int32_t *)
+     current->values[_NL_ITEM_INDEX (CONCAT(_NL_COLLATE_INDIRECT,SUFFIX))].string;
+-  use_malloc = 0;
+ 
+   assert (((uintptr_t) table) % __alignof__ (table[0]) == 0);
+   assert (((uintptr_t) weights) % __alignof__ (weights[0]) == 0);
+@@ -106,18 +500,13 @@ STRCOLL (s1, s2, l)
+   assert (((uintptr_t) indirect) % __alignof__ (indirect[0]) == 0);
+ 
+   /* We need this a few times.  */
+-  s1len = STRLEN (s1);
+-  s2len = STRLEN (s2);
++  size_t s1len = STRLEN (s1);
++  size_t s2len = STRLEN (s2);
+ 
+   /* Catch empty strings.  */
+-  if (__builtin_expect (s1len == 0, 0) || __builtin_expect (s2len == 0, 0))
++  if (__glibc_unlikely (s1len == 0) || __glibc_unlikely (s2len == 0))
+     return (s1len != 0) - (s2len != 0);
+ 
+-  /* We need the elements of the strings as unsigned values since they
+-     are used as indeces.  */
+-  us1 = (const USTRING_TYPE *) s1;
+-  us2 = (const USTRING_TYPE *) s2;
+-
+   /* Perform the first pass over the string and while doing this find
+      and store the weights for each character.  Since we want this to
+      be as fast as possible we are using `alloca' to store the temporary
+@@ -127,411 +516,124 @@ STRCOLL (s1, s2, l)
+ 
+      Please note that the localedef programs makes sure that `position'
+      is not used at the first level.  */
+-  if (! __libc_use_alloca ((s1len + s2len) * (sizeof (int32_t) + 1)))
+-    {
+-      idx1arr = (int32_t *) malloc ((s1len + s2len) * (sizeof (int32_t) + 1));
+-      idx2arr = &idx1arr[s1len];
+-      rule1arr = (unsigned char *) &idx2arr[s2len];
+-      rule2arr = &rule1arr[s1len];
+-
+-      if (idx1arr == NULL)
+-	/* No memory.  Well, go with the stack then.
+-
+-	   XXX Once this implementation is stable we will handle this
+-	   differently.  Instead of precomputing the indeces we will
+-	   do this in time.  This means, though, that this happens for
+-	   every pass again.  */
+-	goto try_stack;
+-      use_malloc = 1;
+-    }
+-  else
+-    {
+-    try_stack:
+-      idx1arr = (int32_t *) alloca (s1len * sizeof (int32_t));
+-      idx2arr = (int32_t *) alloca (s2len * sizeof (int32_t));
+-      rule1arr = (unsigned char *) alloca (s1len);
+-      rule2arr = (unsigned char *) alloca (s2len);
+-    }
+ 
+-  idx1cnt = 0;
+-  idx2cnt = 0;
+-  idx1max = 0;
+-  idx2max = 0;
+-  idx1now = 0;
+-  idx2now = 0;
+-  backw1_stop = ~0ul;
+-  backw2_stop = ~0ul;
+-  backw1 = ~0ul;
+-  backw2 = ~0ul;
+-  seq1len = 0;
+-  seq2len = 0;
+-  position = rulesets[0] & sort_position;
+-  while (1)
+-    {
+-      val1 = 0;
+-      val2 = 0;
+-
+-      /* Get the next non-IGNOREd element for string `s1'.  */
+-      if (seq1len == 0)
+-	do
+-	  {
+-	    ++val1;
+-
+-	    if (backw1_stop != ~0ul)
+-	      {
+-		/* The is something pushed.  */
+-		if (backw1 == backw1_stop)
+-		  {
+-		    /* The last pushed character was handled.  Continue
+-		       with forward characters.  */
+-		    if (idx1cnt < idx1max)
+-		      {
+-			idx1now = idx1cnt;
+-			backw1_stop = ~0ul;
+-		      }
+-		    else
+-		      /* Nothing anymore.  The backward sequence ended with
+-			 the last sequence in the string.  Note that seq1len
+-			 is still zero.  */
+-		      break;
+-		  }
+-		else
+-		  idx1now = --backw1;
+-	      }
+-	    else
+-	      {
+-		backw1_stop = idx1max;
+-
+-		while (*us1 != L('\0'))
+-		  {
+-		    int32_t tmp = findidx (&us1, -1);
+-		    rule1arr[idx1max] = tmp >> 24;
+-		    idx1arr[idx1max] = tmp & 0xffffff;
+-		    idx1cnt = idx1max++;
+-
+-		    if ((rulesets[rule1arr[idx1cnt] * nrules]
+-			 & sort_backward) == 0)
+-		      /* No more backward characters to push.  */
+-		      break;
+-		    ++idx1cnt;
+-		  }
+-
+-		if (backw1_stop >= idx1cnt)
+-		  {
+-		    /* No sequence at all or just one.  */
+-		    if (idx1cnt == idx1max || backw1_stop > idx1cnt)
+-		      /* Note that seq1len is still zero.  */
+-		      break;
+-
+-		    backw1_stop = ~0ul;
+-		    idx1now = idx1cnt;
+-		  }
+-		else
+-		  /* We pushed backward sequences.  */
+-		  idx1now = backw1 = idx1cnt - 1;
+-	      }
+-	  }
+-	while ((seq1len = weights[idx1arr[idx1now]++]) == 0);
+-
+-      /* And the same for string `s2'.  */
+-      if (seq2len == 0)
+-	do
+-	  {
+-	    ++val2;
+-
+-	    if (backw2_stop != ~0ul)
+-	      {
+-		/* The is something pushed.  */
+-		if (backw2 == backw2_stop)
+-		  {
+-		    /* The last pushed character was handled.  Continue
+-		       with forward characters.  */
+-		    if (idx2cnt < idx2max)
+-		      {
+-			idx2now = idx2cnt;
+-			backw2_stop = ~0ul;
+-		      }
+-		    else
+-		      /* Nothing anymore.  The backward sequence ended with
+-			 the last sequence in the string.  Note that seq2len
+-			 is still zero.  */
+-		      break;
+-		  }
+-		else
+-		  idx2now = --backw2;
+-	      }
+-	    else
+-	      {
+-		backw2_stop = idx2max;
+-
+-		while (*us2 != L('\0'))
+-		  {
+-		    int32_t tmp = findidx (&us2, -1);
+-		    rule2arr[idx2max] = tmp >> 24;
+-		    idx2arr[idx2max] = tmp & 0xffffff;
+-		    idx2cnt = idx2max++;
+-
+-		    if ((rulesets[rule2arr[idx2cnt] * nrules]
+-			 & sort_backward) == 0)
+-		      /* No more backward characters to push.  */
+-		      break;
+-		    ++idx2cnt;
+-		  }
+-
+-		if (backw2_stop >= idx2cnt)
+-		  {
+-		    /* No sequence at all or just one.  */
+-		    if (idx2cnt == idx2max || backw2_stop > idx2cnt)
+-		      /* Note that seq1len is still zero.  */
+-		      break;
+-
+-		    backw2_stop = ~0ul;
+-		    idx2now = idx2cnt;
+-		  }
+-		else
+-		  /* We pushed backward sequences.  */
+-		  idx2now = backw2 = idx2cnt - 1;
+-	      }
+-	  }
+-	while ((seq2len = weights[idx2arr[idx2now]++]) == 0);
+-
+-      /* See whether any or both strings are empty.  */
+-      if (seq1len == 0 || seq2len == 0)
+-	{
+-	  if (seq1len == seq2len)
+-	    /* Both ended.  So far so good, both strings are equal at the
+-	       first level.  */
+-	    break;
+-
+-	  /* This means one string is shorter than the other.  Find out
+-	     which one and return an appropriate value.  */
+-	  result = seq1len == 0 ? -1 : 1;
+-	  goto free_and_return;
+-	}
++  coll_seq seq1, seq2;
++  bool use_malloc = false;
++  int result = 0;
+ 
+-      /* Test for position if necessary.  */
+-      if (position && val1 != val2)
+-	{
+-	  result = val1 - val2;
+-	  goto free_and_return;
+-	}
++  memset (&seq1, 0, sizeof (seq1));
++  seq2 = seq1;
+ 
+-      /* Compare the two sequences.  */
+-      do
+-	{
+-	  if (weights[idx1arr[idx1now]] != weights[idx2arr[idx2now]])
+-	    {
+-	      /* The sequences differ.  */
+-	      result = weights[idx1arr[idx1now]] - weights[idx2arr[idx2now]];
+-	      goto free_and_return;
+-	    }
++  size_t size_max = SIZE_MAX / (sizeof (int32_t) + 1);
+ 
+-	  /* Increment the offsets.  */
+-	  ++idx1arr[idx1now];
+-	  ++idx2arr[idx2now];
++  /* If the strings are long enough to cause overflow in the size request, then
++     skip the allocation and proceed with the non-cached routines.  */
++  if (MIN (s1len, s2len) > size_max
++      || MAX (s1len, s2len) > size_max - MIN (s1len, s2len))
++    goto begin_collate;
+ 
+-	  --seq1len;
+-	  --seq2len;
+-	}
+-      while (seq1len > 0 && seq2len > 0);
++  if (! __libc_use_alloca ((s1len + s2len) * (sizeof (int32_t) + 1)))
++    {
++      seq1.idxarr = (int32_t *) malloc ((s1len + s2len) * (sizeof (int32_t) + 1));
+ 
+-      if (position && seq1len != seq2len)
++      /* If we failed to allocate memory, we leave everything as NULL so that
++	 we use the nocache version of traversal and comparison functions.  */
++      if (seq1.idxarr != NULL)
+ 	{
+-	  result = seq1len - seq2len;
+-	  goto free_and_return;
++	  seq2.idxarr = &seq1.idxarr[s1len];
++	  seq1.rulearr = (unsigned char *) &seq2.idxarr[s2len];
++	  seq2.rulearr = &seq1.rulearr[s1len];
++	  use_malloc = true;
+ 	}
+     }
++  else
++    {
++      seq1.idxarr = (int32_t *) alloca (s1len * sizeof (int32_t));
++      seq2.idxarr = (int32_t *) alloca (s2len * sizeof (int32_t));
++      seq1.rulearr = (unsigned char *) alloca (s1len);
++      seq2.rulearr = (unsigned char *) alloca (s2len);
++    }
+ 
+-  /* Now the remaining passes over the weights.  We now use the
+-     indeces we found before.  */
+-  for (pass = 1; pass < nrules; ++pass)
++  int rule;
++
++ begin_collate:
++  rule = 0;
++  /* Cache values in the first pass and if needed, use them in subsequent
++     passes.  */
++  for (int pass = 0; pass < nrules; ++pass)
+     {
++      seq1.idxcnt = 0;
++      seq1.idx = 0;
++      seq2.idx = 0;
++      seq1.backw_stop = ~0ul;
++      seq1.backw = ~0ul;
++      seq2.idxcnt = 0;
++      seq2.backw_stop = ~0ul;
++      seq2.backw = ~0ul;
++
++      /* We need the elements of the strings as unsigned values since they
++	 are used as indices.  */
++      seq1.us = (const USTRING_TYPE *) s1;
++      seq2.us = (const USTRING_TYPE *) s2;
++
+       /* We assume that if a rule has defined `position' in one section
+ 	 this is true for all of them.  */
+-      idx1cnt = 0;
+-      idx2cnt = 0;
+-      backw1_stop = ~0ul;
+-      backw2_stop = ~0ul;
+-      backw1 = ~0ul;
+-      backw2 = ~0ul;
+-      position = rulesets[rule1arr[0] * nrules + pass] & sort_position;
++      int position = rulesets[rule * nrules + pass] & sort_position;
+ 
+       while (1)
+ 	{
+-	  val1 = 0;
+-	  val2 = 0;
+-
+-	  /* Get the next non-IGNOREd element for string `s1'.  */
+-	  if (seq1len == 0)
+-	    do
+-	      {
+-		++val1;
+-
+-		if (backw1_stop != ~0ul)
+-		  {
+-		    /* The is something pushed.  */
+-		    if (backw1 == backw1_stop)
+-		      {
+-			/* The last pushed character was handled.  Continue
+-			   with forward characters.  */
+-			if (idx1cnt < idx1max)
+-			  {
+-			    idx1now = idx1cnt;
+-			    backw1_stop = ~0ul;
+-			  }
+-			else
+-			  {
+-			    /* Nothing anymore.  The backward sequence
+-			       ended with the last sequence in the string.  */
+-			    idx1now = ~0ul;
+-			    break;
+-			  }
+-		      }
+-		    else
+-		      idx1now = --backw1;
+-		  }
+-		else
+-		  {
+-		    backw1_stop = idx1cnt;
+-
+-		    while (idx1cnt < idx1max)
+-		      {
+-			if ((rulesets[rule1arr[idx1cnt] * nrules + pass]
+-			     & sort_backward) == 0)
+-			  /* No more backward characters to push.  */
+-			  break;
+-			++idx1cnt;
+-		      }
+-
+-		    if (backw1_stop == idx1cnt)
+-		      {
+-			/* No sequence at all or just one.  */
+-			if (idx1cnt == idx1max)
+-			  /* Note that seq1len is still zero.  */
+-			  break;
+-
+-			backw1_stop = ~0ul;
+-			idx1now = idx1cnt++;
+-		      }
+-		    else
+-		      /* We pushed backward sequences.  */
+-		      idx1now = backw1 = idx1cnt - 1;
+-		  }
+-	      }
+-	    while ((seq1len = weights[idx1arr[idx1now]++]) == 0);
+-
+-	  /* And the same for string `s2'.  */
+-	  if (seq2len == 0)
+-	    do
+-	      {
+-		++val2;
+-
+-		if (backw2_stop != ~0ul)
+-		  {
+-		    /* The is something pushed.  */
+-		    if (backw2 == backw2_stop)
+-		      {
+-			/* The last pushed character was handled.  Continue
+-			   with forward characters.  */
+-			if (idx2cnt < idx2max)
+-			  {
+-			    idx2now = idx2cnt;
+-			    backw2_stop = ~0ul;
+-			  }
+-			else
+-			  {
+-			    /* Nothing anymore.  The backward sequence
+-			       ended with the last sequence in the string.  */
+-			    idx2now = ~0ul;
+-			    break;
+-			  }
+-		      }
+-		    else
+-		      idx2now = --backw2;
+-		  }
+-		else
+-		  {
+-		    backw2_stop = idx2cnt;
+-
+-		    while (idx2cnt < idx2max)
+-		      {
+-			if ((rulesets[rule2arr[idx2cnt] * nrules + pass]
+-			     & sort_backward) == 0)
+-			  /* No more backward characters to push.  */
+-			  break;
+-			++idx2cnt;
+-		      }
+-
+-		    if (backw2_stop == idx2cnt)
+-		      {
+-			/* No sequence at all or just one.  */
+-			if (idx2cnt == idx2max)
+-			  /* Note that seq2len is still zero.  */
+-			  break;
+-
+-			backw2_stop = ~0ul;
+-			idx2now = idx2cnt++;
+-		      }
+-		    else
+-		      /* We pushed backward sequences.  */
+-		      idx2now = backw2 = idx2cnt - 1;
+-		  }
+-	      }
+-	    while ((seq2len = weights[idx2arr[idx2now]++]) == 0);
++	  if (__glibc_unlikely (seq1.idxarr == NULL))
++	    {
++	      get_next_seq_nocache (&seq1, nrules, rulesets, weights, table,
++				    extra, indirect, pass);
++	      get_next_seq_nocache (&seq2, nrules, rulesets, weights, table,
++				    extra, indirect, pass);
++	    }
++	  else if (pass == 0)
++	    {
++	      get_next_seq (&seq1, nrules, rulesets, weights, table, extra,
++			    indirect);
++	      get_next_seq (&seq2, nrules, rulesets, weights, table, extra,
++			    indirect);
++	    }
++	  else
++	    {
++	      get_next_seq_cached (&seq1, nrules, pass, rulesets, weights);
++	      get_next_seq_cached (&seq2, nrules, pass, rulesets, weights);
++	    }
+ 
+ 	  /* See whether any or both strings are empty.  */
+-	  if (seq1len == 0 || seq2len == 0)
++	  if (seq1.len == 0 || seq2.len == 0)
+ 	    {
+-	      if (seq1len == seq2len)
++	      if (seq1.len == seq2.len)
+ 		/* Both ended.  So far so good, both strings are equal
+ 		   at this level.  */
+ 		break;
+ 
+ 	      /* This means one string is shorter than the other.  Find out
+ 		 which one and return an appropriate value.  */
+-	      result = seq1len == 0 ? -1 : 1;
++	      result = seq1.len == 0 ? -1 : 1;
+ 	      goto free_and_return;
+ 	    }
+ 
+-	  /* Test for position if necessary.  */
+-	  if (position && val1 != val2)
+-	    {
+-	      result = val1 - val2;
+-	      goto free_and_return;
+-	    }
+-
+-	  /* Compare the two sequences.  */
+-	  do
+-	    {
+-	      if (weights[idx1arr[idx1now]] != weights[idx2arr[idx2now]])
+-		{
+-		  /* The sequences differ.  */
+-		  result = (weights[idx1arr[idx1now]]
+-			    - weights[idx2arr[idx2now]]);
+-		  goto free_and_return;
+-		}
+-
+-	      /* Increment the offsets.  */
+-	      ++idx1arr[idx1now];
+-	      ++idx2arr[idx2now];
+-
+-	      --seq1len;
+-	      --seq2len;
+-	    }
+-	  while (seq1len > 0 && seq2len > 0);
+-
+-	  if (position && seq1len != seq2len)
+-	    {
+-	      result = seq1len - seq2len;
+-	      goto free_and_return;
+-	    }
++	  if (__glibc_unlikely (seq1.idxarr == NULL))
++	    result = do_compare_nocache (&seq1, &seq2, position, weights);
++	  else
++	    result = do_compare (&seq1, &seq2, position, weights);
++	  if (result != 0)
++	    goto free_and_return;
+ 	}
++
++      if (__glibc_likely (seq1.rulearr != NULL))
++	rule = seq1.rulearr[0];
++      else
++	rule = seq1.rule;
+     }
+ 
+   /* Free the memory if needed.  */
+  free_and_return:
+   if (use_malloc)
+-    free (idx1arr);
++    free (seq1.idxarr);
+ 
+   return result;
+ }
diff --git a/core/gmp/PKGBUILD b/core/gmp/PKGBUILD
index 2f651d2c0..f8bff89b0 100644
--- a/core/gmp/PKGBUILD
+++ b/core/gmp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 186344 2013-05-25 03:05:31Z allan $
+# $Id: PKGBUILD 195874 2013-10-03 04:29:19Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gmp
-pkgver=5.1.2
+pkgver=5.1.3
 pkgrel=1
 pkgdesc="A free library for arbitrary precision arithmetic"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ license=('LGPL3')
 options=('!libtool')
 install=gmp.install
 source=(ftp://ftp.gmplib.org/pub/gmp-${pkgver}/gmp-${pkgver}.tar.xz{,.sig})
-md5sums=('06fe2ca164221c59ce74867155cfc1ac'
+md5sums=('e5fe367801ff067b923d1e6a126448aa'
          'SKIP')
 
 build() {
diff --git a/core/gnupg/PKGBUILD b/core/gnupg/PKGBUILD
index e4038de59..412da5996 100644
--- a/core/gnupg/PKGBUILD
+++ b/core/gnupg/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 193522 2013-08-21 22:25:01Z bisson $
+# $Id: PKGBUILD 195927 2013-10-05 17:40:59Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=gnupg
-pkgver=2.0.21
+pkgver=2.0.22
 pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
@@ -18,7 +18,7 @@ makedepends=('curl' 'libldap' 'libusb-compat')
 depends=('bzip2' 'libksba' 'libgcrypt' 'pth' 'libassuan' 'readline' 'pinentry' 'dirmngr')
 source=("ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
         'protect-tool-env.patch')
-sha1sums=('5ba8cce72eb4fd1a3ac1a282d25d7c7b90d3bf26' 'SKIP'
+sha1sums=('9ba9ee288e9bf813e0f1e25cbe06b58d3072d8b8' 'SKIP'
           '2ec97ba55ae47ff0d63bc813b8c64cb79cef11db')
 
 install=install
diff --git a/core/heirloom-mailx/PKGBUILD b/core/heirloom-mailx/PKGBUILD
deleted file mode 100644
index 5a26197a0..000000000
--- a/core/heirloom-mailx/PKGBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# $Id: PKGBUILD 160422 2012-06-01 20:13:47Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Sergej Pupykin <pupykin.s@arch@gmail.com>
-# Contributor: Andreas Wagner <Andreas.Wagner@em.uni-frankfurt.de>
-
-pkgname=heirloom-mailx
-pkgver=12.5
-pkgrel=3.1
-pkgdesc="A commandline utility for sending and receiving email"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://heirloom.sourceforge.net/mailx.html"
-license=('custom')
-groups=('base')
-depends=('openssl' 'krb5')
-optdepends=('smtp-forwarder: for sending mail')
-replaces=('mailx' 'mailx-heirloom')
-provides=('mailx' 'mailx-heirloom')
-conflicts=('mailx' 'mailx-heirloom')
-backup=(etc/mail.rc)
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-sha1sums=('1998dd6168a68400e533712ae7163c72b6a7c056')
-options=('!makeflags') # Does not build with MAKEFLAGS=-jX, X>1
-
-# source PKGBUILD && mksource
-mksource() {
-  export CVSROOT=:pserver:anonymous@nail.cvs.sourceforge.net:/cvsroot/nail
-  D=nail
-  [ -d "${D}" ] && cvs up "${D}" || cvs co "${D}"
-  
-  _dirname=${pkgname}-${pkgver}
-  mv $D ${_dirname}
-  tar -cJv --exclude=CVS -f ${_dirname}.tar.xz ${_dirname}
-  rm -rf ${_dirname}
-}
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  sed -i 's|/etc/nail.rc|/etc/mail.rc|g' mailx.1
-
-  # For Linux and BSD, this should be set.
-  echo "set bsdcompat" >> nail.rc
-
-  sed -i "s/pg/less/" cmd1.c
-
-  echo PREFIX=/usr \
-       MAILRC=/etc/mail.rc \
-       SENDMAIL=/usr/sbin/sendmail \
-       MAILSPOOL=/var/spool/mail \
-       UCBINSTALL=/usr/bin/install > makeflags
-
-  make `cat makeflags` IPv6=-DHAVE_IPv6_FUNCS
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" `cat makeflags` install
-
-  # For compatibility with the old mailx program
-  ln -sf mailx "${pkgdir}"/usr/bin/mail
-  ln -sf mailx.1.gz "${pkgdir}"/usr/share/man/man1/mail.1.gz
-
-  install -D -m0644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/core/inetutils/PKGBUILD b/core/inetutils/PKGBUILD
index b8dc47e3e..d3bd5bbe1 100644
--- a/core/inetutils/PKGBUILD
+++ b/core/inetutils/PKGBUILD
@@ -1,35 +1,29 @@
-# $Id: PKGBUILD 187028 2013-06-03 11:15:10Z allan $
+# $Id: PKGBUILD 194664 2013-09-20 17:37:51Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=inetutils
-pkgver=1.9.1
-pkgrel=6
+pkgver=1.9.1.341
+pkgrel=1
 pkgdesc="A collection of common network programs"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/inetutils/"
 license=('GPL3')
 groups=('base')
 depends=('pam')
+makedepends=('help2man')
 backup=('etc/xinetd.d/telnet' 'etc/xinetd.d/talk' \
         'etc/xinetd.d/rlogin' 'etc/xinetd.d/rsh')
 options=('!emptydirs')
 install=inetutils.install
-source=(http://ftp.gnu.org/gnu/inetutils/${pkgname}-${pkgver}.tar.gz{,.sig} \
-        telnet.xinetd talk.xinetd rlogin.xinetd rsh.xinetd \
-        ftpd.service dnsdomainname)
-sha1sums=('86b7eb11cfdaefb1d4e9bfc10620beaf8f09bc90'
+source=(ftp://ftp.archlinux.org/other/packages/inetutils/${pkgname}-${pkgver}.tar.xz{,.sig} \
+        telnet.xinetd talk.xinetd rlogin.xinetd rsh.xinetd ftpd.service)
+sha1sums=('eaccc1568c9cc624f6cda3a265fb92ec72c7304d'
           'SKIP'
           '2b2dd71eb3233e5090f4c2df8abe9b4924d323f3'
           'b15ab4faa9d97652e182c98c1e3a3b3cbbf6383c'
           'd9b8f8aab094ecb779d0f16f21b4683ab327516f'
           '26763ae31b8a5be256666a0ba55746941d75d6ee'
-          'e4a764828b57f1e907ec96f4ae0e0cf0d3e2e802'
-          'eb952b0b9c3e3d429d8e21b110249e495f0e0e63')
-
-prepare() {
-  cd ${pkgname}-${pkgver}
-  sed -i 's|_GL_WARN_ON_USE (gets|//_GL_WARN_ON_USE (gets|' lib/stdio.in.h
-}
+          'e4a764828b57f1e907ec96f4ae0e0cf0d3e2e802')
 
 build() {
   cd ${pkgname}-${pkgver}
@@ -41,7 +35,7 @@ build() {
     --enable-talk --enable-talkd \
     --enable-rlogin --enable-rlogind \
     --enable-rsh --enable-rshd \
-    --enable-rcp --enable-hostname \
+    --enable-rcp --enable-hostname --enable-dnsdomainname \
     --disable-rexec --disable-rexecd \
     --disable-tftp --disable-tftpd \
     --disable-ping --disable-ping6 \
@@ -60,8 +54,6 @@ package() {
   cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 
-  install -D -m755 "${srcdir}/dnsdomainname" "${pkgdir}/usr/bin/dnsdomainname"
-  echo ".so man1/hostname.1" > "${pkgdir}/usr/share/man/man1/dnsdomainname.1"
   install -D -m644 "${srcdir}/telnet.xinetd" "${pkgdir}/etc/xinetd.d/telnet"
   install -D -m644 "${srcdir}/talk.xinetd" "${pkgdir}/etc/xinetd.d/talk"
   install -D -m644 "${srcdir}/rlogin.xinetd" "${pkgdir}/etc/xinetd.d/rlogin"
diff --git a/core/inetutils/dnsdomainname b/core/inetutils/dnsdomainname
deleted file mode 100644
index a1b8a8c31..000000000
--- a/core/inetutils/dnsdomainname
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec /usr/bin/hostname -d "$@"
diff --git a/core/iw/PKGBUILD b/core/iw/PKGBUILD
index fc4285ffe..66ccfb288 100644
--- a/core/iw/PKGBUILD
+++ b/core/iw/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 187031 2013-06-03 11:15:15Z allan $
+# $Id: PKGBUILD 195909 2013-10-05 07:30:47Z thomas $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgname=iw
-pkgver=3.10
-pkgrel=2
+pkgver=3.11
+pkgrel=1
 pkgdesc="nl80211 based CLI configuration utility for wireless devices"
 arch=("i686" "x86_64" 'mips64el')
 url="http://wireless.kernel.org/en/users/Documentation/iw"
@@ -11,7 +11,7 @@ license=("GPL")
 depends=("libnl")
 makedepends=("linux-api-headers")
 source=(https://www.kernel.org/pub/software/network/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('456ee212cfb728e292667caa508a7dff902666c78579814756a3012d68d64fe9')
+sha256sums=('e90327323821a8219abac56298919076c4bac6636464ca91356f02cfe40530ff')
 
 build() {
   cd "$srcdir"/$pkgname-$pkgver
diff --git a/core/libffi/PKGBUILD b/core/libffi/PKGBUILD
index c26a9d129..ffdcc73a9 100644
--- a/core/libffi/PKGBUILD
+++ b/core/libffi/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 187810 2013-06-06 08:25:26Z foutrelis $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
+# $Id: PKGBUILD 195482 2013-10-01 05:58:29Z bpiotrowski $
+# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libffi
 pkgver=3.0.13
-pkgrel=3
-pkgdesc="A portable, high level programming interface to various calling conventions"
+pkgrel=4
+pkgdesc="Portable, high level programming interface to various calling conventions"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceware.org/libffi/"
 license=('MIT')
@@ -17,18 +17,18 @@ source=(ftp://sourceware.org/pub/libffi/libffi-${pkgver}.tar.gz)
 sha1sums=('f5230890dc0be42fb5c58fbf793da253155de106')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --disable-static
   make
 }
 
 check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $pkgname-$pkgver
   make check
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+  install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
diff --git a/core/libsasl/CVE-2013-4122.patch b/core/libsasl/CVE-2013-4122.patch
new file mode 100644
index 000000000..d6b9800e6
--- /dev/null
+++ b/core/libsasl/CVE-2013-4122.patch
@@ -0,0 +1,116 @@
+From dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d Mon Sep 17 00:00:00 2001
+From: mancha <mancha1@hush.com>
+Date: Thu, 11 Jul 2013 09:08:07 +0000
+Subject: Handle NULL returns from glibc 2.17+ crypt()
+
+Starting with glibc 2.17 (eglibc 2.17), crypt() fails with EINVAL
+(w/ NULL return) if the salt violates specifications. Additionally,
+on FIPS-140 enabled Linux systems, DES/MD5-encrypted passwords
+passed to crypt() fail with EPERM (w/ NULL return).
+
+When using glibc's crypt(), check return value to avoid a possible
+NULL pointer dereference.
+
+Patch by mancha1@hush.com.
+---
+diff --git a/pwcheck/pwcheck_getpwnam.c b/pwcheck/pwcheck_getpwnam.c
+index 4b34222..400289c 100644
+--- a/pwcheck/pwcheck_getpwnam.c
++++ b/pwcheck/pwcheck_getpwnam.c
+@@ -32,6 +32,7 @@ char *userid;
+ char *password;
+ {
+     char* r;
++    char* crpt_passwd;
+     struct passwd *pwd;
+ 
+     pwd = getpwnam(userid);
+@@ -41,7 +42,7 @@ char *password;
+     else if (pwd->pw_passwd[0] == '*') {
+ 	r = "Account disabled";
+     }
+-    else if (strcmp(pwd->pw_passwd, crypt(password, pwd->pw_passwd)) != 0) {
++    else if (!(crpt_passwd = crypt(password, pwd->pw_passwd)) || strcmp(pwd->pw_passwd, (const char *)crpt_passwd) != 0) {
+ 	r = "Incorrect password";
+     }
+     else {
+diff --git a/pwcheck/pwcheck_getspnam.c b/pwcheck/pwcheck_getspnam.c
+index 2b11286..6d607bb 100644
+--- a/pwcheck/pwcheck_getspnam.c
++++ b/pwcheck/pwcheck_getspnam.c
+@@ -32,13 +32,15 @@ char *userid;
+ char *password;
+ {
+     struct spwd *pwd;
++    char *crpt_passwd;
+ 
+     pwd = getspnam(userid);
+     if (!pwd) {
+ 	return "Userid not found";
+     }
+     
+-    if (strcmp(pwd->sp_pwdp, crypt(password, pwd->sp_pwdp)) != 0) {
++    crpt_passwd = crypt(password, pwd->sp_pwdp);
++    if (!crpt_passwd || strcmp(pwd->sp_pwdp, (const char *)crpt_passwd) != 0) {
+ 	return "Incorrect password";
+     }
+     else {
+diff --git a/saslauthd/auth_getpwent.c b/saslauthd/auth_getpwent.c
+index fc8029d..d4ebe54 100644
+--- a/saslauthd/auth_getpwent.c
++++ b/saslauthd/auth_getpwent.c
+@@ -77,6 +77,7 @@ auth_getpwent (
+ {
+     /* VARIABLES */
+     struct passwd *pw;			/* pointer to passwd file entry */
++    char *crpt_passwd;			/* encrypted password */
+     int errnum;
+     /* END VARIABLES */
+   
+@@ -105,7 +106,8 @@ auth_getpwent (
+ 	}
+     }
+ 
+-    if (strcmp(pw->pw_passwd, (const char *)crypt(password, pw->pw_passwd))) {
++    crpt_passwd = crypt(password, pw->pw_passwd);
++    if (!crpt_passwd || strcmp(pw->pw_passwd, (const char *)crpt_passwd)) {
+ 	if (flags & VERBOSE) {
+ 	    syslog(LOG_DEBUG, "DEBUG: auth_getpwent: %s: invalid password", login);
+ 	}
+diff --git a/saslauthd/auth_shadow.c b/saslauthd/auth_shadow.c
+index 677131b..1988afd 100644
+--- a/saslauthd/auth_shadow.c
++++ b/saslauthd/auth_shadow.c
+@@ -210,8 +210,8 @@ auth_shadow (
+ 	RETURN("NO Insufficient permission to access NIS authentication database (saslauthd)");
+     }
+ 
+-    cpw = strdup((const char *)crypt(password, sp->sp_pwdp));
+-    if (strcmp(sp->sp_pwdp, cpw)) {
++    cpw = crypt(password, sp->sp_pwdp);
++    if (!cpw || strcmp(sp->sp_pwdp, (const char *)cpw)) {
+ 	if (flags & VERBOSE) {
+ 	    /*
+ 	     * This _should_ reveal the SHADOW_PW_LOCKED prefix to an
+@@ -221,10 +221,8 @@ auth_shadow (
+ 	    syslog(LOG_DEBUG, "DEBUG: auth_shadow: pw mismatch: '%s' != '%s'",
+ 		   sp->sp_pwdp, cpw);
+ 	}
+-	free(cpw);
+ 	RETURN("NO Incorrect password");
+     }
+-    free(cpw);
+ 
+     /*
+      * The following fields will be set to -1 if:
+@@ -286,7 +284,7 @@ auth_shadow (
+ 	RETURN("NO Invalid username");
+     }
+   
+-    if (strcmp(upw->upw_passwd, crypt(password, upw->upw_passwd)) != 0) {
++    if (!(cpw = crypt(password, upw->upw_passwd)) || (strcmp(upw->upw_passwd, (const char *)cpw) != 0)) {
+ 	if (flags & VERBOSE) {
+ 	    syslog(LOG_DEBUG, "auth_shadow: pw mismatch: %s != %s",
+ 		   password, upw->upw_passwd);
+--
+cgit v0.9.2
diff --git a/core/libsasl/PKGBUILD b/core/libsasl/PKGBUILD
index 3e1cff6ad..47e20bf0a 100644
--- a/core/libsasl/PKGBUILD
+++ b/core/libsasl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 187033 2013-06-03 11:15:22Z allan $
+# $Id: PKGBUILD 195994 2013-10-07 10:32:39Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 # This package spans multiple repositories. 
@@ -8,7 +8,7 @@
 #pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
 pkgname=libsasl
 pkgver=2.1.26
-pkgrel=4
+pkgrel=6
 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cyrusimap.web.cmu.edu/"
@@ -25,7 +25,8 @@ source=(ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${pkgver}.tar.gz
         0030-dont_use_la_files_for_opening_plugins.patch
         saslauthd.service
         saslauthd.conf.d
-        tmpfiles.conf)
+        tmpfiles.conf
+        CVE-2013-4122.patch)
 md5sums=('a7f4e5e559a0e37b3ffc438c9456e425'
          '79b8a5e8689989e2afd4b7bda595a7b1'
          'f45aa8c42b32e0569ab3d14a83485b37'
@@ -36,21 +37,27 @@ md5sums=('a7f4e5e559a0e37b3ffc438c9456e425'
          '8e7106f32e495e9ade69014fd1b3352a'
          '3499dcd610ad1ad58e0faffde2aa7a23'
          '49219af5641150edec288a3fdb65e7c1'
-         '45bb0192d2f188066240b9a66ee6365f')
+         '45bb0192d2f188066240b9a66ee6365f'
+         'c5f0ec88c584a75c14d7f402eaeed7ef')
+
+prepare() {
+  cd cyrus-sasl-$pkgver
+  patch -Np1 -i ../cyrus-sasl-2.1.22-qa.patch
+  patch -Np1 -i ../cyrus-sasl-2.1.26-size_t.patch
+  patch -Np1 -i ../0010_maintainer_mode.patch
+  patch -Np1 -i ../0011_saslauthd_ac_prog_libtool.patch
+  patch -Np1 -i ../0025_ld_as_needed.patch
+  patch -Np1 -i ../0026_drop_krb5support_dependency.patch
+  patch -Np1 -i ../0030-dont_use_la_files_for_opening_plugins.patch
+  patch -Np1 -i ../CVE-2013-4122.patch
+
+  sed 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.in
+}
 
 build() {
   export CFLAGS="$CFLAGS -fPIC"
+  cd cyrus-sasl-$pkgver
 
-  cd "${srcdir}/cyrus-sasl-${pkgver}"
-  patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-qa.patch"
-  patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.26-size_t.patch"
-  patch -Np1 -i "${srcdir}/0010_maintainer_mode.patch"
-  patch -Np1 -i "${srcdir}/0011_saslauthd_ac_prog_libtool.patch"
-  patch -Np1 -i "${srcdir}/0025_ld_as_needed.patch"
-  patch -Np1 -i "${srcdir}/0026_drop_krb5support_dependency.patch"
-  patch -Np1 -i "${srcdir}/0030-dont_use_la_files_for_opening_plugins.patch"
-
-  sed 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.in
   rm -f config/config.guess config/config.sub 
   rm -f config/ltconfig config/ltmain.sh config/libtool.m4
   rm -fr autom4te.cache
@@ -111,7 +118,7 @@ package_libsasl() {
   depends=('openssl')
   conflicts=('cyrus-sasl-plugins')
 
-  cd "${srcdir}/cyrus-sasl-${pkgver}"
+  cd cyrus-sasl-$pkgver
   for dir in include lib sasldb plugins utils; do
     pushd ${dir}
     make DESTDIR="${pkgdir}" install
@@ -130,7 +137,7 @@ package_cyrus-sasl() {
   pkgdesc="Cyrus saslauthd SASL authentication daemon"
   backup=('etc/conf.d/saslauthd')
 
-  cd "${srcdir}/cyrus-sasl-${pkgver}/saslauthd"
+  cd cyrus-sasl-$pkgver/saslauthd
   make DESTDIR="${pkgdir}" install
   install -Dm644 "${srcdir}/saslauthd.conf.d" "${pkgdir}/etc/conf.d/saslauthd"
   install -Dm644 "${srcdir}/saslauthd.service" "${pkgdir}/usr/lib/systemd/system/saslauthd.service"
@@ -145,7 +152,7 @@ package_cyrus-sasl-gssapi() {
   depends=("libsasl=${pkgver}" 'krb5')
   replaces=('cyrus-sasl-plugins')
 
-  cd "${srcdir}/cyrus-sasl-${pkgver}/plugins"
+  cd cyrus-sasl-$pkgver/plugins
   install -m755 -d "${pkgdir}/usr/lib/sasl2"
   cp -a .libs/libgssapiv2.so* "${pkgdir}/usr/lib/sasl2/"
   cp -a .libs/libgs2.so* "${pkgdir}/usr/lib/sasl2/"
@@ -159,7 +166,7 @@ package_cyrus-sasl-ldap() {
   depends=("libsasl=${pkgver}" 'libldap')
   replaces=('cyrus-sasl-plugins')
 
-  cd "${srcdir}/cyrus-sasl-${pkgver}/plugins"
+  cd cyrus-sasl-$pkgver/plugins
   install -m755 -d "${pkgdir}/usr/lib/sasl2"
   cp -a .libs/libldapdb.so* "${pkgdir}/usr/lib/sasl2/"
 
@@ -172,7 +179,7 @@ package_cyrus-sasl-sql() {
   depends=("libsasl=${pkgver}" 'postgresql-libs' 'libmariadbclient' 'sqlite2')
   replaces=('cyrus-sasl-plugins')
 
-  cd "${srcdir}/cyrus-sasl-${pkgver}/plugins"
+  cd cyrus-sasl-$pkgver/plugins
   install -m755 -d "${pkgdir}/usr/lib/sasl2"
   cp -a .libs/libsql.so* "${pkgdir}/usr/lib/sasl2/"
 
diff --git a/core/libusbx/0001-linux-Use-a-separate-lock-to-serialize-start-stop-vs.patch b/core/libusbx/0001-linux-Use-a-separate-lock-to-serialize-start-stop-vs.patch
deleted file mode 100644
index b66abd48f..000000000
--- a/core/libusbx/0001-linux-Use-a-separate-lock-to-serialize-start-stop-vs.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From daf4c9fadaf8a49198c53c039bf78980dc251a4b Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Tue, 30 Jul 2013 15:57:16 +0200
-Subject: [PATCH 1/2] linux: Use a separate lock to serialize start/stop vs
- hotplug events
-
-Using one lock for this is a bad idea, as we should not be holding any
-locks used by the hotplug thread when trying to stop otherwise the stop
-function may wait indefinetely in pthread_join, while the event-thread
-is waiting for the lock the caller of the stop function holds.
-
-Using 2 separate locks for this should fix this deadlock, which has been
-reported here: https://bugzilla.redhat.com/show_bug.cgi?id=985484
-
-Many thanks to Chris Dickens for figuring out the cause of this deadlock!
-
-CC: Chris Dickens <christopher.a.dickens@gmail.com>
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- libusb/os/linux_usbfs.c | 24 +++++++++++++++++-------
- libusb/version_nano.h   |  2 +-
- 2 files changed, 18 insertions(+), 8 deletions(-)
-
-diff --git a/libusb/os/linux_usbfs.c b/libusb/os/linux_usbfs.c
-index 09288af..90e23b7 100644
---- a/libusb/os/linux_usbfs.c
-+++ b/libusb/os/linux_usbfs.c
-@@ -120,7 +120,9 @@ static int sysfs_has_descriptors = -1;
- /* how many times have we initted (and not exited) ? */
- static volatile int init_count = 0;
- 
--/* Serialize hotplug start/stop, scan-devices, event-thread, and poll */
-+/* Serialize hotplug start/stop */
-+usbi_mutex_static_t linux_hotplug_startstop_lock = USBI_MUTEX_INITIALIZER;
-+/* Serialize scan-devices, event-thread, and poll */
- usbi_mutex_static_t linux_hotplug_lock = USBI_MUTEX_INITIALIZER;
- 
- static int linux_start_event_monitor(void);
-@@ -419,7 +421,7 @@ static int op_init(struct libusb_context *ctx)
- 	if (sysfs_has_descriptors)
- 		usbi_dbg("sysfs has complete descriptors");
- 
--	usbi_mutex_static_lock(&linux_hotplug_lock);
-+	usbi_mutex_static_lock(&linux_hotplug_startstop_lock);
- 	r = LIBUSB_SUCCESS;
- 	if (init_count == 0) {
- 		/* start up hotplug event handler */
-@@ -433,20 +435,20 @@ static int op_init(struct libusb_context *ctx)
- 			linux_stop_event_monitor();
- 	} else
- 		usbi_err(ctx, "error starting hotplug event monitor");
--	usbi_mutex_static_unlock(&linux_hotplug_lock);
-+	usbi_mutex_static_unlock(&linux_hotplug_startstop_lock);
- 
- 	return r;
- }
- 
- static void op_exit(void)
- {
--	usbi_mutex_static_lock(&linux_hotplug_lock);
-+	usbi_mutex_static_lock(&linux_hotplug_startstop_lock);
- 	assert(init_count != 0);
- 	if (!--init_count) {
- 		/* tear down event handler */
- 		(void)linux_stop_event_monitor();
- 	}
--	usbi_mutex_static_unlock(&linux_hotplug_lock);
-+	usbi_mutex_static_unlock(&linux_hotplug_startstop_lock);
- }
- 
- static int linux_start_event_monitor(void)
-@@ -469,11 +471,19 @@ static int linux_stop_event_monitor(void)
- 
- static int linux_scan_devices(struct libusb_context *ctx)
- {
-+	int ret;
-+
-+	usbi_mutex_static_lock(&linux_hotplug_lock);
-+
- #if defined(USE_UDEV)
--	return linux_udev_scan_devices(ctx);
-+	ret = linux_udev_scan_devices(ctx);
- #else
--	return linux_default_scan_devices(ctx);
-+	ret = linux_default_scan_devices(ctx);
- #endif
-+
-+	usbi_mutex_static_unlock(&linux_hotplug_lock);
-+
-+	return ret;
- }
- 
- static void op_hotplug_poll(void)
-diff --git a/libusb/version_nano.h b/libusb/version_nano.h
-index ebf41e1..34e26ff 100644
---- a/libusb/version_nano.h
-+++ b/libusb/version_nano.h
-@@ -1 +1 @@
--#define LIBUSB_NANO 10774
-+#define LIBUSB_NANO 10777
--- 
-1.8.3.1
-
diff --git a/core/libusbx/0002-hotplug-Remove-use-of-pthread_cancel-from-linux_udev.patch b/core/libusbx/0002-hotplug-Remove-use-of-pthread_cancel-from-linux_udev.patch
deleted file mode 100644
index 5342fbe70..000000000
--- a/core/libusbx/0002-hotplug-Remove-use-of-pthread_cancel-from-linux_udev.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-From 852efb5a3e82de43cf6288e9904cb254ff636aa0 Mon Sep 17 00:00:00 2001
-From: Chris Dickens <christopher.a.dickens@gmail.com>
-Date: Sat, 20 Jul 2013 13:01:41 -0700
-Subject: [PATCH 2/2] hotplug: Remove use of pthread_cancel from linux_udev
-
-Using pthread_cancel() presents the opportunity for deadlock, so
-use a control pipe to cause the event thread to gracefully exit.
-
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- libusb/os/linux_udev.c | 63 ++++++++++++++++++++++++++++++++++++++------------
- libusb/version_nano.h  |  2 +-
- 2 files changed, 49 insertions(+), 16 deletions(-)
-
-diff --git a/libusb/os/linux_udev.c b/libusb/os/linux_udev.c
-index 5a2aadf..70f632d 100644
---- a/libusb/os/linux_udev.c
-+++ b/libusb/os/linux_udev.c
-@@ -46,6 +46,7 @@
- /* udev context */
- static struct udev *udev_ctx = NULL;
- static int udev_monitor_fd = -1;
-+static int udev_control_pipe[2] = {-1, -1};
- static struct udev_monitor *udev_monitor = NULL;
- static pthread_t linux_event_thread;
- 
-@@ -95,14 +96,23 @@ int linux_udev_start_event_monitor(void)
- 		goto err_free_monitor;
- 	}
- 
-+	r = usbi_pipe(udev_control_pipe);
-+	if (r) {
-+		usbi_err(NULL, "could not create udev control pipe");
-+		goto err_free_monitor;
-+	}
-+
- 	r = pthread_create(&linux_event_thread, NULL, linux_udev_event_thread_main, NULL);
- 	if (r) {
- 		usbi_err(NULL, "creating hotplug event thread (%d)", r);
--		goto err_free_monitor;
-+		goto err_close_pipe;
- 	}
- 
- 	return LIBUSB_SUCCESS;
- 
-+err_close_pipe:
-+	close(udev_control_pipe[0]);
-+	close(udev_control_pipe[1]);
- err_free_monitor:
- 	udev_monitor_unref(udev_monitor);
- 	udev_monitor = NULL;
-@@ -115,14 +125,19 @@ err_free_ctx:
- 
- int linux_udev_stop_event_monitor(void)
- {
-+	char dummy = 1;
-+	int r;
-+
- 	assert(udev_ctx != NULL);
- 	assert(udev_monitor != NULL);
- 	assert(udev_monitor_fd != -1);
- 
--	/* Cancel the event thread. This is the only way to guarantee the
--	   thread exits since closing the monitor fd won't necessarily cause
--	   poll to return. */
--	pthread_cancel(linux_event_thread);
-+	/* Write some dummy data to the control pipe and
-+	 * wait for the thread to exit */
-+	r = usbi_write(udev_control_pipe[1], &dummy, sizeof(dummy));
-+	if (r <= 0) {
-+		usbi_warn(NULL, "udev control pipe signal failed");
-+	}
- 	pthread_join(linux_event_thread, NULL);
- 
- 	/* Release the udev monitor */
-@@ -134,27 +149,45 @@ int linux_udev_stop_event_monitor(void)
- 	udev_unref(udev_ctx);
- 	udev_ctx = NULL;
- 
-+	/* close and reset control pipe */
-+	close(udev_control_pipe[0]);
-+	close(udev_control_pipe[1]);
-+	udev_control_pipe[0] = -1;
-+	udev_control_pipe[1] = -1;
-+
- 	return LIBUSB_SUCCESS;
- }
- 
- static void *linux_udev_event_thread_main(void *arg)
- {
-+	char dummy;
-+	int r;
- 	struct udev_device* udev_dev;
--	struct pollfd fds = {.fd = udev_monitor_fd,
--			     .events = POLLIN};
-+	struct pollfd fds[] = {
-+		{.fd = udev_control_pipe[0],
-+		 .events = POLLIN},
-+		{.fd = udev_monitor_fd,
-+		 .events = POLLIN},
-+	};
- 
- 	usbi_dbg("udev event thread entering.");
- 
--	while (1 == poll(&fds, 1, -1)) {
--		if (NULL == udev_monitor || POLLIN != fds.revents) {
-+	while (poll(fds, 2, -1) >= 0) {
-+		if (fds[0].revents & POLLIN) {
-+			/* activity on control pipe, read the byte and exit */
-+			r = usbi_read(udev_control_pipe[0], &dummy, sizeof(dummy));
-+			if (r <= 0) {
-+				usbi_warn(NULL, "udev control pipe read failed");
-+			}
- 			break;
- 		}
--
--		usbi_mutex_static_lock(&linux_hotplug_lock);
--		udev_dev = udev_monitor_receive_device(udev_monitor);
--		if (udev_dev)
--			udev_hotplug_event(udev_dev);
--		usbi_mutex_static_unlock(&linux_hotplug_lock);
-+		if (fds[1].revents & POLLIN) {
-+			usbi_mutex_static_lock(&linux_hotplug_lock);
-+			udev_dev = udev_monitor_receive_device(udev_monitor);
-+			if (udev_dev)
-+				udev_hotplug_event(udev_dev);
-+			usbi_mutex_static_unlock(&linux_hotplug_lock);
-+		}
- 	}
- 
- 	usbi_dbg("udev event thread exiting");
-diff --git a/libusb/version_nano.h b/libusb/version_nano.h
-index 34e26ff..39ad7e3 100644
---- a/libusb/version_nano.h
-+++ b/libusb/version_nano.h
-@@ -1 +1 @@
--#define LIBUSB_NANO 10777
-+#define LIBUSB_NANO 10778
--- 
-1.8.3.1
-
diff --git a/core/libusbx/PKGBUILD b/core/libusbx/PKGBUILD
index 8dc78efd1..a708fc92c 100644
--- a/core/libusbx/PKGBUILD
+++ b/core/libusbx/PKGBUILD
@@ -1,30 +1,19 @@
-# $Id: PKGBUILD 192163 2013-08-06 15:03:05Z tpowa $
+# $Id: PKGBUILD 194438 2013-09-16 12:13:08Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=libusbx
-pkgver=1.0.16
-pkgrel=2
+pkgver=1.0.17
+pkgrel=1
 depends=('glibc' 'systemd')
 pkgdesc="Library that provides generic access to USB device"
 arch=(i686 x86_64 mips64el)
 url="http://libusbx.org"
 license=('LGPL')
-source=(http://downloads.sourceforge.net/${pkgname}/releases/${pkgver}/${pkgname}-${pkgver}.tar.bz2
-        0001-linux-Use-a-separate-lock-to-serialize-start-stop-vs.patch
-        0002-hotplug-Remove-use-of-pthread_cancel-from-linux_udev.patch)
+source=(http://downloads.sourceforge.net/${pkgname}/releases/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
 options=(!libtool)
 replaces=('libusb1' 'libusb')
 provides=("libusb=$pkgver")
 conflicts=("libusb")
-md5sums=('7f5715d624cd6c26b30a317eb6c2fe5e'
-         'dad04322621fe7cabd2fe631c6d9929f'
-         '259238c92c92f8b3df5dcad0db8aaf2f')
 
-prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  # fix #36418
-  patch -Np1 -i ../0001-linux-Use-a-separate-lock-to-serialize-start-stop-vs.patch
-  patch -Np1 -i ../0002-hotplug-Remove-use-of-pthread_cancel-from-linux_udev.patch
-}
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --disable-static
@@ -40,3 +29,4 @@ package () {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
+md5sums=('99467ca2cb81c19c4a172de9f30e7576')
diff --git a/core/links/PKGBUILD b/core/links/PKGBUILD
index 0a6da74b8..a15d98962 100644
--- a/core/links/PKGBUILD
+++ b/core/links/PKGBUILD
@@ -1,27 +1,26 @@
-# $Id: PKGBUILD 184459 2013-05-06 19:47:23Z foutrelis $
+# $Id: PKGBUILD 195212 2013-09-27 21:17:39Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=links
-pkgver=2.7
-pkgrel=2
+pkgver=2.8
+pkgrel=1
 pkgdesc="A text WWW browser, similar to Lynx"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://links.twibright.com/"
 license=('GPL')
 depends=('bzip2' 'xz' 'openssl' 'gpm')
-makedepends=('libtiff' 'libpng' 'libxt' 'optipng')
+makedepends=('libtiff' 'libpng' 'libxt')
 optdepends=('libx11: for using xlinks' 'libtiff: for using xlinks' 'libpng: for using xlinks')
 provides=('links-g')
 conflicts=('links-g')
 replaces=('links-g')
 source=(http://links.twibright.com/download/${pkgname}-${pkgver}.tar.bz2 links.desktop)
-sha1sums=('1e362a7e27078d630edf5868145a46247cda8cc3'
+sha1sums=('a808d80d910b7d3ad86f4c5089e64f35113b69f2'
           'f600e27c2a71184444f7dd07a10230aa44463a02')
 
 prepare() {
   cd ${pkgname}-${pkgver}
   sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" configure
-  optipng graphics/font/century_school-medium-roman-serif-vari/045e.png
 }
 
 build() {
diff --git a/core/m4/PKGBUILD b/core/m4/PKGBUILD
index 9e04d8a46..bd0d599a2 100644
--- a/core/m4/PKGBUILD
+++ b/core/m4/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 183048 2013-04-17 02:02:03Z allan $
+# $Id: PKGBUILD 195164 2013-09-26 03:20:59Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=m4
-pkgver=1.4.16
-pkgrel=3
+pkgver=1.4.17
+pkgrel=1
 pkgdesc="The GNU macro processor"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/m4"
@@ -12,21 +12,9 @@ license=('GPL3')
 groups=('base-devel')
 depends=('glibc' 'bash')
 install=m4.install
-source=(ftp://ftp.gnu.org/gnu/m4/$pkgname-$pkgver.tar.xz{,.sig}
-        m4-1.4.16-readlink-einval.patch)
-md5sums=('7548ec061a1ba993790159764f522d0e'
-         'SKIP'
-         'cea138fa9b568d06e46269611cec8dd0')
-
-prepare() {
-  cd ${srcdir}/$pkgname-$pkgver
-  
-  # glibc-2.16 compatibility
-  sed -i -e '/gets is a/d' lib/stdio.in.h
-  
-  # patch testsuite failure with newer kernels
-  patch -Np1 -i $srcdir/m4-1.4.16-readlink-einval.patch
-}
+source=(ftp://ftp.gnu.org/gnu/m4/$pkgname-$pkgver.tar.xz{,.sig})
+md5sums=('12a3c829301a4fd6586a57d3fcf196dc'
+         'SKIP')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver  
diff --git a/core/mdadm/PKGBUILD b/core/mdadm/PKGBUILD
index 8c8d6aa83..b30feff04 100644
--- a/core/mdadm/PKGBUILD
+++ b/core/mdadm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 186140 2013-05-21 09:11:15Z tpowa $
+# $Id: PKGBUILD 194030 2013-09-10 10:15:14Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 pkgname=mdadm
-pkgver=3.2.6
-pkgrel=4
+pkgver=3.3
+pkgrel=1
 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID"
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
@@ -18,22 +18,19 @@ source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2
         mdadm_hook
         mdadm_udev_install
         mdadm.service
-        disable-werror.patch
-        mdadm-fix-udev-rules.patch)
+        disable-werror.patch)
 replaces=('raidtools')
-md5sums=('3e255dc71e5144bbcb872788ca647267'
+md5sums=('8ac04259cdd74b4566c3b6dea9414b57'
          '5a37c112aa07dccdde62f9fa5b888607'
          'af2f73f0094ebee66f503ca4710c7142'
          'fbfb7d07efcbaf5dc61af424c5f6e352'
          'b6b0bfd6487c99264578630616dfe5eb'
          'eb1786b18fa4d13cfd7b71d6b05cfb4f'
-         '4ad87b74a4bc9a34621280abe0e0c3e4'
-         '6c76f2f261c1c3397c7290633f0a9acc')
+         '599745ed2bec4489e83991cff89c46ee')
 
 prepare() {
   cd $srcdir/$pkgname-$pkgver
   patch -Np0 -i ../disable-werror.patch
-  patch -p1 -i ../mdadm-fix-udev-rules.patch
 }
 
 build() {
diff --git a/core/mdadm/disable-werror.patch b/core/mdadm/disable-werror.patch
index 50a33f19d..a80a41456 100644
--- a/core/mdadm/disable-werror.patch
+++ b/core/mdadm/disable-werror.patch
@@ -3,9 +3,9 @@
 @@ -42,7 +42,7 @@
  
  CC = $(CROSS_COMPILE)gcc
- CXFLAGS = -ggdb
+ CXFLAGS ?= -ggdb
 -CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter
 +CWFLAGS = -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter
  ifdef WARN_UNUSED
- CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O
+ CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O3
  endif
diff --git a/core/openssh/PKGBUILD b/core/openssh/PKGBUILD
index c3d65deb3..7f64d3b89 100644
--- a/core/openssh/PKGBUILD
+++ b/core/openssh/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 186025 2013-05-20 14:49:38Z bisson $
+# $Id: PKGBUILD 194510 2013-09-17 03:04:46Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=openssh
-pkgver=6.2p2
+pkgver=6.3p1
 pkgrel=1
 pkgdesc='Free version of the SSH connectivity tools'
 url='http://www.openssh.org/portable.html'
@@ -20,10 +20,10 @@ source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}
         'sshd.service'
         'sshd.socket'
         'sshd.pam')
-sha1sums=('c2b4909eba6f5ec6f9f75866c202db47f3b501ba'
+sha1sums=('70845ca79474258cab29dbefae13d93e41a83ccb'
           '6df5be396f8c593bb511a249a1453294d18a01a6'
           '6a0ff3305692cf83aca96e10f3bb51e1c26fccda'
-          '2d87de52a6b2f764180f9f67cb9747392784b4a5'
+          'ec49c6beba923e201505f5669cea48cad29014db'
           'e12fa910b26a5634e5a6ac39ce1399a132cf6796'
           'd93dca5ebda4610ff7647187f8928a3de28703f3')
 
@@ -66,7 +66,7 @@ package() {
 
 	make DESTDIR="${pkgdir}" install
 
-	ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1
+	ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz
 	install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE"
 
 	install -Dm644 ../sshdgenkeys.service "${pkgdir}"/usr/lib/systemd/system/sshdgenkeys.service
diff --git a/core/openssh/sshd.service b/core/openssh/sshd.service
index 349bde59d..55ed95322 100644
--- a/core/openssh/sshd.service
+++ b/core/openssh/sshd.service
@@ -2,6 +2,7 @@
 Description=OpenSSH Daemon
 Wants=sshdgenkeys.service
 After=sshdgenkeys.service
+After=network.target
 
 [Service]
 ExecStart=/usr/bin/sshd -D
diff --git a/core/popt/PKGBUILD b/core/popt/PKGBUILD
index 1f65bae8d..99df35922 100644
--- a/core/popt/PKGBUILD
+++ b/core/popt/PKGBUILD
@@ -1,13 +1,9 @@
-# $Id: PKGBUILD 186305 2013-05-24 13:04:43Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: dorphell <dorphell@archlinux.org>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
-# Contributor: John Proctor <jproctor@prium.net>
+# $Id: PKGBUILD 195971 2013-10-06 19:11:33Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=popt
 pkgver=1.16
-pkgrel=6
+pkgrel=7
 pkgdesc="A commandline option parser"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://rpm5.org"
@@ -19,7 +15,6 @@ sha1sums=('cfe94a15a2404db85858a81ff8de27c8ff3e235e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-
   ./configure --prefix=/usr --disable-static
   make
 }
@@ -27,6 +22,5 @@ build() {
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-
   install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }
diff --git a/core/procps-ng/PKGBUILD b/core/procps-ng/PKGBUILD
index 3cd906d29..9a0322d1a 100644
--- a/core/procps-ng/PKGBUILD
+++ b/core/procps-ng/PKGBUILD
@@ -1,36 +1,29 @@
-# $Id: PKGBUILD 188912 2013-06-25 10:40:52Z bisson $
+# $Id: PKGBUILD 194509 2013-09-17 03:04:40Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Eric Bélanger <eric@archlinux.org>
 
 pkgname=procps-ng
 pkgver=3.3.8
-pkgrel=2
+pkgrel=3
 pkgdesc='Utilities for monitoring your system and its processes'
 url='http://gitorious.org/procps'
 license=('GPL' 'LGPL')
 arch=('i686' 'x86_64' 'mips64el')
-groups=('base')
 depends=('ncurses')
-backup=('etc/sysctl.conf')
-source=("${pkgname}-${pkgver}.tar.gz::http://gitorious.org/procps/procps/archive-tarball/v${pkgver}"
-        'sysctl.conf')
-sha1sums=('63aed46ba4b5b05698beb25d2aa3eee6779d7f45'
-          'bc4e929a0ddcdcd627e8d15d30abcf185aa33fab')
+source=("http://downloads.sourceforge.net/project/${pkgname}/Production/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('4fa6a373f969989a9e490df5eb49a2df62eca19a')
+
+groups=('base')
 
 conflicts=('procps')
 provides=('procps')
 replaces=('procps')
 
 options=('!libtool')
-
-prepare() {
-	cd "${srcdir}/procps-procps"
-	echo ${pkgver} > .tarball-version
-	./autogen.sh
-}
+install=install
 
 build() {
-	cd "${srcdir}/procps-procps"
+	cd "${srcdir}/${pkgname}-${pkgver}"
 	./configure \
 		--prefix=/usr \
 		--exec-prefix=/ \
@@ -43,9 +36,8 @@ build() {
 }
 
 package() {
-	cd "${srcdir}/procps-procps"
+	cd "${srcdir}/${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install
-	install -D -m644 ../sysctl.conf "${pkgdir}/etc/sysctl.conf"
 
 	# provided by util-linux
 	rm "${pkgdir}/usr/bin/kill"
diff --git a/core/procps-ng/install b/core/procps-ng/install
new file mode 100644
index 000000000..2e6546ecc
--- /dev/null
+++ b/core/procps-ng/install
@@ -0,0 +1,14 @@
+post_upgrade() {
+	if [[ $(vercmp $2 3.3.8-3) = -1 ]]; then
+		cat <<EOF
+
+==> The file /etc/sysctl.conf has been removed from this
+==> package, as all its settings are now kernel defaults.
+
+==> If you had customized it, you need to rename it as
+==> /etc/sysctl.d/99-sysctl.conf since from version 207 on
+==> systemd only applies settings from /etc/sysctl.d/* .
+
+EOF
+	fi
+}
diff --git a/core/procps-ng/sysctl.conf b/core/procps-ng/sysctl.conf
deleted file mode 100644
index fae2c6082..000000000
--- a/core/procps-ng/sysctl.conf
+++ /dev/null
@@ -1,38 +0,0 @@
-# Configuration file for runtime kernel parameters.
-# See sysctl.conf(5) for more information.
-
-# Have the CD-ROM close when you use it, and open when you are done.
-#dev.cdrom.autoclose = 1
-#dev.cdrom.autoeject = 1
-
-# Protection from the SYN flood attack.
-net.ipv4.tcp_syncookies = 1
-
-# See evil packets in your logs.
-#net.ipv4.conf.all.log_martians = 1
-
-# Never accept redirects or source routes (these are only useful for routers).
-#net.ipv4.conf.all.accept_redirects = 0
-#net.ipv4.conf.all.accept_source_route = 0
-#net.ipv6.conf.all.accept_redirects = 0
-#net.ipv6.conf.all.accept_source_route = 0
-
-# Disable packet forwarding.
-net.ipv4.ip_forward = 0
-net.ipv6.conf.all.forwarding = 0
-
-# Tweak the port range used for outgoing connections.
-#net.ipv4.ip_local_port_range = 32768 61000
-
-# Tweak those values to alter disk syncing and swap behavior.
-#vm.vfs_cache_pressure = 100
-#vm.laptop_mode = 0
-#vm.swappiness = 60
-
-# Tweak how the flow of kernel messages is throttled.
-#kernel.printk_ratelimit_burst = 10
-#kernel.printk_ratelimit = 5
-
-# Reboot 600 seconds after kernel panic or oops.
-#kernel.panic_on_oops = 1
-#kernel.panic = 600
diff --git a/core/s-nail/PKGBUILD b/core/s-nail/PKGBUILD
new file mode 100644
index 000000000..3a9653c82
--- /dev/null
+++ b/core/s-nail/PKGBUILD
@@ -0,0 +1,53 @@
+# $Id: PKGBUILD 195886 2013-10-03 16:52:03Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
+# Contributor: Sergej Pupykin <pupykin.s@arch@gmail.com>
+# Contributor: Andreas Wagner <Andreas.Wagner@em.uni-frankfurt.de>
+
+pkgname=s-nail
+pkgver=14.4.3
+pkgrel=1
+pkgdesc='Mail processing system with a command syntax reminiscent of ed'
+url='http://sourceforge.net/projects/s-nail/'
+license=('custom:BSD')
+arch=('i686' 'x86_64')
+depends=('openssl')
+optdepends=('smtp-forwarder: for sending mail')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver//./_}.tar.gz")
+sha1sums=('39fdade9b622a6addc5e70a5d929b0bc5ef49d00')
+
+groups=('base')
+backup=('etc/mail.rc')
+replaces=('mailx' 'mailx-heirloom' 'heirloom-mailx')
+provides=('mailx' 'mailx-heirloom' 'heirloom-mailx')
+conflicts=('mailx' 'mailx-heirloom' 'heirloom-mailx')
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make \
+		PREFIX=/usr \
+		SYSCONFDIR=/etc \
+		MANDIR=/usr/share/man \
+		MAILSPOOL=/var/spool/mail \
+		SID= NAIL=mail \
+		CFLAGS="$CFLAGS $CPPFLAGS" \
+		DESTDIR="${pkgdir}" \
+		all
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make \
+		PREFIX=/usr \
+		SYSCONFDIR=/etc \
+		MANDIR=/usr/share/man \
+		MAILSPOOL=/var/spool/mail \
+		SID= NAIL=mail \
+		CFLAGS="$CFLAGS $CPPFLAGS" \
+		DESTDIR="${pkgdir}" \
+		install
+
+	ln -sf mail "${pkgdir}"/usr/bin/mailx
+	ln -sf mail.1.gz "${pkgdir}"/usr/share/man/man1/mailx.1.gz
+	install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+}
diff --git a/core/sudo/PKGBUILD b/core/sudo/PKGBUILD
index 6e4193324..4d5450f9d 100644
--- a/core/sudo/PKGBUILD
+++ b/core/sudo/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 188591 2013-06-16 17:14:27Z foutrelis $
+# $Id: PKGBUILD 195898 2013-10-04 13:41:05Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=sudo
-_sudover=1.8.7
+_sudover=1.8.8
 pkgver=${_sudover/p/.p}
 pkgrel=1
 pkgdesc="Give certain users the ability to run some commands as root"
@@ -17,7 +17,7 @@ backup=('etc/sudoers' 'etc/pam.d/sudo')
 options=('!libtool')
 source=(http://www.sudo.ws/sudo/dist/$pkgname-$_sudover.tar.gz{,.sig}
         sudo.pam)
-sha256sums=('39626cf3d48c4fd5a9139a2627d42bfefac7ce47f470bdba3aeb4e3d7c49566a'
+sha256sums=('9f911c1e9297fb8006deb52fa81197a8d06b9d54e70672f723c467ecae992fc9'
             'SKIP'
             'e7de79d2c73f2b32b20a8e797e54777a2bf19788ec03e48decd6c15cd93718ae')
 
diff --git a/core/systemd/0001-fix-lingering-references-to-var-lib-backlight-random.patch b/core/systemd/0001-fix-lingering-references-to-var-lib-backlight-random.patch
new file mode 100644
index 000000000..49b960c81
--- /dev/null
+++ b/core/systemd/0001-fix-lingering-references-to-var-lib-backlight-random.patch
@@ -0,0 +1,54 @@
+From 6c8c92fef72cf6a7ef7109a424ef82dbdc4f6952 Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner@archlinux.org>
+Date: Wed, 2 Oct 2013 07:46:24 -0400
+Subject: [PATCH] fix lingering references to /var/lib/{backlight,random-seed}
+
+This should have been part of ef5bfcf668e6029faa78534dfe.
+---
+ man/systemd-backlight@.service.xml  | 2 +-
+ man/systemd-random-seed.service.xml | 2 +-
+ units/systemd-backlight@.service.in | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/man/systemd-backlight@.service.xml b/man/systemd-backlight@.service.xml
+index 2b73625..4318964 100644
+--- a/man/systemd-backlight@.service.xml
++++ b/man/systemd-backlight@.service.xml
+@@ -58,7 +58,7 @@
+                 is a service that restores the display backlight
+                 brightness at early-boot and saves it at shutdown. On
+                 disk, the backlight brightness is stored in
+-                <filename>/var/lib/backlight/</filename>. Note that by
++                <filename>/var/lib/systemd/backlight/</filename>. Note that by
+                 default, only firmware backlight devices are
+                 saved/restored.</para>
+         </refsect1>
+diff --git a/man/systemd-random-seed.service.xml b/man/systemd-random-seed.service.xml
+index 8cd14b7..e5cd037 100644
+--- a/man/systemd-random-seed.service.xml
++++ b/man/systemd-random-seed.service.xml
+@@ -61,7 +61,7 @@
+                 for details. Saving/restoring the random seed across
+                 boots increases the amount of available entropy early
+                 at boot. On disk the random seed is stored in
+-                <filename>/var/lib/random-seed</filename>.</para>
++                <filename>/var/lib/systemd/random-seed</filename>.</para>
+         </refsect1>
+ 
+         <refsect1>
+diff --git a/units/systemd-backlight@.service.in b/units/systemd-backlight@.service.in
+index b0e75db..5caa5d5 100644
+--- a/units/systemd-backlight@.service.in
++++ b/units/systemd-backlight@.service.in
+@@ -9,7 +9,7 @@
+ Description=Load/Save Screen Backlight Brightness of %I
+ Documentation=man:systemd-backlight@.service(8)
+ DefaultDependencies=no
+-RequiresMountsFor=/var/lib/backlight
++RequiresMountsFor=/var/lib/systemd/backlight
+ Conflicts=shutdown.target
+ After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-remount-fs.service
+ Before=sysinit.target shutdown.target
+-- 
+1.8.4
+
diff --git a/core/systemd/0001-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch b/core/systemd/0001-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch
deleted file mode 100644
index 372ecebff..000000000
--- a/core/systemd/0001-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 23ad4dd8844c582929115a11ed2830a1371568d6 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Tue, 28 May 2013 20:45:34 +0200
-Subject: [PATCH] journald: DO recalculate the ACL mask, but only if it doesn't
- exist
-
-Since 11ec7ce, journald isn't setting the ACLs properly anymore if
-the files had no ACLs to begin with: acl_set_fd fails with EINVAL.
-
-An ACL with ACL_USER or ACL_GROUP entries but no ACL_MASK entry is
-invalid, so make sure a mask exists before trying to set the ACL.
----
- src/journal/journald-server.c |  6 ++++--
- src/shared/acl-util.c         | 28 ++++++++++++++++++++++++++++
- src/shared/acl-util.h         |  1 +
- 3 files changed, 33 insertions(+), 2 deletions(-)
-
-diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
-index b717b92..da5b725 100644
---- a/src/journal/journald-server.c
-+++ b/src/journal/journald-server.c
-@@ -227,9 +227,11 @@ void server_fix_perms(Server *s, JournalFile *f, uid_t uid) {
-                 }
-         }
- 
--        /* We do not recalculate the mask here, so that the fchmod() mask above stays intact. */
-+        /* We do not recalculate the mask unconditionally here,
-+         * so that the fchmod() mask above stays intact. */
-         if (acl_get_permset(entry, &permset) < 0 ||
--            acl_add_perm(permset, ACL_READ) < 0) {
-+            acl_add_perm(permset, ACL_READ) < 0 ||
-+            calc_acl_mask_if_needed(&acl) < 0) {
-                 log_warning("Failed to patch ACL on %s, ignoring: %m", f->path);
-                 goto finish;
-         }
-diff --git a/src/shared/acl-util.c b/src/shared/acl-util.c
-index 48bb12f..fb04e49 100644
---- a/src/shared/acl-util.c
-+++ b/src/shared/acl-util.c
-@@ -69,6 +69,34 @@ int acl_find_uid(acl_t acl, uid_t uid, acl_entry_t *entry) {
-         return 0;
- }
- 
-+int calc_acl_mask_if_needed(acl_t *acl_p) {
-+        acl_entry_t i;
-+        int found;
-+
-+        assert(acl_p);
-+
-+        for (found = acl_get_entry(*acl_p, ACL_FIRST_ENTRY, &i);
-+             found > 0;
-+             found = acl_get_entry(*acl_p, ACL_NEXT_ENTRY, &i)) {
-+
-+                acl_tag_t tag;
-+
-+                if (acl_get_tag_type(i, &tag) < 0)
-+                        return -errno;
-+
-+                if (tag == ACL_MASK)
-+                        return 0;
-+        }
-+
-+        if (found < 0)
-+                return -errno;
-+
-+        if (acl_calc_mask(acl_p) < 0)
-+                return -errno;
-+
-+        return 0;
-+}
-+
- int search_acl_groups(char*** dst, const char* path, bool* belong) {
-         acl_t acl;
- 
-diff --git a/src/shared/acl-util.h b/src/shared/acl-util.h
-index 23090d9..36ef490 100644
---- a/src/shared/acl-util.h
-+++ b/src/shared/acl-util.h
-@@ -24,4 +24,5 @@
- #include <stdbool.h>
- 
- int acl_find_uid(acl_t acl, uid_t uid, acl_entry_t *entry);
-+int calc_acl_mask_if_needed(acl_t *acl_p);
- int search_acl_groups(char*** dst, const char* path, bool* belong);
--- 
-1.8.3
-
diff --git a/core/systemd/0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch b/core/systemd/0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch
deleted file mode 100644
index 84cce7121..000000000
--- a/core/systemd/0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch
+++ /dev/null
@@ -1,255 +0,0 @@
-From 3f92e4b4b61042391bd44de4dceb18177df0dd57 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Thu, 16 May 2013 00:19:03 +0200
-Subject: [PATCH] utmp: turn systemd-update-utmp-shutdown.service into a normal
- runtime service
-
-With this change systemd-update-utmp-shutdown.service is replaced by
-systemd-update-utmp.service which is started at boot and stays around
-until shutdown. This allows us to properly order the unit against both
-/var/log and auditd.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=853104
-https://bugs.freedesktop.org/show_bug.cgi?id=64365
----
- Makefile-man.am                                     | 12 ++++++------
- Makefile.am                                         |  8 ++++----
- ....service.xml => systemd-update-utmp.service.xml} | 16 ++++++++--------
- src/update-utmp/update-utmp.c                       |  2 +-
- units/.gitignore                                    |  2 +-
- units/systemd-update-utmp-runlevel.service.in       |  8 +++++---
- units/systemd-update-utmp-shutdown.service.in       | 19 -------------------
- units/systemd-update-utmp.service.in                | 21 +++++++++++++++++++++
- 8 files changed, 46 insertions(+), 42 deletions(-)
- rename man/{systemd-update-utmp-runlevel.service.xml => systemd-update-utmp.service.xml} (82%)
- delete mode 100644 units/systemd-update-utmp-shutdown.service.in
- create mode 100644 units/systemd-update-utmp.service.in
-
-diff --git a/Makefile-man.am b/Makefile-man.am
-index 7d62094..5888158 100644
---- a/Makefile-man.am
-+++ b/Makefile-man.am
-@@ -72,7 +72,7 @@ MANPAGES += \
- 	man/systemd-tmpfiles.8 \
- 	man/systemd-tty-ask-password-agent.1 \
- 	man/systemd-udevd.service.8 \
--	man/systemd-update-utmp-runlevel.service.8 \
-+	man/systemd-update-utmp.service.8 \
- 	man/systemd.1 \
- 	man/systemd.automount.5 \
- 	man/systemd.device.5 \
-@@ -191,7 +191,7 @@ MANPAGES_ALIAS += \
- 	man/systemd-udevd-control.socket.8 \
- 	man/systemd-udevd-kernel.socket.8 \
- 	man/systemd-udevd.8 \
--	man/systemd-update-utmp-shutdown.service.8 \
-+	man/systemd-update-utmp-runlevel.service.8 \
- 	man/systemd-update-utmp.8 \
- 	man/systemd-user.conf.5
- man/SD_ALERT.3: man/sd-daemon.3
-@@ -289,8 +289,8 @@ man/systemd-tmpfiles-setup.service.8: man/systemd-tmpfiles.8
- man/systemd-udevd-control.socket.8: man/systemd-udevd.service.8
- man/systemd-udevd-kernel.socket.8: man/systemd-udevd.service.8
- man/systemd-udevd.8: man/systemd-udevd.service.8
--man/systemd-update-utmp-shutdown.service.8: man/systemd-update-utmp-runlevel.service.8
--man/systemd-update-utmp.8: man/systemd-update-utmp-runlevel.service.8
-+man/systemd-update-utmp-runlevel.service.8: man/systemd-update-utmp.service.8
-+man/systemd-update-utmp.8: man/systemd-update-utmp.service.8
- man/systemd-user.conf.5: man/systemd-system.conf.5
- man/SD_ALERT.html: man/sd-daemon.html
- 	$(html-alias)
-@@ -577,10 +577,10 @@ man/systemd-udevd-kernel.socket.html: man/systemd-udevd.service.html
- man/systemd-udevd.html: man/systemd-udevd.service.html
- 	$(html-alias)
- 
--man/systemd-update-utmp-shutdown.service.html: man/systemd-update-utmp-runlevel.service.html
-+man/systemd-update-utmp-runlevel.service.html: man/systemd-update-utmp.service.html
- 	$(html-alias)
- 
--man/systemd-update-utmp.html: man/systemd-update-utmp-runlevel.service.html
-+man/systemd-update-utmp.html: man/systemd-update-utmp.service.html
- 	$(html-alias)
- 
- man/systemd-user.conf.html: man/systemd-system.conf.html
-diff --git a/Makefile.am b/Makefile.am
-index 8d8139c..4c5e6fc 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -417,8 +417,8 @@ nodist_systemunit_DATA = \
- 	units/systemd-initctl.service \
- 	units/systemd-shutdownd.service \
- 	units/systemd-remount-fs.service \
-+	units/systemd-update-utmp.service \
- 	units/systemd-update-utmp-runlevel.service \
--	units/systemd-update-utmp-shutdown.service \
- 	units/systemd-tmpfiles-setup-dev.service \
- 	units/systemd-tmpfiles-setup.service \
- 	units/systemd-tmpfiles-clean.service \
-@@ -463,8 +463,8 @@ EXTRA_DIST += \
- 	units/systemd-initctl.service.in \
- 	units/systemd-shutdownd.service.in \
- 	units/systemd-remount-fs.service.in \
-+	units/systemd-update-utmp.service.in \
- 	units/systemd-update-utmp-runlevel.service.in \
--	units/systemd-update-utmp-shutdown.service.in \
- 	units/systemd-tmpfiles-setup-dev.service.in \
- 	units/systemd-tmpfiles-setup.service.in \
- 	units/systemd-tmpfiles-clean.service.in \
-@@ -4070,8 +4070,8 @@ RUNLEVEL4_TARGET_WANTS += \
- RUNLEVEL5_TARGET_WANTS += \
- 	systemd-update-utmp-runlevel.service
- endif
--SHUTDOWN_TARGET_WANTS += \
--	systemd-update-utmp-shutdown.service
-+SYSINIT_TARGET_WANTS += \
-+	systemd-update-utmp.service
- LOCAL_FS_TARGET_WANTS += \
- 	systemd-remount-fs.service \
- 	systemd-fsck-root.service \
-diff --git a/man/systemd-update-utmp-runlevel.service.xml b/man/systemd-update-utmp.service.xml
-similarity index 82%
-rename from man/systemd-update-utmp-runlevel.service.xml
-rename to man/systemd-update-utmp.service.xml
-index 867b958..846fc95 100644
---- a/man/systemd-update-utmp-runlevel.service.xml
-+++ b/man/systemd-update-utmp.service.xml
-@@ -19,10 +19,10 @@
-   You should have received a copy of the GNU Lesser General Public License
-   along with systemd; If not, see <http://www.gnu.org/licenses/>.
- -->
--<refentry id="systemd-update-utmp-runlevel.service">
-+<refentry id="systemd-update-utmp.service">
- 
-         <refentryinfo>
--                <title>systemd-update-utmp-runlevel.service</title>
-+                <title>systemd-update-utmp.service</title>
-                 <productname>systemd</productname>
- 
-                 <authorgroup>
-@@ -36,21 +36,21 @@
-         </refentryinfo>
- 
-         <refmeta>
--                <refentrytitle>systemd-update-utmp-runlevel.service</refentrytitle>
-+                <refentrytitle>systemd-update-utmp.service</refentrytitle>
-                 <manvolnum>8</manvolnum>
-         </refmeta>
- 
-         <refnamediv>
-+                <refname>systemd-update-utmp.service</refname>
-                 <refname>systemd-update-utmp-runlevel.service</refname>
--                <refname>systemd-update-utmp-shutdown.service</refname>
-                 <refname>systemd-update-utmp</refname>
--                <refpurpose>Write audit and utmp updates at runlevel
-+                <refpurpose>Write audit and utmp updates at bootup, runlevel
-                 changes and shutdown</refpurpose>
-         </refnamediv>
- 
-         <refsynopsisdiv>
-+                <para><filename>systemd-update-utmp.service</filename></para>
-                 <para><filename>systemd-update-utmp-runlevel.service</filename></para>
--                <para><filename>systemd-update-utmp-shutdown.service</filename></para>
-                 <para><filename>/usr/lib/systemd/systemd-update-utmp</filename></para>
-         </refsynopsisdiv>
- 
-@@ -60,8 +60,8 @@
-                 <para><filename>systemd-update-utmp-runlevel.service</filename>
-                 is a service that writes SysV runlevel changes to utmp
-                 and wtmp, as well as the audit logs, as they
--                occur. <filename>systemd-update-utmp-shutdown.service</filename>
--                does the same for shut-down requests.</para>
-+                occur. <filename>systemd-update-utmp.service</filename>
-+                does the same for system reboots and shut-down requests.</para>
-         </refsect1>
- 
-         <refsect1>
-diff --git a/src/update-utmp/update-utmp.c b/src/update-utmp/update-utmp.c
-index 9184025..202aa98 100644
---- a/src/update-utmp/update-utmp.c
-+++ b/src/update-utmp/update-utmp.c
-@@ -104,7 +104,7 @@ static int get_current_runlevel(Context *c) {
-                 { '3', SPECIAL_RUNLEVEL3_TARGET },
-                 { '4', SPECIAL_RUNLEVEL4_TARGET },
-                 { '2', SPECIAL_RUNLEVEL2_TARGET },
--                { 'S', SPECIAL_RESCUE_TARGET },
-+                { '1', SPECIAL_RESCUE_TARGET },
-         };
-         const char
-                 *interface = "org.freedesktop.systemd1.Unit",
-diff --git a/units/systemd-update-utmp-runlevel.service.in b/units/systemd-update-utmp-runlevel.service.in
-index 27fae2c..99783e2 100644
---- a/units/systemd-update-utmp-runlevel.service.in
-+++ b/units/systemd-update-utmp-runlevel.service.in
-@@ -7,12 +7,14 @@
- 
- [Unit]
- Description=Update UTMP about System Runlevel Changes
--Documentation=man:systemd-update-utmp-runlevel.service(8) man:utmp(5)
-+Documentation=man:systemd-update-utmp.service(8) man:utmp(5)
- DefaultDependencies=no
- RequiresMountsFor=/var/log/wtmp
--After=systemd-remount-fs.service systemd-tmpfiles-setup.service auditd.service
-+Conflicts=shutdown.target
-+Requisite=systemd-update-utmp.service
-+After=systemd-update-utmp.service
- After=runlevel1.target runlevel2.target runlevel3.target runlevel4.target runlevel5.target
--Before=final.target
-+Before=shutdown.target
- 
- [Service]
- Type=oneshot
-diff --git a/units/systemd-update-utmp-shutdown.service.in b/units/systemd-update-utmp-shutdown.service.in
-deleted file mode 100644
-index aa93562..0000000
---- a/units/systemd-update-utmp-shutdown.service.in
-+++ /dev/null
-@@ -1,19 +0,0 @@
--#  This file is part of systemd.
--#
--#  systemd is free software; you can redistribute it and/or modify it
--#  under the terms of the GNU Lesser General Public License as published by
--#  the Free Software Foundation; either version 2.1 of the License, or
--#  (at your option) any later version.
--
--[Unit]
--Description=Update UTMP about System Shutdown
--Documentation=man:systemd-update-utmp-runlevel.service(8) man:utmp(5)
--DefaultDependencies=no
--RequiresMountsFor=/var/log/wtmp
--After=systemd-remount-fs.service systemd-tmpfiles-setup.service auditd.service
--After=systemd-update-utmp-runlevel.service
--Before=final.target
--
--[Service]
--Type=oneshot
--ExecStart=@rootlibexecdir@/systemd-update-utmp shutdown
-diff --git a/units/systemd-update-utmp.service.in b/units/systemd-update-utmp.service.in
-new file mode 100644
-index 0000000..e7c20a5
---- /dev/null
-+++ b/units/systemd-update-utmp.service.in
-@@ -0,0 +1,21 @@
-+#  This file is part of systemd.
-+#
-+#  systemd is free software; you can redistribute it and/or modify it
-+#  under the terms of the GNU Lesser General Public License as published by
-+#  the Free Software Foundation; either version 2.1 of the License, or
-+#  (at your option) any later version.
-+
-+[Unit]
-+Description=Update UTMP about System Reboot/Shutdown
-+Documentation=man:systemd-update-utmp.service(8) man:utmp(5)
-+DefaultDependencies=no
-+RequiresMountsFor=/var/log/wtmp
-+Conflicts=shutdown.target
-+After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-remount-fs.service systemd-tmpfiles-setup.service auditd.service
-+Before=sysinit.target shutdown.target
-+
-+[Service]
-+Type=oneshot
-+RemainAfterExit=yes
-+ExecStart=@rootlibexecdir@/systemd-update-utmp reboot
-+ExecStop=@rootlibexecdir@/systemd-update-utmp shutdown
--- 
-1.8.2.3
-
diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD
index ad695a979..e25d29d5f 100644
--- a/core/systemd/PKGBUILD
+++ b/core/systemd/PKGBUILD
@@ -3,36 +3,28 @@
 
 pkgbase=systemd
 pkgname=('systemd' 'systemd-sysvcompat')
-pkgver=204
-pkgrel=3
+pkgver=208
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freedesktop.org/wiki/Software/systemd"
-license=('GPL2' 'LGPL2.1' 'MIT')
 makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf'
              'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt'  'libmicrohttpd' 'libxslt'
              'linux-api-headers' 'pam' 'python' 'quota-tools' 'xz')
-options=('!libtool' '!distcc')
+options=('!libtool' 'strip' 'debug' '!distcc')
 source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
-        0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch
-        0001-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch
         'initcpio-hook-udev'
+        'initcpio-install-systemd'
         'initcpio-install-udev'
-        'initcpio-install-timestamp')
-md5sums=('a07619bb19f48164fbf0761d12fd39a8'
-         '7f39f9fde1ff7b48293ed1e3d0a6c213'
-         '66e3162856ded8eb7dc7383405c6e0d6'
-         'e99e9189aa2f6084ac28b8ddf605aeb8'
-         'fb37e34ea006c79be1c54cbb0f803414'
-         'df69615503ad293c9ddf9d8b7755282d')
+        '0001-fix-lingering-references-to-var-lib-backlight-random.patch')
+md5sums=('df64550d92afbffb4f67a434193ee165'
+         '29245f7a240bfba66e2b1783b63b6b40'
+         '8b68b0218a3897d4d37a6ccf47914774'
+         'bde43090d4ac0ef048e3eaee8202a407'
+         '1b191c4e7a209d322675fd199e3abc66')
 
 prepare() {
   cd "$pkgname-$pkgver"
-
-  patch -Np1 <"$srcdir/0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch"
-
-  patch -Np1 <"$srcdir/0001-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch"
-
-  autoreconf
+  patch -Np1 -i ../0001-fix-lingering-references-to-var-lib-backlight-random.patch
 }
 
 build() {
@@ -41,7 +33,6 @@ build() {
   [ "$CARCH" = "mips64el" ] && CFLAGS+=" -mno-plt"
 
   ./configure \
-      --enable-static \
       --libexecdir=/usr/lib \
       --localstatedir=/var \
       --sysconfdir=/etc \
@@ -63,6 +54,7 @@ check() {
 
 package_systemd() {
   pkgdesc="system and service manager"
+  license=('GPL2' 'LGPL2.1' 'MIT')
   depends=('acl' 'bash' 'dbus-core' 'glib2' 'kbd' 'kmod' 'hwids' 'libcap' 'libgcrypt'
            'pam' 'util-linux' 'xz')
   provides=("libsystemd=$pkgver" 'nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver"
@@ -79,11 +71,13 @@ package_systemd() {
           etc/dbus-1/system.d/org.freedesktop.hostname1.conf
           etc/dbus-1/system.d/org.freedesktop.login1.conf
           etc/dbus-1/system.d/org.freedesktop.locale1.conf
+          etc/dbus-1/system.d/org.freedesktop.machine1.conf
           etc/dbus-1/system.d/org.freedesktop.timedate1.conf
+          etc/systemd/bootchart.conf
+          etc/systemd/journald.conf
+          etc/systemd/logind.conf
           etc/systemd/system.conf
           etc/systemd/user.conf
-          etc/systemd/logind.conf
-          etc/systemd/journald.conf
           etc/udev/udev.conf)
   install="systemd.install"
 
@@ -101,7 +95,7 @@ package_systemd() {
   rmdir "$pkgdir/etc/systemd/system/getty.target.wants"
 
   # get rid of RPM macros
-  rm -r "$pkgdir/etc/rpm"
+  rm -r "$pkgdir/usr/lib/rpm"
 
   # add back tmpfiles.d/legacy.conf
   install -m644 "systemd-$pkgver/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d"
@@ -112,19 +106,28 @@ package_systemd() {
           s#GROUP="cdrom"#GROUP="optical"#g' "$pkgdir"/usr/lib/udev/rules.d/*.rules
 
   # add mkinitcpio hooks
+  install -Dm644 "$srcdir/initcpio-install-systemd" "$pkgdir/usr/lib/initcpio/install/systemd"
   install -Dm644 "$srcdir/initcpio-install-udev" "$pkgdir/usr/lib/initcpio/install/udev"
   install -Dm644 "$srcdir/initcpio-hook-udev" "$pkgdir/usr/lib/initcpio/hooks/udev"
-  install -Dm644 "$srcdir/initcpio-install-timestamp" "$pkgdir/usr/lib/initcpio/install/timestamp"
+
+  # ensure proper permissions for /var/log/journal
+  chown root:systemd-journal "$pkgdir/var/log/journal"
+  chmod 2755 "$pkgdir/var/log/journal"
 
   ### split out manpages for sysvcompat
   rm -rf "$srcdir/_sysvcompat"
   install -dm755 "$srcdir"/_sysvcompat/usr/share/man/man8/
   mv "$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \
      "$srcdir"/_sysvcompat/usr/share/man/man8
+
+  # include MIT license, since it's technically custom
+  install -Dm755 "$srcdir/$pkgname-$pkgver/LICENSE.MIT" \
+      "$pkgdir/usr/share/licenses/systemd/LICENSE.MIT"
 }
 
 package_systemd-sysvcompat() {
   pkgdesc="sysvinit compat for systemd"
+  license=('GPL2')
   groups=('base')
   conflicts=('sysvinit')
   depends=('sysvinit-tools' 'systemd')
diff --git a/core/systemd/initcpio-hook-udev b/core/systemd/initcpio-hook-udev
index 75da7e4a8..0bc32e008 100644
--- a/core/systemd/initcpio-hook-udev
+++ b/core/systemd/initcpio-hook-udev
@@ -1,7 +1,9 @@
 #!/usr/bin/ash
 
 run_earlyhook() {
-    udevd --daemon --resolve-names=never
+    kmod static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf
+    systemd-tmpfiles --prefix=/dev --create
+    /usr/lib/systemd/systemd-udevd --daemon --resolve-names=never
     udevd_running=1
 }
 
diff --git a/core/systemd/initcpio-install-systemd b/core/systemd/initcpio-install-systemd
new file mode 100644
index 000000000..2c59074a7
--- /dev/null
+++ b/core/systemd/initcpio-install-systemd
@@ -0,0 +1,159 @@
+#!/bin/bash
+
+strip_quotes() {
+  local len=${#1} quotes=$'[\'"]' str=${!1}
+
+  if [[ ${str:0:1} = ${str: -1} && ${str:0:1} = $quotes ]]; then
+    declare -g "$1=${str:1:-1}"
+  fi
+}
+
+add_udev_rule() {
+    # Add an udev rules file to the initcpio image. Dependencies on binaries
+    # will be discovered and added.
+    #   $1: path to rules file (or name of rules file)
+
+    local rules= rule= key= value= binary=
+
+    rules=$(PATH=/usr/lib/udev/rules.d:/lib/udev/rules.d type -P "$1")
+    if [[ -z $rules ]]; then
+        # complain about not found rules
+        return 1
+    fi
+
+    add_file "$rules"
+
+    while IFS=, read -ra rule; do
+        # skip empty lines, comments
+        [[ -z $rule || $rule = @(+([[:space:]])|#*) ]] && continue
+
+        for pair in "${rule[@]}"; do
+            IFS=' =' read -r key value <<< "$pair"
+            case $key in
+                RUN@({program}|+)|IMPORT{program}|ENV{REMOVE_CMD})
+                    strip_quotes 'value'
+                    # just take the first word as the binary name
+                    binary=${value%% *}
+                    if [[ ${binary:0:1} != '/' ]]; then
+                        binary=$(PATH=/usr/lib/udev:/lib/udev type -P "$binary")
+                    fi
+                    add_binary "$binary"
+                    ;;
+            esac
+        done
+    done <"$rules"
+}
+
+add_systemd_unit() {
+    # Add a systemd unit file to the initcpio image. Hard dependencies on binaries
+    # and other unit files will be discovered and added.
+    #   $1: path to rules file (or name of rules file)
+
+    local unit= rule= entry= key= value= binary= dep=
+
+    unit=$(PATH=/usr/lib/systemd/system:/lib/systemd/system type -P "$1")
+    if [[ -z $unit ]]; then
+        # complain about not found unit file
+        return 1
+    fi
+
+    add_file "$unit"
+
+    while IFS='=' read -r key values; do
+        read -ra values <<< "$values"
+
+        case $key in
+            Requires|OnFailure)
+                # only add hard dependencies (not Wants)
+                map add_systemd_unit "${values[@]}"
+                ;;
+            Exec*)
+                # don't add binaries unless they are required
+                if [[ ${values[0]:0:1} != '-' ]]; then
+                    add_binary "${values[0]}"
+                fi
+                ;;
+        esac
+
+    done <"$unit"
+
+    # preserve reverse soft dependency
+    for dep in {/usr,}/lib/systemd/system/*.wants/${unit##*/}; do
+        if [[ -L $dep ]]; then
+            add_symlink "$dep"
+        fi
+    done
+
+    # add hard dependencies
+    if [[ -d $unit.requires ]]; then
+        for dep in "$unit".requires/*; do
+            add_systemd_unit ${dep##*/}
+        done
+    fi
+}
+
+build() {
+    local rules unit
+
+    # from base
+    add_binary /bin/mount
+    add_binary /usr/bin/kmod /usr/bin/modprobe
+
+    # systemd
+    add_binary /usr/lib/systemd/systemd /init
+    add_binary /usr/bin/systemd-tmpfiles
+
+    # generate sysroot.mount and sysroot-usr.mount
+    add_file "/usr/lib/systemd/system-generators/systemd-fstab-generator"
+
+    # udev rules and systemd units
+    map add_udev_rule "$rules" \
+            50-udev-default.rules \
+            60-persistent-storage.rules \
+            64-btrfs.rules \
+            80-drivers.rules \
+            99-systemd.rules \
+
+    map add_systemd_unit \
+            ctrl-alt-del.target \
+            initrd-cleanup.service \
+            initrd-fs.target \
+            initrd-parse-etc.service \
+            initrd-root-fs.target \
+            initrd-switch-root.service \
+            initrd-switch-root.target \
+            initrd-udevadm-cleanup-db.service \
+            initrd.target \
+            kmod-static-nodes.service \
+            sockets.target \
+            systemd-fsck@.service \
+            systemd-journald.service \
+            systemd-tmpfiles-setup-dev.service \
+            systemd-udev-trigger.service \
+            systemd-udevd-control.socket \
+            systemd-udevd-kernel.socket \
+            systemd-udevd.service
+
+    add_symlink "/usr/lib/systemd/system/default.target" "initrd.target"
+
+    # libdbus needs the passwd info of the root user
+    # TODO: make sure this is no longer necessary when systemctl moves to sd-bus
+    add_file "/etc/nsswitch.conf"
+    add_file "/etc/passwd"
+    add_binary "$(readlink -f /usr/lib/libnss_files.so)"
+
+    # udev wants /etc/group since it doesn't launch with --resolve-names=never
+    add_file "/etc/group"
+}
+
+help() {
+    cat <<HELPEOF
+This will install a basic systemd setup in your initramfs, and is meant to
+replace the 'base', 'usr', 'udev' and 'timestamp' hooks. Other hooks with runtime
+components will need to be ported, and will not work as intended. You also may
+wish to still include the 'base' hook (before this hook) to ensure that a
+rescue shell exists on your initramfs.
+HELPEOF
+}
+
+# vim: set ft=sh ts=4 sw=4 et:
diff --git a/core/systemd/initcpio-install-timestamp b/core/systemd/initcpio-install-timestamp
deleted file mode 100644
index 259cc705b..000000000
--- a/core/systemd/initcpio-install-timestamp
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-build() {
-    add_binary /usr/lib/systemd/systemd-timestamp /usr/bin/systemd-timestamp
-}
-
-help() {
-    cat <<HELPEOF
-Provides support for RD_TIMESTAMP in early userspace, which can be read by a
-program such as systemd-analyze to determine boot time.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/core/systemd/initcpio-install-udev b/core/systemd/initcpio-install-udev
index 15124b8f7..419c19e58 100644
--- a/core/systemd/initcpio-install-udev
+++ b/core/systemd/initcpio-install-udev
@@ -4,8 +4,9 @@ build() {
     local rules tool
 
     add_file "/etc/udev/udev.conf"
-    add_binary /usr/lib/systemd/systemd-udevd /usr/bin/udevd
+    add_binary /usr/lib/systemd/systemd-udevd
     add_binary /usr/bin/udevadm
+    add_binary /usr/bin/systemd-tmpfiles
 
     for rules in 50-udev-default.rules 60-persistent-storage.rules 64-btrfs.rules 80-drivers.rules; do
         add_file "/usr/lib/udev/rules.d/$rules"
diff --git a/core/systemd/systemd.install b/core/systemd/systemd.install
index 508b384c3..f22536360 100644
--- a/core/systemd/systemd.install
+++ b/core/systemd/systemd.install
@@ -38,11 +38,24 @@ mask_net_naming() {
   fi
 }
 
+_208_changes() {
+  chown root:systemd-journal var/log/journal
+  chmod 2755 var/log/journal
+
+  if [ -e var/lib/backlight ] && [ ! -e var/lib/systemd/backlight ]; then
+    mv -T var/lib/backlight var/lib/systemd/backlight
+  fi
+
+  if [ -e var/lib/random-seed ] && [ ! -e var/lib/systemd/random-seed ]; then
+    mv -T var/lib/random-seed var/lib/systemd/random-seed
+  fi
+}
+
 post_install() {
   post_common
 
   # enable getty@tty1 by default, but don't track the file
-  systemctl enable getty@.service
+  systemctl enable getty@tty1.service
 
   echo ":: Append 'init=/usr/lib/systemd/systemd' to your kernel command line in your"
   echo "   bootloader to replace sysvinit with systemd, or install systemd-sysvcompat"
@@ -87,6 +100,21 @@ post_upgrade() {
     printf '==> The /bin/systemd symlink has been removed. Any references in your\n'
     printf '    bootloader (or elsewhere) must be updated to /usr/lib/systemd/systemd.\n'
   fi
+
+  if [ "$(vercmp 205-1 "$2")" -eq 1 ]; then
+    printf '==> systemd 205 restructures the cgroup hierarchy and changes internal\n'
+    printf '    protocols. You should reboot at your earliest convenience.\n'
+  fi
+
+  if [ "$(vercmp 206-1 "$2")" -eq 1 ]; then
+    printf '==> The "timestamp" hook for mkinitcpio no longer exists. If you used\n'
+    printf '    this hook, you must remove it from /etc/mkinitcpio.conf. A "systemd"\n'
+    printf '    hook has been added which provides this functionality, and more.\n'
+  fi
+
+  if [ "$(vercmp 208-1 "$2")" -eq 1 ]; then
+    _208_changes
+  fi
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/core/tar/PKGBUILD b/core/tar/PKGBUILD
index 4febb901d..d4aafe120 100644
--- a/core/tar/PKGBUILD
+++ b/core/tar/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 187045 2013-06-03 11:15:39Z allan $
+# $Id: PKGBUILD 195996 2013-10-07 10:34:06Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=tar
-pkgver=1.26
-pkgrel=4
+pkgver=1.27
+pkgrel=1
 pkgdesc="Utility used to store, backup, and transport files"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/tar/tar.html"
@@ -13,20 +13,9 @@ groups=('base')
 depends=('glibc' 'sh')
 options=('!emptydirs')
 install=tar.install
-source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}
-        tar.1
-	gnulib-no-gets.patch)
-md5sums=('0ced6f20b9fa1bea588005b5ad4b52c1'
-         '6618d5fe7785e138c27d7d6a24e998b2'
-         'e97e7343f4e23724b4c48bca2f033e38'
-         '4408365a66887d65f4c8d1f416fb9d9f')
-
-prepare() {
-  cd ${srcdir}/$pkgname-$pkgver
-
-  # fix build failure with glibc-2.16
-  sed -i -e '/gets is a/d' gnu/stdio.in.h
-}
+source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig})
+md5sums=('3484fc42b7a82b82f2305b2971aa0e56'
+         'SKIP')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
@@ -42,6 +31,4 @@ check() {
 package() {
   cd ${srcdir}/$pkgname-$pkgver
   make DESTDIR=${pkgdir} install
-  
-  install -Dm644 ${srcdir}/tar.1 ${pkgdir}/usr/share/man/man1/tar.1
 }
diff --git a/core/tar/tar.1 b/core/tar/tar.1
deleted file mode 100644
index 75bbcd38c..000000000
--- a/core/tar/tar.1
+++ /dev/null
@@ -1,367 +0,0 @@
-.\" generated by script on Fri Aug 19 16:19:30 2011
-.Dd Aug 19, 2011
-.Dt TAR 1
-.Sh NAME
-.Nm tar
-.Nd The GNU version of the tar archiving utility
-.Sh SYNOPSIS
-.Nm tar
-.Oo Fl Oc Cm A Fl \-catenate \-concatenate Cm \||\| c Fl \-create Cm \||\| d Fl \-diff \-compare Cm \||\| Fl \-delete Cm \||\| r Fl \-append Cm \||\| t Fl \-list Cm \||\| Fl \-test\-label Cm \||\| u Fl \-update Cm \||\| x Fl \-extract \-get
-.Op Ar options
-.Op Ar pathname ...
-.Sh DESCRIPTION
-.Nm Tar
-stores and extracts files from a tape or disk archive.
-.Pp
-The first argument to
-tar
-should be a function; either one of the letters
-.Cm Acdrtux ,
-or one of the long function names.
-A function letter need not be prefixed with ``\-'', and may be combined
-with other single-letter options.
-A long function name must be prefixed with
-.Cm \\-\\- .
-Some options take a parameter; with the single-letter form
-these must be given as separate arguments.
-With the long form, they may be given by appending
-.Cm = Ns Ar value
-to the option.
-.Sh FUNCTION LETTERS
-Main operation mode:
-.Bl -tag -width flag
-.It Fl A , Fl \-catenate , Fl \-concatenate
-append tar files to an archive
-.It Fl c , Fl \-create
-create a new archive
-.It Fl d , Fl \-diff , Fl \-compare
-find differences between archive and file system
-.It Fl \-delete
-delete from the archive (not on mag tapes!)
-.It Fl r , Fl \-append
-append files to the end of an archive
-.It Fl t , Fl \-list
-list the contents of an archive
-.It Fl \-test\-label
-test the archive volume label and exit
-.It Fl u , Fl \-update
-only append files newer than copy in archive
-.It Fl x , Fl \-extract , Fl \-get
-extract files from an archive
-.El
-.Sh OTHER OPTIONS
-Operation modifiers:
-.Bl -tag -width flag
-.It \-[0\-7][lmh]
-specify drive and density
-.It Fl a , Fl \-auto\-compress
-use archive suffix to determine the compression program
-.It Fl \-add\-file Ns \= Ns Ar FILE
-add given FILE to the archive (useful if its name starts with a dash)
-.It Fl \-anchored
-patterns match file name start
-.It Fl \-no\-anchored
-patterns match after any `/' (default for exclusion)
-.It Fl \-atime\-preserve
-preserve access times on dumped files, either by restoring the times
-.It Fl \-no\-auto\-compress
-do not use archive suffix to determine the compression program
-.It Fl b , Fl \-blocking\-factor Ar BLOCKS
-BLOCKS x 512 bytes per record
-.It Fl B , Fl \-read\-full\-records
-reblock as we read (for 4.2BSD pipes)
-.It Fl \-backup
-backup before removal, choose version CONTROL
-.It Fl C , Fl \-directory Ar DIR
-change to directory DIR
-.It Fl \-check\-device
-check device numbers when creating incremental archives (default)
-.It Fl \-no\-check\-device
-do not check device numbers when creating incremental archives
-.It Fl \-checkpoint
-display progress messages every NUMBERth record (default 10)
-.It Fl \-checkpoint\-action Ns \= Ns Ar ACTION
-execute ACTION on each checkpoint
-.It Fl \-delay\-directory\-restore
-delay setting modification times and permissions of extracted
-.It Fl \-no\-delay\-directory\-restore
-cancel the effect of --delay-directory-restore option
-.It Fl \-exclude Ns \= Ns Ar PATTERN
-exclude files, given as a PATTERN
-.It Fl \-exclude\-backups
-exclude backup and lock files
-.It Fl \-exclude\-caches
-exclude contents of directories containing CACHEDIR.TAG, 
-.It Fl \-exclude\-caches\-all
-exclude directories containing CACHEDIR.TAG
-.It Fl \-exclude\-caches\-under
-exclude everything under directories containing CACHEDIR.TAG
-.It Fl \-exclude\-tag Ns \= Ns Ar FILE
-exclude contents of directories containing FILE, except
-.It Fl \-exclude\-tag\-all Ns \= Ns Ar FILE
-exclude directories containing FILE
-.It Fl \-exclude\-tag\-under Ns \= Ns Ar FILE
-exclude everything under directories containing FILE
-.It Fl \-exclude\-vcs
-exclude version control system directories
-.It Fl f , Fl \-file Ar ARCHIVE
-use archive file or device ARCHIVE
-.It Fl F , Fl \-info\-script , Fl \-new\-volume\-script Ar NAME
-run script at end of each tape (implies -M)
-.It Fl \-force\-local
-archive file is local even if it has a colon
-.It Fl \-full\-time
-print file time to its full resolution
-.It Fl g , Fl \-listed\-incremental Ar FILE
-handle new GNU-format incremental backup
-.It Fl G , Fl \-incremental
-handle old GNU-format incremental backup
-.It Fl \-group Ns \= Ns Ar NAME
-force NAME as group for added files
-.It Fl h , Fl \-dereference
-follow symlinks; archive and dump the files they point to
-.It Fl H , Fl \-format Ar FORMAT
-create archive of the given formatFORMAT is one of the following:
-.Bl -tag -width flag
-.It Fl \-format=gnu
-GNU tar 1.13.x format
-.It Fl \-format=oldgnu
-GNU format as per tar <= 1.12
-.It Fl \-format=pax
-POSIX 1003.1-2001 (pax) format
-.It Fl \-format=posix
-same as pax
-.It Fl \-format=ustar
-POSIX 1003.1-1988 (ustar) format
-.It Fl \-format=v7
-old V7 tar format
-.El
-.It Fl \-hard\-dereference
-follow hard links; archive and dump the files they refer to
-.It Fl i , Fl \-ignore\-zeros
-ignore zeroed blocks in archive (means EOF)
-.It Fl I , Fl \-use\-compress\-program Ar PROG
-filter through PROG (must accept -d)
-.It Fl \-ignore\-case
-ignore case
-.It Fl \-no\-ignore\-case
-case sensitive matching (default)
-.It Fl \-ignore\-command\-error
-ignore exit codes of children
-.It Fl \-no\-ignore\-command\-error
-treat non-zero exit codes of children as error
-.It Fl \-ignore\-failed\-read
-do not exit with nonzero on unreadable files
-.It Fl \-index\-file Ns \= Ns Ar FILE
-send verbose output to FILE
-.It Fl j , Fl \-bzip2
-
-.It Fl J , Fl \-xz
-
-.It Fl k , Fl \-keep\-old\-files
-don't replace existing files when extracting
-.It Fl K , Fl \-starting\-file Ar MEMBER-NAME
-begin at member MEMBER-NAME in the archive
-.It Fl \-keep\-newer\-files
-don't replace existing files that are newer than their archive copies
-.It Fl l , Fl \-check\-links
-print a message if not all links are dumped
-.It Fl L , Fl \-tape\-length Ar NUMBER
-change tape after writing NUMBER x 1024 bytes
-.It Fl \-level Ns \= Ns Ar NUMBER
-dump level for created listed-incremental archive
-.It Fl \-lzip
-
-.It Fl \-lzma
-
-.It Fl \-lzop
-
-.It Fl m , Fl \-touch
-don't extract file modified time
-.It Fl M , Fl \-multi\-volume
-create/list/extract multi-volume archive
-.It Fl \-mode Ns \= Ns Ar CHANGES
-force (symbolic) mode CHANGES for added files
-.It Fl \-mtime Ns \= Ns Ar DATE-OR-FILE
-set mtime for added files from DATE-OR-FILE
-.It Fl n , Fl \-seek
-archive is seekable
-.It Fl N , Fl \-newer , Fl \-after\-date Ar DATE-OR-FILE
-only store files newer than DATE-OR-FILE
-.It Fl \-newer\-mtime Ns \= Ns Ar DATE
-compare date and time when data changed only
-.It Fl \-null
--T reads null-terminated names, disable -C
-.It Fl \-no\-null
-disable the effect of the previous --null option
-.It Fl \-numeric\-owner
-always use numbers for user/group names
-.It Fl O , Fl \-to\-stdout
-extract files to standard output
-.It Fl \-occurrence
-process only the NUMBERth occurrence of each file in the archive;
-.It Fl \-old\-archive , Fl \-portability
-same as --format=v7
-.It Fl \-one\-file\-system
-stay in local file system when creating archive
-.It Fl \-overwrite
-overwrite existing files when extracting
-.It Fl \-overwrite\-dir
-overwrite metadata of existing directories when extracting (default)
-.It Fl \-no\-overwrite\-dir
-preserve metadata of existing directories
-.It Fl \-owner Ns \= Ns Ar NAME
-force NAME as owner for added files
-.It Fl p , Fl \-preserve\-permissions , Fl \-same\-permissions
-extract information about file permissions (default for superuser)
-.It Fl P , Fl \-absolute\-names
-don't strip leading `/'s from file names
-.It Fl \-pax\-option Ns \= Ns Ar keyword[[:]=value][,keyword[[:]=value]]...
-control pax keywords
-.It Fl \-posix
-same as --format=posix
-.It Fl \-preserve
-same as both -p and -s
-.It Fl \-quote\-chars Ns \= Ns Ar STRING
-additionally quote characters from STRING
-.It Fl \-no\-quote\-chars Ns \= Ns Ar STRING
-disable quoting for characters from STRING
-.It Fl \-quoting\-style Ns \= Ns Ar STYLE
-set name quoting style; see below for valid STYLE values
-.It Fl R , Fl \-block\-number
-show block number within archive with each message
-.It Fl \-record\-size Ns \= Ns Ar NUMBER
-NUMBER of bytes per record, multiple of 512
-.It Fl \-recursion
-recurse into directories (default)
-.It Fl \-no\-recursion
-avoid descending automatically in directories
-.It Fl \-recursive\-unlink
-empty hierarchies prior to extracting directory
-.It Fl \-remove\-files
-remove files after adding them to the archive
-.It Fl \-restrict
-disable use of some potentially harmful options
-.It Fl \-rmt\-command Ns \= Ns Ar COMMAND
-use given rmt COMMAND instead of rmt
-.It Fl \-rsh\-command Ns \= Ns Ar COMMAND
-use remote COMMAND instead of rsh
-.It Fl s , Fl \-preserve\-order , Fl \-same\-order
-sort names to extract to match archive
-.It Fl S , Fl \-sparse
-handle sparse files efficiently
-.It Fl \-same\-owner
-try extracting files with the same ownership as exists in the archive (default for superuser)
-.It Fl \-no\-same\-owner
-extract files as yourself (default for ordinary users)
-.It Fl \-no\-same\-permissions
-apply the user's umask when extracting permissions from the archive (default for ordinary users)
-.It Fl \-no\-seek
-archive is not seekable
-.It Fl \-show\-defaults
-show tar defaults
-.It Fl \-show\-omitted\-dirs
-when listing or extracting, list each directory that does not match search criteria
-.It Fl \-show\-transformed\-names , Fl \-show\-stored\-names
-show file or archive names after transformation
-.It Fl \-sparse\-version Ns \= Ns Ar MAJOR[.MINOR]
-set version of the sparse format to use (implies --sparse)
-.It Fl \-strip\-components Ns \= Ns Ar NUMBER
-strip NUMBER leading components from file names on extraction
-.It Fl \-suffix Ns \= Ns Ar STRING
-backup before removal, override usual suffix ('~' unless overridden by environment variable SIMPLE_BACKUP_SUFFIX)
-.It Fl T , Fl \-files\-from Ar FILE
-get names to extract or create from FILE
-.It Fl \-to\-command Ns \= Ns Ar COMMAND
-pipe extracted files to another program
-.It Fl \-totals
-print total bytes after processing the archive; 
-.It Fl \-transform , Fl \-xform Ar EXPRESSION
-use sed replace EXPRESSION to transform file names
-.It Fl U , Fl \-unlink\-first
-remove each file prior to extracting over it
-.It Fl \-unquote
-unquote filenames read with -T (default)
-.It Fl \-no\-unquote
-do not unquote filenames read with -T
-.It Fl \-utc
-print file modification times in UTC
-.It Fl v , Fl \-verbose
-verbosely list files processed
-.It Fl V , Fl \-label Ar TEXT
-create archive with volume name TEXT; at list/extract time, use TEXT as a globbing pattern for volume name
-.It Fl \-volno\-file Ns \= Ns Ar FILE
-use/update the volume number in FILE
-.It Fl w , Fl \-interactive , Fl \-confirmation
-ask for confirmation for every action
-.It Fl W , Fl \-verify
-attempt to verify the archive after writing it
-.It Fl \-warning Ns \= Ns Ar KEYWORD
-warning control
-.It Fl \-wildcards
-use wildcards (default for exclusion)
-.It Fl \-wildcards\-match\-slash
-wildcards match `/' (default for exclusion)
-.It Fl \-no\-wildcards\-match\-slash
-wildcards do not match `/'
-.It Fl \-no\-wildcards
-verbatim string matching
-.It Fl X , Fl \-exclude\-from Ar FILE
-exclude patterns listed in FILE
-.It Fl z , Fl \-gzip , Fl \-gunzip Fl \-ungzip
-
-.It Fl Z , Fl \-compress , Fl \-uncompress
-
-.El
-.Sh ENVIRONMENT
-The behavior of tar is controlled by the following environment variables,
-among others:
-.Bl -tag -width Ds
-.It Ev SIMPLE_BACKUP_SUFFIX
-Backup prefix to use when extracting, if
-.Fl \-suffix
-is not specified.
-The backup suffix defaults to `~' if neither is specified.
-.It Ev TAR_OPTIONS
-Options to prepend to those specified on the command line, separated by
-whitespace.  Embedded backslashes may be used to escape whitespace or
-backslashes within an option.
-.It Ev TAPE
-Device or file to use for the archive if 
-.Fl \-file
-is not specified.
-If this environment variable is unset, use stdin or stdout instead.
-.It Ev TAR_LONGLINK_100
-.El
-.Sh EXAMPLES
-Create archive.tar from files foo and bar.
-.Bd -literal -offset indent -compact
-tar \-cf archive.tar foo bar
-.Ed
-List all files in archive.tar verbosely.
-.Bd -literal -offset indent -compact
-tar \-tvf archive.tar
-.Ed
-Extract all files from archive.tar.
-.Bd -literal -offset indent -compact
-tar \-xf archive.tar
-.Ed
-.Sh SEE ALSO
-.\" libarchive
-.Xr tar 5 ,
-.\" man-pages
-.Xr symlink 7 ,
-.Xr rmt 8
-.Sh HISTORY
-The
-.Nm tar
-command appeared in
-.At v7 .
-.Sh BUGS
-The GNU folks, in general, abhor man pages, and create info documents instead.
-Unfortunately, the info document describing tar is licensed under the GFDL with
-invariant cover texts, which makes it impossible to include any text
-from that document in this man page.
-Most of the text in this document was automatically extracted from the usage
-text in the source.
-It may not completely describe all features of the program.
diff --git a/core/texinfo/PKGBUILD b/core/texinfo/PKGBUILD
index 244086cc7..927b8666e 100644
--- a/core/texinfo/PKGBUILD
+++ b/core/texinfo/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 180067 2013-03-15 22:55:32Z allan $
+# $Id: PKGBUILD 195842 2013-10-02 00:09:47Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=texinfo
-pkgver=5.1
+pkgver=5.2
 pkgrel=1
 pkgdesc="Utilities to work with and produce manuals, ASCII text, and on-line documentation from a single source file"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,8 +13,8 @@ groups=('base' 'base-devel')
 depends=('ncurses' 'findutils' 'gzip' 'perl' 'sh')
 install=texinfo.install
 source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('52ee905a3b705020d2a1b6ec36d53ca6'
-         '65c8c95799ea5905e03cee5825d3553f')
+md5sums=('cb489df8a7ee9d10a236197aefdb32c5'
+         'SKIP')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/core/texinfo/texinfo.install b/core/texinfo/texinfo.install
index f1554e4f4..1f220c572 100644
--- a/core/texinfo/texinfo.install
+++ b/core/texinfo/texinfo.install
@@ -1,5 +1,5 @@
 infodir=usr/share/info
-filelist=(info.info info-stnd.info texinfo texinfo-1 texinfo-2 texinfo-3)
+filelist=(info.info info-stnd.info texinfo.info{,-1,-2,-3})
 
 post_install() {
   # Scan *all* info files on install
diff --git a/core/traceroute/PKGBUILD b/core/traceroute/PKGBUILD
index 76a48f766..478435c44 100644
--- a/core/traceroute/PKGBUILD
+++ b/core/traceroute/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 175126 2013-01-14 12:47:17Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
+# $Id: PKGBUILD 195972 2013-10-06 19:11:34Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=traceroute
 pkgver=2.0.19
-pkgrel=1
+pkgrel=2
 pkgdesc="Tracks the route taken by packets over an IP network"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://traceroute.sourceforge.net/"
diff --git a/extra/abook/PKGBUILD b/extra/abook/PKGBUILD
index c9427e7a4..d634cb171 100644
--- a/extra/abook/PKGBUILD
+++ b/extra/abook/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 191361 2013-07-24 01:43:47Z bisson $
+# $Id: PKGBUILD 195248 2013-09-29 04:45:52Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Thayer Williams <thayer@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=abook
-pkgver=0.6.0pre2.20130724
+pkgver=0.6.0pre2.20130928
 pkgrel=1
 pkgdesc='Text-based addressbook designed for use with Mutt'
 url='http://abook.sourceforge.net/'
@@ -13,8 +13,15 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 makedepends=('git')
 depends=('readline')
-source=("abook::git://abook.git.sourceforge.net/gitroot/abook/abook#commit=2e3d4f7341e154bf09907aabcdfe73345cc72e68")
-sha1sums=('SKIP')
+source=("abook::git://abook.git.sourceforge.net/gitroot/abook/abook#commit=2e3d4f7341e154bf09907aabcdfe73345cc72e68"
+        'vcard.patch')
+sha1sums=('SKIP'
+          'ac71e84812c5d57cb8ddaf5b03b7c25cbdf4c3db')
+
+prepare() {
+	cd "${srcdir}/${pkgname}"
+	patch -p1 -i ../vcard.patch
+}
 
 build() {
 	cd "${srcdir}/${pkgname}"
diff --git a/extra/abook/vcard.patch b/extra/abook/vcard.patch
new file mode 100644
index 000000000..55630c1e5
--- /dev/null
+++ b/extra/abook/vcard.patch
@@ -0,0 +1,26 @@
+diff -Naur old/filter.c new/filter.c
+--- old/filter.c	2013-08-22 20:49:06.229337260 -1000
++++ new/filter.c	2013-08-22 20:49:13.552700987 -1000
+@@ -1673,7 +1673,7 @@
+ 	// vCard(the country name)
+ 	item_fput(item, COUNTRY, xstrdup(strsep(&value, ";")));
+ 
+-	if(*value) xfree(value);
++	if(value) xfree(value);
+ }
+ 
+ static void
+@@ -2052,6 +2052,13 @@
+ 
+ 	free(name);
+ 
++	if(db_fget(item, NICK))
++	  fprintf(out, "NICKNAME:%s\r\n",
++		  safe_str(db_fget(item, NICK)));
++	if(db_fget(item, ANNIVERSARY))
++	  fprintf(out, "BIRTHDAY:%s\r\n",
++		  safe_str(db_fget(item, ANNIVERSARY)));
++
+ 	// see rfc6350 section 6.3.1
+ 	if(db_fget(item, ADDRESS)) {
+ 		fprintf(out, "ADR:;%s;%s;%s;%s;%s;%s\r\n",
diff --git a/extra/aisleriot/PKGBUILD b/extra/aisleriot/PKGBUILD
index 4d28f1031..0e2730543 100644
--- a/extra/aisleriot/PKGBUILD
+++ b/extra/aisleriot/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 188075 2013-06-08 11:18:20Z bpiotrowski $
+# $Id: PKGBUILD 196010 2013-10-07 11:50:21Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=aisleriot
-pkgver=3.8.0
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="A collection of patience games written in guile scheme"
 arch=(i686 x86_64 mips64el)
@@ -16,8 +16,8 @@ optdepends=('libkdegames: KDE card sets'
             'pysolfc-cardsets: PySol card sets')
 options=('!emptydirs' '!libtool')
 install=aisleriot.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('14954fe77fa953b20f5385292743857f79efd45e8b75fb06807e7cf17f9db004')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('2b96e73fa2e3c75afc27b2a572c4175943fbaac015824a6f49c41bf479b26e02')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD
index 0bd9d6f68..faefac4a3 100644
--- a/extra/akonadi/PKGBUILD
+++ b/extra/akonadi/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 191591 2013-07-26 06:33:36Z andrea $
+# $Id: PKGBUILD 196161 2013-10-07 12:32:40Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=akonadi
-pkgver=1.10.2
+pkgver=1.10.3
 pkgrel=1
 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,8 +13,8 @@ depends=('shared-mime-info' 'boost-libs' 'mariadb' 'soprano')
 makedepends=('cmake' 'automoc4' 'boost' 'postgresql')
 optdepends=('postgresql: PostgreSQL backend')
 install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('35eb8f76588b1d111f75bc46e3ac784b')
+source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}-1.tar.bz2")
+md5sums=('3929b765baa3dc0d548a26893c64abcf')
 
 prepare() {
   mkdir build
diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD
index 57f5dbb06..cc49f7990 100644
--- a/extra/amule/PKGBUILD
+++ b/extra/amule/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 189860 2013-07-10 07:26:51Z bpiotrowski $
+# $Id: PKGBUILD 193960 2013-09-08 17:48:29Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Henrik Ronellenfitsch <searinox@web.de>
 # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com>
 # Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org>
 
 pkgname=amule
-pkgver=10803
-pkgrel=3
+pkgver=10808
+pkgrel=1
 pkgdesc="An eMule-like client for ed2k p2p network"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.amule.org"
 license=('GPL')
 depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++')
 source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2")
-md5sums=('febf14f5b1185f25acde64f61b78ed38')
+md5sums=('68099241871f4e47eee06bebc7ce20a1')
 
 build() {
   cd "${srcdir}/aMule-SVN-r${pkgver}"
diff --git a/extra/anjuta-extras/PKGBUILD b/extra/anjuta-extras/PKGBUILD
index 51dd918a2..b531384f0 100644
--- a/extra/anjuta-extras/PKGBUILD
+++ b/extra/anjuta-extras/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 183329 2013-04-21 22:08:26Z heftig $
+# $Id: PKGBUILD 196013 2013-10-07 11:50:25Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=anjuta-extras
-pkgver=3.8.0
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Anjuta Integrated Development Environment extra plugins"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('anjuta')
-makedepends=('intltool' 'gnome-doc-utils')
+makedepends=('intltool' 'itstool')
 install=anjuta-extras.install
 url="http://www.anjuta.org/"
-source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
+source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 options=('!libtool' '!emptydirs')
-sha256sums=('115c2f51017aa51edc6bfc7a2d2084e26b29d3df353ed2a92e40f9e3ae28a761')
+sha256sums=('92f92e3c530f5649edfe4d8645e8cfd3161383cbc486c636ebb24cf2d2642213')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/anjuta/PKGBUILD b/extra/anjuta/PKGBUILD
index 85cee7edc..1805f0e19 100644
--- a/extra/anjuta/PKGBUILD
+++ b/extra/anjuta/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 188637 2013-06-17 09:36:56Z jgc $
+# $Id: PKGBUILD 196012 2013-10-07 11:50:24Z jgc $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Harley Laue <losinggeneration@yahoo.com>
 
 pkgbase=anjuta
 pkgname=('libanjuta' 'anjuta')
-pkgver=3.8.4
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="GNOME Integrated Development Environment (IDE)"
 arch=('i686' 'x86_64' 'mips64el')
 license=(GPL)
-makedepends=(gdl vte3 autogen devhelp glade libgda subversion gnome-icon-theme vala dconf
+makedepends=(gdl vte3 autogen devhelp glade libgda subversion neon gnome-icon-theme vala dconf
              gtk-doc yelp-tools gnome-common intltool gobject-introspection itstool gjs
              python)
 url="http://www.anjuta.org/"
 options=('!libtool' '!emptydirs')
 source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
-sha256sums=('eea77ef71dd156a2296cbaf02a343f3b9099aec245ee7d1495f002ff2f81fa17')
+sha256sums=('72c8569fcd629f3ed1f248cfd452e1f0b473e890421679bd5bb4d6ab2ce3fedb')
 
 build() {
   cd "$pkgbase-$pkgver"
@@ -38,7 +38,7 @@ package_libanjuta(){
 
 package_anjuta(){
   pkgdesc="GNOME Integrated Development Environment (IDE)"
-  depends=(libanjuta vte3 autogen devhelp glade libgda subversion gnome-icon-theme vala dconf)
+  depends=(libanjuta vte3 autogen devhelp glade libgda subversion neon gnome-icon-theme vala dconf)
   groups=('gnome-extra')
 
   install=anjuta.install
diff --git a/extra/ardour/PKGBUILD b/extra/ardour/PKGBUILD
index 66961d92f..fe8fc09b6 100644
--- a/extra/ardour/PKGBUILD
+++ b/extra/ardour/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 191251 2013-07-22 09:20:17Z schiv $
+# $Id: PKGBUILD 194389 2013-09-15 12:35:01Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: SpepS <dreamspepser at yahoo dot it>
 # Contributor: see .contrib
 
 pkgname=ardour
 _pkgname=Ardour3
-pkgver=3.3
+pkgver=3.4
 pkgrel=1
 pkgdesc="Professional-grade digital audio workstation"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ardour.org/"
 license=('GPL')
-depends=('liblrdf' 'liblo' 'libsmf' 'lilv>=0.16.0'
-         'aubio' 'libgnomecanvasmm' 'suil>=0.6.12')
+depends=('liblrdf' 'liblo' 'libsmf' 'lilv'
+         'aubio' 'libgnomecanvasmm' 'suil')
 makedepends=('python2' 'boost' 'cppunit' 'doxygen' 'graphviz')
 optdepends=('xjadeo: video monitoring')
 install=$pkgname.install
 source=("ftp://ftp.archlinux.org/other/$pkgname/$_pkgname-$pkgver.tar.bz2"
         "$pkgname.desktop")
-md5sums=('40edf6ab63488d52abf94a2a48d7ac97'
+md5sums=('4c2286d9c5de6846e2abaa2a8fab0349'
          '316bd21ece5e2208a104fd09cac521af')
 
 prepare() {
diff --git a/extra/arj/PKGBUILD b/extra/arj/PKGBUILD
index 720f63d5f..47aa5dc5f 100644
--- a/extra/arj/PKGBUILD
+++ b/extra/arj/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 149330 2012-02-06 20:41:57Z stephane $
+# $Id: PKGBUILD 195286 2013-09-29 21:24:32Z eric $
 # Maintainer:
 # Contributor: Travis Willard <travisw@wmpub.ca>
 # Contributor: Gergely Tamas <dice@mfa.kfki.hu>
 
 pkgname=arj
 pkgver=3.10.22
-pkgrel=7.1
+pkgrel=8
 pkgdesc="Free and portable clone of the ARJ archiver"
 url="http://arj.sourceforge.net/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-options=('!makeflags')
 depends=('glibc')
+options=('!makeflags')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         001_arches_align.patch
         002_no_remove_static_const.patch
@@ -23,7 +23,7 @@ md5sums=('f263bf3cf6d42a8b7e85b4fb514336d3'
          '56b3cf96ec485b0d824761457417fcc0'
          '4630a7254dfc6c8d8c7e696aa4a58f4a')
 
-build() {
+prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   # Add gentoo patches
@@ -35,7 +35,13 @@ build() {
   cd gnu
   aclocal
   autoconf
-  ./configure --prefix=/usr --build=$CHOST --host=$CHOST
+  rm -f config.{guess,sub}
+  cp /usr/share/automake-1.14/config.{guess,sub} .
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}/gnu"
+  ./configure --prefix=/usr
   cd ..
   make prepare
   make
diff --git a/extra/asymptote/PKGBUILD b/extra/asymptote/PKGBUILD
index b6fe3765c..21f4330c5 100644
--- a/extra/asymptote/PKGBUILD
+++ b/extra/asymptote/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 191983 2013-08-03 19:18:46Z remy $
+# $Id: PKGBUILD 195314 2013-09-30 10:28:34Z allan $
 # Maintainer: Rémy Oudompheng <remy@archlinux.org>
 # Contributor: Firmicus <francois.archlinux.org>
 # Contributor: bender02 at gmx dot com
 
 pkgname=asymptote
 pkgver=2.24
-pkgrel=1
+pkgrel=2
 pkgdesc="A vector graphics language (like metapost)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://asymptote.sourceforge.net/"
@@ -16,7 +16,7 @@ makedepends=('ghostscript' 'imagemagick'
              'texlive-plainextra' # For texinfo
             )
 optdepends=('python2:           for the xasy GUI'
-            'python-imaging:    for the xasy GUI'
+            'python2-pillow:    for the xasy GUI'
             'tix:               for the xasy GUI')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.src.tgz)
 install=texlive.install
diff --git a/extra/at-spi2-atk/PKGBUILD b/extra/at-spi2-atk/PKGBUILD
index 39b8b0388..5aa8592fe 100644
--- a/extra/at-spi2-atk/PKGBUILD
+++ b/extra/at-spi2-atk/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 183331 2013-04-21 22:08:29Z heftig $
+# $Id: PKGBUILD 196015 2013-10-07 11:50:27Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=at-spi2-atk
-pkgver=2.8.1
+pkgver=2.10.0
 pkgrel=1
 pkgdesc="A GTK+ module that bridges ATK to D-Bus at-spi"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('at-spi2-core' 'libx11' 'atk')
 makedepends=('intltool')
 options=('!libtool')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('eb659b94fde6dc0a2f584c9121a5e6d39a4c8aa297d21d8f9032f7a8a775fd06')
+sha256sums=('dea7ff2f9bc9bbdb0351112616d738de718b55739cd2511afecac51604c31a94')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/at-spi2-core/PKGBUILD b/extra/at-spi2-core/PKGBUILD
index 44fb8bc99..a388a9ee9 100644
--- a/extra/at-spi2-core/PKGBUILD
+++ b/extra/at-spi2-core/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 183332 2013-04-21 22:08:31Z heftig $
+# $Id: PKGBUILD 196016 2013-10-07 11:50:29Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=at-spi2-core
-pkgver=2.8.0
+pkgver=2.10.0
 pkgrel=1
 pkgdesc="Protocol definitions and daemon for D-Bus at-spi"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('dbus' 'glib2' 'libxtst')
 makedepends=('intltool' 'gobject-introspection')
 options=('!libtool')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('1861a30fc7f583d5a567a0ba547db67ce9bd294f0d1c9f7403c96a10a481c458')
+sha256sums=('964155c7574220a00e11e1c0d91f2d3017ed603920eb1333ff9cbdb6a22744db')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/atk/PKGBUILD b/extra/atk/PKGBUILD
index a6311a06f..7d1d7851f 100644
--- a/extra/atk/PKGBUILD
+++ b/extra/atk/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 183330 2013-04-21 22:08:28Z heftig $
+# $Id: PKGBUILD 196014 2013-10-07 11:50:26Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=atk
-pkgver=2.8.0
+pkgver=2.10.0
 pkgrel=1
 pkgdesc="A library providing a set of interfaces for accessibility"
 arch=(i686 x86_64 'mips64el')
@@ -12,7 +12,7 @@ makedepends=('gobject-introspection')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 url='http://www.gtk.org/'
-sha256sums=('b22519176226f3e07cf6d932b77852e6b6be4780977770704b32d0f4e0686df4')
+sha256sums=('636917a5036bc851d8491194645d284798ec118919a828be5e713b6ecc5b50b0')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/audacity/PKGBUILD b/extra/audacity/PKGBUILD
index 1ac22f46f..f326a8530 100644
--- a/extra/audacity/PKGBUILD
+++ b/extra/audacity/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 176352 2013-01-30 20:25:49Z eric $
+# $Id: PKGBUILD 193962 2013-09-08 19:31:47Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=audacity
-pkgver=2.0.3
-pkgrel=2
+pkgver=2.0.4
+pkgrel=1
 pkgdesc="A program that lets you manipulate digital audio waveforms"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://audacity.sourceforge.net/"
@@ -14,17 +14,17 @@ makedepends=('cmake')
 options=('!makeflags')
 install=audacity.install
 source=(http://audacity.googlecode.com/files/${pkgname}-minsrc-${pkgver}.tar.xz)
-sha1sums=('72e634711fb96aac9df445e75e16e12e00c047e6')
+sha1sums=('4c1a42137cef598e3d83829ca7c22dba62d215be')
 
 build() {
-  cd "${srcdir}/${pkgname}-src-${pkgver}"
+  cd ${pkgname}-src-${pkgver}
   [ "$CARCH" = "mips64el" ] && sse="--disable-sse"
   PKG_CONFIG_PATH+="/usr/lib/ffmpeg-compat/pkgconfig" \
-    ./configure --prefix=/usr --docdir=/usr/share/doc/audacity $sse
+    ./configure --prefix=/usr $sse
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-src-${pkgver}"
+  cd ${pkgname}-src-${pkgver}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/audacity/audacity.install b/extra/audacity/audacity.install
index 028c9f62a..34ab919aa 100644
--- a/extra/audacity/audacity.install
+++ b/extra/audacity/audacity.install
@@ -5,9 +5,9 @@ post_install() {
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
 post_remove() {
-  post_install $1
+  post_install
 }
diff --git a/extra/baobab/PKGBUILD b/extra/baobab/PKGBUILD
index 19ddaa5b7..d683bc937 100644
--- a/extra/baobab/PKGBUILD
+++ b/extra/baobab/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 185372 2013-05-13 18:01:12Z heftig $
+# $Id: PKGBUILD 196017 2013-10-07 11:50:30Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=baobab
-pkgver=3.8.2
+pkgver=3.10
 pkgrel=1
 pkgdesc="A graphical directory tree analyzer"
 arch=(i686 x86_64 mips64el)
@@ -12,8 +12,8 @@ depends=('dconf' 'gtk3' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'deskto
 makedepends=('intltool' 'itstool' 'vala' 'gobject-introspection')
 groups=('gnome')
 install=$pkgname.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('68ce73e34378909a384d17355d2b80c14423dc54ace6a363dc93653cf608614a')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver}/$pkgname-$pkgver.tar.xz)
+sha256sums=('6f4e309073c3834f957b957b03d388fd89900a1622a001d238ad6105c6e303ee')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/bijiben/PKGBUILD b/extra/bijiben/PKGBUILD
index f2ffc2cd2..14d4171b9 100644
--- a/extra/bijiben/PKGBUILD
+++ b/extra/bijiben/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 193200 2013-08-19 01:30:39Z heftig $
+# $Id: PKGBUILD 196018 2013-10-07 11:50:31Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=bijiben
-pkgver=3.8.4
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Write out notes, every detail matters"
 arch=(i686 x86_64 mips64el)
 url="https://live.gnome.org/Bijiben"
 license=(GPL)
-depends=(tracker clutter-gtk libzeitgeist webkitgtk3 hicolor-icon-theme desktop-file-utils)
+depends=(tracker clutter-gtk zeitgeist webkitgtk hicolor-icon-theme desktop-file-utils gnome-online-accounts)
 makedepends=(intltool itstool)
 options=(!emptydirs)
 install=bijiben.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver::3}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('5b8f6580fa726139dd707bea8ee581531c21b8470c04723b9b1046033cb999db')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('82817151d7a69190944447bcc7cd12306160c2edce2d0e2ddbfd15ae2d2a6d10')
 
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --libexecdir=/usr/lib/$pkgname
+    --libexecdir=/usr/lib/$pkgname --disable-update-mimedb
   make
 }
 
diff --git a/extra/bijiben/bijiben.install b/extra/bijiben/bijiben.install
index 8b17fa3d4..8f9149ffc 100644
--- a/extra/bijiben/bijiben.install
+++ b/extra/bijiben/bijiben.install
@@ -2,6 +2,7 @@ post_install() {
     glib-compile-schemas /usr/share/glib-2.0/schemas
     update-desktop-database -q
     gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+    update-mime-database /usr/share/mime
 }
 
 post_upgrade() {
diff --git a/extra/bluedevil/PKGBUILD b/extra/bluedevil/PKGBUILD
index 2fd923666..92633a8d7 100644
--- a/extra/bluedevil/PKGBUILD
+++ b/extra/bluedevil/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 180985 2013-03-29 12:10:22Z andrea $
+# $Id: PKGBUILD 194547 2013-09-18 11:33:01Z tomegun $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=bluedevil
-pkgver=1.3.1
+pkgver=1.3.2
 pkgrel=1
 pkgdesc='KDE bluetooth framework'
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,13 +11,13 @@ license=('GPL')
 depends=('kdebase-workspace' 'libbluedevil' 'obex-data-server' 'obexd-client')
 makedepends=('cmake' 'automoc4')
 install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('d21ad78030ffd892bb2ae5c78aa37919')
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
+md5sums=('a43e644fe75bd090c47c060dcbdfdb27')
 
 build(){
   mkdir build
   cd build
-  cmake ../${pkgname}-${pkgver} \
+  cmake ../${pkgname}-v${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr
   make
diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD
index f1c82b6ca..286957cf6 100644
--- a/extra/bluez/PKGBUILD
+++ b/extra/bluez/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 189679 2013-07-04 14:55:32Z tomegun $
+# $Id: PKGBUILD 194652 2013-09-20 13:20:06Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
 
 pkgbase=bluez
 pkgname=('bluez' 'bluez-utils' 'bluez-libs')
-pkgver=5.7
+pkgver=5.9
 pkgrel=1
 url="http://www.bluez.org/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
-makedepends=('libusb-compat' 'dbus' 'libical' 'systemd')
+makedepends=('dbus' 'libical' 'systemd')
 options=(!libtool)
 source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2")
 
@@ -65,11 +65,11 @@ package_bluez-libs() {
 }
 package_bluez-utils() {
   pkgdesc="Development and debugging utilities for the bluetooth protocol stack"
-  depends=('systemd' 'libusb-compat')
+  depends=('systemd')
   conflicts=('bluez-hcidump')
   provides=('bluez-hcidump')
   replaces=('bluez-hcidump' 'bluez<=4.101')
 
   mv "$srcdir/_utils"/* "$pkgdir"
 }
-md5sums=('eb883ce61753bd3f300a531bcc2af49e')
+md5sums=('6edaf60d09ee32942a739f80ea847db1')
diff --git a/extra/boo/PKGBUILD b/extra/boo/PKGBUILD
index 27ae5ff7e..8243ba40e 100644
--- a/extra/boo/PKGBUILD
+++ b/extra/boo/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 149602 2012-02-08 17:29:14Z stephane $
+# $Id: PKGBUILD 195921 2013-10-05 12:22:09Z bpiotrowski $
 # Maintainer: Hugo Doria <hugo@archlinux.org>
 # Contributor: tardo <tardo@nagi-fanboi.net>
 # Contributor: Brice Carpentier <brice@dlfp.org>
 
 pkgname=boo
 pkgver=0.9.4.9
-pkgrel=2
+pkgrel=3
 pkgdesc="A wrist friendly language for the CLI"
 arch=('i686' 'x86_64')
 url="http://boo.codehaus.org/"
diff --git a/extra/brasero/PKGBUILD b/extra/brasero/PKGBUILD
index 06ac2ba34..bb13ee15b 100644
--- a/extra/brasero/PKGBUILD
+++ b/extra/brasero/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 183335 2013-04-21 22:08:35Z heftig $
+# $Id: PKGBUILD 196019 2013-10-07 11:50:33Z jgc $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=brasero
 pkgver=3.8.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A disc burning application for Gnome"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnome.org/projects/brasero"
@@ -20,14 +20,23 @@ optdepends=('libburn: alternative back-end'
 replaces=('nautilus-cd-burner')
 install=brasero.install
 groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('d98a368a6129e50681e8243c5e0833c32cca699bd50b839c6a551d52b396bce4')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+        bug655513.patch)
+sha256sums=('d98a368a6129e50681e8243c5e0833c32cca699bd50b839c6a551d52b396bce4'
+            '3e774040c570881fe120af7c250a91e8a69331289490c823feed87c4d00f98fb')
 
-build() {
+prepare() {
   cd "$pkgname-$pkgver"
 
   # Update tracker dep
   sed -i '/tracker/s/0\.14/0.16/' configure.ac
+
+  # Fix infinite loop after cancelling the burn image dialog
+  patch -Np1 -i ../bug655513.patch
+}
+  
+build() {
+  cd "$pkgname-$pkgver"
   autoreconf -f -v -i
 
   ./configure --prefix=/usr --sysconfdir=/etc \
diff --git a/extra/brasero/bug655513.patch b/extra/brasero/bug655513.patch
new file mode 100644
index 000000000..c5841d3f7
--- /dev/null
+++ b/extra/brasero/bug655513.patch
@@ -0,0 +1,37 @@
+From f122ee0620380b7c21edce722cfe347f10c8c827 Mon Sep 17 00:00:00 2001
+From: Joshua Lock <joshua.lock@intel.com>
+Date: Tue, 03 Sep 2013 10:01:26 +0000
+Subject: brasero-app: don't try and show the main window if it hasn't been created
+
+It's possible to open brasero without creating the main window, such as
+when opening an image file directly triggering the image burning dialogue.
+In these cases trying to show the main window when the dialogue is
+dismissed is an error, brasero should just exit.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=655513
+---
+diff --git a/src/brasero-app.c b/src/brasero-app.c
+index d345941..8d10781 100644
+--- a/src/brasero-app.c
++++ b/src/brasero-app.c
+@@ -2013,6 +2013,9 @@ brasero_app_run_mainwin (BraseroApp *app)
+ 
+ 	priv = BRASERO_APP_PRIVATE (app);
+ 
++	if (!priv->mainwin)
++		return FALSE;
++
+ 	if (priv->mainwin_running)
+ 		return TRUE;
+ 
+@@ -2055,6 +2058,8 @@ brasero_app_init (BraseroApp *object)
+ 
+ 	priv = BRASERO_APP_PRIVATE (object);
+ 
++	priv->mainwin = NULL;
++
+ 	/* Load settings */
+ 	priv->setting = brasero_setting_get_default ();
+ 	brasero_setting_load (priv->setting);
+--
+cgit v0.9.2
diff --git a/extra/cdparanoia/PKGBUILD b/extra/cdparanoia/PKGBUILD
index 3d9096993..db49c0848 100644
--- a/extra/cdparanoia/PKGBUILD
+++ b/extra/cdparanoia/PKGBUILD
@@ -1,24 +1,27 @@
-# $Id: PKGBUILD 149332 2012-02-06 20:43:48Z stephane $
-# Maintainer:
-# Contributor: Alexander Fehr <pizzapunk gmail com>
+# $Id: PKGBUILD 195270 2013-09-29 18:03:20Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=cdparanoia
 pkgver=10.2
-pkgrel=4.2
+pkgrel=5
 pkgdesc="Compact Disc Digital Audio extraction tool"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xiph.org/paranoia/"
 license=('GPL')
 depends=('glibc')
-options=('!makeflags')
-source=("http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-$pkgver.src.tgz"
-        'gcc.patch')
-md5sums=('b304bbe8ab63373924a744eac9ebc652'
-         '12da14958d2b84c6719fe69890436445')
+options=('!makeflags' '!staticlibs')
+source=(http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-$pkgver.src.tgz
+        gcc.patch)
+sha1sums=('1901e20d3a370ca6afa4c76a9ef30d3f03044320'
+          '67faaf0e3eed2e3de6f66d8168604bc6c7295921')
 
-build() {
+prepare() {
   cd "${srcdir}/${pkgname}-III-${pkgver}"
   patch -p0 -i ${srcdir}/gcc.patch
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-III-${pkgver}"
   ./configure --prefix=/usr --mandir=/usr/share/man
   make
 }
diff --git a/extra/cheese/PKGBUILD b/extra/cheese/PKGBUILD
index 8f384caae..a01fa92da 100644
--- a/extra/cheese/PKGBUILD
+++ b/extra/cheese/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 191326 2013-07-23 16:47:58Z jgc $
+# $Id: PKGBUILD 196020 2013-10-07 11:50:34Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=cheese
-pkgver=3.8.3
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Use your webcam to take photos and videos, apply fancy special effects and share the fun with others"
 arch=(i686 x86_64 'mips64el')
@@ -16,7 +16,7 @@ options=('!libtool' '!emptydirs')
 url="http://www.gnome.org/projects/cheese/"
 install=cheese.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('5f08079b6ccaa6ea8de9163ff0e43554347c12e13f0a60eb6ad06d291c116937')
+sha256sums=('eb0d8ba5211a4fe804d540e16a7fb61f16c467e23b106370723c32731b6e620b')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/chromaprint/PKGBUILD b/extra/chromaprint/PKGBUILD
index 20f60941d..63e492395 100644
--- a/extra/chromaprint/PKGBUILD
+++ b/extra/chromaprint/PKGBUILD
@@ -1,22 +1,21 @@
-# $Id: PKGBUILD 191890 2013-08-01 06:53:24Z bpiotrowski $
+# $Id: PKGBUILD 193966 2013-09-09 09:33:12Z bisson $
 # Contributor: Wieland Hoffmann <the_mineo@web.de>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=chromaprint
-pkgver=0.7
-pkgrel=6
+pkgver=1.0
+pkgrel=1
 pkgdesc='Library that implements a custom algorithm for extracting fingerprints from any audio source'
 url='http://acoustid.org/chromaprint/'
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('ffmpeg')
-makedepends=('cmake' 'git')
-source=('git+https://bitbucket.org/acoustid/chromaprint.git#commit=dd51f8e')
-sha1sums=('SKIP')
+makedepends=('cmake')
+source=("https://bitbucket.org/acoustid/${pkgname}/downloads/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('919e012af588a7e6fea862b29a30e3a5da67526a')
 
 build() {
-	cd "${srcdir}/${pkgname}"
-
+	cd "${srcdir}/${pkgname}-${pkgver}"
 	cmake \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_BUILD_TYPE=Release \
@@ -26,6 +25,6 @@ build() {
 }
 
 package() {
-	cd "${srcdir}/${pkgname}"
+	cd "${srcdir}/${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/clamav/PKGBUILD b/extra/clamav/PKGBUILD
index cb5880f62..496ec0b7d 100644
--- a/extra/clamav/PKGBUILD
+++ b/extra/clamav/PKGBUILD
@@ -1,30 +1,30 @@
-# $Id: PKGBUILD 191274 2013-07-23 03:29:14Z bisson $
+# $Id: PKGBUILD 194640 2013-09-20 02:05:29Z 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=3
+pkgver=0.98
+pkgrel=1
 pkgdesc='Anti-virus toolkit for Unix'
 url='http://www.clamav.net/'
 license=('GPL')
 options=('!libtool')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('bzip2' 'libltdl')
-backup=('etc/clamav/clamd.conf' 'etc/clamav/freshclam.conf' 'etc/logrotate.d/clamav')
+backup=('etc/logrotate.d/clamav')
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
         'service'
         'service.fresh'
         'logrotate'
         'tmpfiles.d'
         'config.patch')
-sha1sums=('078c0ac2b4e69d27eecd7544a8361abcd859e73c'
+sha1sums=('1e6a7284721387646c713a8d32fa8b5a897985db'
           'b6ac0c5de1e5b41232b10d4f84e86201c370eaeb'
           'cda9a087e5593992150cb456e34c5f6f589aca82'
           'bb488a56b0f6a0760446cde89c1e3321e2717b78'
           'a224ea9b4d0f4f196827347d54bed51e11c197ea'
-          '1c8ef193919b041135115170acd6313f008de808')
+          '00dfadd93d11186793cb1161745f9dd7370beb99')
 
 install=install
 
@@ -49,11 +49,6 @@ package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install
 
-	# Make sure conf files get installed, because make install
-	# doesn't do that if clamav is already installed upon building.
-	install -Dm644 etc/clamd.conf "${pkgdir}"/etc/clamav/clamd.conf
-	install -Dm644 etc/freshclam.conf "${pkgdir}"/etc/clamav/freshclam.conf
-
 	install -Dm644 ../service.fresh "${pkgdir}"/usr/lib/systemd/system/freshclamd.service
 	install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/clamd.service
 	install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/clamav.conf
diff --git a/extra/clamav/config.patch b/extra/clamav/config.patch
index 0640df2c3..0b552b3f9 100644
--- a/extra/clamav/config.patch
+++ b/extra/clamav/config.patch
@@ -1,6 +1,6 @@
-diff -arU 0 old/etc/clamd.conf new/etc/clamd.conf
---- old/etc/clamd.conf	2010-12-02 19:31:21.773357389 +0100
-+++ new/etc/clamd.conf	2010-12-02 19:31:45.873357389 +0100
+diff -arU 0 old/etc/clamd.conf.sample new/etc/clamd.conf.sample
+--- old/etc/clamd.conf.sample	2010-12-02 19:31:21.773357389 +0100
++++ new/etc/clamd.conf.sample	2010-12-02 19:31:45.873357389 +0100
 @@ -14 +14 @@
 -#LogFile /tmp/clamd.log
 +LogFile /var/log/clamav/clamd.log
@@ -19,9 +19,9 @@ diff -arU 0 old/etc/clamd.conf new/etc/clamd.conf
 @@ -190 +190 @@
 -#User clamav
 +User clamav
-diff -arU 0 old/etc/freshclam.conf new/etc/freshclam.conf
---- old/etc/freshclam.conf	2010-12-02 19:31:21.773357389 +0100
-+++ new/etc/freshclam.conf	2010-12-02 19:31:51.190024057 +0100
+diff -arU 0 old/etc/freshclam.conf.sample new/etc/freshclam.conf.sample
+--- old/etc/freshclam.conf.sample	2010-12-02 19:31:21.773357389 +0100
++++ new/etc/freshclam.conf.sample	2010-12-02 19:31:51.190024057 +0100
 @@ -17 +17 @@
 -#UpdateLogFile /var/log/freshclam.log
 +UpdateLogFile /var/log/clamav/freshclam.log
diff --git a/extra/clutter-gst/PKGBUILD b/extra/clutter-gst/PKGBUILD
index 637d67be0..8c585e8d4 100644
--- a/extra/clutter-gst/PKGBUILD
+++ b/extra/clutter-gst/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 191304 2013-07-23 13:13:07Z heftig $
+# $Id: PKGBUILD 196022 2013-10-07 11:50:36Z jgc $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 
 pkgname=clutter-gst
-pkgver=2.0.6
+pkgver=2.0.8
 pkgrel=1
 pkgdesc="GStreamer bindings for clutter"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=(clutter gst-plugins-base-libs libxdamage gst-plugins-bad)
 makedepends=(gobject-introspection)
 options=('!libtool')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('0ecc5630b0578968201802b831a75904a26e6ffe38fb8b60209ef9da51f8b258')
+sha256sums=('cee6b0667c74a54fdf43f0ec7c1dc8ff0ffd1c594e0d43529de45048f8080a4d')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/clutter-gtk/PKGBUILD b/extra/clutter-gtk/PKGBUILD
index f0c446e13..a8f647fd2 100644
--- a/extra/clutter-gtk/PKGBUILD
+++ b/extra/clutter-gtk/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 189885 2013-07-10 14:58:18Z jgc $
+# $Id: PKGBUILD 196023 2013-10-07 11:50:36Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=clutter-gtk
 pkgver=1.4.4
-pkgrel=3
+pkgrel=4
 pkgdesc="GTK clutter widget"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://clutter-project.org/"
diff --git a/extra/clutter/PKGBUILD b/extra/clutter/PKGBUILD
index 2b0a30eea..8444153f9 100644
--- a/extra/clutter/PKGBUILD
+++ b/extra/clutter/PKGBUILD
@@ -1,25 +1,26 @@
-# $Id: PKGBUILD 190119 2013-07-15 21:53:44Z tomegun $
+# $Id: PKGBUILD 196021 2013-10-07 11:50:34Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=clutter
-pkgver=1.14.4
-pkgrel=3
+pkgver=1.16.0
+pkgrel=1
 pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://clutter-project.org/"
 options=('!libtool')
 license=('LGPL')
-depends=('cogl' 'mesa' 'json-glib' 'atk' 'libxi' 'libxkbcommon')
+depends=('cogl' 'mesa' 'json-glib' 'atk' 'libxi' 'libxkbcommon' 'libevdev')
 makedepends=('gobject-introspection')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('c996d91fff6fff24d9e23dcd545439ebc6b999fb1cf9ee44c28ca54c49c0ee1c')
+sha256sums=('a213c7859051d6d19b5550c7e433757a35aa8e2b61a43d2eae83dd87912ea8ae')
 
 build() {
   cd "$pkgname-$pkgver"
   ./configure --prefix=/usr --enable-introspection \
-    --enable-wayland-backend --enable-egl-backend --enable-evdev-input
+    --enable-wayland-backend --enable-egl-backend --enable-evdev-input \
+    --enable-wayland-compositor
 
   # https://bugzilla.gnome.org/show_bug.cgi?id=655517
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
diff --git a/extra/cogl/PKGBUILD b/extra/cogl/PKGBUILD
index 573c9b350..86cdbef17 100644
--- a/extra/cogl/PKGBUILD
+++ b/extra/cogl/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 190118 2013-07-15 21:53:44Z tomegun $
+# $Id: PKGBUILD 196024 2013-10-07 11:50:37Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=cogl
-pkgver=1.14.0
-pkgrel=4
+pkgver=1.16.0
+pkgrel=2
 pkgdesc="An object oriented GL/GLES Abstraction/Utility Layer"
 arch=(mips64el)
 url="http://www.clutter-project.org/"
@@ -12,12 +12,14 @@ depends=('libdrm' 'libxext' 'libxdamage' 'libxcomposite' 'gdk-pixbuf2' 'pango')
 makedepends=('mesa' 'gobject-introspection')
 options=(!libtool !emptydirs)
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('276e8c9f5ff0fcd57c1eaf74cc245f41ad469a95a18ac831fac2d5960baa5ae8')
+sha256sums=('75c2c4636a050fda7ee8722ce3d9c618b08799ed92bbb72b4fdff3e73b096094')
 
 build() {
   cd "$pkgname-$pkgver"
   ./configure --prefix=/usr \
-    --enable-wayland-egl-platform --enable-gles{1,2}
+    --enable-gles{1,2} \
+    --enable-{kms,wayland}-egl-platform \
+    --enable-wayland-egl-server
 
   # https://bugzilla.gnome.org/show_bug.cgi?id=655517
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
diff --git a/extra/cyrus-sasl/CVE-2013-4122.patch b/extra/cyrus-sasl/CVE-2013-4122.patch
new file mode 100644
index 000000000..d6b9800e6
--- /dev/null
+++ b/extra/cyrus-sasl/CVE-2013-4122.patch
@@ -0,0 +1,116 @@
+From dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d Mon Sep 17 00:00:00 2001
+From: mancha <mancha1@hush.com>
+Date: Thu, 11 Jul 2013 09:08:07 +0000
+Subject: Handle NULL returns from glibc 2.17+ crypt()
+
+Starting with glibc 2.17 (eglibc 2.17), crypt() fails with EINVAL
+(w/ NULL return) if the salt violates specifications. Additionally,
+on FIPS-140 enabled Linux systems, DES/MD5-encrypted passwords
+passed to crypt() fail with EPERM (w/ NULL return).
+
+When using glibc's crypt(), check return value to avoid a possible
+NULL pointer dereference.
+
+Patch by mancha1@hush.com.
+---
+diff --git a/pwcheck/pwcheck_getpwnam.c b/pwcheck/pwcheck_getpwnam.c
+index 4b34222..400289c 100644
+--- a/pwcheck/pwcheck_getpwnam.c
++++ b/pwcheck/pwcheck_getpwnam.c
+@@ -32,6 +32,7 @@ char *userid;
+ char *password;
+ {
+     char* r;
++    char* crpt_passwd;
+     struct passwd *pwd;
+ 
+     pwd = getpwnam(userid);
+@@ -41,7 +42,7 @@ char *password;
+     else if (pwd->pw_passwd[0] == '*') {
+ 	r = "Account disabled";
+     }
+-    else if (strcmp(pwd->pw_passwd, crypt(password, pwd->pw_passwd)) != 0) {
++    else if (!(crpt_passwd = crypt(password, pwd->pw_passwd)) || strcmp(pwd->pw_passwd, (const char *)crpt_passwd) != 0) {
+ 	r = "Incorrect password";
+     }
+     else {
+diff --git a/pwcheck/pwcheck_getspnam.c b/pwcheck/pwcheck_getspnam.c
+index 2b11286..6d607bb 100644
+--- a/pwcheck/pwcheck_getspnam.c
++++ b/pwcheck/pwcheck_getspnam.c
+@@ -32,13 +32,15 @@ char *userid;
+ char *password;
+ {
+     struct spwd *pwd;
++    char *crpt_passwd;
+ 
+     pwd = getspnam(userid);
+     if (!pwd) {
+ 	return "Userid not found";
+     }
+     
+-    if (strcmp(pwd->sp_pwdp, crypt(password, pwd->sp_pwdp)) != 0) {
++    crpt_passwd = crypt(password, pwd->sp_pwdp);
++    if (!crpt_passwd || strcmp(pwd->sp_pwdp, (const char *)crpt_passwd) != 0) {
+ 	return "Incorrect password";
+     }
+     else {
+diff --git a/saslauthd/auth_getpwent.c b/saslauthd/auth_getpwent.c
+index fc8029d..d4ebe54 100644
+--- a/saslauthd/auth_getpwent.c
++++ b/saslauthd/auth_getpwent.c
+@@ -77,6 +77,7 @@ auth_getpwent (
+ {
+     /* VARIABLES */
+     struct passwd *pw;			/* pointer to passwd file entry */
++    char *crpt_passwd;			/* encrypted password */
+     int errnum;
+     /* END VARIABLES */
+   
+@@ -105,7 +106,8 @@ auth_getpwent (
+ 	}
+     }
+ 
+-    if (strcmp(pw->pw_passwd, (const char *)crypt(password, pw->pw_passwd))) {
++    crpt_passwd = crypt(password, pw->pw_passwd);
++    if (!crpt_passwd || strcmp(pw->pw_passwd, (const char *)crpt_passwd)) {
+ 	if (flags & VERBOSE) {
+ 	    syslog(LOG_DEBUG, "DEBUG: auth_getpwent: %s: invalid password", login);
+ 	}
+diff --git a/saslauthd/auth_shadow.c b/saslauthd/auth_shadow.c
+index 677131b..1988afd 100644
+--- a/saslauthd/auth_shadow.c
++++ b/saslauthd/auth_shadow.c
+@@ -210,8 +210,8 @@ auth_shadow (
+ 	RETURN("NO Insufficient permission to access NIS authentication database (saslauthd)");
+     }
+ 
+-    cpw = strdup((const char *)crypt(password, sp->sp_pwdp));
+-    if (strcmp(sp->sp_pwdp, cpw)) {
++    cpw = crypt(password, sp->sp_pwdp);
++    if (!cpw || strcmp(sp->sp_pwdp, (const char *)cpw)) {
+ 	if (flags & VERBOSE) {
+ 	    /*
+ 	     * This _should_ reveal the SHADOW_PW_LOCKED prefix to an
+@@ -221,10 +221,8 @@ auth_shadow (
+ 	    syslog(LOG_DEBUG, "DEBUG: auth_shadow: pw mismatch: '%s' != '%s'",
+ 		   sp->sp_pwdp, cpw);
+ 	}
+-	free(cpw);
+ 	RETURN("NO Incorrect password");
+     }
+-    free(cpw);
+ 
+     /*
+      * The following fields will be set to -1 if:
+@@ -286,7 +284,7 @@ auth_shadow (
+ 	RETURN("NO Invalid username");
+     }
+   
+-    if (strcmp(upw->upw_passwd, crypt(password, upw->upw_passwd)) != 0) {
++    if (!(cpw = crypt(password, upw->upw_passwd)) || (strcmp(upw->upw_passwd, (const char *)cpw) != 0)) {
+ 	if (flags & VERBOSE) {
+ 	    syslog(LOG_DEBUG, "auth_shadow: pw mismatch: %s != %s",
+ 		   password, upw->upw_passwd);
+--
+cgit v0.9.2
diff --git a/extra/cyrus-sasl/PKGBUILD b/extra/cyrus-sasl/PKGBUILD
index 07cf8e0cb..4fdfe49ad 100644
--- a/extra/cyrus-sasl/PKGBUILD
+++ b/extra/cyrus-sasl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 187053 2013-06-03 11:16:18Z allan $
+# $Id: PKGBUILD 195995 2013-10-07 10:32:45Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 # This package spans multiple repositories. 
@@ -8,7 +8,7 @@ pkgbase=('cyrus-sasl')
 pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
 #pkgname=libsasl
 pkgver=2.1.26
-pkgrel=4
+pkgrel=6
 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cyrusimap.web.cmu.edu/"
@@ -25,7 +25,8 @@ source=(ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${pkgver}.tar.gz
         0030-dont_use_la_files_for_opening_plugins.patch
         saslauthd.service
         saslauthd.conf.d
-        tmpfiles.conf)
+        tmpfiles.conf
+        CVE-2013-4122.patch)
 md5sums=('a7f4e5e559a0e37b3ffc438c9456e425'
          '79b8a5e8689989e2afd4b7bda595a7b1'
          'f45aa8c42b32e0569ab3d14a83485b37'
@@ -36,21 +37,27 @@ md5sums=('a7f4e5e559a0e37b3ffc438c9456e425'
          '8e7106f32e495e9ade69014fd1b3352a'
          '3499dcd610ad1ad58e0faffde2aa7a23'
          '49219af5641150edec288a3fdb65e7c1'
-         '45bb0192d2f188066240b9a66ee6365f')
+         '45bb0192d2f188066240b9a66ee6365f'
+         'c5f0ec88c584a75c14d7f402eaeed7ef')
+
+prepare() {
+  cd cyrus-sasl-$pkgver
+  patch -Np1 -i ../cyrus-sasl-2.1.22-qa.patch
+  patch -Np1 -i ../cyrus-sasl-2.1.26-size_t.patch
+  patch -Np1 -i ../0010_maintainer_mode.patch
+  patch -Np1 -i ../0011_saslauthd_ac_prog_libtool.patch
+  patch -Np1 -i ../0025_ld_as_needed.patch
+  patch -Np1 -i ../0026_drop_krb5support_dependency.patch
+  patch -Np1 -i ../0030-dont_use_la_files_for_opening_plugins.patch
+  patch -Np1 -i ../CVE-2013-4122.patch
+
+  sed 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.in
+}
 
 build() {
   export CFLAGS="$CFLAGS -fPIC"
+  cd cyrus-sasl-$pkgver
 
-  cd "${srcdir}/cyrus-sasl-${pkgver}"
-  patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-qa.patch"
-  patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.26-size_t.patch"
-  patch -Np1 -i "${srcdir}/0010_maintainer_mode.patch"
-  patch -Np1 -i "${srcdir}/0011_saslauthd_ac_prog_libtool.patch"
-  patch -Np1 -i "${srcdir}/0025_ld_as_needed.patch"
-  patch -Np1 -i "${srcdir}/0026_drop_krb5support_dependency.patch"
-  patch -Np1 -i "${srcdir}/0030-dont_use_la_files_for_opening_plugins.patch"
-
-  sed 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.in
   rm -f config/config.guess config/config.sub 
   rm -f config/ltconfig config/ltmain.sh config/libtool.m4
   rm -fr autom4te.cache
@@ -111,7 +118,7 @@ package_libsasl() {
   depends=('openssl')
   conflicts=('cyrus-sasl-plugins')
 
-  cd "${srcdir}/cyrus-sasl-${pkgver}"
+  cd cyrus-sasl-$pkgver
   for dir in include lib sasldb plugins utils; do
     pushd ${dir}
     make DESTDIR="${pkgdir}" install
@@ -130,7 +137,7 @@ package_cyrus-sasl() {
   pkgdesc="Cyrus saslauthd SASL authentication daemon"
   backup=('etc/conf.d/saslauthd')
 
-  cd "${srcdir}/cyrus-sasl-${pkgver}/saslauthd"
+  cd cyrus-sasl-$pkgver/saslauthd
   make DESTDIR="${pkgdir}" install
   install -Dm644 "${srcdir}/saslauthd.conf.d" "${pkgdir}/etc/conf.d/saslauthd"
   install -Dm644 "${srcdir}/saslauthd.service" "${pkgdir}/usr/lib/systemd/system/saslauthd.service"
@@ -145,7 +152,7 @@ package_cyrus-sasl-gssapi() {
   depends=("libsasl=${pkgver}" 'krb5')
   replaces=('cyrus-sasl-plugins')
 
-  cd "${srcdir}/cyrus-sasl-${pkgver}/plugins"
+  cd cyrus-sasl-$pkgver/plugins
   install -m755 -d "${pkgdir}/usr/lib/sasl2"
   cp -a .libs/libgssapiv2.so* "${pkgdir}/usr/lib/sasl2/"
   cp -a .libs/libgs2.so* "${pkgdir}/usr/lib/sasl2/"
@@ -159,7 +166,7 @@ package_cyrus-sasl-ldap() {
   depends=("libsasl=${pkgver}" 'libldap')
   replaces=('cyrus-sasl-plugins')
 
-  cd "${srcdir}/cyrus-sasl-${pkgver}/plugins"
+  cd cyrus-sasl-$pkgver/plugins
   install -m755 -d "${pkgdir}/usr/lib/sasl2"
   cp -a .libs/libldapdb.so* "${pkgdir}/usr/lib/sasl2/"
 
@@ -172,7 +179,7 @@ package_cyrus-sasl-sql() {
   depends=("libsasl=${pkgver}" 'postgresql-libs' 'libmariadbclient' 'sqlite2')
   replaces=('cyrus-sasl-plugins')
 
-  cd "${srcdir}/cyrus-sasl-${pkgver}/plugins"
+  cd cyrus-sasl-$pkgver/plugins
   install -m755 -d "${pkgdir}/usr/lib/sasl2"
   cp -a .libs/libsql.so* "${pkgdir}/usr/lib/sasl2/"
 
diff --git a/extra/dconf/PKGBUILD b/extra/dconf/PKGBUILD
index 4080832c2..0dccaad2b 100644
--- a/extra/dconf/PKGBUILD
+++ b/extra/dconf/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 190798 2013-07-16 21:17:38Z heftig $
+# $Id: PKGBUILD 196025 2013-10-07 11:50:38Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=dconf
-pkgver=0.16.1
+pkgver=0.18.0
 pkgrel=1
 pkgdesc="A low-level configuration system."
 arch=(i686 x86_64 'mips64el')
@@ -13,7 +13,7 @@ makedepends=('vala' 'gtk3' 'intltool' 'docbook-xsl' 'python' 'python2')
 optdepends=('gtk3: for dconf-editor')
 install=dconf.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('a551d04d06599ee9adde500c71ad8567d68f45420b6dbca10ca51e2834d80fee')
+sha256sums=('109b1bc6078690af1ed88cb144ef5c5aee7304769d8bdc82ed48c3696f10c955')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/desktop-file-utils/ChangeLog b/extra/desktop-file-utils/ChangeLog
deleted file mode 100644
index 8941e4825..000000000
--- a/extra/desktop-file-utils/ChangeLog
+++ /dev/null
@@ -1,7 +0,0 @@
-2008-07-22  Alexander Fehr  <pizzapunk gmail com>
-
-  * desktop-file-utils-0.15-1:
-  New upstream release.
-  New maintainer.
-  Changed url.
-  Added ChangeLog.
diff --git a/extra/desktop-file-utils/PKGBUILD b/extra/desktop-file-utils/PKGBUILD
index 2493e0774..89c67e814 100644
--- a/extra/desktop-file-utils/PKGBUILD
+++ b/extra/desktop-file-utils/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 174820 2013-01-07 18:41:05Z andyrtr $
+# $Id: PKGBUILD 196163 2013-10-07 12:38:06Z jgc $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 
 pkgname=desktop-file-utils
-pkgver=0.21
+pkgver=0.22
 pkgrel=1
 pkgdesc="Command line utilities for working with desktop entries"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ url="http://www.freedesktop.org/wiki/Software/desktop-file-utils"
 license=('GPL')
 depends=('glib2')
 source=(http://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-${pkgver}.tar.xz)
-md5sums=('fda5c312c9fb3b8d818fb54f2c34db82')
+sha256sums=('843532672692f98e9b2d6ae6cc8658da562dfde1606c7f33d9d227a344de56c5')
 
 build() {
   cd "${srcdir}/desktop-file-utils-${pkgver}"
diff --git a/extra/devhelp/PKGBUILD b/extra/devhelp/PKGBUILD
index 2a5913115..a2f70e87c 100644
--- a/extra/devhelp/PKGBUILD
+++ b/extra/devhelp/PKGBUILD
@@ -1,28 +1,27 @@
-# $Id: PKGBUILD 191281 2013-07-23 09:52:37Z jgc $
+# $Id: PKGBUILD 196026 2013-10-07 11:50:39Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Link Dupont <link@subpop.net>
 
 pkgname=devhelp
-pkgver=3.8.2
-pkgrel=2
+pkgver=3.10.0
+pkgrel=1
 pkgdesc="API documentation browser for GNOME"
 arch=(i686 x86_64 'mips64el')
 license=(GPL)
 url="http://live.gnome.org/devhelp/"
-depends=(webkitgtk3 hicolor-icon-theme)
+depends=(webkitgtk hicolor-icon-theme)
 makedepends=(pkgconfig intltool python)
 options=('!libtool' '!emptydirs')
 install=devhelp.install
 groups=('gnome-extra')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('a245b53824c6f2ff89245ff807bb2140bde74951ea6f1d759a0fd0c6959ca9f7')
+sha256sums=('4d28d21a0331c67086607b737147947b288416ab38c8a0b0264f7a63bd4fce9b')
 
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --with-webkit2
+      --localstatedir=/var --disable-static
   make
 }
 
diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD
index 7443af532..89ea54bca 100644
--- a/extra/digikam/PKGBUILD
+++ b/extra/digikam/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 193384 2013-08-19 10:05:42Z andrea $
+# $Id: PKGBUILD 195970 2013-10-06 19:03:45Z ronald $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgbase=digikam
 pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki')
-pkgver=3.3.0
-pkgrel=2
+pkgver=3.4.0
+pkgrel=1
 pkgdesc="Digital photo management application for KDE"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -15,7 +15,7 @@ makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr'
              'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin' 'libgphoto2'
              'cmake' 'automoc4' 'doxygen' 'lensfun' 'qt-gstreamer' 'imagemagick')
 source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('ecf8d9eca918059cdd90ef3538295ee9873fb55f')
+sha1sums=('9ed0ef7a7eda8660edf44b1e89354f110e487373')
 
 prepare() {
   mkdir build
diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD
index c9f3fb2d2..a69f783e9 100644
--- a/extra/dovecot/PKGBUILD
+++ b/extra/dovecot/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 192152 2013-08-06 14:10:47Z andyrtr $
+# $Id: PKGBUILD 195140 2013-09-25 15:41:44Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Paul Mattal <paul@mattal.com>
 # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
@@ -8,7 +8,7 @@
 # --->>> remember to rebuild/bump pigeonhole in one step <<<---
 
 pkgname=dovecot
-pkgver=2.2.5
+pkgver=2.2.6
 pkgrel=1
 pkgdesc="An IMAP and POP3 server written with security primarily in mind"
 arch=('i686' 'x86_64' 'mips64el')
@@ -24,7 +24,7 @@ options=('!libtool')
 install=$pkgname.install
 source=(http://dovecot.org/releases/2.2/${pkgname}-${pkgver}.tar.gz{,.sig}
         dovecot.tmpfilesd)
-md5sums=('0096442e2a1739b1b7997a833248a263'
+md5sums=('db65988ef2e6889dd8b49c132b21fc8f'
          'SKIP'
          '342a28251d40f983c98c0d1f1bf3d07d')
 
@@ -32,7 +32,7 @@ build() {
   cd ${srcdir}/$pkgname-$pkgver
 
   # fix build with recent clucene (FC)
-  sed -i '/DEFAULT_INCLUDES *=/s|$| '"$(pkg-config --cflags libclucene-core)|" src/plugins/fts-lucene/Makefile.in
+#  sed -i '/DEFAULT_INCLUDES *=/s|$| '"$(pkg-config --cflags libclucene-core)|" src/plugins/fts-lucene/Makefile.in
   
   # fix path in helper script
   sed -i 's:OPENSSLCONFIG=${OPENSSLCONFIG-dovecot-openssl.cnf}:OPENSSLCONFIG=${OPENSSLCONFIG- /etc/ssl/dovecot-openssl.cnf}:' doc/mkcert.sh
diff --git a/extra/efilinux-efi/PKGBUILD b/extra/efilinux-efi/PKGBUILD
deleted file mode 100644
index bd75029c5..000000000
--- a/extra/efilinux-efi/PKGBUILD
+++ /dev/null
@@ -1,62 +0,0 @@
-# Contributor : Keshav Padram <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
-
-_gitroot="git://git.kernel.org/pub/scm/boot/efilinux/efilinux.git"
-_gitname="efilinux"
-_gitbranch="master"
-
-pkgname="efilinux-efi"
-pkgver="1.0"
-pkgrel="8"
-pkgdesc="Simple UEFI Linux bootloader - Precursor to EFISTUB"
-url="https://github.com/mfleming/efilinux"
-arch=('x86_64' 'i686')
-license=('GPL')
-makedepends=('gnu-efi-libs')
-depends=('dosfstools' 'efibootmgr')
-options=('!strip')
-install="${pkgname}.install"
-
-source=("${_gitname}::git+${_gitroot}#branch=${_gitbranch}")
-sha1sums=('SKIP')
-
-[[ "${CARCH}" == "x86_64" ]] && _EFI_ARCH="x86_64"
-[[ "${CARCH}" == "i686" ]] && _EFI_ARCH="ia32"
-
-[[ "${CARCH}" == "x86_64" ]] && _EFI_S_ARCH="x64"
-[[ "${CARCH}" == "i686" ]] && _EFI_S_ARCH="ia32"
-
-build() {
-	
-	rm -rf "${srcdir}/efilinux-${pkgver}/" || true
-	cp -r "${srcdir}/${_gitname}" "${srcdir}/efilinux-${pkgver}"
-	
-	cd "${srcdir}/efilinux-${pkgver}/"
-	
-	## Add "-fno-strict-aliasing -fno-stack-protector -fno-stack-check -mno-sse -mno-mmx" to CFLAGS
-	sed 's|-DEFI_FUNCTION_WRAPPER|-fno-strict-aliasing -fno-stack-protector -fno-stack-check -mno-sse -mno-mmx -DEFI_FUNCTION_WRAPPER|g' -i "${srcdir}/efilinux-${pkgver}/Makefile"
-	
-	## Add -DGNU_EFI_USE_MS_ABI to CFLAGS
-	sed 's|-DEFI_FUNCTION_WRAPPER|-DEFI_FUNCTION_WRAPPER -DGNU_EFI_USE_MS_ABI|g' -i "${srcdir}/efilinux-${pkgver}/Makefile"
-	
-	## Add -m64 for x86_64 build
-	sed 's|CFLAGS += -mno-red-zone|CFLAGS += -m64 -mno-red-zone|g' -i "${srcdir}/efilinux-${pkgver}/Makefile"
-	
-	## Unset all compiler FLAGS
-	unset CFLAGS
-	unset CPPFLAGS
-	unset CXXFLAGS
-	unset LDFLAGS
-	unset MAKEFLAGS
-	
-	make CRT0="/usr/lib/crt0-efi-${_EFI_ARCH}.o" LDSCRIPT="/usr/lib/elf_${_EFI_ARCH}_efi.lds"
-	
-}
-
-package() {
-	
-	cd "${srcdir}/efilinux-${pkgver}/"
-	
-	install -d "${pkgdir}/usr/lib/efilinux/"
-	install -D -m0644 "${srcdir}/efilinux-${pkgver}/efilinux.efi" "${pkgdir}/usr/lib/efilinux/efilinux${_EFI_S_ARCH}.efi"
-	
-}
diff --git a/extra/efilinux-efi/efilinux-efi.install b/extra/efilinux-efi/efilinux-efi.install
deleted file mode 100644
index 6d6e817c5..000000000
--- a/extra/efilinux-efi/efilinux-efi.install
+++ /dev/null
@@ -1,23 +0,0 @@
-post_install() {
-	
-	cat << EOF 
-
-efilinux has been installed at /usr/lib/efilinux/*.efi
-
-Copy the efi application for your UEFI ARCH to a sub-directory of
-<EFISYS>/EFI/ and add an entry to firmware boot menu using efibootmgr
-or mactel-boot (for Macs)
-
-Usage instructions at http://thread.gmane.org/gmane.linux.kernel/1172645 
-and http://article.gmane.org/gmane.linux.kernel/1175060
-
-EOF
-	
-}
-
-post_upgrade() {
-	
-	post_install
-	
-}
-
diff --git a/extra/ekiga/PKGBUILD b/extra/ekiga/PKGBUILD
index a324d9bb3..a2c0f7f81 100644
--- a/extra/ekiga/PKGBUILD
+++ b/extra/ekiga/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 190037 2013-07-13 12:40:41Z svenstaro $
+# $Id: PKGBUILD 196027 2013-10-07 11:50:40Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tom K <tomk@runbox.com>
 
 pkgname=ekiga
 pkgver=4.0.1
-pkgrel=5
+pkgrel=6
 pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)"
 url="http://www.ekiga.org"
 license=(GPL)
diff --git a/extra/elfutils/PKGBUILD b/extra/elfutils/PKGBUILD
index b09cf7948..ef98832e7 100644
--- a/extra/elfutils/PKGBUILD
+++ b/extra/elfutils/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 189328 2013-07-03 01:24:05Z eric $
+# $Id: PKGBUILD 194689 2013-09-22 08:17:23Z lcarlier $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Andrej Gelenberg <andrej.gelenberg@udo.edu>
 
 pkgname=elfutils
-pkgver=0.155
+pkgver=0.156
 pkgrel=1
 pkgdesc="Libraries and utilities to handle ELF object files and DWARF debugging information"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,23 +13,16 @@ depends=('gcc-libs' 'zlib' 'bzip2' 'xz')
 provides=('libelf')
 replaces=('libelf')
 conflicts=('libelf')
-options=('!makeflags')
-source=(https://fedorahosted.org/releases/e/l/elfutils/${pkgver}/elfutils-${pkgver}.tar.bz2{,.sig}
-        elfutils-0.155-binutils-pr-ld-13621.patch)
-sha1sums=('1b96084cd9fe037c1c0bd2c280aaa701f913462b'
-          'fcd0ebd029b305bf030983daf151a2a1ab5294af'
-          '8a8be7c0686c6311c1ce969ba10494e704ead48c')
-
-prepare() {
-  cd ${pkgname}-${pkgver}
-  patch -Np1 -i ../elfutils-0.155-binutils-pr-ld-13621.patch
-  sed -i -e 's:-Werror::g' $(find -name Makefile.in)
-}
+source=(https://fedorahosted.org/releases/e/l/elfutils/${pkgver}/elfutils-${pkgver}.tar.bz2{,.sig})
+sha1sums=('48b30828eb0fb47787e45d80db05c05bbe0eaa76'
+          'SKIP')
 
 build() {
   cd ${pkgname}-${pkgver}
+
   CFLAGS+=" -g"  # required for test-suite success
   ./configure --prefix=/usr --program-prefix="eu-"
+
   make
 }
 
@@ -41,5 +34,6 @@ check() {
 
 package() {
   cd ${pkgname}-${pkgver}
+
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/elfutils/elfutils-0.155-binutils-pr-ld-13621.patch b/extra/elfutils/elfutils-0.155-binutils-pr-ld-13621.patch
deleted file mode 100644
index 7f99ac0be..000000000
--- a/extra/elfutils/elfutils-0.155-binutils-pr-ld-13621.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/tests/run-elflint-self.sh b/tests/run-elflint-self.sh
-index 4b01008..7a5f0c8 100755
---- a/tests/run-elflint-self.sh
-+++ b/tests/run-elflint-self.sh
-@@ -18,4 +18,11 @@
- 
- . $srcdir/test-subr.sh
- 
-+# Makes sure we exit cleanly even when we don't...
-+clean_exit()
-+{
-+  if test $? != 0; then echo "binutils PR ld/13621 workaround"; exit 0; fi
-+}
-+trap clean_exit EXIT
-+
- testrun_on_self ../src/elflint --quiet --gnu-ld
diff --git a/extra/empathy/PKGBUILD b/extra/empathy/PKGBUILD
index 0ba87960e..40fd956d0 100644
--- a/extra/empathy/PKGBUILD
+++ b/extra/empathy/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 186309 2013-05-24 14:23:00Z heftig $
+# $Id: PKGBUILD 196028 2013-10-07 11:50:41Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=empathy
-pkgver=3.8.3
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="A GNOME instant messaging client using the Telepathy framework."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://live.gnome.org/Empathy"
 license=(GPL2)
-depends=(clutter-gst clutter-gtk folks gcr iso-codes libcanberra libpulse webkitgtk3 telepathy-farstream telepathy-glib telepathy-logger telepathy-mission-control)
+depends=(clutter-gst clutter-gtk folks gcr iso-codes libcanberra libpulse webkitgtk telepathy-farstream telepathy-glib telepathy-logger telepathy-mission-control geoclue2 geocode-glib cheese libchamplain)
 makedepends=(intltool itstool docbook-xsl python2)
 optdepends=('telepathy-gabble: XMPP/Jabber support'
             'telepathy-idle: IRC support'
@@ -18,8 +18,8 @@ optdepends=('telepathy-gabble: XMPP/Jabber support'
 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=('61e547c6f0929b3111219349482e2395a32f41bbd0852046405d835acba965c0')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('5580bdba9faec0518b3328d5dc23f03dc0cf25ccf6c14902f306838c23d5918f')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/eog-plugins/PKGBUILD b/extra/eog-plugins/PKGBUILD
index d781aa20f..35a0946c0 100644
--- a/extra/eog-plugins/PKGBUILD
+++ b/extra/eog-plugins/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 186992 2013-06-02 19:43:30Z heftig $
+# $Id: PKGBUILD 196030 2013-10-07 11:50:43Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=eog-plugins
-pkgver=3.8.1
-pkgrel=2
+pkgver=3.10.0
+pkgrel=1
 pkgdesc="Plugins for Eye of Gnome"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnome.org/"
@@ -13,7 +13,7 @@ makedepends=('intltool')
 install=eog-plugins.install
 options=('!libtool')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('5cf8dab5b6622b9e712da4094185112cc84baa96f2775cc76bf654b1c443cfb9')
+sha256sums=('0e6699c45181264e87f34a6eb03deeadfd5d73e35995772b7afc803e8218906d')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/eog/PKGBUILD b/extra/eog/PKGBUILD
index b60bc2c34..43e05dd2d 100644
--- a/extra/eog/PKGBUILD
+++ b/extra/eog/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 185427 2013-05-14 09:33:41Z heftig $
+# $Id: PKGBUILD 196029 2013-10-07 11:50:42Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=eog
-pkgver=3.8.2
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Eye of Gnome: An image viewing and cataloging program"
 arch=(i686 x86_64 mips64el)
@@ -15,7 +15,7 @@ groups=(gnome)
 options=('!emptydirs' '!libtool')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('689251b6dd18ef191cbfd9431c0324c70707b60edd73d86fc014bd8ae0bd8336')
+sha256sums=('d449abfba8ac460b9d9af17778a0f2ffed5c983e74232596b807c3a99f11a1da')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/evince/PKGBUILD b/extra/evince/PKGBUILD
index 6107d244f..230f99612 100644
--- a/extra/evince/PKGBUILD
+++ b/extra/evince/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 189847 2013-07-09 13:12:40Z heftig $
+# $Id: PKGBUILD 196032 2013-10-07 11:50:46Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evince
-pkgver=3.8.3
-pkgrel=1
+pkgver=3.10.0
+pkgrel=2
 pkgdesc="Simply a document viewer"
 url="http://projects.gnome.org/evince/"
 arch=(i686 x86_64 mips64el)
@@ -11,12 +11,15 @@ license=(GPL)
 depends=(gtk3 libgxps libspectre gsfonts poppler-glib djvulibre gnome-icon-theme t1lib libsecret desktop-file-utils dconf gsettings-desktop-schemas)
 makedepends=(itstool libnautilus-extension texlive-bin intltool gobject-introspection docbook-xsl python)
 optdepends=('texlive-bin: DVI support'
-	    'gvfs: bookmark support and session saving')
+	    'gvfs: bookmark support and session saving'
+            'p7zip: cbz and cb7 compressed comic books'
+            'tar: cbt compressed comic books'
+            'unrar: cbr compressed comic books')
 groups=(gnome)
 install=evince.install
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('1526921201fabe833733e7c2552dfbe62085fd18d325a27c2fffb332e5e418bd')
+sha256sums=('495e855af3f071277d79be97a36bf39938d13d09530e80412fed4b7c0b1bdd3e')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/evolution-data-server/PKGBUILD b/extra/evolution-data-server/PKGBUILD
index e6d5812df..70e175b5d 100644
--- a/extra/evolution-data-server/PKGBUILD
+++ b/extra/evolution-data-server/PKGBUILD
@@ -1,45 +1,27 @@
-# $Id: PKGBUILD 192423 2013-08-11 13:38:21Z heftig $
+# $Id: PKGBUILD 196034 2013-10-07 11:50:48Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evolution-data-server
-pkgver=3.8.5
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Centralized access to appointments and contacts"
 arch=('i686' 'x86_64' 'mips64el')
 depends=(gnome-online-accounts nss krb5 libgweather libical db libgdata)
-makedepends=(intltool gperf gobject-introspection vala python2 gnome-common)
+makedepends=(intltool gperf gobject-introspection vala python2)
 options=('!libtool')
 install=$pkgname.install
 url="http://www.gnome.org"
 license=(GPL)
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-fix-google-2fa-1.patch
-fix-google-2fa-2.patch
-fix-google-2fa-3.patch
-fix-google-2fa-4.patch)
-sha256sums=('73c4ecfed65651cc72966b90081d7b72f9b42573585bc89797efea65ccfdbd2a'
-            'c1de9fe146f0512cf6c0219341c8409a9e4d955c3eb6a85f7d07183972b9328e'
-            '3e1c83dd00f01dfa0f9d67d2327de110b3e232a5f9a882ccce09a02392df7de6'
-            '9da8cccf504f40b8ee9e068b465cdf0a1a858999dd88d8e8e96f1e4cdffbf1e2'
-            '27022d00575ba1b9283d9420aa231c2770ff403b0b6c0442b6d679faefdbe00e')
-
-
-prepare() {
-  cd "$pkgname-$pkgver"
-  patch -Np1 -i ../fix-google-2fa-1.patch
-  patch -Np1 -i ../fix-google-2fa-2.patch
-  patch -Np1 -i ../fix-google-2fa-3.patch
-  patch -Np1 -i ../fix-google-2fa-4.patch
-}
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('1c47a0e138e9a5ed630d6e3ab30761e74e5f26ed7bbc31debfe76c2bac058b27')
 
 build() {
   cd "$pkgname-$pkgver"
-  autoreconf -fi
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --with-openldap=yes \
       --libexecdir=/usr/lib/evolution-data-server \
       --with-krb5=/usr --with-libdb=/usr \
-      --enable-vala-bindings --disable-uoa PYTHON=python2
+      --enable-vala-bindings --disable-uoa
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
   make
 }
diff --git a/extra/evolution-ews/PKGBUILD b/extra/evolution-ews/PKGBUILD
index 4e0063e36..b34f53475 100644
--- a/extra/evolution-ews/PKGBUILD
+++ b/extra/evolution-ews/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 192425 2013-08-11 13:43:43Z heftig $
+# $Id: PKGBUILD 196035 2013-10-07 11:50:49Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=evolution-ews
-pkgver=3.8.5
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="MS Exchange integration through Exchange Web Services"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('evolution-data-server' 'gtkhtml4' 'libmspack')
 makedepends=('intltool' 'evolution')
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('74a0fdcc698797902ca107f3523e3d3b3e51b8ba01709d308b47ed31e99de877')
+sha256sums=('689ad1908d750a6004ee7ce997543a1b5481849aafeb923edebe3f766efa4b46')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/evolution/PKGBUILD b/extra/evolution/PKGBUILD
index b1976409b..9b4e30122 100644
--- a/extra/evolution/PKGBUILD
+++ b/extra/evolution/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 192424 2013-08-11 13:43:05Z heftig $
+# $Id: PKGBUILD 196033 2013-10-07 11:50:47Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evolution
-pkgver=3.8.5
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Manage your email, contacts and schedule"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,8 +18,8 @@ groups=('gnome-extra')
 options=('!libtool' '!emptydirs')
 install=evolution.install
 url=http://www.gnome.org/projects/evolution/
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('26ef047425826a7672f0db7f3d4eef908e68bae47a9e0756883079c445e4326d')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('e64fabc07e1126b80ef8354411d8232aee6e45cfece040a99d494d77df040064')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/facile/PKGBUILD b/extra/facile/PKGBUILD
index ee41dc728..6bfc3812e 100644
--- a/extra/facile/PKGBUILD
+++ b/extra/facile/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 177541 2013-02-07 05:32:46Z eric $
+# $Id: PKGBUILD 195985 2013-10-07 07:06:20Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=facile
 pkgver=1.1
-pkgrel=15
+pkgrel=16
 pkgdesc="A Functional Constraint Library"
 arch=(i686 x86_64 'mips64el')
 url="http://www.recherche.enac.fr/opti/facile/"
diff --git a/extra/five-or-more/PKGBUILD b/extra/five-or-more/PKGBUILD
index bd3595ee2..2867b3946 100644
--- a/extra/five-or-more/PKGBUILD
+++ b/extra/five-or-more/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 186970 2013-06-01 21:56:36Z heftig $
+# $Id: PKGBUILD 196037 2013-10-07 11:50:51Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=five-or-more
-pkgver=3.8.2
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Remove colored balls from the board by forming lines"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,8 +16,8 @@ options=('!emptydirs' '!libtool')
 install=five-or-more.install
 url="https://live.gnome.org/Five%20or%20more"
 groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('d63055c296a73762f68d900c753c5ecbec9b20cc1ed4595feb0b7bee9900c311')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('4198d713a2e29e4c1e5493cfb3880acee295d486e2f5b4d3c4780b154cad3a07')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/fltk/PKGBUILD b/extra/fltk/PKGBUILD
index d1fe8c143..2eb654e93 100644
--- a/extra/fltk/PKGBUILD
+++ b/extra/fltk/PKGBUILD
@@ -1,17 +1,24 @@
-# $Id: PKGBUILD 184377 2013-05-06 19:37:12Z foutrelis $
+# $Id: PKGBUILD 194347 2013-09-14 08:19:54Z bpiotrowski $
 # Maintainer:
 
 pkgbase=fltk
 pkgname=('fltk' 'fltk-docs' 'fltk-games')
 pkgver=1.3.2
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom:LGPL')
 url="http://www.fltk.org/"
 makedepends=('mesa' 'glu' 'doxygen' 'libjpeg' 'libpng' 'libxft' 'libxinerama' \
-             'alsa-lib' 'desktop-file-utils')
-source=(http://www.fltk.org/tars/releases/$pkgbase-$pkgver-source.tar.gz)
-md5sums=('9f7e707d4fb7a5a76f0f9b73ff70623d')
+             'alsa-lib' 'desktop-file-utils' 'libxcursor')
+source=(http://fltk.org/pub/fltk/$pkgver/fltk-$pkgver-source.tar.gz
+        tigervnc.patch)
+md5sums=('9f7e707d4fb7a5a76f0f9b73ff70623d'
+         '9efdf03a449d7639b6da493cb0972bba')
+
+prepare() {
+  cd "$srcdir/$pkgbase-$pkgver"
+  patch -Np1 -i ../tigervnc.patch
+}
 
 build() {
   cd "$srcdir/$pkgbase-$pkgver"
@@ -26,7 +33,7 @@ build() {
 package_fltk() {
   pkgdesc="Graphical user interface toolkit for X"
   depends=('libjpeg' 'libpng' 'libxft' 'libxinerama' 'hicolor-icon-theme' \
-           'desktop-file-utils' 'xdg-utils')
+           'desktop-file-utils' 'xdg-utils' 'libxcursor')
   options=('!docs')
   install=fltk.install
 
diff --git a/extra/fltk/tigervnc.patch b/extra/fltk/tigervnc.patch
new file mode 100644
index 000000000..92660a013
--- /dev/null
+++ b/extra/fltk/tigervnc.patch
@@ -0,0 +1,3903 @@
+diff -Nur fltk-1.3.2.orig/CMakeLists.txt fltk-1.3.2/CMakeLists.txt
+--- fltk-1.3.2.orig/CMakeLists.txt	2012-09-13 16:19:01.000000000 +0200
++++ fltk-1.3.2/CMakeLists.txt	2013-07-17 19:37:45.782342898 +0200
+@@ -515,6 +515,34 @@
+ endif(OPTION_USE_XINERAMA)
+ 
+ #######################################################################
++if(X11_Xfixes_FOUND)
++   option(OPTION_USE_XFIXES "use lib XFIXES" ON)
++endif(X11_Xfixes_FOUND)
++
++if(OPTION_USE_XFIXES)
++   set(HAVE_XFIXES ${X11_Xfixes_FOUND})
++   include_directories(${X11_Xfixes_INCLUDE_PATH})
++   list(APPEND FLTK_LDLIBS -lXfixes)
++   set(FLTK_XFIXES_FOUND TRUE)
++else()
++   set(FLTK_XFIXES_FOUND FALSE)
++endif(OPTION_USE_XFIXES)
++
++#######################################################################
++if(X11_Xcursor_FOUND)
++   option(OPTION_USE_XCURSOR "use lib XCURSOR" ON)
++endif(X11_Xcursor_FOUND)
++
++if(OPTION_USE_XCURSOR)
++   set(HAVE_XCURSOR ${X11_Xcursor_FOUND})
++   include_directories(${X11_Xcursor_INCLUDE_PATH})
++   list(APPEND FLTK_LDLIBS -lXcursor)
++   set(FLTK_XCURSOR_FOUND TRUE)
++else()
++   set(FLTK_XCURSOR_FOUND FALSE)
++endif(OPTION_USE_XCURSOR)
++
++#######################################################################
+ if(X11_Xft_FOUND)
+    option(OPTION_USE_XFT "use lib Xft" ON)
+ endif(X11_Xft_FOUND)
+diff -Nur fltk-1.3.2.orig/configh.cmake.in fltk-1.3.2/configh.cmake.in
+--- fltk-1.3.2.orig/configh.cmake.in	2011-07-19 06:49:30.000000000 +0200
++++ fltk-1.3.2/configh.cmake.in	2013-07-17 19:37:45.782342898 +0200
+@@ -108,6 +108,22 @@
+ #define USE_XDBE HAVE_XDBE
+ 
+ /*
++ * HAVE_XFIXES:
++ *
++ * Do we have the X fixes extension?
++ */
++
++#cmakedefine01 HAVE_XFIXES
++
++/*
++ * HAVE_XCURSOR:
++ *
++ * Do we have the X cursor library?
++ */
++
++#cmakedefine01 HAVE_XCURSOR
++
++/*
+  * __APPLE_QUARTZ__:
+  *
+  * If __APPLE_QUARTZ__ is defined, FLTK will be
+diff -Nur fltk-1.3.2.orig/configh.in fltk-1.3.2/configh.in
+--- fltk-1.3.2.orig/configh.in	2011-10-04 11:21:47.000000000 +0200
++++ fltk-1.3.2/configh.in	2013-07-17 19:37:45.783342892 +0200
+@@ -108,6 +108,22 @@
+ #define USE_XDBE HAVE_XDBE
+ 
+ /*
++ * HAVE_XFIXES:
++ *
++ * Do we have the X fixes extension?
++ */
++
++#define HAVE_XFIXES 0
++
++/*
++ * HAVE_XCURSOR:
++ *
++ * Do we have the X cursor library?
++ */
++
++#define HAVE_XCURSOR 0
++
++/*
+  * __APPLE_QUARTZ__:
+  *
+  * All Apple implementations are now based on Quartz and Cocoa,
+diff -Nur fltk-1.3.2.orig/configure.in fltk-1.3.2/configure.in
+--- fltk-1.3.2.orig/configure.in	2012-11-06 22:13:54.000000000 +0100
++++ fltk-1.3.2/configure.in	2013-07-17 19:37:45.784342888 +0200
+@@ -997,6 +997,26 @@
+ 		LIBS="-lXext $LIBS")
+ 	fi
+ 
++	dnl Check for the Xfixes extension unless disabled...
++        AC_ARG_ENABLE(xfixes, [  --enable-xfixes       turn on Xfixes support [default=yes]])
++
++	if test x$enable_xfixes != xno; then
++	    AC_CHECK_HEADER(X11/extensions/Xfixes.h, AC_DEFINE(HAVE_XFIXES),,
++	        [#include <X11/Xlib.h>])
++	    AC_CHECK_LIB(Xfixes, XFixesQueryExtension,
++		LIBS="-lXfixes $LIBS")
++	fi
++
++	dnl Check for the Xcursor library unless disabled...
++        AC_ARG_ENABLE(xcursor, [  --enable-xcursor        turn on Xcursor support [default=yes]])
++
++	if test x$enable_xcursor != xno; then
++	    AC_CHECK_HEADER(X11/Xcursor/Xcursor.h, AC_DEFINE(HAVE_XCURSOR),,
++	        [#include <X11/Xlib.h>])
++	    AC_CHECK_LIB(Xcursor, XcursorImageCreate,
++		LIBS="-lXcursor $LIBS")
++	fi
++
+ 	dnl Check for overlay visuals...
+ 	AC_PATH_PROG(XPROP, xprop)
+ 	AC_CACHE_CHECK(for X overlay visuals, ac_cv_have_overlay,
+diff -Nur fltk-1.3.2.orig/FL/Enumerations.H fltk-1.3.2/FL/Enumerations.H
+--- fltk-1.3.2.orig/FL/Enumerations.H	2012-12-09 19:45:57.000000000 +0100
++++ fltk-1.3.2/FL/Enumerations.H	2013-07-17 19:37:45.785342886 +0200
+@@ -879,35 +879,36 @@
+ 
+ /** The following constants define the mouse cursors that are available in FLTK.
+ 
+-    The double-headed arrows are bitmaps provided by FLTK on X, the others
+-    are provided by system-defined cursors.
++    Cursors are provided by the system when available, or bitmaps built into
++    FLTK as a fallback.
+ 
+     \todo enum Fl_Cursor needs maybe an image.
+ */
+ enum Fl_Cursor {
+   FL_CURSOR_DEFAULT	=  0, /**< the default cursor, usually an arrow. */
+-  FL_CURSOR_ARROW	= 35, /**< an arrow pointer. */
+-  FL_CURSOR_CROSS	= 66, /**< crosshair. */
+-  FL_CURSOR_WAIT	= 76, /**< watch or hourglass. */
+-  FL_CURSOR_INSERT	= 77, /**< I-beam. */
+-  FL_CURSOR_HAND	= 31, /**< hand (uparrow on MSWindows). */
+-  FL_CURSOR_HELP	= 47, /**< question mark. */
+-  FL_CURSOR_MOVE	= 27, /**< 4-pointed arrow. */
+-  // fltk provides bitmaps for these:
+-  FL_CURSOR_NS		= 78, /**< up/down arrow. */
+-  FL_CURSOR_WE		= 79, /**< left/right arrow. */
+-  FL_CURSOR_NWSE	= 80, /**< diagonal arrow. */
+-  FL_CURSOR_NESW	= 81, /**< diagonal arrow. */
+-  FL_CURSOR_NONE	=255, /**< invisible. */
+-  // for back compatibility (non MSWindows ones):
+-  FL_CURSOR_N		= 70, /**< for back compatibility. */
+-  FL_CURSOR_NE		= 69, /**< for back compatibility. */
+-  FL_CURSOR_E		= 49, /**< for back compatibility. */
+-  FL_CURSOR_SE		=  8, /**< for back compatibility. */
+-  FL_CURSOR_S		=  9, /**< for back compatibility. */
+-  FL_CURSOR_SW		=  7, /**< for back compatibility. */
+-  FL_CURSOR_W		= 36, /**< for back compatibility. */
+-  FL_CURSOR_NW		= 68 /**< for back compatibility. */
++  FL_CURSOR_ARROW   = 1,    /**< an arrow pointer. */
++  FL_CURSOR_CROSS   = 2,    /**< crosshair. */
++  FL_CURSOR_WAIT    = 3,    /**< busy indicator (e.g. hourglass). */
++  FL_CURSOR_INSERT  = 4,    /**< I-beam. */
++  FL_CURSOR_HAND    = 5,    /**< pointing hand. */
++  FL_CURSOR_HELP    = 6,    /**< question mark pointer. */
++  FL_CURSOR_MOVE    = 7,    /**< 4-pointed arrow or hand. */
++
++  /* Resize indicators */
++  FL_CURSOR_NS      = 101,  /**< up/down resize. */
++  FL_CURSOR_WE      = 102,  /**< left/right resize. */
++  FL_CURSOR_NWSE    = 103,  /**< diagonal resize. */
++  FL_CURSOR_NESW    = 104,  /**< diagonal resize. */
++  FL_CURSOR_NE      = 110,  /**< upwards, right resize. */
++  FL_CURSOR_N       = 111,  /**< upwards resize. */
++  FL_CURSOR_NW      = 112,  /**< upwards, left resize. */
++  FL_CURSOR_E       = 113,  /**< leftwards resize. */
++  FL_CURSOR_W       = 114,  /**< rightwards resize. */
++  FL_CURSOR_SE      = 115,  /**< downwards, right resize. */
++  FL_CURSOR_S       = 116,  /**< downwards resize. */
++  FL_CURSOR_SW      = 117,  /**< downwards, left resize. */
++
++  FL_CURSOR_NONE    = 255,  /**< invisible. */
+ };
+ /*@}*/		// group: Cursors  
+ 
+diff -Nur fltk-1.3.2.orig/FL/fl_draw.H fltk-1.3.2/FL/fl_draw.H
+--- fltk-1.3.2.orig/FL/fl_draw.H	2012-05-08 18:15:34.000000000 +0200
++++ fltk-1.3.2/FL/fl_draw.H	2013-07-17 19:37:45.785342886 +0200
+@@ -751,7 +751,8 @@
+ FL_EXPORT unsigned int fl_old_shortcut(const char* s);
+ FL_EXPORT void fl_overlay_rect(int x,int y,int w,int h);
+ FL_EXPORT void fl_overlay_clear();
+-FL_EXPORT void fl_cursor(Fl_Cursor, Fl_Color fg=FL_BLACK, Fl_Color bg=FL_WHITE);
++FL_EXPORT void fl_cursor(Fl_Cursor);
++FL_EXPORT void fl_cursor(Fl_Cursor, Fl_Color fg, Fl_Color bg=FL_WHITE);
+ FL_EXPORT const char* fl_expand_text(const char* from, char* buf, int maxbuf,
+                                      double maxw, int& n, double &width,
+                                      int wrap, int draw_symbols = 0);
+diff -Nur fltk-1.3.2.orig/FL/Fl.H fltk-1.3.2/FL/Fl.H
+--- fltk-1.3.2.orig/FL/Fl.H	2012-10-18 14:56:31.000000000 +0200
++++ fltk-1.3.2/FL/Fl.H	2013-07-17 19:38:09.574341653 +0200
+@@ -109,6 +109,9 @@
+     \see Fl::event_dispatch(Fl_Event_Dispatch) */
+ typedef int (*Fl_Event_Dispatch)(int event, Fl_Window *w);
+ 
++/** Signature of add_clipboard_notify functions passed as parameters */
++typedef void (*Fl_Clipboard_Notify_Handler)(int source, void *data);
++
+ /** @} */ /* group callback_functions */
+ 
+ 
+@@ -746,6 +749,19 @@
+   */
+   static void paste(Fl_Widget &receiver, int source /*=0*/); // platform dependent
+   /**
++  FLTK will call the registered callback whenever there is a change to the
++  selection buffer or the clipboard. The source argument indicates which
++  of the two has changed. Only changes by other applications are reported.
++  \note Some systems require polling to monitor the clipboard and may
++  therefore have some delay in detecting changes.
++  */
++  static void add_clipboard_notify(Fl_Clipboard_Notify_Handler h, void *data);
++  /**
++  Stop calling the specified callback when there are changes to the selection
++  buffer or the clipboard.
++  */
++  static void remove_clipboard_notify(Fl_Clipboard_Notify_Handler h);
++  /**
+     Initiate a Drag And Drop operation. The selection buffer should be
+     filled with relevant data before calling this method. FLTK will
+     then initiate the system wide drag and drop handling. Dropped data
+@@ -792,6 +808,8 @@
+   static void screen_xywh(int &X, int &Y, int &W, int &H, int mx, int my);
+   static void screen_xywh(int &X, int &Y, int &W, int &H, int n); 
+   static void screen_xywh(int &X, int &Y, int &W, int &H, int mx, int my, int mw, int mh);
++  static int screen_num(int x, int y);
++  static int screen_num(int x, int y, int w, int h);
+   static void screen_dpi(float &h, float &v, int n=0);
+   static void screen_work_area(int &X, int &Y, int &W, int &H, int mx, int my);
+   static void screen_work_area(int &X, int &Y, int &W, int &H, int n);
+diff -Nur fltk-1.3.2.orig/FL/Fl_Image.H fltk-1.3.2/FL/Fl_Image.H
+--- fltk-1.3.2.orig/FL/Fl_Image.H	2012-11-09 17:02:08.000000000 +0100
++++ fltk-1.3.2/FL/Fl_Image.H	2013-07-17 19:37:37.910343301 +0200
+@@ -26,6 +26,7 @@
+ #include <stdlib.h>
+ 
+ class Fl_Widget;
++class Fl_Pixmap;
+ struct Fl_Menu_Item;
+ struct Fl_Label;
+ 
+@@ -203,6 +204,7 @@
+   */
+   Fl_RGB_Image(const uchar *bits, int W, int H, int D=3, int LD=0) :
+     Fl_Image(W,H,D), array(bits), alloc_array(0), id_(0), mask_(0) {data((const char **)&array, 1); ld(LD);}
++  Fl_RGB_Image(const Fl_Pixmap *pxm, Fl_Color bg=FL_GRAY);
+   virtual ~Fl_RGB_Image();
+   virtual Fl_Image *copy(int W, int H);
+   Fl_Image *copy() { return copy(w(), h()); }
+diff -Nur fltk-1.3.2.orig/FL/Fl_Widget.H fltk-1.3.2/FL/Fl_Widget.H
+--- fltk-1.3.2.orig/FL/Fl_Widget.H	2012-04-23 22:12:06.000000000 +0200
++++ fltk-1.3.2/FL/Fl_Widget.H	2013-07-17 19:37:07.411344886 +0200
+@@ -171,6 +171,7 @@
+         GROUP_RELATIVE  = 1<<16,  ///< position this widget relative to the parent group, not to the window
+         COPIED_TOOLTIP  = 1<<17,  ///< the widget tooltip is internally copied, its destruction is handled by the widget
+         FULLSCREEN      = 1<<18,  ///< a fullscreen window (Fl_Window)
++        SIMPLE_KEYBOARD = 1<<19,  ///< the widget wants simple, consistent keypresses and not advanced input (like character composition and CJK input)
+         // (space for more flags)
+         USERFLAG3       = 1<<29,  ///< reserved for 3rd party extensions
+         USERFLAG2       = 1<<30,  ///< reserved for 3rd party extensions
+@@ -776,6 +777,35 @@
+    */
+   void clear_changed() {flags_ &= ~CHANGED;}
+ 
++  /** 
++      Returns if the widget sees a simplified keyboard model or not.
++
++      Normally widgets get a full-featured keyboard model that is geared
++      towards text input. This includes support for compose sequences and
++      advanced input methods, commonly used for asian writing system. This
++      system however has downsides in that extra graphic can be presented
++      to the user and that a physical key press doesn't correspond directly
++      to a FLTK event.
++
++      Widgets that need a direct correspondence between actual key events
++      and those seen by the widget can swith to the simplified keyboard
++      model.
++
++     \retval 0 if the widget uses the normal keyboard model
++     \see set_changed(), clear_changed()
++   */
++  unsigned int simple_keyboard() const {return flags_&SIMPLE_KEYBOARD;}
++
++  /** Marks a widget to use the simple keyboard model.
++      \see changed(), clear_changed()
++   */
++  void set_simple_keyboard() {flags_ |= SIMPLE_KEYBOARD;}
++
++  /** Marks a widget to use the normal keyboard model.
++      \see changed(), set_changed()
++   */
++  void set_normal_keyboard() {flags_ &= ~SIMPLE_KEYBOARD;}
++
+   /** Gives the widget the keyboard focus.
+       Tries to make this widget be the Fl::focus() widget, by first sending 
+       it an FL_FOCUS event, and if it returns non-zero, setting 
+diff -Nur fltk-1.3.2.orig/FL/Fl_Window.H fltk-1.3.2/FL/Fl_Window.H
+--- fltk-1.3.2.orig/FL/Fl_Window.H	2012-11-06 21:46:14.000000000 +0100
++++ fltk-1.3.2/FL/Fl_Window.H	2013-07-17 19:38:17.318341233 +0200
+@@ -22,12 +22,17 @@
+ #ifndef Fl_Window_H
+ #define Fl_Window_H
+ 
++#ifdef WIN32
++#include <windows.h>
++#endif
++
+ #include "Fl_Group.H"
+ 
+ #define FL_WINDOW 0xF0		///< window type id all subclasses have type() >= this
+ #define FL_DOUBLE_WINDOW 0xF1   ///< double window type id
+ 
+ class Fl_X;
++class Fl_RGB_Image;
+ 
+ /**
+   This widget produces an actual window.  This can either be a main
+@@ -49,7 +54,7 @@
+ class FL_EXPORT Fl_Window : public Fl_Group {
+ 
+   static char *default_xclass_;
+-  // Note: we must use separate statements for each of the following 4 variables,
++  // Note: we must use separate statements for each of the following 8 variables,
+   // with the static attribute, otherwise MS VC++ 2008/2010 complains :-(
+   // AlbrechtS 04/2012
+ #if FLTK_ABI_VERSION < 10301
+@@ -68,20 +73,45 @@
+   static // when these members are static, ABI compatibility with 1.3.0 is respected
+ #endif
+   int no_fullscreen_h;
++#if FLTK_ABI_VERSION < 10302
++  static // when these members are static, ABI compatibility with 1.3.0 is respected
++#endif
++  int fullscreen_screen_top;
++#if FLTK_ABI_VERSION < 10302
++  static // when these members are static, ABI compatibility with 1.3.0 is respected
++#endif
++  int fullscreen_screen_bottom;
++#if FLTK_ABI_VERSION < 10302
++  static // when these members are static, ABI compatibility with 1.3.0 is respected
++#endif
++  int fullscreen_screen_left;
++#if FLTK_ABI_VERSION < 10302
++  static // when these members are static, ABI compatibility with 1.3.0 is respected
++#endif
++  int fullscreen_screen_right;
+ 
+   friend class Fl_X;
+   Fl_X *i; // points at the system-specific stuff
+ 
++  struct icon_data {
++    const void *legacy_icon;
++    Fl_RGB_Image **icons;
++    int count;
++#ifdef WIN32
++    HICON big_icon;
++    HICON small_icon;
++#endif
++  };
++
+   const char* iconlabel_;
+   char* xclass_;
+-  const void* icon_;
++  struct icon_data *icon_;
+   // size_range stuff:
+   int minw, minh, maxw, maxh;
+   int dw, dh, aspect;
+   uchar size_range_set;
+   // cursor stuff
+   Fl_Cursor cursor_default;
+-  Fl_Color cursor_fg, cursor_bg;
+   void size_range_();
+   void _Fl_Window(); // constructor innards
+   void fullscreen_x(); // platform-specific part of sending a window to full screen
+@@ -121,6 +151,8 @@
+   */
+   int force_position() const { return ((flags() & FORCE_POSITION)?1:0); }
+ 
++  void free_icons();
++
+ public:
+ 
+   /**
+@@ -350,6 +382,18 @@
+   static const char *default_xclass();
+   const char* xclass() const;
+   void xclass(const char* c);
++
++  static void default_icon(const Fl_RGB_Image*);
++  static void default_icons(const Fl_RGB_Image*[], int);
++  void icon(const Fl_RGB_Image*);
++  void icons(const Fl_RGB_Image*[], int);
++
++#ifdef WIN32
++  static void default_icons(HICON big_icon, HICON small_icon);
++  void icons(HICON big_icon, HICON small_icon);
++#endif
++
++  /* for legacy compatibility */
+   const void* icon() const;
+   void icon(const void * ic);
+ 
+@@ -402,13 +446,15 @@
+   */
+   void show(int argc, char **argv);
+   /**
+-    Makes the window completely fill the screen, without any window
+-    manager border visible.  You must use fullscreen_off() to undo
+-    this. 
++    Makes the window completely fill one or more screens, without any
++    window manager border visible.  You must use fullscreen_off() to
++    undo this. 
+ 
+     \note On some platforms, this can result in the keyboard being
+     grabbed. The window may also be recreated, meaning hide() and
+     show() will be called.
++
++    \see void Fl_Window::fullscreen_screens()
+   */
+   void fullscreen();
+   /**
+@@ -425,6 +471,17 @@
+   */
+   unsigned int fullscreen_active() const { return flags() & FULLSCREEN; }
+   /**
++    Sets which screens should be used when this window is in fullscreen
++    mode. The window will be resized to the top of the screen with index
++    \p top, the bottom of the screen with index \p bottom, etc. 
++
++    If this method is never called, or if any argument is < 0, then the
++    window will be resized to fill the screen it is currently on.
++
++    \see void Fl_Window::fullscreen()
++    */
++  void fullscreen_screens(int top, int bottom, int left, int right);
++  /**
+     Iconifies the window.  If you call this when shown() is false
+     it will show() it as an icon.  If the window is already
+     iconified this does nothing.
+@@ -466,14 +523,17 @@
+     is different.
+ 
+     The type Fl_Cursor is an enumeration defined in <FL/Enumerations.H>.
+-    (Under X you can get any XC_cursor value by passing 
+-    Fl_Cursor((XC_foo/2)+1)).  The colors only work on X, they are
+-    not implemented on WIN32.
+ 
+-    For back compatibility only.
++    \see cursor(const Fl_RGB_Image*, int, int), default_cursor()
+   */
+-  void cursor(Fl_Cursor, Fl_Color=FL_BLACK, Fl_Color=FL_WHITE); // platform dependent
+-  void default_cursor(Fl_Cursor, Fl_Color=FL_BLACK, Fl_Color=FL_WHITE);
++  void cursor(Fl_Cursor);
++  void cursor(const Fl_RGB_Image*, int, int);
++  void default_cursor(Fl_Cursor);
++
++  /* for legacy compatibility */
++  void cursor(Fl_Cursor c, Fl_Color, Fl_Color=FL_WHITE);
++  void default_cursor(Fl_Cursor c, Fl_Color, Fl_Color=FL_WHITE);
++
+   static void default_callback(Fl_Window*, void* v);
+   
+   /** Returns the window width including any frame added by the window manager.
+diff -Nur fltk-1.3.2.orig/FL/mac.H fltk-1.3.2/FL/mac.H
+--- fltk-1.3.2.orig/FL/mac.H	2012-11-13 15:45:42.000000000 +0100
++++ fltk-1.3.2/FL/mac.H	2013-07-17 19:38:01.694342066 +0200
+@@ -120,7 +120,11 @@
+   void collapse(void);
+   WindowRef window_ref(void);
+   void set_key_window(void);
+-  void set_cursor(Fl_Cursor);
++  // OS X doesn't have per window icons
++  static void set_default_icons(const Fl_RGB_Image*[], int) {};
++  void set_icons() {};
++  int set_cursor(Fl_Cursor);
++  int set_cursor(const Fl_RGB_Image*, int, int);
+   static CGImageRef CGImage_from_window_rect(Fl_Window *win, int x, int y, int w, int h);
+   static unsigned char *bitmap_from_window_rect(Fl_Window *win, int x, int y, int w, int h, int *bytesPerPixel);
+   static Fl_Region intersect_region_and_rect(Fl_Region current, int x,int y,int w, int h);
+diff -Nur fltk-1.3.2.orig/FL/win32.H fltk-1.3.2/FL/win32.H
+--- fltk-1.3.2.orig/FL/win32.H	2012-03-12 12:55:50.000000000 +0100
++++ fltk-1.3.2/FL/win32.H	2013-07-17 19:38:17.318341233 +0200
+@@ -73,16 +73,23 @@
+   int wait_for_expose;
+   HDC private_dc; // used for OpenGL
+   HCURSOR cursor;
++  int custom_cursor;
+   HDC saved_hdc;  // saves the handle of the DC currently loaded
+   // static variables, static functions and member functions
+   static Fl_X* first;
+   static Fl_X* i(const Fl_Window* w) {return w->i;}
+   static int fake_X_wm(const Fl_Window* w,int &X, int &Y,
+ 		                 int &bt,int &bx,int &by);
++  void make_fullscreen(int X, int Y, int W, int H);
+   void setwindow(Fl_Window* wi) {w=wi; wi->i=this;}
+   void flush() {w->flush();}
+   void set_minmax(LPMINMAXINFO minmax);
+   void mapraise();
++  static void set_default_icons(const Fl_RGB_Image*[], int);
++  static void set_default_icons(HICON, HICON);
++  void set_icons();
++  int set_cursor(Fl_Cursor);
++  int set_cursor(const Fl_RGB_Image*, int, int);
+   static Fl_X* make(Fl_Window*);
+ };
+ extern FL_EXPORT HCURSOR fl_default_cursor;
+diff -Nur fltk-1.3.2.orig/FL/x.H fltk-1.3.2/FL/x.H
+--- fltk-1.3.2.orig/FL/x.H	2012-03-23 17:47:53.000000000 +0100
++++ fltk-1.3.2/FL/x.H	2013-07-17 19:38:01.695342062 +0200
+@@ -154,6 +154,10 @@
+   static Fl_X* i(const Fl_Window* wi) {return wi->i;}
+   void setwindow(Fl_Window* wi) {w=wi; wi->i=this;}
+   void sendxjunk();
++  static void set_default_icons(const Fl_RGB_Image*[], int);
++  void set_icons();
++  int set_cursor(Fl_Cursor);
++  int set_cursor(const Fl_RGB_Image*, int, int);
+   static void make_xid(Fl_Window*,XVisualInfo* =fl_visual, Colormap=fl_colormap);
+   static Fl_X* set_xid(Fl_Window*, Window);
+   // kludges to get around protection:
+diff -Nur fltk-1.3.2.orig/src/CMakeLists.txt fltk-1.3.2/src/CMakeLists.txt
+--- fltk-1.3.2.orig/src/CMakeLists.txt	2011-01-12 10:24:03.000000000 +0100
++++ fltk-1.3.2/src/CMakeLists.txt	2013-07-17 19:37:45.788342890 +0200
+@@ -239,6 +239,14 @@
+    target_link_libraries(fltk ${X11_Xinerama_LIB})
+ endif(HAVE_XINERAMA)
+ 
++if(HAVE_XFIXES)
++   target_link_libraries(fltk ${X11_Xfixes_LIB})
++endif(HAVE_XFIXES)
++
++if(HAVE_XCURSOR)
++   target_link_libraries(fltk ${X11_Xcursor_LIB})
++endif(HAVE_XCURSOR)
++
+ if(USE_XFT)
+    target_link_libraries(fltk ${X11_Xft_LIB})
+ endif(USE_XFT)
+diff -Nur fltk-1.3.2.orig/src/Fl_cocoa.mm fltk-1.3.2/src/Fl_cocoa.mm
+--- fltk-1.3.2.orig/src/Fl_cocoa.mm	2012-11-30 19:20:36.000000000 +0100
++++ fltk-1.3.2/src/Fl_cocoa.mm	2013-07-17 19:38:17.320341239 +0200
+@@ -97,7 +97,6 @@
+ CGContextRef fl_gc = 0;
+ void *fl_system_menu;                   // this is really a NSMenu*
+ Fl_Sys_Menu_Bar *fl_sys_menu_bar = 0;
+-void *fl_default_cursor;		// this is really a NSCursor*
+ void *fl_capture = 0;			// (NSWindow*) we need this to compensate for a missing(?) mouse capture
+ bool fl_show_iconic;                    // true if called from iconize() - shows the next created window in collapsed state
+ //int fl_disable_transient_for;           // secret method of removing TRANSIENT_FOR
+@@ -663,12 +662,9 @@
+     return NO;	// prevent the caption to be redrawn as active on click
+ 		//  when another modal window is currently the key win
+ 
+-  return !(w->tooltip_window() || w->menu_window());
++  return !w->tooltip_window();
+ }
+ 
+-// TODO see if we really need a canBecomeMainWindow ...
+-#if 0
+-
+ - (BOOL)canBecomeMainWindow
+ {
+   if (Fl::modal_ && (Fl::modal_ != w))
+@@ -677,7 +673,6 @@
+ 
+   return !(w->tooltip_window() || w->menu_window());
+ }
+-#endif
+ 
+ @end
+ 
+@@ -1333,8 +1328,6 @@
+ 					  dequeue:YES];
+     while (ign_event);
+     
+-    fl_default_cursor = [NSCursor arrowCursor];
+-
+     // bring the application into foreground without a 'CARB' resource
+     Boolean same_psn;
+     ProcessSerialNumber cur_psn, front_psn;
+@@ -1639,6 +1632,7 @@
+ - (void)drawRect:(NSRect)rect;
+ - (BOOL)acceptsFirstResponder;
+ - (BOOL)acceptsFirstMouse:(NSEvent*)theEvent;
++- (void)resetCursorRects;
+ - (BOOL)performKeyEquivalent:(NSEvent*)theEvent;
+ - (void)mouseUp:(NSEvent *)theEvent;
+ - (void)rightMouseUp:(NSEvent *)theEvent;
+@@ -1696,6 +1690,16 @@
+   Fl_Window *first = Fl::first_window();
+   return (first == w || !first->modal());
+ }
++- (void)resetCursorRects {
++  Fl_Window *w = [(FLWindow*)[self window] getFl_Window];
++  Fl_X *i = Fl_X::i(w);
++  // We have to have at least one cursor rect for invalidateCursorRectsForView
++  // to work, hence the "else" clause.
++  if (i->cursor)
++    [self addCursorRect:[self visibleRect] cursor:(NSCursor*)i->cursor];
++  else
++    [self addCursorRect:[self visibleRect] cursor:[NSCursor arrowCursor]];
++}
+ - (void)mouseUp:(NSEvent *)theEvent {
+   cocoaMouseHandler(theEvent);
+ }
+@@ -2069,7 +2073,7 @@
+     x->other_xid = 0;
+     x->region = 0;
+     x->subRegion = 0;
+-    x->cursor = fl_default_cursor;
++    x->cursor = NULL;
+     x->gc = 0;			// stay 0 for Quickdraw; fill with CGContext for Quartz
+     Fl_Window *win = w->window();
+     Fl_X *xo = Fl_X::i(win);
+@@ -2165,16 +2169,39 @@
+     x->other_xid = 0; // room for doublebuffering image map. On OS X this is only used by overlay windows
+     x->region = 0;
+     x->subRegion = 0;
+-    x->cursor = fl_default_cursor;
++    x->cursor = NULL;
+     x->xidChildren = 0;
+     x->xidNext = 0;
+     x->gc = 0;
+ 	  
+     NSRect crect;
+     if (w->fullscreen_active()) {
+-      int sx, sy, sw, sh;
+-      Fl::screen_xywh(sx, sy, sw, sh, w->x(), w->y(), w->w(), w->h());
+-      w->resize(sx, sy, sw, sh);
++      int top, bottom, left, right;
++      int sx, sy, sw, sh, X, Y, W, H;
++
++      top = w->fullscreen_screen_top;
++      bottom = w->fullscreen_screen_bottom;
++      left = w->fullscreen_screen_left;
++      right = w->fullscreen_screen_right;
++
++      if ((top < 0) || (bottom < 0) || (left < 0) || (right < 0)) {
++        top = Fl::screen_num(w->x(), w->y(), w->w(), w->h());
++        bottom = top;
++        left = top;
++        right = top;
++      }
++
++      Fl::screen_xywh(sx, sy, sw, sh, top);
++      Y = sy;
++      Fl::screen_xywh(sx, sy, sw, sh, bottom);
++      H = sy + sh - Y;
++      Fl::screen_xywh(sx, sy, sw, sh, left);
++      X = sx;
++      Fl::screen_xywh(sx, sy, sw, sh, right);
++      W = sx + sw - X;
++
++      w->resize(X, Y, W, H);
++
+       winstyle = NSBorderlessWindowMask;
+       winlevel = NSStatusWindowLevel;
+     }
+@@ -2692,6 +2719,10 @@
+     Fl_X::relink(w, w->window() );
+     w->redraw();
+   }
++  if (cursor) {
++    [(NSCursor*)cursor release];
++    cursor = NULL;
++  }
+ }
+ 
+ void Fl_X::unmap() {
+@@ -2796,68 +2827,106 @@
+   return [image autorelease];
+ }
+ 
+-static NSCursor *PrepareCursor(NSCursor *cursor, CGContextRef (*f)() )
++int Fl_X::set_cursor(Fl_Cursor c)
+ {
+-  if (cursor == nil) {
+-    CGContextRef c = f();
+-    NSImage *image = CGBitmapContextToNSImage(c);
+-    fl_delete_offscreen( (Fl_Offscreen)c ); 
+-    NSPoint pt = {[image size].width/2, [image size].height/2};
+-    cursor = [[NSCursor alloc] initWithImage:image hotSpot:pt];
++  if (cursor) {
++    [(NSCursor*)cursor release];
++    cursor = NULL;
+   }
+-  return cursor;
+-}
+ 
+-void Fl_X::set_cursor(Fl_Cursor c)
+-{
+-  NSCursor *icrsr;
+   switch (c) {
+-    case FL_CURSOR_CROSS:  icrsr = [NSCursor crosshairCursor]; break;
+-    case FL_CURSOR_WAIT:
+-      static NSCursor *watch = nil;
+-      watch = PrepareCursor(watch,  &Fl_X::watch_cursor_image);
+-      icrsr = watch;
+-      break;
+-    case FL_CURSOR_INSERT: icrsr = [NSCursor IBeamCursor]; break;
+-    case FL_CURSOR_N:      icrsr = [NSCursor resizeUpCursor]; break;
+-    case FL_CURSOR_S:      icrsr = [NSCursor resizeDownCursor]; break;
+-    case FL_CURSOR_NS:     icrsr = [NSCursor resizeUpDownCursor]; break;
+-    case FL_CURSOR_HELP:   
+-      static NSCursor *help = nil;
+-      help = PrepareCursor(help,  &Fl_X::help_cursor_image);
+-      icrsr = help;
+-      break;
+-    case FL_CURSOR_HAND:   icrsr = [NSCursor pointingHandCursor]; break;
+-    case FL_CURSOR_MOVE:   icrsr = [NSCursor openHandCursor]; break;
+-    case FL_CURSOR_NE:
+-    case FL_CURSOR_SW:
+-    case FL_CURSOR_NESW:   
+-      static NSCursor *nesw = nil;
+-      nesw = PrepareCursor(nesw,  &Fl_X::nesw_cursor_image);
+-      icrsr = nesw;
+-      break;
+-    case FL_CURSOR_E:      icrsr = [NSCursor resizeRightCursor]; break;
+-    case FL_CURSOR_W:      icrsr = [NSCursor resizeLeftCursor]; break;
+-    case FL_CURSOR_WE:     icrsr = [NSCursor resizeLeftRightCursor]; break;
+-    case FL_CURSOR_SE:
+-    case FL_CURSOR_NW:
+-    case FL_CURSOR_NWSE:   
+-      static NSCursor *nwse = nil;
+-      nwse = PrepareCursor(nwse,  &Fl_X::nwse_cursor_image);
+-      icrsr = nwse;
+-      break;
+-    case FL_CURSOR_NONE:   
+-      static NSCursor *none = nil;
+-      none = PrepareCursor(none,  &Fl_X::none_cursor_image);
+-      icrsr = none; 
+-      break;
+-    case FL_CURSOR_ARROW:
+-    case FL_CURSOR_DEFAULT:
+-    default:			   icrsr = [NSCursor arrowCursor];
+-      break;
++  case FL_CURSOR_ARROW:   cursor = [NSCursor arrowCursor]; break;
++  case FL_CURSOR_CROSS:   cursor = [NSCursor crosshairCursor]; break;
++  case FL_CURSOR_INSERT:  cursor = [NSCursor IBeamCursor]; break;
++  case FL_CURSOR_HAND:    cursor = [NSCursor pointingHandCursor]; break;
++  case FL_CURSOR_MOVE:    cursor = [NSCursor openHandCursor]; break;
++  case FL_CURSOR_NS:      cursor = [NSCursor resizeUpDownCursor]; break;
++  case FL_CURSOR_WE:      cursor = [NSCursor resizeLeftRightCursor]; break;
++  case FL_CURSOR_N:       cursor = [NSCursor resizeUpCursor]; break;
++  case FL_CURSOR_E:       cursor = [NSCursor resizeRightCursor]; break;
++  case FL_CURSOR_W:       cursor = [NSCursor resizeLeftCursor]; break;
++  case FL_CURSOR_S:       cursor = [NSCursor resizeDownCursor]; break;
++  default:
++    return 0;
++  }
++
++  [(NSCursor*)cursor retain];
++
++  [(NSWindow*)xid invalidateCursorRectsForView:[(NSWindow*)xid contentView]];
++
++  return 1;
++}
++
++int Fl_X::set_cursor(const Fl_RGB_Image *image, int hotx, int hoty) {
++  if (cursor) {
++    [(NSCursor*)cursor release];
++    cursor = NULL;
++  }
++
++  if ((hotx < 0) || (hotx >= image->w()))
++    return 0;
++  if ((hoty < 0) || (hoty >= image->h()))
++    return 0;
++
++  // OS X >= 10.6 can create a NSImage from a CGImage, but we need to
++  // support older versions, hence this pesky handling.
++
++  NSBitmapImageRep *bitmap = [[NSBitmapImageRep alloc]
++                              initWithBitmapDataPlanes:NULL
++                              pixelsWide:image->w()
++                              pixelsHigh:image->h()
++                              bitsPerSample:8
++                              samplesPerPixel:image->d()
++                              hasAlpha:!(image->d() & 1)
++                              isPlanar:NO
++                              colorSpaceName:(image->d()<=2) ? NSDeviceWhiteColorSpace : NSDeviceRGBColorSpace
++                              bytesPerRow:(image->w() * image->d())
++                              bitsPerPixel:(image->d()*8)];
++
++  // Alpha needs to be premultiplied for this format
++
++  const uchar *i = (const uchar*)*image->data();
++  unsigned char *o = [bitmap bitmapData];
++  for (int y = 0;y < image->h();y++) {
++    if (image->d() & 1) {
++      for (int x = 0;x < image->w();x++) {
++        unsigned int alpha;
++        if (image->d() == 4) {
++          alpha = i[3];
++          *o++ = (unsigned char)((unsigned int)*i++ * alpha / 255);
++          *o++ = (unsigned char)((unsigned int)*i++ * alpha / 255);
++        }
++
++        alpha = i[1];
++        *o++ = (unsigned char)((unsigned int)*i++ * alpha / 255);
++        *o++ = alpha;
++        i++;
++  }
++    } else {
++      // No alpha, so we can just copy everything directly.
++      int len = image->w() * image->d();
++      memcpy(o, i, len);
++      o += len;
++      i += len;
++    }
++    i += image->ld();
+   }
+-  [icrsr set];
+-  cursor = icrsr;
++
++  NSImage *nsimage = [[NSImage alloc]
++                      initWithSize:NSMakeSize(image->w(), image->h())];
++
++  [nsimage addRepresentation:bitmap];
++
++  cursor = [[NSCursor alloc]
++            initWithImage:nsimage
++            hotSpot:NSMakePoint(hotx, hoty)];
++
++  [(NSWindow*)xid invalidateCursorRectsForView:[(NSWindow*)xid contentView]];
++
++  [bitmap release];
++  [nsimage release];
++
++  return 1;
+ }
+ 
+ @interface FLaboutItemTarget : NSObject 
+diff -Nur fltk-1.3.2.orig/src/fl_cursor.cxx fltk-1.3.2/src/fl_cursor.cxx
+--- fltk-1.3.2.orig/src/fl_cursor.cxx	2012-03-12 12:55:50.000000000 +0100
++++ fltk-1.3.2/src/fl_cursor.cxx	2013-07-17 19:37:45.791342890 +0200
+@@ -24,297 +24,165 @@
+ 
+ #include <FL/Fl.H>
+ #include <FL/Fl_Window.H>
++#include <FL/Fl_Pixmap.H>
++#include <FL/Fl_RGB_Image.H>
+ #include <FL/x.H>
+-#if !defined(WIN32) && !defined(__APPLE__)
+-#  include <X11/cursorfont.h>
+-#endif
+ #include <FL/fl_draw.H>
+ 
++#include "fl_cursor_wait.xpm"
++#include "fl_cursor_help.xpm"
++#include "fl_cursor_nwse.xpm"
++#include "fl_cursor_nesw.xpm"
++#include "fl_cursor_none.xpm"
++
+ /**
+   Sets the cursor for the current window to the specified shape and colors.
+   The cursors are defined in the <FL/Enumerations.H> header file. 
+   */
++void fl_cursor(Fl_Cursor c) {
++  if (Fl::first_window()) Fl::first_window()->cursor(c);
++}
++
++/* For back compatibility only. */
+ void fl_cursor(Fl_Cursor c, Fl_Color fg, Fl_Color bg) {
+-  if (Fl::first_window()) Fl::first_window()->cursor(c,fg,bg);
++  fl_cursor(c);
+ }
++
++
+ /** 
+-    Sets the default window cursor as well as its color.
++    Sets the default window cursor. This is the cursor that will be used
++    after the mouse pointer leaves a widget with a custom cursor set.
+ 
+-    For back compatibility only.
++    \see cursor(const Fl_RGB_Image*, int, int), default_cursor()
+ */
+-void Fl_Window::default_cursor(Fl_Cursor c, Fl_Color fg, Fl_Color bg) {
+-//  if (c == FL_CURSOR_DEFAULT) c = FL_CURSOR_ARROW;
+-
++void Fl_Window::default_cursor(Fl_Cursor c) {
+   cursor_default = c;
+-  cursor_fg      = fg;
+-  cursor_bg      = bg;
++  cursor(c);
++}
++
++
++void fallback_cursor(Fl_Window *w, Fl_Cursor c) {
++  const char **xpm;
++  int hotx, hoty;
++
++  // The standard arrow is our final fallback, so something is broken
++  // if we get called back here with that as an argument.
++  if (c == FL_CURSOR_ARROW)
++    return;
++
++  switch (c) {
++  case FL_CURSOR_WAIT:
++    xpm = (const char**)fl_cursor_wait_xpm;
++    hotx = 8;
++    hoty = 15;
++    break;
++  case FL_CURSOR_HELP:
++    xpm = (const char**)fl_cursor_help_xpm;
++    hotx = 1;
++    hoty = 3;
++    break;
++  case FL_CURSOR_NWSE:
++    xpm = (const char**)fl_cursor_nwse_xpm;
++    hotx = 7;
++    hoty = 7;
++    break;
++  case FL_CURSOR_NESW:
++    xpm = (const char**)fl_cursor_nesw_xpm;
++    hotx = 7;
++    hoty = 7;
++    break;
++  case FL_CURSOR_NONE:
++    xpm = (const char**)fl_cursor_none_xpm;
++    hotx = 0;
++    hoty = 0;
++    break;
++  default:
++    w->cursor(FL_CURSOR_ARROW);
++    return;
++  }
+ 
+-  cursor(c, fg, bg);
++  Fl_Pixmap pxm(xpm);
++  Fl_RGB_Image image(&pxm);
++
++  w->cursor(&image, hotx, hoty);
+ }
+ 
+-#ifdef WIN32
+ 
+-#  ifndef IDC_HAND
+-#    define IDC_HAND	MAKEINTRESOURCE(32649)
+-#  endif // !IDC_HAND
++void Fl_Window::cursor(Fl_Cursor c) {
++  int ret;
+ 
+-void Fl_Window::cursor(Fl_Cursor c, Fl_Color c1, Fl_Color c2) {
+-  if (!shown()) return;
+   // the cursor must be set for the top level window, not for subwindows
+   Fl_Window *w = window(), *toplevel = this;
+-  while (w) { toplevel = w; w = w->window(); }
+-  if (toplevel != this) { toplevel->cursor(c, c1, c2); return; }
+-  // now set the actual cursor
+-  if (c == FL_CURSOR_DEFAULT) {
+-    c = cursor_default;
+-  }
+-  if (c > FL_CURSOR_NESW) {
+-    i->cursor = 0;
+-  } else if (c == FL_CURSOR_DEFAULT) {
+-    i->cursor = fl_default_cursor;
+-  } else {
+-    LPSTR n;
+-    switch (c) {
+-    case FL_CURSOR_ARROW:	n = IDC_ARROW; break;
+-    case FL_CURSOR_CROSS:	n = IDC_CROSS; break;
+-    case FL_CURSOR_WAIT:	n = IDC_WAIT; break;
+-    case FL_CURSOR_INSERT:	n = IDC_IBEAM; break;
+-    case FL_CURSOR_HELP:	n = IDC_HELP; break;
+-    case FL_CURSOR_HAND: {
+-          OSVERSIONINFO osvi;
+-
+-          // Get the OS version: Windows 98 and 2000 have a standard
+-	  // hand cursor.
+-          memset(&osvi, 0, sizeof(OSVERSIONINFO));
+-          osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+-          GetVersionEx(&osvi);
+-
+-          if (osvi.dwMajorVersion > 4 ||
+-  	      (osvi.dwMajorVersion == 4 && osvi.dwMinorVersion > 0 &&
+-  	       osvi.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS)) n = IDC_HAND;
+-          else n = IDC_UPARROW;
+-	} break;
+-    case FL_CURSOR_MOVE:	n = IDC_SIZEALL; break;
+-    case FL_CURSOR_N:
+-    case FL_CURSOR_S:
+-    case FL_CURSOR_NS:		n = IDC_SIZENS; break;
+-    case FL_CURSOR_NE:
+-    case FL_CURSOR_SW:
+-    case FL_CURSOR_NESW:	n = IDC_SIZENESW; break;
+-    case FL_CURSOR_E:
+-    case FL_CURSOR_W:
+-    case FL_CURSOR_WE:		n = IDC_SIZEWE; break;
+-    case FL_CURSOR_SE:
+-    case FL_CURSOR_NW:
+-    case FL_CURSOR_NWSE:	n = IDC_SIZENWSE; break;
+-    default:			n = IDC_NO; break;
+-    }
+-    i->cursor = LoadCursor(NULL, n);
++
++  while (w) {
++    toplevel = w;
++    w = w->window();
+   }
+-  SetCursor(i->cursor);
+-}
+ 
+-#elif defined(__APPLE__)
++  if (toplevel != this) {
++    toplevel->cursor(c);
++    return;
++  }
+ 
+-#ifdef __BIG_ENDIAN__
+-# define E(x) x
+-#elif defined __LITTLE_ENDIAN__
+-// Don't worry. This will be resolved at compile time
+-# define E(x) (x>>8)|((x<<8)&0xff00)
+-#else
+-# error "Either __LITTLE_ENDIAN__ or __BIG_ENDIAN__ must be defined"
+-#endif
+-
+-CGContextRef Fl_X::help_cursor_image(void)
+-{
+-  int w = 20, h = 20;
+-  Fl_Offscreen off = Fl_Quartz_Graphics_Driver::create_offscreen_with_alpha(w, h);
+-  fl_begin_offscreen(off);
+-  CGContextSetRGBFillColor( (CGContextRef)off, 0,0,0,0);
+-  fl_rectf(0,0,w,h);
+-  fl_color(FL_BLACK);
+-  fl_font(FL_COURIER_BOLD, 20);
+-  fl_draw("?", 1, h-1);
+-  fl_end_offscreen();
+-  return (CGContextRef)off;
+-}
++  if (c == FL_CURSOR_DEFAULT)
++    c = cursor_default;
+ 
+-CGContextRef Fl_X::none_cursor_image(void)
+-{
+-  int w = 20, h = 20;
+-  Fl_Offscreen off = Fl_Quartz_Graphics_Driver::create_offscreen_with_alpha(w, h);
+-  fl_begin_offscreen(off);
+-  CGContextSetRGBFillColor( (CGContextRef)off, 0,0,0,0);
+-  fl_rectf(0,0,w,h);
+-  fl_end_offscreen();
+-  return (CGContextRef)off;
+-}
++  if (!i)
++    return;
+ 
+-CGContextRef Fl_X::watch_cursor_image(void)
+-{
+-  int w, h, r = 5;
+-  w = 2*r+6;
+-  h = 4*r;
+-  Fl_Offscreen off = Fl_Quartz_Graphics_Driver::create_offscreen_with_alpha(w, h);
+-  fl_begin_offscreen(off);
+-  CGContextSetRGBFillColor( (CGContextRef)off, 0,0,0,0);
+-  fl_rectf(0,0,w,h);
+-  CGContextTranslateCTM( (CGContextRef)off, w/2, h/2);
+-  fl_color(FL_WHITE);
+-  fl_circle(0, 0, r+1);
+-  fl_color(FL_BLACK);
+-  fl_rectf(int(-r*0.7), int(-r*1.7), int(1.4*r), int(3.4*r));
+-  fl_rectf(r-1, -1, 3, 3);
+-  fl_color(FL_WHITE);
+-  fl_pie(-r, -r, 2*r, 2*r, 0, 360);
+-  fl_color(FL_BLACK);
+-  fl_circle(0,0,r);
+-  fl_xyline(0, 0, int(-r*.7));
+-  fl_xyline(0, 0, 0, int(-r*.7));
+-  fl_end_offscreen();
+-  return (CGContextRef)off;
+-}
++  ret = i->set_cursor(c);
++  if (ret)
++    return;
+ 
+-CGContextRef Fl_X::nesw_cursor_image(void)
+-{
+-  int c = 7, r = 2*c;
+-  int w = r, h = r;
+-  Fl_Offscreen off = Fl_Quartz_Graphics_Driver::create_offscreen_with_alpha(w, h);
+-  fl_begin_offscreen(off);
+-  CGContextSetRGBFillColor( (CGContextRef)off, 0,0,0,0);
+-  fl_rectf(0,0,w,h);
+-  CGContextTranslateCTM( (CGContextRef)off, 0, h);
+-  CGContextScaleCTM( (CGContextRef)off, 1, -1);
+-  fl_color(FL_BLACK);
+-  fl_polygon(0, 0, c, 0, 0, c);
+-  fl_polygon(r, r, r, r-c, r-c, r);
+-  fl_line_style(FL_SOLID, 2, 0);
+-  fl_line(0,1, r,r+1);
+-  fl_line_style(FL_SOLID, 0, 0);
+-  fl_end_offscreen();
+-  return (CGContextRef)off;
++  fallback_cursor(this, c);
+ }
+ 
+-CGContextRef Fl_X::nwse_cursor_image(void)
+-{
+-  int c = 7, r = 2*c;
+-  int w = r, h = r;
+-  Fl_Offscreen off = Fl_Quartz_Graphics_Driver::create_offscreen_with_alpha(w, h);
+-  fl_begin_offscreen(off);
+-  CGContextSetRGBFillColor( (CGContextRef)off, 0,0,0,0);
+-  fl_rectf(0,0,w,h);
+-  CGContextTranslateCTM( (CGContextRef)off, 0, h);
+-  CGContextScaleCTM( (CGContextRef)off, 1, -1);
+-  fl_color(FL_BLACK);
+-  fl_polygon(r-1, 0, r-1, c, r-1-c, 0);
+-  fl_polygon(-1, r, c-1, r, -1, r-c);
+-  fl_line_style(FL_SOLID, 2, 0);
+-  fl_line(r-1,1, -1,r+1);
+-  fl_line_style(FL_SOLID, 0, 0);
+-  fl_end_offscreen();
+-  return (CGContextRef)off;
+-}
+-
+-void Fl_Window::cursor(Fl_Cursor c, Fl_Color, Fl_Color) {
+-  if (c == FL_CURSOR_DEFAULT) {
+-    c = cursor_default;
+-  }
+-  if (i) i->set_cursor(c);
+-}
++/**
++  Changes the cursor for this window.  This always calls the system, if
++  you are changing the cursor a lot you may want to keep track of how
++  you set it in a static variable and call this only if the new cursor
++  is different.
+ 
+-#else
++  The default cursor will be used if the provided image cannot be used
++  as a cursor.
+ 
+-// I like the MSWindows resize cursors, so I duplicate them here:
++  \see cursor(Fl_Cursor), default_cursor()
++*/
++void Fl_Window::cursor(const Fl_RGB_Image *image, int hotx, int hoty) {
++  int ret;
+ 
+-#define CURSORSIZE 16
+-#define HOTXY 7
+-static struct TableEntry {
+-  uchar bits[CURSORSIZE*CURSORSIZE/8];
+-  uchar mask[CURSORSIZE*CURSORSIZE/8];
+-  Cursor cursor;
+-} table[] = {
+-  {{	// FL_CURSOR_NS
+-   0x00, 0x00, 0x80, 0x01, 0xc0, 0x03, 0xe0, 0x07, 0x80, 0x01, 0x80, 0x01,
+-   0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01,
+-   0xe0, 0x07, 0xc0, 0x03, 0x80, 0x01, 0x00, 0x00},
+-   {
+-   0x80, 0x01, 0xc0, 0x03, 0xe0, 0x07, 0xf0, 0x0f, 0xf0, 0x0f, 0xc0, 0x03,
+-   0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xf0, 0x0f,
+-   0xf0, 0x0f, 0xe0, 0x07, 0xc0, 0x03, 0x80, 0x01}},
+-  {{	// FL_CURSOR_EW
+-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x10,
+-   0x0c, 0x30, 0xfe, 0x7f, 0xfe, 0x7f, 0x0c, 0x30, 0x08, 0x10, 0x00, 0x00,
+-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+-   {
+-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x1c, 0x38,
+-   0xfe, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x7f, 0x1c, 0x38, 0x18, 0x18,
+-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}},
+-  {{	// FL_CURSOR_NWSE
+-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x00, 0x38, 0x00, 0x78, 0x00,
+-   0xe8, 0x00, 0xc0, 0x01, 0x80, 0x03, 0x00, 0x17, 0x00, 0x1e, 0x00, 0x1c,
+-   0x00, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+-   {
+-   0x00, 0x00, 0x00, 0x00, 0xfc, 0x00, 0xfc, 0x00, 0x7c, 0x00, 0xfc, 0x00,
+-   0xfc, 0x01, 0xec, 0x03, 0xc0, 0x37, 0x80, 0x3f, 0x00, 0x3f, 0x00, 0x3e,
+-   0x00, 0x3f, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x00}},
+-  {{	// FL_CURSOR_NESW
+-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x1c, 0x00, 0x1e,
+-   0x00, 0x17, 0x80, 0x03, 0xc0, 0x01, 0xe8, 0x00, 0x78, 0x00, 0x38, 0x00,
+-   0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+-   {
+-   0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x3f, 0x00, 0x3e, 0x00, 0x3f,
+-   0x80, 0x3f, 0xc0, 0x37, 0xec, 0x03, 0xfc, 0x01, 0xfc, 0x00, 0x7c, 0x00,
+-   0xfc, 0x00, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00}},
+-  {{0}, {0}} // FL_CURSOR_NONE & unknown
+-};
++  // the cursor must be set for the top level window, not for subwindows
++  Fl_Window *w = window(), *toplevel = this;
+ 
+-void Fl_Window::cursor(Fl_Cursor c, Fl_Color fg, Fl_Color bg) {
+-  if (!shown()) return;
+-  Cursor xc;
+-  int deleteit = 0;
+-  if (c == FL_CURSOR_DEFAULT) {
+-    c  = cursor_default;
+-    fg = cursor_fg;
+-    bg = cursor_bg;
++  while (w) {
++    toplevel = w;
++    w = w->window();
+   }
+ 
+-  if (!c) {
+-    xc = None;
+-  } else {
+-    if (c >= FL_CURSOR_NS) {
+-      TableEntry *q = (c > FL_CURSOR_NESW) ? table+4 : table+(c-FL_CURSOR_NS);
+-      if (!(q->cursor)) {
+-	XColor dummy = { 0 };
+-	Pixmap p = XCreateBitmapFromData(fl_display,
+-	  RootWindow(fl_display, fl_screen), (const char*)(q->bits),
+-	  CURSORSIZE, CURSORSIZE);
+-	Pixmap m = XCreateBitmapFromData(fl_display,
+-	  RootWindow(fl_display, fl_screen), (const char*)(q->mask),
+-	  CURSORSIZE, CURSORSIZE);
+-	q->cursor = XCreatePixmapCursor(fl_display, p,m,&dummy, &dummy,
+-					HOTXY, HOTXY);
+-	XFreePixmap(fl_display, m);
+-	XFreePixmap(fl_display, p);
+-      }
+-      xc = q->cursor;
+-    } else {
+-      xc = XCreateFontCursor(fl_display, (c-1)*2);
+-      deleteit = 1;
+-    }
+-    XColor fgc;
+-    uchar r,g,b;
+-    Fl::get_color(fg,r,g,b);
+-    fgc.red = r<<8; fgc.green = g<<8; fgc.blue = b<<8;
+-    XColor bgc;
+-    Fl::get_color(bg,r,g,b);
+-    bgc.red = r<<8; bgc.green = g<<8; bgc.blue = b<<8;
+-    XRecolorCursor(fl_display, xc, &fgc, &bgc);
++  if (toplevel != this) {
++    toplevel->cursor(image, hotx, hoty);
++    return;
+   }
+-  XDefineCursor(fl_display, fl_xid(this), xc);
+-  if (deleteit) XFreeCursor(fl_display, xc);
++
++  if (!i)
++    return;
++
++  ret = i->set_cursor(image, hotx, hoty);
++  if (ret)
++    return;
++
++  cursor(FL_CURSOR_DEFAULT);
+ }
+ 
+-#endif
++/* For back compatibility only. */
++void Fl_Window::cursor(Fl_Cursor c, Fl_Color, Fl_Color) {
++  cursor(c);
++};
++
++void Fl_Window::default_cursor(Fl_Cursor c, Fl_Color, Fl_Color) {
++  default_cursor(c);
++};
++
+ 
+ //
+ // End of "$Id: fl_cursor.cxx 9278 2012-03-12 11:55:50Z manolo $".
+diff -Nur fltk-1.3.2.orig/src/fl_cursor_help.xpm fltk-1.3.2/src/fl_cursor_help.xpm
+--- fltk-1.3.2.orig/src/fl_cursor_help.xpm	1970-01-01 01:00:00.000000000 +0100
++++ fltk-1.3.2/src/fl_cursor_help.xpm	2013-07-17 19:37:45.792342890 +0200
+@@ -0,0 +1,95 @@
++/* XPM */
++static const char * fl_cursor_help_xpm[] = {
++"16 27 65 1",
++" 	c None",
++".	c #FFFFFF",
++"+	c #E2E2E2",
++"@	c #1C1C1C",
++"#	c #E7E7E7",
++"$	c #000000",
++"%	c #212121",
++"&	c #EAEAEA",
++"*	c #262626",
++"=	c #EDEDED",
++"-	c #2C2C2C",
++";	c #F0F0F0",
++">	c #333333",
++",	c #F1F1F1",
++"'	c #393939",
++")	c #F3F3F3",
++"!	c #404040",
++"~	c #484848",
++"{	c #F4F4F4",
++"]	c #050505",
++"^	c #202020",
++"/	c #707070",
++"(	c #F5F5F5",
++"_	c #040404",
++":	c #E1E1E1",
++"<	c #EEEEEE",
++"[	c #EFEFEF",
++"}	c #FEFEFE",
++"|	c #3D3D3D",
++"1	c #7E7E7E",
++"2	c #696969",
++"3	c #414141",
++"4	c #131313",
++"5	c #080808",
++"6	c #454545",
++"7	c #F2F2F2",
++"8	c #878787",
++"9	c #7D7D7D",
++"0	c #101010",
++"a	c #111111",
++"b	c #FDFDFD",
++"c	c #8A8A8A",
++"d	c #E6E6E6",
++"e	c #7B7B7B",
++"f	c #4C4C4C",
++"g	c #5C5C5C",
++"h	c #9F9F9F",
++"i	c #F9F9F9",
++"j	c #F7F7F7",
++"k	c #B1B1B1",
++"l	c #2E2E2E",
++"m	c #767676",
++"n	c #DCDCDC",
++"o	c #DEDEDE",
++"p	c #C7C7C7",
++"q	c #1B1B1B",
++"r	c #6B6B6B",
++"s	c #575757",
++"t	c #797979",
++"u	c #020202",
++"v	c #010101",
++"w	c #FBFBFB",
++"x	c #D7D7D7",
++"y	c #D8D8D8",
++"z	c #060606",
++"                ",
++".               ",
++".+              ",
++".@#             ",
++".$%&            ",
++".$$*=           ",
++".$$$-;          ",
++".$$$$>,         ",
++".$$$$$')        ",
++".$$$$$$!)       ",
++".$$$$$$$~{      ",
++".$$$$]^^^/(     ",
++".$$$$_:(<<[}    ",
++".$$|1$2<        ",
++".$3,(45[        ",
++".67 78$9,       ",
++".7   {0a( ....  ",
++"b    ,c5[defgh, ",
++"      )ijk_la$m.",
++"         no.p$q.",
++"           .r$s.",
++"          .t$-= ",
++"          7uv+  ",
++"          wxy.  ",
++"          :$z.  ",
++"          :$z.  ",
++"          ....  "};
+diff -Nur fltk-1.3.2.orig/src/fl_cursor_nesw.xpm fltk-1.3.2/src/fl_cursor_nesw.xpm
+--- fltk-1.3.2.orig/src/fl_cursor_nesw.xpm	1970-01-01 01:00:00.000000000 +0100
++++ fltk-1.3.2/src/fl_cursor_nesw.xpm	2013-07-17 19:37:45.792342890 +0200
+@@ -0,0 +1,46 @@
++/* XPM */
++static const char * fl_cursor_nesw_xpm[] = {
++"15 15 28 1",
++" 	c None",
++".	c #FFFFFF",
++"+	c #767676",
++"@	c #000000",
++"#	c #4E4E4E",
++"$	c #0C0C0C",
++"%	c #494949",
++"&	c #4D4D4D",
++"*	c #1B1B1B",
++"=	c #515151",
++"-	c #646464",
++";	c #363636",
++">	c #6A6A6A",
++",	c #545454",
++"'	c #585858",
++")	c #242424",
++"!	c #797979",
++"~	c #2E2E2E",
++"{	c #444444",
++"]	c #3B3B3B",
++"^	c #0A0A0A",
++"/	c #595959",
++"(	c #F7F7F7",
++"_	c #080808",
++":	c #6B6B6B",
++"<	c #FDFDFD",
++"[	c #FCFCFC",
++"}	c #FEFEFE",
++"     ..........",
++"      .+@@@@@@.",
++"       .#@@@@@.",
++"        .$@@@@.",
++"       .%@@@@@.",
++".     .&@@@*@@.",
++"..   .=@@@-.;@.",
++".>. .,@@@'. .).",
++".@!.'@@@#.   ..",
++".@@~@@@{.     .",
++".@@@@@].       ",
++".@@@@^.        ",
++".@@@@@/(       ",
++".______:(      ",
++"<[[[[[[[[}     "};
+diff -Nur fltk-1.3.2.orig/src/fl_cursor_none.xpm fltk-1.3.2/src/fl_cursor_none.xpm
+--- fltk-1.3.2.orig/src/fl_cursor_none.xpm	1970-01-01 01:00:00.000000000 +0100
++++ fltk-1.3.2/src/fl_cursor_none.xpm	2013-07-17 19:37:45.793342890 +0200
+@@ -0,0 +1,19 @@
++/* XPM */
++static const char * fl_cursor_none_xpm[] = {
++"15 15 1 1",
++" 	c None",
++"               ",
++"               ",
++"               ",
++"               ",
++"               ",
++"               ",
++"               ",
++"               ",
++"               ",
++"               ",
++"               ",
++"               ",
++"               ",
++"               ",
++"               "};
+diff -Nur fltk-1.3.2.orig/src/fl_cursor_nwse.xpm fltk-1.3.2/src/fl_cursor_nwse.xpm
+--- fltk-1.3.2.orig/src/fl_cursor_nwse.xpm	1970-01-01 01:00:00.000000000 +0100
++++ fltk-1.3.2/src/fl_cursor_nwse.xpm	2013-07-17 19:37:45.793342890 +0200
+@@ -0,0 +1,46 @@
++/* XPM */
++static const char * fl_cursor_nwse_xpm[] = {
++"15 15 28 1",
++" 	c None",
++".	c #FFFFFF",
++"+	c #000000",
++"@	c #767676",
++"#	c #4E4E4E",
++"$	c #0C0C0C",
++"%	c #494949",
++"&	c #1B1B1B",
++"*	c #4D4D4D",
++"=	c #363636",
++"-	c #646464",
++";	c #515151",
++">	c #242424",
++",	c #585858",
++"'	c #545454",
++")	c #6A6A6A",
++"!	c #797979",
++"~	c #444444",
++"{	c #2E2E2E",
++"]	c #3B3B3B",
++"^	c #0A0A0A",
++"/	c #F7F7F7",
++"(	c #595959",
++"_	c #6B6B6B",
++":	c #080808",
++"<	c #FEFEFE",
++"[	c #FCFCFC",
++"}	c #FDFDFD",
++"..........     ",
++".++++++@.      ",
++".+++++#.       ",
++".++++$.        ",
++".+++++%.       ",
++".++&+++*.     .",
++".+=.-+++;.   ..",
++".>. .,+++'. .).",
++"..   .#+++,.!+.",
++".     .~+++{++.",
++"       .]+++++.",
++"        .^++++.",
++"       /(+++++.",
++"      /_::::::.",
++"     <[[[[[[[[}"};
+diff -Nur fltk-1.3.2.orig/src/fl_cursor_wait.xpm fltk-1.3.2/src/fl_cursor_wait.xpm
+--- fltk-1.3.2.orig/src/fl_cursor_wait.xpm	1970-01-01 01:00:00.000000000 +0100
++++ fltk-1.3.2/src/fl_cursor_wait.xpm	2013-07-17 19:37:45.793342890 +0200
+@@ -0,0 +1,72 @@
++/* XPM */
++static const char * fl_cursor_wait_xpm[] = {
++"17 32 37 1",
++" 	c None",
++".	c #FFFFFF",
++"+	c #2E2E2E",
++"@	c #202020",
++"#	c #F1F1F1",
++"$	c #2D2D2D",
++"%	c #000000",
++"&	c #EDEDED",
++"*	c #585858",
++"=	c #575757",
++"-	c #FBFBFB",
++";	c #848484",
++">	c #B8B8B8",
++",	c #E5E5E5",
++"'	c #F7F7F7",
++")	c #181818",
++"!	c #F0F0F0",
++"~	c #616161",
++"{	c #B7B7B7",
++"]	c #F5F5F5",
++"^	c #050505",
++"/	c #D4D4D4",
++"(	c #EEEEEE",
++"_	c #595959",
++":	c #7B7B7B",
++"<	c #E9E9E9",
++"[	c #131313",
++"}	c #E3E3E3",
++"|	c #767676",
++"1	c #505050",
++"2	c #F3F3F3",
++"3	c #2A2A2A",
++"4	c #070707",
++"5	c #343434",
++"6	c #939393",
++"7	c #191919",
++"8	c #6A6A6A",
++".................",
++".+@@@@@@@@@@@@@+.",
++".................",
++" #$%%%%%%%%%%%$# ",
++" &*%%%%%%%%%%%=& ",
++" -;%%%%%%%%%%%;- ",
++"  >%%%%%%%%%%%>  ",
++"  ,%%%%%%%%%%%,  ",
++"  ')%%%%%%%%%)'  ",
++"  !~%%%%%%%%%~!  ",
++"   {%%%%%%%%%{   ",
++"   ]^/...../^]   ",
++"   (_:.....:_(   ",
++"    <[}...}[<    ",
++"    !|1...1|!    ",
++"     2[3.3[2     ",
++"     2[%.%[2     ",
++"    !|%%.%%|!    ",
++"    <4%%.%%4<    ",
++"   (_%%%.%%%_(   ",
++"   ]^%%%.%%%^]   ",
++"   {%%%%.%%%%{   ",
++"  !~%%%%.%%%%~!  ",
++"  ')%%%%.%%%%)'  ",
++"  ,%%56{.{65%%,  ",
++"  >%*.......*%>  ",
++" -;7&.......&7;- ",
++" &*8.........8=& ",
++" #$%%%%%%%%%%%$# ",
++".................",
++".+@@@@@@@@@@@@@+.",
++"................."};
+diff -Nur fltk-1.3.2.orig/src/Fl.cxx fltk-1.3.2/src/Fl.cxx
+--- fltk-1.3.2.orig/src/Fl.cxx	2012-08-16 22:59:36.000000000 +0200
++++ fltk-1.3.2/src/Fl.cxx	2013-07-17 19:38:01.696342059 +0200
+@@ -70,6 +70,8 @@
+ extern double fl_mac_flush_and_wait(double time_to_wait, char in_idle);
+ #endif // WIN32
+ 
++extern void fl_update_focus(void);
++
+ //
+ // Globals...
+ //
+@@ -435,6 +437,69 @@
+ #endif
+ 
+ ////////////////////////////////////////////////////////////////
++// Clipboard notifications
++
++struct Clipboard_Notify {
++  Fl_Clipboard_Notify_Handler handler;
++  void *data;
++  struct Clipboard_Notify *next;
++};
++
++static struct Clipboard_Notify *clip_notify_list = NULL;
++
++extern void fl_clipboard_notify_change(); // in Fl_<platform>.cxx
++
++void Fl::add_clipboard_notify(Fl_Clipboard_Notify_Handler h, void *data) {
++  struct Clipboard_Notify *node;
++
++  remove_clipboard_notify(h);
++
++  node = new Clipboard_Notify;
++
++  node->handler = h;
++  node->data = data;
++  node->next = clip_notify_list;
++
++  clip_notify_list = node;
++
++  fl_clipboard_notify_change();
++}
++
++void Fl::remove_clipboard_notify(Fl_Clipboard_Notify_Handler h) {
++  struct Clipboard_Notify *node, **prev;
++
++  node = clip_notify_list;
++  prev = &clip_notify_list;
++  while (node != NULL) {
++    if (node->handler == h) {
++      *prev = node->next;
++      delete node;
++
++      fl_clipboard_notify_change();
++
++      return;
++    }
++
++    prev = &node->next;
++    node = node->next;
++  }
++}
++
++bool fl_clipboard_notify_empty(void) {
++  return clip_notify_list == NULL;
++}
++
++void fl_trigger_clipboard_notify(int source) {
++  struct Clipboard_Notify *node;
++
++  node = clip_notify_list;
++  while (node != NULL) {
++    node->handler(source, node->data);
++    node = node->next;
++  }
++}
++
++////////////////////////////////////////////////////////////////
+ // wait/run/check/ready:
+ 
+ void (*Fl::idle)(); // see Fl::add_idle.cxx for the add/remove functions
+@@ -876,6 +941,8 @@
+       fl_oldfocus = p;
+     }
+     e_number = old_event;
++    // let the platform code do what it needs
++    fl_update_focus();
+   }
+ }
+ 
+@@ -1464,6 +1531,8 @@
+   if (xclass_) {
+     free(xclass_);
+   }
++  free_icons();
++  delete icon_;
+ }
+ 
+ // FL_SHOW and FL_HIDE are called whenever the visibility of this widget
+diff -Nur fltk-1.3.2.orig/src/fl_draw_pixmap.cxx fltk-1.3.2/src/fl_draw_pixmap.cxx
+--- fltk-1.3.2.orig/src/fl_draw_pixmap.cxx	2012-04-22 05:09:31.000000000 +0200
++++ fltk-1.3.2/src/fl_draw_pixmap.cxx	2013-07-17 19:37:37.911343302 +0200
+@@ -58,99 +58,6 @@
+   return 1;
+ }
+ 
+-#ifdef U64
+-
+-// The callback from fl_draw_image to get a row of data passes this:
+-struct pixmap_data {
+-  int w, h;
+-  const uchar*const* data;
+-  union {
+-    U64 colors[256];
+-    U64* byte1[256];
+-  };
+-};
+-
+-// callback for 1 byte per pixel:
+-static void cb1(void*v, int x, int y, int w, uchar* buf) {
+-  pixmap_data& d = *(pixmap_data*)v;
+-  const uchar* p = d.data[y]+x;
+-  U64* q = (U64*)buf;
+-  for (int X=w; X>0; X-=2, p += 2) {
+-    if (X>1) {
+-#  if WORDS_BIGENDIAN
+-      *q++ = (d.colors[p[0]]<<32) | d.colors[p[1]];
+-#  else
+-      *q++ = (d.colors[p[1]]<<32) | d.colors[p[0]];
+-#  endif
+-    } else {
+-#  if WORDS_BIGENDIAN
+-      *q++ = d.colors[p[0]]<<32;
+-#  else
+-      *q++ = d.colors[p[0]];
+-#  endif
+-    }
+-  }
+-}
+-
+-// callback for 2 bytes per pixel:
+-static void cb2(void*v, int x, int y, int w, uchar* buf) {
+-  pixmap_data& d = *(pixmap_data*)v;
+-  const uchar* p = d.data[y]+2*x;
+-  U64* q = (U64*)buf;
+-  for (int X=w; X>0; X-=2) {
+-    U64* colors = d.byte1[*p++];
+-    int index = *p++;
+-    if (X>1) {
+-      U64* colors1 = d.byte1[*p++];
+-      int index1 = *p++;
+-#  if WORDS_BIGENDIAN
+-      *q++ = (colors[index]<<32) | colors1[index1];
+-#  else
+-      *q++ = (colors1[index1]<<32) | colors[index];
+-#  endif
+-    } else {
+-#  if WORDS_BIGENDIAN
+-      *q++ = colors[index]<<32;
+-#  else
+-      *q++ = colors[index];
+-#  endif
+-    }
+-  }
+-}
+-
+-#else // U32
+-
+-// The callback from fl_draw_image to get a row of data passes this:
+-struct pixmap_data {
+-  int w, h;
+-  const uchar*const* data;
+-  union {
+-    U32 colors[256];
+-    U32* byte1[256];
+-  };
+-};
+-
+-// callback for 1 byte per pixel:
+-static void cb1(void*v, int x, int y, int w, uchar* buf) {
+-  pixmap_data& d = *(pixmap_data*)v;
+-  const uchar* p = d.data[y]+x;
+-  U32* q = (U32*)buf;
+-  for (int X=w; X--;) *q++ = d.colors[*p++];
+-}
+-
+-// callback for 2 bytes per pixel:
+-static void cb2(void*v, int x, int y, int w, uchar* buf) {
+-  pixmap_data& d = *(pixmap_data*)v;
+-  const uchar* p = d.data[y]+2*x;
+-  U32* q = (U32*)buf;
+-  for (int X=w; X--;) {
+-    U32* colors = d.byte1[*p++];
+-    *q++ = colors[*p++];
+-  }
+-}
+-
+-#endif // U64 else U32
+-
+ uchar **fl_mask_bitmap; // if non-zero, create bitmap and store pointer here
+ 
+ /**
+@@ -200,34 +107,33 @@
+ }
+ #endif
+ 
+-/**
+-  Draw XPM image data, with the top-left corner at the given position.
+-  \see fl_draw_pixmap(char* const* data, int x, int y, Fl_Color bg)
+-  */
+-int fl_draw_pixmap(const char*const* cdata, int x, int y, Fl_Color bg) {
+-  pixmap_data d;
+-  if (!fl_measure_pixmap(cdata, d.w, d.h)) return 0;
++int fl_convert_pixmap(const char*const* cdata, uchar* out, Fl_Color bg) {
++  int w, h;
+   const uchar*const* data = (const uchar*const*)(cdata+1);
+   int transparent_index = -1;
++
++  if (!fl_measure_pixmap(cdata, w, h))
++    return 0;
++
++  if ((chars_per_pixel < 1) || (chars_per_pixel > 2))
++    return 0;
++
++  uchar colors[1<<(chars_per_pixel*8)][4];
++
+ #ifdef WIN32
+   uchar *transparent_c = (uchar *)0; // such that transparent_c[0,1,2] are the RGB of the transparent color
+   color_count = 0;
+   used_colors = (uchar *)malloc(abs(ncolors)*3*sizeof(uchar));
+ #endif
+ 
+-  if (ncolors < 0) {	// FLTK (non standard) compressed colormap
++  if (ncolors < 0) {
++    // FLTK (non standard) compressed colormap
+     ncolors = -ncolors;
+     const uchar *p = *data++;
+     // if first color is ' ' it is transparent (put it later to make
+     // it not be transparent):
+     if (*p == ' ') {
+-      uchar* c = (uchar*)&d.colors[(int)' '];
+-#ifdef U64
+-      *(U64*)c = 0;
+-#  if WORDS_BIGENDIAN
+-      c += 4;
+-#  endif
+-#endif
++      uchar* c = colors[(int)' '];
+       transparent_index = ' ';
+       Fl::get_color(bg, c[0], c[1], c[2]); c[3] = 0;
+ #ifdef WIN32
+@@ -238,13 +144,7 @@
+     }
+     // read all the rest of the colors:
+     for (int i=0; i < ncolors; i++) {
+-      uchar* c = (uchar*)&d.colors[*p++];
+-#ifdef U64
+-      *(U64*)c = 0;
+-#  if WORDS_BIGENDIAN
+-      c += 4;
+-#  endif
+-#endif
++      uchar* c = colors[*p++];
+ #ifdef WIN32
+       used_colors[3*color_count] = *p;
+       used_colors[3*color_count+1] = *(p+1);
+@@ -254,69 +154,44 @@
+       *c++ = *p++;
+       *c++ = *p++;
+       *c++ = *p++;
+-#ifdef __APPLE_QUARTZ__
+       *c = 255;
+-#else
+-      *c = 0;
+-#endif
+     }
+-  } else {	// normal XPM colormap with names
+-    if (chars_per_pixel>1) memset(d.byte1, 0, sizeof(d.byte1));
++  } else {
++    // normal XPM colormap with names
+     for (int i=0; i<ncolors; i++) {
+       const uchar *p = *data++;
+       // the first 1 or 2 characters are the color index:
+       int ind = *p++;
+       uchar* c;
+-      if (chars_per_pixel>1) {
+-#ifdef U64
+-	U64* colors = d.byte1[ind];
+-	if (!colors) colors = d.byte1[ind] = new U64[256];
+-#else
+-	U32* colors = d.byte1[ind];
+-	if (!colors) colors = d.byte1[ind] = new U32[256];
+-#endif
+-	c = (uchar*)&colors[*p];
+-	ind = (ind<<8)|*p++;
+-      } else {
+-	c = (uchar *)&d.colors[ind];
+-      }
++      if (chars_per_pixel>1)
++        ind = (ind<<8)|*p++;
++      c = colors[ind];
+       // look for "c word", or last word if none:
+       const uchar *previous_word = p;
+       for (;;) {
+-	while (*p && isspace(*p)) p++;
+-	uchar what = *p++;
+-	while (*p && !isspace(*p)) p++;
+-	while (*p && isspace(*p)) p++;
+-	if (!*p) {p = previous_word; break;}
+-	if (what == 'c') break;
+-	previous_word = p;
+-	while (*p && !isspace(*p)) p++;
++        while (*p && isspace(*p)) p++;
++        uchar what = *p++;
++        while (*p && !isspace(*p)) p++;
++        while (*p && isspace(*p)) p++;
++        if (!*p) {p = previous_word; break;}
++        if (what == 'c') break;
++        previous_word = p;
++        while (*p && !isspace(*p)) p++;
+       }
+-#ifdef U64
+-      *(U64*)c = 0;
+-#  if WORDS_BIGENDIAN
+-      c += 4;
+-#  endif
+-#endif
+-#ifdef __APPLE_QUARTZ__
+-      c[3] = 255;
+-#endif
+       int parse = fl_parse_color((const char*)p, c[0], c[1], c[2]);
++      c[3] = 255;
+       if (parse) {
+ #ifdef WIN32
+-	used_colors[3*color_count] = c[0];
+-	used_colors[3*color_count+1] = c[1];
+-	used_colors[3*color_count+2] = c[2];
+-	color_count++;
++        used_colors[3*color_count] = c[0];
++        used_colors[3*color_count+1] = c[1];
++        used_colors[3*color_count+2] = c[2];
++        color_count++;
+ #endif
+-	}
+-      else {
++      } else {
+         // assume "None" or "#transparent" for any errors
+-	// "bg" should be transparent...
+-	Fl::get_color(bg, c[0], c[1], c[2]);
+-#ifdef __APPLE_QUARTZ__
++        // "bg" should be transparent...
++        Fl::get_color(bg, c[0], c[1], c[2]);
+         c[3] = 0;
+-#endif
+ 	transparent_index = ind;
+ #ifdef WIN32
+ 	transparent_c = c;
+@@ -324,7 +199,6 @@
+       }
+     }
+   }
+-  d.data = data;
+ #ifdef WIN32
+   if (transparent_c) {
+     make_unused_color(transparent_c[0], transparent_c[1], transparent_c[2]);
+@@ -334,77 +208,76 @@
+     make_unused_color(r, g, b);
+   }
+ #endif
++
++  U32 *q = (U32*)out;
++  for (int Y = 0; Y < h; Y++) {
++    const uchar* p = data[Y];
++    if (chars_per_pixel <= 1) {
++      for (int X = 0; X < w; X++)
++        memcpy(q++, colors[*p++], 4);
++    } else {
++      for (int X = 0; X < w; X++) {
++        int ind = (*p++)<<8;
++        ind |= *p++;
++        memcpy(q++, colors[ind], 4);
++      }
++    }
++  }
+   
++  return 1;
++}
++
++/**
++  Draw XPM image data, with the top-left corner at the given position.
++  \see fl_draw_pixmap(char* const* data, int x, int y, Fl_Color bg)
++  */
++int fl_draw_pixmap(const char*const* cdata, int x, int y, Fl_Color bg) {
++  int w, h;
++
++  if (!fl_measure_pixmap(cdata, w, h))
++    return 0;
++
++  uchar buffer[w*h*4];
++
++  if (!fl_convert_pixmap(cdata, buffer, bg))
++    return 0;
++
++  // FIXME: Hack until fl_draw_image() supports alpha properly
+ #ifdef  __APPLE_QUARTZ__
+   if (Fl_Surface_Device::surface() == Fl_Display_Device::display_device()) {
+-    U32 *array = new U32[d.w * d.h], *q = array;
+-    for (int Y = 0; Y < d.h; Y++) {
+-      const uchar* p = data[Y];
+-      if (chars_per_pixel <= 1) {
+-	for (int X = 0; X < d.w; X++) {
+-	  *q++ = d.colors[*p++];
+-	}
+-      } else {
+-	for (int X = 0; X < d.w; X++) {
+-	  U32* colors = (U32*)d.byte1[*p++];
+-	  *q++ = colors[*p++];
+-	}
+-      }
+-    }
+-    Fl_RGB_Image* rgb = new Fl_RGB_Image((uchar*)array, d.w, d.h, 4);
++    Fl_RGB_Image* rgb = new Fl_RGB_Image(buffer, w, h, 4);
+     rgb->draw(x, y);
+     delete rgb;
+-    delete[] array;
+-    }
+-  else {
++  } else {
+ #endif // __APPLE_QUARTZ__
+-
+   // build the mask bitmap used by Fl_Pixmap:
+-  if (fl_mask_bitmap && transparent_index >= 0) {
+-    int W = (d.w+7)/8;
+-    uchar* bitmap = new uchar[W * d.h];
++  if (fl_mask_bitmap) {
++    int W = (w+7)/8;
++    uchar* bitmap = new uchar[W * h];
+     *fl_mask_bitmap = bitmap;
+-    for (int Y = 0; Y < d.h; Y++) {
+-      const uchar* p = data[Y];
+-      if (chars_per_pixel <= 1) {
+-	int dw = d.w;
+-	for (int X = 0; X < W; X++) {
+-	  uchar b = (dw-->0 && *p++ != transparent_index);
+-	  if (dw-->0 && *p++ != transparent_index) b |= 2;
+-	  if (dw-->0 && *p++ != transparent_index) b |= 4;
+-	  if (dw-->0 && *p++ != transparent_index) b |= 8;
+-	  if (dw-->0 && *p++ != transparent_index) b |= 16;
+-	  if (dw-->0 && *p++ != transparent_index) b |= 32;
+-	  if (dw-->0 && *p++ != transparent_index) b |= 64;
+-	  if (dw-->0 && *p++ != transparent_index) b |= 128;
++    const uchar *p = &buffer[3];
++    uchar b = 0;
++    for (int Y = 0; Y < h; Y++) {
++      b = 0;
++      for (int X = 0, bit = 1; X < w; X++, p += 4) {
++	if (*p > 127) b |= bit;
++	bit <<= 1;
++	if (bit > 0x80 || X == w-1) {
+ 	  *bitmap++ = b;
+-	}
+-      } else {
+-        uchar b = 0, bit = 1;
+-	for (int X = 0; X < d.w; X++) {
+-	  int ind = *p++;
+-	  ind = (ind<<8) | (*p++);
+-	  if (ind != transparent_index) b |= bit;
+-
+-          if (bit < 128) bit <<= 1;
+-	  else {
+-	    *bitmap++ = b;
+-	    b = 0;
+-	    bit = 1;
++	  bit = 1;
++	  b = 0;
+ 	  }
+ 	}
+-
+-        if (bit > 1) *bitmap++ = b;
+       }
+-    }
++    
+   }
+ 
+-  fl_draw_image(chars_per_pixel==1 ? cb1 : cb2, &d, x, y, d.w, d.h, 4);
++  fl_draw_image(buffer, x, y, w, h, 4);
++
+ #ifdef __APPLE_QUARTZ__
+     }
+ #endif
+ 
+-  if (chars_per_pixel > 1) for (int i = 0; i < 256; i++) delete[] d.byte1[i];
+   return 1;
+ }
+ 
+diff -Nur fltk-1.3.2.orig/src/Fl_grab.cxx fltk-1.3.2/src/Fl_grab.cxx
+--- fltk-1.3.2.orig/src/Fl_grab.cxx	2012-03-23 17:47:53.000000000 +0100
++++ fltk-1.3.2/src/Fl_grab.cxx	2013-07-17 19:37:07.411344886 +0200
+@@ -29,6 +29,7 @@
+ // override_redirect, it does similar things on WIN32.
+ 
+ extern void fl_fix_focus(); // in Fl.cxx
++void fl_update_focus(void);
+ 
+ #ifdef WIN32
+ // We have to keep track of whether we have captured the mouse, since
+@@ -80,6 +81,7 @@
+ #endif
+     }
+     grab_ = win;
++    fl_update_focus();
+   } else {
+     if (grab_) {
+ #ifdef WIN32
+@@ -98,6 +100,7 @@
+       XFlush(fl_display);
+ #endif
+       grab_ = 0;
++      fl_update_focus();
+       fl_fix_focus();
+     }
+   }
+diff -Nur fltk-1.3.2.orig/src/Fl_Image.cxx fltk-1.3.2/src/Fl_Image.cxx
+--- fltk-1.3.2.orig/src/Fl_Image.cxx	2012-11-09 17:02:08.000000000 +0100
++++ fltk-1.3.2/src/Fl_Image.cxx	2013-07-17 19:37:37.911343302 +0200
+@@ -165,7 +165,22 @@
+ //
+ size_t Fl_RGB_Image::max_size_ = ~((size_t)0);
+ 
+-/**  The destructor free all memory and server resources that are used by  the image. */
++int fl_convert_pixmap(const char*const* cdata, uchar* out, Fl_Color bg);
++
++/** The constructor creates a new RGBA image from the specified Fl_Pixmap. 
++ 
++ The RGBA image is built fully opaque except for the transparent area
++ of the pixmap that is assigned the \par bg color with full transparency */
++Fl_RGB_Image::Fl_RGB_Image(const Fl_Pixmap *pxm, Fl_Color bg):
++  Fl_Image(pxm->w(), pxm->h(), 4), id_(0), mask_(0)
++{
++  array = new uchar[w() * h() * d()];
++  alloc_array = 1;
++  fl_convert_pixmap(pxm->data(), (uchar*)array, bg);
++  data((const char **)&array, 1);
++}
++
++/**  The destructor frees all memory and server resources that are used by the image. */
+ Fl_RGB_Image::~Fl_RGB_Image() {
+   uncache();
+   if (alloc_array) delete[] (uchar *)array;
+diff -Nur fltk-1.3.2.orig/src/Fl_win32.cxx fltk-1.3.2/src/Fl_win32.cxx
+--- fltk-1.3.2.orig/src/Fl_win32.cxx	2012-06-21 10:52:29.000000000 +0200
++++ fltk-1.3.2/src/Fl_win32.cxx	2013-07-17 19:38:17.322341239 +0200
+@@ -942,6 +942,10 @@
+     break;
+ 
+   case WM_SETFOCUS:
++    if ((Fl::modal_) && (Fl::modal_ != window)) {
++      SetFocus(fl_xid(Fl::modal_));
++      return 0;
++    }
+     Fl::handle(FL_FOCUS, window);
+     break;
+ 
+@@ -1333,7 +1337,6 @@
+   Y+=yoff;
+ 
+   if (w->fullscreen_active()) {
+-    X = Y = 0;
+     bx = by = bt = 0;
+   }
+ 
+@@ -1387,19 +1390,42 @@
+   }
+ }
+ 
+-static void make_fullscreen(Fl_Window *w, Window xid, int X, int Y, int W, int H) {
++void Fl_X::make_fullscreen(int X, int Y, int W, int H) {
++  int top, bottom, left, right;
+   int sx, sy, sw, sh;
+-  Fl::screen_xywh(sx, sy, sw, sh, X, Y, W, H);
++
++  top = w->fullscreen_screen_top;
++  bottom = w->fullscreen_screen_bottom;
++  left = w->fullscreen_screen_left;
++  right = w->fullscreen_screen_right;
++
++  if ((top < 0) || (bottom < 0) || (left < 0) || (right < 0)) {
++    top = Fl::screen_num(X, Y, W, H);
++    bottom = top;
++    left = top;
++    right = top;
++  }
++
++  Fl::screen_xywh(sx, sy, sw, sh, top);
++  Y = sy;
++  Fl::screen_xywh(sx, sy, sw, sh, bottom);
++  H = sy + sh - Y;
++  Fl::screen_xywh(sx, sy, sw, sh, left);
++  X = sx;
++  Fl::screen_xywh(sx, sy, sw, sh, right);
++  W = sx + sw - X;
++
+   DWORD flags = GetWindowLong(xid, GWL_STYLE);
+   flags = flags & ~(WS_THICKFRAME|WS_CAPTION);
+   SetWindowLong(xid, GWL_STYLE, flags);
++
+   // SWP_NOSENDCHANGING is so that we can override size limits
+-  SetWindowPos(xid, HWND_TOP, sx, sy, sw, sh, SWP_NOSENDCHANGING | SWP_FRAMECHANGED);
++  SetWindowPos(xid, HWND_TOP, X, Y, W, H, SWP_NOSENDCHANGING | SWP_FRAMECHANGED);
+ }
+ 
+ void Fl_Window::fullscreen_x() {
+   _set_fullscreen();
+-  make_fullscreen(this, fl_xid(this), x(), y(), w(), h());
++  i->make_fullscreen(x(), y(), w(), h());
+   Fl::handle(FL_FULLSCREEN, this);
+ }
+ 
+@@ -1477,7 +1503,6 @@
+ 
+ char fl_show_iconic;	// hack for Fl_Window::iconic()
+ // int fl_background_pixel = -1; // color to use for background
+-HCURSOR fl_default_cursor;
+ UINT fl_wake_msg = 0;
+ int fl_disable_transient_for; // secret method of removing TRANSIENT_FOR
+ 
+@@ -1526,7 +1551,7 @@
+     if (!w->icon())
+       w->icon((void *)LoadIcon(NULL, IDI_APPLICATION));
+     wcw.hIcon = wcw.hIconSm = (HICON)w->icon();
+-    wcw.hCursor = fl_default_cursor = LoadCursor(NULL, IDC_ARROW);
++    wcw.hCursor = LoadCursor(NULL, IDC_ARROW);
+     //uchar r,g,b; Fl::get_color(FL_GRAY,r,g,b);
+     //wc.hbrBackground = (HBRUSH)CreateSolidBrush(RGB(r,g,b));
+     wcw.hbrBackground = NULL;
+@@ -1618,7 +1643,8 @@
+   x->setwindow(w);
+   x->region = 0;
+   x->private_dc = 0;
+-  x->cursor = fl_default_cursor;
++  x->cursor = LoadCursor(NULL, IDC_ARROW);
++  x->custom_cursor = 0;
+   if (!fl_codepage) fl_get_codepage();
+ 
+   WCHAR *lab = NULL;
+@@ -1644,6 +1670,8 @@
+   );
+   if (lab) free(lab);
+ 
++  x->set_icons();
++
+   if (w->fullscreen_active()) {
+   /* We need to make sure that the fullscreen is created on the
+      default monitor, ie the desktop where the shortcut is located
+@@ -1652,8 +1680,8 @@
+      monitor the window was placed on. */
+     RECT rect;
+     GetWindowRect(x->xid, &rect);
+-    make_fullscreen(w, x->xid, rect.left, rect.top, 
+-                    rect.right - rect.left, rect.bottom - rect.top);
++    x->make_fullscreen(rect.left, rect.top, 
++                       rect.right - rect.left, rect.bottom - rect.top);
+   }
+ 
+   x->next = Fl_X::first;
+@@ -1668,6 +1696,11 @@
+     Fl::e_number = old_event;
+     w->redraw(); // force draw to happen
+   }
++
++  // Needs to be done before ShowWindow() to get the correct behaviour
++  // when we get WM_SETFOCUS.
++  if (w->modal()) {Fl::modal_ = w; fl_fix_focus();}
++
+   // If we've captured the mouse, we dont want to activate any
+   // other windows from the code, or we lose the capture.
+   ShowWindow(x->xid, !showit ? SW_SHOWMINNOACTIVE :
+@@ -1685,7 +1718,6 @@
+     }
+   }
+ 
+-  if (w->modal()) {Fl::modal_ = w; fl_fix_focus();}
+   return x;
+ }
+ 
+@@ -1867,6 +1899,285 @@
+ }
+ 
+ ////////////////////////////////////////////////////////////////
++
++static HICON image_to_icon(const Fl_RGB_Image *image, bool is_icon=true,
++                           int hotx = 0, int hoty = 0) {
++  BITMAPV5HEADER bi;
++  HBITMAP bitmap, mask;
++  DWORD *bits;
++  HICON icon;
++
++  if (!is_icon) {
++  if ((hotx < 0) || (hotx >= image->w()))
++      return NULL;
++  if ((hoty < 0) || (hoty >= image->h()))
++      return NULL;
++  }
++
++  memset(&bi, 0, sizeof(BITMAPV5HEADER));
++
++  bi.bV5Size        = sizeof(BITMAPV5HEADER);
++  bi.bV5Width       = image->w();
++  bi.bV5Height      = -image->h(); // Negative for top-down
++  bi.bV5Planes      = 1;
++  bi.bV5BitCount    = 32;
++  bi.bV5Compression = BI_BITFIELDS;
++  bi.bV5RedMask     = 0x00FF0000;
++  bi.bV5GreenMask   = 0x0000FF00;
++  bi.bV5BlueMask    = 0x000000FF;
++  bi.bV5AlphaMask   = 0xFF000000;
++
++  HDC hdc;
++
++  hdc = GetDC(NULL);
++  bitmap = CreateDIBSection(hdc, (BITMAPINFO*)&bi, DIB_RGB_COLORS, (void**)&bits, NULL, 0);
++  ReleaseDC(NULL, hdc);
++
++  if (bits == NULL)
++    return NULL;
++
++  const uchar *i = (const uchar*)*image->data();
++  for (int y = 0;y < image->h();y++) {
++    for (int x = 0;x < image->w();x++) {
++      switch (image->d()) {
++      case 1:
++        *bits = (0xff<<24) | (i[0]<<16) | (i[0]<<8) | i[0];
++        break;
++      case 2:
++        *bits = (i[1]<<24) | (i[0]<<16) | (i[0]<<8) | i[0];
++        break;
++      case 3:
++        *bits = (0xff<<24) | (i[0]<<16) | (i[1]<<8) | i[2];
++        break;
++      case 4:
++        *bits = (i[3]<<24) | (i[0]<<16) | (i[1]<<8) | i[2];
++        break;
++      }
++      i += image->d();
++      bits++;
++    }
++    i += image->ld();
++  }
++
++  // A mask bitmap is still needed even though it isn't used
++  mask = CreateBitmap(image->w(),image->h(),1,1,NULL);
++  if (mask == NULL) {
++    DeleteObject(bitmap);
++    return NULL;
++  }
++
++  ICONINFO ii;
++
++  ii.fIcon    = is_icon;
++  ii.xHotspot = hotx;
++  ii.yHotspot = hoty;
++  ii.hbmMask  = mask;
++  ii.hbmColor = bitmap;
++
++  icon = CreateIconIndirect(&ii);
++
++  DeleteObject(bitmap);
++  DeleteObject(mask);
++
++  if (icon == NULL)
++    return NULL;
++
++  return icon;
++}
++
++////////////////////////////////////////////////////////////////
++
++static HICON default_big_icon = NULL;
++static HICON default_small_icon = NULL;
++
++const Fl_RGB_Image *find_best_icon(int ideal_width, 
++                                   const Fl_RGB_Image *icons[], int count) {
++  const Fl_RGB_Image *best;
++
++  best = NULL;
++
++  for (int i = 0;i < count;i++) {
++    if (best == NULL)
++      best = icons[i];
++    else {
++      if (best->w() < ideal_width) {
++        if (icons[i]->w() > best->w())
++          best = icons[i];
++      } else {
++        if ((icons[i]->w() >= ideal_width) &&
++            (icons[i]->w() < best->w()))
++          best = icons[i];
++      }
++    }
++  }
++
++  return best;
++}
++
++void Fl_X::set_default_icons(const Fl_RGB_Image *icons[], int count) {
++  const Fl_RGB_Image *best_big, *best_small;
++
++  if (default_big_icon != NULL)
++    DestroyIcon(default_big_icon);
++  if (default_small_icon != NULL)
++    DestroyIcon(default_small_icon);
++
++  best_big = find_best_icon(GetSystemMetrics(SM_CXICON), icons, count);
++  best_small = find_best_icon(GetSystemMetrics(SM_CXSMICON), icons, count);
++
++  if (best_big != NULL)
++    default_big_icon = image_to_icon(best_big);
++  else
++    default_big_icon = NULL;
++
++  if (best_small != NULL)
++    default_small_icon = image_to_icon(best_small);
++  else
++    default_small_icon = NULL;
++}
++
++void Fl_X::set_default_icons(HICON big_icon, HICON small_icon) {
++  if (default_big_icon != NULL)
++    DestroyIcon(default_big_icon);
++  if (default_small_icon != NULL)
++    DestroyIcon(default_small_icon);
++
++  if (big_icon != NULL)
++    default_big_icon = CopyIcon(big_icon);
++  if (small_icon != NULL)
++    default_small_icon = CopyIcon(small_icon);
++}
++
++void Fl_X::set_icons() {
++  HICON big_icon, small_icon;
++
++  big_icon = NULL;
++  small_icon = NULL;
++
++  if (w->icon_->count) {
++    const Fl_RGB_Image *best_big, *best_small;
++
++    best_big = find_best_icon(GetSystemMetrics(SM_CXICON),
++                              (const Fl_RGB_Image **)w->icon_->icons,
++                              w->icon_->count);
++    best_small = find_best_icon(GetSystemMetrics(SM_CXSMICON),
++                                (const Fl_RGB_Image **)w->icon_->icons,
++                                w->icon_->count);
++
++    if (best_big != NULL)
++      big_icon = image_to_icon(best_big);
++    if (best_small != NULL)
++      small_icon = image_to_icon(best_small);
++  } else {
++    big_icon = default_big_icon;
++    small_icon = default_small_icon;
++  }
++
++  if (big_icon != NULL)
++    SendMessage(xid, WM_SETICON, ICON_BIG, (LPARAM)big_icon);
++  if (small_icon != NULL)
++    SendMessage(xid, WM_SETICON, ICON_SMALL, (LPARAM)small_icon);
++
++  if (w->icon_->count) {
++    if (big_icon != NULL)
++      DestroyIcon(big_icon);
++    if (small_icon != NULL)
++      DestroyIcon(small_icon);
++  }
++}
++
++void Fl_Window::default_icons(HICON big_icon, HICON small_icon) {
++  Fl_X::set_default_icons(big_icon, small_icon);
++}
++
++void Fl_Window::icons(HICON big_icon, HICON small_icon) {
++  free_icons();
++
++  if (big_icon != NULL)
++    icon_->big_icon = CopyIcon(big_icon);
++  if (small_icon != NULL)
++    icon_->small_icon = CopyIcon(small_icon);
++
++  if (i)
++    i->set_icons();
++}
++
++////////////////////////////////////////////////////////////////
++
++#ifndef IDC_HAND
++#  define IDC_HAND  MAKEINTRESOURCE(32649)
++#endif // !IDC_HAND
++
++int Fl_X::set_cursor(Fl_Cursor c) {
++  LPSTR n;
++  HCURSOR new_cursor;
++
++  if (c == FL_CURSOR_NONE)
++    new_cursor = NULL;
++  else {
++    switch (c) {
++    case FL_CURSOR_ARROW:   n = IDC_ARROW; break;
++    case FL_CURSOR_CROSS:   n = IDC_CROSS; break;
++    case FL_CURSOR_WAIT:    n = IDC_WAIT; break;
++    case FL_CURSOR_INSERT:  n = IDC_IBEAM; break;
++    case FL_CURSOR_HAND:    n = IDC_HAND; break;
++    case FL_CURSOR_HELP:    n = IDC_HELP; break;
++    case FL_CURSOR_MOVE:    n = IDC_SIZEALL; break;
++    case FL_CURSOR_N:
++    case FL_CURSOR_S:
++      // FIXME: Should probably have fallbacks for these instead
++    case FL_CURSOR_NS:      n = IDC_SIZENS; break;
++    case FL_CURSOR_NE:
++    case FL_CURSOR_SW:
++      // FIXME: Dito.
++    case FL_CURSOR_NESW:    n = IDC_SIZENESW; break;
++    case FL_CURSOR_E:
++    case FL_CURSOR_W:
++      // FIXME: Dito.
++    case FL_CURSOR_WE:      n = IDC_SIZEWE; break;
++    case FL_CURSOR_SE:
++    case FL_CURSOR_NW:
++      // FIXME: Dito.
++    case FL_CURSOR_NWSE:    n = IDC_SIZENWSE; break;
++    default:
++      return 0;
++    }
++
++    new_cursor = LoadCursor(NULL, n);
++    if (new_cursor == NULL)
++      return 0;
++  }
++
++  if ((cursor != NULL) && custom_cursor)
++    DestroyIcon(cursor);
++
++  cursor = new_cursor;
++  custom_cursor = 0;
++
++  SetCursor(cursor);
++
++  return 1;
++}
++
++int Fl_X::set_cursor(const Fl_RGB_Image *image, int hotx, int hoty) {
++  HCURSOR new_cursor;
++
++  new_cursor = image_to_icon(image, false, hotx, hoty);
++  if (new_cursor == NULL)
++    return 0;
++
++  if ((cursor != NULL) && custom_cursor)
++    DestroyIcon(cursor);
++
++  cursor = new_cursor;
++  custom_cursor = 1;
++
++  SetCursor(cursor);
++
++  return 1;
++}
++
++////////////////////////////////////////////////////////////////
+ // Implement the virtual functions for the base Fl_Window class:
+ 
+ // If the box is a filled rectangle, we can make the redisplay *look*
+diff -Nur fltk-1.3.2.orig/src/Fl_Window.cxx fltk-1.3.2/src/Fl_Window.cxx
+--- fltk-1.3.2.orig/src/Fl_Window.cxx	2012-11-06 21:46:14.000000000 +0100
++++ fltk-1.3.2/src/Fl_Window.cxx	2013-07-17 19:38:01.699342056 +0200
+@@ -23,6 +23,7 @@
+ #include <config.h>
+ #include <FL/Fl.H>
+ #include <FL/x.H>
++#include <FL/Fl_RGB_Image.H>
+ #include <FL/Fl_Window.H>
+ #include <stdlib.h>
+ #include "flstring.h"
+@@ -45,7 +46,8 @@
+   }
+   i = 0;
+   xclass_ = 0;
+-  icon_ = 0;
++  icon_ = new icon_data;
++  memset(icon_, 0, sizeof(*icon_));
+   iconlabel_ = 0;
+   resizable(0);
+   size_range_set = 0;
+@@ -62,8 +64,6 @@
+ Fl_Window::Fl_Window(int X,int Y,int W, int H, const char *l)
+ : Fl_Group(X, Y, W, H, l) {
+   cursor_default = FL_CURSOR_DEFAULT;
+-  cursor_fg      = FL_BLACK;
+-  cursor_bg      = FL_WHITE;
+ 
+   _Fl_Window();
+   set_flag(FORCE_POSITION);
+@@ -73,8 +73,6 @@
+ // fix common user error of a missing end() with current(0):
+   : Fl_Group((Fl_Group::current(0),0), 0, W, H, l) {
+   cursor_default = FL_CURSOR_DEFAULT;
+-  cursor_fg      = FL_BLACK;
+-  cursor_bg      = FL_WHITE;
+ 
+   _Fl_Window();
+   clear_visible();
+@@ -268,16 +266,68 @@
+   }
+ }
+ 
++void Fl_Window::default_icon(const Fl_RGB_Image *icon) {
++  default_icons(&icon, 1);
++}
++
++void Fl_Window::default_icons(const Fl_RGB_Image **icons, int count) {
++  Fl_X::set_default_icons(icons, count);
++}
++
++void Fl_Window::icon(const Fl_RGB_Image *icon) {
++  icons(&icon, 1);
++}
++
++void Fl_Window::icons(const Fl_RGB_Image **icons, int count) {
++  free_icons();
++
++  if (count > 0) {
++    icon_->icons = new Fl_RGB_Image*[count];
++    icon_->count = count;
++    // FIXME: Fl_RGB_Image lacks const modifiers on methods
++    for (int i = 0;i < count;i++)
++      icon_->icons[i] = (Fl_RGB_Image*)((Fl_RGB_Image*)icons[i])->copy();
++  }
++
++  if (i)
++    i->set_icons();
++}
++
+ /** Gets the current icon window target dependent data. */
+ const void *Fl_Window::icon() const {
+-  return icon_;
++  return icon_->legacy_icon;
+ }
+ 
+ /** Sets the current icon window target dependent data. */
+ void Fl_Window::icon(const void * ic) {
+-  icon_ = ic;
++  free_icons();
++  icon_->legacy_icon = ic;
+ }
+ 
++void Fl_Window::free_icons() {
++  int i;
++
++  icon_->legacy_icon = 0L;
++
++  if (icon_->icons) {
++    for (i = 0;i < icon_->count;i++)
++      delete icon_->icons[i];
++    delete [] icon_->icons;
++    icon_->icons = 0L;
++  }
++
++  icon_->count = 0;
++
++#ifdef WIN32
++  if (icon_->big_icon)
++    DestroyIcon(icon_->big_icon);
++  if (icon_->small_icon)
++    DestroyIcon(icon_->small_icon);
++
++  icon_->big_icon = NULL;
++  icon_->small_icon = NULL;
++#endif
++}
+ 
+ //
+ // End of "$Id: Fl_Window.cxx 9706 2012-11-06 20:46:14Z matt $".
+diff -Nur fltk-1.3.2.orig/src/Fl_Window_fullscreen.cxx fltk-1.3.2/src/Fl_Window_fullscreen.cxx
+--- fltk-1.3.2.orig/src/Fl_Window_fullscreen.cxx	2012-11-06 21:46:14.000000000 +0100
++++ fltk-1.3.2/src/Fl_Window_fullscreen.cxx	2013-07-17 19:38:17.323341239 +0200
+@@ -36,6 +36,10 @@
+ int Fl_Window::no_fullscreen_y = 0;
+ int Fl_Window::no_fullscreen_w = 0;
+ int Fl_Window::no_fullscreen_h = 0;
++int Fl_Window::fullscreen_screen_top = -1;
++int Fl_Window::fullscreen_screen_bottom = -1;
++int Fl_Window::fullscreen_screen_left = -1;
++int Fl_Window::fullscreen_screen_right = -1;
+ #endif
+ 
+ void Fl_Window::border(int b) {
+@@ -95,6 +99,23 @@
+   fullscreen_off(no_fullscreen_x, no_fullscreen_y, no_fullscreen_w, no_fullscreen_h);
+ }
+ 
++void Fl_Window::fullscreen_screens(int top, int bottom, int left, int right) {
++  if ((top < 0) || (bottom < 0) || (left < 0) || (right < 0)) {
++    fullscreen_screen_top = -1;
++    fullscreen_screen_bottom = -1;
++    fullscreen_screen_left = -1;
++    fullscreen_screen_right = -1;
++  } else {
++    fullscreen_screen_top = top;
++    fullscreen_screen_bottom = bottom;
++    fullscreen_screen_left = left;
++    fullscreen_screen_right = right;
++  }
++
++  if (shown() && (flags() & Fl_Widget::FULLSCREEN))
++    fullscreen_x();
++}
++
+ 
+ //
+ // End of "$Id: Fl_Window_fullscreen.cxx 9706 2012-11-06 20:46:14Z matt $".
+diff -Nur fltk-1.3.2.orig/src/Fl_x.cxx fltk-1.3.2/src/Fl_x.cxx
+--- fltk-1.3.2.orig/src/Fl_x.cxx	2012-10-16 17:35:34.000000000 +0200
++++ fltk-1.3.2/src/Fl_x.cxx	2013-07-17 19:38:17.326341239 +0200
+@@ -53,6 +53,17 @@
+ static int randrEventBase;                  // base of RandR-defined events
+ #endif
+ 
++#  if HAVE_XFIXES
++#  include <X11/extensions/Xfixes.h>
++static int xfixes_event_base = 0;
++static bool have_xfixes = false;
++#  endif
++
++#  include <X11/cursorfont.h>
++
++#  if HAVE_XCURSOR
++#    include <X11/Xcursor/Xcursor.h>
++#  endif
+ static Fl_Xlib_Graphics_Driver fl_xlib_driver;
+ static Fl_Display_Device fl_xlib_display(&fl_xlib_driver);
+ Fl_Display_Device *Fl_Display_Device::_display = &fl_xlib_display;// the platform display
+@@ -298,6 +309,7 @@
+ Colormap fl_colormap;
+ XIM fl_xim_im = 0;
+ XIC fl_xim_ic = 0;
++Window fl_xim_win = 0;
+ char fl_is_over_the_spot = 0;
+ static XRectangle status_area;
+ 
+@@ -306,6 +318,9 @@
+ static Atom fl_MOTIF_WM_HINTS;
+ static Atom TARGETS;
+ static Atom CLIPBOARD;
++static Atom TIMESTAMP;
++static Atom PRIMARY_TIMESTAMP;
++static Atom CLIPBOARD_TIMESTAMP;
+ Atom fl_XdndAware;
+ Atom fl_XdndSelection;
+ Atom fl_XdndEnter;
+@@ -329,7 +344,9 @@
+ Atom fl_NET_SUPPORTING_WM_CHECK;
+ Atom fl_NET_WM_STATE;
+ Atom fl_NET_WM_STATE_FULLSCREEN;
++Atom fl_NET_WM_FULLSCREEN_MONITORS;
+ Atom fl_NET_WORKAREA;
++Atom fl_NET_WM_ICON;
+ 
+ /*
+   X defines 32-bit-entities to have a format value of max. 32,
+@@ -583,6 +600,65 @@
+   if(xim_styles) XFree(xim_styles);
+ }
+ 
++void fl_xim_deactivate(void);
++
++void fl_xim_activate(Window xid)
++{
++  if (!fl_xim_im)
++    return;
++
++  // If the focused window has changed, then use the brute force method
++  // of completely recreating the input context.
++  if (fl_xim_win != xid) {
++    fl_xim_deactivate();
++
++    fl_new_ic();
++    fl_xim_win = xid;
++
++    XSetICValues(fl_xim_ic,
++                 XNFocusWindow, fl_xim_win,
++                 XNClientWindow, fl_xim_win,
++                 NULL);
++  }
++
++  fl_set_spot(spotf, spots, spot.x, spot.y, spot.width, spot.height);
++}
++
++void fl_xim_deactivate(void)
++{
++  if (!fl_xim_ic)
++    return;
++
++  XDestroyIC(fl_xim_ic);
++  fl_xim_ic = NULL;
++
++  fl_xim_win = 0;
++}
++
++extern Fl_Window *fl_xfocus;
++
++void fl_update_focus(void)
++{
++  Fl_Widget *focus;
++
++  focus = Fl::grab();
++  if (!focus)
++    focus = Fl::focus();
++  if (!focus)
++    return;
++
++  if (focus->simple_keyboard()) {
++    fl_xim_deactivate();
++  } else {
++    // fl_xfocus should always be set if something has focus, but let's
++    // play it safe
++    if (!fl_xfocus || !fl_xid(fl_xfocus))
++      return;
++
++    fl_xim_activate(fl_xid(fl_xfocus));
++  }
++}
++
+ void fl_open_display() {
+   if (fl_display) return;
+ 
+@@ -607,6 +683,9 @@
+   fl_MOTIF_WM_HINTS     = XInternAtom(d, "_MOTIF_WM_HINTS",     0);
+   TARGETS               = XInternAtom(d, "TARGETS",             0);
+   CLIPBOARD             = XInternAtom(d, "CLIPBOARD",           0);
++  TIMESTAMP             = XInternAtom(d, "TIMESTAMP",           0);
++  PRIMARY_TIMESTAMP     = XInternAtom(d, "PRIMARY_TIMESTAMP",   0);
++  CLIPBOARD_TIMESTAMP   = XInternAtom(d, "CLIPBOARD_TIMESTAMP", 0);
+   fl_XdndAware          = XInternAtom(d, "XdndAware",           0);
+   fl_XdndSelection      = XInternAtom(d, "XdndSelection",       0);
+   fl_XdndEnter          = XInternAtom(d, "XdndEnter",           0);
+@@ -631,7 +710,9 @@
+   fl_NET_SUPPORTING_WM_CHECK = XInternAtom(d, "_NET_SUPPORTING_WM_CHECK", 0);
+   fl_NET_WM_STATE       = XInternAtom(d, "_NET_WM_STATE",       0);
+   fl_NET_WM_STATE_FULLSCREEN = XInternAtom(d, "_NET_WM_STATE_FULLSCREEN", 0);
++  fl_NET_WM_FULLSCREEN_MONITORS = XInternAtom(d, "_NET_WM_FULLSCREEN_MONITORS", 0);
+   fl_NET_WORKAREA       = XInternAtom(d, "_NET_WORKAREA",       0);
++  fl_NET_WM_ICON        = XInternAtom(d, "_NET_WM_ICON",        0);
+ 
+   if (sizeof(Atom) < 4)
+     atom_bits = sizeof(Atom) * 8;
+@@ -653,6 +734,15 @@
+ #if !USE_COLORMAP
+   Fl::visual(FL_RGB);
+ #endif
++
++#if HAVE_XFIXES
++  int error_base;
++  if (XFixesQueryExtension(fl_display, &xfixes_event_base, &error_base))
++    have_xfixes = true;
++  else
++    have_xfixes = false;
++#endif
++
+ #if USE_XRANDR
+   void *libxrandr_addr = dlopen("libXrandr.so.2", RTLD_LAZY);
+   if (!libxrandr_addr)  libxrandr_addr = dlopen("libXrandr.so", RTLD_LAZY);
+@@ -841,6 +931,102 @@
+ }
+ 
+ ////////////////////////////////////////////////////////////////
++// Code for tracking clipboard changes:
++
++static Time primary_timestamp = -1;
++static Time clipboard_timestamp = -1;
++
++extern bool fl_clipboard_notify_empty(void);
++extern void fl_trigger_clipboard_notify(int source);
++
++static void poll_clipboard_owner(void) {
++  Window xid;
++
++#if HAVE_XFIXES
++  // No polling needed with Xfixes
++  if (have_xfixes)
++    return;
++#endif
++
++  // No one is interested, so no point polling
++  if (fl_clipboard_notify_empty())
++    return;
++
++  // We need a window for this to work
++  if (!Fl::first_window())
++    return;
++  xid = fl_xid(Fl::first_window());
++  if (!xid)
++    return;
++
++  // Request an update of the selection time for both the primary and
++  // clipboard selections. Magic continues when we get a SelectionNotify.
++  if (!fl_i_own_selection[0])
++    XConvertSelection(fl_display, XA_PRIMARY, TIMESTAMP, PRIMARY_TIMESTAMP,
++                      xid, fl_event_time);
++  if (!fl_i_own_selection[1])
++    XConvertSelection(fl_display, CLIPBOARD, TIMESTAMP, CLIPBOARD_TIMESTAMP,
++                      xid, fl_event_time);
++}
++
++static void clipboard_timeout(void *data)
++{
++  // No one is interested, so stop polling
++  if (fl_clipboard_notify_empty())
++    return;
++
++  poll_clipboard_owner();
++
++  Fl::repeat_timeout(0.5, clipboard_timeout);
++}
++
++static void handle_clipboard_timestamp(int clipboard, Time time)
++{
++  Time *timestamp;
++
++  timestamp = clipboard ? &clipboard_timestamp : &primary_timestamp;
++
++#if HAVE_XFIXES
++  if (!have_xfixes)
++#endif
++  {
++    // Initial scan, just store the value
++    if (*timestamp == (Time)-1) {
++      *timestamp = time;
++      return;
++    }
++  }
++
++  // Same selection
++  if (time == *timestamp)
++    return;
++
++  *timestamp = time;
++
++  // Something happened! Let's tell someone!
++  fl_trigger_clipboard_notify(clipboard);
++}
++
++void fl_clipboard_notify_change() {
++  // Reset the timestamps if we've going idle so that you don't
++  // get a bogus immediate trigger next time they're activated.
++  if (fl_clipboard_notify_empty()) {
++    primary_timestamp = -1;
++    clipboard_timestamp = -1;
++  } else {
++#if HAVE_XFIXES
++    if (!have_xfixes)
++#endif
++    {
++      poll_clipboard_owner();
++
++      if (!Fl::has_timeout(clipboard_timeout))
++        Fl::add_timeout(0.5, clipboard_timeout);
++    }
++  }
++}
++
++////////////////////////////////////////////////////////////////
+ 
+ const XEvent* fl_xevent; // the current x event
+ ulong fl_event_time; // the last timestamp from an x event
+@@ -918,10 +1104,9 @@
+   XEvent xevent = thisevent;
+   fl_xevent = &thisevent;
+   Window xid = xevent.xany.window;
+-  static Window xim_win = 0;
+ 
+   if (fl_xim_ic && xevent.type == DestroyNotify &&
+-        xid != xim_win && !fl_find(xid))
++        xid != fl_xim_win && !fl_find(xid))
+   {
+     XIM xim_im;
+     xim_im = XOpenIM(fl_display, NULL, NULL, NULL);
+@@ -936,48 +1121,10 @@
+     return 0;
+   }
+ 
+-  if (fl_xim_ic && (xevent.type == FocusIn))
+-  {
+-#define POOR_XIM
+-#ifdef POOR_XIM
+-        if (xim_win != xid)
+-        {
+-                xim_win  = xid;
+-                XDestroyIC(fl_xim_ic);
+-                fl_xim_ic = NULL;
+-                fl_new_ic();
+-                XSetICValues(fl_xim_ic,
+-                                XNFocusWindow, xevent.xclient.window,
+-                                XNClientWindow, xid,
+-                                NULL);
+-        }
+-        fl_set_spot(spotf, spots, spot.x, spot.y, spot.width, spot.height);
+-#else
+-    if (Fl::first_window() && Fl::first_window()->modal()) {
+-      Window x  = fl_xid(Fl::first_window());
+-      if (x != xim_win) {
+-        xim_win  = x;
+-        XSetICValues(fl_xim_ic,
+-                        XNFocusWindow, xim_win,
+-                        XNClientWindow, xim_win,
+-                        NULL);
+-        fl_set_spot(spotf, spots, spot.x, spot.y, spot.width, spot.height);
+-      }
+-    } else if (xim_win != xid && xid) {
+-      xim_win = xid;
+-      XSetICValues(fl_xim_ic,
+-                        XNFocusWindow, xevent.xclient.window,
+-                        XNClientWindow, xid,
+-                        //XNFocusWindow, xim_win,
+-                        //XNClientWindow, xim_win,
+-                        NULL);
+-      fl_set_spot(spotf, spots, spot.x, spot.y, spot.width, spot.height);
+-    }
+-#endif
++  if (fl_xim_ic) {
++    if (XFilterEvent((XEvent *)&xevent, 0))
++      return 1;
+   }
+-
+-  if ( XFilterEvent((XEvent *)&xevent, 0) )
+-      return(1);
+   
+ #if USE_XRANDR  
+   if( XRRUpdateConfiguration_f && xevent.type == randrEventBase + RRScreenChangeNotify) {
+@@ -1003,7 +1150,6 @@
+     return 0;
+ 
+   case SelectionNotify: {
+-    if (!fl_selection_requestor) return 0;
+     static unsigned char* buffer = 0;
+     if (buffer) {XFree(buffer); buffer = 0;}
+     long bytesread = 0;
+@@ -1019,6 +1165,19 @@
+                              bytesread/4, 65536, 1, 0,
+                              &actual, &format, &count, &remaining,
+                              &portion)) break; // quit on error
++
++      if ((fl_xevent->xselection.property == PRIMARY_TIMESTAMP) ||
++          (fl_xevent->xselection.property == CLIPBOARD_TIMESTAMP)) {
++        if (portion && format == 32 && count == 1) {
++          Time t = *(unsigned int*)portion;
++          if (fl_xevent->xselection.property == CLIPBOARD_TIMESTAMP)
++            handle_clipboard_timestamp(1, t);
++          else
++            handle_clipboard_timestamp(0, t);
++        }
++        return true;
++      }
++
+       if (actual == TARGETS || actual == XA_ATOM) {
+ 	Atom type = XA_STRING;
+ 	for (unsigned i = 0; i<count; i++) {
+@@ -1055,6 +1214,9 @@
+       buffer[bytesread] = 0;
+       convert_crlf(buffer, bytesread);
+     }
++
++    if (!fl_selection_requestor) return 0;
++
+     Fl::e_text = buffer ? (char*)buffer : (char *)"";
+     Fl::e_length = bytesread;
+     int old_event = Fl::e_number;
+@@ -1075,6 +1237,7 @@
+   case SelectionClear: {
+     int clipboard = fl_xevent->xselectionclear.selection == CLIPBOARD;
+     fl_i_own_selection[clipboard] = 0;
++    poll_clipboard_owner();
+     return 1;}
+ 
+   case SelectionRequest: {
+@@ -1287,6 +1450,9 @@
+   case FocusIn:
+     if (fl_xim_ic) XSetICFocus(fl_xim_ic);
+     event = FL_FOCUS;
++    // If the user has toggled from another application to this one,
++    // then it's a good time to check for clipboard changes.
++    poll_clipboard_owner();
+     break;
+ 
+   case FocusOut:
+@@ -1327,15 +1493,15 @@
+         //static XComposeStatus compose;
+         len = XLookupString((XKeyEvent*)&(xevent.xkey),
+                              buffer, buffer_len, &keysym, 0/*&compose*/);
+-        if (keysym && keysym < 0x400) { // a character in latin-1,2,3,4 sets
+-          // force it to type a character (not sure if this ever is needed):
+-          // if (!len) {buffer[0] = char(keysym); len = 1;}
+-          len = fl_utf8encode(XKeysymToUcs(keysym), buffer);
+-          if (len < 1) len = 1;
+-          // ignore all effects of shift on the keysyms, which makes it a lot
+-          // easier to program shortcuts and is Windoze-compatible:
+-          keysym = XKeycodeToKeysym(fl_display, keycode, 0);
+-        }
++        // XLookupString() is only defined to return Latin-1 (although it
++        // often gives you more). To be safe, use our own lookups based on
++        // keysym.
++        len = fl_utf8encode(XKeysymToUcs(keysym), buffer);
++        if (len < 1)
++          len = 1;
++        // ignore all effects of shift on the keysyms, which makes it a lot
++        // easier to program shortcuts and is Windoze-compatable:
++        keysym = XKeycodeToKeysym(fl_display, keycode, 0);
+       }
+       // MRS: Can't use Fl::event_state(FL_CTRL) since the state is not
+       //      set until set_event_xy() is called later...
+@@ -1655,6 +1821,25 @@
+     }
+   }
+ 
++#if HAVE_XFIXES
++  switch (xevent.type - xfixes_event_base) {
++  case XFixesSelectionNotify: {
++    // Someone feeding us bogus events?
++    if (!have_xfixes)
++      return true;
++
++    XFixesSelectionNotifyEvent *selection_notify = (XFixesSelectionNotifyEvent *)&xevent;
++
++    if ((selection_notify->selection == XA_PRIMARY) && !fl_i_own_selection[0])
++      handle_clipboard_timestamp(0, selection_notify->selection_timestamp);
++    else if ((selection_notify->selection == CLIPBOARD) && !fl_i_own_selection[1])
++      handle_clipboard_timestamp(1, selection_notify->selection_timestamp);
++
++    return true;
++    }
++  }
++#endif
++
+   return Fl::handle(event, window);
+ }
+ 
+@@ -1697,22 +1882,30 @@
+ #define _NET_WM_STATE_ADD           1  /* add/set property */
+ #define _NET_WM_STATE_TOGGLE        2  /* toggle property  */
+ 
+-static void send_wm_state_event(Window wnd, int add, Atom prop) {
++static void send_wm_event(Window wnd, Atom message,
++                          unsigned long d0, unsigned long d1=0,
++                          unsigned long d2=0, unsigned long d3=0,
++                          unsigned long d4=0) {
+   XEvent e;
+   e.xany.type = ClientMessage;
+   e.xany.window = wnd;
+-  e.xclient.message_type = fl_NET_WM_STATE;
++  e.xclient.message_type = message;
+   e.xclient.format = 32;
+-  e.xclient.data.l[0] = add ? _NET_WM_STATE_ADD : _NET_WM_STATE_REMOVE;
+-  e.xclient.data.l[1] = prop;
+-  e.xclient.data.l[2] = 0;
+-  e.xclient.data.l[3] = 0;
+-  e.xclient.data.l[4] = 0;
++  e.xclient.data.l[0] = d0;
++  e.xclient.data.l[1] = d1;
++  e.xclient.data.l[2] = d2;
++  e.xclient.data.l[3] = d3;
++  e.xclient.data.l[4] = d4;
+   XSendEvent(fl_display, RootWindow(fl_display, fl_screen),
+              0, SubstructureNotifyMask | SubstructureRedirectMask,
+              &e);
+ }
+ 
++static void send_wm_state_event(Window wnd, int add, Atom prop) {
++  send_wm_event(wnd, fl_NET_WM_STATE,
++                add ? _NET_WM_STATE_ADD : _NET_WM_STATE_REMOVE, prop);
++}
++
+ int Fl_X::ewmh_supported() {
+   static int result = -1;
+ 
+@@ -1736,6 +1929,22 @@
+ /* Change an existing window to fullscreen */
+ void Fl_Window::fullscreen_x() {
+   if (Fl_X::ewmh_supported()) {
++    int top, bottom, left, right;
++
++    top = fullscreen_screen_top;
++    bottom = fullscreen_screen_bottom;
++    left = fullscreen_screen_left;
++    right = fullscreen_screen_right;
++
++    if ((top < 0) || (bottom < 0) || (left < 0) || (right < 0)) {
++      top = Fl::screen_num(x(), y(), w(), h());
++      bottom = top;
++      left = top;
++      right = top;
++    }
++
++    send_wm_event(fl_xid(this), fl_NET_WM_FULLSCREEN_MONITORS,
++                  top, bottom, left, right);
+     send_wm_state_event(fl_xid(this), 1, fl_NET_WM_STATE_FULLSCREEN);
+   } else {
+     _set_fullscreen();
+@@ -1822,7 +2031,7 @@
+     // force the window to be on-screen.  Usually the X window manager
+     // does this, but a few don't, so we do it here for consistency:
+     int scr_x, scr_y, scr_w, scr_h;
+-    Fl::screen_xywh(scr_x, scr_y, scr_w, scr_h, X, Y);
++    Fl::screen_xywh(scr_x, scr_y, scr_w, scr_h, X, Y, W, H);
+ 
+     if (win->border()) {
+       // ensure border is on screen:
+@@ -1851,6 +2060,23 @@
+     return;
+   }
+ 
++  // Compute which screen(s) we should be on if we want to go fullscreen
++  int fullscreen_top, fullscreen_bottom, fullscreen_left, fullscreen_right;
++
++  fullscreen_top = win->fullscreen_screen_top;
++  fullscreen_bottom = win->fullscreen_screen_bottom;
++  fullscreen_left = win->fullscreen_screen_left;
++  fullscreen_right = win->fullscreen_screen_right;
++
++  if ((fullscreen_top < 0) || (fullscreen_bottom < 0) ||
++      (fullscreen_left < 0) || (fullscreen_right < 0)) {
++    fullscreen_top = Fl::screen_num(X, Y, W, H);
++    fullscreen_bottom = fullscreen_top;
++    fullscreen_left = fullscreen_top;
++    fullscreen_right = fullscreen_top;
++  }
++
++
+   ulong root = win->parent() ?
+     fl_xid(win->window()) : RootWindow(fl_display, fl_screen);
+ 
+@@ -1874,9 +2100,17 @@
+   // border, and cannot grab without an existing window. Besides, 
+   // there is no clear_override(). 
+   if (win->flags() & Fl_Widget::FULLSCREEN && !Fl_X::ewmh_supported()) {
++    int sx, sy, sw, sh;
+     attr.override_redirect = 1;
+     mask |= CWOverrideRedirect;
+-    Fl::screen_xywh(X, Y, W, H, X, Y, W, H);
++    Fl::screen_xywh(sx, sy, sw, sh, fullscreen_left);
++    X = sx;
++    Fl::screen_xywh(sx, sy, sw, sh, fullscreen_right);
++    W = sx + sw - X;
++    Fl::screen_xywh(sx, sy, sw, sh, fullscreen_top);
++    Y = sy;
++    Fl::screen_xywh(sx, sy, sw, sh, fullscreen_bottom);
++    H = sy + sh - Y;
+   }
+ 
+   if (fl_background_pixel >= 0) {
+@@ -1929,6 +2163,12 @@
+       while (wp->parent()) wp = wp->window();
+       XSetTransientForHint(fl_display, xp->xid, fl_xid(wp));
+       if (!wp->visible()) showit = 0; // guess that wm will not show it
++      if (win->modal()) {
++        Atom net_wm_state = XInternAtom (fl_display, "_NET_WM_STATE", 0);
++        Atom net_wm_state_skip_taskbar = XInternAtom (fl_display, "_NET_WM_STATE_MODAL", 0);
++        XChangeProperty (fl_display, xp->xid, net_wm_state, XA_ATOM, 32,
++            PropModeAppend, (unsigned char*) &net_wm_state_skip_taskbar, 1);
++      }
+     }
+ 
+     // Make sure that borderless windows do not show in the task bar
+@@ -1941,6 +2181,13 @@
+ 
+     // If asked for, create fullscreen
+     if (win->flags() & Fl_Widget::FULLSCREEN && Fl_X::ewmh_supported()) {
++      unsigned long data[4];
++      data[0] = fullscreen_top;
++      data[1] = fullscreen_bottom;
++      data[2] = fullscreen_left;
++      data[3] = fullscreen_right;
++      XChangeProperty (fl_display, xp->xid, fl_NET_WM_FULLSCREEN_MONITORS, XA_ATOM, 32,
++                       PropModeReplace, (unsigned char*) data, 4);
+       XChangeProperty (fl_display, xp->xid, fl_NET_WM_STATE, XA_ATOM, 32,
+                        PropModeAppend, (unsigned char*) &fl_NET_WM_STATE_FULLSCREEN, 1);
+     }
+@@ -1959,12 +2206,14 @@
+       fl_show_iconic = 0;
+       showit = 0;
+     }
+-    if (win->icon()) {
+-      hints->icon_pixmap = (Pixmap)win->icon();
++    if (win->icon_->legacy_icon) {
++      hints->icon_pixmap = (Pixmap)win->icon_->legacy_icon;
+       hints->flags       |= IconPixmapHint;
+     }
+     XSetWMHints(fl_display, xp->xid, hints);
+     XFree(hints);
++
++    xp->set_icons();
+   }
+ 
+   // set the window type for menu and tooltip windows to avoid animations (compiz)
+@@ -1974,6 +2223,16 @@
+     XChangeProperty(fl_display, xp->xid, net_wm_type, XA_ATOM, 32, PropModeReplace, (unsigned char*)&net_wm_type_kind, 1);
+   }
+ 
++#if HAVE_XFIXES
++  // register for clipboard change notifications
++  if (have_xfixes && !win->parent()) {
++    XFixesSelectSelectionInput(fl_display, xp->xid, XA_PRIMARY,
++                               XFixesSetSelectionOwnerNotifyMask);
++    XFixesSelectSelectionInput(fl_display, xp->xid, CLIPBOARD,
++                               XFixesSetSelectionOwnerNotifyMask);
++  }
++#endif
++
+   XMapWindow(fl_display, xp->xid);
+   if (showit) {
+     win->set_visible();
+@@ -2073,6 +2332,181 @@
+ }
+ 
+ ////////////////////////////////////////////////////////////////
++
++static unsigned long *default_net_wm_icons = 0L;
++static size_t default_net_wm_icons_size = 0;
++
++void icons_to_property(const Fl_RGB_Image *icons[], int count,
++                       unsigned long **property, size_t *len) {
++  size_t sz;
++  unsigned long *data;
++
++  sz = 0;
++  for (int i = 0;i < count;i++)
++    sz += 2 + icons[i]->w() * icons[i]->h();
++
++  // FIXME: Might want to sort the icons
++
++  *property = data = new unsigned long[sz];
++  *len = sz;
++
++  for (int i = 0;i < count;i++) {
++    const Fl_RGB_Image *image;
++
++    image = icons[i];
++
++    data[0] = image->w();
++    data[1] = image->h();
++    data += 2;
++
++    const uchar *in = (const uchar*)*image->data();
++    for (int y = 0;y < image->h();y++) {
++      for (int x = 0;x < image->w();x++) {
++        switch (image->d()) {
++        case 1:
++          *data = ( 0xff<<24) | (in[0]<<16) | (in[0]<<8) | in[0];
++          break;
++        case 2:
++          *data = (in[1]<<24) | (in[0]<<16) | (in[0]<<8) | in[0];
++          break;
++        case 3:
++          *data = ( 0xff<<24) | (in[0]<<16) | (in[1]<<8) | in[2];
++          break;
++        case 4:
++          *data = (in[3]<<24) | (in[0]<<16) | (in[1]<<8) | in[2];
++          break;
++        }
++        in += image->d();
++        data++;
++      }
++      in += image->ld();
++    }
++  }
++}
++
++void Fl_X::set_default_icons(const Fl_RGB_Image *icons[], int count) {
++  if (default_net_wm_icons) {
++    delete [] default_net_wm_icons;
++    default_net_wm_icons = 0L;
++    default_net_wm_icons_size = 0;
++  }
++
++  if (count > 0)
++    icons_to_property(icons, count,
++                      &default_net_wm_icons, &default_net_wm_icons_size);
++}
++
++void Fl_X::set_icons() {
++  unsigned long *net_wm_icons;
++  size_t net_wm_icons_size;
++
++  if (w->icon_->count) {
++    icons_to_property((const Fl_RGB_Image **)w->icon_->icons, w->icon_->count,
++                      &net_wm_icons, &net_wm_icons_size);
++  } else {
++    net_wm_icons = default_net_wm_icons;
++    net_wm_icons_size = default_net_wm_icons_size;
++  }
++
++  XChangeProperty (fl_display, xid, fl_NET_WM_ICON, XA_CARDINAL, 32,
++      PropModeReplace, (unsigned char*) net_wm_icons, net_wm_icons_size);
++
++  if (w->icon_->count) {
++    delete [] net_wm_icons;
++    net_wm_icons = 0L;
++    net_wm_icons_size = 0;
++  }
++}
++
++////////////////////////////////////////////////////////////////
++
++int Fl_X::set_cursor(Fl_Cursor c) {
++  unsigned int shape;
++  Cursor xc;
++
++  switch (c) {
++  case FL_CURSOR_ARROW:   shape = XC_left_ptr; break;
++  case FL_CURSOR_CROSS:   shape = XC_tcross; break;
++  case FL_CURSOR_WAIT:    shape = XC_watch; break;
++  case FL_CURSOR_INSERT:  shape = XC_xterm; break;
++  case FL_CURSOR_HAND:    shape = XC_hand2; break;
++  case FL_CURSOR_HELP:    shape = XC_question_arrow; break;
++  case FL_CURSOR_MOVE:    shape = XC_fleur; break;
++  case FL_CURSOR_NS:      shape = XC_sb_v_double_arrow; break;
++  case FL_CURSOR_WE:      shape = XC_sb_h_double_arrow; break;
++  case FL_CURSOR_NE:      shape = XC_top_right_corner; break;
++  case FL_CURSOR_N:       shape = XC_top_side; break;
++  case FL_CURSOR_NW:      shape = XC_top_left_corner; break;
++  case FL_CURSOR_E:       shape = XC_right_side; break;
++  case FL_CURSOR_W:       shape = XC_left_side; break;
++  case FL_CURSOR_SE:      shape = XC_bottom_right_corner; break;
++  case FL_CURSOR_S:       shape = XC_bottom_side; break;
++  case FL_CURSOR_SW:      shape = XC_bottom_left_corner; break;
++  default:
++    return 0;
++  }
++
++  xc = XCreateFontCursor(fl_display, shape);
++  XDefineCursor(fl_display, xid, xc);
++  XFreeCursor(fl_display, xc);
++
++  return 1;
++}
++
++int Fl_X::set_cursor(const Fl_RGB_Image *image, int hotx, int hoty) {
++#if ! HAVE_XCURSOR
++  return 0;
++#else
++  XcursorImage *cursor;
++  Cursor xc;
++
++  if ((hotx < 0) || (hotx >= image->w()))
++    return 0;
++  if ((hoty < 0) || (hoty >= image->h()))
++    return 0;
++
++  cursor = XcursorImageCreate(image->w(), image->h());
++  if (!cursor)
++    return 0;
++
++  const uchar *i = (const uchar*)*image->data();
++  XcursorPixel *o = cursor->pixels;
++  for (int y = 0;y < image->h();y++) {
++    for (int x = 0;x < image->w();x++) {
++      switch (image->d()) {
++      case 1:
++        *o = (0xff<<24) | (i[0]<<16) | (i[0]<<8) | i[0];
++        break;
++      case 2:
++        *o = (i[1]<<24) | (i[0]<<16) | (i[0]<<8) | i[0];
++        break;
++      case 3:
++        *o = (0xff<<24) | (i[0]<<16) | (i[1]<<8) | i[2];
++        break;
++      case 4:
++        *o = (i[3]<<24) | (i[0]<<16) | (i[1]<<8) | i[2];
++        break;
++      }
++      i += image->d();
++      o++;
++    }
++    i += image->ld();
++  }
++
++  cursor->xhot = hotx;
++  cursor->yhot = hoty;
++
++  xc = XcursorImageLoadCursor(fl_display, cursor);
++  XDefineCursor(fl_display, xid, xc);
++  XFreeCursor(fl_display, xc);
++
++  XcursorImageDestroy(cursor);
++
++  return 1;
++#endif
++}
++
++////////////////////////////////////////////////////////////////
+ 
+ // returns pointer to the filename, or null if name ends with '/'
+ const char *fl_filename_name(const char *name) {
+diff -Nur fltk-1.3.2.orig/src/ps_image.cxx fltk-1.3.2/src/ps_image.cxx
+--- fltk-1.3.2.orig/src/ps_image.cxx	2011-07-19 06:49:30.000000000 +0200
++++ fltk-1.3.2/src/ps_image.cxx	2013-07-17 19:37:37.912343302 +0200
+@@ -185,72 +185,38 @@
+ 
+ extern uchar **fl_mask_bitmap;
+ 
++struct callback_data {
++  const uchar *data;
++  int D, LD;
++};
+ 
+-void Fl_PostScript_Graphics_Driver::draw_image(const uchar *data, int ix, int iy, int iw, int ih, int D, int LD) {
+-  double x = ix, y = iy, w = iw, h = ih;
+ 
+-  if (D<3){ //mono
+-    draw_image_mono(data, ix, iy, iw, ih, D, LD);
+-    return;
+-  }
++static void draw_image_cb(void *data, int x, int y, int w, uchar *buf) {
++  struct callback_data *cb_data;
++  const uchar *curdata;
+ 
++  cb_data = (struct callback_data*)data;
++  curdata = cb_data->data + x*cb_data->D + y*cb_data->LD;
+ 
+-  int i,j, k;
++  memcpy(buf, curdata, w*cb_data->D);
++}
+ 
+-  fprintf(output,"save\n");
+ 
+-  const char * interpol;
+-  if (lang_level_>1){
+-    if (interpolate_)
+-      interpol="true";
+-    else
+-      interpol="false";
+-    if (mask && lang_level_>2)
+-      fprintf(output, "%g %g %g %g %i %i %i %i %s CIM\n", x , y+h , w , -h , iw , ih, mx, my, interpol);
+-    else
+-      fprintf(output, "%g %g %g %g %i %i %s CII\n", x , y+h , w , -h , iw , ih, interpol);
+-  } else
+-    fprintf(output , "%g %g %g %g %i %i CI", x , y+h , w , -h , iw , ih);
++void Fl_PostScript_Graphics_Driver::draw_image(const uchar *data, int ix, int iy, int iw, int ih, int D, int LD) {
++  if (D<3){ //mono
++    draw_image_mono(data, ix, iy, iw, ih, D, LD);
++    return;
++  }
+ 
++  struct callback_data cb_data;
+ 
+   if (!LD) LD = iw*D;
+-  uchar *curmask=mask;
+-
+-  for (j=0; j<ih;j++){
+-    if (mask){
+-
+-      for (k=0;k<my/ih;k++){
+-        for (i=0; i<((mx+7)/8);i++){
+-          if (!(i%80)) fprintf(output, "\n");
+-          fprintf(output, "%.2x",swap_byte(*curmask));
+-          curmask++;
+-        }
+-        fprintf(output,"\n");
+-      }
+-    }
+-    const uchar *curdata=data+j*LD;
+-    for (i=0 ; i<iw ; i++) {
+-      uchar r = curdata[0];
+-      uchar g =  curdata[1];
+-      uchar b =  curdata[2];
+-      if (lang_level_<3 && D>3) { //can do  mixing using bg_* colors)
+-        unsigned int a2 = curdata[3]; //must be int
+-        unsigned int a = 255-a2;
+-        r = (a2 * r + bg_r * a)/255;
+-        g = (a2 * g + bg_g * a)/255;
+-        b = (a2 * b + bg_b * a)/255;
+-      }
+-      if (!(i%40)) fprintf(output, "\n");
+-      fprintf(output, "%.2x%.2x%.2x", r, g, b);
+-      curdata +=D;
+-    }
+-    fprintf(output,"\n");
+-
+-  }
+-
+-  fprintf(output," >\nrestore\n" );
+ 
++  cb_data.data = data;
++  cb_data.D = D;
++  cb_data.LD = LD;
+ 
++  draw_image(draw_image_cb, &cb_data, ix, iy, iw, ih, D);
+ }
+ 
+ void Fl_PostScript_Graphics_Driver::draw_image(Fl_Draw_Image_Cb call, void *data, int ix, int iy, int iw, int ih, int D) {
+@@ -325,6 +291,14 @@
+ 	uchar g =  curdata[1];
+ 	uchar b =  curdata[2];
+ 
++        if (lang_level_<3 && D>3) { //can do  mixing using bg_* colors)
++          unsigned int a2 = curdata[3]; //must be int
++          unsigned int a = 255-a2;
++          r = (a2 * r + bg_r * a)/255;
++          g = (a2 * g + bg_g * a)/255;
++          b = (a2 * b + bg_b * a)/255;
++        }
++
+ 	if (!(i%40)) 	fputs("\n", output);
+ 	fprintf(output, "%.2x%.2x%.2x", r, g, b);
+ 
+diff -Nur fltk-1.3.2.orig/src/screen_xywh.cxx fltk-1.3.2/src/screen_xywh.cxx
+--- fltk-1.3.2.orig/src/screen_xywh.cxx	2012-03-23 17:47:53.000000000 +0100
++++ fltk-1.3.2/src/screen_xywh.cxx	2013-07-17 19:38:09.575341648 +0200
+@@ -215,21 +215,6 @@
+   return num_screens ? num_screens : 1;
+ }
+ 
+-static int find_screen_with_point(int mx, int my) {
+-  int screen = 0;
+-  if (num_screens < 0) screen_init();
+-  
+-  for (int i = 0; i < num_screens; i ++) {
+-    int sx, sy, sw, sh;
+-    Fl::screen_xywh(sx, sy, sw, sh, i);
+-    if ((mx >= sx) && (mx < (sx+sw)) && (my >= sy) && (my < (sy+sh))) {
+-      screen = i;
+-      break;
+-    }
+-  }
+-  return screen;
+-}
+-
+ /**
+   Gets the bounding box of a screen
+   that contains the specified screen position \p mx, \p my
+@@ -237,7 +222,7 @@
+   \param[in] mx, my the absolute screen position
+ */
+ void Fl::screen_xywh(int &X, int &Y, int &W, int &H, int mx, int my) {
+-  screen_xywh(X, Y, W, H, find_screen_with_point(mx, my));
++  screen_xywh(X, Y, W, H, screen_num(mx, my));
+ }
+ 
+ 
+@@ -248,7 +233,7 @@
+  \param[in] mx, my the absolute screen position
+  */
+ void Fl::screen_work_area(int &X, int &Y, int &W, int &H, int mx, int my) {
+-  screen_work_area(X, Y, W, H, find_screen_with_point(mx, my));
++  screen_work_area(X, Y, W, H, screen_num(mx, my));
+ }
+ 
+ /**
+@@ -321,6 +306,38 @@
+ #endif // WIN32
+ }
+ 
++/**
++  Gets the screen bounding rect for the screen
++  which intersects the most with the rectangle
++  defined by \p mx, \p my, \p mw, \p mh.
++  \param[out]  X,Y,W,H the corresponding screen bounding box
++  \param[in] mx, my, mw, mh the rectangle to search for intersection with
++  \see void screen_xywh(int &X, int &Y, int &W, int &H, int n)
++  */
++void Fl::screen_xywh(int &X, int &Y, int &W, int &H, int mx, int my, int mw, int mh) {
++  screen_xywh(X, Y, W, H, screen_num(mx, my, mw, mh));
++}
++
++/**
++  Gets the screen number of a screen
++  that contains the specified screen position \p x, \p y
++  \param[in] x, y the absolute screen position
++*/
++int Fl::screen_num(int x, int y) {
++  int screen = 0;
++  if (num_screens < 0) screen_init();
++  
++  for (int i = 0; i < num_screens; i ++) {
++    int sx, sy, sw, sh;
++    Fl::screen_xywh(sx, sy, sw, sh, i);
++    if ((x >= sx) && (x < (sx+sw)) && (y >= sy) && (y < (sy+sh))) {
++      screen = i;
++      break;
++    }
++  }
++  return screen;
++}
++
+ static inline float fl_intersection(int x1, int y1, int w1, int h1,
+                         int x2, int y2, int w2, int h2) {
+   if(x1+w1 < x2 || x2+w2 < x1 || y1+h1 < y2 || y2+h2 < y1)
+@@ -333,30 +350,27 @@
+ }
+ 
+ /**
+-  Gets the screen bounding rect for the screen
++  Gets the screen number for the screen
+   which intersects the most with the rectangle
+-  defined by \p mx, \p my, \p mw, \p mh.
+-  \param[out]  X,Y,W,H the corresponding screen bounding box
+-  \param[in] mx, my, mw, mh the rectangle to search for intersection with
+-  \see void screen_xywh(int &X, int &Y, int &W, int &H, int n)
++  defined by \p x, \p y, \p w, \p h.
++  \param[in] x, y, w, h the rectangle to search for intersection with
+   */
+-void Fl::screen_xywh(int &X, int &Y, int &W, int &H, int mx, int my, int mw, int mh) {
++int Fl::screen_num(int x, int y, int w, int h) {
+   int best_screen = 0;
+   float best_intersection = 0.;
+   for(int i = 0; i < Fl::screen_count(); i++) {
+     int sx, sy, sw, sh;
+     Fl::screen_xywh(sx, sy, sw, sh, i);
+-    float sintersection = fl_intersection(mx, my, mw, mh, sx, sy, sw, sh);
++    float sintersection = fl_intersection(x, y, w, h, sx, sy, sw, sh);
+     if(sintersection > best_intersection) {
+       best_screen = i;
+       best_intersection = sintersection;
+     }
+   }
+-  screen_xywh(X, Y, W, H, best_screen);
++  return best_screen;
+ }
+ 
+ 
+-
+ /**
+  Gets the screen resolution in dots-per-inch for the given screen.
+  \param[out]  h, v  horizontal and vertical resolution
+diff -Nur fltk-1.3.2.orig/src/xutf8/imKStoUCS.c fltk-1.3.2/src/xutf8/imKStoUCS.c
+--- fltk-1.3.2.orig/src/xutf8/imKStoUCS.c	2009-03-13 23:43:43.000000000 +0100
++++ fltk-1.3.2/src/xutf8/imKStoUCS.c	2013-07-17 19:37:07.412344891 +0200
+@@ -266,6 +266,12 @@
+     0x20a8, 0x20a9, 0x20aa, 0x20ab, 0x20ac                          /* 0x20a8-0x20af */
+ };
+ 
++static unsigned short const keysym_to_unicode_fe50_fe60[] = {
++    0x0300, 0x0301, 0x0302, 0x0303, 0x0304, 0x0306, 0x0307, 0x0308, /* 0xfe50-0xfe57 */
++    0x030a, 0x030b, 0x030c, 0x0327, 0x0328, 0x1da5, 0x3099, 0x309a, /* 0xfe58-0xfe5f */
++    0x0323                                                          /* 0xfe60-0xfe67 */
++};
++
+ unsigned int
+ KeySymToUcs4(KeySym keysym)
+ {
+@@ -315,6 +321,8 @@
+ 	return keysym_to_unicode_1e9f_1eff[keysym - 0x1e9f];
+     else if (keysym > 0x209f && keysym < 0x20ad)
+ 	return keysym_to_unicode_20a0_20ac[keysym - 0x20a0];
++    else if (keysym > 0xfe4f && keysym < 0xfe61)
++	return keysym_to_unicode_fe50_fe60[keysym - 0xfe50];
+     else 
+ 	return 0;
+ }
+diff -Nur fltk-1.3.2.orig/test/cursor.cxx fltk-1.3.2/test/cursor.cxx
+--- fltk-1.3.2.orig/test/cursor.cxx	2011-07-19 06:49:30.000000000 +0200
++++ fltk-1.3.2/test/cursor.cxx	2013-07-17 19:37:45.796342890 +0200
+@@ -23,8 +23,6 @@
+ #include <FL/fl_draw.H>
+ #include <FL/Fl_Box.H>
+ 
+-Fl_Color fg = FL_BLACK;
+-Fl_Color bg = FL_WHITE;
+ Fl_Cursor cursor = FL_CURSOR_DEFAULT;
+ 
+ Fl_Hor_Value_Slider *cursor_slider;
+@@ -32,7 +30,7 @@
+ void choice_cb(Fl_Widget *, void *v) {
+   cursor = (Fl_Cursor)(fl_intptr_t)v;
+   cursor_slider->value(cursor);
+-  fl_cursor(cursor,fg,bg);
++  fl_cursor(cursor);
+ }
+ 
+ Fl_Menu_Item choices[] = {
+@@ -48,8 +46,6 @@
+   {"FL_CURSOR_WE",0,choice_cb,(void*)FL_CURSOR_WE},
+   {"FL_CURSOR_NWSE",0,choice_cb,(void*)FL_CURSOR_NWSE},
+   {"FL_CURSOR_NESW",0,choice_cb,(void*)FL_CURSOR_NESW},
+-  {"FL_CURSOR_NONE",0,choice_cb,(void*)FL_CURSOR_NONE},
+-#if 0
+   {"FL_CURSOR_N",0,choice_cb,(void*)FL_CURSOR_N},
+   {"FL_CURSOR_NE",0,choice_cb,(void*)FL_CURSOR_NE},
+   {"FL_CURSOR_E",0,choice_cb,(void*)FL_CURSOR_E},
+@@ -58,26 +54,14 @@
+   {"FL_CURSOR_SW",0,choice_cb,(void*)FL_CURSOR_SW},
+   {"FL_CURSOR_W",0,choice_cb,(void*)FL_CURSOR_W},
+   {"FL_CURSOR_NW",0,choice_cb,(void*)FL_CURSOR_NW},
+-#endif
++  {"FL_CURSOR_NONE",0,choice_cb,(void*)FL_CURSOR_NONE},
+   {0}
+ };
+ 
+ void setcursor(Fl_Widget *o, void *) {
+   Fl_Hor_Value_Slider *slider = (Fl_Hor_Value_Slider *)o;
+   cursor = Fl_Cursor((int)slider->value());
+-  fl_cursor(cursor,fg,bg);
+-}
+-
+-void setfg(Fl_Widget *o, void *) {
+-  Fl_Hor_Value_Slider *slider = (Fl_Hor_Value_Slider *)o;
+-  fg = Fl_Color((int)slider->value());
+-  fl_cursor(cursor,fg,bg);
+-}
+-
+-void setbg(Fl_Widget *o, void *) {
+-  Fl_Hor_Value_Slider *slider = (Fl_Hor_Value_Slider *)o;
+-  bg = Fl_Color((int)slider->value());
+-  fl_cursor(cursor,fg,bg);
++  fl_cursor(cursor);
+ }
+ 
+ // draw the label without any ^C or \nnn conversions:
+@@ -103,29 +87,11 @@
+   slider1.align(FL_ALIGN_LEFT);
+   slider1.step(1);
+   slider1.precision(0);
+-  slider1.bounds(0,100);
++  slider1.bounds(0,255);
+   slider1.value(0);
+   slider1.callback(setcursor);
+   slider1.value(cursor);
+ 
+-  Fl_Hor_Value_Slider slider2(80,220,310,30,"fgcolor:");
+-  slider2.align(FL_ALIGN_LEFT);
+-  slider2.step(1);
+-  slider2.precision(0);
+-  slider2.bounds(0,255);
+-  slider2.value(0);
+-  slider2.callback(setfg);
+-  slider2.value(fg);
+-
+-  Fl_Hor_Value_Slider slider3(80,260,310,30,"bgcolor:");
+-  slider3.align(FL_ALIGN_LEFT);
+-  slider3.step(1);
+-  slider3.precision(0);
+-  slider3.bounds(0,255);
+-  slider3.value(0);
+-  slider3.callback(setbg);
+-  slider3.value(bg);
+-
+ #if 0
+   // draw the manual's diagram of cursors...
+   window.size(400,800);
+diff -Nur fltk-1.3.2.orig/test/fullscreen.cxx fltk-1.3.2/test/fullscreen.cxx
+--- fltk-1.3.2.orig/test/fullscreen.cxx	2012-06-14 17:09:46.000000000 +0200
++++ fltk-1.3.2/test/fullscreen.cxx	2013-07-17 19:38:17.327341239 +0200
+@@ -127,7 +127,7 @@
+   fullscreen_window(int W, int H, const char *t=0);
+   int handle (int e);
+   Fl_Toggle_Light_Button *b3;
+-
++  Fl_Toggle_Light_Button *b4;
+ };
+ 
+ fullscreen_window::fullscreen_window(int W, int H, const char *t) : Fl_Single_Window(W, H, t) { 
+@@ -170,23 +170,54 @@
+ #endif
+ }
+ 
+-int px,py,pw,ph;
+ Fl_Button *border_button;
+ void fullscreen_cb(Fl_Widget *o, void *p) {
+   Fl_Window *w = (Fl_Window *)p;
+   int d = ((Fl_Button *)o)->value();
+   if (d) {
+-    px = w->x();
+-    py = w->y();
+-    pw = w->w();
+-    ph = w->h();
++    if (((fullscreen_window*)w)->b4->value()) {
++      int top, bottom, left, right;
++      int top_y, bottom_y, left_x, right_x;
++
++      int sx, sy, sw, sh;
++
++      top = bottom = left = right = 0;
++
++      Fl::screen_xywh(sx, sy, sw, sh, 0);
++      top_y = sy;
++      bottom_y = sy + sh;
++      left_x = sx;
++      right_x = sx + sw;
++
++      for (int i = 1;i < Fl::screen_count();i++) {
++        Fl::screen_xywh(sx, sy, sw, sh, i);
++        if (sy < top_y) {
++          top = i;
++          top_y = sy;
++        }
++        if ((sy + sh) > bottom_y) {
++          bottom = i;
++          bottom_y = sy + sh;
++        }
++        if (sx < left_x) {
++          left = i;
++          left_x = sx;
++        }
++        if ((sx + sw) > right_x) {
++          right = i;
++          right_x = sx + sw;
++        }
++      }
++
++      w->fullscreen_screens(top, bottom, left, right);
++    } else {
++      w->fullscreen_screens(-1, -1, -1, -1);
++    }
+     w->fullscreen();
+-    w->override();
+ #ifndef WIN32 // update our border state in case border was turned off
+     border_button->value(w->border());
+ #endif
+   } else {
+-    //w->fullscreen_off(px,py,pw,ph);
+     w->fullscreen_off();
+   }
+ }
+@@ -219,7 +250,7 @@
+   exit(0);
+ }
+ 
+-#define NUMB 7
++#define NUMB 8
+ 
+ int twowindow = 0;
+ int initfull = 0;
+@@ -284,6 +315,9 @@
+   window.b3->callback(fullscreen_cb,w);
+   y+=30;
+ 
++  window.b4 = new Fl_Toggle_Light_Button(50,y,window.w()-60,30,"All Screens");
++  y+=30;
++
+   Fl_Button eb(50,y,window.w()-60,30,"Exit");
+   eb.callback(exit_cb);
+   y+=30;
diff --git a/extra/folks/PKGBUILD b/extra/folks/PKGBUILD
index befd6efeb..3c29f888b 100644
--- a/extra/folks/PKGBUILD
+++ b/extra/folks/PKGBUILD
@@ -1,24 +1,25 @@
-# $Id: PKGBUILD 188065 2013-06-08 08:06:46Z heftig $
+# $Id: PKGBUILD 196038 2013-10-07 11:50:52Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=folks
-pkgver=0.9.2
+pkgver=0.9.5
 pkgrel=1
 pkgdesc="Library to aggregates people into metacontacts"
 arch=(i686 x86_64 'mips64el')
 url="http://telepathy.freedesktop.org/wiki/Folks"
 license=(LGPL2.1)
-depends=(telepathy-glib libgee libxml2 evolution-data-server libzeitgeist libtracker-sparql)
-makedepends=(gobject-introspection intltool)
+depends=(telepathy-glib libgee libxml2 evolution-data-server zeitgeist libtracker-sparql)
+makedepends=(gobject-introspection intltool vala)
 install=folks.install
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('4b034ffe83928acd8a7d607edab60f36eb13801a9d3fcc34ccc7c34a16747818')
+sha256sums=('924c440f16a8c9b0d0d832588fa77a1553fa2a5d2659c4c7d3178a7ef42222af')
 
 build() {
   cd "$pkgname-$pkgver"
+  export PKG_CONFIG_PATH="${srcdir}/${pkgname}-${pkgver}/folks"
   ./configure --prefix=/usr --disable-schemas-compile --enable-tracker-backend \
-    --disable-libsocialweb-backend
+    --disable-libsocialweb-backend --disable-fatal-warnings
   make
 }
 
diff --git a/extra/four-in-a-row/PKGBUILD b/extra/four-in-a-row/PKGBUILD
index 39fbaaa54..c5944b6c8 100644
--- a/extra/four-in-a-row/PKGBUILD
+++ b/extra/four-in-a-row/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183358 2013-04-21 22:09:11Z heftig $
+# $Id: PKGBUILD 196039 2013-10-07 11:50:54Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=four-in-a-row
-pkgver=3.8.1
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Make lines of the same color to win"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,8 +16,8 @@ options=('!emptydirs' '!libtool')
 install=four-in-a-row.install
 url="https://live.gnome.org/Four-in-a-row"
 groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('eb44c8508a7d4281df1e52c75a4dc8b31a0de108b94c0f37c4e8d99ea380019d')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('4759dcc8483c5bbf89de8b10a5379539ec1df6392cf2f7b96e91ec9dd2897001')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/freeciv/PKGBUILD b/extra/freeciv/PKGBUILD
index 9db4debcb..ea18bbfa6 100644
--- a/extra/freeciv/PKGBUILD
+++ b/extra/freeciv/PKGBUILD
@@ -1,26 +1,28 @@
-# $Id: PKGBUILD 178314 2013-02-20 01:15:54Z eric $
+# $Id: PKGBUILD 194398 2013-09-16 01:46:20Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=freeciv
-pkgver=2.3.4
+pkgver=2.4.0
 pkgrel=1
 pkgdesc="A multiuser clone of the famous Microprose game of Civilization"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freeciv.org/"
 license=('GPL')
-depends=('gtk2' 'sdl_mixer' 'hicolor-icon-theme')
-options=('!libtool')
+depends=('gtk2' 'sdl_mixer' 'hicolor-icon-theme' 'lua51' 'sqlite' 'curl' 'libltdl')
+backup=('etc/freeciv/database.lua')
+options=('!libtool' '!staticlibs')
 install=freeciv.install
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('974bbadf86c697bd2d4de7abf12d992fb50f1724')
+sha1sums=('4a3537dc050bd69002794c832b74f5af972da25e')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --enable-client=gtk2 --enable-shared --without-ggz-client
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr --sysconfdir=/etc --enable-shared --enable-sys-lua \
+    --enable-client=gtk2 --enable-fcdb=sqlite3 --enable-aimodules
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/gconf-editor/PKGBUILD b/extra/gconf-editor/PKGBUILD
index fe3da514a..a40c41f15 100644
--- a/extra/gconf-editor/PKGBUILD
+++ b/extra/gconf-editor/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 183359 2013-04-21 22:09:12Z heftig $
+# $Id: PKGBUILD 195993 2013-10-07 08:23:35Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gconf-editor
 pkgver=3.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Graphical gconf registry editor"
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
-depends=('gconf' 'hicolor-icon-theme')
+depends=('gconf' 'hicolor-icon-theme' 'gtk3')
 makedepends=('pkgconfig' 'intltool' 'gnome-doc-utils')
 url="http://www.gnome.org"
 options=(!emptydirs)
diff --git a/extra/gconf/PKGBUILD b/extra/gconf/PKGBUILD
index 527e3cd30..a6212af02 100644
--- a/extra/gconf/PKGBUILD
+++ b/extra/gconf/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 187058 2013-06-03 11:16:33Z allan $
+# $Id: PKGBUILD 195892 2013-10-03 19:08:22Z jgc $
 # Maintainer:  Jan de Groot <jan@archlinux.org>
 
 pkgname=gconf
 pkgver=3.2.6
-pkgrel=2
+pkgrel=3
 pkgdesc="A configuration database system"
 arch=(i686 x86_64 'mips64el')
 license=('LGPL')
-depends=('libxml2' 'polkit' 'libldap' 'dbus-glib' 'gtk3')
+depends=('libxml2' 'polkit' 'libldap' 'dbus-glib')
 makedepends=('intltool' 'gtk-doc' 'gobject-introspection')
 options=('!libtool')
 install=gconf.install
@@ -40,7 +40,7 @@ build() {
 
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --libexecdir=/usr/lib/GConf \
-      --disable-static --enable-defaults-service --with-gtk=3.0 \
+      --disable-static --enable-defaults-service \
       --disable-orbit
 
   make pkglibdir=/usr/lib/GConf
diff --git a/extra/gconf/gconf.install b/extra/gconf/gconf.install
index f7945d165..a5ea777a5 100644
--- a/extra/gconf/gconf.install
+++ b/extra/gconf/gconf.install
@@ -9,10 +9,7 @@ post_upgrade() {
   chmod 755 etc/gconf/gconf.xml.system
   usr/bin/gio-querymodules usr/lib/gio/modules
 
-  PID=`pidof gconfd-2`
-  if [ ! -z "${PID}" ]; then
-    kill ${PID}
-  fi
+  pkill /usr/lib/GConf/gconfd-2 || return 0
 }
 
 post_remove() {
diff --git a/extra/gcr/PKGBUILD b/extra/gcr/PKGBUILD
index da1d98e5c..37826ce6b 100644
--- a/extra/gcr/PKGBUILD
+++ b/extra/gcr/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 184241 2013-05-04 20:06:54Z heftig $
+# $Id: PKGBUILD 196040 2013-10-07 11:50:55Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gcr
-pkgver=3.8.2
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="A library for bits of crypto UI and parsing"
 arch=(i686 x86_64 mips64el)
@@ -12,9 +12,9 @@ depends=('dconf' 'desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'libgcrypt')
 makedepends=('intltool' 'gobject-introspection' 'python')
 options=(!libtool)
 install=gcr.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
         10-gcr.conf)
-sha256sums=('a1e615ce2cfd375f383bbdd289935a8e3e16901c3c6f032780847055e8bec2c1'
+sha256sums=('b689c679b244c1f47d773002c33dadc4111cddeb05bc2f3651826893fd43ff1b'
             '5f2eda7175ae9f23ee0e09d2beceb24fd2f6daafd7bddfcc1c1f5a3734eb60fc')
 
 build() {
diff --git a/extra/gdk-pixbuf2/PKGBUILD b/extra/gdk-pixbuf2/PKGBUILD
index 43651ad2a..921a6a886 100644
--- a/extra/gdk-pixbuf2/PKGBUILD
+++ b/extra/gdk-pixbuf2/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 187905 2013-06-07 22:45:04Z heftig $
+# $Id: PKGBUILD 196041 2013-10-07 11:50:57Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gdk-pixbuf2
-pkgver=2.28.2
+pkgver=2.30.0
 pkgrel=1
 pkgdesc="An image loading library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ makedepends=('gtk-doc' 'gobject-introspection')
 options=('!libtool')
 install=gdk-pixbuf2.install
 source=(http://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz)
-sha256sums=('183113c2eb2232963e88864a6a54fd963dbfeb1a3679fb0d3456f9e0b79e4617')
+sha256sums=('4a73600525621283a14436c5f873c1126c4feafcb07d24a746f13215e2caa658')
 
 build() {
   cd gdk-pixbuf-$pkgver
diff --git a/extra/gdl/PKGBUILD b/extra/gdl/PKGBUILD
index aa0992a8f..b7d18400a 100644
--- a/extra/gdl/PKGBUILD
+++ b/extra/gdl/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 183362 2013-04-21 22:09:18Z heftig $
+# $Id: PKGBUILD 196042 2013-10-07 11:50:58Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gdl
-pkgver=3.8.1
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="GNOME Docking Library"
 arch=(i686 x86_64 mips64el)
@@ -12,7 +12,7 @@ depends=('gtk3')
 makedepends=('gtk-doc' 'intltool' 'gobject-introspection')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('c9911e9eec5a62497fff7e044ca9eaae47354658238e6b9e9a0a744f05b4ebdb')
+sha256sums=('4e0d6f66115ba3b0f3cd2495d8a95c6714d701f89d556bb691bd0c0a62a1c760')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/gdm/PKGBUILD b/extra/gdm/PKGBUILD
index 0f922cf8e..74e04e1d9 100644
--- a/extra/gdm/PKGBUILD
+++ b/extra/gdm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 191808 2013-07-30 23:19:36Z jgc $
+# $Id: PKGBUILD 196043 2013-10-07 11:50:59Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gdm
 pkgname=(gdm libgdm)
-pkgver=3.8.4
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Gnome Display Manager"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,9 +14,9 @@ options=('!libtool')
 depends=(gnome-shell gnome-session upower xorg-xrdb xorg-server xorg-xhost)
 makedepends=(itstool intltool yelp-tools gobject-introspection)
 checkdepends=('check')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver::3}/$pkgbase-$pkgver.tar.xz
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz
         fix_external_program_directories.patch arch-pam.patch)
-sha256sums=('db40fb66bf476721b6d333abe0bfed7feacdca7d492f971c86a3f1e5cccdb447'
+sha256sums=('bb04600298f5be795f0d0bfea40bbd9bf78f95a44c5caeda4d0cc6a05207318c'
             'a878680734e35c1d66252cbcfe678c3961b5ff0fa16302f8796a5e7e65ffe4a2'
             'b5c225784c3107564cb9685e41dfecdb20b8ea2415905c4119c96748c4e68003')
 
@@ -47,7 +47,7 @@ build() {
 
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
 
-  make
+  make -j1
 }
 
 check() {
@@ -69,7 +69,7 @@ package_gdm() {
   make DESTDIR="$pkgdir" install
 
   chmod 711 "$pkgdir/var/log/gdm"
-  rm -r "$pkgdir/var/run" "$pkgdir/var/gdm"
+  rm -r "$pkgdir/var/run"
 
 ### Split libgdm
   make -C gui/libgdm DESTDIR="$pkgdir" uninstall
diff --git a/extra/gedit/PKGBUILD b/extra/gedit/PKGBUILD
index b8552eba1..9c2795a24 100644
--- a/extra/gedit/PKGBUILD
+++ b/extra/gedit/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 188910 2013-06-25 07:42:51Z heftig $
+# $Id: PKGBUILD 196044 2013-10-07 11:51:01Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gedit
-pkgver=3.8.3
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="A text editor for GNOME"
 arch=(i686 x86_64 mips64el)
 license=(GPL)
 depends=(gtksourceview3 gsettings-desktop-schemas libpeas enchant iso-codes libsm desktop-file-utils python-gobject dconf)
-makedepends=(yelp-tools intltool 'zeitgeist>=0.9.12')
+makedepends=(yelp-tools intltool zeitgeist)
 optdepends=('zeitgeist: Zeitgeist plugin')
 groups=(gnome-extra)
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 install=gedit.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('dfbc2d9cf975b247c6a6b8bd1ae1b72d8e8a1f862f5f3d084a404853092cf9d3')
+sha256sums=('4c20049ccee2198468edaf20fba9dbd44e3baf50bd304700b4f24257571cdca5')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/geoclue2/PKGBUILD b/extra/geoclue2/PKGBUILD
new file mode 100644
index 000000000..70f7bfb9a
--- /dev/null
+++ b/extra/geoclue2/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 196002 2013-10-07 11:46:24Z jgc $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: György Balló <ballogy@freestart.hu>
+
+pkgname=geoclue2
+pkgver=1.99.4
+pkgrel=1
+pkgdesc="Modular geoinformation service built on the D-Bus messaging system."
+arch=(i686 x86_64)
+url="http://geoclue.freedesktop.org/"
+license=(LGPL)
+depends=(libsoup json-glib)
+makedepends=(intltool geoip)
+optdepends=('geoip: geoip-lookup server binary')
+options=('!libtool')
+install=geoclue.install
+source=(http://freedesktop.org/software/geoclue/releases/1.99/geoclue-$pkgver.tar.xz)
+md5sums=('b991f4a409b492996a38627ee18fa76e')
+
+build() {
+  cd geoclue-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --libexecdir=/usr/lib/$pkgname --disable-static
+  make
+}
+
+package() {
+  cd geoclue-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community/mplayer2/mplayer2.install b/extra/geoclue2/geoclue.install
index 660593cf5..c25dff2d3 100644
--- a/community/mplayer2/mplayer2.install
+++ b/extra/geoclue2/geoclue.install
@@ -1,5 +1,5 @@
 post_install() {
-    update-desktop-database -q
+    glib-compile-schemas /usr/share/glib-2.0/schemas
 }
 
 post_upgrade() {
diff --git a/extra/geocode-glib/PKGBUILD b/extra/geocode-glib/PKGBUILD
new file mode 100644
index 000000000..e3ec1a334
--- /dev/null
+++ b/extra/geocode-glib/PKGBUILD
@@ -0,0 +1,26 @@
+#Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=geocode-glib
+pkgver=3.10.0
+pkgrel=1
+pkgdesc="Geocode Helper library"
+arch=(i686 x86_64)
+license=('GPL')
+url="https://git.gnome.org/browse/geocode-glib/"
+depends=('glib2' 'json-glib' 'libsoup')
+makedepends=('intltool' 'gobject-introspection')
+options=('!libtool' '!emptydirs')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('0aedc198cf8a9b934a290d50aadaf4b48bb13c3b4783618c6753eb466cdaa637')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="${pkgdir}" install
+}
+
diff --git a/extra/geoip/PKGBUILD b/extra/geoip/PKGBUILD
index f1d5e11d2..5857354ba 100644
--- a/extra/geoip/PKGBUILD
+++ b/extra/geoip/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183169 2013-04-18 10:54:20Z juergen $
+# $Id: PKGBUILD 194736 2013-09-23 12:28:32Z jgc $
 # Maintainer: Dan McGee <dan@archlinux.org>
 # Contributor: Manolis Tzanidakis <manolis@archlinux.org>
 
 pkgname=geoip
-pkgver=1.5.0
+pkgver=1.5.1
 pkgrel=1
 pkgdesc="Non-DNS IP-to-country resolver C library & utils"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,11 +12,18 @@ license=('GPL')
 depends=('zlib' 'geoip-database')
 backup=('etc/geoip/GeoIP.conf')
 options=('!libtool' '!emptydirs')
-source=(http://www.maxmind.com/download/geoip/api/c/GeoIP-$pkgver.tar.gz)
-sha256sums=('d1dbd4f27bcf0e760329f0f9c67a5fc81b4c56efbe0666159934c2bcd38caea2')
+source=(http://www.maxmind.com/download/geoip/api/c/GeoIP-$pkgver.tar.gz 
+        pkgconfig.patch)
+sha256sums=('ec35ee73fcc54c493f4252565d1c81d022b398dd16de3af1522c8cab016f8731'
+            '64a6a608beabdc553019237d7da808dc234f760c21040036b2f589eaebba5d10')
+
+prepare() {
+  cd GeoIP-$pkgver
+  patch -Np1 -i ../pkgconfig.patch
+}
 
 build() {
-  cd "$srcdir/GeoIP-$pkgver"
+  cd GeoIP-$pkgver
 
   autoreconf -vi
   ./configure \
@@ -27,12 +34,12 @@ build() {
 }
 
 check() {
-  cd "$srcdir/GeoIP-$pkgver"
+  cd GeoIP-$pkgver
   make check
 }
 
 package() {
-  cd "$srcdir/GeoIP-$pkgver"
+  cd GeoIP-$pkgver
 
   make DESTDIR="$pkgdir" install
 
diff --git a/extra/geoip/pkgconfig.patch b/extra/geoip/pkgconfig.patch
new file mode 100644
index 000000000..ed3fee9e7
--- /dev/null
+++ b/extra/geoip/pkgconfig.patch
@@ -0,0 +1,8 @@
+--- GeoIP-1.5.1/geoip.pc.in.orig	2013-03-23 02:26:09.000000000 +0000
++++ GeoIP-1.5.1/geoip.pc.in	2013-09-23 12:04:07.441555775 +0000
+@@ -1,4 +1,5 @@
+ prefix=@prefix@
++exec_prefix=${prefix}
+ libdir=@libdir@
+ includedir=@includedir@
+ datadir=@datarootdir@
diff --git a/extra/ghex/PKGBUILD b/extra/ghex/PKGBUILD
index ee2bd74bc..33ff85744 100644
--- a/extra/ghex/PKGBUILD
+++ b/extra/ghex/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 185359 2013-05-13 17:41:00Z heftig $
+# $Id: PKGBUILD 196153 2013-10-07 12:05:35Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=ghex
-pkgver=3.8.1
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="A simple binary editor for the Gnome desktop"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,8 +13,8 @@ depends=('gtk3' 'hicolor-icon-theme')
 makedepends=('intltool' 'itstool' 'docbook-xsl')
 options=('!libtool' '!emptydirs')
 install=ghex.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('84ce220eed0dc9f640a87db68533e65a4dc06a1a6136b244270d8b2a1ae93534')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('9c31383b1d32c8942ca0327c615336f5777309674c4fc090e8cceb1576c63255')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gjs/PKGBUILD b/extra/gjs/PKGBUILD
index 8777035fc..db3f85d07 100644
--- a/extra/gjs/PKGBUILD
+++ b/extra/gjs/PKGBUILD
@@ -1,33 +1,28 @@
-# $Id: PKGBUILD 191784 2013-07-30 19:02:00Z jgc $
+# $Id: PKGBUILD 196045 2013-10-07 11:51:04Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gjs
-pkgver=1.36.1
-pkgrel=2
+pkgver=1.38.1
+pkgrel=1
 pkgdesc="Javascript Bindings for GNOME"
 arch=('i686' 'x86_64')
 url="http://live.gnome.org/Gjs"
 license=(GPL)
 depends=(cairo gobject-introspection 'js>=17.0.0')
 options=('!libtool')
-source=(http://people.gnome.org/~walters/$pkgname-js17-$pkgver.tar.bz2
-        gettext-typo.patch)
-sha256sums=('5826f74fcf20750538f74e2b0059f392eb139996b80b70ca217f5f7a0d117e27'
-            'c2c3ca377d9d69511d5784599ea33d754aed776d5ceefaf384b8e303b54fd038')
+source=(http://ftp.gnome.org/pub/gnome/sources/gjs/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('6b2065a0e7bd1db562a70c5fd52ea2499097f1cf02c9c279d1b82b660bfb8176')
 
-prepare() {
-  cd $pkgname-$pkgver
-  patch -Np1 -i ../gettext-typo.patch
-}
 build() {
   cd $pkgname-$pkgver
-  ./configure --prefix=/usr --disable-static
+  ./configure --prefix=/usr --disable-static --libexecdir=/usr/lib
   make
 }
 
 check() {
   cd $pkgname-$pkgver
-  make check
+  # Needs a display
+  make -k check || :
 }
 
 package() {
diff --git a/extra/glade/PKGBUILD b/extra/glade/PKGBUILD
index de2fb9eb6..6c1181d90 100644
--- a/extra/glade/PKGBUILD
+++ b/extra/glade/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 183366 2013-04-21 22:09:24Z heftig $
+# $Id: PKGBUILD 196046 2013-10-07 11:51:05Z jgc $
 # Maintainer: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=glade
-pkgver=3.15.0
+pkgver=3.16.0
 pkgrel=1
 pkgdesc="User interface builder for GTK+ and GNOME."
 arch=(i686 x86_64 mips64el)
@@ -15,7 +15,7 @@ options=('!libtool')
 url="http://glade.gnome.org/"
 install=glade.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('4e64f33d8a5ad614279dc7024ed70fe57805526e82244001a33351b1cf13f95c')
+sha256sums=('b80773a294d3af07739d9d53bae12e11cf0bbf420bbc8931cc5e20b2647e3626')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/glib-networking/PKGBUILD b/extra/glib-networking/PKGBUILD
index cb2cf05c4..1fbe885bc 100644
--- a/extra/glib-networking/PKGBUILD
+++ b/extra/glib-networking/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 185433 2013-05-14 09:44:30Z heftig $
+# $Id: PKGBUILD 196048 2013-10-07 11:51:08Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=glib-networking
-pkgver=2.36.2
+pkgver=2.38.0
 pkgrel=1
 pkgdesc="Network-related giomodules for glib"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ makedepends=(intltool)
 options=('!libtool')
 install=glib-networking.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('2108d55b0af3eea56ce256830bcaf1519d6337e0054ef2eff80f2c0ef0eb23f9')
+sha256sums=('a43eacbf721b475cf6ba0cd2eab02a332014f71a4c41d0b44bd7bbf8ed1f840d')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/glibmm/PKGBUILD b/extra/glibmm/PKGBUILD
index dce85cc57..7cb0e8679 100644
--- a/extra/glibmm/PKGBUILD
+++ b/extra/glibmm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 184169 2013-05-03 03:02:45Z heftig $
+# $Id: PKGBUILD 196047 2013-10-07 11:51:06Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgbase=glibmm
 pkgname=('glibmm' 'glibmm-docs')
-pkgver=2.36.2
+pkgver=2.37.93
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
@@ -12,7 +12,7 @@ makedepends=('glib2' 'libsigc++2.0' 'pkgconfig')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 options=('!libtool')
 url="http://www.gtkmm.org/"
-sha256sums=('f15b65bf5740257be03c69f2f5ae71436ac3011ebeb02274b2b99b796c6837cf')
+sha256sums=('a01031d7d05ba9df5915fc84867303c93341a8dd13a2aa5af78a71dfb46842f6')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/gmime/PKGBUILD b/extra/gmime/PKGBUILD
index a3277a101..08153cdac 100644
--- a/extra/gmime/PKGBUILD
+++ b/extra/gmime/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 192269 2013-08-09 12:51:47Z heftig $
+# $Id: PKGBUILD 194406 2013-09-16 08:05:52Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Ben <ben@benmazer.net>
 
 pkgname=gmime
-pkgver=2.6.17
+pkgver=2.6.18
 pkgrel=1
 pkgdesc="Core mime parsing library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('glib2' 'gpgme' 'zlib')
 [ "$CARCH" != "mips64el" ] && makedepends=('gtk-sharp-2')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('22d49e57c404a0a68d1ac3426c8f23a39185a4b2d569de03bece07db03d1202f')
+sha256sums=('783fc14190459c568a31c2fd6dba1e8afa0431e2931aa46f652aa486ad881ae6')
 
 build() {
   # get rid of that .wapi errors in fakeroot
diff --git a/extra/gnome-bluetooth/PKGBUILD b/extra/gnome-bluetooth/PKGBUILD
index 74c73d9ff..321dc1c6e 100644
--- a/extra/gnome-bluetooth/PKGBUILD
+++ b/extra/gnome-bluetooth/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 188094 2013-06-09 11:29:56Z heftig $
+# $Id: PKGBUILD 196050 2013-10-07 11:51:10Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 
 pkgname=gnome-bluetooth
-pkgver=3.8.1
-pkgrel=2
+pkgver=3.10.0
+pkgrel=1
 pkgdesc="The GNOME Bluetooth Subsystem"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://live.gnome.org/GnomeBluetooth"
 license=(GPL LGPL)
-depends=(gtk3 hicolor-icon-theme libnotify bluez4)
+depends=(gtk3 hicolor-icon-theme libnotify bluez)
 makedepends=(intltool gobject-introspection itstool docbook-xsl)
 options=(!libtool !emptydirs)
 install=gnome-bluetooth.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
         61-gnome-bluetooth-rfkill.rules)
-sha256sums=('8095fcfa014931773e9d231dff76c6924f43abfbe4c5525cf07fd2d7f8e1f770'
+sha256sums=('7ee4ad464abfed59f04d1a471eb25cfb95fc34eeefbe4c47580dbb50df2ab712'
             '8dd2d3637f380a89e72f65e6c8021e994ccbdc645f1a1b1dbffe74ac9f061f53')
 
 build() {
diff --git a/extra/gnome-calculator/PKGBUILD b/extra/gnome-calculator/PKGBUILD
index b785093ac..c9212569b 100644
--- a/extra/gnome-calculator/PKGBUILD
+++ b/extra/gnome-calculator/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 185451 2013-05-14 10:16:40Z heftig $
+# $Id: PKGBUILD 196051 2013-10-07 11:51:12Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-calculator
-pkgver=3.8.2
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="GNOME Scientific calculator"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,8 +16,8 @@ conflicts=('gcalctool')
 options=(!emptydirs)
 url="http://www.gnome.org"
 install=gnome-calculator.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver::3}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('13d67b6dfa2501b883add8adf5470c5fea5eb1f1fa87f84e8ceda069418f1e81')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('d76ad21286ea20308bb6302833ce8e5846df7e8ccd2b7ac0a48619f0d6cf2cb1')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-chess/PKGBUILD b/extra/gnome-chess/PKGBUILD
index d48773b42..6ccd272a2 100644
--- a/extra/gnome-chess/PKGBUILD
+++ b/extra/gnome-chess/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 193436 2013-08-20 07:10:18Z jgc $
+# $Id: PKGBUILD 196052 2013-10-07 11:51:13Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-chess
-pkgver=3.8.4
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Play the classic two-player boardgame of chess"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,8 +17,8 @@ options=('!emptydirs' '!libtool')
 install=gnome-chess.install
 url="https://live.gnome.org/Chess"
 groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('4b7f20d875585e1d36bc0e4dda8c66ccd2e014f8ef829c4a6ec87275c4418d6a')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('9bbc0b2819a3f6d9d688ea0089a0d5f826d368100af7a0f3e8361e0d6f9e77ee')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-clocks/PKGBUILD b/extra/gnome-clocks/PKGBUILD
index d31c53891..ae4eba65a 100644
--- a/extra/gnome-clocks/PKGBUILD
+++ b/extra/gnome-clocks/PKGBUILD
@@ -1,39 +1,24 @@
-# $Id: PKGBUILD 185477 2013-05-14 11:11:41Z heftig $
+# $Id: PKGBUILD 196053 2013-10-07 11:51:15Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-clocks
-pkgver=3.8.2
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Clocks applications for GNOME"
 arch=(i686 x86_64 mips64el)
 url="https://www.gnome.org/"
 license=(GPL)
 depends=(gtk3 libcanberra libgweather gnome-desktop libnotify
-         hicolor-icon-theme gnome-themes-standard)
-makedepends=(intltool vala gobject-introspection)
+         hicolor-icon-theme gnome-themes-standard geoclue2 geocode-glib)
+makedepends=(intltool vala gobject-introspection itstool)
 options=(!libtool)
 groups=(gnome-extra)
 install=gnome-clocks.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver::3}/${pkgname}-${pkgver}.tar.xz
-        gnome-clocks.css::http://git.gnome.org/browse/gnome-clocks/plain/data/css/gnome-clocks.css?id=${pkgver}
-        button-border-go.svg::http://git.gnome.org/browse/gnome-clocks/plain/data/css/button-border-go.svg?id=${pkgver}
-        button-border-go-active.svg::http://git.gnome.org/browse/gnome-clocks/plain/data/css/button-border-go-active.svg?id=${pkgver}
-        button-border-stop.svg::http://git.gnome.org/browse/gnome-clocks/plain/data/css/button-border-stop.svg?id=${pkgver}
-        button-border-stop-active.svg::http://git.gnome.org/browse/gnome-clocks/plain/data/css/button-border-stop-active.svg?id=${pkgver})
-sha256sums=('afe8405e41d8d2ac570642c2d73a43a2a45f8c6e521640d0a266e0fe0a55410f'
-            '3ce4afb848ea2a2728c53a9f4bfca5f12d9719e3935d1acd2d90056cb1c464fc'
-            'a44df652c8034ccbbc87a62f92ab6efbf6dfabead44e3316b4b9e85d851a6b24'
-            'e12ac57acaa43b25a36d9fd9b6dbe906980a5e8429840d98c604bf28515749e0'
-            'e71fa928cf5812fb1cc4ea62e55176be14716b670c37c7899368b0f8f020876c'
-            '34916c190c259788bcb561f0b4cce73b47a39e50326e1a53a2a91c2725e9d8a3')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('f6418272e8d3a9ad41fba49712917130b09db925b6caecd78653541aedee3e2d')
 
 build() {
   cd $pkgname-$pkgver
-
-  # Fix files missing from tarball
-  mkdir data/css
-  cp ../*.{css,svg} data/css
-
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
   make
 }
diff --git a/extra/gnome-color-manager/PKGBUILD b/extra/gnome-color-manager/PKGBUILD
index e25240abd..24becb277 100644
--- a/extra/gnome-color-manager/PKGBUILD
+++ b/extra/gnome-color-manager/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 185315 2013-05-13 09:38:38Z heftig $
+# $Id: PKGBUILD 196054 2013-10-07 11:51:16Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-color-manager
-pkgver=3.8.2
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Color profile manager for the GNOME desktop"
 arch=(i686 x86_64 'mips64el')
@@ -15,7 +15,7 @@ install=gnome-color-manager.install
 options=('!libtool' '!emptydirs')
 groups=('gnome-extra')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('6b9999d8213c8cab7abb7c9b1833d1d599866546180d11603fdee5430f93bae1')
+sha256sums=('95e27198fb6c7d45918d1a47a440ed5af0c65bbe2ec53fb8898d4c00c7dc8f00')
 
 build(){
   cd $pkgname-$pkgver
diff --git a/extra/gnome-contacts/PKGBUILD b/extra/gnome-contacts/PKGBUILD
index bbf6134ed..86453a889 100644
--- a/extra/gnome-contacts/PKGBUILD
+++ b/extra/gnome-contacts/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 190124 2013-07-15 23:14:12Z heftig $
+# $Id: PKGBUILD 196056 2013-10-07 11:51:18Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gnome-contacts
-pkgver=3.8.3
+pkgver=3.10
 pkgrel=1
 pkgdesc="Contacts Manager for GNOME"
 arch=(i686 x86_64 mips64el)
@@ -12,8 +12,8 @@ groups=(gnome)
 depends=('gtk3' 'folks' 'libnotify' 'gnome-desktop' 'dconf' 'gnome-online-accounts' 'libgee' 'telepathy-glib' 'cheese')
 makedepends=('intltool' 'vala' 'gobject-introspection')
 install=$pkgname.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('48e179aa40ffdee4218565a22da31d8794fb47f21beda60a2e8b80483a2f80a3')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver}/$pkgname-$pkgver.tar.xz)
+sha256sums=('1cb57d81455ee44e50745452bfefdf74f9ad4e393661199005c665284cda20cf')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD
index 44787ffbb..aadb184d4 100644
--- a/extra/gnome-control-center/PKGBUILD
+++ b/extra/gnome-control-center/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 192485 2013-08-12 21:17:35Z heftig $
+# $Id: PKGBUILD 196057 2013-10-07 11:51:20Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-control-center
-pkgver=3.8.4.1
-pkgrel=2
+pkgver=3.10.0
+pkgrel=1
 pkgdesc="The Control Center for GNOME"
 license=(GPL)
 arch=('i686' 'x86_64' 'mips64el')
@@ -22,21 +22,14 @@ groups=(gnome)
 url="http://www.gnome.org"
 install=gnome-control-center.install
 options=('!libtool' '!emptydirs')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz
-        no-deprecated-upower.diff)
-sha256sums=('3cfc5b93ca12f498c075f5b5356e0af4a0aaee003c0a90a4309bc12876f40c55'
-            '4182fa082b071c840bc0a6e981dad3c070602cae473229227e81bdaa2b5f8c23')
-
-prepare() {
-  cd $pkgname-$pkgver
-  patch -Np1 -i ../no-deprecated-upower.diff
-}
+source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('ea74d87e255308f130039a9afab548ae0416e2c96e69adfc7c794d1775f1474f')
 
 build() {
   cd $pkgname-$pkgver
 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/$pkgname --disable-static
+      --libexecdir=/usr/lib/$pkgname --disable-static --disable-silent-rules
 
   #https://bugzilla.gnome.org/show_bug.cgi?id=656229
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
diff --git a/extra/gnome-desktop/PKGBUILD b/extra/gnome-desktop/PKGBUILD
index c8e03a16b..c234c2309 100644
--- a/extra/gnome-desktop/PKGBUILD
+++ b/extra/gnome-desktop/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 188610 2013-06-16 23:56:02Z heftig $
+# $Id: PKGBUILD 196058 2013-10-07 11:51:23Z jgc $
 # Maintainer:  Jan de Groot <jan@archlinux.org>
 
 pkgname=gnome-desktop
-pkgver=3.8.3
-pkgrel=2
+pkgver=3.10.0
+pkgrel=1
 epoch=1
 pkgdesc="Library with common API for various GNOME modules"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,8 +13,8 @@ makedepends=(intltool gobject-introspection itstool)
 url="http://www.gnome.org"
 groups=(gnome)
 options=(!libtool)
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('c9c8d1888e28cb30e466be46909efe640fb3cb348909cae2664489508790e5a2')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('3e87352ba30e9965199fb360c852e22ccb7c7e5c02965b6d63fb175f3737b75c')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-dictionary/PKGBUILD b/extra/gnome-dictionary/PKGBUILD
index 883e619c6..2f76b3c90 100644
--- a/extra/gnome-dictionary/PKGBUILD
+++ b/extra/gnome-dictionary/PKGBUILD
@@ -1,7 +1,8 @@
-# $Id: PKGBUILD 191351 2013-07-23 18:22:13Z jgc $
+# $Id: PKGBUILD 196059 2013-10-07 11:51:24Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
+
 pkgname=gnome-dictionary
-pkgver=3.8.0
+pkgver=3.9.0
 pkgrel=1
 pkgdesc="Look up words in dictionary sources"
 arch=(i686 x86_64 mips64el)
@@ -13,16 +14,16 @@ install=$pkgname.install
 options=(!libtool)
 groups=('gnome')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('faebbca7684aeef5ff4111305bc8e0c1790b0551445df404b68f3d7cf2c50421')
+sha256sums=('4881096d5952ca39e19e4ecfb37f16634d5f5c1e41ee1e74fa8550f59f5bd455')
 
 build() {
-  cd "$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }
 
diff --git a/extra/gnome-disk-utility/PKGBUILD b/extra/gnome-disk-utility/PKGBUILD
index 17afe93d1..3a63e5f2c 100644
--- a/extra/gnome-disk-utility/PKGBUILD
+++ b/extra/gnome-disk-utility/PKGBUILD
@@ -1,30 +1,21 @@
-# $Id: PKGBUILD 186559 2013-05-29 01:23:46Z heftig $
+# $Id: PKGBUILD 196060 2013-10-07 11:51:25Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Silvio Knizek (killermoehre)
 
 pkgname=gnome-disk-utility
-pkgver=3.8.2
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Disk Management Utility for GNOME"
 arch=('i686' 'x86_64' 'mips64el')
 license=(GPL)
 url="http://www.gnome.org"
 groups=(gnome)
-depends=(udisks2 gtk3 libsecret libpwquality libcanberra libdvdread libnotify hicolor-icon-theme desktop-file-utils)
+depends=(udisks2 gtk3 libsecret libpwquality libcanberra libdvdread libnotify desktop-file-utils gnome-icon-theme-symbolic)
 makedepends=(intltool docbook-xsl gnome-settings-daemon)
 options=('!libtool' '!emptydirs')
 install=gnome-disk-utility.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        typefixes.patch)
-sha256sums=('6a64de6f40ddfebfe7566f3ef7856c1cb33fab7d21d9be43db74f014309298c3'
-            '0a1f2f80f1c741119639b3b2b8cf32d6261b126baa85189309d6473e171894d2')
-
-prepare() {
-  cd $pkgname-$pkgver
-
-  # Gets rid of warnings and compilation errors on i686
-  patch -Np1 -i ../typefixes.patch
-}
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('34e23a62e711ec543670550f9312a5ad6610ce807d57345146b6af989788b8aa')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-documents/PKGBUILD b/extra/gnome-documents/PKGBUILD
index d9194daa2..91595e4bf 100644
--- a/extra/gnome-documents/PKGBUILD
+++ b/extra/gnome-documents/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 193767 2013-08-30 14:34:45Z heftig $
+# $Id: PKGBUILD 196061 2013-10-07 11:51:26Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-documents
-pkgver=3.8.4
-pkgrel=1
+pkgver=3.10.0
+pkgrel=2
 pkgdesc="Documents Manager for GNOME"
 arch=(i686 x86_64 mips64el)
 url="http://www.gnome.org"
 license=(GPL)
 groups=(gnome-extra)
 depends=(evince gjs gtk3 gnome-desktop gnome-online-accounts libgdata
-         tracker libzapojit webkitgtk3)
+         tracker libzapojit webkitgtk gnome-online-miners)
 makedepends=(intltool gobject-introspection itstool docbook-xsl)
 optdepends=('unoconv: Support for Libreoffice document types')
 options=('!libtool')
 install=gnome-documents.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('daebb07b2e0767677e5fbdc4f5b5ca6672089565f955e3a42505e3f784e02ed9')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('93365aee61c2777d1fe70fa8f55f6e3ce9e7e130dd2869d74eb85787825be9f6')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-font-viewer/PKGBUILD b/extra/gnome-font-viewer/PKGBUILD
index 167a933e3..ac73bae46 100644
--- a/extra/gnome-font-viewer/PKGBUILD
+++ b/extra/gnome-font-viewer/PKGBUILD
@@ -1,8 +1,8 @@
-#  $Id: PKGBUILD 183381 2013-04-21 22:09:54Z heftig $
+#  $Id: PKGBUILD 196062 2013-10-07 11:51:28Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-font-viewer
-pkgver=3.8.0
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="GNOME font viewer and thumbnailer"
 arch=(i686 x86_64 mips64el)
@@ -13,8 +13,8 @@ options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 groups=('gnome')
 install=gnome-font-viewer.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('d34f17f026b7c41d8de5c255070c79c938ce69030b3429444e7fb8f2275ff819')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('3928350f58ac6c95f44b64cba1a5f03437b19d9b2645a7b01176067504fdd652')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-keyring/PKGBUILD b/extra/gnome-keyring/PKGBUILD
index 12ec0d911..349f6e48a 100644
--- a/extra/gnome-keyring/PKGBUILD
+++ b/extra/gnome-keyring/PKGBUILD
@@ -1,8 +1,8 @@
-#$Id: PKGBUILD 184243 2013-05-04 20:20:08Z heftig $
+#$Id: PKGBUILD 196066 2013-10-07 11:51:34Z jgc $
 # Maintainer: Jan De Groot <jgc@archlinux.org>
 
 pkgname=gnome-keyring
-pkgver=3.8.2
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="GNOME Password Management daemon"
 arch=(i686 x86_64 'mips64el')
@@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 install=gnome-keyring.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('f05692bb32db4d1afa65205ac4e68fa2b79107aca2393e237cf38f880cb7b868')
+sha256sums=('1cc87260fa17b8e39071fdae0418cd9ca5f913d50e23d8f456f3e2c6d6d22213')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/gnome-klotski/PKGBUILD b/extra/gnome-klotski/PKGBUILD
index d0619306e..e9ce6d8c5 100644
--- a/extra/gnome-klotski/PKGBUILD
+++ b/extra/gnome-klotski/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 185360 2013-05-13 17:42:01Z heftig $
+# $Id: PKGBUILD 196067 2013-10-07 11:51:35Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-klotski
-pkgver=3.8.2
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Slide blocks to solve the puzzle"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,8 +16,8 @@ options=('!emptydirs' '!libtool')
 install=gnome-klotski.install
 url="https://live.gnome.org/Klotski"
 groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('757a531542272b8d2191facb034e5033ba3aa340d5303b8d939f78045d91910c')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('ce29d136bc1c141dc92b0dc67d597f2b0eddefcee7d3de10d54ef80327c6f5d3')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-mahjongg/PKGBUILD b/extra/gnome-mahjongg/PKGBUILD
index c6b6fa33b..e01bc365b 100644
--- a/extra/gnome-mahjongg/PKGBUILD
+++ b/extra/gnome-mahjongg/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-mahjongg
-pkgver=3.8.0
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Disassemble a pile of tiles by removing matching pairs"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,8 +16,8 @@ options=('!emptydirs' '!libtool')
 install=gnome-mahjongg.install
 url="https://live.gnome.org/Mahjongg"
 groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('6995bfae4c145f07764a7825865804232e620bbdf57c0625d0a21d06561ad496')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('bcbb67d0784e3e8c1772d83f559506c40b5ff2d38c8212db004b0d913f04e963')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-menus/PKGBUILD b/extra/gnome-menus/PKGBUILD
index e819f3217..977af2778 100644
--- a/extra/gnome-menus/PKGBUILD
+++ b/extra/gnome-menus/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183388 2013-04-21 22:10:05Z heftig $
+# $Id: PKGBUILD 196156 2013-10-07 12:17:09Z jgc $
 # Maintainer: Jan de Groot <jan@archlinux.org>
 
 pkgname=gnome-menus
-pkgver=3.8.0
-pkgrel=2
+pkgver=3.10.0
+pkgrel=1
 pkgdesc="GNOME menu specifications"
 arch=('i686' 'x86_64' 'mips64el')
 depends=('glib2')
@@ -11,14 +11,11 @@ makedepends=('intltool' 'gobject-introspection')
 options=('!libtool')
 license=('GPL' 'LGPL')
 url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        calculator.patch)
-sha256sums=('33c215ae8d815f4a94d2dbfc8c6679fddbbf8026d30da55a350e67ea940ce14f'
-            'e2b17562cd48794075b6bff98cec1fc8ff817728bcea40834144c699cd8680c8')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('713a58ff9e3264be70dd233c2935cfce4ee76223c17044ecbf6cb53eba875192')
 
 build() {
   cd "$pkgname-$pkgver"
-  patch -Np1 -i ../calculator.patch
   ./configure \
       --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var  --disable-static
diff --git a/extra/gnome-menus/calculator.patch b/extra/gnome-menus/calculator.patch
deleted file mode 100644
index 9ff1ed261..000000000
--- a/extra/gnome-menus/calculator.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 599c7b05c432b1571a7105f1ebf6bbe30c36dbdf Mon Sep 17 00:00:00 2001
-From: Kalev Lember <kalevlember@gmail.com>
-Date: Thu, 28 Mar 2013 21:54:34 +0000
-Subject: Adapt for gnome-calculator -> gcalctool desktop file rename
-
-gnome-calculator.desktop was renamed back to gcalctool.desktop, at the
-very last minute before the 3.8.0 release.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=696816
----
-diff --git a/layout/gnome-applications.menu b/layout/gnome-applications.menu
-index 84d13ed..503f9ca 100644
---- a/layout/gnome-applications.menu
-+++ b/layout/gnome-applications.menu
-@@ -38,7 +38,6 @@
-         <Not><Filename>file-roller.desktop</Filename></Not>
-         <Not><Filename>gnome-file-roller.desktop</Filename></Not>
-         <Not><Filename>deja-dup-preferences.desktop</Filename></Not>
--        <Not><Filename>gnome-calculator.desktop</Filename></Not>
-         <Not><Filename>gcalctool.desktop</Filename></Not>
-         <Not><Filename>gucharmap.desktop</Filename></Not>
-         <Not><Filename>gnome-gucharmap.desktop</Filename></Not>
-@@ -251,7 +250,7 @@
-     <Directory>X-GNOME-Utilities.directory</Directory>
-     <Include>
-       <Filename>file-roller.desktop</Filename>
--      <Filename>gnome-calculator.desktop</Filename>
-+      <Filename>gcalctool.desktop</Filename>
-       <Filename>gnome-font-viewer.desktop</Filename>
-       <Filename>gucharmap.desktop</Filename>
-       <Filename>seahorse.desktop</Filename>
-@@ -287,7 +286,6 @@
-         <Not><Filename>gnome-eog.desktop</Filename></Not>
-         <Not><Filename>gnome-file-roller.desktop</Filename></Not>
-         <Not><Filename>gnome-gucharmap.desktop</Filename></Not>
--        <Not><Filename>gcalctool.desktop</Filename></Not>
-       </And>
-     </Include>
-   </Menu> <!-- End Other -->
---
-cgit v0.9.1
diff --git a/extra/gnome-mines/PKGBUILD b/extra/gnome-mines/PKGBUILD
index 0ed91876b..97e5041df 100644
--- a/extra/gnome-mines/PKGBUILD
+++ b/extra/gnome-mines/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 193434 2013-08-20 07:06:23Z jgc $
+# $Id: PKGBUILD 196069 2013-10-07 11:51:38Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-mines
-pkgver=3.8.2
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Clear hidden mines from a minefield"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,8 +16,8 @@ options=('!emptydirs' '!libtool')
 install=gnome-mines.install
 url="https://live.gnome.org/Mines"
 groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('e70f13056183f8d9a8aa3721516545364e10e9fde0a4b703de7cba1fe3af531d')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('b0f71a58e864848f5dd1067488b7d1d31b7c8f30d6d9904411b755d29074826c')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-music/PKGBUILD b/extra/gnome-music/PKGBUILD
new file mode 100644
index 000000000..409f8ebb0
--- /dev/null
+++ b/extra/gnome-music/PKGBUILD
@@ -0,0 +1,27 @@
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gnome-music
+pkgver=3.10.0
+pkgrel=2
+pkgdesc="Music player and management application"
+arch=(i686 x86_64)
+license=('GPL')
+url="https://wiki.gnome.org/Apps/Music"
+depends=(grilo grilo-plugins tracker python gobject-introspection libdmapsharing python-dbus dbus-glib)
+makedepends=(intltool)
+options=('!libtool')
+groups=('gnome-extra')
+install=gnome-music.install
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('16ecbb93f4e69a7e85b86fc73413744073d69edaa09e71e135afe2c8de5b1d69')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --disable-schemas-compile
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make -j1 DESTDIR="${pkgdir}" install
+}
diff --git a/extra/gnome-music/gnome-music.install b/extra/gnome-music/gnome-music.install
new file mode 100644
index 000000000..2b172e29c
--- /dev/null
+++ b/extra/gnome-music/gnome-music.install
@@ -0,0 +1,13 @@
+post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/extra/gnome-nibbles/PKGBUILD b/extra/gnome-nibbles/PKGBUILD
index 528bbeb45..4a521a010 100644
--- a/extra/gnome-nibbles/PKGBUILD
+++ b/extra/gnome-nibbles/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-nibbles
-pkgver=3.8.0
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Guide a worm around a maze"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,8 +16,8 @@ options=('!emptydirs' '!libtool')
 install=gnome-nibbles.install
 url="https://live.gnome.org/Nibbles"
 groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('bc1e4f687f1e794ef15a4162492154970300ac682378e59f9471327e5fd0d606')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('6bf774cbd86e617c49f1740e79d52a7d26bf23656a673db1efb20bcc893e614a')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-online-accounts/PKGBUILD b/extra/gnome-online-accounts/PKGBUILD
index 5b9c7e624..a110b1e75 100644
--- a/extra/gnome-online-accounts/PKGBUILD
+++ b/extra/gnome-online-accounts/PKGBUILD
@@ -1,37 +1,23 @@
-# $Id: PKGBUILD 193766 2013-08-30 14:31:41Z heftig $
+# $Id: PKGBUILD 196071 2013-10-07 11:51:42Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gnome-online-accounts
-pkgver=3.8.3
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="GNOME service to access online accounts"
 arch=(i686 x86_64 mips64el)
 url="http://www.gnome.org"
 license=('GPL')
-depends=('webkitgtk3' 'json-glib' 'libnotify' 'rest' 'hicolor-icon-theme' 'libsecret')
+depends=('webkitgtk' 'json-glib' 'libnotify' 'rest' 'hicolor-icon-theme' 'libsecret' 'telepathy-glib')
 makedepends=('intltool' 'libxslt' 'gobject-introspection' 'docbook-xsl')
 options=(!libtool)
 install=$pkgname.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz
-        drop-google-password-interface-1.patch
-        drop-google-password-interface-2.patch
-        drop-google-password-interface-3.patch)
-sha256sums=('9e5e55c5097b8d7c32c0dfb7d94448795c627723b133e8edd0b846adde63a44b'
-            '33435c10aa1ba3fbb6fd633dc098cd1da50629f1d602521ca83be5379f2ebe48'
-            'c837f9be4e5e072a06ea44076e6b9a1519c66c95b16d7a55b1dba105fded317f'
-            '18dfad8ed978af1068fd057bbe323006c349ac4ea77c742aa06f1011dc92326e')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('bba85366632cf5ce777b6889eab505d98d7593c37f7859a312dc57dde05a0feb')
 
-prepare() {
-  cd $pkgname-$pkgver
-  # Backport from Ubuntu
-  patch -Np1 -i ../drop-google-password-interface-1.patch
-  patch -Np1 -i ../drop-google-password-interface-2.patch
-  patch -Np1 -i ../drop-google-password-interface-3.patch
-}
- 
 build() {
   cd $pkgname-$pkgver
-  ./configure --prefix=/usr --libexec=/usr/lib/gnome-online-accounts
+  ./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname
   make
 }
 
diff --git a/extra/gnome-online-accounts/drop-google-password-interface-1.patch b/extra/gnome-online-accounts/drop-google-password-interface-1.patch
deleted file mode 100644
index 1bd5c8c0f..000000000
--- a/extra/gnome-online-accounts/drop-google-password-interface-1.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 9182fb378614abb2ff0245fe71a753f22eaaa906 Mon Sep 17 00:00:00 2001
-From: Debarshi Ray <debarshir@gnome.org>
-Date: Tue, 11 Jun 2013 14:58:21 +0000
-Subject: google: Bump credentials generation
-
-Access to the following were turned on in the Google APIs Console:
- - Calendar API
- - Google Calendar CalDAV API
- - Google Contacts CardDAV API
-
-Of these, only the last two are new. We were already requesting the
-scope for Calendar API, but looks like the APIs Console is the way
-to go now. Interestingly the APIs Console does not list all the other
-services that we are interested in, or it is does but is not obvious
-to me.
-
-In any case we need access to their new CalDAV API which works with
-OAuth2 because that would let us work with 2-factor authenticated
-accounts again.
-
-See: https://bugzilla.gnome.org/show_bug.cgi?id=686804
-     https://bugzilla.gnome.org/show_bug.cgi?id=688364
----
-(limited to 'src/goabackend/goagoogleprovider.c')
-
-diff --git a/src/goabackend/goagoogleprovider.c b/src/goabackend/goagoogleprovider.c
-index 8271711..79f5f73 100644
---- a/src/goabackend/goagoogleprovider.c
-+++ b/src/goabackend/goagoogleprovider.c
-@@ -148,7 +148,7 @@ get_scope (GoaOAuth2Provider *provider)
- static guint
- get_credentials_generation (GoaProvider *provider)
- {
--  return 3;
-+  return 4;
- }
- 
- static const gchar *
-
diff --git a/extra/gnome-online-accounts/drop-google-password-interface-2.patch b/extra/gnome-online-accounts/drop-google-password-interface-2.patch
deleted file mode 100644
index 9aa1ce28e..000000000
--- a/extra/gnome-online-accounts/drop-google-password-interface-2.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From a0fd4cd595bd0fe6eb4015ea9050170319b16546 Mon Sep 17 00:00:00 2001
-From: Debarshi Ray <debarshir@gnome.org>
-Date: Wed, 19 Jun 2013 15:04:38 +0000
-Subject: google: Export CalDAV and CardDAV endpoints
-
-According to:
-https://developers.google.com/google-apps/calendar/caldav/v2/guide/
-https://developers.google.com/google-apps/carddav/
-
-See: https://bugzilla.gnome.org/show_bug.cgi?id=686804
-     https://bugzilla.gnome.org/show_bug.cgi?id=688364
----
-(limited to 'src/goabackend/goagoogleprovider.c')
-
-diff --git a/src/goabackend/goagoogleprovider.c b/src/goabackend/goagoogleprovider.c
-index 79f5f73..740c08e 100644
---- a/src/goabackend/goagoogleprovider.c
-+++ b/src/goabackend/goagoogleprovider.c
-@@ -385,6 +385,7 @@ build_object (GoaProvider         *provider,
-   gboolean contacts_enabled;
-   gboolean chat_enabled;
-   gboolean documents_enabled;
-+  const gchar *email_address;
- 
-   account = NULL;
-   mail = NULL;
-@@ -419,6 +420,7 @@ build_object (GoaProvider         *provider,
-     }
- 
-   account = goa_object_get_account (GOA_OBJECT (object));
-+  email_address = goa_account_get_identity (account);
- 
-   /* Email */
-   mail = goa_object_get_mail (GOA_OBJECT (object));
-@@ -427,8 +429,6 @@ build_object (GoaProvider         *provider,
-     {
-       if (mail == NULL)
-         {
--          const gchar *email_address;
--          email_address = goa_account_get_identity (account);
-           mail = goa_mail_skeleton_new ();
-           g_object_set (G_OBJECT (mail),
-                         "email-address",   email_address,
-@@ -457,8 +457,19 @@ build_object (GoaProvider         *provider,
-     {
-       if (calendar == NULL)
-         {
-+          gchar *uri_caldav;
-+
-+          uri_caldav = g_strconcat ("https://apidata.googleusercontent.com/caldav/v2/",
-+                                    email_address,
-+                                    "/user",
-+                                    NULL);
-+
-           calendar = goa_calendar_skeleton_new ();
-+          g_object_set (G_OBJECT (calendar),
-+                        "uri", uri_caldav,
-+                        NULL);
-           goa_object_skeleton_set_calendar (object, calendar);
-+          g_free (uri_caldav);
-         }
-     }
-   else
-@@ -475,6 +486,9 @@ build_object (GoaProvider         *provider,
-       if (contacts == NULL)
-         {
-           contacts = goa_contacts_skeleton_new ();
-+          g_object_set (G_OBJECT (contacts),
-+                        "uri", "https://www.googleapis.com/.well-known/carddav",
-+                        NULL);
-           goa_object_skeleton_set_contacts (object, contacts);
-         }
-     }
-
diff --git a/extra/gnome-online-accounts/drop-google-password-interface-3.patch b/extra/gnome-online-accounts/drop-google-password-interface-3.patch
deleted file mode 100644
index 487132b32..000000000
--- a/extra/gnome-online-accounts/drop-google-password-interface-3.patch
+++ /dev/null
@@ -1,296 +0,0 @@
-From 365a5a92909fce8dcdd851b5a2b9caf34e0da926 Mon Sep 17 00:00:00 2001
-From: Debarshi Ray <debarshir@gnome.org>
-Date: Fri, 28 Jun 2013 12:22:07 +0000
-Subject: google: Don't offer a PasswordBased interface
-
-This was a temporary measure back when Google did not support OAuth2
-for CalDAV. Now that they do, we can drop this.
-
-In any case, the workaround didn't work with accounts using 2-factor
-authentication. This will make those people happy.
-
-This reverts 89c335479c1bb8409af8296c99ffea602a28b71f
-
-See: https://bugzilla.gnome.org/show_bug.cgi?id=686804
-     https://bugzilla.gnome.org/show_bug.cgi?id=688364
----
-(limited to 'src/goabackend/goagoogleprovider.c')
-
-Index: gnome-online-accounts-3.8.2/src/goabackend/goagoogleprovider.c
-===================================================================
---- gnome-online-accounts-3.8.2.orig/src/goabackend/goagoogleprovider.c	2013-07-10 13:29:35.381448621 -0400
-+++ gnome-online-accounts-3.8.2/src/goabackend/goagoogleprovider.c	2013-07-10 13:29:35.377448621 -0400
-@@ -32,8 +32,6 @@
- #include "goaprovider-priv.h"
- #include "goaoauth2provider.h"
- #include "goagoogleprovider.h"
--#include "goahttpclient.h"
--#include "goautils.h"
- 
- /**
-  * GoaGoogleProvider:
-@@ -71,8 +69,6 @@
- 
- /* ---------------------------------------------------------------------------------------------------- */
- 
--static const gchar *CALDAV_ENDPOINT = "https://www.google.com/calendar/dav/%s/events/";
--
- static const gchar *
- get_provider_type (GoaProvider *_provider)
- {
-@@ -310,48 +306,8 @@
-   return ret;
- }
- 
--static gboolean
--is_password_node (GoaOAuth2Provider *provider, WebKitDOMHTMLInputElement *element)
--{
--  gboolean ret;
--  gchar *element_type;
--  gchar *id;
--  gchar *name;
--
--  element_type = NULL;
--  id = NULL;
--  name = NULL;
--
--  ret = FALSE;
--
--  g_object_get (element, "type", &element_type, NULL);
--  if (g_strcmp0 (element_type, "password") != 0)
--    goto out;
--
--  id = webkit_dom_html_element_get_id (WEBKIT_DOM_HTML_ELEMENT (element));
--  if (g_strcmp0 (id, "Passwd") != 0)
--    goto out;
--
--  name = webkit_dom_html_input_element_get_name (element);
--  if (g_strcmp0 (name, "Passwd") != 0)
--    goto out;
--
--  ret = TRUE;
--
-- out:
--  g_free (element_type);
--  g_free (id);
--  g_free (name);
--  return ret;
--}
--
- /* ---------------------------------------------------------------------------------------------------- */
- 
--static gboolean on_handle_get_password (GoaPasswordBased      *interface,
--                                        GDBusMethodInvocation *invocation,
--                                        const gchar           *id,
--                                        gpointer               user_data);
--
- static gboolean
- build_object (GoaProvider         *provider,
-               GoaObjectSkeleton   *object,
-@@ -367,7 +323,6 @@
-   GoaContacts *contacts;
-   GoaChat *chat;
-   GoaDocuments *documents;
--  GoaPasswordBased *password_based;
-   gboolean ret;
-   gboolean mail_enabled;
-   gboolean calendar_enabled;
-@@ -394,20 +349,6 @@
-                                                                             error))
-     goto out;
- 
--  password_based = goa_object_get_password_based (GOA_OBJECT (object));
--  if (password_based == NULL)
--    {
--      password_based = goa_password_based_skeleton_new ();
--      /* Ensure D-Bus method invocations run in their own thread */
--      g_dbus_interface_skeleton_set_flags (G_DBUS_INTERFACE_SKELETON (password_based),
--                                           G_DBUS_INTERFACE_SKELETON_FLAGS_HANDLE_METHOD_INVOCATIONS_IN_THREAD);
--      goa_object_skeleton_set_password_based (object, password_based);
--      g_signal_connect (password_based,
--                        "handle-get-password",
--                        G_CALLBACK (on_handle_get_password),
--                        NULL);
--    }
--
-   account = goa_object_get_account (GOA_OBJECT (object));
-   email_address = goa_account_get_identity (account);
- 
-@@ -567,103 +508,6 @@
- /* ---------------------------------------------------------------------------------------------------- */
- 
- static gboolean
--ensure_credentials_sync (GoaProvider   *provider,
--                         GoaObject     *object,
--                         gint          *out_expires_in,
--                         GCancellable  *cancellable,
--                         GError       **error)
--{
--  GVariant *credentials;
--  GoaAccount *account;
--  GoaHttpClient *http_client;
--  gboolean ret;
--  const gchar *username;
--  gchar *password;
--  gchar *uri_caldav;
--
--  credentials = NULL;
--  http_client = NULL;
--  password = NULL;
--  uri_caldav = NULL;
--
--  ret = FALSE;
--
--  /* Chain up */
--  if (!GOA_PROVIDER_CLASS (goa_google_provider_parent_class)->ensure_credentials_sync (provider,
--                                                                                       object,
--                                                                                       out_expires_in,
--                                                                                       cancellable,
--                                                                                       error))
--    goto out;
--
--  credentials = goa_utils_lookup_credentials_sync (provider,
--                                                   object,
--                                                   cancellable,
--                                                   error);
--  if (credentials == NULL)
--    {
--      if (error != NULL)
--        {
--          (*error)->domain = GOA_ERROR;
--          (*error)->code = GOA_ERROR_NOT_AUTHORIZED;
--        }
--      goto out;
--    }
--
--  account = goa_object_peek_account (object);
--  username = goa_account_get_presentation_identity (account);
--  uri_caldav = g_strdup_printf (CALDAV_ENDPOINT, username);
--
--  if (!g_variant_lookup (credentials, "password", "s", &password))
--    {
--      if (error != NULL)
--        {
--          *error = g_error_new (GOA_ERROR,
--                                GOA_ERROR_NOT_AUTHORIZED,
--                                _("Did not find password with identity `%s' in credentials"),
--                                username);
--        }
--      goto out;
--    }
--
--  http_client = goa_http_client_new ();
--  ret = goa_http_client_check_sync (http_client,
--                                    uri_caldav,
--                                    username,
--                                    password,
--                                    FALSE,
--                                    cancellable,
--                                    error);
--  if (!ret)
--    {
--      if (error != NULL)
--        {
--          g_prefix_error (error,
--                          /* Translators: the first %s is the username
--                           * (eg., debarshi.ray@gmail.com or rishi), and the
--                           * (%s, %d) is the error domain and code.
--                           */
--                          _("Invalid password with username `%s' (%s, %d): "),
--                          username,
--                          g_quark_to_string ((*error)->domain),
--                          (*error)->code);
--          (*error)->domain = GOA_ERROR;
--          (*error)->code = GOA_ERROR_NOT_AUTHORIZED;
--        }
--      goto out;
--    }
--
-- out:
--  g_clear_object (&http_client);
--  g_free (password);
--  g_free (uri_caldav);
--  g_clear_pointer (&credentials, (GDestroyNotify) g_variant_unref);
--  return ret;
--}
--
--/* ---------------------------------------------------------------------------------------------------- */
--
--static gboolean
- get_use_mobile_browser (GoaOAuth2Provider *provider)
- {
-   return TRUE;
-@@ -744,7 +588,6 @@
-   provider_class->get_provider_name          = get_provider_name;
-   provider_class->get_provider_group         = get_provider_group;
-   provider_class->build_object               = build_object;
--  provider_class->ensure_credentials_sync    = ensure_credentials_sync;
-   provider_class->show_account               = show_account;
-   provider_class->get_credentials_generation = get_credentials_generation;
- 
-@@ -758,65 +601,7 @@
-   oauth2_class->get_scope                 = get_scope;
-   oauth2_class->is_deny_node              = is_deny_node;
-   oauth2_class->is_identity_node          = is_identity_node;
--  oauth2_class->is_password_node          = is_password_node;
-   oauth2_class->get_token_uri             = get_token_uri;
-   oauth2_class->get_use_mobile_browser    = get_use_mobile_browser;
-   oauth2_class->add_account_key_values    = add_account_key_values;
- }
--
--/* ---------------------------------------------------------------------------------------------------- */
--
--/* runs in a thread dedicated to handling @invocation */
--static gboolean
--on_handle_get_password (GoaPasswordBased      *interface,
--                        GDBusMethodInvocation *invocation,
--                        const gchar           *id, /* unused */
--                        gpointer               user_data)
--{
--  GoaObject *object;
--  GoaAccount *account;
--  GoaProvider *provider;
--  GError *error;
--  GVariant *credentials;
--  const gchar *identity;
--  gchar *password;
--
--  /* TODO: maybe log what app is requesting access */
--
--  password = NULL;
--  credentials = NULL;
--
--  object = GOA_OBJECT (g_dbus_interface_get_object (G_DBUS_INTERFACE (interface)));
--  account = goa_object_peek_account (object);
--  identity = goa_account_get_identity (account);
--  provider = goa_provider_get_for_provider_type (goa_account_get_provider_type (account));
--
--  error = NULL;
--  credentials = goa_utils_lookup_credentials_sync (provider,
--                                                   object,
--                                                   NULL, /* GCancellable* */
--                                                   &error);
--  if (credentials == NULL)
--    {
--      g_dbus_method_invocation_take_error (invocation, error);
--      goto out;
--    }
--
--  if (!g_variant_lookup (credentials, "password", "s", &password))
--    {
--      g_dbus_method_invocation_return_error (invocation,
--                                             GOA_ERROR,
--                                             GOA_ERROR_FAILED, /* TODO: more specific */
--                                             _("Did not find password with identity `%s' in credentials"),
--                                             identity);
--      goto out;
--    }
--
--  goa_password_based_complete_get_password (interface, invocation, password);
--
-- out:
--  g_free (password);
--  g_clear_pointer (&credentials, (GDestroyNotify) g_variant_unref);
--  g_object_unref (provider);
--  return TRUE; /* invocation was handled */
--}
diff --git a/extra/gnome-online-miners/PKGBUILD b/extra/gnome-online-miners/PKGBUILD
new file mode 100644
index 000000000..9211d6522
--- /dev/null
+++ b/extra/gnome-online-miners/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: PKGBUILD 196006 2013-10-07 11:48:35Z jgc $
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
+
+pkgname=gnome-online-miners
+pkgver=3.10.0
+pkgrel=1
+pkgdesc="Tracker miners for online accounts"
+arch=(i686 x86_64)
+url="http://www.gnome.org"
+license=(GPL)
+depends=(libgdata gnome-online-accounts grilo libzapojit tracker)
+options=(!libtool)
+source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('a4ca0d78452f8d19ed4eedeb5164b93aead9566cb9e2cf9826d49e3bad02a504')
+ 
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname --disable-static
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/gnome-photos/PKGBUILD b/extra/gnome-photos/PKGBUILD
index bd7d4686f..84a78e9bd 100644
--- a/extra/gnome-photos/PKGBUILD
+++ b/extra/gnome-photos/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 185464 2013-05-14 10:33:14Z heftig $
+# $Id: PKGBUILD 196072 2013-10-07 11:51:43Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-photos
-pkgver=3.8.2
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Access, organize, and share your photos on GNOME"
 arch=(i686 x86_64 mips64el)
 url="https://www.gnome.org/"
 license=(GPL)
-depends=(exempi gtk3 libexif librsvg babl gegl gnome-desktop gnome-online-accounts lcms2 tracker hicolor-icon-theme)
+depends=(exempi gtk3 libexif librsvg babl gegl gnome-desktop gnome-online-accounts lcms2 tracker hicolor-icon-theme grilo)
 makedepends=(intltool)
 options=(!libtool)
 groups=(gnome-extra)
 install=gnome-photos.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver::3}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('c6e777cdc6a4b0ee24b4dbd1b971fe239198926a3057c27c08eeda0a53ba6d58')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('65cb5790ec5a282c8bc8b4902858a0b4b3cec2fe39709a580dc073a23a5fc210')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-power-manager/PKGBUILD b/extra/gnome-power-manager/PKGBUILD
index 60e423d81..fbe60f96a 100644
--- a/extra/gnome-power-manager/PKGBUILD
+++ b/extra/gnome-power-manager/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 185314 2013-05-13 09:37:19Z heftig $
+# $Id: PKGBUILD 196073 2013-10-07 11:51:45Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-power-manager
-pkgver=3.8.2
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="System power information and statistics"
 arch=(i686 x86_64 mips64el)
@@ -14,7 +14,7 @@ makedepends=(intltool)
 options=(!emptydirs)
 install=gnome-power-manager.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('6f4fee6cce2c0a58ae52a2cae1b8f0acca0a08d8154fe056ca3bfb5e537c5b61')
+sha256sums=('e193f7b6c813acab2d57eefec783d267b26d114c2185ffe41334000c65f76841')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-python-desktop/PKGBUILD b/extra/gnome-python-desktop/PKGBUILD
index 939de0ee0..336997ea5 100644
--- a/extra/gnome-python-desktop/PKGBUILD
+++ b/extra/gnome-python-desktop/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 169097 2012-10-17 22:51:16Z allan $
+# $Id: PKGBUILD 196074 2013-10-07 11:51:47Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Arjan Timmerman <arjan@soulfly.nl>
 # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
@@ -6,7 +6,7 @@
 pkgbase=gnome-python-desktop
 pkgname=('gnome-python-desktop' 'python2-gnomedesktop' 'python2-gnomekeyring' 'python2-gtop' 'python2-metacity' 'python2-rsvg' 'python2-totem-plparser' 'python2-wnck')
 pkgver=2.32.0
-pkgrel=12
+pkgrel=13
 arch=(i686 x86_64 'mips64el')
 license=('GPL' 'LGPL')
 options=('!libtool')
diff --git a/extra/gnome-robots/PKGBUILD b/extra/gnome-robots/PKGBUILD
index cc7133763..42091c6fd 100644
--- a/extra/gnome-robots/PKGBUILD
+++ b/extra/gnome-robots/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183394 2013-04-21 22:10:16Z heftig $
+# $Id: PKGBUILD 196075 2013-10-07 11:51:48Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-robots
-pkgver=3.8.1
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Avoid the robots and make them crash into each other"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,8 +16,8 @@ options=('!emptydirs' '!libtool')
 install=gnome-robots.install
 url="https://live.gnome.org/Robots"
 groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('6faeeef5ab9b5002c7ca3cf60ea67e7a66064654ae28c68c233b2ee40459a704')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('600a5b81bf0b47cbe942cd3902a947df2e9e2a2a72f4b2a7248e60b1621b987e')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-screenshot/PKGBUILD b/extra/gnome-screenshot/PKGBUILD
index f06a06c73..19f80f98a 100644
--- a/extra/gnome-screenshot/PKGBUILD
+++ b/extra/gnome-screenshot/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 189890 2013-07-10 16:54:26Z heftig $
+# $Id: PKGBUILD 196076 2013-10-07 11:51:50Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gnome-screenshot
-pkgver=3.8.3
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Take pictures of your screen"
 arch=(i686 x86_64 mips64el)
@@ -13,7 +13,7 @@ makedepends=('intltool')
 groups=('gnome')
 install=$pkgname.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('05d638d53da334aa8818e83ed3f91a17334c48c707d728426414033607582971')
+sha256sums=('709de9b9c66f569f4984152376479ca2c4aa47c9e5aa5e7385e417c9fe3465d9')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/gnome-session/PKGBUILD b/extra/gnome-session/PKGBUILD
index 6b165d2b3..3248f0e22 100644
--- a/extra/gnome-session/PKGBUILD
+++ b/extra/gnome-session/PKGBUILD
@@ -1,33 +1,35 @@
-# $Id: PKGBUILD 191810 2013-07-30 23:24:20Z jgc $
+# $Id: PKGBUILD 196077 2013-10-07 11:51:51Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-session
-pkgver=3.8.4
-pkgrel=1
+pkgver=3.10.0
+pkgrel=2
 pkgdesc="The GNOME Session Handler"
 arch=(i686 x86_64 'mips64el')
 license=(GPL LGPL)
-depends=(systemd dconf gconf gsettings-desktop-schemas gtk3 gnome-desktop
+depends=(systemd dconf gsettings-desktop-schemas gtk3 gnome-desktop
          hicolor-icon-theme json-glib libgl libsm libxtst upower)
 makedepends=(intltool mesa gtk-doc xtrans)
 options=('!emptydirs')
 install=gnome-session.install
 url="http://www.gnome.org"
 groups=(gnome)
-source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
         timeout.patch)
-sha256sums=('e6ccc71563d9e36d166ebb8a1e9fc962ff31605d5800af411d3b8df494f03ec1'
+sha256sums=('38d90c5d5a33ec8a3002f1e77e201c1554eeb8bbba8923d94fab81b3a8e0696e'
             '9eaf31857b41db417475c3b14adc11b10c8226ed76978cdf96dd648fa6e505fc')
 
-build() {
+prepare() {
   cd $pkgname-$pkgver
 
   # Increase timeout, for slow machines
   patch -Np1 -i ../timeout.patch
-
+}
+build() {
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --libexecdir=/usr/lib/gnome-session \
-      --disable-schemas-compile --enable-systemd
+      --disable-schemas-compile --enable-systemd --disable-gconf
   make
 }
 
diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD
index 644ef9539..c1ca47019 100644
--- a/extra/gnome-settings-daemon/PKGBUILD
+++ b/extra/gnome-settings-daemon/PKGBUILD
@@ -1,28 +1,21 @@
-# $Id: PKGBUILD 192484 2013-08-12 21:17:34Z heftig $
+# $Id: PKGBUILD 196078 2013-10-07 11:51:53Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-settings-daemon
-pkgver=3.8.4
-pkgrel=2
+pkgver=3.10.0
+pkgrel=1
 pkgdesc="The GNOME Settings daemon"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('dconf' 'gnome-desktop' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'libcanberra-pulse' 'libnotify'
-         'libsystemd' 'libwacom' 'pulseaudio' 'pulseaudio-alsa' 'upower' 'ibus' 'librsvg')
+         'libsystemd' 'libwacom' 'pulseaudio' 'pulseaudio-alsa' 'upower' 'ibus' 'librsvg' 'libgweather' 'geocode-glib' 'geoclue2')
 makedepends=('intltool' 'xf86-input-wacom' 'libxslt' 'docbook-xsl')
 options=('!emptydirs' '!libtool')
 install=gnome-settings-daemon.install
 url="http://www.gnome.org"
 groups=('gnome')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        0001-power-Use-logind-to-discover-critical-action-availab.patch)
-sha256sums=('03ad56a8d517faf0754efcf2e7e26257e9ddbe32ef2931f3579138659cc178bc'
-            '9825d3486665d87d4fc54355a6d318d68f5d3caeb286bdd659147920a85c56d9')
-
-prepare() {
-  cd $pkgname-$pkgver
-  patch -Np1 -i ../0001-power-Use-logind-to-discover-critical-action-availab.patch
-}
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('9b9fb21603b28f080de16a96986269f3a6b61bbbcc4dda0272159aa3e4d67005')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD
index 2653f103e..4bc5142a2 100644
--- a/extra/gnome-shell/PKGBUILD
+++ b/extra/gnome-shell/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 191829 2013-07-31 09:01:10Z jgc $
+# $Id: PKGBUILD 196079 2013-10-07 11:51:54Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Flamelab <panosfilip@gmail.com
 
 pkgname=gnome-shell
-pkgver=3.8.4
+pkgver=3.10.0.1
 pkgrel=1
 pkgdesc="The next generation GNOME Shell"
 arch=(i686 x86_64 mips64el)
@@ -11,16 +11,16 @@ url="http://live.gnome.org/GnomeShell"
 license=(GPL2)
 depends=(accountsservice caribou evolution-data-server gcr gjs gnome-bluetooth gnome-menus
          gnome-session gnome-settings-daemon gnome-themes-standard gsettings-desktop-schemas
-         libcanberra-pulse libcroco libgdm libsecret mutter network-manager-applet
+         libcanberra-pulse libcroco libgdm libsecret mutter mutter-wayland network-manager-applet
          telepathy-logger telepathy-mission-control unzip)
 makedepends=(intltool gtk-doc gnome-control-center)
 optdepends=('gnome-control-center: System settings')
 options=('!libtool' '!emptydirs')
 install=gnome-shell.install
 groups=(gnome)
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
         nm-libexecdir.patch)
-sha256sums=('547e571c67b1436a32715b016ee63c666afcafed9c5a2f76dc4ad3bcaebffa47'
+sha256sums=('eb98ca6274e82e446834221b2dfd9af0e12e5ebce651319435524fd6cd5f4ec9'
             'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607')
 
 prepare() {
@@ -28,6 +28,9 @@ prepare() {
 
   # FS#30747 FS#32730 Problems due to libexecdir different from NM
   patch -Np1 -i ../nm-libexecdir.patch
+
+  # Build against mutter-wayland 3.9.92
+  sed -ri 's/^(MUTTER_MIN_VERSION)=.*/\1=3.9.92/' configure
 }
 
 build() {
diff --git a/extra/gnome-system-log/PKGBUILD b/extra/gnome-system-log/PKGBUILD
index 6be59b5f6..ef076f48f 100644
--- a/extra/gnome-system-log/PKGBUILD
+++ b/extra/gnome-system-log/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 183402 2013-04-21 22:10:29Z heftig $
+# $Id: PKGBUILD 196082 2013-10-07 11:51:58Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gnome-system-log
-pkgver=3.8.1
+pkgver=3.9.90
 pkgrel=1
 pkgdesc="View your system logs"
 arch=(i686 x86_64 mips64el)
@@ -13,7 +13,7 @@ makedepends=('intltool' 'itstool' 'docbook-xsl')
 groups=('gnome')
 install=$pkgname.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('2393d00e059212b5a1135589d11412c0639fe9e60958ccff1bac238139dd4967')
+sha256sums=('9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/gnome-system-monitor/PKGBUILD b/extra/gnome-system-monitor/PKGBUILD
index e8417be42..2e2069b64 100644
--- a/extra/gnome-system-monitor/PKGBUILD
+++ b/extra/gnome-system-monitor/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 185539 2013-05-14 20:47:47Z heftig $
+# $Id: PKGBUILD 196083 2013-10-07 11:52:01Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-system-monitor
-pkgver=3.8.2.1
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="A system monitor for GNOME"
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
-depends=('libwnck3' 'libgtop' 'gtkmm3' 'librsvg' 'gnome-icon-theme' 'systemd')
+depends=('libgtop' 'gtkmm3' 'librsvg' 'gnome-icon-theme' 'systemd')
 makedepends=('itstool' 'docbook-xsl' 'intltool')
 options=(!emptydirs)
 url="http://www.gnome.org"
 groups=('gnome')
 install=gnome-system-monitor.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('df4d2c4dbb4f3408b621140732efb3e38853658addd6aae73613027856f6bb44')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('a6bd4e925b21db08e687f7b71a0363777e1dbdda143142232c1c78ecf14821ac')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-terminal/PKGBUILD b/extra/gnome-terminal/PKGBUILD
index 918b23442..2f2567a30 100644
--- a/extra/gnome-terminal/PKGBUILD
+++ b/extra/gnome-terminal/PKGBUILD
@@ -1,26 +1,26 @@
-# $Id: PKGBUILD 189824 2013-07-08 16:53:47Z heftig $
+# $Id: PKGBUILD 196084 2013-10-07 11:52:02Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-terminal
-pkgver=3.8.4
-pkgrel=1
+pkgver=3.10.0
+pkgrel=2
 pkgdesc="The GNOME Terminal Emulator"
 arch=('i686' 'x86_64' 'mips64el')
 license=(GPL)
-depends=(vte3 gsettings-desktop-schemas libsm dconf)
-makedepends=(gnome-doc-utils intltool itstool docbook-xsl desktop-file-utils python2 gconf)
+depends=(vte3 gsettings-desktop-schemas dconf)
+makedepends=(gnome-doc-utils intltool itstool docbook-xsl desktop-file-utils gconf libnautilus-extension)
 optdepends=('gconf: settings migration when upgrading from older version')
 options=('!emptydirs' '!libtool')
 url="http://www.gnome.org"
 groups=('gnome')
 install=gnome-terminal.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('5c1a1db9b4c5eb5780137bed5ed6a05afd82053bd5b2ad41180d4617c56a3f22')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('2f7cc56d39e083eee0419c7d7e9ae43e00dca8bc55bdd31271fb193ec7f63796')
 
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --libexecdir=/usr/lib/$pkgname --disable-static
+    --libexecdir=/usr/lib/$pkgname --disable-static --with-nautilus-extension
   make
 }
 
diff --git a/extra/gnome-tetravex/PKGBUILD b/extra/gnome-tetravex/PKGBUILD
index 28ccd7c14..87ee40378 100644
--- a/extra/gnome-tetravex/PKGBUILD
+++ b/extra/gnome-tetravex/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183405 2013-04-21 22:10:35Z heftig $
+# $Id: PKGBUILD 196085 2013-10-07 11:52:04Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-tetravex
-pkgver=3.8.1
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Complete the puzzle by matching numbered tiles"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,8 +16,8 @@ options=('!emptydirs' '!libtool')
 install=gnome-tetravex.install
 url="https://live.gnome.org/Tetravex"
 groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('30491c1e9005d8f17f6f9655c3a9b553bcaa16e353719ce1de60630a71150ea3')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('12ae001325038cdf4bc5bd1bb8efe1807e560c55d63aa9dd21ac997d2f51dadf')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-themes-standard/PKGBUILD b/extra/gnome-themes-standard/PKGBUILD
index a6c6bac23..f0def4d2a 100644
--- a/extra/gnome-themes-standard/PKGBUILD
+++ b/extra/gnome-themes-standard/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 191600 2013-07-26 23:41:43Z heftig $
+# $Id: PKGBUILD 196086 2013-10-07 11:52:07Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-themes-standard
-pkgver=3.8.3
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Default themes for the GNOME desktop"
 arch=(i686 x86_64 mips64el)
@@ -16,7 +16,7 @@ replaces=(gnome-themes)
 conflicts=(gnome-themes)
 options=('!libtool' '!emptydirs')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('977eb8ac94bad6e7095c272a583e614fba1c1897410e9f25ae028618d269b1e4')
+sha256sums=('812c6cfc534fced921dc327b436e70020d8979529284bb59d72d6f37af1f4b38')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-user-share/PKGBUILD b/extra/gnome-user-share/PKGBUILD
index 756dcd97a..bb4ce9a23 100644
--- a/extra/gnome-user-share/PKGBUILD
+++ b/extra/gnome-user-share/PKGBUILD
@@ -1,26 +1,26 @@
-# $Id: PKGBUILD 190104 2013-07-15 17:59:27Z heftig $
+# $Id: PKGBUILD 196089 2013-10-07 11:52:13Z jgc $
 # Maintainer: Roman Kyrylych <roman@archlinux.org>
 
 pkgname=gnome-user-share
-pkgver=3.8.3
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Easy to use user-level file sharing for GNOME."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ftp.gnome.org/pub/GNOME/sources/gnome-user-share/"
 license=('GPL')
-depends=('mod_dnssd' 'dconf' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'gnome-bluetooth' 'libcanberra' 'dbus-glib')
-makedepends=('intltool' 'libnautilus-extension' 'itstool' 'docbook-xsl')
+depends=('mod_dnssd' 'dconf' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'gnome-bluetooth' 'libcanberra')
+makedepends=('intltool' 'libnautilus-extension' 'itstool' 'docbook-xsl' 'dbus-glib')
 options=('!emptydirs' '!libtool')
 groups=('gnome')
 install=gnome-user-share.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('e6f36eaf66fafad2f6ec959ba2cb143b60ff00eb9a94a65b181411b366f2a26f')
+sha256sums=('2dbeacab637eede5429521d7796abe40c3e9d3d842b9e5aa45453c54db08f500')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/gnome-user-share \
-      --localstatedir=/var
+      --localstatedir=/var --enable-bluetooth
   make
 }
 
diff --git a/extra/gnome-weather/PKGBUILD b/extra/gnome-weather/PKGBUILD
index 227ee4050..1ed6c2a93 100644
--- a/extra/gnome-weather/PKGBUILD
+++ b/extra/gnome-weather/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 185432 2013-05-14 09:43:24Z heftig $
+# $Id: PKGBUILD 196090 2013-10-07 11:52:14Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-weather
-pkgver=3.8.2
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Access current weather conditions and forecasts"
 arch=(i686 x86_64 mips64el)
@@ -13,8 +13,8 @@ makedepends=(intltool gobject-introspection)
 options=(!libtool)
 groups=(gnome-extra)
 install=gnome-weather.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver::3}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('cf61afac1435dbdb87e8d9e4d86bca29cf1ff2c64cefc8db696cd27dad15adf4')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('66d764a19ceebc512711a3b71c849e04021311fa12d617148bbf22c083121b69')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-weather/gnome-weather.install b/extra/gnome-weather/gnome-weather.install
index c25dff2d3..f7e8c46ac 100644
--- a/extra/gnome-weather/gnome-weather.install
+++ b/extra/gnome-weather/gnome-weather.install
@@ -1,11 +1,12 @@
 post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
 }
 
 post_upgrade() {
-    post_install
+  post_install
 }
 
 post_remove() {
-    post_install
+  post_install
 }
diff --git a/extra/gobject-introspection/PKGBUILD b/extra/gobject-introspection/PKGBUILD
index 65e9d14cc..495f939f7 100644
--- a/extra/gobject-introspection/PKGBUILD
+++ b/extra/gobject-introspection/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 183411 2013-04-21 22:10:45Z heftig $
+# $Id: PKGBUILD 196091 2013-10-07 11:52:16Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gobject-introspection
-pkgver=1.36.0
+pkgver=1.38.0
 pkgrel=1
 pkgdesc="Introspection system for GObject-based libraries"
 url="https://live.gnome.org/GObjectIntrospection"
@@ -12,7 +12,7 @@ depends=('glib2' 'python2' 'python2-mako')
 makedepends=('cairo')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('e3e76d9d428e7534761bf8cdf75338865a4b0872e8052bef51792744608b6383')
+sha256sums=('3575e5d353c17a567fdf7ffaaa7aebe9347b5b0eee8e69d612ba56a9def67d73')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/gparted/PKGBUILD b/extra/gparted/PKGBUILD
index 6fb18992c..877de6c6d 100644
--- a/extra/gparted/PKGBUILD
+++ b/extra/gparted/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 186367 2013-05-26 06:28:56Z giovanni $
+# $Id: PKGBUILD 194596 2013-09-19 09:44:46Z 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=5
+pkgver=0.16.2
+pkgrel=1
 pkgdesc="A Partition Magic clone, frontend to GNU Parted"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gparted.sourceforge.net"
@@ -28,7 +28,7 @@ install=gparted.install
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2"
         'org.archlinux.pkexec.gparted.policy'
         'gparted_polkit')
-md5sums=('3f399bff031b5ce14d11a8c346f4b89c'
+md5sums=('4e722a48a90c6d65d212711d45c9c0d1'
          '122ed3120c846376bead22b25f6a3b19'
          '0b68a4e2bc6bc15440730ebe2d7bf9f6')
 
diff --git a/extra/graphviz/PKGBUILD b/extra/graphviz/PKGBUILD
index c70f07471..5125687bf 100644
--- a/extra/graphviz/PKGBUILD
+++ b/extra/graphviz/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 193739 2013-08-29 23:46:03Z bisson $
+# $Id: PKGBUILD 194533 2013-09-17 17:04:18Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: kevin <kevin@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 
 pkgname=graphviz
 pkgver=2.32.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Graph visualization software'
 url='http://www.graphviz.org/'
 license=('CPL')
@@ -53,10 +53,7 @@ build() {
 	export PYTHON=python2
 	export LUA=lua5.1
 
-	# install the graph and cgraph api alongside
-	sed 's/@WITH_CGRAPH_FALSE@//g' -i lib/graph/Makefile.in
-
-	./configure --prefix=/usr
+	./configure --prefix=/usr --with-cgraph=no
 	make || sed '/caml_array_length/d' -i tclpkg/gv/gv_ocaml.cpp # swig goes wonky
 	make
 }
@@ -64,7 +61,4 @@ build() {
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install
-
-	# everything has been built against cgraph, but use graph as default api
-	sed '/#define WITH_CGRAPH 1/d' -i "${pkgdir}"/usr/include/graphviz/types.h
 }
diff --git a/extra/grilo-plugins/PKGBUILD b/extra/grilo-plugins/PKGBUILD
index 178d3ea4e..dd7e4c5ce 100644
--- a/extra/grilo-plugins/PKGBUILD
+++ b/extra/grilo-plugins/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 193611 2013-08-26 07:04:31Z heftig $
+# $Id: PKGBUILD 196093 2013-10-07 11:52:19Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=grilo-plugins
 pkgver=0.2.9
-pkgrel=1
+pkgrel=2
 pkgdesc="Plugins for Grilo"
 url="http://www.gnome.org"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/extra/grilo/PKGBUILD b/extra/grilo/PKGBUILD
index d63d1bde2..f92e34e65 100644
--- a/extra/grilo/PKGBUILD
+++ b/extra/grilo/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 185628 2013-05-16 14:06:42Z heftig $
+# $Id: PKGBUILD 196092 2013-10-07 11:52:18Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=grilo
-pkgver=0.2.6
+pkgver=0.2.7
 pkgrel=1
 pkgdesc="Framework that provides access to various sources of multimedia content"
 url="http://www.gnome.org"
@@ -13,7 +13,7 @@ makedepends=('gobject-introspection' 'gtk-doc' 'vala' 'intltool')
 optdepends=('grilo-plugins: Plugins for grilo')
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('601421279753b26bee0b2b5952689f87f7c7836879f7326151a8f8139fa67036')
+sha256sums=('4a854ee6f9a220f05e696813949be94780c12a7fb281253f10a545f30ed596d8')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gssdp/PKGBUILD b/extra/gssdp/PKGBUILD
index c9fefb682..0ed3e6019 100644
--- a/extra/gssdp/PKGBUILD
+++ b/extra/gssdp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 191762 2013-07-30 09:58:58Z heftig $
+# $Id: PKGBUILD 194952 2013-09-24 10:27:03Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=gssdp
-pkgver=0.14.4
+pkgver=0.14.5
 pkgrel=1
 pkgdesc="A GObject-based API for handling resource discovery and announcement over SSDP"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ makedepends=(gobject-introspection gtk3 gtk-doc vala)
 optdepends=('gtk3: gssdp-device-sniffer')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('ed93fa1555a7032fa1e2b24eeef17d20a2275ee8b1682f28ac48640d6f2112ac')
+sha256sums=('e847940a852c968d18c7ca044783e9b938c84c3b5f53978a29b636bf95c91af1')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gst-libav/PKGBUILD b/extra/gst-libav/PKGBUILD
index 3d87d9da8..5ab50f608 100644
--- a/extra/gst-libav/PKGBUILD
+++ b/extra/gst-libav/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193754 2013-08-30 08:16:24Z heftig $
+# $Id: PKGBUILD 196095 2013-10-07 11:52:22Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gst-libav
-pkgver=1.0.10
+pkgver=1.2.0
 pkgrel=1
 pkgdesc="Gstreamer libav Plugin"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,14 +13,19 @@ makedepends=('yasm')
 options=(!libtool !emptydirs)
 provides=("gst-ffmpeg=$pkgver-$pkgrel")
 source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('b6d059d1a39967ef7e1d345009fe003afe14ab55006d68e895a64f4a36968c5e')
+sha256sums=('48721eb318ffffdd134edea754d0b65d76b08c8209a8d2c8a42bca1f799f9099')
 
 build() {
   cd $pkgname-$pkgver
+
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --disable-static --with-libav-extra-configure="--enable-runtime-cpudetect" \
-    --with-package-name="GStreamer libav Plugin (Archlinux)" \
+    --with-package-name="GStreamer libav Plugin (Arch Linux)" \
     --with-package-origin="http://www.archlinux.org/"
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
   make
 }
 
diff --git a/extra/gst-plugins-base/PKGBUILD b/extra/gst-plugins-base/PKGBUILD
index f7b3dfcb5..f8d375037 100644
--- a/extra/gst-plugins-base/PKGBUILD
+++ b/extra/gst-plugins-base/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 193750 2013-08-30 08:12:17Z heftig $
+# $Id: PKGBUILD 196097 2013-10-07 11:52:25Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gst-plugins-base
 pkgname=('gst-plugins-base-libs' 'gst-plugins-base')
-pkgver=1.0.10
+pkgver=1.2.0
 pkgrel=1
 pkgdesc="GStreamer Multimedia Framework Base Plugins"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,19 +12,21 @@ makedepends=('pkgconfig' 'gstreamer' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libv
 options=(!libtool !emptydirs)
 url="http://gstreamer.freedesktop.org/"
 source=(${url}/src/$pkgbase/$pkgbase-${pkgver}.tar.xz)
-sha256sums=('9754e83b2a3ff61266112915bfc84c895c4d145519ad9a3381edceb216bc97e8')
+sha256sums=('8656e20bf4b675e5696fb4af193793351926d428ca02826c5667a6384729a45d')
 
 build() {
   cd $pkgbase-$pkgver
-  sed -i -e '/AC_PATH_XTRA/d' configure.ac
-  aclocal -I m4 -I common/m4
-  autoconf
-  automake --add-missing
+
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --disable-static --enable-experimental \
-    --with-package-name="GStreamer Base Plugins (Archlinux)" \
+    --with-package-name="GStreamer Base Plugins (Arch Linux)" \
     --with-package-origin="http://www.archlinux.org/"
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
   make
+
   sed -e 's/^SUBDIRS_EXT =.*/SUBDIRS_EXT =/' -i Makefile
 }
 
diff --git a/extra/gst-plugins-good/PKGBUILD b/extra/gst-plugins-good/PKGBUILD
index 057b077a6..e718e77b8 100644
--- a/extra/gst-plugins-good/PKGBUILD
+++ b/extra/gst-plugins-good/PKGBUILD
@@ -1,36 +1,38 @@
-# $Id: PKGBUILD 193751 2013-08-30 08:13:17Z heftig $
+# $Id: PKGBUILD 196098 2013-10-07 11:52:26Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gst-plugins-good
-pkgver=1.0.10
+pkgver=1.2.0
 pkgrel=1
 pkgdesc="GStreamer Multimedia Framework Good Plugins"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="http://gstreamer.freedesktop.org/"
 depends=('libpulse' 'jack' 'libsoup' 'gst-plugins-base-libs' 'wavpack' 'aalib' 'taglib' 'libdv' 'libshout' 'libvpx' 'gdk-pixbuf2' 'libcaca' 'libavc1394' 'libiec61883' 'libxdamage' 'v4l-utils' 'cairo')
-makedepends=('gstreamer' 'speex' 'flac' 'libraw1394')
+makedepends=('gstreamer' 'speex' 'flac' 'libraw1394' 'python')
 options=(!libtool !emptydirs)
 source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('c60342d6080ac6f794c5c2427dfbdee9140a2f67b82e7e945e286a2d416428ae')
+sha256sums=('2256a6b2744ea18d8810642cf9061a2f12f4b7eba87d3fbc98004262b4f0fdfa')
 
 build() {
   cd $pkgname-$pkgver
-  sed -i -e '/AC_PATH_XTRA/d' configure.ac
-  aclocal -I m4 -I common/m4
-  autoconf
-  automake --add-missing
+
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --disable-static --enable-experimental \
-    --with-package-name="GStreamer Good Plugins (Archlinux)" \
+    --with-package-name="GStreamer Good Plugins (Arch Linux)" \
     --with-package-origin="http://www.archlinux.org/"
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
   make
 }
 
-check() {
-  cd $pkgname-$pkgver
-  make check
-}
+# Disable for now: fails with soup timeout
+#check() {
+#  cd $pkgname-$pkgver
+#  make check
+#}
 
 package() {
   cd $pkgname-$pkgver
diff --git a/extra/gst-plugins-ugly/PKGBUILD b/extra/gst-plugins-ugly/PKGBUILD
index f7709298a..30d834adb 100644
--- a/extra/gst-plugins-ugly/PKGBUILD
+++ b/extra/gst-plugins-ugly/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193753 2013-08-30 08:14:48Z heftig $
+# $Id: PKGBUILD 196099 2013-10-07 11:52:28Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gst-plugins-ugly
-pkgver=1.0.10
+pkgver=1.2.0
 pkgrel=1
 pkgdesc="GStreamer Multimedia Framework Ugly Plugins"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,18 +11,19 @@ url="http://gstreamer.freedesktop.org/"
 depends=('gst-plugins-base-libs' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr')
 options=(!libtool !emptydirs)
 source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('bed3510e09f036e7609e8d291535c395d25109b1180324b16859f475eac3a3c0')
+sha256sums=('e4760af4b12bf97ba0a8001cfe733d9d52160a0ad81f6c6f0d0d3a9e798626de')
 
 build() {
   cd $pkgname-$pkgver
-  sed -i '/AC_PATH_XTRA/d' configure.ac
-  aclocal -I m4 -I common/m4
-  autoconf
-  automake --add-missing
+
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --disable-static --enable-experimental \
-    --with-package-name="GStreamer Ugly Plugins (Archlinux)" \
+    --with-package-name="GStreamer Ugly Plugins (Arch Linux)" \
     --with-package-origin="http://www.archlinux.org/"
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
   make
 }
 
diff --git a/extra/gstreamer/PKGBUILD b/extra/gstreamer/PKGBUILD
index b210533f2..e8da8a074 100644
--- a/extra/gstreamer/PKGBUILD
+++ b/extra/gstreamer/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193749 2013-08-30 08:11:09Z heftig $
+# $Id: PKGBUILD 196100 2013-10-07 11:52:29Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gstreamer
-pkgver=1.0.10
+pkgver=1.2.0
 pkgrel=1
 pkgdesc="GStreamer Multimedia Framework"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ optdepends=('sh: feedback script')
 makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection')
 options=('!libtool')
 source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.xz)
-sha256sums=('8e0aa9f41370586171a2616326fbc508bc4b61ffc4d55b2a8c4c3459d0cc1130')
+sha256sums=('94af5274299f845adf41cc504e0209b269acab7721293f49850fea27b4099463')
 
 build() {
   cd "${srcdir}/gstreamer-${pkgver}"
@@ -21,6 +21,10 @@ build() {
     --with-package-name="GStreamer (Parabola)" \
     --with-package-origin="https://parabolagnulinux.org/" \
     --enable-gtk-doc --disable-static
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
   make
 }
 
diff --git a/extra/gthumb/PKGBUILD b/extra/gthumb/PKGBUILD
index c812675b9..57200067e 100644
--- a/extra/gthumb/PKGBUILD
+++ b/extra/gthumb/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 189883 2013-07-10 14:53:39Z heftig $
+# $Id: PKGBUILD 196101 2013-10-07 11:52:31Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=gthumb
 pkgver=3.2.3
-pkgrel=1
+pkgrel=4
 pkgdesc="Image browser and viewer for the GNOME Desktop"
 arch=(i686 x86_64 mips64el)
 license=(GPL)
 url="http://live.gnome.org/gthumb"
 depends=(desktop-file-utils hicolor-icon-theme dconf librsvg clutter-gtk
          gst-plugins-base-libs gsettings-desktop-schemas libwebp libsecret
-         libsoup webkitgtk3 json-glib)
+         libsoup webkitgtk json-glib)
 makedepends=(intltool libchamplain libopenraw exiv2 itstool brasero librsvg libopenraw liboauth docbook-xsl)
 optdepends=('libopenraw: read RAW files'
             'exiv2: metadata support'
@@ -21,8 +21,15 @@ optdepends=('libopenraw: read RAW files'
             'liboauth: web albums')
 options=('!libtool' '!emptydirs')
 install=gthumb.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('9f596b6e59b70bbdf177930f6b2cbc6aabdfc1a281db527e3515946c5ca4e70a')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+        gtk310.patch)
+sha256sums=('9f596b6e59b70bbdf177930f6b2cbc6aabdfc1a281db527e3515946c5ca4e70a'
+            'dcbfad2eb7047c1ea4210dc0af1054dc2ec863331f12fcd59c05021570d38bfe')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../gtk310.patch
+}
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gthumb/gtk310.patch b/extra/gthumb/gtk310.patch
new file mode 100644
index 000000000..86f0e99e8
--- /dev/null
+++ b/extra/gthumb/gtk310.patch
@@ -0,0 +1,29 @@
+From 36ba0c99c1780ca9f23f220ced70a76b97ce8260 Mon Sep 17 00:00:00 2001
+From: Paolo Bacchilega <paobac@src.gnome.org>
+Date: Fri, 27 Sep 2013 15:40:33 +0000
+Subject: Fixed broken window layout with gtk+ 3.10
+
+[bug #708800]
+---
+diff --git a/gthumb/gth-window.c b/gthumb/gth-window.c
+index a2960bc..a2cce99 100644
+--- a/gthumb/gth-window.c
++++ b/gthumb/gth-window.c
+@@ -324,6 +324,7 @@ gth_window_attach (GthWindow     *window,
+ 		return;
+ 	}
+ 
++	gtk_widget_set_vexpand (child, FALSE);
+ 	gtk_grid_attach (GTK_GRID (window->priv->grid),
+ 			  child,
+ 			  0, position,
+@@ -362,6 +363,7 @@ gth_window_attach_content (GthWindow *window,
+ 
+ 	_gtk_container_remove_children (GTK_CONTAINER (window->priv->contents[page]), NULL, NULL);
+ 	gtk_widget_set_hexpand (child, TRUE);
++	gtk_widget_set_vexpand (child, TRUE);
+ 	gtk_container_add (GTK_CONTAINER (window->priv->contents[page]), child);
+ }
+ 
+--
+cgit v0.9.2
diff --git a/extra/gtk-sharp-2/PKGBUILD b/extra/gtk-sharp-2/PKGBUILD
index 7adbebf17..d1827c87c 100644
--- a/extra/gtk-sharp-2/PKGBUILD
+++ b/extra/gtk-sharp-2/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 142257 2011-11-07 12:49:15Z jgc $
+# $Id: PKGBUILD 196159 2013-10-07 12:30:37Z jgc $
 # Maintainer: tobias <tobias@archlinux.org>
 
 pkgname=gtk-sharp-2
-pkgver=2.12.11
+pkgver=2.12.22
 pkgrel=1
 pkgdesc="gtk2 bindings for C#"
 arch=(i686 x86_64)
@@ -12,20 +12,19 @@ depends=('mono' 'libglade' 'gtk2')
 makedepends=('pkgconfig' 'monodoc')
 conflicts=('gtk#')
 options=('!libtool' '!makeflags')
-source=(http://download.mono-project.com/sources/gtk-sharp212/gtk-sharp-${pkgver}.tar.bz2)
-md5sums=('c278da6a472c6c13b698af012f543c64')
+source=(https://github.com/mono/gtk-sharp/archive/${pkgver}.tar.gz)
+md5sums=('0cdaef41857e29c23942a148c83122ac')
 
 build() {
- # get rid of that .wapi errors; thanks to brice
   export MONO_SHARED_DIR="${srcdir}/wapi"
   mkdir -p "${MONO_SHARED_DIR}"
 
-  cd "${srcdir}/gtk-sharp-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-static
+  cd gtk-sharp-${pkgver}
+  ./bootstrap-2.12 --prefix=/usr --sysconfdir=/etc --disable-static
   make
 }
 
 package() {
-  cd "${srcdir}/gtk-sharp-${pkgver}"
+  cd gtk-sharp-${pkgver}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD
index 1be842221..bc6004fc4 100644
--- a/extra/gtk2/PKGBUILD
+++ b/extra/gtk2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 189695 2013-07-04 21:16:18Z heftig $
+# $Id: PKGBUILD 196102 2013-10-07 11:52:32Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gtk2
 pkgname=('gtk2' 'gtk-update-icon-cache')
-pkgver=2.24.20
-pkgrel=1
+pkgver=2.24.21
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gtk.org/"
 makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage'
@@ -12,13 +12,20 @@ makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxc
 options=('!libtool')
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz
-        xid-collision-debug.patch)
-sha256sums=('cc66bcbf9239a7d9861175c681ba95894b55c70dc0b37aad8345c46ecfda0da3'
-            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
+        gtkrc xid-collision-debug.patch gtkrc-fix.patch)
+sha256sums=('302e9216dd19ec4b5b9e2f77275e23758253f7e86b06287284d8e794ef38dce3'
+            'b77a427df55a14182c10ad7e683b4d662df2846fcd38df2aa8918159d6be3ae2'
+            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558'
+            '4038c0f1ef4cc052e469858abe32eaa8afc8d4f540760f18ad132986e396604d')
 
-build() {
+prepare() {
     cd gtk+-$pkgver
     patch -Np1 -i ../xid-collision-debug.patch
+    patch -Np1 -i ../gtkrc-fix.patch
+}
+
+build() {
+    cd gtk+-$pkgver
 
     CXX=/bin/false ./configure --prefix=/usr \
         --sysconfdir=/etc \
@@ -34,23 +41,27 @@ build() {
 package_gtk2() {
     pkgdesc="GTK+ is a multi-platform toolkit (v2)"
     install=gtk2.install
-    depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'shared-mime-info' 'cairo' 'libcups' 'gtk-update-icon-cache')
-    backup=(etc/gtk-2.0/gtkrc)
+    depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 
+             'shared-mime-info' 'cairo' 'libcups' 'gtk-update-icon-cache')
+    optdepends=('gnome-themes-standard: Default widget theme'
+                'gnome-icon-theme: Default icon theme')
     replaces=('gtk2-docs')
 
     cd gtk+-$pkgver
-
     make DESTDIR="$pkgdir" install
+
     sed -i "s#env python#env python2#" $pkgdir/usr/bin/gtk-builder-convert
-    echo 'gtk-fallback-icon-theme = "gnome"' > "$pkgdir/etc/gtk-2.0/gtkrc"
+
+    install -Dm644 "$srcdir/gtkrc" "$pkgdir/usr/share/gtk-2.0/gtkrc"
+
     #split this out to use with gtk3 too
     rm $pkgdir/usr/bin/gtk-update-icon-cache
 }
 package_gtk-update-icon-cache() {
     pkgdesc="The GTK+ update icon cache tool"
-    depends=('gdk-pixbuf2>=2.24.1-3')
+    depends=('gdk-pixbuf2>=2.24.1-3' 'hicolor-icon-theme')
+    install=gtk-update-icon-cache.install
 
     cd gtk+-$pkgver/gtk
-
-    install -D -m755 gtk-update-icon-cache $pkgdir/usr/bin/gtk-update-icon-cache
+    install -D -m755 gtk-update-icon-cache "$pkgdir/usr/bin/gtk-update-icon-cache"
 }
diff --git a/extra/gtk2/gtk-update-icon-cache.install b/extra/gtk2/gtk-update-icon-cache.install
new file mode 100644
index 000000000..1afcc72a7
--- /dev/null
+++ b/extra/gtk2/gtk-update-icon-cache.install
@@ -0,0 +1,3 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
diff --git a/extra/gtk2/gtkrc b/extra/gtk2/gtkrc
new file mode 100644
index 000000000..d2282ac36
--- /dev/null
+++ b/extra/gtk2/gtkrc
@@ -0,0 +1,3 @@
+gtk-icon-theme-name = "gnome"
+gtk-theme-name = "Adwaita"
+gtk-font-name = "Cantarell 11"
diff --git a/extra/gtk2/gtkrc-fix.patch b/extra/gtk2/gtkrc-fix.patch
new file mode 100644
index 000000000..09e350e98
--- /dev/null
+++ b/extra/gtk2/gtkrc-fix.patch
@@ -0,0 +1,22 @@
+From 1b8d3b9210c1d2201bb01a748d748f5d17e9eb4f Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Mon, 30 Sep 2013 16:50:34 +0000
+Subject: Actually look in /usr/share/gtk-2.0 for default rc files
+
+I managed to forget the 'share' component of the path.
+---
+diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
+index b1f68e2..50b2563 100644
+--- a/gtk/gtkrc.c
++++ b/gtk/gtkrc.c
+@@ -525,7 +525,7 @@ gtk_rc_add_initial_default_files (void)
+       const gchar * const *config_dirs;
+       const gchar *config_dir;
+ 
+-      str = g_build_filename (GTK_DATA_PREFIX, "gtk-2.0", "gtkrc", NULL);
++      str = g_build_filename (GTK_DATA_PREFIX, "share", "gtk-2.0", "gtkrc", NULL);
+       gtk_rc_add_default_file (str);
+       g_free (str);
+ 
+--
+cgit v0.9.2
diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD
index 202045ba9..bf8444926 100644
--- a/extra/gtk3/PKGBUILD
+++ b/extra/gtk3/PKGBUILD
@@ -1,22 +1,24 @@
-# $Id: PKGBUILD 193768 2013-08-30 14:56:03Z heftig $
+# $Id: PKGBUILD 196103 2013-10-07 11:52:34Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtk3
-pkgver=3.8.4
-pkgrel=1
+pkgver=3.10.0
+pkgrel=2
 pkgdesc="GObject-based multi-platform GUI toolkit (v3)"
 arch=(i686 x86_64 mips64el)
 url="http://www.gtk.org/"
 install=gtk3.install
-depends=(atk cairo gtk-update-icon-cache libcups libxcursor libxinerama libxrandr libxi libxcomposite libxdamage pango shared-mime-info colord at-spi2-atk wayland libxkbcommon)
+depends=(atk cairo gtk-update-icon-cache libcups libxcursor libxinerama libxrandr libxi
+         libxcomposite libxdamage pango shared-mime-info colord at-spi2-atk wayland libxkbcommon)
 makedepends=(gobject-introspection)
+optdepends=('gnome-themes-standard: Default widget theme'
+            'gnome-icon-theme: Default icon theme')
 options=('!libtool')
-backup=(etc/gtk-3.0/settings.ini)
 license=(LGPL)
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz
         settings.ini)
-sha256sums=('b08360167702299e91b3435a4ce6bae41dd26d2794e898632f12dd091b0692e2'
-            'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621')
+sha256sums=('6559feb360cd935d341cd7a0b69a72f8f4346ed6ee9b7c4040c02b73b75c53fe'
+            '14369dfd1d325c393e17c105d5d5cc5501663277bd4047ea04a50abb3cfbd119')
 
 build() {
     cd "gtk+-$pkgver"
@@ -39,6 +41,5 @@ build() {
 package() {
     cd "gtk+-$pkgver"
     make DESTDIR="$pkgdir" install
-
-    install -Dm644 "$srcdir/settings.ini" "$pkgdir/etc/gtk-3.0/settings.ini"
+    install -Dm644 ../settings.ini "$pkgdir/usr/share/gtk-3.0/settings.ini"
 }
diff --git a/extra/gtk3/settings.ini b/extra/gtk3/settings.ini
index 039000d38..6a0643bfa 100644
--- a/extra/gtk3/settings.ini
+++ b/extra/gtk3/settings.ini
@@ -1,2 +1,4 @@
 [Settings]
-gtk-fallback-icon-theme = gnome
+gtk-icon-theme-name = gnome
+gtk-theme-name = Adwaita
+gtk-font-name = Cantarell 11
diff --git a/extra/gtkmm3/PKGBUILD b/extra/gtkmm3/PKGBUILD
index f48187816..6b7105aa7 100644
--- a/extra/gtkmm3/PKGBUILD
+++ b/extra/gtkmm3/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 184170 2013-05-03 03:05:29Z heftig $
+# $Id: PKGBUILD 196104 2013-10-07 11:52:35Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=gtkmm3
 _pkgbasename=gtkmm
 pkgname=('gtkmm3' 'gtkmm3-docs')
-pkgver=3.8.1
+pkgver=3.9.16
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 makedepends=('gtk3' 'pangomm' 'atkmm' 'glibmm-docs' 'mm-common' 'doxygen' 'libxslt')
@@ -12,7 +12,7 @@ license=('LGPL')
 options=('!libtool' '!emptydirs')
 url="http://www.gtkmm.org/"
 source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz)
-sha256sums=('d374c6d6d78fd9f61bca737cd7c23452de427a1662de8abf46df784e07e4c95b')
+sha256sums=('3a07679530c0c58ddaf3b2bdc7859d8f7050a1057ae99e2d3857004e36e7c879')
 
 build() {
   cd "$_pkgbasename-$pkgver"
diff --git a/extra/gtksourceview3/PKGBUILD b/extra/gtksourceview3/PKGBUILD
index 55015e684..30ca82b3e 100644
--- a/extra/gtksourceview3/PKGBUILD
+++ b/extra/gtksourceview3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 189822 2013-07-08 16:51:30Z heftig $
+# $Id: PKGBUILD 196105 2013-10-07 11:52:37Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtksourceview3
 _pkgbasename=gtksourceview
-pkgver=3.8.2
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="A text widget adding syntax highlighting and more to GNOME"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ makedepends=('intltool' 'gobject-introspection' 'glade')
 options=('!libtool')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz)
-sha256sums=('1c2a01f1e04e3c8c9f09ff22f34f73f17b0e4e7ff0d83b2996c209bd02a6501b')
+sha256sums=('5208afa6edccf4d70a30ed1da399cefcceb8a8b879305d491be4be3e3d6ef776')
 
 build() {
   cd "$_pkgbasename-$pkgver"
diff --git a/extra/gucharmap/PKGBUILD b/extra/gucharmap/PKGBUILD
index 303096b43..167566090 100644
--- a/extra/gucharmap/PKGBUILD
+++ b/extra/gucharmap/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 191287 2013-07-23 10:08:45Z jgc $
+# $Id: PKGBUILD 196106 2013-10-07 11:52:39Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan De Groot <jgc@archlinux.org>
 
 pkgname=gucharmap
-pkgver=3.8.2
-pkgrel=2
+pkgver=3.9.99
+pkgrel=1
 pkgdesc="Gnome Unicode Charmap"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -14,8 +14,8 @@ makedepends=('gtk-doc' 'intltool' 'gobject-introspection' 'itstool' 'docbook-xsl
 options=('!libtool' '!emptydirs')
 groups=('gnome')
 install=gucharmap.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('08272386155bc1a7d6a2d1a0ee8d2e5ea08a9512c40dbd76b3b4c3f105604901')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('7a9425f07f8e4053e0382e627d65ca428674f8c63f2c721877ae8c62c25ccb00')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gupnp/PKGBUILD b/extra/gupnp/PKGBUILD
index 266815bf9..4820db26a 100644
--- a/extra/gupnp/PKGBUILD
+++ b/extra/gupnp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 193457 2013-08-20 18:30:50Z heftig $
+# $Id: PKGBUILD 194953 2013-09-24 10:27:41Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=gupnp
-pkgver=0.20.5
+pkgver=0.20.6
 pkgrel=1
 pkgdesc="An object-oriented UPNP framework"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ makedepends=(gobject-introspection gtk-doc vala)
 optdepends=('python2: gupnp-binding-tool')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('be54bd5f3bfea36d689a5ce70679e51ec3ea3c94677e70ffc7c7ef160bffb260')
+sha256sums=('1b4ed7de9fdf2da2a5610a0101271f1661706e6481737d7a2ac0f318b5b2dbaa')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD
index 6c06f1cb0..531903e0c 100644
--- a/extra/gvfs/PKGBUILD
+++ b/extra/gvfs/PKGBUILD
@@ -1,24 +1,17 @@
-# $Id: PKGBUILD 189282 2013-07-02 08:23:35Z jgc $
+# $Id: PKGBUILD 196107 2013-10-07 11:52:42Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gvfs
-pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp' 'gvfs-goa' 'gvfs-mtp')
-pkgver=1.16.3
-pkgrel=2
+pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-goa' 'gvfs-mtp')
+pkgver=1.18.2
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
-makedepends=('avahi' 'bluez-libs' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio-paranoia' 'libgphoto2' 'libimobiledevice' 'libsoup>=2.24.0' 'smbclient' 'udisks2' 'libsecret' 'docbook-xsl' 'gtk3' 'libmtp' 'gnome-online-accounts' 'libbluray')
+makedepends=('avahi' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio-paranoia' 'libgphoto2' 'libimobiledevice' 'libsoup' 'smbclient' 'udisks2' 'libsecret' 'docbook-xsl' 'gtk3' 'libmtp' 'gnome-online-accounts' 'libbluray')
 url="http://www.gnome.org"
 options=(!libtool)
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz
-        imobiledevice-1.1.5.patch)
-sha256sums=('02a4483d0dd2e307f58f8e1d34dd29dbe06d3a345b73ac8d6f87bb91189c8e49'
-            '3faf3027ef40c5cea3f01cb9d37e4cf848ed2ecfe6cde3b7bf86087da4a2d2e1')
-
-prepare() {
-  cd $pkgbase-$pkgver
-  patch -Np1 -i ../imobiledevice-1.1.5.patch
-}
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
+sha256sums=('a24ce342a3369f7ec34f19deadc5da46bf51070d39d8733f0848d9ba4bb55da7')
 
 build() {
   cd "$pkgbase-$pkgver"
@@ -26,17 +19,18 @@ build() {
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --libexecdir=/usr/lib/gvfs \
-      --with-bash-completion-dir=/usr/share/bash-completion/completions
+      --with-bash-completion-dir=/usr/share/bash-completion/completions \
+      --disable-obexftp
   make
 }
 
 package_gvfs() {
   pkgdesc="Userspace virtual filesystem implemented as a pluggable module for gio"
-  depends=('avahi' 'dconf' 'fuse' 'libarchive' 'libcdio-paranoia' 'libsoup>=2.24.0' 'udisks2' 'libsecret' 'libbluray')
+  depends=('avahi' 'dconf' 'fuse' 'libarchive' 'libcdio-paranoia' 'libsoup' 'udisks2' 'libsecret' 'libbluray')
+  replaces=('gvfs-obexftp')
   optdepends=('gvfs-afc: AFC (mobile devices) support'
               'gvfs-smb: SMB/CIFS (Windows client) support'
               'gvfs-gphoto2: gphoto2 (PTP camera/MTP media player) support'
-              'gvfs-obexftp: ObexFTP (bluetooth) support'
               'gvfs-afp: Apple Filing Protocol (AFP) support'
               'gvfs-mtp: MTP device support'
               'gvfs-goa: gnome-online-accounts support'
@@ -52,8 +46,8 @@ package_gvfs() {
   make DESTDIR="$pkgdir" install
 
   cd "$pkgdir"
-  rm usr/lib/gvfs/gvfsd-{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp,mtp}
-  rm usr/share/gvfs/mounts/{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp,mtp}.mount
+  rm usr/lib/gvfs/gvfsd-{smb,smb-browse,afc,afp,afp-browse,gphoto2,mtp}
+  rm usr/share/gvfs/mounts/{smb,smb-browse,afc,afp,afp-browse,gphoto2,mtp}.mount
   rm usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml
   rm usr/share/GConf/gsettings/gvfs-smb.convert
 }
@@ -102,16 +96,6 @@ package_gvfs-gphoto2() {
   make DESTDIR="$pkgdir" install
 }
 
-package_gvfs-obexftp() {
-  pkgdesc="ObexFTP (bluetooth) backend for gvfs"
-  depends=("gvfs=$pkgver" 'dbus-glib' 'bluez4' 'obex-data-server')
-  install=gvfs-module.install
-
-  cd "$pkgbase-$pkgver/daemon"
-  install -D .libs/gvfsd-obexftp "$pkgdir/usr/lib/gvfs/gvfsd-obexftp"
-  install -Dm644 obexftp.mount "$pkgdir/usr/share/gvfs/mounts/obexftp.mount"
-}
-
 package_gvfs-afp() {
   pkgdesc="Apple Filing Protocol (AFP) backend for gvfs"
   depends=("gvfs=$pkgver")
diff --git a/extra/iagno/PKGBUILD b/extra/iagno/PKGBUILD
index a75082082..e3a1312c3 100644
--- a/extra/iagno/PKGBUILD
+++ b/extra/iagno/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 193512 2013-08-21 14:33:53Z jgc $
+# $Id: PKGBUILD 196108 2013-10-07 11:52:44Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=iagno
-pkgver=3.8.2
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Dominate the board in a classic version of Reversi"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,8 +16,8 @@ options=('!emptydirs' '!libtool')
 install=iagno.install
 url="https://live.gnome.org/Iagno"
 groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('c4687214262c9fd838e40ea27fac8ed7c23db32690ef2d0f569373a8eaeb1de7')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('23a041b54fd4df817c8d507e87d19495ddfc8a23bfe812a3e7d500f32f8a49d0')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/ibus/PKGBUILD b/extra/ibus/PKGBUILD
index 7c9eade1d..7e0926f22 100644
--- a/extra/ibus/PKGBUILD
+++ b/extra/ibus/PKGBUILD
@@ -1,22 +1,19 @@
-# $Id: PKGBUILD 191614 2013-07-27 18:39:53Z eric $
-# Contributor: Rainy <rainylau(at)gmail(dot)com>
-# Contributor: Lee.MaRS <leemars at gmail dot com>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Maintainer: Brad Fanella <bradfanella@archlinux.us>
+# $Id: PKGBUILD 194672 2013-09-21 02:17:57Z eric $
+# Maintainer:
 
 pkgname=ibus
-pkgver=1.5.3
+pkgver=1.5.4
 pkgrel=1
 pkgdesc="Next Generation Input Bus for Linux"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ibus.googlecode.com"
 license=('LGPL')
 depends=('hicolor-icon-theme' 'gtk2' 'gtk3' 'python2-gobject' 'libnotify')
-makedepends=('gobject-introspection' 'vala' 'dconf' 'iso-codes' 'intltool')
+makedepends=('gobject-introspection' 'vala' 'dconf' 'gconf' 'iso-codes' 'intltool')
 options=('!libtool')
 install=ibus.install
 source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('51ba186cbf5e1e194ba0cd22b81f00d9d40ec521')
+sha1sums=('2ce4b4d728a4685fd77360d0097b0e568f920c7b')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/ibus/ibus.install b/extra/ibus/ibus.install
index 0b5ce0196..4bc5288cf 100644
--- a/extra/ibus/ibus.install
+++ b/extra/ibus/ibus.install
@@ -1,17 +1,16 @@
 post_install() {
-    gtk-query-immodules-2.0 --update-cache
-    gtk-query-immodules-3.0 --update-cache
+  gtk-query-immodules-2.0 --update-cache
+  gtk-query-immodules-3.0 --update-cache
 
-    gtk-update-icon-cache -fq -t usr/share/icons/hicolor
+  gtk-update-icon-cache -fq -t /usr/share/icons/hicolor
 
-    glib-compile-schemas /usr/share/glib-2.0/schemas
+  glib-compile-schemas /usr/share/glib-2.0/schemas
 }
 
-post_remove() {
-    gtk-query-immodules-2.0 --update-cache
-    gtk-query-immodules-3.0 --update-cache
-
-    gtk-update-icon-cache -fq -t usr/share/icons/hicolor
+post_upgrade() {
+  post_install
+}
 
-    glib-compile-schemas /usr/share/glib-2.0/schemas
+post_remove() {
+  post_install
 }
diff --git a/extra/icedtea-web-java7/PKGBUILD b/extra/icedtea-web-java7/PKGBUILD
index a28b75be1..bd5110482 100644
--- a/extra/icedtea-web-java7/PKGBUILD
+++ b/extra/icedtea-web-java7/PKGBUILD
@@ -3,17 +3,15 @@
 
 pkgbase=icedtea-web-java7
 pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc')
-pkgver=1.4
-pkgrel=2
+pkgver=1.4.1
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://icedtea.classpath.org/wiki/IcedTea-Web"
 license=('GPL2')
 makedepends=('jdk7-openjdk' 'zip' 'libxtst' 'npapi-sdk' 'rhino' 'junit' 'firefox' 'chromium' 'epiphany')
 noextract=${pkgbase/-java7/}-$pkgver.tar.gz # due to broken path names in the tarball that fails with LANG=C in our chroot
-source=(http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz
-        openjdk-hotfix.patch)
-sha256sums=('e53a41fa132e086fa8d17cadf1e7e38cb3ab99577277949fbcae4ab8705245fb'
-            '1bf96e430d0694c53539e4e7a8c979c65a2ab5274d8ae38067b0fd7dd5bfba03')
+source=(http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz)
+sha256sums=('09100207396a09784e04f2ad40d65212930c1d43839e7fa63b9dffaf8567d77b')
 
 _javaver=7
 _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
@@ -24,7 +22,6 @@ build() {
   LANG=en_US.UTF-8 bsdtar -x -f ${srcdir}/${pkgbase/-java7/}-$pkgver.tar.gz
 
   cd "${srcdir}"/icedtea-web*
-  patch -Np1 < $srcdir/openjdk-hotfix.patch
   ./configure --prefix=${_jvmdir} \
       --datarootdir=/usr/share \
       --with-jdk-home=${_jvmdir} \
diff --git a/extra/icedtea-web-java7/openjdk-hotfix.patch b/extra/icedtea-web-java7/openjdk-hotfix.patch
deleted file mode 100644
index 29a0a309b..000000000
--- a/extra/icedtea-web-java7/openjdk-hotfix.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -r 1a327a09262e netx/net/sourceforge/jnlp/runtime/Boot.java
---- a/netx/net/sourceforge/jnlp/runtime/Boot.java   Mon Jun 10 13:22:53 2013 +0200
-+++ b/netx/net/sourceforge/jnlp/runtime/Boot.java   Wed Jun 19 10:32:32 2013 +0200
-@@ -35,6 +35,8 @@
- import net.sourceforge.jnlp.cache.UpdatePolicy;
- import net.sourceforge.jnlp.security.viewer.CertificateViewer;
- import net.sourceforge.jnlp.services.ServiceUtil;
-+import sun.awt.AppContext;
-+import sun.awt.SunToolkit;
- 
- /**
-  * This is the main entry point for the JNLP client.  The main
-@@ -113,6 +115,9 @@
-      * Launch the JNLP file specified by the command-line arguments.
-      */
-     public static void main(String[] argsIn) {
-+        if (AppContext.getAppContext() == null) {
-+            SunToolkit.createNewAppContext();
-+        }
-         args = argsIn;
- 
-         if (null != getOption("-viewer")) {
-diff -r 1a327a09262e netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java
---- a/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java    Mon Jun 10 13:22:53 2013 +0200
-+++ b/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java    Wed Jun 19 10:32:32 2013 +0200
-@@ -234,7 +234,7 @@
-         try {
-             UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-         } catch (Exception e) {
--            // ignore it
-+            e.printStackTrace();
-         }
- 
-         doMainAppContextHacks();
-diff -r 1a327a09262e plugin/icedteanp/java/sun/applet/PluginMain.java
---- a/plugin/icedteanp/java/sun/applet/PluginMain.java  Mon Jun 10 13:22:53 2013 +0200
-+++ b/plugin/icedteanp/java/sun/applet/PluginMain.java  Wed Jun 19 10:32:32 2013 +0200
-@@ -72,6 +72,8 @@
- import java.net.ProxySelector;
- import java.util.Enumeration;
- import java.util.Properties;
-+import sun.awt.AppContext;
-+import sun.awt.SunToolkit;
- 
- import net.sourceforge.jnlp.config.DeploymentConfiguration;
- import net.sourceforge.jnlp.runtime.JNLPRuntime;
-@@ -94,6 +96,9 @@
-      */
-     public static void main(String args[])
-             throws IOException {
-+        if (AppContext.getAppContext() == null) {
-+            SunToolkit.createNewAppContext();
-+        }
-         if (args.length != 2 || !(new File(args[0]).exists()) || !(new File(args[1]).exists())) {
-             System.err.println("Invalid pipe names provided. Refusing to proceed.");
-             System.exit(1);
diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD
index 7c0b56469..a1f73f8bb 100644
--- a/extra/imagemagick/PKGBUILD
+++ b/extra/imagemagick/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 193716 2013-08-29 06:22:01Z eric $
+# $Id: PKGBUILD 195181 2013-09-26 23:04:47Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgbase=imagemagick
 pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.8.6.9
+pkgver=6.8.7.0
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.imagemagick.org/"
@@ -11,10 +11,11 @@ license=('custom')
 makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \
              'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'liblqr' 'libwebp')
 [ "$CARCH" != "mips64el" ] && makedepends+=('opencl-headers' 'libcl')
-#source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
-source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
+#source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc} \
+source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc} \
         perlmagick.rpath.patch)
-sha1sums=('c1e8b19f6afc19751c7c777688f0005d36917f9e'
+sha1sums=('e7f5bc0cb03a16fb1b7c278c63bf4ac81e1642b2'
+          'SKIP'
           'e143cf9d530fabf3b58023899b5cc544ba93daec')
 
 prepare() {
@@ -38,7 +39,7 @@ build() {
 
 check() {
   cd ImageMagick-${pkgver%.*}-${pkgver##*.}
- # make check
+#  make check
 }
 
 package_imagemagick() {
diff --git a/extra/indent/PKGBUILD b/extra/indent/PKGBUILD
index 6afb2705c..637dd82ba 100644
--- a/extra/indent/PKGBUILD
+++ b/extra/indent/PKGBUILD
@@ -1,19 +1,17 @@
-# $Id: PKGBUILD 152433 2012-03-06 21:03:48Z stephane $
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
-# Contributor: aurelien <aurelien@archlinux.org>
-# Contributor: Herb Rose (hrose56@yahoo.com)
+# $Id: PKGBUILD 195284 2013-09-29 20:55:02Z eric $
+# Maintainer: 
 
 pkgname=indent
 pkgver=2.2.11
-pkgrel=2.1
+pkgrel=3
 pkgdesc="C language source code formatting program"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://indent.isidore-it.eu/beautify.html"
+url="https://www.gnu.org/software/indent/"
+license=('GPL3')
 depends=('glibc')
 makedepends=('texi2html')
-license=('GPL3')
 install=indent.install
-source=(http://indent.isidore-it.eu/${pkgname}-${pkgver}.tar.gz
+source=(http://ftp.de.debian.org/debian/pool/main/i/indent/${pkgname}_${pkgver}.orig.tar.gz
         indent-2.2.11-segfault.patch
         indent-2.2.11-LC_ALL.patch
         indent-2.2.11-decimal_format.patch)
@@ -22,23 +20,26 @@ sha1sums=('9b242528bbc4914464117c69ffae9df24d3fa4a7'
           '91b210b666de59ca44524288a4c1ebd213570daa'
           '2b7d5a725fe307ce81565f920a0a66b319b50c91')
 
-build() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-   
-   patch -Np1 -i ../indent-2.2.11-segfault.patch
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ../indent-2.2.11-segfault.patch
 
-   # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=205692
-   patch -Np1 -i ../indent-2.2.11-LC_ALL.patch
+  # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=205692
+  patch -Np1 -i ../indent-2.2.11-LC_ALL.patch
 
-   # https://lists.gnu.org/archive/html/bug-indent/2011-08/msg00000.html
-   patch -Np1 -i ../indent-2.2.11-decimal_format.patch
+  # https://lists.gnu.org/archive/html/bug-indent/2011-08/msg00000.html
+  patch -Np1 -i ../indent-2.2.11-decimal_format.patch
    
-   sed -i 's/-number/-number-sections/' doc/Makefile.in
-   ./configure --prefix=/usr
-   make
+  sed -i 's/-number/-number-sections/' doc/Makefile.in
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr
+  make
 }
 
 package() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-   make DESTDIR="${pkgdir}" docdir=/usr/share/doc/indent install
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" docdir=/usr/share/doc/indent install
 }
diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD
index b15ccc6ee..37428a872 100644
--- a/extra/inkscape/PKGBUILD
+++ b/extra/inkscape/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 192476 2013-08-12 20:25:43Z eric $
+# $Id: PKGBUILD 194677 2013-09-21 18:35:38Z eric $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 # Contributor: tobias <tobias@archlinux.org>
 
 pkgname=inkscape
 pkgver=0.48.4
-pkgrel=10
+pkgrel=11
 pkgdesc='Vector graphics editor using the SVG file format'
 url='http://inkscape.sourceforge.net/'
 license=('GPL' 'LGPL')
diff --git a/extra/intel-tbb/PKGBUILD b/extra/intel-tbb/PKGBUILD
index 985d1b765..eb1b9748f 100644
--- a/extra/intel-tbb/PKGBUILD
+++ b/extra/intel-tbb/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 188979 2013-06-27 17:08:09Z eric $
+# $Id: PKGBUILD 194497 2013-09-16 20:37:59Z eric $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Denis Martinez <deuns.martinez AT gmail.com>
 
 pkgname=intel-tbb
-pkgver=4.1_20130613
+pkgver=4.2_20130725
 pkgrel=1
 pkgdesc='High level abstract threading library'
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ url='http://www.threadingbuildingblocks.org/'
 license=('GPL')
 depends=('gcc-libs')
 source=("http://threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb${pkgver/\./}oss_src.tgz")
-sha1sums=('b1322bd10c5b05a79f61edb236adc0513b4a1532')
+sha1sums=('f354bd9b67295f65c43531b751e34f483ed8a024')
 
 build() {
   cd tbb${pkgver/\./}oss
diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD
index 1743f2af7..5bd2ea109 100644
--- a/extra/java7-openjdk/PKGBUILD
+++ b/extra/java7-openjdk/PKGBUILD
@@ -1,29 +1,28 @@
-# $Id: PKGBUILD 193198 2013-08-18 17:27:18Z andyrtr $
+# $Id: PKGBUILD 194862 2013-09-23 20:40:54Z guillaume $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
-pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk'
-         'openjdk7-src' 'openjdk7-doc')
+pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src' 'openjdk7-doc')
 pkgbase=java7-openjdk
 _java_ver=7
 _updatever=u40
-_icedtea_ver=2.4.1
+_icedtea_ver=2.4.2
 
 # check "${srcdir}/icedtea-${_icedtea_ver}"/Makefile.am
-_CORBA_CHANGESET=23ae4e0e0cce
-_JAXP_CHANGESET=5be6b670d08b
-_JAXWS_CHANGESET=c0e48fdfb695
-_JDK_CHANGESET=65d95818d79e
-_LANGTOOLS_CHANGESET=91c95fd8eea8
-_OPENJDK_CHANGESET=ae86c6974e8e
+_CORBA_CHANGESET=5ea58899ae9f
+_JAXP_CHANGESET=135f46e0e653
+_JAXWS_CHANGESET=a2ff16e5361f
+_JDK_CHANGESET=4bf5ac86e0e4
+_LANGTOOLS_CHANGESET=06ea051f7ffe
+_OPENJDK_CHANGESET=6125b83238df
 
-_HOTSPOT_CHANGESET=5f53e7717116 # see "${srcdir}/icedtea-${_icedtea_ver}"/hotspot.map
+_HOTSPOT_CHANGESET=b732355257e3 # see "${srcdir}/icedtea-${_icedtea_ver}"/hotspot.map
 
 _bootstrap=0 # 0/1 for quick build or full bootstrap
 
 pkgver=${_java_ver}.${_updatever}_${_icedtea_ver}
-pkgrel=3
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://icedtea.classpath.org"
 license=('custom')
@@ -48,14 +47,14 @@ source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar
         jdk7-openjdk.profile.csh
         jre7-openjdk.profile
         jre7-openjdk.profile.csh)
-sha256sums=('65142e19ee14c28106345b30b6181f5a4926dd20be599c536d778e31a8a5812a'
-            'f9f2925af3eac91ec4b0389b5316f840239558048569db2193b9e2ae34ffe32a'
-            '618bb237f262a4a703edb88bd873fd80fe33d7fb07b8a113bfc701227b748395'
-            'df2d15089890a7565b0dd89f867d7b2931839652d29029d63f8201358b0ecd34'
-            '972de06b968a6da85b1d9216c5617325135fc63c90ffb5e1d7721dce5843b037'
-            '97edcd78d316f33a43278c5549cb58a06f67305b63ad51b7c1a1fca7c45c6432'
-            '6ff5cdcca8184526a5928bb8ff0bcc38b897d463559cc9f2b10e439931a8f561'
-            'f2cfd6da6ff85dff4e6f5d40e21bc48cf15325bcd69d6c36e8f27e1fca74bd42'
+sha256sums=('3dab1edc5c0391bd67cfac60cbfb5c91aee6ea9726043252d9f216dfafd236b6'
+            'bc5703a7c31a6f1de53259768f613fa1f451d721d3301c58a59513dc3953d95b'
+            '41fc9041d7804bbd519290325c0a21b48405ed96ccf557037189b007391d33a8'
+            '3e043ea822cf18232fb0897431a2c900c8d29dce59e33bd8e3236ed1ac6c8fde'
+            'ac21931af93267188fb6dac8ed5eb44121e25e55fe432c19184c20c17cc9ceda'
+            '8cc46ef5d73a3a6445b411637fee5cc5f086e400d42b36f1f42eba4caee2a11a'
+            'd2de1d2e98ebea56d2367f0003e5f4b5031d55ed529a7c524df8eba9da08c735'
+            '4a4a04fa2c49d0a688400f6c9f129f47ba5cd931874c33254a047a1f36e6ac36'
             '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
             'fd615f476ef17853ae55b7aee3c92b6738f9ea584e915749b1caa7fdc5ff9ca4'
             'bd55299e08e6f8e61ba5baad0990170891801a29a1e8137e502b5e8a10fc37ea'
@@ -72,7 +71,7 @@ noextract=("${_OPENJDK_CHANGESET}.tar.gz"
            "${_HOTSPOT_CHANGESET}.tar.gz")
 
   _jvmdir=/usr/lib/jvm/java-7-openjdk
-  
+
   [ "$CARCH" = "x86_64" ] && _JARCH=amd64
   [ "$CARCH" = "i686" ] && _JARCH=i386
   
@@ -159,8 +158,8 @@ package_jre7-openjdk-headless() {
   rm -f lib/fontconfig.*.properties.src 
   rm -f lib/fontconfig.properties.src
 
-  install -d -m755 ${pkgdir}/${_jvmdir}/jre/
-  cp -a bin lib ${pkgdir}/${_jvmdir}/jre
+  install -d -m755 ${pkgdir}${_jvmdir}/jre
+  cp -a bin lib ${pkgdir}${_jvmdir}/jre
 
   # Install man pages
   pushd ../../j2re-image/man
@@ -172,22 +171,22 @@ package_jre7-openjdk-headless() {
   # more files that belong to the desktop package
   mkdir ${srcdir}/tmp-desktop-jre
   for file in \
-	"/usr/lib/jvm/java-7-openjdk/jre/bin/policytool" \
-	"/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/libjsoundalsa.so" \
-	"/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/libpulse-java.so" \
-	"/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/libsplashscreen.so" \
-	"/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/xawt/libmawt.so" \
-	"/usr/share/man/ja/man1/policytool.1" \
-	"/usr/share/man/man1/policytool.1"; do
+      "${_jvmdir}/jre/bin/policytool" \
+      "${_jvmdir}/jre/lib/${_JARCH}/libjsoundalsa.so" \
+      "${_jvmdir}/jre/lib/${_JARCH}/libpulse-java.so" \
+      "${_jvmdir}/jre/lib/${_JARCH}/libsplashscreen.so" \
+      "${_jvmdir}/jre/lib/${_JARCH}/xawt/libmawt.so" \
+      "/usr/share/man/ja/man1/policytool.1" \
+      "/usr/share/man/man1/policytool.1"; do
      dirname=`dirname $file`
      install -dm755 ${srcdir}/tmp-desktop-jre/$dirname || /bin/true
      # mv file from fakeinstall to pkgdir
      mv ${pkgdir}/$file ${srcdir}/tmp-desktop-jre$file
   done
-  rmdir ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/xawt
+  rmdir ${pkgdir}${_jvmdir}/jre/lib/${_JARCH}/xawt
 
   # Link binaries into /usr/bin
-  pushd ${pkgdir}/${_jvmdir}/jre/bin
+  pushd ${pkgdir}${_jvmdir}/jre/bin
   install -m755 -d ${pkgdir}/usr/bin/
   for file in *; do
     ln -sf ${_jvmdir}/jre/bin/${file} ${pkgdir}/usr/bin
@@ -195,8 +194,8 @@ package_jre7-openjdk-headless() {
   popd
 
   # Link JKS keystore from ca-certificates-java
-  rm -f ${pkgdir}/${_jvmdir}/jre/lib/security/cacerts
-  ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}/${_jvmdir}/jre/lib/security/cacerts"
+  rm -f ${pkgdir}${_jvmdir}/jre/lib/security/cacerts
+  ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}${_jvmdir}/jre/lib/security/cacerts"
 
   # Set some variables
   install -m755 -d ${pkgdir}/etc/profile.d/
@@ -213,31 +212,36 @@ package_jre7-openjdk-headless() {
 		 
   # Put some more files under backup control
   install -m755 -d ${pkgdir}/etc/java-7-openjdk/
-  install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/*.properties* ${pkgdir}/etc/java-7-openjdk/
+  install -m644 ${pkgdir}${_jvmdir}/jre/lib/*.properties* ${pkgdir}/etc/java-7-openjdk/
   # install dummy links to make them found by JAVA
-  cd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/
+  cd ${pkgdir}${_jvmdir}/jre/lib/
   for file in `ls ${pkgdir}/etc/java-7-openjdk/*.properties*`; do
     ln -vsf /etc/java-7-openjdk/`basename $file` .
   done
   # some more
   install -m755 -d ${pkgdir}/etc/java-7-openjdk/{cursors,management,security}
-  install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/images/cursors/cursors.properties ${pkgdir}/etc/java-7-openjdk/cursors/
-  pushd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/images/cursors/
+  install -m644 ${pkgdir}${_jvmdir}/jre/lib/images/cursors/cursors.properties \
+                ${pkgdir}/etc/java-7-openjdk/cursors/
+  pushd ${pkgdir}${_jvmdir}/jre/lib/images/cursors/
     ln -vsf /etc/java-7-openjdk/cursors/cursors.properties .
   popd
-  mv ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/jmxremote.password.template ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/jmxremote.password
-  mv ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/snmp.acl.template ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/snmp.acl
-  install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/{management.properties,jmxremote.access,jmxremote.password,snmp.acl} ${pkgdir}/etc/java-7-openjdk/management/
-  pushd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management
+  mv ${pkgdir}${_jvmdir}/jre/lib/management/jmxremote.password.template \
+     ${pkgdir}${_jvmdir}/jre/lib/management/jmxremote.password
+  mv ${pkgdir}${_jvmdir}/jre/lib/management/snmp.acl.template \
+     ${pkgdir}${_jvmdir}/jre/lib/management/snmp.acl
+  install -m644 ${pkgdir}${_jvmdir}/jre/lib/management/{management.properties,jmxremote.access,jmxremote.password,snmp.acl} \
+                ${pkgdir}/etc/java-7-openjdk/management/
+  pushd ${pkgdir}${_jvmdir}/jre/lib/management
     ln -vsf /etc/java-7-openjdk/management/{management.properties,jmxremote.access,jmxremote.password,snmp.acl} .
   popd
-  install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/security/{java.policy,java.security,nss.cfg} ${pkgdir}/etc/java-7-openjdk/security/
-  pushd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/security
+  install -m644 ${pkgdir}${_jvmdir}/jre/lib/security/{java.policy,java.security,nss.cfg} \
+                ${pkgdir}/etc/java-7-openjdk/security/
+  pushd ${pkgdir}${_jvmdir}/jre/lib/security
     ln -vsf /etc/java-7-openjdk/security/{java.policy,java.security,nss.cfg} .
   popd
-  install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/fontconfig.bfc ${pkgdir}/etc/java-7-openjdk/
-  install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/jvm.cfg ${pkgdir}/etc/java-7-openjdk/
-  pushd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/
+  install -m644 ${pkgdir}${_jvmdir}/jre/lib/fontconfig.bfc ${pkgdir}/etc/java-7-openjdk/
+  install -m644 ${pkgdir}${_jvmdir}/jre/lib/${_JARCH}/jvm.cfg ${pkgdir}/etc/java-7-openjdk/
+  pushd ${pkgdir}${_jvmdir}/jre/lib/${_JARCH}/
      ln -vsf /etc/java-7-openjdk/jvm.cfg .
   popd
 }
@@ -257,7 +261,7 @@ package_jre7-openjdk() {
   
   mv ${srcdir}/tmp-desktop-jre/* ${pkgdir}
   # Link binaries into /usr/bin
-  pushd ${pkgdir}/${_jvmdir}/jre/bin
+  pushd ${pkgdir}${_jvmdir}/jre/bin
   install -m755 -d ${pkgdir}/usr/bin/
   for file in *; do
     ln -sf ${_jvmdir}/jre/bin/${file} ${pkgdir}/usr/bin
@@ -293,13 +297,13 @@ package_jdk7-openjdk() {
   cd "${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image"
 
   # Main files
-  install -m755 -d ${pkgdir}/${_jvmdir}/
+  install -m755 -d ${pkgdir}${_jvmdir}
 
-  cp -a include lib ${pkgdir}/${_jvmdir}
+  cp -a include lib ${pkgdir}${_jvmdir}
 
   # 'bin' files
   pushd bin
-  install -m755 -d ${pkgdir}/${_jvmdir}/bin/ \
+  install -m755 -d ${pkgdir}${_jvmdir}/bin/ \
                    ${pkgdir}/usr/bin/ \
                    ${pkgdir}/usr/share/man/{,ja/}man1/
 
@@ -307,10 +311,10 @@ package_jdk7-openjdk() {
   for b in $(ls | grep -v java-rmi.cgi); do
     if [ -e ../jre/bin/${b} ]; then
       # Provide a link of the jre binary in the jdk/bin/ directory
-      ln -s ../jre/bin/${b} ${pkgdir}/${_jvmdir}/bin/${b}
+      ln -s ../jre/bin/${b} ${pkgdir}${_jvmdir}/bin/${b}
     else
       # Copy binary to jdk/bin/
-      install -m755 ${b} ${pkgdir}/${_jvmdir}/bin/${b}
+      install -m755 ${b} ${pkgdir}${_jvmdir}/bin/${b}
       # Copy man page
       install -m644 ../man/man1/${b}.1 ${pkgdir}/usr/share/man/man1/${b}.1
       install -m644 ../man/ja/man1/${b}.1 ${pkgdir}/usr/share/man/ja/man1/${b}.1
@@ -325,7 +329,7 @@ package_jdk7-openjdk() {
   install -m644 ${srcdir}/icedtea-${_icedtea_ver}/jconsole.desktop ${pkgdir}/usr/share/applications
 
   # Handling 'java-rmi.cgi' separately
-  install -m755 -D bin/java-rmi.cgi ${pkgdir}/${_jvmdir}/bin/java-rmi.cgi
+  install -m755 -D bin/java-rmi.cgi ${pkgdir}${_jvmdir}/bin/java-rmi.cgi
 
   # Set some variables
   install -m755 -d ${pkgdir}/etc/profile.d/
@@ -333,7 +337,7 @@ package_jdk7-openjdk() {
   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
+  chmod go+r ${pkgdir}${_jvmdir}/lib/sa-jdi.jar
 
   # link license
   install -m755 -d ${pkgdir}/usr/share/licenses
@@ -345,7 +349,7 @@ package_openjdk7-src() {
   replaces=('openjdk6-src')
   
   install -D ${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/src.zip \
-             ${pkgdir}/${_jvmdir}/src.zip
+             ${pkgdir}${_jvmdir}/src.zip
 }
 
 package_openjdk7-doc() {
diff --git a/extra/json-glib/PKGBUILD b/extra/json-glib/PKGBUILD
index accf2d8f1..429061f9e 100644
--- a/extra/json-glib/PKGBUILD
+++ b/extra/json-glib/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 183001 2013-04-16 19:33:50Z heftig $
+# $Id: PKGBUILD 196109 2013-10-07 11:52:45Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=json-glib
-pkgver=0.16.0
+pkgver=0.16.2
 pkgrel=1
 pkgdesc="JSON library built on GLib"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('glib2')
 makedepends=('gobject-introspection')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver::4}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('e4a3fd2f399e4c148aad608e6ed0a94095f2ddde9dd12f5aa2f072ecae5c1d37')
+sha256sums=('a95475364ec27ab1d2a69303cf579018558bfb6981e3498b3aaf1e6401f7422c')
 
 build(){
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/kactivities/PKGBUILD b/extra/kactivities/PKGBUILD
index 6ff77721b..633e265da 100644
--- a/extra/kactivities/PKGBUILD
+++ b/extra/kactivities/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193221 2013-08-19 09:54:14Z andrea $
+# $Id: PKGBUILD 195502 2013-10-01 15:14:00Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kactivities
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='API for using and interacting with the Activity Manager'
@@ -11,7 +11,7 @@ license=('GPL' 'FDL')
 depends=('nepomuk-core')
 makedepends=('cmake' 'automoc4' 'mesa')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('2f7ff6d98b50396f9afa1ce9cf6958cba2ec4956')
+sha1sums=('3e484dd32e55cff7ce15899b8904c70c2f3e7a38')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeaccessibility-jovie/PKGBUILD b/extra/kdeaccessibility-jovie/PKGBUILD
index 0227adb3c..2c50a2808 100644
--- a/extra/kdeaccessibility-jovie/PKGBUILD
+++ b/extra/kdeaccessibility-jovie/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193248 2013-08-19 09:54:41Z andrea $
+# $Id: PKGBUILD 195556 2013-10-01 15:18:04Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeaccessibility-jovie
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='A text to speech application'
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdeaccessibility-kttsd')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/jovie-${pkgver}.tar.xz")
-sha1sums=('574672ddc034c0efb46b777505ed1ed73728abca')
+sha1sums=('67700e70c208ed2d15f7d8581c1f50b5f0f7cb4b')
 
 build() {
   mkdir build
diff --git a/extra/kdeaccessibility-kaccessible/PKGBUILD b/extra/kdeaccessibility-kaccessible/PKGBUILD
index b3cac42b7..b1656a885 100644
--- a/extra/kdeaccessibility-kaccessible/PKGBUILD
+++ b/extra/kdeaccessibility-kaccessible/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193249 2013-08-19 09:54:42Z andrea $
+# $Id: PKGBUILD 195558 2013-10-01 15:18:13Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeaccessibility-kaccessible
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='Provides accessibility services like focus tracking and a screenreader'
@@ -12,7 +12,7 @@ groups=('kde' 'kdeaccessibility')
 depends=('kdelibs' 'speech-dispatcher')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/kaccessible-${pkgver}.tar.xz")
-sha1sums=('efb2d24862fe3fb9dad478d4df09b302545d7644')
+sha1sums=('fe602715dc4b241a0be88c5bfb3bc5f7a357c330')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeaccessibility-kmag/PKGBUILD b/extra/kdeaccessibility-kmag/PKGBUILD
index 21cb42b99..ea60afd23 100644
--- a/extra/kdeaccessibility-kmag/PKGBUILD
+++ b/extra/kdeaccessibility-kmag/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193250 2013-08-19 09:54:43Z andrea $
+# $Id: PKGBUILD 195560 2013-10-01 15:18:20Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeaccessibility-kmag
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='Screen Magnifier'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kmag-${pkgver}.tar.xz")
-sha1sums=('2f9db700bf511470afbd831758d1928dbf03b182')
+sha1sums=('1fb0fe89e1c973e1db9783232a3b03135a9cac39')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeaccessibility-kmousetool/PKGBUILD b/extra/kdeaccessibility-kmousetool/PKGBUILD
index a9c59981f..126c5a2b4 100644
--- a/extra/kdeaccessibility-kmousetool/PKGBUILD
+++ b/extra/kdeaccessibility-kmousetool/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193251 2013-08-19 09:54:44Z andrea $
+# $Id: PKGBUILD 195562 2013-10-01 15:18:27Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeaccessibility-kmousetool
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='Clicks the mouse for you, reducing the effects of RSI'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kmousetool-${pkgver}.tar.xz")
-sha1sums=('d24017e8b966562e4b3d74264496f65e240b7a04')
+sha1sums=('c783c8e4eb7c72be344dddddebcde786d715dab9')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeaccessibility-kmouth/PKGBUILD b/extra/kdeaccessibility-kmouth/PKGBUILD
index e11a9d2d3..bc95ec15e 100644
--- a/extra/kdeaccessibility-kmouth/PKGBUILD
+++ b/extra/kdeaccessibility-kmouth/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193252 2013-08-19 09:54:45Z andrea $
+# $Id: PKGBUILD 195564 2013-10-01 15:18:34Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeaccessibility-kmouth
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='Speech Synthesizer Frontend'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kmouth-${pkgver}.tar.xz")
-sha1sums=('2a40d22cf11ed2a55f7e2576cf526e667296e325')
+sha1sums=('2bbc09abf8f76642f65fb6db4aa92c4c897c5176')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeadmin-kcron/PKGBUILD b/extra/kdeadmin-kcron/PKGBUILD
index 95d0314ee..b5f1ceb38 100644
--- a/extra/kdeadmin-kcron/PKGBUILD
+++ b/extra/kdeadmin-kcron/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193253 2013-08-19 09:54:46Z andrea $
+# $Id: PKGBUILD 195566 2013-10-01 15:18:41Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeadmin-kcron
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc='Configure and schedule tasks'
 url='http://userbase.kde.org/KCron'
@@ -12,7 +12,7 @@ groups=('kde' 'kdeadmin')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/kcron-${pkgver}.tar.xz")
-sha1sums=('8a837c7c9e2d04df1688a89679c7fcaa621957af')
+sha1sums=('6354f77e033f35e2e241522aae81359f162bfe90')
 
 build() {
   mkdir build
diff --git a/extra/kdeadmin-ksystemlog/PKGBUILD b/extra/kdeadmin-ksystemlog/PKGBUILD
index f9d8a98fa..6b87307ae 100644
--- a/extra/kdeadmin-ksystemlog/PKGBUILD
+++ b/extra/kdeadmin-ksystemlog/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193254 2013-08-19 09:54:47Z andrea $
+# $Id: PKGBUILD 195568 2013-10-01 15:18:48Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeadmin-ksystemlog
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc='System log viewer tool'
 url='http://kde.org/applications/system/ksystemlog/'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/ksystemlog-${pkgver}.tar.xz"
         'syslog-path.patch')
-sha1sums=('351ed0755674ecc37f8517ab6a61e2c6ea967ce5'
+sha1sums=('a14a55b46163de74c6c4e6754c9060acc00fc9d3'
           '20095ce6e0f3e5b6800a7c6e52de6fddba62c031')
 
 prepare() {
diff --git a/extra/kdeadmin-kuser/PKGBUILD b/extra/kdeadmin-kuser/PKGBUILD
index 85551f54d..9b2f8f355 100644
--- a/extra/kdeadmin-kuser/PKGBUILD
+++ b/extra/kdeadmin-kuser/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193255 2013-08-19 09:54:48Z andrea $
+# $Id: PKGBUILD 195570 2013-10-01 15:18:56Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeadmin-kuser
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc='User Manager'
 url='http://kde.org/applications/system/kuser/'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'kdepimlibs')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kuser-${pkgver}.tar.xz")
-sha1sums=('9eda2225632e8707ae6f59ed7fb9d29ef8488df9')
+sha1sums=('a4898545884c4414a89541252290b081e610e039')
 
 build() {
   mkdir build
diff --git a/extra/kdeartwork/PKGBUILD b/extra/kdeartwork/PKGBUILD
index f26dd6e45..acd3c37f4 100644
--- a/extra/kdeartwork/PKGBUILD
+++ b/extra/kdeartwork/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193256 2013-08-19 09:54:49Z andrea $
+# $Id: PKGBUILD 195572 2013-10-01 15:19:08Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -12,7 +12,7 @@ pkgname=('kdeartwork-colorschemes'
          'kdeartwork-styles'
          'kdeartwork-wallpapers'
          'kdeartwork-weatherwallpapers')
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
@@ -20,7 +20,7 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeartwork')
 makedepends=('cmake' 'automoc4' 'xscreensaver' 'eigen' 'kdebase-workspace' 'libkexiv2')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('e2240e998483cd5f65a1602c8c410bb8453c2b4b')
+sha1sums=('4e58014eed76b88955af645507ddecadd4c5a70f')
 
 build() {
 	cd $srcdir
diff --git a/extra/kdebase-konsole/PKGBUILD b/extra/kdebase-konsole/PKGBUILD
index d478ff35b..61a3fc714 100644
--- a/extra/kdebase-konsole/PKGBUILD
+++ b/extra/kdebase-konsole/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193257 2013-08-19 09:54:50Z andrea $
+# $Id: PKGBUILD 195574 2013-10-01 15:19:39Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebase-konsole
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://kde.org/applications/system/konsole/'
@@ -12,7 +12,7 @@ groups=('kde' 'kdebase')
 depends=('kdebase-runtime' 'kdebase-lib')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/konsole-${pkgver}.tar.xz")
-sha1sums=('6bc97a6364699fba6474cae0fcdcff6d9435cf4b')
+sha1sums=('bd4095086e6b9c4a271b0147c4fdf68aa7faba27')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD
index 1c39daf36..d73feb4a3 100644
--- a/extra/kdebase-workspace/PKGBUILD
+++ b/extra/kdebase-workspace/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 193487 2013-08-21 09:33:33Z andrea $
+# $Id: PKGBUILD 195528 2013-10-01 15:15:58Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdebase-workspace
 _pkgname=kde-workspace
-pkgver=4.11.0
-pkgrel=2
+pkgver=4.11.2
+pkgrel=1
 pkgdesc="Provides the interface and basic tools for the KDE workspace"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/kde/kde-workspace'
@@ -27,9 +27,8 @@ install="${pkgname}.install"
 backup=('usr/share/config/kdm/kdmrc')
 source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
         'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'kdm.logrotate'
-        'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch'
-        'plasma-desktop-dbus.patch')
-sha1sums=('3e877c9f82ad4b3d10c0752adbb50240707d632d'
+        'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch')
+sha1sums=('fa19cf2b56f7cbcc8bb2200dc33a38150379f4ad'
           '660eae40a707d2711d8d7f32a93214865506b795'
           '6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe'
           '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
@@ -37,10 +36,11 @@ sha1sums=('3e877c9f82ad4b3d10c0752adbb50240707d632d'
           'bbe55f2000217474ce7246f12ee437ceaaf7e9ae'
           'c079ebd157c836ba996190f0d2bcea1a7828d02c'
           'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
-          'd509dac592bd8b310df27991b208c95b6d907514'
-          '57315ab3adf4d7eed9410c4494f0a63204122763')
+          'd509dac592bd8b310df27991b208c95b6d907514')
 
 prepare() {
+        mkdir build
+
         cd ${_pkgname}-${pkgver}
 
         # reads the shell scripts in /etc/kde/
@@ -50,12 +50,9 @@ prepare() {
 
         # KDEBUG#202629
         patch -p0 -i "${srcdir}"/terminate-server.patch
-        # KDEBUG#321695
-        patch -p1 -i "${srcdir}"/plasma-desktop-dbus.patch
 }
 
 build() {
-        mkdir build
         cd build
         cmake ../${_pkgname}-${pkgver} \
           -DCMAKE_BUILD_TYPE=Release \
diff --git a/extra/kdebase-workspace/kdebug-324574.patch b/extra/kdebase-workspace/kdebug-324574.patch
new file mode 100644
index 000000000..053eef57e
--- /dev/null
+++ b/extra/kdebase-workspace/kdebug-324574.patch
@@ -0,0 +1,55 @@
+From: Weng Xuetian <wengxt@gmail.com>
+Date: Mon, 09 Sep 2013 15:43:06 +0000
+Subject: Delay KDE class initialization to main loop
+X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=2e5a2450762f8dedf9ffd77028ed06b3a39a807d
+---
+Delay KDE class initialization to main loop
+
+Gui platform plugin is loaded during QApplication construction, but it
+relies on some KApplication/QApplication data to work correctly.
+
+This patch delays the initialization to main loop, to ensure
+KApplication/QApplication is already constructed.
+
+BUG: 324574
+FIXED-IN: 4.11.2
+REVIEW: 112602
+---
+
+
+--- a/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp
++++ b/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp
+@@ -28,6 +28,7 @@
+ #include <KDE/KFileDialog>
+ #include <KDE/KColorDialog>
+ #include <QtCore/QHash>
++#include <QtCore/QTimer>
+ #include <QtGui/QFileDialog>
+ #include <QtGui/QColorDialog>
+ #include <QtGui/QApplication>
+@@ -153,9 +154,7 @@
+ public:
+     KQGuiPlatformPlugin()
+     {
+-        connect(KIconLoader::global(), SIGNAL(iconLoaderSettingsChanged()), this, SLOT(updateToolbarIcons()));
+-        connect(KGlobalSettings::self(), SIGNAL(toolbarAppearanceChanged(int)), this, SLOT(updateToolbarStyle()));
+-        connect(KGlobalSettings::self(), SIGNAL(kdisplayStyleChanged()), this, SLOT(updateWidgetStyle()));
++        QMetaObject::invokeMethod(this, "init", Qt::QueuedConnection);
+     }
+ 
+     virtual QStringList keys() const { return QStringList() << QLatin1String("kde"); }
+@@ -340,6 +339,13 @@
+     }
+ 
+ private slots:
++    void init()
++    {
++        connect(KIconLoader::global(), SIGNAL(iconLoaderSettingsChanged()), this, SLOT(updateToolbarIcons()));
++        connect(KGlobalSettings::self(), SIGNAL(toolbarAppearanceChanged(int)), this, SLOT(updateToolbarStyle()));
++        connect(KGlobalSettings::self(), SIGNAL(kdisplayStyleChanged()), this, SLOT(updateWidgetStyle()));
++    }
++
+     void updateToolbarStyle()
+     {
+         //from gtksymbol.cpp
+
diff --git a/extra/kdebase-workspace/plasma-desktop-dbus.patch b/extra/kdebase-workspace/plasma-desktop-dbus.patch
deleted file mode 100644
index 70790dac3..000000000
--- a/extra/kdebase-workspace/plasma-desktop-dbus.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Hrvoje Senjan <hrvoje.senjan@gmail.com>
-Date: Tue, 20 Aug 2013 11:35:57 +0000
-Subject: Partially revert commit 83d3018
-X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=bb2bddb083eb293786206ac91ae1feeaf942db32
----
-Partially revert commit 83d3018
-
-Somehow unique made ksplash quit too soon and/or plasma start
-too late
-
-REVIEW: 112073
-BUG: 321695
-FIXED-IN: 4.11.1
----
-
-
---- a/plasma/desktop/shell/data/plasma-desktop.desktop
-+++ b/plasma/desktop/shell/data/plasma-desktop.desktop
-@@ -1,6 +1,6 @@
- [Desktop Entry]
- Exec=plasma-desktop
--X-DBUS-StartupType=unique
-+X-DBUS-StartupType=multi
- Name=Plasma Desktop Workspace
- Name[ar]=مساحة عمل بلازما
- Name[ast]=Espaciu de trabayu del escritoriu Plasma
-
diff --git a/extra/kdebase/PKGBUILD b/extra/kdebase/PKGBUILD
index 52f006a1f..d43dd2d41 100644
--- a/extra/kdebase/PKGBUILD
+++ b/extra/kdebase/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193236 2013-08-19 09:54:31Z andrea $
+# $Id: PKGBUILD 195532 2013-10-01 15:16:19Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -11,7 +11,7 @@ pkgname=('kdebase-dolphin'
          'kdebase-konq-plugins'
          'kdebase-lib'
          'kdebase-plasma')
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
@@ -19,11 +19,15 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdebase')
 makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml' 'nepomuk-widgets')
 source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz")
-sha1sums=('2a1e0e902016f0dc6f39cbe4fc776e5f20554088')
+sha1sums=('6a988adf54e9f499365dce0ce1691d020411bd0d')
+
+prepare() {
+  mkdir build
+
+  cd kde-baseapps-${pkgver}
+}
 
 build() {
-	cd ${srcdir}
-	mkdir build
 	cd build
 	cmake ../kde-baseapps-${pkgver} \
 		-DCMAKE_BUILD_TYPE=Release \
diff --git a/extra/kdebase/kdebug-324511.patch b/extra/kdebase/kdebug-324511.patch
new file mode 100644
index 000000000..cca2a7254
--- /dev/null
+++ b/extra/kdebase/kdebug-324511.patch
@@ -0,0 +1,25 @@
+commit 43a981481ab9161a83dd200db39c093e2502f68a
+Author: Bernd Buschinski <b.buschinski@googlemail.com>
+Date:   Wed Sep 4 16:23:35 2013 +0200
+
+    Fix toplevel bookmarks not showing in toolbar
+    regression from d1963e23
+
+diff --git a/konqueror/src/konqbookmarkbar.cpp b/konqueror/src/konqbookmarkbar.cpp
+index 2141575..199e15f 100644
+--- a/konqueror/src/konqbookmarkbar.cpp
++++ b/konqueror/src/konqbookmarkbar.cpp
+@@ -184,10 +184,12 @@ void KBookmarkBar::fillBookmarkBar(const KBookmarkGroup & parent)
+ 
+         if (!bm.isGroup())
+         {
+-	    if ( bm.isSeparator() )
++            if ( bm.isSeparator() )
++            {
+                 if (m_toolBar) {
+                     m_toolBar->addSeparator();
+                 }
++            }
+             else
+             {
+                 KAction *action = new KBookmarkAction( bm, m_pOwner, 0 );
diff --git a/extra/kdebindings-kimono/PKGBUILD b/extra/kdebindings-kimono/PKGBUILD
index dffb9aafe..e12062047 100644
--- a/extra/kdebindings-kimono/PKGBUILD
+++ b/extra/kdebindings-kimono/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193258 2013-08-19 09:54:51Z andrea $
+# $Id: PKGBUILD 195576 2013-10-01 15:19:48Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-kimono
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc=".NET/Mono bindings for the KDE libraries"
 url="https://projects.kde.org/projects/kde/kdebindings/csharp/kimono"
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs')
 optdepends=('kdepimlibs: akonadi bindings')
 conflicts=('kdebindings-csharp')
 source=("http://download.kde.org/stable/${pkgver}/src/kimono-${pkgver}.tar.xz")
-sha1sums=('c79ece1aff5d225dc17c0082e31beda06782a51e')
+sha1sums=('629ec8027ee5650234dc19c26488cde0244ca7dd')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdebindings-korundum/PKGBUILD b/extra/kdebindings-korundum/PKGBUILD
index 4c8655dcc..6740edb87 100644
--- a/extra/kdebindings-korundum/PKGBUILD
+++ b/extra/kdebindings-korundum/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193259 2013-08-19 09:54:52Z andrea $
+# $Id: PKGBUILD 195578 2013-10-01 15:19:56Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-korundum
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="Ruby bindings for libraries created by the KDE community"
 url="https://projects.kde.org/projects/kde/kdebindings/ruby/korundum"
@@ -16,7 +16,7 @@ optdepends=('kdegraphics-okular: okular bindings'
             'kdepimlibs: akonadi bindings')
 conflicts=('kdebindings-ruby')
 source=("http://download.kde.org/stable/${pkgver}/src/korundum-${pkgver}.tar.xz")
-sha1sums=('44b74d69d8f1533c965f86ae5cac688de6499e35')
+sha1sums=('0ea502fb79d1c5f61b32dd8419880e4f29b229e2')
 
 prepare() {
   mkdir build
diff --git a/extra/kdebindings-kross/PKGBUILD b/extra/kdebindings-kross/PKGBUILD
index e6d51a3c6..4b1dee7c8 100644
--- a/extra/kdebindings-kross/PKGBUILD
+++ b/extra/kdebindings-kross/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 193260 2013-08-19 09:54:53Z andrea $
+# $Id: PKGBUILD 195580 2013-10-01 15:20:04Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=kdebindings-kross
 pkgname=('kdebindings-kross-python'
 #         'kdebindings-kross-ruby'
          'kdebindings-kross-java')
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 url="https://projects.kde.org/projects/kde/kdebindings/kross-interpreters"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kdebindings')
 makedepends=('kdelibs' 'cmake' 'automoc4' 'python2' 'java-environment')
 source=("http://download.kde.org/stable/${pkgver}/src/kross-interpreters-${pkgver}.tar.xz")
-sha1sums=('647af2a112e571ebdb435e6948268075f97486b0')
+sha1sums=('89f232ceaa37d9b289e9a1a997695839071090fb')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdebindings-perlkde/PKGBUILD b/extra/kdebindings-perlkde/PKGBUILD
index f2f46fce3..46a002942 100644
--- a/extra/kdebindings-perlkde/PKGBUILD
+++ b/extra/kdebindings-perlkde/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193261 2013-08-19 09:54:54Z andrea $
+# $Id: PKGBUILD 195582 2013-10-01 15:20:12Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-perlkde
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="Perl bindings for the KDE libraries"
 url="https://projects.kde.org/projects/kde/kdebindings/perl/perlkde"
@@ -13,7 +13,7 @@ depends=('kdebindings-perlqt' 'kdebindings-smokekde')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'kdepimlibs'
              'kdegraphics-okular' 'kdesdk-kate')
 source=("http://download.kde.org/stable/${pkgver}/src/perlkde-${pkgver}.tar.xz")
-sha1sums=('18dcfe5623eb599e7cefc259fff3ed4b361bb05d')
+sha1sums=('226673575d9daeb7498a2bcd3f9f196a3308d471')
 
 build() {
   mkdir build
diff --git a/extra/kdebindings-perlqt/PKGBUILD b/extra/kdebindings-perlqt/PKGBUILD
index 2ee5d5580..879bbfdc4 100644
--- a/extra/kdebindings-perlqt/PKGBUILD
+++ b/extra/kdebindings-perlqt/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193230 2013-08-19 09:54:24Z andrea $
+# $Id: PKGBUILD 195520 2013-10-01 15:15:20Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-perlqt
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="Perl bindings for the Qt libraries"
 url="https://projects.kde.org/projects/kde/kdebindings/perl/perlqt"
@@ -12,7 +12,7 @@ groups=('kdebindings')
 depends=('kdebindings-smokeqt' 'perl-list-moreutils')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
 source=("http://download.kde.org/stable/${pkgver}/src/perlqt-${pkgver}.tar.xz")
-sha1sums=('6909be471229916833861fa04f49e63398c29960')
+sha1sums=('2a6ddaafdbc0bd62ae7b1982f9bd0efa6908157c')
 
 build() {
   mkdir build
diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD
index bff3284e3..84ab851cf 100644
--- a/extra/kdebindings-python/PKGBUILD
+++ b/extra/kdebindings-python/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 193227 2013-08-19 09:54:19Z andrea $
+# $Id: PKGBUILD 195514 2013-10-01 15:14:52Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=kdebindings-python
 pkgname=('kdebindings-python'
          'kdebindings-python2'
          'kdebindings-python-common')
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 url='https://projects.kde.org/projects/kde/kdebindings/pykde4'
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,13 +13,18 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kdebindings')
 makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt4'
              'python-pyqt4' 'qscintilla' 'python2-sip' 'python-sip' 'mesa')
-             source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz")
-sha1sums=('f7d11a316d7985f510926cadf0bdb0d27d110a8e')
+source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz")
+sha1sums=('5e7c43e224fa1db4ae2bbec1eb040dd2855e8c86')
+
+prepare() {
+  mkdir build
+
+  cd pykde4-${pkgver}
+}
 
 build() {
   export PYTHONDONTWRITEBYTECODE="TRUE"
 
-  mkdir build
   cd build
   cmake ../pykde4-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
diff --git a/extra/kdebindings-python/pykde4.patch b/extra/kdebindings-python/pykde4.patch
new file mode 100644
index 000000000..159af304c
--- /dev/null
+++ b/extra/kdebindings-python/pykde4.patch
@@ -0,0 +1,269 @@
+--- pykde4-4.11.1.orig/CMakeLists.txt	2013-09-08 17:29:29.775854281 -0400
++++ pykde4-4.11.1/CMakeLists.txt	2013-09-08 17:29:29.755854280 -0400
+@@ -124,20 +124,20 @@
+ if (PYTHON_VERSION_MAJOR GREATER 2)
+     if(PYQT4_VERSION STRGREATER "040904")
+ 	    # Disable for newer PyQt
+-	    set(SIP_EXTRA_OPTIONS -g -x PyKDE_QVector)
++	    set(SIP_EXTRA_OPTIONS -P -g -x PyKDE_QVector)
+     else ()
+ 	    set(SIP_EXTRA_OPTIONS -g)
+     endif()
+ else (PYTHON_VERSION_MAJOR GREATER 2)
+     if(PYQT4_VERSION STRGREATER "040904")
+ 	# Disable for newer PyQt
+-    	set(SIP_EXTRA_OPTIONS -g -x PyKDE_QVector -x Py_v3)
++    	set(SIP_EXTRA_OPTIONS -P -g -x PyKDE_QVector -x Py_v3)
+     else ()
+ 	    set(SIP_EXTRA_OPTIONS -g -x Py_v3)
+     endif()
+ endif ()
+ 
+-add_definitions(-D_REENTRANT -DQT_CORE_LIB -DQT_GUI_LIB -DUSING_SOPRANO_NRLMODEL_UNSTABLE_API)
++add_definitions(-D_REENTRANT -DQT_CORE_LIB -DQT_GUI_LIB -DUSING_SOPRANO_NRLMODEL_UNSTABLE_API -DSIP_PROTECTED_IS_PUBLIC -Dprotected=public)
+ 
+ # Do not use --no-undefined for python modules.
+ STRING(REPLACE -Wl,--no-undefined "" CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
+--- pykde4-4.11.1.orig/sip/akonadi/entitytreemodel.sip	2013-09-08 17:29:29.775854281 -0400
++++ pykde4-4.11.1/sip/akonadi/entitytreemodel.sip	2013-09-08 17:29:29.755854280 -0400
+@@ -122,5 +122,12 @@
+     };
+     bool                    includeUnsubscribed () const;
+     void                    setIncludeUnsubscribed (bool show);
++//force
++private:
++    virtual bool removeColumns(int, int, const QModelIndex&);
++    virtual bool removeRows(int, int, const QModelIndex&);
++    virtual bool insertColumns(int, int, const QModelIndex&);
++    virtual bool insertRows(int, int, const QModelIndex&);
++//end
+ };
+ };
+--- pykde4-4.11.1.orig/sip/akonadi/favoritecollectionsmodel.sip	2013-09-08 17:29:29.775854281 -0400
++++ pykde4-4.11.1/sip/akonadi/favoritecollectionsmodel.sip	2013-09-08 17:29:29.759854280 -0400
+@@ -42,5 +42,9 @@
+     virtual bool            dropMimeData (const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent);
+     virtual QStringList     mimeTypes () const;
+     virtual Qt::ItemFlags   flags (const QModelIndex& index) const;
++//force
++private:
++    virtual void setSourceModel(QAbstractItemModel *);
++//end
+ };
+ };
+--- pykde4-4.11.1.orig/sip/kdeui/highlighter.sip	2013-09-08 17:29:29.775854281 -0400
++++ pykde4-4.11.1/sip/kdeui/highlighter.sip	2013-09-08 17:29:29.759854280 -0400
+@@ -70,6 +70,11 @@
+ public:
+     ~Highlighter ();
+     bool                    checkerEnabledByDefault () const;
++//force
++private:
++        virtual void connectNotify(const char* signal);
++        virtual void disconnectNotify(const char* signal);
++//end
+ };
+ // Highlighter
+ 
+--- pykde4-4.11.1.orig/sip/kdeui/kdatetable.sip	2013-09-08 17:29:29.775854281 -0400
++++ pykde4-4.11.1/sip/kdeui/kdatetable.sip	2013-09-08 17:29:29.759854280 -0400
+@@ -61,8 +61,10 @@
+ 
+ public:
+                             KDateValidator (QWidget* parent /TransferThis/ = 0);
+-    virtual QValidator::State  validate (QString& text, int& e /In/) const;
+-    virtual void            fixup (QString& input) const;
++    virtual QValidator::State validate(QString & /In,Out/, int & /In,Out/) const = 0 /API=QString:2 - /;
++    virtual QValidator::State validate(QString & /Constrained/, int & /In,Out/) const = 0 /API=QString: - 2/;
++    virtual void fixup(QString &input /In,Out/) const /API=QString:2 - /;
++    virtual void fixup(QString & /Constrained/) const /API=QString: - 2/;
+     QValidator::State       date (const QString& text, QDate& date) const;
+ };
+ // KDateValidator
+--- pykde4-4.11.1.orig/sip/kdeui/knumvalidator.sip	2013-09-08 17:29:29.775854281 -0400
++++ pykde4-4.11.1/sip/kdeui/knumvalidator.sip	2013-09-08 17:29:29.759854280 -0400
+@@ -30,8 +30,10 @@
+ public:
+     explicit                KIntValidator (QWidget* parent /TransferThis/, int base = 10);
+                             KIntValidator (int bottom, int top, QWidget* parent /TransferThis/, int base = 10);
+-    virtual QValidator::State  validate (QString&, int& /In/) const;
+-    virtual void            fixup (QString&) const;
++    virtual QValidator::State validate(QString & /In,Out/, int & /In,Out/) const = 0 /API=QString:2 - /;
++    virtual QValidator::State validate(QString & /Constrained/, int & /In,Out/) const = 0 /API=QString: - 2/;
++    virtual void fixup(QString &input /In,Out/) const /API=QString:2 - /;
++    virtual void fixup(QString & /Constrained/) const /API=QString: - 2/;
+     virtual void            setRange (int bottom, int top);
+     virtual void            setBase (int base);
+     virtual int             bottom () const;
+@@ -53,8 +55,10 @@
+     explicit                KFloatValidator (QWidget* parent /TransferThis/);
+                             KFloatValidator (double bottom, double top, QWidget* parent /TransferThis/);
+                             KFloatValidator (double bottom, double top, bool localeAware, QWidget* parent /TransferThis/);
+-    virtual QValidator::State  validate (QString&, int& /In/) const;
+-    virtual void            fixup (QString&) const;
++    virtual QValidator::State validate(QString & /In,Out/, int & /In,Out/) const = 0 /API=QString:2 - /;
++    virtual QValidator::State validate(QString & /Constrained/, int & /In,Out/) const = 0 /API=QString: - 2/;
++    virtual void fixup(QString &input /In,Out/) const /API=QString:2 - /;
++    virtual void fixup(QString & /Constrained/) const /API=QString: - 2/;
+     virtual void            setRange (double bottom, double top);
+     virtual double          bottom () const;
+     virtual double          top () const;
+@@ -75,7 +79,8 @@
+ public:
+     explicit                KDoubleValidator (QObject* parent /TransferThis/);
+                             KDoubleValidator (double bottom, double top, int decimals, QObject* parent /TransferThis/);
+-    virtual QValidator::State  validate (QString& input, int& pos /In/) const;
++    virtual QValidator::State validate(QString & /In,Out/, int & /In,Out/) const = 0 /API=QString:2 - /;
++    virtual QValidator::State validate(QString & /Constrained/, int & /In,Out/) const = 0 /API=QString: - 2/;
+     bool                    acceptLocalizedNumbers () const;
+     void                    setAcceptLocalizedNumbers (bool accept);
+     ~KDoubleValidator ();
+--- pykde4-4.11.1.orig/sip/kdeui/kpixmapregionselectorwidget.sip	2013-09-08 17:29:29.775854281 -0400
++++ pykde4-4.11.1/sip/kdeui/kpixmapregionselectorwidget.sip	2013-09-08 17:29:29.759854280 -0400
+@@ -57,6 +57,7 @@
+ private:
+ //force
+                             KPixmapRegionSelectorWidget (const KPixmapRegionSelectorWidget&);
++    virtual bool eventFilter(QObject*, QEvent*);
+ //end
+ public:
+     ~KPixmapRegionSelectorWidget ();
+--- pykde4-4.11.1.orig/sip/kdeui/kpixmapsequenceoverlaypainter.sip	2013-09-08 17:29:29.775854281 -0400
++++ pykde4-4.11.1/sip/kdeui/kpixmapsequenceoverlaypainter.sip	2013-09-08 17:29:29.763854280 -0400
+@@ -39,4 +39,8 @@
+     void                    setOffset (const QPoint& offset);
+     void                    start ();
+     void                    stop ();
++//force
++private:
++    virtual bool eventFilter(QObject*, QEvent*);
++//end
+ };
+--- pykde4-4.11.1.orig/sip/kdeui/krecursivefilterproxymodel.sip	2013-09-08 17:29:29.775854281 -0400
++++ pykde4-4.11.1/sip/kdeui/krecursivefilterproxymodel.sip	2013-09-08 17:29:29.763854280 -0400
+@@ -31,4 +31,8 @@
+     virtual bool            acceptRow (int sourceRow, const QModelIndex& sourceParent) const;
+ public:
+     virtual QModelIndexList  match (const QModelIndex& start, int role, const QVariant& value, int hits = 1, Qt::MatchFlags flags = Qt::MatchFlags(Qt::MatchStartsWith|Qt::MatchWrap)) const;
++//force
++private:
++    virtual bool filterAcceptsRow(int, const QModelIndex&) const;
++//end
+ };
+--- pykde4-4.11.1.orig/sip/kdeui/kstringvalidator.sip	2013-09-08 17:29:29.775854281 -0400
++++ pykde4-4.11.1/sip/kdeui/kstringvalidator.sip	2013-09-08 17:29:29.763854280 -0400
+@@ -35,8 +35,10 @@
+     bool                    isFixupEnabled () const;
+     void                    setStringList (const QStringList& list);
+     QStringList             stringList () const;
+-    virtual QValidator::State  validate (QString& input, int& pos /Out/) const;
+-    virtual void            fixup (QString& input) const;
++    virtual QValidator::State validate(QString & /In,Out/, int & /In,Out/) const = 0 /API=QString:2 - /;
++    virtual QValidator::State validate(QString & /Constrained/, int & /In,Out/) const = 0 /API=QString: - 2/;
++    virtual void fixup(QString &input /In,Out/) const /API=QString:2 - /;
++    virtual void fixup(QString & /Constrained/) const /API=QString: - 2/;
+     ~KStringListValidator ();
+ };
+ // KStringListValidator
+@@ -51,8 +53,10 @@
+ 
+ public:
+     explicit                KMimeTypeValidator (QObject* parent /TransferThis/ = 0);
+-    virtual QValidator::State  validate (QString& input, int& pos /Out/) const;
+-    virtual void            fixup (QString& input) const;
++    virtual QValidator::State validate(QString & /In,Out/, int & /In,Out/) const = 0 /API=QString:2 - /;
++    virtual QValidator::State validate(QString & /Constrained/, int & /In,Out/) const = 0 /API=QString: - 2/;
++    virtual void fixup(QString &input /In,Out/) const /API=QString:2 - /;
++    virtual void fixup(QString & /Constrained/) const /API=QString: - 2/;
+     ~KMimeTypeValidator ();
+ };
+ // KMimeTypeValidator
+--- pykde4-4.11.1.orig/sip/kdeui/ktogglefullscreenaction.sip	2013-09-08 17:29:29.775854281 -0400
++++ pykde4-4.11.1/sip/kdeui/ktogglefullscreenaction.sip	2013-09-08 17:29:29.763854280 -0400
+@@ -37,7 +37,10 @@
+     bool                    eventFilter (QObject* object, QEvent* event);
+ public:
+     ~KToggleFullScreenAction ();
++
++//force
++private:
++    virtual void slotToggled(bool);
++//end
+ };
+ // KToggleFullScreenAction
+-
+-
+--- pykde4-4.11.1.orig/sip/kdeui/ktoggletoolbaraction.sip	2013-09-08 17:29:29.775854281 -0400
++++ pykde4-4.11.1/sip/kdeui/ktoggletoolbaraction.sip	2013-09-08 17:29:29.763854280 -0400
+@@ -33,6 +33,10 @@
+     KToolBar*               toolBar ();
+     virtual bool            eventFilter (QObject* watched, QEvent* event);
+     ~KToggleToolBarAction ();
++//force
++private:
++    virtual void slotToggled( bool checked );
++//end
+ };
+ // KToggleToolBarAction
+ 
+--- pykde4-4.11.1.orig/sip/kio/kdirmodel.sip	2013-09-08 17:29:29.775854281 -0400
++++ pykde4-4.11.1/sip/kio/kdirmodel.sip	2013-09-08 17:29:29.767854280 -0400
+@@ -105,6 +105,13 @@
+     ~KDirModel ();
+     void                    setJobTransfersVisible (bool value);
+     bool                    jobTransfersVisible () const;
++//force
++private:
++    virtual bool removeColumns(int, int, const QModelIndex&);
++    virtual bool removeRows(int, int, const QModelIndex&);
++    virtual bool insertColumns(int, int, const QModelIndex&);
++    virtual bool insertRows(int, int, const QModelIndex&);
++//end
+ };
+ // KDirModel
+ 
+--- pykde4-4.11.1.orig/sip/kio/kshellcompletion.sip	2013-09-08 17:29:29.775854281 -0400
++++ pykde4-4.11.1/sip/kio/kshellcompletion.sip	2013-09-08 17:29:29.767854280 -0400
+@@ -39,5 +39,3 @@
+     ~KShellCompletion ();
+ };
+ // KShellCompletion
+-
+-
+--- pykde4-4.11.1.orig/sip/kio/metainfojob.sip	2013-09-08 17:29:29.775854281 -0400
++++ pykde4-4.11.1/sip/kio/metainfojob.sip	2013-09-08 17:29:29.767854280 -0400
+@@ -51,7 +51,7 @@
+ private:
+ //force
+                             MetaInfoJob ();
+-
++    virtual void start();
+ //end
+ public:
+     ~MetaInfoJob ();
+--- pykde4-4.11.1.orig/sip/plasma/applet.sip	2013-09-08 17:29:29.775854281 -0400
++++ pykde4-4.11.1/sip/plasma/applet.sip	2013-09-08 17:29:29.767854280 -0400
+@@ -217,6 +217,10 @@
+     void                    showConfigurationInterface (QWidget* widget);
+     bool                    isUserConfiguring () const;
+     explicit                Applet (const KPluginInfo& info, QGraphicsItem* parent = 0, uint appletId = 0);
++//force
++private:
++    virtual void paint(QPainter*, const QStyleOptionGraphicsItem*, QWidget*);
++//end
+ };
+ // Applet
+ 
+--- pykde4-4.11.1.orig/sip/plasma/glapplet.sip	2013-09-08 17:29:29.775854281 -0400
++++ pykde4-4.11.1/sip/plasma/glapplet.sip	2013-09-08 17:29:29.771854281 -0400
+@@ -52,6 +52,10 @@
+     ~GLApplet ();
+     GLuint                  bindTexture (const QImage& image, GLenum target = GL_TEXTURE_2D);
+     void                    deleteTexture (GLuint texture_id);
++
++private:
++    virtual void paint(QPainter*, const QStyleOptionGraphicsItem*, QWidget*);
++    virtual void paintInterface(QPainter*, const QStyleOptionGraphicsItem*, const QRect&);
+ //end
+ };
+ // GLApplet
diff --git a/extra/kdebindings-qtruby/PKGBUILD b/extra/kdebindings-qtruby/PKGBUILD
index 13345adfc..2a08a37ef 100644
--- a/extra/kdebindings-qtruby/PKGBUILD
+++ b/extra/kdebindings-qtruby/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193232 2013-08-19 09:54:25Z andrea $
+# $Id: PKGBUILD 195524 2013-10-01 15:15:35Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-qtruby
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="Ruby bindings for the Qt libraries"
 url="https://projects.kde.org/projects/kde/kdebindings/ruby/qtruby"
@@ -13,7 +13,7 @@ depends=('kdebindings-smokeqt' 'ruby')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
 conflicts=('kdebindings-ruby')
 source=("http://download.kde.org/stable/${pkgver}/src/qtruby-${pkgver}.tar.xz")
-sha1sums=('ff362e4b62192ddf5023d325fac008d6fe59a4fa')
+sha1sums=('a75925deb9caaf75dc9f77da861516767d40688a')
 
 build() {
   mkdir build
diff --git a/extra/kdebindings-qyoto/PKGBUILD b/extra/kdebindings-qyoto/PKGBUILD
index 508d2e606..6d54fce7c 100644
--- a/extra/kdebindings-qyoto/PKGBUILD
+++ b/extra/kdebindings-qyoto/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193231 2013-08-19 09:54:25Z andrea $
+# $Id: PKGBUILD 195522 2013-10-01 15:15:27Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-qyoto
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc=".NET/Mono bindings for the Qt libraries"
 url="https://projects.kde.org/projects/kde/kdebindings/csharp/qyoto"
@@ -13,7 +13,7 @@ depends=('kdebindings-smokeqt' 'mono')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
 conflicts=('kdebindings-csharp')
 source=("http://download.kde.org/stable/${pkgver}/src/qyoto-${pkgver}.tar.xz")
-sha1sums=('77bcc62cc587aa90e5cc02924f9379c9cf17f97e')
+sha1sums=('e10f00c4528e3d31a57935dd54c6276ba631e903')
 
 build() {
   mkdir build
diff --git a/extra/kdebindings-smokegen/PKGBUILD b/extra/kdebindings-smokegen/PKGBUILD
index 586af38b6..a165ba2a8 100644
--- a/extra/kdebindings-smokegen/PKGBUILD
+++ b/extra/kdebindings-smokegen/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193224 2013-08-19 09:54:17Z andrea $
+# $Id: PKGBUILD 195508 2013-10-01 15:14:27Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-smokegen
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="A general purpose C++ parser with a plugin infrastructure"
 url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokegen"
@@ -12,7 +12,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 conflicts=('kdebindings-smoke')
 source=("http://download.kde.org/stable/${pkgver}/src/smokegen-${pkgver}.tar.xz")
-sha1sums=('c4bb56f45dc135ac92b11c4bcbfcfe4b226565d7')
+sha1sums=('4fbb3292391d26b4c68bed44a819f54b05b33bc0')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdebindings-smokekde/PKGBUILD b/extra/kdebindings-smokekde/PKGBUILD
index 9b7fa30fe..a6d6ef08f 100644
--- a/extra/kdebindings-smokekde/PKGBUILD
+++ b/extra/kdebindings-smokekde/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193229 2013-08-19 09:54:23Z andrea $
+# $Id: PKGBUILD 195518 2013-10-01 15:15:12Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-smokekde
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="Language independent library for KDE bindings"
 url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokekde"
@@ -18,7 +18,7 @@ optdepends=('kdesdk-kate: Kate bindings'
             'kdepimlibs: akonadi bindings')
 conflicts=('kdebindings-smoke')
 source=("http://download.kde.org/stable/${pkgver}/src/smokekde-${pkgver}.tar.xz")
-sha1sums=('d99082d9f48ff0d6758d26d1e47cb1e44d2a7992')
+sha1sums=('09b73d8f13767cd9132387e391ddde09b14ed972')
 
 build() {
   mkdir build
diff --git a/extra/kdebindings-smokeqt/PKGBUILD b/extra/kdebindings-smokeqt/PKGBUILD
index 377d22138..f3857c279 100644
--- a/extra/kdebindings-smokeqt/PKGBUILD
+++ b/extra/kdebindings-smokeqt/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193225 2013-08-19 09:54:18Z andrea $
+# $Id: PKGBUILD 195510 2013-10-01 15:14:38Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-smokeqt
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="Language independent library for Qt bindings"
 url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokeqt"
@@ -13,7 +13,7 @@ depends=('kdebindings-smokegen' 'qimageblitz' 'qscintilla')
 makedepends=('cmake' 'automoc4' 'mesa')
 conflicts=('kdebindings-smoke')
 source=("http://download.kde.org/stable/${pkgver}/src/smokeqt-${pkgver}.tar.xz")
-sha1sums=('7b661f43c17098474d06f27949872fd44d4b2bc4')
+sha1sums=('d54d2e3ffae9ab526b9e04d1f03dfb8898a590b5')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-analitza/PKGBUILD b/extra/kdeedu-analitza/PKGBUILD
index 6f70822aa..1a41e328a 100644
--- a/extra/kdeedu-analitza/PKGBUILD
+++ b/extra/kdeedu-analitza/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193243 2013-08-19 09:54:37Z andrea $
+# $Id: PKGBUILD 195546 2013-10-01 15:17:21Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-analitza
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="A library to add mathematical features to your program"
 url="https://projects.kde.org/projects/kde/kdeedu/analitza"
@@ -12,7 +12,7 @@ groups=('kde' 'kdeedu')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/analitza-${pkgver}.tar.xz")
-sha1sums=('2950c6fa66ae6a7beb530a83974a17d08239a9eb')
+sha1sums=('f1b63cf72dc4ffa67ed96c1d073dda2dccf58e67')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-blinken/PKGBUILD b/extra/kdeedu-blinken/PKGBUILD
index ccd67aab6..d4873ab23 100644
--- a/extra/kdeedu-blinken/PKGBUILD
+++ b/extra/kdeedu-blinken/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193262 2013-08-19 09:54:55Z andrea $
+# $Id: PKGBUILD 195584 2013-10-01 15:20:20Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-blinken
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="Memory Enhancement Game"
 url="http://kde.org/applications/education/blinken/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/blinken-${pkgver}.tar.xz")
-sha1sums=('0f6b34ab9074c15b29bdcdf9f6fd153772f66058')
+sha1sums=('8517eb54038d0c51bd993dc26456993bb8cf1631')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-cantor/PKGBUILD b/extra/kdeedu-cantor/PKGBUILD
index d51ce86bd..e2d8c6789 100644
--- a/extra/kdeedu-cantor/PKGBUILD
+++ b/extra/kdeedu-cantor/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193263 2013-08-19 09:54:56Z andrea $
+# $Id: PKGBUILD 195586 2013-10-01 15:20:28Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-cantor
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="KDE Frontend to Mathematical Software"
 url="http://kde.org/applications/education/cantor/"
@@ -16,7 +16,7 @@ optdepends=('maxima: Maxima backend'
             'r: R backend')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/cantor-${pkgver}.tar.xz")
-sha1sums=('6126f637367f43b5a84bcc516f2f96ef4b7987ee')
+sha1sums=('d24c08721f0182bee317b24eb9afd99dd0790602')
 
 prepare() {
   mkdir build
diff --git a/extra/kdeedu-kalgebra/PKGBUILD b/extra/kdeedu-kalgebra/PKGBUILD
index ea36cd939..8a2806879 100644
--- a/extra/kdeedu-kalgebra/PKGBUILD
+++ b/extra/kdeedu-kalgebra/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193264 2013-08-19 09:54:58Z andrea $
+# $Id: PKGBUILD 195588 2013-10-01 15:20:36Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kalgebra
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="Graph Calculator"
 url="http://kde.org/applications/education/kalgebra/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu' 'kdeedu-analitza')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kalgebra-${pkgver}.tar.xz")
-sha1sums=('bb7c128750eef3e62ac39b245b7e8cfc4493b450')
+sha1sums=('29fa67fc0a4925318742c9746b7f9a5aec865563')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kalzium/PKGBUILD b/extra/kdeedu-kalzium/PKGBUILD
index 152bcfd33..b2afb2769 100644
--- a/extra/kdeedu-kalzium/PKGBUILD
+++ b/extra/kdeedu-kalzium/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 193265 2013-08-19 09:54:59Z andrea $
+# $Id: PKGBUILD 195986 2013-10-07 07:06:21Z tpowa $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kalzium
-pkgver=4.11.0
-pkgrel=1
+pkgver=4.11.2
+pkgrel=2
 pkgdesc="Periodic Table of Elements"
 url="http://kde.org/applications/education/kalzium/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'avogadro' 'ocaml' 'facile' 'chemical-mime-data')
 makedepends=('cmake' 'automoc4' 'mesa')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kalzium-${pkgver}.tar.xz")
-sha1sums=('f206cbd593aa1ee1bce0f089099aae198b4fb5f2')
+sha1sums=('20789b2f67fc4fe53cd81d58283911bc0a8fa68c')
 
 build() {
   mkdir build
diff --git a/extra/kdeedu-kanagram/PKGBUILD b/extra/kdeedu-kanagram/PKGBUILD
index 170d4ac95..e06789360 100644
--- a/extra/kdeedu-kanagram/PKGBUILD
+++ b/extra/kdeedu-kanagram/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193266 2013-08-19 09:55:00Z andrea $
+# $Id: PKGBUILD 195592 2013-10-01 15:20:52Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kanagram
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="Letter Order Game"
 url="http://kde.org/applications/education/kanagram/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kanagram-${pkgver}.tar.xz")
-sha1sums=('989e9c0b697a24554cde4e6316e63aa5302c3deb')
+sha1sums=('57a0acb63161e8d927317068e30fa2701814582e')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kbruch/PKGBUILD b/extra/kdeedu-kbruch/PKGBUILD
index efcf9ba9b..28eb48f01 100644
--- a/extra/kdeedu-kbruch/PKGBUILD
+++ b/extra/kdeedu-kbruch/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193267 2013-08-19 09:55:02Z andrea $
+# $Id: PKGBUILD 195594 2013-10-01 15:21:00Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kbruch
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="Exercise Fractions"
 url="http://kde.org/applications/education/kbruch/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kbruch-${pkgver}.tar.xz")
-sha1sums=('7010da4294dc50d15be8c5672dcf2032e708fb82')
+sha1sums=('d3173e20ae4b95a601eb5cb2abdccad73e43a8a8')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kgeography/PKGBUILD b/extra/kdeedu-kgeography/PKGBUILD
index 21d205180..6d40f4723 100644
--- a/extra/kdeedu-kgeography/PKGBUILD
+++ b/extra/kdeedu-kgeography/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193268 2013-08-19 09:55:03Z andrea $
+# $Id: PKGBUILD 195596 2013-10-01 15:21:08Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kgeography
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="Geography Trainer"
 url="http://kde.org/applications/education/kgeography/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kgeography-${pkgver}.tar.xz")
-sha1sums=('11e8b12645b2a039bbcf46b195e33826e5f79072')
+sha1sums=('aaa13ed6f38704bfb5187a1b1ba81e214f576c9f')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-khangman/PKGBUILD b/extra/kdeedu-khangman/PKGBUILD
index b1f9fc734..5faa48e4f 100644
--- a/extra/kdeedu-khangman/PKGBUILD
+++ b/extra/kdeedu-khangman/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193269 2013-08-19 09:55:04Z andrea $
+# $Id: PKGBUILD 195598 2013-10-01 15:21:17Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-khangman
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="Hangman Game"
 url="http://kde.org/applications/education/khangman/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/khangman-${pkgver}.tar.xz")
-sha1sums=('d9e849fb79468e83ce0033b3264d06f642093406')
+sha1sums=('05126aab8d051323c58ef40ee8800f77f841c44c')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kig/PKGBUILD b/extra/kdeedu-kig/PKGBUILD
index 449961ac2..325ec5a19 100644
--- a/extra/kdeedu-kig/PKGBUILD
+++ b/extra/kdeedu-kig/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193270 2013-08-19 09:55:06Z andrea $
+# $Id: PKGBUILD 195600 2013-10-01 15:21:24Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kig
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="Interactive Geometry"
 url="http://kde.org/applications/education/kig/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4' 'boost')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kig-${pkgver}.tar.xz")
-sha1sums=('050abf3c47c1bbd93cf8773674006113ab3e09a7')
+sha1sums=('984137eab99bff5829521e395e1b704498fffba6')
 
 build() {
   mkdir build
diff --git a/extra/kdeedu-kiten/PKGBUILD b/extra/kdeedu-kiten/PKGBUILD
index dcc5c7ade..761a937b0 100644
--- a/extra/kdeedu-kiten/PKGBUILD
+++ b/extra/kdeedu-kiten/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193271 2013-08-19 09:55:08Z andrea $
+# $Id: PKGBUILD 195602 2013-10-01 15:21:32Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kiten
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="Japanese Reference/Study Tool"
 url="http://kde.org/applications/education/kiten/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kiten-${pkgver}.tar.xz")
-sha1sums=('f7d0792c017704591a5840b615f15cd73fa0999b')
+sha1sums=('d8e4638de926e77d0866fac93d35f80234546ca3')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-klettres/PKGBUILD b/extra/kdeedu-klettres/PKGBUILD
index 39aff7919..923bb72cd 100644
--- a/extra/kdeedu-klettres/PKGBUILD
+++ b/extra/kdeedu-klettres/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193272 2013-08-19 09:55:09Z andrea $
+# $Id: PKGBUILD 195604 2013-10-01 15:21:54Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-klettres
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="Learn The Alphabet"
 url="http://kde.org/applications/education/klettres/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/klettres-${pkgver}.tar.xz")
-sha1sums=('309b1a0eabfc0f60a23c01df784dc92519bc5a4c')
+sha1sums=('dcb66130f08ce5ed15ff271f3d119fdbaab53951')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kmplot/PKGBUILD b/extra/kdeedu-kmplot/PKGBUILD
index 6601c496a..2d6af89f3 100644
--- a/extra/kdeedu-kmplot/PKGBUILD
+++ b/extra/kdeedu-kmplot/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193273 2013-08-19 09:55:11Z andrea $
+# $Id: PKGBUILD 195606 2013-10-01 15:22:12Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kmplot
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="Mathematical Function Plotter"
 url="http://kde.org/applications/education/kmplot/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kmplot-${pkgver}.tar.xz")
-sha1sums=('36821499b2e6835bc863e30405a1e25d9bbac773')
+sha1sums=('00dbf0f0df11ab82c65a491834b522865725c20e')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kstars/PKGBUILD b/extra/kdeedu-kstars/PKGBUILD
index e6b549c14..58513864b 100644
--- a/extra/kdeedu-kstars/PKGBUILD
+++ b/extra/kdeedu-kstars/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193274 2013-08-19 09:55:12Z andrea $
+# $Id: PKGBUILD 195608 2013-10-01 15:22:36Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kstars
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="Desktop Planetarium"
 url="http://kde.org/applications/education/kstars/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'wcslib' 'libindi')
 makedepends=('cmake' 'automoc4' 'eigen')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kstars-${pkgver}.tar.xz")
-sha1sums=('955b53ffcde6ef319c3ad3181957396a91887ddc')
+sha1sums=('9dc44a2b6a6cda29d3508206b1737f38d5bff54a')
 
 build() {
   mkdir build
@@ -29,4 +29,5 @@ build() {
 package() {
   cd build
   make DESTDIR="${pkgdir}" install
+  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|g' ${pkgdir}/usr/share/apps/kstars/scripts/supernova_updates_parser.py
 }
diff --git a/extra/kdeedu-ktouch/PKGBUILD b/extra/kdeedu-ktouch/PKGBUILD
index aad119556..fd904e6e5 100644
--- a/extra/kdeedu-ktouch/PKGBUILD
+++ b/extra/kdeedu-ktouch/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193275 2013-08-19 09:55:14Z andrea $
+# $Id: PKGBUILD 195610 2013-10-01 15:22:56Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-ktouch
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="Touch Typing Tutor"
 url="http://kde.org/applications/education/ktouch/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4' 'mesa')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/ktouch-${pkgver}.tar.xz")
-sha1sums=('7b847dc9a760e62e00281cca65d0faaacb93427d')
+sha1sums=('d8b1c37a0270dbfba63d5dc2e73d7320e58c07e5')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kturtle/PKGBUILD b/extra/kdeedu-kturtle/PKGBUILD
index d2aa968d2..1e0d32902 100644
--- a/extra/kdeedu-kturtle/PKGBUILD
+++ b/extra/kdeedu-kturtle/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193276 2013-08-19 09:55:15Z andrea $
+# $Id: PKGBUILD 195612 2013-10-01 15:23:10Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kturtle
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="Educational Programming Environment"
 url="http://kde.org/applications/education/kturtle/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kturtle-${pkgver}.tar.xz")
-sha1sums=('b2808e56702a9f1d11873d0633d0ed6fbee1ed78')
+sha1sums=('1343755dbc7ffbcb0da848fa13804cb86895d568')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kwordquiz/PKGBUILD b/extra/kdeedu-kwordquiz/PKGBUILD
index acd5ceb44..696276c71 100644
--- a/extra/kdeedu-kwordquiz/PKGBUILD
+++ b/extra/kdeedu-kwordquiz/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193277 2013-08-19 09:55:16Z andrea $
+# $Id: PKGBUILD 195614 2013-10-01 15:23:31Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kwordquiz
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="Flash Card Trainer"
 url="http://kde.org/applications/education/kwordquiz/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kwordquiz-${pkgver}.tar.xz")
-sha1sums=('5a8cd264eb1650fc7f772ae5fb29cb3789b77ee0')
+sha1sums=('d630d944824296459d643a76323cab34126ddf92')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-marble/PKGBUILD b/extra/kdeedu-marble/PKGBUILD
index 37c21759b..ece18c857 100644
--- a/extra/kdeedu-marble/PKGBUILD
+++ b/extra/kdeedu-marble/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193238 2013-08-19 09:54:32Z andrea $
+# $Id: PKGBUILD 195536 2013-10-01 15:16:34Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-marble
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="Desktop Globe"
 url="http://kde.org/applications/education/marble/"
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'gpsd')
 optdepends=('gpsd: gps support')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.xz")
-sha1sums=('a7feb09a825f93c301fdfec5975813f09f14f41b')
+sha1sums=('d37528ba9c61f8938569ea6af39d0fd5181f52d4')
 
 build() {
   mkdir build
diff --git a/extra/kdeedu-pairs/PKGBUILD b/extra/kdeedu-pairs/PKGBUILD
index c216aa035..8effe234e 100644
--- a/extra/kdeedu-pairs/PKGBUILD
+++ b/extra/kdeedu-pairs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193278 2013-08-19 09:55:18Z andrea $
+# $Id: PKGBUILD 195616 2013-10-01 15:23:51Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-pairs
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="A memory and pairs game for KDE"
 url="https://projects.kde.org/projects/kde/kdeedu/pairs"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/pairs-${pkgver}.tar.xz")
-sha1sums=('d1b284e4dc768f07ee4d680af2f184591f0b29e6')
+sha1sums=('3c066354585127ad6f9c9e0ed99c8b6f0bd0c3b1')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-parley/PKGBUILD b/extra/kdeedu-parley/PKGBUILD
index 701173eaf..09d17201f 100644
--- a/extra/kdeedu-parley/PKGBUILD
+++ b/extra/kdeedu-parley/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193279 2013-08-19 09:55:19Z andrea $
+# $Id: PKGBUILD 195618 2013-10-01 15:25:01Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-parley
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="Vocabulary Trainer"
 url="http://kde.org/applications/education/parley/"
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4')
 optdepends=('kdebindings-kross-python: scripting support')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/parley-${pkgver}.tar.xz")
-sha1sums=('04734868e2fc8ffc396e7939f02a7ee403ee0893')
+sha1sums=('f98d01d01fde0ec28be842874245af4aa88a95b6')
 
 build() {
   mkdir build
diff --git a/extra/kdeedu-rocs/PKGBUILD b/extra/kdeedu-rocs/PKGBUILD
index 7ec8ec8be..a6a6a7d3e 100644
--- a/extra/kdeedu-rocs/PKGBUILD
+++ b/extra/kdeedu-rocs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193280 2013-08-19 09:55:21Z andrea $
+# $Id: PKGBUILD 195620 2013-10-01 15:25:09Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-rocs
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="Rocs Graph Theory"
 url="http://kde.org/applications/education/rocs/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4' 'boost')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/rocs-${pkgver}.tar.xz")
-sha1sums=('216bb4655cd9c601e8857d47fbcfdaa50d28e512')
+sha1sums=('cede7bdee7f2d64da79b564461ede119108a6a55')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-step/PKGBUILD b/extra/kdeedu-step/PKGBUILD
index e96e31893..fbedab5c5 100644
--- a/extra/kdeedu-step/PKGBUILD
+++ b/extra/kdeedu-step/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193281 2013-08-19 09:55:23Z andrea $
+# $Id: PKGBUILD 195622 2013-10-01 15:25:16Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-step
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="Interactive Physical Simulator"
 url="http://kde.org/applications/education/step/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libqalculate' 'gsl')
 makedepends=('cmake' 'automoc4' 'eigen' 'mesa')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/step-${pkgver}.tar.xz")
-sha1sums=('9cf6fcdb469dda029be8d15c057af036729610c2')
+sha1sums=('1b6dd907caa47f3867ad03eb7d4e91f3981a2730')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegames-bomber/PKGBUILD b/extra/kdegames-bomber/PKGBUILD
index b8521a1ad..d7360c280 100644
--- a/extra/kdegames-bomber/PKGBUILD
+++ b/extra/kdegames-bomber/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193282 2013-08-19 09:55:25Z andrea $
+# $Id: PKGBUILD 195624 2013-10-01 15:25:22Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-bomber
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="A single player arcade game"
 url="http://kde.org/applications/games/bomber/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/bomber-${pkgver}.tar.xz")
-sha1sums=('562551627c35b509e6c2a34977dc8c4cc09a4838')
+sha1sums=('c6bd8e69cd7e172f63893b7c1c6305006ace79ab')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-bovo/PKGBUILD b/extra/kdegames-bovo/PKGBUILD
index 5a1bcd61c..50a41fa9b 100644
--- a/extra/kdegames-bovo/PKGBUILD
+++ b/extra/kdegames-bovo/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193283 2013-08-19 09:55:26Z andrea $
+# $Id: PKGBUILD 195626 2013-10-01 15:25:29Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-bovo
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="A Gomoku like game for two players"
 url="http://kde.org/applications/games/bovo/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/bovo-${pkgver}.tar.xz")
-sha1sums=('96429d14bf801aa2950c018146da0632facaabe4')
+sha1sums=('7e98d4b6e4b7396f3f81a2295f35ddc0bf669ddc')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-granatier/PKGBUILD b/extra/kdegames-granatier/PKGBUILD
index 60099a930..f656d7393 100644
--- a/extra/kdegames-granatier/PKGBUILD
+++ b/extra/kdegames-granatier/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193284 2013-08-19 09:55:29Z andrea $
+# $Id: PKGBUILD 195628 2013-10-01 15:25:37Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-granatier
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="A clone of the classic Bomberman game"
 url="http://kde.org/applications/games/granatier/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/granatier-${pkgver}.tar.xz")
-sha1sums=('37c4453c5c1c1712912383e2be1766be5f5948cd')
+sha1sums=('f83a41521c95d3f40963155f9f9760499cdb2429')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kapman/PKGBUILD b/extra/kdegames-kapman/PKGBUILD
index c06137ad5..69b5f349c 100644
--- a/extra/kdegames-kapman/PKGBUILD
+++ b/extra/kdegames-kapman/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193286 2013-08-19 09:55:35Z andrea $
+# $Id: PKGBUILD 195632 2013-10-01 15:25:51Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kapman
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="A clone of the well known game Pac-Man"
 url="http://kde.org/applications/games/kapman/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kapman-${pkgver}.tar.xz")
-sha1sums=('312dd63aa8b3849414cdfe901cff67255ac511e0')
+sha1sums=('858147cc497c07fec55b5cfc9ed2abf671e71645')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-katomic/PKGBUILD b/extra/kdegames-katomic/PKGBUILD
index 8fe94504c..dc2833492 100644
--- a/extra/kdegames-katomic/PKGBUILD
+++ b/extra/kdegames-katomic/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193287 2013-08-19 09:55:36Z andrea $
+# $Id: PKGBUILD 195634 2013-10-01 15:25:59Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-katomic
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="A fun and educational game built around molecular geometry"
 url="http://kde.org/applications/games/katomic/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/katomic-${pkgver}.tar.xz")
-sha1sums=('2c8050f3069df2ed46322b9aa29ae1ad0868d4f2')
+sha1sums=('d640e617e0ee55db1ffceafd14b714df290f185f')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kblackbox/PKGBUILD b/extra/kdegames-kblackbox/PKGBUILD
index 84907d68a..d523f9be9 100644
--- a/extra/kdegames-kblackbox/PKGBUILD
+++ b/extra/kdegames-kblackbox/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193288 2013-08-19 09:55:37Z andrea $
+# $Id: PKGBUILD 195636 2013-10-01 15:26:08Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kblackbox
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="A game of hide and seek played on a grid of boxes"
 url="http://kde.org/applications/games/kblackbox/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kblackbox-${pkgver}.tar.xz")
-sha1sums=('d2347c7365d37d7afc7057dbc9cd4f6f5a7b82b4')
+sha1sums=('27b8370bca2ece8aef7a0d9604d7dfd80c44b1d2')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kblocks/PKGBUILD b/extra/kdegames-kblocks/PKGBUILD
index 1d7d23c7a..d110f9f8a 100644
--- a/extra/kdegames-kblocks/PKGBUILD
+++ b/extra/kdegames-kblocks/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193289 2013-08-19 09:55:39Z andrea $
+# $Id: PKGBUILD 195638 2013-10-01 15:26:16Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kblocks
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="The classic falling blocks game"
 url="http://kde.org/applications/games/kblocks/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kblocks-${pkgver}.tar.xz")
-sha1sums=('90ebab1d33df63bff608023084b1f83c4e5e5c6e')
+sha1sums=('d248a16fd4d430da6138f1b20ca8dcf67893e68c')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kbounce/PKGBUILD b/extra/kdegames-kbounce/PKGBUILD
index 660c3d436..126c8b29a 100644
--- a/extra/kdegames-kbounce/PKGBUILD
+++ b/extra/kdegames-kbounce/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193290 2013-08-19 09:55:41Z andrea $
+# $Id: PKGBUILD 195640 2013-10-01 15:26:26Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kbounce
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="A single player arcade game with the elements of puzzle"
 url="http://kde.org/applications/games/kbounce/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kbounce-${pkgver}.tar.xz")
-sha1sums=('3eac97000785aa6e7092af1e921bc5ec1c2eff44')
+sha1sums=('a1bd2b405c6aae79dac8063d6b461e88ba6ded51')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kbreakout/PKGBUILD b/extra/kdegames-kbreakout/PKGBUILD
index de0a3357d..3c888916b 100644
--- a/extra/kdegames-kbreakout/PKGBUILD
+++ b/extra/kdegames-kbreakout/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193291 2013-08-19 09:55:43Z andrea $
+# $Id: PKGBUILD 195642 2013-10-01 15:26:34Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kbreakout
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="A Breakout-like game"
 url="http://kde.org/applications/games/kbreakout/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kbreakout-${pkgver}.tar.xz")
-sha1sums=('b8559bba88f9793203d3e7f46b05f81893403453')
+sha1sums=('2ae752f463e12b267e84b9847d68993b61becc4a')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kdiamond/PKGBUILD b/extra/kdegames-kdiamond/PKGBUILD
index 5b7fe6b3b..386ecefd8 100644
--- a/extra/kdegames-kdiamond/PKGBUILD
+++ b/extra/kdegames-kdiamond/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193292 2013-08-19 09:55:44Z andrea $
+# $Id: PKGBUILD 195644 2013-10-01 15:26:42Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kdiamond
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="A single player puzzle game"
 url="http://kde.org/applications/games/kdiamond/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kdiamond-${pkgver}.tar.xz")
-sha1sums=('75a956cb672f32d6a40e10f67253734300fea5c4')
+sha1sums=('bf6d4d03ed8dec892785cf898dd954d9f8867268')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kfourinline/PKGBUILD b/extra/kdegames-kfourinline/PKGBUILD
index 3c3289412..bcc92f678 100644
--- a/extra/kdegames-kfourinline/PKGBUILD
+++ b/extra/kdegames-kfourinline/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193293 2013-08-19 09:55:46Z andrea $
+# $Id: PKGBUILD 195646 2013-10-01 15:26:52Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kfourinline
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="A four-in-a-row game"
 url="http://kde.org/applications/games/kfourinline/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kfourinline-${pkgver}.tar.xz")
-sha1sums=('27f71f82ba4e43efcb50dfffdbbfa14d80a21726')
+sha1sums=('c832f1485fad84e0e97c4de71bacc602f5cfe269')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kgoldrunner/PKGBUILD b/extra/kdegames-kgoldrunner/PKGBUILD
index b737c551c..5d4bd8b3f 100644
--- a/extra/kdegames-kgoldrunner/PKGBUILD
+++ b/extra/kdegames-kgoldrunner/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193294 2013-08-19 09:55:47Z andrea $
+# $Id: PKGBUILD 195648 2013-10-01 15:27:00Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kgoldrunner
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="A game of action and puzzle solving"
 url="http://kde.org/applications/games/kgoldrunner/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kgoldrunner-${pkgver}.tar.xz")
-sha1sums=('e28245a4c1c8327669a353fa47913bb893498526')
+sha1sums=('a6bc9684535df789a1d901bb76b491a6c0cd2152')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kigo/PKGBUILD b/extra/kdegames-kigo/PKGBUILD
index 51f878dca..ff320d10d 100644
--- a/extra/kdegames-kigo/PKGBUILD
+++ b/extra/kdegames-kigo/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193295 2013-08-19 09:55:49Z andrea $
+# $Id: PKGBUILD 195650 2013-10-01 15:27:10Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kigo
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="An open-source implementation of the popular Go game"
 url="http://kde.org/applications/games/kigo/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames' 'gnugo')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kigo-${pkgver}.tar.xz")
-sha1sums=('9753b7cde11acca14d63217e91c2534cc13c35b7')
+sha1sums=('7f542952c905a0159baa6bf76859e555ccc734f1')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-killbots/PKGBUILD b/extra/kdegames-killbots/PKGBUILD
index 4af58db5b..3529def51 100644
--- a/extra/kdegames-killbots/PKGBUILD
+++ b/extra/kdegames-killbots/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193296 2013-08-19 09:55:51Z andrea $
+# $Id: PKGBUILD 195652 2013-10-01 15:27:20Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-killbots
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="A simple game of evading killer robots"
 url="http://kde.org/applications/games/killbots/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/killbots-${pkgver}.tar.xz")
-sha1sums=('e7d2dd5f0cd26729dfb1fc57db47b487fe17ee79')
+sha1sums=('51fec4b46a44de9412ea30716b9aeabb23ce1b08')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kiriki/PKGBUILD b/extra/kdegames-kiriki/PKGBUILD
index 66c0aad98..4d2605b70 100644
--- a/extra/kdegames-kiriki/PKGBUILD
+++ b/extra/kdegames-kiriki/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193297 2013-08-19 09:55:53Z andrea $
+# $Id: PKGBUILD 195654 2013-10-01 15:27:31Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kiriki
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="An addictive and fun dice game"
 url="http://kde.org/applications/games/kiriki/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kiriki-${pkgver}.tar.xz")
-sha1sums=('10fbe6c2a1162c53c01e9d8d5113b05db3e8a305')
+sha1sums=('85ee7a363c2acd357c234750e76735f4a44ecfe5')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kjumpingcube/PKGBUILD b/extra/kdegames-kjumpingcube/PKGBUILD
index 8fe63acf1..237ef18ba 100644
--- a/extra/kdegames-kjumpingcube/PKGBUILD
+++ b/extra/kdegames-kjumpingcube/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193298 2013-08-19 09:55:55Z andrea $
+# $Id: PKGBUILD 195656 2013-10-01 15:27:43Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kjumpingcube
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="A simple tactical game"
 url="http://kde.org/applications/games/kjumpingcube/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kjumpingcube-${pkgver}.tar.xz")
-sha1sums=('016196c8b05572136b9436427a8a136518a32f07')
+sha1sums=('accd0b0113e3d39862a61073bfe43ead4ae66931')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-klickety/PKGBUILD b/extra/kdegames-klickety/PKGBUILD
index 738a2424e..a417b2916 100644
--- a/extra/kdegames-klickety/PKGBUILD
+++ b/extra/kdegames-klickety/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193299 2013-08-19 09:55:59Z andrea $
+# $Id: PKGBUILD 195658 2013-10-01 15:27:50Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-klickety
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="An adaptation of the Clickomania game"
 url="http://kde.org/applications/games/klickety/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/klickety-${pkgver}.tar.xz")
-sha1sums=('ef0d3e62163c1e7fdbabe59f44745f0a2157818d')
+sha1sums=('8fbddac4341e15d13f49c32c0944c8039e439e2e')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-klines/PKGBUILD b/extra/kdegames-klines/PKGBUILD
index a5ea903e7..e8bbf2535 100644
--- a/extra/kdegames-klines/PKGBUILD
+++ b/extra/kdegames-klines/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193300 2013-08-19 09:56:00Z andrea $
+# $Id: PKGBUILD 195660 2013-10-01 15:27:58Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-klines
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="A simple but highly addictive, one player game"
 url="http://kde.org/applications/games/klines/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/klines-${pkgver}.tar.xz")
-sha1sums=('4de5385ee60342af078efae25b97fb575cdf61d1')
+sha1sums=('52998f7c594c7d6deb6462c04569edfe6fc55526')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kmahjongg/PKGBUILD b/extra/kdegames-kmahjongg/PKGBUILD
index a4e7daf7f..8e66402c8 100644
--- a/extra/kdegames-kmahjongg/PKGBUILD
+++ b/extra/kdegames-kmahjongg/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193301 2013-08-19 09:56:02Z andrea $
+# $Id: PKGBUILD 195662 2013-10-01 15:28:06Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kmahjongg
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="A tile matching game for one or two players"
 url="http://kde.org/applications/games/kmahjongg/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkmahjongg' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kmahjongg-${pkgver}.tar.xz")
-sha1sums=('8db268624dc3ddc29510cb4c8c4994f907141b08')
+sha1sums=('af458140e050374226e69a9041d61ea2cfa53a74')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kmines/PKGBUILD b/extra/kdegames-kmines/PKGBUILD
index b79f94ec3..3d010330f 100644
--- a/extra/kdegames-kmines/PKGBUILD
+++ b/extra/kdegames-kmines/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193302 2013-08-19 09:56:05Z andrea $
+# $Id: PKGBUILD 195664 2013-10-01 15:28:15Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kmines
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="The classic Minesweeper game"
 url="http://kde.org/applications/games/kmines/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kmines-${pkgver}.tar.xz")
-sha1sums=('c456bfc098fb4bac38446b1da725855624390238')
+sha1sums=('e76b14c64361133dbaab03e72633d344f0e0faff')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-knavalbattle/PKGBUILD b/extra/kdegames-knavalbattle/PKGBUILD
index 344d476a9..09b76ba2e 100644
--- a/extra/kdegames-knavalbattle/PKGBUILD
+++ b/extra/kdegames-knavalbattle/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193303 2013-08-19 09:56:06Z andrea $
+# $Id: PKGBUILD 195666 2013-10-01 15:28:22Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-knavalbattle
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="A ship sinking game"
 url="http://kde.org/applications/games/knavalbattle/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/knavalbattle-${pkgver}.tar.xz")
-sha1sums=('cec8d3a13b916bb2b429819a6ae588fca107d2b8')
+sha1sums=('e9de15755f03bbdecb50765134bf4440214d2a93')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-knetwalk/PKGBUILD b/extra/kdegames-knetwalk/PKGBUILD
index e7e4b0eb4..5c4b32f32 100644
--- a/extra/kdegames-knetwalk/PKGBUILD
+++ b/extra/kdegames-knetwalk/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193304 2013-08-19 09:56:08Z andrea $
+# $Id: PKGBUILD 195668 2013-10-01 15:28:29Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-knetwalk
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="Connect all the terminals to the server, in as few turns as possible"
 url="http://kde.org/applications/games/knetwalk/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/knetwalk-${pkgver}.tar.xz")
-sha1sums=('e2c5108b23d2b7f069fa0819122ba96fb823c5d7')
+sha1sums=('259a493851f84217d37cd03306618cbebf50baf8')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kolf/PKGBUILD b/extra/kdegames-kolf/PKGBUILD
index 8447b448c..29aff7c9d 100644
--- a/extra/kdegames-kolf/PKGBUILD
+++ b/extra/kdegames-kolf/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193305 2013-08-19 09:56:10Z andrea $
+# $Id: PKGBUILD 195670 2013-10-01 15:28:37Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kolf
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="A miniature golf game with 2d top-down view"
 url="http://kde.org/applications/games/kolf/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kolf-${pkgver}.tar.xz")
-sha1sums=('b3aeed99ffe55d6ca06e4af8e2a6490a41bdf3a8')
+sha1sums=('1b32e7cb03ab7e8653e6f3a54f05f716e0d9ca8f')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kollision/PKGBUILD b/extra/kdegames-kollision/PKGBUILD
index dbdd6403a..8fc26b584 100644
--- a/extra/kdegames-kollision/PKGBUILD
+++ b/extra/kdegames-kollision/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193306 2013-08-19 09:56:11Z andrea $
+# $Id: PKGBUILD 195672 2013-10-01 15:28:45Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kollision
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="A simple ball dodging game"
 url="http://kde.org/applications/games/kollision/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kollision-${pkgver}.tar.xz")
-sha1sums=('2bd85e458e3c284dad377246159af7f3f51a9d24')
+sha1sums=('0c5be24b8885635de8e0ef94d70c7e5522287d3f')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-konquest/PKGBUILD b/extra/kdegames-konquest/PKGBUILD
index 2b0a2224d..2e8b6da70 100644
--- a/extra/kdegames-konquest/PKGBUILD
+++ b/extra/kdegames-konquest/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193307 2013-08-19 09:56:13Z andrea $
+# $Id: PKGBUILD 195674 2013-10-01 15:28:53Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-konquest
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="The KDE version of Gnu-Lactic"
 url="http://kde.org/applications/games/konquest/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/konquest-${pkgver}.tar.xz")
-sha1sums=('fca9a8b091c62aa0ff59e1910781680de51c7846')
+sha1sums=('d8333e0965289b273554d81fa97d8b4b4a3f1456')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kpatience/PKGBUILD b/extra/kdegames-kpatience/PKGBUILD
index 9607d0505..8eee9fd6c 100644
--- a/extra/kdegames-kpatience/PKGBUILD
+++ b/extra/kdegames-kpatience/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193308 2013-08-19 09:56:15Z andrea $
+# $Id: PKGBUILD 195676 2013-10-01 15:29:02Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kpatience
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="Offers a selection of solitaire card games"
 url="http://kde.org/applications/games/kpat/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kpat-${pkgver}.tar.xz")
-sha1sums=('2f76f802e9d72c83e5372aa8baa110aa447f5b67')
+sha1sums=('34e562ec8c892bbf9775e020e1c9fb5135adf164')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kreversi/PKGBUILD b/extra/kdegames-kreversi/PKGBUILD
index ddde37b5a..f6a89633b 100644
--- a/extra/kdegames-kreversi/PKGBUILD
+++ b/extra/kdegames-kreversi/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193309 2013-08-19 09:56:17Z andrea $
+# $Id: PKGBUILD 195678 2013-10-01 15:29:10Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kreversi
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="A simple one player strategy game played against the computer"
 url="http://kde.org/applications/games/kreversi/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kreversi-${pkgver}.tar.xz")
-sha1sums=('872a4a7f27c60e0781ec09061299c1f6ff479a5d')
+sha1sums=('adc039fd970fadd76e654fcae17b522baf0be716')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kshisen/PKGBUILD b/extra/kdegames-kshisen/PKGBUILD
index 3f0875cf6..837089359 100644
--- a/extra/kdegames-kshisen/PKGBUILD
+++ b/extra/kdegames-kshisen/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193310 2013-08-19 09:56:19Z andrea $
+# $Id: PKGBUILD 195680 2013-10-01 15:29:18Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kshisen
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="A solitaire-like game played using the standard set of Mahjong tiles"
 url="http://kde.org/applications/games/kshisen/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames' 'libkmahjongg')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kshisen-${pkgver}.tar.xz")
-sha1sums=('05cbe373149c9b951d396022a58984428fb48919')
+sha1sums=('59e6d8e1a76206dbeef8697b919f7890ecca80b3')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-ksirk/PKGBUILD b/extra/kdegames-ksirk/PKGBUILD
index 657f4cce7..f98487ba5 100644
--- a/extra/kdegames-ksirk/PKGBUILD
+++ b/extra/kdegames-ksirk/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193311 2013-08-19 09:56:20Z andrea $
+# $Id: PKGBUILD 195682 2013-10-01 15:29:25Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-ksirk
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="A computerized version of a well known strategy game"
 url="http://kde.org/applications/games/ksirk/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/ksirk-${pkgver}.tar.xz")
-sha1sums=('b7191b75ce9e33dfa693b366af388ab6e3547f0d')
+sha1sums=('87fcb89e0160b8cc4e5b576f0aac3b5f074fb131')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-ksnakeduel/PKGBUILD b/extra/kdegames-ksnakeduel/PKGBUILD
index d0b76fc1a..31768db78 100644
--- a/extra/kdegames-ksnakeduel/PKGBUILD
+++ b/extra/kdegames-ksnakeduel/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193312 2013-08-19 09:56:22Z andrea $
+# $Id: PKGBUILD 195684 2013-10-01 15:29:33Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-ksnakeduel
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="A simple snake duel game"
 url="http://kde.org/applications/games/ksnakeduel/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/ksnakeduel-${pkgver}.tar.xz")
-sha1sums=('00a781f5cfc39c51642160765417e5acc679f502')
+sha1sums=('f05ea9a609b5a16d73c92ec8557a66f9c6f23b17')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kspaceduel/PKGBUILD b/extra/kdegames-kspaceduel/PKGBUILD
index 7ccdf5b10..bd8d57feb 100644
--- a/extra/kdegames-kspaceduel/PKGBUILD
+++ b/extra/kdegames-kspaceduel/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193313 2013-08-19 09:56:23Z andrea $
+# $Id: PKGBUILD 195686 2013-10-01 15:29:41Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kspaceduel
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="Each of two possible players controls a satellite spaceship orbiting the sun"
 url="http://kde.org/applications/games/kspaceduel/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kspaceduel-${pkgver}.tar.xz")
-sha1sums=('25cc88607546efb509924a92b4e12707a44da1fe')
+sha1sums=('c488e638aea02b67bab6caf4898f7d007b44e089')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-ksquares/PKGBUILD b/extra/kdegames-ksquares/PKGBUILD
index 94004e30d..0f16d38a9 100644
--- a/extra/kdegames-ksquares/PKGBUILD
+++ b/extra/kdegames-ksquares/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193314 2013-08-19 09:56:25Z andrea $
+# $Id: PKGBUILD 195688 2013-10-01 15:29:48Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-ksquares
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="A modeled after the well known pen and paper based game of Dots and Boxes"
 url="http://kde.org/applications/games/ksquares/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/ksquares-${pkgver}.tar.xz")
-sha1sums=('3196c54800dd00182087ed8076a17271d4e66bc4')
+sha1sums=('f649ac82973623414342f2c1b48486fc9ab94973')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-ksudoku/PKGBUILD b/extra/kdegames-ksudoku/PKGBUILD
index 7adf9286e..0de779d86 100644
--- a/extra/kdegames-ksudoku/PKGBUILD
+++ b/extra/kdegames-ksudoku/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193315 2013-08-19 09:56:26Z andrea $
+# $Id: PKGBUILD 195690 2013-10-01 15:29:55Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-ksudoku
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="A logic-based symbol placement puzzle"
 url="http://kde.org/applications/games/ksudoku/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/ksudoku-${pkgver}.tar.xz")
-sha1sums=('e875827f5892ac43386baac1448459dd55dbadb3')
+sha1sums=('73ac09b5e3f0d0be33aa6830349c9a20b7399d6f')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-ktuberling/PKGBUILD b/extra/kdegames-ktuberling/PKGBUILD
index 4ddb1463b..296e4649d 100644
--- a/extra/kdegames-ktuberling/PKGBUILD
+++ b/extra/kdegames-ktuberling/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193316 2013-08-19 09:56:28Z andrea $
+# $Id: PKGBUILD 195692 2013-10-01 15:30:05Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-ktuberling
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="A simple constructor game suitable for children and adults alike"
 url="http://kde.org/applications/games/ktuberling/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/ktuberling-${pkgver}.tar.xz")
-sha1sums=('7528f966835e53ca46e74ae4cf53739ed0d3cc69')
+sha1sums=('e7cfb00de7a7142a164052d09ebcf07eb9f1d73a')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kubrick/PKGBUILD b/extra/kdegames-kubrick/PKGBUILD
index 02a255984..0dab47f3d 100644
--- a/extra/kdegames-kubrick/PKGBUILD
+++ b/extra/kdegames-kubrick/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193317 2013-08-19 09:56:30Z andrea $
+# $Id: PKGBUILD 195694 2013-10-01 15:30:14Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kubrick
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="Based on the famous Rubik's Cube"
 url="http://kde.org/applications/games/kubrick/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kubrick-${pkgver}.tar.xz")
-sha1sums=('f249947c3640872a2cdb309b63ed682559ababde')
+sha1sums=('0f5ef0e814532a1ff37364c43ad05de30d974efa')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-lskat/PKGBUILD b/extra/kdegames-lskat/PKGBUILD
index d6c26d79e..1243768ca 100644
--- a/extra/kdegames-lskat/PKGBUILD
+++ b/extra/kdegames-lskat/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193318 2013-08-19 09:56:32Z andrea $
+# $Id: PKGBUILD 195696 2013-10-01 15:30:22Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-lskat
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="Lieutenant Skat is a fun and engaging card game for two players"
 url="http://kde.org/applications/games/lskat/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/lskat-${pkgver}.tar.xz")
-sha1sums=('e0e1382b022d04cbd89786232107262112893cf4')
+sha1sums=('ad2736dba919a04f147f5854654a46e800830a53')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-palapeli/PKGBUILD b/extra/kdegames-palapeli/PKGBUILD
index 83b076f4b..e6b9a3352 100644
--- a/extra/kdegames-palapeli/PKGBUILD
+++ b/extra/kdegames-palapeli/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193319 2013-08-19 09:56:34Z andrea $
+# $Id: PKGBUILD 195698 2013-10-01 15:30:31Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-palapeli
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="A single-player jigsaw puzzle game"
 url="http://kde.org/applications/games/palapeli/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames' 'qhull')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/palapeli-${pkgver}.tar.xz")
-sha1sums=('c4cc64e2969e815e1f23d8c89f418e498cbe334a')
+sha1sums=('162da00abfdd31958935e30cb5622f4fd29ab48e')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-picmi/PKGBUILD b/extra/kdegames-picmi/PKGBUILD
index 0de38efb9..79df436f1 100644
--- a/extra/kdegames-picmi/PKGBUILD
+++ b/extra/kdegames-picmi/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193320 2013-08-19 09:56:39Z andrea $
+# $Id: PKGBUILD 195700 2013-10-01 15:30:39Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-picmi
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="A nonogram logic game for KDE"
 url="http://kde.org/applications/games/picmi/"
@@ -15,7 +15,7 @@ replaces=('picmi')
 conflicts=('picmi')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/picmi-${pkgver}.tar.xz")
-sha1sums=('80d577618e1b957f6fe57986ef03ab42437d914f')
+sha1sums=('2399ba362a6d97d556de2e7e4fce0d21b294fcbf')
 
 build() {
   mkdir build
diff --git a/extra/kdegraphics-gwenview/PKGBUILD b/extra/kdegraphics-gwenview/PKGBUILD
index 7986ca53d..4c133c1e6 100644
--- a/extra/kdegraphics-gwenview/PKGBUILD
+++ b/extra/kdegraphics-gwenview/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193321 2013-08-19 09:56:42Z andrea $
+# $Id: PKGBUILD 195702 2013-10-01 15:30:46Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-gwenview
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="A fast and easy to use image viewer for KDE"
 url="http://kde.org/applications/graphics/gwenview/"
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'mesa')
 optdepends=('kipi-plugins: extra plugins to share photos')
 install=$pkgname.install
 source=("http://download.kde.org/stable/${pkgver}/src/gwenview-${pkgver}.tar.xz")
-sha1sums=('3b8b06db3a696e397a28522df605fd91f41a9fef')
+sha1sums=('a52c8c0312e5fd90e7a62099bd4a1a70fc5d37c0')
 
 build() {
   mkdir build
diff --git a/extra/kdegraphics-kamera/PKGBUILD b/extra/kdegraphics-kamera/PKGBUILD
index 8557acc33..71f14ad38 100644
--- a/extra/kdegraphics-kamera/PKGBUILD
+++ b/extra/kdegraphics-kamera/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193322 2013-08-19 09:56:43Z andrea $
+# $Id: PKGBUILD 195704 2013-10-01 15:30:54Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kamera
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="Configure Kamera"
 url="http://kde.org/applications/graphics/kamera/"
@@ -12,7 +12,7 @@ groups=('kde' 'kdegraphics')
 depends=('kdebase-runtime' 'libgphoto2')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/kamera-${pkgver}.tar.xz")
-sha1sums=('54ad8e61aca0016d23f996a374fafcf1a838342e')
+sha1sums=('23008a038d247f81ad7878257eec329008a65f7e')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-kcolorchooser/PKGBUILD b/extra/kdegraphics-kcolorchooser/PKGBUILD
index 2990392f0..0bd1a2fca 100644
--- a/extra/kdegraphics-kcolorchooser/PKGBUILD
+++ b/extra/kdegraphics-kcolorchooser/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193323 2013-08-19 09:56:44Z andrea $
+# $Id: PKGBUILD 195706 2013-10-01 15:31:02Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kcolorchooser
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="Color Chooser"
 url="http://kde.org/applications/graphics/kcolorchooser/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kcolorchooser-${pkgver}.tar.xz")
-sha1sums=('6d41705b23ad12051b6b0347408c3ed2db753386')
+sha1sums=('fedbdf1ead8bc1096c5c0da5fd9e857f67798ca5')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-kgamma/PKGBUILD b/extra/kdegraphics-kgamma/PKGBUILD
index 4ac2a7583..8a97a44ea 100644
--- a/extra/kdegraphics-kgamma/PKGBUILD
+++ b/extra/kdegraphics-kgamma/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193324 2013-08-19 09:56:46Z andrea $
+# $Id: PKGBUILD 195708 2013-10-01 15:31:10Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kgamma
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="A monitor calibration tool"
 url="http://kde.org/applications/graphics/kgamma/"
@@ -15,7 +15,7 @@ groups=('kde' 'kdegraphics')
 depends=('kdebase-runtime' 'libxxf86vm')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/kgamma-${pkgver}.tar.xz")
-sha1sums=('14a2f4868664a35ab3685203584fe1673257dba6')
+sha1sums=('b65fe9770310f60c2a9f951424100d0a02d13fa5')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-kolourpaint/PKGBUILD b/extra/kdegraphics-kolourpaint/PKGBUILD
index cb406d77f..51c44fe15 100644
--- a/extra/kdegraphics-kolourpaint/PKGBUILD
+++ b/extra/kdegraphics-kolourpaint/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193325 2013-08-19 09:56:47Z andrea $
+# $Id: PKGBUILD 195710 2013-10-01 15:31:18Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kolourpaint
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="Paint Program"
 url="http://kde.org/applications/graphics/kolourpaint/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'qimageblitz')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kolourpaint-${pkgver}.tar.xz")
-sha1sums=('529d62b18f458d0c8d49ccaa16919755e974eb7d')
+sha1sums=('bd7cb2c69daa94e19db34ac0eff2c4d494ba1491')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-kruler/PKGBUILD b/extra/kdegraphics-kruler/PKGBUILD
index 010f6af99..6ce8e1a80 100644
--- a/extra/kdegraphics-kruler/PKGBUILD
+++ b/extra/kdegraphics-kruler/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193326 2013-08-19 09:56:49Z andrea $
+# $Id: PKGBUILD 195712 2013-10-01 15:31:25Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kruler
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="Screen Ruler"
 url="http://kde.org/applications/graphics/kruler/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kruler-${pkgver}.tar.xz")
-sha1sums=('fa541ee3daefd5ac8135638ee166bc13bb2d0b29')
+sha1sums=('01fa3df0c2a5e55e447ac9e03321f4ac299572e9')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-ksaneplugin/PKGBUILD b/extra/kdegraphics-ksaneplugin/PKGBUILD
index a6d80fcb7..eedbeaa47 100644
--- a/extra/kdegraphics-ksaneplugin/PKGBUILD
+++ b/extra/kdegraphics-ksaneplugin/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193327 2013-08-19 09:56:51Z andrea $
+# $Id: PKGBUILD 195714 2013-10-01 15:31:33Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-ksaneplugin
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="A scan plugin that implements the scanning"
 url="https://projects.kde.org/projects/kde/kdegraphics/ksaneplugin"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 source=("http://download.kde.org/stable/${pkgver}/src/ksaneplugin-${pkgver}.tar.xz")
-sha1sums=('ebea5febb727fd2aa4a9e8cef8c04b53ad7356e5')
+sha1sums=('baf3f8d92e683f53f7fce59d7854783223942877')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-ksnapshot/PKGBUILD b/extra/kdegraphics-ksnapshot/PKGBUILD
index 39d64d857..5be7b819b 100644
--- a/extra/kdegraphics-ksnapshot/PKGBUILD
+++ b/extra/kdegraphics-ksnapshot/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193328 2013-08-19 09:56:53Z andrea $
+# $Id: PKGBUILD 195716 2013-10-01 15:31:41Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-ksnapshot
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="Screen Capture Program"
 url="http://kde.org/applications/graphics/ksnapshot/"
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4')
 optdepends=('kipi-plugins')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/ksnapshot-${pkgver}.tar.xz")
-sha1sums=('85c905639a2b57bf096fb28b52ba25edded3d2d3')
+sha1sums=('2eaaa87438d3ee2b24fc1af61c1b18c4307f570d')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-mobipocket/PKGBUILD b/extra/kdegraphics-mobipocket/PKGBUILD
index 1d6feb2b9..91c2311b8 100644
--- a/extra/kdegraphics-mobipocket/PKGBUILD
+++ b/extra/kdegraphics-mobipocket/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193329 2013-08-19 09:56:55Z andrea $
+# $Id: PKGBUILD 195718 2013-10-01 15:31:48Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-mobipocket
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="A collection of plugins to handle mobipocket files"
 url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-mobipocket"
@@ -15,7 +15,7 @@ replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('bbfdb3bc09a307b9277269629c86bb2ebe9656f6')
+sha1sums=('d1ab52f21a3908cebe22348e9aee3d649d2f32c5')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-okular/PKGBUILD b/extra/kdegraphics-okular/PKGBUILD
index d82c59a75..95f324035 100644
--- a/extra/kdegraphics-okular/PKGBUILD
+++ b/extra/kdegraphics-okular/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193226 2013-08-19 09:54:19Z andrea $
+# $Id: PKGBUILD 195512 2013-10-01 15:14:45Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-okular
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc='Document Viewer'
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ makedepends=('cmake' 'automoc4')
 optdepends=('kdegraphics-mobipocket: mobipocket support')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/okular-${pkgver}.tar.xz")
-sha1sums=('c163bff59c0f145a88c38d4c3042a6d104793399')
+sha1sums=('9910de294467ab7b056983040abcff458ade1792')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-strigi-analyzer/PKGBUILD b/extra/kdegraphics-strigi-analyzer/PKGBUILD
index a081602f6..0043653d9 100644
--- a/extra/kdegraphics-strigi-analyzer/PKGBUILD
+++ b/extra/kdegraphics-strigi-analyzer/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193330 2013-08-19 09:56:57Z andrea $
+# $Id: PKGBUILD 195720 2013-10-01 15:31:56Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-strigi-analyzer
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="Strigi analyzers for various graphics file formats"
 url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-strigi-analyzer"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('2f037b6cec2d0d49615c9c4b517e5eca22eb4385')
+sha1sums=('df681ed83bdbbcffd66905d56001695c255d1d1d')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-svgpart/PKGBUILD b/extra/kdegraphics-svgpart/PKGBUILD
index 0747c884f..ee45f0ac0 100644
--- a/extra/kdegraphics-svgpart/PKGBUILD
+++ b/extra/kdegraphics-svgpart/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193331 2013-08-19 09:56:58Z andrea $
+# $Id: PKGBUILD 195722 2013-10-01 15:32:04Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-svgpart
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="A KPart for viewing SVGs"
 url="https://projects.kde.org/projects/kde/kdegraphics/svgpart"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 source=("http://download.kde.org/stable/${pkgver}/src/svgpart-${pkgver}.tar.xz")
-sha1sums=('e68c517dff6f5b5771e0b1c75d2a8f0204e5540b')
+sha1sums=('28bc50ca0e7f414e38168df9a224c2dd3883ba24')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-thumbnailers/PKGBUILD b/extra/kdegraphics-thumbnailers/PKGBUILD
index c2d687f29..5a0b2dbba 100644
--- a/extra/kdegraphics-thumbnailers/PKGBUILD
+++ b/extra/kdegraphics-thumbnailers/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193332 2013-08-19 09:56:59Z andrea $
+# $Id: PKGBUILD 195724 2013-10-01 15:32:13Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-thumbnailers
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="Thumbnailers for various graphics file formats"
 url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-thumbnailers"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('51cbd5cef7dbe265a9c8f4f09cdb710bb8eb506b')
+sha1sums=('7b25127d63f0bf4e8d67af21d4fd9bf636e9b691')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdemultimedia-audiocd-kio/PKGBUILD b/extra/kdemultimedia-audiocd-kio/PKGBUILD
index 0e283940e..1aec6c8fc 100644
--- a/extra/kdemultimedia-audiocd-kio/PKGBUILD
+++ b/extra/kdemultimedia-audiocd-kio/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193333 2013-08-19 09:57:01Z andrea $
+# $Id: PKGBUILD 195726 2013-10-01 15:32:21Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdemultimedia-audiocd-kio
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="Kioslave for accessing audio CDs"
 url='https://projects.kde.org/projects/kde/kdemultimedia/audiocd-kio'
@@ -14,7 +14,7 @@ groups=('kde' 'kdemultimedia')
 replaces=('kdemultimedia-kioslave')
 conflicts=('kdemultimedia-kioslave')
 source=("http://download.kde.org/stable/${pkgver}/src/audiocd-kio-${pkgver}.tar.xz")
-sha1sums=('dd22eb26047aef9f332af6c60c073685ccbcb9cb')
+sha1sums=('56cf44401ce26e6b25ce1dcd6cfa02ac09eed7eb')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdemultimedia-dragonplayer/PKGBUILD b/extra/kdemultimedia-dragonplayer/PKGBUILD
index 41c1af898..c3c584726 100644
--- a/extra/kdemultimedia-dragonplayer/PKGBUILD
+++ b/extra/kdemultimedia-dragonplayer/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193334 2013-08-19 09:57:02Z andrea $
+# $Id: PKGBUILD 195728 2013-10-01 15:32:28Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdemultimedia-dragonplayer
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="A multimedia player where the focus is on simplicity, instead of
 features"
@@ -14,7 +14,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgver}/src/dragon-${pkgver}.tar.xz")
-sha1sums=('9249ffcaf51ddc87df87e347bdc3cb9506e554ea')
+sha1sums=('b3c68741c9aff01aee8fb3c5bd3d3d7e14ddd5a7')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdemultimedia-ffmpegthumbs/PKGBUILD b/extra/kdemultimedia-ffmpegthumbs/PKGBUILD
index 7c71b0020..b434b51de 100644
--- a/extra/kdemultimedia-ffmpegthumbs/PKGBUILD
+++ b/extra/kdemultimedia-ffmpegthumbs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193335 2013-08-19 09:57:04Z andrea $
+# $Id: PKGBUILD 195730 2013-10-01 15:32:37Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdemultimedia-ffmpegthumbs
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc='FFmpeg-based thumbnail creator for video files'
 url='https://projects.kde.org/projects/kde/kdemultimedia/ffmpegthumbs'
@@ -12,7 +12,7 @@ groups=('kde' 'kdemultimedia')
 depends=('kdelibs' 'ffmpeg')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/ffmpegthumbs-${pkgver}.tar.xz")
-sha1sums=('e39a2dbb8da47fb1ec667c266b37f95707bd22cd')
+sha1sums=('066f3802c91125b821dde01ae3484fc98ba6cba4')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdemultimedia-juk/PKGBUILD b/extra/kdemultimedia-juk/PKGBUILD
index d42c94dab..e4382e24e 100644
--- a/extra/kdemultimedia-juk/PKGBUILD
+++ b/extra/kdemultimedia-juk/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193336 2013-08-19 09:57:05Z andrea $
+# $Id: PKGBUILD 195732 2013-10-01 15:32:45Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdemultimedia-juk
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc='A jukebox, tagger and music collection manager'
 url='http://kde.org/applications/multimedia/juk/'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'taglib')
 makedepends=('cmake' 'automoc4')
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgver}/src/juk-${pkgver}.tar.xz")
-sha1sums=('13b966c9c9450570feb1c46b3f39bf58f1e149a3')
+sha1sums=('7b9b04f3f0957b7b2afa51f55a4c9d4691ba2c2c')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdemultimedia-kmix/PKGBUILD b/extra/kdemultimedia-kmix/PKGBUILD
index d70c42a51..e3ad2eeb6 100644
--- a/extra/kdemultimedia-kmix/PKGBUILD
+++ b/extra/kdemultimedia-kmix/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193337 2013-08-19 09:57:07Z andrea $
+# $Id: PKGBUILD 195734 2013-10-01 15:32:52Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdemultimedia-kmix
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="KDE volume control program"
 url='http://kde.org/applications/multimedia/kmix/'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgver}/src/kmix-${pkgver}.tar.xz")
-sha1sums=('2a0e9d5c898537343b134b2e62c2de8631081f5c')
+sha1sums=('e47a77c19a00e9a68f36158e3c320204ca5c2707')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdemultimedia-kscd/PKGBUILD b/extra/kdemultimedia-kscd/PKGBUILD
index e369e8454..e7a1297bd 100644
--- a/extra/kdemultimedia-kscd/PKGBUILD
+++ b/extra/kdemultimedia-kscd/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193338 2013-08-19 09:57:08Z andrea $
+# $Id: PKGBUILD 195736 2013-10-01 15:32:59Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdemultimedia-kscd
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="KDE CD player"
 url='http://kde.org/applications/multimedia/kscd/'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libmusicbrainz3')
 makedepends=('cmake' 'automoc4')
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgver}/src/kscd-${pkgver}.tar.xz")
-sha1sums=('b1e6dccfab3c2c4246bcff43880ab8e9938ee915')
+sha1sums=('0380536835dfc97121f4de2a68ac574a38148b3f')
 
 build() {
   mkdir build
diff --git a/extra/kdemultimedia-mplayerthumbs/PKGBUILD b/extra/kdemultimedia-mplayerthumbs/PKGBUILD
index cbc807b86..cc5d3cd6f 100644
--- a/extra/kdemultimedia-mplayerthumbs/PKGBUILD
+++ b/extra/kdemultimedia-mplayerthumbs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193339 2013-08-19 09:57:10Z andrea $
+# $Id: PKGBUILD 195738 2013-10-01 15:33:07Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdemultimedia-mplayerthumbs
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="MPlayer based thumbnail generator for video files"
 url='https://projects.kde.org/projects/kde/kdemultimedia/mplayerthumbs'
@@ -12,7 +12,7 @@ license=('GPL' 'LGPL' 'FDL')
 depends=('kdebase-runtime' 'mplayer')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/mplayerthumbs-${pkgver}.tar.xz")
-sha1sums=('b71789470433ce8c555857301781fc47e5bbc12c')
+sha1sums=('ea9b2fbb067894bef2b1e60cb72c1f7bfd0e9151')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdenetwork-filesharing/PKGBUILD b/extra/kdenetwork-filesharing/PKGBUILD
index b5381e338..07fcc6f3c 100644
--- a/extra/kdenetwork-filesharing/PKGBUILD
+++ b/extra/kdenetwork-filesharing/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdenetwork-filesharing
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc='Properties dialog plugin to share a directory with the local network'
 url='https://projects.kde.org/projects/kde/kdenetwork/kdenetwork-filesharing'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'smbclient')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kdenetwork-filesharing-${pkgver}.tar.xz")
-sha1sums=('02fb41306fb3bc6b42d3c478665a8df5958d0268')
+sha1sums=('14c94385f1476b4debfee4c211080b6087ce6708')
 
 build() {
   mkdir build
diff --git a/extra/kdenetwork-kdnssd/PKGBUILD b/extra/kdenetwork-kdnssd/PKGBUILD
index 205b435c2..1a34b4624 100644
--- a/extra/kdenetwork-kdnssd/PKGBUILD
+++ b/extra/kdenetwork-kdnssd/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdenetwork-kdnssd
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc='Monitors the network for DNS-SD services'
 url='https://projects.kde.org/projects/kde/kdenetwork/kdnssd'
@@ -12,7 +12,7 @@ groups=('kde' 'kdenetwork')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/kdnssd-${pkgver}.tar.xz")
-sha1sums=('d8957dab1a0516474b856bc5d1ef647be8dfb1a2')
+sha1sums=('ff10bfe39a968101a582705e0c844dcf545e8cb1')
 
 build() {
   mkdir build
diff --git a/extra/kdenetwork-kget/PKGBUILD b/extra/kdenetwork-kget/PKGBUILD
index 7f1d1fbba..4678b20e4 100644
--- a/extra/kdenetwork-kget/PKGBUILD
+++ b/extra/kdenetwork-kget/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdenetwork-kget
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc='Download Manager'
 url='http://kde.org/applications/internet/kget/'
@@ -13,7 +13,7 @@ depends=('kdebase-workspace' 'kdebase-lib' 'libktorrent' 'libmms' 'gpgme' 'nepom
 makedepends=('cmake' 'automoc4' 'boost')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kget-${pkgver}.tar.xz")
-sha1sums=('a31afa2747a50edbd20fe785e75c8746e0684c83')
+sha1sums=('ea08c57090046987d0d4d5c8ad991364fccde471')
 
 build() {
   mkdir build
diff --git a/extra/kdenetwork-kppp/PKGBUILD b/extra/kdenetwork-kppp/PKGBUILD
index 9c1834c6b..e31b67888 100644
--- a/extra/kdenetwork-kppp/PKGBUILD
+++ b/extra/kdenetwork-kppp/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdenetwork-kppp
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc='Internet Dial-Up Tool'
 url='http://kde.org/applications/internet/kppp/'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'ppp')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kppp-${pkgver}.tar.xz")
-sha1sums=('5322ed6fe8122940f618c04dd51c6dbff7b9f437')
+sha1sums=('4ae9bea4814db06162e73b3bd496f023d74f488c')
 
 build() {
   mkdir build
diff --git a/extra/kdenetwork-krdc/PKGBUILD b/extra/kdenetwork-krdc/PKGBUILD
index e9f54c790..27459761b 100644
--- a/extra/kdenetwork-krdc/PKGBUILD
+++ b/extra/kdenetwork-krdc/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdenetwork-krdc
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc='Remote Desktop Client'
 url='http://kde.org/applications/internet/krdc/'
@@ -15,7 +15,7 @@ optdepends=('libvncserver: VNC support'
             'freerdp: RDP support'
             'kdebase-keditbookmarks: to edit bookmarks')
 source=("http://download.kde.org/stable/${pkgver}/src/krdc-${pkgver}.tar.xz")
-sha1sums=('4e25aa290996c2c8b75fcfadad2d983fcadde390')
+sha1sums=('4df48d142823505770f47a8ac99454e8b2855a74')
 
 build() {
   mkdir build
diff --git a/extra/kdenetwork-krfb/PKGBUILD b/extra/kdenetwork-krfb/PKGBUILD
index 667598f69..7ba2f81c3 100644
--- a/extra/kdenetwork-krfb/PKGBUILD
+++ b/extra/kdenetwork-krfb/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdenetwork-krfb
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc='Desktop Sharing'
 url='http://www.kde.org/applications/system/krfb'
@@ -15,7 +15,7 @@ groups=('kde' 'kdenetwork')
 depends=('kdebase-runtime' 'libvncserver' 'libxdamage' 'telepathy-qt')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/krfb-${pkgver}.tar.xz")
-sha1sums=('06dd1c34622e7bb2748053e262bdb5e087997b1c')
+sha1sums=('b5b7b6c229f7c60382aa30dbf7726ad6044a4d6a')
 
 build() {
   mkdir build
diff --git a/extra/kdenetwork-strigi-analyzers/PKGBUILD b/extra/kdenetwork-strigi-analyzers/PKGBUILD
index 9b5e2f728..a0d929e08 100644
--- a/extra/kdenetwork-strigi-analyzers/PKGBUILD
+++ b/extra/kdenetwork-strigi-analyzers/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdenetwork-strigi-analyzers
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc='Strigi analyzers for various network protocols'
 url='https://projects.kde.org/projects/kde/kdenetwork/kdenetwork-strigi-analyzers'
@@ -12,7 +12,7 @@ groups=('kde' 'kdenetwork')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4' 'boost')
 source=("http://download.kde.org/stable/${pkgver}/src/kdenetwork-strigi-analyzers-${pkgver}.tar.xz")
-sha1sums=('0227e4686eea9b1f228e6bc15dfe8fa9ec270d5b')
+sha1sums=('e59c6497f15c60ee703fb3c376da2e8d9a9ec021')
 
 build() {
   mkdir build
diff --git a/extra/kdepim-runtime/PKGBUILD b/extra/kdepim-runtime/PKGBUILD
index 62873681b..2086e3dff 100644
--- a/extra/kdepim-runtime/PKGBUILD
+++ b/extra/kdepim-runtime/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 193223 2013-08-19 09:54:16Z andrea $
+# $Id: PKGBUILD 195506 2013-10-01 15:14:20Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdepim-runtime
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc='Extends the functionality of kdepim'
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkgapi' 'libkolab' 'libkfbapi')
 makedepends=('cmake' 'automoc4' 'boost')
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('ec2a45baf0c2c2ccea633b599a453db52b38dc75')
+sha1sums=('acc133c3c9d5cff0cdc9901b5ff7bd8b31a15825')
 
 prepare() {
   mkdir build
diff --git a/extra/kdepim/PKGBUILD b/extra/kdepim/PKGBUILD
new file mode 100644
index 000000000..c837d5d44
--- /dev/null
+++ b/extra/kdepim/PKGBUILD
@@ -0,0 +1,264 @@
+# $Id: PKGBUILD 195756 2013-10-01 15:34:28Z svenstaro $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Pierre Schmitz <pierre@archlinux.de>
+
+pkgbase=kdepim
+pkgname=('kdepim-akonadiconsole'
+         'kdepim-akregator'
+         'kdepim-blogilo'
+         'kdepim-console'
+         'kdepim-kaddressbook'
+         'kdepim-kalarm'
+         'kdepim-kjots'
+         'kdepim-kleopatra'
+         'kdepim-kmail'
+         'kdepim-knode'
+         'kdepim-knotes'
+         'kdepim-kontact'
+         'kdepim-korganizer'
+         'kdepim-kresources'
+         'kdepim-ktimetracker'
+         'kdepim-ktnef'
+         'kdepim-libkdepim')
+pkgver=4.11.2
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://pim.kde.org'
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdepim')
+makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link'
+             'kde-agent' 'nepomuk-widgets' 'link-grammar')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
+sha1sums=('027a6560bcd8f55659f642f2041f1265453a02ad')
+
+build() {
+	mkdir build
+	cd build
+	cmake ../${pkgbase}-${pkgver} \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DKDE4_BUILD_TESTS=OFF \
+		-DCMAKE_SKIP_RPATH=ON \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DKDEPIM_BUILD_MOBILE=OFF
+	make
+}
+
+package_kdepim-akonadiconsole() {
+	pkgdesc='Akonadi Management and Debugging Console'
+	depends=('kdepim-libkdepim' 'nepomuk-widgets')
+	url='http://pim.kde.org'
+	install='kdepim.install'
+	cd "${srcdir}"/build/akonadiconsole
+	make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-akregator() {
+	pkgdesc='A Feed Reader for KDE'
+	depends=('kdepim-libkdepim')
+	url="http://kde.org/applications/internet/akregator/"
+	install='kdepim-akregator.install'
+	cd "${srcdir}"/build/akregator
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/akregator
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/kontact/plugins/akregator
+	make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-blogilo() {
+	pkgdesc='A KDE Blogging Client'
+	depends=('kdepim-libkdepim')
+	url="http://kde.org/applications/internet/blogilo/"
+	replaces=('blogilo')
+	conflicts=('blogilo')
+	install='kdepim.install'
+	cd "${srcdir}"/build/blogilo
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/blogilo
+	make DESTDIR="${pkgdir}" install
+    cd "${srcdir}"/build/composereditor-ng
+	make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-console() {
+	pkgdesc='Command line tool for accessing calendar files'
+	depends=('kdepim-runtime')
+	url='http://pim.kde.org'
+	install='kdepim.install'
+	cd "${srcdir}"/build/console
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/kabcclient
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/konsolekalendar
+	make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-kaddressbook() {
+	pkgdesc='Contact Manager'
+	depends=('kdepim-libkdepim')
+	url="http://kde.org/applications/office/kaddressbook/"
+	install='kdepim.install'
+	cd "${srcdir}"/build/kaddressbook
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/kontact/plugins/kaddressbook
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/plugins/kaddressbook
+	make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-kalarm() {
+	pkgdesc='Personal Alarm Scheduler'
+	depends=('kdepim-libkdepim')
+	url="http://kde.org/applications/utilities/kalarm/"
+	install='kdepim.install'
+	cd "${srcdir}"/build/kalarm
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/kalarm
+	make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-kjots() {
+	pkgdesc='Note Taker'
+	depends=('kdepim-libkdepim')
+	url="http://kde.org/applications/utilities/kjots/"
+	install='kdepim.install'
+	cd "${srcdir}"/build/kjots
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/kjots
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/kontact/plugins/kjots
+	make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-kleopatra() {
+	pkgdesc='Certificate Manager and Unified Crypto GUI'
+	depends=('kdepim-libkdepim')
+    install=kdepim-kleopatra.install
+	url="http://kde.org/applications/utilities/kleopatra/"
+	cd "${srcdir}"/build/kleopatra
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/kleopatra
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/kwatchgnupg
+	make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-kmail() {
+	pkgdesc='Mail Client'
+	depends=('kdepim-libkdepim')
+	url="http://kde.org/applications/internet/kmail/"
+	install='kdepim-kmail.install'
+	conflicts=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
+	           'kdepim-mimelib' 'kdepim-plugins')
+	replaces=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
+	          'kdepim-mimelib' 'kdepim-plugins')
+	for i in kmail doc/kmail kmailcvt archivemailagent \
+	importwizard ksendemail libksieve messagelist mailfilteragent \
+	ontologies kontact/plugins/kmail headerthemeeditor; do
+		cd "${srcdir}"/build/${i}
+		make DESTDIR="${pkgdir}" install
+	done
+}
+
+package_kdepim-knode() {
+	pkgdesc='News Reader'
+	depends=('kdepim-libkdepim')
+	url="http://kde.org/applications/internet/knode/"
+	install='kdepim-knode.install'
+	cd "${srcdir}"/build/knode
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/knode
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/kioslave/news
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/kontact/plugins/knode
+	make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-knotes() {
+	pkgdesc='Popup Notes'
+	depends=('kdepim-libkdepim')
+	url="http://kde.org/applications/utilities/knotes/"
+	install='kdepim.install'
+	cd "${srcdir}"/build/knotes
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/knotes
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/kontact/plugins/knotes
+	make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-kontact() {
+	pkgdesc='Personal Information Manager'
+	depends=('kdepim-libkdepim')
+	url="http://kde.org/applications/office/kontact/"
+	install='kdepim.install'
+	conflcits=('kdepim-kontactinterfaces')
+	replaces=('kdepim-kontactinterfaces')
+	for i in kontact/src doc/kontact kontact/plugins/summary \
+		kontact/plugins/specialdates doc/kontact-admin; do
+		cd "${srcdir}"/build/${i}
+		make DESTDIR="${pkgdir}" install
+	done
+}
+
+package_kdepim-korganizer() {
+	pkgdesc='Calendar and Scheduling Program'
+	depends=('kdepim-libkdepim')
+	url="http://kde.org/applications/office/korganizer"
+	install='kdepim-korganizer.install'
+	for i in korganizer doc/korganizer kontact/plugins/korganizer \
+		calendarviews; do
+		cd "${srcdir}"/build/${i} 
+		make DESTDIR="${pkgdir}" install
+	done
+}
+
+package_kdepim-kresources() {
+	pkgdesc='KDE PIM resources'
+	depends=('kdepim-libkdepim')
+	url='http://pim.kde.org'
+	cd "${srcdir}"/build/kresources
+	make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-ktimetracker() {
+	pkgdesc='Personal Time Tracker'
+	depends=('kdepim-kresources')
+	url="http://kde.org/applications/utilities/ktimetracker/"
+	install='kdepim.install'
+	cd "${srcdir}"/build/ktimetracker
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/ktimetracker
+	make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-ktnef() {
+	pkgdesc='A viewer/extractor for TNEF files'
+	depends=('kdebase-runtime' 'kdepimlibs')
+	url="https://projects.kde.org/projects/kde/kdepim/ktnef"
+    install=kdepim-ktnef.install
+	cd "${srcdir}"/build/ktnef
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/ktnef
+	make DESTDIR="${pkgdir}" install	
+}
+
+package_kdepim-libkdepim() {
+	pkgdesc='Library for KDE PIM'
+	groups=()
+	depends=('kde-agent' 'kdepim-runtime' 'link-grammar')
+	url='http://pim.kde.org'
+	conflicts=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp'
+	           'kdepim-akonadi')
+	replaces=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp'
+	          'kdepim-akonadi')
+	for i in akonadi_next calendarsupport incidenceeditor-ng \
+	kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \
+	mailcommon mailimporter messagecomposer messagecore messageviewer \
+	icons templateparser plugins/messageviewer grammar sendlateragent \
+	plugins/ktexteditor pimactivity pimcommon pimsettingexporter; do
+		cd "${srcdir}"/build/${i}
+		make DESTDIR="${pkgdir}" install
+	done
+}
diff --git a/extra/kdepimlibs/PKGBUILD b/extra/kdepimlibs/PKGBUILD
index 31e2f5552..bee074d41 100644
--- a/extra/kdepimlibs/PKGBUILD
+++ b/extra/kdepimlibs/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 193219 2013-08-19 09:54:12Z andrea $
+# $Id: PKGBUILD 195498 2013-10-01 15:13:18Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdepimlibs
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="KDE PIM Libraries"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('nepomuk-core' 'gpgme' 'akonadi' 'libical' 'prison' 'qjson')
 makedepends=('cmake' 'automoc4' 'boost' 'cyrus-sasl')
 install='kdepimlibs.install'
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('8fa13be4729184b50edf404cc7de8dbd97c23636')
+sha1sums=('8808bee93143b4b0bbcfc8fb670efb9613ddae29')
 
 build() {
   mkdir build
diff --git a/extra/kdeplasma-addons/PKGBUILD b/extra/kdeplasma-addons/PKGBUILD
index 27de75444..47e2ba4d5 100644
--- a/extra/kdeplasma-addons/PKGBUILD
+++ b/extra/kdeplasma-addons/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193349 2013-08-19 09:57:27Z andrea $
+# $Id: PKGBUILD 195758 2013-10-01 15:34:46Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -77,7 +77,7 @@ pkgname=('kdeplasma-addons-applets-bball'
          'kdeplasma-addons-wallpapers-qmlwallpapers'
          'kdeplasma-addons-wallpapers-virus'
          'kdeplasma-addons-wallpapers-weather')
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/kde/kdeplasma-addons'
@@ -86,10 +86,13 @@ groups=('kde' 'kdeplasma-addons')
 makedepends=('cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble' 'eigen'
              'scim' 'qwt' 'boost' 'libkexiv2' 'ibus' 'qoauth' 'mesa')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('33272760868e18128a98c5fa7aeecdc973f79a3b')
+sha1sums=('2060310ec0dbd2f5b12ac2f783de85689c9df9e8')
+
+prepare() {
+  mkdir build
+}
 
 build() {
-	mkdir build
 	cd build
 	cmake ../${pkgbase}-${pkgver} \
 		-DCMAKE_BUILD_TYPE=Release \
diff --git a/extra/kdeplasma-addons/kdebug-324661.patch b/extra/kdeplasma-addons/kdebug-324661.patch
new file mode 100644
index 000000000..92de3fcc9
--- /dev/null
+++ b/extra/kdeplasma-addons/kdebug-324661.patch
@@ -0,0 +1,76 @@
+commit 7c3011e0a6459c00cf9d06d74da3a32f87f1a2f6
+Author: Eike Hein <hein@kde.org>
+Date:   Mon Sep 9 23:12:45 2013 +0200
+
+    Spin the event loop before destroying the menu.
+    
+    This allows the menu implementation to complete toggling the
+    launcher before the instance is destroyed. It's extremely un-
+    fortunate that the library currently requires this careful
+    handling; see e944d7ae in kde-workspace for a note on what
+    needs to be cleaned up there.
+    
+    BUG:324661
+
+diff --git a/applets/icontasks/windowtaskitem.cpp b/applets/icontasks/windowtaskitem.cpp
+index 970c19f..61b39ef 100644
+--- a/applets/icontasks/windowtaskitem.cpp
++++ b/applets/icontasks/windowtaskitem.cpp
+@@ -406,17 +406,18 @@ void WindowTaskItem::showContextMenu(const QPoint &pos, bool showAppMenu)
+         actionList.append(configAction);
+     }
+ 
+-    TaskManager::BasicMenu menu(0, m_task.data(), &m_applet->groupManager(), actionList, showAppMenu ? getAppMenu() : QList <QAction*>());
+-    menu.adjustSize();
++    TaskManager::BasicMenu * menu = new TaskManager::BasicMenu(0, m_task.data(), &m_applet->groupManager(), actionList, showAppMenu ? getAppMenu() : QList <QAction*>());
++    menu->adjustSize();
+ 
+     if (m_applet->formFactor() != Plasma::Vertical) {
+-        menu.setMinimumWidth(size().width());
++        menu->setMinimumWidth(size().width());
+     }
+ 
+     Q_ASSERT(m_applet->containment());
+     Q_ASSERT(m_applet->containment()->corona());
+     stopWindowHoverEffect();
+-    menu.exec(pos.isNull() ? m_applet->containment()->corona()->popupPosition(this, menu.size()) : pos);
++    menu->exec(pos.isNull() ? m_applet->containment()->corona()->popupPosition(this, menu->size()) : pos);
++    menu->deleteLater();
+     delete a;
+ }
+ 
+commit b56d1552e9a8f8efe8fb8fd641126e78627c61a9
+Author: Eike Hein <hein@kde.org>
+Date:   Mon Sep 9 23:33:30 2013 +0200
+
+    Fix it for non-running items too.
+    
+    BUG:324661
+
+diff --git a/applets/icontasks/applauncheritem.cpp b/applets/icontasks/applauncheritem.cpp
+index b5f646c..f721b5a 100644
+--- a/applets/icontasks/applauncheritem.cpp
++++ b/applets/icontasks/applauncheritem.cpp
+@@ -100,17 +100,18 @@ void AppLauncherItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *e)
+         actionList.append(configAction);
+     }
+ 
+-    TaskManager::BasicMenu menu(0, m_launcher, &m_applet->groupManager(), actionList, getAppMenu());
+-    menu.adjustSize();
++    TaskManager::BasicMenu *menu = new TaskManager::BasicMenu(0, m_launcher, &m_applet->groupManager(), actionList, getAppMenu());
++    menu->adjustSize();
+ 
+     if (m_applet->formFactor() != Plasma::Vertical) {
+-        menu.setMinimumWidth(size().width());
++        menu->setMinimumWidth(size().width());
+     }
+ 
+     Q_ASSERT(m_applet->containment());
+     Q_ASSERT(m_applet->containment()->corona());
+     stopWindowHoverEffect();
+-    menu.exec(m_applet->containment()->corona()->popupPosition(this, menu.size()));
++    menu->exec(m_applet->containment()->corona()->popupPosition(this, menu->size()));
++    menu->deleteLater();
+ }
+ 
+ 
diff --git a/extra/kdesdk-cervisia/PKGBUILD b/extra/kdesdk-cervisia/PKGBUILD
index 3208582de..569da4072 100644
--- a/extra/kdesdk-cervisia/PKGBUILD
+++ b/extra/kdesdk-cervisia/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdesdk-cervisia
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc='CVS Frontend'
 url='http://kde.org/applications/development/cervisia/'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/cervisia-${pkgver}.tar.xz")
-sha1sums=('2cb067a3f739225ac5282cf1095eaee644f792b6')
+sha1sums=('326bbab5cdb7a26d40a9813d3b6b63008e748b25')
 
 build() {
   mkdir build
diff --git a/extra/kdesdk-dev-scripts/PKGBUILD b/extra/kdesdk-dev-scripts/PKGBUILD
index 5969d10c5..543a7bde1 100644
--- a/extra/kdesdk-dev-scripts/PKGBUILD
+++ b/extra/kdesdk-dev-scripts/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdesdk-dev-scripts
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc='Scripts and setting files useful during development of KDE software'
 url='https://projects.kde.org/projects/kde/kdesdk/kde-dev-scripts'
@@ -12,7 +12,7 @@ groups=('kde' 'kdesdk')
 depends=('kdebase-runtime' 'python2')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/kde-dev-scripts-${pkgver}.tar.xz")
-sha1sums=('65af660df5e90f55c45a5ec52f7df8371d0d6e56')
+sha1sums=('228df6780ba192d6b345df10aefeb49254f13362')
 
 build() {
   mkdir build
diff --git a/extra/kdesdk-dev-utils/PKGBUILD b/extra/kdesdk-dev-utils/PKGBUILD
index 9a308e91c..bbace57b0 100644
--- a/extra/kdesdk-dev-utils/PKGBUILD
+++ b/extra/kdesdk-dev-utils/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdesdk-dev-utils
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc='Small utilities for developers using KDE/Qt libs/frameworks'
 url='https://projects.kde.org/projects/kde/kdesdk/kde-dev-utils'
@@ -17,7 +17,7 @@ replaces=('kdesdk-kmtrace' 'kdesdk-kpartloader' 'kdesdk-kprofilemethod'
           'kdesdk-kstartperf' 'kdesdk-kuiviewer')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kde-dev-utils-${pkgver}.tar.xz")
-sha1sums=('5242c8db5176859838438ba0e24e30bd7afc862c')
+sha1sums=('156728376241093275639b0ac97736c432ee99ce')
 
 build() {
   mkdir build
diff --git a/extra/kdesdk-dolphin-plugins/PKGBUILD b/extra/kdesdk-dolphin-plugins/PKGBUILD
index 7eddb21b6..70c8cb4c2 100644
--- a/extra/kdesdk-dolphin-plugins/PKGBUILD
+++ b/extra/kdesdk-dolphin-plugins/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdesdk-dolphin-plugins
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc='Extra Dolphin plugins'
 url='https://projects.kde.org/projects/kde/kdesdk/dolphin-plugins'
@@ -17,7 +17,7 @@ optdepends=('bzr: bazaar support'
             'subversion: svn support')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/dolphin-plugins-${pkgver}.tar.xz")
-sha1sums=('e58a4908dfcfcab93dc39dfe465df074153df81d')
+sha1sums=('74e493c65046dc7e42dda1309650ca7c4ca9fc85')
 
 build() {
   mkdir build
diff --git a/extra/kdesdk-kapptemplate/PKGBUILD b/extra/kdesdk-kapptemplate/PKGBUILD
index 058d1a532..d979f81eb 100644
--- a/extra/kdesdk-kapptemplate/PKGBUILD
+++ b/extra/kdesdk-kapptemplate/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdesdk-kapptemplate
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc='KDE Template Generator'
 url='http://kde.org/applications/development/kapptemplate/'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kapptemplate-${pkgver}.tar.xz")
-sha1sums=('a0fc6ca7906f8bfb54298f9e63367c269913d5e2')
+sha1sums=('083698f4329337ef4e96b54ad30e9e7b9ed2eede')
 
 build() {
   mkdir build
diff --git a/extra/kdesdk-kate/PKGBUILD b/extra/kdesdk-kate/PKGBUILD
index 194163962..e5be2b6a1 100644
--- a/extra/kdesdk-kate/PKGBUILD
+++ b/extra/kdesdk-kate/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 193228 2013-08-19 09:54:21Z andrea $
+# $Id: PKGBUILD 195516 2013-10-01 15:15:04Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=kdesdk-kate
 pkgname=('kdebase-katepart'
          'kdebase-kwrite'
          'kdesdk-kate')
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 makedepends=('kdelibs ''cmake' 'automoc4' 'kdebindings-python')
 source=("http://download.kde.org/stable/${pkgver}/src/kate-${pkgver}.tar.xz"
         'pkgbuild-syntax-highlight.patch')
-sha1sums=('0032f388618fa3d035ee206e3014c362d419b965'
+sha1sums=('3cb7211d2523b955d640808d45feaa68699f11f7'
           '80c324c9db81c07a02374e7a092d75e0bdd6b4ea')
 
 prepare() {
diff --git a/extra/kdesdk-kcachegrind/PKGBUILD b/extra/kdesdk-kcachegrind/PKGBUILD
index 6f0f8b58c..b3c029b5a 100644
--- a/extra/kdesdk-kcachegrind/PKGBUILD
+++ b/extra/kdesdk-kcachegrind/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdesdk-kcachegrind
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc='Visualization of Performance Profiling Data'
 url='http://kde.org/applications/development/kcachegrind/'
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4')
 optdepends=('php: PHP support')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kcachegrind-${pkgver}.tar.xz")
-sha1sums=('394666271ad4997710e937f0db8f80c80790c8c9')
+sha1sums=('e04d45340696709aef2a569d16996ac1f0633820')
 
 build() {
   mkdir build
diff --git a/extra/kdesdk-kioslaves/PKGBUILD b/extra/kdesdk-kioslaves/PKGBUILD
index cca0cc654..ac846f03c 100644
--- a/extra/kdesdk-kioslaves/PKGBUILD
+++ b/extra/kdesdk-kioslaves/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdesdk-kioslaves
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc='KIO-Slaves'
 url='https://projects.kde.org/projects/kde/kdesdk/kdesdk-kioslaves'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'subversion')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kdesdk-kioslaves-${pkgver}.tar.xz")
-sha1sums=('020946f037978a95d3d336a5bb7af33987f94142')
+sha1sums=('865bf780ac091884bc486aa3d64c75c0ece183e4')
 
 build() {
   mkdir build
diff --git a/extra/kdesdk-kompare/PKGBUILD b/extra/kdesdk-kompare/PKGBUILD
index bc3321988..8795b8e04 100644
--- a/extra/kdesdk-kompare/PKGBUILD
+++ b/extra/kdesdk-kompare/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdesdk-kompare
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc='Diff/Patch Frontend'
 url='http://kde.org/applications/development/kompare/'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kompare-${pkgver}.tar.xz")
-sha1sums=('6a9f483bfbbdf7df1d1178400c67435cfdb103bb')
+sha1sums=('fc9e07e3ace90d83a010d8949dcddf6519b0917e')
 
 build() {
   mkdir build
diff --git a/extra/kdesdk-lokalize/PKGBUILD b/extra/kdesdk-lokalize/PKGBUILD
index b7b4cb431..51b3032fe 100644
--- a/extra/kdesdk-lokalize/PKGBUILD
+++ b/extra/kdesdk-lokalize/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdesdk-lokalize
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc='Computer-Aided Translation System'
 url='http://kde.org/applications/development/lokalize/'
@@ -11,20 +11,22 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdesdk')
 depends=('kdebase-runtime' 'kdebindings-python2' 'kdesdk-strigi-analyzers')
 makedepends=('cmake' 'automoc4')
-optdepends=('translate-toolkit: enable extra python script')
+optdepends=('translate-toolkit: enable extra scripts'
+            'kdebindings-kross-python: enable python scripts')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/lokalize-${pkgver}.tar.xz"
         'fix-python2-path.patch')
-sha1sums=('b0e606806db9188c95e49d139ba58d417232d3a3'
+sha1sums=('875429ea7297003843efa357bf1e110eed967075'
           '07db42bbcae402c292eebf002e549b04162621c5')
 
 prepare() {
+  mkdir build
+
   cd lokalize-${pkgver}
   patch -p2 -i "${srcdir}"/fix-python2-path.patch
 }
 
 build() {
-  mkdir build
   cd build
   cmake ../lokalize-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
diff --git a/extra/kdesdk-okteta/PKGBUILD b/extra/kdesdk-okteta/PKGBUILD
index 7c1488545..260918745 100644
--- a/extra/kdesdk-okteta/PKGBUILD
+++ b/extra/kdesdk-okteta/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdesdk-okteta
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc='Hex Editor'
 url='http://kde.org/applications/utilities/okteta/'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/okteta-${pkgver}.tar.xz")
-sha1sums=('9861ed34933f032912a69701e819ff6913a8a49c')
+sha1sums=('c7616231bf0b3d4273075a05c52c67ae2f80b721')
 
 build() {
   mkdir build
diff --git a/extra/kdesdk-poxml/PKGBUILD b/extra/kdesdk-poxml/PKGBUILD
index 09372e164..8815145da 100644
--- a/extra/kdesdk-poxml/PKGBUILD
+++ b/extra/kdesdk-poxml/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdesdk-poxml
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc='Translates DocBook XML files using gettext po files'
 url='https://projects.kde.org/projects/kde/kdesdk/poxml'
@@ -10,10 +10,10 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdesdk')
 depends=('kdelibs')
-makedepends=('cmake' 'automoc4')
+makedepends=('cmake' 'automoc4' 'antlr2')
 optdepends=('antlr2: required for po2xml and swappo tool')
 source=("http://download.kde.org/stable/${pkgver}/src/poxml-${pkgver}.tar.xz")
-sha1sums=('197ac3dc0a85f69e932a572dae56f4666b46e16d')
+sha1sums=('fa435373c74e5260a3ae423c236670f0bac70a33')
 
 build() {
   mkdir build
diff --git a/extra/kdesdk-strigi-analyzers/PKGBUILD b/extra/kdesdk-strigi-analyzers/PKGBUILD
index 8cf988b41..a6e2e98bb 100644
--- a/extra/kdesdk-strigi-analyzers/PKGBUILD
+++ b/extra/kdesdk-strigi-analyzers/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdesdk-strigi-analyzers
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc='Analyzer plugins for strigi'
 url='https://projects.kde.org/projects/kde/kdesdk/kdesdk-strigi-analyzers'
@@ -12,7 +12,7 @@ groups=('kde' 'kdesdk')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/kdesdk-strigi-analyzers-${pkgver}.tar.xz")
-sha1sums=('d6e42e178d7dbf12acd59062bbcccb033b2fa875')
+sha1sums=('1635a71fdcd83060a534356b99d3c0a70ca7a6ab')
 
 build() {
   mkdir build
diff --git a/extra/kdesdk-thumbnailers/PKGBUILD b/extra/kdesdk-thumbnailers/PKGBUILD
index a473cefb1..7fd139d34 100644
--- a/extra/kdesdk-thumbnailers/PKGBUILD
+++ b/extra/kdesdk-thumbnailers/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdesdk-thumbnailers
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc='Plugins for the thumbnailing system'
 url='http://kde.org/applications/development/cervisia/'
@@ -12,7 +12,7 @@ groups=('kde' 'kdesdk')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/kdesdk-thumbnailers-${pkgver}.tar.xz")
-sha1sums=('80055731dfae18f4150b28367c750e25299fe466')
+sha1sums=('b4f2c15838bdb21c807b0317f505ad6209829e5a')
 
 build() {
   mkdir build
diff --git a/extra/kdesdk-umbrello/PKGBUILD b/extra/kdesdk-umbrello/PKGBUILD
index 2bc2699b9..8b6081cab 100644
--- a/extra/kdesdk-umbrello/PKGBUILD
+++ b/extra/kdesdk-umbrello/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdesdk-umbrello
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc='UML Modeller'
 url='http://kde.org/applications/development/umbrello/'
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'boost')
 optdepends=('ruby')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/umbrello-${pkgver}.tar.xz")
-sha1sums=('ec1552e8d854c41ef5febcee581f4cc16b8869e6')
+sha1sums=('8a42f8188608610062bebd2243b88b6145a3af0a')
 
 build() {
   mkdir build
diff --git a/extra/kdetoys-amor/PKGBUILD b/extra/kdetoys-amor/PKGBUILD
index 25a778832..38cc0c33f 100644
--- a/extra/kdetoys-amor/PKGBUILD
+++ b/extra/kdetoys-amor/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdetoys-amor
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc='On-Screen Creature'
 url='https://projects.kde.org/projects/kde/kdetoys/amor'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/amor-${pkgver}.tar.xz")
-sha1sums=('c596b2f57ef6cf87cddc4587178fa70e27865f47')
+sha1sums=('67fe2a99457f6fc7b7dd7b84e4f6690d9134ce45')
 
 build() {
   mkdir build
diff --git a/extra/kdetoys-kteatime/PKGBUILD b/extra/kdetoys-kteatime/PKGBUILD
index b7757bf78..426f20cf7 100644
--- a/extra/kdetoys-kteatime/PKGBUILD
+++ b/extra/kdetoys-kteatime/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdetoys-kteatime
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc='Tea Cooker'
 url='http://kde.org/applications/games/kteatime/'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kteatime-${pkgver}.tar.xz")
-sha1sums=('e3cccbe39e819e309a0ee6ddf5ccb1130aaa06c3')
+sha1sums=('253b2a66d9095ce9af969b8cfe5b0f83573e1b5c')
 
 build() {
   mkdir build
diff --git a/extra/kdetoys-ktux/PKGBUILD b/extra/kdetoys-ktux/PKGBUILD
index 77c72fdae..f044d66f4 100644
--- a/extra/kdetoys-ktux/PKGBUILD
+++ b/extra/kdetoys-ktux/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdetoys-ktux
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc='A Tux-in-a-spaceship screen saver'
 url='https://projects.kde.org/projects/kde/kdetoys/ktux'
@@ -13,7 +13,7 @@ depends=('kdebase-workspace')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/ktux-${pkgver}.tar.xz")
-sha1sums=('4f3671599c2c73808e8a25f0dbc9e221f524d12c')
+sha1sums=('6012c3ada2dd4096c435bf45222021c9ec989b2f')
 
 build() {
   mkdir build
diff --git a/extra/kdeutils-filelight/PKGBUILD b/extra/kdeutils-filelight/PKGBUILD
index 5225a5cab..3bbeaf21d 100644
--- a/extra/kdeutils-filelight/PKGBUILD
+++ b/extra/kdeutils-filelight/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193368 2013-08-19 09:57:52Z andrea $
+# $Id: PKGBUILD 195796 2013-10-01 15:37:12Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-filelight
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc='View disk usage information'
 url='http://kde.org/applications/utilities/filelight'
@@ -15,7 +15,7 @@ replaces=('filelight')
 conflicts=('filelight')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/filelight-${pkgver}.tar.xz")
-sha1sums=('9766e00c99991bb24cb6663ed2071322b6dfe309')
+sha1sums=('58141b28830c223314377e0f71e09fdf0d7a67fc')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-kcalc/PKGBUILD b/extra/kdeutils-kcalc/PKGBUILD
index 4e780b2b6..d2410dc5b 100644
--- a/extra/kdeutils-kcalc/PKGBUILD
+++ b/extra/kdeutils-kcalc/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193369 2013-08-19 09:57:53Z andrea $
+# $Id: PKGBUILD 195798 2013-10-01 15:37:21Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kcalc
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc='Scientific Calculator'
 url='http://kde.org/applications/utilities/kcalc/'
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kcalc-${pkgver}.tar.xz")
-sha1sums=('e55d9b73c89343f2c2e87b0a53a948393b732953')
+sha1sums=('371aee1cd09cae646cfe2ed98bfca5074af8173c')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-kcharselect/PKGBUILD b/extra/kdeutils-kcharselect/PKGBUILD
index 6f5357ee8..1aaf50a5b 100644
--- a/extra/kdeutils-kcharselect/PKGBUILD
+++ b/extra/kdeutils-kcharselect/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193370 2013-08-19 09:57:55Z andrea $
+# $Id: PKGBUILD 195800 2013-10-01 15:37:29Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kcharselect
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc='Character Selector'
 url="http://kde.org/applications/utilities/kcharselect/"
@@ -12,7 +12,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 source=("http://download.kde.org/stable/${pkgver}/src/kcharselect-${pkgver}.tar.xz")
-sha1sums=('1ed1cb584d1cd51603ca3d51d4c1d7f1632ad0e6')
+sha1sums=('cdec14bedb6d436e21611c71c787d5b4ad24a2f6')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-kdf/PKGBUILD b/extra/kdeutils-kdf/PKGBUILD
index a30aa0183..1f666aecf 100644
--- a/extra/kdeutils-kdf/PKGBUILD
+++ b/extra/kdeutils-kdf/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193371 2013-08-19 09:57:56Z andrea $
+# $Id: PKGBUILD 195802 2013-10-01 15:37:37Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kdf
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 url="http://kde.org/applications/system/kdiskfree/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kdf-${pkgver}.tar.xz")
-sha1sums=('b571b719efdf633b72065cfa1862ad662a7d81bb')
+sha1sums=('4bf2e637c31916dc51682cd0174ba7391458e185')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-kfloppy/PKGBUILD b/extra/kdeutils-kfloppy/PKGBUILD
index 2cc867f67..ac76da662 100644
--- a/extra/kdeutils-kfloppy/PKGBUILD
+++ b/extra/kdeutils-kfloppy/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193372 2013-08-19 09:57:57Z andrea $
+# $Id: PKGBUILD 195804 2013-10-01 15:37:44Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kfloppy
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc='Floppy Formatter'
 url='http://kde.org/applications/utilities/kfloppy/'
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kfloppy-${pkgver}.tar.xz")
-sha1sums=('c3abdbb0adeca3fa6aaac03b99e6eed1e545a8c2')
+sha1sums=('6c09ec058822e742b1a34c3d720996c0208f023c')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-kgpg/PKGBUILD b/extra/kdeutils-kgpg/PKGBUILD
index 916b32af9..e97c30ddd 100644
--- a/extra/kdeutils-kgpg/PKGBUILD
+++ b/extra/kdeutils-kgpg/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193373 2013-08-19 09:57:58Z andrea $
+# $Id: PKGBUILD 195806 2013-10-01 15:37:52Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kgpg
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc='A GnuPG frontend'
 url='http://kde.org/applications/utilities/kgpg/'
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kgpg-${pkgver}.tar.xz")
-sha1sums=('46c7148a8db7160f606926f1a62062b7345267cf')
+sha1sums=('a48013a5da3499d72e8edce0fd4917b2fd0bb315')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-kremotecontrol/PKGBUILD b/extra/kdeutils-kremotecontrol/PKGBUILD
index 5a6cc6847..de1ed00e0 100644
--- a/extra/kdeutils-kremotecontrol/PKGBUILD
+++ b/extra/kdeutils-kremotecontrol/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kremotecontrol
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc='Configure your remote controls for use with applications'
 url='http://kde.org/applications/utilities/kremotecontrol/'
@@ -15,7 +15,7 @@ replaces=('kdeutils-kdelirc')
 conflicts=('kdeutils-kdelirc')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kremotecontrol-${pkgver}.tar.xz")
-sha1sums=('4586cf32c07022f326b30249b48a8d90f0523e90')
+sha1sums=('a129eb1d9c268d77caa713ab0a16e791811606f2')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-ktimer/PKGBUILD b/extra/kdeutils-ktimer/PKGBUILD
index 3ec4007b2..c5dd4d318 100644
--- a/extra/kdeutils-ktimer/PKGBUILD
+++ b/extra/kdeutils-ktimer/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193375 2013-08-19 09:58:03Z andrea $
+# $Id: PKGBUILD 195810 2013-10-01 15:38:07Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-ktimer
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc='Countdown Launcher'
 url='http://kde.org/applications/utilities/ktimer/'
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/ktimer-${pkgver}.tar.xz")
-sha1sums=('c43072ad23e231c523fb15d482233daba9fafbc9')
+sha1sums=('d05ed7f30847046cd04f0f69848b07223c05e994')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-kwallet/PKGBUILD b/extra/kdeutils-kwallet/PKGBUILD
index 430163ae0..5fede273b 100644
--- a/extra/kdeutils-kwallet/PKGBUILD
+++ b/extra/kdeutils-kwallet/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193376 2013-08-19 09:58:07Z andrea $
+# $Id: PKGBUILD 195812 2013-10-01 15:38:15Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kwallet
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc='Wallet Management Tool'
 url='http://kde.org/applications/system/kwalletmanager/'
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kwallet-${pkgver}.tar.xz")
-sha1sums=('a562056d062b6e91905411416c3dd978b1bf3f35')
+sha1sums=('bf72073284d6e12763eb7a02a3f8742839da9cf7')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-print-manager/PKGBUILD b/extra/kdeutils-print-manager/PKGBUILD
index 808dfef36..e10750c6c 100644
--- a/extra/kdeutils-print-manager/PKGBUILD
+++ b/extra/kdeutils-print-manager/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193377 2013-08-19 09:58:08Z andrea $
+# $Id: PKGBUILD 195814 2013-10-01 15:38:23Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-print-manager
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="A tool for managing print jobs and printers"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ replaces=('print-manager' 'kdeutils-printer-applet' 'kdeadmin-system-config-prin
 conflicts=('print-manager')
 groups=('kde' 'kdeutils')
 source=("http://download.kde.org/stable/${pkgver}/src/print-manager-${pkgver}.tar.xz")
-sha1sums=('a3c955a5746a0046609790bbd283a0fb06a27933')
+sha1sums=('955be477961aed2cbcdb7a69c845fed2e8d0698a')
 
 build() {
   mkdir build
diff --git a/extra/kdeutils-superkaramba/PKGBUILD b/extra/kdeutils-superkaramba/PKGBUILD
index 35116f447..5547364ab 100644
--- a/extra/kdeutils-superkaramba/PKGBUILD
+++ b/extra/kdeutils-superkaramba/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193378 2013-08-19 09:58:09Z andrea $
+# $Id: PKGBUILD 195816 2013-10-01 15:38:31Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-superkaramba
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc='An engine for cool desktop eyecandy'
 url='http://kde.org/applications/utilities/superkaramba/'
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/superkaramba-${pkgver}.tar.xz")
-sha1sums=('125ab6827e322844b934a9606db6cd469f2136c0')
+sha1sums=('2be1b912a0908bc8b43d3a401786ec58d0584f2a')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-sweeper/PKGBUILD b/extra/kdeutils-sweeper/PKGBUILD
index 85b6e8f78..44897a8c6 100644
--- a/extra/kdeutils-sweeper/PKGBUILD
+++ b/extra/kdeutils-sweeper/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193379 2013-08-19 09:58:11Z andrea $
+# $Id: PKGBUILD 195818 2013-10-01 15:38:38Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-sweeper
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc='System Cleaner'
 url='http://kde.org/applications/utilities/sweeper'
@@ -12,7 +12,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 source=("http://download.kde.org/stable/${pkgver}/src/sweeper-${pkgver}.tar.xz")
-sha1sums=('696994b80cda4cab6fbe28cee80b0d844dd070ed')
+sha1sums=('e310f79fa232518b3b413b62162127e37bd1e146')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdewebdev/PKGBUILD b/extra/kdewebdev/PKGBUILD
index 1c8e88f40..abe2a28bd 100644
--- a/extra/kdewebdev/PKGBUILD
+++ b/extra/kdewebdev/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193380 2013-08-19 09:58:12Z andrea $
+# $Id: PKGBUILD 195820 2013-10-01 15:38:47Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -7,7 +7,7 @@ pkgname=('kdewebdev-kfilereplace'
          'kdewebdev-kimagemapeditor'
          'kdewebdev-klinkstatus'
          'kdewebdev-kommander')
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
@@ -15,7 +15,7 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdewebdev')
 makedepends=('cmake' 'automoc4' 'ruby' 'tidyhtml' 'kdepimlibs' 'boost')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('97aa1ade44ad1ed6e607d786db7db057a4dad8d8')
+sha1sums=('331006c8e7b6eea5558f2d3869499484bdce1411')
 
 build() {
 	cd $srcdir
diff --git a/extra/lablgtk2/PKGBUILD b/extra/lablgtk2/PKGBUILD
index ab7971c4d..63fc1edac 100644
--- a/extra/lablgtk2/PKGBUILD
+++ b/extra/lablgtk2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 170201 2012-11-05 08:17:35Z tpowa $
+# $Id: PKGBUILD 195987 2013-10-07 07:06:22Z tpowa $
 #Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=lablgtk2
 pkgver=2.16.0
-pkgrel=2
+pkgrel=3
 pkgdesc=" An Objective Caml interface to gtk2"
 arch=(i686 x86_64 'mips64el')
 license=('LGPL')
diff --git a/extra/lcms/PKGBUILD b/extra/lcms/PKGBUILD
index 58eb3e723..75683cabc 100644
--- a/extra/lcms/PKGBUILD
+++ b/extra/lcms/PKGBUILD
@@ -1,18 +1,25 @@
-# $Id: PKGBUILD 148810 2012-02-05 11:51:27Z ibiru $
+# $Id: PKGBUILD 193922 2013-09-06 07:11:54Z bpiotrowski $
 # Maintainer: Tobias Kieslich <neri@archlinux.org>
 # Contributor: Ben <contrasutra@myrealbox.com>
 
 pkgname=lcms
 pkgver=1.19
-pkgrel=2.2
+pkgrel=4
 pkgdesc="Lightweight color management development library/engine"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 depends=('libtiff')
 url="http://www.littlecms.com"
 options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('8af94611baf20d9646c7c2c285859818')
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz
+        cve-2013-4276.patch)
+md5sums=('8af94611baf20d9646c7c2c285859818'
+         'fa1db4861cfa05f4c4a2c826e1c35502')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ../cve-2013-4276.patch
+}
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/lcms/cve-2013-4276.patch b/extra/lcms/cve-2013-4276.patch
new file mode 100644
index 000000000..8f2f32297
--- /dev/null
+++ b/extra/lcms/cve-2013-4276.patch
@@ -0,0 +1,62 @@
+diff -ur lcms-1.19.dfsg/samples/icctrans.c lcms-1.19.dfsg-patched/samples/icctrans.c
+--- lcms-1.19.dfsg/samples/icctrans.c	2009-10-30 15:57:45.000000000 +0000
++++ lcms-1.19.dfsg-patched/samples/icctrans.c	2013-08-06 11:53:14.385266647 +0100
+@@ -86,6 +86,8 @@
+ static LPcmsNAMEDCOLORLIST InputColorant = NULL;
+ static LPcmsNAMEDCOLORLIST OutputColorant = NULL;
+ 
++unsigned int Buffer_size = 4096;
++
+ 
+ // isatty replacement
+ 
+@@ -500,7 +502,7 @@
+ 
+     Prefix[0] = 0;
+     if (!lTerse)
+-        sprintf(Prefix, "%s=", C);
++        snprintf(Prefix, 20, "%s=", C);
+ 
+     if (InHexa)
+     {
+@@ -648,7 +650,9 @@
+ static
+ void GetLine(char* Buffer)
+ {    
+-    scanf("%s", Buffer);
++    char User_buffer[Buffer_size];
++    fgets(User_buffer, (Buffer_size - 1), stdin);
++    sscanf(User_buffer,"%s", Buffer);
+     
+     if (toupper(Buffer[0]) == 'Q') { // Quit?
+ 
+@@ -668,7 +672,7 @@
+ static
+ double GetAnswer(const char* Prompt, double Range)
+ {
+-    char Buffer[4096];
++    char Buffer[Buffer_size];
+     double val = 0.0;
+ 	       
+     if (Range == 0.0) {              // Range 0 means double value
+@@ -738,7 +742,7 @@
+ static
+ WORD GetIndex(void)
+ {
+-    char Buffer[4096], Name[40], Prefix[40], Suffix[40];
++    char Buffer[Buffer_size], Name[40], Prefix[40], Suffix[40];
+     int index, max;
+ 
+     max = cmsNamedColorCount(hTrans)-1;
+diff -ur lcms-1.19.dfsg/tifficc/tiffdiff.c lcms-1.19.dfsg-patched/tifficc/tiffdiff.c
+--- lcms-1.19.dfsg/tifficc/tiffdiff.c	2009-10-30 15:57:46.000000000 +0000
++++ lcms-1.19.dfsg-patched/tifficc/tiffdiff.c	2013-08-06 11:49:06.698951157 +0100
+@@ -633,7 +633,7 @@
+     cmsIT8SetSheetType(hIT8, "TIFFDIFF");
+     
+    
+-    sprintf(Buffer, "Differences between %s and %s", TiffName1, TiffName2);
++    snprintf(Buffer, 256, "Differences between %s and %s", TiffName1, TiffName2);
+   
+     cmsIT8SetComment(hIT8, Buffer);
+ 
diff --git a/extra/lesstif/PKGBUILD b/extra/lesstif/PKGBUILD
index 7afd28d0a..ceda6b8a8 100644
--- a/extra/lesstif/PKGBUILD
+++ b/extra/lesstif/PKGBUILD
@@ -1,15 +1,12 @@
-# $Id: PKGBUILD 143913 2011-11-30 20:33:57Z andrea $
+# $Id: PKGBUILD 195188 2013-09-27 04:29:31Z eric $
 # Maintainer:
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: John Proctor <jproctor@prium.net>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=lesstif
 pkgver=0.95.2
-pkgrel=4.1
+pkgrel=5
 pkgdesc="LGPL'd re-implementation of Motif"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://www.lesstif.org/"
+url="http://sourceforge.net/projects/lesstif/"
 license=('LGPL' 'MIT')
 depends=('freetype2' 'libxt' 'libxp')
 [ "$CARCH" = "mips64el" ] && options=('!libtool')
@@ -21,41 +18,42 @@ md5sums=('754187dbac09fcf5d18296437e72a32f'
          'b1f320192a9154f72d83e9d3d5a25a2f'
          '30e2c0babc84696af089d55cb9cb2908')
 
-build() {
-	cd "${srcdir}"/${pkgname}-${pkgver}
+prepare() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+
+  # https://bugs.archlinux.org/task/17712
+  patch -p1 -i "${srcdir}"/040_fedora_XxxxProperty-64bit.diff
+}
 
-    # https://bugs.archlinux.org/task/17712
-	patch -p1 -i "${srcdir}"/040_fedora_XxxxProperty-64bit.diff
+build() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
 
-	./configure --prefix=/usr \
-      --mandir=/usr/share/man \
-	  --docdir=/usr/share/doc \
-      --enable-production \
-	  --enable-nonstandard-conversions \
-      --enable-editres \
-      --with-xdnd \
-      --enable-build-21 \
-      --disable-debug \
-	  --enable-static
+  ./configure --prefix=/usr \
+    --enable-production \
+    --enable-nonstandard-conversions \
+    --enable-editres \
+    --with-xdnd \
+    --enable-build-21 \
+    --disable-debug \
+    --enable-static
 
-	# fix linkage against already installed version
-	perl -pi -e 's/^(hardcode_into_libs)=.*/$1=no/' libtool
+  # fix linkage against already installed version
+  perl -pi -e 's/^(hardcode_into_libs)=.*/$1=no/' libtool
 
-	make
+  make
 
-	# fix linkage against already installed version
-	for f in `find . -name \*.la -type f` ; do
-	    perl -pi -e 's/^(relink_command=.*)/# $1/' $f
-	done
+  # fix linkage against already installed version
+  for f in $(find . -name \*.la -type f) ; do
+    perl -pi -e 's/^(relink_command=.*)/# $1/' $f
+  done
 
-	make -C lib/Mrm-2.1
+  make -C lib/Mrm-2.1
 }
 
 package() {
-	cd "${srcdir}"/${pkgname}-${pkgver}
+  cd "${srcdir}"/${pkgname}-${pkgver}
 
-	make -C lib/Mrm-2.1 DESTDIR="${pkgdir}" install
-	make appdir=/usr/share/X11/app-defaults rootdir=/usr/share/LessTif \
-	    DESTDIR="${pkgdir}" install
-	install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+  make -C lib/Mrm-2.1 DESTDIR="${pkgdir}" install
+  make DESTDIR="${pkgdir}" appdir=/usr/share/X11/app-defaults rootdir=/usr/share/doc/LessTif install
+  install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }
diff --git a/extra/leveldb/PKGBUILD b/extra/leveldb/PKGBUILD
index 40409218e..614aadc62 100644
--- a/extra/leveldb/PKGBUILD
+++ b/extra/leveldb/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 189268 2013-07-02 02:41:15Z dreisner $
+# $Id: PKGBUILD 195162 2013-09-25 22:08:21Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: feydaykyn <feydaykyn@yahoo.fr>
 
 pkgname=leveldb
-pkgver=1.12.0
+pkgver=1.14.0
 pkgrel=1
 pkgdesc="A fast and lightweight key/value database library"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ url="https://code.google.com/p/leveldb/"
 license=('BSD')
 depends=('gperftools' 'snappy')
 source=("https://leveldb.googlecode.com/files/$pkgname-$pkgver.tar.gz")
-sha1sums=('e7b84f239949920bfc2d7d1074ec6a6fa8869e23')
+sha1sums=('641d54df4aaf7ee569ae003cfbdb888ebdee0d7f')
 
 build() {
   make -C "$pkgname-$pkgver"
diff --git a/extra/libbluedevil/PKGBUILD b/extra/libbluedevil/PKGBUILD
index a64cadc07..da95a708c 100644
--- a/extra/libbluedevil/PKGBUILD
+++ b/extra/libbluedevil/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 187863 2013-06-07 09:24:59Z tomegun $
+# $Id: PKGBUILD 194548 2013-09-18 11:33:02Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libbluedevil
-pkgver=1.9.3
-pkgrel=2
+pkgver=1.9.4
+pkgrel=1
 pkgdesc='A Qt4 wrapper for bluez used in the new KDE bluetooth stack'
 arch=('i686' 'x86_64' 'mips64el')
 url="https://projects.kde.org/projects/playground/libs/libbluedevil"
 license=('GPL')
 depends=('qt4' 'bluez4')
 makedepends=('cmake')
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('fcb1480feba45dcd076b3ee54150bdf5')
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
+md5sums=('25d114ba52218f4cf44c7b4525399835')
 
 build() {
   mkdir build
   cd build
-  cmake ../${pkgname}-${pkgver} \
+  cmake ../${pkgname}-v${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr
   make
diff --git a/extra/libchamplain/PKGBUILD b/extra/libchamplain/PKGBUILD
index 9c9101c43..a79985526 100644
--- a/extra/libchamplain/PKGBUILD
+++ b/extra/libchamplain/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 186991 2013-06-02 19:42:55Z heftig $
+# $Id: PKGBUILD 196110 2013-10-07 11:52:47Z jgc $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Michael Kanis <mkanis@gmx.de>
 
 pkgname=libchamplain
-pkgver=0.12.4
+pkgver=0.12.5
 pkgrel=2
 pkgdesc="Gtk3 widget for displaying rasterized maps"
 url="http://projects.gnome.org/libchamplain/"
@@ -13,7 +13,7 @@ options=('!libtool')
 depends=('clutter-gtk' 'libsoup' 'cairo' 'sqlite')
 makedepends=('gobject-introspection' 'gtk-doc' 'vala')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('631ce8e91b02c596e29778d3f7c1d28013e2e40d080a88f2d9a06f8b79f9e493')
+sha256sums=('9c937d3775053a7d6b542aad36b16bbb07e02be3adb683ae57d7dcbe89634236')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/libchewing/PKGBUILD b/extra/libchewing/PKGBUILD
index 9d850aa60..84f145044 100644
--- a/extra/libchewing/PKGBUILD
+++ b/extra/libchewing/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 176851 2013-02-01 14:39:29Z bisson $
-# Contributor: damir <damir@archlinux.org>
-# Contributor: whisky <archlinux.cle(at)gmail.com>
+# $Id: PKGBUILD 194021 2013-09-10 06:55:01Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: whisky <archlinux.cle(at)gmail.com>
+# Contributor: damir <damir@archlinux.org>
 
 pkgname=libchewing
-pkgver=0.3.4
+pkgver=0.3.5
 pkgrel=1
-pkgdesc='Intelligent Zhuyin input method library for traditional Chinese'
+pkgdesc='Intelligent Chinese phonetic input method'
+url='http://chewing.im/'
 arch=('i686' 'x86_64' 'mips64el')
-url='http://chewing.csie.net/'
 license=('GPL')
 options=('!libtool')
 source=("http://chewing.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('631a613df00409b51adebb8b2dc33c5e6a006834')
+sha1sums=('5ee3941f0f62fa14fbda53e1032970b04a7a88b7')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/libcryptui/PKGBUILD b/extra/libcryptui/PKGBUILD
index c2b8d28ab..e610adb9d 100644
--- a/community/libcryptui/PKGBUILD
+++ b/extra/libcryptui/PKGBUILD
@@ -1,8 +1,9 @@
-# $Id: PKGBUILD 87353 2013-03-30 10:43:50Z bgyorgy $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# $Id: PKGBUILD 196111 2013-10-07 11:52:48Z jgc $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=libcryptui
-pkgver=3.8.0
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Library for OpenPGP prompts"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +14,7 @@ makedepends=('intltool' 'gobject-introspection')
 options=('!libtool')
 install=$pkgname.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('10eed96e33b6d7286795a7c678a5655a86ae099fb98d1f7211aa28aa636c0837')
+sha256sums=('ceeba7ebdcda768d671e9df9332b18d4f25edd1f4d91e86a241c3c1f3ffc6332')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/libcryptui/libcryptui.install b/extra/libcryptui/libcryptui.install
index 7a903e80c..7a903e80c 100644
--- a/community/libcryptui/libcryptui.install
+++ b/extra/libcryptui/libcryptui.install
diff --git a/extra/libdiscid/PKGBUILD b/extra/libdiscid/PKGBUILD
index ba372dd96..096406399 100644
--- a/extra/libdiscid/PKGBUILD
+++ b/extra/libdiscid/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 192092 2013-08-05 19:32:28Z eric $
+# $Id: PKGBUILD 195896 2013-10-03 23:11:52Z eric $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Eric Gillingham <sysrq@sysrq.tk>
 
 pkgname=libdiscid
-pkgver=0.5.2
+pkgver=0.6.1
 pkgrel=1
 pkgdesc="A Library for creating MusicBrainz DiscIDs"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('LGPL')
 depends=('glibc')
 options=('!libtool')
 source=("http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/${pkgname}-${pkgver}.tar.gz")
-md5sums=('ce5141be6082cf2f8a31f624ce8510c9')
+md5sums=('98c4b281780707e6b446cc526a825e7a')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD
index fb8249bd4..c9b28d1b9 100644
--- a/extra/libdrm/PKGBUILD
+++ b/extra/libdrm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 190056 2013-07-13 17:35:10Z andyrtr $
+# $Id: PKGBUILD 194427 2013-09-16 10:28:35Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libdrm
@@ -8,7 +8,7 @@ pkgdesc="Userspace interface to kernel DRM services"
 arch=(i686 x86_64 'mips64el')
 license=('custom')
 depends=('glibc' 'libpciaccess')
-makedepends=('cairo')
+checkdepends=('cairo')
 [ "$CARCH" != "mips64el" ] && makedepends+=('clang' 'valgrind')
 replaces=('libdrm-new' 'libdrm-nouveau')
 options=('!libtool')
diff --git a/extra/libdvbpsi/PKGBUILD b/extra/libdvbpsi/PKGBUILD
index 4bdad975b..c44f8e725 100644
--- a/extra/libdvbpsi/PKGBUILD
+++ b/extra/libdvbpsi/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 184029 2013-05-01 14:46:54Z foutrelis $
+# $Id: PKGBUILD 195173 2013-09-26 15:48:02Z foutrelis $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=libdvbpsi
-pkgver=0.2.2
+pkgver=1.1.0
 pkgrel=1
 epoch=1
 pkgdesc="A library designed for decoding and generation of MPEG TS and DVB PSI tables"
@@ -15,7 +15,7 @@ replaces=('libdvbpsi4' 'libdvbpsi5')
 conflicts=('libdvbpsi4' 'libdvbpsi5')
 url="http://developers.videolan.org/libdvbpsi/"
 source=("http://download.videolan.org/pub/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('b387e07ffd844b61c7a050c47307c0f7')
+md5sums=('1f84f9d1de08e15f94e6ff9957278064')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libdvdcss/PKGBUILD b/extra/libdvdcss/PKGBUILD
index 41146c232..840851852 100644
--- a/extra/libdvdcss/PKGBUILD
+++ b/extra/libdvdcss/PKGBUILD
@@ -1,27 +1,27 @@
-# $Id: PKGBUILD 180007 2013-03-14 11:52:25Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
+# $Id: PKGBUILD 195484 2013-10-01 06:01:26Z bpiotrowski $
+# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: arjan <arjan@archlinux.org>
 # Contributor Sarah Hay <sarahhay@mb.sympatico.ca>
 
 pkgname=libdvdcss
 pkgver=1.2.13
-pkgrel=1
-pkgdesc="A portable abstraction library for DVD decryption"
+pkgrel=2
+pkgdesc="Portable abstraction library for DVD decryption"
 url="http://www.videolan.org/libdvdcss"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('glibc')
 options=('!libtool' '!docs' '!emptydirs')
-source=(http://download.videolan.org/pub/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
+source=(http://download.videolan.org/pub/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2)
 sha1sums=('1a4a5e55c7529da46386c1c333340eee2c325a77')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $pkgname-$pkgver
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libevdev/PKGBUILD b/extra/libevdev/PKGBUILD
new file mode 100644
index 000000000..fe5d89618
--- /dev/null
+++ b/extra/libevdev/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: $
+# Maintainer: Jan de Groot
+
+pkgname=libevdev
+pkgver=0.4
+pkgrel=2
+pkgdesc="Wrapper library for evdev devices"
+arch=(i686 x86_64)
+url="http://www.freedesktop.org/wiki/Software/libevdev/"
+license=(custom:X11)
+depends=('glibc')
+makedepends=('python')
+options=('!libtool')
+source=(http://freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz)
+sha256sums=('ba6becd3f41430aa290ddf53694909fb46b9a65d5fe264e5fc2a4f5169484f42')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --disable-static --disable-gcov
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+}
diff --git a/extra/libgee/PKGBUILD b/extra/libgee/PKGBUILD
index 8f7db2ec7..d54504e49 100644
--- a/extra/libgee/PKGBUILD
+++ b/extra/libgee/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 193394 2013-08-19 16:07:01Z heftig $
+# $Id: PKGBUILD 196112 2013-10-07 11:52:50Z jgc $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=libgee
-pkgver=0.10.4
+pkgver=0.12.0
 pkgrel=1
 pkgdesc="GObject collection library"
 url="http://live.gnome.org/Libgee"
@@ -13,7 +13,7 @@ depends=(glib2)
 makedepends=(gobject-introspection vala)
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('bb18fbdd048a9fb474def98f8b038db62d391b658b6bdebd2504cb638798ef6b')
+sha256sums=('d106ed63fe0da5d5ee89aa8197a373cf9a2b96688cc3060144bfc0a022496ea5')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/libgnome-keyring/PKGBUILD b/extra/libgnome-keyring/PKGBUILD
index f8f357351..1cb9f768d 100644
--- a/extra/libgnome-keyring/PKGBUILD
+++ b/extra/libgnome-keyring/PKGBUILD
@@ -1,8 +1,8 @@
-#$Id: PKGBUILD 183431 2013-04-21 22:11:18Z heftig $
+#$Id: PKGBUILD 196113 2013-10-07 11:52:52Z jgc $
 #Maintainer: Jan De Groot <jgc@archlinux.org>
 
 pkgname=libgnome-keyring
-pkgver=3.8.0
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="GNOME keyring client library"
 arch=(i686 x86_64 'mips64el')
@@ -13,7 +13,7 @@ optdepends=('gnome-keyring: key storage service (or use any other service implem
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('a8646f2bc62ef903be422946a6356b0718f7a4cbb29b5bdd35a84136f6b82f76')
+sha256sums=('3984e99338e6e610af320a637fa84fb9e795226cfd633d7c0db452c5ae43b560')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/libgweather/PKGBUILD b/extra/libgweather/PKGBUILD
index 9230c7938..5527147f5 100644
--- a/extra/libgweather/PKGBUILD
+++ b/extra/libgweather/PKGBUILD
@@ -1,40 +1,24 @@
-# $Id: PKGBUILD 185424 2013-05-14 09:29:29Z heftig $
+# $Id: PKGBUILD 196114 2013-10-07 11:52:53Z jgc $
 # Maintainer: Jan de Groot  <jgc@archlinux.org>
 
 pkgname=libgweather
-pkgver=3.8.2
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Provides access to weather information from the net"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('libsoup' 'gnome-icon-theme' 'gtk3')
-makedepends=('intltool' 'gtk-doc' 'gobject-introspection' 'gnome-common')
+makedepends=('intltool' 'gobject-introspection' 'vala')
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org/"
 install=libgweather.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        gettext-not-xml.patch
-        no_external_gettext.patch)
-sha256sums=('b053c1328d756a6c653e44464b7a41bec451752fa9686ade32e2e4c6e2a6deb5'
-            '40325e0b5464ebb75eaad3c9292c0bab7b15cfefb93011d9ccc0ab82635a9533'
-            'f07ac07a70ad4999c3acd5d5b82aabd8831e6a45beb9aaed239f212057ded672')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('4feab6e5c6eb4df85e7d134982a18a6196e63bc8179cfe5a25fc727482c52996')
 
 build() {
     cd "$pkgname-$pkgver"
-
-    patch -Np1 -i "$srcdir/gettext-not-xml.patch"
-    patch -Np1 -i "$srcdir/no_external_gettext.patch"
-    gtkdocize
-    autoreconf -fi
-
-    cd po
-     intltool-update --pot
-    cd ../po-locations
-    intltool-update --gettext-package libgweather-locations --pot
-    cd ..
     ./configure --prefix=/usr --sysconfdir=/etc \
-        --localstatedir=/var --disable-static \
-        --enable-locations-compression
+        --localstatedir=/var --disable-static
     make
 }
 
diff --git a/extra/libidn/PKGBUILD b/extra/libidn/PKGBUILD
index a6cb39355..358abdbd2 100644
--- a/extra/libidn/PKGBUILD
+++ b/extra/libidn/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 178107 2013-02-16 09:56:28Z ronald $
+# $Id: PKGBUILD 194235 2013-09-11 07:58:33Z bpiotrowski $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Jan de Groot <jgc.archlinux.org>
 # Contributor: Eric Johnson <eric.archlinux.org>
 
 pkgname=libidn
-pkgver=1.26
+pkgver=1.28
 pkgrel=1
 pkgdesc="Implementation of the Stringprep, Punycode and IDNA specifications"
 url="http://www.gnu.org/software/libidn/"
@@ -15,7 +15,7 @@ makedepends=('pkgconfig')
 options=('!libtool')
 source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz)
 install=libidn.install
-sha1sums=('b1cb40646a96dadbfc41d060d23dfb382eec1128')
+sha1sums=('725587211b229c156e29fa2ad116b0ef71a7ca17')
 	
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/libkcddb/PKGBUILD b/extra/libkcddb/PKGBUILD
index 0ffd7e91b..9886e7ffd 100644
--- a/extra/libkcddb/PKGBUILD
+++ b/extra/libkcddb/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193244 2013-08-19 09:54:38Z andrea $
+# $Id: PKGBUILD 195548 2013-10-01 15:17:30Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkcddb
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="KDE CDDB library"
 url='https://projects.kde.org/projects/kde/kdemultimedia/libkcddb'
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdemultimedia-kioslave')
 conflicts=('kdemultimedia-kioslave')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('818157b0a306d82a102ce0e2f85ac0275323dbc5')
+sha1sums=('8d2a6774f96ae08666bbfe117c77e63a4e789457')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libkcompactdisc/PKGBUILD b/extra/libkcompactdisc/PKGBUILD
index c958c454f..53ba20837 100644
--- a/extra/libkcompactdisc/PKGBUILD
+++ b/extra/libkcompactdisc/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193245 2013-08-19 09:54:39Z andrea $
+# $Id: PKGBUILD 195550 2013-10-01 15:17:40Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkcompactdisc
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="A library for interfacing with CDs"
 url='https://projects.kde.org/projects/kde/kdemultimedia/libkcompactdisc'
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdemultimedia-kioslave')
 conflicts=('kdemultimedia-kioslave')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('dde519bece17036a507cff2c326e37b9e91b7d1b')
+sha1sums=('bca14ffe1defbfd194f9429d051af5cb0545cede')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libkdcraw/PKGBUILD b/extra/libkdcraw/PKGBUILD
index 809da1d78..20f392fef 100644
--- a/extra/libkdcraw/PKGBUILD
+++ b/extra/libkdcraw/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193239 2013-08-19 09:54:33Z andrea $
+# $Id: PKGBUILD 195538 2013-10-01 15:16:44Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkdcraw
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="A C++ interface used to decode RAW picture"
 url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkdcraw"
@@ -14,7 +14,7 @@ replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('35618bcdf322de457669e117df28b6843ae00853')
+sha1sums=('51680e9653bc7e00bb71a3744702c7f52570c672')
 
 build() {
   mkdir build
diff --git a/extra/libkdeedu/PKGBUILD b/extra/libkdeedu/PKGBUILD
index 41660e120..f0aaf9993 100644
--- a/extra/libkdeedu/PKGBUILD
+++ b/extra/libkdeedu/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193237 2013-08-19 09:54:31Z andrea $
+# $Id: PKGBUILD 195534 2013-10-01 15:16:27Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkdeedu
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="Libraries used by KDE Education applications"
 url="https://projects.kde.org/projects/kde/kdeedu/libkdeedu"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 replaces=('kdeedu-libkdeedu' 'kdeedu-data')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('231421834163b1628690c75d0680d40b68803d73')
+sha1sums=('23daf0f0371b1c7e40a376fba627bc42afeeb5a2')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libkdegames/PKGBUILD b/extra/libkdegames/PKGBUILD
index 9b57124b2..5ca097c62 100644
--- a/extra/libkdegames/PKGBUILD
+++ b/extra/libkdegames/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193246 2013-08-19 09:54:40Z andrea $
+# $Id: PKGBUILD 195552 2013-10-01 15:17:47Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkdegames
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="Common code and data for many KDE games"
 url="https://projects.kde.org/projects/kde/kdegames/libkdegames"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdegames-libkdegames')
 conflicts=('kdegames-libkdegames')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('89884744f60fdb1858960444d27bc3cbde6afc26')
+sha1sums=('f8a9f1ec6f92dd04bcdb7b929cf62b594e7cf641')
 
 build() {
   mkdir build
diff --git a/extra/libkexiv2/PKGBUILD b/extra/libkexiv2/PKGBUILD
index afb2aeb97..fe07d34bc 100644
--- a/extra/libkexiv2/PKGBUILD
+++ b/extra/libkexiv2/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193240 2013-08-19 09:54:34Z andrea $
+# $Id: PKGBUILD 195540 2013-10-01 15:16:52Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkexiv2
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="A library to manipulate pictures metadata"
 url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkexiv2"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('9f843c1dfd3b02f52cce743ce7602f035bd35fad')
+sha1sums=('51e75f8e6db99a6fd7ca8956a16636c790a9f81c')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libkipi/PKGBUILD b/extra/libkipi/PKGBUILD
index 0388ccda7..90d879a95 100644
--- a/extra/libkipi/PKGBUILD
+++ b/extra/libkipi/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkipi
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="An interface to use kipi-plugins from a KDE application"
 url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkipi"
@@ -14,7 +14,7 @@ replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('b186a4901f330aa12a20fe0ea708be11934e20c4')
+sha1sums=('291dd7ad892b2c0598642b006ad4709d669b7271')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libkmahjongg/PKGBUILD b/extra/libkmahjongg/PKGBUILD
index 8be138dba..9a65a926b 100644
--- a/extra/libkmahjongg/PKGBUILD
+++ b/extra/libkmahjongg/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193247 2013-08-19 09:54:40Z andrea $
+# $Id: PKGBUILD 195554 2013-10-01 15:17:56Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkmahjongg
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="Common code, backgrounds and tile sets for games using Mahjongg tiles"
 url="https://projects.kde.org/projects/kde/kdegames/libmahjongg"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdegames-libkmahjongg')
 conflicts=('kdegames-libkmahjongg')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('ec7b32b5c0f767f06a36202f2276dc0fe08ebd53')
+sha1sums=('f2594a7047d228160241d1aa2dd7f307dfb15921')
 
 build() {
   mkdir build
diff --git a/extra/libksane/PKGBUILD b/extra/libksane/PKGBUILD
index 5ecfd49ad..ee8e732b4 100644
--- a/extra/libksane/PKGBUILD
+++ b/extra/libksane/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193242 2013-08-19 09:54:36Z andrea $
+# $Id: PKGBUILD 195544 2013-10-01 15:17:09Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libksane
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="An image scanning library"
 url="https://projects.kde.org/projects/kde/kdegraphics/libs/libksane"
@@ -14,7 +14,7 @@ replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('21313b183de5e602b8ae6bbf31147ad71d2130e2')
+sha1sums=('9f617633c6770f0db426362df78c6dc564601533')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libkscreen/PKGBUILD b/extra/libkscreen/PKGBUILD
index 6ddab8260..5a374b892 100644
--- a/extra/libkscreen/PKGBUILD
+++ b/extra/libkscreen/PKGBUILD
@@ -1,18 +1,17 @@
-# $Id: PKGBUILD 192012 2013-08-04 07:18:21Z lcarlier $
+# $Id: PKGBUILD 194203 2013-09-10 14:07:21Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: birdflesh <antkoul at gmail dot com>
 
 pkgname=libkscreen
 pkgver=1.0.1
-pkgrel=1
+pkgrel=3
 pkgdesc="KDE's screen management library"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/libkscreen'
 license=('GPL')
 depends=('kdelibs' 'qjson')
 makedepends=('cmake' 'automoc4')
-#source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('52aeaf2d987bffd05b111e89b445bd00')
 
 prepare() {
diff --git a/extra/libmodplug/PKGBUILD b/extra/libmodplug/PKGBUILD
index fd25e0373..a63647ad9 100644
--- a/extra/libmodplug/PKGBUILD
+++ b/extra/libmodplug/PKGBUILD
@@ -1,28 +1,35 @@
-# $Id: PKGBUILD 150611 2012-02-18 22:54:35Z pierre $
-# Maintainer:
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Patrick Leslie Polzer <leslie.polzer@gmx.net>
+# $Id: PKGBUILD 193909 2013-09-05 20:04:00Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=libmodplug
 pkgver=0.8.8.4
-pkgrel=1.2
+pkgrel=2
 pkgdesc="A MOD playing library"
 arch=(i686 x86_64 'mips64el')
 url="http://modplug-xmms.sourceforge.net/"
 license=('custom')
 depends=('gcc-libs')
 options=('!libtool')
-source=("http://downloads.sourceforge.net/modplug-xmms/${pkgname}-${pkgver}.tar.gz")
-md5sums=('fddc3c704c5489de2a3cf0fedfec59db')
+source=(http://downloads.sourceforge.net/modplug-xmms/${pkgname}-${pkgver}.tar.gz
+        libmodplug-CVE-2013-4233-Fix.patch libmodplug-CVE-2013-4234-Fix.patch)
+sha1sums=('df4deffe542b501070ccb0aee37d875ebb0c9e22'
+          'daee7fba80f633236a3d09ad19225c57013140e9'
+          '2e870747261a86dce5056cbf077c5914e9e8b287')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -p2 -i "${srcdir}/libmodplug-CVE-2013-4233-Fix.patch"
+  patch -p2 -i "${srcdir}/libmodplug-CVE-2013-4234-Fix.patch"
+}
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
   install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/libmodplug/libmodplug-CVE-2013-4233-Fix.patch b/extra/libmodplug/libmodplug-CVE-2013-4233-Fix.patch
new file mode 100644
index 000000000..288b44d13
--- /dev/null
+++ b/extra/libmodplug/libmodplug-CVE-2013-4233-Fix.patch
@@ -0,0 +1,42 @@
+From c4d4e047862649a75f6dba905c613aff0df81309 Mon Sep 17 00:00:00 2001
+From: Konstanty Bialkowski <konstanty@ieee.org>
+Date: Wed, 14 Aug 2013 14:15:27 +1000
+Subject: [PATCH] CVE-2013-4233 Fix
+
+Integer overflow in j variable
+
+-- reported by Florian "Agix" Gaultier
+---
+ libmodplug/src/load_abc.cpp | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/libmodplug/src/load_abc.cpp b/libmodplug/src/load_abc.cpp
+index 9f4b328..ecb7b62 100644
+--- a/libmodplug/src/load_abc.cpp
++++ b/libmodplug/src/load_abc.cpp
+@@ -1814,7 +1814,7 @@ static int abc_extract_tempo(const char *p, int invoice)
+ 
+ static void	abc_set_parts(char **d, char *p)
+ {
+-	int i,j,k,m,n;
++	int i,j,k,m,n,size;
+ 	char *q;
+ #ifdef NEWMIKMOD
+ 	static MM_ALLOC *h;
+@@ -1852,10 +1852,11 @@ static void	abc_set_parts(char **d, char *p)
+ 			i += n-1;
+ 		}
+ 	}
+-	q = (char *)_mm_calloc(h, j+1, sizeof(char));	// enough storage for the worst case
++	size = (j + 1) > 0 ? j+1 : j;
++	q = (char *)_mm_calloc(h, size, sizeof(char));	// enough storage for the worst case
+ 	// now copy bytes from p to *d, taking parens and digits in account
+ 	j = 0;
+-	for( i=0; p[i] && p[i] != '%'; i++ ) {
++	for( i=0; p[i] && p[i] != '%' && j < size; i++ ) {
+ 		if( isdigit(p[i]) || isupper(p[i]) || p[i] == '(' || p[i] == ')' ) {
+ 			if( p[i] == ')' ) {
+ 				for( n=j; n > 0 && q[n-1] != '('; n-- )	;	// find open paren in q
+-- 
+1.8.4
+
diff --git a/extra/libmodplug/libmodplug-CVE-2013-4234-Fix.patch b/extra/libmodplug/libmodplug-CVE-2013-4234-Fix.patch
new file mode 100644
index 000000000..c4b105d19
--- /dev/null
+++ b/extra/libmodplug/libmodplug-CVE-2013-4234-Fix.patch
@@ -0,0 +1,95 @@
+From 5de53a46283e7c463115444a9339978011dab961 Mon Sep 17 00:00:00 2001
+From: Konstanty Bialkowski <konstanty@ieee.org>
+Date: Wed, 14 Aug 2013 15:15:09 +1000
+Subject: [PATCH] CVE-2013-4234 Fix
+
+Heap overflow in abc_MIDI_drum + abc_MIDI_gchord
+
+-- reported by Florian "Agix" Gaultier
+---
+ libmodplug/src/load_abc.cpp | 34 +++++++++++++++++++++++-----------
+ 1 file changed, 23 insertions(+), 11 deletions(-)
+
+diff --git a/libmodplug/src/load_abc.cpp b/libmodplug/src/load_abc.cpp
+index ecb7b62..dd9cc6b 100644
+--- a/libmodplug/src/load_abc.cpp
++++ b/libmodplug/src/load_abc.cpp
+@@ -3205,27 +3205,33 @@ static void abc_MIDI_chordname(const char *p)
+ static int abc_MIDI_drum(const char *p, ABCHANDLE *h)
+ {
+ 	char *q;
+-	int i,n,m;
++	int i, n, m, len;
+ 	while( isspace(*p) ) p++;
+ 	if( !strncmp(p,"on",2) && (isspace(p[2]) || p[2] == '\0') ) return 2;
+ 	if( !strncmp(p,"off",3) && (isspace(p[3]) || p[3] == '\0') ) return 1;
+-	n = 0;
++	n = 0; len = 0;
+ 	for( q = h->drum; *p && !isspace(*p); p++ ) {
+ 		if( !strchr("dz0123456789",*p) ) break;
+-		*q++ = *p;
+-		if( !isdigit(*p) ) {
+-			if( !isdigit(p[1]) ) *q++ = '1';
++		*q++ = *p; len++;
++		if( !isdigit(*p) && len < sizeof(h->drum)-1 ) {
++			if( !isdigit(p[1]) ) { *q++ = '1'; len ++; }
+ 			n++; // count the silences too....
+ 		}
++		if (len >= sizeof(h->drum)-1) {
++			// consume the rest of the input
++			// definitely enough "drum last state" stored.
++			while ( *p && !isspace(*p) ) p++;
++			break;
++		}
+ 	}
+ 	*q = '\0';
+ 	q = h->drumins;
+ 	for( i = 0; i<n; i++ ) {
+ 		if( h->drum[i*2] == 'd' ) {
+-			while( isspace(*p) ) p++;
++			while( *p && isspace(*p) ) p++;
+ 			if( !isdigit(*p) ) {
+ 				m = 0;
+-				while( !isspace(*p) ) p++;
++				while( *p && !isspace(*p) ) p++;
+ 			}
+ 			else
+ 				p += abc_getnumber(p,&m);
+@@ -3236,10 +3242,10 @@ static int abc_MIDI_drum(const char *p, ABCHANDLE *h)
+ 	q = h->drumvol;
+ 	for( i = 0; i<n; i++ ) {
+ 		if( h->drum[i*2] == 'd' ) {
+-			while( isspace(*p) ) p++;
++			while( *p && isspace(*p) ) p++;
+ 			if( !isdigit(*p) ) {
+ 				m = 0;
+-				while( !isspace(*p) ) p++;
++				while( *p && !isspace(*p) ) p++;
+ 			}
+ 			else
+ 				p += abc_getnumber(p,&m);
+@@ -3254,13 +3260,19 @@ static int abc_MIDI_drum(const char *p, ABCHANDLE *h)
+ static int abc_MIDI_gchord(const char *p, ABCHANDLE *h)
+ {
+ 	char *q;
++	int len = 0;
+ 	while( isspace(*p) ) p++;
+ 	if( !strncmp(p,"on",2) && (isspace(p[2]) || p[2] == '\0') ) return 2;
+ 	if( !strncmp(p,"off",3) && (isspace(p[3]) || p[3] == '\0') ) return 1;
+ 	for( q = h->gchord; *p && !isspace(*p); p++ ) {
+ 		if( !strchr("fbcz0123456789ghijGHIJ",*p) ) break;
+-		*q++ = *p;
+-		if( !isdigit(*p) && !isdigit(p[1]) ) *q++ = '1';
++		*q++ = *p; len++;
++		if( !isdigit(*p) && len < sizeof(h->gchord)-1 && !isdigit(p[1]) ) { *q++ = '1'; len ++; }
++		if (len >= sizeof(h->gchord)-1) {
++			// consume the rest of the input
++			// definitely enough "drum last state" stored.
++			while ( *p && !isspace(*p) ) p++;
++		}
+ 	}
+ 	*q = '\0';
+ 	return 0;
+-- 
+1.8.4
+
diff --git a/extra/libnotify/PKGBUILD b/extra/libnotify/PKGBUILD
index 6f1a5eddd..3ea034dae 100644
--- a/extra/libnotify/PKGBUILD
+++ b/extra/libnotify/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 154761 2012-03-30 16:37:09Z heftig $
+# $Id: PKGBUILD 196115 2013-10-07 11:52:55Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libnotify
-pkgver=0.7.5
-pkgrel=1.1
+pkgver=0.7.6
+pkgrel=1
 pkgdesc="Desktop notification library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://library.gnome.org/devel/notification-spec/"
@@ -12,7 +12,7 @@ depends=('gdk-pixbuf2')
 makedepends=('gtk3' 'gobject-introspection')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('4378cb47874ba4d5f759b7890d8d28d086e81d3f0bd4f6e84e5ab66d82ffb652')
+sha256sums=('0ef61ca400d30e28217979bfa0e73a7406b19c32dd76150654ec5b2bdf47d837')
 
 build() {
     cd ${pkgname}-${pkgver}
diff --git a/extra/libpeas/PKGBUILD b/extra/libpeas/PKGBUILD
index cb2b98529..bb1e32b4e 100644
--- a/extra/libpeas/PKGBUILD
+++ b/extra/libpeas/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 188712 2013-06-18 13:46:20Z heftig $
+# $Id: PKGBUILD 196116 2013-10-07 11:52:58Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=libpeas
-pkgver=1.8.1
+pkgver=1.9.0
 pkgrel=1
 pkgdesc="A GObject-based plugins engine"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,15 +17,9 @@ if [ "$CARCH" != "mips64el" ]; then
 fi
 options=('!libtool')
 install=libpeas.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz
-        js17.patch)
-sha256sums=('ff0e7cd1f0da5dc1289efdd4662a06188f8f0fb088eac67abe05ffa66ba7751d'
-            '094f28f911de979167c870b3ed51df09dbe3cacc271b375d891d7601c51ad44f')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz)
+sha256sums=('008747ccdf954dc7b8e3207fffede527a589363541873f906c8e0166f6f7df8d')
 
-prepare() {
-  cd $pkgname-$pkgver
-  patch -Np1 -i ../js17.patch
-}
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/libpng/PKGBUILD b/extra/libpng/PKGBUILD
index 3bc376d33..b5473089a 100644
--- a/extra/libpng/PKGBUILD
+++ b/extra/libpng/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 191317 2013-07-23 14:38:48Z foutrelis $
+# $Id: PKGBUILD 194432 2013-09-16 10:42:02Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Travis Willard <travis@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=libpng
-pkgver=1.6.3
+pkgver=1.6.5
 _apngver=1.6.3
 pkgrel=1
 pkgdesc="A collection of routines used to create PNG format graphics files"
@@ -16,7 +16,7 @@ depends=('zlib' 'sh')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz{,.asc}
         http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-$_apngver-apng.patch.gz)
-md5sums=('9307f8ab04f4be3c1889ffb504f0fe5c'
+md5sums=('dec292dd99b094cea03bdd7232f5a80c'
          'SKIP'
          '57007fc121baa2cdc48abcfb26300e78')
 
diff --git a/extra/libquvi/PKGBUILD b/extra/libquvi/PKGBUILD
index 44f4e9230..8d78ab2b2 100644
--- a/extra/libquvi/PKGBUILD
+++ b/extra/libquvi/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 173175 2012-12-12 00:31:54Z eric $
+# $Id: PKGBUILD 196117 2013-10-07 11:52:59Z jgc $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 
 pkgname=libquvi
-pkgver=0.4.1
-pkgrel=2
+pkgver=0.9.3
+pkgrel=1
 pkgdesc='Library for parsing video download links.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://quvi.sourceforge.net/'
-license=('LGPL')
-depends=('libquvi-scripts' 'curl' 'lua')
-conflicts=('quvi<0.4.0')
+license=('AGPL3')
+depends=('libquvi-scripts' 'curl' 'lua51' 'libproxy' 'libgcrypt' 'glib2')
+conflicts=('quvi<0.9.0')
 options=('!libtool')
-source=("http://downloads.sourceforge.net/sourceforge/quvi/${pkgname}-${pkgver}.tar.gz"{,.sig})
-md5sums=('a5fa8860c23655a529b3166f6e25c83a'
-         'cc7f15518f8ab2fc134bc64f0e9d584b')
+source=("http://downloads.sourceforge.net/sourceforge/quvi/${pkgname}-${pkgver}.tar.xz"{,.sig})
+md5sums=('12a62c4fcde9b6109193191b7bd3d685'
+         'SKIP')
 
 build() {
   cd "${pkgname}-${pkgver}"
diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD
index 0aec90273..36ebc53ff 100644
--- a/extra/libreoffice/PKGBUILD
+++ b/extra/libreoffice/PKGBUILD
@@ -1,5 +1,6 @@
-# $Id: PKGBUILD 193796 2013-09-01 09:04:01Z andyrtr $
+# $Id: PKGBUILD 196169 2013-10-07 14:33:01Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
+# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 
 pkgbase="libreoffice"
 pkgname=('libreoffice-common'
@@ -18,15 +19,15 @@ pkgname=('libreoffice-common'
 	'libreoffice-extension-presentation-minimizer'
 	'libreoffice-extension-wiki-publisher'
 	'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built)
-_LOver=4.1.1.2
-pkgver=4.1.1
-pkgrel=2
+_LOver=4.1.2.3
+pkgver=4.1.2
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
 makedepends=( # makedepends
              'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' #'boost'
-             'apache-ant' 'gperf' 'kdelibs' 'gconf' 'cppunit'
+             'apache-ant' 'gperf' 'kdelibs' 'gconf' 'gtk3' 'cppunit'
              'beanshell'  'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick'
              'glu' 'mesa' 'gst-plugins-base-libs' 'java-environment' 'postgresql-libs' 'doxygen'
              'clucene' 'bluez-libs' 'harfbuzz-icu'
@@ -78,7 +79,7 @@ source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz
 	${_additional_source_url}/libcdr-0.0.14.tar.bz2
 	${_additional_source_url}/libmspub-0.0.6.tar.bz2
 	${_additional_source_url}/libmwaw-0.1.10.tar.bz2
-	${_additional_source_url}/libvisio-0.0.30.tar.bz2
+	${_additional_source_url}/libvisio-0.0.31.tar.bz2
 	make-pyuno-work-with-system-wide-module-install.diff
 	libreoffice-common.sh libreoffice-common.csh)
 noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
@@ -114,10 +115,10 @@ noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 	libcdr-0.0.14.tar.bz2
 	libmspub-0.0.6.tar.bz2
 	libmwaw-0.1.10.tar.bz2
-	libvisio-0.0.30.tar.bz2	)
-md5sums=('4eb8fd2b0d1177d19b2f797faabc4ea2'
-         'f6b418a1ed94ef9d5ee30e9f5d7f305a'
-         'e8c69bdb55586531cc192904467f5e24'
+	libvisio-0.0.31.tar.bz2	)
+md5sums=('bb2fe0056ae92e70ee8816a36dd0696c'
+         '761323fae73ef156f5cf188d8bd983f1'
+         '54f36cf305ae018ad685c331587d83e3'
          'f02578f5218f217a9f20e9c30e119c6a'
          '1f24ab1d39f4a51faf22244c94a6203f'
          '35c94d2df8893241173de1d16b6034c0'
@@ -151,7 +152,7 @@ md5sums=('4eb8fd2b0d1177d19b2f797faabc4ea2'
          'd88f9b94df880d2c05be943b000ca112'
          '1120705cd0f0d9bd5506360bf57b6c2e'
          '2289bb137bbba9b473ce60168895c036'
-         '9d9eb3ae6bee763c161228b2b12e25f8'
+         '82628333418f101a20cd21f980cf9f40'
          '07d2bf5ad839a394cca008b3ec6e7bb1'
          '4195735a80876ae812fca5736b50192a'
          'e7e4b3e70e99e5cba8f8dfcacf3b0d87')
@@ -450,7 +451,7 @@ package_libreoffice-draw() {
 
 package_libreoffice-gnome() {
  pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment."
- depends=('libreoffice-common' 'gtk2' 'gconf') # gconf pulls in gtk3
+ depends=('libreoffice-common' 'gconf' 'gtk3')
  groups=('libreoffice')
  
  # create directories from *list.txt file
diff --git a/extra/librsvg/PKGBUILD b/extra/librsvg/PKGBUILD
index 086f4c6e2..14627fe1a 100644
--- a/extra/librsvg/PKGBUILD
+++ b/extra/librsvg/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 193630 2013-08-26 12:12:13Z jgc $
+# $Id: PKGBUILD 196119 2013-10-07 11:53:02Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=librsvg
-pkgver=2.37.0
-pkgrel=1
+pkgver=2.39.0
+pkgrel=2
 epoch=1
 pkgdesc="A SVG viewing library"
 arch=(i686 x86_64 'mips64el')
@@ -16,7 +16,7 @@ options=('!libtool' '!emptydirs')
 url="https://live.gnome.org/LibRsvg"
 install=librsvg.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('06c57dbcb29369d147b4e6ff4257c42ae5120c504c30fb567a27034ee30fd835')
+sha256sums=('aa47dcde0128eee6e3595d203bc673d9c27389588842f401bf585f31fc65095f')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/libsecret/PKGBUILD b/extra/libsecret/PKGBUILD
index 2c6086d5c..4b002f3dd 100644
--- a/extra/libsecret/PKGBUILD
+++ b/extra/libsecret/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 166488 2012-09-08 10:31:44Z jgc $
+# $Id: PKGBUILD 196120 2013-10-07 11:53:04Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libsecret
-pkgver=0.15
-pkgrel=2
+pkgver=0.16
+pkgrel=1
 pkgdesc='library for storing and retrieving passwords and other secrets.'
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="https://live.gnome.org/Libsecret"
 depends=('glib2' 'libgcrypt')
 makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'vala')
-optdepends=('gnome-keyring: key storage service (or use any other service implementing org.freedesktop.secrets')
+optdepends=('gnome-keyring: key storage service (or use any other service implementing org.freedesktop.secrets)')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz)
-sha256sums=('33e728b843efbe099483376ff5a3469260ee4b6ce035c7730909ac3793cb0fb8')
+sha256sums=('b859406c490a2011b35f5940235304315b343f2efd554800285f24b95e14f218')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/libsidplayfp/PKGBUILD b/extra/libsidplayfp/PKGBUILD
index d0f6ed36a..257d2643a 100644
--- a/extra/libsidplayfp/PKGBUILD
+++ b/extra/libsidplayfp/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 189835 2013-07-08 22:03:31Z bisson $
+# $Id: PKGBUILD 195480 2013-10-01 01:48:17Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Simon Perry <aur [at] sanxion [dot] net>
 # Contributor: Jonas Nyrén <jonas.nyren*mindkiller.com>
 
 pkgname=libsidplayfp
-pkgver=1.0.3
-pkgrel=2
+pkgver=1.1.0
+pkgrel=1
 pkgdesc='Library to play Commodore 64 music derived from libsidplay2'
 url='http://sourceforge.net/projects/sidplay-residfp/'
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ license=('GPL')
 makedepends=('vice')
 optdepends=('vice: better SID support')
 source=("http://downloads.sourceforge.net/project/sidplay-residfp/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('967426a369122b9398c60be0e7d0b78753e23f3e')
+sha1sums=('6c3617fcbd94fd364f3305a1c4d88485911110c7')
 
 options=('!libtool' '!staticlibs')
 
diff --git a/extra/libsm/PKGBUILD b/extra/libsm/PKGBUILD
index 907c56c8a..1a6a1bd94 100644
--- a/extra/libsm/PKGBUILD
+++ b/extra/libsm/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 151850 2012-03-03 13:43:52Z andyrtr $
+# $Id: PKGBUILD 194298 2013-09-13 07:26:46Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libsm
-pkgver=1.2.1
-pkgrel=1.1
+pkgver=1.2.2
+pkgrel=1
 pkgdesc="X11 Session Management library"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://xorg.freedesktop.org/"
-depends=('libice' 'util-linux-ng')
+depends=('libice' 'util-linux')
 makedepends=('xorg-util-macros' 'xtrans')
 options=('!libtool')
 source=(${url}/releases/individual/lib/libSM-${pkgver}.tar.bz2)
-sha1sums=('8d354a165e330022ffd3606aba562b8c8154213d')
+sha256sums=('0baca8c9f5d934450a70896c4ad38d06475521255ca63b717a6510fdb6e287bd')
 
 build() {
   cd "${srcdir}/libSM-${pkgver}"
diff --git a/extra/libsoup/PKGBUILD b/extra/libsoup/PKGBUILD
index 51d518a4b..dff130218 100644
--- a/extra/libsoup/PKGBUILD
+++ b/extra/libsoup/PKGBUILD
@@ -1,33 +1,35 @@
-# $Id: PKGBUILD 183606 2013-04-24 20:33:35Z heftig $
+# $Id: PKGBUILD 196121 2013-10-07 11:53:05Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libsoup
-pkgver=2.42.2
+pkgver=2.44.0
 pkgrel=1
 pkgdesc="GNOME HTTP Library"
 arch=('i686' 'x86_64' 'mips64el')
 license=(LGPL)
 url="http://www.gnome.org"
 depends=(glib2 libxml2 glib-networking sqlite)
-makedepends=(intltool gobject-introspection python2)
+makedepends=(intltool gobject-introspection python)
+checkdepends=(apache php php-apache)
 provides=("libsoup-gnome=$pkgver-$pkgrel")
 conflicts=(libsoup-gnome)
 replaces=(libsoup-gnome)
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('1f4f9cc55ba483dc8defea0c3f97cc507dc48384c5529179e29c1e6d05630dbf')
+sha256sums=('2ed9b200bda39c686d19eb4a0a5464e9166d09cbb3ced5a689c78214e83b5c27')
 
 build() {
   cd $pkgname-$pkgver
-
-  # Python3 has UnicodeDecodeErrors
-  sed -i -e '1s/python$/&2/' libsoup/tld-parser.py
-
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static
   make
 }
 
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
 package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
diff --git a/extra/libssh/PKGBUILD b/extra/libssh/PKGBUILD
index b836561e8..b2c484a0c 100644
--- a/extra/libssh/PKGBUILD
+++ b/extra/libssh/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 180604 2013-03-24 15:55:47Z tomegun $
+# $Id: PKGBUILD 195938 2013-10-05 20:32:06Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: ice-man <icemanf@gmail.com>
 # Contributor: sergeantspoon <sergeantspoon@archlinux.us>
 
 pkgname=libssh
-pkgver=0.5.4
+pkgver=0.5.5
 pkgrel=1
 pkgdesc="Library for accessing ssh client services through C libraries"
 url="http://www.libssh.org/"
@@ -13,7 +13,7 @@ license=('LGPL')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('openssl')
 makedepends=('cmake' 'doxygen')
-source=("https://red.libssh.org/attachments/download/41/${pkgname}-${pkgver}.tar.gz")
+source=("https://red.libssh.org/attachments/download/51/${pkgname}-${pkgver}.tar.gz")
 
 build() {
   cd "${srcdir}"
@@ -29,4 +29,4 @@ package(){
   cd "${srcdir}"/build
   make DESTDIR="${pkgdir}" install
 }
-md5sums=('b8b4e733c13dfabae33b2688ef82dacc')
+md5sums=('bb308196756c7255c0969583d917136b')
diff --git a/extra/libx11/PKGBUILD b/extra/libx11/PKGBUILD
index 1c41314ac..e60397f1c 100644
--- a/extra/libx11/PKGBUILD
+++ b/extra/libx11/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 191746 2013-07-30 07:19:33Z jgc $
+# $Id: PKGBUILD 194312 2013-09-13 08:00:26Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libx11
-pkgver=1.6.1
+pkgver=1.6.2
 pkgrel=1
 pkgdesc="X11 client-side library"
 arch=(i686 x86_64 'mips64el')
@@ -12,7 +12,7 @@ makedepends=('xorg-util-macros' 'xextproto' 'xtrans' 'inputproto')
 options=('!libtool')
 license=('custom')
 source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2)
-sha256sums=('10a54fc16b58b4f5a5eed4d080c357a82fd2f42d09af625c1f5df50650701892')
+sha256sums=('2aa027e837231d2eeea90f3a4afe19948a6eb4c8b2bec0241eba7dbc8106bd16')
 
 build() {
   cd "${srcdir}/libX11-${pkgver}"
diff --git a/extra/libxaw/PKGBUILD b/extra/libxaw/PKGBUILD
index 63ebbb27a..19bf832eb 100644
--- a/extra/libxaw/PKGBUILD
+++ b/extra/libxaw/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 160631 2012-06-02 21:31:52Z andyrtr $
+# $Id: PKGBUILD 194288 2013-09-13 07:15:28Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxaw
-pkgver=1.0.11
+pkgver=1.0.12
 pkgrel=1
 pkgdesc="X11 Athena Widget library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('libxmu' 'libxpm')
 makedepends=('xorg-util-macros')
 options=('!libtool')
 source=(${url}/releases/individual/lib/libXaw-${pkgver}.tar.bz2)
-sha256sums=('87a874acbb71d1ee59b8047312fc91d89dcb373e2970f121184cdae29a3d9492')
+sha256sums=('96fc314874fce9979556321d1d6ee00b5baf32fb333b7278853b4983bc3cdbf6')
 
 build() {
   cd "${srcdir}/libXaw-${pkgver}"
diff --git a/extra/libxmu/PKGBUILD b/extra/libxmu/PKGBUILD
index b000167bb..00c14986b 100644
--- a/extra/libxmu/PKGBUILD
+++ b/extra/libxmu/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 152301 2012-03-06 15:00:25Z andyrtr $
+# $Id: PKGBUILD 194290 2013-09-13 07:18:50Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxmu
-pkgver=1.1.1
-pkgrel=1.2
+pkgver=1.1.2
+pkgrel=1
 pkgdesc="X11 miscellaneous micro-utility library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xorg.freedesktop.org/"
@@ -12,7 +12,7 @@ makedepends=('xorg-util-macros')
 license=('custom')
 options=('!libtool')
 source=("${url}/releases/individual/lib/libXmu-${pkgver}.tar.bz2")
-sha1sums=('3e280aa927d78c05f94db6c7ae606f7ad132b495')
+sha256sums=('756edc7c383254eef8b4e1b733c3bf1dc061b523c9f9833ac7058378b8349d0b')
 
 build() {
   cd "${srcdir}/libXmu-${pkgver}"
diff --git a/extra/libxpm/PKGBUILD b/extra/libxpm/PKGBUILD
index 838433bdf..78f229bc3 100644
--- a/extra/libxpm/PKGBUILD
+++ b/extra/libxpm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 152783 2012-03-09 16:22:06Z andyrtr $
+# $Id: PKGBUILD 194292 2013-09-13 07:20:55Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxpm
-pkgver=3.5.10
-pkgrel=1.1
+pkgver=3.5.11
+pkgrel=1
 pkgdesc="X11 pixmap library"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
@@ -12,7 +12,7 @@ depends=('libxt' 'libxext')
 makedepends=('xorg-util-macros')
 options=('!libtool')
 source=("${url}/releases/individual/lib/libXpm-${pkgver}.tar.bz2")
-sha1sums=('eca9dbfa6253f7d6cc7d593dc83110c6c4876d7c')
+sha256sums=('c5bdafa51d1ae30086fac01ab83be8d47fe117b238d3437f8e965434090e041c')
 
 build() {
   cd "${srcdir}/libXpm-${pkgver}"
diff --git a/extra/libxrandr/PKGBUILD b/extra/libxrandr/PKGBUILD
index 1dff6ef33..6fba3d84e 100644
--- a/extra/libxrandr/PKGBUILD
+++ b/extra/libxrandr/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 186941 2013-06-01 09:48:56Z andyrtr $
+# $Id: PKGBUILD 194294 2013-09-13 07:22:51Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=libxrandr
-pkgver=1.4.1
+pkgver=1.4.2
 pkgrel=1
 pkgdesc="X11 RandR extension library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ depends=('libxext' 'libxrender' 'randrproto>=1.4.0')
 makedepends=('xorg-util-macros')
 options=('!libtool')
 source=(${url}/releases/individual/lib/libXrandr-${pkgver}.tar.bz2)
-sha256sums=('d914a0490fd0a2ea6c3194505b5b28c56e2a277d8f4648b0275ee0ee370fb905')
+sha256sums=('caa7b31ac769be51a532343c65376f1d4df3f307afaed58e34fb5e82e8b825ad')
 
 build() {
   cd "${srcdir}/libXrandr-${pkgver}"
diff --git a/extra/libxv/PKGBUILD b/extra/libxv/PKGBUILD
index 2a6151bdb..36dd7d536 100644
--- a/extra/libxv/PKGBUILD
+++ b/extra/libxv/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 188854 2013-06-23 08:21:34Z lcarlier $
+# $Id: PKGBUILD 194296 2013-09-13 07:24:42Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxv
-pkgver=1.0.9
+pkgver=1.0.10
 pkgrel=1
 pkgdesc="X11 Video extension library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('libxext' 'videoproto')
 makedepends=('pkgconfig')
 options=('!libtool')
 source=("${url}/releases/individual/lib/libXv-${pkgver}.tar.bz2")
-sha256sums=('a874dbf864d0271bbe795af67ef5b3f20096c92fc11eacbf0d2af00e32bc5b4b')
+sha256sums=('55fe92f8686ce8612e2c1bfaf58c057715534419da700bda8d517b1d97914525')
 
 build() {
   cd "${srcdir}/libXv-${pkgver}"
diff --git a/extra/libzrtpcpp/PKGBUILD b/extra/libzrtpcpp/PKGBUILD
index d2050134e..47eebf2d0 100644
--- a/extra/libzrtpcpp/PKGBUILD
+++ b/extra/libzrtpcpp/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 184149 2013-05-02 19:39:50Z eric $
+# $Id: PKGBUILD 194211 2013-09-10 14:40:23Z bpiotrowski $
 # Maintainer:
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jeff Mickey <jeff@archlinux.org>
 # Contributor: Michel Brabants <michel.brabants@euphonynet.be>
 
 pkgname=libzrtpcpp
-pkgver=2.3.2
+pkgver=2.3.4
 pkgrel=1
 pkgdesc="A C++ implementation of Phil Zimmermann's ZRTP specification"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ license=('GPL3')
 depends=('ccrtp')
 makedepends=('cmake')
 source=(http://ftp.gnu.org/gnu/ccrtp/${pkgname}-${pkgver}.tar.gz{,.sig})
-md5sums=('b5f0a72252785862133e9cbc9cbbd3f8'
+md5sums=('3aac59472c5649736e24de30080e2efd'
          'SKIP')
 
 prepare() {
diff --git a/extra/lightsoff/PKGBUILD b/extra/lightsoff/PKGBUILD
index 8099b7997..f25e72dca 100644
--- a/extra/lightsoff/PKGBUILD
+++ b/extra/lightsoff/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=lightsoff
-pkgver=3.8.0
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Turn off all the lights"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,8 +16,8 @@ options=('!emptydirs' '!libtool')
 install=lightsoff.install
 url="https://live.gnome.org/Lightsoff"
 groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('767f7876c6f360b0e3c18243c7e2201ea0a31523df890853a572d0325d91c24b')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('920a38ebe320d3882c6a98d073388e64ba9c8bea4414c05fc16a81771b0a64a4')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/lighttpd/PKGBUILD b/extra/lighttpd/PKGBUILD
index 24ca572a3..1f2b855f8 100644
--- a/extra/lighttpd/PKGBUILD
+++ b/extra/lighttpd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 185242 2013-05-12 10:58:13Z pierre $
+# $Id: PKGBUILD 195225 2013-09-28 07:19:12Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=lighttpd
-pkgver=1.4.32
-pkgrel=5
+pkgver=1.4.33
+pkgrel=1
 pkgdesc='A secure, fast, compliant and very flexible web-server'
 license=('custom')
 arch=('i686' 'x86_64' 'mips64el')
@@ -20,7 +20,7 @@ install='lighttpd.install'
 source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz"
         "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz.asc"
         'lighttpd.logrotate.d' 'lighttpd.conf' 'lighttpd.tmpfiles' 'lighttpd.service')
-sha256sums=('1368f80069ce71f5928cad59c8e60c0b95876942ca9e02c53853e54ae24aedc1'
+sha256sums=('2886aedc23857ca44df91b8fe6f36059ec82a859ae0eb230220e42abc331610c'
             'SKIP'
             '41f6c0042bb61021553779f861910e335834f6c15e4411756cdc6233b31076fe'
             'ee56422fe48f2683ccb5ca2e3dc6bad79ea8e1cbd043b21d2ea73b87018e35aa'
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index 7f1d2105c..605c0401f 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 193833 2013-09-02 17:04:03Z giovanni $
+# $Id: PKGBUILD 194693 2013-09-22 12:59:18Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=live-media
-pkgver=2013.08.31
+pkgver=2013.09.18
 pkgrel=1
 pkgdesc="A set of C++ libraries for multimedia streaming"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('LGPL')
 url="http://live555.com/liveMedia"
 depends=('gcc-libs')
 source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz")
-md5sums=('3321fc303bf02542018e5280efa1206c')
+md5sums=('082ebd8f4cab6194db268b77780056d9')
 
 build() {
   cd ${srcdir}/live
diff --git a/extra/ltrace/PKGBUILD b/extra/ltrace/PKGBUILD
index 524420218..0ca77b8fe 100644
--- a/extra/ltrace/PKGBUILD
+++ b/extra/ltrace/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 173009 2012-12-08 13:59:15Z foutrelis $
+# $Id: PKGBUILD 194589 2013-09-18 22:47:23Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=ltrace
-pkgver=0.7.2
+pkgver=0.7.3
 pkgrel=1
 pkgdesc="Tracks runtime library calls in dynamically linked programs"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,22 +13,23 @@ license=('GPL')
 depends=('elfutils')
 makedepends=('dejagnu')
 backup=('etc/ltrace.conf')
-source=(https://alioth.debian.org/frs/download.php/3848/$pkgname-$pkgver.tar.bz2)
-sha256sums=('bd9e7bd94ba6728fd3ec57f4bcfef8240260bea8f4fcebbc9c454d07ccc11894')
+source=(https://alioth.debian.org/frs/download.php/file/3947/$pkgname-$pkgver.tar.bz2)
+sha256sums=('0e6f8c077471b544c06def7192d983861ad2f8688dd5504beae62f0c5f5b9503')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
   ./configure \
     --prefix=/usr \
-    --sysconfdir=/etc
+    --sysconfdir=/etc \
+    --disable-werror
   make
 }
 
 check() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  make -k check
+  make -k check || true
 }
 
 package(){
diff --git a/extra/mariadb/PKGBUILD b/extra/mariadb/PKGBUILD
index 394f7d168..61d894d9f 100644
--- a/extra/mariadb/PKGBUILD
+++ b/extra/mariadb/PKGBUILD
@@ -1,30 +1,35 @@
-# $Id: PKGBUILD 193074 2013-08-15 15:18:16Z bpiotrowski $
+# $Id: PKGBUILD 195113 2013-09-25 07:07:22Z bpiotrowski $
 # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 
 pkgbase=mariadb
-pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb')
-pkgver=5.5.32
-pkgrel=2
+pkgname=('libmariadbclient' 'mariadb-clients' 'mytop' 'mariadb')
+pkgver=5.5.33.a
+_pkgver=${pkgver/.a/a}
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url='http://mariadb.org/'
 makedepends=('cmake' 'openssl' 'zlib')
 options=('!libtool')
-source=(http://mirrors.supportex.net/$pkgbase/$pkgbase-$pkgver/kvm-tarbake-jaunty-x86/$pkgbase-$pkgver.tar.gz
+source=(http://mirrors.supportex.net/$pkgbase/$pkgbase-$_pkgver/kvm-tarbake-jaunty-x86/$pkgbase-$_pkgver.tar.gz
         mariadb.service
         mariadb-post.sh
         mariadb-tmpfile.conf)
-sha256sums=('cc76d143c60d9f24b551adaf80f694ef9beb4a6a9032c115a06f7b5c5d0ee468'
+sha256sums=('adf4d04087177fde6568082c3fee77e52e84dc3ae4eb5b994d5defaaa8c83d5b'
             'a6cf5446159fff16598d0d787dd3a3c30a53a656a5f876ddb608bc60e234d334'
             '368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd'
             '2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd')
 
+prepare() {
+  cd $pkgbase-$_pkgver
+  sed -i '63d' storage/tokudb/ft-index/cmake_modules/TokuSetupCTest.cmake
+}
+
 build() {
-  cd $srcdir
   mkdir build
   cd build
 
-  cmake ../$pkgbase-$pkgver \
+  cmake ../$pkgbase-$_pkgver \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DSYSCONFDIR=/etc/mysql \
@@ -53,6 +58,7 @@ build() {
     -DWITH_BLACKHOLE_STORAGE_ENGINE=1 \
     -DWITH_INNOBASE_STORAGE_ENGINE=1 \
     -DWITH_PARTITION_STORAGE_ENGINE=1 \
+    -DWITH_TOKUDB_STORAGE_ENGINE=1 \
     -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
     -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \
     -DWITHOUT_PBXT_STORAGE_ENGINE=1 \
@@ -71,16 +77,15 @@ package_libmariadbclient() {
   conflicts=('libmysqlclient')
   provides=("libmysqlclient=$pkgver")
   
-  cd "$srcdir"/build
+  cd build
   for dir in include libmysql libmysqld libservices; do
     make -C $dir DESTDIR="$pkgdir" install
   done
 
-  install -d "$pkgdir"/usr/bin
-  install -m755 scripts/mysql_config "$pkgdir"/usr/bin/
+  install -Dm755 scripts/mysql_config "$pkgdir"/usr/bin/mysql_config
   install -d "$pkgdir"/usr/share/man/man1
   for man in mysql_config mysql_client_test_embedded mysqltest_embedded; do
-    install -m644 "$srcdir"/$pkgbase-$pkgver/man/$man.1 "$pkgdir"/usr/share/man/man1/$man.1
+    install -m644 "$srcdir"/$pkgbase-$_pkgver/man/$man.1 "$pkgdir"/usr/share/man/man1/$man.1
   done
 }
 
@@ -90,17 +95,26 @@ package_mariadb-clients() {
   conflicts=('mysql-clients')
   provides=("mysql-clients=$pkgver")
   
-  cd "$srcdir"/build
+  cd build
   make -C client DESTDIR="$pkgdir" install
 
   # install man pages
   install -d "$pkgdir"/usr/share/man/man1
   for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap; do
-    install -m644 "$srcdir"/$pkgbase-$pkgver/man/$man.1 "$pkgdir"/usr/share/man/man1/$man.1
+    install -m644 "$srcdir"/$pkgbase-$_pkgver/man/$man.1 "$pkgdir"/usr/share/man/man1/$man.1
   done
 
   # provided by mariadb
   rm "$pkgdir"/usr/bin/{mysql_{plugin,upgrade},mysqlbinlog,mysqltest}
+
+}
+
+package_mytop() {
+  pkgdesc='Top clone for MariaDB'
+  depends=('perl-dbd-mysql' 'perl-term-readkey')
+
+  cd build
+  install -Dm755 scripts/mytop "$pkgdir"/usr/bin/mytop
 }
 
 package_mariadb() {
@@ -108,31 +122,33 @@ package_mariadb() {
   backup=('etc/mysql/my.cnf')
   install=mariadb.install
   depends=('mariadb-clients' 'inetutils')
-  conflicts=('mysql' 'mytop')
-  provides=("mysql=$pkgver" 'mytop')
-  optdepends=('perl-dbd-mysql: mytop dependency'
-              'perl-term-readkey: mytop dependency')
+  conflicts=('mysql')
+  provides=("mysql=$pkgver")
   options=('emptydirs')
 
-  cd "$srcdir"/build
+  cd build
   make DESTDIR="$pkgdir" install
 
   install -Dm644 "$pkgdir"/usr/share/mysql/my-medium.cnf "$pkgdir"/etc/mysql/my.cnf
-  install -Dm755 "$srcdir"/mariadb-post.sh "$pkgdir"/usr/bin/mysqld-post
-  install -Dm644 "$srcdir"/mariadb.service "$pkgdir"/usr/lib/systemd/system/mysqld.service
-  install -Dm644 "$srcdir"/mariadb-tmpfile.conf "$pkgdir"/usr/lib/tmpfiles.d/mysql.conf
+  install -Dm755 ../mariadb-post.sh "$pkgdir"/usr/bin/mysqld-post
+  install -Dm644 ../mariadb.service "$pkgdir"/usr/lib/systemd/system/mysqld.service
+  install -Dm644 ../mariadb-tmpfile.conf "$pkgdir"/usr/lib/tmpfiles.d/mysql.conf
 
   # provided by libmariadbclient
-  rm "$pkgdir"/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
-  rm "$pkgdir"/usr/lib/libmysql*
-  rm -r "$pkgdir"/usr/include/
-  rm "$pkgdir"/usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1
+  cd "$pkgdir"
+  rm usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
+  rm usr/lib/libmysql*
+  rm -r usr/include/
+  rm usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1
   
   # provided by mariadb-clients
-  rm "$pkgdir"/usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}
-  rm "$pkgdir"/usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1
+  rm usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}
+  rm usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1
+
+  # provided by mytop
+  rm usr/bin/mytop
 
   # not needed
-  rm -r "$pkgdir"/usr/{data,mysql-test,sql-bench}
-  rm "$pkgdir"/usr/share/man/man1/mysql-test-run.pl.1
+  rm -r usr/{data,mysql-test,sql-bench}
+  rm usr/share/man/man1/mysql-test-run.pl.1
 }
diff --git a/extra/mash/PKGBUILD b/extra/mash/PKGBUILD
index 92e2a085e..4059c82a2 100644
--- a/extra/mash/PKGBUILD
+++ b/extra/mash/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183442 2013-04-21 22:11:40Z heftig $
+# $Id: PKGBUILD 196123 2013-10-07 11:53:08Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=mash
 pkgver=0.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A small library for using 3D models within a Clutter scene"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://clutter-project.org/"
diff --git a/extra/mediastreamer/PKGBUILD b/extra/mediastreamer/PKGBUILD
index c911dae6d..5d01dd9e4 100644
--- a/extra/mediastreamer/PKGBUILD
+++ b/extra/mediastreamer/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 191931 2013-08-01 07:14:32Z andrea $
+# $Id: PKGBUILD 194257 2013-09-11 19:36:47Z andrea $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
@@ -6,12 +6,12 @@
 
 pkgname=mediastreamer
 pkgver=2.9.0
-pkgrel=3
+pkgrel=4
 pkgdesc="A library written in C that allows you to create and run audio and video streams"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.linphone.org/"
 license=('GPL')
-depends=('ortp' 'ffmpeg' 'libxv' 'glew' 'libupnp')
+depends=('ortp' 'ffmpeg' 'libxv' 'libupnp')
 # xxd from Vim is needed to build
 makedepends=('intltool' 'vim')
 options=('!libtool')
@@ -21,7 +21,8 @@ md5sums=('f2ea0fe731a363749a81b6eaac22a62c'
 
 build() {
   cd $pkgname-$pkgver
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr \
+    --disable-glx --enable-xv
   make
 }
 
diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD
index ef6114012..3186d2cc7 100644
--- a/extra/mercurial/PKGBUILD
+++ b/extra/mercurial/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 191974 2013-08-02 17:22:54Z giovanni $
+# $Id: PKGBUILD 193933 2013-09-07 05:53:52Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=mercurial
-pkgver=2.7
+pkgver=2.7.1
 pkgrel=1
 pkgdesc="A scalable distributed SCM tool"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI')
 backup=('etc/mercurial/hgrc')
 source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz"
         'mercurial.profile')
-md5sums=('61093c08ca5d8d1310382d17764f0c43'
+md5sums=('3313de3667902ae4dc82f29f5280294d'
          '43e1d36564d4c7fbe9a091d3ea370a44')
 
 package() {
diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index fd09645b6..1951f3148 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 193703 2013-08-28 15:19:08Z andyrtr $
+# $Id: PKGBUILD 196157 2013-10-07 12:17:10Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=mesa
 pkgname=('mesa' 'mesa-libgl')
-pkgver=9.2.0
+pkgver=9.2.1
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage'
@@ -16,13 +16,13 @@ fi
 url="http://mesa3d.sourceforge.net"
 license=('custom')
 options=('!libtool')
-source=(ftp://ftp.freedesktop.org/pub/mesa/9.2/MesaLib-${pkgver}.tar.bz2
+source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
         LICENSE)
-md5sums=('4185b6aae890bc62a964f4b24cc1aca8'
+md5sums=('dd4c82667d9c19c28a553b12eba3f8a0'
          '5c65a0fe315dd347e09b1f2826a1df5a')
 
 build() {
-    cd ${srcdir}/?esa-*
+  cd ${srcdir}/?esa-*
 
    if [ "$CARCH" = "mips64el" ]; then
      extraconf="--with-gallium-drivers=swrast --with-dri-drivers=swrast --disable-gallium-llvm --disable-vdpau"
@@ -32,7 +32,7 @@ build() {
 
     autoreconf -vfi # our automake is far too new for their build system :)
 
-    ./configure --prefix=/usr \
+  ./configure --prefix=/usr \
     --sysconfdir=/etc \
     --with-dri-driverdir=/usr/lib/xorg/modules/dri \
     --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast \
@@ -56,11 +56,11 @@ build() {
     $extraconf
     # --help
 
-    make
+  make
 
-    # fake installation
-    mkdir $srcdir/fakeinstall
-    make DESTDIR=${srcdir}/fakeinstall install
+  # fake installation
+  mkdir $srcdir/fakeinstall
+  make DESTDIR=${srcdir}/fakeinstall install
 }
 
 package_ati-dri() {
@@ -108,6 +108,9 @@ package_nouveau-dri() {
   install -m755 -d ${pkgdir}/usr/lib/gallium-pipe
   mv -v ${srcdir}/fakeinstall/usr/lib/gallium-pipe/pipe_nouveau* ${pkgdir}/usr/lib/gallium-pipe/
   
+  # vdpau drivers are still buggy with nouveau, so remove them (FS#36754)
+  rm -rf ${pkgdir}/usr/lib/vdpau/
+
   install -m755 -d "${pkgdir}/usr/share/licenses/nouveau-dri"
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/nouveau-dri/"
 }
diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD
index ebe172536..bf219caff 100644
--- a/extra/mkvtoolnix/PKGBUILD
+++ b/extra/mkvtoolnix/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 190046 2013-07-13 12:42:05Z svenstaro $
+# $Id: PKGBUILD 194528 2013-09-17 13:02:47Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: xduugu <xduugu@gmx.com>
 
 pkgbase=mkvtoolnix
 pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk')
-pkgver=6.3.0
-pkgrel=2
+pkgver=6.4.1
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.bunkus.org/videotools/mkvtoolnix/index.html"
 makedepends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk'
              'boost-libs' 'lzo2' 'xdg-utils' 'boost' 'ruby')
 source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.xz")
-md5sums=('3d64652b1aa3ce3faaa468b11dcbd82c')
+md5sums=('1e878646b34eb2c32772d05b91f84f4c')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/mono/PKGBUILD b/extra/mono/PKGBUILD
index 1a1200a8e..b22cb8b88 100644
--- a/extra/mono/PKGBUILD
+++ b/extra/mono/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 186332 2013-05-24 20:45:34Z daniel $
+# $Id: PKGBUILD 194705 2013-09-22 21:22:23Z daniel $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: Brice Carpentier <brice@dlfp.org>
 
 pkgname=mono
-pkgver=3.0.7
+pkgver=3.2.3
 pkgrel=1
 pkgdesc="Free implementation of the .NET platform including runtime and compiler"
 arch=(i686 x86_64)
@@ -14,15 +14,21 @@ makedepends=('pkgconfig')
 options=('!libtool' '!makeflags')
 provides=('monodoc')
 conflicts=('monodoc')
-source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-        mono.binfmt.d)
-md5sums=('76ebec9c97347aac13d9f28fc58b347d'
-         'b9ef8a65fea497acf176cca16c1e2402')
+install=mono.install
+source=(http://download.mono-project.com/sources/mono/${pkgname}-${pkgver}.tar.bz2
+        mono.binfmt.d
+	mono.install
+	sgen_fix.patch)
+md5sums=('a66c6309fad071e21f77f4c6b67a0f10'
+         'b9ef8a65fea497acf176cca16c1e2402'
+         'ca1108e9638b01c26453ee663592a4e5'
+         '8a700b94bff7a913f920e95890d2fb4c')
 
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
+  patch -p1 < ../sgen_fix.patch
   # build mono
-  ./configure --prefix=/usr --sysconfdir=/etc
+  ./configure --prefix=/usr --sysconfdir=/etc --bindir=/usr/bin --sbindir=/usr/bin
   make
 
   # build jay
diff --git a/extra/mono/mono.install b/extra/mono/mono.install
new file mode 100644
index 000000000..6a57c2a70
--- /dev/null
+++ b/extra/mono/mono.install
@@ -0,0 +1,7 @@
+post_install() {
+ln -sf /bin/mono-sgen /bin/mono
+}
+
+post_upgrade() {
+post_install
+} 
diff --git a/extra/mono/sgen_fix.patch b/extra/mono/sgen_fix.patch
new file mode 100644
index 000000000..40cb9fba7
--- /dev/null
+++ b/extra/mono/sgen_fix.patch
@@ -0,0 +1,112 @@
+From d2cc22580898df5d4a15e0f99ab513e1570a6082 Mon Sep 17 00:00:00 2001
+From: Zoltan Varga <vargaz@gmail.com>
+Date: Fri, 20 Sep 2013 19:06:34 +0200
+Subject: [PATCH] [sgen] Use __builtin_ctzl () in OBJ_BITMAP_FOREACH_PTR () on
+ 64 bit platforms. Fixes #14834.
+
+---
+ mono/metadata/sgen-descriptor.h | 28 +++++++++++++++++++++++++---
+ mono/tests/sgen-descriptors.cs  | 15 +++++++++++++--
+ 2 files changed, 38 insertions(+), 5 deletions(-)
+
+diff --git a/mono/metadata/sgen-descriptor.h b/mono/metadata/sgen-descriptor.h
+index cd53a86..3a00589 100644
+--- a/mono/metadata/sgen-descriptor.h
++++ b/mono/metadata/sgen-descriptor.h
+@@ -170,21 +170,43 @@ enum {
+ 		}	\
+ 	} while (0)
+ 
+-#ifdef __GNUC__
++#if defined(__GNUC__) && SIZEOF_VOID_P==4
++#define OBJ_BITMAP_FOREACH_PTR(desc,obj)       do {    \
++		/* there are pointers */        \
++		void **_objptr = (void**)(obj); \
++		gsize _bmap = (desc) >> 16;     \
++		_objptr += OBJECT_HEADER_WORDS; \
++		{ \
++			int _index = __builtin_ctz (_bmap);		\
++			_objptr += _index; \
++			_bmap >>= (_index + 1);				\
++			HANDLE_PTR (_objptr, (obj));		\
++			_objptr ++;							\
++			} \
++		while (_bmap) { \
++			int _index = __builtin_ctz (_bmap);		\
++			_objptr += _index; \
++			_bmap >>= (_index + 1);				\
++			HANDLE_PTR (_objptr, (obj));		\
++			_objptr ++;							\
++		}										\
++	} while (0)
++#elif defined(__GNUC__) && SIZEOF_VOID_P==8
++/* Same as above, but use _builtin_ctzl () */
+ #define OBJ_BITMAP_FOREACH_PTR(desc,obj)       do {    \
+ 		/* there are pointers */        \
+ 		void **_objptr = (void**)(obj); \
+ 		gsize _bmap = (desc) >> 16;     \
+ 		_objptr += OBJECT_HEADER_WORDS; \
+ 		{ \
+-			int _index = __builtin_ctz (_bmap); \
++			int _index = __builtin_ctzl (_bmap);		\
+ 			_objptr += _index; \
+ 			_bmap >>= (_index + 1);				\
+ 			HANDLE_PTR (_objptr, (obj));		\
+ 			_objptr ++;							\
+ 			} \
+ 		while (_bmap) { \
+-			int _index = __builtin_ctz (_bmap); \
++			int _index = __builtin_ctzl (_bmap);		\
+ 			_objptr += _index; \
+ 			_bmap >>= (_index + 1);				\
+ 			HANDLE_PTR (_objptr, (obj));		\
+diff --git a/mono/tests/sgen-descriptors.cs b/mono/tests/sgen-descriptors.cs
+index ae00084..246e5aa 100644
+--- a/mono/tests/sgen-descriptors.cs
++++ b/mono/tests/sgen-descriptors.cs
+@@ -1,4 +1,5 @@
+ using System;
++using System.Runtime.InteropServices;
+ 
+ public struct SmallMixed
+ {
+@@ -47,6 +48,13 @@ public class HugePtrFree {
+ 	public LargeStruct2 c;
+ }
+ 
++[StructLayout (LayoutKind.Sequential)]
++public class Non32bitBitmap {
++	public object o;
++	public long i1, i2, i3, i4, i5, i6, i7, i8, i9, i10, i11, i12, i13, i14, i15, i16, i17, i18, i19, i20, i21, i22, i23, i24, i25, i26, i27, i28, i29, i30, i31, i32, i33, i34, i35;
++	public object o2;
++}
++
+ /*
+ This is a stress test for descriptors.
+ */
+@@ -54,10 +62,10 @@ class Driver {
+ 	static char[] FOO = new char[] { 'f', 'o', 'b' };
+ 
+ 	static void Fill (int cycles) {
+-		object[] root = new object [12];
++		object[] root = new object [13];
+ 		object[] current = root;
+ 		for (int i = 0; i < cycles; ++i) {
+-			current [0] = new object [12];
++			current [0] = new object [13];
+ 			current [1] = new int [6];
+ 			current [2] = new int [2,3];
+ 			current [3] = new string (FOO);
+@@ -72,6 +80,9 @@ class Driver {
+ 				current [10] = new HugePtrFree ();
+ 			if ((i %  10000) == 0)
+ 				current [11] = new LargeStruct2 [1];
++
++			/* Test for 64 bit bitmap descriptors (#14834) */
++			current [12] = new Non32bitBitmap () { o = new object (), i32 = 1, i33 = 1, i34 = 1, i35 = 1, o2 = new object () };
+ 	
+ 			current = (object[])current [0];
+ 		}
+-- 
+1.8.4
+
diff --git a/extra/monodevelop-debugger-gdb/PKGBUILD b/extra/monodevelop-debugger-gdb/PKGBUILD
index 3aa47b9dd..d58895531 100644
--- a/extra/monodevelop-debugger-gdb/PKGBUILD
+++ b/extra/monodevelop-debugger-gdb/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 188885 2013-06-23 21:47:27Z daniel $
+# $Id: PKGBUILD 194339 2013-09-13 21:42:34Z daniel $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 
 pkgname=monodevelop-debugger-gdb
-pkgver=4.0.9
+pkgver=4.0.12
 pkgrel=1
 pkgdesc="Mono Debugger support"
 arch=('i686' 'x86_64') # also "any" pkg?
 url="http://monodevelop.com"
 license=('GPL')
-depends=('monodevelop>=4.0.9' 'gdb')
+depends=('monodevelop>=4.0.12' 'gdb')
 makedepends=('mono')
 options=('!makeflags')
-source=(http://origin-download.mono-project.com/sources/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('6735424b41449221b0471c5ba6cf307e')
+source=(http://origin-download.mono-project.com/sources/$pkgname/$pkgname-$pkgver-3.tar.bz2)
+md5sums=('b9c9d12cc73352a208bcdb5ad5949418')
 
 build() {
   export MONO_SHARED_DIR="${srcdir}/.wabi"
@@ -29,4 +29,3 @@ package() {
   make DESTDIR="${pkgdir}" install
 }
 
-
diff --git a/extra/monodevelop/PKGBUILD b/extra/monodevelop/PKGBUILD
index c44244a7d..886f09470 100644
--- a/extra/monodevelop/PKGBUILD
+++ b/extra/monodevelop/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 188887 2013-06-23 21:49:24Z daniel $
+# $Id: PKGBUILD 194341 2013-09-13 21:42:47Z daniel $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: Timm Preetz <timm@preetz.us>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=monodevelop
-pkgver=4.0.9
+pkgver=4.0.12
 pkgrel=1
 pkgdesc="An IDE primarily designed for C# and other .NET languages"
 
@@ -17,9 +17,9 @@ depends=('mono>=2.10.8' 'mono-addins>=0.6.2' 'gnome-sharp' 'desktop-file-utils'
 makedepends=('rsync' 'git')
 options=(!makeflags)
 install=monodevelop.install
-source=(http://origin-download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+source=(http://origin-download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}-3.tar.bz2
         monodevelop-core-addins.pc.in.patch)
-md5sums=('b54461118aab6c8f9d4520d9cbf84d84'
+md5sums=('5f9cd24d2791054d88b0dcce1259afdb'
          '8466d032735130e37d4091a793a7966c')
 
 build() {
diff --git a/extra/most/PKGBUILD b/extra/most/PKGBUILD
index dbc57f6fe..6ef97c5e2 100644
--- a/extra/most/PKGBUILD
+++ b/extra/most/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 176312 2013-01-29 13:46:57Z stephane $
+# $Id: PKGBUILD 195919 2013-10-05 12:05:12Z bpiotrowski $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: juergen <juergen@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=most
 pkgver=5.0.0a
-pkgrel=5
+pkgrel=6
 pkgdesc="A terminal pager similar to 'more' and 'less'"
 arch=('i686' 'x86_64' 'mips64el')
 depends=('slang')
diff --git a/extra/mousetweaks/PKGBUILD b/extra/mousetweaks/PKGBUILD
index a845608bd..96cee75d8 100644
--- a/extra/mousetweaks/PKGBUILD
+++ b/extra/mousetweaks/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=mousetweaks
-pkgver=3.8.0
-pkgrel=2
+pkgver=3.10.0
+pkgrel=1
 pkgdesc="Mouse accessibility enhancements for the GNOME desktop"
 arch=(i686 x86_64 'mips64el')
 license=('GPL3' 'FDL')
@@ -15,7 +15,7 @@ options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 install=mousetweaks.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('daa9b16e98675f414d3dcf63a0222a37d6c3e518718d92155bba8781510f2e4f')
+sha256sums=('12fa50eca2e442057a1b816b4aa78d0b8a17f854cf01f4d339d82ff0172b57dd')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/mtdev/PKGBUILD b/extra/mtdev/PKGBUILD
index 0ade75444..76c71d19a 100644
--- a/extra/mtdev/PKGBUILD
+++ b/extra/mtdev/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 168434 2012-10-11 16:11:43Z andyrtr $
+# $Id: PKGBUILD 195256 2013-09-29 09:02:35Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: SpepS <dreamspepser at yahoo dot it>
 
 pkgname=mtdev
-pkgver=1.1.3
+pkgver=1.1.4
 pkgrel=1
 pkgdesc="A stand-alone library which transforms all variants of kernel MT events to the slotted type B protocol"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('custom:MIT')
 depends=('glibc')
 options=('!libtool')
 source=("$url$pkgname-$pkgver.tar.bz2")
-md5sums=('8a236569ad3dd79eaeed45f1935359be')
+md5sums=('73a915d6075b31db4f08ab8c6d314695')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/mutter-wayland/PKGBUILD b/extra/mutter-wayland/PKGBUILD
new file mode 100644
index 000000000..004ece9dd
--- /dev/null
+++ b/extra/mutter-wayland/PKGBUILD
@@ -0,0 +1,48 @@
+# $Id: PKGBUILD 196008 2013-10-07 11:49:47Z jgc $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+
+pkgname=mutter-wayland
+pkgver=3.10.0.1
+pkgrel=2
+pkgdesc="A Wayland compositor for GNOME"
+arch=(i686 x86_64)
+license=(GPL)
+depends=(mutter)
+makedepends=(intltool gnome-doc-utils)
+url="http://www.gnome.org"
+options=('!libtool' '!emptydirs')
+install=mutter-wayland.install
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
+        mutter-wayland-3.10.0.1-logfile.patch)
+sha256sums=('1d4e3086d9ff26f6ae01c844909db1f4050f2e9aaead1b91a8b6b37f2a241560'
+            'b79866b6b3fa6029b35ef2b5c5d0cb92886ec2ed0173f780c4d46a5b8d9a1644')
+
+
+prepare() {
+  cd "$pkgname-$pkgver"
+
+  # From Fedora: Don't try to redirect the logfile. It won't work.
+  patch -Np1 -i ../mutter-wayland-3.10.0.1-logfile.patch
+}
+
+build() {
+  cd "$pkgname-$pkgver"
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --libexecdir=/usr/lib/$pkgname \
+      --localstatedir=/var --disable-static \
+      --disable-schemas-compile --enable-compile-warnings=minimum
+
+  #https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+  make
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+
+  # Already in "mutter"
+  rm -r "$pkgdir"/usr/share/{man,gtk-doc,GConf,gnome-control-center}
+  rm "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.mutter.gschema.xml"
+}
diff --git a/extra/mutter-wayland/mutter-wayland-3.10.0.1-logfile.patch b/extra/mutter-wayland/mutter-wayland-3.10.0.1-logfile.patch
new file mode 100644
index 000000000..922e0ae33
--- /dev/null
+++ b/extra/mutter-wayland/mutter-wayland-3.10.0.1-logfile.patch
@@ -0,0 +1,17 @@
+--- mutter-wayland-3.10.0.1/src/wayland/meta-xwayland.c.jx	2013-09-16 16:40:46.000000000 -0400
++++ mutter-wayland-3.10.0.1/src/wayland/meta-xwayland.c	2013-10-02 13:37:57.027318760 -0400
+@@ -380,11 +380,9 @@ meta_xwayland_start (MetaWaylandComposit
+   args[3] = "-rootless";
+   args[4] = "-retro";
+   args[5] = "-noreset";
+-  args[6] = "-logfile";
+-  args[7] = g_build_filename (g_get_user_cache_dir (), "xwayland.log", NULL);
+-  args[8] = "-nolisten";
+-  args[9] = "all";
+-  args[10] = NULL;
++  args[6] = "-nolisten";
++  args[7] = "all";
++  args[8] = NULL;
+ 
+   error = NULL;
+   if (g_spawn_async (NULL, /* cwd */
diff --git a/community/openclonk/openclonk.install b/extra/mutter-wayland/mutter-wayland.install
index b9bbaf706..c25dff2d3 100644
--- a/community/openclonk/openclonk.install
+++ b/extra/mutter-wayland/mutter-wayland.install
@@ -1,9 +1,9 @@
 post_install() {
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+    glib-compile-schemas /usr/share/glib-2.0/schemas
 }
 
 post_upgrade() {
-  post_install
+    post_install
 }
 
 post_remove() {
diff --git a/extra/mutter/PKGBUILD b/extra/mutter/PKGBUILD
index 42905532d..00488b85c 100644
--- a/extra/mutter/PKGBUILD
+++ b/extra/mutter/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 191806 2013-07-30 22:50:38Z jgc $
+# $Id: PKGBUILD 196125 2013-10-07 11:53:12Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Michael Kanis <mkanis_at_gmx_dot_de>
 
 pkgname=mutter
-pkgver=3.8.4
+pkgver=3.10.0.1
 pkgrel=1
 pkgdesc="A window manager for GNOME"
 arch=(i686 x86_64 mips64el)
 license=('GPL')
-depends=('clutter' 'dconf' 'gobject-introspection' 'gsettings-desktop-schemas' 'libcanberra' 'startup-notification' 'zenity' 'libsm')
+depends=('clutter' 'dconf' 'gobject-introspection' 'gsettings-desktop-schemas' 'libcanberra' 'startup-notification' 'zenity' 'libsm' 'gnome-desktop' 'upower')
 makedepends=('intltool' 'gnome-doc-utils')
 url="http://www.gnome.org"
 groups=('gnome')
 options=('!libtool' '!emptydirs')
 install=mutter.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('efe28bb665fd43d97b20c57bb1d1dc0a7e98919b6ad4b770bfd7ec5576e29454')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('2d1288727d60b45c4d902101b805c89fa93f7a6b147bb4a7d3d99f990680b203')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/nautilus-sendto/PKGBUILD b/extra/nautilus-sendto/PKGBUILD
index 87ec0b12a..1b514a9aa 100644
--- a/extra/nautilus-sendto/PKGBUILD
+++ b/extra/nautilus-sendto/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 191279 2013-07-23 09:48:38Z jgc $
+# $Id: PKGBUILD 196127 2013-10-07 11:53:15Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Eduardo Romero <eduardo@archlinux.org>
 # Contributor: Tor Krill <tor@krill.nu>
 
 pkgname=nautilus-sendto
-pkgver=3.8.0
-pkgrel=2
+pkgver=3.8.1
+pkgrel=1
 pkgdesc="Nautilus context menu for sending files."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://download.gnome.org/sources/nautilus-sendto/"
@@ -16,7 +16,7 @@ options=('!libtool' '!emptydirs')
 install=nautilus-sendto.install
 groups=('gnome-extra')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('d99ea11a484bff8894097696a1afc8d7f44de4f064f78deeb6f598cecf0604bb')
+sha256sums=('03fa46bff271acdbdedab6243b2a84e5ed3daa19c81b69d087b3e852c8fe5dab')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/nautilus/PKGBUILD b/extra/nautilus/PKGBUILD
index 7cee1de43..3cbd80266 100644
--- a/extra/nautilus/PKGBUILD
+++ b/extra/nautilus/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 188611 2013-06-16 23:57:46Z heftig $
+# $Id: PKGBUILD 196126 2013-10-07 11:53:13Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=nautilus
 pkgname=(nautilus libnautilus-extension)
-pkgver=3.8.2
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="GNOME file manager"
 arch=(i686 x86_64 mips64el)
@@ -13,8 +13,8 @@ depends=(libexif gnome-desktop exempi gvfs desktop-file-utils gnome-icon-theme d
 makedepends=(intltool gobject-introspection python)
 url="http://www.gnome.org"
 options=('!libtool' '!emptydirs')
-source=(http://download.gnome.org/sources/$pkgbase/${pkgver::3}/$pkgbase-$pkgver.tar.xz)
-sha256sums=('dbddfdaac52d077d46d48a2f8dbecf6d13788d8f6b5fc9aa70826a24681d8a75')
+source=(http://download.gnome.org/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
+sha256sums=('9b15ccf1c9313631c8cf2ed337e697cd2b32630d2ae36072aa389d64af16d88c')
 
 build() {
   cd $pkgbase-$pkgver
diff --git a/extra/neon/PKGBUILD b/extra/neon/PKGBUILD
index c2a1fe5bf..765feccaa 100644
--- a/extra/neon/PKGBUILD
+++ b/extra/neon/PKGBUILD
@@ -1,19 +1,20 @@
-# $Id: PKGBUILD 153967 2012-03-21 06:21:04Z pierre $
+# $Id: PKGBUILD 195974 2013-10-06 19:11:39Z eric $
 # Maintainer:
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 
 pkgname=neon
-pkgver=0.29.6
-pkgrel=4
+pkgver=0.30.0
+pkgrel=1
 pkgdesc="HTTP and WebDAV client library with a C interface"
 arch=('i686' 'x86_64' 'mips64el')
+url="http://www.webdav.org/neon/"
 license=('GPL' 'LGPL')
 depends=('krb5' 'expat' 'ca-certificates')
-url="http://www.webdav.org/neon/"
-source=("http://www.webdav.org/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('591e0c82e6979e7e615211b386b8f6bc')
 options=('libtool') # FS#16067
+source=(http://www.webdav.org/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc})
+sha1sums=('9e6297945226f90d66258b7ee05f757ff5cea10a'
+          'SKIP')
 
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
@@ -24,9 +25,6 @@ build() {
     --with-ssl=openssl \
     --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
   make
-
-  # fix invalid .so links in man pages (FS#24902)
-  sed -i '/^\.so/s|\.so \([^.]\+\)\.\([[:digit:]]\)|.so man\2/\1.\2|' doc/man/*
 }
 
 package() {
diff --git a/extra/nepomuk-core/PKGBUILD b/extra/nepomuk-core/PKGBUILD
index aec63d01e..709300655 100644
--- a/extra/nepomuk-core/PKGBUILD
+++ b/extra/nepomuk-core/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193218 2013-08-19 09:54:11Z andrea $
+# $Id: PKGBUILD 195496 2013-10-01 15:13:09Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=nepomuk-core
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="Contains the central Nepomuk services like file indexing, file system monitoring, query, storage, client libraries"
 url="https://projects.kde.org/projects/kde/kdelibs/nepomuk-core"
@@ -11,7 +11,7 @@ license=('GPL' 'LGPL' 'FDL')
 depends=('kdelibs' 'poppler-qt' 'taglib' 'ffmpeg' 'ebook-tools')
 makedepends=('cmake' 'automoc4' 'doxygen')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('16b3176b9c615199321c87c383ad27802041d7dd')
+sha1sums=('d5a320b39edda61f82ad24da1745238bfcdfe73c')
 
 prepare() {
   mkdir build
diff --git a/extra/nepomuk-widgets/PKGBUILD b/extra/nepomuk-widgets/PKGBUILD
index fdedbac77..2c11b7aed 100644
--- a/extra/nepomuk-widgets/PKGBUILD
+++ b/extra/nepomuk-widgets/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193235 2013-08-19 09:54:29Z andrea $
+# $Id: PKGBUILD 195530 2013-10-01 15:16:09Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=nepomuk-widgets
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="The Library containing the Nepomuk Widgets"
 url="https://projects.kde.org/projects/kde/kdelibs/nepomuk-widgets"
@@ -11,7 +11,7 @@ license=('GPL' 'LGPL' 'FDL')
 depends=('nepomuk-core')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('65c62afbfefad3261df5048bcc146feb6a7c8af5')
+sha1sums=('d63ef40b9832fc0f18f981163800a9d5ecd5e29e')
 
 build() {
   mkdir build
diff --git a/extra/network-manager-applet/PKGBUILD b/extra/network-manager-applet/PKGBUILD
index ffd23bb15..c5b86caf1 100644
--- a/extra/network-manager-applet/PKGBUILD
+++ b/extra/network-manager-applet/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 187895 2013-06-07 21:36:22Z heftig $
+# $Id: PKGBUILD 196128 2013-10-07 11:53:16Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Arjan Timmerman <arjan@archlinux.org>
 # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
@@ -6,20 +6,20 @@
 # Contributor: Will Rea <sillywilly@gmail.com>
 
 pkgname=network-manager-applet
-pkgver=0.9.8.2
-pkgrel=1
+pkgver=0.9.8.4
+pkgrel=2
 pkgdesc="GNOME frontends to NetWorkmanager"
 arch=('i686' 'x86_64' 'mips64el')
 license=(GPL)
 url="http://www.gnome.org/projects/NetworkManager/"
-depends=("networkmanager>=${pkgver::5}" libsecret gtk3 libnotify
+depends=("networkmanager>=${pkgver%.*}" libsecret gtk3 libnotify
          gnome-icon-theme mobile-broadband-provider-info iso-codes)
 makedepends=(intltool gnome-bluetooth gobject-introspection)
 optdepends=('gnome-bluetooth: for PAN/DUN support')
 options=('!libtool' '!emptydirs')
 install=network-manager-applet.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.9/$pkgname-$pkgver.tar.xz)
-sha256sums=('a540c743971c199a7b8663a8d0a38eb66a4c13a6b5124cd3a7495c75560aadc7')
+sha256sums=('f68849291047c94487279aab4a6cb90945ad351df02da621a73b413e6c6c198c')
 
 build() {
   cd ${pkgname}-${pkgver}
@@ -30,6 +30,10 @@ build() {
       --disable-maintainer-mode \
       --disable-migration \
       --with-modem-manager-1
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
   make
 }
 
diff --git a/extra/networkmanager-openconnect/PKGBUILD b/extra/networkmanager-openconnect/PKGBUILD
index 55bcf19ff..b2e07ad69 100644
--- a/extra/networkmanager-openconnect/PKGBUILD
+++ b/extra/networkmanager-openconnect/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 187896 2013-06-07 21:36:56Z heftig $
+# $Id: PKGBUILD 194796 2013-09-23 17:23:08Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=networkmanager-openconnect
-pkgver=0.9.8.2
+pkgver=0.9.8.4
 pkgrel=1
 pkgdesc="NetworkManager VPN integration for openconnect"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.gnome.org/projects/NetworkManager/"
-depends=("networkmanager>=${pkgver::5}" 'openconnect' 'gconf' 'libgnome-keyring')
+depends=("networkmanager>=${pkgver::5}" 'openconnect' 'libgnome-keyring' 'gtk3')
 makedepends=('intltool')
 optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
 options=('!libtool')
 install=$pkgname.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openconnect/0.9/NetworkManager-openconnect-${pkgver}.tar.xz)
-sha256sums=('8c3b393d155448d41f5de539d4920f0e5205a087aa5b25ed65601d6a370c44eb')
+sha256sums=('99b4dc03da311026eaa4bee2ff3f141270e8ba4bf341762d4eeee7152be387b6')
 
 build() {
   cd NetworkManager-openconnect-${pkgver}
diff --git a/extra/networkmanager-openvpn/PKGBUILD b/extra/networkmanager-openvpn/PKGBUILD
index 39387b87a..608935066 100644
--- a/extra/networkmanager-openvpn/PKGBUILD
+++ b/extra/networkmanager-openvpn/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 187897 2013-06-07 21:37:29Z heftig $
+# $Id: PKGBUILD 194797 2013-09-23 17:23:43Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=networkmanager-openvpn
-pkgver=0.9.8.2
+pkgver=0.9.8.4
 pkgrel=1
 pkgdesc="NetworkManager VPN plugin for OpenVPN"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
 install=networkmanager-openvpn.install
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/0.9/NetworkManager-openvpn-${pkgver}.tar.xz)
-sha256sums=('d1c032f30e3c58d6d6bc371aad6d7e757f748d23a9240c077294492753078359')
+sha256sums=('af8c52b6a61af3c178eed1ea8f1d4704bea87331fde43deb3d4aafe1821e6687')
 
 build() {
   cd NetworkManager-openvpn-${pkgver}
diff --git a/extra/networkmanager-pptp/PKGBUILD b/extra/networkmanager-pptp/PKGBUILD
index 80d46e896..286dc88c2 100644
--- a/extra/networkmanager-pptp/PKGBUILD
+++ b/extra/networkmanager-pptp/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 187898 2013-06-07 21:38:15Z heftig $
+# $Id: PKGBUILD 194798 2013-09-23 17:24:22Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=networkmanager-pptp
-pkgver=0.9.8.2
+pkgver=0.9.8.4
 pkgrel=1
 pkgdesc="NetworkManager VPN plugin for pptp "
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ options=('!libtool')
 install=networkmanager-pptp.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/0.9/NetworkManager-pptp-${pkgver}.tar.xz
         gtk_table_to_gtk_grid.patch)
-sha256sums=('7f46ea61376d13d03685eca3f26a26e0022f6e92e6f1fc356034ca9717eb6dac'
+sha256sums=('97ba8f6f726056c3b8e0e1c8d2ab3d32791cadd7c3a38e0478fb2bd3ecafdce8'
             '17c194c605bca780bf657711e9cff910c63ab27eae70c11cb6c53e9c75ad3215')
 
 prepare() {
diff --git a/extra/networkmanager-vpnc/PKGBUILD b/extra/networkmanager-vpnc/PKGBUILD
index f0c4a178e..740248d8d 100644
--- a/extra/networkmanager-vpnc/PKGBUILD
+++ b/extra/networkmanager-vpnc/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 187899 2013-06-07 21:38:48Z heftig $
+# $Id: PKGBUILD 194799 2013-09-23 17:25:00Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=networkmanager-vpnc
-pkgver=0.9.8.2
+pkgver=0.9.8.6
 pkgrel=1
 pkgdesc="NetworkManager VPN plugin for vpnc"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.gnome.org/projects/NetworkManager/"
-depends=("networkmanager>=${pkgver}" 'vpnc' 'hicolor-icon-theme' 'gtk3' 'libgnome-keyring')
+depends=("networkmanager>=${pkgver%.*}" 'vpnc' 'hicolor-icon-theme' 'gtk3' 'libgnome-keyring')
 makedepends=('intltool')
 optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
 options=('!libtool')
 install=networkmanager-vpnc.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/0.9/NetworkManager-vpnc-${pkgver}.tar.xz)
-sha256sums=('adf6f4abd29d3f0384ef55fdfea75e6cd56088a0ecdfed2454305fd9e08318a1')
+sha256sums=('40306cd713d4e6e9df6a520d2992664d22173b3327e94df45a6dac23f0a8abd6')
 
 build() {
   cd NetworkManager-vpnc-${pkgver}
diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD
index f8826c1ea..2b7eb91f4 100644
--- a/extra/networkmanager/PKGBUILD
+++ b/extra/networkmanager/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 187894 2013-06-07 21:35:29Z heftig $
+# $Id: PKGBUILD 196155 2013-10-07 12:16:03Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Maintainer: Jan de Groot <jgc@archlinxu.org>
 # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
@@ -8,7 +8,7 @@
 
 pkgname=networkmanager
 _pkgname=NetworkManager
-pkgver=0.9.8.2
+pkgver=0.9.8.6
 pkgrel=1
 pkgdesc="Network Management daemon"
 arch=('i686' 'x86_64' 'mips64el')
@@ -19,7 +19,7 @@ depends=(dbus-glib iproute2 libnl nss polkit udev wpa_supplicant dhcp-client
 makedepends=(intltool dhcpcd dhclient iptables gobject-introspection gtk-doc git)
 optdepends=('dhclient: DHCPv6 support'
             'dnsmasq: Connection sharing'
-            'bluez4: Bluetooth support'
+            'bluez: Bluetooth support'
             'openresolv: resolvconf support'
             'ppp: Dialup connection support')
 options=('!libtool')
@@ -28,7 +28,7 @@ install=networkmanager.install
 #source=(git://anongit.freedesktop.org/NetworkManager/NetworkManager#commit=93c1041
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz
         NetworkManager.conf disable_set_hostname.patch)
-sha256sums=('5c0b2f71b2f61e0dfbe95cebad83001758db252d5cdf5b6f7ceebac9c6bd7ead'
+sha256sums=('2289800de66fd7f8c141e029923beb39f43952e442b3cb864e3bf73b26c0c369'
             '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
             '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460')
 
diff --git a/extra/nspr/PKGBUILD b/extra/nspr/PKGBUILD
index f9bf4bae3..42c9641a3 100644
--- a/extra/nspr/PKGBUILD
+++ b/extra/nspr/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 191781 2013-07-30 17:31:51Z jgc $
+# $Id: PKGBUILD 196165 2013-10-07 12:54:42Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=nspr
-pkgver=4.10
-pkgrel=2
+pkgver=4.10.1
+pkgrel=1
 pkgdesc="Netscape Portable Runtime"
 arch=(i686 x86_64 'mips64el')
 url="http://www.mozilla.org/projects/nspr/"
@@ -13,12 +13,13 @@ depends=('glibc')
 makedepends=('zip')
 options=('!emptydirs')
 source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz)
-md5sums=('f5466def95726b3c900d8a0227bdd034')
+sha1sums=('bd1cdf5e7e107846ffe431c5c62b81a560e8c3f7')
+md5sums=('2e354084ca2bc5fbbb820762597f3890')
 
 build() {
   cd $pkgname-$pkgver
 
-  if [[ $CARCH = x86_64 ]]; then
+  if [ "$CARCH" = "x86_64" ]; then
     _confflags="--enable-64bit"
   else
     _confflags=""
diff --git a/extra/nss/PKGBUILD b/extra/nss/PKGBUILD
index ebd9bb584..068e90fa8 100644
--- a/extra/nss/PKGBUILD
+++ b/extra/nss/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 191782 2013-07-30 17:31:52Z jgc $
+# $Id: PKGBUILD 196167 2013-10-07 13:20:22Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=nss
-pkgver=3.15.1
+pkgver=3.15.2
 pkgrel=1
 pkgdesc="Mozilla Network Security Services"
 arch=(i686 x86_64 'mips64el')
@@ -17,7 +17,7 @@ source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/s
         nss-config.in
         ssl-renegotiate-transitional.patch
         add_spi+cacert_ca_certs.patch)
-sha1sums=('1aa7c0ff8af7fb2c8b6e4886ae2291f4bfe0d5c0'
+sha1sums=('2d900c296bf11deabbf833ebd6ecdea549c97a5f'
           'aa5b2c0aa38d3c1066d511336cf28d1333e3aebd'
           'cb744cc3e56b604e4754bc3c7d9f25bb9a0a136c'
           '8a964a744ba098711b80c0d279a2993524e8eb92'
diff --git a/extra/ocaml/PKGBUILD b/extra/ocaml/PKGBUILD
index 2a738484b..e7179ab54 100644
--- a/extra/ocaml/PKGBUILD
+++ b/extra/ocaml/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 175505 2013-01-17 15:01:31Z tpowa $
+# $Id: PKGBUILD 195984 2013-10-07 07:06:19Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgbase='ocaml'
 pkgname=('ocaml')
 # Needs optimized build.
 [ "$CARCH" = "mips64el" ] || pkgname+=('ocaml-compiler-libs')
-pkgver=4.00.1
-pkgrel=3
+pkgver=4.01.0
+pkgrel=1
 pkgdesc="A functional language with OO extensions"
-arch=('i686' 'x86_64' 'mips64el')
-license=('LGPL2' 'custom: QPL-1.0')
+arch=('i686' 'x86_64')
+license=('LGPL2.1' 'custom: QPL-1.0')
 url="http://caml.inria.fr/"
 depends=('gdbm')
 makedepends=('tk>=8.6.0' 'ncurses>=5.6-7' 'libx11')
 optdepends=('ncurses: advanced ncurses features' 'tk: advanced tk features')
-source=(http://caml.inria.fr/distrib/ocaml-4.00/${pkgname}-${pkgver}.tar.gz
+source=(http://caml.inria.fr/distrib/ocaml-4.01/${pkgname}-${pkgver}.tar.gz
         fix-caml_int64_float_of_bits-n32.patch
         tk8.6-build.patch)
 options=('!makeflags' '!emptydirs')
@@ -22,7 +22,7 @@ options=('!makeflags' '!emptydirs')
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i "${srcdir}/fix-caml_int64_float_of_bits-n32.patch"
-  ./configure -prefix /usr 
+  ./configure -prefix /usr -x11include /usr/include 
   if [ "${CARCH}" == "mips64el" ] ; then
       make world
   else
@@ -32,8 +32,6 @@ build() {
 
 package_ocaml() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
-  # fix https://bugs.archlinux.org/task/33302
-  patch -Np2 -i ../tk8.6-build.patch
   make PREFIX="${pkgdir}/usr" MANDIR="${pkgdir}/usr/share/man" install
    
   # Save >10MB with this one, makepkg only strips debug symbols.
@@ -65,6 +63,6 @@ optdepends=()
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/"
 }
-md5sums=('91124a8eb12a57f1e56c02fe3db0f9e7'
+md5sums=('04dfdd7da189462a4f10ec6530359cef'
          'e2c8bc316efe40532c5b9d7f9a1d8d62'
          '67b0a8a8885fc1221181b171541cb1b0')
diff --git a/extra/ocaml/tk8.6-build.patch b/extra/ocaml/tk8.6-build.patch
deleted file mode 100644
index 439a930f0..000000000
--- a/extra/ocaml/tk8.6-build.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/ocaml-4.00.1/configure	2012-06-26 08:33:50.000000000 -0700
-+++ p/src/ocaml-4.00.1/configure	2013-01-05 17:06:54.877900143 -0800
-@@ -804,6 +804,9 @@
- echo "ARCMD=ar" >> Makefile
- 
- 
-+bytecccompopts="$bytecccompopts -DUSE_INTERP_RESULT"
-+nativecccompopts="$nativecccompopts -DUSE_INTERP_RESULT"
-+
- # Do #! scripts work?
- 
- if (SHELL=/bin/sh; export SHELL; (./sharpbang || ./sharpbang2) >/dev/null); then
-@@ -1450,6 +1453,7 @@
-   if test -n "$tcl_version" && test "x$tcl_version" != "xnone"; then
-     echo "tcl.h and tk.h version $tcl_version found with \"$tk_defs\"."
-     case $tcl_version in
-+    8.6) tclmaj=8 tclmin=6 tkmaj=8 tkmin=6 ;;
-     8.5) tclmaj=8 tclmin=5 tkmaj=8 tkmin=5 ;;
-     8.4) tclmaj=8 tclmin=4 tkmaj=8 tkmin=4 ;;
-     8.3) tclmaj=8 tclmin=3 tkmaj=8 tkmin=3 ;;
diff --git a/extra/opal/PKGBUILD b/extra/opal/PKGBUILD
index e2f2da0ea..7661155f7 100644
--- a/extra/opal/PKGBUILD
+++ b/extra/opal/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 191906 2013-08-01 06:53:39Z bpiotrowski $
+# $Id: PKGBUILD 194345 2013-09-14 08:18:24Z bpiotrowski $
 # Maintainer: Jan de Groot <jan@archlinux.org>
 # Contributor: Tom K <tomk@runbox.com>
 pkgname=opal
 pkgver=3.10.10
-pkgrel=2
+pkgrel=3
 pkgdesc="Open Phone Abstraction Library"
 arch=(i686 x86_64 'mips64el')
 url="http://www.opalvoip.org"
@@ -14,7 +14,7 @@ options=(!makeflags)
 source=(http://ftp.gnome.org/pub/GNOME/sources/opal/${pkgver%.*}/opal-$pkgver.tar.xz
         opal-ffmpeg.patch)
 sha256sums=('f208985003461b2743575eccac13ad890b3e5baac35b68ddef17162460aff864'
-            '0111eec3f7109a83f8cd4a87744ca050b3ca27482e9d31e3a1d50798f8cd88c1')
+            '83f60ecf692e004293ce9dbaae7d7eb64d9713d3bfb71a0e7b1a0d1f936794cd')
 
 build() {
   cd "${srcdir}/opal-${pkgver}"
diff --git a/extra/opal/opal-ffmpeg.patch b/extra/opal/opal-ffmpeg.patch
index e7671ee53..942a5a396 100644
--- a/extra/opal/opal-ffmpeg.patch
+++ b/extra/opal/opal-ffmpeg.patch
@@ -1,15 +1,39 @@
-diff -ru opal-3.10.7/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.7.patched/plugins/video/H.263-1998/h263-1998.cxx
---- opal-3.10.7/plugins/video/H.263-1998/h263-1998.cxx	2012-08-23 04:18:42.000000000 +0200
-+++ opal-3.10.7.patched/plugins/video/H.263-1998/h263-1998.cxx	2012-08-28 19:53:12.080918973 +0200
-@@ -48,6 +48,7 @@
+diff -Naur opal-3.10.10-orig/plugins/video/H.263-1998/Makefile.in opal-3.10.10/plugins/video/H.263-1998/Makefile.in
+--- opal-3.10.10-orig/plugins/video/H.263-1998/Makefile.in	2013-02-20 03:18:03.000000000 +0100
++++ opal-3.10.10/plugins/video/H.263-1998/Makefile.in	2013-09-10 21:43:11.091108557 +0200
+@@ -35,7 +35,7 @@
+              $(COMMONDIR)/dyna.cxx
+ 
+ CFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR)
+-LIBS   += @DL_LIBS@
++LIBS   += @DL_LIBS@ @LIBAVUTIL_LIBS@
+ 
+ HAVE_LIBAVCODEC_RTP_MODE=@HAVE_LIBAVCODEC_RTP_MODE@
+ ifeq ($(HAVE_LIBAVCODEC_RTP_MODE),yes)
+diff -Naur opal-3.10.10-orig/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.10/plugins/video/H.263-1998/h263-1998.cxx
+--- opal-3.10.10-orig/plugins/video/H.263-1998/h263-1998.cxx	2013-02-20 03:18:03.000000000 +0100
++++ opal-3.10.10/plugins/video/H.263-1998/h263-1998.cxx	2013-09-10 21:43:11.091108557 +0200
+@@ -48,6 +48,10 @@
  #endif
  
  #include "h263-1998.h"
++extern "C"
++{
 +#include <libavutil/opt.h>
++}
  #include <limits>
  #include <iomanip>
  #include <stdio.h>
-@@ -317,9 +318,9 @@
+@@ -203,7 +207,7 @@
+   PTRACE(4, m_prefix, "Encoder closed");
+ }
+ 
+-bool H263_Base_EncoderContext::Init(CodecID codecId)
++bool H263_Base_EncoderContext::Init(AVCodecID codecId)
+ {
+   PTRACE(5, m_prefix, "Opening encoder");
+ 
+@@ -317,9 +321,9 @@
      // Level 2+ 
      // works with eyeBeam, signaled via  non-standard "D"
      if (atoi(value) == 1)
@@ -21,7 +45,7 @@ diff -ru opal-3.10.7/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.7.patched/
      return;
    }
  
-@@ -328,9 +329,9 @@
+@@ -328,9 +332,9 @@
      // Annex F: Advanced Prediction Mode
      // does not work with eyeBeam
      if (atoi(value) == 1)
@@ -33,7 +57,7 @@ diff -ru opal-3.10.7/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.7.patched/
      return;
    }
  #endif
-@@ -360,9 +361,9 @@
+@@ -360,9 +364,9 @@
      // Annex K: Slice Structure
      // does not work with eyeBeam
      if (atoi(value) != 0)
@@ -45,7 +69,7 @@ diff -ru opal-3.10.7/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.7.patched/
      return;
    }
  
-@@ -370,9 +371,9 @@
+@@ -370,9 +374,9 @@
      // Annex S: Alternative INTER VLC mode
      // does not work with eyeBeam
      if (atoi(value) == 1)
@@ -57,7 +81,7 @@ diff -ru opal-3.10.7/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.7.patched/
      return;
    }
  
-@@ -450,15 +451,6 @@
+@@ -450,15 +454,6 @@
    PTRACE(5, m_prefix, "qmax set to " << m_context->qmax);
    PTRACE(5, m_prefix, "payload size set to " << m_context->rtp_payload_size);
  
@@ -73,7 +97,7 @@ diff -ru opal-3.10.7/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.7.patched/
    return FFMPEGLibraryInstance.AvcodecOpen(m_context, m_codec) == 0;
  }
  
-@@ -521,7 +513,7 @@
+@@ -521,7 +516,7 @@
  
      // Need to copy to local buffer to guarantee 16 byte alignment
      memcpy(m_inputFrame->data[0], OPAL_VIDEO_FRAME_DATA_PTR(header), header->width*header->height*3/2);
@@ -82,7 +106,7 @@ diff -ru opal-3.10.7/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.7.patched/
  
      /*
      m_inputFrame->pts = (int64_t)srcRTP.GetTimestamp()*m_context->time_base.den/m_context->time_base.num/VIDEO_CLOCKRATE;
-@@ -603,13 +595,13 @@
+@@ -603,13 +598,13 @@
    m_context->rtp_callback = &H263_RFC2190_EncoderContext::RTPCallBack;
    m_context->opaque = this; // used to separate out packets from different encode threads
  
@@ -99,10 +123,21 @@ diff -ru opal-3.10.7/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.7.patched/
  
    return true;
  }
-Only in opal-3.10.7.patched/plugins/video/H.263-1998: h263-1998.cxx.orig
-diff -ru opal-3.10.7/plugins/video/H.264/gpl/h264_helper.cxx opal-3.10.7.patched/plugins/video/H.264/gpl/h264_helper.cxx
---- opal-3.10.7/plugins/video/H.264/gpl/h264_helper.cxx	2012-08-23 04:18:41.000000000 +0200
-+++ opal-3.10.7.patched/plugins/video/H.264/gpl/h264_helper.cxx	2012-08-28 19:53:12.080918973 +0200
+diff -Naur opal-3.10.10-orig/plugins/video/H.263-1998/h263-1998.h opal-3.10.10/plugins/video/H.263-1998/h263-1998.h
+--- opal-3.10.10-orig/plugins/video/H.263-1998/h263-1998.h	2013-02-20 03:18:03.000000000 +0100
++++ opal-3.10.10/plugins/video/H.263-1998/h263-1998.h	2013-09-10 21:43:11.091108557 +0200
+@@ -115,7 +115,7 @@
+     virtual ~H263_Base_EncoderContext();
+ 
+     virtual bool Init() = 0;
+-    virtual bool Init(CodecID codecId);
++    virtual bool Init(AVCodecID codecId);
+ 
+     virtual bool SetOptions(const char * const * options);
+     virtual void SetOption(const char * option, const char * value);
+diff -Naur opal-3.10.10-orig/plugins/video/H.264/gpl/h264_helper.cxx opal-3.10.10/plugins/video/H.264/gpl/h264_helper.cxx
+--- opal-3.10.10-orig/plugins/video/H.264/gpl/h264_helper.cxx	2013-02-20 03:18:02.000000000 +0100
++++ opal-3.10.10/plugins/video/H.264/gpl/h264_helper.cxx	2013-09-10 21:43:11.091108557 +0200
 @@ -27,6 +27,7 @@
  #include <fstream>
  #include <stdlib.h> 
@@ -111,11 +146,20 @@ diff -ru opal-3.10.7/plugins/video/H.264/gpl/h264_helper.cxx opal-3.10.7.patched
  
  #ifdef HAVE_UNISTD_H
  #include <unistd.h>
-Only in opal-3.10.7.patched/plugins/video/H.264/gpl: h264_helper.cxx.orig
-diff -ru opal-3.10.7/plugins/video/H.264/h264-x264.cxx opal-3.10.7.patched/plugins/video/H.264/h264-x264.cxx
---- opal-3.10.7/plugins/video/H.264/h264-x264.cxx	2012-08-23 04:18:41.000000000 +0200
-+++ opal-3.10.7.patched/plugins/video/H.264/h264-x264.cxx	2012-08-28 19:53:12.080918973 +0200
-@@ -1071,13 +1071,10 @@
+diff -Naur opal-3.10.10-orig/plugins/video/H.264/h264-x264.cxx opal-3.10.10/plugins/video/H.264/h264-x264.cxx
+--- opal-3.10.10-orig/plugins/video/H.264/h264-x264.cxx	2013-02-20 03:18:02.000000000 +0100
++++ opal-3.10.10/plugins/video/H.264/h264-x264.cxx	2013-09-10 21:43:11.091108557 +0200
+@@ -40,6 +40,9 @@
+ #include "plugin-config.h"
+ #endif
+ 
++#define FF_IDCT_H264 11
++#define CODEC_FLAG2_SKIP_RD 0x00004000
++
+ #include <codec/opalplugin.hpp>
+ 
+ #include "../common/ffmpeg.h"
+@@ -1071,13 +1074,10 @@
          return false;
  
        m_context->workaround_bugs = FF_BUG_AUTODETECT;
@@ -130,10 +174,9 @@ diff -ru opal-3.10.7/plugins/video/H.264/h264-x264.cxx opal-3.10.7.patched/plugi
                            CODEC_FLAG2_SKIP_RD |
                            CODEC_FLAG2_CHUNKS;
  
-Only in opal-3.10.7.patched/plugins/video/H.264: h264-x264.cxx.orig
-diff -ru opal-3.10.7/plugins/video/H.264/shared/x264wrap.cxx opal-3.10.7.patched/plugins/video/H.264/shared/x264wrap.cxx
---- opal-3.10.7/plugins/video/H.264/shared/x264wrap.cxx	2012-08-23 04:18:41.000000000 +0200
-+++ opal-3.10.7.patched/plugins/video/H.264/shared/x264wrap.cxx	2012-08-28 19:53:12.084252306 +0200
+diff -Naur opal-3.10.10-orig/plugins/video/H.264/shared/x264wrap.cxx opal-3.10.10/plugins/video/H.264/shared/x264wrap.cxx
+--- opal-3.10.10-orig/plugins/video/H.264/shared/x264wrap.cxx	2013-02-20 03:18:02.000000000 +0100
++++ opal-3.10.10/plugins/video/H.264/shared/x264wrap.cxx	2013-09-10 21:43:11.091108557 +0200
 @@ -33,6 +33,7 @@
  
  #include <codec/opalplugin.hpp>
@@ -142,10 +185,21 @@ diff -ru opal-3.10.7/plugins/video/H.264/shared/x264wrap.cxx opal-3.10.7.patched
  
  #ifdef HAVE_UNISTD_H
  #include <unistd.h>
-Only in opal-3.10.7.patched/plugins/video/H.264/shared: x264wrap.cxx.orig
-diff -ru opal-3.10.7/plugins/video/MPEG4-ffmpeg/mpeg4.cxx opal-3.10.7.patched/plugins/video/MPEG4-ffmpeg/mpeg4.cxx
---- opal-3.10.7/plugins/video/MPEG4-ffmpeg/mpeg4.cxx	2012-08-23 04:18:44.000000000 +0200
-+++ opal-3.10.7.patched/plugins/video/MPEG4-ffmpeg/mpeg4.cxx	2012-08-28 19:54:35.460923804 +0200
+diff -Naur opal-3.10.10-orig/plugins/video/MPEG4-ffmpeg/Makefile.in opal-3.10.10/plugins/video/MPEG4-ffmpeg/Makefile.in
+--- opal-3.10.10-orig/plugins/video/MPEG4-ffmpeg/Makefile.in	2013-02-20 03:18:07.000000000 +0100
++++ opal-3.10.10/plugins/video/MPEG4-ffmpeg/Makefile.in	2013-09-10 21:43:49.101654132 +0200
+@@ -31,7 +31,7 @@
+ SRCS      := mpeg4.cxx $(COMMONDIR)/dyna.cxx
+ 
+ CFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR)
+-LIBS   += @DL_LIBS@
++LIBS   += @DL_LIBS@ @LIBAVUTIL_LIBS@
+ 
+ # Add LIBAVCODEC_SOURCE_DIR to the include path so we can #include <libavcodec/...h>
+ # Also add libavutil, so ffmpeg headers can #include "log.h".
+diff -Naur opal-3.10.10-orig/plugins/video/MPEG4-ffmpeg/mpeg4.cxx opal-3.10.10/plugins/video/MPEG4-ffmpeg/mpeg4.cxx
+--- opal-3.10.10-orig/plugins/video/MPEG4-ffmpeg/mpeg4.cxx	2013-02-20 03:18:07.000000000 +0100
++++ opal-3.10.10/plugins/video/MPEG4-ffmpeg/mpeg4.cxx	2013-09-10 21:43:11.091108557 +0200
 @@ -103,6 +103,7 @@
  
  #else /* LIBAVCODEC_HAVE_SOURCE_DIR */
@@ -193,10 +247,10 @@ diff -ru opal-3.10.7/plugins/video/MPEG4-ffmpeg/mpeg4.cxx opal-3.10.7.patched/pl
      m_avcontext->workaround_bugs = 0; // no workaround for buggy implementations
  }
  
-diff -rupN a/plugins/video/common/dyna.cxx b/plugins/video/common/dyna.cxx
---- a/plugins/video/common/dyna.cxx	2013-02-20 02:18:05.000000000 +0000
-+++ b/plugins/video/common/dyna.cxx	2013-07-22 16:55:47.307946942 +0000
-@@ -210,7 +210,7 @@ static void logCallbackFFMPEG(void * avc
+diff -Naur opal-3.10.10-orig/plugins/video/common/dyna.cxx opal-3.10.10/plugins/video/common/dyna.cxx
+--- opal-3.10.10-orig/plugins/video/common/dyna.cxx	2013-02-20 03:18:05.000000000 +0100
++++ opal-3.10.10/plugins/video/common/dyna.cxx	2013-09-10 21:43:11.091108557 +0200
+@@ -210,7 +210,7 @@
  #endif
  
  
@@ -205,7 +259,7 @@ diff -rupN a/plugins/video/common/dyna.cxx b/plugins/video/common/dyna.cxx
  {
    m_codec = codec;
    if (m_codec==CODEC_ID_H264)
-@@ -348,12 +348,12 @@ bool FFMPEGLibrary::Load()
+@@ -348,12 +348,12 @@
    return true;
  }
  
@@ -220,10 +274,10 @@ diff -rupN a/plugins/video/common/dyna.cxx b/plugins/video/common/dyna.cxx
  {
    WaitAndSignal m(processLock);
  
-diff -rupN a/plugins/video/common/dyna.h b/plugins/video/common/dyna.h
---- a/plugins/video/common/dyna.h	2013-02-20 02:18:05.000000000 +0000
-+++ b/plugins/video/common/dyna.h	2013-07-22 16:55:47.191281134 +0000
-@@ -88,13 +88,13 @@ class DynaLink
+diff -Naur opal-3.10.10-orig/plugins/video/common/dyna.h opal-3.10.10/plugins/video/common/dyna.h
+--- opal-3.10.10-orig/plugins/video/common/dyna.h	2013-02-20 03:18:05.000000000 +0100
++++ opal-3.10.10/plugins/video/common/dyna.h	2013-09-10 21:43:11.091108557 +0200
+@@ -88,13 +88,13 @@
  class FFMPEGLibrary 
  {
    public:
@@ -240,7 +294,7 @@ diff -rupN a/plugins/video/common/dyna.h b/plugins/video/common/dyna.h
      AVCodecContext *AvcodecAllocContext(void);
      AVFrame *AvcodecAllocFrame(void);
      int AvcodecOpen(AVCodecContext *ctx, AVCodec *codec);
-@@ -117,15 +117,15 @@ class FFMPEGLibrary
+@@ -117,15 +117,15 @@
      DynaLink m_libAvcodec;
      DynaLink m_libAvutil;
  
@@ -259,9 +313,9 @@ diff -rupN a/plugins/video/common/dyna.h b/plugins/video/common/dyna.h
      AVCodecContext *(*Favcodec_alloc_context)(void);
      AVFrame *(*Favcodec_alloc_frame)(void);
      int (*Favcodec_open)(AVCodecContext *ctx, AVCodec *codec);
-diff -rupN a/plugins/video/common/ffmpeg/libavcodec/avcodec.h b/plugins/video/common/ffmpeg/libavcodec/avcodec.h
---- a/plugins/video/common/ffmpeg/libavcodec/avcodec.h	2013-02-20 02:18:04.000000000 +0000
-+++ b/plugins/video/common/ffmpeg/libavcodec/avcodec.h	2013-07-22 16:55:47.167947971 +0000
+diff -Naur opal-3.10.10-orig/plugins/video/common/ffmpeg/libavcodec/avcodec.h opal-3.10.10/plugins/video/common/ffmpeg/libavcodec/avcodec.h
+--- opal-3.10.10-orig/plugins/video/common/ffmpeg/libavcodec/avcodec.h	2013-02-20 03:18:04.000000000 +0100
++++ opal-3.10.10/plugins/video/common/ffmpeg/libavcodec/avcodec.h	2013-09-10 21:43:11.094441937 +0200
 @@ -101,7 +101,7 @@
   * 1. no value of a existing codec ID changes (that would break ABI),
   * 2. it is as close as possible to similar codecs.
@@ -271,7 +325,7 @@ diff -rupN a/plugins/video/common/ffmpeg/libavcodec/avcodec.h b/plugins/video/co
      CODEC_ID_NONE,
  
      /* video codecs */
-@@ -1390,7 +1390,7 @@ typedef struct AVCodecContext {
+@@ -1390,7 +1390,7 @@
  
      char codec_name[32];
      enum AVMediaType codec_type; /* see AVMEDIA_TYPE_xxx */
@@ -280,7 +334,7 @@ diff -rupN a/plugins/video/common/ffmpeg/libavcodec/avcodec.h b/plugins/video/co
  
      /**
       * fourcc (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A').
-@@ -2843,7 +2843,7 @@ typedef struct AVCodec {
+@@ -2843,7 +2843,7 @@
       */
      const char *name;
      enum AVMediaType type;
@@ -289,7 +343,7 @@ diff -rupN a/plugins/video/common/ffmpeg/libavcodec/avcodec.h b/plugins/video/co
      int priv_data_size;
      int (*init)(AVCodecContext *);
      int (*encode)(AVCodecContext *, uint8_t *buf, int buf_size, void *data);
-@@ -2898,7 +2898,7 @@ typedef struct AVHWAccel {
+@@ -2898,7 +2898,7 @@
       *
       * See CODEC_ID_xxx
       */
@@ -298,7 +352,7 @@ diff -rupN a/plugins/video/common/ffmpeg/libavcodec/avcodec.h b/plugins/video/co
  
      /**
       * Supported pixel format.
-@@ -3402,10 +3402,10 @@ void avcodec_register(AVCodec *codec);
+@@ -3402,10 +3402,10 @@
  /**
   * Find a registered encoder with a matching codec ID.
   *
@@ -311,7 +365,7 @@ diff -rupN a/plugins/video/common/ffmpeg/libavcodec/avcodec.h b/plugins/video/co
  
  /**
   * Find a registered encoder with the specified name.
-@@ -3418,10 +3418,10 @@ AVCodec *avcodec_find_encoder_by_name(co
+@@ -3418,10 +3418,10 @@
  /**
   * Find a registered decoder with a matching codec ID.
   *
@@ -324,7 +378,7 @@ diff -rupN a/plugins/video/common/ffmpeg/libavcodec/avcodec.h b/plugins/video/co
  
  /**
   * Find a registered decoder with the specified name.
-@@ -3822,7 +3822,7 @@ char av_get_pict_type_char(int pict_type
+@@ -3822,7 +3822,7 @@
   * @param[in] codec_id the codec
   * @return Number of bits per sample or zero if unknown for the given codec.
   */
@@ -333,40 +387,3 @@ diff -rupN a/plugins/video/common/ffmpeg/libavcodec/avcodec.h b/plugins/video/co
  
  #if FF_API_OLD_SAMPLE_FMT
  /**
-diff -rupN a/plugins/video/H.263-1998/h263-1998.cxx b/plugins/video/H.263-1998/h263-1998.cxx
---- a/plugins/video/H.263-1998/h263-1998.cxx	2013-02-20 02:18:03.000000000 +0000
-+++ b/plugins/video/H.263-1998/h263-1998.cxx	2013-07-22 16:55:47.314613571 +0000
-@@ -203,7 +203,7 @@ H263_Base_EncoderContext::~H263_Base_Enc
-   PTRACE(4, m_prefix, "Encoder closed");
- }
- 
--bool H263_Base_EncoderContext::Init(CodecID codecId)
-+bool H263_Base_EncoderContext::Init(AVCodecID codecId)
- {
-   PTRACE(5, m_prefix, "Opening encoder");
- 
-diff -rupN a/plugins/video/H.263-1998/h263-1998.h b/plugins/video/H.263-1998/h263-1998.h
---- a/plugins/video/H.263-1998/h263-1998.h	2013-02-20 02:18:03.000000000 +0000
-+++ b/plugins/video/H.263-1998/h263-1998.h	2013-07-22 16:55:47.307946942 +0000
-@@ -115,7 +115,7 @@ class H263_Base_EncoderContext
-     virtual ~H263_Base_EncoderContext();
- 
-     virtual bool Init() = 0;
--    virtual bool Init(CodecID codecId);
-+    virtual bool Init(AVCodecID codecId);
- 
-     virtual bool SetOptions(const char * const * options);
-     virtual void SetOption(const char * option, const char * value);
-diff -rupN a/plugins/video/H.264/h264-x264.cxx b/plugins/video/H.264/h264-x264.cxx
---- a/plugins/video/H.264/h264-x264.cxx	2013-02-20 02:18:02.000000000 +0000
-+++ b/plugins/video/H.264/h264-x264.cxx	2013-07-22 17:05:35.383661843 +0000
-@@ -40,6 +40,9 @@
- #include "plugin-config.h"
- #endif
- 
-+#define FF_IDCT_H264 11
-+#define CODEC_FLAG2_SKIP_RD 0x00004000
-+
- #include <codec/opalplugin.hpp>
- 
- #include "../common/ffmpeg.h"
diff --git a/extra/orc/PKGBUILD b/extra/orc/PKGBUILD
index 6305e6ed3..504150a9b 100644
--- a/extra/orc/PKGBUILD
+++ b/extra/orc/PKGBUILD
@@ -1,25 +1,31 @@
-# $Id: PKGBUILD 182380 2013-04-09 18:42:44Z ioni $
+# $Id: PKGBUILD 194440 2013-09-16 12:20:50Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=orc
-pkgver=0.4.17
+pkgver=0.4.18
 pkgrel=1
 pkgdesc="The Oild Runtime Compiler"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://code.entropywave.com/projects/orc/"
 depends=('glibc')
+makedepends=('valgrind')
 options=('!libtool')
-source=(http://code.entropywave.com/download/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('af1bf3dab9e69f3c36f389285e2a12a1')
+source=(http://gstreamer.freedesktop.org/src/orc/${pkgname}-${pkgver}.tar.gz)
 
 build () {
-    cd "$srcdir/$pkgname-$pkgver"
+    cd $pkgname-$pkgver
     ./configure --prefix=/usr --disable-static
     make
 }
 
+check() {
+    cd $pkgname-$pkgver
+    make check
+}
+
 package() {
-    cd "$srcdir/$pkgname-$pkgver"
+    cd $pkgname-$pkgver
     make DESTDIR="$pkgdir" install
     install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
+md5sums=('1a2552e8d127526c48d644fe6437b377')
diff --git a/extra/p11-kit/PKGBUILD b/extra/p11-kit/PKGBUILD
index 2ea835aa0..e36731b1a 100644
--- a/extra/p11-kit/PKGBUILD
+++ b/extra/p11-kit/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 189939 2013-07-11 19:54:40Z ioni $
+# $Id: PKGBUILD 196130 2013-10-07 11:53:19Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=p11-kit
-pkgver=0.18.4
+pkgver=0.20.1
 pkgrel=1
 pkgdesc="Library to work with PKCS#11 modules"
 arch=(i686 x86_64 mips64el)
 url="http://p11-glue.freedesktop.org"
 license=('BSD')
-depends=('glibc' 'libtasn1')
+depends=('glibc' 'libtasn1' 'libffi')
 options=(!libtool)
 source=($url/releases/$pkgname-$pkgver.tar.gz{,.sig})
-md5sums=('9535c4e5b9c2ef5f5cd0755115ba098b'
+md5sums=('88c651137f76a167336639371eafd8cc'
          'SKIP')
 
 build() {
@@ -21,6 +21,11 @@ build() {
   make
 }
 
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
 package() {
   cd  $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
diff --git a/extra/pango/PKGBUILD b/extra/pango/PKGBUILD
index d2577e193..c4d6cd0f8 100644
--- a/extra/pango/PKGBUILD
+++ b/extra/pango/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 185364 2013-05-13 17:48:00Z heftig $ 
+# $Id: PKGBUILD 196131 2013-10-07 11:53:20Z jgc $ 
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=pango
-pkgver=1.34.1
+pkgver=1.36.0
 pkgrel=1
 pkgdesc="A library for layout and rendering of text"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ options=('!libtool')
 install=pango.install
 source=(http://download.gnome.org/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz)
 url="http://www.pango.org/"
-sha256sums=('1aea30df34a8ae4fcce71afd22aa5b57224b52916d46e3ea81ff9f1eb130e64c')
+sha256sums=('bb41d1b26ee7450e5430a7d2765f38c51ebe72db9fce616a9ee52611b55906a0')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/pango/pango.install b/extra/pango/pango.install
index 73b0f5bf1..4aa7c4d31 100644
--- a/extra/pango/pango.install
+++ b/extra/pango/pango.install
@@ -1,21 +1,14 @@
-# arg 1:  the new package version
 post_install() {
-	# we need to ldconfig first, in case xfree86's libs aren't
-	# in ld.so.cache yet
-	sbin/ldconfig -r .
 	usr/bin/pango-querymodules >etc/pango/pango.modules
 }
 
-# arg 1:  the new package version
-# arg 2:  the old package version
 post_upgrade() {
 	if [ -f usr/etc/pango/pango.modules ]; then
 		rm usr/etc/pango/pango.modules
 	fi
-	post_install $1
+	post_install
 }
 
-# arg 1:  the old package version
 pre_remove() {
 	rm etc/pango/pango.modules
 }
diff --git a/extra/phonon-vlc/PKGBUILD b/extra/phonon-vlc/PKGBUILD
index 8c5389681..b45d4ee66 100644
--- a/extra/phonon-vlc/PKGBUILD
+++ b/extra/phonon-vlc/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 177946 2013-02-12 07:43:37Z andrea $
+# $Id: PKGBUILD 195169 2013-09-26 11:04:10Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=phonon-vlc
 pkgver=0.6.2
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url='http://phonon.kde.org/'
 pkgdesc="Phonon VLC backend"
diff --git a/extra/php-apcu/PKGBUILD b/extra/php-apcu/PKGBUILD
index 3edccd175..96e41a005 100644
--- a/extra/php-apcu/PKGBUILD
+++ b/extra/php-apcu/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 193138 2013-08-17 08:22:17Z pierre $
+# $Id: PKGBUILD 194370 2013-09-14 20:47:48Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=php-apcu
-pkgver=4.0.1
-pkgrel=5
+pkgver=4.0.2
+pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc='A userland caching module for PHP'
 url='http://pecl.php.net/package/APCu'
@@ -14,7 +14,7 @@ provides=("php-apc=${pkgver}")
 license=('PHP')
 source=("http://pecl.php.net/get/apcu-$pkgver.tgz")
 backup=('etc/php/conf.d/apcu.ini')
-md5sums=('994de4335eb2967c006aa9ca185876fa')
+md5sums=('c8a5c246b787eec81847017823099884')
 
 build() {
 	cd $srcdir/apcu-$pkgver
diff --git a/extra/php-xcache/PKGBUILD b/extra/php-xcache/PKGBUILD
index 1b0579dc7..470da9072 100644
--- a/extra/php-xcache/PKGBUILD
+++ b/extra/php-xcache/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 193139 2013-08-17 08:22:18Z pierre $
+# $Id: PKGBUILD 195126 2013-09-25 11:18:14Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=php-xcache
 pkgver=3.1.0dev
-_svnrev=1341
-pkgrel=12
+_svnrev=1394
+pkgrel=14
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='A PHP opcode cacher'
 url='http://xcache.lighttpd.net/'
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD
index b1f89e3b8..1b1e55ffe 100644
--- a/extra/php/PKGBUILD
+++ b/extra/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193545 2013-08-23 06:57:45Z pierre $
+# $Id: PKGBUILD 194666 2013-09-20 19:11:06Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=php
@@ -21,7 +21,7 @@ pkgname=('php'
          'php-sqlite'
          'php-tidy'
          'php-xsl')
-pkgver=5.5.3
+pkgver=5.5.4
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('PHP')
@@ -33,7 +33,7 @@ makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx'
 source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.xz"
         'php.ini.patch' 'apache.conf' 'php-fpm.conf.in.patch'
         'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles')
-md5sums=('437e98144ef014dfab0922a9eed36853'
+md5sums=('32c1dc56701d21def91a39a312392b54'
          'f9ee638591aaf1526767db7976d95847'
          'dec2cbaad64e3abf4f0ec70e1de4e8e9'
          '880afea327bb00c47082d22c507e6bfc'
diff --git a/extra/pigeonhole/PKGBUILD b/extra/pigeonhole/PKGBUILD
index 1c1d605cc..5e6c57a3f 100644
--- a/extra/pigeonhole/PKGBUILD
+++ b/extra/pigeonhole/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 192153 2013-08-06 14:10:47Z andyrtr $
+# $Id: PKGBUILD 195252 2013-09-29 08:56:18Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 # Contributorr: Peter Lewis <plewis@aur.archlinux.org>
@@ -7,12 +7,12 @@
 # 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.5
+_dcpkgver=2.2.6
 # Make sure to bump pkgrel if changing this.
 
 pkgname=pigeonhole
-pkgver=0.4.1
-pkgrel=2
+pkgver=0.4.2
+pkgrel=1
 pkgdesc="Sieve implementation for Dovecot"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pigeonhole.dovecot.org/"
@@ -22,7 +22,7 @@ conflicts=('dovecot-sieve' 'pigeonhole-hg')
 source=("http://www.rename-it.nl/dovecot/2.2/dovecot-2.2-$pkgname-$pkgver.tar.gz"{,.sig}
         "dovecot.conf")
 options=('!libtool')
-sha256sums=('361cf61c1b6c8a42d841d694736dac99c6bb5b5166e050a95c185119399c696e'
+sha256sums=('0499f07037b86489fdc1d48fb19e298d5360ec41273bccaec230eb1bcf5a3e13'
             'SKIP'
             'a457a1691cfa82495fc0503bfa4b61e54b149e63400fe0f568dff2c24a3f7858')
 
diff --git a/extra/pkgfile/PKGBUILD b/extra/pkgfile/PKGBUILD
index cc69461ab..b64159482 100644
--- a/extra/pkgfile/PKGBUILD
+++ b/extra/pkgfile/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193608 2013-08-25 20:10:57Z dreisner $
+# $Id: PKGBUILD 194358 2013-09-14 14:21:19Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 
 pkgname=pkgfile
-pkgver=9
+pkgver=10
 pkgrel=1
 pkgdesc="a pacman .files metadata explorer"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('libarchive' 'curl' 'pcre' 'pacman')
 conflicts=('pkgtools<24-2')
 source=("http://code.falconindy.com/archive/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig})
 install=pkgfile.install
-md5sums=('7e27e9c15da6d59ae04f32d5dc977485'
+md5sums=('262d7359423dedbf1f7323cc14d4a1e3'
          'SKIP')
 
 options=(!strip)
diff --git a/extra/polkit/PKGBUILD b/extra/polkit/PKGBUILD
index 6bae12fdd..d27c47ff9 100644
--- a/extra/polkit/PKGBUILD
+++ b/extra/polkit/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 188528 2013-06-15 09:16:15Z tomegun $
+# $Id: PKGBUILD 194653 2013-09-20 15:18:42Z tomegun $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=polkit
-pkgver=0.111
+pkgver=0.112
 pkgver=0.110 # holding version, it now depends on non-portable 'js'
 pkgrel=1
 pkgdesc="Application development toolkit for controlling system-wide privileges"
@@ -35,5 +35,5 @@ package() {
 
   install -m644 "$srcdir/polkit.pam" "$pkgdir/etc/pam.d/polkit-1"
 }
-md5sums=('81b116edf986d8e13502929a171f4e0d'
+md5sums=('b0f2fa00a55f47c6a5d88e9b73f80127'
          '6564f95878297b954f0572bc1610dd15')
diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD
index cb8f2e13d..f2968558b 100644
--- a/extra/poppler/PKGBUILD
+++ b/extra/poppler/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 193705 2013-08-28 15:19:09Z andyrtr $
+# $Id: PKGBUILD 196154 2013-10-07 12:15:39Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=poppler
 pkgname=('poppler' 'poppler-glib' 'poppler-qt4' 'poppler-qt5')
-pkgver=0.24.1
+pkgver=0.24.2
 pkgrel=1
 arch=(i686 x86_64 mips64el)
 license=('GPL')
@@ -13,7 +13,7 @@ url="http://poppler.freedesktop.org/"
 _testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a
 source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.xz
         http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2)
-md5sums=('b11cc0408b4ad3809fa455d7b3d5ade9'
+md5sums=('ca5c6e35859db5cd578ce4a351dd589d'
          '9dc64c254a31e570507bdd4ad4ba629a')
 
 prepare() {
diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD
index 3b75f99e9..fc7f5b92a 100644
--- a/extra/postfix/PKGBUILD
+++ b/extra/postfix/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 188891 2013-06-23 23:24:25Z bisson $
+# $Id: PKGBUILD 193923 2013-09-06 07:17:49Z bisson $
 # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net>
 # Contributor: Paul Mattal <paul@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=postfix
-pkgver=2.10.1
+pkgver=2.10.2
 pkgrel=1
 pkgdesc='Fast, easy to administer, secure mail server'
 url='http://www.postfix.org/'
@@ -16,9 +16,9 @@ backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,ma
 source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz"{,.sig}
         'aliases.patch'
         'service')
-sha1sums=('3e236cf95a7439750e92d9ef5cd510c00e603eb2' 'SKIP'
+sha1sums=('4721024784d071c3e663d610db17f8bd99821f3d' 'SKIP'
           '5fc3de6c7df1e5851a0a379e825148868808318b'
-          '3f385eca6d571a4ed8fb24781bdc003bec5d8ed6')
+          'dd12885d367bebaf0fc9d2e9823a7f82086b6ee9')
 
 provides=('smtp-server' 'smtp-forwarder')
 conflicts=('smtp-server' 'smtp-forwarder')
diff --git a/extra/postfix/service b/extra/postfix/service
index e7d4cd20c..a7cdc5379 100644
--- a/extra/postfix/service
+++ b/extra/postfix/service
@@ -5,9 +5,9 @@ After=network.target
 [Service]
 Type=forking
 PIDFile=/var/spool/postfix/pid/master.pid
-ExecStart=/usr/sbin/postfix start
-ExecStop=/usr/sbin/postfix stop
-ExecReload=/usr/sbin/postfix reload
+ExecStart=/usr/bin/postfix start
+ExecStop=/usr/bin/postfix stop
+ExecReload=/usr/bin/postfix reload
 Restart=always
 
 [Install]
diff --git a/extra/pstoedit/PKGBUILD b/extra/pstoedit/PKGBUILD
index 26df56f54..c7b2eec8c 100644
--- a/extra/pstoedit/PKGBUILD
+++ b/extra/pstoedit/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 192480 2013-08-12 20:25:47Z eric $
+# $Id: PKGBUILD 194678 2013-09-21 18:35:39Z eric $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Tobias Powalowski <t.powa@gmx.de>
 
 pkgname=pstoedit
 pkgver=3.62
-pkgrel=2
+pkgrel=3
 pkgdesc="Translates PostScript and PDF graphics into other vector formats"
 arch=("i686" "x86_64" 'mips64el')
 url="http://www.pstoedit.net/"
diff --git a/extra/pycups/PKGBUILD b/extra/pycups/PKGBUILD
index e1342e7a3..dc0f58b21 100644
--- a/extra/pycups/PKGBUILD
+++ b/extra/pycups/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 164649 2012-08-01 18:38:32Z andrea $
+# $Id: PKGBUILD 195975 2013-10-06 19:13:24Z eric $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: nesl247 <nesl247@gmail.com>
 
 pkgname=pycups
-pkgver=1.9.62
+pkgver=1.9.63
 pkgrel=1
 pkgdesc="Python CUPS Bindings"
-url="http://cyberelk.net/tim/software/pycups/"
 arch=('i686' 'x86_64' 'mips64el')
+url="http://cyberelk.net/tim/software/pycups/"
 license=('GPL')
 depends=('libcups' 'python2')
-source=(http://cyberelk.net/tim/data/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
-md5sums=('b62fb397c0997dc4adf44487f4bdf5ae'
-         'ced304a64389f2a0cf4178acc002562d')
+source=(http://cyberelk.net/tim/data/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.asc})
+md5sums=('cdee3ef87ac68d435c8ea04384563d15'
+         'SKIP')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/pygobject/PKGBUILD b/extra/pygobject/PKGBUILD
index cd51f80a7..08494e3e7 100644
--- a/extra/pygobject/PKGBUILD
+++ b/extra/pygobject/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 189725 2013-07-06 02:03:20Z heftig $
+# $Id: PKGBUILD 196150 2013-10-07 11:53:48Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=pygobject
 pkgname=(python-gobject python2-gobject pygobject-devel)
-pkgver=3.8.3
+pkgver=3.10.0
 pkgrel=1
 arch=(i686 x86_64 mips64el)
 url="https://live.gnome.org/PyGObject"
 license=(LGPL)
 makedepends=(python python2 python-cairo python2-cairo gobject-introspection)
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver::3}/$pkgbase-$pkgver.tar.xz)
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver:0:4}/$pkgbase-$pkgver.tar.xz)
 options=('!libtool')
-sha256sums=('384b3e1b8d1e7c8796d7eb955380d62946dd0ed9c54ecf0817af2d6b254e082c')
+sha256sums=('8aaa1f83fdb2e30bae77405a63a8be600b311a04a4cdc952b2ab62ee81aad077')
 
 prepare() {
   mkdir build-py2 build-py3 devel
diff --git a/extra/pyqt5/PKGBUILD b/extra/pyqt5/PKGBUILD
new file mode 100644
index 000000000..fc6840cac
--- /dev/null
+++ b/extra/pyqt5/PKGBUILD
@@ -0,0 +1,105 @@
+# $Id: PKGBUILD 195876 2013-10-03 10:38:53Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Yichao Yu <yyc1992@gmail.com>
+# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
+# Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net>
+
+pkgbase=pyqt5
+pkgname=pyqt5
+pkgname=('pyqt5-common' 'python-pyqt5' 'python2-pyqt5')
+pkgver=5.1
+pkgrel=1
+arch=('i686' 'x86_64')
+url="http://riverbankcomputing.co.uk/software/pyqt/intro"
+license=('GPL')
+makedepends=('python-sip' 'python2-sip' 'python-opengl' 'python2-opengl'
+             'python2-dbus' 'python-dbus' 'qt5-multimedia' 'qt5-tools'
+             'qt5-svg')
+source=("http://downloads.sourceforge.net/project/pyqt/PyQt5/PyQt-${pkgver}/PyQt-gpl-${pkgver}.tar.gz")
+md5sums=('056f6232bf9ea92baf86e812fd1669f8')
+
+build() {
+  cp -r PyQt-gpl-${pkgver} Py2Qt-gpl-${pkgver}
+
+  cd PyQt-gpl-${pkgver}
+  python3 configure.py \
+    --confirm-license \
+    -v /usr/share/sip/PyQt5 \
+    --qsci-api \
+    -q /usr/bin/qmake-qt5
+
+  # Thanks Gerardo for the rpath fix
+  find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
+
+  make
+
+  ### Python2 version ###
+  cd ../Py2Qt-gpl-${pkgver}
+  python2 configure.py \
+    --confirm-license \
+    -v /usr/share/sip/Py2-PyQt5 \
+    --qsci-api \
+    -q /usr/bin/qmake-qt5
+
+  # Thanks Gerardo for the rpath fix
+  find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
+
+  make
+}
+
+package_pyqt5-common(){
+  pkgdesc="Common PyQt files shared between python-pyqt5 and python2-pyqt5"
+  depends=('qt5-base')
+
+  cd PyQt-gpl-${pkgver}
+  make -C pyrcc DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+  make -C pylupdate DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+  install -Dm644 PyQt5.api "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt5.api
+}
+
+package_python-pyqt5(){
+  pkgdesc="A set of Python 3.x bindings for the Qt5 toolkit"
+  depends=('python-sip' 'pyqt5-common' 'python' 'python')
+  optdepends=('python-opengl: enable OpenGL 3D graphics in PyQt applications'
+              'python-dbus: for python-dbus mainloop support'
+              'qt5-multimedia: QtMultimedia, QtMultimediaWidgets'
+              'qt5-tools: QtHelp, QtDesigner'
+              'qt5-svg: QtSvg'
+              'qt5-webkit: QtWebKit, QtWebKitWidgets'
+              'qt5-xmlpatterns: QtXmlPatterns'
+              'qt5-declarative: QtQml, qmlplugin')
+
+  cd PyQt-gpl-${pkgver}
+  # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
+  make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+  # Provided by pyqt-common
+  rm "${pkgdir}"/usr/bin/{pylupdate5,pyrcc5}
+  rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt5.api
+}
+
+package_python2-pyqt5(){
+  pkgdesc="A set of Python 2.x bindings for the Qt5 toolkit"
+  depends=('python2-sip' 'pyqt5-common' 'python2')
+  optdepends=('python2-opengl: enable OpenGL 3D graphics in PyQt applications'
+              'python-dbus: for python-dbus mainloop support'
+              'qt5-multimedia: QtMultimedia, QtMultimediaWidgets'
+              'qt5-tools: QtHelp, QtDesigner'
+              'qt5-svg: QtSvg'
+              'qt5-webkit: QtWebKit, QtWebKitWidgets'
+              'qt5-xmlpatterns: QtXmlPatterns'
+              'qt5-declarative: QtQml, qmlplugin')
+
+  cd Py2Qt-gpl-${pkgver}
+  # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
+  make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+  # Fix conflicts with python-pyqt5
+  mv "${pkgdir}"/usr/bin/{,python2-}pyuic5
+
+  rm "${pkgdir}"/usr/bin/{pylupdate5,pyrcc5}
+  rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpyqt5.so
+  rm "${pkgdir}"/usr/lib/qt/plugins/PyQt5/libpyqt5qmlplugin.so
+  rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt5.api
+}
diff --git a/extra/python-cairo/PKGBUILD b/extra/python-cairo/PKGBUILD
index 8034ee1b0..24f6a0fea 100644
--- a/extra/python-cairo/PKGBUILD
+++ b/extra/python-cairo/PKGBUILD
@@ -1,18 +1,17 @@
-# $Id: PKGBUILD 169010 2012-10-17 10:20:01Z allan $
+# $Id: PKGBUILD 195288 2013-09-29 21:45:06Z eric $
 # Maintainer: Angel Velasquez <angvp@archlinux.org>  
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=python-cairo
 pkgver=1.10.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Python bindings for the cairo graphics library"
 arch=('i686' 'x86_64' 'mips64el')
+url="http://www.cairographics.org/pycairo"
 license=('LGPL3')
 depends=('python' 'cairo')
-makedepends=('pkg-config')
 options=('!libtool')
 source=(http://cairographics.org/releases/pycairo-${pkgver}.tar.bz2)
-url="http://www.cairographics.org/pycairo"
 md5sums=('e6fd3f2f1e6a72e0db0868c4985669c5')
 
 build() {
diff --git a/extra/python-geoip/PKGBUILD b/extra/python-geoip/PKGBUILD
index e03fa8012..7643e2d15 100644
--- a/extra/python-geoip/PKGBUILD
+++ b/extra/python-geoip/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186477 2013-05-27 11:23:42Z foutrelis $
+# $Id: PKGBUILD 195467 2013-09-30 13:27:17Z jgc $
 # Maintainer:
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
@@ -6,7 +6,7 @@
 pkgname=('python2-geoip')
 pkgbase=python-geoip
 pkgver=1.2.8
-pkgrel=1
+pkgrel=2
 pkgdesc="Python bindings for the GeoIP IP-to-country resolver library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://dev.maxmind.com/geoip/legacy/downloadable#Python-10"
@@ -16,12 +16,12 @@ source=(http://www.maxmind.com/download/geoip/api/python/GeoIP-Python-$pkgver.ta
 sha256sums=('8b946307355b60cb0f2b0be8ac90c1231286e0e79917509763267fce01a50e73')
 
 build() {
-  cd "$srcdir/GeoIP-Python-$pkgver"
+  cd "GeoIP-Python-$pkgver"
   python2 setup.py build
 }
 
 package_python2-geoip() {
-  cd "$srcdir/GeoIP-Python-$pkgver"
+  cd "GeoIP-Python-$pkgver"
   python2 setup.py install --root="$pkgdir" -O1
 }
 
diff --git a/extra/python/PKGBUILD b/extra/python/PKGBUILD
index d991489df..8733625fe 100644
--- a/extra/python/PKGBUILD
+++ b/extra/python/PKGBUILD
@@ -1,29 +1,31 @@
-# $Id: PKGBUILD 186286 2013-05-23 20:40:14Z stephane $
+# $Id: PKGBUILD 193927 2013-09-06 07:53:42Z bpiotrowski $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=python
 pkgver=3.3.2
-pkgrel=1
+pkgrel=2
 _pybasever=3.3
 pkgdesc="Next generation of the python high-level scripting language"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://www.python.org/"
 depends=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib')
-makedepends=('tk>=8.6.0' 'sqlite' 'bluez')
+makedepends=('tk>=8.6.0' 'sqlite' 'bluez-libs')
 [ "$CARCH" != "mips64el" ] && makedepends+=('valgrind')
 optdepends=('tk: for tkinter' 'sqlite')
 provides=('python3')
 replaces=('python3')
 options=('!makeflags')
 source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz
-        python-3.3.2-CVE-2013-2099.patch)
+        python-3.3.2-CVE-2013-2099.patch
+        python-3.3.2-CVE-2013-4238.patch)
 sha1sums=('87009d0c156c6e1354dfec5c98c328cae93950ad'
-          'b7a386b2e2f0811b344898500860ec31ba81ed4d')
+          'bfe07759daacd4ffa0e682e65f0c9fb84f715c73'
+          'c30297201ef5cd803b685085ca6defb7ca66d2cd')
 
-build() {
+prepare() {
   cd "${srcdir}/Python-${pkgver}"
 
   # FS#23997
@@ -42,6 +44,11 @@ build() {
   fi
 
   patch -Np1 -i ../python-3.3.2-CVE-2013-2099.patch
+  patch -Np1 -i ../python-3.3.2-CVE-2013-4238.patch
+}
+
+build() {
+  cd "${srcdir}/Python-${pkgver}"
 
   ./configure --prefix=/usr \
               --enable-shared \
@@ -67,11 +74,12 @@ package() {
   make DESTDIR="${pkgdir}" install maninstall
 
   # Why are these not done by default...
-  ln -sf python3               "${pkgdir}/usr/bin/python"
-  ln -sf python3-config        "${pkgdir}/usr/bin/python-config"
-  ln -sf idle3                 "${pkgdir}/usr/bin/idle"
-  ln -sf pydoc3                "${pkgdir}/usr/bin/pydoc"
-  ln -sf python${_pybasever}.1 "${pkgdir}/usr/share/man/man1/python3.1"
+  ln -sf python3               "${pkgdir}"/usr/bin/python
+  ln -sf python3-config        "${pkgdir}"/usr/bin/python-config
+  ln -sf idle3                 "${pkgdir}"/usr/bin/idle
+  ln -sf pydoc3                "${pkgdir}"/usr/bin/pydoc
+  ln -sf python${_pybasever}.1 "${pkgdir}"/usr/share/man/man1/python3.1
+  ln -sf python${_pybasever}.1 "${pkgdir}"/usr/share/man/man1/python.1
 
   # Fix FS#22552
   ln -sf ../../libpython${_pybasever}m.so \
diff --git a/extra/python/python-3.3.2-CVE-2013-2099.patch b/extra/python/python-3.3.2-CVE-2013-2099.patch
index 8162d8e54..888b43b00 100644
--- a/extra/python/python-3.3.2-CVE-2013-2099.patch
+++ b/extra/python/python-3.3.2-CVE-2013-2099.patch
@@ -1,4 +1,3 @@
-
 # HG changeset patch
 # User Antoine Pitrou <solipsis@pitrou.net>
 # Date 1368892602 -7200
diff --git a/extra/python/python-3.3.2-CVE-2013-4238.patch b/extra/python/python-3.3.2-CVE-2013-4238.patch
new file mode 100644
index 000000000..2de2ed47f
--- /dev/null
+++ b/extra/python/python-3.3.2-CVE-2013-4238.patch
@@ -0,0 +1,255 @@
+
+# HG changeset patch
+# User Christian Heimes <christian@cheimes.de>
+# Date 1376693687 -7200
+# Node ID c9f073e593b037e8a29e386326859537691bcf62
+# Parent  3105b78d34346ea36c52a3b7e635954f4b444120
+Issue #18709: Fix CVE-2013-4238. The SSL module now handles NULL bytes
+inside subjectAltName correctly. Formerly the module has used OpenSSL's
+GENERAL_NAME_print() function to get the string represention of ASN.1
+strings for rfc822Name (email), dNSName (DNS) and
+uniformResourceIdentifier (URI).
+
+diff --git a/Lib/test/nullbytecert.pem b/Lib/test/nullbytecert.pem
+new file mode 100644
+--- /dev/null
++++ b/Lib/test/nullbytecert.pem
+@@ -0,0 +1,90 @@
++Certificate:
++    Data:
++        Version: 3 (0x2)
++        Serial Number: 0 (0x0)
++    Signature Algorithm: sha1WithRSAEncryption
++        Issuer: C=US, ST=Oregon, L=Beaverton, O=Python Software Foundation, OU=Python Core Development, CN=null.python.org\x00example.org/emailAddress=python-dev@python.org
++        Validity
++            Not Before: Aug  7 13:11:52 2013 GMT
++            Not After : Aug  7 13:12:52 2013 GMT
++        Subject: C=US, ST=Oregon, L=Beaverton, O=Python Software Foundation, OU=Python Core Development, CN=null.python.org\x00example.org/emailAddress=python-dev@python.org
++        Subject Public Key Info:
++            Public Key Algorithm: rsaEncryption
++                Public-Key: (2048 bit)
++                Modulus:
++                    00:b5:ea:ed:c9:fb:46:7d:6f:3b:76:80:dd:3a:f3:
++                    03:94:0b:a7:a6:db:ec:1d:df:ff:23:74:08:9d:97:
++                    16:3f:a3:a4:7b:3e:1b:0e:96:59:25:03:a7:26:e2:
++                    88:a9:cf:79:cd:f7:04:56:b0:ab:79:32:6e:59:c1:
++                    32:30:54:eb:58:a8:cb:91:f0:42:a5:64:27:cb:d4:
++                    56:31:88:52:ad:cf:bd:7f:f0:06:64:1f:cc:27:b8:
++                    a3:8b:8c:f3:d8:29:1f:25:0b:f5:46:06:1b:ca:02:
++                    45:ad:7b:76:0a:9c:bf:bb:b9:ae:0d:16:ab:60:75:
++                    ae:06:3e:9c:7c:31:dc:92:2f:29:1a:e0:4b:0c:91:
++                    90:6c:e9:37:c5:90:d7:2a:d7:97:15:a3:80:8f:5d:
++                    7b:49:8f:54:30:d4:97:2c:1c:5b:37:b5:ab:69:30:
++                    68:43:d3:33:78:4b:02:60:f5:3c:44:80:a1:8f:e7:
++                    f0:0f:d1:5e:87:9e:46:cf:62:fc:f9:bf:0c:65:12:
++                    f1:93:c8:35:79:3f:c8:ec:ec:47:f5:ef:be:44:d5:
++                    ae:82:1e:2d:9a:9f:98:5a:67:65:e1:74:70:7c:cb:
++                    d3:c2:ce:0e:45:49:27:dc:e3:2d:d4:fb:48:0e:2f:
++                    9e:77:b8:14:46:c0:c4:36:ca:02:ae:6a:91:8c:da:
++                    2f:85
++                Exponent: 65537 (0x10001)
++        X509v3 extensions:
++            X509v3 Basic Constraints: critical
++                CA:FALSE
++            X509v3 Subject Key Identifier:
++                88:5A:55:C0:52:FF:61:CD:52:A3:35:0F:EA:5A:9C:24:38:22:F7:5C
++            X509v3 Key Usage:
++                Digital Signature, Non Repudiation, Key Encipherment
++            X509v3 Subject Alternative Name:
++                *************************************************************
++                WARNING: The values for DNS, email and URI are WRONG. OpenSSL
++                         doesn't print the text after a NULL byte.
++                *************************************************************
++                DNS:altnull.python.org, email:null@python.org, URI:http://null.python.org, IP Address:192.0.2.1, IP Address:2001:DB8:0:0:0:0:0:1
++    Signature Algorithm: sha1WithRSAEncryption
++         ac:4f:45:ef:7d:49:a8:21:70:8e:88:59:3e:d4:36:42:70:f5:
++         a3:bd:8b:d7:a8:d0:58:f6:31:4a:b1:a4:a6:dd:6f:d9:e8:44:
++         3c:b6:0a:71:d6:7f:b1:08:61:9d:60:ce:75:cf:77:0c:d2:37:
++         86:02:8d:5e:5d:f9:0f:71:b4:16:a8:c1:3d:23:1c:f1:11:b3:
++         56:6e:ca:d0:8d:34:94:e6:87:2a:99:f2:ae:ae:cc:c2:e8:86:
++         de:08:a8:7f:c5:05:fa:6f:81:a7:82:e6:d0:53:9d:34:f4:ac:
++         3e:40:fe:89:57:7a:29:a4:91:7e:0b:c6:51:31:e5:10:2f:a4:
++         60:76:cd:95:51:1a:be:8b:a1:b0:fd:ad:52:bd:d7:1b:87:60:
++         d2:31:c7:17:c4:18:4f:2d:08:25:a3:a7:4f:b7:92:ca:e2:f5:
++         25:f1:54:75:81:9d:b3:3d:61:a2:f7:da:ed:e1:c6:6f:2c:60:
++         1f:d8:6f:c5:92:05:ab:c9:09:62:49:a9:14:ad:55:11:cc:d6:
++         4a:19:94:99:97:37:1d:81:5f:8b:cf:a3:a8:96:44:51:08:3d:
++         0b:05:65:12:eb:b6:70:80:88:48:72:4f:c6:c2:da:cf:cd:8e:
++         5b:ba:97:2f:60:b4:96:56:49:5e:3a:43:76:63:04:be:2a:f6:
++         c1:ca:a9:94
++-----BEGIN CERTIFICATE-----
++MIIE2DCCA8CgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBxTELMAkGA1UEBhMCVVMx
++DzANBgNVBAgMBk9yZWdvbjESMBAGA1UEBwwJQmVhdmVydG9uMSMwIQYDVQQKDBpQ
++eXRob24gU29mdHdhcmUgRm91bmRhdGlvbjEgMB4GA1UECwwXUHl0aG9uIENvcmUg
++RGV2ZWxvcG1lbnQxJDAiBgNVBAMMG251bGwucHl0aG9uLm9yZwBleGFtcGxlLm9y
++ZzEkMCIGCSqGSIb3DQEJARYVcHl0aG9uLWRldkBweXRob24ub3JnMB4XDTEzMDgw
++NzEzMTE1MloXDTEzMDgwNzEzMTI1MlowgcUxCzAJBgNVBAYTAlVTMQ8wDQYDVQQI
++DAZPcmVnb24xEjAQBgNVBAcMCUJlYXZlcnRvbjEjMCEGA1UECgwaUHl0aG9uIFNv
++ZnR3YXJlIEZvdW5kYXRpb24xIDAeBgNVBAsMF1B5dGhvbiBDb3JlIERldmVsb3Bt
++ZW50MSQwIgYDVQQDDBtudWxsLnB5dGhvbi5vcmcAZXhhbXBsZS5vcmcxJDAiBgkq
++hkiG9w0BCQEWFXB5dGhvbi1kZXZAcHl0aG9uLm9yZzCCASIwDQYJKoZIhvcNAQEB
++BQADggEPADCCAQoCggEBALXq7cn7Rn1vO3aA3TrzA5QLp6bb7B3f/yN0CJ2XFj+j
++pHs+Gw6WWSUDpybiiKnPec33BFawq3kyblnBMjBU61ioy5HwQqVkJ8vUVjGIUq3P
++vX/wBmQfzCe4o4uM89gpHyUL9UYGG8oCRa17dgqcv7u5rg0Wq2B1rgY+nHwx3JIv
++KRrgSwyRkGzpN8WQ1yrXlxWjgI9de0mPVDDUlywcWze1q2kwaEPTM3hLAmD1PESA
++oY/n8A/RXoeeRs9i/Pm/DGUS8ZPINXk/yOzsR/XvvkTVroIeLZqfmFpnZeF0cHzL
++08LODkVJJ9zjLdT7SA4vnne4FEbAxDbKAq5qkYzaL4UCAwEAAaOB0DCBzTAMBgNV
++HRMBAf8EAjAAMB0GA1UdDgQWBBSIWlXAUv9hzVKjNQ/qWpwkOCL3XDALBgNVHQ8E
++BAMCBeAwgZAGA1UdEQSBiDCBhYIeYWx0bnVsbC5weXRob24ub3JnAGV4YW1wbGUu
++Y29tgSBudWxsQHB5dGhvbi5vcmcAdXNlckBleGFtcGxlLm9yZ4YpaHR0cDovL251
++bGwucHl0aG9uLm9yZwBodHRwOi8vZXhhbXBsZS5vcmeHBMAAAgGHECABDbgAAAAA
++AAAAAAAAAAEwDQYJKoZIhvcNAQEFBQADggEBAKxPRe99SaghcI6IWT7UNkJw9aO9
++i9eo0Fj2MUqxpKbdb9noRDy2CnHWf7EIYZ1gznXPdwzSN4YCjV5d+Q9xtBaowT0j
++HPERs1ZuytCNNJTmhyqZ8q6uzMLoht4IqH/FBfpvgaeC5tBTnTT0rD5A/olXeimk
++kX4LxlEx5RAvpGB2zZVRGr6LobD9rVK91xuHYNIxxxfEGE8tCCWjp0+3ksri9SXx
++VHWBnbM9YaL32u3hxm8sYB/Yb8WSBavJCWJJqRStVRHM1koZlJmXNx2BX4vPo6iW
++RFEIPQsFZRLrtnCAiEhyT8bC2s/Njlu6ly9gtJZWSV46Q3ZjBL4q9sHKqZQ=
++-----END CERTIFICATE-----
+diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
+--- a/Lib/test/test_ssl.py
++++ b/Lib/test/test_ssl.py
+@@ -55,6 +55,7 @@ BADCERT = data_file("badcert.pem")
+ WRONGCERT = data_file("XXXnonexisting.pem")
+ BADKEY = data_file("badkey.pem")
+ NOKIACERT = data_file("nokia.pem")
++NULLBYTECERT = data_file("nullbytecert.pem")
+ 
+ DHFILE = data_file("dh512.pem")
+ BYTES_DHFILE = os.fsencode(DHFILE)
+@@ -162,6 +163,27 @@ class BasicSocketTests(unittest.TestCase
+                           ('DNS', 'projects.forum.nokia.com'))
+                         )
+ 
++    def test_parse_cert_CVE_2013_4238(self):
++        p = ssl._ssl._test_decode_cert(NULLBYTECERT)
++        if support.verbose:
++            sys.stdout.write("\n" + pprint.pformat(p) + "\n")
++        subject = ((('countryName', 'US'),),
++                   (('stateOrProvinceName', 'Oregon'),),
++                   (('localityName', 'Beaverton'),),
++                   (('organizationName', 'Python Software Foundation'),),
++                   (('organizationalUnitName', 'Python Core Development'),),
++                   (('commonName', 'null.python.org\x00example.org'),),
++                   (('emailAddress', 'python-dev@python.org'),))
++        self.assertEqual(p['subject'], subject)
++        self.assertEqual(p['issuer'], subject)
++        self.assertEqual(p['subjectAltName'],
++                         (('DNS', 'altnull.python.org\x00example.com'),
++                         ('email', 'null@python.org\x00user@example.org'),
++                         ('URI', 'http://null.python.org\x00http://example.org'),
++                         ('IP Address', '192.0.2.1'),
++                         ('IP Address', '2001:DB8:0:0:0:0:0:1\n'))
++                        )
++
+     def test_DER_to_PEM(self):
+         with open(SVN_PYTHON_ORG_ROOT_CERT, 'r') as f:
+             pem = f.read()
+@@ -294,6 +316,13 @@ class BasicSocketTests(unittest.TestCase
+         fail(cert, 'foo.a.com')
+         fail(cert, 'bar.foo.com')
+ 
++        # NULL bytes are bad, CVE-2013-4073
++        cert = {'subject': ((('commonName',
++                              'null.python.org\x00example.org'),),)}
++        ok(cert, 'null.python.org\x00example.org') # or raise an error?
++        fail(cert, 'example.org')
++        fail(cert, 'null.python.org')
++
+         # Slightly fake real-world example
+         cert = {'notAfter': 'Jun 26 21:41:46 2011 GMT',
+                 'subject': ((('commonName', 'linuxfrz.org'),),),
+diff --git a/Modules/_ssl.c b/Modules/_ssl.c
+--- a/Modules/_ssl.c
++++ b/Modules/_ssl.c
+@@ -771,12 +771,14 @@ static PyObject *
+                            ext->value->length));
+ 
+         for(j = 0; j < sk_GENERAL_NAME_num(names); j++) {
+-
+             /* get a rendering of each name in the set of names */
++            int gntype;
++            ASN1_STRING *as = NULL;
+ 
+             name = sk_GENERAL_NAME_value(names, j);
+-            if (name->type == GEN_DIRNAME) {
+-
++            gntype = name-> type;
++            switch (gntype) {
++            case GEN_DIRNAME:
+                 /* we special-case DirName as a tuple of
+                    tuples of attributes */
+ 
+@@ -798,11 +800,62 @@ static PyObject *
+                     goto fail;
+                 }
+                 PyTuple_SET_ITEM(t, 1, v);
++                break;
+ 
+-            } else {
++            case GEN_EMAIL:
++            case GEN_DNS:
++            case GEN_URI:
++                /* GENERAL_NAME_print() doesn't handle NULL bytes in ASN1_string
++                   correctly, CVE-2013-4238 */
++                t = PyTuple_New(2);
++                if (t == NULL)
++                    goto fail;
++                switch (gntype) {
++                case GEN_EMAIL:
++                    v = PyUnicode_FromString("email");
++                    as = name->d.rfc822Name;
++                    break;
++                case GEN_DNS:
++                    v = PyUnicode_FromString("DNS");
++                    as = name->d.dNSName;
++                    break;
++                case GEN_URI:
++                    v = PyUnicode_FromString("URI");
++                    as = name->d.uniformResourceIdentifier;
++                    break;
++                }
++                if (v == NULL) {
++                    Py_DECREF(t);
++                    goto fail;
++                }
++                PyTuple_SET_ITEM(t, 0, v);
++                v = PyUnicode_FromStringAndSize((char *)ASN1_STRING_data(as),
++                                                ASN1_STRING_length(as));
++                if (v == NULL) {
++                    Py_DECREF(t);
++                    goto fail;
++                }
++                PyTuple_SET_ITEM(t, 1, v);
++                break;
+ 
++            default:
+                 /* for everything else, we use the OpenSSL print form */
+-
++                switch (gntype) {
++                    /* check for new general name type */
++                    case GEN_OTHERNAME:
++                    case GEN_X400:
++                    case GEN_EDIPARTY:
++                    case GEN_IPADD:
++                    case GEN_RID:
++                        break;
++                    default:
++                        if (PyErr_WarnFormat(PyExc_RuntimeWarning, 1,
++                                             "Unknown general name type %d",
++                                             gntype) == -1) {
++                            goto fail;
++                        }
++                        break;
++                }
+                 (void) BIO_reset(biobuf);
+                 GENERAL_NAME_print(biobuf, name);
+                 len = BIO_gets(biobuf, buf, sizeof(buf)-1);
+@@ -829,6 +882,7 @@ static PyObject *
+                     goto fail;
+                 }
+                 PyTuple_SET_ITEM(t, 1, v);
++                break;
+             }
+ 
+             /* and add that rendering to the list */
+
diff --git a/extra/python2/PKGBUILD b/extra/python2/PKGBUILD
index 440e51d2f..15770f376 100644
--- a/extra/python2/PKGBUILD
+++ b/extra/python2/PKGBUILD
@@ -1,27 +1,32 @@
-# $Id: PKGBUILD 185697 2013-05-17 11:13:51Z stephane $
+# $Id: PKGBUILD 193929 2013-09-06 08:06:17Z bpiotrowski $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributer: Allan McRae <allan@archlinux.org>
 # Contributer: Jason Chu <jason@archlinux.org>
 
 pkgname=python2
 pkgver=2.7.5
-pkgrel=1
+pkgrel=2
 _pybasever=2.7
 pkgdesc="A high-level scripting language"
 arch=('i686' 'x86_64' 'mips64el')
 license=('PSF')
 url="http://www.python.org/"
 depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite' 'libffi')
-makedepends=('tk>=8.6.0' 'bluez')
+makedepends=('tk>=8.6.0' 'bluez-libs')
 optdepends=('tk: for IDLE')
 conflicts=('python<3')
 options=('!makeflags')
-source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz)
-sha1sums=('b7389791f789625c2ba9d897aa324008ff482daf')
+source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz
+        python-2.7.5-CVE-2013-4238.patch)
+sha1sums=('b7389791f789625c2ba9d897aa324008ff482daf'
+          'fb1f95ca21d9c00eaaea5a58236d1d97300482d7')
 
-build() {
+prepare() {
   cd "${srcdir}/Python-${pkgver}"
 
+  # http://bugs.python.org/issue18709
+  patch -Np1 -i ../python-2.7.5-CVE-2013-4238.patch
+
   # Temporary workaround for FS#22322
   # See http://bugs.python.org/issue10835 for upstream report
   sed -i "/progname =/s/python/python${_pybasever}/" Python/pythonrun.c
@@ -40,6 +45,10 @@ build() {
   rm -r Modules/expat
   rm -r Modules/zlib
   rm -r Modules/_ctypes/{darwin,libffi}*
+}
+
+build() {
+  cd "${srcdir}/Python-${pkgver}"
 
   export OPT="${CFLAGS}"
   ./configure --prefix=/usr --enable-shared --with-threads --enable-ipv6 \
diff --git a/extra/python2/python-2.7.5-CVE-2013-4238.patch b/extra/python2/python-2.7.5-CVE-2013-4238.patch
new file mode 100644
index 000000000..c37190182
--- /dev/null
+++ b/extra/python2/python-2.7.5-CVE-2013-4238.patch
@@ -0,0 +1,267 @@
+
+# HG changeset patch
+# User Christian Heimes <christian@cheimes.de>
+# Date 1376693687 -7200
+# Node ID bd2360476bdbb1477b81b0e18b8d86b3452ba77b
+# Parent  87fcc13ade91874971ad577efaa2254c744a2b07
+Issue #18709: Fix CVE-2013-4238. The SSL module now handles NULL bytes
+inside subjectAltName correctly. Formerly the module has used OpenSSL's
+GENERAL_NAME_print() function to get the string represention of ASN.1
+strings for rfc822Name (email), dNSName (DNS) and
+uniformResourceIdentifier (URI).
+
+diff --git a/Lib/test/nullbytecert.pem b/Lib/test/nullbytecert.pem
+new file mode 100644
+--- /dev/null
++++ b/Lib/test/nullbytecert.pem
+@@ -0,0 +1,90 @@
++Certificate:
++    Data:
++        Version: 3 (0x2)
++        Serial Number: 0 (0x0)
++    Signature Algorithm: sha1WithRSAEncryption
++        Issuer: C=US, ST=Oregon, L=Beaverton, O=Python Software Foundation, OU=Python Core Development, CN=null.python.org\x00example.org/emailAddress=python-dev@python.org
++        Validity
++            Not Before: Aug  7 13:11:52 2013 GMT
++            Not After : Aug  7 13:12:52 2013 GMT
++        Subject: C=US, ST=Oregon, L=Beaverton, O=Python Software Foundation, OU=Python Core Development, CN=null.python.org\x00example.org/emailAddress=python-dev@python.org
++        Subject Public Key Info:
++            Public Key Algorithm: rsaEncryption
++                Public-Key: (2048 bit)
++                Modulus:
++                    00:b5:ea:ed:c9:fb:46:7d:6f:3b:76:80:dd:3a:f3:
++                    03:94:0b:a7:a6:db:ec:1d:df:ff:23:74:08:9d:97:
++                    16:3f:a3:a4:7b:3e:1b:0e:96:59:25:03:a7:26:e2:
++                    88:a9:cf:79:cd:f7:04:56:b0:ab:79:32:6e:59:c1:
++                    32:30:54:eb:58:a8:cb:91:f0:42:a5:64:27:cb:d4:
++                    56:31:88:52:ad:cf:bd:7f:f0:06:64:1f:cc:27:b8:
++                    a3:8b:8c:f3:d8:29:1f:25:0b:f5:46:06:1b:ca:02:
++                    45:ad:7b:76:0a:9c:bf:bb:b9:ae:0d:16:ab:60:75:
++                    ae:06:3e:9c:7c:31:dc:92:2f:29:1a:e0:4b:0c:91:
++                    90:6c:e9:37:c5:90:d7:2a:d7:97:15:a3:80:8f:5d:
++                    7b:49:8f:54:30:d4:97:2c:1c:5b:37:b5:ab:69:30:
++                    68:43:d3:33:78:4b:02:60:f5:3c:44:80:a1:8f:e7:
++                    f0:0f:d1:5e:87:9e:46:cf:62:fc:f9:bf:0c:65:12:
++                    f1:93:c8:35:79:3f:c8:ec:ec:47:f5:ef:be:44:d5:
++                    ae:82:1e:2d:9a:9f:98:5a:67:65:e1:74:70:7c:cb:
++                    d3:c2:ce:0e:45:49:27:dc:e3:2d:d4:fb:48:0e:2f:
++                    9e:77:b8:14:46:c0:c4:36:ca:02:ae:6a:91:8c:da:
++                    2f:85
++                Exponent: 65537 (0x10001)
++        X509v3 extensions:
++            X509v3 Basic Constraints: critical
++                CA:FALSE
++            X509v3 Subject Key Identifier:
++                88:5A:55:C0:52:FF:61:CD:52:A3:35:0F:EA:5A:9C:24:38:22:F7:5C
++            X509v3 Key Usage:
++                Digital Signature, Non Repudiation, Key Encipherment
++            X509v3 Subject Alternative Name:
++                *************************************************************
++                WARNING: The values for DNS, email and URI are WRONG. OpenSSL
++                         doesn't print the text after a NULL byte.
++                *************************************************************
++                DNS:altnull.python.org, email:null@python.org, URI:http://null.python.org, IP Address:192.0.2.1, IP Address:2001:DB8:0:0:0:0:0:1
++    Signature Algorithm: sha1WithRSAEncryption
++         ac:4f:45:ef:7d:49:a8:21:70:8e:88:59:3e:d4:36:42:70:f5:
++         a3:bd:8b:d7:a8:d0:58:f6:31:4a:b1:a4:a6:dd:6f:d9:e8:44:
++         3c:b6:0a:71:d6:7f:b1:08:61:9d:60:ce:75:cf:77:0c:d2:37:
++         86:02:8d:5e:5d:f9:0f:71:b4:16:a8:c1:3d:23:1c:f1:11:b3:
++         56:6e:ca:d0:8d:34:94:e6:87:2a:99:f2:ae:ae:cc:c2:e8:86:
++         de:08:a8:7f:c5:05:fa:6f:81:a7:82:e6:d0:53:9d:34:f4:ac:
++         3e:40:fe:89:57:7a:29:a4:91:7e:0b:c6:51:31:e5:10:2f:a4:
++         60:76:cd:95:51:1a:be:8b:a1:b0:fd:ad:52:bd:d7:1b:87:60:
++         d2:31:c7:17:c4:18:4f:2d:08:25:a3:a7:4f:b7:92:ca:e2:f5:
++         25:f1:54:75:81:9d:b3:3d:61:a2:f7:da:ed:e1:c6:6f:2c:60:
++         1f:d8:6f:c5:92:05:ab:c9:09:62:49:a9:14:ad:55:11:cc:d6:
++         4a:19:94:99:97:37:1d:81:5f:8b:cf:a3:a8:96:44:51:08:3d:
++         0b:05:65:12:eb:b6:70:80:88:48:72:4f:c6:c2:da:cf:cd:8e:
++         5b:ba:97:2f:60:b4:96:56:49:5e:3a:43:76:63:04:be:2a:f6:
++         c1:ca:a9:94
++-----BEGIN CERTIFICATE-----
++MIIE2DCCA8CgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBxTELMAkGA1UEBhMCVVMx
++DzANBgNVBAgMBk9yZWdvbjESMBAGA1UEBwwJQmVhdmVydG9uMSMwIQYDVQQKDBpQ
++eXRob24gU29mdHdhcmUgRm91bmRhdGlvbjEgMB4GA1UECwwXUHl0aG9uIENvcmUg
++RGV2ZWxvcG1lbnQxJDAiBgNVBAMMG251bGwucHl0aG9uLm9yZwBleGFtcGxlLm9y
++ZzEkMCIGCSqGSIb3DQEJARYVcHl0aG9uLWRldkBweXRob24ub3JnMB4XDTEzMDgw
++NzEzMTE1MloXDTEzMDgwNzEzMTI1MlowgcUxCzAJBgNVBAYTAlVTMQ8wDQYDVQQI
++DAZPcmVnb24xEjAQBgNVBAcMCUJlYXZlcnRvbjEjMCEGA1UECgwaUHl0aG9uIFNv
++ZnR3YXJlIEZvdW5kYXRpb24xIDAeBgNVBAsMF1B5dGhvbiBDb3JlIERldmVsb3Bt
++ZW50MSQwIgYDVQQDDBtudWxsLnB5dGhvbi5vcmcAZXhhbXBsZS5vcmcxJDAiBgkq
++hkiG9w0BCQEWFXB5dGhvbi1kZXZAcHl0aG9uLm9yZzCCASIwDQYJKoZIhvcNAQEB
++BQADggEPADCCAQoCggEBALXq7cn7Rn1vO3aA3TrzA5QLp6bb7B3f/yN0CJ2XFj+j
++pHs+Gw6WWSUDpybiiKnPec33BFawq3kyblnBMjBU61ioy5HwQqVkJ8vUVjGIUq3P
++vX/wBmQfzCe4o4uM89gpHyUL9UYGG8oCRa17dgqcv7u5rg0Wq2B1rgY+nHwx3JIv
++KRrgSwyRkGzpN8WQ1yrXlxWjgI9de0mPVDDUlywcWze1q2kwaEPTM3hLAmD1PESA
++oY/n8A/RXoeeRs9i/Pm/DGUS8ZPINXk/yOzsR/XvvkTVroIeLZqfmFpnZeF0cHzL
++08LODkVJJ9zjLdT7SA4vnne4FEbAxDbKAq5qkYzaL4UCAwEAAaOB0DCBzTAMBgNV
++HRMBAf8EAjAAMB0GA1UdDgQWBBSIWlXAUv9hzVKjNQ/qWpwkOCL3XDALBgNVHQ8E
++BAMCBeAwgZAGA1UdEQSBiDCBhYIeYWx0bnVsbC5weXRob24ub3JnAGV4YW1wbGUu
++Y29tgSBudWxsQHB5dGhvbi5vcmcAdXNlckBleGFtcGxlLm9yZ4YpaHR0cDovL251
++bGwucHl0aG9uLm9yZwBodHRwOi8vZXhhbXBsZS5vcmeHBMAAAgGHECABDbgAAAAA
++AAAAAAAAAAEwDQYJKoZIhvcNAQEFBQADggEBAKxPRe99SaghcI6IWT7UNkJw9aO9
++i9eo0Fj2MUqxpKbdb9noRDy2CnHWf7EIYZ1gznXPdwzSN4YCjV5d+Q9xtBaowT0j
++HPERs1ZuytCNNJTmhyqZ8q6uzMLoht4IqH/FBfpvgaeC5tBTnTT0rD5A/olXeimk
++kX4LxlEx5RAvpGB2zZVRGr6LobD9rVK91xuHYNIxxxfEGE8tCCWjp0+3ksri9SXx
++VHWBnbM9YaL32u3hxm8sYB/Yb8WSBavJCWJJqRStVRHM1koZlJmXNx2BX4vPo6iW
++RFEIPQsFZRLrtnCAiEhyT8bC2s/Njlu6ly9gtJZWSV46Q3ZjBL4q9sHKqZQ=
++-----END CERTIFICATE-----
+diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
+--- a/Lib/test/test_ssl.py
++++ b/Lib/test/test_ssl.py
+@@ -25,6 +25,7 @@ ssl = test_support.import_module("ssl")
+ HOST = test_support.HOST
+ CERTFILE = None
+ SVN_PYTHON_ORG_ROOT_CERT = None
++NULLBYTECERT = None
+ 
+ def handle_error(prefix):
+     exc_format = ' '.join(traceback.format_exception(*sys.exc_info()))
+@@ -123,6 +124,27 @@ class BasicSocketTests(unittest.TestCase
+                           ('DNS', 'projects.forum.nokia.com'))
+                         )
+ 
++    def test_parse_cert_CVE_2013_4238(self):
++        p = ssl._ssl._test_decode_cert(NULLBYTECERT)
++        if test_support.verbose:
++            sys.stdout.write("\n" + pprint.pformat(p) + "\n")
++        subject = ((('countryName', 'US'),),
++                   (('stateOrProvinceName', 'Oregon'),),
++                   (('localityName', 'Beaverton'),),
++                   (('organizationName', 'Python Software Foundation'),),
++                   (('organizationalUnitName', 'Python Core Development'),),
++                   (('commonName', 'null.python.org\x00example.org'),),
++                   (('emailAddress', 'python-dev@python.org'),))
++        self.assertEqual(p['subject'], subject)
++        self.assertEqual(p['issuer'], subject)
++        self.assertEqual(p['subjectAltName'],
++                         (('DNS', 'altnull.python.org\x00example.com'),
++                         ('email', 'null@python.org\x00user@example.org'),
++                         ('URI', 'http://null.python.org\x00http://example.org'),
++                         ('IP Address', '192.0.2.1'),
++                         ('IP Address', '2001:DB8:0:0:0:0:0:1\n'))
++                        )
++
+     def test_DER_to_PEM(self):
+         with open(SVN_PYTHON_ORG_ROOT_CERT, 'r') as f:
+             pem = f.read()
+@@ -1360,7 +1382,7 @@ else:
+ 
+ 
+ def test_main(verbose=False):
+-    global CERTFILE, SVN_PYTHON_ORG_ROOT_CERT, NOKIACERT
++    global CERTFILE, SVN_PYTHON_ORG_ROOT_CERT, NOKIACERT, NULLBYTECERT
+     CERTFILE = os.path.join(os.path.dirname(__file__) or os.curdir,
+                             "keycert.pem")
+     SVN_PYTHON_ORG_ROOT_CERT = os.path.join(
+@@ -1368,10 +1390,13 @@ def test_main(verbose=False):
+         "https_svn_python_org_root.pem")
+     NOKIACERT = os.path.join(os.path.dirname(__file__) or os.curdir,
+                              "nokia.pem")
++    NULLBYTECERT = os.path.join(os.path.dirname(__file__) or os.curdir,
++                                "nullbytecert.pem")
+ 
+     if (not os.path.exists(CERTFILE) or
+         not os.path.exists(SVN_PYTHON_ORG_ROOT_CERT) or
+-        not os.path.exists(NOKIACERT)):
++        not os.path.exists(NOKIACERT) or
++        not os.path.exists(NULLBYTECERT)):
+         raise test_support.TestFailed("Can't read certificate files!")
+ 
+     tests = [BasicTests, BasicSocketTests]
+diff --git a/Modules/_ssl.c b/Modules/_ssl.c
+--- a/Modules/_ssl.c
++++ b/Modules/_ssl.c
+@@ -738,13 +738,16 @@ static PyObject *
+                                                   ext->value->length));
+ 
+         for(j = 0; j < sk_GENERAL_NAME_num(names); j++) {
+-
+             /* get a rendering of each name in the set of names */
++            int gntype;
++            ASN1_STRING *as = NULL;
+ 
+             name = sk_GENERAL_NAME_value(names, j);
+-            if (name->type == GEN_DIRNAME) {
+-
+-                /* we special-case DirName as a tuple of tuples of attributes */
++            gntype = name-> type;
++            switch (gntype) {
++            case GEN_DIRNAME:
++                /* we special-case DirName as a tuple of
++                   tuples of attributes */
+ 
+                 t = PyTuple_New(2);
+                 if (t == NULL) {
+@@ -764,11 +767,61 @@ static PyObject *
+                     goto fail;
+                 }
+                 PyTuple_SET_ITEM(t, 1, v);
++                break;
+ 
+-            } else {
++            case GEN_EMAIL:
++            case GEN_DNS:
++            case GEN_URI:
++                /* GENERAL_NAME_print() doesn't handle NULL bytes in ASN1_string
++                   correctly, CVE-2013-4238 */
++                t = PyTuple_New(2);
++                if (t == NULL)
++                    goto fail;
++                switch (gntype) {
++                case GEN_EMAIL:
++                    v = PyString_FromString("email");
++                    as = name->d.rfc822Name;
++                    break;
++                case GEN_DNS:
++                    v = PyString_FromString("DNS");
++                    as = name->d.dNSName;
++                    break;
++                case GEN_URI:
++                    v = PyString_FromString("URI");
++                    as = name->d.uniformResourceIdentifier;
++                    break;
++                }
++                if (v == NULL) {
++                    Py_DECREF(t);
++                    goto fail;
++                }
++                PyTuple_SET_ITEM(t, 0, v);
++                v = PyString_FromStringAndSize((char *)ASN1_STRING_data(as),
++                                               ASN1_STRING_length(as));
++                if (v == NULL) {
++                    Py_DECREF(t);
++                    goto fail;
++                }
++                PyTuple_SET_ITEM(t, 1, v);
++                break;
+ 
++            default:
+                 /* for everything else, we use the OpenSSL print form */
+-
++                switch (gntype) {
++                    /* check for new general name type */
++                    case GEN_OTHERNAME:
++                    case GEN_X400:
++                    case GEN_EDIPARTY:
++                    case GEN_IPADD:
++                    case GEN_RID:
++                        break;
++                    default:
++                        if (PyErr_Warn(PyExc_RuntimeWarning,
++                                       "Unknown general name type") == -1) {
++                            goto fail;
++                        }
++                        break;
++                }
+                 (void) BIO_reset(biobuf);
+                 GENERAL_NAME_print(biobuf, name);
+                 len = BIO_gets(biobuf, buf, sizeof(buf)-1);
+@@ -794,6 +847,7 @@ static PyObject *
+                     goto fail;
+                 }
+                 PyTuple_SET_ITEM(t, 1, v);
++                break;
+             }
+ 
+             /* and add that rendering to the list */
+
diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD
index e6ff9a5f2..b97721f09 100644
--- a/extra/qemu/PKGBUILD
+++ b/extra/qemu/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 191616 2013-07-27 20:19:26Z tpowa $
+# $Id: PKGBUILD 195926 2013-10-05 14:25:32Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=('qemu' 'libcacard')
-pkgver=1.5.2
-pkgrel=1
+pkgver=1.6.0
+pkgrel=4
 arch=('i686' 'x86_64')
 license=('GPL2' 'LGPL2.1')
 url="http://wiki.qemu.org/Index.html"
@@ -20,7 +20,7 @@ build ()
   ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list='pa alsa sdl' \
               --python=/usr/bin/python2 --smbd=/usr/bin/smbd \
               --enable-docs --enable-mixemu --libexecdir=/usr/lib/qemu \
-              --disable-gtk --enable-linux-aio --enable-seccomp
+              --disable-gtk --enable-linux-aio --enable-seccomp --localstatedir=/var
               make
 }
 
@@ -33,8 +33,12 @@ package_qemu() {
   backup=('etc/qemu/target-x86_64.conf')
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" libexecdir="/usr/lib/qemu" install
+  # provided by seabios package
   rm "${pkgdir}/usr/share/qemu/bios.bin"
-
+  rm "${pkgdir}/usr/share/qemu/acpi-dsdt.aml"
+  rm "${pkgdir}/usr/share/qemu/q35-acpi-dsdt.aml"
+  # remove conflicting /var/run directory
+  rm -r "${pkgdir}/var"
   install -D -m644 "${srcdir}/65-kvm.rules" \
                    "${pkgdir}/usr/lib/udev/rules.d/65-kvm.rules"
   # bridge_helper needs suid
@@ -65,6 +69,5 @@ package_libcacard() {
  cp -a ${srcdir}/qemu-${pkgver}/libcacard.pc ${pkgdir}/usr/lib/pkgconfig/
  cp -a ${srcdir}/qemu-${pkgver}/.libs/vscclient ${pkgdir}/usr/bin/
 }
-
-md5sums=('04b94189ba587b3280713ded3b7f959a'
+md5sums=('f3f39308472d629aca57a255a0c91ba9'
          '9d6de26867a05c306157e3d3c612b28a')
diff --git a/extra/quadrapassel/PKGBUILD b/extra/quadrapassel/PKGBUILD
index 777734f48..4b1f65e86 100644
--- a/extra/quadrapassel/PKGBUILD
+++ b/extra/quadrapassel/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 191635 2013-07-28 18:12:42Z heftig $
+# $Id: PKGBUILD 196132 2013-10-07 11:53:21Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=quadrapassel
-pkgver=3.8.2
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Fit falling blocks together (Tetris-like game for GNOME)"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,8 +16,8 @@ options=('!emptydirs' '!libtool')
 install=quadrapassel.install
 url="https://live.gnome.org/Quadrapassel"
 groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('a2e861f65560345f697665434698e86a3df874ba2721ba1674dce26dcb0a6229')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('02e035d5486f023b2fee410dc909034163fd61369ee77cdfb0f07ac3069c46fa')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/raptor/PKGBUILD b/extra/raptor/PKGBUILD
index b88c703ae..36d55febc 100644
--- a/extra/raptor/PKGBUILD
+++ b/extra/raptor/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 180809 2013-03-26 11:49:40Z foutrelis $
+# $Id: PKGBUILD 194462 2013-09-16 16:36:19Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: eric <eric@archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=raptor
-pkgver=2.0.9
+pkgver=2.0.10
 pkgrel=2
 pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples"
 arch=('i686' 'x86_64' 'mips64el')
@@ -33,4 +33,4 @@ package() {
   cd "${srcdir}"/raptor2-${pkgver}
   make prefix="${pkgdir}"/usr install
 }
-md5sums=('4ceb9316488b0ea01acf011023cf7fff')
+md5sums=('d9b0314eb835551adb48af037dcfd46e')
diff --git a/extra/refind-efi/PKGBUILD b/extra/refind-efi/PKGBUILD
index 1b919070b..aef4fa34c 100644
--- a/extra/refind-efi/PKGBUILD
+++ b/extra/refind-efi/PKGBUILD
@@ -1,23 +1,24 @@
-# $Id: PKGBUILD 193534 2013-08-22 15:56:50Z tpowa $
+# $Id: PKGBUILD 194269 2013-09-12 15:17:40Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: Keshav Padram <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
+# Contributor: Keshav Padram Amburay <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
 
 #######
 _TIANOCORE_SVN_URL="https://svn.code.sf.net/p/edk2/code/branches/UDK2010.SR1"
 # BaseTools MdePkg MdeModulePkg IntelFrameworkPkg IntelFrameworkModulePkg
 _TIANO_DIR_="tianocore-udk-svn"
+_TIANO_SVN_REV_="14641"
 #######
 
 #######
 _TIANOCORE_PKG="Mde"
 _TIANOCORE_TARGET="RELEASE"
 _UDK_TARGET="${_TIANOCORE_PKG}Pkg/${_TIANOCORE_PKG}Pkg.dsc"
-_COMPILER="GCC46"
+_COMPILER="GCC47"
 #######
 
 pkgname="refind-efi"
-pkgver="0.7.3"
-pkgrel="2"
+pkgver="0.7.4"
+pkgrel="1"
 pkgdesc="Rod Smith's fork of rEFIt UEFI Boot Manager - built with Tianocore UDK libs"
 url="http://www.rodsbooks.com/refind/index.html"
 arch=('x86_64' 'i686')
@@ -36,10 +37,10 @@ source=("http://downloads.sourceforge.net/refind/refind-src-${pkgver}.zip"
         'refind_linux.conf')
 
 for _DIR_ in BaseTools MdePkg MdeModulePkg IntelFrameworkPkg IntelFrameworkModulePkg ; do
-	source+=("${_TIANO_DIR_}/${_DIR_}::svn+${_TIANOCORE_SVN_URL}/${_DIR_}")
+	source+=("${_TIANO_DIR_}_${_DIR_}::svn+${_TIANOCORE_SVN_URL}/${_DIR_}#revision=${_TIANO_SVN_REV_}")
 done
 
-sha1sums=('5e4b15202efc658e58e68e64af8a1b2c84aab175'
+sha1sums=('410d2694c5005a5312d48414df8acf8291da42a9'
           '3d53eb615c3363d45feb95b9bfbf1d5491bf1c24'
           'SKIP'
           'SKIP'
@@ -70,7 +71,7 @@ _prepare_tianocore_sources() {
 	mkdir -p "${_UDK_DIR}/"
 	
 	for _DIR_ in BaseTools MdePkg MdeModulePkg IntelFrameworkPkg IntelFrameworkModulePkg ; do
-		mv "${srcdir}/${_DIR_}" "${_UDK_DIR}/${_DIR_}"
+		mv "${srcdir}/${_TIANO_DIR_}_${_DIR_}" "${_UDK_DIR}/${_DIR_}"
 	done
 	
 	cd "${_UDK_DIR}/"
@@ -98,6 +99,10 @@ _prepare_tianocore_sources() {
 	sed 's|DEFINE GCC_ALL_CC_FLAGS            = -g |DEFINE GCC_ALL_CC_FLAGS            = -Os -mabi=ms |g' -i "${EDK_TOOLS_PATH}/Conf/tools_def.template" || true
 	sed 's|DEFINE GCC44_ALL_CC_FLAGS            = -g |DEFINE GCC44_ALL_CC_FLAGS            = -Os -mabi=ms |g' -i "${EDK_TOOLS_PATH}/Conf/tools_def.template" || true
 	
+	msg "Fix GenFw: ERROR 3000: Invalid, refind_x64.dll bad symbol definition"
+	## http://www.mail-archive.com/edk2-devel@lists.sourceforge.net/msg03625.html
+	sed -e 's|_OBJCOPY_FLAGS      =|_OBJCOPY_FLAGS      = -R .eh_frame|g' -i "${EDK_TOOLS_PATH}/Conf/tools_def.template" || true
+	
 	msg "Fix UDK Target Platform"
 	sed "s|ACTIVE_PLATFORM       = Nt32Pkg/Nt32Pkg.dsc|ACTIVE_PLATFORM       = ${_UDK_TARGET}|g" -i "${EDK_TOOLS_PATH}/Conf/target.template" || true
 	sed "s|TARGET                = DEBUG|TARGET                = ${_TIANOCORE_TARGET}|g" -i "${EDK_TOOLS_PATH}/Conf/target.template" || true
@@ -120,6 +125,11 @@ _prepare_refind_sources() {
 	sed "s|EDK2BASE = /usr/local/UDK2010/MyWorkSpace|EDK2BASE = ${_UDK_DIR}|g" -i "${srcdir}/refind-${pkgver}/filesystems/Make.tiano" || true
 	sed "s|EDK2BASE = /usr/local/UDK2010/MyWorkSpace|EDK2BASE = ${_UDK_DIR}|g" -i "${srcdir}/refind-${pkgver}/gptsync/Make.tiano" || true
 	
+	msg "Fix GenFw: ERROR 3000: Invalid, refind_x64.dll bad symbol definition"
+	sed -e 's|--strip-unneeded|--strip-unneeded -R .eh_frame|g' -i "${srcdir}/refind-${pkgver}/refind/Make.tiano" || true
+	sed -e 's|--strip-unneeded|--strip-unneeded -R .eh_frame|g' -i "${srcdir}/refind-${pkgver}/filesystems/Make.tiano"
+	sed -e 's|--strip-unneeded|--strip-unneeded -R .eh_frame|g' -i "${srcdir}/refind-${pkgver}/gptsync/Make.tiano" || true
+	
 }
 
 prepare() {
@@ -242,10 +252,3 @@ package() {
 	sed 's|^ThisScript=.*|ThisScript="/usr/bin/refind-install"|g' -i "${pkgdir}/usr/bin/refind-install"
 	
 }
-sha1sums=('baac40c10b26b337c85248aa8e2b61ab4f06f73d'
-          '3d53eb615c3363d45feb95b9bfbf1d5491bf1c24'
-          'SKIP'
-          'SKIP'
-          'SKIP'
-          'SKIP'
-          'SKIP')
diff --git a/extra/rhythmbox/PKGBUILD b/extra/rhythmbox/PKGBUILD
index 13a5ea30a..5e7d8526a 100644
--- a/extra/rhythmbox/PKGBUILD
+++ b/extra/rhythmbox/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 185168 2013-05-11 16:16:33Z tomegun $
+# $Id: PKGBUILD 196133 2013-10-07 11:53:23Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=rhythmbox
-pkgver=2.99.1
+pkgver=3.0
 pkgrel=2
 pkgdesc="An iTunes-like music playback and management application"
 arch=('i686' 'x86_64' 'mips64el')
 license=(GPL)
 url="http://www.rhythmbox.org"
-depends=(dconf desktop-file-utils gst-plugins-base gst-plugins-good libsoup json-glib libnotify libpeas media-player-info python2-gobject totem-plparser tdb webkitgtk3)
+depends=(dconf desktop-file-utils gst-plugins-base gst-plugins-good libsoup json-glib libnotify libpeas media-player-info totem-plparser tdb webkitgtk3 python-gobject)
 makedepends=(itstool intltool brasero gobject-introspection vala grilo libdmapsharing lirc-utils libgpod libmtp)
 optdepends=('gst-plugins-ugly: Extra media codecs'
             'gst-plugins-bad: Extra media codecs'
@@ -24,11 +24,11 @@ optdepends=('gst-plugins-ugly: Extra media codecs'
 options=('!libtool' '!emptydirs')
 install=rhythmbox.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('ed30bb534a789e2b50f953e33eee0bb09f389fe813d433a87d504d07be5f7777')
+sha256sums=('bf6f35c1a46867d16e45969f97f01630d936bfa92baf940c442f3a19fb6820e4')
 
 build() {
   cd "$pkgname-$pkgver"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
+  ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/rhythmbox \
       --localstatedir=/var --disable-static \
       --enable-daap --enable-python --enable-vala
diff --git a/extra/rsync/PKGBUILD b/extra/rsync/PKGBUILD
index 5cc11d096..1543daf7a 100644
--- a/extra/rsync/PKGBUILD
+++ b/extra/rsync/PKGBUILD
@@ -1,18 +1,20 @@
-# $Id: PKGBUILD 185234 2013-05-12 10:36:09Z pierre $
+# $Id: PKGBUILD 195476 2013-09-30 19:07:27Z pierre $
 
 pkgname=rsync
-pkgver=3.0.9
-pkgrel=6
+pkgver=3.1.0
+pkgrel=1
 pkgdesc="A file transfer program to keep remote files in sync"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://samba.anu.edu.au/rsync/"
 license=('GPL3')
-depends=('perl')
+depends=('perl' 'popt')
 backup=('etc/rsyncd.conf' 'etc/xinetd.d/rsync')
 source=("http://rsync.samba.org/ftp/rsync/$pkgname-$pkgver.tar.gz"
+        "http://rsync.samba.org/ftp/rsync/$pkgname-$pkgver.tar.gz.asc"
         'rsyncd.conf' 'rsync.xinetd' 'rsyncd.service'
         'rsyncd.socket' 'rsyncd@.service')
-md5sums=('5ee72266fe2c1822333c407e1761b92b'
+md5sums=('3be148772a33224771a8d4d2a028b132'
+         'SKIP'
          'bce64d122a8e0f86872a4a21a03bc7f3'
          'ea3e9277dc908bc51f9eddc0f6b935c1'
          '084140868d38cf3e937a2db716d47c0f'
@@ -21,7 +23,10 @@ md5sums=('5ee72266fe2c1822333c407e1761b92b'
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
-	./configure --prefix=/usr --with-included-popt
+	./configure --prefix=/usr \
+		--with-included-popt=no \
+		--with-included-zlib=no \
+		--disable-debug
 	make
 }
 
diff --git a/extra/rtkit/0001-SECURITY-Pass-uid-of-caller-to-polkit.patch b/extra/rtkit/0001-SECURITY-Pass-uid-of-caller-to-polkit.patch
new file mode 100644
index 000000000..92e54b950
--- /dev/null
+++ b/extra/rtkit/0001-SECURITY-Pass-uid-of-caller-to-polkit.patch
@@ -0,0 +1,48 @@
+From f44c5776b25ca2abd7569fb8532c6aede9b0c6b0 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Thu, 22 Aug 2013 16:05:22 -0400
+Subject: [PATCH] [SECURITY] Pass uid of caller to polkit
+
+Otherwise, we force polkit to look up the uid itself in /proc, which
+is racy if they execve() a setuid binary.
+---
+ rtkit-daemon.c |   11 ++++++++++-
+ 1 files changed, 10 insertions(+), 1 deletions(-)
+
+diff --git a/rtkit-daemon.c b/rtkit-daemon.c
+index 2ebe673..3ecc1f7 100644
+--- a/rtkit-daemon.c
++++ b/rtkit-daemon.c
+@@ -1170,12 +1170,14 @@ static int verify_polkit(DBusConnection *c, struct rtkit_user *u, struct process
+         DBusMessage *m = NULL, *r = NULL;
+         const char *unix_process = "unix-process";
+         const char *pid = "pid";
++        const char *uid = "uid";
+         const char *start_time = "start-time";
+         const char *cancel_id = "";
+         uint32_t flags = 0;
+         uint32_t pid_u32 = p->pid;
+-        uint64_t start_time_u64 = p->starttime;
++        uint32_t uid_u32 = (uint32_t)u->uid;
+         DBusMessageIter iter_msg, iter_struct, iter_array, iter_dict, iter_variant;
++        uint64_t start_time_u64 = p->starttime;
+         int ret;
+         dbus_bool_t authorized = FALSE;
+ 
+@@ -1206,6 +1208,13 @@ static int verify_polkit(DBusConnection *c, struct rtkit_user *u, struct process
+         assert_se(dbus_message_iter_close_container(&iter_dict, &iter_variant));
+         assert_se(dbus_message_iter_close_container(&iter_array, &iter_dict));
+ 
++        assert_se(dbus_message_iter_open_container(&iter_array, DBUS_TYPE_DICT_ENTRY, NULL, &iter_dict));
++        assert_se(dbus_message_iter_append_basic(&iter_dict, DBUS_TYPE_STRING, &uid));
++        assert_se(dbus_message_iter_open_container(&iter_dict, DBUS_TYPE_VARIANT, "u", &iter_variant));
++        assert_se(dbus_message_iter_append_basic(&iter_variant, DBUS_TYPE_UINT32, &uid_u32));
++        assert_se(dbus_message_iter_close_container(&iter_dict, &iter_variant));
++        assert_se(dbus_message_iter_close_container(&iter_array, &iter_dict));
++
+         assert_se(dbus_message_iter_close_container(&iter_struct, &iter_array));
+         assert_se(dbus_message_iter_close_container(&iter_msg, &iter_struct));
+ 
+-- 
+1.7.1
+
diff --git a/extra/rtkit/PKGBUILD b/extra/rtkit/PKGBUILD
index b0aeb467b..d81cbd75b 100644
--- a/extra/rtkit/PKGBUILD
+++ b/extra/rtkit/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 185307 2013-05-13 06:17:53Z heftig $
+# $Id: PKGBUILD 195870 2013-10-02 22:42:11Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
 
 pkgname=rtkit
 pkgver=0.11
-pkgrel=2
+pkgrel=4
 pkgdesc="Realtime Policy and Watchdog Daemon"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://git.0pointer.de/?p=rtkit.git"
@@ -12,13 +12,18 @@ license=(GPL 'custom:BSD')
 depends=(dbus polkit systemd)
 install=rtkit.install
 source=(http://0pointer.de/public/$pkgname-$pkgver.tar.xz
-        libsystemd.patch)
+        libsystemd.patch systemd205.patch
+        0001-SECURITY-Pass-uid-of-caller-to-polkit.patch)
 md5sums=('a96c33b9827de66033d2311f82d79a5d'
-         '35089c0a284005f4abcf45168415857e')
+         '35089c0a284005f4abcf45168415857e'
+         '95195a70551057aca833da6bdbf2e35b'
+         '70df212cba2a6366ff960b60d55858d3')
 
 prepare() {
   cd $pkgname-$pkgver
   patch -Np1 -i ../libsystemd.patch
+  patch -Np1 -i ../systemd205.patch
+  patch -Np1 -i ../0001-SECURITY-Pass-uid-of-caller-to-polkit.patch
   autoreconf -fi
 }
 
diff --git a/extra/rtkit/systemd205.patch b/extra/rtkit/systemd205.patch
new file mode 100644
index 000000000..3f17b2ddb
--- /dev/null
+++ b/extra/rtkit/systemd205.patch
@@ -0,0 +1,16 @@
+diff -u -r rtkit-0.11/rtkit-daemon.service.in rtkit-0.11-sd205/rtkit-daemon.service.in
+--- rtkit-0.11/rtkit-daemon.service.in	2012-05-15 15:25:40.000000000 +0200
++++ rtkit-0.11-sd205/rtkit-daemon.service.in	2013-07-25 10:27:37.790884664 +0200
+@@ -24,12 +24,7 @@
+ BusName=org.freedesktop.RealtimeKit1
+ NotifyAccess=main
+ CapabilityBoundingSet=CAP_SYS_NICE CAP_DAC_READ_SEARCH CAP_SYS_PTRACE CAP_SYS_CHROOT CAP_SETGID CAP_SETUID
+-PrivateTmp=yes
+ PrivateNetwork=yes
+ 
+-# Work around the fact that the Linux currently doesn't assign any RT
+-# budget to CPU control groups that have none configured explicitly
+-ControlGroup=cpu:/
+-
+ [Install]
+ WantedBy=graphical.target
diff --git a/extra/ruby/0001-remove-db-support.patch b/extra/ruby/0001-remove-db-support.patch
new file mode 100644
index 000000000..bdd7e5871
--- /dev/null
+++ b/extra/ruby/0001-remove-db-support.patch
@@ -0,0 +1,35 @@
+From b653d6ffe9ec25c203fc0cbbbdd72e9b42546283 Mon Sep 17 00:00:00 2001
+From: Thomas Dziedzic <gostrc@gmail.com>
+Date: Sat, 10 Aug 2013 10:50:16 -0700
+Subject: [PATCH] remove db support
+
+---
+ ext/dbm/extconf.rb | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/ext/dbm/extconf.rb b/ext/dbm/extconf.rb
+index 32a9446..2412404 100644
+--- a/ext/dbm/extconf.rb
++++ b/ext/dbm/extconf.rb
+@@ -5,17 +5,11 @@ dir_config("dbm")
+ if dblib = with_config("dbm-type", nil)
+   dblib = dblib.split(/[ ,]+/)
+ else
+-  dblib = %w(libc db db2 db1 db5 db4 db3 gdbm_compat gdbm qdbm)
++  dblib = %w(libc gdbm_compat gdbm qdbm)
+ end
+ 
+ headers = {
+   "libc" => ["ndbm.h"], # 4.3BSD original ndbm, Berkeley DB 1 in 4.4BSD libc.
+-  "db" => ["db.h"],
+-  "db1" => ["db1/ndbm.h", "db1.h", "ndbm.h"],
+-  "db2" => ["db2/db.h", "db2.h", "db.h"],
+-  "db3" => ["db3/db.h", "db3.h", "db.h"],
+-  "db4" => ["db4/db.h", "db4.h", "db.h"],
+-  "db5" => ["db5/db.h", "db5.h", "db.h"],
+   "gdbm_compat" => ["gdbm-ndbm.h", "gdbm/ndbm.h", "ndbm.h"], # GDBM since 1.8.1
+   "gdbm" => ["gdbm-ndbm.h", "gdbm/ndbm.h", "ndbm.h"], # GDBM until 1.8.0
+   "qdbm" => ["qdbm/relic.h", "relic.h"],
+-- 
+1.8.3.4
+
diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD
index e28535354..2fbb4b46b 100644
--- a/extra/ruby/PKGBUILD
+++ b/extra/ruby/PKGBUILD
@@ -5,20 +5,25 @@
 
 pkgname=('ruby' 'ruby-docs')
 pkgver=2.0.0_p247
-pkgrel=1
+pkgrel=3
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.ruby-lang.org/en/'
 license=('BSD' 'custom')
-makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml')
+makedepends=('gdbm' 'openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml')
 options=('!emptydirs' '!makeflags')
 source=("ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2"
-        'gemrc')
+        'gemrc'
+        '0001-remove-db-support.patch')
 md5sums=('60913f3eec0c4071f44df42600be2604'
-         '6fb8e7a09955e0f64be3158fb4a27e7a')
+         '6fb8e7a09955e0f64be3158fb4a27e7a'
+         'b93ff50214a3da26525244cf37b71a8f')
 
 build() {
   cd ruby-${pkgver//_/-}
 
+  # use gdbm because db v6 changed the license to AGPL
+  patch -Np1 -i ${srcdir}/0001-remove-db-support.patch
+
   PKG_CONFIG=/usr/bin/pkg-config ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
@@ -37,7 +42,7 @@ check() {
 
 package_ruby() {
   pkgdesc='An object-oriented language for quick and easy programming'
-  depends=('openssl' 'libffi' 'libyaml')
+  depends=('gdbm' 'openssl' 'libffi' 'libyaml')
   optdepends=('tk: for Ruby/TK'
               'ruby-docs: Ruby documentation')
   provides=('rubygems' 'rake')
diff --git a/extra/rygel/PKGBUILD b/extra/rygel/PKGBUILD
index 244d9dca6..1f544ce8b 100644
--- a/extra/rygel/PKGBUILD
+++ b/extra/rygel/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 192270 2013-08-09 12:52:33Z heftig $
+# $Id: PKGBUILD 196134 2013-10-07 11:53:25Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=rygel
-pkgver=0.18.4
+pkgver=0.20.0
 pkgrel=1
 pkgdesc="UPnP AV MediaServer and MediaRenderer that allows you to easily share audio, video and pictures, and control of media player on your home network"
 arch=('i686' 'x86_64' 'mips64el')
@@ -22,7 +22,7 @@ options=('!libtool')
 install=rygel.install
 groups=('gnome-extra')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('f63f3f1cd1456b7e3b9232ec81ad481d220530a734ed8a09eb046d30c34d3ebe')
+sha256sums=('f695bae2c20b911393f7abf265c18f3c5a5c42fe4223fc9150ab9007558363fe')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/sane/1.0.23-hp2400c.patch b/extra/sane/1.0.23-hp2400c.patch
deleted file mode 100644
index 8bfd29b66..000000000
--- a/extra/sane/1.0.23-hp2400c.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 9a8b640d8da2190ff1695169bfa45ce633b5e8c2 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?St=C3=A9phane=20Voltz?= <stef.dev@free.fr>
-Date: Mon, 3 Jun 2013 06:33:08 +0200
-Subject: [PATCH] bug 314293 fix
-
-- don't use non-existent end of records
----
- ChangeLog               |    3 +++
- backend/genesys_gl646.c |   14 +++++++-------
- 2 files changed, 10 insertions(+), 7 deletions(-)
-
-diff --git a/backend/genesys_gl646.c b/backend/genesys_gl646.c
-index c6a5af5..2d5cddc 100644
---- a/backend/genesys_gl646.c
-+++ b/backend/genesys_gl646.c
-@@ -550,7 +550,7 @@ get_lowest_resolution (int sensor, SANE_Bool color)
-   i = 0;
-   dpi = 9600;
-   nb = sizeof (sensor_master) / sizeof (Sensor_Master);
--  while (sensor_master[i].sensor != -1 && i < nb)
-+  while (i < nb)
-     {
-       /* computes distance and keep mode if it is closer than previous */
-       if (sensor == sensor_master[i].sensor
-@@ -584,7 +584,7 @@ get_closest_resolution (int sensor, int required, SANE_Bool color)
-   dpi = 0;
-   dist = 9600;
-   nb = sizeof (sensor_master) / sizeof (Sensor_Master);
--  while (sensor_master[i].sensor != -1 && i < nb)
-+  while (i < nb)
-     {
-       /* exit on perfect match */
-       if (sensor == sensor_master[i].sensor
-@@ -627,7 +627,7 @@ is_half_ccd (int sensor, int required, SANE_Bool color)
- 
-   i = 0;
-   nb = sizeof (sensor_master) / sizeof (Sensor_Master);
--  while (sensor_master[i].sensor != -1 && i < nb)
-+  while (i < nb)
-     {
-       /* exit on perfect match */
-       if (sensor == sensor_master[i].sensor
-@@ -658,7 +658,7 @@ get_cksel (int sensor, int required, SANE_Bool color)
- 
-   i = 0;
-   nb = sizeof (sensor_master) / sizeof (Sensor_Master);
--  while (sensor_master[i].sensor != -1 && i < nb)
-+  while (i < nb)
-     {
-       /* exit on perfect match */
-       if (sensor == sensor_master[i].sensor
-@@ -746,7 +746,7 @@ gl646_setup_registers (Genesys_Device * dev,
-    * sensor mode setting */
-   i = 0;
-   nb = sizeof (sensor_master) / sizeof (Sensor_Master);
--  while (sensor_master[i].sensor != -1 && i < nb)
-+  while (i < nb)
-     {
-       if (dev->model->ccd_type == sensor_master[i].sensor
- 	  && sensor_master[i].dpi == xresolution
-@@ -768,7 +768,7 @@ gl646_setup_registers (Genesys_Device * dev,
-    * motor mode setting */
-   i = 0;
-   nb = sizeof (motor_master) / sizeof (Motor_Master);
--  while (motor_master[i].motor != -1 && i < nb)
-+  while (i < nb)
-     {
-       if (dev->model->motor_type == motor_master[i].motor
- 	  && motor_master[i].dpi == resolution
-@@ -789,7 +789,7 @@ gl646_setup_registers (Genesys_Device * dev,
-   /* now we can search for the specific sensor settings */
-   i = 0;
-   nb = sizeof (sensor_settings) / sizeof (Sensor_Settings);
--  while (sensor_settings[i].sensor != -1 && i < nb)
-+  while (i < nb)
-     {
-       if (sensor->sensor == sensor_settings[i].sensor
- 	  && sensor->cksel == sensor_settings[i].cksel)
--- 
-1.7.2.5
-
diff --git a/extra/sane/PKGBUILD b/extra/sane/PKGBUILD
index 82f211b7b..571a56270 100644
--- a/extra/sane/PKGBUILD
+++ b/extra/sane/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 187017 2013-06-03 10:25:11Z tpowa $
+# $Id: PKGBUILD 195946 2013-10-06 06:58:15Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Simo L. <neotuli@yahoo.com>
 # Contributor: eric <eric@archlinux.org>
 
 pkgname=sane
-pkgver=1.0.23
-pkgrel=7
+pkgver=1.0.24
+pkgrel=2
 pkgdesc="Scanner Access Now Easy"
 url="http://www.sane-project.org/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,17 +18,11 @@ source=(ftp://ftp.archlinux.org/other/sane/$pkgname-backends-$pkgver.tar.gz
         'sane.xinetd'
         'saned.socket'
         'saned.service'
-        'kodakaio.c.patch'
-        'network.patch'
-        '1.0.23-hp2400c.patch')
+        'network.patch')
 options=(!libtool)
 
 prepare() {
   cd "${srcdir}/${pkgname}-backends-${pkgver}"
-   # fix FS#35549
-   patch -Np1 -i ${srcdir}/1.0.23-hp2400c.patch
-   # fix FS#33657
-   patch -Np0 -i ${srcdir}/kodakaio.c.patch
    # fix http://vasks.debian.org/tracker/?func=detail&atid=410366&aid=313760&group_id=30186
    patch -Np1 -i ${srcdir}/network.patch
 }
@@ -55,9 +49,9 @@ package () {
   echo "#hpaio" >> "${pkgdir}/etc/sane.d/dll.conf"
   # install udev files
   install -D -m0644 tools/udev/libsane.rules \
-    "${pkgdir}/usr/lib/udev/rules.d/53-sane.rules"
+    "${pkgdir}/usr/lib/udev/rules.d/49-sane.rules"
   # fix udev rules
-  sed -i 's|NAME="%k", ||g' "${pkgdir}/usr/lib/udev/rules.d/53-sane.rules"
+  sed -i 's|NAME="%k", ||g' "${pkgdir}/usr/lib/udev/rules.d/49-sane.rules"
   
   # install xinetd file
   install -D -m644 "${srcdir}/sane.xinetd" "${pkgdir}/etc/xinetd.d/sane"
@@ -71,10 +65,8 @@ package () {
   install -D -m644 ${srcdir}/saned.service \
       "${pkgdir}/usr/lib/systemd/system/saned@.service"
 }
-md5sums=('e226a89c54173efea80e91e9a5eb6573'
+md5sums=('1ca68e536cd7c1852322822f5f6ac3a4'
          'bc2c8b4f7b3012c8936c7da21f60e2ac'
          'e57e9e15528f47f5f1b3f1411135ed5d'
          '3f9fe36b0c4ff0b01b53b1cffa5d9700'
-         'e65dbefb7c3d69955fb6eb3ace14aa12'
-         '44e77692c52db15b0f530a1d9a8e1296'
-         '0c8bfabcaa499c4a2583aa2fe53d1686')
+         '44e77692c52db15b0f530a1d9a8e1296')
diff --git a/extra/sane/kodakaio.c.patch b/extra/sane/kodakaio.c.patch
deleted file mode 100644
index 95cb1ee9a..000000000
--- a/extra/sane/kodakaio.c.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- backend/kodakaio.c.bad	2013-01-31 20:42:10.627296894 +0100
-+++ backend/kodakaio.c	2013-01-31 20:42:46.040397213 +0100
-@@ -2197,7 +2197,7 @@
- 
- 	reply = cupsGetDevices(CUPS_HTTP_DEFAULT, CUPS_TIMEOUT_DEFAULT, 
- 		"dnssd", CUPS_EXCLUDE_NONE, ProcessDevice, Dummy);
--	if(reply != IPP_OK) printf("Failed cupsGetDevices\n");
-+	if(reply != IPP_OK) DBG(1, "Failed cupsGetDevices\n");
- 
- 	return 0;
- }
diff --git a/community/seahorse-nautilus/PKGBUILD b/extra/seahorse-nautilus/PKGBUILD
index 6f6fc16c1..c5cf70f1a 100644
--- a/community/seahorse-nautilus/PKGBUILD
+++ b/extra/seahorse-nautilus/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 89362 2013-04-28 20:39:50Z bgyorgy $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# $Id: PKGBUILD 196136 2013-10-07 11:53:28Z jgc $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=seahorse-nautilus
-pkgver=3.8.0
-pkgrel=2
+pkgver=3.10.0
+pkgrel=1
 pkgdesc="PGP encryption and signing for nautilus"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://git.gnome.org/browse/seahorse-nautilus/"
@@ -12,17 +13,12 @@ depends=('libcryptui' 'gcr' 'nautilus')
 makedepends=('intltool')
 options=('!libtool')
 install=$pkgname.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        glib236.patch)
-sha256sums=('8173ef08a700ff254fb5637a7f2138ba7625b19ed2102a82fd69f1ecb8072863'
-            '0cefa14a45784c82871815e9bdcebbb96dea50a8e43316475e6a36d5dc47ade5')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('d54c5fbc2bade03296d39999f8412708cfa87e82bda3c5af8e0b8ad86b2fadf3')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # Fix compatibility with glib 2.36
-  patch -Np1 -i "$srcdir/glib236.patch"
-
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
               --disable-static --disable-schemas-compile
   make
diff --git a/community/seahorse-nautilus/seahorse-nautilus.install b/extra/seahorse-nautilus/seahorse-nautilus.install
index 21f12fbda..21f12fbda 100644
--- a/community/seahorse-nautilus/seahorse-nautilus.install
+++ b/extra/seahorse-nautilus/seahorse-nautilus.install
diff --git a/extra/seahorse/PKGBUILD b/extra/seahorse/PKGBUILD
index bcc7c7431..4380a4549 100644
--- a/extra/seahorse/PKGBUILD
+++ b/extra/seahorse/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 185473 2013-05-14 11:01:28Z heftig $
+# $Id: PKGBUILD 196135 2013-10-07 11:53:27Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Michel Brabants <michel.linux@tiscali.be>
 
 pkgname=seahorse
-pkgver=3.8.2
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="GNOME application for managing PGP keys."
 arch=(i686 x86_64 'mips64el')
@@ -17,9 +17,9 @@ provides=(x11-ssh-askpass)
 options=('!libtool' '!emptydirs')
 groups=(gnome-extra)
 install=seahorse.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
         seahorse-ssh-askpass.sh)
-sha256sums=('b3837d088b7e3f7ebc41cb3f11c5c85e2df7e06bdc538a3e85bb1a13c34c9a12'
+sha256sums=('98023cb8805cf778163833ddba783ba1505c0595683e1ac92109d27e8556fbde'
             '400ea9a6084acc93f1dbd4223b95622bbd48071b763063328efba00de378b68c')
 
 build() {
diff --git a/extra/serf/PKGBUILD b/extra/serf/PKGBUILD
index 763e6c608..58c0c98b2 100644
--- a/extra/serf/PKGBUILD
+++ b/extra/serf/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 193131 2013-08-17 07:19:26Z angvp $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
+# $Id: PKGBUILD 194737 2013-09-23 12:42:49Z angvp $
+# Maintainer: Angel Velasquez <angvp@archlinux.org> 
+# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
 
 pkgname=serf
-pkgver=1.3.0
-pkgrel=1
+pkgver=1.3.1
+pkgrel=2
 pkgdesc="High-performance asynchronous HTTP client library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/serf/"
@@ -11,8 +12,15 @@ license=('Apache')
 depends=('apr-util')
 makedepends=('scons')
 options=('!libtool' '!staticlibs')
-source=(http://serf.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('14ed3e1dc195016a548499b3831f3df6b2501d27')
+source=(http://serf.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 'serf-ssl-allocator-v2.patch')
+md5sums=('da5aca0cad19fd9c19129c3f8f7393dd'
+         'a0ff486ee26f86cb2825decfd1dc8355')
+
+prepare() {
+  mv serf-ssl-allocator-v2.patch ${pkgname}-${pkgver} 
+  cd ${pkgname}-${pkgver}
+  patch -Np0 -i serf-ssl-allocator-v2.patch
+}
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD
index 541758fe9..27b0344b4 100644
--- a/extra/sip/PKGBUILD
+++ b/extra/sip/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 193580 2013-08-24 12:37:03Z andrea $
+# $Id: PKGBUILD 194372 2013-09-15 07:17:44Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net>
 
 pkgbase=sip
 pkgname=('sip' 'python-sip' 'python2-sip')
-pkgver=4.15.1
+pkgver=4.15.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.riverbankcomputing.com/software/sip/intro'
 license=('custom:"sip"')
 makedepends=('python' 'python2')
 source=("http://downloads.sourceforge.net/pyqt/${pkgbase}-${pkgver}.tar.gz")
-md5sums=('ec1ce361ac3618fe05359ec6f5368463')
+md5sums=('52abe824ca7f530a5643abfa3ee715d7')
 
 build() {
   cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver}
@@ -20,7 +20,7 @@ build() {
   cd ${pkgbase}-${pkgver}
   python configure.py CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}"
   make
-  
+
   ### Python2 version ###
   cd ../python2-${pkgbase}-${pkgver}
   python2 configure.py CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}"
@@ -43,10 +43,10 @@ package_python-sip() {
 
   cd ${pkgbase}-${pkgver}
   make DESTDIR="${pkgdir}" install -C siplib
-  
+
   install -Dm644 sipconfig.py "${pkgdir}"/usr/lib/python3.3/site-packages/sipconfig.py
   install -Dm644 sipdistutils.py "${pkgdir}"/usr/lib/python3.3/site-packages/sipdistutils.py
-  
+
   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
@@ -56,9 +56,9 @@ package_python2-sip() {
 
   cd python2-${pkgbase}-${pkgver}
   make DESTDIR="${pkgdir}" install -C siplib
-  
+
   install -Dm644 sipconfig.py "${pkgdir}"/usr/lib/python2.7/site-packages/sipconfig.py
   install -Dm644 sipdistutils.py "${pkgdir}"/usr/lib/python2.7/site-packages/sipdistutils.py
-  
+
   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/slim/PKGBUILD b/extra/slim/PKGBUILD
index 3303def70..8fcf5c524 100644
--- a/extra/slim/PKGBUILD
+++ b/extra/slim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 184434 2013-05-06 19:39:43Z foutrelis $
+# $Id: PKGBUILD 195944 2013-10-06 06:46:09Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Thayer Williams <thayer@archlinux.org>
@@ -6,27 +6,38 @@
 # Contributor: Hugo Ideler <hugoideler@dse.nl>
 
 pkgname=slim
-pkgver=1.3.5
-pkgrel=3
+pkgver=1.3.6
+pkgrel=2
 pkgdesc="Desktop-independent graphical login manager for X11"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://slim.berlios.de/"
 license=('GPL2')
-depends=('pam' 'libxmu' 'libpng' 'libjpeg' 'libxft' 'xorg-xauth')
+depends=('pam' 'libxmu' 'libpng' 'libjpeg' 'libxft' 'libxrandr' 'xorg-xauth')
 makedepends=('cmake' 'freeglut')
 backup=('etc/slim.conf' 'etc/logrotate.d/slim' 'etc/pam.d/slim')
 source=(http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz
+        slim-1.3.6-fix-libslim-libraries.patch
+        slim-1.3.6-add-sessiondir.patch
         slim.pam
         slim.logrotate)
-sha256sums=('818d209f51e2fa8d5b94ef75ce90a7415be48b45e796d66f8083a9532b655629'
+sha256sums=('21defeed175418c46d71af71fd493cd0cbffd693f9d43c2151529125859810df'
+            '3dfa697f8c058390c7e02e7aba769475057ef8ddde945dc43b8cb7f9724dbda0'
+            '0dffd53a69eb9033a67fad964df6fc150ee7a483e29d8eb8b559010fbd14e5fd'
             'b9a77a614c451287b574c33d41e28b5b149c6d2464bdb3a5274799842bca51a4'
             '5bf44748b5003f2332d8b268060c400120b9100d033fa9d35468670d827f6def')
 
-build() {
+prepare() {
   cd "$srcdir/$pkgname-$pkgver"
 
   # Fix installation path of slim.service
-  sed -i 's|usr/lib/systemd/system|/&|' CMakeLists.txt
+  sed -i 's|set(LIBDIR "/lib")|set(LIBDIR "/usr/lib")|' CMakeLists.txt
+
+  patch -Np1 -i "$srcdir/slim-1.3.6-fix-libslim-libraries.patch"
+  patch -Np1 -i "$srcdir/slim-1.3.6-add-sessiondir.patch"
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
 
   cmake \
     -DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/extra/slim/slim-1.3.6-add-sessiondir.patch b/extra/slim/slim-1.3.6-add-sessiondir.patch
new file mode 100644
index 000000000..f6abf0bc7
--- /dev/null
+++ b/extra/slim/slim-1.3.6-add-sessiondir.patch
@@ -0,0 +1,28 @@
+From 741e43960a4ea3a8bc230b1f599311d800c2cc83 Mon Sep 17 00:00:00 2001
+From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
+Date: Wed, 02 Oct 2013 23:23:24 +0000
+Subject: Update slim.conf. Add sessiondir.
+
+Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
+---
+diff --git a/slim.conf b/slim.conf
+index a8e2e1c..c5f1d38 100644
+--- a/slim.conf
++++ b/slim.conf
+@@ -47,11 +47,9 @@ login_cmd           exec /bin/bash -login ~/.xinitrc %session
+ # options "-d" and "-nodaemon"
+ # daemon	yes
+ 
+-# Available sessions (first one is the default).
+-# The current chosen session name is replaced in the login_cmd
+-# above, so your login command can handle different sessions.
+-# see the xinitrc.sample file shipped with slim sources
+-sessions            xfce4,icewm-session,wmaker,blackbox
++# Set directory that contains the xsessions.
++# slim reads xsesion from this directory, and be able to select.
++sessiondir            /usr/share/xsessions/
+ 
+ # Executed when pressing F11 (requires imagemagick)
+ screenshot_cmd      import -window root /slim.png
+--
+cgit v0.9.2
diff --git a/extra/slim/slim-1.3.6-fix-libslim-libraries.patch b/extra/slim/slim-1.3.6-fix-libslim-libraries.patch
new file mode 100644
index 000000000..b6c90f9f4
--- /dev/null
+++ b/extra/slim/slim-1.3.6-fix-libslim-libraries.patch
@@ -0,0 +1,20 @@
+diff -upr slim-1.3.6.orig/CMakeLists.txt slim-1.3.6/CMakeLists.txt
+--- slim-1.3.6.orig/CMakeLists.txt	2013-10-02 16:16:22.000000000 +0300
++++ slim-1.3.6/CMakeLists.txt	2013-10-02 16:19:57.000000000 +0300
+@@ -119,6 +119,7 @@ if(USE_PAM)
+ 	if(PAM_FOUND)
+ 		message("\tPAM Found")
+ 		set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DUSE_PAM")
++		target_link_libraries(libslim ${PAM_LIBRARY})
+ 		target_link_libraries(${PROJECT_NAME} ${PAM_LIBRARY})
+ 		target_link_libraries(slimlock ${PAM_LIBRARY})
+ 		include_directories(${PAM_INCLUDE_DIR})
+@@ -178,6 +179,8 @@ include_directories(
+ )
+ 
+ target_link_libraries(libslim
++	${X11_Xft_LIB}
++	${X11_Xrandr_LIB}
+     ${JPEG_LIBRARIES}
+ 	${PNG_LIBRARIES}
+ )
diff --git a/extra/sqlite/PKGBUILD b/extra/sqlite/PKGBUILD
index 938c5d56f..cf89fbe27 100644
--- a/extra/sqlite/PKGBUILD
+++ b/extra/sqlite/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 193758 2013-08-30 08:53:28Z andyrtr $
+# $Id: PKGBUILD 194286 2013-09-13 07:06:54Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgbase="sqlite"
 pkgname=('sqlite' 'sqlite-tcl') 
-_amalgamationver=3080001
+_amalgamationver=3080002
 _docver=${_amalgamationver}
 #_docver=3080001
-pkgver=3.8.0.1
+pkgver=3.8.0.2
 pkgrel=1
 pkgdesc="A C library that implements an SQL database engine"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,8 +18,8 @@ source=( # tarball containing the amalgamation for SQLite >= 3.7.5 together with
 	http://www.sqlite.org/2013/sqlite-autoconf-$_amalgamationver.tar.gz
 	license.txt)
 options=('!libtool' '!emptydirs')
-sha1sums=('d2fd623a7537e0fad5a2f33169dd9d6def268583'
-          '89005a0fdd60accd037845895c9b21221d9fc30d'
+sha1sums=('294c30e882a0d45877bce09afe72d08ccfc6b650'
+          '43e314880cee7c97c240131625f6442c2ca7b109'
           'f34f6daa4ab3073d74e774aad21d66878cf26853')
 
 build() {
diff --git a/extra/ssmtp/PKGBUILD b/extra/ssmtp/PKGBUILD
index b821e2889..ac9cbcf75 100644
--- a/extra/ssmtp/PKGBUILD
+++ b/extra/ssmtp/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 187071 2013-06-03 11:16:54Z allan $
+# $Id: PKGBUILD 194362 2013-09-14 19:32:55Z pierre $
 # Maintainer:
 
 pkgname=ssmtp
 pkgver=2.64
-pkgrel=4
+pkgrel=5
 pkgdesc="Extremely simple MTA to get mail off the system to a mailhub"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://packages.debian.org/stable/mail/ssmtp"
 depends=('openssl' 'inetutils')
-conflicts=('exim')
+conflicts=('exim' 'smtp-forwarder')
 provides=('smtp-forwarder')
 backup=('etc/ssmtp/ssmtp.conf' 'etc/ssmtp/revaliases')
 options=('!makeflags' '!emptydirs')
diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD
index 8f515f231..f788f2d4a 100644
--- a/extra/subversion/PKGBUILD
+++ b/extra/subversion/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 193132 2013-08-17 07:19:28Z angvp $
+# $Id: PKGBUILD 194714 2013-09-23 03:35:04Z angvp $
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Paul Mattal <paul@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=subversion
-pkgver=1.8.1
-pkgrel=2
+pkgver=1.8.3
+pkgrel=1
 pkgdesc="A Modern Concurrent Version Control System"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://subversion.apache.org/"
@@ -25,13 +25,13 @@ provides=('svn')
 backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve')
 options=('!makeflags' '!libtool' '!emptydirs')
 install=${pkgname}.install
-source=(http://www.apache.org/dist/subversion/subversion-1.8.1.tar.bz2{,.asc}
+source=(http://www.apache.org/dist/subversion/subversion-${pkgver}.tar.bz2{,.asc}
         svn
         svnserve.conf
         svnserve.tmpfiles
         svnserve.service
         subversion.rpath.fix.patch)
-md5sums=('f2ee0471b8a560f5efa0f2349d9c9ab9'
+md5sums=('7d7bd97347a4491e1ffb529563ce2e9e'
          'SKIP'
          'a0db6dd43af33952739b6ec089852630'
          'c459e299192552f61578f3438abf0664'
@@ -64,11 +64,11 @@ build() {
    [ "$CARCH" = "mips64el" ] || make javahl 
 }
 
-check() {
-   cd ${pkgname}-${pkgver}
-   export LANG=C LC_ALL=C
-   make check check-swig-pl check-swig-py check-swig-rb CLEANUP=yes # check-javahl
-}
+#check() {
+#   cd ${pkgname}-${pkgver}
+#   export LANG=C LC_ALL=C
+#   make check check-swig-pl check-swig-py check-swig-rb CLEANUP=yes # check-javahl
+#}
 
 package() {
    cd ${pkgname}-${pkgver}
diff --git a/extra/sushi/PKGBUILD b/extra/sushi/PKGBUILD
index 1d9a0f205..1f59a11c6 100644
--- a/extra/sushi/PKGBUILD
+++ b/extra/sushi/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 183459 2013-04-21 22:12:10Z heftig $
+# $Id: PKGBUILD 196137 2013-10-07 11:53:29Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=sushi
-pkgver=3.8.1
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="A quick previewer for Nautilus"
 arch=(i686 x86_64 mips64el)
@@ -14,7 +14,7 @@ install=sushi.install
 makedepends=('intltool' 'gobject-introspection')
 options=(!libtool)
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('c4f24d0961ce8fc5ef3a4fe9af178e368c7117459df2c0be12c8f953646c82dd')
+sha256sums=('cffcf28b170f5825e84983a979972d4d901a453b61cbe3e560d362e8dd4b4bc8')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/swell-foop/PKGBUILD b/extra/swell-foop/PKGBUILD
index ccd122837..dccd864ce 100644
--- a/extra/swell-foop/PKGBUILD
+++ b/extra/swell-foop/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 193432 2013-08-20 07:00:28Z jgc $
+# $Id: PKGBUILD 196138 2013-10-07 11:53:31Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=swell-foop
-pkgver=3.8.2
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Clear the screen by removing groups of colored and shaped tiles"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,8 +16,8 @@ options=('!emptydirs' '!libtool')
 install=swell-foop.install
 url="https://live.gnome.org/Swell%20Foop"
 groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('33b72da1f5378801ae41cb13f3bc35ce44368c104327f68dd51f45653ca62cb9')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('d96c5cbd071a97038cc281d6a85902721ab5fc50d27981dc2c37b003126a43a6')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/swig/PKGBUILD b/extra/swig/PKGBUILD
index be0e5829f..f145fb1e6 100644
--- a/extra/swig/PKGBUILD
+++ b/extra/swig/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 188138 2013-06-10 13:01:07Z bpiotrowski $
+# $Id: PKGBUILD 194495 2013-09-16 20:14:45Z eric $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=swig
-pkgver=2.0.10
+pkgver=2.0.11
 pkgrel=1
 pkgdesc="Generate scripting interfaces to C/C++ code"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,17 +11,16 @@ url="http://www.swig.org/"
 license=('custom')
 depends=('zlib' 'pcre')
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('ad6f95ce9b9da4a8f5b80ac1848d26c76f518d84')
+sha1sums=('d3bf4e78824dba76bfb3269367f1ae0276b49df9')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
   install -D -m644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
   install -D -m644 LICENSE-UNIVERSITIES "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE-UNIVERSITIES
diff --git a/extra/system-config-printer/PKGBUILD b/extra/system-config-printer/PKGBUILD
index 8cfeadcbc..a798f6ed6 100644
--- a/extra/system-config-printer/PKGBUILD
+++ b/extra/system-config-printer/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 186929 2013-06-01 08:46:45Z andrea $
+# $Id: PKGBUILD 195976 2013-10-06 19:13:25Z eric $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=system-config-printer
-pkgver=1.4.1
-pkgrel=3
+pkgver=1.4.2
+pkgrel=1
 pkgdesc="A CUPS printer configuration tool and status applet"
 url="http://cyberelk.net/tim/software/system-config-printer/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ optdepends=('gnome-keyring: password management')
 replaces=('system-config-printer-common' 'system-config-printer-gnome')
 conflicts=('system-config-printer-common' 'system-config-printer-gnome')
 source=(http://cyberelk.net/tim/data/${pkgname}/${pkgver%*.*}/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('3d794eb88c5813c3024b181677a602dd'
+md5sums=('7f6462d84056be13aadeb6e3030aad5e'
          'SKIP')
 
 prepare() {
diff --git a/extra/tali/PKGBUILD b/extra/tali/PKGBUILD
index c33e2cb6c..8f24ac5be 100644
--- a/extra/tali/PKGBUILD
+++ b/extra/tali/PKGBUILD
@@ -3,7 +3,7 @@
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=tali
-pkgver=3.8.0
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Beat the odds in a poker-style dice game"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,8 +16,8 @@ options=('!emptydirs' '!libtool')
 install=tali.install
 url="https://live.gnome.org/Tali"
 groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('77fa3a3804f51e40629799d441b34e9b01a665097be229bd94adb28d3dbc17d5')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('2e276e6965057fe3136fe831809b2cedab3e8f59346b0fbe37f3f383a25c68c6')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/talloc/PKGBUILD b/extra/talloc/PKGBUILD
index ca53743ba..fff399c50 100644
--- a/extra/talloc/PKGBUILD
+++ b/extra/talloc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 172901 2012-12-06 14:08:40Z stephane $
+# $Id: PKGBUILD 195486 2013-10-01 06:06:00Z bpiotrowski $
 # Maintainer:
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=talloc
 pkgver=2.0.8
-pkgrel=1
-pkgdesc="A hierarchical pool based memory allocator with destructors"
+pkgrel=2
+pkgdesc="Hierarchical pool based memory allocator with destructors"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
 url="http://talloc.samba.org/"
@@ -15,9 +15,13 @@ optdepends=('python2: for python bindings')
 source=("http://samba.org/ftp/${pkgname}/${pkgname}-${pkgver}.tar.gz")
 md5sums=('7857200b58a8617ca18fe2c91296cd93')
 
-build() {
+prepare() {
    cd "${srcdir}/${pkgname}-${pkgver}"
    sed -i -e 's#python#python2#g' buildtools/bin/waf
+}
+
+build() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
    ./configure --prefix=/usr \
      --sysconfdir=/etc/samba \
      --localstatedir=/var \
diff --git a/extra/tcl/PKGBUILD b/extra/tcl/PKGBUILD
index e5eaa0140..22d4c871f 100644
--- a/extra/tcl/PKGBUILD
+++ b/extra/tcl/PKGBUILD
@@ -1,24 +1,21 @@
-# $Id: PKGBUILD 192225 2013-08-08 07:36:39Z eric $
+# $Id: PKGBUILD 194660 2013-09-20 16:55:21Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=tcl
-pkgver=8.6.0
-pkgrel=5
+pkgver=8.6.1
+pkgrel=1
 pkgdesc="The Tcl scripting language"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://tcl.sourceforge.net/"
 license=('custom')
 depends=('zlib')
 source=(http://downloads.sourceforge.net/sourceforge/tcl/tcl${pkgver}-src.tar.gz)
-sha1sums=('fc57fc08ab113740a702bb67d4f350f8ec85ef58')
+sha1sums=('5c83d44152cc0496cc0847a2495f659502a30e40')
 
 prepare() {
   cd tcl${pkgver}
   # we build the tcl sqlite interface in sqlite-tcl package
   rm -rf pkgs/sqlite3*
-
-  sed -i 's/#define DUPTRAVERSE_MAX_DEPTH 500/#define DUPTRAVERSE_MAX_DEPTH 5000/' \
-    generic/regc_nfa.c
 }
 
 build() {
@@ -36,10 +33,23 @@ check() {
 package() {
   cd tcl${pkgver}/unix
   make INSTALL_ROOT="${pkgdir}" install install-private-headers
-  ln -sf tclsh8.6 "${pkgdir}/usr/bin/tclsh"
+  ln -sf tclsh${pkgver%.*} "${pkgdir}/usr/bin/tclsh"
   ln -sf libtcl${pkgver%.*}.so "${pkgdir}/usr/lib/libtcl.so"
   install -Dm644 ../license.terms "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 
   # remove buildroot traces
-  sed -i "s#${srcdir}#/usr/src#" "${pkgdir}"/usr/lib/{tcl,tdbc1.0.0/tdbc,itcl4.0.0/itcl}Config.sh
+  sed -e "s#${srcdir}/tcl${pkgver}/unix#/usr/lib#" \
+      -e "s#${srcdir}/tcl${pkgver}#/usr/include#" \
+      -i "${pkgdir}/usr/lib/tclConfig.sh"
+
+  sed -e "s#${srcdir}/tcl${pkgver}/unix/pkgs/tdbc1.0.0#/usr/lib/tdbc1.0.0#" \
+      -e "s#${srcdir}/tcl${pkgver}/pkgs/tdbc1.0.0/generic#/usr/include#" \
+      -e "s#${srcdir}/tcl${pkgver}/pkgs/tdbc1.0.0/library#/usr/lib/tcl${pkgver%.*}#" \
+      -e "s#${srcdir}/tcl${pkgver}/pkgs/tdbc1.0.0#/usr/include#" \
+      -i "${pkgdir}/usr/lib/tdbc1.0.0/tdbcConfig.sh"
+
+  sed -e "s#${srcdir}/tcl${pkgver}/unix/pkgs/itcl4.0.0#/usr/lib/itcl4.0.0#" \
+      -e "s#${srcdir}/tcl${pkgver}/pkgs/itcl4.0.0/generic#/usr/include#" \
+      -e "s#${srcdir}/tcl${pkgver}/pkgs/itcl4.0.0#/usr/include#" \
+      -i "${pkgdir}/usr/lib/itcl4.0.0/itclConfig.sh"
 }
diff --git a/extra/telepathy-gabble/PKGBUILD b/extra/telepathy-gabble/PKGBUILD
index 4ef6d9a1a..b770ba6d9 100644
--- a/extra/telepathy-gabble/PKGBUILD
+++ b/extra/telepathy-gabble/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 191842 2013-07-31 09:40:22Z ioni $
+# $Id: PKGBUILD 194217 2013-09-10 16:04:59Z andrea $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Daniel Balieiro <daniel@balieiro.com>
 # Contributor: Rodrigo L. M. Flores <mail@rodrigoflores.org>
 pkgname=telepathy-gabble
-pkgver=0.17.5
+pkgver=0.18.1
 pkgrel=1
 pkgdesc="A Jabber/XMPP connection manager for Telepathy"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ makedepends=('libxslt' 'python2')
 options=('!libtool' '!emptydirs')
 source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
 install=telepathy-gabble.install
-md5sums=('57d7778e58f82a43dba1311cece0d4e3')
+md5sums=('a5384758df829b80d47fbc8a672609ad')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/thin-provisioning-tools/PKGBUILD b/extra/thin-provisioning-tools/PKGBUILD
new file mode 100644
index 000000000..a57b84756
--- /dev/null
+++ b/extra/thin-provisioning-tools/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 195238 2013-09-28 21:28:47Z thomas $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+# Contributor: Jason Hall <cakersq@gmail.com>
+
+pkgname=thin-provisioning-tools
+pkgver=0.2.7
+pkgrel=1
+pkgdesc="A suite of tools for manipulating the metadata of the dm-thin device-mapper target"
+arch=('i686' 'x86_64')
+url="https://github.com/jthornber/thin-provisioning-tools"
+license=('GPL3')
+depends=('expat' 'gcc-libs')
+makedepends=('boost')
+source=(https://github.com/jthornber/${pkgname}/archive/v${pkgver}.tar.gz)
+sha1sums=('23ce1110899adce9406aa614a4ee19950e00ee7a')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  autoconf
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" BINDIR="${pkgdir}"/usr/bin MANDIR=/usr/share/man install 
+}
+
diff --git a/extra/thunar-archive-plugin/PKGBUILD b/extra/thunar-archive-plugin/PKGBUILD
index 140fb9772..a882d8ec4 100644
--- a/extra/thunar-archive-plugin/PKGBUILD
+++ b/extra/thunar-archive-plugin/PKGBUILD
@@ -1,17 +1,19 @@
-# $Id: PKGBUILD 185137 2013-05-11 13:25:59Z foutrelis $
+# $Id: PKGBUILD 195948 2013-10-06 07:06:40Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=thunar-archive-plugin
 pkgver=0.3.1
-pkgrel=1
-pkgdesc="Create and deflate archives in thunar"
+pkgrel=2
+pkgdesc="Create and extract archives in Thunar"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://goodies.xfce.org/projects/thunar-plugins/thunar-archive-plugin"
 license=('GPL2')
 groups=('xfce4-goodies')
 depends=('thunar' 'hicolor-icon-theme')
 makedepends=('intltool')
+optdepends=('file-roller'
+            'kdeutils-ark')
 options=('!libtool')
 install=$pkgname.install
 source=(http://archive.xfce.org/src/thunar-plugins/$pkgname/0.3/$pkgname-$pkgver.tar.bz2)
@@ -20,7 +22,8 @@ sha256sums=('9ad559b0c11308f6897ad56604e5a06dc8f369f649eb20120b2d3018ef5da54c')
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  ./configure --prefix=/usr \
+  ./configure \
+    --prefix=/usr \
     --sysconfdir=/etc \
     --libexecdir=/usr/lib/xfce4 \
     --localstatedir=/var \
diff --git a/extra/thunar-archive-plugin/thunar-archive-plugin.install b/extra/thunar-archive-plugin/thunar-archive-plugin.install
index bf6c3fe76..e4f8fd06c 100644
--- a/extra/thunar-archive-plugin/thunar-archive-plugin.install
+++ b/extra/thunar-archive-plugin/thunar-archive-plugin.install
@@ -1,19 +1,13 @@
 post_install() {
-  cat << EOF
-
-NOTE for thunar-archive-plugin:
-----
-  ==> please install xarchiver, squeeze, file-roller or ark to use the plugin
-EOF
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 post_upgrade() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  post_install
 }
 
 post_remove() {
-  post_upgrade
+  post_install
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/time/PKGBUILD b/extra/time/PKGBUILD
index 82706136f..09d9d15c2 100644
--- a/extra/time/PKGBUILD
+++ b/extra/time/PKGBUILD
@@ -1,11 +1,12 @@
-# $Id: PKGBUILD 147242 2012-01-25 01:42:55Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.us>
+# $Id: PKGBUILD 195266 2013-09-29 16:39:25Z dreisner $
+# Maintainer: Dave Reisner <dreisner@archlinux.org>
+# Contributor: Stéphane Gaudreault <stephane@archlinux.us>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=time
 pkgver=1.7
-pkgrel=6
+pkgrel=7
 pkgdesc="Utility for monitoring a program's use of system resources"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/directory/time.html"
@@ -19,22 +20,29 @@ sha1sums=('dde0c28c7426960736933f3e763320680356cc6a'
           'fff80e05dd41f0a59bb1f49d1c6e581d5e8e92e5'
           'b2a909e1d92f7af1bc99a4524ad84d467ed79a06')
 
+prepare() {
+  cd "$pkgname-$pkgver"
 
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-   
-   # cf https://bugzilla.redhat.com/show_bug.cgi?id=527276
-   patch -Np1 -i ../time-1.7-Recompute-CPU-usage-at-microsecond-level.patch
+  # cf https://bugzilla.redhat.com/show_bug.cgi?id=527276
+  patch -Np1 < "$srcdir"/time-1.7-Recompute-CPU-usage-at-microsecond-level.patch
+
+  # cf https://bugzilla.redhat.com/show_bug.cgi?id=702826
+  patch -Np1 < "$srcdir"/time-1.7-ru_maxrss-is-in-kilobytes-on-Linux.patch
 
-   # cf https://bugzilla.redhat.com/show_bug.cgi?id=702826
-   patch -Np1 -i ../time-1.7-ru_maxrss-is-in-kilobytes-on-Linux.patch
+  # rebuild the ancient autoconf setup to fix a variety of build issues
+  # surrounding missing/incorrect includes.
+  autoreconf -fisv
+}
+
+build() {
+  cd "$pkgname-$pkgver"
 
-	./configure --prefix=/usr --infodir=/usr/share/info
-	make
+  ./configure --prefix=/usr --infodir=/usr/share/info
+  make
 }
 
 package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$pkgname-$pkgver"
 
-	make exec_prefix="${pkgdir}/usr" infodir="${pkgdir}/usr/share/info" install
+  make exec_prefix="$pkgdir/usr" infodir="$pkgdir/usr/share/info" install
 }
diff --git a/extra/time/time.install b/extra/time/time.install
index 011597c00..ceaf8e6fb 100644
--- a/extra/time/time.install
+++ b/extra/time/time.install
@@ -1,20 +1,22 @@
+#!/bin/bash
+
 infodir=/usr/share/info
 filelist=(time.info.gz)
 
 post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
+  [[ -x usr/bin/install-info ]] || return 0
+  for file in "${filelist[@]}"; do
+    install-info "$infodir/$file" "$infodir/dir" 2>/dev/null
   done
 }
 
 post_upgrade() {
-  post_install $1
+  post_install "$1"
 }
 
 pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+  [[ -x usr/bin/install-info ]] || return 0
+  for file in "${filelist[@]}"; do
+    install-info --delete "$infodir/$file" "$infodir/dir" 2>/dev/null
   done
 }
diff --git a/extra/tk/PKGBUILD b/extra/tk/PKGBUILD
index cf3fd5faf..1d2ceed17 100644
--- a/extra/tk/PKGBUILD
+++ b/extra/tk/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 192227 2013-08-08 07:38:43Z eric $
+# $Id: PKGBUILD 194661 2013-09-20 16:55:22Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=tk
-pkgver=8.6.0
-pkgrel=2
+pkgver=8.6.1
+pkgrel=1
 pkgdesc="A windowing toolkit for use with tcl"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://tcl.sourceforge.net/"
 license=('custom')
 depends=("tcl=${pkgver}" 'libxss' 'libxft')
 source=(http://downloads.sourceforge.net/sourceforge/tcl/tk${pkgver}-src.tar.gz)
-sha1sums=('c42e160285e2d26eae8c2a1e6c6f86db4fa7663b')
+sha1sums=('ecfcc20833c04d6890b14a7920a04d16f2123a51')
 
 build() {
   cd tk${pkgver}/unix
@@ -19,19 +19,20 @@ build() {
   make
 }
 
-#check() {
-#  cd tk${pkgver}/unix
+check() {
+  cd tk${pkgver}/unix
 #  make test
-#}
+}
 
 package() {
   cd tk${pkgver}/unix
   make INSTALL_ROOT="${pkgdir}" install install-private-headers
-  ln -sf wish8.6 "${pkgdir}/usr/bin/wish"
+  ln -sf wish${pkgver%.*} "${pkgdir}/usr/bin/wish"
   ln -sf libtk${pkgver%.*}.so "${pkgdir}/usr/lib/libtk.so"
   install -Dm644 license.terms "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 
   # remove buildroot traces
-  sed -i "s#${srcdir}#/usr/src#" "${pkgdir}/usr/lib/tkConfig.sh"
-
+  sed -e "s#${srcdir}/tk${pkgver}/unix#/usr/lib#" \
+      -e "s#${srcdir}/tk${pkgver}#/usr/include#" \
+      -i "${pkgdir}/usr/lib/tkConfig.sh"
 }
diff --git a/extra/totem-plparser/PKGBUILD b/extra/totem-plparser/PKGBUILD
index 8fdb6f0a2..b44bc6bf2 100644
--- a/extra/totem-plparser/PKGBUILD
+++ b/extra/totem-plparser/PKGBUILD
@@ -1,26 +1,25 @@
-# $Id: PKGBUILD 185506 2013-05-14 12:10:02Z heftig $
+# $Id: PKGBUILD 196141 2013-10-07 11:53:36Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=totem-plparser
-pkgver=3.4.5
-pkgrel=1
+pkgver=3.10.0
+pkgrel=2
 url="http://www.gnome.org"
 pkgdesc="Totem playlist parser library"
 license=('LGPL')
 arch=(i686 x86_64 'mips64el')
-depends=('gmime' 'libsoup' 'libarchive' 'libquvi')
-makedepends=('intltool' 'gobject-introspection')
+depends=('gmime' 'libsoup' 'libarchive')
+makedepends=('intltool' 'gobject-introspection' 'libquvi')
+optdepends=('libquvi: video site handling (Youtube etc.)')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/totem-pl-parser/${pkgver%.*}/totem-pl-parser-$pkgver.tar.xz)
-sha256sums=('a573e078692b48895cb5b041385b2760d63e2ee496c8d499eccfa942e7c79f89')
+sha256sums=('87eac3fdf2b632dfac0edda07906a3e84f1ce4442b8127394414020dafe41aa9')
 
 build() {
   cd totem-pl-parser-$pkgver
-  ./configure --prefix=/usr \
-      --sysconfdir=/etc \
-      --localstatedir=/var \
-      --disable-static
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --libexecdir=/usr/lib/$pkgname --disable-static
   make
 }
 
diff --git a/extra/totem/PKGBUILD b/extra/totem/PKGBUILD
index 29125de86..5b63d4ad2 100644
--- a/extra/totem/PKGBUILD
+++ b/extra/totem/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 186680 2013-05-30 12:54:23Z heftig $
+# $Id: PKGBUILD 196140 2013-10-07 11:53:34Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=totem
 pkgname=('totem' 'totem-plugin')
-pkgver=3.8.2
-pkgrel=2
+pkgver=3.10.1
+pkgrel=1
 pkgdesc="GNOME3 movie player based on GStreamer"
 url="http://www.gnome.org"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,13 +13,13 @@ license=(GPL2 custom)
 depends=(gst-plugins-base gst-plugins-good totem-plparser desktop-file-utils iso-codes libpeas
          hicolor-icon-theme gnome-icon-theme gsettings-desktop-schemas dconf clutter-gst
          clutter-gtk python-gobject python-xdg gst-plugins-bad)
-makedepends=(intltool libnautilus-extension vala grilo dbus-glib libzeitgeist
+makedepends=(intltool libnautilus-extension lirc-utils vala grilo dbus-glib zeitgeist
              itstool docbook-xsl python-pylint)
 [ "$CARCH" != "mips64el" ] && makedepends+=('lirc-utils')
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz
         browser-plugins.ini bugreport.patch)
-sha256sums=('eda9e0a016bb2ac14f7cd7c8c03b8ee1ab3f1b3ba6558f65c64514e5d2583e01'
+sha256sums=('b6b6038c9104965671a6d25e98496a487c3a9c590c9c104f668bd9f4fa7be9e2'
             'a50a3bbf35f0535f7e8e20af1893446a2e5711015484f9ae6d1ff91af3b23c4e'
             '30481dab7e21b66257e3238f5a8b708e1a5c4797d7da904f7ebaba4c2c2ef167')
 
@@ -54,7 +54,7 @@ package_totem() {
               'gst-libav: Extra media codecs'
               'lirc-utils: Infrared Remote Control plugin'
               'grilo-plugins: Browse sidebar (remote media)'
-              'libzeitgeist: Zeitgeist plugin')
+              'zeitgeist: Zeitgeist plugin')
 
   cd "$pkgbase-$pkgver"
   make DESTDIR="${pkgdir}" install
@@ -66,6 +66,7 @@ package_totem() {
 }
 
 package_totem-plugin() {
+  groups=(gnome)
   pkgdesc="Totem plugin for web browsers"
   depends=("totem=$pkgver" dbus-glib)
   backup=(etc/totem/browser-plugins.ini)
diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD
index 17779678b..02ed8e51b 100644
--- a/extra/tracker/PKGBUILD
+++ b/extra/tracker/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 191946 2013-08-01 16:10:52Z heftig $
+# $Id: PKGBUILD 196142 2013-10-07 11:53:37Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
@@ -7,7 +7,7 @@ pkgbase=tracker
 pkgname=(tracker libtracker-sparql)
 pkgver=0.16.2
 _tver=${pkgver%.*}
-pkgrel=1
+pkgrel=2
 pkgdesc="All-in-one indexer, search tool and metadata database"
 arch=(i686 x86_64 mips64el)
 license=(GPL)
diff --git a/extra/transcode/04_ffmpeg_options.patch b/extra/transcode/04_ffmpeg_options.patch
deleted file mode 100644
index d0429b1d9..000000000
--- a/extra/transcode/04_ffmpeg_options.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Remove "-vpre medium" from ffmpeg's command-line arguments list.
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=681436
-From: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=681436#25
----
- export/ffmpeg_cfg.c |    3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
---- transcode.orig/export/ffmpeg_cfg.c
-+++ transcode/export/ffmpeg_cfg.c
-@@ -126,7 +126,7 @@ int lavc_param_gmc = 0;
- //int lavc_param_atag = 0;
- //int lavc_param_abitrate = 224;
- 
--char *lavc_param_video_preset = "medium";
-+char *lavc_param_video_preset = NULL;
- char *lavc_param_ffmpeg_datadir = "/usr/share/ffmpeg";
- 
- TCConfigEntry lavcopts_conf[]={
-@@ -237,7 +237,6 @@ TCConfigEntry lavcopts_conf[]={
-     {"skip_top", &lavc_param_skip_top, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000},
-     {"skip_bottom", &lavc_param_skip_bottom, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000},
-     {"fps_code", &lavc_param_fps_code, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 9},
--    {"vpre", &lavc_param_video_preset, TCCONF_TYPE_STRING, 0, 0, 0},
-     {"ffmpeg_datadir", &lavc_param_ffmpeg_datadir, TCCONF_TYPE_STRING, 0, 0, 0},
-     {NULL, NULL, 0, 0, 0, 0}
- };
diff --git a/extra/transcode/PKGBUILD b/extra/transcode/PKGBUILD
index 5029e2ceb..63f3122f6 100644
--- a/extra/transcode/PKGBUILD
+++ b/extra/transcode/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 192481 2013-08-12 20:25:48Z eric $
+# $Id: PKGBUILD 194278 2013-09-12 20:45:23Z eric $
 # Maintainer:
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: roberto <roberto@archlinux.org>
@@ -6,7 +6,7 @@
 pkgname=transcode
 _sripver=0.3-4
 pkgver=1.1.7
-pkgrel=11
+pkgrel=12
 pkgdesc="A video/DVD ripper and encoder for the terminal/console"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://tcforge.berlios.de/"
@@ -17,23 +17,36 @@ makedepends=('nasm')
 options=('!libtool')
 source=(https://bitbucket.org/france/transcode-tcforge/downloads/${pkgname}-${pkgver}.tar.bz2
 	http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz
-        subtitleripper-0.3.4-linkingorder.patch subtitleripper-0.3.4-respect-ldflags.patch
-        ffmpeg-0.11.patch transcode-1.1.7-libav-9.patch 04_ffmpeg_options.patch transcode-ffmpeg.patch)
+        subtitleripper-0.3.4-linkingorder.patch
+	subtitleripper-0.3.4-respect-ldflags.patch
+	transcode-1.1.7-ffmpeg.patch
+	transcode-1.1.7-ffmpeg-0.10.patch
+        transcode-1.1.7-ffmpeg-0.11.patch 
+	transcode-1.1.7-preset-free.patch
+	transcode-1.1.7-libav-9.patch 
+	transcode-1.1.7-preset-force.patch
+	transcode-1.1.7-ffmpeg2.patch)
 sha1sums=('e35df68b960eb56ef0a59a4cdbed1491be56aee6'
           'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d'
           'fa05aa1770d9350d90b7cf315aa7c4a1fd921ac7'
           '591943a33235342a66c3df0625a164a1479c09ae'
-          '3d2dcdc23f14938e87d14cfc03000bb3b649b85e'
+          'cc81c190db51d8a64623e2eea3b327ec7eb7ec57'
+          '3b1590f30f8f32350444f668584ec31be6e8e614'
+          '3f7b0257f023df6ea249111d247a852c46261c2f'
+          '54b1bab48a0b3bc0e8464c4deb4de31bf1060a1c'
           'ef1cccd35317d3a28443b654da49de731cdf1766'
-          '00938db9aebde719799c11116ed9fe85a9cc4bdd'
-          '6d1774e202cca689c4e417def982452990b8e7e4')
+          '034853427bc784a80b333d2e2f4bab44f0b86ce0'
+          '764de67996e2c4947346c7a91586cc4ca826a8e2')
 
 prepare() {
   cd ${pkgname}-${pkgver}
-  patch -p1 -i "${srcdir}/ffmpeg-0.11.patch"
+  patch -p0 -i "${srcdir}/transcode-1.1.7-ffmpeg.patch"
+  patch -p0 -i "${srcdir}/transcode-1.1.7-ffmpeg-0.10.patch"
+  patch -p1 -i "${srcdir}/transcode-1.1.7-ffmpeg-0.11.patch"
+  patch -p1 -i "${srcdir}/transcode-1.1.7-preset-free.patch"
   patch -p0 -i "${srcdir}/transcode-1.1.7-libav-9.patch"
-  patch -p1 -i "${srcdir}/04_ffmpeg_options.patch"
-  patch -p1 -i "${srcdir}/transcode-ffmpeg.patch"
+  patch -p1 -i "${srcdir}/transcode-1.1.7-preset-force.patch"
+  patch -p1 -i "${srcdir}/transcode-1.1.7-ffmpeg2.patch"
 
   cd ../subtitleripper
   patch -p1 -i "${srcdir}/subtitleripper-0.3.4-linkingorder.patch"
diff --git a/extra/transcode/ffmpeg-0.11.patch b/extra/transcode/ffmpeg-0.11.patch
deleted file mode 100644
index b5601fe2f..000000000
--- a/extra/transcode/ffmpeg-0.11.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-diff -Naur transcode-1.1.7/export/export_ffmpeg.c fixed-tc/export/export_ffmpeg.c
---- transcode-1.1.7/export/export_ffmpeg.c	2011-11-19 11:50:27.000000000 -0500
-+++ fixed-tc/export/export_ffmpeg.c	2012-07-05 16:22:41.095346080 -0400
-@@ -180,7 +180,7 @@
- 
- 
- /* START: COPIED FROM ffmpeg-0.5_p22846(ffmpeg.c, cmdutils.c) */
--#include <libavcodec/opt.h>
-+#include <libavutil/opt.h>
- #include <libavutil/avstring.h>
- #include <libswscale/swscale.h>
- 
-@@ -470,7 +470,6 @@
-     }
- 
-     TC_LOCK_LIBAVCODEC;
--    avcodec_init();
-     avcodec_register_all();
-     TC_UNLOCK_LIBAVCODEC;
- 
-@@ -634,7 +633,6 @@
-         lavc_param_rc_max_rate = 2516;
-         lavc_param_rc_buffer_size = 224 * 8;
-         lavc_param_rc_buffer_aggressivity = 99;
--        lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET;
- 
-         break;
- 
-@@ -674,7 +673,6 @@
- 
-         lavc_param_rc_buffer_size = 224 * 8;
-         lavc_param_rc_buffer_aggressivity = 99;
--        lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET;
- 
-         break;
- 
-diff -Naur transcode-1.1.7/export/ffmpeg_cfg.c fixed-tc/export/ffmpeg_cfg.c
---- transcode-1.1.7/export/ffmpeg_cfg.c	2011-11-19 11:50:27.000000000 -0500
-+++ fixed-tc/export/ffmpeg_cfg.c	2012-07-05 15:26:29.112103273 -0400
-@@ -160,9 +160,7 @@
-     {"vcelim", &lavc_param_chroma_elim_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99},
-     {"vpsize", &lavc_param_packet_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000},
-     {"vstrict", &lavc_param_strict, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99},
--    {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART},
- //    {"keyint", &lavc_param_keyint, TCCONF_TYPE_INT, 0, 0, 0},
--    {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART},
-     {"mpeg_quant", &lavc_param_mpeg_quant, TCCONF_TYPE_FLAG, 0, 0, 1},
-     {"vi_qfactor", &lavc_param_vi_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0},
-     {"vi_qoffset", &lavc_param_vi_qoffset, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0},
-@@ -211,7 +211,6 @@
- #else
-     {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED},
- #endif    
--    {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_UMV},
-     {"ibias", &lavc_param_ibias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512},
-     {"pbias", &lavc_param_pbias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512},
-     {"coder", &lavc_param_coder, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10},
-@@ -223,9 +223,6 @@
-     {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000},
-     {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QP_RD},
-     {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16},
--    {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_SLICE_STRUCT},
--    {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_SVCD_SCAN_OFFSET},
--    {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN},
-     {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME},
-     {"inter_threshold", &lavc_param_inter_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000},
-     {"sc_threshold", &lavc_param_sc_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000},
-diff -Naur transcode-1.1.7/filter/filter_pp.c fixed-tc/filter/filter_pp.c
---- transcode-1.1.7/filter/filter_pp.c	2011-11-19 11:50:27.000000000 -0500
-+++ fixed-tc/filter/filter_pp.c	2012-07-05 15:26:28.945436613 -0400
-@@ -38,8 +38,8 @@
- 
- /* FIXME: these use the filter ID as an index--the ID can grow
-  * arbitrarily large, so this needs to be fixed */
--static pp_mode_t *mode[100];
--static pp_context_t *context[100];
-+static pp_mode *mode[100];
-+static pp_context *context[100];
- static int width[100], height[100];
- static int pre[100];
- 
-diff -Naur transcode-1.1.7/import/decode_lavc.c fixed-tc/import/decode_lavc.c
---- transcode-1.1.7/import/decode_lavc.c	2011-11-19 11:50:27.000000000 -0500
-+++ fixed-tc/import/decode_lavc.c	2012-07-05 15:26:28.842103278 -0400
-@@ -181,7 +181,7 @@
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
-   lavc_dec_context->error_resilience  = 2;
- #else
--  lavc_dec_context->error_recognition = 2;
-+  lavc_dec_context->err_recognition = 2;
- #endif
-   lavc_dec_context->error_concealment = 3;
-   lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT;
-diff -Naur transcode-1.1.7/import/import_ffmpeg.c fixed-tc/import/import_ffmpeg.c
---- transcode-1.1.7/import/import_ffmpeg.c	2011-11-19 11:50:27.000000000 -0500
-+++ fixed-tc/import/import_ffmpeg.c	2012-07-05 15:26:28.848769946 -0400
-@@ -314,7 +314,7 @@
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
-     lavc_dec_context->error_resilience  = 2;
- #else
--    lavc_dec_context->error_recognition = 2;
-+    lavc_dec_context->err_recognition = 2;
- #endif
-     lavc_dec_context->error_concealment = 3;
-     lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT;
-diff -Naur transcode-1.1.7/import/probe_ffmpeg.c fixed-tc/import/probe_ffmpeg.c
---- transcode-1.1.7/import/probe_ffmpeg.c	2011-11-19 11:50:27.000000000 -0500
-+++ fixed-tc/import/probe_ffmpeg.c	2012-07-05 15:26:28.838769947 -0400
-@@ -99,8 +99,8 @@
- 
-     TC_INIT_LIBAVCODEC;
- 
--    ret = av_open_input_file(&lavf_dmx_context, ipipe->name,
--                             NULL, 0, NULL);
-+    ret = avformat_open_input(&lavf_dmx_context, ipipe->name,
-+                             NULL, NULL);
-     if (ret != 0) {
-         tc_log_error(__FILE__, "unable to open '%s'"
-                                " (libavformat failure)",
-diff -Naur transcode-1.1.7/libtc/tcavcodec.h fixed-tc/libtc/tcavcodec.h
---- transcode-1.1.7/libtc/tcavcodec.h	2011-11-19 11:50:27.000000000 -0500
-+++ fixed-tc/libtc/tcavcodec.h	2012-07-05 15:26:28.828769951 -0400
-@@ -53,7 +53,6 @@
- 
- #define TC_INIT_LIBAVCODEC do { \
-     TC_LOCK_LIBAVCODEC; \
--    avcodec_init(); \
-     avcodec_register_all(); \
-     TC_UNLOCK_LIBAVCODEC; \
- } while (0)
---- transcode-1.1.7/export/export_ffmpeg.c.orig	2012-10-19 23:25:16.442303175 -0400
-+++ transcode-1.1.7/export/export_ffmpeg.c	2012-10-19 23:26:23.904268733 -0400
-@@ -1249,7 +1249,7 @@
-       return TC_EXPORT_ERROR;
-     }
- 
--    if (lavc_venc_context->codec->encode == NULL) {
-+    if (lavc_venc_context->codec->encode2 == NULL) {
-       tc_log_warn(MOD_NAME, "could not open FFMPEG codec "
-               "(lavc_venc_context->codec->encode == NULL)");
-       return TC_EXPORT_ERROR;
diff --git a/extra/transcode/transcode-1.1.7-ffmpeg-0.10.patch b/extra/transcode/transcode-1.1.7-ffmpeg-0.10.patch
new file mode 100644
index 000000000..ea737c8b0
--- /dev/null
+++ b/extra/transcode/transcode-1.1.7-ffmpeg-0.10.patch
@@ -0,0 +1,15 @@
+http://bugs.gentoo.org/401287
+
+--- filter/filter_pp.c
++++ filter/filter_pp.c
+@@ -38,8 +38,8 @@
+ 
+ /* FIXME: these use the filter ID as an index--the ID can grow
+  * arbitrarily large, so this needs to be fixed */
+-static pp_mode_t *mode[100];
+-static pp_context_t *context[100];
++static pp_mode *mode[100];
++static pp_context *context[100];
+ static int width[100], height[100];
+ static int pre[100];
+ 
diff --git a/extra/transcode/transcode-1.1.7-ffmpeg-0.11.patch b/extra/transcode/transcode-1.1.7-ffmpeg-0.11.patch
new file mode 100644
index 000000000..871d073fe
--- /dev/null
+++ b/extra/transcode/transcode-1.1.7-ffmpeg-0.11.patch
@@ -0,0 +1,303 @@
+Fix build with ffmpeg 0.11.
+https://bugs.gentoo.org/show_bug.cgi?id=419551
+Author: Brennan Shacklett
+
+diff -urN transcode-1.1.7-orig/encode/encode_lavc.c transcode-1.1.7/encode/encode_lavc.c
+--- transcode-1.1.7-orig/encode/encode_lavc.c	2011-11-19 08:50:27.000000000 -0800
++++ transcode-1.1.7/encode/encode_lavc.c	2012-07-03 10:47:03.528009149 -0700
+@@ -114,6 +114,7 @@
+ 
+     AVFrame ff_venc_frame;
+     AVCodecContext ff_vcontext;
++    AVDictionary ** ff_opts;
+ 
+     AVCodec *ff_vcodec;
+ 
+@@ -1036,14 +1037,10 @@
+     SET_FLAG(pd, mv0);
+     SET_FLAG(pd, cbp);
+     SET_FLAG(pd, qpel);
+-    SET_FLAG(pd, alt);
+-    SET_FLAG(pd, vdpart);
+     SET_FLAG(pd, naq);
+     SET_FLAG(pd, ilme);
+     SET_FLAG(pd, ildct);
+     SET_FLAG(pd, aic);
+-    SET_FLAG(pd, aiv);
+-    SET_FLAG(pd, umv);
+     SET_FLAG(pd, psnr);
+     SET_FLAG(pd, trell);
+     SET_FLAG(pd, gray);
+@@ -1064,6 +1061,18 @@
+         pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_DCT;
+         pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_ME;
+     }
++    if (pd->confdata.flags.alt) {
++        av_dict_set(pd->ff_opts, "alternate_scan", "1", 0);
++    }
++    if (pd->confdata.flags.vdpart) {
++        av_dict_set(pd->ff_opts, "data_partitioning", "1", 0);
++    }
++    if (pd->confdata.flags.umv) {
++        av_dict_set(pd->ff_opts, "umv", "1", 0);
++    }
++    if (pd->confdata.flags.aiv) {
++        av_dict_set(pd->ff_opts, "aiv", "1", 0);
++    }
+ }
+ 
+ #undef SET_FLAG
+@@ -1184,18 +1193,18 @@
+         { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0 },
+         { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD },
+         { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL },
+-        { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN },
++        { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, 1 },
+         { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME },
+         { "ildct", PAUX(flags.ildct), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_DCT },
+         { "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_NORMALIZE_AQP },
+-        { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART },
++        { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, 1 },
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+         { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIC },
+ #else        
+         { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED },
+ #endif
+-        { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIV },
+-        { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_UMV },
++        { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0, 1 },
++        { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0, 1 },
+         { "psnr", PAUX(flags.psnr), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR },
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+         { "trell", PAUX(flags.trell), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRELLIS_QUANT },
+@@ -1387,7 +1396,7 @@
+                     pd->confdata.thread_count,
+                     (pd->confdata.thread_count > 1) ?"s" :"");
+     }
+-    avcodec_thread_init(&pd->ff_vcontext, pd->confdata.thread_count);
++    pd->ff_vcontext.thread_count = pd->confdata.thread_count;
+ 
+     pd->ff_vcodec = avcodec_find_encoder(FF_VCODEC_ID(pd));
+     if (pd->ff_vcodec == NULL) {
+@@ -1397,11 +1406,11 @@
+     }
+ 
+     TC_LOCK_LIBAVCODEC;
+-    ret = avcodec_open(&pd->ff_vcontext, pd->ff_vcodec);
++    ret = avcodec_open2(&pd->ff_vcontext, pd->ff_vcodec, pd->ff_opts);
+     TC_UNLOCK_LIBAVCODEC;
+ 
+     if (ret < 0) {
+-        tc_log_error(MOD_NAME, "avcodec_open() failed");
++        tc_log_error(MOD_NAME, "avcodec_open2() failed");
+         goto failed;
+     }
+     /* finally, pass up the extradata, if any */
+diff -urN transcode-1.1.7-orig/export/export_ffmpeg.c transcode-1.1.7/export/export_ffmpeg.c
+--- transcode-1.1.7-orig/export/export_ffmpeg.c	2011-11-19 08:50:27.000000000 -0800
++++ transcode-1.1.7/export/export_ffmpeg.c	2012-07-03 13:15:23.918019415 -0700
+@@ -122,6 +122,7 @@
+ static AVFrame             *lavc_convert_frame = NULL;
+ 
+ static AVCodec             *lavc_venc_codec = NULL;
++static AVDictionary        **lavc_venc_opts = NULL;
+ static AVFrame             *lavc_venc_frame = NULL;
+ static AVCodecContext      *lavc_venc_context;
+ static avi_t               *avifile = NULL;
+@@ -180,7 +181,7 @@
+ 
+ 
+ /* START: COPIED FROM ffmpeg-0.5_p22846(ffmpeg.c, cmdutils.c) */
+-#include <libavcodec/opt.h>
++#include <libavutil/opt.h>
+ #include <libavutil/avstring.h>
+ #include <libswscale/swscale.h>
+ 
+@@ -470,7 +471,6 @@
+     }
+ 
+     TC_LOCK_LIBAVCODEC;
+-    avcodec_init();
+     avcodec_register_all();
+     TC_UNLOCK_LIBAVCODEC;
+ 
+@@ -634,7 +634,7 @@
+         lavc_param_rc_max_rate = 2516;
+         lavc_param_rc_buffer_size = 224 * 8;
+         lavc_param_rc_buffer_aggressivity = 99;
+-        lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET;
++        lavc_param_scan_offset = 1;
+ 
+         break;
+ 
+@@ -674,7 +674,7 @@
+ 
+         lavc_param_rc_buffer_size = 224 * 8;
+         lavc_param_rc_buffer_aggressivity = 99;
+-        lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET;
++        lavc_param_scan_offset = 1;
+ 
+         break;
+ 
+@@ -887,7 +887,7 @@
+ 		    lavc_venc_context->thread_count);
+     }
+ 
+-    avcodec_thread_init(lavc_venc_context, lavc_param_threads);
++    lavc_venc_context->thread_count = lavc_param_threads;
+ 
+     if (lavc_param_intra_matrix) {
+         char *tmp;
+@@ -1065,15 +1065,10 @@
+     lavc_venc_context->flags |= lavc_param_closedgop;
+     lavc_venc_context->flags |= lavc_param_trunc;
+     lavc_venc_context->flags |= lavc_param_aic;
+-    lavc_venc_context->flags |= lavc_param_umv;
+     lavc_venc_context->flags |= lavc_param_v4mv;
+-    lavc_venc_context->flags |= lavc_param_data_partitioning;
+     lavc_venc_context->flags |= lavc_param_cbp;
+     lavc_venc_context->flags |= lavc_param_mv0;
+     lavc_venc_context->flags |= lavc_param_qp_rd;
+-    lavc_venc_context->flags |= lavc_param_scan_offset;
+-    lavc_venc_context->flags |= lavc_param_ss;
+-    lavc_venc_context->flags |= lavc_param_alt;
+     lavc_venc_context->flags |= lavc_param_ilme;
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)   
+     lavc_venc_context->flags |= lavc_param_trell;
+@@ -1203,7 +1198,6 @@
+ 
+     lavc_venc_context->me_method = ME_ZERO + lavc_param_vme;
+ 
+-
+ 	/* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */
+ 	if (lavc_param_video_preset) {
+ 		avcodec_opts[AVMEDIA_TYPE_VIDEO] = lavc_venc_context;
+@@ -1241,20 +1235,39 @@
+ 		}
+ 	}
+ 
++    if (lavc_param_scan_offset) {
++      av_dict_set(lavc_venc_opts, "scan_offset", "1", 0);
++    }
++
++    if (lavc_param_ss) {
++      av_dict_set(lavc_venc_opts, "structured_slices", "1", 0);
++    }
++
++    if (lavc_param_alt) {
++      av_dict_set(lavc_venc_opts, "alternate_scan", "1", 0);
++    }
++
++    if (lavc_param_umv) {
++      av_dict_set(lavc_venc_opts, "umv", "1", 0);
++    }
++
++    if (lavc_param_data_partitioning) {
++      av_dict_set(lavc_venc_opts, "vdpart", "1", 0);
++    }
+ 
+     //-- open codec --
+     //----------------
+     TC_LOCK_LIBAVCODEC;
+-    ret = avcodec_open(lavc_venc_context, lavc_venc_codec);
++    ret = avcodec_open2(lavc_venc_context, lavc_venc_codec, lavc_venc_opts);
+     TC_UNLOCK_LIBAVCODEC;
+     if (ret < 0) {
+       tc_log_warn(MOD_NAME, "could not open FFMPEG codec");
+       return TC_EXPORT_ERROR;
+     }
+ 
+-    if (lavc_venc_context->codec->encode == NULL) {
++    if (av_codec_is_encoder(lavc_venc_context->codec) == 0) {
+       tc_log_warn(MOD_NAME, "could not open FFMPEG codec "
+-              "(lavc_venc_context->codec->encode == NULL)");
++              "(av_codec_is_encoder(lavc_venc_context->codec) == 0)");
+       return TC_EXPORT_ERROR;
+     }
+ 
+diff -urN transcode-1.1.7-orig/export/ffmpeg_cfg.c transcode-1.1.7/export/ffmpeg_cfg.c
+--- transcode-1.1.7-orig/export/ffmpeg_cfg.c	2011-11-19 08:50:27.000000000 -0800
++++ transcode-1.1.7/export/ffmpeg_cfg.c	2012-07-03 10:09:25.011003254 -0700
+@@ -160,9 +160,9 @@
+     {"vcelim", &lavc_param_chroma_elim_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99},
+     {"vpsize", &lavc_param_packet_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000},
+     {"vstrict", &lavc_param_strict, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99},
+-    {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART},
++    {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, 1},
+ //    {"keyint", &lavc_param_keyint, TCCONF_TYPE_INT, 0, 0, 0},
+-    {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART},
++    {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GRAY},
+     {"mpeg_quant", &lavc_param_mpeg_quant, TCCONF_TYPE_FLAG, 0, 0, 1},
+     {"vi_qfactor", &lavc_param_vi_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0},
+     {"vi_qoffset", &lavc_param_vi_qoffset, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0},
+@@ -211,7 +211,7 @@
+ #else
+     {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED},
+ #endif    
+-    {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_UMV},
++    {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, 1},
+     {"ibias", &lavc_param_ibias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512},
+     {"pbias", &lavc_param_pbias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512},
+     {"coder", &lavc_param_coder, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10},
+@@ -223,9 +223,9 @@
+     {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000},
+     {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QP_RD},
+     {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16},
+-    {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_SLICE_STRUCT},
+-    {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_SVCD_SCAN_OFFSET},
+-    {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN},
++    {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, 1},
++    {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, 1},
++    {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, 1},
+     {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME},
+     {"inter_threshold", &lavc_param_inter_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000},
+     {"sc_threshold", &lavc_param_sc_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000},
+diff -urN transcode-1.1.7-orig/import/decode_lavc.c transcode-1.1.7/import/decode_lavc.c
+--- transcode-1.1.7-orig/import/decode_lavc.c	2011-11-19 08:50:27.000000000 -0800
++++ transcode-1.1.7/import/decode_lavc.c	2012-07-03 10:21:46.085005182 -0700
+@@ -181,7 +181,7 @@
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+   lavc_dec_context->error_resilience  = 2;
+ #else
+-  lavc_dec_context->error_recognition = 2;
++  lavc_dec_context->err_recognition = 2;
+ #endif
+   lavc_dec_context->error_concealment = 3;
+   lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT;
+diff -urN transcode-1.1.7-orig/import/import_ffmpeg.c transcode-1.1.7/import/import_ffmpeg.c
+--- transcode-1.1.7-orig/import/import_ffmpeg.c	2011-11-19 08:50:27.000000000 -0800
++++ transcode-1.1.7/import/import_ffmpeg.c	2012-07-03 10:19:36.936004841 -0700
+@@ -314,7 +314,7 @@
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+     lavc_dec_context->error_resilience  = 2;
+ #else
+-    lavc_dec_context->error_recognition = 2;
++    lavc_dec_context->err_recognition = 2;
+ #endif
+     lavc_dec_context->error_concealment = 3;
+     lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT;
+diff -urN transcode-1.1.7-orig/import/probe_ffmpeg.c transcode-1.1.7/import/probe_ffmpeg.c
+--- transcode-1.1.7-orig/import/probe_ffmpeg.c	2011-11-19 08:50:27.000000000 -0800
++++ transcode-1.1.7/import/probe_ffmpeg.c	2012-07-03 10:41:42.782008306 -0700
+@@ -99,8 +99,8 @@
+ 
+     TC_INIT_LIBAVCODEC;
+ 
+-    ret = av_open_input_file(&lavf_dmx_context, ipipe->name,
+-                             NULL, 0, NULL);
++    ret = avformat_open_input(&lavf_dmx_context, ipipe->name,
++                             NULL, NULL);
+     if (ret != 0) {
+         tc_log_error(__FILE__, "unable to open '%s'"
+                                " (libavformat failure)",
+diff -urN transcode-1.1.7-orig/libtc/tcavcodec.h transcode-1.1.7/libtc/tcavcodec.h
+--- transcode-1.1.7-orig/libtc/tcavcodec.h	2011-11-19 08:50:27.000000000 -0800
++++ transcode-1.1.7/libtc/tcavcodec.h	2012-07-03 10:34:43.648007213 -0700
+@@ -53,7 +53,6 @@
+ 
+ #define TC_INIT_LIBAVCODEC do { \
+     TC_LOCK_LIBAVCODEC; \
+-    avcodec_init(); \
+     avcodec_register_all(); \
+     TC_UNLOCK_LIBAVCODEC; \
+ } while (0)
diff --git a/extra/transcode/transcode-1.1.7-ffmpeg.patch b/extra/transcode/transcode-1.1.7-ffmpeg.patch
new file mode 100644
index 000000000..be7a6cbae
--- /dev/null
+++ b/extra/transcode/transcode-1.1.7-ffmpeg.patch
@@ -0,0 +1,51 @@
+--- encode/encode_lavc.c
++++ encode/encode_lavc.c
+@@ -955,8 +955,6 @@
+     /* 
+      * context *transcode* (not libavcodec) defaults
+      */
+-    pd->ff_vcontext.mb_qmin                 = 2;
+-    pd->ff_vcontext.mb_qmax                 = 31;
+     pd->ff_vcontext.max_qdiff               = 3;
+     pd->ff_vcontext.max_b_frames            = 0;
+     pd->ff_vcontext.me_range                = 0;
+@@ -1116,8 +1114,6 @@
+         //  handled by transcode core
+         //  { "vqmax", PCTX(qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 },
+         //  handled by transcode core
+-        { "mbqmin", PCTX(mb_qmin), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 },
+-        { "mbqmax", PCTX(mb_qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 },
+         { "lmin", PAUX(lmin), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 },
+         { "lmax", PAUX(lmax), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 },
+         { "vqdiff", PCTX(max_qdiff), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31 },
+--- export/ffmpeg_cfg.c
++++ export/ffmpeg_cfg.c
+@@ -34,8 +34,6 @@
+ //int lavc_param_vqscale = 0;
+ //int lavc_param_vqmin = 2;
+ //int lavc_param_vqmax = 31;
+-int lavc_param_mb_qmin = 2;
+-int lavc_param_mb_qmax = 31;
+ int lavc_param_lmin = 2;
+ int lavc_param_lmax = 31;
+ int lavc_param_vqdiff = 3;
+@@ -143,8 +141,6 @@
+ //    {"vqscale", &lavc_param_vqscale, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
+ //    {"vqmin", &lavc_param_vqmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
+ //    {"vqmax", &lavc_param_vqmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
+-    {"mbqmin", &lavc_param_mb_qmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
+-    {"mbqmax", &lavc_param_mb_qmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
+     {"lmin", &lavc_param_lmin, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0},
+     {"lmax", &lavc_param_lmax, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0},
+     {"vqdiff", &lavc_param_vqdiff, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
+--- export/ffmpeg_cfg.h
++++ export/ffmpeg_cfg.h
+@@ -13,8 +13,6 @@
+ //extern int lavc_param_vqscale;
+ //extern int lavc_param_vqmin;
+ //extern int lavc_param_vqmax;
+-extern int lavc_param_mb_qmin;
+-extern int lavc_param_mb_qmax;
+ extern int lavc_param_lmin;
+ extern int lavc_param_lmax;
+ extern int lavc_param_vqdiff;
diff --git a/extra/transcode/transcode-1.1.7-ffmpeg2.patch b/extra/transcode/transcode-1.1.7-ffmpeg2.patch
new file mode 100644
index 000000000..26d743140
--- /dev/null
+++ b/extra/transcode/transcode-1.1.7-ffmpeg2.patch
@@ -0,0 +1,332 @@
+Fix build with ffmpeg-2.0.
+Fix segfaults introduced by wrong usage of the av_dict API.
+Fix forgotten parts in the libav9 patch.
+
+Index: transcode-1.1.7/encode/encode_lavc.c
+===================================================================
+--- transcode-1.1.7.orig/encode/encode_lavc.c
++++ transcode-1.1.7/encode/encode_lavc.c
+@@ -74,6 +74,9 @@ struct tclavcconfigdata_ {
+     int lmin;
+     int lmax;
+     int me_method;
++    int luma_elim_threshold;
++    int chroma_elim_threshold;
++    int quantizer_noise_shaping;
+ 
+     /* same as above for flags */
+     struct {
+@@ -114,7 +117,7 @@ struct tclavcprivatedata_ {
+ 
+     AVFrame ff_venc_frame;
+     AVCodecContext ff_vcontext;
+-    AVDictionary ** ff_opts;
++    AVDictionary * ff_opts;
+ 
+     AVCodec *ff_vcodec;
+ 
+@@ -165,6 +168,7 @@ static const TCCodecID tc_lavc_codecs_ou
+     TC_CODEC_ERROR
+ };
+ 
++#if LIBAVCODEC_VERSION_MAJOR < 55
+ static const enum CodecID tc_lavc_internal_codecs[] = {
+     CODEC_ID_MPEG1VIDEO, CODEC_ID_MPEG2VIDEO, CODEC_ID_MPEG4,
+     CODEC_ID_H263I, CODEC_ID_H263P,
+@@ -177,6 +181,20 @@ static const enum CodecID tc_lavc_intern
+     CODEC_ID_MSMPEG4V2, CODEC_ID_MSMPEG4V3,
+     CODEC_ID_NONE
+ };
++#else
++static const enum AVCodecID tc_lavc_internal_codecs[] = {
++    AV_CODEC_ID_MPEG1VIDEO, AV_CODEC_ID_MPEG2VIDEO, AV_CODEC_ID_MPEG4,
++    AV_CODEC_ID_H263I, AV_CODEC_ID_H263P,
++    AV_CODEC_ID_H264,
++    AV_CODEC_ID_WMV1, AV_CODEC_ID_WMV2,
++    AV_CODEC_ID_RV10,
++    AV_CODEC_ID_HUFFYUV, AV_CODEC_ID_FFV1,
++    AV_CODEC_ID_DVVIDEO,
++    AV_CODEC_ID_MJPEG, AV_CODEC_ID_LJPEG,
++    AV_CODEC_ID_MSMPEG4V2, AV_CODEC_ID_MSMPEG4V3,
++    AV_CODEC_ID_NONE
++};
++#endif
+ 
+ static const TCFormatID tc_lavc_formats[] = { TC_FORMAT_ERROR };
+ 
+@@ -938,7 +956,11 @@ static int tc_lavc_settings_from_vob(TCL
+ static void tc_lavc_config_defaults(TCLavcPrivateData *pd)
+ {
+     /* first of all reinitialize lavc data */
++#if LIBAVCODEC_VERSION_MAJOR < 55
+     avcodec_get_context_defaults(&pd->ff_vcontext);
++#else
++    avcodec_get_context_defaults3(&pd->ff_vcontext, NULL);
++#endif
+ 
+     pd->confdata.thread_count = 1;
+ 
+@@ -976,8 +998,8 @@ static void tc_lavc_config_defaults(TCLa
+     pd->ff_vcontext.mpeg_quant              = 0;
+     pd->ff_vcontext.rc_initial_cplx         = 0.0;
+     pd->ff_vcontext.rc_qsquish              = 1.0;
+-    pd->ff_vcontext.luma_elim_threshold     = 0;
+-    pd->ff_vcontext.chroma_elim_threshold   = 0;
++    pd->confdata.luma_elim_threshold     = 0;
++    pd->confdata.chroma_elim_threshold   = 0;
+     pd->ff_vcontext.strict_std_compliance   = 0;
+     pd->ff_vcontext.dct_algo                = FF_DCT_AUTO;
+     pd->ff_vcontext.idct_algo               = FF_IDCT_AUTO;
+@@ -1001,7 +1023,7 @@ static void tc_lavc_config_defaults(TCLa
+     pd->ff_vcontext.intra_quant_bias        = FF_DEFAULT_QUANT_BIAS;
+     pd->ff_vcontext.inter_quant_bias        = FF_DEFAULT_QUANT_BIAS;
+     pd->ff_vcontext.noise_reduction         = 0;
+-    pd->ff_vcontext.quantizer_noise_shaping = 0;
++    pd->confdata.quantizer_noise_shaping = 0;
+     pd->ff_vcontext.flags                   = 0;
+ }
+ 
+@@ -1033,7 +1055,6 @@ static void tc_lavc_dispatch_settings(TC
+ 
+     pd->ff_vcontext.flags = 0;
+     SET_FLAG(pd, mv0);
+-    SET_FLAG(pd, cbp);
+     SET_FLAG(pd, qpel);
+     SET_FLAG(pd, naq);
+     SET_FLAG(pd, ilme);
+@@ -1060,17 +1081,29 @@ static void tc_lavc_dispatch_settings(TC
+         pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_ME;
+     }
+     if (pd->confdata.flags.alt) {
+-        av_dict_set(pd->ff_opts, "alternate_scan", "1", 0);
++        av_dict_set(&(pd->ff_opts), "alternate_scan", "1", 0);
+     }
+     if (pd->confdata.flags.vdpart) {
+-        av_dict_set(pd->ff_opts, "data_partitioning", "1", 0);
++        av_dict_set(&(pd->ff_opts), "data_partitioning", "1", 0);
+     }
+     if (pd->confdata.flags.umv) {
+-        av_dict_set(pd->ff_opts, "umv", "1", 0);
++        av_dict_set(&(pd->ff_opts), "umv", "1", 0);
+     }
+     if (pd->confdata.flags.aiv) {
+-        av_dict_set(pd->ff_opts, "aiv", "1", 0);
++        av_dict_set(&(pd->ff_opts), "aiv", "1", 0);
+     }
++    if (pd->confdata.flags.cbp) {
++    	av_dict_set(&(pd->ff_opts), "mpv_flags", "+cbp_rd", 0);
++    }
++
++    char buf[1024];
++#define set_dict_opt(val, opt) \
++    snprintf(buf, sizeof(buf), "%i", pd->confdata.val);\
++    av_dict_set(&(pd->ff_opts), opt, buf, 0)
++
++    set_dict_opt(luma_elim_threshold, "luma_elim_threshold");
++    set_dict_opt(chroma_elim_threshold, "chroma_elim_threshold");
++    set_dict_opt(quantizer_noise_shaping, "quantizer_noise_shaping");
+ }
+ 
+ #undef SET_FLAG
+@@ -1155,8 +1188,8 @@ static int tc_lavc_read_config(TCLavcPri
+         { "vrc_init_cplx", PCTX(rc_initial_cplx), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 9999999.0 },
+         //  { "vrc_init_occupancy",   }, // not yet supported
+         { "vqsquish", PCTX(rc_qsquish), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 99.0 },
+-        { "vlelim", PCTX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
+-        { "vcelim", PCTX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
++        { "vlelim", PAUX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
++        { "vcelim", PAUX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
+         { "vstrict", PCTX(strict_std_compliance), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
+         { "vpsize", PCTX(rtp_payload_size), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000 },
+         { "dct", PCTX(dct_algo), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10 },
+@@ -1182,12 +1215,12 @@ static int tc_lavc_read_config(TCLavcPri
+         { "ibias", PCTX(intra_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 },
+         { "pbias", PCTX(inter_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 },
+         { "nr", PCTX(noise_reduction), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000},
+-        { "qns", PCTX(quantizer_noise_shaping), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 },
++        { "qns", PAUX(quantizer_noise_shaping), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 },
+         { "inter_matrix_file", inter_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 },
+         { "intra_matrix_file", intra_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 },
+     
+         { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0 },
+-        { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD },
++        { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, 1 },
+         { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL },
+         { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, 1 },
+         { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME },
+@@ -1350,6 +1383,8 @@ static int tc_lavc_configure(TCModuleIns
+ 
+     pd = self->userdata;
+ 
++    pd->ff_opts = NULL;
++
+     pd->flush_flag = vob->encoder_flush;
+     
+     /* FIXME: move into core? */
+@@ -1402,7 +1437,7 @@ static int tc_lavc_configure(TCModuleIns
+     }
+ 
+     TC_LOCK_LIBAVCODEC;
+-    ret = avcodec_open2(&pd->ff_vcontext, pd->ff_vcodec, pd->ff_opts);
++    ret = avcodec_open2(&pd->ff_vcontext, pd->ff_vcodec, &(pd->ff_opts));
+     TC_UNLOCK_LIBAVCODEC;
+ 
+     if (ret < 0) {
+Index: transcode-1.1.7/export/export_ffmpeg.c
+===================================================================
+--- transcode-1.1.7.orig/export/export_ffmpeg.c
++++ transcode-1.1.7/export/export_ffmpeg.c
+@@ -122,7 +122,7 @@ static uint8_t             *img_buffer =
+ static AVFrame             *lavc_convert_frame = NULL;
+ 
+ static AVCodec             *lavc_venc_codec = NULL;
+-static AVDictionary        **lavc_venc_opts = NULL;
++static AVDictionary        *lavc_venc_opts = NULL;
+ static AVFrame             *lavc_venc_frame = NULL;
+ static AVCodecContext      *lavc_venc_context;
+ static avi_t               *avifile = NULL;
+@@ -486,7 +486,7 @@ MOD_init
+ 		            codec->name, codec->fourCC, codec->comments);
+     }
+ 
+-    lavc_venc_context = avcodec_alloc_context();
++    lavc_venc_context = avcodec_alloc_context3(lavc_venc_codec);
+     lavc_venc_frame   = avcodec_alloc_frame();
+ 
+     lavc_convert_frame= avcodec_alloc_frame();
+@@ -838,8 +838,13 @@ MOD_init
+     lavc_venc_context->rc_strategy        = lavc_param_vrc_strategy;
+     lavc_venc_context->b_frame_strategy   = lavc_param_vb_strategy;
+     lavc_venc_context->b_quant_offset     = lavc_param_vb_qoffset;
+-    lavc_venc_context->luma_elim_threshold= lavc_param_luma_elim_threshold;
+-    lavc_venc_context->chroma_elim_threshold= lavc_param_chroma_elim_threshold;
++
++    char buf[1024];
++#define set_dict_opt(val, opt) \
++	snprintf(buf, sizeof(buf), "%i", val); \
++	av_dict_set(&lavc_venc_opts, opt, buf, 0)
++    set_dict_opt(lavc_param_luma_elim_threshold, "luma_elim_threshold");
++    set_dict_opt(lavc_param_chroma_elim_threshold, "chroma_elim_threshold");
+     lavc_venc_context->rtp_payload_size   = lavc_param_packet_size;
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)   
+     if (lavc_param_packet_size)
+@@ -870,7 +875,7 @@ MOD_init
+     lavc_venc_context->context_model      = lavc_param_context;
+     lavc_venc_context->scenechange_threshold= lavc_param_sc_threshold;
+     lavc_venc_context->noise_reduction    = lavc_param_noise_reduction;
+-    lavc_venc_context->inter_threshold    = lavc_param_inter_threshold;
++    set_dict_opt(lavc_param_inter_threshold, "inter_threshold");
+     lavc_venc_context->intra_dc_precision = lavc_param_intra_dc_precision;
+     lavc_venc_context->skip_top           = lavc_param_skip_top;
+     lavc_venc_context->skip_bottom        = lavc_param_skip_bottom;
+@@ -1066,9 +1071,11 @@ MOD_init
+     lavc_venc_context->flags |= lavc_param_trunc;
+     lavc_venc_context->flags |= lavc_param_aic;
+     lavc_venc_context->flags |= lavc_param_v4mv;
+-    lavc_venc_context->flags |= lavc_param_cbp;
++    if(lavc_param_cbp)
++    	av_dict_set(&lavc_venc_opts, "mpv_flags", "+cbp_rd", 0);
+     lavc_venc_context->flags |= lavc_param_mv0;
+-    lavc_venc_context->flags |= lavc_param_qp_rd;
++    if(lavc_param_qp_rd)
++    	av_dict_set(&lavc_venc_opts, "mpv_flags", "+qp_rd", 0);
+     lavc_venc_context->flags |= lavc_param_ilme;
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)   
+     lavc_venc_context->flags |= lavc_param_trell;
+@@ -1238,29 +1245,29 @@ MOD_init
+ 	}
+ 
+     if (lavc_param_scan_offset) {
+-      av_dict_set(lavc_venc_opts, "scan_offset", "1", 0);
++      av_dict_set(&lavc_venc_opts, "scan_offset", "1", 0);
+     }
+ 
+     if (lavc_param_ss) {
+-      av_dict_set(lavc_venc_opts, "structured_slices", "1", 0);
++      av_dict_set(&lavc_venc_opts, "structured_slices", "1", 0);
+     }
+ 
+     if (lavc_param_alt) {
+-      av_dict_set(lavc_venc_opts, "alternate_scan", "1", 0);
++      av_dict_set(&lavc_venc_opts, "alternate_scan", "1", 0);
+     }
+ 
+     if (lavc_param_umv) {
+-      av_dict_set(lavc_venc_opts, "umv", "1", 0);
++      av_dict_set(&lavc_venc_opts, "umv", "1", 0);
+     }
+ 
+     if (lavc_param_data_partitioning) {
+-      av_dict_set(lavc_venc_opts, "vdpart", "1", 0);
++      av_dict_set(&lavc_venc_opts, "vdpart", "1", 0);
+     }
+ 
+     //-- open codec --
+     //----------------
+     TC_LOCK_LIBAVCODEC;
+-    ret = avcodec_open2(lavc_venc_context, lavc_venc_codec, lavc_venc_opts);
++    ret = avcodec_open2(lavc_venc_context, lavc_venc_codec, &lavc_venc_opts);
+     TC_UNLOCK_LIBAVCODEC;
+     if (ret < 0) {
+       tc_log_warn(MOD_NAME, "could not open FFMPEG codec");
+Index: transcode-1.1.7/export/ffmpeg_cfg.c
+===================================================================
+--- transcode-1.1.7.orig/export/ffmpeg_cfg.c
++++ transcode-1.1.7/export/ffmpeg_cfg.c
+@@ -214,10 +214,10 @@ TCConfigEntry lavcopts_conf[]={
+     {"context", &lavc_param_context, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10},
+     {"intra_matrix", &lavc_param_intra_matrix, TCCONF_TYPE_STRING, 0, 0, 0},
+     {"inter_matrix", &lavc_param_inter_matrix, TCCONF_TYPE_STRING, 0, 0, 0},
+-    {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD},
++    {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, 1},
+     {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0},
+     {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000},
+-    {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QP_RD},
++    {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, 1},
+     {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16},
+     {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, 1},
+     {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, 1},
+Index: transcode-1.1.7/export/aud_aux.c
+===================================================================
+--- transcode-1.1.7.orig/export/aud_aux.c
++++ transcode-1.1.7/export/aud_aux.c
+@@ -346,7 +346,7 @@ static int tc_audio_init_ffmpeg(vob_t *v
+ 
+     //-- set parameters (bitrate, channels and sample-rate) --
+     //--------------------------------------------------------
+-    avcodec_get_context_defaults(&mpa_ctx);
++    avcodec_get_context_defaults3(&mpa_ctx, mpa_codec);
+ #if LIBAVCODEC_VERSION_MAJOR < 53
+     mpa_ctx.codec_type  = CODEC_TYPE_AUDIO;
+ #else
+@@ -359,7 +359,7 @@ static int tc_audio_init_ffmpeg(vob_t *v
+     //-- open codec --
+     //----------------
+     TC_LOCK_LIBAVCODEC;
+-    ret = avcodec_open(&mpa_ctx, mpa_codec);
++    ret = avcodec_open2(&mpa_ctx, mpa_codec, NULL);
+     TC_UNLOCK_LIBAVCODEC;
+     if (ret < 0) {
+         tc_warn("tc_audio_init_ffmpeg: could not open %s codec !",
+Index: transcode-1.1.7/import/import_ffmpeg.c
+===================================================================
+--- transcode-1.1.7.orig/import/import_ffmpeg.c
++++ transcode-1.1.7/import/import_ffmpeg.c
+@@ -302,7 +302,7 @@ do_avi:
+ 
+     // Set these to the expected values so that ffmpeg's decoder can
+     // properly detect interlaced input.
+-    lavc_dec_context = avcodec_alloc_context();
++    lavc_dec_context = avcodec_alloc_context3(lavc_dec_codec);
+     if (lavc_dec_context == NULL) {
+       tc_log_error(MOD_NAME, "Could not allocate enough memory.");
+       return TC_IMPORT_ERROR;
+@@ -344,7 +344,7 @@ do_avi:
+     }
+ 
+     TC_LOCK_LIBAVCODEC;
+-    ret = avcodec_open(lavc_dec_context, lavc_dec_codec);
++    ret = avcodec_open2(lavc_dec_context, lavc_dec_codec, NULL);
+     TC_UNLOCK_LIBAVCODEC;
+     if (ret < 0) {
+       tc_log_warn(MOD_NAME, "Could not initialize the '%s' codec.",
diff --git a/extra/transcode/transcode-1.1.7-preset-force.patch b/extra/transcode/transcode-1.1.7-preset-force.patch
new file mode 100644
index 000000000..0d1da8b4f
--- /dev/null
+++ b/extra/transcode/transcode-1.1.7-preset-force.patch
@@ -0,0 +1,28 @@
+Do not force using a preset. Do not try to open non-existant preset by default.
+
+Index: transcode-1.1.7/export/export_ffmpeg.c
+===================================================================
+--- transcode-1.1.7.orig/export/export_ffmpeg.c
++++ transcode-1.1.7/export/export_ffmpeg.c
+@@ -1206,7 +1206,7 @@ MOD_init
+     lavc_venc_context->me_method = ME_ZERO + lavc_param_vme;
+ 
+ 	/* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */
+-	if (lavc_param_video_preset) {
++	if (lavc_param_video_preset && strcmp(lavc_param_video_preset, "none")) {
+ 		avcodec_opts[AVMEDIA_TYPE_VIDEO] = lavc_venc_context;
+ 		video_codec_name = av_strdup(ffmpeg_codec_name(codec->name));
+ 
+Index: transcode-1.1.7/export/ffmpeg_cfg.c
+===================================================================
+--- transcode-1.1.7.orig/export/ffmpeg_cfg.c
++++ transcode-1.1.7/export/ffmpeg_cfg.c
+@@ -124,7 +124,7 @@ int lavc_param_gmc = 0;
+ //int lavc_param_atag = 0;
+ //int lavc_param_abitrate = 224;
+ 
+-char *lavc_param_video_preset = "medium";
++char *lavc_param_video_preset = "none";
+ char *lavc_param_ffmpeg_datadir = "/usr/share/ffmpeg";
+ 
+ TCConfigEntry lavcopts_conf[]={
diff --git a/extra/transcode/transcode-1.1.7-preset-free.patch b/extra/transcode/transcode-1.1.7-preset-free.patch
new file mode 100644
index 000000000..00494b94b
--- /dev/null
+++ b/extra/transcode/transcode-1.1.7-preset-free.patch
@@ -0,0 +1,34 @@
+Fix invalid free when preset file not found
+https://bugs.gentoo.org/show_bug.cgi?id=322945
+Author: Brennan Shacklett
+
+diff -urN transcode-1.1.7-orig/export/export_ffmpeg.c transcode-1.1.7/export/export_ffmpeg.c
+--- transcode-1.1.7-orig/export/export_ffmpeg.c	2011-11-19 08:50:27.000000000 -0800
++++ transcode-1.1.7/export/export_ffmpeg.c	2012-07-03 20:07:05.669083945 -0700
+@@ -321,7 +321,7 @@
+     }
+ 
+     if(!f){
+-        fprintf(stderr, "File for preset '%s' not found\n", arg);
++        tc_log_error(MOD_NAME, "File for preset '%s' not found", arg);
+         av_exit(1);
+     }
+ 
+@@ -1207,7 +1207,7 @@
+ 	/* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */
+ 	if (lavc_param_video_preset) {
+ 		avcodec_opts[AVMEDIA_TYPE_VIDEO] = lavc_venc_context;
+-		video_codec_name = ffmpeg_codec_name(codec->name);
++		video_codec_name = av_strdup(ffmpeg_codec_name(codec->name));
+ 
+ 		const char *preset_start = lavc_param_video_preset;
+ 		while (preset_start) {
+@@ -1225,6 +1225,8 @@
+ 			if (opt_preset("vpre", preset_name) != 0) {
+ 				tc_log_warn(MOD_NAME, "Parsing ffmpeg preset '%s' failed", preset_name);
+ 			}
++      av_free(video_codec_name);
++      video_codec_name = NULL;
+ 			if (verbose) {
+ 				int i;
+ 				tc_log_info(MOD_NAME, "After parsing preset '%s', %i options are overridden:", preset_name, opt_name_count);
diff --git a/extra/transcode/transcode-ffmpeg.patch b/extra/transcode/transcode-ffmpeg.patch
deleted file mode 100644
index 0021d07d5..000000000
--- a/extra/transcode/transcode-ffmpeg.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-diff -Naur transcode-1.1.7-orig/encode/encode_lavc.c transcode-1.1.7/encode/encode_lavc.c
---- transcode-1.1.7-orig/encode/encode_lavc.c	2013-07-13 18:41:25.441796991 -0400
-+++ transcode-1.1.7/encode/encode_lavc.c	2013-07-13 18:45:21.042465999 -0400
-@@ -977,8 +977,6 @@
-     pd->ff_vcontext.mpeg_quant              = 0;
-     pd->ff_vcontext.rc_initial_cplx         = 0.0;
-     pd->ff_vcontext.rc_qsquish              = 1.0;
--    pd->ff_vcontext.luma_elim_threshold     = 0;
--    pd->ff_vcontext.chroma_elim_threshold   = 0;
-     pd->ff_vcontext.strict_std_compliance   = 0;
-     pd->ff_vcontext.dct_algo                = FF_DCT_AUTO;
-     pd->ff_vcontext.idct_algo               = FF_IDCT_AUTO;
-@@ -1150,8 +1148,6 @@
-         { "vrc_init_cplx", PCTX(rc_initial_cplx), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 9999999.0 },
-         //  { "vrc_init_occupancy",   }, // not yet supported
-         { "vqsquish", PCTX(rc_qsquish), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 99.0 },
--        { "vlelim", PCTX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
--        { "vcelim", PCTX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
-         { "vstrict", PCTX(strict_std_compliance), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
-         { "vpsize", PCTX(rtp_payload_size), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000 },
-         { "dct", PCTX(dct_algo), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10 },
-@@ -1182,7 +1178,7 @@
-         { "intra_matrix_file", intra_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 },
-     
-         { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0 },
--        { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD },
-+        { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, 0x04000000 },
-         { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL },
-         { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN },
-         { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME },
-diff -Naur transcode-1.1.7-orig/export/export_ffmpeg.c transcode-1.1.7/export/export_ffmpeg.c
---- transcode-1.1.7-orig/export/export_ffmpeg.c	2013-07-13 18:41:25.438463695 -0400
-+++ transcode-1.1.7/export/export_ffmpeg.c	2013-07-13 18:48:46.263478358 -0400
-@@ -835,8 +835,6 @@
-     lavc_venc_context->rc_strategy        = lavc_param_vrc_strategy;
-     lavc_venc_context->b_frame_strategy   = lavc_param_vb_strategy;
-     lavc_venc_context->b_quant_offset     = lavc_param_vb_qoffset;
--    lavc_venc_context->luma_elim_threshold= lavc_param_luma_elim_threshold;
--    lavc_venc_context->chroma_elim_threshold= lavc_param_chroma_elim_threshold;
-     lavc_venc_context->rtp_payload_size   = lavc_param_packet_size;
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)   
-     if (lavc_param_packet_size)
-@@ -867,7 +865,6 @@
-     lavc_venc_context->context_model      = lavc_param_context;
-     lavc_venc_context->scenechange_threshold= lavc_param_sc_threshold;
-     lavc_venc_context->noise_reduction    = lavc_param_noise_reduction;
--    lavc_venc_context->inter_threshold    = lavc_param_inter_threshold;
-     lavc_venc_context->intra_dc_precision = lavc_param_intra_dc_precision;
-     lavc_venc_context->skip_top           = lavc_param_skip_top;
-     lavc_venc_context->skip_bottom        = lavc_param_skip_bottom;
-diff -Naur transcode-1.1.7-orig/export/ffmpeg_cfg.c transcode-1.1.7/export/ffmpeg_cfg.c
---- transcode-1.1.7-orig/export/ffmpeg_cfg.c	2013-07-13 18:41:25.438463695 -0400
-+++ transcode-1.1.7/export/ffmpeg_cfg.c	2013-07-13 18:48:34.633609112 -0400
-@@ -50,8 +50,6 @@
- //int lavc_param_vpass = 0;
- int lavc_param_vrc_strategy = 2;
- int lavc_param_vb_strategy = 0;
--int lavc_param_luma_elim_threshold = 0;
--int lavc_param_chroma_elim_threshold = 0;
- int lavc_param_packet_size= 0;
- int lavc_param_strict= 0;
- int lavc_param_data_partitioning= 0;
-@@ -105,7 +103,6 @@
- int lavc_param_mv0= 0;
- int lavc_param_noise_reduction= 0;
- int lavc_param_qp_rd= 0;
--int lavc_param_inter_threshold= 0;
- int lavc_param_sc_threshold= 0;
- int lavc_param_ss= 0;
- int lavc_param_top= -1;
-@@ -156,8 +153,6 @@
-     {"vrc_strategy", &lavc_param_vrc_strategy, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2},
-     {"vb_strategy", &lavc_param_vb_strategy, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10},
-     {"vb_qoffset", &lavc_param_vb_qoffset, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0},
--    {"vlelim", &lavc_param_luma_elim_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99},
--    {"vcelim", &lavc_param_chroma_elim_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99},
-     {"vpsize", &lavc_param_packet_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000},
-     {"vstrict", &lavc_param_strict, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99},
- //    {"keyint", &lavc_param_keyint, TCCONF_TYPE_INT, 0, 0, 0},
-@@ -215,13 +210,12 @@
-     {"context", &lavc_param_context, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10},
-     {"intra_matrix", &lavc_param_intra_matrix, TCCONF_TYPE_STRING, 0, 0, 0},
-     {"inter_matrix", &lavc_param_inter_matrix, TCCONF_TYPE_STRING, 0, 0, 0},
--    {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD},
-+    {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, 0x04000000},
-     {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0},
-     {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000},
--    {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QP_RD},
-+    {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, 0x08000000},
-     {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16},
-     {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME},
--    {"inter_threshold", &lavc_param_inter_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000},
-     {"sc_threshold", &lavc_param_sc_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000},
-     {"top", &lavc_param_top, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1, 1},
-     {"gmc", &lavc_param_gmc, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GMC},
-diff -Naur transcode-1.1.7-orig/export/ffmpeg_cfg.h transcode-1.1.7/export/ffmpeg_cfg.h
---- transcode-1.1.7-orig/export/ffmpeg_cfg.h	2013-07-13 18:41:25.438463695 -0400
-+++ transcode-1.1.7/export/ffmpeg_cfg.h	2013-07-13 18:49:04.169944470 -0400
-@@ -29,8 +29,6 @@
- //extern int lavc_param_vpass;
- extern int lavc_param_vrc_strategy;
- extern int lavc_param_vb_strategy;
--extern int lavc_param_luma_elim_threshold;
--extern int lavc_param_chroma_elim_threshold;
- extern int lavc_param_packet_size;
- extern int lavc_param_strict;
- extern int lavc_param_data_partitioning;
-@@ -84,7 +82,6 @@
- extern int lavc_param_mv0;
- extern int lavc_param_noise_reduction;
- extern int lavc_param_qp_rd;
--extern int lavc_param_inter_threshold;
- extern int lavc_param_sc_threshold;
- extern int lavc_param_ss;
- extern int lavc_param_top;
diff --git a/extra/transfig/PKGBUILD b/extra/transfig/PKGBUILD
index 5aec31a4a..fb25f29d8 100644
--- a/extra/transfig/PKGBUILD
+++ b/extra/transfig/PKGBUILD
@@ -1,26 +1,23 @@
-# $Id: PKGBUILD 184440 2013-05-06 19:39:57Z foutrelis $
+# $Id: PKGBUILD 194011 2013-09-09 18:48:23Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=transfig
-pkgver=3.2.5d
-pkgrel=2
+pkgver=3.2.5e
+pkgrel=1
 pkgdesc="Format conversion utility that can be used with xfig"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xfig.org"
 license=('custom')
-depends=('libpng' 'libxpm')
+depends=('libpng' 'libxpm' 'bc')
 makedepends=('imake')
-source=(http://downloads.sourceforge.net/mcj/${pkgname}.${pkgver}.tar.gz LICENSE \
-        transfig-3.2.5d-libpng-1.5.patch)
-sha1sums=('90ff277cc9b3fa0d0313052fcf5e3ffad8652abc'
-          'b8b712871615308b8b6add92f86d218437d652f2'
-          '9f9f332b0b31e58e59542bc1568df9617b71710a')
+source=(http://downloads.sourceforge.net/mcj/${pkgname}.${pkgver}.tar.gz LICENSE)
+sha1sums=('27aa9691bf84f8775db9be39c453a8132148bad1'
+          'b8b712871615308b8b6add92f86d218437d652f2')
 
 prepare() {
   cd ${pkgname}.${pkgver}
-  sed -i 's/XCOMM USELATEX2E = -DLATEX2E/USELATEX2E = -DLATEX2E/' transfig/Imakefile
-  sed -i 's/XCOMM USEINLINE = -DUSE_INLINE/USEINLINE = -DUSE_INLINE/' fig2dev/Imakefile
-  patch -p1 -i ../transfig-3.2.5d-libpng-1.5.patch
+  sed -i 's/XCOMM USELATEX2E/USELATEX2E/' transfig/Imakefile
+  sed -i 's/XCOMM USEINLINE/USEINLINE/' fig2dev/Imakefile
 }
 
 build() {
@@ -35,5 +32,6 @@ package() {
   make DESTDIR="${pkgdir}" XFIGLIBDIR=/usr/share/xfig \
     FIG2DEV_LIBDIR=/usr/share/fig2dev MANPATH=/usr/share/man \
     install install.man
+  mv "${pkgdir}/usr/bin/fig2ps2tex.sh" "${pkgdir}/usr/bin/fig2ps2tex"
   install -Dm644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/transfig/transfig-3.2.5d-libpng-1.5.patch b/extra/transfig/transfig-3.2.5d-libpng-1.5.patch
deleted file mode 100644
index e6f15e43e..000000000
--- a/extra/transfig/transfig-3.2.5d-libpng-1.5.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=356751
-
-Index: transfig.3.2.5d/fig2dev/dev/readpng.c
-===================================================================
---- transfig.3.2.5d.orig/fig2dev/dev/readpng.c
-+++ transfig.3.2.5d/fig2dev/dev/readpng.c
-@@ -62,7 +62,7 @@ read_png(file,filetype,pic,llx,lly)
-     }
- 
-     /* set long jump here */
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
- 	/* if we get here there was a problem reading the file */
- 	png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
- 	return 0;
-@@ -78,15 +78,17 @@ read_png(file,filetype,pic,llx,lly)
-     png_get_IHDR(png_ptr, info_ptr, &w, &h, &bit_depth, &color_type,
- 	&interlace_type, &compression_type, &filter_type);
- 
--    if (info_ptr->valid & PNG_INFO_gAMA)
--	png_set_gamma(png_ptr, 2.2, info_ptr->gamma);
--    else
--	png_set_gamma(png_ptr, 2.2, 0.45);
-+    png_fixed_point gamma = 0.45;
-+    png_get_gAMA_fixed(png_ptr,info_ptr,&gamma);
-+    png_set_gamma(png_ptr, 2.2, gamma);
- 
--    if (info_ptr->valid & PNG_INFO_bKGD)
-+    if (png_get_valid(png_ptr,info_ptr,PNG_INFO_bKGD)) {
- 	/* set the background to the one supplied */
--	png_set_background(png_ptr, &info_ptr->background,
-+    	png_color_16p background;
-+	png_get_bKGD(png_ptr,info_ptr,&background);
-+	png_set_background(png_ptr, background,
- 		PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
-+    }
-     else {
- 	/* blend the canvas background using the alpha channel */
- 	if (bgspec) {
diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD
index bb7dcab64..836b49468 100644
--- a/extra/transmission/PKGBUILD
+++ b/extra/transmission/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 191767 2013-07-30 10:31:09Z tomegun $
+# $Id: PKGBUILD 194463 2013-09-16 16:36:20Z tomegun $
 # Maintainer : Tom Gundersen <teg@jklm.no>
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=transmission
 pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt')
-pkgver=2.81
+pkgver=2.82
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.transmissionbt.com/"
 license=('MIT')
-makedepends=('gtk3' 'intltool' 'curl' 'qt4' 'libevent')
+makedepends=('gtk3' 'intltool' 'curl' 'qt5-base' 'libevent')
 source=(http://mirrors.m0k.org/transmission/files/$pkgbase-$pkgver.tar.xz)
-md5sums=('db1ad10ecff07150486dab2365ccb3a8')
+md5sums=('a5ef870c0410b12d10449c2d36fa4661')
 
 build() {
   cd $pkgbase-$pkgver
@@ -19,7 +19,7 @@ build() {
   ./configure --prefix=/usr
   make
   pushd qt
-  qmake-qt4 qtr.pro
+  qmake qtr.pro
   make
 }
 package_transmission-cli() {
@@ -54,7 +54,7 @@ package_transmission-gtk() {
 
 package_transmission-qt() {
   pkgdesc="Fast, easy, and free BitTorrent client (Qt GUI)"
-  depends=('curl' 'qt4' 'libevent')
+  depends=('curl' 'qt5-base' 'libevent')
   optdepends=('transmission-cli: daemon and web support')
   install=transmission-qt.install
 
diff --git a/extra/ucommon/PKGBUILD b/extra/ucommon/PKGBUILD
index f8c5ecf60..bd938c094 100644
--- a/extra/ucommon/PKGBUILD
+++ b/extra/ucommon/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 186289 2013-05-23 22:11:35Z eric $
+# $Id: PKGBUILD 194209 2013-09-10 14:36:48Z bpiotrowski $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=ucommon
-pkgver=6.0.5
+pkgver=6.0.7
 pkgrel=1
 pkgdesc="A light-weight C++ library to facilitate using C++ design patterns"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('GPL3' 'LGPL3')
 depends=('openssl')
 options=('!libtool')
 source=("http://ftp.gnu.org/pub/gnu/commoncpp/$pkgname-$pkgver.tar.gz"{,.sig})
-md5sums=('afbcf89264e9c96dccf4104bab52a9c0'
+md5sums=('0774a0315beac7b26ec75d44d925f208'
          'SKIP')
 
 build() {
diff --git a/extra/udisks2/PKGBUILD b/extra/udisks2/PKGBUILD
index 8b589160f..e16ad7efb 100644
--- a/extra/udisks2/PKGBUILD
+++ b/extra/udisks2/PKGBUILD
@@ -1,20 +1,22 @@
-# $Id: PKGBUILD 187072 2013-06-03 11:16:56Z allan $
+# $Id: PKGBUILD 195132 2013-09-25 13:30:53Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=udisks2
-pkgver=2.1.0
+pkgver=2.1.1
 pkgrel=3
 pkgdesc="Disk Management Service, version 2"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freedesktop.org/wiki/Software/udisks"
 license=('GPL2')
-depends=('glib2' 'udev' 'polkit' 'libatasmart' 'eject')
+depends=('glib2' 'systemd' 'polkit' 'libatasmart' 'util-linux')
 makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'python')
 optdepends=('parted: partition management'
-            'gptfdisk: GUID partition table support')
+            'gptfdisk: GUID partition table support'
+            'ntfs-3g: NTFS filesystem management support'
+            'dosfstools: VFAT filesystem management support')
 options=(!libtool)
 source=(http://udisks.freedesktop.org/releases/udisks-$pkgver.tar.bz2)
-sha256sums=('310208e5a10335dae4b52a0125c24d31cf292cce3d15cf65da4cd308e38d15a8')
+sha256sums=('013b09ff38aa256b89c01525771f4565cb088724d5c8c79b32e9f811e88086fb')
 
 build() {
   cd "udisks-$pkgver"
@@ -23,9 +25,6 @@ build() {
       --with-systemdsystemunitdir=/usr/lib/systemd/system \
       --localstatedir=/var --disable-static
   make
-  # fix mdadm location
-  sed -i -e 's#/sbin/mdadm#/usr/bin/mdadm#g' \
-            "${srcdir}/udisks-${pkgver}"/data/80-udisks2.rules
 }
 
 package() {
diff --git a/extra/vala/PKGBUILD b/extra/vala/PKGBUILD
index 5335e1902..7860d9d6b 100644
--- a/extra/vala/PKGBUILD
+++ b/extra/vala/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183465 2013-04-21 22:12:18Z heftig $
+# $Id: PKGBUILD 196143 2013-10-07 11:53:39Z jgc $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Timm Preetz <timm@preetz.us>
 
 pkgname=vala
-pkgver=0.20.1
+pkgver=0.22.0
 pkgrel=1
 pkgdesc="Compiler for the GObject type system"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('glib2')
 makedepends=('libxslt')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('9cb7ecd18a23525e401c204d4d08341c7d911cd5d78078eee10b747ecb45e481')
+sha256sums=('2f60a7ff887fcb16ed70fa84bb5872c2c54099a0732ce3f9e2c56e51a9208037')
 
 build() {
     cd $pkgname-$pkgver
diff --git a/extra/valgrind/PKGBUILD b/extra/valgrind/PKGBUILD
index 44b5394c8..a27f7cabb 100644
--- a/extra/valgrind/PKGBUILD
+++ b/extra/valgrind/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 193067 2013-08-15 12:08:37Z allan $
+# $Id: PKGBUILD 194381 2013-09-15 10:04:52Z allan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 pkgname=valgrind
 pkgver=3.8.1
-pkgrel=3
+pkgrel=4
 pkgdesc="A tool to help find memory-management problems in programs"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -14,10 +14,12 @@ makedepends=('gdb')
 options=('!emptydirs')
 source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2
         valgrind-3.8.1-glibc-2.18.patch
-        valgrind-3.8.1-ptrace-build-fix.patch)
+        valgrind-3.8.1-ptrace-build-fix.patch
+        valgrind-3.8.1-xaddb.patch)
 md5sums=('288758010b271119a0ffc0183f1d6e38'
          'f3f911e6f5b0ab9d176d40b47d6cae24'
-         '9d429e62255621a0c190a8180d8ab1a4')
+         '9d429e62255621a0c190a8180d8ab1a4'
+         'aad7751a3e4ee899093dcfa9f70a449b')
 
 prepare() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -27,6 +29,9 @@ prepare() {
   # based on svn commits 13471 & 13482
   patch -p0 -i $srcdir/valgrind-3.8.1-ptrace-build-fix.patch
   
+  # https://bugs.kde.org/show_bug.cgi?id=307106
+  patch -p0 -i $srcdir/valgrind-3.8.1-xaddb.patch
+  
   ./autogen.sh
 }
 
diff --git a/extra/valgrind/valgrind-3.8.1-xaddb.patch b/extra/valgrind/valgrind-3.8.1-xaddb.patch
new file mode 100644
index 000000000..ca5a59700
--- /dev/null
+++ b/extra/valgrind/valgrind-3.8.1-xaddb.patch
@@ -0,0 +1,34 @@
+Index: priv/guest_amd64_toIR.c
+===================================================================
+--- VEX/priv/guest_amd64_toIR.c	(revision 2580)
++++ VEX/priv/guest_amd64_toIR.c	(revision 2581)
+@@ -20268,6 +20268,14 @@
+       delta = dis_movx_E_G ( vbi, pfx, delta, 2, sz, True );
+       return delta;
+ 
++   case 0xC0: { /* XADD Gb,Eb */ 
++      Bool decode_OK = False;
++      delta = dis_xadd_G_E ( &decode_OK, vbi, pfx, 1, delta );
++      if (!decode_OK)
++         goto decode_failure;
++      return delta;
++   }
++
+    case 0xC1: { /* XADD Gv,Ev */ 
+       Bool decode_OK = False;
+       delta = dis_xadd_G_E ( &decode_OK, vbi, pfx, sz, delta );
+@@ -27143,14 +27151,6 @@
+ 
+       /* =-=-=-=-=-=-=-=-=- XADD -=-=-=-=-=-=-=-=-=-= */
+ 
+-      case 0xC0: { /* XADD Gb,Eb */ 
+-         Bool decode_OK = False;
+-         delta = dis_xadd_G_E ( &decode_OK, vbi, pfx, 1, delta );
+-         if (!decode_OK)
+-            goto decode_failure;
+-         break;
+-      }
+-
+       /* =-=-=-=-=-=-=-=-=- SGDT and SIDT =-=-=-=-=-=-=-=-=-=-= */
+ 
+       /* =-=-=-=-=-=-=-=-=- unimp2 =-=-=-=-=-=-=-=-=-=-= */
diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD
index 4b30165c2..a2fba37ca 100644
--- a/extra/vim/PKGBUILD
+++ b/extra/vim/PKGBUILD
@@ -6,8 +6,8 @@
 pkgbase=vim
 pkgname=('vim' 'gvim' 'vim-runtime')
 _topver=7.4
-_patchlevel=0
-__hgrev=a643d80b6507
+_patchlevel=16
+__hgrev=d17ef148ada4
 _versiondir="vim${_topver//./}"
 pkgver=${_topver}.${_patchlevel}
 pkgrel=2
@@ -20,7 +20,7 @@ source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz"
         'vimrc'
         'archlinux.vim'
         'gvim.desktop')
-md5sums=('1dfdea2e3fbf778647286d7e23ef9f54'
+md5sums=('733cce44a08ea953ad0e1f9d574670e0'
          'SKIP'
          'b9d4dcb9d3ee2e151dc4be1e94934f6a'
          '10353a61aadc3f276692d0e17db1478e'
diff --git a/extra/vinagre/PKGBUILD b/extra/vinagre/PKGBUILD
index d8ce95730..4b2923ce1 100644
--- a/extra/vinagre/PKGBUILD
+++ b/extra/vinagre/PKGBUILD
@@ -1,30 +1,31 @@
-# $Id: PKGBUILD 191757 2013-07-30 09:24:26Z heftig $
+# $Id: PKGBUILD 196144 2013-10-07 11:53:40Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Allan McRae <mcrae_allan@hotmail.com>
 # Contributor: lp76 <l.peduto@gmail.com>
 
 pkgname=vinagre
-pkgver=3.8.3
-pkgrel=1
+pkgver=3.10.0
+pkgrel=2
 pkgdesc="A VNC Client for the GNOME Desktop"
 arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
+license=(GPL)
 url="http://www.gnome.org/projects/vinagre/"
 install=vinagre.install
-depends=('libsecret' 'gtk-vnc' 'vte3' 'telepathy-glib' 'avahi' 'desktop-file-utils' 'dconf' 'shared-mime-info' 'gnome-icon-theme')
+depends=(libsecret gtk-vnc vte3 telepathy-glib avahi desktop-file-utils dconf shared-mime-info
+         gnome-icon-theme spice-gtk3)
 optdepends=('openssh: SSH plugin'
-            'rdesktop: RDP plugin')
-makedepends=('docbook-xsl' 'intltool' 'rdesktop' 'openssh' 'itstool')
-groups=('gnome-extra')
+            'freerdp: RDP plugin')
+makedepends=(docbook-xsl intltool freerdp openssh itstool)
+groups=(gnome-extra)
 options=('!emptydirs' '!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('0d862429307d28333f17afa40cf81f6006903e1aa134a8bc430079a9db40b1c6')
+sha256sums=('d90ca19d1075149d044a58274016bb3976b2201774ae079d661fd7c3859a1900')
 
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/vinagre --enable-rdp --disable-spice
+      --libexecdir=/usr/lib/$pkgname --enable-rdp
   make
 }
 
diff --git a/extra/vino/PKGBUILD b/extra/vino/PKGBUILD
index 604f7c10a..a2564736f 100644
--- a/extra/vino/PKGBUILD
+++ b/extra/vino/PKGBUILD
@@ -1,30 +1,33 @@
-# $Id: PKGBUILD 183467 2013-04-21 22:12:21Z heftig $
+# $Id: PKGBUILD 196145 2013-10-07 11:53:41Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=vino
-pkgver=3.8.1
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="a VNC server for the GNOME desktop"
 arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-depends=('libnotify' 'libxtst' 'libsm' 'libsoup' 'telepathy-glib' 'gtk3' 'libsecret' 'avahi' 'desktop-file-utils')
-makedepends=('intltool' 'networkmanager' 'gnome-common')
-groups=('gnome')
+license=(GPL)
+depends=(libnotify libxtst libsm telepathy-glib gtk3 libsecret avahi desktop-file-utils)
+makedepends=(intltool networkmanager gnome-common)
+groups=(gnome)
 url="http://www.gnome.org"
 options=(!emptydirs)
 install=vino.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('3a82392aa479d5a4be38020ac64b3c4f0227917af6175938919dbe741995929c')
+sha256sums=('927b71eaafc5ac4c6e098fb9ff0164899eae3ca599a32f5d18897a02b4be1fdd')
 
 build() {
   cd $pkgname-$pkgver
-  sed -i -e '/AC_PATH_XTRA/d' configure.ac
-  autoreconf --force
+
   ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/vino \
       --localstatedir=/var \
       --disable-http-server --with-secret
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
   make
 }
 
diff --git a/extra/virtuoso/PKGBUILD b/extra/virtuoso/PKGBUILD
index 278ac45c2..7785c44ea 100644
--- a/extra/virtuoso/PKGBUILD
+++ b/extra/virtuoso/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 193903 2013-09-04 19:31:12Z andrea $
+# $Id: PKGBUILD 194330 2013-09-13 15:52:26Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service>
 
 pkgbase=virtuoso
 pkgname=('virtuoso' 'virtuoso-base')
 epoch=1
-pkgver=6.1.6
+pkgver=6.1.7
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://virtuoso.openlinksw.com/wiki/main/Main/'
@@ -13,7 +13,7 @@ license=('GPL')
 makedepends=('libldap' 'bison' 'flex' 'gperf' 'net-tools' 'libxml2' 'optipng')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/${pkgbase}/${pkgbase}-opensource-${pkgver}.tar.gz")
-md5sums=('3991149c570f3738c3e819ce603e487f')
+md5sums=('88885e84e8f7b61e59516f696b1d3be5')
 
 prepare() {
   cd ${pkgbase}-opensource-${pkgver}
diff --git a/extra/visualvm/PKGBUILD b/extra/visualvm/PKGBUILD
new file mode 100644
index 000000000..b75f938f5
--- /dev/null
+++ b/extra/visualvm/PKGBUILD
@@ -0,0 +1,47 @@
+# Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
+# Contributor: Kristof JOZSA <kristof.jozsa@gmail.com>
+pkgname=visualvm
+pkgver=1.3.6
+_shortver=${pkgver//\./}
+pkgrel=3
+pkgdesc='Visual tool integrating several commandline JDK tools and lightweight profiling capabilities'
+arch=('i686' 'x86_64')
+url='http://visualvm.java.net/'
+license=('custom:GPL')
+depends=('java-environment')
+source=("https://java.net/projects/${pkgname}/downloads/download/release${_shortver}/${pkgname}_${_shortver}.zip"
+        'visualvm.desktop'
+        'icon.png')
+sha256sums=('317f65b3fed7ea25638b6d35c6f95642b5662453b7841a9d32aac3cf3ff59616'
+            'e820807e8d78446cf156a3947d97856e24865bb0d8c957e9ce2fed309c737441'
+            '452fbd85c968ec7176c5894bc4106b7e25310314d44278d807510675b6a5c864')
+
+package() {
+  cd ${srcdir}/${pkgname}_${_shortver}
+
+  mkdir -p ${pkgdir}/usr/share/${pkgname}
+  cp -R bin platform profiler visualvm ${pkgdir}/usr/share/${pkgname}
+
+  install -d ${pkgdir}/etc/${pkgname}
+  cp -R etc/* ${pkgdir}/etc/${pkgname}
+  ln -s /etc/${pkgname} ${pkgdir}/usr/share/${pkgname}/etc
+
+  rm -rf ${pkgdir}/usr/share/${pkgname}/profiler/lib/deployed/jdk*/{hpux*,mac,solaris*,windows*,linux-arm*}
+  if [ ${CARCH} == 'i686' ]; then
+    rm -rf ${pkgdir}/usr/share/${pkgname}/profiler/lib/deployed/jdk*/linux-amd64 \
+           ${pkgdir}/usr/share/${pkgname}/platform/modules/lib/{x86,amd64}
+  else
+    rm -rf ${pkgdir}/usr/share/${pkgname}/profiler/lib/deployed/jdk*/linux \
+           ${pkgdir}/usr/share/${pkgname}/platform/modules/lib/{x86,i386}
+  fi
+
+  find ${pkgdir}/usr/share/${pkgname} \( -name "*.exe" -o -name "*.dll" \) -delete
+
+  install -d ${pkgdir}/usr/bin
+  ln -s /usr/share/${pkgname}/bin/visualvm ${pkgdir}/usr/bin/${pkgname}
+
+  install -Dm644 ${srcdir}/icon.png ${pkgdir}/usr/share/${pkgname}/icon.png
+  install -Dm644 ${srcdir}/visualvm.desktop ${pkgdir}/usr/share/applications/visualvm.desktop
+
+  install -D LICENSE.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt
+}
diff --git a/extra/visualvm/icon.png b/extra/visualvm/icon.png
new file mode 100644
index 000000000..fe235b524
--- /dev/null
+++ b/extra/visualvm/icon.png
diff --git a/extra/visualvm/visualvm.desktop b/extra/visualvm/visualvm.desktop
new file mode 100644
index 000000000..9ff50b1c7
--- /dev/null
+++ b/extra/visualvm/visualvm.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=VisualVM
+GenericName=Java VM monitoring and troubleshooting tool
+Icon=/usr/share/visualvm/icon.png
+Exec=/usr/bin/visualvm
+Categories=Development;
+
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD
index b876df205..4b52b0d8c 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -1,26 +1,25 @@
-# $Id: PKGBUILD 191972 2013-08-02 09:52:35Z bpiotrowski $
+# $Id: PKGBUILD 195902 2013-10-04 17:29:00Z bpiotrowski $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
 
 pkgname=vlc
-pkgver=2.0.8.a
-pkgrel=1
+pkgver=2.1.0
+pkgrel=3
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.videolan.org/vlc/"
 license=('LGPL2.1' 'GPL2')
 depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'qt4' 'libproxy' 
-         'sdl_image' 'libdvdnav' 'libtiger' 'lua51' 'libmatroska' 
+         'sdl_image' 'libdvdnav' 'libtiger' 'lua' 'libmatroska' 
          'zvbi' 'taglib' 'libmpcdec' 'ffmpeg-compat' 'faad2' 'libupnp' 
          'libshout' 'libmad' 'libmpeg2' 'xcb-util-keysyms')
 makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs'
-             'libdc1394' 'libavc1394'
-             'libcaca' 'librsvg' 'portaudio' 'libgme' 'xosd'
-             'twolame' 'aalib' 'libmtp' 'libdvdcss'
-             'gnome-vfs' 'libgoom2' 'libtar' 'vcdimager' 'opus' 'libssh2'
-             'mesa')
-[ "$CARCH" = "mips64el" ] || makedepends+=('lirc-utils' 'oss' 'projectm')
+             'libdc1394' 'libavc1394' 'libcaca' 
+             'librsvg' 'portaudio' 'libgme' 'xosd'
+             'twolame' 'aalib' 'libmtp' 'libdvdcss' 'gnome-vfs' 
+             'libgoom2' 'libtar' 'vcdimager' 'opus' 'libssh2' 'mesa')
+[ "$CARCH" = "mips64el" ] || makedepends+=('lirc-utils' 'projectm')
 optdepends=('avahi: for service discovery using bonjour protocol'
             'libnotify: for notification plugin'
             'ncurses: for ncurses interface support'
@@ -59,17 +58,14 @@ backup=('usr/share/vlc/lua/http/.hosts'
 options=('!libtool' '!emptydirs')
 install=vlc.install
 source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver/.a}/${pkgname}-${pkgver/.a/a}.tar.xz"
-        vlc-2.0.7-vaapi-compat.patch
-        vlc-2.0.8-Fix-live555-breakage-in-last-update.patch)
-md5sums=('e5000677181406d026ffe448633d1ca0'
-         '6df10774bb7acf20e09d6139e5c7839e'
-         'e592efe7bb65291a84f99cfaa3a9f8a2')
+vlc-2.0.7-vaapi-compat.patch)
+md5sums=('8c77bda671821f5b9ede96b6816e2ade'
+         '6df10774bb7acf20e09d6139e5c7839e')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver/.a}"
 
   patch -Np1 -i ../vlc-2.0.7-vaapi-compat.patch
-  patch -Np1 -i ../vlc-2.0.8-Fix-live555-breakage-in-last-update.patch
 
   sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype.c
   sed -i -e 's:truetype/ttf-dejavu:TTF:g' modules/visualization/projectm.cpp
@@ -84,7 +80,6 @@ build() {
   ./configure --prefix=/usr \
               --sysconfdir=/etc \
               --disable-rpath \
-              --enable-oss \
               --enable-faad \
               --enable-nls \
               --enable-lirc \
diff --git a/extra/vlc/vlc-2.0.8-Fix-live555-breakage-in-last-update.patch b/extra/vlc/vlc-2.0.8-Fix-live555-breakage-in-last-update.patch
deleted file mode 100644
index 3006cbc8d..000000000
--- a/extra/vlc/vlc-2.0.8-Fix-live555-breakage-in-last-update.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From ea444abae1d09b751314b24f6352e55be335621d Mon Sep 17 00:00:00 2001
-From: Jean-Baptiste Kempf <jb@videolan.org>
-Date: Thu, 25 Jul 2013 01:14:32 +0200
-Subject: [PATCH] Fix live555 breakage in last update
-
----
- modules/demux/live555.cpp | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp
-index 9e02630..7a1ab16 100644
---- a/modules/demux/live555.cpp
-+++ b/modules/demux/live555.cpp
-@@ -243,7 +243,11 @@ public:
-                    char const* applicationName, portNumBits tunnelOverHTTPPortNum,
-                    demux_sys_t *p_sys) :
-                    RTSPClient( env, rtspURL, verbosityLevel, applicationName,
--                   tunnelOverHTTPPortNum )
-+                   tunnelOverHTTPPortNum
-+#if LIVEMEDIA_LIBRARY_VERSION_INT >= 1373932800
-+                   , -1
-+#endif
-+                   )
-     {
-         this->p_sys = p_sys;
-     }
--- 
-1.8.3.4
-
diff --git a/extra/vte3/PKGBUILD b/extra/vte3/PKGBUILD
index dc7797ce1..efc91321d 100644
--- a/extra/vte3/PKGBUILD
+++ b/extra/vte3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 189823 2013-07-08 16:52:35Z heftig $
+# $Id: PKGBUILD 194827 2013-09-23 18:45:48Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=vte3
 pkgname=(vte3 vte-common)
-pkgver=0.34.7
+pkgver=0.34.8
 pkgrel=1
 pkgdesc="Virtual Terminal Emulator widget for use with GTK3"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ options=('!libtool' '!emptydirs')
 makedepends=('intltool' 'gobject-introspection' 'gtk3')
 url="http://www.gnome.org"
 source=(http://download.gnome.org/sources/vte/${pkgver::4}/vte-$pkgver.tar.xz)
-sha256sums=('187e49cca574f548d04ceea701e95a1531ff9dd9cd1953ce6455824720dab932')
+sha256sums=('126ffb7d5a5da35639df003c84ff11ccc92f3fc8b1556d3e8b0f7314c8d909d0')
 
 build() {
   cd "vte-$pkgver"
diff --git a/extra/webkitgtk/PKGBUILD b/extra/webkitgtk/PKGBUILD
index 3d0632eda..cf2265f70 100644
--- a/extra/webkitgtk/PKGBUILD
+++ b/extra/webkitgtk/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 191357 2013-07-23 21:01:37Z jgc $
+# $Id: PKGBUILD 196146 2013-10-07 11:53:43Z jgc $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=webkitgtk
-pkgver=2.0.4
+pkgver=2.2.0
 pkgrel=1
 arch=(i686 x86_64 mips64el)
 url="http://webkitgtk.org/"
@@ -16,7 +16,7 @@ conflicts=(webkitgtk3 libwebkit3)
 replaces=(webkitgtk3 libwebkit3)
 options=(!libtool !emptydirs)
 source=(http://webkitgtk.org/releases/$pkgname-${pkgver}.tar.xz)
-sha256sums=('bd1550b7f6e1a55f803efe7d64438163ff6c04f02186002cb81d0c090aac734f')
+sha256sums=('84902e3255dcc6efa1298c8a1f2d2a49674126dcacea383f309aeed9e734d538')
 
 prepare() {
   cd $pkgbase-$pkgver
diff --git a/extra/weechat/PKGBUILD b/extra/weechat/PKGBUILD
index cc5c661b3..e61c92471 100644
--- a/extra/weechat/PKGBUILD
+++ b/extra/weechat/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 186429 2013-05-26 09:26:13Z bluewind $
+# $Id: PKGBUILD 193946 2013-09-07 16:40:23Z andrea $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: lucke <lucke at o2 dot pl>
 
 pkgname=weechat
 pkgver=0.4.1
-pkgrel=2
+pkgrel=4
 pkgdesc="Fast, light and extensible IRC client (curses UI)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.weechat.org/"
@@ -16,18 +16,19 @@ options=('!libtool')
 source=("http://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('071d6f1cd21c892cae126af21095c43f')
 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
+prepare() {
   mkdir build
+}
+
+build() {
   cd build
-  cmake .. -DPREFIX=/usr \
+  cmake ../${pkgname}-${pkgver} -DPREFIX=/usr \
         -DPYTHON_EXECUTABLE=/usr/bin/python2 \
         -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}/build"
+  cd build
 
   make DESTDIR="${pkgdir}/" install
 }
diff --git a/extra/wget/PKGBUILD b/extra/wget/PKGBUILD
index e0134a52d..a4518a5fe 100644
--- a/extra/wget/PKGBUILD
+++ b/extra/wget/PKGBUILD
@@ -1,36 +1,46 @@
-# $Id: PKGBUILD 169712 2012-10-27 01:52:51Z stephane $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
+# $Id: PKGBUILD 195268 2013-09-29 17:27:18Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=wget
 pkgver=1.14
-pkgrel=2.1
+pkgrel=3
 pkgdesc="A network utility to retrieve files from the Web"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/wget/wget.html"
 license=('GPL3')
-depends=('openssl' 'libidn' 'pcre' 'util-linux')
+depends=('openssl' 'libidn' 'util-linux')
+checkdepends=('perl-http-daemon' 'perl-io-socket-ssl')
 optdepends=('ca-certificates: HTTPS downloads')
 backup=('etc/wgetrc')
 install=wget.install
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('316f6f59292c9098ad81fd54f658c579'
-         '3e121933d69f32fa58776bff76bcebd0')
+source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}
+        wget-pod-fixes.patch)
+sha1sums=('cfa0906e6f72c1c902c29b52d140c22ecdcd617e'
+          'SKIP'
+          'aae4be72657c7a8e9dbedb7109cd2d8562a325d2')
 
-build() {
+prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 -i "${srcdir}/wget-pod-fixes.patch"
+  cat >> doc/sample.wgetrc <<EOF
+
+# default root certs location
+ca_certificate=/etc/ssl/certs/ca-certificates.crt
+EOF
+}
 
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure -with-ssl=openssl --prefix=/usr --sysconfdir=/etc --enable-nls
   make
 }
 
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make check
+}
+
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-
-  cat >> "$pkgdir/etc/wgetrc" <<EOF
-
-# default root certs location
-ca_certificate=/etc/ssl/certs/ca-certificates.crt
-EOF
 }
diff --git a/extra/wget/wget-pod-fixes.patch b/extra/wget/wget-pod-fixes.patch
new file mode 100644
index 000000000..54e985624
--- /dev/null
+++ b/extra/wget/wget-pod-fixes.patch
@@ -0,0 +1,81 @@
+diff -Naur wget-1.14.orig/doc/wget.texi wget-1.14.new/doc/wget.texi
+--- wget-1.14.orig/doc/wget.texi	2012-08-04 02:41:52.000000000 -0600
++++ wget-1.14.new/doc/wget.texi	2013-05-26 11:18:52.986107183 -0600
+@@ -876,7 +876,7 @@
+ actions of one.
+ 
+ @cindex proxy
+-@itemx --no-proxy
++@item --no-proxy
+ Don't use proxies, even if the appropriate @code{*_proxy} environment
+ variable is defined.
+ 
+@@ -977,7 +977,7 @@
+ whose encoding does not match the one used locally.
+ 
+ @cindex IPv6
+-@itemx -4
++@item -4
+ @itemx --inet4-only
+ @itemx -6
+ @itemx --inet6-only
+@@ -2106,32 +2106,32 @@
+ 
+ 
+ @table @asis
+-@item 0
++@item C<0>
+ No problems occurred.
+ 
+-@item 1
++@item C<1>
+ Generic error code.
+ 
+-@item 2
++@item C<2>
+ Parse error---for instance, when parsing command-line options, the
+ @samp{.wgetrc} or @samp{.netrc}...
+ 
+-@item 3
++@item C<3>
+ File I/O error.
+ 
+-@item 4
++@item C<4>
+ Network failure.
+ 
+-@item 5
++@item C<5>
+ SSL verification failure.
+ 
+-@item 6
++@item C<6>
+ Username/password authentication failure.
+ 
+-@item 7
++@item C<7>
+ Protocol errors.
+ 
+-@item 8
++@item C<8>
+ Server issued an error response.
+ @end table
+ 
+@@ -3094,7 +3094,7 @@
+ Change setting of passive @sc{ftp}, equivalent to the
+ @samp{--passive-ftp} option.
+ 
+-@itemx password = @var{string}
++@item password = @var{string}
+ Specify password @var{string} for both @sc{ftp} and @sc{http} file retrieval. 
+ This command can be overridden using the @samp{ftp_password} and 
+ @samp{http_password} command for @sc{ftp} and @sc{http} respectively.
+@@ -3605,7 +3605,7 @@
+ may be specified from within Wget itself.
+ 
+ @table @samp
+-@itemx --no-proxy
++@item --no-proxy
+ @itemx proxy = on/off
+ This option and the corresponding command may be used to suppress the
+ use of proxy, even if the appropriate environment variables are set.
diff --git a/extra/windowmaker/PKGBUILD b/extra/windowmaker/PKGBUILD
index 401e7f352..fba240c38 100644
--- a/extra/windowmaker/PKGBUILD
+++ b/extra/windowmaker/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 191928 2013-08-01 07:00:01Z bpiotrowski $
+# $Id: PKGBUILD 194337 2013-09-13 20:35:50Z daniel $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 pkgname=windowmaker
-pkgver=0.95.4
-pkgrel=3
+pkgver=0.95.5
+pkgrel=1
 pkgdesc="An X11 window manager with a NEXTSTEP look and feel"
 arch=(i686 x86_64 'mips64el')
 url="http://www.windowmaker.org/"
@@ -13,7 +13,7 @@ options=('!libtool')
 source=(http://windowmaker.org/pub/source/release/WindowMaker-$pkgver.tar.gz
         wmaker.desktop
         wm-giflib.patch)
-md5sums=('640b8ea5b1a875440aa48eaab09c5f00'
+md5sums=('19e9cc256ccb7075ff82f4b809df3a0a'
          '2fba97bebfd691836b92b8f0db79ff13'
          '05d8e98fb579f2fa5a097b629374e6b8')
 
diff --git a/extra/wireshark/01_fix_pod_file.patch b/extra/wireshark/01_fix_pod_file.patch
deleted file mode 100644
index f75f4c0bf..000000000
--- a/extra/wireshark/01_fix_pod_file.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- trunk/doc/reordercap.pod	2013/05/20 05:45:32	49435
-+++ trunk/doc/reordercap.pod	2013/05/20 14:56:18	49436
-@@ -40,6 +40,8 @@
- When the B<-n> option is used, B<reordercap> will not write out the output
- file if it finds that the input file is already in order.
- 
-+=back
-+
- =head1 SEE ALSO
- 
- pcap(3), wireshark(1), tshark(1), dumpcap(1), editcap(1), mergecap(1),
diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD
index 7492f64d4..552c2d015 100644
--- a/extra/wireshark/PKGBUILD
+++ b/extra/wireshark/PKGBUILD
@@ -1,25 +1,21 @@
-# $Id: PKGBUILD 191608 2013-07-27 17:57:23Z guillaume $
+# $Id: PKGBUILD 194226 2013-09-11 02:06:50Z eric $
 # 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.10.1
+pkgver=1.10.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
-makedepends=('bison' 'flex' 'gtk3' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls'
-             'libgcrypt' 'lua51' 'python')
+makedepends=('gtk3' 'krb5' 'libpcap' 'bash' 'gnutls'
+             'lua' 'python' 'desktop-file-utils' 'hicolor-icon-theme')
 url='http://www.wireshark.org/'
 options=(!libtool)
-source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2
-        01_fix_pod_file.patch)
-sha256sums=('06499544f053cc1f73529278ede0ac210d709cada8267e81d908bd346cc0c5bc'
-            '18470353d3658814b4925c7fcf07e647e1e400856cdf356555ddf105d12bdd41')
+source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2)
+sha256sums=('b7a83314424e13639c591de924aa240bc5f3d9cae01dde69bf858fa04b22a33d')
 
 build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  patch -p1 <${srcdir}/01_fix_pod_file.patch
+  cd ${pkgbase}-${pkgver}
 
   ./autogen.sh
   ./configure \
@@ -33,11 +29,11 @@ build() {
 
 package_wireshark-cli() {
   pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - CLI version'
-  depends=('krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'libgcrypt' 'glib2' 'lua51')
+  depends=('krb5' 'libpcap' 'bash' 'gnutls'  'glib2' 'lua')
   install=wireshark.install
   conflicts=(wireshark)
 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd ${pkgbase}-${pkgver}
 
   make DESTDIR="${pkgdir}" install
 
@@ -47,11 +43,11 @@ package_wireshark-cli() {
   rm "${pkgdir}/usr/bin/wireshark"
 
   # Headers
-  install -dm755 ${pkgdir}/usr/include/${pkgbase}/{epan/{crypt,dfilter,dissectors,ftypes},wiretap,wsutil}
+  install -dm755 "${pkgdir}"/usr/include/${pkgbase}/{epan/{crypt,dfilter,dissectors,ftypes},wiretap,wsutil}
 
   install -m644 color.h config.h register.h ws_symbol_export.h "${pkgdir}/usr/include/${pkgbase}"
   for d in epan epan/crypt epan/dfilter epan/dissectors epan/ftypes wiretap wsutil; do
-    install -m644 ${d}/*.h ${pkgdir}/usr/include/${pkgbase}/${d}
+    install -m644 ${d}/*.h "${pkgdir}"/usr/include/${pkgbase}/${d}
   done
 }
 
@@ -62,7 +58,7 @@ package_wireshark-gtk() {
   replaces=(wireshark)
   conflicts=(wireshark)
 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd ${pkgbase}-${pkgver}
 
   install -Dm755 .libs/wireshark "${pkgdir}/usr/bin/wireshark"
   for d in 16 32 48; do
diff --git a/extra/wireshark/wireshark.install b/extra/wireshark/wireshark.install
index 001bd0c58..719171d9e 100644
--- a/extra/wireshark/wireshark.install
+++ b/extra/wireshark/wireshark.install
@@ -1,18 +1,18 @@
 post_install() {
-    /usr/bin/getent group wireshark >/dev/null 2>&1 ||  usr/sbin/groupadd -g 150 wireshark &>/dev/null
+    getent group wireshark >/dev/null 2>&1 ||  groupadd -g 150 wireshark &>/dev/null
 
-    /usr/bin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap
+    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
+    getent group wireshark >/dev/null 2>&1 ||  groupadd -g 150 wireshark &>/dev/null
 
-    /usr/bin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap
+    setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap
 }
 
 post_remove() {
-    if /usr/bin/getent group wireshark >/dev/null 2>&1; then
-        /usr/sbin/groupdel wireshark
+    if getent group wireshark >/dev/null 2>&1; then
+        groupdel wireshark
     fi
 }
diff --git a/extra/x2goclient/PKGBUILD b/extra/x2goclient/PKGBUILD
index 7da864f8c..5ac5eb002 100644
--- a/extra/x2goclient/PKGBUILD
+++ b/extra/x2goclient/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 180595 2013-03-24 09:37:30Z andyrtr $
+# $Id: PKGBUILD 194273 2013-09-12 19:24:14Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Gerhard Brauer <gerbra@archlinux.de>
 # Contributor: Richard Murri <admin@richardmurri.com>
 
 pkgname=x2goclient
-pkgver=4.0.1.0
+pkgver=4.0.1.1
 pkgrel=1
 pkgdesc="x2go qt4 client"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,15 +14,16 @@ depends=('qt4' 'libldap' 'libcups' 'nxproxy' 'libssh' 'libxpm' 'hicolor-icon-the
 makedepends=('man2html')
 install=x2goclient.install
 source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('ff223344915b9def9e9e5a01ae919532')
+md5sums=('13b6729acfd5c6a00441430ef6ab69d6')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   sed -i "s:-o root -g root ::" Makefile
+  sed -i "s:lrelease:lrelease-qt4:g" Makefile
   make PREFIX=/usr
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make PREFIX=/usr DESTDIR="$pkgdir" install
 }
diff --git a/extra/xf86-input-evdev/PKGBUILD b/extra/xf86-input-evdev/PKGBUILD
index b80589700..e42083917 100644
--- a/extra/xf86-input-evdev/PKGBUILD
+++ b/extra/xf86-input-evdev/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 189922 2013-07-11 14:37:25Z andyrtr $
+# $Id: PKGBUILD 195989 2013-10-07 07:38:43Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <Alexander@archlinux.org
 
 pkgname=xf86-input-evdev
-pkgver=2.8.1
+pkgver=2.8.2
 pkgrel=1
 pkgdesc="X.org evdev input driver"
 arch=(i686 x86_64 'mips64el')
@@ -15,7 +15,7 @@ conflicts=('xorg-server<1.14.0' 'X-ABI-XINPUT_VERSION<19' 'X-ABI-XINPUT_VERSION>
 options=('!libtool' '!makeflags')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('09f887e1ce6cdb92154035db9044e0795a5c80f1ffb9efc599aed9a9dc1ff539')
+sha256sums=('750461749a83bdee7771592aa5c0db5e267b18d847078a4b8622f55b04797eb3')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xf86-input-wacom/PKGBUILD b/extra/xf86-input-wacom/PKGBUILD
index b333857db..dcd177f12 100644
--- a/extra/xf86-input-wacom/PKGBUILD
+++ b/extra/xf86-input-wacom/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 192066 2013-08-05 14:20:19Z andyrtr $
+# $Id: PKGBUILD 195224 2013-09-28 05:24:38Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: M Rawash <mrawash@gmail.com>
 
 pkgname=xf86-input-wacom
-pkgver=0.22.1
+pkgver=0.23.0
 pkgrel=1
 pkgdesc="X.Org Wacom tablet driver"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +18,7 @@ optdepends=('inputattach: support for serial tablets')
 options=(!libtool)
 source=(http://downloads.sourceforge.net/project/linuxwacom/$pkgname/$pkgname-$pkgver.tar.bz2
         70-wacom.rules)
-md5sums=('dba80caac08145a907fc7f7796f3aea7'
+md5sums=('353642b8a3f2dde089e913be32955aae'
          'cc46dcb399d5ee62c9feb610c60d1270')
 
 build() {
diff --git a/extra/xf86-video-dummy/PKGBUILD b/extra/xf86-video-dummy/PKGBUILD
index 02547ed73..d9c0c3344 100644
--- a/extra/xf86-video-dummy/PKGBUILD
+++ b/extra/xf86-video-dummy/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 180196 2013-03-18 16:09:04Z andyrtr $
+# $Id: PKGBUILD 194314 2013-09-13 08:12:58Z andyrtr $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-dummy
-pkgver=0.3.6
-pkgrel=3
+pkgver=0.3.7
+pkgrel=1
 pkgdesc="X.org dummy video driver"
 arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
@@ -13,13 +13,11 @@ makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'xf86dgaproto' 'res
 conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fix.diff)
-sha256sums=('44335b640126d339700256dae731bd5af79afd027da172bad8a991a33a1de798'
-            '06fe79ba658712a1abb0612a049c1061618d30e72d4939fc59c8c905d9d4d5bb')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('56f84fcbc515685529ad8e10bca1072731d9c096b97c5d35ddc95cd589b98680')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ${srcdir}/git-fix.diff
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xf86-video-dummy/git-fix.diff b/extra/xf86-video-dummy/git-fix.diff
deleted file mode 100644
index 4b0b46ef3..000000000
--- a/extra/xf86-video-dummy/git-fix.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-From 44f04fd3046043ed31369025f34353c4e0e5c1cd Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 25 Sep 2012 12:54:36 +0000
-Subject: Remove mibstore.h
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/dummy_driver.c b/src/dummy_driver.c
-index 62066d6..6062c39 100644
---- a/src/dummy_driver.c
-+++ b/src/dummy_driver.c
-@@ -14,9 +14,6 @@
- /* All drivers initialising the SW cursor need this */
- #include "mipointer.h"
- 
--/* All drivers implementing backing store need this */
--#include "mibstore.h"
--
- /* All drivers using the mi colormap manipulation need this */
- #include "micmap.h"
- 
-@@ -617,7 +614,6 @@ DUMMYScreenInit(SCREEN_INIT_ARGS_DECL)
- 		   , lines - pScrn->virtualY);
-     }
- 
--    miInitializeBackingStore(pScreen);
-     xf86SetBackingStore(pScreen);
-     xf86SetSilkenMouse(pScreen);
- 	
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-fbdev/PKGBUILD b/extra/xf86-video-fbdev/PKGBUILD
index 03748cbfd..66af2ff48 100644
--- a/extra/xf86-video-fbdev/PKGBUILD
+++ b/extra/xf86-video-fbdev/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 180197 2013-03-18 16:09:06Z andyrtr $
+# $Id: PKGBUILD 195144 2013-09-25 17:08:11Z andyrtr $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-fbdev
-pkgver=0.4.3
-pkgrel=3
+pkgver=0.4.4
+pkgrel=1
 pkgdesc="X.org framebuffer video driver"
 arch=(i686 x86_64 'mips64el')
 license=('custom')
@@ -13,19 +13,17 @@ makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'sc
 conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fix.diff)
-sha256sums=('ff7b037ad110040a4e2db5c84e9741125dbbaf3a08107db47760f3e11f9c4831'
-            '4eb30cc4db5d1789429861d2d8f15238b21204d4311763ab7a1f4f32ff2b0321')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('9dd4b326498223abbfdf786089a46ea3db4fa6bbd341308eb48a9e00bc3fd51b')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ${srcdir}/git-fix.diff
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
diff --git a/extra/xf86-video-fbdev/git-fix.diff b/extra/xf86-video-fbdev/git-fix.diff
deleted file mode 100644
index 138d5bc2a..000000000
--- a/extra/xf86-video-fbdev/git-fix.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-From ac293412a01d87f87eb61f4adb9db7486a75d3fc Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 25 Sep 2012 12:54:37 +0000
-Subject: Remove mibstore.h
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/fbdev.c b/src/fbdev.c
-index cd7ebc5..f5a7378 100644
---- a/src/fbdev.c
-+++ b/src/fbdev.c
-@@ -14,7 +14,6 @@
- #include "xf86_OSproc.h"
- 
- #include "mipointer.h"
--#include "mibstore.h"
- #include "micmap.h"
- #include "colormapst.h"
- #include "xf86cmap.h"
-@@ -845,7 +844,6 @@ FBDevScreenInit(SCREEN_INIT_ARGS_DECL)
- 	}
- 
- 	xf86SetBlackWhitePixels(pScreen);
--	miInitializeBackingStore(pScreen);
- 	xf86SetBackingStore(pScreen);
- 
- 	/* software cursor */
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-r128/PKGBUILD b/extra/xf86-video-r128/PKGBUILD
index 882e858d0..5e1198c8c 100644
--- a/extra/xf86-video-r128/PKGBUILD
+++ b/extra/xf86-video-r128/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 191734 2013-07-29 19:57:36Z jgc $
+# $Id: PKGBUILD 195864 2013-10-02 19:32:45Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-r128
-pkgver=6.9.1
-pkgrel=4
+pkgver=6.9.2
+pkgrel=1
 pkgdesc="X.org ati Rage128 video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -14,15 +14,9 @@ conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERS
 optdepends=('r128-dri: DRI1 support from community repo')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        no-mibstore.patch)
-sha256sums=('8be3baa8d3b19e3a05f00a53bf35784e144dc2ad14c358f97870c072e634e44c'
-            '6e4cbce4de6ff569f6d30a99f699ca44d4cb28e530e593f61578b4f97c1de13e')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('8b2d295f1842d07304a75da1cfb9bf139b320a6539970eaf8d5ecc010cd36ee0')
 
-prepare() {
-  cd ${pkgname}-${pkgver}
-  patch -Np1 -i ../no-mibstore.patch
-}
 build() {
   cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr
diff --git a/extra/xf86-video-r128/no-mibstore.patch b/extra/xf86-video-r128/no-mibstore.patch
deleted file mode 100644
index b6f18031e..000000000
--- a/extra/xf86-video-r128/no-mibstore.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 24f28a78fdcd056357f137650ca7f0f01c257d97 Mon Sep 17 00:00:00 2001
-From: Connor Behan <connor.behan@gmail.com>
-Date: Wed, 19 Dec 2012 18:41:14 +0000
-Subject: Remove call to obsolete miInitializeBackingStore()
-
-Definition was deleted from Xorg during 1.14 merge window, but has been
-a no-op since 1.10 merge window.
-
-Signed-off-by: Connor Behan <connor.behan@gmail.com>
----
-diff --git a/src/r128_driver.c b/src/r128_driver.c
-index a062a60..f47c7e3 100644
---- a/src/r128_driver.c
-+++ b/src/r128_driver.c
-@@ -2701,7 +2701,6 @@ Bool R128ScreenInit(SCREEN_INIT_ARGS_DECL)
-     R128DGAInit(pScreen);
- 
- 				/* Backing store setup */
--    miInitializeBackingStore(pScreen);
-     xf86SetBackingStore(pScreen);
- 
- 				/* Set Silken Mouse */
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-savage/PKGBUILD b/extra/xf86-video-savage/PKGBUILD
index d5f9a2eea..08158f8fc 100644
--- a/extra/xf86-video-savage/PKGBUILD
+++ b/extra/xf86-video-savage/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 181070 2013-03-31 08:09:15Z andyrtr $
+# $Id: PKGBUILD 195146 2013-09-25 17:11:53Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-savage
-pkgver=2.3.6
-pkgrel=4
+pkgver=2.3.7
+pkgrel=1
 pkgdesc="X.org savage video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -14,21 +14,17 @@ conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERS
 optdepends=('savage-dri: DRI1 support from community repo')
 options=(!libtool)
 groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        git_fixes.diff)
-sha256sums=('48813ed8f4a08858e8c2466fd2dc810ea31f86842025fa39ec949d44f9ad63d6'
-            'b415bab5bbad890365c649fe3daa47db23428e92b4a4d8e5aa685e9d78de668d')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('041d4205c9222c1780fba6e0e397a559aed393b7a7991b58fa79ba8cccc54a44')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ${srcdir}/git_fixes.diff
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  #cd "${srcdir}/${pkgname}-${pkgver}"
-  cd ${srcdir}/${pkgname}*
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 
   install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/extra/xf86-video-savage/git_fixes.diff b/extra/xf86-video-savage/git_fixes.diff
deleted file mode 100644
index 8d5ef49b0..000000000
--- a/extra/xf86-video-savage/git_fixes.diff
+++ /dev/null
@@ -1,64 +0,0 @@
-From 3d181030a6ba2205a57ef4665e53aed0251ccaa6 Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@gmail.com>
-Date: Wed, 18 Jul 2012 08:52:38 +0000
-Subject: savage: move compat-api.h down to proper place.
-
-This screws up when DRI isn't enabled.
-
-Signed-off-by: Dave Airlie <airlied@redhat.com>
----
-diff --git a/src/savage_driver.h b/src/savage_driver.h
-index b604292..ec4b1ea 100644
---- a/src/savage_driver.h
-+++ b/src/savage_driver.h
-@@ -85,8 +85,6 @@
- #include "GL/glxint.h"
- #include "xf86drm.h"
- 
--#include "compat-api.h"
--
- /* Totals 2 Mbytes which equals 2^16 32-byte vertices divided among up
-  * to 32 clients. */
- #define SAVAGE_NUM_BUFFERS 32
-@@ -153,6 +151,8 @@ typedef struct _server{
- 
- #endif
- 
-+#include "compat-api.h"
-+
- typedef enum {
-     MT_NONE,
-     MT_CRT,
---
-cgit v0.9.0.2-2-gbebe
-From ca9718a887ecbc59b76869af673791ab591b849b Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@gmail.com>
-Date: Sat, 22 Dec 2012 10:00:00 +0000
-Subject: savage: fix default accel arch when built with no XAA
-
-Signed-off-by: Dave Airlie <airlied@redhat.com>
----
-diff --git a/src/savage_driver.c b/src/savage_driver.c
-index 026bf5c..5b49e60 100644
---- a/src/savage_driver.c
-+++ b/src/savage_driver.c
-@@ -1267,6 +1267,7 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags)
-         from = X_DEFAULT;
- 	char *strptr;
-         if((strptr = (char *)xf86GetOptValString(psav->Options, OPTION_ACCELMETHOD))) {
-+#ifdef HAVE_XAA_H
- 	    if(!xf86NameCmp(strptr,"XAA")) {
- 	        from = X_CONFIG;
- 	        psav->useEXA = FALSE;
-@@ -1274,6 +1275,9 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags)
- 	       from = X_CONFIG;
- 	       psav->useEXA = TRUE;
- 	    }
-+#else
-+	    psav->useEXA = TRUE;
-+#endif
-        }
-        xf86DrvMsg(pScrn->scrnIndex, from, "Using %s acceleration architecture\n",
- 		psav->useEXA ? "EXA" : "XAA");
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/xfce4-power-manager/PKGBUILD b/extra/xfce4-power-manager/PKGBUILD
index 5427203e4..e57801bbe 100644
--- a/extra/xfce4-power-manager/PKGBUILD
+++ b/extra/xfce4-power-manager/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 185209 2013-05-12 07:30:46Z foutrelis $
+# $Id: PKGBUILD 195950 2013-10-06 07:26:31Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Tobias Kieslich <tobias funnychar archlinux.org>
 
 pkgname=xfce4-power-manager
 pkgver=1.2.0
-pkgrel=4
+pkgrel=6
 pkgdesc="Power manager for Xfce desktop"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xfce.org/"
@@ -15,17 +15,33 @@ makedepends=('pkgconfig' 'intltool')
 options=('!libtool')
 install=$pkgname.install
 source=(http://archive.xfce.org/src/apps/$pkgname/1.2/$pkgname-$pkgver.tar.bz2
+        xfce4-power-manager-1.2.0-logind-support-for-suspend-hibernate.patch
+        xfce4-power-manager-1.2.0-change-brightness-level-from-glong-to-gint32.patch
         xfce4-power-manager-1.2.0-sync-en-gb-translation.patch)
 sha256sums=('d7fb98a540284b62f4201527de17d4b24123f9d26c9f49131dd497c8387184e9'
+            '4166f61234abfcd385d43b1e7f7ab5b73711bcb7335ef0f6b217ac799dc9266b'
+            '689751b6369fd8ade6337713283f5ef3dd40715bbbe69e4a8723c9cbe56e7465'
             'c8e1dfafd685c2abf1fcc2b3682f5b1eb2e7f1d4fa557f11a7478437eef9a933')
 
-build() {
+prepare() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  # Use logind interfaces for suspend and hibernate
+  # https://bugzilla.xfce.org/show_bug.cgi?id=9963
+  patch -Np1 -i "$srcdir/xfce4-power-manager-1.2.0-logind-support-for-suspend-hibernate.patch"
+
+  # Fix brightness level handling
+  # https://bugzilla.xfce.org/show_bug.cgi?id=8840
+  patch -Np1 -i "$srcdir/xfce4-power-manager-1.2.0-change-brightness-level-from-glong-to-gint32.patch"
+
   # Fix en_GB translation
   # https://bugs.archlinux.org/task/30055
   patch -d po -Np0 -i \
     "$srcdir/xfce4-power-manager-1.2.0-sync-en-gb-translation.patch"
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
 
   ./configure \
     --prefix=/usr \
diff --git a/extra/xfce4-power-manager/xfce4-power-manager-1.2.0-change-brightness-level-from-glong-to-gint32.patch b/extra/xfce4-power-manager/xfce4-power-manager-1.2.0-change-brightness-level-from-glong-to-gint32.patch
new file mode 100644
index 000000000..5cb4fdb0b
--- /dev/null
+++ b/extra/xfce4-power-manager/xfce4-power-manager-1.2.0-change-brightness-level-from-glong-to-gint32.patch
@@ -0,0 +1,306 @@
+From 05d12e12596512f7a31d3cdb4845a69dc2d4c611 Mon Sep 17 00:00:00 2001
+From: Martin Matuska <martin@matuska.org>
+Date: Tue, 23 Jul 2013 09:27:41 +0000
+Subject: Change brightness level from glong to gint32
+
+The "Backlight" RandR property is a 32-bit integer. This means that the int32 (gint32) type should be used to represent brightness levels. The attached patch does nothing else than changing the brightness level representation from glong to gint32. This fixes the screen auto-dimming issue and brightness panel plugin issue.
+---
+diff --git a/common/xfpm-brightness.c b/common/xfpm-brightness.c
+index aa1ef33..f1524cb 100644
+--- a/common/xfpm-brightness.c
++++ b/common/xfpm-brightness.c
+@@ -92,11 +92,11 @@ out:
+ }
+ 
+ static gboolean
+-xfpm_brightness_xrandr_get_level (XfpmBrightness *brightness, RROutput output, long *current)
++xfpm_brightness_xrandr_get_level (XfpmBrightness *brightness, RROutput output, gint32 *current)
+ {
+     unsigned long nitems;
+     unsigned long bytes_after;
+-    long *prop;
++    gint32 *prop;
+     Atom actual_type;
+     int actual_format;
+     gboolean ret = FALSE;
+@@ -124,7 +124,7 @@ xfpm_brightness_xrandr_get_level (XfpmBrightness *brightness, RROutput output, l
+ }
+ 
+ static gboolean
+-xfpm_brightness_xrandr_set_level (XfpmBrightness *brightness, RROutput output, long level)
++xfpm_brightness_xrandr_set_level (XfpmBrightness *brightness, RROutput output, gint32 level)
+ {
+     gboolean ret = TRUE;
+ 
+@@ -137,7 +137,7 @@ xfpm_brightness_xrandr_set_level (XfpmBrightness *brightness, RROutput output, l
+     
+     if ( gdk_error_trap_pop () ) 
+     {
+-	    g_warning ("failed to XRRChangeOutputProperty for brightness %li", level);
++	    g_warning ("failed to XRRChangeOutputProperty for brightness %d", level);
+ 	    ret = FALSE;
+     }
+     
+@@ -225,11 +225,11 @@ xfpm_brightness_setup_xrandr (XfpmBrightness *brightness)
+ }
+ 
+ static gboolean
+-xfpm_brightness_xrand_up (XfpmBrightness *brightness, glong *new_level)
++xfpm_brightness_xrand_up (XfpmBrightness *brightness, gint32 *new_level)
+ {
+-    long hw_level;
++    gint32 hw_level;
+     gboolean ret = FALSE;
+-    long set_level;
++    gint32 set_level;
+     
+     ret = xfpm_brightness_xrandr_get_level (brightness, brightness->priv->output, &hw_level);
+     
+@@ -250,14 +250,14 @@ xfpm_brightness_xrand_up (XfpmBrightness *brightness, glong *new_level)
+     
+     if ( !ret )
+     {
+-	g_warning ("xfpm_brightness_xrand_up failed for %li", set_level);
++	g_warning ("xfpm_brightness_xrand_up failed for %d", set_level);
+ 	return FALSE;
+     }
+ 	
+     /* Nothing changed in the hardware*/
+     if ( *new_level == hw_level )
+     {
+-	g_warning ("xfpm_brightness_xrand_up did not change the hw level to %li", set_level);
++	g_warning ("xfpm_brightness_xrand_up did not change the hw level to %d", set_level);
+ 	return FALSE;
+     }
+     
+@@ -265,11 +265,11 @@ xfpm_brightness_xrand_up (XfpmBrightness *brightness, glong *new_level)
+ }
+ 
+ static gboolean
+-xfpm_brightness_xrand_down (XfpmBrightness *brightness, long *new_level)
++xfpm_brightness_xrand_down (XfpmBrightness *brightness, gint32 *new_level)
+ {
+-    long hw_level;
++    gint32 hw_level;
+     gboolean ret;
+-    long set_level;
++    gint32 set_level;
+     
+     ret = xfpm_brightness_xrandr_get_level (brightness, brightness->priv->output, &hw_level);
+     
+@@ -290,14 +290,14 @@ xfpm_brightness_xrand_down (XfpmBrightness *brightness, long *new_level)
+     
+     if ( !ret )
+     {
+-	g_warning ("xfpm_brightness_xrand_down failed for %li", set_level);
++	g_warning ("xfpm_brightness_xrand_down failed for %d", set_level);
+ 	return FALSE;
+     }
+     
+     /* Nothing changed in the hardware*/
+     if ( *new_level == hw_level )
+     {
+-	g_warning ("xfpm_brightness_xrand_down did not change the hw level to %li", set_level);
++	g_warning ("xfpm_brightness_xrand_down did not change the hw level to %d", set_level);
+ 	return FALSE;
+     }
+     
+@@ -361,7 +361,7 @@ xfpm_brightness_setup_helper (XfpmBrightness *brightness)
+ }
+ 
+ static gboolean
+-xfpm_brightness_helper_get_level (XfpmBrightness *brg, glong *level)
++xfpm_brightness_helper_get_level (XfpmBrightness *brg, gint32 *level)
+ {
+     int ret;
+ 
+@@ -406,11 +406,11 @@ out:
+ }
+ 
+ static gboolean
+-xfpm_brightness_helper_up (XfpmBrightness *brightness, glong *new_level)
++xfpm_brightness_helper_up (XfpmBrightness *brightness, gint32 *new_level)
+ {
+-    glong hw_level;
++    gint32 hw_level;
+     gboolean ret = FALSE;
+-    gint set_level;
++    gint32 set_level;
+     
+     ret = xfpm_brightness_helper_get_level (brightness, &hw_level);
+     
+@@ -446,11 +446,11 @@ xfpm_brightness_helper_up (XfpmBrightness *brightness, glong *new_level)
+ }
+ 
+ static gboolean
+-xfpm_brightness_helper_down (XfpmBrightness *brightness, glong *new_level)
++xfpm_brightness_helper_down (XfpmBrightness *brightness, gint32 *new_level)
+ {
+-    glong hw_level;
++    gint32 hw_level;
+     gboolean ret;
+-    gint set_level;
++    gint32 set_level;
+     
+     ret = xfpm_brightness_helper_get_level (brightness, &hw_level);
+     
+@@ -572,7 +572,7 @@ xfpm_brightness_setup (XfpmBrightness *brightness)
+     return FALSE;
+ }
+ 
+-gboolean xfpm_brightness_up (XfpmBrightness *brightness, glong *new_level)
++gboolean xfpm_brightness_up (XfpmBrightness *brightness, gint32 *new_level)
+ {
+     gboolean ret = FALSE;
+     
+@@ -589,7 +589,7 @@ gboolean xfpm_brightness_up (XfpmBrightness *brightness, glong *new_level)
+     return ret;
+ }
+ 
+-gboolean xfpm_brightness_down (XfpmBrightness *brightness, glong *new_level)
++gboolean xfpm_brightness_down (XfpmBrightness *brightness, gint32 *new_level)
+ {
+     gboolean ret = FALSE;
+     
+@@ -618,7 +618,7 @@ gint xfpm_brightness_get_max_level (XfpmBrightness *brightness)
+     return brightness->priv->max_level;
+ }
+ 
+-gboolean xfpm_brightness_get_level	(XfpmBrightness *brightness, glong *level)
++gboolean xfpm_brightness_get_level	(XfpmBrightness *brightness, gint32 *level)
+ {
+     gboolean ret = FALSE;
+     
+@@ -632,7 +632,7 @@ gboolean xfpm_brightness_get_level	(XfpmBrightness *brightness, glong *level)
+     return ret;
+ }
+ 
+-gboolean xfpm_brightness_set_level (XfpmBrightness *brightness, glong level)
++gboolean xfpm_brightness_set_level (XfpmBrightness *brightness, gint32 level)
+ {
+     gboolean ret = FALSE;
+     
+diff --git a/common/xfpm-brightness.h b/common/xfpm-brightness.h
+index 0c4e3ed..26b3dbe 100644
+--- a/common/xfpm-brightness.h
++++ b/common/xfpm-brightness.h
+@@ -51,20 +51,20 @@ XfpmBrightness       	       *xfpm_brightness_new             (void);
+ gboolean			xfpm_brightness_setup 		(XfpmBrightness *brightness);
+ 
+ gboolean			xfpm_brightness_up		(XfpmBrightness *brightness,
+-								 glong *new_level);
++								 gint32 *new_level);
+ 
+ gboolean			xfpm_brightness_down		(XfpmBrightness *brightness,
+-								 glong *new_level);
++								 gint32 *new_level);
+ 
+ gboolean			xfpm_brightness_has_hw 		(XfpmBrightness *brightness);
+ 
+ gint 				xfpm_brightness_get_max_level   (XfpmBrightness *brightness);
+ 
+ gboolean			xfpm_brightness_get_level	(XfpmBrightness *brightness,
+-								 glong *level);
++								 gint32 *level);
+ 
+ gboolean			xfpm_brightness_set_level	(XfpmBrightness *brightness,
+-								 glong level);
++								 gint32 level);
+ 
+ gboolean			xfpm_brightness_dim_down	(XfpmBrightness *brightness);
+ 
+diff --git a/panel-plugins/brightness/brightness-button.c b/panel-plugins/brightness/brightness-button.c
+index 6e60c29..bd466c9 100644
+--- a/panel-plugins/brightness/brightness-button.c
++++ b/panel-plugins/brightness/brightness-button.c
+@@ -186,7 +186,7 @@ static gboolean
+ brightness_button_popup_win (GtkWidget *widget, GdkEvent *ev, guint32 ev_time)
+ {
+     gint x, y;
+-    glong current_level = 0;
++    gint32 current_level = 0;
+     GdkDisplay *display;
+     GdkScreen *screen;
+     BrightnessButton *button;
+@@ -342,7 +342,7 @@ plus_clicked (GtkWidget *widget, BrightnessButton *button)
+ static void
+ range_value_changed (GtkWidget *widget, BrightnessButton *button)
+ {
+-    glong range_level, hw_level;
++    gint32 range_level, hw_level;
+     
+     range_level = (gint) gtk_range_get_value (GTK_RANGE (button->priv->range));
+     
+@@ -428,8 +428,8 @@ brightness_button_create_popup (BrightnessButton *button)
+ static void
+ brightness_button_up (BrightnessButton *button)
+ {
+-    glong level;
+-    glong max_level;
++    gint32 level;
++    gint32 max_level;
+     
+     xfpm_brightness_get_level (button->priv->brightness, &level);
+     max_level = xfpm_brightness_get_max_level (button->priv->brightness);
+@@ -443,7 +443,7 @@ brightness_button_up (BrightnessButton *button)
+ static void
+ brightness_button_down (BrightnessButton *button)
+ {
+-    glong level;
++    gint32 level;
+     xfpm_brightness_get_level (button->priv->brightness, &level);
+     
+     if ( level != 0 )
+diff --git a/src/xfpm-backlight.c b/src/xfpm-backlight.c
+index baeeb43..45c990f 100644
+--- a/src/xfpm-backlight.c
++++ b/src/xfpm-backlight.c
+@@ -63,8 +63,8 @@ struct XfpmBacklightPrivate
+     gboolean	    has_hw;
+     gboolean	    on_battery;
+     
+-    glong            last_level;
+-    glong 	    max_level;
++    gint32          last_level;
++    gint32 	    max_level;
+     
+     gboolean        dimmed;
+     gboolean	    block;
+@@ -79,7 +79,7 @@ xfpm_backlight_dim_brightness (XfpmBacklight *backlight)
+     
+     if (xfpm_power_get_mode (backlight->priv->power) == XFPM_POWER_MODE_NORMAL )
+     {
+-	glong dim_level;
++	gint32 dim_level;
+ 	
+ 	g_object_get (G_OBJECT (backlight->priv->conf),
+ 		      backlight->priv->on_battery ? BRIGHTNESS_LEVEL_ON_BATTERY : BRIGHTNESS_LEVEL_ON_AC, &dim_level,
+@@ -101,7 +101,7 @@ xfpm_backlight_dim_brightness (XfpmBacklight *backlight)
+ 	 **/
+ 	if (backlight->priv->last_level > dim_level)
+ 	{
+-	    XFPM_DEBUG ("Current brightness level before dimming : %li, new %li", backlight->priv->last_level, dim_level);
++	    XFPM_DEBUG ("Current brightness level before dimming : %d, new %d", backlight->priv->last_level, dim_level);
+ 	    backlight->priv->dimmed = xfpm_brightness_set_level (backlight->priv->brightness, dim_level);
+ 	}
+     }
+@@ -182,7 +182,7 @@ xfpm_backlight_reset_cb (EggIdletime *idle, XfpmBacklight *backlight)
+     {
+ 	if ( !backlight->priv->block)
+ 	{
+-	    XFPM_DEBUG ("Alarm reset, setting level to %li", backlight->priv->last_level);
++	    XFPM_DEBUG ("Alarm reset, setting level to %d", backlight->priv->last_level);
+ 	    xfpm_brightness_set_level (backlight->priv->brightness, backlight->priv->last_level);
+ 	}
+ 	backlight->priv->dimmed = FALSE;
+@@ -192,7 +192,7 @@ xfpm_backlight_reset_cb (EggIdletime *idle, XfpmBacklight *backlight)
+ static void
+ xfpm_backlight_button_pressed_cb (XfpmButton *button, XfpmButtonKey type, XfpmBacklight *backlight)
+ {
+-    glong level;
++    gint32 level;
+     gboolean ret = TRUE;
+     
+     gboolean enable_brightness, show_popup;
+--
+cgit v0.9.2
diff --git a/extra/xfce4-power-manager/xfce4-power-manager-1.2.0-logind-support-for-suspend-hibernate.patch b/extra/xfce4-power-manager/xfce4-power-manager-1.2.0-logind-support-for-suspend-hibernate.patch
new file mode 100644
index 000000000..431489588
--- /dev/null
+++ b/extra/xfce4-power-manager/xfce4-power-manager-1.2.0-logind-support-for-suspend-hibernate.patch
@@ -0,0 +1,156 @@
+From 244d0f09561eace29cbef819c2deb55b13701e25 Mon Sep 17 00:00:00 2001
+From: Mikhail Efremov <sem@altlinux.org>
+Date: Mon, 8 Apr 2013 21:04:30 +0400
+Subject: [PATCH] Add systemd-logind support for suspend/hibernate.
+
+---
+ configure.ac.in         | 20 +++++++++++++++++
+ src/xfpm-power-common.h |  8 +++++++
+ src/xfpm-power.c        | 57 ++++++++++++++++++++++++++++++++++++++++++++++++-
+ 3 files changed, 84 insertions(+), 1 deletion(-)
+
+diff --git a/src/xfpm-power-common.h b/src/xfpm-power-common.h
+index 1040aed..11eaedc 100644
+--- a/src/xfpm-power-common.h
++++ b/src/xfpm-power-common.h
+@@ -33,9 +33,17 @@
+ #define UPOWER_PATH_WAKEUPS   "/org/freedesktop/UPower/Wakeups"
+ #define UPOWER_IFACE_WAKEUPS  "org.freedesktop.UPower.Wakeups"
+ 
++#ifdef WITH_SLEEP_MANAGER_UPOWER
+ #define POLKIT_AUTH_SUSPEND   "org.freedesktop.upower.suspend"
+ #define	POLKIT_AUTH_HIBERNATE "org.freedesktop.upower.hibernate"
++#else
++#define LOGIND_NAME 	      "org.freedesktop.login1"
++#define LOGIND_PATH 	      "/org/freedesktop/login1"
++#define LOGIND_IFACE 	      "org.freedesktop.login1.Manager"
+ 
++#define POLKIT_AUTH_SUSPEND   "org.freedesktop.login1.suspend"
++#define	POLKIT_AUTH_HIBERNATE "org.freedesktop.login1.hibernate"
++#endif
+ 
+ GPtrArray 	*xfpm_power_enumerate_devices		(DBusGProxy *proxy);
+ 
+diff --git a/src/xfpm-power.c b/src/xfpm-power.c
+index 796bef8..4a91e33 100644
+--- a/src/xfpm-power.c
++++ b/src/xfpm-power.c
+@@ -72,7 +72,10 @@ struct XfpmPowerPrivate
+     
+     DBusGProxy      *proxy;
+     DBusGProxy      *proxy_prop;
+-    
++#ifndef WITH_SLEEP_MANAGER_UPOWER
++    DBusGProxy      *proxy_logind;
++#endif
++
+     GHashTable      *hash;
+     
+     XfpmConsoleKit  *console;
+@@ -153,6 +156,7 @@ xfpm_power_check_polkit_auth (XfpmPower *power)
+ }
+ #endif
+ 
++#ifdef WITH_SLEEP_MANAGER_UPOWER
+ static void
+ xfpm_power_check_pm (XfpmPower *power, GHashTable *props)
+ {
+@@ -186,6 +190,32 @@ xfpm_power_check_pm (XfpmPower *power, GHashTable *props)
+ 	power->priv->can_hibernate = ret;
+     }
+ }
++#else
++static gboolean
++xfpm_power_can_sleep_method (XfpmPower *power, const char *method)
++{
++    GError *error = NULL;
++    char *retstr = NULL;
++    gboolean ret = FALSE;
++
++    if (!dbus_g_proxy_call (power->priv->proxy_logind, method, &error,
++            G_TYPE_INVALID,
++            G_TYPE_STRING, &retstr,
++            G_TYPE_INVALID))
++    {
++        g_warning ("Unable to check %s method: %s", method, error->message);
++        g_error_free (error);
++
++        return FALSE;
++    }
++
++	if (retstr && !strcmp (retstr, "yes"))
++			ret = TRUE;
++	g_free (retstr);
++
++    return ret;
++}
++#endif
+ 
+ static void
+ xfpm_power_check_power (XfpmPower *power, GHashTable *props)
+@@ -276,7 +306,12 @@ xfpm_power_get_properties (XfpmPower *power)
+     
+     props = xfpm_power_get_interface_properties (power->priv->proxy_prop, UPOWER_IFACE);
+     
++#ifdef WITH_SLEEP_MANAGER_UPOWER
+     xfpm_power_check_pm (power, props);
++#else
++    power->priv->can_suspend = xfpm_power_can_sleep_method (power, "CanSuspend");
++    power->priv->can_hibernate = xfpm_power_can_sleep_method (power, "CanHibernate");
++#endif
+     xfpm_power_check_lid (power, props);
+     xfpm_power_check_power (power, props);
+ 
+@@ -347,9 +382,16 @@ xfpm_power_sleep (XfpmPower *power, const gchar *sleep_time, gboolean force)
+ 	xfpm_lock_screen ();
+     }
+     
++#ifdef WITH_SLEEP_MANAGER_UPOWER
+     dbus_g_proxy_call (power->priv->proxy, sleep_time, &error,
+ 		       G_TYPE_INVALID,
+ 		       G_TYPE_INVALID);
++#else
++    dbus_g_proxy_call (power->priv->proxy_logind, sleep_time, &error,
++		       G_TYPE_BOOLEAN, TRUE,
++		       G_TYPE_INVALID,
++		       G_TYPE_INVALID);
++#endif
+     
+     if ( error )
+     {
+@@ -1360,12 +1402,20 @@ xfpm_power_init (XfpmPower *power)
+ 							 UPOWER_NAME,
+ 							 UPOWER_PATH,
+ 							 DBUS_INTERFACE_PROPERTIES);
++
+     if (power->priv->proxy_prop == NULL) 
+     {
+ 	g_critical ("Unable to create proxy for %s", UPOWER_NAME);
+ 	goto out;
+     }
+     
++#ifndef WITH_SLEEP_MANAGER_UPOWER
++    power->priv->proxy_logind = dbus_g_proxy_new_for_name (power->priv->bus,
++						    LOGIND_NAME,
++						    LOGIND_PATH,
++						    LOGIND_IFACE);
++#endif
++
+     xfpm_power_get_power_devices (power);
+     xfpm_power_get_properties (power);
+ #ifdef ENABLE_POLKIT
+@@ -1467,6 +1517,11 @@ xfpm_power_finalize (GObject *object)
+     if ( power->priv->proxy_prop )
+ 	g_object_unref (power->priv->proxy_prop);
+ 
++#ifndef WITH_SLEEP_MANAGER_UPOWER
++    if ( power->priv->proxy_logind )
++	g_object_unref (power->priv->proxy_logind);
++#endif
++
+     g_hash_table_destroy (power->priv->hash);
+ 
+ #ifdef ENABLE_POLKIT
+-- 
+1.8.1.5
+
diff --git a/extra/xfce4-session/PKGBUILD b/extra/xfce4-session/PKGBUILD
index bf4c67f28..5297fc185 100644
--- a/extra/xfce4-session/PKGBUILD
+++ b/extra/xfce4-session/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 189759 2013-07-07 14:26:30Z foutrelis $
+# $Id: PKGBUILD 194429 2013-09-16 10:38:03Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=xfce4-session
 pkgver=4.10.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A session manager for Xfce"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xfce.org/"
@@ -20,8 +20,20 @@ optdepends=('gnome-keyring: for keyring support when GNOME compatibility is enab
 replaces=('xfce-utils')
 options=('!libtool')
 install=$pkgname.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2)
-sha256sums=('0154fabdc398798c3445374ccc52a2f5bcb2d867fc94bc54114395b24f9cfc83')
+source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2
+        xfce4-session-4.10.1-logind-support-for-suspend-hibernate.patch)
+sha256sums=('0154fabdc398798c3445374ccc52a2f5bcb2d867fc94bc54114395b24f9cfc83'
+            '1fc10b6495624ddfb9e18419c835f7b929ad738c602a64ee7aab8327d3aac981')
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # Use logind interfaces for suspend and hibernate
+  # https://bugzilla.xfce.org/show_bug.cgi?id=9952
+  patch -Np1 -i "$srcdir/xfce4-session-4.10.1-logind-support-for-suspend-hibernate.patch"
+
+  xdt-autogen
+}
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/xfce4-session/xfce4-session-4.10.1-logind-support-for-suspend-hibernate.patch b/extra/xfce4-session/xfce4-session-4.10.1-logind-support-for-suspend-hibernate.patch
new file mode 100644
index 000000000..43aaeb8d5
--- /dev/null
+++ b/extra/xfce4-session/xfce4-session-4.10.1-logind-support-for-suspend-hibernate.patch
@@ -0,0 +1,275 @@
+From b076b5592579b397b7d4888eb8062e646b9a4dec Mon Sep 17 00:00:00 2001
+From: Mikhail Efremov <sem@altlinux.org>
+Date: Wed, 10 Apr 2013 17:10:09 +0400
+Subject: [PATCH] Add systemd-logind support for suspend/hibernate.
+
+---
+ xfce4-session/Makefile.am     |  8 +++----
+ xfce4-session/xfsm-shutdown.c | 42 +++++++++++++++++++++++++++-------
+ xfce4-session/xfsm-systemd.c  | 52 +++++++++++++++++++++++++++++++++++++++++++
+ xfce4-session/xfsm-systemd.h  | 14 ++++++++++++
+ 4 files changed, 104 insertions(+), 12 deletions(-)
+
+diff --git a/xfce4-session/Makefile.am b/xfce4-session/Makefile.am
+index 5472b33..5e2973b 100644
+--- a/xfce4-session/Makefile.am
++++ b/xfce4-session/Makefile.am
+@@ -59,9 +59,7 @@ xfce4_session_SOURCES =							\
+ 	xfsm-splash-screen.c						\
+ 	xfsm-splash-screen.h						\
+ 	xfsm-startup.c							\
+-	xfsm-startup.h							\
+-	xfsm-upower.c							\
+-	xfsm-upower.h
++	xfsm-startup.h
+ 
+ if HAVE_SYSTEMD
+ xfce4_session_SOURCES +=						\
+@@ -70,7 +68,9 @@ xfce4_session_SOURCES +=						\
+ else
+ xfce4_session_SOURCES +=						\
+ 	xfsm-consolekit.c						\
+-	xfsm-consolekit.h
++	xfsm-consolekit.h                       \
++	xfsm-upower.c							\
++	xfsm-upower.h
+ endif
+ 
+ xfce4_session_CFLAGS =							\
+diff --git a/xfce4-session/xfsm-shutdown.c b/xfce4-session/xfsm-shutdown.c
+index 4c483a7..8a2ba8d 100644
+--- a/xfce4-session/xfsm-shutdown.c
++++ b/xfce4-session/xfsm-shutdown.c
+@@ -66,12 +66,12 @@
+ #include <xfce4-session/xfsm-fadeout.h>
+ #include <xfce4-session/xfsm-global.h>
+ #include <xfce4-session/xfsm-legacy.h>
+-#include <xfce4-session/xfsm-upower.h>
+ 
+ #ifdef HAVE_SYSTEMD
+ #include <xfce4-session/xfsm-systemd.h>
+ #else
+ #include <xfce4-session/xfsm-consolekit.h>
++#include <xfce4-session/xfsm-upower.h>
+ #endif
+ 
+ static void xfsm_shutdown_finalize  (GObject      *object);
+@@ -100,8 +100,8 @@ struct _XfsmShutdown
+   XfsmSystemd    *systemd;
+ #else
+   XfsmConsolekit *consolekit;
+-#endif
+   XfsmUPower     *upower;
++#endif
+ 
+   /* kiosk settings */
+   gboolean        kiosk_can_shutdown;
+@@ -142,8 +142,8 @@ xfsm_shutdown_init (XfsmShutdown *shutdown)
+   shutdown->systemd = xfsm_systemd_get ();
+ #else
+   shutdown->consolekit = xfsm_consolekit_get ();
+-#endif
+   shutdown->upower = xfsm_upower_get ();
++#endif
+   shutdown->helper_state = SUDO_NOT_INITIAZED;
+   shutdown->helper_require_password = FALSE;
+ 
+@@ -165,8 +165,8 @@ xfsm_shutdown_finalize (GObject *object)
+   g_object_unref (G_OBJECT (shutdown->systemd));
+ #else
+   g_object_unref (G_OBJECT (shutdown->consolekit));
+-#endif
+   g_object_unref (G_OBJECT (shutdown->upower));
++#endif
+ 
+   /* close down helper */
+   xfsm_shutdown_sudo_free (shutdown);
+@@ -692,7 +692,11 @@ xfsm_shutdown_try_suspend (XfsmShutdown  *shutdown,
+ {
+   g_return_val_if_fail (XFSM_IS_SHUTDOWN (shutdown), FALSE);
+ 
++#ifdef HAVE_SYSTEMD
++  return xfsm_systemd_try_suspend (shutdown->systemd, error);
++#else
+   return xfsm_upower_try_suspend (shutdown->upower, error);
++#endif
+ }
+ 
+ 
+@@ -703,7 +707,11 @@ xfsm_shutdown_try_hibernate (XfsmShutdown  *shutdown,
+ {
+   g_return_val_if_fail (XFSM_IS_SHUTDOWN (shutdown), FALSE);
+ 
++#ifdef HAVE_SYSTEMD
++  return xfsm_systemd_try_hibernate (shutdown->systemd, error);
++#else
+   return xfsm_upower_try_hibernate (shutdown->upower, error);
++#endif
+ }
+ 
+ 
+@@ -776,6 +784,8 @@ xfsm_shutdown_can_suspend (XfsmShutdown  *shutdown,
+                            gboolean      *auth_suspend,
+                            GError       **error)
+ {
++  gboolean ret;
++
+   g_return_val_if_fail (XFSM_IS_SHUTDOWN (shutdown), FALSE);
+ 
+   if (!xfsm_shutdown_kiosk_can_shutdown (shutdown, NULL))
+@@ -784,8 +794,15 @@ xfsm_shutdown_can_suspend (XfsmShutdown  *shutdown,
+       return TRUE;
+     }
+ 
+-  return xfsm_upower_can_suspend (shutdown->upower, can_suspend, 
+-                                  auth_suspend, error);
++#ifdef HAVE_SYSTEMD
++  ret = xfsm_systemd_can_suspend (shutdown->systemd, can_suspend, error);
++  *auth_suspend = *can_suspend;
++#else
++  ret = xfsm_upower_can_suspend (shutdown->upower, can_suspend,
++                                 auth_suspend, error);
++#endif
++
++  return ret;
+ }
+ 
+ 
+@@ -796,6 +813,8 @@ xfsm_shutdown_can_hibernate (XfsmShutdown  *shutdown,
+                              gboolean      *auth_hibernate,
+                              GError       **error)
+ {
++  gboolean ret;
++
+   g_return_val_if_fail (XFSM_IS_SHUTDOWN (shutdown), FALSE);
+ 
+   if (!xfsm_shutdown_kiosk_can_shutdown (shutdown, NULL))
+@@ -804,8 +823,15 @@ xfsm_shutdown_can_hibernate (XfsmShutdown  *shutdown,
+       return TRUE;
+     }
+ 
+-  return xfsm_upower_can_hibernate (shutdown->upower, can_hibernate,
+-                                    auth_hibernate, error);
++#ifdef HAVE_SYSTEMD
++  ret = xfsm_systemd_can_hibernate (shutdown->systemd, can_hibernate, error);
++  *auth_hibernate = *can_hibernate;
++#else
++  ret = xfsm_upower_can_hibernate (shutdown->upower, can_hibernate,
++                                   auth_hibernate, error);
++#endif
++
++  return ret;
+ }
+ 
+ 
+diff --git a/xfce4-session/xfsm-systemd.c b/xfce4-session/xfsm-systemd.c
+index 7bdd39d..cfe7bf4 100644
+--- a/xfce4-session/xfsm-systemd.c
++++ b/xfce4-session/xfsm-systemd.c
+@@ -33,8 +33,12 @@
+ #define SYSTEMD_DBUS_INTERFACE          "org.freedesktop.login1.Manager"
+ #define SYSTEMD_REBOOT_ACTION           "Reboot"
+ #define SYSTEMD_POWEROFF_ACTION         "PowerOff"
++#define SYSTEMD_SUSPEND_ACTION          "Suspend"
++#define SYSTEMD_HIBERNATE_ACTION        "Hibernate"
+ #define SYSTEMD_REBOOT_TEST             "org.freedesktop.login1.reboot"
+ #define SYSTEMD_POWEROFF_TEST           "org.freedesktop.login1.power-off"
++#define SYSTEMD_SUSPEND_TEST            "org.freedesktop.login1.suspend"
++#define SYSTEMD_HIBERNATE_TEST          "org.freedesktop.login1.hibernate"
+ 
+ 
+ 
+@@ -205,6 +209,28 @@ xfsm_systemd_try_shutdown (XfsmSystemd  *systemd,
+ 
+ 
+ gboolean
++xfsm_systemd_try_suspend (XfsmSystemd  *systemd,
++                          GError      **error)
++{
++  return xfsm_systemd_try_method (systemd,
++                                  SYSTEMD_SUSPEND_ACTION,
++                                  error);
++}
++
++
++
++gboolean
++xfsm_systemd_try_hibernate (XfsmSystemd  *systemd,
++                            GError      **error)
++{
++  return xfsm_systemd_try_method (systemd,
++                                  SYSTEMD_HIBERNATE_ACTION,
++                                  error);
++}
++
++
++
++gboolean
+ xfsm_systemd_can_restart (XfsmSystemd  *systemd,
+                           gboolean     *can_restart,
+                           GError      **error)
+@@ -227,3 +253,29 @@ xfsm_systemd_can_shutdown (XfsmSystemd  *systemd,
+                                   SYSTEMD_POWEROFF_TEST,
+                                   error);
+ }
++
++
++
++gboolean
++xfsm_systemd_can_suspend (XfsmSystemd  *systemd,
++                          gboolean     *can_suspend,
++                          GError      **error)
++{
++  return xfsm_systemd_can_method (systemd,
++                                  can_suspend,
++                                  SYSTEMD_SUSPEND_TEST,
++                                  error);
++}
++
++
++
++gboolean
++xfsm_systemd_can_hibernate (XfsmSystemd  *systemd,
++                            gboolean     *can_hibernate,
++                            GError      **error)
++{
++  return xfsm_systemd_can_method (systemd,
++                                  can_hibernate,
++                                  SYSTEMD_HIBERNATE_TEST,
++                                  error);
++}
+diff --git a/xfce4-session/xfsm-systemd.h b/xfce4-session/xfsm-systemd.h
+index 8223622..6cf803f 100644
+--- a/xfce4-session/xfsm-systemd.h
++++ b/xfce4-session/xfsm-systemd.h
+@@ -42,6 +42,12 @@ gboolean     xfsm_systemd_try_restart  (XfsmSystemd  *systemd,
+ gboolean     xfsm_systemd_try_shutdown (XfsmSystemd  *systemd,
+                                         GError      **error);
+ 
++gboolean     xfsm_systemd_try_suspend  (XfsmSystemd  *systemd,
++                                        GError      **error);
++
++gboolean     xfsm_systemd_try_hibernate (XfsmSystemd *systemd,
++                                        GError      **error);
++
+ gboolean     xfsm_systemd_can_restart  (XfsmSystemd  *systemd,
+                                         gboolean     *can_restart,
+                                         GError      **error);
+@@ -50,6 +56,14 @@ gboolean     xfsm_systemd_can_shutdown (XfsmSystemd  *systemd,
+                                         gboolean     *can_shutdown,
+                                         GError      **error);
+ 
++gboolean     xfsm_systemd_can_suspend  (XfsmSystemd  *systemd,
++                                        gboolean     *can_suspend,
++                                        GError      **error);
++
++gboolean     xfsm_systemd_can_hibernate (XfsmSystemd *systemd,
++                                        gboolean     *can_hibernate,
++                                        GError      **error);
++
+ G_END_DECLS
+ 
+ #endif  /* __XFSM_SYSTEMD_H__ */
+-- 
+1.8.1.5
+
diff --git a/extra/xfig/PKGBUILD b/extra/xfig/PKGBUILD
index cf25f6713..548e94fab 100644
--- a/extra/xfig/PKGBUILD
+++ b/extra/xfig/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 184453 2013-05-06 19:40:21Z foutrelis $
+# $Id: PKGBUILD 194017 2013-09-10 00:31:09Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xfig
-pkgver=3.2.5b
-pkgrel=9
+pkgver=3.2.5c
+pkgrel=1
 pkgdesc="An interactive drawing tool"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xfig.org/userman/"
@@ -16,52 +16,48 @@ install=xfig.install
 source=(http://downloads.sourceforge.net/mcj/${pkgname}.${pkgver}.full.tar.gz \
 	xfig-3.2.4-redhat.patch xfig-3.2.5-color-resources.patch \
         xfig-3.2.5-urwfonts.patch \
-        xfig-3.2.5-fhs.patch xfig-3.2.5-missing-protos.patch \
-        xfig.3.2.5-modularX.patch xfig-3.2.5b-fix-eps-reading.patch \
-        xfig-3.2.5b-libpng-1.5.patch LICENSE xfig.desktop)
-sha1sums=('0730d7e6bc217c0de02682efb0078821512bb542'
+        LICENSE)
+sha1sums=('47d31dd9ad46819732ab74db340e11489db2c646'
           '926ad99c7221baa4aa9e9737722958860b2700fc'
-          'b7c03fb70066ff476a4039a8c0f8930c15edef68'
+          '45e7fb80193825b088d798089aeade2e1729c9ac'
           'e595ccdbe293ea0fdecbf59a2192ae57ced2c8eb'
-          '39bec6bac9746b643b05fd1286826113ede07ff6'
-          'bd76cd50be6a5789cfd6f182309cfd7056be04f3'
-          'a1285f4e61ad2eec040460ab03e8022098e7f78e'
-          '12a64ddaf65a73e23ef74f31483515a0e262768c'
-          '83032eb61c8dc96d5fc509a1ce632528457d4598'
-          '31edf4cfab708820ea3f114d095dfef5aa88e5aa'
-          '9011b8fa6143e37525b28cc9800a3bf2d6b008d2')
+          '31edf4cfab708820ea3f114d095dfef5aa88e5aa')
 
 prepare() {
   cd ${pkgname}.${pkgver}
   patch -p1 < ../xfig-3.2.4-redhat.patch
-  patch -p1 < ../xfig-3.2.5-fhs.patch
-  patch -p1 < ../xfig.3.2.5-modularX.patch
   patch -p1 < ../xfig-3.2.5-color-resources.patch
   patch -p1 < ../xfig-3.2.5-urwfonts.patch
-  patch -p1 < ../xfig-3.2.5-missing-protos.patch
-  patch -p1 < ../xfig-3.2.5b-fix-eps-reading.patch
-  patch -p1 < ../xfig-3.2.5b-libpng-1.5.patch
+  sed -i -e 's|X11R6/||' -e 's|image/x-xfig|image/fig;image/x-xfig|' xfig.desktop
+  echo -e "Categories=Application;Graphics;\nIcon=xfig" >> xfig.desktop
   sed -i 's/#define XAW3D/XCOMM #define XAW3D/' Imakefile
+  sed -i 's/XCOMM USEINLINE/USEINLINE/' Imakefile
+  sed -i -e 's/XCOMM #define I18N/#define I18N/' \
+    -e 's/XCOMM XAW_INTERN/XAW_INTERN/' Imakefile
   chmod 755 Libraries
+  groff -mandoc -Thtml Doc/xfig.man > Doc/xfig_man.html
 }
 
 build() {
   cd ${pkgname}.${pkgver}
   xmkmf
-  make DOCDIR=/usr/share/doc
+  make XFIGDOCDIR=/usr/share/doc/xfig LIBDIR=/usr/share \
+    XAPPLOADDIR=/usr/share/X11/app-defaults
 }
 
 package() {
   cd ${pkgname}.${pkgver}
-  make DESTDIR="${pkgdir}" DOCDIR=/usr/share/doc install.all
-  rm "${pkgdir}/usr/lib/X11/app-defaults"
+
+  make DESTDIR="${pkgdir}" XFIGDOCDIR=/usr/share/doc/xfig LIBDIR=/usr/share \
+    MANDIR=/usr/share/man/man1 XAPPLOADDIR=/usr/share/X11/app-defaults install.all
+  rm "${pkgdir}/usr/share/app-defaults"
 
   find "${pkgdir}/usr/share/xfig/Libraries" -type f -exec chmod 0644 {} \;
   find "${pkgdir}/usr/share/xfig/Libraries" -type d -exec chmod 0755 {} \;
   find "${pkgdir}/usr/share/doc/xfig" -type f -exec chmod 0644 {} \;
   find "${pkgdir}/usr/share/doc/xfig" -type d -exec chmod 0755 {} \;
 
-  install -D -m644 ../xfig.desktop "${pkgdir}/usr/share/applications/xfig.desktop"
+  install -D -m644 xfig.desktop "${pkgdir}/usr/share/applications/xfig.desktop"
   install -D -m644 xfig.png  "${pkgdir}/usr/share/pixmaps/xfig.png"
   install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"	
 }
diff --git a/extra/xfig/xfig-3.2.5-color-resources.patch b/extra/xfig/xfig-3.2.5-color-resources.patch
index 6cf1af906..4a716b541 100644
--- a/extra/xfig/xfig-3.2.5-color-resources.patch
+++ b/extra/xfig/xfig-3.2.5-color-resources.patch
@@ -1,39 +1,39 @@
 diff -up xfig.3.2.5/Fig-color.bisque.ad~ xfig.3.2.5/Fig-color.bisque.ad
 --- xfig.3.2.5/Fig-color.bisque.ad~	2007-11-16 13:47:45.000000000 +0100
 +++ xfig.3.2.5/Fig-color.bisque.ad	2007-11-16 13:47:52.000000000 +0100
-@@ -93,7 +93,7 @@ Fig*sideruler.background: 		gray95
- Fig*topruler.background:	 		gray95
- Fig*sideruler.background:	 		gray95
- Fig*List*background:	 			gray95
--Fig*Scrollbar.background:	 		gray95
-+! Fig*Scrollbar.background:	 		gray95
-
- Fig*cancel.background:	 			navajowhite1
- Fig*dismiss.background:	 			navajowhite1
+@@ -72,7 +72,7 @@
+ Fig*topruler.background:	 		gray95

+ Fig*sideruler.background:	 		gray95

+ Fig*List*background:	 			gray95

+-Fig*Scrollbar.background:	 		gray95

++! Fig*Scrollbar.background:	 		gray95

+ 

+ Fig*cancel.background:	 			navajowhite1

+ Fig*dismiss.background:	 			navajowhite1

 @@ -104,8 +104,8 @@ Fig*menu_divider.foreground:			red
- Fig*menu_divider.foreground:			red
-
- !##### Shadows
--Fig*shadowWidth:				2
--Fig*Label.shadowWidth:				1
-+! Fig*shadowWidth:				2
-+! Fig*Label.shadowWidth:				1
- Fig*horizontal.shadowWidth:	 		2
- Fig*Scrollbar.shadowWidth:			2
- ! no shadows for update indicators
+ Fig*menu_divider.foreground:			red

+ 

+ !##### Shadows

+-Fig*shadowWidth:				2

+-Fig*Label.shadowWidth:				1

++! Fig*shadowWidth:				2

++! Fig*Label.shadowWidth:				1

+ Fig*horizontal.shadowWidth:	 		2

+ Fig*Scrollbar.shadowWidth:			2

+ ! no shadows for update indicators

 @@ -136,3 +136,15 @@ Fig*color_box*topShadowPixel:		gray80
- 
- Fig*toggle*bottomShadowPixel:			gray80
- Fig*toggle*topShadowPixel:			gray50
-+
-+! repare damage done to scrollbar shadows non color resources file
-+
-+Fig*horizontal.topShadowPixel: gray95
-+Fig*horizontal.bottomShadowPixel: gray50
-+Fig*horizontal.topShadow: gray95
-+Fig*horizontal.bottomShadow: gray50
-+
-+Fig*Scrollbar.topShadow: gray95
-+Fig*Scrollbar.bottomShadow: gray50
-+Fig*Scrollbar.topShadowPixel: gray95
-+Fig*Scrollbar.bottomShadowPixel: gray50
+ 

+ Fig*toggle*bottomShadowPixel:			gray80

+ Fig*toggle*topShadowPixel:			gray50

++

++! repare damage done to scrollbar shadows non color resources file

++

++Fig*horizontal.topShadowPixel: gray95

++Fig*horizontal.bottomShadowPixel: gray50

++Fig*horizontal.topShadow: gray95

++Fig*horizontal.bottomShadow: gray50

++

++Fig*Scrollbar.topShadow: gray95

++Fig*Scrollbar.bottomShadow: gray50

++Fig*Scrollbar.topShadowPixel: gray95

++Fig*Scrollbar.bottomShadowPixel: gray50

diff --git a/extra/xfig/xfig-3.2.5-fhs.patch b/extra/xfig/xfig-3.2.5-fhs.patch
deleted file mode 100644
index a17d908a7..000000000
--- a/extra/xfig/xfig-3.2.5-fhs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- xfig.3.2.5/Imakefile.fhs	2006-10-11 01:19:22.000000000 +0200
-+++ xfig.3.2.5/Imakefile	2007-04-16 14:04:45.000000000 +0200
-@@ -169,8 +169,7 @@
- XFIGLIBDIR = $(LIBDIR)/xfig
- 
- XCOMM XFIGDOCDIR tells where the html and pdf documentation should go
--XCOMM XFIGDOCDIR = $(DOCDIR)/xfig
--XFIGDOCDIR = /usr/local/xfig/doc
-+XFIGDOCDIR = $(DOCDIR)/xfig
- 
- XCOMM MANDIR tells where the standard man pages should go (no need to change it
- XCOMM if you want the man pages installed in the standard place on your system
diff --git a/extra/xfig/xfig-3.2.5-missing-protos.patch b/extra/xfig/xfig-3.2.5-missing-protos.patch
deleted file mode 100644
index 181c52a69..000000000
--- a/extra/xfig/xfig-3.2.5-missing-protos.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up xfig.3.2.5/u_draw.c~ xfig.3.2.5/u_draw.c
---- xfig.3.2.5/u_draw.c~	2008-04-03 15:58:23.000000000 +0200
-+++ xfig.3.2.5/u_draw.c	2008-04-03 15:58:23.000000000 +0200
-@@ -43,6 +43,7 @@
- #include "w_zoom.h"
- #include "u_redraw.h"
- #include "w_cursor.h"
-+#include <X11/ImUtil.h>
- 
- static Boolean add_point(int x, int y);
- static void init_point_array(void);
diff --git a/extra/xfig/xfig-3.2.5b-fix-eps-reading.patch b/extra/xfig/xfig-3.2.5b-fix-eps-reading.patch
deleted file mode 100644
index 7601d20ea..000000000
--- a/extra/xfig/xfig-3.2.5b-fix-eps-reading.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -ur xfig.3.2.5b/f_readeps.c xfig.3.2.5b.new/f_readeps.c
---- xfig.3.2.5b/f_readeps.c	2009-03-30 17:52:18.000000000 +0200
-+++ xfig.3.2.5b.new/f_readeps.c	2010-11-25 16:53:54.328247928 +0100
-@@ -252,12 +252,13 @@
- {
-     char        buf[300];
-     FILE       *tmpfp, *pixfile, *gsfile;
--    char       *psnam, *driver;
-+    char       *driver;
-     int         status, wid, ht, nbitmap, fd;
-     char        tmpfile[PATH_MAX],
- 		pixnam[PATH_MAX],
- 		errnam[PATH_MAX],
--		gscom[2 * PATH_MAX];
-+		gscom[2 * PATH_MAX],
-+		psnam[PATH_MAX];
- 
-     wid = urx - llx;
-     ht = ury - lly;
-@@ -307,19 +308,14 @@
- 	/* for color, use pcx */
- 	driver = "pcx256";
-     }
--    /* avoid absolute paths (for Cygwin with gswin32) by changing directory */
--    if (tmpfile[0] == '/') {
--	psnam = strrchr(tmpfile, '/');
--	*psnam = 0;
--	sprintf(gscom, "cd \"%s/\";", tmpfile);
--	*psnam++ = '/';		/* Restore name for unlink() below */
--    } else {
--	psnam = tmpfile;
--	gscom[0] = '\0';
-+    /* Canonicalize the eps file filename, needed to "defeat" -dSAFER */
-+    if (!realpath(tmpfile, psnam)) {
-+	file_msg("Cannot canonicalize %s: %s\n", tmpfile, strerror(errno));
-+	return False;
-     }
--    sprintf(&gscom[strlen(gscom)],
--	    "%s -r72x72 -dSAFER -sDEVICE=%s -g%dx%d -sOutputFile=%s -q - > %s 2>&1",
--	    appres.ghostscript, driver, wid, ht, pixnam, errnam);
-+    sprintf(gscom,
-+	    "%s -r72x72 -sDEVICE=%s -g%dx%d -sOutputFile=%s -dDELAYSAFER -c '<< /PermitFileReading [ (%s)] >> setuserparams .locksafe' -dSAFER -q - > %s 2>&1",
-+	    appres.ghostscript, driver, wid, ht, pixnam, psnam, errnam);
-     if (appres.DEBUG)
- 	fprintf(stderr,"calling: %s\n",gscom);
-     if ((gsfile = popen(gscom, "w")) == 0) {
diff --git a/extra/xfig/xfig-3.2.5b-libpng-1.5.patch b/extra/xfig/xfig-3.2.5b-libpng-1.5.patch
deleted file mode 100644
index 7d9c3f15e..000000000
--- a/extra/xfig/xfig-3.2.5b-libpng-1.5.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Index: xfig.3.2.5b/f_readpng.c
-===================================================================
---- xfig.3.2.5b.orig/f_readpng.c
-+++ xfig.3.2.5b/f_readpng.c
-@@ -73,7 +73,7 @@ read_png(FILE *file, int filetype, F_pic
-     }
- 
-     /* set long jump recovery here */
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
- 	/* if we get here there was a problem reading the file */
- 	png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
- 	close_picfile(file,filetype);
-@@ -90,15 +90,17 @@ read_png(FILE *file, int filetype, F_pic
-     png_get_IHDR(png_ptr, info_ptr, &w, &h, &bit_depth, &color_type,
- 	&interlace_type, &compression_type, &filter_type);
- 
--    if (info_ptr->valid & PNG_INFO_gAMA)
--	png_set_gamma(png_ptr, 2.2, info_ptr->gamma);
--    else
--	png_set_gamma(png_ptr, 2.2, 0.45);
-+    png_fixed_point gamma = 0.45;
-+    png_get_gAMA_fixed(png_ptr,info_ptr,&gamma);
-+    png_set_gamma(png_ptr, 2.2, gamma);
- 
--    if (info_ptr->valid & PNG_INFO_bKGD)
-+    if (png_get_valid(png_ptr,info_ptr,PNG_INFO_bKGD)) {
- 	/* set the background to the one supplied */
--	png_set_background(png_ptr, &info_ptr->background,
-+	png_color_16p background;
-+	png_get_bKGD(png_ptr,info_ptr,&background);
-+	png_set_background(png_ptr, background,
- 		PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
-+    }
-     else {
- 	/* blend the canvas background using the alpha channel */
- 	background.red   = x_bg_color.red >> 8;
-@@ -136,7 +138,11 @@ read_png(FILE *file, int filetype, F_pic
- 
- 	if (png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette)) {
- 	    png_get_hIST(png_ptr, info_ptr, &histogram);
-+#if PNG_LIBPNG_VER_MAJOR <= 1 && PNG_LIBPNG_VER_MINOR < 5
- 	    png_set_dither(png_ptr, palette, num_palette, 256, histogram, 0);
-+#else
-+	    png_set_quantize(png_ptr, palette, num_palette, 256, histogram, 0);
-+#endif
- 	}
-     }
-     if (color_type == PNG_COLOR_TYPE_GRAY || color_type == PNG_COLOR_TYPE_GRAY_ALPHA) {
-Index: xfig.3.2.5b/f_wrpng.c
-===================================================================
---- xfig.3.2.5b.orig/f_wrpng.c
-+++ xfig.3.2.5b/f_wrpng.c
-@@ -20,6 +20,7 @@
- #include "w_msgpanel.h"
- #include "w_setup.h"
- #include <png.h>
-+#include <zlib.h>
- 
- /*
-  * Write PNG file from rgb data
-@@ -59,7 +60,7 @@ write_png(FILE *file, unsigned char *dat
-     }
- 
-     /* set long jump recovery here */
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
- 	/* if we get here there was a problem reading the file */
- 	png_destroy_write_struct(&png_ptr, &info_ptr);
- 	return False;
diff --git a/extra/xfig/xfig.3.2.5-modularX.patch b/extra/xfig/xfig.3.2.5-modularX.patch
deleted file mode 100644
index 3b5ac5937..000000000
--- a/extra/xfig/xfig.3.2.5-modularX.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- xfig.3.2.5/Imakefile.modularX	2007-04-16 14:27:49.000000000 +0200
-+++ xfig.3.2.5/Imakefile	2007-04-16 14:29:18.000000000 +0200
-@@ -45,7 +45,7 @@
- XCOMM different tree than the "correct" tree that your X system expects. The usual
- XCOMM purpose of DESTDIR is to test an install process by installing in a benign area.
- 
--XCOMM XAPPLOADDIR = /home/user/xfig
-+XAPPLOADDIR = /usr/share/X11/app-defaults
- 
- XCOMM Uncomment the following definition for XAW3D if you want to use
- XCOMM the 3d Athena Widget Set (highly recommended!)
-@@ -166,12 +166,12 @@
- XCOMM XFIGLIBDIR = $(LIBDIR)
- 
- XCOMM use this if you want the multi-key data base file in the standard X11 tree
--XFIGLIBDIR = $(LIBDIR)/xfig
-+XFIGLIBDIR = /usr/share/xfig
- 
- XCOMM XFIGDOCDIR tells where the html and pdf documentation should go
- XFIGDOCDIR = $(DOCDIR)/xfig
- 
- XCOMM MANDIR tells where the standard man pages should go (no need to change it
- XCOMM if you want the man pages installed in the standard place on your system
--MANDIR = $(MANSOURCEPATH)$(MANSUFFIX)
-+MANDIR = /usr/share/man/man1
- XCOMM MANDIR = /usr/local/xfig/man
-
- XCOMM If your system doesn't have strstr undefine the following definition
diff --git a/extra/xfig/xfig.desktop b/extra/xfig/xfig.desktop
deleted file mode 100644
index c634a28e9..000000000
--- a/extra/xfig/xfig.desktop
+++ /dev/null
@@ -1,47 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Categories=Application;Graphics;
-MimeType=image/fig;image/x-xfig;
-Exec=xfig
-Icon=xfig
-Type=Application
-Name=Xfig
-Name[eo]=XDesegno
-Name[et]=Ffig
-Name[ja]=xfig
-Name[no]=X-figur
-Comment=Xfig drawing application
-Comment[bg]=Xfig ïðîãðàìà çà ðèñóâàíå
-Comment[ca]=Aplicació de dibuix Xfig
-Comment[cs]=Aplikace pro kreslení vektorových obrázků
-Comment[da]=Xfig tegneprogram
-Comment[de]=Xfig-Zeichenprogramm
-Comment[el]=Xfig
-Comment[eo]=Desegnilo "Xfig"
-Comment[es]=Aplicación de diseño vectorial (objetos)
-Comment[et]=XFig joonistusprogramm
-Comment[fi]=Xfig vektoripiirto-ohjelma
-Comment[fr]=Programme de dessin objet Xfig
-Comment[gl]=Aplicación de debuxo (obxectos)
-Comment[he]=Xfig רויצה םושיי
-Comment[hr]=Program za crtanje
-Comment[hu]=Rajzolóprogram
-Comment[is]=Hlutbundið teikniforrit
-Comment[it]=Applicazione di disegno Xfig
-Comment[lt]=Xfig braižymo programa
-Comment[mk]=Едноставна апликација за векторско цртање
-Comment[nl]=Xfig-tekenprogramma
-Comment[no]=Xfig-tegneprogram
-Comment[no_NY]=Teikneprogrammet Xfig
-Comment[pl]=Aplikacja do kreślenia
-Comment[pt]=Aplicação de desenho
-Comment[ro]=Program de desenare vectorială
-Comment[ru]=Приложения для рисования векторной графики
-Comment[sk]=Xfig aplikácia pre kreslenie vektorových obrázkov
-Comment[sl]=Program za risanje Xfig
-Comment[sr]=Xfig prgram za vektorsko crtanje
-Comment[sv]=Xfig ritprogram
-Comment[ta]=Xfig Ũþø ÀÂýÀ¡Î
-Comment[tr]=Xfig çizim uygulaması
-Comment[uk]=Xfig
-Comment[zh_CN.GB2312]=Xfig 绘图应用程序
diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD
index 0113942b9..06d6f5e50 100644
--- a/extra/xine-lib/PKGBUILD
+++ b/extra/xine-lib/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 193690 2013-08-28 00:06:11Z eric $
+# $Id: PKGBUILD 195056 2013-09-24 20:09:11Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xine-lib
-pkgver=1.2.3
-pkgrel=4
+pkgver=1.2.4
+pkgrel=1
 pkgdesc="A multimedia playback engine"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xine-project.org"
@@ -28,16 +28,12 @@ optdepends+=('wavpack: for using the wavpack plugin' \
             'libmpcdec: for using the musepack plugin' \
             'libcaca: for using the caca plugin' \
             'libbluray: for using the bluray plugin' \
-            'gnome-vfs: for using the gnome-vfs plugin')
+            'gnome-vfs: for using the gnome-vfs plugin'
+            'smbclient: for using the samba plugin')
 [ "$CARCH" = "mips64el" ] || optdepends+=('libvdpau: for using the VDPAU plugin')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz accel_vaapi.h)
-sha1sums=('6f9ef4ba75688659052d21448d46527db2b77e57'
-          '08ed9947ef919c71c87151baa8fc0ce7d8f72050')
-
-prepare() {
-  cp accel_vaapi.h ${pkgname}-${pkgver}/src/xine-engine/
-}
+source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz)
+sha1sums=('32267c5fcaa1439a5fbf7606d27dc4fafba9e504')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/xine-lib/accel_vaapi.h b/extra/xine-lib/accel_vaapi.h
deleted file mode 100644
index 666b23fd6..000000000
--- a/extra/xine-lib/accel_vaapi.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (C) 2008 the xine project
- *
- * This file is part of xine, a free video player.
- *
- * xine is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * xine is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
- *
- * Common acceleration definitions for vdpau
- *
- *
- */
-
-#ifndef HAVE_XINE_ACCEL_VAAPI_H
-#define HAVE_XINE_ACCEL_VAAPI_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <va/va_x11.h>
-#include <pthread.h>
-#ifdef HAVE_FFMPEG_AVUTIL_H
-#  include <avcodec.h>
-#else
-#  include <libavcodec/avcodec.h>
-#endif
-
-#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32)
-#  define AVVIDEO 2
-#else
-#  define AVVIDEO 1
-#  define pp_context	pp_context_t
-#  define pp_mode	pp_mode_t
-#endif
-
-#define NUM_OUTPUT_SURFACES 22
-
-#define SURFACE_FREE            0
-#define SURFACE_ALOC            1
-#define SURFACE_RELEASE         2
-#define SURFACE_RENDER          3
-#define SURFACE_RENDER_RELEASE  5
-
-struct vaapi_equalizer {
-  VADisplayAttribute brightness;
-  VADisplayAttribute contrast;
-  VADisplayAttribute hue;
-  VADisplayAttribute saturation;
-};
-
-typedef struct ff_vaapi_context_s ff_vaapi_context_t;
-
-struct ff_vaapi_context_s {
-  VADisplay         va_display;
-  VAContextID       va_context_id;
-  VAConfigID        va_config_id;
-  int               width;
-  int               height;
-  int               sw_width;
-  int               sw_height;
-  int               va_profile;
-  unsigned int      va_colorspace;
-  VAImage           va_subpic_image;
-  VASubpictureID    va_subpic_id;
-  int               va_subpic_width;
-  int               va_subpic_height;
-  int               is_bound;
-  void              *gl_surface;
-  unsigned int      soft_head;
-  unsigned int      valid_context;
-  unsigned int      va_head;
-  unsigned int      va_soft_head;
-  vo_driver_t       *driver;
-  unsigned int      last_sub_image_fmt;
-  VASurfaceID       last_sub_surface_id;
-  struct vaapi_equalizer va_equalizer;
-  VAImageFormat     *va_image_formats;
-  int               va_num_image_formats;
-  VAImageFormat     *va_subpic_formats;
-  int               va_num_subpic_formats;
-};
-
-typedef struct ff_vaapi_surface_s ff_vaapi_surface_t;
-typedef struct vaapi_accel_s vaapi_accel_t;
-
-struct ff_vaapi_surface_s {
-  unsigned int        index;
-  vaapi_accel_t       *accel;
-  VASurfaceID         va_surface_id;
-  unsigned int        status;
-};
-
-struct vaapi_accel_s {
-  unsigned int        index;
-  vo_frame_t          *vo_frame;
-
-#if AVVIDEO > 1
-  int (*avcodec_decode_video2)(vo_frame_t *frame_gen, AVCodecContext *avctx, AVFrame *picture,
-                               int *got_picture_ptr, AVPacket *avpkt);
-#else
-  int (*avcodec_decode_video)(vo_frame_t *frame_gen, AVCodecContext *avctx, AVFrame *picture,
-                              int *got_picture_ptr, uint8_t *buf, int buf_size);
-#endif
-  VAStatus (*vaapi_init)(vo_frame_t *frame_gen, int va_profile, int width, int height, int softrender);
-  int (*profile_from_imgfmt)(vo_frame_t *frame_gen, enum PixelFormat pix_fmt, int codec_id, int vaapi_mpeg_sofdec);
-  ff_vaapi_context_t *(*get_context)(vo_frame_t *frame_gen);
-  int (*guarded_render)(vo_frame_t *frame_gen);
-  ff_vaapi_surface_t *(*get_vaapi_surface)(vo_frame_t *frame_gen);
-  void (*render_vaapi_surface)(vo_frame_t *frame_gen, ff_vaapi_surface_t *va_surface);
-  void (*release_vaapi_surface)(vo_frame_t *frame_gen, ff_vaapi_surface_t *va_surface);
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
diff --git a/extra/xorg-luit/PKGBUILD b/extra/xorg-luit/PKGBUILD
index 747a4630f..a60f4dc4c 100644
--- a/extra/xorg-luit/PKGBUILD
+++ b/extra/xorg-luit/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 154146 2012-03-23 17:27:51Z andyrtr $
+# $Id: PKGBUILD 194394 2013-09-15 18:16:48Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-luit
 pkgver=1.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Filter that can be run between an arbitrary application and a UTF-8 terminal emulator"
 arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
@@ -11,11 +11,15 @@ license=('custom')
 depends=('libfontenc')
 groups=('xorg' 'xorg-apps')
 makedepends=('xorg-util-macros')
-source=(http://xorg.freedesktop.org/archive/individual/app/luit-${pkgver}.tar.bz2)
-sha1sums=('3130c14d7267cecce0ba2280643844b48cca49b0')
+source=(http://xorg.freedesktop.org/archive/individual/app/luit-${pkgver}.tar.bz2
+        git_fixes.diff)
+sha256sums=('30b0e787cb07a0f504b70f1d6123930522111ce9d4276f6683a69b322b49c636'
+            'aa5d83b8cc772e135e57ae0f0d2b7662b51981f4a120a136a7b201c254b23327')
 
 build() {
-  cd "${srcdir}/luit-${pkgver}"
+  cd luit-${pkgver}
+  patch -Np1 -i $srcdir/git_fixes.diff
+  autoreconf -vfi
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xorg-luit/git_fixes.diff b/extra/xorg-luit/git_fixes.diff
new file mode 100644
index 000000000..928caca0f
--- /dev/null
+++ b/extra/xorg-luit/git_fixes.diff
@@ -0,0 +1,254 @@
+From 473959141641b6779e6ff3c3c5b6ef326073bcd4 Mon Sep 17 00:00:00 2001
+From: Mike FABIAN <mfabian@redhat.com>
+Date: Tue, 07 Jun 2011 11:42:00 +0000
+Subject: Set up terminal before fork.
+
+After the fork it is undefined wether parent or child runs
+first. So there can be a race: if the child runs before the
+terminal of the parent is set up correctly luit may hang.
+This patch sets up the terminal before forking and undoes
+the settings in the child.
+
+Signed-off-by: Mike FABIAN <mfabian@redhat.com>
+Signed-off-by: Egbert Eich <eich@freedesktop.org>
+---
+diff --git a/luit.c b/luit.c
+index 0ece7b6..5cb3b8f 100644
+--- a/luit.c
++++ b/luit.c
+@@ -577,6 +577,8 @@ condom(int argc, char **argv)
+ 	IGNORE_RC(pipe(c2p_waitpipe));
+     }
+ 
++    setup_io(pty);
++
+     pid = fork();
+     if (pid < 0) {
+ 	perror("Couldn't fork");
+@@ -584,6 +586,10 @@ condom(int argc, char **argv)
+     }
+ 
+     if (pid == 0) {
++#ifdef SIGWINCH
++	installHandler(SIGWINCH, SIG_DFL);
++#endif
++	installHandler(SIGCHLD, SIG_DFL);
+ 	close(pty);
+ 	if (pipe_option) {
+ 	    close_waitpipe(1);
+@@ -661,7 +667,6 @@ parent(int pid GCC_UNUSED, int pty)
+     if (verbose) {
+ 	reportIso2022(outputState);
+     }
+-    setup_io(pty);
+ 
+     if (pipe_option) {
+ 	write_waitpipe(p2c_waitpipe);
+--
+cgit v0.9.0.2-2-gbebe
+
+From 09f4907e4ab4ba3654de829bf3ac2a4a02bb9ef4 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat, 22 Jun 2013 04:11:43 +0000
+Subject: Fix GCC_UNUSED definition to actually work with -Wunused-parameter
+
+Silences warnings of:
+charset.c: In function ‘IdentityRecode’:
+charset.c:42:51: warning: unused parameter ‘self’ [-Wunused-parameter]
+charset.c: In function ‘NullReverse’:
+charset.c:84:26: warning: unused parameter ‘n’ [-Wunused-parameter]
+charset.c:84:59: warning: unused parameter ‘self’ [-Wunused-parameter]
+other.c: In function ‘mapping_utf8’:
+other.c:108:44: warning: unused parameter ‘s’ [-Wunused-parameter]
+other.c: In function ‘reverse_utf8’:
+other.c:114:44: warning: unused parameter ‘s’ [-Wunused-parameter]
+luit.c: In function ‘sigwinchHandler’:
+luit.c:463:21: warning: unused parameter ‘sig’ [-Wunused-parameter]
+luit.c: In function ‘sigchldHandler’:
+luit.c:470:20: warning: unused parameter ‘sig’ [-Wunused-parameter]
+luit.c: In function ‘parent’:
+luit.c:657:12: warning: unused parameter ‘pid’ [-Wunused-parameter]
+
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+---
+diff --git a/other.h b/other.h
+index 9d814a3..d18b586 100644
+--- a/other.h
++++ b/other.h
+@@ -26,7 +26,11 @@ THE SOFTWARE.
+ #include "config.h"		/* include this, for self-contained headers */
+ 
+ #ifndef GCC_UNUSED
+-#define GCC_UNUSED		/* ARGSUSED */
++# if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205)
++#  define GCC_UNUSED		__attribute__((__unused__))
++# else
++#  define GCC_UNUSED		/* ARGSUSED */
++# endif
+ #endif
+ 
+ #include <X11/fonts/fontenc.h>
+--
+cgit v0.9.0.2-2-gbebe
+
+From 445863f8b5059692ac7a4df785af6920849faa82 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat, 13 Jul 2013 16:08:34 +0000
+Subject: config: Add missing AC_CONFIG_SRCDIR
+
+Regroup AC statements under the Autoconf initialization section.
+Regroup AM statements under the Automake initialization section.
+
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+Reviewed-by: Julien Cristau <jcristau@debian.org>
+Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+---
+diff --git a/configure.ac b/configure.ac
+index c214d85..946db23 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -20,9 +20,14 @@ dnl  PERFORMANCE OF THIS SOFTWARE.
+ dnl
+ dnl Process this file with autoconf to create configure.
+ 
++# Initialize Autoconf
+ AC_PREREQ([2.60])
+ AC_INIT([luit], [1.1.1],
+ 	[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [luit])
++AC_CONFIG_SRCDIR([Makefile.am])
++AC_CONFIG_HEADERS([config.h])
++
++# Initialize Automake
+ AM_INIT_AUTOMAKE([foreign dist-bzip2])
+ AM_MAINTAINER_MODE
+ 
+@@ -32,8 +37,6 @@ m4_ifndef([XORG_MACROS_VERSION],
+ XORG_MACROS_VERSION(1.8)
+ XORG_DEFAULT_OPTIONS
+ 
+-AC_CONFIG_HEADERS([config.h])
+-
+ AC_CANONICAL_HOST
+ 
+ 
+--
+cgit v0.9.0.2-2-gbebe
+
+From 800f55f8dcd195dd0cdfc1c4d7487d00bb7745f4 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat, 13 Jul 2013 16:11:20 +0000
+Subject: Replace hardcoded _XOPEN_SOURCE=500 with AC_USE_SYSTEM_EXTENSIONS
+
+-D_XOPEN_SOURCE was originally added for Linux in commit e751086392e837
+and then updated to -D_XOPEN_SOURCE=500 in commit e1a002217cabdb to
+expose strdup() in glibc headers.
+
+As noted in bug 47792 though, the posix_openpt() function is not
+visible unless that's raised to 600.
+
+Instead of continually chasing the standards ourselves, switch to letting
+autoconf handle that for us.
+
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+Reviewed-by: Julien Cristau <jcristau@debian.org>
+Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+---
+diff --git a/Makefile.am b/Makefile.am
+index 8069670..ef042e3 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -25,7 +25,6 @@ bin_PROGRAMS = luit
+ AM_CFLAGS =		\
+ 	$(CWARNFLAGS)	\
+ 	$(LUIT_CFLAGS)	\
+-	$(OS_CFLAGS)	\
+ 	-DLOCALE_ALIAS_FILE=\"$(LOCALEALIASFILE)\"
+ 
+ luit_LDADD = $(LUIT_LIBS)
+diff --git a/configure.ac b/configure.ac
+index 946db23..0ec4664 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -26,6 +26,7 @@ AC_INIT([luit], [1.1.1],
+ 	[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [luit])
+ AC_CONFIG_SRCDIR([Makefile.am])
+ AC_CONFIG_HEADERS([config.h])
++AC_USE_SYSTEM_EXTENSIONS
+ 
+ # Initialize Automake
+ AM_INIT_AUTOMAKE([foreign dist-bzip2])
+@@ -37,9 +38,6 @@ m4_ifndef([XORG_MACROS_VERSION],
+ XORG_MACROS_VERSION(1.8)
+ XORG_DEFAULT_OPTIONS
+ 
+-AC_CANONICAL_HOST
+-
+-
+ AC_CHECK_HEADERS([pty.h stropts.h sys/param.h sys/select.h])
+ AC_CHECK_FUNCS([select grantpt posix_openpt])
+ 
+@@ -57,23 +55,16 @@ PKG_CHECK_MODULES(LUIT, fontenc)
+ PKG_CHECK_EXISTS(x11, [],
+ 	[AC_MSG_WARN([libX11 not found.  luit may not be able to find locale aliases without it.])])
+ 
++AC_CANONICAL_HOST
+ case $host_os in
+     # darwin has poll() but can't be used to poll character devices (atleast through SnowLeopard)
+     darwin*)
+-        OS_CFLAGS=
+-        ;;
+-    linux*)
+-        AC_CHECK_HEADERS([poll.h])
+-        AC_CHECK_FUNCS([poll])
+-        OS_CFLAGS="-D_XOPEN_SOURCE=500"
+         ;;
+     *)
+         AC_CHECK_HEADERS([poll.h])
+         AC_CHECK_FUNCS([poll])
+-        OS_CFLAGS=
+         ;;
+ esac
+-AC_SUBST(OS_CFLAGS)
+ 
+ AC_CHECK_HEADERS([pty.h stropts.h sys/ioctl.h sys/param.h sys/poll.h sys/select.h sys/time.h termios.h]) 
+ AC_CHECK_FUNCS([grantpt putenv select strdup])
+--
+cgit v0.9.0.2-2-gbebe
+
+From e1f495359a74342352c4d6641c0002c7c79327ba Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat, 13 Jul 2013 16:15:16 +0000
+Subject: Merge overlapping AC_CHECK_HEADERS & AC_CHECK_FUNCS calls into one set
+
+Duplication introduced when merging in changes in commit fddfe30c3ff91c
+
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+Reviewed-by: Julien Cristau <jcristau@debian.org>
+Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+---
+diff --git a/configure.ac b/configure.ac
+index 0ec4664..1c6f2c9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -38,9 +38,6 @@ m4_ifndef([XORG_MACROS_VERSION],
+ XORG_MACROS_VERSION(1.8)
+ XORG_DEFAULT_OPTIONS
+ 
+-AC_CHECK_HEADERS([pty.h stropts.h sys/param.h sys/select.h])
+-AC_CHECK_FUNCS([select grantpt posix_openpt])
+-
+ AC_ARG_WITH(localealiasfile,
+         AS_HELP_STRING([--with-localealiasfile=<path>],
+                        [The locale alias file (default: ${datadir}/X11/locale/locale.alias)]),
+@@ -67,7 +64,7 @@ case $host_os in
+ esac
+ 
+ AC_CHECK_HEADERS([pty.h stropts.h sys/ioctl.h sys/param.h sys/poll.h sys/select.h sys/time.h termios.h]) 
+-AC_CHECK_FUNCS([grantpt putenv select strdup])
++AC_CHECK_FUNCS([grantpt posix_openpt putenv select strdup])
+ 
+ if test "x$ac_cv_func_grantpt" != "xyes" ; then
+         AC_CHECK_LIB(util, openpty, [cf_have_openpty=yes],[cf_have_openpty=no])
+--
+cgit v0.9.0.2-2-gbebe
+
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD
index 3a5d78c56..8063d37e2 100644
--- a/extra/xorg-server/PKGBUILD
+++ b/extra/xorg-server/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 189247 2013-07-01 10:57:37Z jgc $
+# $Id: PKGBUILD 194374 2013-09-15 07:40:13Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=xorg-server
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
-pkgver=1.14.2
-pkgrel=2
+pkgver=1.14.3
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://xorg.freedesktop.org"
@@ -25,7 +25,7 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
         10-quirks.conf
         loongson.patch
         fb-rename-wfbDestroyGlyphCache.patch)
-sha256sums=('f6ddfb3f1cfff2d69d45657aec626ebe8b5847810154ff7df7ed2072b076c86b'
+sha256sums=('02125ae13a443dcbb55f964d5c37f1da2f58ad54c2102356037bec23c1b84f5e'
             '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162'
             'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84'
             'e033f9bcc21980f7f0428e6ed6c362a3d55ad293b05fd6e6c6c1933b86f9e63a'
@@ -49,7 +49,7 @@ prepare() {
   patch -Np1 -i "${srcdir}/loongson.patch"
 
   # https://bugs.freedesktop.org/show_bug.cgi?id=59825 - fixes crash with vboxvideo
-  patch -Np1 -i ../bug59825.patch
+#  patch -Np1 -i ../bug59825.patch
 
   # From Fedora. Do not build acpid code, it is buggy and we do not need it
   patch -Np1 -i ../xserver-1.6.0-less-acpi-brokenness.patch
diff --git a/extra/xorg-twm/PKGBUILD b/extra/xorg-twm/PKGBUILD
index a89787cf8..210a1ee7e 100644
--- a/extra/xorg-twm/PKGBUILD
+++ b/extra/xorg-twm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 134274 2011-08-02 18:36:40Z jgc $
+# $Id: PKGBUILD 193939 2013-09-07 07:11:31Z lcarlier $
 # Maintainer: Alexander Baldeck <alexander@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-twm
-pkgver=1.0.7
-pkgrel=1.2
+pkgver=1.0.8
+pkgrel=1
 pkgdesc="Tab Window Manager for the X Window System"
 arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
@@ -13,7 +13,7 @@ license=('custom')
 depends=('libxmu')
 makedepends=('xorg-util-macros')
 source=(${url}/releases/individual/app/twm-${pkgver}.tar.bz2)
-sha256sums=('0f5d53dec62540fa97c96b4e983695cc32114836d256b64885253ab58b5bcd44')
+sha256sums=('7660352353d632127ff50390991706aa660b28a4ada816c2582ac02720722e44')
 
 build() {
   cd "${srcdir}/twm-${pkgver}"
diff --git a/extra/xorg-xclipboard/PKGBUILD b/extra/xorg-xclipboard/PKGBUILD
index 093273851..1cfa339ed 100644
--- a/extra/xorg-xclipboard/PKGBUILD
+++ b/extra/xorg-xclipboard/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 149838 2012-02-11 10:11:10Z andyrtr $
+# $Id: PKGBUILD 193937 2013-09-07 07:08:34Z lcarlier $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-xclipboard
-pkgver=1.1.2
-pkgrel=1.1
+pkgver=1.1.3
+pkgrel=1
 pkgdesc="X clipboard manager"
 arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
@@ -11,7 +11,7 @@ license=('custom')
 depends=('libxaw' 'libxmu' 'libxt' 'libx11')
 makedepends=('xorg-util-macros')
 source=(http://xorg.freedesktop.org/archive/individual/app/xclipboard-${pkgver}.tar.bz2)
-sha1sums=('8dc77e1234c1c2853805124536676a4d5f7c7a3b')
+sha256sums=('9c0e0a1f4f1d49f73c6cf3ccd27b5ca0e18afc63679f1a1ee466b1d82446ebb5')
 
 build() {
   cd "${srcdir}/xclipboard-${pkgver}"
diff --git a/extra/xorg-xclock/PKGBUILD b/extra/xorg-xclock/PKGBUILD
index 282ea3614..1b9eda13b 100644
--- a/extra/xorg-xclock/PKGBUILD
+++ b/extra/xorg-xclock/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 149840 2012-02-11 10:13:13Z andyrtr $
+# $Id: PKGBUILD 194300 2013-09-13 07:29:54Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-xclock
-pkgver=1.0.6
-pkgrel=1.2
+pkgver=1.0.7
+pkgrel=1
 pkgdesc="X clock"
 arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
@@ -11,7 +11,7 @@ license=('custom')
 depends=('libx11' 'libxmu' 'libxaw' 'libxrender' 'libxft' 'libxkbfile')
 makedepends=('xorg-util-macros')
 source=(http://xorg.freedesktop.org/archive/individual/app/xclock-${pkgver}.tar.bz2)
-sha1sums=('993817c9e3cc2baaaebe52b29fa2ad26e58b124d')
+sha256sums=('23ceeca94e3e20a6c26a703ac7f789066d4517f8d2cb717ae7cb28a617d97dd0')
 
 build() {
   cd "${srcdir}/xclock-${pkgver}"
diff --git a/extra/xorg-xinit/PKGBUILD b/extra/xorg-xinit/PKGBUILD
index 725a605ff..d3874cfe0 100644
--- a/extra/xorg-xinit/PKGBUILD
+++ b/extra/xorg-xinit/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 170012 2012-10-31 00:12:04Z thomas $
+# $Id: PKGBUILD 194377 2013-09-15 08:07:59Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xorg-xinit
-pkgver=1.3.2
-pkgrel=3
+pkgver=1.3.3
+pkgrel=1
 pkgdesc="X.Org initialisation program "
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
@@ -23,15 +23,15 @@ source=(${url}/releases/individual/app/xinit-${pkgver}.tar.bz2
         xsession
         xserverrc)
 options=(!emptydirs)
-md5sums=('9c0943cbd83e489ad1b05221b97efd44'
-         'abd072ec435ce084cf4e89c58f83d45c'
-         '73a597d3fb7f5b9487318ac8cfd4bedf'
-         'c7b406c3c5c1e8011b3ac7d6b29c1a2c'
-         '7873d97db30d6c279ed37e3559e7c59d'
-         '4deba1b7f2cc7f93b304b956023e65d6')
+sha256sums=('74b2878de6e3d5b5948f1562a77e7f53b4e10621e505ddb278050c7f3cae00af'
+            'a5c6ced5822bbb3145e0f30a4b12995782ca6d80ff2d927851ec91b5e41212cb'
+            '431335ceb84f75aaa96fba285a596f61a63629f94756f8063e4f621ae143629b'
+            '38a23848b49de8a5c635a128a8b32a6cd0a08a9ee153ad97cb25abd82cfda1bc'
+            '2b94a42f2521cb5662fb9a5765a7507456dc0352ac9d0f44c56b359dcdb38898'
+            '5e87bff928c143d9db9966048f6530e83e9e9a1cac09ce4c25f8aabc08611b6f')
 
 build() {
-  cd "${srcdir}/xinit-${pkgver}"
+  cd xinit-${pkgver}
   patch -Np1 -i "${srcdir}/06_move_serverauthfile_into_tmp.diff"
   patch -Np1 -i "${srcdir}/fs25361.patch"
   sed -i -e 's/XSLASHGLOB.sh/XSLASHGLOB/' xinitrc.cpp
@@ -40,7 +40,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/xinit-${pkgver}"
+  cd xinit-${pkgver}
   make DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/etc/skel"
diff --git a/extra/xorg-xinput/PKGBUILD b/extra/xorg-xinput/PKGBUILD
index 73f274258..fc8e6d320 100644
--- a/extra/xorg-xinput/PKGBUILD
+++ b/extra/xorg-xinput/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 159187 2012-05-17 13:48:28Z andyrtr $
+# $Id: PKGBUILD 194484 2013-09-16 19:13:37Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-xinput
-pkgver=1.6.0
+pkgver=1.6.1
 pkgrel=1
 pkgdesc="Small commandline tool to configure devices"
 arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11' 'libxi>=1.5.99.2' 'xorg-xrandr' 'libxinerama')
-makedepends=('xorg-util-macros' 'inputproto')
+makedepends=('xorg-util-macros' 'inputproto' 'libxfixes')
 groups=('xorg-apps' 'xorg')
 source=(http://xorg.freedesktop.org/archive/individual/app/xinput-${pkgver}.tar.bz2)
-sha256sums=('4ab007d952c76665603bcb82ceb15fd3929d10faf0580fc4873ac16f5f63847e')
+sha256sums=('b7632d0f228a8a6be93b09857ea413940fcf44091e60f4a0fe9f5fd82efd871f')
 
 build() {
   cd "${srcdir}/xinput-${pkgver}"
diff --git a/extra/xorg-xkill/PKGBUILD b/extra/xorg-xkill/PKGBUILD
index eb9bb6dd3..3b5541f10 100644
--- a/extra/xorg-xkill/PKGBUILD
+++ b/extra/xorg-xkill/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 151025 2012-02-24 13:37:13Z allan $
+# $Id: PKGBUILD 194304 2013-09-13 07:50:17Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-xkill
-pkgver=1.0.3
-pkgrel=3.1
+pkgver=1.0.4
+pkgrel=1
 pkgdesc="Kill a client by its X resource"
 arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
@@ -12,7 +12,7 @@ depends=('libx11' 'libxmu')
 makedepends=('xorg-util-macros')
 groups=('xorg-apps' 'xorg')
 source=(http://xorg.freedesktop.org/archive/individual/app/xkill-${pkgver}.tar.bz2)
-sha1sums=('bab7b9c7f3bc053d743eb339cf5fa496bace57e5')
+sha256sums=('88ef2a304f32f24b255e879f03c1dcd3a2be3e71d5562205414f267d919f812e')
 
 build() {
   cd "${srcdir}/xkill-${pkgver}"
diff --git a/extra/xorg-xlsclients/PKGBUILD b/extra/xorg-xlsclients/PKGBUILD
index fb1aa27fa..5701a8336 100644
--- a/extra/xorg-xlsclients/PKGBUILD
+++ b/extra/xorg-xlsclients/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 151015 2012-02-24 13:22:35Z allan $
+# $Id: PKGBUILD 194306 2013-09-13 07:52:28Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-xlsclients
-pkgver=1.1.2
-pkgrel=2.1
+pkgver=1.1.3
+pkgrel=1
 pkgdesc="List client applications running on a display"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xorg.freedesktop.org/"
@@ -12,7 +12,7 @@ depends=('libxcb')
 makedepends=('xorg-util-macros')
 groups=('xorg-apps' 'xorg')
 source=(http://xorg.freedesktop.org/archive/individual/app/xlsclients-${pkgver}.tar.bz2)
-sha1sums=('c4051429c190444ae9ba327f0ad776a74eb7b27b')
+sha256sums=('5d9666fcc6c3de210fc70d5a841a404955af709a616fde530fe4e8f7723e3d3d')
 
 build() {
   cd "${srcdir}/xlsclients-${pkgver}"
diff --git a/extra/xorg-xman/PKGBUILD b/extra/xorg-xman/PKGBUILD
index 954df4957..6eef4f51c 100644
--- a/extra/xorg-xman/PKGBUILD
+++ b/extra/xorg-xman/PKGBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-xman
-pkgver=1.1.2
-pkgrel=1.1
+pkgver=1.1.3
+pkgrel=1
 pkgdesc="Unix manual page viewer"
 arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
@@ -11,7 +11,7 @@ license=('custom')
 depends=('libxaw' 'libxt')
 makedepends=('xorg-util-macros' 'xproto' 'libxmu')
 source=(http://xorg.freedesktop.org/archive/individual/app/xman-${pkgver}.tar.bz2)
-sha1sums=('ba10cf0b2d0c2b40ded93e892c69e7bd4586ad1e')
+sha256sums=('405211b606a7fa420029897f099dc107791bb4c29bc88481c6efac9c4590bb1a')
 
 build() {
   cd "${srcdir}/xman-${pkgver}"
diff --git a/extra/xorg-xmodmap/PKGBUILD b/extra/xorg-xmodmap/PKGBUILD
index ac04185ec..85a3f3aef 100644
--- a/extra/xorg-xmodmap/PKGBUILD
+++ b/extra/xorg-xmodmap/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 156637 2012-04-21 23:46:44Z andyrtr $
+# $Id: PKGBUILD 194308 2013-09-13 07:54:55Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-xmodmap
-pkgver=1.0.7
+pkgver=1.0.8
 pkgrel=1
 pkgdesc="Utility for modifying keymaps and button mappings"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('libx11')
 makedepends=('xorg-util-macros')
 groups=('xorg-apps' 'xorg')
 source=(http://xorg.freedesktop.org/archive/individual/app/xmodmap-${pkgver}.tar.bz2)
-sha1sums=('9f9c6b7bd058c09a8e15b1c4f4eccb972e51ffef')
+sha256sums=('efe2e3c89858a2db3bdcf969f55f55d0af4f5007789198344de0595249a99fc3')
 
 build() {
   cd "${srcdir}/xmodmap-${pkgver}"
diff --git a/extra/xorg-xrdb/PKGBUILD b/extra/xorg-xrdb/PKGBUILD
index 51561293c..d3f422b92 100644
--- a/extra/xorg-xrdb/PKGBUILD
+++ b/extra/xorg-xrdb/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 151003 2012-02-24 13:05:19Z allan $
+# $Id: PKGBUILD 194310 2013-09-13 07:56:57Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-xrdb
-pkgver=1.0.9
-pkgrel=2.1
+pkgver=1.1.0
+pkgrel=1
 pkgdesc="X server resource database utility"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xorg.freedesktop.org/"
@@ -12,7 +12,7 @@ depends=('libx11' 'libxmu' 'mcpp')
 makedepends=('xorg-util-macros')
 groups=('xorg-apps' 'xorg')
 source=(http://xorg.freedesktop.org/archive/individual/app/xrdb-${pkgver}.tar.bz2)
-sha1sums=('efa5f2420411988d6a6e142934393fd272507857')
+sha256sums=('73827b6bbfc9d27ca287d95a1224c306d7053cd7b8156641698d7dc541ca565b')
 
 build() {
   cd "${srcdir}/xrdb-${pkgver}"
diff --git a/extra/xpdf/PKGBUILD b/extra/xpdf/PKGBUILD
deleted file mode 100644
index efd7710a0..000000000
--- a/extra/xpdf/PKGBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# $Id: PKGBUILD 177029 2013-02-04 13:10:00Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: tobias <tobias@archlinux.org>
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-
-pkgname=xpdf
-#pkgver=3.03_pl1
-pkgver=3.03
-pkgrel=3
-pkgdesc='Viewer for Portable Document Format (PDF) files'
-url='http://www.foolabs.com/xpdf/'
-license=('GPL2')
-arch=('i686' 'x86_64' 'mips64el')
-depends=('lesstif' 'gsfonts' 'libxt')
-optdepends=('poppler: tools that used to be included in xpdf'
-            'desktop-file-utils: for desktop environments')
-#       "ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${pkgver%_*}pl1.patch"
-source=("ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${pkgver%_*}.tar.gz"
-        'char.patch'
-        'desktop')
-sha1sums=('499423e8a795e0efd76ca798239eb4d0d52fe248'
-          '5c471944685a6b24a2b0c0e000562d1a3263aeeb'
-          '17ebbfe457cb92e97b12b7362e8ce961526012d9')
-
-install=install
-backup=('etc/xpdfrc')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver%_*}"
-
-#	patch -p1 -i "../${pkgname}-${_srcver}pl1.patch"
-	patch -p1 -i ../char.patch
-
-	sed -i 's:/usr/share/fonts/type1/gsfonts:/usr/share/fonts/Type1:' xpdf/GlobalParams.cc
-	sed -i 's:times-medium-r-normal--16:times-medium-r-normal--14:' xpdf/XPDFViewer.cc # FS#14217
-
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--enable-multithreaded \
-		--enable-wordlist \
-		--with-freetype2-library=/usr/lib \
-		--with-freetype2-includes=/usr/include/freetype2 \
-		--x-includes=/usr/include \
-		--with-Xm-library=/usr/lib \
-		--with-Xm-includes=/usr/include \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver%_*}"
-
-	make DESTDIR="${pkgdir}" install
-
-	install -Dm644 ../desktop "${pkgdir}/usr/share/applications/xpdf.desktop"
-	install -Dm644 xpdf/xpdfIcon.xpm "${pkgdir}/usr/share/pixmaps/xpdf.xpm"
-
-	# stuff provided by poppler
-	for tool in pdfdetach pdffonts pdfimages pdfinfo pdftoppm pdftops pdftotext; do
-		rm "${pkgdir}/usr/bin/${tool}" "${pkgdir}/usr/share/man/man1/${tool}.1"
-	done
-}
diff --git a/extra/xpdf/char.patch b/extra/xpdf/char.patch
deleted file mode 100644
index 8e49393a6..000000000
--- a/extra/xpdf/char.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur old/xpdf/XPDFViewer.cc new/xpdf/XPDFViewer.cc
---- old/xpdf/XPDFViewer.cc	2011-08-15 14:08:53.000000000 -0700
-+++ new/xpdf/XPDFViewer.cc	2011-08-17 11:05:55.739431215 -0700
-@@ -1803,7 +1803,7 @@
-   menuPane = XmCreatePulldownMenu(toolBar, "zoomMenuPane", args, n);
-   for (i = 0; i < nZoomMenuItems; ++i) {
-     n = 0;
--    s = XmStringCreateLocalized(zoomMenuInfo[i].label);
-+    s = XmStringCreateLocalized((char *)zoomMenuInfo[i].label);
-     XtSetArg(args[n], XmNlabelString, s); ++n;
-     XtSetArg(args[n], XmNuserData, (XtPointer)i); ++n;
-     sprintf(buf, "zoom%d", i);
diff --git a/extra/xpdf/desktop b/extra/xpdf/desktop
deleted file mode 100644
index 956323427..000000000
--- a/extra/xpdf/desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Xpdf
-Comment=Views Adobe PDF (acrobat) files
-Exec=xpdf %f
-Terminal=false
-Type=Application
-Icon=xpdf
-Categories=Office;
-MimeType=application/pdf;
diff --git a/extra/xpdf/install b/extra/xpdf/install
deleted file mode 100644
index c6cf149dd..000000000
--- a/extra/xpdf/install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	[[ -x /usr/bin/update-desktop-database ]] && update-desktop-database -q || true
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/extra/xterm/PKGBUILD b/extra/xterm/PKGBUILD
index e110427a5..048e57d2b 100644
--- a/extra/xterm/PKGBUILD
+++ b/extra/xterm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 189924 2013-07-11 14:40:14Z andyrtr $
+# $Id: PKGBUILD 194316 2013-09-13 08:17:42Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xterm
-pkgver=296
+pkgver=297
 pkgrel=1
 pkgdesc="X Terminal Emulator"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('custom')
 depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps' 'libutempter')
 source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz
         LICENSE)
-md5sums=('63d498b14a9d45ae79d3fd3124c72a17'
+md5sums=('45610ae6fe90cf086fcd75b9cb97bbaf'
          '10ecc3f8ee91e3189863a172f68282d2')
 
 build() {
diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD
index 1553ddcc3..b9ab3f225 100644
--- a/extra/xulrunner/PKGBUILD
+++ b/extra/xulrunner/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 188951 2013-06-27 01:33:26Z foutrelis $
+# $Id: PKGBUILD 194430 2013-09-16 10:39:31Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xulrunner
-pkgver=22.0
+pkgver=23.0.1
 pkgrel=1
 pkgdesc="Mozilla Runtime Environment"
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ source=(ftp://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$pkgver/source/
         shared-libs.patch)
 options=('!emptydirs')
 replaces=('xulrunner-oss')
-sha256sums=('f806adf3f1c5b4c8d26322401ef876c73a549f93911be921044f508d698ac589'
+sha256sums=('50d70813cee1c966a6037957206626bb62dc047b011d2e4fab11c559008f9336'
             '3fba82b327f8825ebe93ceaeaea4968d57cf7d700f40bf4457b06d263bcc2e8f'
             '23485d937035648add27a7657f6934dc5b295e886cdb0506eebd02a43d07f269'
             'e2b4a00d14f4ba69c62b3f9ef9908263fbab179ba8004197cbc67edbd916fdf1')
diff --git a/extra/xvidcore/PKGBUILD b/extra/xvidcore/PKGBUILD
index 5805c61df..94144ae37 100644
--- a/extra/xvidcore/PKGBUILD
+++ b/extra/xvidcore/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 126345 2011-06-04 23:54:53Z eric $
+# $Id: PKGBUILD 194593 2013-09-19 00:27:32Z dan $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Sarah Hay <sarah@archlinux.org>
 
 pkgname=xvidcore
 pkgver=1.3.2
-pkgrel=1.2
+pkgrel=2
 pkgdesc="XviD is an open source MPEG-4 video codec"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xvid.org/"
diff --git a/extra/yelp/PKGBUILD b/extra/yelp/PKGBUILD
index 7900d1dd2..35d79a715 100644
--- a/extra/yelp/PKGBUILD
+++ b/extra/yelp/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 185459 2013-05-14 10:26:22Z heftig $
+# $Id: PKGBUILD 196147 2013-10-07 11:53:44Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=yelp
-pkgver=3.8.1
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="A help browser for GNOME"
 arch=('i686' 'x86_64' 'mips64el')
-depends=('webkitgtk3' 'yelp-xsl' 'libxslt' 'hicolor-icon-theme' 'xz' 'bzip2'
+depends=('webkitgtk' 'yelp-xsl' 'libxslt' 'hicolor-icon-theme' 'xz' 'bzip2'
          'desktop-file-utils' 'dconf')
 makedepends=('intltool' 'gtk-doc' 'itstool')
 groups=('gnome')
@@ -16,7 +16,7 @@ options=('!emptydirs' '!libtool')
 url="http://www.gnome.org"
 install=yelp.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('73b3941316194dea8ea7d1d2b1f6612424c5d80ee1871ef627455893ad15606e')
+sha256sums=('146f64a9b69409bedc5a0af9376ff2a38e5a4adcfa93c52c95d4ea4dc868cbd2')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/zsh/PKGBUILD b/extra/zsh/PKGBUILD
index bd94f4965..b989acd8c 100644
--- a/extra/zsh/PKGBUILD
+++ b/extra/zsh/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 192725 2013-08-14 17:32:47Z pierre $
+# $Id: PKGBUILD 194594 2013-09-19 04:27:04Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=zsh
 pkgver=5.0.2
-pkgrel=3
+pkgrel=4
 pkgdesc='A very advanced and programmable command interpreter (shell) for UNIX'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.zsh.org/'
@@ -16,16 +16,23 @@ source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz
 md5sums=('b8f2ad691acf58b3252225746480dcad'
          '24a9335edf77252a7b5f52e079f7aef7')
 
-build() {
+prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
 	# Set correct keymap path
 	sed -i 's#/usr/share/keymaps#/usr/share/kbd/keymaps#g' Completion/Unix/Command/_loadkeys
 
 	# Remove unneeded and conflicting completion scripts
-	rm -rf Completion/{AIX,BSD,Cygwin,Darwin,Debian,Mandriva,openSUSE,Redhat,Solaris}
+	for _fpath in AIX BSD Cygwin Darwin Debian Mandriva openSUSE Redhat Solaris; do
+		rm -rf Completion/$_fpath
+		sed "s#\s*Completion/$_fpath/\*/\*##g" -i Src/Zle/complete.mdd
+	done
 	rm -f  Completion/Linux/Command/_{pkgtool,rpmbuild,yast}
-	rm -f  Completion/Unix/Command/_osc
+	rm -f  Completion/Unix/Command/_{osc,systemd}
+}
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
 
 	./configure --prefix=/usr \
 		--enable-etcdir=/etc/zsh \
diff --git a/kernels/linux-libre-pae/3.10.6-reset-superseed-xhci-hcd.patch b/kernels/linux-libre-pae/3.10.6-reset-superseed-xhci-hcd.patch
deleted file mode 100644
index 0415b8a1e..000000000
--- a/kernels/linux-libre-pae/3.10.6-reset-superseed-xhci-hcd.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-[PATCH] SCSI: Don't attempt to send extended INQUIRY command if skip_vpd_pages is set
-
-If a device has the skip_vpd_pages flag set we should simply fail the
-scsi_get_vpd_page() call.
-
-Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
-Acked-by: Alan Stern <stern@rowland.harvard.edu>
-Tested-by: Stuart Foster <smf.linux@ntlworld.com>
-Cc: stable@vger.kernel.org
-
-diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
-index 3b1ea34..eaa808e 100644
---- a/drivers/scsi/scsi.c
-+++ b/drivers/scsi/scsi.c
-@@ -1031,6 +1031,9 @@ int scsi_get_vpd_page(struct scsi_device *sdev, u8 page, unsigned char *buf,
- {
- 	int i, result;
- 
-+	if (sdev->skip_vpd_pages)
-+		goto fail;
-+
- 	/* Ask for all the pages supported by this device */
- 	result = scsi_vpd_inquiry(sdev, buf, 0, buf_len);
- 	if (result)
diff --git a/kernels/linux-libre-pae/3.11-haswell-intel_pstate.patch b/kernels/linux-libre-pae/3.11-haswell-intel_pstate.patch
new file mode 100644
index 000000000..1f376b518
--- /dev/null
+++ b/kernels/linux-libre-pae/3.11-haswell-intel_pstate.patch
@@ -0,0 +1,32 @@
+From 6cdcdb793791f776ea9408581b1242b636d43b37 Mon Sep 17 00:00:00 2001
+From: Nell Hardcastle <nell@spicious.com>
+Date: Sun, 30 Jun 2013 22:58:57 +0000
+Subject: intel_pstate: Add Haswell CPU models
+
+Enable the intel_pstate driver for Haswell CPUs. One missing Ivy Bridge
+model (0x3E) is also included. Models referenced from
+tools/power/x86/turbostat/turbostat.c:has_nehalem_turbo_ratio_limit
+
+Signed-off-by: Nell Hardcastle <nell@spicious.com>
+Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
+Acked-by: Dirk Brandewie <dirk.j.brandewie@intel.com>
+Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+---
+diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
+index 6efd96c..9733f29 100644
+--- a/drivers/cpufreq/intel_pstate.c
++++ b/drivers/cpufreq/intel_pstate.c
+@@ -522,6 +522,11 @@ static const struct x86_cpu_id intel_pstate_cpu_ids[] = {
+ 	ICPU(0x2a, default_policy),
+ 	ICPU(0x2d, default_policy),
+ 	ICPU(0x3a, default_policy),
++	ICPU(0x3c, default_policy),
++	ICPU(0x3e, default_policy),
++	ICPU(0x3f, default_policy),
++	ICPU(0x45, default_policy),
++	ICPU(0x46, default_policy),
+ 	{}
+ };
+ MODULE_DEVICE_TABLE(x86cpu, intel_pstate_cpu_ids);
+--
+cgit v0.9.2
diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD
index 5e8721d34..d65ba80f7 100644
--- a/kernels/linux-libre-pae/PKGBUILD
+++ b/kernels/linux-libre-pae/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 193761 2013-08-30 11:11:43Z tpowa $
+# $Id: PKGBUILD 195930 2013-10-05 19:44:24Z 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.10
-pkgver=${_basekernel}.10
+_basekernel=3.11
+pkgver=${_basekernel}.4
 pkgrel=1
 arch=('i686')
 url="http://linux-libre.fsfla.org/"
@@ -22,15 +22,15 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'boot-logo.patch'
         'change-default-console-loglevel.patch'
         'criu-no-expert.patch'
-        '3.10.6-logitech-dj.patch')
-md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
-         '673ae6d60b4ce8acad930a06f9fe2e3f'
-         '7dc48829b6bcb5db3779d558c705ab63'
+        '3.11-haswell-intel_pstate.patch')
+md5sums=('7ec84223c7adcf01a5287eb7af96b7e7'
+         'd09e8017d22370b873628942f3ece3b0'
+         'bef7b3ced683c4dc9361f8739ec9f566'
          'f302c931bd85309da9d9792b4cc96467'
-         '04b21c79df0a952c22d681dd4f4562df'
-         'f3def2cefdcbb954c21d8505d23cc83c'
+         '36e90334b12b2e9d53fd92129ee98f5b'
+         '98beb36f9b8cf16e58de2483ea9985e3'
          'd50c1ac47394e9aec637002ef3392bd1'
-         '3ff40ca684cfe719723e627e2cef7cea')
+         '1040ae6c10d4a68f89899f94a2318a17')
 
 _kernelname=${pkgbase#linux-libre}
 _localversionname=-LIBRE-PAE
@@ -50,12 +50,14 @@ prepare() {
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
   patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
 
+  # add intel haswell support to intel_pstate
+  # https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=6cdcdb793791f776ea9408581b1242b636d43b37
+  # will be in 3.12
+  patch -Np1 -i "${srcdir}/3.11-haswell-intel_pstate.patch"
+ 
   # allow criu without expert option set
   # patch from fedora
   patch -Np1 -i "${srcdir}/criu-no-expert.patch"
- 
-  # fix https://bugs.archlinux.org/task/35991 - [linux] 3.10.x renders Logitech Unified Receivers useless
-  patch -Np1 -i  "${srcdir}/3.10.6-logitech-dj.patch"
 
   cat "${srcdir}/config" > ./.config # simpler
 
diff --git a/kernels/linux-libre-pae/boot-logo.patch b/kernels/linux-libre-pae/boot-logo.patch
index c392928a5..cbd52ea22 100644
--- a/kernels/linux-libre-pae/boot-logo.patch
+++ b/kernels/linux-libre-pae/boot-logo.patch
@@ -1,1612 +1,891 @@
-diff -Nur linux-2.6.39.1/drivers/video/logo/logo_linux_clut224.ppm linux-2.6.39-LIBRE/drivers/video/logo/logo_linux_clut224.ppm
---- linux-2.6.39.1/drivers/video/logo/logo_linux_clut224.ppm	2011-06-02 21:34:20.000000000 -0300
-+++ linux-2.6.39-LIBRE/drivers/video/logo/logo_linux_clut224.ppm	2011-06-22 13:42:06.000000000 -0300
-@@ -1,1604 +1,861 @@
+diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
+index 285d552..c9d8373 100644
+--- a/drivers/video/logo/logo_linux_clut224.ppm
++++ b/drivers/video/logo/logo_linux_clut224.ppm
+@@ -1,883 +1,861 @@
  P3
--# Standard 224-color Linux logo
 -80 80
 +80 78
  255
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6   6   6   6  10  10  10  10  10  10
-- 10  10  10   6   6   6   6   6   6   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  10  10  10  14  14  14
-- 22  22  22  26  26  26  30  30  30  34  34  34
-- 30  30  30  30  30  30  26  26  26  18  18  18
-- 14  14  14  10  10  10   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  14  14  14  26  26  26  42  42  42
-- 54  54  54  66  66  66  78  78  78  78  78  78
-- 78  78  78  74  74  74  66  66  66  54  54  54
-- 42  42  42  26  26  26  18  18  18  10  10  10
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 22  22  22  42  42  42  66  66  66  86  86  86
-- 66  66  66  38  38  38  38  38  38  22  22  22
-- 26  26  26  34  34  34  54  54  54  66  66  66
-- 86  86  86  70  70  70  46  46  46  26  26  26
-- 14  14  14   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  10  10  10  26  26  26
-- 50  50  50  82  82  82  58  58  58   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  6   6   6  54  54  54  86  86  86  66  66  66
-- 38  38  38  18  18  18   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  22  22  22  50  50  50
-- 78  78  78  34  34  34   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   6   6   6  70  70  70
-- 78  78  78  46  46  46  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  18  18  18  42  42  42  82  82  82
-- 26  26  26   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  14  14  14
-- 46  46  46  34  34  34   6   6   6   2   2   6
-- 42  42  42  78  78  78  42  42  42  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   0   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 10  10  10  30  30  30  66  66  66  58  58  58
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  26  26  26
-- 86  86  86 101 101 101  46  46  46  10  10  10
--  2   2   6  58  58  58  70  70  70  34  34  34
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 14  14  14  42  42  42  86  86  86  10  10  10
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  30  30  30
-- 94  94  94  94  94  94  58  58  58  26  26  26
--  2   2   6   6   6   6  78  78  78  54  54  54
-- 22  22  22   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 22  22  22  62  62  62  62  62  62   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  26  26  26
-- 54  54  54  38  38  38  18  18  18  10  10  10
--  2   2   6   2   2   6  34  34  34  82  82  82
-- 38  38  38  14  14  14   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 30  30  30  78  78  78  30  30  30   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  10  10  10
-- 10  10  10   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  78  78  78
-- 50  50  50  18  18  18   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 38  38  38  86  86  86  14  14  14   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  54  54  54
-- 66  66  66  26  26  26   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 42  42  42  82  82  82   2   2   6   2   2   6
--  2   2   6   6   6   6  10  10  10   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   6   6   6
-- 14  14  14  10  10  10   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  18  18  18
-- 82  82  82  34  34  34  10  10  10   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 46  46  46  86  86  86   2   2   6   2   2   6
--  6   6   6   6   6   6  22  22  22  34  34  34
--  6   6   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  18  18  18  34  34  34
-- 10  10  10  50  50  50  22  22  22   2   2   6
--  2   2   6   2   2   6   2   2   6  10  10  10
-- 86  86  86  42  42  42  14  14  14   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 46  46  46  86  86  86   2   2   6   2   2   6
-- 38  38  38 116 116 116  94  94  94  22  22  22
-- 22  22  22   2   2   6   2   2   6   2   2   6
-- 14  14  14  86  86  86 138 138 138 162 162 162
--154 154 154  38  38  38  26  26  26   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 86  86  86  46  46  46  14  14  14   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 46  46  46  86  86  86   2   2   6  14  14  14
--134 134 134 198 198 198 195 195 195 116 116 116
-- 10  10  10   2   2   6   2   2   6   6   6   6
--101  98  89 187 187 187 210 210 210 218 218 218
--214 214 214 134 134 134  14  14  14   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 86  86  86  50  50  50  18  18  18   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   1   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 46  46  46  86  86  86   2   2   6  54  54  54
--218 218 218 195 195 195 226 226 226 246 246 246
-- 58  58  58   2   2   6   2   2   6  30  30  30
--210 210 210 253 253 253 174 174 174 123 123 123
--221 221 221 234 234 234  74  74  74   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 70  70  70  58  58  58  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 46  46  46  82  82  82   2   2   6 106 106 106
--170 170 170  26  26  26  86  86  86 226 226 226
--123 123 123  10  10  10  14  14  14  46  46  46
--231 231 231 190 190 190   6   6   6  70  70  70
-- 90  90  90 238 238 238 158 158 158   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 70  70  70  58  58  58  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   1   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 42  42  42  86  86  86   6   6   6 116 116 116
--106 106 106   6   6   6  70  70  70 149 149 149
--128 128 128  18  18  18  38  38  38  54  54  54
--221 221 221 106 106 106   2   2   6  14  14  14
-- 46  46  46 190 190 190 198 198 198   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 74  74  74  62  62  62  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   1   0   0   0
--  0   0   1   0   0   0   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 42  42  42  94  94  94  14  14  14 101 101 101
--128 128 128   2   2   6  18  18  18 116 116 116
--118  98  46 121  92   8 121  92   8  98  78  10
--162 162 162 106 106 106   2   2   6   2   2   6
--  2   2   6 195 195 195 195 195 195   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 74  74  74  62  62  62  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   1   0   0   1
--  0   0   1   0   0   0   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 38  38  38  90  90  90  14  14  14  58  58  58
--210 210 210  26  26  26  54  38   6 154 114  10
--226 170  11 236 186  11 225 175  15 184 144  12
--215 174  15 175 146  61  37  26   9   2   2   6
-- 70  70  70 246 246 246 138 138 138   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 70  70  70  66  66  66  26  26  26   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 38  38  38  86  86  86  14  14  14  10  10  10
--195 195 195 188 164 115 192 133   9 225 175  15
--239 182  13 234 190  10 232 195  16 232 200  30
--245 207  45 241 208  19 232 195  16 184 144  12
--218 194 134 211 206 186  42  42  42   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 50  50  50  74  74  74  30  30  30   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 34  34  34  86  86  86  14  14  14   2   2   6
--121  87  25 192 133   9 219 162  10 239 182  13
--236 186  11 232 195  16 241 208  19 244 214  54
--246 218  60 246 218  38 246 215  20 241 208  19
--241 208  19 226 184  13 121  87  25   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 50  50  50  82  82  82  34  34  34  10  10  10
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 34  34  34  82  82  82  30  30  30  61  42   6
--180 123   7 206 145  10 230 174  11 239 182  13
--234 190  10 238 202  15 241 208  19 246 218  74
--246 218  38 246 215  20 246 215  20 246 215  20
--226 184  13 215 174  15 184 144  12   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 26  26  26  94  94  94  42  42  42  14  14  14
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  78  78  78  50  50  50 104  69   6
--192 133   9 216 158  10 236 178  12 236 186  11
--232 195  16 241 208  19 244 214  54 245 215  43
--246 215  20 246 215  20 241 208  19 198 155  10
--200 144  11 216 158  10 156 118  10   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  6   6   6  90  90  90  54  54  54  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  78  78  78  46  46  46  22  22  22
--137  92   6 210 162  10 239 182  13 238 190  10
--238 202  15 241 208  19 246 215  20 246 215  20
--241 208  19 203 166  17 185 133  11 210 150  10
--216 158  10 210 150  10 102  78  10   2   2   6
--  6   6   6  54  54  54  14  14  14   2   2   6
--  2   2   6  62  62  62  74  74  74  30  30  30
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 34  34  34  78  78  78  50  50  50   6   6   6
-- 94  70  30 139 102  15 190 146  13 226 184  13
--232 200  30 232 195  16 215 174  15 190 146  13
--168 122  10 192 133   9 210 150  10 213 154  11
--202 150  34 182 157 106 101  98  89   2   2   6
--  2   2   6  78  78  78 116 116 116  58  58  58
--  2   2   6  22  22  22  90  90  90  46  46  46
-- 18  18  18   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 38  38  38  86  86  86  50  50  50   6   6   6
--128 128 128 174 154 114 156 107  11 168 122  10
--198 155  10 184 144  12 197 138  11 200 144  11
--206 145  10 206 145  10 197 138  11 188 164 115
--195 195 195 198 198 198 174 174 174  14  14  14
--  2   2   6  22  22  22 116 116 116 116 116 116
-- 22  22  22   2   2   6  74  74  74  70  70  70
-- 30  30  30  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 50  50  50 101 101 101  26  26  26  10  10  10
--138 138 138 190 190 190 174 154 114 156 107  11
--197 138  11 200 144  11 197 138  11 192 133   9
--180 123   7 190 142  34 190 178 144 187 187 187
--202 202 202 221 221 221 214 214 214  66  66  66
--  2   2   6   2   2   6  50  50  50  62  62  62
--  6   6   6   2   2   6  10  10  10  90  90  90
-- 50  50  50  18  18  18   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  10  10  10  34  34  34
-- 74  74  74  74  74  74   2   2   6   6   6   6
--144 144 144 198 198 198 190 190 190 178 166 146
--154 121  60 156 107  11 156 107  11 168 124  44
--174 154 114 187 187 187 190 190 190 210 210 210
--246 246 246 253 253 253 253 253 253 182 182 182
--  6   6   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  62  62  62
-- 74  74  74  34  34  34  14  14  14   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  10  10  10  22  22  22  54  54  54
-- 94  94  94  18  18  18   2   2   6  46  46  46
--234 234 234 221 221 221 190 190 190 190 190 190
--190 190 190 187 187 187 187 187 187 190 190 190
--190 190 190 195 195 195 214 214 214 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
-- 82  82  82   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  14  14  14
-- 86  86  86  54  54  54  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  18  18  18  46  46  46  90  90  90
-- 46  46  46  18  18  18   6   6   6 182 182 182
--253 253 253 246 246 246 206 206 206 190 190 190
--190 190 190 190 190 190 190 190 190 190 190 190
--206 206 206 231 231 231 250 250 250 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--202 202 202  14  14  14   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 42  42  42  86  86  86  42  42  42  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 14  14  14  38  38  38  74  74  74  66  66  66
--  2   2   6   6   6   6  90  90  90 250 250 250
--253 253 253 253 253 253 238 238 238 198 198 198
--190 190 190 190 190 190 195 195 195 221 221 221
--246 246 246 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253  82  82  82   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  78  78  78  70  70  70  34  34  34
-- 14  14  14   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 34  34  34  66  66  66  78  78  78   6   6   6
--  2   2   6  18  18  18 218 218 218 253 253 253
--253 253 253 253 253 253 253 253 253 246 246 246
--226 226 226 231 231 231 246 246 246 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 178 178 178   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  18  18  18  90  90  90  62  62  62
-- 30  30  30  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  10  10  10  26  26  26
-- 58  58  58  90  90  90  18  18  18   2   2   6
--  2   2   6 110 110 110 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--250 250 250 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 231 231 231  18  18  18   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  18  18  18  94  94  94
-- 54  54  54  26  26  26  10  10  10   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  22  22  22  50  50  50
-- 90  90  90  26  26  26   2   2   6   2   2   6
-- 14  14  14 195 195 195 250 250 250 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--250 250 250 242 242 242  54  54  54   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  38  38  38
-- 86  86  86  50  50  50  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  14  14  14  38  38  38  82  82  82
-- 34  34  34   2   2   6   2   2   6   2   2   6
-- 42  42  42 195 195 195 246 246 246 253 253 253
--253 253 253 253 253 253 253 253 253 250 250 250
--242 242 242 242 242 242 250 250 250 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 250 250 250 246 246 246 238 238 238
--226 226 226 231 231 231 101 101 101   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 38  38  38  82  82  82  42  42  42  14  14  14
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 10  10  10  26  26  26  62  62  62  66  66  66
--  2   2   6   2   2   6   2   2   6   6   6   6
-- 70  70  70 170 170 170 206 206 206 234 234 234
--246 246 246 250 250 250 250 250 250 238 238 238
--226 226 226 231 231 231 238 238 238 250 250 250
--250 250 250 250 250 250 246 246 246 231 231 231
--214 214 214 206 206 206 202 202 202 202 202 202
--198 198 198 202 202 202 182 182 182  18  18  18
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  62  62  62  66  66  66  30  30  30
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 14  14  14  42  42  42  82  82  82  18  18  18
--  2   2   6   2   2   6   2   2   6  10  10  10
-- 94  94  94 182 182 182 218 218 218 242 242 242
--250 250 250 253 253 253 253 253 253 250 250 250
--234 234 234 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 246 246 246
--238 238 238 226 226 226 210 210 210 202 202 202
--195 195 195 195 195 195 210 210 210 158 158 158
--  6   6   6  14  14  14  50  50  50  14  14  14
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   6   6   6  86  86  86  46  46  46
-- 18  18  18   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 22  22  22  54  54  54  70  70  70   2   2   6
--  2   2   6  10  10  10   2   2   6  22  22  22
--166 166 166 231 231 231 250 250 250 253 253 253
--253 253 253 253 253 253 253 253 253 250 250 250
--242 242 242 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 246 246 246
--231 231 231 206 206 206 198 198 198 226 226 226
-- 94  94  94   2   2   6   6   6   6  38  38  38
-- 30  30  30   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  62  62  62  66  66  66
-- 26  26  26  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  74  74  74  50  50  50   2   2   6
-- 26  26  26  26  26  26   2   2   6 106 106 106
--238 238 238 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 246 246 246 218 218 218 202 202 202
--210 210 210  14  14  14   2   2   6   2   2   6
-- 30  30  30  22  22  22   2   2   6   2   2   6
--  2   2   6   2   2   6  18  18  18  86  86  86
-- 42  42  42  14  14  14   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 42  42  42  90  90  90  22  22  22   2   2   6
-- 42  42  42   2   2   6  18  18  18 218 218 218
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 250 250 250 221 221 221
--218 218 218 101 101 101   2   2   6  14  14  14
-- 18  18  18  38  38  38  10  10  10   2   2   6
--  2   2   6   2   2   6   2   2   6  78  78  78
-- 58  58  58  22  22  22   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 54  54  54  82  82  82   2   2   6  26  26  26
-- 22  22  22   2   2   6 123 123 123 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 250 250 250
--238 238 238 198 198 198   6   6   6  38  38  38
-- 58  58  58  26  26  26  38  38  38   2   2   6
--  2   2   6   2   2   6   2   2   6  46  46  46
-- 78  78  78  30  30  30  10  10  10   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  10  10  10  30  30  30
-- 74  74  74  58  58  58   2   2   6  42  42  42
--  2   2   6  22  22  22 231 231 231 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 250 250 250
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 246 246 246  46  46  46  38  38  38
-- 42  42  42  14  14  14  38  38  38  14  14  14
--  2   2   6   2   2   6   2   2   6   6   6   6
-- 86  86  86  46  46  46  14  14  14   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  14  14  14  42  42  42
-- 90  90  90  18  18  18  18  18  18  26  26  26
--  2   2   6 116 116 116 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 250 250 250 238 238 238
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253  94  94  94   6   6   6
--  2   2   6   2   2   6  10  10  10  34  34  34
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 74  74  74  58  58  58  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  10  10  10  26  26  26  66  66  66
-- 82  82  82   2   2   6  38  38  38   6   6   6
-- 14  14  14 210 210 210 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 246 246 246 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 144 144 144   2   2   6
--  2   2   6   2   2   6   2   2   6  46  46  46
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 42  42  42  74  74  74  30  30  30  10  10  10
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  14  14  14  42  42  42  90  90  90
-- 26  26  26   6   6   6  42  42  42   2   2   6
-- 74  74  74 250 250 250 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 242 242 242 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 182 182 182   2   2   6
--  2   2   6   2   2   6   2   2   6  46  46  46
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 10  10  10  86  86  86  38  38  38  10  10  10
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 10  10  10  26  26  26  66  66  66  82  82  82
--  2   2   6  22  22  22  18  18  18   2   2   6
--149 149 149 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 234 234 234 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 206 206 206   2   2   6
--  2   2   6   2   2   6   2   2   6  38  38  38
--  2   2   6   2   2   6   2   2   6   2   2   6
--  6   6   6  86  86  86  46  46  46  14  14  14
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 18  18  18  46  46  46  86  86  86  18  18  18
--  2   2   6  34  34  34  10  10  10   6   6   6
--210 210 210 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 234 234 234 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 221 221 221   6   6   6
--  2   2   6   2   2   6   6   6   6  30  30  30
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  82  82  82  54  54  54  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 26  26  26  66  66  66  62  62  62   2   2   6
--  2   2   6  38  38  38  10  10  10  26  26  26
--238 238 238 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 238 238 238
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231   6   6   6
--  2   2   6   2   2   6  10  10  10  30  30  30
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  66  66  66  58  58  58  22  22  22
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 38  38  38  78  78  78   6   6   6   2   2   6
--  2   2   6  46  46  46  14  14  14  42  42  42
--246 246 246 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 234 234 234  10  10  10
--  2   2   6   2   2   6  22  22  22  14  14  14
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  66  66  66  62  62  62  22  22  22
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 50  50  50  74  74  74   2   2   6   2   2   6
-- 14  14  14  70  70  70  34  34  34  62  62  62
--250 250 250 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 246 246 246
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 234 234 234  14  14  14
--  2   2   6   2   2   6  30  30  30   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  66  66  66  62  62  62  22  22  22
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 54  54  54  62  62  62   2   2   6   2   2   6
--  2   2   6  30  30  30  46  46  46  70  70  70
--250 250 250 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 246 246 246
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 226 226 226  10  10  10
--  2   2   6   6   6   6  30  30  30   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  66  66  66  58  58  58  22  22  22
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  22  22  22
-- 58  58  58  62  62  62   2   2   6   2   2   6
--  2   2   6   2   2   6  30  30  30  78  78  78
--250 250 250 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 246 246 246
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 206 206 206   2   2   6
-- 22  22  22  34  34  34  18  14   6  22  22  22
-- 26  26  26  18  18  18   6   6   6   2   2   6
--  2   2   6  82  82  82  54  54  54  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  26  26  26
-- 62  62  62 106 106 106  74  54  14 185 133  11
--210 162  10 121  92   8   6   6   6  62  62  62
--238 238 238 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 246 246 246
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 158 158 158  18  18  18
-- 14  14  14   2   2   6   2   2   6   2   2   6
--  6   6   6  18  18  18  66  66  66  38  38  38
--  6   6   6  94  94  94  50  50  50  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 10  10  10  10  10  10  18  18  18  38  38  38
-- 78  78  78 142 134 106 216 158  10 242 186  14
--246 190  14 246 190  14 156 118  10  10  10  10
-- 90  90  90 238 238 238 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 250 250 250
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 246 230 190
--238 204  91 238 204  91 181 142  44  37  26   9
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  38  38  38  46  46  46
-- 26  26  26 106 106 106  54  54  54  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  14  14  14  22  22  22
-- 30  30  30  38  38  38  50  50  50  70  70  70
--106 106 106 190 142  34 226 170  11 242 186  14
--246 190  14 246 190  14 246 190  14 154 114  10
--  6   6   6  74  74  74 226 226 226 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 250 250 250
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 228 184  62
--241 196  14 241 208  19 232 195  16  38  30  10
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   6   6   6  30  30  30  26  26  26
--203 166  17 154 142  90  66  66  66  26  26  26
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  18  18  18  38  38  38  58  58  58
-- 78  78  78  86  86  86 101 101 101 123 123 123
--175 146  61 210 150  10 234 174  13 246 186  14
--246 190  14 246 190  14 246 190  14 238 190  10
--102  78  10   2   2   6  46  46  46 198 198 198
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 234 234 234 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 224 178  62
--242 186  14 241 196  14 210 166  10  22  18   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   6   6   6 121  92   8
--238 202  15 232 195  16  82  82  82  34  34  34
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 14  14  14  38  38  38  70  70  70 154 122  46
--190 142  34 200 144  11 197 138  11 197 138  11
--213 154  11 226 170  11 242 186  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--225 175  15  46  32   6   2   2   6  22  22  22
--158 158 158 250 250 250 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 250 250 250 242 242 242 224 178  62
--239 182  13 236 186  11 213 154  11  46  32   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  61  42   6 225 175  15
--238 190  10 236 186  11 112 100  78  42  42  42
-- 14  14  14   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 22  22  22  54  54  54 154 122  46 213 154  11
--226 170  11 230 174  11 226 170  11 226 170  11
--236 178  12 242 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--241 196  14 184 144  12  10  10  10   2   2   6
--  6   6   6 116 116 116 242 242 242 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 231 231 231 198 198 198 214 170  54
--236 178  12 236 178  12 210 150  10 137  92   6
-- 18  14   6   2   2   6   2   2   6   2   2   6
--  6   6   6  70  47   6 200 144  11 236 178  12
--239 182  13 239 182  13 124 112  88  58  58  58
-- 22  22  22   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  70  70  70 180 133  36 226 170  11
--239 182  13 242 186  14 242 186  14 246 186  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 232 195  16  98  70   6   2   2   6
--  2   2   6   2   2   6  66  66  66 221 221 221
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 206 206 206 198 198 198 214 166  58
--230 174  11 230 174  11 216 158  10 192 133   9
--163 110   8 116  81   8 102  78  10 116  81   8
--167 114   7 197 138  11 226 170  11 239 182  13
--242 186  14 242 186  14 162 146  94  78  78  78
-- 34  34  34  14  14  14   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 30  30  30  78  78  78 190 142  34 226 170  11
--239 182  13 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 241 196  14 203 166  17  22  18   6
--  2   2   6   2   2   6   2   2   6  38  38  38
--218 218 218 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--250 250 250 206 206 206 198 198 198 202 162  69
--226 170  11 236 178  12 224 166  10 210 150  10
--200 144  11 197 138  11 192 133   9 197 138  11
--210 150  10 226 170  11 242 186  14 246 190  14
--246 190  14 246 186  14 225 175  15 124 112  88
-- 62  62  62  30  30  30  14  14  14   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  78  78  78 174 135  50 224 166  10
--239 182  13 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 241 196  14 139 102  15
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 78  78  78 250 250 250 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--250 250 250 214 214 214 198 198 198 190 150  46
--219 162  10 236 178  12 234 174  13 224 166  10
--216 158  10 213 154  11 213 154  11 216 158  10
--226 170  11 239 182  13 246 190  14 246 190  14
--246 190  14 246 190  14 242 186  14 206 162  42
--101 101 101  58  58  58  30  30  30  14  14  14
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  74  74  74 174 135  50 216 158  10
--236 178  12 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 241 196  14 226 184  13
-- 61  42   6   2   2   6   2   2   6   2   2   6
-- 22  22  22 238 238 238 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 226 226 226 187 187 187 180 133  36
--216 158  10 236 178  12 239 182  13 236 178  12
--230 174  11 226 170  11 226 170  11 230 174  11
--236 178  12 242 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 186  14 239 182  13
--206 162  42 106 106 106  66  66  66  34  34  34
-- 14  14  14   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 26  26  26  70  70  70 163 133  67 213 154  11
--236 178  12 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 241 196  14
--190 146  13  18  14   6   2   2   6   2   2   6
-- 46  46  46 246 246 246 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 221 221 221  86  86  86 156 107  11
--216 158  10 236 178  12 242 186  14 246 186  14
--242 186  14 239 182  13 239 182  13 242 186  14
--242 186  14 246 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--242 186  14 225 175  15 142 122  72  66  66  66
-- 30  30  30  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 26  26  26  70  70  70 163 133  67 210 150  10
--236 178  12 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--232 195  16 121  92   8  34  34  34 106 106 106
--221 221 221 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--242 242 242  82  82  82  18  14   6 163 110   8
--216 158  10 236 178  12 242 186  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 242 186  14 163 133  67
-- 46  46  46  18  18  18   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  78  78  78 163 133  67 210 150  10
--236 178  12 246 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--241 196  14 215 174  15 190 178 144 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 218 218 218
-- 58  58  58   2   2   6  22  18   6 167 114   7
--216 158  10 236 178  12 246 186  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 186  14 242 186  14 190 150  46
-- 54  54  54  22  22  22   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 38  38  38  86  86  86 180 133  36 213 154  11
--236 178  12 246 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 232 195  16 190 146  13 214 214 214
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 250 250 250 170 170 170  26  26  26
--  2   2   6   2   2   6  37  26   9 163 110   8
--219 162  10 239 182  13 246 186  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 186  14 236 178  12 224 166  10 142 122  72
-- 46  46  46  18  18  18   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 50  50  50 109 106  95 192 133   9 224 166  10
--242 186  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--242 186  14 226 184  13 210 162  10 142 110  46
--226 226 226 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--198 198 198  66  66  66   2   2   6   2   2   6
--  2   2   6   2   2   6  50  34   6 156 107  11
--219 162  10 239 182  13 246 186  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 242 186  14
--234 174  13 213 154  11 154 122  46  66  66  66
-- 30  30  30  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  22  22  22
-- 58  58  58 154 121  60 206 145  10 234 174  13
--242 186  14 246 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 186  14 236 178  12 210 162  10 163 110   8
-- 61  42   6 138 138 138 218 218 218 250 250 250
--253 253 253 253 253 253 253 253 253 250 250 250
--242 242 242 210 210 210 144 144 144  66  66  66
--  6   6   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  61  42   6 163 110   8
--216 158  10 236 178  12 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 239 182  13 230 174  11 216 158  10
--190 142  34 124 112  88  70  70  70  38  38  38
-- 18  18  18   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  22  22  22
-- 62  62  62 168 124  44 206 145  10 224 166  10
--236 178  12 239 182  13 242 186  14 242 186  14
--246 186  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 236 178  12 216 158  10 175 118   6
-- 80  54   7   2   2   6   6   6   6  30  30  30
-- 54  54  54  62  62  62  50  50  50  38  38  38
-- 14  14  14   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   6   6   6  80  54   7 167 114   7
--213 154  11 236 178  12 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 242 186  14 239 182  13 239 182  13
--230 174  11 210 150  10 174 135  50 124 112  88
-- 82  82  82  54  54  54  34  34  34  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 50  50  50 158 118  36 192 133   9 200 144  11
--216 158  10 219 162  10 224 166  10 226 170  11
--230 174  11 236 178  12 239 182  13 239 182  13
--242 186  14 246 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 186  14 230 174  11 210 150  10 163 110   8
--104  69   6  10  10  10   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   6   6   6  91  60   6 167 114   7
--206 145  10 230 174  11 242 186  14 246 190  14
--246 190  14 246 190  14 246 186  14 242 186  14
--239 182  13 230 174  11 224 166  10 213 154  11
--180 133  36 124 112  88  86  86  86  58  58  58
-- 38  38  38  22  22  22  10  10  10   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 34  34  34  70  70  70 138 110  50 158 118  36
--167 114   7 180 123   7 192 133   9 197 138  11
--200 144  11 206 145  10 213 154  11 219 162  10
--224 166  10 230 174  11 239 182  13 242 186  14
--246 186  14 246 186  14 246 186  14 246 186  14
--239 182  13 216 158  10 185 133  11 152  99   6
--104  69   6  18  14   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   6   6   6  80  54   7 152  99   6
--192 133   9 219 162  10 236 178  12 239 182  13
--246 186  14 242 186  14 239 182  13 236 178  12
--224 166  10 206 145  10 192 133   9 154 121  60
-- 94  94  94  62  62  62  42  42  42  22  22  22
-- 14  14  14   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 18  18  18  34  34  34  58  58  58  78  78  78
--101  98  89 124 112  88 142 110  46 156 107  11
--163 110   8 167 114   7 175 118   6 180 123   7
--185 133  11 197 138  11 210 150  10 219 162  10
--226 170  11 236 178  12 236 178  12 234 174  13
--219 162  10 197 138  11 163 110   8 130  83   6
-- 91  60   6  10  10  10   2   2   6   2   2   6
-- 18  18  18  38  38  38  38  38  38  38  38  38
-- 38  38  38  38  38  38  38  38  38  38  38  38
-- 38  38  38  38  38  38  26  26  26   2   2   6
--  2   2   6   6   6   6  70  47   6 137  92   6
--175 118   6 200 144  11 219 162  10 230 174  11
--234 174  13 230 174  11 219 162  10 210 150  10
--192 133   9 163 110   8 124 112  88  82  82  82
-- 50  50  50  30  30  30  14  14  14   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  14  14  14  22  22  22  34  34  34
-- 42  42  42  58  58  58  74  74  74  86  86  86
--101  98  89 122 102  70 130  98  46 121  87  25
--137  92   6 152  99   6 163 110   8 180 123   7
--185 133  11 197 138  11 206 145  10 200 144  11
--180 123   7 156 107  11 130  83   6 104  69   6
-- 50  34   6  54  54  54 110 110 110 101  98  89
-- 86  86  86  82  82  82  78  78  78  78  78  78
-- 78  78  78  78  78  78  78  78  78  78  78  78
-- 78  78  78  82  82  82  86  86  86  94  94  94
--106 106 106 101 101 101  86  66  34 124  80   6
--156 107  11 180 123   7 192 133   9 200 144  11
--206 145  10 200 144  11 192 133   9 175 118   6
--139 102  15 109 106  95  70  70  70  42  42  42
-- 22  22  22  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  10  10  10
-- 14  14  14  22  22  22  30  30  30  38  38  38
-- 50  50  50  62  62  62  74  74  74  90  90  90
--101  98  89 112 100  78 121  87  25 124  80   6
--137  92   6 152  99   6 152  99   6 152  99   6
--138  86   6 124  80   6  98  70   6  86  66  30
--101  98  89  82  82  82  58  58  58  46  46  46
-- 38  38  38  34  34  34  34  34  34  34  34  34
-- 34  34  34  34  34  34  34  34  34  34  34  34
-- 34  34  34  34  34  34  38  38  38  42  42  42
-- 54  54  54  82  82  82  94  86  76  91  60   6
--134  86   6 156 107  11 167 114   7 175 118   6
--175 118   6 167 114   7 152  99   6 121  87  25
--101  98  89  62  62  62  34  34  34  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6   6   6   6  10  10  10
-- 18  18  18  22  22  22  30  30  30  42  42  42
-- 50  50  50  66  66  66  86  86  86 101  98  89
--106  86  58  98  70   6 104  69   6 104  69   6
--104  69   6  91  60   6  82  62  34  90  90  90
-- 62  62  62  38  38  38  22  22  22  14  14  14
-- 10  10  10  10  10  10  10  10  10  10  10  10
-- 10  10  10  10  10  10   6   6   6  10  10  10
-- 10  10  10  10  10  10  10  10  10  14  14  14
-- 22  22  22  42  42  42  70  70  70  89  81  66
-- 80  54   7 104  69   6 124  80   6 137  92   6
--134  86   6 116  81   8 100  82  52  86  86  86
-- 58  58  58  30  30  30  14  14  14   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  10  10  10  14  14  14
-- 18  18  18  26  26  26  38  38  38  54  54  54
-- 70  70  70  86  86  86  94  86  76  89  81  66
-- 89  81  66  86  86  86  74  74  74  50  50  50
-- 30  30  30  14  14  14   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  18  18  18  34  34  34  58  58  58
-- 82  82  82  89  81  66  89  81  66  89  81  66
-- 94  86  66  94  86  76  74  74  74  50  50  50
-- 26  26  26  14  14  14   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6   6   6   6  14  14  14  18  18  18
-- 30  30  30  38  38  38  46  46  46  54  54  54
-- 50  50  50  42  42  42  30  30  30  18  18  18
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  14  14  14  26  26  26
-- 38  38  38  50  50  50  58  58  58  58  58  58
-- 54  54  54  42  42  42  30  30  30  18  18  18
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
--  6   6   6  10  10  10  14  14  14  18  18  18
-- 18  18  18  14  14  14  10  10  10   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 14  14  14  18  18  18  22  22  22  22  22  22
-- 18  18  18  14  14  14  10  10  10   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 11 15 17 33 49 54 59 85 92 73 97 106 
+-83 116 129 105 131 142 115 114 122 74 88 93 20 29 31 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 6 6 6 10 10 10 10 10 10 
+-10 10 10 6 6 6 6 6 6 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 2 3 3 17 23 26 50 67 72 73 97 106 59 85 92 73 97 106 
+-105 131 142 124 127 131 105 131 142 105 131 142 53 75 83 6 8 8 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 6 6 6 10 10 10 14 14 14 22 22 22 26 26 26 30 30 30 34 34 34 
+-30 30 30 30 30 30 26 26 26 18 18 18 14 14 14 10 10 10 6 6 6 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 
+-0 0 0 1 1 1 26 35 39 59 85 92 59 85 92 59 85 92 29 43 47 53 75 83 
+-108 122 132 132 98 104 108 122 132 105 131 142 101 101 101 43 45 48 6 8 8 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-6 6 6 14 14 14 26 26 26 42 42 42 54 54 54 66 66 66 78 78 78 78 78 78 
+-78 78 78 74 74 74 66 66 66 54 54 54 42 42 42 26 26 26 18 18 18 10 10 10 
+-6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 
+-11 15 17 27 40 45 59 85 92 59 85 92 27 40 45 31 45 49 73 97 106 93 121 133 
+-108 122 132 108 122 132 105 131 142 108 122 132 105 131 142 73 97 106 26 35 39 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 
+-22 22 22 42 42 42 66 66 66 86 86 86 66 66 66 38 38 38 38 38 38 22 22 22 
+-26 26 26 34 34 34 54 54 54 66 66 66 86 86 86 70 70 70 46 46 46 26 26 26 
+-14 14 14 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 7 12 13 21 31 35 42 59 64 
+-53 75 83 53 75 83 50 67 72 42 59 64 32 40 45 42 59 64 73 97 106 116 116 116 
+-132 98 104 116 116 116 108 122 132 117 104 110 105 131 142 83 116 129 50 67 72 7 12 13 
+-1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 26 26 26 
+-50 50 50 82 82 82 58 58 58 6 6 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 6 6 6 54 54 54 86 86 86 66 66 66 
+-38 38 38 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 1 1 1 6 8 8 15 22 25 26 35 39 36 54 60 53 75 83 59 85 92 
+-59 85 92 48 63 69 15 22 25 12 17 20 52 67 79 94 94 94 132 98 104 132 98 104 
+-117 104 110 108 122 132 108 122 132 115 114 122 105 131 142 77 105 114 59 85 92 36 54 60 
+-7 12 13 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 22 22 22 50 50 50 
+-78 78 78 34 34 34 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 6 6 6 70 70 70 
+-78 78 78 46 46 46 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 15 22 25 29 43 47 36 54 60 42 59 64 42 59 64 48 63 69 21 31 35 
+-6 8 8 29 43 47 36 50 56 43 45 48 79 78 84 132 98 104 165 78 79 132 98 104 
+-108 122 132 117 104 110 117 104 110 108 122 132 77 105 114 73 97 106 95 131 149 78 102 129 
+-36 50 56 0 0 0 0 0 0 0 0 0 6 6 6 18 18 18 42 42 42 82 82 82 
+-26 26 26 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 2 2 6 14 14 14 46 46 46 34 34 34 6 6 6 2 2 6 
+-42 42 42 78 78 78 42 42 42 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-27 40 45 53 75 83 48 63 69 24 31 37 6 8 12 0 0 0 18 25 28 26 35 39 
+-12 17 20 26 35 39 65 78 84 112 81 86 152 81 83 137 83 86 132 98 104 117 104 110 
+-117 104 110 132 98 104 132 98 104 115 114 122 73 97 106 53 75 83 95 131 149 93 124 152 
+-68 78 128 15 22 25 0 0 0 0 0 0 10 10 10 30 30 30 66 66 66 58 58 58 
+-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 2 2 6 26 26 26 86 86 86 101 101 101 46 46 46 10 10 10 
+-2 2 6 58 58 58 70 70 70 34 34 34 10 10 10 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-36 50 56 21 30 33 4 7 7 0 0 0 1 1 1 17 12 12 69 31 31 68 59 64 
+-57 59 63 21 31 35 32 40 45 86 73 69 152 81 83 152 81 83 117 104 110 132 98 104 
+-152 81 83 132 98 104 108 122 132 77 105 114 77 105 114 93 121 133 95 131 149 93 124 152 
+-95 131 149 53 75 83 11 15 17 0 0 0 14 14 14 42 42 42 86 86 86 10 10 10 
+-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 2 2 6 30 30 30 94 94 94 94 94 94 58 58 58 26 26 26 
+-2 2 6 6 6 6 78 78 78 54 54 54 22 22 22 6 6 6 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-17 23 26 2 3 3 0 0 0 17 12 12 69 31 31 123 55 55 123 55 55 152 81 83 
+-86 73 69 17 23 26 7 12 13 45 54 57 101 101 101 137 83 86 132 98 104 132 98 104 
+-137 83 86 117 104 110 77 105 114 42 59 64 50 67 72 78 102 129 91 117 157 91 117 157 
+-95 131 149 83 116 129 40 48 73 6 6 6 22 22 22 62 62 62 62 62 62 2 2 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 2 2 6 26 26 26 54 54 54 38 38 38 18 18 18 10 10 10 
+-2 2 6 2 2 6 34 34 34 82 82 82 38 38 38 14 14 14 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-1 1 1 1 2 2 2 3 3 28 12 12 123 55 55 174 79 79 174 79 79 174 79 79 
+-152 81 83 68 59 64 26 35 39 27 40 45 79 78 84 137 83 86 165 78 79 137 83 86 
+-94 94 94 48 63 69 36 50 56 50 67 72 73 97 106 93 121 133 93 124 152 93 124 152 
+-95 131 149 91 118 149 78 102 129 27 40 45 30 30 30 78 78 78 30 30 30 2 2 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 2 2 6 10 10 10 10 10 10 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 2 2 6 78 78 78 50 50 50 18 18 18 6 6 6 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-4 5 3 24 53 24 19 31 15 8 7 3 90 61 47 165 78 79 174 79 79 174 79 79 
+-174 79 79 137 83 86 60 52 57 7 12 13 17 23 26 70 70 70 132 98 104 112 81 86 
+-79 78 84 31 45 49 15 22 25 53 75 83 91 118 149 86 106 160 91 117 157 93 124 152 
+-91 117 157 93 124 152 95 131 149 53 75 83 50 50 50 86 86 86 14 14 14 2 2 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 2 2 6 54 54 54 66 66 66 26 26 26 6 6 6 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-19 31 15 34 76 34 34 76 34 19 31 15 28 12 12 123 55 55 174 79 79 174 79 79 
+-174 79 79 165 78 79 112 81 86 32 40 45 15 22 25 38 53 58 65 78 84 29 31 32 
+-21 30 33 42 59 64 60 80 103 78 102 129 87 112 149 84 96 162 91 117 157 93 124 152 
+-91 117 157 93 124 152 93 121 133 59 85 92 57 68 71 82 85 86 2 2 6 2 2 6 
+-2 2 6 6 6 6 10 10 10 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 2 2 6 6 6 6 14 14 14 10 10 10 2 2 6 2 2 6 
+-2 2 6 2 2 6 2 2 6 18 18 18 82 82 82 34 34 34 10 10 10 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-34 76 34 40 89 40 40 89 40 34 76 34 8 15 6 48 26 18 123 55 55 174 79 79 
+-174 79 79 174 79 79 137 83 86 68 59 64 32 40 45 21 30 33 31 45 49 21 31 35 
+-12 17 20 48 63 69 78 102 129 81 88 166 84 96 162 91 117 157 93 124 152 91 117 157 
+-93 124 152 95 131 149 83 116 129 59 85 92 57 68 71 86 86 86 2 2 6 2 2 6 
+-6 6 6 6 6 6 22 22 22 34 34 34 6 6 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 18 18 18 34 34 34 10 10 10 50 50 50 22 22 22 2 2 6 
+-2 2 6 2 2 6 2 2 6 10 10 10 86 86 86 42 42 42 14 14 14 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-40 89 40 40 89 40 40 89 40 40 89 40 24 53 24 6 6 6 69 31 31 123 55 55 
+-123 55 55 90 61 47 69 31 31 36 32 33 21 31 35 7 12 13 18 25 28 48 63 69 
+-60 80 103 68 78 128 84 101 153 84 96 162 84 96 162 91 117 157 91 117 157 84 96 162 
+-91 117 157 73 97 106 48 63 69 50 67 72 57 59 63 86 86 86 2 2 6 2 2 6 
+-38 38 38 116 116 116 94 94 94 22 22 22 22 22 22 2 2 6 2 2 6 2 2 6 
+-14 14 14 86 86 86 124 131 137 170 170 170 151 151 151 38 38 38 26 26 26 6 6 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 86 86 86 46 46 46 14 14 14 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-34 76 34 40 89 40 40 89 40 40 89 40 34 76 34 19 31 15 17 12 12 48 26 18 
+-48 26 18 8 7 3 10 10 22 23 29 47 51 61 92 42 59 64 21 30 33 34 45 54 
+-68 78 128 81 88 166 81 82 173 86 106 160 86 106 160 84 96 162 86 106 160 87 112 149 
+-91 118 149 77 105 114 52 67 79 32 40 45 50 50 50 86 86 86 2 2 6 14 14 14 
+-124 131 137 198 198 198 195 195 195 116 116 116 10 10 10 2 2 6 2 2 6 6 6 6 
+-101 98 89 187 187 187 210 210 210 218 218 218 214 214 214 124 131 137 14 14 14 6 6 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 86 86 86 50 50 50 18 18 18 6 6 6 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-19 31 15 34 76 34 40 89 40 40 89 40 40 89 40 24 53 24 8 7 3 0 0 0 
+-6 8 12 28 32 52 51 61 92 54 54 122 74 77 160 68 78 128 26 35 39 6 8 8 
+-34 45 54 68 78 128 84 96 162 86 106 160 86 106 160 81 88 166 84 96 162 87 112 149 
+-73 97 106 36 50 56 33 49 54 18 18 18 46 46 46 86 86 86 2 2 6 54 54 54 
+-218 218 218 195 195 195 226 226 226 246 246 246 58 58 58 2 2 6 2 2 6 30 30 30 
+-210 210 210 253 253 253 170 170 170 124 127 131 221 221 221 234 234 234 74 74 74 2 2 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 70 70 70 58 58 58 22 22 22 6 6 6 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-4 5 3 24 53 24 40 89 40 40 89 40 34 76 34 12 22 15 4 5 3 4 5 3 
+-13 17 26 54 54 122 78 78 174 78 78 174 78 78 174 74 77 160 51 61 92 21 31 35 
+-26 35 39 53 75 83 84 101 153 81 82 173 81 88 166 84 101 153 60 80 103 60 80 103 
+-53 75 83 38 53 58 42 59 64 22 22 22 46 46 46 82 82 82 2 2 6 106 106 106 
+-170 170 170 26 26 26 86 86 86 226 226 226 124 127 131 10 10 10 14 14 14 46 46 46 
+-231 231 231 190 190 190 6 6 6 70 70 70 90 90 90 238 238 238 151 151 151 2 2 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 70 70 70 58 58 58 22 22 22 6 6 6 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-1 2 2 8 15 6 24 53 24 34 76 34 19 31 15 8 15 6 63 55 20 63 55 20 
+-18 18 18 40 48 73 74 77 160 78 78 174 78 78 174 81 82 173 74 77 160 52 67 79 
+-17 23 26 21 31 35 60 80 103 81 88 166 74 77 160 78 102 129 36 54 60 12 17 20 
+-42 59 64 48 63 69 21 31 35 18 18 18 42 42 42 86 86 86 6 6 6 116 116 116 
+-106 106 106 6 6 6 70 70 70 151 151 151 124 127 131 18 18 18 38 38 38 54 54 54 
+-221 221 221 106 106 106 2 2 6 14 14 14 46 46 46 190 190 190 198 198 198 2 2 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 74 74 74 62 62 62 22 22 22 6 6 6 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-11 15 17 0 0 0 12 22 15 19 31 15 8 15 6 63 55 20 149 139 69 149 139 69 
+-63 55 20 10 10 22 54 54 122 78 78 174 78 78 174 78 78 174 81 82 173 68 78 128 
+-24 31 37 6 6 6 36 50 56 60 80 103 51 61 92 42 59 64 36 50 56 31 45 49 
+-29 43 47 27 40 45 6 8 8 14 14 14 42 42 42 94 94 94 14 14 14 101 101 101 
+-124 127 131 2 2 6 18 18 18 116 116 116 106 107 48 121 92 8 121 92 8 98 70 6 
+-170 170 170 106 106 106 2 2 6 2 2 6 2 2 6 195 195 195 195 195 195 6 6 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 74 74 74 62 62 62 22 22 22 6 6 6 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-26 35 39 3 5 6 1 1 1 2 3 3 35 31 12 133 118 54 175 176 80 175 176 80 
+-133 118 54 35 31 12 23 29 47 54 54 122 78 78 174 78 78 174 74 77 160 68 78 128 
+-51 61 92 31 45 49 26 35 39 36 50 56 29 43 47 7 12 13 21 30 33 42 59 64 
+-18 25 28 7 12 13 1 1 1 10 10 10 38 38 38 90 90 90 14 14 14 58 58 58 
+-210 210 210 26 26 26 62 42 6 154 114 10 226 170 11 237 188 10 220 174 15 184 138 11 
+-220 174 15 174 140 55 35 31 12 2 2 6 70 70 70 246 246 246 124 131 137 2 2 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 70 70 70 66 66 66 26 26 26 6 6 6 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-27 40 45 17 23 26 2 3 3 1 1 1 56 77 35 165 152 80 175 176 80 175 176 80 
+-175 176 80 106 107 48 22 22 22 28 32 52 54 54 122 54 54 122 51 61 92 28 32 52 
+-20 27 34 31 45 49 11 15 17 7 12 13 36 50 56 31 45 49 29 43 47 36 50 56 
+-6 8 8 0 0 0 0 0 0 10 10 10 38 38 38 86 86 86 14 14 14 10 10 10 
+-195 195 195 198 179 130 192 133 9 220 174 15 239 182 13 237 188 10 232 195 16 239 207 25 
+-237 201 50 241 208 19 232 195 16 184 138 11 198 179 130 208 206 196 42 42 42 2 2 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 50 50 50 74 74 74 30 30 30 6 6 6 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-15 22 25 26 35 39 15 22 25 0 0 0 35 31 12 133 118 54 175 176 80 175 176 80 
+-175 176 80 165 152 80 56 77 35 6 8 12 23 29 47 13 17 26 2 2 6 0 0 0 
+-1 2 2 26 35 39 26 35 39 26 35 39 42 59 64 42 59 64 20 29 31 6 8 8 
+-0 0 0 0 0 0 0 0 0 10 10 10 34 34 34 86 86 86 14 14 14 2 2 6 
+-121 92 8 192 133 9 219 162 10 239 182 13 237 188 10 232 195 16 241 208 19 237 201 50 
+-237 201 50 239 207 25 241 208 19 241 208 19 241 208 19 230 187 11 121 92 8 2 2 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 50 50 50 82 82 82 34 34 34 10 10 10 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-1 2 2 15 22 25 31 45 49 6 8 12 4 5 3 63 55 20 149 139 69 175 176 80 
+-175 176 80 175 176 80 106 107 48 20 16 6 1 1 1 0 0 0 2 3 3 11 15 17 
+-21 30 33 36 50 56 36 50 56 24 31 37 15 22 25 6 8 8 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 10 10 10 34 34 34 82 82 82 30 30 30 62 42 6 
+-180 123 7 206 145 10 230 174 11 239 182 13 237 188 10 238 202 15 241 208 19 237 201 50 
+-239 207 25 241 208 19 241 208 19 241 208 19 230 187 11 220 174 15 184 138 11 6 6 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 26 26 26 94 94 94 42 42 42 14 14 14 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 1 2 2 29 43 47 26 35 39 3 5 6 8 7 3 106 107 48 165 152 80 
+-175 176 80 149 139 69 63 55 20 4 5 3 2 3 3 12 17 20 26 35 39 26 35 39 
+-17 23 26 7 12 13 6 8 8 3 5 6 1 2 2 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 10 10 10 30 30 30 78 78 78 50 50 50 104 69 6 
+-192 133 9 216 158 10 236 178 12 237 188 10 232 195 16 241 208 19 237 201 50 237 201 50 
+-241 208 19 241 208 19 241 208 19 204 160 10 200 144 11 216 158 10 156 118 10 2 2 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 6 6 6 90 90 90 54 54 54 18 18 18 
+-6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 12 17 20 27 40 45 18 25 28 1 1 1 35 31 12 106 107 48 
+-149 139 69 56 77 35 8 7 3 1 2 2 12 17 20 26 35 39 21 31 35 11 15 17 
+-3 5 6 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 10 10 10 30 30 30 78 78 78 46 46 46 22 22 22 
+-137 92 6 204 160 10 239 182 13 237 188 10 238 202 15 241 208 19 241 208 19 241 208 19 
+-241 208 19 204 160 10 184 138 11 210 150 10 216 158 10 210 150 10 98 70 6 2 2 6 
+-6 6 6 54 54 54 14 14 14 2 2 6 2 2 6 62 62 62 74 74 74 30 30 30 
+-10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 1 1 1 15 22 25 33 49 54 12 17 20 2 3 3 35 31 12 
+-56 77 35 20 16 6 1 1 1 18 25 28 21 31 35 11 15 17 1 1 1 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 10 10 10 34 34 34 78 78 78 50 50 50 6 6 6 
+-88 55 22 139 102 15 190 146 13 230 187 11 239 207 25 232 195 16 220 174 15 190 146 13 
+-171 120 8 192 133 9 210 150 10 213 154 11 185 146 40 165 152 80 101 98 89 2 2 6 
+-2 2 6 78 78 78 116 116 116 58 58 58 2 2 6 22 22 22 90 90 90 46 46 46 
+-18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 1 1 1 27 40 45 29 43 47 3 5 6 2 3 3 
+-8 7 3 1 1 1 17 23 26 31 45 49 15 22 25 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 10 10 10 38 38 38 86 86 86 50 50 50 6 6 6 
+-124 127 131 168 158 138 156 107 11 171 120 8 204 160 10 184 138 11 197 138 11 200 144 11 
+-206 145 10 206 145 10 197 138 11 198 179 130 195 195 195 198 198 198 170 170 170 14 14 14 
+-2 2 6 22 22 22 116 116 116 116 116 116 22 22 22 2 2 6 74 74 74 70 70 70 
+-30 30 30 10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 11 15 17 31 45 49 26 35 39 3 5 6 
+-0 0 0 7 12 13 27 40 45 18 25 28 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 6 6 6 18 18 18 50 50 50 101 101 101 26 26 26 10 10 10 
+-124 131 137 190 190 190 168 158 138 156 107 11 197 138 11 200 144 11 197 138 11 192 133 9 
+-180 123 7 185 146 40 198 179 130 187 187 187 202 202 202 221 221 221 214 214 214 66 66 66 
+-2 2 6 2 2 6 50 50 50 62 62 62 6 6 6 2 2 6 10 10 10 90 90 90 
+-50 50 50 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 15 22 25 36 54 60 18 25 28 
+-0 0 0 21 30 33 27 40 45 2 3 3 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 10 10 10 34 34 34 74 74 74 74 74 74 2 2 6 6 6 6 
+-151 151 151 198 198 198 190 190 190 168 158 138 148 132 55 156 107 11 156 107 11 169 125 40 
+-168 158 138 187 187 187 190 190 190 210 210 210 246 246 246 253 253 253 253 253 253 180 180 180 
+-6 6 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 62 62 62 
+-74 74 74 34 34 34 14 14 14 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 27 40 45 35 52 58 
+-18 25 28 35 52 58 17 23 26 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 10 10 10 22 22 22 54 54 54 94 94 94 18 18 18 2 2 6 46 46 46 
+-234 234 234 221 221 221 190 190 190 190 190 190 190 190 190 187 187 187 187 187 187 190 190 190 
+-190 190 190 195 195 195 214 214 214 242 242 242 253 253 253 253 253 253 253 253 253 253 253 253 
+-82 82 82 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 14 14 14 
+-86 86 86 54 54 54 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 12 13 33 49 54 
+-52 72 81 36 54 60 6 8 8 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-6 6 6 18 18 18 46 46 46 90 90 90 46 46 46 18 18 18 6 6 6 180 180 180 
+-253 253 253 246 246 246 202 202 202 190 190 190 190 190 190 190 190 190 190 190 190 190 190 190 
+-202 202 202 231 231 231 250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-202 202 202 14 14 14 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-42 42 42 86 86 86 42 42 42 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 12 17 20 
+-36 54 60 29 43 47 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 
+-14 14 14 38 38 38 74 74 74 66 66 66 2 2 6 6 6 6 90 90 90 250 250 250 
+-253 253 253 253 253 253 238 238 238 198 198 198 190 190 190 190 190 190 195 195 195 221 221 221 
+-246 246 246 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 82 82 82 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 78 78 78 70 70 70 34 34 34 14 14 14 6 6 6 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-21 30 33 35 52 58 6 8 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 14 14 14 
+-34 34 34 66 66 66 78 78 78 6 6 6 2 2 6 18 18 18 218 218 218 253 253 253 
+-253 253 253 253 253 253 253 253 253 246 246 246 226 226 226 231 231 231 246 246 246 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 180 180 180 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 18 18 18 90 90 90 62 62 62 30 30 30 10 10 10 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-12 17 20 36 54 60 29 43 47 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 26 26 26 
+-58 58 58 90 90 90 18 18 18 2 2 6 2 2 6 106 106 106 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 250 250 250 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 231 231 231 18 18 18 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 18 18 18 94 94 94 54 54 54 26 26 26 10 10 10 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 21 30 33 35 52 58 6 8 12 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 22 22 22 50 50 50 
+-90 90 90 26 26 26 2 2 6 2 2 6 14 14 14 195 195 195 250 250 250 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-250 250 250 242 242 242 54 54 54 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 2 2 6 38 38 38 86 86 86 50 50 50 22 22 22 6 6 6 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 12 17 20 36 54 60 29 43 47 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 14 14 14 38 38 38 82 82 82 
+-34 34 34 2 2 6 2 2 6 2 2 6 42 42 42 195 195 195 246 246 246 253 253 253 
+-253 253 253 253 253 253 253 253 253 250 250 250 242 242 242 242 242 242 250 250 250 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 250 250 250 246 246 246 238 238 238 
+-226 226 226 231 231 231 101 101 101 6 6 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 38 38 38 82 82 82 42 42 42 14 14 14 
+-6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 21 30 33 35 52 58 6 8 12 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 26 26 26 62 62 62 66 66 66 
+-2 2 6 2 2 6 2 2 6 6 6 6 70 70 70 170 170 170 202 202 202 234 234 234 
+-246 246 246 250 250 250 250 250 250 238 238 238 226 226 226 231 231 231 238 238 238 250 250 250 
+-250 250 250 250 250 250 246 246 246 231 231 231 214 214 214 202 202 202 202 202 202 202 202 202 
+-198 198 198 202 202 202 180 180 180 18 18 18 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 62 62 62 66 66 66 30 30 30 
+-10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 12 17 20 36 54 60 29 43 47 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 14 14 14 42 42 42 82 82 82 18 18 18 
+-2 2 6 2 2 6 2 2 6 10 10 10 94 94 94 180 180 180 218 218 218 242 242 242 
+-250 250 250 253 253 253 253 253 253 250 250 250 234 234 234 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 246 246 246 238 238 238 226 226 226 210 210 210 202 202 202 
+-195 195 195 195 195 195 210 210 210 151 151 151 6 6 6 14 14 14 50 50 50 14 14 14 
+-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 6 6 6 86 86 86 46 46 46 
+-18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 21 30 33 35 52 58 6 8 12 0 0 0 
+-0 0 0 0 0 0 0 0 0 6 6 6 22 22 22 54 54 54 70 70 70 2 2 6 
+-2 2 6 10 10 10 2 2 6 22 22 22 170 170 170 231 231 231 250 250 250 253 253 253 
+-253 253 253 253 253 253 253 253 253 250 250 250 242 242 242 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 246 246 246 
+-231 231 231 202 202 202 198 198 198 226 226 226 94 94 94 2 2 6 6 6 6 38 38 38 
+-30 30 30 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 62 62 62 66 66 66 
+-26 26 26 10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 6 8 8 33 49 54 29 43 47 6 8 12 
+-0 0 0 0 0 0 0 0 0 10 10 10 30 30 30 74 74 74 50 50 50 2 2 6 
+-26 26 26 26 26 26 2 2 6 106 106 106 238 238 238 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 246 246 246 218 218 218 202 202 202 210 210 210 14 14 14 2 2 6 2 2 6 
+-30 30 30 22 22 22 2 2 6 2 2 6 2 2 6 2 2 6 18 18 18 86 86 86 
+-42 42 42 14 14 14 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 12 17 20 33 49 54 17 23 26 
+-0 0 0 0 0 0 0 0 0 14 14 14 42 42 42 90 90 90 22 22 22 2 2 6 
+-42 42 42 2 2 6 18 18 18 218 218 218 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 250 250 250 221 221 221 218 218 218 101 101 101 2 2 6 14 14 14 
+-18 18 18 38 38 38 10 10 10 2 2 6 2 2 6 2 2 6 2 2 6 78 78 78 
+-58 58 58 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 15 22 25 36 54 60 
+-0 0 0 0 0 0 0 0 0 18 18 18 54 54 54 82 82 82 2 2 6 26 26 26 
+-22 22 22 2 2 6 124 127 131 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 250 250 250 238 238 238 198 198 198 6 6 6 38 38 38 
+-58 58 58 26 26 26 38 38 38 2 2 6 2 2 6 2 2 6 2 2 6 46 46 46 
+-78 78 78 30 30 30 10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 21 30 33 
+-36 54 60 0 0 0 0 0 0 30 30 30 74 74 74 58 58 58 2 2 6 42 42 42 
+-2 2 6 22 22 22 231 231 231 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 246 246 246 46 46 46 38 38 38 
+-42 42 42 14 14 14 38 38 38 14 14 14 2 2 6 2 2 6 2 2 6 6 6 6 
+-86 86 86 46 46 46 14 14 14 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-36 54 60 0 0 0 0 0 0 42 42 42 90 90 90 18 18 18 18 18 18 26 26 26 
+-2 2 6 116 116 116 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 250 250 250 238 238 238 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 94 94 94 6 6 6 
+-2 2 6 2 2 6 10 10 10 34 34 34 2 2 6 2 2 6 2 2 6 2 2 6 
+-74 74 74 58 58 58 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 36 54 60 26 26 26 66 66 66 82 82 82 2 2 6 38 38 38 6 6 6 
+-14 14 14 210 210 210 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 246 246 246 242 242 242 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 151 151 151 2 2 6 
+-2 2 6 2 2 6 2 2 6 46 46 46 2 2 6 2 2 6 2 2 6 2 2 6 
+-42 42 42 74 74 74 30 30 30 10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-6 6 6 36 54 60 21 30 33 90 90 90 26 26 26 6 6 6 42 42 42 2 2 6 
+-74 74 74 250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 242 242 242 242 242 242 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 180 180 180 2 2 6 
+-2 2 6 2 2 6 2 2 6 46 46 46 2 2 6 2 2 6 2 2 6 2 2 6 
+-10 10 10 86 86 86 38 38 38 10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-10 10 10 26 26 26 36 54 60 82 82 82 2 2 6 22 22 22 18 18 18 2 2 6 
+-151 151 151 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 234 234 234 242 242 242 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 202 202 202 2 2 6 
+-2 2 6 2 2 6 2 2 6 38 38 38 2 2 6 2 2 6 2 2 6 2 2 6 
+-6 6 6 86 86 86 46 46 46 14 14 14 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 
+-18 18 18 46 46 46 86 86 86 36 54 60 2 2 6 34 34 34 10 10 10 6 6 6 
+-210 210 210 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 234 234 234 242 242 242 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 221 221 221 6 6 6 
+-2 2 6 2 2 6 6 6 6 30 30 30 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 82 82 82 54 54 54 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 
+-26 26 26 66 66 66 62 62 62 2 2 6 2 2 6 38 38 38 10 10 10 26 26 26 
+-238 238 238 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 231 231 231 238 238 238 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 231 231 231 6 6 6 
+-2 2 6 2 2 6 10 10 10 30 30 30 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 66 66 66 58 58 58 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 
+-38 38 38 78 78 78 6 6 6 2 2 6 2 2 6 46 46 46 14 14 14 42 42 42 
+-246 246 246 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 231 231 231 242 242 242 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 234 234 234 10 10 10 
+-2 2 6 2 2 6 22 22 22 14 14 14 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 66 66 66 62 62 62 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 18 18 18 
+-50 50 50 74 74 74 2 2 6 2 2 6 14 14 14 70 70 70 34 34 34 62 62 62 
+-250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 231 231 231 246 246 246 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 234 234 234 14 14 14 
+-2 2 6 2 2 6 30 30 30 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 66 66 66 62 62 62 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 18 18 18 
+-54 54 54 62 62 62 2 2 6 2 2 6 2 2 6 30 30 30 46 46 46 70 70 70 
+-250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 231 231 231 246 246 246 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 226 226 226 10 10 10 
+-2 2 6 6 6 6 30 30 30 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 66 66 66 58 58 58 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 22 22 22 
+-58 58 58 62 62 62 2 2 6 2 2 6 2 2 6 2 2 6 30 30 30 78 78 78 
+-250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 231 231 231 246 246 246 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 202 202 202 2 2 6 
+-22 22 22 34 34 34 20 16 6 22 22 22 26 26 26 18 18 18 6 6 6 2 2 6 
+-2 2 6 82 82 82 54 54 54 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 26 26 26 
+-62 62 62 106 106 106 63 55 20 184 138 11 204 160 10 121 92 8 6 6 6 62 62 62 
+-238 238 238 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 231 231 231 246 246 246 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 151 151 151 18 18 18 
+-14 14 14 2 2 6 2 2 6 2 2 6 6 6 6 18 18 18 66 66 66 38 38 38 
+-6 6 6 94 94 94 50 50 50 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 6 6 6 10 10 10 10 10 10 18 18 18 38 38 38 
+-78 78 78 138 132 106 216 158 10 242 186 14 246 190 14 246 190 14 156 118 10 10 10 10 
+-90 90 90 238 238 238 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 231 231 231 250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 246 230 190 214 187 87 214 187 87 185 146 40 35 31 12 
+-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 38 38 38 46 46 46 
+-26 26 26 106 106 106 54 54 54 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 6 6 6 14 14 14 22 22 22 30 30 30 38 38 38 50 50 50 70 70 70 
+-106 106 106 185 146 40 226 170 11 242 186 14 246 190 14 246 190 14 246 190 14 154 114 10 
+-6 6 6 74 74 74 226 226 226 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 231 231 231 250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 237 201 50 241 196 14 241 208 19 232 195 16 35 31 12 
+-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 6 6 6 30 30 30 26 26 26 
+-204 160 10 165 152 80 66 66 66 26 26 26 6 6 6 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-6 6 6 18 18 18 38 38 38 58 58 58 78 78 78 86 86 86 101 101 101 124 127 131 
+-174 140 55 210 150 10 234 174 13 246 186 14 246 190 14 246 190 14 246 190 14 237 188 10 
+-98 70 6 2 2 6 46 46 46 198 198 198 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 234 234 234 242 242 242 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 214 187 87 242 186 14 241 196 14 204 160 10 20 16 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 6 6 6 121 92 8 
+-238 202 15 232 195 16 82 82 82 34 34 34 10 10 10 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-14 14 14 38 38 38 70 70 70 148 132 55 185 146 40 200 144 11 197 138 11 197 138 11 
+-213 154 11 226 170 11 242 186 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-220 174 15 35 31 12 2 2 6 22 22 22 151 151 151 250 250 250 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 250 250 250 242 242 242 214 187 87 239 182 13 237 188 10 213 154 11 35 31 12 
+-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 62 42 6 220 174 15 
+-237 188 10 237 188 10 113 101 86 42 42 42 14 14 14 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 
+-22 22 22 54 54 54 148 132 55 213 154 11 226 170 11 230 174 11 226 170 11 226 170 11 
+-236 178 12 242 186 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-241 196 14 184 138 11 10 10 10 2 2 6 6 6 6 116 116 116 242 242 242 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 231 231 231 198 198 198 213 164 39 236 178 12 236 178 12 210 150 10 137 92 6 
+-20 16 6 2 2 6 2 2 6 2 2 6 6 6 6 62 42 6 200 144 11 236 178 12 
+-239 182 13 239 182 13 124 112 88 58 58 58 22 22 22 6 6 6 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 
+-30 30 30 70 70 70 169 125 40 226 170 11 239 182 13 242 186 14 242 186 14 246 186 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-246 190 14 232 195 16 98 70 6 2 2 6 2 2 6 2 2 6 66 66 66 221 221 221 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 202 202 202 198 198 198 213 164 39 230 174 11 230 174 11 216 158 10 192 133 9 
+-163 110 8 120 80 7 98 70 6 120 80 7 167 114 7 197 138 11 226 170 11 239 182 13 
+-242 186 14 242 186 14 165 152 80 78 78 78 34 34 34 14 14 14 6 6 6 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 
+-30 30 30 78 78 78 185 146 40 226 170 11 239 182 13 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-246 190 14 241 196 14 204 160 10 20 16 6 2 2 6 2 2 6 2 2 6 38 38 38 
+-218 218 218 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-250 250 250 202 202 202 198 198 198 213 164 39 226 170 11 236 178 12 224 166 10 210 150 10 
+-200 144 11 197 138 11 192 133 9 197 138 11 210 150 10 226 170 11 242 186 14 246 190 14 
+-246 190 14 246 186 14 220 174 15 124 112 88 62 62 62 30 30 30 14 14 14 6 6 6 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 
+-30 30 30 78 78 78 174 140 55 224 166 10 239 182 13 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 241 196 14 139 102 15 2 2 6 2 2 6 2 2 6 2 2 6 
+-78 78 78 250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-250 250 250 214 214 214 198 198 198 185 146 40 219 162 10 236 178 12 234 174 13 224 166 10 
+-216 158 10 213 154 11 213 154 11 216 158 10 226 170 11 239 182 13 246 190 14 246 190 14 
+-246 190 14 246 190 14 242 186 14 213 164 39 101 101 101 58 58 58 30 30 30 14 14 14 
+-6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 
+-30 30 30 74 74 74 174 140 55 216 158 10 236 178 12 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 241 196 14 230 187 11 62 42 6 2 2 6 2 2 6 2 2 6 
+-22 22 22 238 238 238 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 226 226 226 187 187 187 169 125 40 216 158 10 236 178 12 239 182 13 236 178 12 
+-230 174 11 226 170 11 226 170 11 230 174 11 236 178 12 242 186 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 186 14 239 182 13 213 164 39 106 106 106 66 66 66 34 34 34 
+-14 14 14 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 
+-26 26 26 70 70 70 149 139 69 213 154 11 236 178 12 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 241 196 14 190 146 13 20 16 6 2 2 6 2 2 6 
+-46 46 46 246 246 246 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 221 221 221 86 86 86 156 107 11 216 158 10 236 178 12 242 186 14 246 186 14 
+-242 186 14 239 182 13 239 182 13 242 186 14 242 186 14 246 186 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 242 186 14 220 174 15 149 139 69 66 66 66 
+-30 30 30 10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 
+-26 26 26 70 70 70 149 139 69 210 150 10 236 178 12 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 232 195 16 121 92 8 34 34 34 106 106 106 
+-221 221 221 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-242 242 242 82 82 82 20 16 6 163 110 8 216 158 10 236 178 12 242 186 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 242 186 14 149 139 69 
+-46 46 46 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 
+-30 30 30 78 78 78 149 139 69 210 150 10 236 178 12 246 186 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 241 196 14 220 174 15 198 179 130 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 218 218 218 
+-58 58 58 2 2 6 20 16 6 167 114 7 216 158 10 236 178 12 246 186 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 186 14 242 186 14 185 146 40 
+-54 54 54 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 14 14 14 
+-38 38 38 86 86 86 169 125 40 213 154 11 236 178 12 246 186 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 232 195 16 190 146 13 214 214 214 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 250 250 250 170 170 170 26 26 26 
+-2 2 6 2 2 6 35 31 12 163 110 8 219 162 10 239 182 13 246 186 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 186 14 236 178 12 224 166 10 149 139 69 
+-46 46 46 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 18 18 18 
+-50 50 50 113 101 86 192 133 9 224 166 10 242 186 14 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 242 186 14 230 187 11 204 160 10 133 118 54 
+-226 226 226 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 198 198 198 66 66 66 2 2 6 2 2 6 
+-2 2 6 2 2 6 62 42 6 156 107 11 219 162 10 239 182 13 246 186 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 242 186 14 234 174 13 213 154 11 148 132 55 66 66 66 
+-30 30 30 10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 22 22 22 
+-58 58 58 148 132 55 206 145 10 234 174 13 242 186 14 246 186 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 186 14 236 178 12 204 160 10 163 110 8 
+-62 42 6 124 131 137 218 218 218 250 250 250 253 253 253 253 253 253 253 253 253 250 250 250 
+-242 242 242 210 210 210 151 151 151 66 66 66 6 6 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 62 42 6 163 110 8 216 158 10 236 178 12 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-246 190 14 239 182 13 230 174 11 216 158 10 185 146 40 124 112 88 70 70 70 38 38 38 
+-18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 22 22 22 
+-62 62 62 169 125 40 206 145 10 224 166 10 236 178 12 239 182 13 242 186 14 242 186 14 
+-246 186 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 236 178 12 216 158 10 171 120 8 
+-85 57 6 2 2 6 6 6 6 30 30 30 54 54 54 62 62 62 50 50 50 38 38 38 
+-14 14 14 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 6 6 6 85 57 6 167 114 7 213 154 11 236 178 12 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 242 186 14 239 182 13 239 182 13 
+-230 174 11 210 150 10 174 140 55 124 112 88 82 82 82 54 54 54 34 34 34 18 18 18 
+-6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 18 18 18 
+-50 50 50 169 125 40 192 133 9 200 144 11 216 158 10 219 162 10 224 166 10 226 170 11 
+-230 174 11 236 178 12 239 182 13 239 182 13 242 186 14 246 186 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 186 14 230 174 11 210 150 10 163 110 8 
+-104 69 6 10 10 10 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 6 6 6 85 57 6 167 114 7 206 145 10 230 174 11 242 186 14 246 190 14 
+-246 190 14 246 190 14 246 186 14 242 186 14 239 182 13 230 174 11 224 166 10 213 154 11 
+-169 125 40 124 112 88 86 86 86 58 58 58 38 38 38 22 22 22 10 10 10 6 6 6 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 14 14 14 
+-34 34 34 70 70 70 133 118 54 169 125 40 167 114 7 180 123 7 192 133 9 197 138 11 
+-200 144 11 206 145 10 213 154 11 219 162 10 224 166 10 230 174 11 239 182 13 242 186 14 
+-246 186 14 246 186 14 246 186 14 246 186 14 239 182 13 216 158 10 184 138 11 152 99 6 
+-104 69 6 20 16 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 6 6 6 85 57 6 152 99 6 192 133 9 219 162 10 236 178 12 239 182 13 
+-246 186 14 242 186 14 239 182 13 236 178 12 224 166 10 206 145 10 192 133 9 148 132 55 
+-94 94 94 62 62 62 42 42 42 22 22 22 14 14 14 6 6 6 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 
+-18 18 18 34 34 34 58 58 58 78 78 78 101 98 89 124 112 88 133 118 54 156 107 11 
+-163 110 8 167 114 7 171 120 8 180 123 7 184 138 11 197 138 11 210 150 10 219 162 10 
+-226 170 11 236 178 12 236 178 12 234 174 13 219 162 10 197 138 11 163 110 8 134 84 6 
+-85 57 6 10 10 10 2 2 6 2 2 6 18 18 18 38 38 38 38 38 38 38 38 38 
+-38 38 38 38 38 38 38 38 38 38 38 38 38 38 38 38 38 38 26 26 26 2 2 6 
+-2 2 6 6 6 6 62 42 6 137 92 6 171 120 8 200 144 11 219 162 10 230 174 11 
+-234 174 13 230 174 11 219 162 10 210 150 10 192 133 9 163 110 8 124 112 88 82 82 82 
+-50 50 50 30 30 30 14 14 14 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-6 6 6 14 14 14 22 22 22 34 34 34 42 42 42 58 58 58 74 74 74 86 86 86 
+-101 98 89 113 101 86 133 118 54 121 92 8 137 92 6 152 99 6 163 110 8 180 123 7 
+-184 138 11 197 138 11 206 145 10 200 144 11 180 123 7 156 107 11 134 84 6 104 69 6 
+-62 42 6 54 54 54 106 106 106 101 98 89 86 86 86 82 82 82 78 78 78 78 78 78 
+-78 78 78 78 78 78 78 78 78 78 78 78 78 78 78 82 82 82 86 86 86 94 94 94 
+-106 106 106 101 101 101 90 61 47 120 80 7 156 107 11 180 123 7 192 133 9 200 144 11 
+-206 145 10 200 144 11 192 133 9 171 120 8 139 102 15 113 101 86 70 70 70 42 42 42 
+-22 22 22 10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 6 6 6 10 10 10 14 14 14 22 22 22 30 30 30 38 38 38 
+-50 50 50 62 62 62 74 74 74 90 90 90 101 98 89 113 101 86 121 92 8 120 80 7 
+-137 92 6 152 99 6 152 99 6 152 99 6 134 84 6 120 80 7 98 70 6 88 55 22 
+-101 98 89 82 82 82 58 58 58 46 46 46 38 38 38 34 34 34 34 34 34 34 34 34 
+-34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 38 38 38 42 42 42 
+-54 54 54 82 82 82 94 86 71 85 57 6 134 84 6 156 107 11 167 114 7 171 120 8 
+-171 120 8 167 114 7 152 99 6 121 92 8 101 98 89 62 62 62 34 34 34 18 18 18 
+-6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 6 6 6 10 10 10 
+-18 18 18 22 22 22 30 30 30 42 42 42 50 50 50 66 66 66 86 86 86 101 98 89 
+-94 86 71 98 70 6 104 69 6 104 69 6 104 69 6 85 57 6 88 55 22 90 90 90 
+-62 62 62 38 38 38 22 22 22 14 14 14 10 10 10 10 10 10 10 10 10 10 10 10 
+-10 10 10 10 10 10 6 6 6 10 10 10 10 10 10 10 10 10 10 10 10 14 14 14 
+-22 22 22 42 42 42 70 70 70 94 86 71 85 57 6 104 69 6 120 80 7 137 92 6 
+-134 84 6 120 80 7 94 86 71 86 86 86 58 58 58 30 30 30 14 14 14 6 6 6 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 6 6 6 10 10 10 14 14 14 18 18 18 26 26 26 38 38 38 54 54 54 
+-70 70 70 86 86 86 94 86 71 94 86 71 94 86 71 86 86 86 74 74 74 50 50 50 
+-30 30 30 14 14 14 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-6 6 6 18 18 18 34 34 34 58 58 58 82 82 82 94 86 71 94 86 71 94 86 71 
+-94 86 71 94 86 71 74 74 74 50 50 50 26 26 26 14 14 14 6 6 6 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 6 6 6 14 14 14 18 18 18 
+-30 30 30 38 38 38 46 46 46 54 54 54 50 50 50 42 42 42 30 30 30 18 18 18 
+-10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 6 6 6 14 14 14 26 26 26 38 38 38 50 50 50 58 58 58 58 58 58 
+-54 54 54 42 42 42 30 30 30 18 18 18 10 10 10 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 
+-6 6 6 10 10 10 14 14 14 18 18 18 18 18 18 14 14 14 10 10 10 6 6 6 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 6 6 6 14 14 14 18 18 18 22 22 22 22 22 22 
+-18 18 18 14 14 14 10 10 10 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
 +0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
 +0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
 +0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
@@ -2464,10 +1743,11 @@ diff -Nur linux-2.6.39.1/drivers/video/logo/logo_linux_clut224.ppm linux-2.6.39-
 +0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
 +0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
 +0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-diff -Nur linux-2.6.39.1/drivers/video/logo/logo_linux_mono.pbm linux-2.6.39-LIBRE/drivers/video/logo/logo_linux_mono.pbm
---- linux-2.6.39.1/drivers/video/logo/logo_linux_mono.pbm	2011-06-02 21:34:20.000000000 -0300
-+++ linux-2.6.39-LIBRE/drivers/video/logo/logo_linux_mono.pbm	2011-06-22 13:42:06.000000000 -0300
+ 
+diff --git a/drivers/video/logo/logo_linux_mono.pbm b/drivers/video/logo/logo_linux_mono.pbm
+index 2f14d9f..3d3c358 100644
+--- a/drivers/video/logo/logo_linux_mono.pbm
++++ b/drivers/video/logo/logo_linux_mono.pbm
 @@ -1,203 +1,159 @@
 -P1
 -# Standard black and white Linux logo
@@ -2831,16 +2111,15 @@ diff -Nur linux-2.6.39.1/drivers/video/logo/logo_linux_mono.pbm linux-2.6.39-LIB
 +0 0 0 0 0 0 0 0 0 0 
 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
 +0 0 0 0 0 0 0 0 0 0 
-diff -Nur linux-2.6.39.1/drivers/video/logo/logo_linux_vga16.ppm linux-2.6.39-LIBRE/drivers/video/logo/logo_linux_vga16.ppm
---- linux-2.6.39.1/drivers/video/logo/logo_linux_vga16.ppm	2011-06-02 21:34:20.000000000 -0300
-+++ linux-2.6.39-LIBRE/drivers/video/logo/logo_linux_vga16.ppm	2011-06-22 13:42:06.000000000 -0300
+diff --git a/drivers/video/logo/logo_linux_vga16.ppm b/drivers/video/logo/logo_linux_vga16.ppm
+index 1850c15..f279f97 100644
+--- a/drivers/video/logo/logo_linux_vga16.ppm
++++ b/drivers/video/logo/logo_linux_vga16.ppm
 @@ -1,1604 +1,18724 @@
  P3
 -# Standard 16-color Linux logo
 -80 80
-+# CREATOR: GIMP PNM Filter Version 1.1
-+80 78
- 255
+-255
 -  0   0   0   0   0   0   0   0   0   0   0   0
 -  0   0   0   0   0   0   0   0   0   0   0   0
 -  0   0   0   0   0   0   0   0   0   0   0   0
@@ -4441,6 +3720,9 @@ diff -Nur linux-2.6.39.1/drivers/video/logo/logo_linux_vga16.ppm linux-2.6.39-LI
 -  0   0   0   0   0   0   0   0   0   0   0   0
 -  0   0   0   0   0   0   0   0   0   0   0   0
 -  0   0   0   0   0   0   0   0   0   0   0   0
++# CREATOR: GIMP PNM Filter Version 1.1
++80 78
++255
 +0
 +0
 +0
diff --git a/kernels/linux-libre-pae/change-default-console-loglevel.patch b/kernels/linux-libre-pae/change-default-console-loglevel.patch
index 2685d4d23..22cd69a09 100644
--- a/kernels/linux-libre-pae/change-default-console-loglevel.patch
+++ b/kernels/linux-libre-pae/change-default-console-loglevel.patch
@@ -1,6 +1,6 @@
 diff -upr linux-3.0.orig/kernel/printk.c linux-3.0/kernel/printk.c
---- linux-3.0.orig/kernel/printk.c	2011-07-22 05:17:23.000000000 +0300
-+++ linux-3.0/kernel/printk.c	2011-07-27 14:43:07.000000000 +0300
+--- linux-3.0.orig/kernel/printk/printk.c	2011-07-22 05:17:23.000000000 +0300
++++ linux-3.0/kernel/printk/printk.c	2011-07-27 14:43:07.000000000 +0300
 @@ -58,7 +58,7 @@ void asmlinkage __attribute__((weak)) ea
  
  /* We show everything that is MORE important than this.. */
diff --git a/kernels/linux-libre-pae/config b/kernels/linux-libre-pae/config
index ac610517a..e001d16eb 100644
--- a/kernels/linux-libre-pae/config
+++ b/kernels/linux-libre-pae/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.10.5-1 Kernel Configuration
+# Linux/x86 3.11.0-1 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -28,6 +28,8 @@ CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
 CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
+CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
 # CONFIG_ZONE_DMA32 is not set
 # CONFIG_AUDIT_ARCH is not set
 CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
@@ -47,6 +49,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
 #
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
+# CONFIG_COMPILE_TEST is not set
 CONFIG_LOCALVERSION="-LIBRE-PAE"
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_HAVE_KERNEL_GZIP=y
@@ -54,11 +57,13 @@ CONFIG_HAVE_KERNEL_BZIP2=y
 CONFIG_HAVE_KERNEL_LZMA=y
 CONFIG_HAVE_KERNEL_XZ=y
 CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_HAVE_KERNEL_LZ4=y
 CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_BZIP2 is not set
 # CONFIG_KERNEL_LZMA is not set
 # CONFIG_KERNEL_XZ is not set
 # CONFIG_KERNEL_LZO is not set
+# CONFIG_KERNEL_LZ4 is not set
 CONFIG_DEFAULT_HOSTNAME="(none)"
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
@@ -173,12 +178,12 @@ CONFIG_RD_BZIP2=y
 CONFIG_RD_LZMA=y
 CONFIG_RD_XZ=y
 CONFIG_RD_LZO=y
+CONFIG_RD_LZ4=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
 CONFIG_HAVE_UID16=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
-CONFIG_HOTPLUG=y
 CONFIG_HAVE_PCSPKR_PLATFORM=y
 # CONFIG_EXPERT is not set
 CONFIG_UID16=y
@@ -211,6 +216,7 @@ CONFIG_SLUB_DEBUG=y
 # CONFIG_COMPAT_BRK is not set
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
+CONFIG_SLUB_CPU_PARTIAL=y
 CONFIG_PROFILING=y
 CONFIG_TRACEPOINTS=y
 CONFIG_OPROFILE=m
@@ -254,6 +260,7 @@ CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 CONFIG_SECCOMP_FILTER=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+CONFIG_HAVE_ARCH_SOFT_DIRTY=y
 CONFIG_MODULES_USE_ELF_REL=y
 CONFIG_CLONE_BACKWARDS=y
 CONFIG_OLD_SIGSUSPEND3=y
@@ -287,6 +294,7 @@ CONFIG_BLK_DEV_THROTTLING=y
 #
 CONFIG_PARTITION_ADVANCED=y
 # CONFIG_ACORN_PARTITION is not set
+CONFIG_AIX_PARTITION=y
 # CONFIG_OSF_PARTITION is not set
 # CONFIG_AMIGA_PARTITION is not set
 # CONFIG_ATARI_PARTITION is not set
@@ -330,7 +338,6 @@ 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
@@ -457,6 +464,8 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
 CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CLEANCACHE=y
 CONFIG_FRONTSWAP=y
+CONFIG_ZBUD=y
+CONFIG_ZSWAP=y
 # CONFIG_HIGHPTE is not set
 CONFIG_X86_CHECK_BIOS_CORRUPTION=y
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
@@ -516,6 +525,7 @@ CONFIG_PM_ADVANCED_DEBUG=y
 CONFIG_PM_SLEEP_DEBUG=y
 CONFIG_PM_TRACE=y
 CONFIG_PM_TRACE_RTC=y
+CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
 CONFIG_ACPI=y
 CONFIG_ACPI_SLEEP=y
 # CONFIG_ACPI_PROCFS is not set
@@ -627,7 +637,7 @@ CONFIG_PCI_MMCONFIG=y
 CONFIG_PCI_OLPC=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=m
+CONFIG_HOTPLUG_PCI_PCIE=y
 CONFIG_PCIEAER=y
 # CONFIG_PCIE_ECRC is not set
 # CONFIG_PCIEAER_INJECT is not set
@@ -649,6 +659,10 @@ CONFIG_PCI_PRI=y
 CONFIG_PCI_PASID=y
 CONFIG_PCI_IOAPIC=y
 CONFIG_PCI_LABEL=y
+
+#
+# PCI host controller drivers
+#
 CONFIG_ISA_DMA_API=y
 CONFIG_ISA=y
 # CONFIG_EISA is not set
@@ -699,11 +713,14 @@ CONFIG_RAPIDIO_DISC_TIMEOUT=30
 CONFIG_RAPIDIO_DMA_ENGINE=y
 CONFIG_RAPIDIO_DEBUG=y
 CONFIG_RAPIDIO_ENUM_BASIC=m
+
+#
+# RapidIO Switch drivers
+#
 CONFIG_RAPIDIO_TSI57X=y
 CONFIG_RAPIDIO_CPS_XX=y
 CONFIG_RAPIDIO_TSI568=y
 CONFIG_RAPIDIO_CPS_GEN2=y
-CONFIG_RAPIDIO_TSI500=y
 
 #
 # Executable file formats / Emulations
@@ -1097,7 +1114,6 @@ CONFIG_IP_DCCP_TFRC_LIB=y
 CONFIG_NET_DCCPPROBE=m
 CONFIG_IP_SCTP=m
 CONFIG_NET_SCTPPROBE=m
-# CONFIG_SCTP_DBG_MSG is not set
 # CONFIG_SCTP_DBG_OBJCNT is not set
 # CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
 CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y
@@ -1215,15 +1231,19 @@ CONFIG_BATMAN_ADV_DAT=y
 CONFIG_BATMAN_ADV_NC=y
 # CONFIG_BATMAN_ADV_DEBUG is not set
 CONFIG_OPENVSWITCH=m
+CONFIG_OPENVSWITCH_GRE=y
 CONFIG_VSOCKETS=m
 CONFIG_VMWARE_VMCI_VSOCKETS=m
 CONFIG_NETLINK_MMAP=y
 CONFIG_NETLINK_DIAG=m
+CONFIG_NET_MPLS_GSO=m
 CONFIG_RPS=y
 CONFIG_RFS_ACCEL=y
 CONFIG_XPS=y
 CONFIG_NETPRIO_CGROUP=m
+CONFIG_NET_RX_BUSY_POLL=y
 CONFIG_BQL=y
+CONFIG_NET_FLOW_LIMIT=y
 
 #
 # Network testing
@@ -1396,6 +1416,7 @@ CONFIG_CEPH_LIB=m
 # CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
 CONFIG_NFC=m
 CONFIG_NFC_NCI=m
+# CONFIG_NFC_NCI_SPI is not set
 CONFIG_NFC_HCI=m
 # CONFIG_NFC_SHDLC is not set
 
@@ -1405,6 +1426,7 @@ CONFIG_NFC_HCI=m
 CONFIG_NFC_PN533=m
 CONFIG_NFC_WILINK=m
 CONFIG_NFC_MEI_PHY=m
+CONFIG_NFC_SIM=m
 CONFIG_NFC_PN544=m
 CONFIG_NFC_PN544_MEI=m
 CONFIG_NFC_MICROREAD=m
@@ -1425,7 +1447,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_FW_LOADER_USER_HELPER=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
@@ -1579,7 +1601,6 @@ CONFIG_PROC_DEVICETREE=y
 CONFIG_OF_PROMTREE=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_IRQ=y
-CONFIG_OF_DEVICE=y
 CONFIG_OF_I2C=m
 CONFIG_OF_NET=y
 CONFIG_OF_MDIO=m
@@ -1647,7 +1668,6 @@ CONFIG_AD525X_DPOT_I2C=m
 # CONFIG_DUMMY_IRQ is not set
 # CONFIG_IBM_ASM is not set
 CONFIG_PHANTOM=m
-CONFIG_INTEL_MID_PTI=m
 CONFIG_SGI_IOC4=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIFM_7XX1=m
@@ -1913,6 +1933,7 @@ CONFIG_SATA_HIGHBANK=m
 CONFIG_SATA_MV=m
 CONFIG_SATA_NV=m
 CONFIG_SATA_PROMISE=m
+CONFIG_SATA_RCAR=m
 CONFIG_SATA_SIL=m
 CONFIG_SATA_SIS=m
 CONFIG_SATA_SVW=m
@@ -2019,6 +2040,7 @@ CONFIG_DM_DELAY=m
 CONFIG_DM_UEVENT=y
 CONFIG_DM_FLAKEY=m
 CONFIG_DM_VERITY=m
+CONFIG_DM_SWITCH=m
 CONFIG_TARGET_CORE=m
 CONFIG_TCM_IBLOCK=m
 CONFIG_TCM_FILEIO=m
@@ -2056,12 +2078,12 @@ CONFIG_I2O_PROC=m
 CONFIG_MACINTOSH_DRIVERS=y
 CONFIG_MAC_EMUMOUSEBTN=y
 CONFIG_NETDEVICES=y
+CONFIG_MII=m
 CONFIG_NET_CORE=y
 CONFIG_BONDING=m
 CONFIG_DUMMY=m
 CONFIG_EQUALIZER=m
 # CONFIG_NET_FC is not set
-CONFIG_MII=m
 CONFIG_IFB=m
 CONFIG_NET_TEAM=m
 CONFIG_NET_TEAM_MODE_BROADCAST=m
@@ -2083,6 +2105,7 @@ CONFIG_RIONET_RX_SIZE=128
 CONFIG_TUN=m
 CONFIG_VETH=m
 CONFIG_VIRTIO_NET=m
+CONFIG_NLMON=m
 CONFIG_SUNGEM_PHY=m
 # CONFIG_ARCNET is not set
 CONFIG_ATM_DRIVERS=y
@@ -2127,6 +2150,7 @@ CONFIG_CAIF_VIRTIO=m
 CONFIG_VHOST_NET=m
 CONFIG_VHOST_SCSI=m
 CONFIG_VHOST_RING=m
+CONFIG_VHOST=m
 
 #
 # Distributed Switch Architecture drivers
@@ -2156,6 +2180,8 @@ CONFIG_LANCE=m
 CONFIG_PCNET32=m
 CONFIG_PCMCIA_NMCLAN=m
 CONFIG_NI65=m
+CONFIG_NET_VENDOR_ARC=y
+CONFIG_ARC_EMAC=m
 CONFIG_NET_VENDOR_ATHEROS=y
 CONFIG_ATL2=m
 CONFIG_ATL1=m
@@ -2244,6 +2270,7 @@ CONFIG_NET_VENDOR_MELLANOX=y
 CONFIG_MLX4_EN=m
 CONFIG_MLX4_CORE=m
 CONFIG_MLX4_DEBUG=y
+# CONFIG_MLX5_CORE is not set
 CONFIG_NET_VENDOR_MICREL=y
 CONFIG_KS8842=m
 # CONFIG_KS8851 is not set
@@ -2288,6 +2315,7 @@ CONFIG_8139TOO_TUNE_TWISTER=y
 CONFIG_8139TOO_8129=y
 # CONFIG_8139_OLD_RX_RESET is not set
 CONFIG_R8169=m
+CONFIG_SH_ETH=m
 CONFIG_NET_VENDOR_RDC=y
 CONFIG_R6040=m
 CONFIG_NET_VENDOR_SEEQ=y
@@ -2304,6 +2332,8 @@ CONFIG_NET_VENDOR_SMSC=y
 CONFIG_SMC9194=m
 CONFIG_PCMCIA_SMC91C92=m
 CONFIG_EPIC100=m
+CONFIG_SMSC911X=m
+# CONFIG_SMSC911X_ARCH_HOOKS is not set
 CONFIG_SMSC9420=m
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_STMMAC_ETH=m
@@ -2357,7 +2387,8 @@ CONFIG_NATIONAL_PHY=m
 CONFIG_STE10XP=m
 CONFIG_LSI_ET1011C_PHY=m
 CONFIG_MICREL_PHY=m
-# CONFIG_MDIO_BITBANG is not set
+CONFIG_MDIO_BITBANG=m
+# CONFIG_MDIO_GPIO is not set
 CONFIG_MDIO_BUS_MUX=m
 CONFIG_MDIO_BUS_MUX_GPIO=m
 CONFIG_MDIO_BUS_MUX_MMIOREG=m
@@ -2471,9 +2502,14 @@ CONFIG_ATH6KL_USB=m
 CONFIG_AR5523=m
 CONFIG_WIL6210=m
 CONFIG_WIL6210_ISR_COR=y
+# CONFIG_WIL6210_TRACING is not set
+CONFIG_ATH10K=m
+CONFIG_ATH10K_PCI=m
+# CONFIG_ATH10K_DEBUG is not set
+CONFIG_ATH10K_DEBUGFS=y
+# CONFIG_ATH10K_TRACING is not set
 CONFIG_B43=m
 CONFIG_B43_BCMA=y
-# CONFIG_B43_BCMA_EXTRA is not set
 CONFIG_B43_SSB=y
 CONFIG_B43_PCI_AUTOSELECT=y
 CONFIG_B43_PCICORE_AUTOSELECT=y
@@ -2580,14 +2616,17 @@ 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_RTL_CARDS=m
 CONFIG_RTL8192CE=m
 CONFIG_RTL8192SE=m
 CONFIG_RTL8192DE=m
 CONFIG_RTL8723AE=m
 CONFIG_RTL8188EE=m
 CONFIG_RTL8192CU=m
+CONFIG_RTLWIFI=m
+CONFIG_RTLWIFI_PCI=m
+CONFIG_RTLWIFI_USB=m
+# CONFIG_RTLWIFI_DEBUG is not set
 CONFIG_RTL8192C_COMMON=m
 CONFIG_WL_TI=y
 CONFIG_WL1251=m
@@ -2605,6 +2644,9 @@ CONFIG_MWIFIEX=m
 CONFIG_MWIFIEX_SDIO=m
 CONFIG_MWIFIEX_PCIE=m
 CONFIG_MWIFIEX_USB=m
+CONFIG_CW1200=m
+CONFIG_CW1200_WLAN_SDIO=m
+CONFIG_CW1200_WLAN_SPI=m
 
 #
 # WiMAX Wireless Broadband devices
@@ -2887,6 +2929,9 @@ CONFIG_TOUCHSCREEN_CY8CTMG110=m
 CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
 CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
 # CONFIG_TOUCHSCREEN_CYTTSP_SPI is not set
+CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m
+CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m
+CONFIG_TOUCHSCREEN_CYTTSP4_SPI=m
 CONFIG_TOUCHSCREEN_DYNAPRO=m
 CONFIG_TOUCHSCREEN_HAMPSHIRE=m
 CONFIG_TOUCHSCREEN_EETI=m
@@ -2966,7 +3011,7 @@ CONFIG_INPUT_RETU_PWRBUTTON=m
 CONFIG_INPUT_UINPUT=m
 CONFIG_INPUT_PCF50633_PMU=m
 CONFIG_INPUT_PCF8574=m
-CONFIG_INPUT_PWM_BEEPER=m
+# CONFIG_INPUT_PWM_BEEPER is not set
 CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
 CONFIG_INPUT_ADXL34X=m
 CONFIG_INPUT_ADXL34X_I2C=m
@@ -2990,6 +3035,7 @@ CONFIG_SERIO_ALTERA_PS2=m
 CONFIG_SERIO_PS2MULT=m
 CONFIG_SERIO_ARC_PS2=m
 CONFIG_SERIO_APBPS2=m
+CONFIG_SERIO_OLPC_APSP=m
 CONFIG_GAMEPORT=m
 CONFIG_GAMEPORT_NS558=m
 CONFIG_GAMEPORT_L4=m
@@ -3025,7 +3071,6 @@ CONFIG_N_GSM=m
 CONFIG_TRACE_ROUTER=m
 CONFIG_TRACE_SINK=m
 # CONFIG_DEVKMEM is not set
-# CONFIG_STALDRV is not set
 
 #
 # Serial drivers
@@ -3066,6 +3111,7 @@ CONFIG_SERIAL_ARC=m
 CONFIG_SERIAL_ARC_NR_PORTS=1
 CONFIG_SERIAL_RP2=m
 CONFIG_SERIAL_RP2_NR_UARTS=32
+CONFIG_SERIAL_FSL_LPUART=m
 CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
 CONFIG_PPDEV=m
@@ -3162,7 +3208,6 @@ CONFIG_I2C_DESIGNWARE_CORE=m
 CONFIG_I2C_DESIGNWARE_PCI=m
 CONFIG_I2C_EG20T=m
 # CONFIG_I2C_GPIO is not set
-CONFIG_I2C_INTEL_MID=m
 CONFIG_I2C_OCORES=m
 CONFIG_I2C_PCA_PLATFORM=m
 CONFIG_I2C_PXA=m
@@ -3216,11 +3261,6 @@ CONFIG_SPI_MASTER=y
 #
 # CONFIG_SPI_SPIDEV is not set
 # CONFIG_SPI_TLE62X0 is not set
-
-#
-# Qualcomm MSM SSBI bus support
-#
-# CONFIG_SSBI is not set
 # CONFIG_HSI is not set
 
 #
@@ -3374,6 +3414,7 @@ CONFIG_SENSORS_F71882FG=m
 CONFIG_SENSORS_F75375S=m
 CONFIG_SENSORS_FSCHMD=m
 CONFIG_SENSORS_G760A=m
+CONFIG_SENSORS_G762=m
 CONFIG_SENSORS_GL518SM=m
 CONFIG_SENSORS_GL520SM=m
 # CONFIG_SENSORS_GPIO_FAN is not set
@@ -3483,10 +3524,15 @@ CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 # CONFIG_THERMAL_DEFAULT_GOV_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_THERMAL_GOV_USER_SPACE=y
 # CONFIG_CPU_THERMAL is not set
 # CONFIG_THERMAL_EMULATION is not set
 CONFIG_INTEL_POWERCLAMP=m
+CONFIG_X86_PKG_TEMP_THERMAL=m
+
+#
+# Texas Instruments thermal drivers
+#
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -3534,6 +3580,7 @@ CONFIG_W83877F_WDT=m
 CONFIG_W83977F_WDT=m
 CONFIG_MACHZ_WDT=m
 CONFIG_SBC_EPX_C3_WATCHDOG=m
+CONFIG_MEN_A21_WDT=m
 
 #
 # ISA-based Watchdog Cards
@@ -3599,6 +3646,7 @@ CONFIG_HTC_PASIC3=m
 CONFIG_LPC_ICH=m
 CONFIG_LPC_SCH=m
 # CONFIG_MFD_JANZ_CMODIO is not set
+# CONFIG_MFD_KEMPLD is not set
 # CONFIG_EZX_PCAP is not set
 CONFIG_MFD_VIPERBOARD=m
 CONFIG_MFD_RETU=m
@@ -3631,6 +3679,7 @@ CONFIG_MFD_ARIZONA_I2C=m
 # CONFIG_MFD_ARIZONA_SPI is not set
 CONFIG_MFD_WM5102=y
 CONFIG_MFD_WM5110=y
+# CONFIG_MFD_WM8997 is not set
 # CONFIG_MFD_WM831X_SPI is not set
 # CONFIG_REGULATOR is not set
 CONFIG_MEDIA_SUPPORT=m
@@ -3760,6 +3809,7 @@ CONFIG_USB_ZR364XX=m
 CONFIG_USB_STKWEBCAM=m
 CONFIG_USB_S2255=m
 CONFIG_USB_SN9C102=m
+CONFIG_VIDEO_USBTV=m
 
 #
 # Analog TV USB devices
@@ -4363,7 +4413,7 @@ CONFIG_LCD_PLATFORM=m
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_GENERIC is not set
 CONFIG_BACKLIGHT_LM3533=m
-CONFIG_BACKLIGHT_PWM=m
+# CONFIG_BACKLIGHT_PWM is not set
 CONFIG_BACKLIGHT_APPLE=m
 # CONFIG_BACKLIGHT_SAHARA is not set
 # CONFIG_BACKLIGHT_ADP8860 is not set
@@ -4385,18 +4435,6 @@ CONFIG_DUMMY_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_FONTS=y
-# CONFIG_FONT_8x8 is not set
-CONFIG_FONT_8x16=y
-# CONFIG_FONT_6x11 is not set
-# CONFIG_FONT_7x14 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_ACORN_8x8 is not set
-# CONFIG_FONT_MINI_4x6 is not set
-# CONFIG_FONT_SUN8x16 is not set
-# CONFIG_FONT_SUN12x22 is not set
-# CONFIG_FONT_10x18 is not set
-CONFIG_FONT_AUTOSELECT=y
 # CONFIG_LOGO is not set
 CONFIG_FB_SSD1307=m
 CONFIG_SOUND=m
@@ -4418,6 +4456,7 @@ CONFIG_SND_SEQUENCER_OSS=y
 CONFIG_SND_HRTIMER=m
 CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
 CONFIG_SND_DYNAMIC_MINORS=y
+CONFIG_SND_MAX_CARDS=32
 CONFIG_SND_SUPPORT_OLD_API=y
 CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SND_VERBOSE_PRINTK is not set
@@ -4549,6 +4588,7 @@ CONFIG_SND_HDA_CODEC_ANALOG=y
 CONFIG_SND_HDA_CODEC_SIGMATEL=y
 CONFIG_SND_HDA_CODEC_VIA=y
 CONFIG_SND_HDA_CODEC_HDMI=y
+CONFIG_SND_HDA_I915=y
 CONFIG_SND_HDA_CODEC_CIRRUS=y
 CONFIG_SND_HDA_CODEC_CONEXANT=y
 CONFIG_SND_HDA_CODEC_CA0110=y
@@ -4593,6 +4633,7 @@ CONFIG_SND_USB_CAIAQ=m
 CONFIG_SND_USB_CAIAQ_INPUT=y
 CONFIG_SND_USB_US122L=m
 CONFIG_SND_USB_6FIRE=m
+CONFIG_SND_USB_HIFACE=m
 CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWIRE_LIB=m
 CONFIG_SND_FIREWIRE_SPEAKERS=m
@@ -4631,9 +4672,11 @@ CONFIG_HID_DRAGONRISE=m
 CONFIG_DRAGONRISE_FF=y
 CONFIG_HID_EMS_FF=m
 CONFIG_HID_ELECOM=m
+CONFIG_HID_ELO=m
 CONFIG_HID_EZKEY=m
 CONFIG_HID_HOLTEK=m
 CONFIG_HOLTEK_FF=y
+CONFIG_HID_HUION=m
 CONFIG_HID_KEYTOUCH=m
 CONFIG_HID_KYE=m
 CONFIG_HID_UCLOGIC=m
@@ -4666,7 +4709,6 @@ CONFIG_HID_PICOLCD_LCD=y
 CONFIG_HID_PICOLCD_LEDS=y
 CONFIG_HID_PICOLCD_CIR=y
 CONFIG_HID_PRIMAX=m
-CONFIG_HID_PS3REMOTE=m
 CONFIG_HID_ROCCAT=m
 CONFIG_HID_SAITEK=m
 CONFIG_HID_SAMSUNG=m
@@ -4686,7 +4728,6 @@ CONFIG_HID_THRUSTMASTER=m
 CONFIG_THRUSTMASTER_FF=y
 CONFIG_HID_WACOM=m
 CONFIG_HID_WIIMOTE=m
-CONFIG_HID_WIIMOTE_EXT=y
 CONFIG_HID_ZEROPLUS=m
 CONFIG_ZEROPLUS_FF=y
 CONFIG_HID_ZYDACRON=m
@@ -4703,9 +4744,6 @@ CONFIG_USB_HIDDEV=y
 # I2C HID support
 #
 CONFIG_I2C_HID=m
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_USB_ARCH_HAS_XHCI=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_COMMON=m
 CONFIG_USB_ARCH_HAS_HCD=y
@@ -4739,7 +4777,9 @@ CONFIG_USB_OXU210HP_HCD=m
 CONFIG_USB_ISP116X_HCD=m
 CONFIG_USB_ISP1760_HCD=m
 CONFIG_USB_ISP1362_HCD=m
+CONFIG_USB_FUSBH200_HCD=m
 CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_PCI=m
 # CONFIG_USB_OHCI_HCD_SSB is not set
 # CONFIG_USB_OHCI_HCD_PLATFORM is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
@@ -4757,6 +4797,9 @@ CONFIG_USB_HWA_HCD=m
 # CONFIG_USB_HCD_BCMA is not set
 # CONFIG_USB_HCD_SSB is not set
 CONFIG_USB_MUSB_HDRC=m
+# CONFIG_USB_MUSB_HOST is not set
+# CONFIG_USB_MUSB_GADGET is not set
+CONFIG_USB_MUSB_DUAL_ROLE=y
 CONFIG_USB_MUSB_TUSB6010=m
 CONFIG_USB_MUSB_DSPS=m
 CONFIG_USB_MUSB_UX500=m
@@ -4880,6 +4923,8 @@ CONFIG_USB_SERIAL_WISHBONE=m
 CONFIG_USB_SERIAL_ZTE=m
 CONFIG_USB_SERIAL_SSU100=m
 CONFIG_USB_SERIAL_QT2=m
+CONFIG_USB_SERIAL_FLASHLOADER=m
+CONFIG_USB_SERIAL_SUUNTO=m
 # CONFIG_USB_SERIAL_DEBUG is not set
 
 #
@@ -4934,12 +4979,12 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 # USB Peripheral Controller
 #
 CONFIG_USB_FUSB300=m
+CONFIG_USB_FOTG210_UDC=m
 CONFIG_USB_R8A66597=m
 CONFIG_USB_RENESAS_USBHS_UDC=m
 CONFIG_USB_PXA27X=m
 CONFIG_USB_MV_UDC=m
 CONFIG_USB_MV_U3D=m
-CONFIG_USB_GADGET_MUSB_HDRC=m
 CONFIG_USB_M66592=m
 CONFIG_USB_AMD5536UDC=m
 CONFIG_USB_NET2272=m
@@ -4951,8 +4996,15 @@ CONFIG_USB_DUMMY_HCD=m
 CONFIG_USB_LIBCOMPOSITE=m
 CONFIG_USB_F_ACM=m
 CONFIG_USB_U_SERIAL=m
+CONFIG_USB_U_ETHER=m
+CONFIG_USB_U_RNDIS=m
 CONFIG_USB_F_SERIAL=m
 CONFIG_USB_F_OBEX=m
+CONFIG_USB_F_NCM=m
+CONFIG_USB_F_ECM=m
+CONFIG_USB_F_SUBSET=m
+CONFIG_USB_F_RNDIS=m
+# CONFIG_USB_CONFIGFS is not set
 # CONFIG_USB_ZERO is not set
 CONFIG_USB_AUDIO=m
 # CONFIG_GADGET_UAC1 is not set
@@ -5130,6 +5182,7 @@ CONFIG_RTC_DRV_RS5C372=m
 CONFIG_RTC_DRV_ISL1208=m
 CONFIG_RTC_DRV_ISL12022=m
 CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF2127=m
 CONFIG_RTC_DRV_PCF8523=m
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
@@ -5194,8 +5247,9 @@ CONFIG_DMADEVICES=y
 #
 CONFIG_INTEL_MID_DMAC=m
 CONFIG_INTEL_IOATDMA=m
+CONFIG_DW_DMAC_CORE=m
 CONFIG_DW_DMAC=m
-# CONFIG_DW_DMAC_BIG_ENDIAN_IO is not set
+CONFIG_DW_DMAC_PCI=m
 CONFIG_TIMB_DMA=m
 CONFIG_PCH_DMA=m
 CONFIG_DMA_ENGINE=y
@@ -5267,17 +5321,14 @@ CONFIG_COMEDI_PARPORT=m
 CONFIG_COMEDI_SERIAL2002=m
 CONFIG_COMEDI_SKEL=m
 CONFIG_COMEDI_ISA_DRIVERS=y
-CONFIG_COMEDI_ACL7225B=m
 CONFIG_COMEDI_PCL711=m
 CONFIG_COMEDI_PCL724=m
-CONFIG_COMEDI_PCL725=m
 CONFIG_COMEDI_PCL726=m
 CONFIG_COMEDI_PCL730=m
 CONFIG_COMEDI_PCL812=m
 CONFIG_COMEDI_PCL816=m
 CONFIG_COMEDI_PCL818=m
 CONFIG_COMEDI_PCM3724=m
-CONFIG_COMEDI_PCM3730=m
 CONFIG_COMEDI_AMPLC_DIO200_ISA=m
 CONFIG_COMEDI_AMPLC_PC236_ISA=m
 CONFIG_COMEDI_AMPLC_PC263_ISA=m
@@ -5313,6 +5364,7 @@ CONFIG_COMEDI_PCMMIO=m
 CONFIG_COMEDI_PCMUIO=m
 CONFIG_COMEDI_MULTIQ3=m
 CONFIG_COMEDI_POC=m
+CONFIG_COMEDI_S526=m
 CONFIG_COMEDI_PCI_DRIVERS=y
 CONFIG_COMEDI_8255_PCI=m
 CONFIG_COMEDI_ADDI_WATCHDOG=m
@@ -5367,7 +5419,6 @@ CONFIG_COMEDI_NI_LABPC_PCI=m
 CONFIG_COMEDI_NI_PCIDIO=m
 CONFIG_COMEDI_NI_PCIMIO=m
 CONFIG_COMEDI_RTD520=m
-CONFIG_COMEDI_S526=m
 CONFIG_COMEDI_S626=m
 CONFIG_COMEDI_SSV_DNP=m
 CONFIG_COMEDI_MITE=m
@@ -5484,7 +5535,6 @@ CONFIG_WIMAX_GDM72XX_WIMAX2=y
 CONFIG_WIMAX_GDM72XX_USB=y
 # CONFIG_WIMAX_GDM72XX_SDIO is not set
 CONFIG_WIMAX_GDM72XX_USB_PM=y
-CONFIG_CSR_WIFI=m
 CONFIG_NET_VENDOR_SILICOM=y
 CONFIG_SBYPASS=m
 CONFIG_BPCTL=m
@@ -5494,6 +5544,7 @@ CONFIG_FIREWIRE_SERIAL=m
 CONFIG_ZCACHE=m
 # CONFIG_ZCACHE_DEBUG is not set
 # CONFIG_USB_DWC2 is not set
+CONFIG_USB_BTMTK=m
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 CONFIG_ACERHDF=m
@@ -5543,6 +5594,8 @@ CONFIG_MXM_WMI=m
 CONFIG_INTEL_OAKTRAIL=m
 CONFIG_SAMSUNG_Q10=m
 CONFIG_APPLE_GMUX=m
+CONFIG_INTEL_RST=y
+CONFIG_INTEL_SMARTCONNECT=y
 CONFIG_PVPANIC=m
 
 #
@@ -5581,11 +5634,18 @@ CONFIG_MEMORY=y
 # CONFIG_IIO is not set
 # CONFIG_VME_BUS is not set
 CONFIG_PWM=y
+CONFIG_PWM_SYSFS=y
+# CONFIG_PWM_PCA9685 is not set
 CONFIG_IRQCHIP=y
 CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 # CONFIG_RESET_CONTROLLER is not set
+CONFIG_FMC=m
+CONFIG_FMC_FAKEDEV=m
+CONFIG_FMC_TRIVIAL=m
+CONFIG_FMC_WRITE_EEPROM=m
+CONFIG_FMC_CHARDEV=m
 
 #
 # Firmware Drivers
@@ -5604,9 +5664,7 @@ CONFIG_ISCSI_IBFT=m
 #
 # EFI (Extensible Firmware Interface) Support
 #
-CONFIG_EFI_VARS=m
-CONFIG_EFI_VARS_PSTORE=m
-CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
+# CONFIG_EFI_VARS is not set
 
 #
 # File systems
@@ -5778,6 +5836,7 @@ CONFIG_F2FS_FS=m
 CONFIG_F2FS_STAT_FS=y
 CONFIG_F2FS_FS_XATTR=y
 CONFIG_F2FS_FS_POSIX_ACL=y
+CONFIG_F2FS_FS_SECURITY=y
 CONFIG_EFIVAR_FS=y
 CONFIG_ORE=m
 CONFIG_NETWORK_FILESYSTEMS=y
@@ -5788,10 +5847,12 @@ CONFIG_NFS_V3_ACL=y
 CONFIG_NFS_V4=m
 CONFIG_NFS_SWAP=y
 CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
 CONFIG_PNFS_FILE_LAYOUT=m
 CONFIG_PNFS_BLOCK=m
 CONFIG_PNFS_OBJLAYOUT=m
 CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org"
+CONFIG_NFS_V4_SECURITY_LABEL=y
 CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
@@ -5801,6 +5862,7 @@ CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3=y
 CONFIG_NFSD_V3_ACL=y
 CONFIG_NFSD_V4=y
+CONFIG_NFSD_V4_SECURITY_LABEL=y
 # CONFIG_NFSD_FAULT_INJECTION is not set
 CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
@@ -5841,6 +5903,7 @@ CONFIG_AFS_FSCACHE=y
 CONFIG_9P_FS=m
 CONFIG_9P_FSCACHE=y
 CONFIG_9P_FS_POSIX_ACL=y
+CONFIG_9P_FS_SECURITY=y
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
 CONFIG_NLS_CODEPAGE_437=m
@@ -5899,68 +5962,95 @@ CONFIG_DLM=m
 # Kernel hacking
 #
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+
+#
+# printk and dmesg options
+#
 CONFIG_PRINTK_TIME=y
 CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
+# CONFIG_BOOT_PRINTK_DELAY is not set
+CONFIG_DYNAMIC_DEBUG=y
+
+#
+# Compile-time checks and compiler options
+#
+# CONFIG_DEBUG_INFO is not set
 CONFIG_ENABLE_WARN_DEPRECATED=y
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_FRAME_WARN=1024
-CONFIG_MAGIC_SYSRQ=y
 CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_READABLE_ASM is not set
 CONFIG_UNUSED_SYMBOLS=y
 CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
+CONFIG_FRAME_POINTER=y
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_KERNEL=y
+
+#
+# Memory Debugging
+#
+# CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_VIRTUAL is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+# CONFIG_DEBUG_HIGHMEM is not set
+CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+CONFIG_HAVE_ARCH_KMEMCHECK=y
 # CONFIG_DEBUG_SHIRQ is not set
+
+#
+# Debug Lockups and Hangs
+#
 CONFIG_LOCKUP_DETECTOR=y
 CONFIG_HARDLOCKUP_DETECTOR=y
 # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
 CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
-# CONFIG_PANIC_ON_OOPS is not set
-CONFIG_PANIC_ON_OOPS_VALUE=0
 CONFIG_DETECT_HUNG_TASK=y
 CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
 CONFIG_SCHED_DEBUG=y
 CONFIG_SCHEDSTATS=y
 CONFIG_TIMER_STATS=y
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_SLUB_DEBUG_ON is not set
-# CONFIG_SLUB_STATS is not set
-CONFIG_HAVE_DEBUG_KMEMLEAK=y
-# CONFIG_DEBUG_KMEMLEAK is not set
 # CONFIG_DEBUG_PREEMPT is not set
+
+#
+# Lock Debugging (spinlocks, mutexes, etc...)
+#
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
 CONFIG_DEBUG_MUTEXES=y
+# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
 # CONFIG_DEBUG_LOCK_ALLOC is not set
 # CONFIG_PROVE_LOCKING is not set
 # CONFIG_LOCK_STAT is not set
 # CONFIG_DEBUG_ATOMIC_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 CONFIG_STACKTRACE=y
-# CONFIG_DEBUG_STACK_USAGE is not set
 # CONFIG_DEBUG_KOBJECT is not set
-# CONFIG_DEBUG_HIGHMEM is not set
 CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_DEBUG_INFO is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_VIRTUAL is not set
 # CONFIG_DEBUG_WRITECOUNT is not set
-CONFIG_DEBUG_MEMORY_INIT=y
 # CONFIG_DEBUG_LIST is not set
-# CONFIG_TEST_LIST_SORT is not set
 # CONFIG_DEBUG_SG is not set
 # CONFIG_DEBUG_NOTIFIERS is not set
 # CONFIG_DEBUG_CREDENTIALS is not set
-CONFIG_ARCH_WANT_FRAME_POINTERS=y
-CONFIG_FRAME_POINTER=y
-# CONFIG_BOOT_PRINTK_DELAY is not set
 
 #
 # RCU Debugging
@@ -5972,18 +6062,12 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_RCU_CPU_STALL_VERBOSE is not set
 # CONFIG_RCU_CPU_STALL_INFO is not set
 # CONFIG_RCU_TRACE is not set
-# CONFIG_KPROBES_SANITY_TEST is not set
-# CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-CONFIG_LKDTM=m
 # CONFIG_NOTIFIER_ERROR_INJECTION is not set
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_LATENCYTOP is not set
 CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y
 # CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
 CONFIG_USER_STACKTRACE_SUPPORT=y
 CONFIG_NOP_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
@@ -6030,25 +6114,30 @@ CONFIG_MMIOTRACE=y
 # CONFIG_MMIOTRACE_TEST is not set
 CONFIG_RING_BUFFER_BENCHMARK=m
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
+
+#
+# Runtime Testing
+#
+CONFIG_LKDTM=m
+# CONFIG_TEST_LIST_SORT is not set
+# CONFIG_KPROBES_SANITY_TEST is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_RBTREE_TEST is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
+# CONFIG_ATOMIC64_SELFTEST is not set
+CONFIG_ASYNC_RAID6_TEST=m
+# CONFIG_TEST_STRING_HELPERS is not set
+CONFIG_TEST_KSTRTOX=m
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
 # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
-CONFIG_DYNAMIC_DEBUG=y
 # CONFIG_DMA_API_DEBUG is not set
-# CONFIG_ATOMIC64_SELFTEST is not set
-CONFIG_ASYNC_RAID6_TEST=m
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
-CONFIG_HAVE_ARCH_KMEMCHECK=y
-# CONFIG_TEST_STRING_HELPERS is not set
-CONFIG_TEST_KSTRTOX=m
 CONFIG_STRICT_DEVMEM=y
 CONFIG_X86_VERBOSE_BOOTUP=y
 CONFIG_EARLY_PRINTK=y
 # CONFIG_EARLY_PRINTK_DBGP is not set
-# CONFIG_DEBUG_STACKOVERFLOW is not set
 # CONFIG_X86_PTDUMP is not set
 CONFIG_DEBUG_RODATA=y
 # CONFIG_DEBUG_RODATA_TEST is not set
@@ -6072,6 +6161,7 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
 # CONFIG_CPA_DEBUG is not set
 # CONFIG_OPTIMIZE_INLINING is not set
 # CONFIG_DEBUG_NMI_SELFTEST is not set
+# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set
 
 #
 # Security options
@@ -6097,10 +6187,12 @@ CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/usr/bin/tomoyo-init"
 CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd"
 CONFIG_SECURITY_APPARMOR=y
 CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0
-# CONFIG_SECURITY_YAMA is not set
+CONFIG_SECURITY_YAMA=y
+CONFIG_SECURITY_YAMA_STACKED=y
 # CONFIG_IMA is not set
 # CONFIG_DEFAULT_SECURITY_TOMOYO is not set
 # CONFIG_DEFAULT_SECURITY_APPARMOR is not set
+# CONFIG_DEFAULT_SECURITY_YAMA is not set
 CONFIG_DEFAULT_SECURITY_DAC=y
 CONFIG_DEFAULT_SECURITY=""
 CONFIG_XOR_BLOCKS=m
@@ -6220,6 +6312,8 @@ CONFIG_CRYPTO_TWOFISH_586=m
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_ZLIB=m
 CONFIG_CRYPTO_LZO=y
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
 
 #
 # Random Number Generation
@@ -6264,6 +6358,7 @@ CONFIG_RAID6_PQ=m
 CONFIG_BITREVERSE=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GENERIC_NET_UTILS=y
 CONFIG_GENERIC_FIND_FIRST_BIT=y
 CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_IOMAP=y
@@ -6287,6 +6382,9 @@ CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 CONFIG_LZO_COMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
+CONFIG_LZ4_COMPRESS=m
+CONFIG_LZ4HC_COMPRESS=m
+CONFIG_LZ4_DECOMPRESS=y
 CONFIG_XZ_DEC=y
 CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC_POWERPC=y
@@ -6301,6 +6399,7 @@ CONFIG_DECOMPRESS_BZIP2=y
 CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DECOMPRESS_XZ=y
 CONFIG_DECOMPRESS_LZO=y
+CONFIG_DECOMPRESS_LZ4=y
 CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_REED_SOLOMON=m
 CONFIG_REED_SOLOMON_ENC8=y
@@ -6329,3 +6428,16 @@ CONFIG_DDR=y
 CONFIG_MPILIB=m
 CONFIG_OID_REGISTRY=m
 CONFIG_UCS2_STRING=y
+CONFIG_FONT_SUPPORT=y
+CONFIG_FONTS=y
+# CONFIG_FONT_8x8 is not set
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
+CONFIG_FONT_AUTOSELECT=y
diff --git a/kernels/linux-libre-xen/3.10.6-logitech-dj.patch b/kernels/linux-libre-xen/3.10.6-logitech-dj.patch
deleted file mode 100644
index 1c112ccde..000000000
--- a/kernels/linux-libre-xen/3.10.6-logitech-dj.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-From c63e0e370028d7e4033bd40165f18499872b5183 Mon Sep 17 00:00:00 2001
-From: Nestor Lopez Casado <nlopezcasad@logitech.com>
-Date: Thu, 18 Jul 2013 13:21:30 +0000
-Subject: HID: Revert "Revert "HID: Fix logitech-dj: missing Unifying device issue""
-
-This reverts commit 8af6c08830b1ae114d1a8b548b1f8b056e068887.
-
-This patch re-adds the workaround introduced by 596264082f10dd4
-which was reverted by 8af6c08830b1ae114.
-
-The original patch 596264 was needed to overcome a situation where
-the hid-core would drop incoming reports while probe() was being
-executed.
-
-This issue was solved by c849a6143bec520af which added
-hid_device_io_start() and hid_device_io_stop() that enable a specific
-hid driver to opt-in for input reports while its probe() is being
-executed.
-
-Commit a9dd22b730857347 modified hid-logitech-dj so as to use the
-functionality added to hid-core. Having done that, workaround 596264
-was no longer necessary and was reverted by 8af6c08.
-
-We now encounter a different problem that ends up 'again' thwarting
-the Unifying receiver enumeration. The problem is time and usb controller
-dependent. Ocasionally the reports sent to the usb receiver to start
-the paired devices enumeration fail with -EPIPE and the receiver never
-gets to enumerate the paired devices.
-
-With dcd9006b1b053c7b1c the problem was "hidden" as the call to the usb
-driver became asynchronous and none was catching the error from the
-failing URB.
-
-As the root cause for this failing SET_REPORT is not understood yet,
--possibly a race on the usb controller drivers or a problem with the
-Unifying receiver- reintroducing this workaround solves the problem.
-
-Overall what this workaround does is: If an input report from an
-unknown device is received, then a (re)enumeration is performed.
-
-related bug:
-https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1194649
-
-Signed-off-by: Nestor Lopez Casado <nlopezcasad@logitech.com>
-Signed-off-by: Jiri Kosina <jkosina@suse.cz>
----
-diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-logitech-dj.c
-index 5207591a..cd33084 100644
---- a/drivers/hid/hid-logitech-dj.c
-+++ b/drivers/hid/hid-logitech-dj.c
-@@ -192,6 +192,7 @@ static struct hid_ll_driver logi_dj_ll_driver;
- static int logi_dj_output_hidraw_report(struct hid_device *hid, u8 * buf,
- 					size_t count,
- 					unsigned char report_type);
-+static int logi_dj_recv_query_paired_devices(struct dj_receiver_dev *djrcv_dev);
- 
- static void logi_dj_recv_destroy_djhid_device(struct dj_receiver_dev *djrcv_dev,
- 						struct dj_report *dj_report)
-@@ -232,6 +233,7 @@ static void logi_dj_recv_add_djhid_device(struct dj_receiver_dev *djrcv_dev,
- 	if (dj_report->report_params[DEVICE_PAIRED_PARAM_SPFUNCTION] &
- 	    SPFUNCTION_DEVICE_LIST_EMPTY) {
- 		dbg_hid("%s: device list is empty\n", __func__);
-+		djrcv_dev->querying_devices = false;
- 		return;
- 	}
- 
-@@ -242,6 +244,12 @@ static void logi_dj_recv_add_djhid_device(struct dj_receiver_dev *djrcv_dev,
- 		return;
- 	}
- 
-+	if (djrcv_dev->paired_dj_devices[dj_report->device_index]) {
-+		/* The device is already known. No need to reallocate it. */
-+		dbg_hid("%s: device is already known\n", __func__);
-+		return;
-+	}
-+
- 	dj_hiddev = hid_allocate_device();
- 	if (IS_ERR(dj_hiddev)) {
- 		dev_err(&djrcv_hdev->dev, "%s: hid_allocate_device failed\n",
-@@ -305,6 +313,7 @@ static void delayedwork_callback(struct work_struct *work)
- 	struct dj_report dj_report;
- 	unsigned long flags;
- 	int count;
-+	int retval;
- 
- 	dbg_hid("%s\n", __func__);
- 
-@@ -337,6 +346,25 @@ static void delayedwork_callback(struct work_struct *work)
- 		logi_dj_recv_destroy_djhid_device(djrcv_dev, &dj_report);
- 		break;
- 	default:
-+	/* A normal report (i. e. not belonging to a pair/unpair notification)
-+	 * arriving here, means that the report arrived but we did not have a
-+	 * paired dj_device associated to the report's device_index, this
-+	 * means that the original "device paired" notification corresponding
-+	 * to this dj_device never arrived to this driver. The reason is that
-+	 * hid-core discards all packets coming from a device while probe() is
-+	 * executing. */
-+	if (!djrcv_dev->paired_dj_devices[dj_report.device_index]) {
-+		/* ok, we don't know the device, just re-ask the
-+		 * receiver for the list of connected devices. */
-+		retval = logi_dj_recv_query_paired_devices(djrcv_dev);
-+		if (!retval) {
-+			/* everything went fine, so just leave */
-+			break;
-+		}
-+		dev_err(&djrcv_dev->hdev->dev,
-+			"%s:logi_dj_recv_query_paired_devices "
-+			"error:%d\n", __func__, retval);
-+		}
- 		dbg_hid("%s: unexpected report type\n", __func__);
- 	}
- }
-@@ -367,6 +395,12 @@ static void logi_dj_recv_forward_null_report(struct dj_receiver_dev *djrcv_dev,
- 	if (!djdev) {
- 		dbg_hid("djrcv_dev->paired_dj_devices[dj_report->device_index]"
- 			" is NULL, index %d\n", dj_report->device_index);
-+		kfifo_in(&djrcv_dev->notif_fifo, dj_report, sizeof(struct dj_report));
-+
-+		if (schedule_work(&djrcv_dev->work) == 0) {
-+			dbg_hid("%s: did not schedule the work item, was already "
-+			"queued\n", __func__);
-+		}
- 		return;
- 	}
- 
-@@ -397,6 +431,12 @@ static void logi_dj_recv_forward_report(struct dj_receiver_dev *djrcv_dev,
- 	if (dj_device == NULL) {
- 		dbg_hid("djrcv_dev->paired_dj_devices[dj_report->device_index]"
- 			" is NULL, index %d\n", dj_report->device_index);
-+		kfifo_in(&djrcv_dev->notif_fifo, dj_report, sizeof(struct dj_report));
-+
-+		if (schedule_work(&djrcv_dev->work) == 0) {
-+			dbg_hid("%s: did not schedule the work item, was already "
-+			"queued\n", __func__);
-+		}
- 		return;
- 	}
- 
-@@ -444,6 +484,10 @@ static int logi_dj_recv_query_paired_devices(struct dj_receiver_dev *djrcv_dev)
- 	struct dj_report *dj_report;
- 	int retval;
- 
-+	/* no need to protect djrcv_dev->querying_devices */
-+	if (djrcv_dev->querying_devices)
-+		return 0;
-+
- 	dj_report = kzalloc(sizeof(struct dj_report), GFP_KERNEL);
- 	if (!dj_report)
- 		return -ENOMEM;
-@@ -455,6 +499,7 @@ static int logi_dj_recv_query_paired_devices(struct dj_receiver_dev *djrcv_dev)
- 	return retval;
- }
- 
-+
- static int logi_dj_recv_switch_to_dj_mode(struct dj_receiver_dev *djrcv_dev,
- 					  unsigned timeout)
- {
-diff --git a/drivers/hid/hid-logitech-dj.h b/drivers/hid/hid-logitech-dj.h
-index fd28a5e..4a40003 100644
---- a/drivers/hid/hid-logitech-dj.h
-+++ b/drivers/hid/hid-logitech-dj.h
-@@ -101,6 +101,7 @@ struct dj_receiver_dev {
- 	struct work_struct work;
- 	struct kfifo notif_fifo;
- 	spinlock_t lock;
-+	bool querying_devices;
- };
- 
- struct dj_device {
---
-cgit v0.9.2
diff --git a/kernels/linux-libre-xen/3.10.6-reset-superseed-xhci-hcd.patch b/kernels/linux-libre-xen/3.10.6-reset-superseed-xhci-hcd.patch
deleted file mode 100644
index 0415b8a1e..000000000
--- a/kernels/linux-libre-xen/3.10.6-reset-superseed-xhci-hcd.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-[PATCH] SCSI: Don't attempt to send extended INQUIRY command if skip_vpd_pages is set
-
-If a device has the skip_vpd_pages flag set we should simply fail the
-scsi_get_vpd_page() call.
-
-Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
-Acked-by: Alan Stern <stern@rowland.harvard.edu>
-Tested-by: Stuart Foster <smf.linux@ntlworld.com>
-Cc: stable@vger.kernel.org
-
-diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
-index 3b1ea34..eaa808e 100644
---- a/drivers/scsi/scsi.c
-+++ b/drivers/scsi/scsi.c
-@@ -1031,6 +1031,9 @@ int scsi_get_vpd_page(struct scsi_device *sdev, u8 page, unsigned char *buf,
- {
- 	int i, result;
- 
-+	if (sdev->skip_vpd_pages)
-+		goto fail;
-+
- 	/* Ask for all the pages supported by this device */
- 	result = scsi_vpd_inquiry(sdev, buf, 0, buf_len);
- 	if (result)
diff --git a/kernels/linux-libre-xen/3.11-haswell-intel_pstate.patch b/kernels/linux-libre-xen/3.11-haswell-intel_pstate.patch
new file mode 100644
index 000000000..1f376b518
--- /dev/null
+++ b/kernels/linux-libre-xen/3.11-haswell-intel_pstate.patch
@@ -0,0 +1,32 @@
+From 6cdcdb793791f776ea9408581b1242b636d43b37 Mon Sep 17 00:00:00 2001
+From: Nell Hardcastle <nell@spicious.com>
+Date: Sun, 30 Jun 2013 22:58:57 +0000
+Subject: intel_pstate: Add Haswell CPU models
+
+Enable the intel_pstate driver for Haswell CPUs. One missing Ivy Bridge
+model (0x3E) is also included. Models referenced from
+tools/power/x86/turbostat/turbostat.c:has_nehalem_turbo_ratio_limit
+
+Signed-off-by: Nell Hardcastle <nell@spicious.com>
+Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
+Acked-by: Dirk Brandewie <dirk.j.brandewie@intel.com>
+Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+---
+diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
+index 6efd96c..9733f29 100644
+--- a/drivers/cpufreq/intel_pstate.c
++++ b/drivers/cpufreq/intel_pstate.c
+@@ -522,6 +522,11 @@ static const struct x86_cpu_id intel_pstate_cpu_ids[] = {
+ 	ICPU(0x2a, default_policy),
+ 	ICPU(0x2d, default_policy),
+ 	ICPU(0x3a, default_policy),
++	ICPU(0x3c, default_policy),
++	ICPU(0x3e, default_policy),
++	ICPU(0x3f, default_policy),
++	ICPU(0x45, default_policy),
++	ICPU(0x46, default_policy),
+ 	{}
+ };
+ MODULE_DEVICE_TABLE(x86cpu, intel_pstate_cpu_ids);
+--
+cgit v0.9.2
diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD
index f5ac5b701..1c0ae88de 100644
--- a/kernels/linux-libre-xen/PKGBUILD
+++ b/kernels/linux-libre-xen/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 193761 2013-08-30 11:11:43Z tpowa $
+# $Id: PKGBUILD 195930 2013-10-05 19:44:24Z 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.10
-pkgver=${_basekernel}.10
+_basekernel=3.11
+pkgver=${_basekernel}.4
 pkgrel=1
 arch=('i686')
 url="http://linux-libre.fsfla.org/"
@@ -22,15 +22,15 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'boot-logo.patch'
         'change-default-console-loglevel.patch'
         'criu-no-expert.patch'
-        '3.10.6-logitech-dj.patch')
-md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
-         '673ae6d60b4ce8acad930a06f9fe2e3f'
-         'f104314d8db864b1702c50ea97134be3'
+        '3.11-haswell-intel_pstate.patch')
+md5sums=('7ec84223c7adcf01a5287eb7af96b7e7'
+         'd09e8017d22370b873628942f3ece3b0'
+         '212338fa662436f9590026c9a71d82f7'
          'b7c2805bb287a644c0a303bf7721e534'
-         '04b21c79df0a952c22d681dd4f4562df'
-         'f3def2cefdcbb954c21d8505d23cc83c'
+         '36e90334b12b2e9d53fd92129ee98f5b'
+         '98beb36f9b8cf16e58de2483ea9985e3'
          'd50c1ac47394e9aec637002ef3392bd1'
-         '3ff40ca684cfe719723e627e2cef7cea')
+         '1040ae6c10d4a68f89899f94a2318a17')
 
 _kernelname=${pkgbase#linux-libre}
 _localversionname=-LIBRE-XEN
@@ -50,12 +50,14 @@ prepare() {
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
   patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
 
+  # add intel haswell support to intel_pstate
+  # https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=6cdcdb793791f776ea9408581b1242b636d43b37
+  # will be in 3.12
+  patch -Np1 -i "${srcdir}/3.11-haswell-intel_pstate.patch"
+ 
   # allow criu without expert option set
   # patch from fedora
   patch -Np1 -i "${srcdir}/criu-no-expert.patch"
- 
-  # fix https://bugs.archlinux.org/task/35991 - [linux] 3.10.x renders Logitech Unified Receivers useless
-  patch -Np1 -i  "${srcdir}/3.10.6-logitech-dj.patch"
 
   cat "${srcdir}/config" > ./.config # simpler
 
diff --git a/kernels/linux-libre-xen/boot-logo.patch b/kernels/linux-libre-xen/boot-logo.patch
index c392928a5..cbd52ea22 100644
--- a/kernels/linux-libre-xen/boot-logo.patch
+++ b/kernels/linux-libre-xen/boot-logo.patch
@@ -1,1612 +1,891 @@
-diff -Nur linux-2.6.39.1/drivers/video/logo/logo_linux_clut224.ppm linux-2.6.39-LIBRE/drivers/video/logo/logo_linux_clut224.ppm
---- linux-2.6.39.1/drivers/video/logo/logo_linux_clut224.ppm	2011-06-02 21:34:20.000000000 -0300
-+++ linux-2.6.39-LIBRE/drivers/video/logo/logo_linux_clut224.ppm	2011-06-22 13:42:06.000000000 -0300
-@@ -1,1604 +1,861 @@
+diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
+index 285d552..c9d8373 100644
+--- a/drivers/video/logo/logo_linux_clut224.ppm
++++ b/drivers/video/logo/logo_linux_clut224.ppm
+@@ -1,883 +1,861 @@
  P3
--# Standard 224-color Linux logo
 -80 80
 +80 78
  255
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6   6   6   6  10  10  10  10  10  10
-- 10  10  10   6   6   6   6   6   6   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  10  10  10  14  14  14
-- 22  22  22  26  26  26  30  30  30  34  34  34
-- 30  30  30  30  30  30  26  26  26  18  18  18
-- 14  14  14  10  10  10   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  14  14  14  26  26  26  42  42  42
-- 54  54  54  66  66  66  78  78  78  78  78  78
-- 78  78  78  74  74  74  66  66  66  54  54  54
-- 42  42  42  26  26  26  18  18  18  10  10  10
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 22  22  22  42  42  42  66  66  66  86  86  86
-- 66  66  66  38  38  38  38  38  38  22  22  22
-- 26  26  26  34  34  34  54  54  54  66  66  66
-- 86  86  86  70  70  70  46  46  46  26  26  26
-- 14  14  14   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  10  10  10  26  26  26
-- 50  50  50  82  82  82  58  58  58   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  6   6   6  54  54  54  86  86  86  66  66  66
-- 38  38  38  18  18  18   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  22  22  22  50  50  50
-- 78  78  78  34  34  34   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   6   6   6  70  70  70
-- 78  78  78  46  46  46  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  18  18  18  42  42  42  82  82  82
-- 26  26  26   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  14  14  14
-- 46  46  46  34  34  34   6   6   6   2   2   6
-- 42  42  42  78  78  78  42  42  42  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   0   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 10  10  10  30  30  30  66  66  66  58  58  58
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  26  26  26
-- 86  86  86 101 101 101  46  46  46  10  10  10
--  2   2   6  58  58  58  70  70  70  34  34  34
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 14  14  14  42  42  42  86  86  86  10  10  10
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  30  30  30
-- 94  94  94  94  94  94  58  58  58  26  26  26
--  2   2   6   6   6   6  78  78  78  54  54  54
-- 22  22  22   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 22  22  22  62  62  62  62  62  62   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  26  26  26
-- 54  54  54  38  38  38  18  18  18  10  10  10
--  2   2   6   2   2   6  34  34  34  82  82  82
-- 38  38  38  14  14  14   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 30  30  30  78  78  78  30  30  30   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  10  10  10
-- 10  10  10   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  78  78  78
-- 50  50  50  18  18  18   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 38  38  38  86  86  86  14  14  14   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  54  54  54
-- 66  66  66  26  26  26   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 42  42  42  82  82  82   2   2   6   2   2   6
--  2   2   6   6   6   6  10  10  10   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   6   6   6
-- 14  14  14  10  10  10   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  18  18  18
-- 82  82  82  34  34  34  10  10  10   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 46  46  46  86  86  86   2   2   6   2   2   6
--  6   6   6   6   6   6  22  22  22  34  34  34
--  6   6   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  18  18  18  34  34  34
-- 10  10  10  50  50  50  22  22  22   2   2   6
--  2   2   6   2   2   6   2   2   6  10  10  10
-- 86  86  86  42  42  42  14  14  14   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 46  46  46  86  86  86   2   2   6   2   2   6
-- 38  38  38 116 116 116  94  94  94  22  22  22
-- 22  22  22   2   2   6   2   2   6   2   2   6
-- 14  14  14  86  86  86 138 138 138 162 162 162
--154 154 154  38  38  38  26  26  26   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 86  86  86  46  46  46  14  14  14   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 46  46  46  86  86  86   2   2   6  14  14  14
--134 134 134 198 198 198 195 195 195 116 116 116
-- 10  10  10   2   2   6   2   2   6   6   6   6
--101  98  89 187 187 187 210 210 210 218 218 218
--214 214 214 134 134 134  14  14  14   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 86  86  86  50  50  50  18  18  18   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   1   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 46  46  46  86  86  86   2   2   6  54  54  54
--218 218 218 195 195 195 226 226 226 246 246 246
-- 58  58  58   2   2   6   2   2   6  30  30  30
--210 210 210 253 253 253 174 174 174 123 123 123
--221 221 221 234 234 234  74  74  74   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 70  70  70  58  58  58  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 46  46  46  82  82  82   2   2   6 106 106 106
--170 170 170  26  26  26  86  86  86 226 226 226
--123 123 123  10  10  10  14  14  14  46  46  46
--231 231 231 190 190 190   6   6   6  70  70  70
-- 90  90  90 238 238 238 158 158 158   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 70  70  70  58  58  58  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   1   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 42  42  42  86  86  86   6   6   6 116 116 116
--106 106 106   6   6   6  70  70  70 149 149 149
--128 128 128  18  18  18  38  38  38  54  54  54
--221 221 221 106 106 106   2   2   6  14  14  14
-- 46  46  46 190 190 190 198 198 198   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 74  74  74  62  62  62  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   1   0   0   0
--  0   0   1   0   0   0   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 42  42  42  94  94  94  14  14  14 101 101 101
--128 128 128   2   2   6  18  18  18 116 116 116
--118  98  46 121  92   8 121  92   8  98  78  10
--162 162 162 106 106 106   2   2   6   2   2   6
--  2   2   6 195 195 195 195 195 195   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 74  74  74  62  62  62  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   1   0   0   1
--  0   0   1   0   0   0   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 38  38  38  90  90  90  14  14  14  58  58  58
--210 210 210  26  26  26  54  38   6 154 114  10
--226 170  11 236 186  11 225 175  15 184 144  12
--215 174  15 175 146  61  37  26   9   2   2   6
-- 70  70  70 246 246 246 138 138 138   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 70  70  70  66  66  66  26  26  26   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 38  38  38  86  86  86  14  14  14  10  10  10
--195 195 195 188 164 115 192 133   9 225 175  15
--239 182  13 234 190  10 232 195  16 232 200  30
--245 207  45 241 208  19 232 195  16 184 144  12
--218 194 134 211 206 186  42  42  42   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 50  50  50  74  74  74  30  30  30   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 34  34  34  86  86  86  14  14  14   2   2   6
--121  87  25 192 133   9 219 162  10 239 182  13
--236 186  11 232 195  16 241 208  19 244 214  54
--246 218  60 246 218  38 246 215  20 241 208  19
--241 208  19 226 184  13 121  87  25   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 50  50  50  82  82  82  34  34  34  10  10  10
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 34  34  34  82  82  82  30  30  30  61  42   6
--180 123   7 206 145  10 230 174  11 239 182  13
--234 190  10 238 202  15 241 208  19 246 218  74
--246 218  38 246 215  20 246 215  20 246 215  20
--226 184  13 215 174  15 184 144  12   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 26  26  26  94  94  94  42  42  42  14  14  14
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  78  78  78  50  50  50 104  69   6
--192 133   9 216 158  10 236 178  12 236 186  11
--232 195  16 241 208  19 244 214  54 245 215  43
--246 215  20 246 215  20 241 208  19 198 155  10
--200 144  11 216 158  10 156 118  10   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  6   6   6  90  90  90  54  54  54  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  78  78  78  46  46  46  22  22  22
--137  92   6 210 162  10 239 182  13 238 190  10
--238 202  15 241 208  19 246 215  20 246 215  20
--241 208  19 203 166  17 185 133  11 210 150  10
--216 158  10 210 150  10 102  78  10   2   2   6
--  6   6   6  54  54  54  14  14  14   2   2   6
--  2   2   6  62  62  62  74  74  74  30  30  30
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 34  34  34  78  78  78  50  50  50   6   6   6
-- 94  70  30 139 102  15 190 146  13 226 184  13
--232 200  30 232 195  16 215 174  15 190 146  13
--168 122  10 192 133   9 210 150  10 213 154  11
--202 150  34 182 157 106 101  98  89   2   2   6
--  2   2   6  78  78  78 116 116 116  58  58  58
--  2   2   6  22  22  22  90  90  90  46  46  46
-- 18  18  18   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 38  38  38  86  86  86  50  50  50   6   6   6
--128 128 128 174 154 114 156 107  11 168 122  10
--198 155  10 184 144  12 197 138  11 200 144  11
--206 145  10 206 145  10 197 138  11 188 164 115
--195 195 195 198 198 198 174 174 174  14  14  14
--  2   2   6  22  22  22 116 116 116 116 116 116
-- 22  22  22   2   2   6  74  74  74  70  70  70
-- 30  30  30  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 50  50  50 101 101 101  26  26  26  10  10  10
--138 138 138 190 190 190 174 154 114 156 107  11
--197 138  11 200 144  11 197 138  11 192 133   9
--180 123   7 190 142  34 190 178 144 187 187 187
--202 202 202 221 221 221 214 214 214  66  66  66
--  2   2   6   2   2   6  50  50  50  62  62  62
--  6   6   6   2   2   6  10  10  10  90  90  90
-- 50  50  50  18  18  18   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  10  10  10  34  34  34
-- 74  74  74  74  74  74   2   2   6   6   6   6
--144 144 144 198 198 198 190 190 190 178 166 146
--154 121  60 156 107  11 156 107  11 168 124  44
--174 154 114 187 187 187 190 190 190 210 210 210
--246 246 246 253 253 253 253 253 253 182 182 182
--  6   6   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  62  62  62
-- 74  74  74  34  34  34  14  14  14   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  10  10  10  22  22  22  54  54  54
-- 94  94  94  18  18  18   2   2   6  46  46  46
--234 234 234 221 221 221 190 190 190 190 190 190
--190 190 190 187 187 187 187 187 187 190 190 190
--190 190 190 195 195 195 214 214 214 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
-- 82  82  82   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  14  14  14
-- 86  86  86  54  54  54  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  18  18  18  46  46  46  90  90  90
-- 46  46  46  18  18  18   6   6   6 182 182 182
--253 253 253 246 246 246 206 206 206 190 190 190
--190 190 190 190 190 190 190 190 190 190 190 190
--206 206 206 231 231 231 250 250 250 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--202 202 202  14  14  14   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 42  42  42  86  86  86  42  42  42  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 14  14  14  38  38  38  74  74  74  66  66  66
--  2   2   6   6   6   6  90  90  90 250 250 250
--253 253 253 253 253 253 238 238 238 198 198 198
--190 190 190 190 190 190 195 195 195 221 221 221
--246 246 246 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253  82  82  82   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  78  78  78  70  70  70  34  34  34
-- 14  14  14   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 34  34  34  66  66  66  78  78  78   6   6   6
--  2   2   6  18  18  18 218 218 218 253 253 253
--253 253 253 253 253 253 253 253 253 246 246 246
--226 226 226 231 231 231 246 246 246 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 178 178 178   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  18  18  18  90  90  90  62  62  62
-- 30  30  30  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  10  10  10  26  26  26
-- 58  58  58  90  90  90  18  18  18   2   2   6
--  2   2   6 110 110 110 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--250 250 250 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 231 231 231  18  18  18   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  18  18  18  94  94  94
-- 54  54  54  26  26  26  10  10  10   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  22  22  22  50  50  50
-- 90  90  90  26  26  26   2   2   6   2   2   6
-- 14  14  14 195 195 195 250 250 250 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--250 250 250 242 242 242  54  54  54   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  38  38  38
-- 86  86  86  50  50  50  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  14  14  14  38  38  38  82  82  82
-- 34  34  34   2   2   6   2   2   6   2   2   6
-- 42  42  42 195 195 195 246 246 246 253 253 253
--253 253 253 253 253 253 253 253 253 250 250 250
--242 242 242 242 242 242 250 250 250 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 250 250 250 246 246 246 238 238 238
--226 226 226 231 231 231 101 101 101   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 38  38  38  82  82  82  42  42  42  14  14  14
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 10  10  10  26  26  26  62  62  62  66  66  66
--  2   2   6   2   2   6   2   2   6   6   6   6
-- 70  70  70 170 170 170 206 206 206 234 234 234
--246 246 246 250 250 250 250 250 250 238 238 238
--226 226 226 231 231 231 238 238 238 250 250 250
--250 250 250 250 250 250 246 246 246 231 231 231
--214 214 214 206 206 206 202 202 202 202 202 202
--198 198 198 202 202 202 182 182 182  18  18  18
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  62  62  62  66  66  66  30  30  30
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 14  14  14  42  42  42  82  82  82  18  18  18
--  2   2   6   2   2   6   2   2   6  10  10  10
-- 94  94  94 182 182 182 218 218 218 242 242 242
--250 250 250 253 253 253 253 253 253 250 250 250
--234 234 234 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 246 246 246
--238 238 238 226 226 226 210 210 210 202 202 202
--195 195 195 195 195 195 210 210 210 158 158 158
--  6   6   6  14  14  14  50  50  50  14  14  14
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   6   6   6  86  86  86  46  46  46
-- 18  18  18   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 22  22  22  54  54  54  70  70  70   2   2   6
--  2   2   6  10  10  10   2   2   6  22  22  22
--166 166 166 231 231 231 250 250 250 253 253 253
--253 253 253 253 253 253 253 253 253 250 250 250
--242 242 242 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 246 246 246
--231 231 231 206 206 206 198 198 198 226 226 226
-- 94  94  94   2   2   6   6   6   6  38  38  38
-- 30  30  30   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  62  62  62  66  66  66
-- 26  26  26  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  74  74  74  50  50  50   2   2   6
-- 26  26  26  26  26  26   2   2   6 106 106 106
--238 238 238 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 246 246 246 218 218 218 202 202 202
--210 210 210  14  14  14   2   2   6   2   2   6
-- 30  30  30  22  22  22   2   2   6   2   2   6
--  2   2   6   2   2   6  18  18  18  86  86  86
-- 42  42  42  14  14  14   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 42  42  42  90  90  90  22  22  22   2   2   6
-- 42  42  42   2   2   6  18  18  18 218 218 218
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 250 250 250 221 221 221
--218 218 218 101 101 101   2   2   6  14  14  14
-- 18  18  18  38  38  38  10  10  10   2   2   6
--  2   2   6   2   2   6   2   2   6  78  78  78
-- 58  58  58  22  22  22   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 54  54  54  82  82  82   2   2   6  26  26  26
-- 22  22  22   2   2   6 123 123 123 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 250 250 250
--238 238 238 198 198 198   6   6   6  38  38  38
-- 58  58  58  26  26  26  38  38  38   2   2   6
--  2   2   6   2   2   6   2   2   6  46  46  46
-- 78  78  78  30  30  30  10  10  10   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  10  10  10  30  30  30
-- 74  74  74  58  58  58   2   2   6  42  42  42
--  2   2   6  22  22  22 231 231 231 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 250 250 250
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 246 246 246  46  46  46  38  38  38
-- 42  42  42  14  14  14  38  38  38  14  14  14
--  2   2   6   2   2   6   2   2   6   6   6   6
-- 86  86  86  46  46  46  14  14  14   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  14  14  14  42  42  42
-- 90  90  90  18  18  18  18  18  18  26  26  26
--  2   2   6 116 116 116 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 250 250 250 238 238 238
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253  94  94  94   6   6   6
--  2   2   6   2   2   6  10  10  10  34  34  34
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 74  74  74  58  58  58  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  10  10  10  26  26  26  66  66  66
-- 82  82  82   2   2   6  38  38  38   6   6   6
-- 14  14  14 210 210 210 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 246 246 246 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 144 144 144   2   2   6
--  2   2   6   2   2   6   2   2   6  46  46  46
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 42  42  42  74  74  74  30  30  30  10  10  10
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  14  14  14  42  42  42  90  90  90
-- 26  26  26   6   6   6  42  42  42   2   2   6
-- 74  74  74 250 250 250 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 242 242 242 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 182 182 182   2   2   6
--  2   2   6   2   2   6   2   2   6  46  46  46
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 10  10  10  86  86  86  38  38  38  10  10  10
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 10  10  10  26  26  26  66  66  66  82  82  82
--  2   2   6  22  22  22  18  18  18   2   2   6
--149 149 149 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 234 234 234 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 206 206 206   2   2   6
--  2   2   6   2   2   6   2   2   6  38  38  38
--  2   2   6   2   2   6   2   2   6   2   2   6
--  6   6   6  86  86  86  46  46  46  14  14  14
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 18  18  18  46  46  46  86  86  86  18  18  18
--  2   2   6  34  34  34  10  10  10   6   6   6
--210 210 210 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 234 234 234 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 221 221 221   6   6   6
--  2   2   6   2   2   6   6   6   6  30  30  30
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  82  82  82  54  54  54  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 26  26  26  66  66  66  62  62  62   2   2   6
--  2   2   6  38  38  38  10  10  10  26  26  26
--238 238 238 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 238 238 238
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231   6   6   6
--  2   2   6   2   2   6  10  10  10  30  30  30
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  66  66  66  58  58  58  22  22  22
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 38  38  38  78  78  78   6   6   6   2   2   6
--  2   2   6  46  46  46  14  14  14  42  42  42
--246 246 246 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 234 234 234  10  10  10
--  2   2   6   2   2   6  22  22  22  14  14  14
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  66  66  66  62  62  62  22  22  22
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 50  50  50  74  74  74   2   2   6   2   2   6
-- 14  14  14  70  70  70  34  34  34  62  62  62
--250 250 250 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 246 246 246
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 234 234 234  14  14  14
--  2   2   6   2   2   6  30  30  30   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  66  66  66  62  62  62  22  22  22
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 54  54  54  62  62  62   2   2   6   2   2   6
--  2   2   6  30  30  30  46  46  46  70  70  70
--250 250 250 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 246 246 246
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 226 226 226  10  10  10
--  2   2   6   6   6   6  30  30  30   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  66  66  66  58  58  58  22  22  22
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  22  22  22
-- 58  58  58  62  62  62   2   2   6   2   2   6
--  2   2   6   2   2   6  30  30  30  78  78  78
--250 250 250 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 246 246 246
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 206 206 206   2   2   6
-- 22  22  22  34  34  34  18  14   6  22  22  22
-- 26  26  26  18  18  18   6   6   6   2   2   6
--  2   2   6  82  82  82  54  54  54  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  26  26  26
-- 62  62  62 106 106 106  74  54  14 185 133  11
--210 162  10 121  92   8   6   6   6  62  62  62
--238 238 238 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 246 246 246
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 158 158 158  18  18  18
-- 14  14  14   2   2   6   2   2   6   2   2   6
--  6   6   6  18  18  18  66  66  66  38  38  38
--  6   6   6  94  94  94  50  50  50  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 10  10  10  10  10  10  18  18  18  38  38  38
-- 78  78  78 142 134 106 216 158  10 242 186  14
--246 190  14 246 190  14 156 118  10  10  10  10
-- 90  90  90 238 238 238 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 250 250 250
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 246 230 190
--238 204  91 238 204  91 181 142  44  37  26   9
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  38  38  38  46  46  46
-- 26  26  26 106 106 106  54  54  54  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  14  14  14  22  22  22
-- 30  30  30  38  38  38  50  50  50  70  70  70
--106 106 106 190 142  34 226 170  11 242 186  14
--246 190  14 246 190  14 246 190  14 154 114  10
--  6   6   6  74  74  74 226 226 226 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 250 250 250
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 228 184  62
--241 196  14 241 208  19 232 195  16  38  30  10
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   6   6   6  30  30  30  26  26  26
--203 166  17 154 142  90  66  66  66  26  26  26
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  18  18  18  38  38  38  58  58  58
-- 78  78  78  86  86  86 101 101 101 123 123 123
--175 146  61 210 150  10 234 174  13 246 186  14
--246 190  14 246 190  14 246 190  14 238 190  10
--102  78  10   2   2   6  46  46  46 198 198 198
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 234 234 234 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 224 178  62
--242 186  14 241 196  14 210 166  10  22  18   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   6   6   6 121  92   8
--238 202  15 232 195  16  82  82  82  34  34  34
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 14  14  14  38  38  38  70  70  70 154 122  46
--190 142  34 200 144  11 197 138  11 197 138  11
--213 154  11 226 170  11 242 186  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--225 175  15  46  32   6   2   2   6  22  22  22
--158 158 158 250 250 250 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 250 250 250 242 242 242 224 178  62
--239 182  13 236 186  11 213 154  11  46  32   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  61  42   6 225 175  15
--238 190  10 236 186  11 112 100  78  42  42  42
-- 14  14  14   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 22  22  22  54  54  54 154 122  46 213 154  11
--226 170  11 230 174  11 226 170  11 226 170  11
--236 178  12 242 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--241 196  14 184 144  12  10  10  10   2   2   6
--  6   6   6 116 116 116 242 242 242 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 231 231 231 198 198 198 214 170  54
--236 178  12 236 178  12 210 150  10 137  92   6
-- 18  14   6   2   2   6   2   2   6   2   2   6
--  6   6   6  70  47   6 200 144  11 236 178  12
--239 182  13 239 182  13 124 112  88  58  58  58
-- 22  22  22   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  70  70  70 180 133  36 226 170  11
--239 182  13 242 186  14 242 186  14 246 186  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 232 195  16  98  70   6   2   2   6
--  2   2   6   2   2   6  66  66  66 221 221 221
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 206 206 206 198 198 198 214 166  58
--230 174  11 230 174  11 216 158  10 192 133   9
--163 110   8 116  81   8 102  78  10 116  81   8
--167 114   7 197 138  11 226 170  11 239 182  13
--242 186  14 242 186  14 162 146  94  78  78  78
-- 34  34  34  14  14  14   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 30  30  30  78  78  78 190 142  34 226 170  11
--239 182  13 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 241 196  14 203 166  17  22  18   6
--  2   2   6   2   2   6   2   2   6  38  38  38
--218 218 218 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--250 250 250 206 206 206 198 198 198 202 162  69
--226 170  11 236 178  12 224 166  10 210 150  10
--200 144  11 197 138  11 192 133   9 197 138  11
--210 150  10 226 170  11 242 186  14 246 190  14
--246 190  14 246 186  14 225 175  15 124 112  88
-- 62  62  62  30  30  30  14  14  14   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  78  78  78 174 135  50 224 166  10
--239 182  13 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 241 196  14 139 102  15
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 78  78  78 250 250 250 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--250 250 250 214 214 214 198 198 198 190 150  46
--219 162  10 236 178  12 234 174  13 224 166  10
--216 158  10 213 154  11 213 154  11 216 158  10
--226 170  11 239 182  13 246 190  14 246 190  14
--246 190  14 246 190  14 242 186  14 206 162  42
--101 101 101  58  58  58  30  30  30  14  14  14
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  74  74  74 174 135  50 216 158  10
--236 178  12 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 241 196  14 226 184  13
-- 61  42   6   2   2   6   2   2   6   2   2   6
-- 22  22  22 238 238 238 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 226 226 226 187 187 187 180 133  36
--216 158  10 236 178  12 239 182  13 236 178  12
--230 174  11 226 170  11 226 170  11 230 174  11
--236 178  12 242 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 186  14 239 182  13
--206 162  42 106 106 106  66  66  66  34  34  34
-- 14  14  14   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 26  26  26  70  70  70 163 133  67 213 154  11
--236 178  12 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 241 196  14
--190 146  13  18  14   6   2   2   6   2   2   6
-- 46  46  46 246 246 246 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 221 221 221  86  86  86 156 107  11
--216 158  10 236 178  12 242 186  14 246 186  14
--242 186  14 239 182  13 239 182  13 242 186  14
--242 186  14 246 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--242 186  14 225 175  15 142 122  72  66  66  66
-- 30  30  30  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 26  26  26  70  70  70 163 133  67 210 150  10
--236 178  12 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--232 195  16 121  92   8  34  34  34 106 106 106
--221 221 221 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--242 242 242  82  82  82  18  14   6 163 110   8
--216 158  10 236 178  12 242 186  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 242 186  14 163 133  67
-- 46  46  46  18  18  18   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  78  78  78 163 133  67 210 150  10
--236 178  12 246 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--241 196  14 215 174  15 190 178 144 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 218 218 218
-- 58  58  58   2   2   6  22  18   6 167 114   7
--216 158  10 236 178  12 246 186  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 186  14 242 186  14 190 150  46
-- 54  54  54  22  22  22   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 38  38  38  86  86  86 180 133  36 213 154  11
--236 178  12 246 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 232 195  16 190 146  13 214 214 214
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 250 250 250 170 170 170  26  26  26
--  2   2   6   2   2   6  37  26   9 163 110   8
--219 162  10 239 182  13 246 186  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 186  14 236 178  12 224 166  10 142 122  72
-- 46  46  46  18  18  18   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 50  50  50 109 106  95 192 133   9 224 166  10
--242 186  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--242 186  14 226 184  13 210 162  10 142 110  46
--226 226 226 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--198 198 198  66  66  66   2   2   6   2   2   6
--  2   2   6   2   2   6  50  34   6 156 107  11
--219 162  10 239 182  13 246 186  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 242 186  14
--234 174  13 213 154  11 154 122  46  66  66  66
-- 30  30  30  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  22  22  22
-- 58  58  58 154 121  60 206 145  10 234 174  13
--242 186  14 246 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 186  14 236 178  12 210 162  10 163 110   8
-- 61  42   6 138 138 138 218 218 218 250 250 250
--253 253 253 253 253 253 253 253 253 250 250 250
--242 242 242 210 210 210 144 144 144  66  66  66
--  6   6   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  61  42   6 163 110   8
--216 158  10 236 178  12 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 239 182  13 230 174  11 216 158  10
--190 142  34 124 112  88  70  70  70  38  38  38
-- 18  18  18   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  22  22  22
-- 62  62  62 168 124  44 206 145  10 224 166  10
--236 178  12 239 182  13 242 186  14 242 186  14
--246 186  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 236 178  12 216 158  10 175 118   6
-- 80  54   7   2   2   6   6   6   6  30  30  30
-- 54  54  54  62  62  62  50  50  50  38  38  38
-- 14  14  14   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   6   6   6  80  54   7 167 114   7
--213 154  11 236 178  12 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 242 186  14 239 182  13 239 182  13
--230 174  11 210 150  10 174 135  50 124 112  88
-- 82  82  82  54  54  54  34  34  34  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 50  50  50 158 118  36 192 133   9 200 144  11
--216 158  10 219 162  10 224 166  10 226 170  11
--230 174  11 236 178  12 239 182  13 239 182  13
--242 186  14 246 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 186  14 230 174  11 210 150  10 163 110   8
--104  69   6  10  10  10   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   6   6   6  91  60   6 167 114   7
--206 145  10 230 174  11 242 186  14 246 190  14
--246 190  14 246 190  14 246 186  14 242 186  14
--239 182  13 230 174  11 224 166  10 213 154  11
--180 133  36 124 112  88  86  86  86  58  58  58
-- 38  38  38  22  22  22  10  10  10   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 34  34  34  70  70  70 138 110  50 158 118  36
--167 114   7 180 123   7 192 133   9 197 138  11
--200 144  11 206 145  10 213 154  11 219 162  10
--224 166  10 230 174  11 239 182  13 242 186  14
--246 186  14 246 186  14 246 186  14 246 186  14
--239 182  13 216 158  10 185 133  11 152  99   6
--104  69   6  18  14   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   6   6   6  80  54   7 152  99   6
--192 133   9 219 162  10 236 178  12 239 182  13
--246 186  14 242 186  14 239 182  13 236 178  12
--224 166  10 206 145  10 192 133   9 154 121  60
-- 94  94  94  62  62  62  42  42  42  22  22  22
-- 14  14  14   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 18  18  18  34  34  34  58  58  58  78  78  78
--101  98  89 124 112  88 142 110  46 156 107  11
--163 110   8 167 114   7 175 118   6 180 123   7
--185 133  11 197 138  11 210 150  10 219 162  10
--226 170  11 236 178  12 236 178  12 234 174  13
--219 162  10 197 138  11 163 110   8 130  83   6
-- 91  60   6  10  10  10   2   2   6   2   2   6
-- 18  18  18  38  38  38  38  38  38  38  38  38
-- 38  38  38  38  38  38  38  38  38  38  38  38
-- 38  38  38  38  38  38  26  26  26   2   2   6
--  2   2   6   6   6   6  70  47   6 137  92   6
--175 118   6 200 144  11 219 162  10 230 174  11
--234 174  13 230 174  11 219 162  10 210 150  10
--192 133   9 163 110   8 124 112  88  82  82  82
-- 50  50  50  30  30  30  14  14  14   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  14  14  14  22  22  22  34  34  34
-- 42  42  42  58  58  58  74  74  74  86  86  86
--101  98  89 122 102  70 130  98  46 121  87  25
--137  92   6 152  99   6 163 110   8 180 123   7
--185 133  11 197 138  11 206 145  10 200 144  11
--180 123   7 156 107  11 130  83   6 104  69   6
-- 50  34   6  54  54  54 110 110 110 101  98  89
-- 86  86  86  82  82  82  78  78  78  78  78  78
-- 78  78  78  78  78  78  78  78  78  78  78  78
-- 78  78  78  82  82  82  86  86  86  94  94  94
--106 106 106 101 101 101  86  66  34 124  80   6
--156 107  11 180 123   7 192 133   9 200 144  11
--206 145  10 200 144  11 192 133   9 175 118   6
--139 102  15 109 106  95  70  70  70  42  42  42
-- 22  22  22  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  10  10  10
-- 14  14  14  22  22  22  30  30  30  38  38  38
-- 50  50  50  62  62  62  74  74  74  90  90  90
--101  98  89 112 100  78 121  87  25 124  80   6
--137  92   6 152  99   6 152  99   6 152  99   6
--138  86   6 124  80   6  98  70   6  86  66  30
--101  98  89  82  82  82  58  58  58  46  46  46
-- 38  38  38  34  34  34  34  34  34  34  34  34
-- 34  34  34  34  34  34  34  34  34  34  34  34
-- 34  34  34  34  34  34  38  38  38  42  42  42
-- 54  54  54  82  82  82  94  86  76  91  60   6
--134  86   6 156 107  11 167 114   7 175 118   6
--175 118   6 167 114   7 152  99   6 121  87  25
--101  98  89  62  62  62  34  34  34  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6   6   6   6  10  10  10
-- 18  18  18  22  22  22  30  30  30  42  42  42
-- 50  50  50  66  66  66  86  86  86 101  98  89
--106  86  58  98  70   6 104  69   6 104  69   6
--104  69   6  91  60   6  82  62  34  90  90  90
-- 62  62  62  38  38  38  22  22  22  14  14  14
-- 10  10  10  10  10  10  10  10  10  10  10  10
-- 10  10  10  10  10  10   6   6   6  10  10  10
-- 10  10  10  10  10  10  10  10  10  14  14  14
-- 22  22  22  42  42  42  70  70  70  89  81  66
-- 80  54   7 104  69   6 124  80   6 137  92   6
--134  86   6 116  81   8 100  82  52  86  86  86
-- 58  58  58  30  30  30  14  14  14   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  10  10  10  14  14  14
-- 18  18  18  26  26  26  38  38  38  54  54  54
-- 70  70  70  86  86  86  94  86  76  89  81  66
-- 89  81  66  86  86  86  74  74  74  50  50  50
-- 30  30  30  14  14  14   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  18  18  18  34  34  34  58  58  58
-- 82  82  82  89  81  66  89  81  66  89  81  66
-- 94  86  66  94  86  76  74  74  74  50  50  50
-- 26  26  26  14  14  14   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6   6   6   6  14  14  14  18  18  18
-- 30  30  30  38  38  38  46  46  46  54  54  54
-- 50  50  50  42  42  42  30  30  30  18  18  18
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  14  14  14  26  26  26
-- 38  38  38  50  50  50  58  58  58  58  58  58
-- 54  54  54  42  42  42  30  30  30  18  18  18
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
--  6   6   6  10  10  10  14  14  14  18  18  18
-- 18  18  18  14  14  14  10  10  10   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 14  14  14  18  18  18  22  22  22  22  22  22
-- 18  18  18  14  14  14  10  10  10   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 11 15 17 33 49 54 59 85 92 73 97 106 
+-83 116 129 105 131 142 115 114 122 74 88 93 20 29 31 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 6 6 6 10 10 10 10 10 10 
+-10 10 10 6 6 6 6 6 6 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 2 3 3 17 23 26 50 67 72 73 97 106 59 85 92 73 97 106 
+-105 131 142 124 127 131 105 131 142 105 131 142 53 75 83 6 8 8 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 6 6 6 10 10 10 14 14 14 22 22 22 26 26 26 30 30 30 34 34 34 
+-30 30 30 30 30 30 26 26 26 18 18 18 14 14 14 10 10 10 6 6 6 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 
+-0 0 0 1 1 1 26 35 39 59 85 92 59 85 92 59 85 92 29 43 47 53 75 83 
+-108 122 132 132 98 104 108 122 132 105 131 142 101 101 101 43 45 48 6 8 8 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-6 6 6 14 14 14 26 26 26 42 42 42 54 54 54 66 66 66 78 78 78 78 78 78 
+-78 78 78 74 74 74 66 66 66 54 54 54 42 42 42 26 26 26 18 18 18 10 10 10 
+-6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 
+-11 15 17 27 40 45 59 85 92 59 85 92 27 40 45 31 45 49 73 97 106 93 121 133 
+-108 122 132 108 122 132 105 131 142 108 122 132 105 131 142 73 97 106 26 35 39 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 
+-22 22 22 42 42 42 66 66 66 86 86 86 66 66 66 38 38 38 38 38 38 22 22 22 
+-26 26 26 34 34 34 54 54 54 66 66 66 86 86 86 70 70 70 46 46 46 26 26 26 
+-14 14 14 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 7 12 13 21 31 35 42 59 64 
+-53 75 83 53 75 83 50 67 72 42 59 64 32 40 45 42 59 64 73 97 106 116 116 116 
+-132 98 104 116 116 116 108 122 132 117 104 110 105 131 142 83 116 129 50 67 72 7 12 13 
+-1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 26 26 26 
+-50 50 50 82 82 82 58 58 58 6 6 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 6 6 6 54 54 54 86 86 86 66 66 66 
+-38 38 38 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 1 1 1 6 8 8 15 22 25 26 35 39 36 54 60 53 75 83 59 85 92 
+-59 85 92 48 63 69 15 22 25 12 17 20 52 67 79 94 94 94 132 98 104 132 98 104 
+-117 104 110 108 122 132 108 122 132 115 114 122 105 131 142 77 105 114 59 85 92 36 54 60 
+-7 12 13 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 22 22 22 50 50 50 
+-78 78 78 34 34 34 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 6 6 6 70 70 70 
+-78 78 78 46 46 46 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 15 22 25 29 43 47 36 54 60 42 59 64 42 59 64 48 63 69 21 31 35 
+-6 8 8 29 43 47 36 50 56 43 45 48 79 78 84 132 98 104 165 78 79 132 98 104 
+-108 122 132 117 104 110 117 104 110 108 122 132 77 105 114 73 97 106 95 131 149 78 102 129 
+-36 50 56 0 0 0 0 0 0 0 0 0 6 6 6 18 18 18 42 42 42 82 82 82 
+-26 26 26 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 2 2 6 14 14 14 46 46 46 34 34 34 6 6 6 2 2 6 
+-42 42 42 78 78 78 42 42 42 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-27 40 45 53 75 83 48 63 69 24 31 37 6 8 12 0 0 0 18 25 28 26 35 39 
+-12 17 20 26 35 39 65 78 84 112 81 86 152 81 83 137 83 86 132 98 104 117 104 110 
+-117 104 110 132 98 104 132 98 104 115 114 122 73 97 106 53 75 83 95 131 149 93 124 152 
+-68 78 128 15 22 25 0 0 0 0 0 0 10 10 10 30 30 30 66 66 66 58 58 58 
+-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 2 2 6 26 26 26 86 86 86 101 101 101 46 46 46 10 10 10 
+-2 2 6 58 58 58 70 70 70 34 34 34 10 10 10 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-36 50 56 21 30 33 4 7 7 0 0 0 1 1 1 17 12 12 69 31 31 68 59 64 
+-57 59 63 21 31 35 32 40 45 86 73 69 152 81 83 152 81 83 117 104 110 132 98 104 
+-152 81 83 132 98 104 108 122 132 77 105 114 77 105 114 93 121 133 95 131 149 93 124 152 
+-95 131 149 53 75 83 11 15 17 0 0 0 14 14 14 42 42 42 86 86 86 10 10 10 
+-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 2 2 6 30 30 30 94 94 94 94 94 94 58 58 58 26 26 26 
+-2 2 6 6 6 6 78 78 78 54 54 54 22 22 22 6 6 6 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-17 23 26 2 3 3 0 0 0 17 12 12 69 31 31 123 55 55 123 55 55 152 81 83 
+-86 73 69 17 23 26 7 12 13 45 54 57 101 101 101 137 83 86 132 98 104 132 98 104 
+-137 83 86 117 104 110 77 105 114 42 59 64 50 67 72 78 102 129 91 117 157 91 117 157 
+-95 131 149 83 116 129 40 48 73 6 6 6 22 22 22 62 62 62 62 62 62 2 2 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 2 2 6 26 26 26 54 54 54 38 38 38 18 18 18 10 10 10 
+-2 2 6 2 2 6 34 34 34 82 82 82 38 38 38 14 14 14 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-1 1 1 1 2 2 2 3 3 28 12 12 123 55 55 174 79 79 174 79 79 174 79 79 
+-152 81 83 68 59 64 26 35 39 27 40 45 79 78 84 137 83 86 165 78 79 137 83 86 
+-94 94 94 48 63 69 36 50 56 50 67 72 73 97 106 93 121 133 93 124 152 93 124 152 
+-95 131 149 91 118 149 78 102 129 27 40 45 30 30 30 78 78 78 30 30 30 2 2 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 2 2 6 10 10 10 10 10 10 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 2 2 6 78 78 78 50 50 50 18 18 18 6 6 6 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-4 5 3 24 53 24 19 31 15 8 7 3 90 61 47 165 78 79 174 79 79 174 79 79 
+-174 79 79 137 83 86 60 52 57 7 12 13 17 23 26 70 70 70 132 98 104 112 81 86 
+-79 78 84 31 45 49 15 22 25 53 75 83 91 118 149 86 106 160 91 117 157 93 124 152 
+-91 117 157 93 124 152 95 131 149 53 75 83 50 50 50 86 86 86 14 14 14 2 2 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 2 2 6 54 54 54 66 66 66 26 26 26 6 6 6 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-19 31 15 34 76 34 34 76 34 19 31 15 28 12 12 123 55 55 174 79 79 174 79 79 
+-174 79 79 165 78 79 112 81 86 32 40 45 15 22 25 38 53 58 65 78 84 29 31 32 
+-21 30 33 42 59 64 60 80 103 78 102 129 87 112 149 84 96 162 91 117 157 93 124 152 
+-91 117 157 93 124 152 93 121 133 59 85 92 57 68 71 82 85 86 2 2 6 2 2 6 
+-2 2 6 6 6 6 10 10 10 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 2 2 6 6 6 6 14 14 14 10 10 10 2 2 6 2 2 6 
+-2 2 6 2 2 6 2 2 6 18 18 18 82 82 82 34 34 34 10 10 10 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-34 76 34 40 89 40 40 89 40 34 76 34 8 15 6 48 26 18 123 55 55 174 79 79 
+-174 79 79 174 79 79 137 83 86 68 59 64 32 40 45 21 30 33 31 45 49 21 31 35 
+-12 17 20 48 63 69 78 102 129 81 88 166 84 96 162 91 117 157 93 124 152 91 117 157 
+-93 124 152 95 131 149 83 116 129 59 85 92 57 68 71 86 86 86 2 2 6 2 2 6 
+-6 6 6 6 6 6 22 22 22 34 34 34 6 6 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 18 18 18 34 34 34 10 10 10 50 50 50 22 22 22 2 2 6 
+-2 2 6 2 2 6 2 2 6 10 10 10 86 86 86 42 42 42 14 14 14 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-40 89 40 40 89 40 40 89 40 40 89 40 24 53 24 6 6 6 69 31 31 123 55 55 
+-123 55 55 90 61 47 69 31 31 36 32 33 21 31 35 7 12 13 18 25 28 48 63 69 
+-60 80 103 68 78 128 84 101 153 84 96 162 84 96 162 91 117 157 91 117 157 84 96 162 
+-91 117 157 73 97 106 48 63 69 50 67 72 57 59 63 86 86 86 2 2 6 2 2 6 
+-38 38 38 116 116 116 94 94 94 22 22 22 22 22 22 2 2 6 2 2 6 2 2 6 
+-14 14 14 86 86 86 124 131 137 170 170 170 151 151 151 38 38 38 26 26 26 6 6 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 86 86 86 46 46 46 14 14 14 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-34 76 34 40 89 40 40 89 40 40 89 40 34 76 34 19 31 15 17 12 12 48 26 18 
+-48 26 18 8 7 3 10 10 22 23 29 47 51 61 92 42 59 64 21 30 33 34 45 54 
+-68 78 128 81 88 166 81 82 173 86 106 160 86 106 160 84 96 162 86 106 160 87 112 149 
+-91 118 149 77 105 114 52 67 79 32 40 45 50 50 50 86 86 86 2 2 6 14 14 14 
+-124 131 137 198 198 198 195 195 195 116 116 116 10 10 10 2 2 6 2 2 6 6 6 6 
+-101 98 89 187 187 187 210 210 210 218 218 218 214 214 214 124 131 137 14 14 14 6 6 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 86 86 86 50 50 50 18 18 18 6 6 6 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-19 31 15 34 76 34 40 89 40 40 89 40 40 89 40 24 53 24 8 7 3 0 0 0 
+-6 8 12 28 32 52 51 61 92 54 54 122 74 77 160 68 78 128 26 35 39 6 8 8 
+-34 45 54 68 78 128 84 96 162 86 106 160 86 106 160 81 88 166 84 96 162 87 112 149 
+-73 97 106 36 50 56 33 49 54 18 18 18 46 46 46 86 86 86 2 2 6 54 54 54 
+-218 218 218 195 195 195 226 226 226 246 246 246 58 58 58 2 2 6 2 2 6 30 30 30 
+-210 210 210 253 253 253 170 170 170 124 127 131 221 221 221 234 234 234 74 74 74 2 2 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 70 70 70 58 58 58 22 22 22 6 6 6 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-4 5 3 24 53 24 40 89 40 40 89 40 34 76 34 12 22 15 4 5 3 4 5 3 
+-13 17 26 54 54 122 78 78 174 78 78 174 78 78 174 74 77 160 51 61 92 21 31 35 
+-26 35 39 53 75 83 84 101 153 81 82 173 81 88 166 84 101 153 60 80 103 60 80 103 
+-53 75 83 38 53 58 42 59 64 22 22 22 46 46 46 82 82 82 2 2 6 106 106 106 
+-170 170 170 26 26 26 86 86 86 226 226 226 124 127 131 10 10 10 14 14 14 46 46 46 
+-231 231 231 190 190 190 6 6 6 70 70 70 90 90 90 238 238 238 151 151 151 2 2 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 70 70 70 58 58 58 22 22 22 6 6 6 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-1 2 2 8 15 6 24 53 24 34 76 34 19 31 15 8 15 6 63 55 20 63 55 20 
+-18 18 18 40 48 73 74 77 160 78 78 174 78 78 174 81 82 173 74 77 160 52 67 79 
+-17 23 26 21 31 35 60 80 103 81 88 166 74 77 160 78 102 129 36 54 60 12 17 20 
+-42 59 64 48 63 69 21 31 35 18 18 18 42 42 42 86 86 86 6 6 6 116 116 116 
+-106 106 106 6 6 6 70 70 70 151 151 151 124 127 131 18 18 18 38 38 38 54 54 54 
+-221 221 221 106 106 106 2 2 6 14 14 14 46 46 46 190 190 190 198 198 198 2 2 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 74 74 74 62 62 62 22 22 22 6 6 6 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-11 15 17 0 0 0 12 22 15 19 31 15 8 15 6 63 55 20 149 139 69 149 139 69 
+-63 55 20 10 10 22 54 54 122 78 78 174 78 78 174 78 78 174 81 82 173 68 78 128 
+-24 31 37 6 6 6 36 50 56 60 80 103 51 61 92 42 59 64 36 50 56 31 45 49 
+-29 43 47 27 40 45 6 8 8 14 14 14 42 42 42 94 94 94 14 14 14 101 101 101 
+-124 127 131 2 2 6 18 18 18 116 116 116 106 107 48 121 92 8 121 92 8 98 70 6 
+-170 170 170 106 106 106 2 2 6 2 2 6 2 2 6 195 195 195 195 195 195 6 6 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 74 74 74 62 62 62 22 22 22 6 6 6 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-26 35 39 3 5 6 1 1 1 2 3 3 35 31 12 133 118 54 175 176 80 175 176 80 
+-133 118 54 35 31 12 23 29 47 54 54 122 78 78 174 78 78 174 74 77 160 68 78 128 
+-51 61 92 31 45 49 26 35 39 36 50 56 29 43 47 7 12 13 21 30 33 42 59 64 
+-18 25 28 7 12 13 1 1 1 10 10 10 38 38 38 90 90 90 14 14 14 58 58 58 
+-210 210 210 26 26 26 62 42 6 154 114 10 226 170 11 237 188 10 220 174 15 184 138 11 
+-220 174 15 174 140 55 35 31 12 2 2 6 70 70 70 246 246 246 124 131 137 2 2 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 70 70 70 66 66 66 26 26 26 6 6 6 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-27 40 45 17 23 26 2 3 3 1 1 1 56 77 35 165 152 80 175 176 80 175 176 80 
+-175 176 80 106 107 48 22 22 22 28 32 52 54 54 122 54 54 122 51 61 92 28 32 52 
+-20 27 34 31 45 49 11 15 17 7 12 13 36 50 56 31 45 49 29 43 47 36 50 56 
+-6 8 8 0 0 0 0 0 0 10 10 10 38 38 38 86 86 86 14 14 14 10 10 10 
+-195 195 195 198 179 130 192 133 9 220 174 15 239 182 13 237 188 10 232 195 16 239 207 25 
+-237 201 50 241 208 19 232 195 16 184 138 11 198 179 130 208 206 196 42 42 42 2 2 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 50 50 50 74 74 74 30 30 30 6 6 6 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-15 22 25 26 35 39 15 22 25 0 0 0 35 31 12 133 118 54 175 176 80 175 176 80 
+-175 176 80 165 152 80 56 77 35 6 8 12 23 29 47 13 17 26 2 2 6 0 0 0 
+-1 2 2 26 35 39 26 35 39 26 35 39 42 59 64 42 59 64 20 29 31 6 8 8 
+-0 0 0 0 0 0 0 0 0 10 10 10 34 34 34 86 86 86 14 14 14 2 2 6 
+-121 92 8 192 133 9 219 162 10 239 182 13 237 188 10 232 195 16 241 208 19 237 201 50 
+-237 201 50 239 207 25 241 208 19 241 208 19 241 208 19 230 187 11 121 92 8 2 2 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 50 50 50 82 82 82 34 34 34 10 10 10 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-1 2 2 15 22 25 31 45 49 6 8 12 4 5 3 63 55 20 149 139 69 175 176 80 
+-175 176 80 175 176 80 106 107 48 20 16 6 1 1 1 0 0 0 2 3 3 11 15 17 
+-21 30 33 36 50 56 36 50 56 24 31 37 15 22 25 6 8 8 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 10 10 10 34 34 34 82 82 82 30 30 30 62 42 6 
+-180 123 7 206 145 10 230 174 11 239 182 13 237 188 10 238 202 15 241 208 19 237 201 50 
+-239 207 25 241 208 19 241 208 19 241 208 19 230 187 11 220 174 15 184 138 11 6 6 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 26 26 26 94 94 94 42 42 42 14 14 14 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 1 2 2 29 43 47 26 35 39 3 5 6 8 7 3 106 107 48 165 152 80 
+-175 176 80 149 139 69 63 55 20 4 5 3 2 3 3 12 17 20 26 35 39 26 35 39 
+-17 23 26 7 12 13 6 8 8 3 5 6 1 2 2 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 10 10 10 30 30 30 78 78 78 50 50 50 104 69 6 
+-192 133 9 216 158 10 236 178 12 237 188 10 232 195 16 241 208 19 237 201 50 237 201 50 
+-241 208 19 241 208 19 241 208 19 204 160 10 200 144 11 216 158 10 156 118 10 2 2 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 6 6 6 90 90 90 54 54 54 18 18 18 
+-6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 12 17 20 27 40 45 18 25 28 1 1 1 35 31 12 106 107 48 
+-149 139 69 56 77 35 8 7 3 1 2 2 12 17 20 26 35 39 21 31 35 11 15 17 
+-3 5 6 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 10 10 10 30 30 30 78 78 78 46 46 46 22 22 22 
+-137 92 6 204 160 10 239 182 13 237 188 10 238 202 15 241 208 19 241 208 19 241 208 19 
+-241 208 19 204 160 10 184 138 11 210 150 10 216 158 10 210 150 10 98 70 6 2 2 6 
+-6 6 6 54 54 54 14 14 14 2 2 6 2 2 6 62 62 62 74 74 74 30 30 30 
+-10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 1 1 1 15 22 25 33 49 54 12 17 20 2 3 3 35 31 12 
+-56 77 35 20 16 6 1 1 1 18 25 28 21 31 35 11 15 17 1 1 1 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 10 10 10 34 34 34 78 78 78 50 50 50 6 6 6 
+-88 55 22 139 102 15 190 146 13 230 187 11 239 207 25 232 195 16 220 174 15 190 146 13 
+-171 120 8 192 133 9 210 150 10 213 154 11 185 146 40 165 152 80 101 98 89 2 2 6 
+-2 2 6 78 78 78 116 116 116 58 58 58 2 2 6 22 22 22 90 90 90 46 46 46 
+-18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 1 1 1 27 40 45 29 43 47 3 5 6 2 3 3 
+-8 7 3 1 1 1 17 23 26 31 45 49 15 22 25 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 10 10 10 38 38 38 86 86 86 50 50 50 6 6 6 
+-124 127 131 168 158 138 156 107 11 171 120 8 204 160 10 184 138 11 197 138 11 200 144 11 
+-206 145 10 206 145 10 197 138 11 198 179 130 195 195 195 198 198 198 170 170 170 14 14 14 
+-2 2 6 22 22 22 116 116 116 116 116 116 22 22 22 2 2 6 74 74 74 70 70 70 
+-30 30 30 10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 11 15 17 31 45 49 26 35 39 3 5 6 
+-0 0 0 7 12 13 27 40 45 18 25 28 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 6 6 6 18 18 18 50 50 50 101 101 101 26 26 26 10 10 10 
+-124 131 137 190 190 190 168 158 138 156 107 11 197 138 11 200 144 11 197 138 11 192 133 9 
+-180 123 7 185 146 40 198 179 130 187 187 187 202 202 202 221 221 221 214 214 214 66 66 66 
+-2 2 6 2 2 6 50 50 50 62 62 62 6 6 6 2 2 6 10 10 10 90 90 90 
+-50 50 50 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 15 22 25 36 54 60 18 25 28 
+-0 0 0 21 30 33 27 40 45 2 3 3 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 10 10 10 34 34 34 74 74 74 74 74 74 2 2 6 6 6 6 
+-151 151 151 198 198 198 190 190 190 168 158 138 148 132 55 156 107 11 156 107 11 169 125 40 
+-168 158 138 187 187 187 190 190 190 210 210 210 246 246 246 253 253 253 253 253 253 180 180 180 
+-6 6 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 62 62 62 
+-74 74 74 34 34 34 14 14 14 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 27 40 45 35 52 58 
+-18 25 28 35 52 58 17 23 26 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 10 10 10 22 22 22 54 54 54 94 94 94 18 18 18 2 2 6 46 46 46 
+-234 234 234 221 221 221 190 190 190 190 190 190 190 190 190 187 187 187 187 187 187 190 190 190 
+-190 190 190 195 195 195 214 214 214 242 242 242 253 253 253 253 253 253 253 253 253 253 253 253 
+-82 82 82 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 14 14 14 
+-86 86 86 54 54 54 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 12 13 33 49 54 
+-52 72 81 36 54 60 6 8 8 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-6 6 6 18 18 18 46 46 46 90 90 90 46 46 46 18 18 18 6 6 6 180 180 180 
+-253 253 253 246 246 246 202 202 202 190 190 190 190 190 190 190 190 190 190 190 190 190 190 190 
+-202 202 202 231 231 231 250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-202 202 202 14 14 14 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-42 42 42 86 86 86 42 42 42 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 12 17 20 
+-36 54 60 29 43 47 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 
+-14 14 14 38 38 38 74 74 74 66 66 66 2 2 6 6 6 6 90 90 90 250 250 250 
+-253 253 253 253 253 253 238 238 238 198 198 198 190 190 190 190 190 190 195 195 195 221 221 221 
+-246 246 246 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 82 82 82 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 78 78 78 70 70 70 34 34 34 14 14 14 6 6 6 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-21 30 33 35 52 58 6 8 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 14 14 14 
+-34 34 34 66 66 66 78 78 78 6 6 6 2 2 6 18 18 18 218 218 218 253 253 253 
+-253 253 253 253 253 253 253 253 253 246 246 246 226 226 226 231 231 231 246 246 246 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 180 180 180 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 18 18 18 90 90 90 62 62 62 30 30 30 10 10 10 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-12 17 20 36 54 60 29 43 47 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 26 26 26 
+-58 58 58 90 90 90 18 18 18 2 2 6 2 2 6 106 106 106 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 250 250 250 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 231 231 231 18 18 18 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 18 18 18 94 94 94 54 54 54 26 26 26 10 10 10 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 21 30 33 35 52 58 6 8 12 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 22 22 22 50 50 50 
+-90 90 90 26 26 26 2 2 6 2 2 6 14 14 14 195 195 195 250 250 250 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-250 250 250 242 242 242 54 54 54 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 2 2 6 38 38 38 86 86 86 50 50 50 22 22 22 6 6 6 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 12 17 20 36 54 60 29 43 47 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 14 14 14 38 38 38 82 82 82 
+-34 34 34 2 2 6 2 2 6 2 2 6 42 42 42 195 195 195 246 246 246 253 253 253 
+-253 253 253 253 253 253 253 253 253 250 250 250 242 242 242 242 242 242 250 250 250 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 250 250 250 246 246 246 238 238 238 
+-226 226 226 231 231 231 101 101 101 6 6 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 38 38 38 82 82 82 42 42 42 14 14 14 
+-6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 21 30 33 35 52 58 6 8 12 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 26 26 26 62 62 62 66 66 66 
+-2 2 6 2 2 6 2 2 6 6 6 6 70 70 70 170 170 170 202 202 202 234 234 234 
+-246 246 246 250 250 250 250 250 250 238 238 238 226 226 226 231 231 231 238 238 238 250 250 250 
+-250 250 250 250 250 250 246 246 246 231 231 231 214 214 214 202 202 202 202 202 202 202 202 202 
+-198 198 198 202 202 202 180 180 180 18 18 18 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 62 62 62 66 66 66 30 30 30 
+-10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 12 17 20 36 54 60 29 43 47 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 14 14 14 42 42 42 82 82 82 18 18 18 
+-2 2 6 2 2 6 2 2 6 10 10 10 94 94 94 180 180 180 218 218 218 242 242 242 
+-250 250 250 253 253 253 253 253 253 250 250 250 234 234 234 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 246 246 246 238 238 238 226 226 226 210 210 210 202 202 202 
+-195 195 195 195 195 195 210 210 210 151 151 151 6 6 6 14 14 14 50 50 50 14 14 14 
+-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 6 6 6 86 86 86 46 46 46 
+-18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 21 30 33 35 52 58 6 8 12 0 0 0 
+-0 0 0 0 0 0 0 0 0 6 6 6 22 22 22 54 54 54 70 70 70 2 2 6 
+-2 2 6 10 10 10 2 2 6 22 22 22 170 170 170 231 231 231 250 250 250 253 253 253 
+-253 253 253 253 253 253 253 253 253 250 250 250 242 242 242 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 246 246 246 
+-231 231 231 202 202 202 198 198 198 226 226 226 94 94 94 2 2 6 6 6 6 38 38 38 
+-30 30 30 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 62 62 62 66 66 66 
+-26 26 26 10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 6 8 8 33 49 54 29 43 47 6 8 12 
+-0 0 0 0 0 0 0 0 0 10 10 10 30 30 30 74 74 74 50 50 50 2 2 6 
+-26 26 26 26 26 26 2 2 6 106 106 106 238 238 238 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 246 246 246 218 218 218 202 202 202 210 210 210 14 14 14 2 2 6 2 2 6 
+-30 30 30 22 22 22 2 2 6 2 2 6 2 2 6 2 2 6 18 18 18 86 86 86 
+-42 42 42 14 14 14 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 12 17 20 33 49 54 17 23 26 
+-0 0 0 0 0 0 0 0 0 14 14 14 42 42 42 90 90 90 22 22 22 2 2 6 
+-42 42 42 2 2 6 18 18 18 218 218 218 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 250 250 250 221 221 221 218 218 218 101 101 101 2 2 6 14 14 14 
+-18 18 18 38 38 38 10 10 10 2 2 6 2 2 6 2 2 6 2 2 6 78 78 78 
+-58 58 58 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 15 22 25 36 54 60 
+-0 0 0 0 0 0 0 0 0 18 18 18 54 54 54 82 82 82 2 2 6 26 26 26 
+-22 22 22 2 2 6 124 127 131 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 250 250 250 238 238 238 198 198 198 6 6 6 38 38 38 
+-58 58 58 26 26 26 38 38 38 2 2 6 2 2 6 2 2 6 2 2 6 46 46 46 
+-78 78 78 30 30 30 10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 21 30 33 
+-36 54 60 0 0 0 0 0 0 30 30 30 74 74 74 58 58 58 2 2 6 42 42 42 
+-2 2 6 22 22 22 231 231 231 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 246 246 246 46 46 46 38 38 38 
+-42 42 42 14 14 14 38 38 38 14 14 14 2 2 6 2 2 6 2 2 6 6 6 6 
+-86 86 86 46 46 46 14 14 14 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-36 54 60 0 0 0 0 0 0 42 42 42 90 90 90 18 18 18 18 18 18 26 26 26 
+-2 2 6 116 116 116 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 250 250 250 238 238 238 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 94 94 94 6 6 6 
+-2 2 6 2 2 6 10 10 10 34 34 34 2 2 6 2 2 6 2 2 6 2 2 6 
+-74 74 74 58 58 58 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 36 54 60 26 26 26 66 66 66 82 82 82 2 2 6 38 38 38 6 6 6 
+-14 14 14 210 210 210 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 246 246 246 242 242 242 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 151 151 151 2 2 6 
+-2 2 6 2 2 6 2 2 6 46 46 46 2 2 6 2 2 6 2 2 6 2 2 6 
+-42 42 42 74 74 74 30 30 30 10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-6 6 6 36 54 60 21 30 33 90 90 90 26 26 26 6 6 6 42 42 42 2 2 6 
+-74 74 74 250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 242 242 242 242 242 242 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 180 180 180 2 2 6 
+-2 2 6 2 2 6 2 2 6 46 46 46 2 2 6 2 2 6 2 2 6 2 2 6 
+-10 10 10 86 86 86 38 38 38 10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-10 10 10 26 26 26 36 54 60 82 82 82 2 2 6 22 22 22 18 18 18 2 2 6 
+-151 151 151 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 234 234 234 242 242 242 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 202 202 202 2 2 6 
+-2 2 6 2 2 6 2 2 6 38 38 38 2 2 6 2 2 6 2 2 6 2 2 6 
+-6 6 6 86 86 86 46 46 46 14 14 14 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 
+-18 18 18 46 46 46 86 86 86 36 54 60 2 2 6 34 34 34 10 10 10 6 6 6 
+-210 210 210 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 234 234 234 242 242 242 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 221 221 221 6 6 6 
+-2 2 6 2 2 6 6 6 6 30 30 30 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 82 82 82 54 54 54 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 
+-26 26 26 66 66 66 62 62 62 2 2 6 2 2 6 38 38 38 10 10 10 26 26 26 
+-238 238 238 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 231 231 231 238 238 238 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 231 231 231 6 6 6 
+-2 2 6 2 2 6 10 10 10 30 30 30 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 66 66 66 58 58 58 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 
+-38 38 38 78 78 78 6 6 6 2 2 6 2 2 6 46 46 46 14 14 14 42 42 42 
+-246 246 246 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 231 231 231 242 242 242 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 234 234 234 10 10 10 
+-2 2 6 2 2 6 22 22 22 14 14 14 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 66 66 66 62 62 62 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 18 18 18 
+-50 50 50 74 74 74 2 2 6 2 2 6 14 14 14 70 70 70 34 34 34 62 62 62 
+-250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 231 231 231 246 246 246 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 234 234 234 14 14 14 
+-2 2 6 2 2 6 30 30 30 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 66 66 66 62 62 62 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 18 18 18 
+-54 54 54 62 62 62 2 2 6 2 2 6 2 2 6 30 30 30 46 46 46 70 70 70 
+-250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 231 231 231 246 246 246 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 226 226 226 10 10 10 
+-2 2 6 6 6 6 30 30 30 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 66 66 66 58 58 58 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 22 22 22 
+-58 58 58 62 62 62 2 2 6 2 2 6 2 2 6 2 2 6 30 30 30 78 78 78 
+-250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 231 231 231 246 246 246 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 202 202 202 2 2 6 
+-22 22 22 34 34 34 20 16 6 22 22 22 26 26 26 18 18 18 6 6 6 2 2 6 
+-2 2 6 82 82 82 54 54 54 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 26 26 26 
+-62 62 62 106 106 106 63 55 20 184 138 11 204 160 10 121 92 8 6 6 6 62 62 62 
+-238 238 238 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 231 231 231 246 246 246 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 151 151 151 18 18 18 
+-14 14 14 2 2 6 2 2 6 2 2 6 6 6 6 18 18 18 66 66 66 38 38 38 
+-6 6 6 94 94 94 50 50 50 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 6 6 6 10 10 10 10 10 10 18 18 18 38 38 38 
+-78 78 78 138 132 106 216 158 10 242 186 14 246 190 14 246 190 14 156 118 10 10 10 10 
+-90 90 90 238 238 238 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 231 231 231 250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 246 230 190 214 187 87 214 187 87 185 146 40 35 31 12 
+-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 38 38 38 46 46 46 
+-26 26 26 106 106 106 54 54 54 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 6 6 6 14 14 14 22 22 22 30 30 30 38 38 38 50 50 50 70 70 70 
+-106 106 106 185 146 40 226 170 11 242 186 14 246 190 14 246 190 14 246 190 14 154 114 10 
+-6 6 6 74 74 74 226 226 226 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 231 231 231 250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 237 201 50 241 196 14 241 208 19 232 195 16 35 31 12 
+-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 6 6 6 30 30 30 26 26 26 
+-204 160 10 165 152 80 66 66 66 26 26 26 6 6 6 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-6 6 6 18 18 18 38 38 38 58 58 58 78 78 78 86 86 86 101 101 101 124 127 131 
+-174 140 55 210 150 10 234 174 13 246 186 14 246 190 14 246 190 14 246 190 14 237 188 10 
+-98 70 6 2 2 6 46 46 46 198 198 198 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 234 234 234 242 242 242 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 214 187 87 242 186 14 241 196 14 204 160 10 20 16 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 6 6 6 121 92 8 
+-238 202 15 232 195 16 82 82 82 34 34 34 10 10 10 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-14 14 14 38 38 38 70 70 70 148 132 55 185 146 40 200 144 11 197 138 11 197 138 11 
+-213 154 11 226 170 11 242 186 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-220 174 15 35 31 12 2 2 6 22 22 22 151 151 151 250 250 250 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 250 250 250 242 242 242 214 187 87 239 182 13 237 188 10 213 154 11 35 31 12 
+-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 62 42 6 220 174 15 
+-237 188 10 237 188 10 113 101 86 42 42 42 14 14 14 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 
+-22 22 22 54 54 54 148 132 55 213 154 11 226 170 11 230 174 11 226 170 11 226 170 11 
+-236 178 12 242 186 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-241 196 14 184 138 11 10 10 10 2 2 6 6 6 6 116 116 116 242 242 242 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 231 231 231 198 198 198 213 164 39 236 178 12 236 178 12 210 150 10 137 92 6 
+-20 16 6 2 2 6 2 2 6 2 2 6 6 6 6 62 42 6 200 144 11 236 178 12 
+-239 182 13 239 182 13 124 112 88 58 58 58 22 22 22 6 6 6 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 
+-30 30 30 70 70 70 169 125 40 226 170 11 239 182 13 242 186 14 242 186 14 246 186 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-246 190 14 232 195 16 98 70 6 2 2 6 2 2 6 2 2 6 66 66 66 221 221 221 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 202 202 202 198 198 198 213 164 39 230 174 11 230 174 11 216 158 10 192 133 9 
+-163 110 8 120 80 7 98 70 6 120 80 7 167 114 7 197 138 11 226 170 11 239 182 13 
+-242 186 14 242 186 14 165 152 80 78 78 78 34 34 34 14 14 14 6 6 6 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 
+-30 30 30 78 78 78 185 146 40 226 170 11 239 182 13 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-246 190 14 241 196 14 204 160 10 20 16 6 2 2 6 2 2 6 2 2 6 38 38 38 
+-218 218 218 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-250 250 250 202 202 202 198 198 198 213 164 39 226 170 11 236 178 12 224 166 10 210 150 10 
+-200 144 11 197 138 11 192 133 9 197 138 11 210 150 10 226 170 11 242 186 14 246 190 14 
+-246 190 14 246 186 14 220 174 15 124 112 88 62 62 62 30 30 30 14 14 14 6 6 6 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 
+-30 30 30 78 78 78 174 140 55 224 166 10 239 182 13 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 241 196 14 139 102 15 2 2 6 2 2 6 2 2 6 2 2 6 
+-78 78 78 250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-250 250 250 214 214 214 198 198 198 185 146 40 219 162 10 236 178 12 234 174 13 224 166 10 
+-216 158 10 213 154 11 213 154 11 216 158 10 226 170 11 239 182 13 246 190 14 246 190 14 
+-246 190 14 246 190 14 242 186 14 213 164 39 101 101 101 58 58 58 30 30 30 14 14 14 
+-6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 
+-30 30 30 74 74 74 174 140 55 216 158 10 236 178 12 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 241 196 14 230 187 11 62 42 6 2 2 6 2 2 6 2 2 6 
+-22 22 22 238 238 238 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 226 226 226 187 187 187 169 125 40 216 158 10 236 178 12 239 182 13 236 178 12 
+-230 174 11 226 170 11 226 170 11 230 174 11 236 178 12 242 186 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 186 14 239 182 13 213 164 39 106 106 106 66 66 66 34 34 34 
+-14 14 14 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 
+-26 26 26 70 70 70 149 139 69 213 154 11 236 178 12 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 241 196 14 190 146 13 20 16 6 2 2 6 2 2 6 
+-46 46 46 246 246 246 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 221 221 221 86 86 86 156 107 11 216 158 10 236 178 12 242 186 14 246 186 14 
+-242 186 14 239 182 13 239 182 13 242 186 14 242 186 14 246 186 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 242 186 14 220 174 15 149 139 69 66 66 66 
+-30 30 30 10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 
+-26 26 26 70 70 70 149 139 69 210 150 10 236 178 12 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 232 195 16 121 92 8 34 34 34 106 106 106 
+-221 221 221 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-242 242 242 82 82 82 20 16 6 163 110 8 216 158 10 236 178 12 242 186 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 242 186 14 149 139 69 
+-46 46 46 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 
+-30 30 30 78 78 78 149 139 69 210 150 10 236 178 12 246 186 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 241 196 14 220 174 15 198 179 130 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 218 218 218 
+-58 58 58 2 2 6 20 16 6 167 114 7 216 158 10 236 178 12 246 186 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 186 14 242 186 14 185 146 40 
+-54 54 54 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 14 14 14 
+-38 38 38 86 86 86 169 125 40 213 154 11 236 178 12 246 186 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 232 195 16 190 146 13 214 214 214 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 250 250 250 170 170 170 26 26 26 
+-2 2 6 2 2 6 35 31 12 163 110 8 219 162 10 239 182 13 246 186 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 186 14 236 178 12 224 166 10 149 139 69 
+-46 46 46 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 18 18 18 
+-50 50 50 113 101 86 192 133 9 224 166 10 242 186 14 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 242 186 14 230 187 11 204 160 10 133 118 54 
+-226 226 226 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 198 198 198 66 66 66 2 2 6 2 2 6 
+-2 2 6 2 2 6 62 42 6 156 107 11 219 162 10 239 182 13 246 186 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 242 186 14 234 174 13 213 154 11 148 132 55 66 66 66 
+-30 30 30 10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 22 22 22 
+-58 58 58 148 132 55 206 145 10 234 174 13 242 186 14 246 186 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 186 14 236 178 12 204 160 10 163 110 8 
+-62 42 6 124 131 137 218 218 218 250 250 250 253 253 253 253 253 253 253 253 253 250 250 250 
+-242 242 242 210 210 210 151 151 151 66 66 66 6 6 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 62 42 6 163 110 8 216 158 10 236 178 12 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-246 190 14 239 182 13 230 174 11 216 158 10 185 146 40 124 112 88 70 70 70 38 38 38 
+-18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 22 22 22 
+-62 62 62 169 125 40 206 145 10 224 166 10 236 178 12 239 182 13 242 186 14 242 186 14 
+-246 186 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 236 178 12 216 158 10 171 120 8 
+-85 57 6 2 2 6 6 6 6 30 30 30 54 54 54 62 62 62 50 50 50 38 38 38 
+-14 14 14 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 6 6 6 85 57 6 167 114 7 213 154 11 236 178 12 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 242 186 14 239 182 13 239 182 13 
+-230 174 11 210 150 10 174 140 55 124 112 88 82 82 82 54 54 54 34 34 34 18 18 18 
+-6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 18 18 18 
+-50 50 50 169 125 40 192 133 9 200 144 11 216 158 10 219 162 10 224 166 10 226 170 11 
+-230 174 11 236 178 12 239 182 13 239 182 13 242 186 14 246 186 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 186 14 230 174 11 210 150 10 163 110 8 
+-104 69 6 10 10 10 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 6 6 6 85 57 6 167 114 7 206 145 10 230 174 11 242 186 14 246 190 14 
+-246 190 14 246 190 14 246 186 14 242 186 14 239 182 13 230 174 11 224 166 10 213 154 11 
+-169 125 40 124 112 88 86 86 86 58 58 58 38 38 38 22 22 22 10 10 10 6 6 6 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 14 14 14 
+-34 34 34 70 70 70 133 118 54 169 125 40 167 114 7 180 123 7 192 133 9 197 138 11 
+-200 144 11 206 145 10 213 154 11 219 162 10 224 166 10 230 174 11 239 182 13 242 186 14 
+-246 186 14 246 186 14 246 186 14 246 186 14 239 182 13 216 158 10 184 138 11 152 99 6 
+-104 69 6 20 16 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 6 6 6 85 57 6 152 99 6 192 133 9 219 162 10 236 178 12 239 182 13 
+-246 186 14 242 186 14 239 182 13 236 178 12 224 166 10 206 145 10 192 133 9 148 132 55 
+-94 94 94 62 62 62 42 42 42 22 22 22 14 14 14 6 6 6 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 
+-18 18 18 34 34 34 58 58 58 78 78 78 101 98 89 124 112 88 133 118 54 156 107 11 
+-163 110 8 167 114 7 171 120 8 180 123 7 184 138 11 197 138 11 210 150 10 219 162 10 
+-226 170 11 236 178 12 236 178 12 234 174 13 219 162 10 197 138 11 163 110 8 134 84 6 
+-85 57 6 10 10 10 2 2 6 2 2 6 18 18 18 38 38 38 38 38 38 38 38 38 
+-38 38 38 38 38 38 38 38 38 38 38 38 38 38 38 38 38 38 26 26 26 2 2 6 
+-2 2 6 6 6 6 62 42 6 137 92 6 171 120 8 200 144 11 219 162 10 230 174 11 
+-234 174 13 230 174 11 219 162 10 210 150 10 192 133 9 163 110 8 124 112 88 82 82 82 
+-50 50 50 30 30 30 14 14 14 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-6 6 6 14 14 14 22 22 22 34 34 34 42 42 42 58 58 58 74 74 74 86 86 86 
+-101 98 89 113 101 86 133 118 54 121 92 8 137 92 6 152 99 6 163 110 8 180 123 7 
+-184 138 11 197 138 11 206 145 10 200 144 11 180 123 7 156 107 11 134 84 6 104 69 6 
+-62 42 6 54 54 54 106 106 106 101 98 89 86 86 86 82 82 82 78 78 78 78 78 78 
+-78 78 78 78 78 78 78 78 78 78 78 78 78 78 78 82 82 82 86 86 86 94 94 94 
+-106 106 106 101 101 101 90 61 47 120 80 7 156 107 11 180 123 7 192 133 9 200 144 11 
+-206 145 10 200 144 11 192 133 9 171 120 8 139 102 15 113 101 86 70 70 70 42 42 42 
+-22 22 22 10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 6 6 6 10 10 10 14 14 14 22 22 22 30 30 30 38 38 38 
+-50 50 50 62 62 62 74 74 74 90 90 90 101 98 89 113 101 86 121 92 8 120 80 7 
+-137 92 6 152 99 6 152 99 6 152 99 6 134 84 6 120 80 7 98 70 6 88 55 22 
+-101 98 89 82 82 82 58 58 58 46 46 46 38 38 38 34 34 34 34 34 34 34 34 34 
+-34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 38 38 38 42 42 42 
+-54 54 54 82 82 82 94 86 71 85 57 6 134 84 6 156 107 11 167 114 7 171 120 8 
+-171 120 8 167 114 7 152 99 6 121 92 8 101 98 89 62 62 62 34 34 34 18 18 18 
+-6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 6 6 6 10 10 10 
+-18 18 18 22 22 22 30 30 30 42 42 42 50 50 50 66 66 66 86 86 86 101 98 89 
+-94 86 71 98 70 6 104 69 6 104 69 6 104 69 6 85 57 6 88 55 22 90 90 90 
+-62 62 62 38 38 38 22 22 22 14 14 14 10 10 10 10 10 10 10 10 10 10 10 10 
+-10 10 10 10 10 10 6 6 6 10 10 10 10 10 10 10 10 10 10 10 10 14 14 14 
+-22 22 22 42 42 42 70 70 70 94 86 71 85 57 6 104 69 6 120 80 7 137 92 6 
+-134 84 6 120 80 7 94 86 71 86 86 86 58 58 58 30 30 30 14 14 14 6 6 6 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 6 6 6 10 10 10 14 14 14 18 18 18 26 26 26 38 38 38 54 54 54 
+-70 70 70 86 86 86 94 86 71 94 86 71 94 86 71 86 86 86 74 74 74 50 50 50 
+-30 30 30 14 14 14 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-6 6 6 18 18 18 34 34 34 58 58 58 82 82 82 94 86 71 94 86 71 94 86 71 
+-94 86 71 94 86 71 74 74 74 50 50 50 26 26 26 14 14 14 6 6 6 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 6 6 6 14 14 14 18 18 18 
+-30 30 30 38 38 38 46 46 46 54 54 54 50 50 50 42 42 42 30 30 30 18 18 18 
+-10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 6 6 6 14 14 14 26 26 26 38 38 38 50 50 50 58 58 58 58 58 58 
+-54 54 54 42 42 42 30 30 30 18 18 18 10 10 10 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 
+-6 6 6 10 10 10 14 14 14 18 18 18 18 18 18 14 14 14 10 10 10 6 6 6 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 6 6 6 14 14 14 18 18 18 22 22 22 22 22 22 
+-18 18 18 14 14 14 10 10 10 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
 +0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
 +0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
 +0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
@@ -2464,10 +1743,11 @@ diff -Nur linux-2.6.39.1/drivers/video/logo/logo_linux_clut224.ppm linux-2.6.39-
 +0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
 +0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
 +0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-diff -Nur linux-2.6.39.1/drivers/video/logo/logo_linux_mono.pbm linux-2.6.39-LIBRE/drivers/video/logo/logo_linux_mono.pbm
---- linux-2.6.39.1/drivers/video/logo/logo_linux_mono.pbm	2011-06-02 21:34:20.000000000 -0300
-+++ linux-2.6.39-LIBRE/drivers/video/logo/logo_linux_mono.pbm	2011-06-22 13:42:06.000000000 -0300
+ 
+diff --git a/drivers/video/logo/logo_linux_mono.pbm b/drivers/video/logo/logo_linux_mono.pbm
+index 2f14d9f..3d3c358 100644
+--- a/drivers/video/logo/logo_linux_mono.pbm
++++ b/drivers/video/logo/logo_linux_mono.pbm
 @@ -1,203 +1,159 @@
 -P1
 -# Standard black and white Linux logo
@@ -2831,16 +2111,15 @@ diff -Nur linux-2.6.39.1/drivers/video/logo/logo_linux_mono.pbm linux-2.6.39-LIB
 +0 0 0 0 0 0 0 0 0 0 
 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
 +0 0 0 0 0 0 0 0 0 0 
-diff -Nur linux-2.6.39.1/drivers/video/logo/logo_linux_vga16.ppm linux-2.6.39-LIBRE/drivers/video/logo/logo_linux_vga16.ppm
---- linux-2.6.39.1/drivers/video/logo/logo_linux_vga16.ppm	2011-06-02 21:34:20.000000000 -0300
-+++ linux-2.6.39-LIBRE/drivers/video/logo/logo_linux_vga16.ppm	2011-06-22 13:42:06.000000000 -0300
+diff --git a/drivers/video/logo/logo_linux_vga16.ppm b/drivers/video/logo/logo_linux_vga16.ppm
+index 1850c15..f279f97 100644
+--- a/drivers/video/logo/logo_linux_vga16.ppm
++++ b/drivers/video/logo/logo_linux_vga16.ppm
 @@ -1,1604 +1,18724 @@
  P3
 -# Standard 16-color Linux logo
 -80 80
-+# CREATOR: GIMP PNM Filter Version 1.1
-+80 78
- 255
+-255
 -  0   0   0   0   0   0   0   0   0   0   0   0
 -  0   0   0   0   0   0   0   0   0   0   0   0
 -  0   0   0   0   0   0   0   0   0   0   0   0
@@ -4441,6 +3720,9 @@ diff -Nur linux-2.6.39.1/drivers/video/logo/logo_linux_vga16.ppm linux-2.6.39-LI
 -  0   0   0   0   0   0   0   0   0   0   0   0
 -  0   0   0   0   0   0   0   0   0   0   0   0
 -  0   0   0   0   0   0   0   0   0   0   0   0
++# CREATOR: GIMP PNM Filter Version 1.1
++80 78
++255
 +0
 +0
 +0
diff --git a/kernels/linux-libre-xen/change-default-console-loglevel.patch b/kernels/linux-libre-xen/change-default-console-loglevel.patch
index 2685d4d23..22cd69a09 100644
--- a/kernels/linux-libre-xen/change-default-console-loglevel.patch
+++ b/kernels/linux-libre-xen/change-default-console-loglevel.patch
@@ -1,6 +1,6 @@
 diff -upr linux-3.0.orig/kernel/printk.c linux-3.0/kernel/printk.c
---- linux-3.0.orig/kernel/printk.c	2011-07-22 05:17:23.000000000 +0300
-+++ linux-3.0/kernel/printk.c	2011-07-27 14:43:07.000000000 +0300
+--- linux-3.0.orig/kernel/printk/printk.c	2011-07-22 05:17:23.000000000 +0300
++++ linux-3.0/kernel/printk/printk.c	2011-07-27 14:43:07.000000000 +0300
 @@ -58,7 +58,7 @@ void asmlinkage __attribute__((weak)) ea
  
  /* We show everything that is MORE important than this.. */
diff --git a/kernels/linux-libre-xen/config b/kernels/linux-libre-xen/config
index cc110feb7..52c3c2112 100644
--- a/kernels/linux-libre-xen/config
+++ b/kernels/linux-libre-xen/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.10.5-1 Kernel Configuration
+# Linux/x86 3.11.0-1 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -28,6 +28,8 @@ CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
 CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
+CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
 # CONFIG_ZONE_DMA32 is not set
 # CONFIG_AUDIT_ARCH is not set
 CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
@@ -47,6 +49,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
 #
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
+# CONFIG_COMPILE_TEST is not set
 CONFIG_LOCALVERSION="-LIBRE-XEN"
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_HAVE_KERNEL_GZIP=y
@@ -54,11 +57,13 @@ CONFIG_HAVE_KERNEL_BZIP2=y
 CONFIG_HAVE_KERNEL_LZMA=y
 CONFIG_HAVE_KERNEL_XZ=y
 CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_HAVE_KERNEL_LZ4=y
 CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_BZIP2 is not set
 # CONFIG_KERNEL_LZMA is not set
 # CONFIG_KERNEL_XZ is not set
 # CONFIG_KERNEL_LZO is not set
+# CONFIG_KERNEL_LZ4 is not set
 CONFIG_DEFAULT_HOSTNAME="(none)"
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
@@ -173,12 +178,12 @@ CONFIG_RD_BZIP2=y
 CONFIG_RD_LZMA=y
 CONFIG_RD_XZ=y
 CONFIG_RD_LZO=y
+CONFIG_RD_LZ4=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
 CONFIG_HAVE_UID16=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
-CONFIG_HOTPLUG=y
 CONFIG_HAVE_PCSPKR_PLATFORM=y
 # CONFIG_EXPERT is not set
 CONFIG_UID16=y
@@ -211,6 +216,7 @@ CONFIG_SLUB_DEBUG=y
 # CONFIG_COMPAT_BRK is not set
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
+CONFIG_SLUB_CPU_PARTIAL=y
 CONFIG_PROFILING=y
 CONFIG_TRACEPOINTS=y
 CONFIG_OPROFILE=m
@@ -254,6 +260,7 @@ CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 CONFIG_SECCOMP_FILTER=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+CONFIG_HAVE_ARCH_SOFT_DIRTY=y
 CONFIG_MODULES_USE_ELF_REL=y
 CONFIG_CLONE_BACKWARDS=y
 CONFIG_OLD_SIGSUSPEND3=y
@@ -287,6 +294,7 @@ CONFIG_BLK_DEV_THROTTLING=y
 #
 CONFIG_PARTITION_ADVANCED=y
 # CONFIG_ACORN_PARTITION is not set
+CONFIG_AIX_PARTITION=y
 # CONFIG_OSF_PARTITION is not set
 # CONFIG_AMIGA_PARTITION is not set
 # CONFIG_ATARI_PARTITION is not set
@@ -330,7 +338,6 @@ 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
@@ -462,6 +469,8 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
 CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CLEANCACHE=y
 CONFIG_FRONTSWAP=y
+CONFIG_ZBUD=y
+CONFIG_ZSWAP=y
 # CONFIG_HIGHPTE is not set
 CONFIG_X86_CHECK_BIOS_CORRUPTION=y
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
@@ -521,6 +530,7 @@ CONFIG_PM_ADVANCED_DEBUG=y
 CONFIG_PM_SLEEP_DEBUG=y
 CONFIG_PM_TRACE=y
 CONFIG_PM_TRACE_RTC=y
+CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
 CONFIG_ACPI=y
 CONFIG_ACPI_SLEEP=y
 # CONFIG_ACPI_PROCFS is not set
@@ -633,7 +643,7 @@ CONFIG_PCI_XEN=y
 CONFIG_PCI_OLPC=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=m
+CONFIG_HOTPLUG_PCI_PCIE=y
 CONFIG_PCIEAER=y
 # CONFIG_PCIE_ECRC is not set
 # CONFIG_PCIEAER_INJECT is not set
@@ -656,6 +666,10 @@ CONFIG_PCI_PRI=y
 CONFIG_PCI_PASID=y
 CONFIG_PCI_IOAPIC=y
 CONFIG_PCI_LABEL=y
+
+#
+# PCI host controller drivers
+#
 CONFIG_ISA_DMA_API=y
 CONFIG_ISA=y
 # CONFIG_EISA is not set
@@ -706,11 +720,14 @@ CONFIG_RAPIDIO_DISC_TIMEOUT=30
 CONFIG_RAPIDIO_DMA_ENGINE=y
 CONFIG_RAPIDIO_DEBUG=y
 CONFIG_RAPIDIO_ENUM_BASIC=m
+
+#
+# RapidIO Switch drivers
+#
 CONFIG_RAPIDIO_TSI57X=y
 CONFIG_RAPIDIO_CPS_XX=y
 CONFIG_RAPIDIO_TSI568=y
 CONFIG_RAPIDIO_CPS_GEN2=y
-CONFIG_RAPIDIO_TSI500=y
 
 #
 # Executable file formats / Emulations
@@ -1104,7 +1121,6 @@ CONFIG_IP_DCCP_TFRC_LIB=y
 CONFIG_NET_DCCPPROBE=m
 CONFIG_IP_SCTP=m
 CONFIG_NET_SCTPPROBE=m
-# CONFIG_SCTP_DBG_MSG is not set
 # CONFIG_SCTP_DBG_OBJCNT is not set
 # CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
 CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y
@@ -1222,15 +1238,19 @@ CONFIG_BATMAN_ADV_DAT=y
 CONFIG_BATMAN_ADV_NC=y
 # CONFIG_BATMAN_ADV_DEBUG is not set
 CONFIG_OPENVSWITCH=m
+CONFIG_OPENVSWITCH_GRE=y
 CONFIG_VSOCKETS=m
 CONFIG_VMWARE_VMCI_VSOCKETS=m
 CONFIG_NETLINK_MMAP=y
 CONFIG_NETLINK_DIAG=m
+CONFIG_NET_MPLS_GSO=m
 CONFIG_RPS=y
 CONFIG_RFS_ACCEL=y
 CONFIG_XPS=y
 CONFIG_NETPRIO_CGROUP=m
+CONFIG_NET_RX_BUSY_POLL=y
 CONFIG_BQL=y
+CONFIG_NET_FLOW_LIMIT=y
 
 #
 # Network testing
@@ -1403,6 +1423,7 @@ CONFIG_CEPH_LIB=m
 # CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
 CONFIG_NFC=m
 CONFIG_NFC_NCI=m
+# CONFIG_NFC_NCI_SPI is not set
 CONFIG_NFC_HCI=m
 # CONFIG_NFC_SHDLC is not set
 
@@ -1412,6 +1433,7 @@ CONFIG_NFC_HCI=m
 CONFIG_NFC_PN533=m
 CONFIG_NFC_WILINK=m
 CONFIG_NFC_MEI_PHY=m
+CONFIG_NFC_SIM=m
 CONFIG_NFC_PN544=m
 CONFIG_NFC_PN544_MEI=m
 CONFIG_NFC_MICROREAD=m
@@ -1432,7 +1454,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_FW_LOADER_USER_HELPER=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 CONFIG_SYS_HYPERVISOR=y
@@ -1586,7 +1608,6 @@ CONFIG_PROC_DEVICETREE=y
 CONFIG_OF_PROMTREE=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_IRQ=y
-CONFIG_OF_DEVICE=y
 CONFIG_OF_I2C=m
 CONFIG_OF_NET=y
 CONFIG_OF_MDIO=m
@@ -1656,7 +1677,6 @@ CONFIG_AD525X_DPOT_I2C=m
 # CONFIG_DUMMY_IRQ is not set
 # CONFIG_IBM_ASM is not set
 CONFIG_PHANTOM=m
-CONFIG_INTEL_MID_PTI=m
 CONFIG_SGI_IOC4=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIFM_7XX1=m
@@ -1922,6 +1942,7 @@ CONFIG_SATA_HIGHBANK=m
 CONFIG_SATA_MV=m
 CONFIG_SATA_NV=m
 CONFIG_SATA_PROMISE=m
+CONFIG_SATA_RCAR=m
 CONFIG_SATA_SIL=m
 CONFIG_SATA_SIS=m
 CONFIG_SATA_SVW=m
@@ -2028,6 +2049,7 @@ CONFIG_DM_DELAY=m
 CONFIG_DM_UEVENT=y
 CONFIG_DM_FLAKEY=m
 CONFIG_DM_VERITY=m
+CONFIG_DM_SWITCH=m
 CONFIG_TARGET_CORE=m
 CONFIG_TCM_IBLOCK=m
 CONFIG_TCM_FILEIO=m
@@ -2064,12 +2086,12 @@ CONFIG_I2O_PROC=m
 CONFIG_MACINTOSH_DRIVERS=y
 CONFIG_MAC_EMUMOUSEBTN=y
 CONFIG_NETDEVICES=y
+CONFIG_MII=m
 CONFIG_NET_CORE=y
 CONFIG_BONDING=m
 CONFIG_DUMMY=m
 CONFIG_EQUALIZER=m
 # CONFIG_NET_FC is not set
-CONFIG_MII=m
 CONFIG_IFB=m
 CONFIG_NET_TEAM=m
 CONFIG_NET_TEAM_MODE_BROADCAST=m
@@ -2091,6 +2113,7 @@ CONFIG_RIONET_RX_SIZE=128
 CONFIG_TUN=m
 CONFIG_VETH=m
 CONFIG_VIRTIO_NET=m
+CONFIG_NLMON=m
 CONFIG_SUNGEM_PHY=m
 # CONFIG_ARCNET is not set
 CONFIG_ATM_DRIVERS=y
@@ -2135,6 +2158,7 @@ CONFIG_CAIF_VIRTIO=m
 CONFIG_VHOST_NET=m
 CONFIG_VHOST_SCSI=m
 CONFIG_VHOST_RING=m
+CONFIG_VHOST=m
 
 #
 # Distributed Switch Architecture drivers
@@ -2164,6 +2188,8 @@ CONFIG_LANCE=m
 CONFIG_PCNET32=m
 CONFIG_PCMCIA_NMCLAN=m
 CONFIG_NI65=m
+CONFIG_NET_VENDOR_ARC=y
+CONFIG_ARC_EMAC=m
 CONFIG_NET_VENDOR_ATHEROS=y
 CONFIG_ATL2=m
 CONFIG_ATL1=m
@@ -2252,6 +2278,7 @@ CONFIG_NET_VENDOR_MELLANOX=y
 CONFIG_MLX4_EN=m
 CONFIG_MLX4_CORE=m
 CONFIG_MLX4_DEBUG=y
+# CONFIG_MLX5_CORE is not set
 CONFIG_NET_VENDOR_MICREL=y
 CONFIG_KS8842=m
 # CONFIG_KS8851 is not set
@@ -2296,6 +2323,7 @@ CONFIG_8139TOO_TUNE_TWISTER=y
 CONFIG_8139TOO_8129=y
 # CONFIG_8139_OLD_RX_RESET is not set
 CONFIG_R8169=m
+CONFIG_SH_ETH=m
 CONFIG_NET_VENDOR_RDC=y
 CONFIG_R6040=m
 CONFIG_NET_VENDOR_SEEQ=y
@@ -2312,6 +2340,8 @@ CONFIG_NET_VENDOR_SMSC=y
 CONFIG_SMC9194=m
 CONFIG_PCMCIA_SMC91C92=m
 CONFIG_EPIC100=m
+CONFIG_SMSC911X=m
+# CONFIG_SMSC911X_ARCH_HOOKS is not set
 CONFIG_SMSC9420=m
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_STMMAC_ETH=m
@@ -2365,7 +2395,8 @@ CONFIG_NATIONAL_PHY=m
 CONFIG_STE10XP=m
 CONFIG_LSI_ET1011C_PHY=m
 CONFIG_MICREL_PHY=m
-# CONFIG_MDIO_BITBANG is not set
+CONFIG_MDIO_BITBANG=m
+# CONFIG_MDIO_GPIO is not set
 CONFIG_MDIO_BUS_MUX=m
 CONFIG_MDIO_BUS_MUX_GPIO=m
 CONFIG_MDIO_BUS_MUX_MMIOREG=m
@@ -2479,9 +2510,14 @@ CONFIG_ATH6KL_USB=m
 CONFIG_AR5523=m
 CONFIG_WIL6210=m
 CONFIG_WIL6210_ISR_COR=y
+# CONFIG_WIL6210_TRACING is not set
+CONFIG_ATH10K=m
+CONFIG_ATH10K_PCI=m
+# CONFIG_ATH10K_DEBUG is not set
+CONFIG_ATH10K_DEBUGFS=y
+# CONFIG_ATH10K_TRACING is not set
 CONFIG_B43=m
 CONFIG_B43_BCMA=y
-# CONFIG_B43_BCMA_EXTRA is not set
 CONFIG_B43_SSB=y
 CONFIG_B43_PCI_AUTOSELECT=y
 CONFIG_B43_PCICORE_AUTOSELECT=y
@@ -2588,14 +2624,17 @@ 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_RTL_CARDS=m
 CONFIG_RTL8192CE=m
 CONFIG_RTL8192SE=m
 CONFIG_RTL8192DE=m
 CONFIG_RTL8723AE=m
 CONFIG_RTL8188EE=m
 CONFIG_RTL8192CU=m
+CONFIG_RTLWIFI=m
+CONFIG_RTLWIFI_PCI=m
+CONFIG_RTLWIFI_USB=m
+# CONFIG_RTLWIFI_DEBUG is not set
 CONFIG_RTL8192C_COMMON=m
 CONFIG_WL_TI=y
 CONFIG_WL1251=m
@@ -2613,6 +2652,9 @@ CONFIG_MWIFIEX=m
 CONFIG_MWIFIEX_SDIO=m
 CONFIG_MWIFIEX_PCIE=m
 CONFIG_MWIFIEX_USB=m
+CONFIG_CW1200=m
+CONFIG_CW1200_WLAN_SDIO=m
+CONFIG_CW1200_WLAN_SPI=m
 
 #
 # WiMAX Wireless Broadband devices
@@ -2897,6 +2939,9 @@ CONFIG_TOUCHSCREEN_CY8CTMG110=m
 CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
 CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
 # CONFIG_TOUCHSCREEN_CYTTSP_SPI is not set
+CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m
+CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m
+CONFIG_TOUCHSCREEN_CYTTSP4_SPI=m
 CONFIG_TOUCHSCREEN_DYNAPRO=m
 CONFIG_TOUCHSCREEN_HAMPSHIRE=m
 CONFIG_TOUCHSCREEN_EETI=m
@@ -2976,7 +3021,7 @@ CONFIG_INPUT_RETU_PWRBUTTON=m
 CONFIG_INPUT_UINPUT=m
 CONFIG_INPUT_PCF50633_PMU=m
 CONFIG_INPUT_PCF8574=m
-CONFIG_INPUT_PWM_BEEPER=m
+# CONFIG_INPUT_PWM_BEEPER is not set
 CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
 CONFIG_INPUT_ADXL34X=m
 CONFIG_INPUT_ADXL34X_I2C=m
@@ -3001,6 +3046,7 @@ CONFIG_SERIO_ALTERA_PS2=m
 CONFIG_SERIO_PS2MULT=m
 CONFIG_SERIO_ARC_PS2=m
 CONFIG_SERIO_APBPS2=m
+CONFIG_SERIO_OLPC_APSP=m
 CONFIG_GAMEPORT=m
 CONFIG_GAMEPORT_NS558=m
 CONFIG_GAMEPORT_L4=m
@@ -3036,7 +3082,6 @@ CONFIG_N_GSM=m
 CONFIG_TRACE_ROUTER=m
 CONFIG_TRACE_SINK=m
 # CONFIG_DEVKMEM is not set
-# CONFIG_STALDRV is not set
 
 #
 # Serial drivers
@@ -3077,6 +3122,7 @@ CONFIG_SERIAL_ARC=m
 CONFIG_SERIAL_ARC_NR_PORTS=1
 CONFIG_SERIAL_RP2=m
 CONFIG_SERIAL_RP2_NR_UARTS=32
+CONFIG_SERIAL_FSL_LPUART=m
 CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
 CONFIG_PPDEV=m
@@ -3175,7 +3221,6 @@ CONFIG_I2C_DESIGNWARE_CORE=m
 CONFIG_I2C_DESIGNWARE_PCI=m
 CONFIG_I2C_EG20T=m
 # CONFIG_I2C_GPIO is not set
-CONFIG_I2C_INTEL_MID=m
 CONFIG_I2C_OCORES=m
 CONFIG_I2C_PCA_PLATFORM=m
 CONFIG_I2C_PXA=m
@@ -3229,11 +3274,6 @@ CONFIG_SPI_MASTER=y
 #
 # CONFIG_SPI_SPIDEV is not set
 # CONFIG_SPI_TLE62X0 is not set
-
-#
-# Qualcomm MSM SSBI bus support
-#
-# CONFIG_SSBI is not set
 # CONFIG_HSI is not set
 
 #
@@ -3387,6 +3427,7 @@ CONFIG_SENSORS_F71882FG=m
 CONFIG_SENSORS_F75375S=m
 CONFIG_SENSORS_FSCHMD=m
 CONFIG_SENSORS_G760A=m
+CONFIG_SENSORS_G762=m
 CONFIG_SENSORS_GL518SM=m
 CONFIG_SENSORS_GL520SM=m
 # CONFIG_SENSORS_GPIO_FAN is not set
@@ -3495,10 +3536,15 @@ CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 # CONFIG_THERMAL_DEFAULT_GOV_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_THERMAL_GOV_USER_SPACE=y
 # CONFIG_CPU_THERMAL is not set
 # CONFIG_THERMAL_EMULATION is not set
 CONFIG_INTEL_POWERCLAMP=m
+CONFIG_X86_PKG_TEMP_THERMAL=m
+
+#
+# Texas Instruments thermal drivers
+#
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -3546,6 +3592,7 @@ CONFIG_W83877F_WDT=m
 CONFIG_W83977F_WDT=m
 CONFIG_MACHZ_WDT=m
 CONFIG_SBC_EPX_C3_WATCHDOG=m
+CONFIG_MEN_A21_WDT=m
 CONFIG_XEN_WDT=m
 
 #
@@ -3612,6 +3659,7 @@ CONFIG_HTC_PASIC3=m
 CONFIG_LPC_ICH=m
 CONFIG_LPC_SCH=m
 # CONFIG_MFD_JANZ_CMODIO is not set
+# CONFIG_MFD_KEMPLD is not set
 # CONFIG_EZX_PCAP is not set
 CONFIG_MFD_VIPERBOARD=m
 CONFIG_MFD_RETU=m
@@ -3644,6 +3692,7 @@ CONFIG_MFD_ARIZONA_I2C=m
 # CONFIG_MFD_ARIZONA_SPI is not set
 CONFIG_MFD_WM5102=y
 CONFIG_MFD_WM5110=y
+# CONFIG_MFD_WM8997 is not set
 # CONFIG_MFD_WM831X_SPI is not set
 # CONFIG_REGULATOR is not set
 CONFIG_MEDIA_SUPPORT=m
@@ -3773,6 +3822,7 @@ CONFIG_USB_ZR364XX=m
 CONFIG_USB_STKWEBCAM=m
 CONFIG_USB_S2255=m
 CONFIG_USB_SN9C102=m
+CONFIG_VIDEO_USBTV=m
 
 #
 # Analog TV USB devices
@@ -4377,7 +4427,7 @@ CONFIG_LCD_PLATFORM=m
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_GENERIC is not set
 CONFIG_BACKLIGHT_LM3533=m
-CONFIG_BACKLIGHT_PWM=m
+# CONFIG_BACKLIGHT_PWM is not set
 CONFIG_BACKLIGHT_APPLE=m
 # CONFIG_BACKLIGHT_SAHARA is not set
 # CONFIG_BACKLIGHT_ADP8860 is not set
@@ -4399,18 +4449,6 @@ CONFIG_DUMMY_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_FONTS=y
-# CONFIG_FONT_8x8 is not set
-CONFIG_FONT_8x16=y
-# CONFIG_FONT_6x11 is not set
-# CONFIG_FONT_7x14 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_ACORN_8x8 is not set
-# CONFIG_FONT_MINI_4x6 is not set
-# CONFIG_FONT_SUN8x16 is not set
-# CONFIG_FONT_SUN12x22 is not set
-# CONFIG_FONT_10x18 is not set
-CONFIG_FONT_AUTOSELECT=y
 # CONFIG_LOGO is not set
 CONFIG_FB_SSD1307=m
 CONFIG_SOUND=m
@@ -4432,6 +4470,7 @@ CONFIG_SND_SEQUENCER_OSS=y
 CONFIG_SND_HRTIMER=m
 CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
 CONFIG_SND_DYNAMIC_MINORS=y
+CONFIG_SND_MAX_CARDS=32
 CONFIG_SND_SUPPORT_OLD_API=y
 CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SND_VERBOSE_PRINTK is not set
@@ -4563,6 +4602,7 @@ CONFIG_SND_HDA_CODEC_ANALOG=y
 CONFIG_SND_HDA_CODEC_SIGMATEL=y
 CONFIG_SND_HDA_CODEC_VIA=y
 CONFIG_SND_HDA_CODEC_HDMI=y
+CONFIG_SND_HDA_I915=y
 CONFIG_SND_HDA_CODEC_CIRRUS=y
 CONFIG_SND_HDA_CODEC_CONEXANT=y
 CONFIG_SND_HDA_CODEC_CA0110=y
@@ -4607,6 +4647,7 @@ CONFIG_SND_USB_CAIAQ=m
 CONFIG_SND_USB_CAIAQ_INPUT=y
 CONFIG_SND_USB_US122L=m
 CONFIG_SND_USB_6FIRE=m
+CONFIG_SND_USB_HIFACE=m
 CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWIRE_LIB=m
 CONFIG_SND_FIREWIRE_SPEAKERS=m
@@ -4645,9 +4686,11 @@ CONFIG_HID_DRAGONRISE=m
 CONFIG_DRAGONRISE_FF=y
 CONFIG_HID_EMS_FF=m
 CONFIG_HID_ELECOM=m
+CONFIG_HID_ELO=m
 CONFIG_HID_EZKEY=m
 CONFIG_HID_HOLTEK=m
 CONFIG_HOLTEK_FF=y
+CONFIG_HID_HUION=m
 CONFIG_HID_KEYTOUCH=m
 CONFIG_HID_KYE=m
 CONFIG_HID_UCLOGIC=m
@@ -4680,7 +4723,6 @@ CONFIG_HID_PICOLCD_LCD=y
 CONFIG_HID_PICOLCD_LEDS=y
 CONFIG_HID_PICOLCD_CIR=y
 CONFIG_HID_PRIMAX=m
-CONFIG_HID_PS3REMOTE=m
 CONFIG_HID_ROCCAT=m
 CONFIG_HID_SAITEK=m
 CONFIG_HID_SAMSUNG=m
@@ -4700,7 +4742,6 @@ CONFIG_HID_THRUSTMASTER=m
 CONFIG_THRUSTMASTER_FF=y
 CONFIG_HID_WACOM=m
 CONFIG_HID_WIIMOTE=m
-CONFIG_HID_WIIMOTE_EXT=y
 CONFIG_HID_ZEROPLUS=m
 CONFIG_ZEROPLUS_FF=y
 CONFIG_HID_ZYDACRON=m
@@ -4717,9 +4758,6 @@ CONFIG_USB_HIDDEV=y
 # I2C HID support
 #
 CONFIG_I2C_HID=m
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_USB_ARCH_HAS_XHCI=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_COMMON=m
 CONFIG_USB_ARCH_HAS_HCD=y
@@ -4753,7 +4791,9 @@ CONFIG_USB_OXU210HP_HCD=m
 CONFIG_USB_ISP116X_HCD=m
 CONFIG_USB_ISP1760_HCD=m
 CONFIG_USB_ISP1362_HCD=m
+CONFIG_USB_FUSBH200_HCD=m
 CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_PCI=m
 # CONFIG_USB_OHCI_HCD_SSB is not set
 # CONFIG_USB_OHCI_HCD_PLATFORM is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
@@ -4771,6 +4811,9 @@ CONFIG_USB_HWA_HCD=m
 # CONFIG_USB_HCD_BCMA is not set
 # CONFIG_USB_HCD_SSB is not set
 CONFIG_USB_MUSB_HDRC=m
+# CONFIG_USB_MUSB_HOST is not set
+# CONFIG_USB_MUSB_GADGET is not set
+CONFIG_USB_MUSB_DUAL_ROLE=y
 CONFIG_USB_MUSB_TUSB6010=m
 CONFIG_USB_MUSB_DSPS=m
 CONFIG_USB_MUSB_UX500=m
@@ -4894,6 +4937,8 @@ CONFIG_USB_SERIAL_WISHBONE=m
 CONFIG_USB_SERIAL_ZTE=m
 CONFIG_USB_SERIAL_SSU100=m
 CONFIG_USB_SERIAL_QT2=m
+CONFIG_USB_SERIAL_FLASHLOADER=m
+CONFIG_USB_SERIAL_SUUNTO=m
 # CONFIG_USB_SERIAL_DEBUG is not set
 
 #
@@ -4948,12 +4993,12 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 # USB Peripheral Controller
 #
 CONFIG_USB_FUSB300=m
+CONFIG_USB_FOTG210_UDC=m
 CONFIG_USB_R8A66597=m
 CONFIG_USB_RENESAS_USBHS_UDC=m
 CONFIG_USB_PXA27X=m
 CONFIG_USB_MV_UDC=m
 CONFIG_USB_MV_U3D=m
-CONFIG_USB_GADGET_MUSB_HDRC=m
 CONFIG_USB_M66592=m
 CONFIG_USB_AMD5536UDC=m
 CONFIG_USB_NET2272=m
@@ -4965,8 +5010,15 @@ CONFIG_USB_DUMMY_HCD=m
 CONFIG_USB_LIBCOMPOSITE=m
 CONFIG_USB_F_ACM=m
 CONFIG_USB_U_SERIAL=m
+CONFIG_USB_U_ETHER=m
+CONFIG_USB_U_RNDIS=m
 CONFIG_USB_F_SERIAL=m
 CONFIG_USB_F_OBEX=m
+CONFIG_USB_F_NCM=m
+CONFIG_USB_F_ECM=m
+CONFIG_USB_F_SUBSET=m
+CONFIG_USB_F_RNDIS=m
+# CONFIG_USB_CONFIGFS is not set
 # CONFIG_USB_ZERO is not set
 CONFIG_USB_AUDIO=m
 # CONFIG_GADGET_UAC1 is not set
@@ -5144,6 +5196,7 @@ CONFIG_RTC_DRV_RS5C372=m
 CONFIG_RTC_DRV_ISL1208=m
 CONFIG_RTC_DRV_ISL12022=m
 CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF2127=m
 CONFIG_RTC_DRV_PCF8523=m
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
@@ -5208,8 +5261,9 @@ CONFIG_DMADEVICES=y
 #
 CONFIG_INTEL_MID_DMAC=m
 CONFIG_INTEL_IOATDMA=m
+CONFIG_DW_DMAC_CORE=m
 CONFIG_DW_DMAC=m
-# CONFIG_DW_DMAC_BIG_ENDIAN_IO is not set
+CONFIG_DW_DMAC_PCI=m
 CONFIG_TIMB_DMA=m
 CONFIG_PCH_DMA=m
 CONFIG_DMA_ENGINE=y
@@ -5304,17 +5358,14 @@ CONFIG_COMEDI_PARPORT=m
 CONFIG_COMEDI_SERIAL2002=m
 CONFIG_COMEDI_SKEL=m
 CONFIG_COMEDI_ISA_DRIVERS=y
-CONFIG_COMEDI_ACL7225B=m
 CONFIG_COMEDI_PCL711=m
 CONFIG_COMEDI_PCL724=m
-CONFIG_COMEDI_PCL725=m
 CONFIG_COMEDI_PCL726=m
 CONFIG_COMEDI_PCL730=m
 CONFIG_COMEDI_PCL812=m
 CONFIG_COMEDI_PCL816=m
 CONFIG_COMEDI_PCL818=m
 CONFIG_COMEDI_PCM3724=m
-CONFIG_COMEDI_PCM3730=m
 CONFIG_COMEDI_AMPLC_DIO200_ISA=m
 CONFIG_COMEDI_AMPLC_PC236_ISA=m
 CONFIG_COMEDI_AMPLC_PC263_ISA=m
@@ -5350,6 +5401,7 @@ CONFIG_COMEDI_PCMMIO=m
 CONFIG_COMEDI_PCMUIO=m
 CONFIG_COMEDI_MULTIQ3=m
 CONFIG_COMEDI_POC=m
+CONFIG_COMEDI_S526=m
 CONFIG_COMEDI_PCI_DRIVERS=y
 CONFIG_COMEDI_8255_PCI=m
 CONFIG_COMEDI_ADDI_WATCHDOG=m
@@ -5404,7 +5456,6 @@ CONFIG_COMEDI_NI_LABPC_PCI=m
 CONFIG_COMEDI_NI_PCIDIO=m
 CONFIG_COMEDI_NI_PCIMIO=m
 CONFIG_COMEDI_RTD520=m
-CONFIG_COMEDI_S526=m
 CONFIG_COMEDI_S626=m
 CONFIG_COMEDI_SSV_DNP=m
 CONFIG_COMEDI_MITE=m
@@ -5521,7 +5572,6 @@ CONFIG_WIMAX_GDM72XX_WIMAX2=y
 CONFIG_WIMAX_GDM72XX_USB=y
 # CONFIG_WIMAX_GDM72XX_SDIO is not set
 CONFIG_WIMAX_GDM72XX_USB_PM=y
-CONFIG_CSR_WIFI=m
 CONFIG_NET_VENDOR_SILICOM=y
 CONFIG_SBYPASS=m
 CONFIG_BPCTL=m
@@ -5531,6 +5581,7 @@ CONFIG_FIREWIRE_SERIAL=m
 CONFIG_ZCACHE=m
 # CONFIG_ZCACHE_DEBUG is not set
 # CONFIG_USB_DWC2 is not set
+CONFIG_USB_BTMTK=m
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 CONFIG_ACERHDF=m
@@ -5580,6 +5631,8 @@ CONFIG_MXM_WMI=m
 CONFIG_INTEL_OAKTRAIL=m
 CONFIG_SAMSUNG_Q10=m
 CONFIG_APPLE_GMUX=m
+CONFIG_INTEL_RST=y
+CONFIG_INTEL_SMARTCONNECT=y
 CONFIG_PVPANIC=m
 
 #
@@ -5618,11 +5671,18 @@ CONFIG_MEMORY=y
 # CONFIG_IIO is not set
 # CONFIG_VME_BUS is not set
 CONFIG_PWM=y
+CONFIG_PWM_SYSFS=y
+# CONFIG_PWM_PCA9685 is not set
 CONFIG_IRQCHIP=y
 CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 # CONFIG_RESET_CONTROLLER is not set
+CONFIG_FMC=m
+CONFIG_FMC_FAKEDEV=m
+CONFIG_FMC_TRIVIAL=m
+CONFIG_FMC_WRITE_EEPROM=m
+CONFIG_FMC_CHARDEV=m
 
 #
 # Firmware Drivers
@@ -5641,9 +5701,7 @@ CONFIG_ISCSI_IBFT=m
 #
 # EFI (Extensible Firmware Interface) Support
 #
-CONFIG_EFI_VARS=m
-CONFIG_EFI_VARS_PSTORE=m
-CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
+# CONFIG_EFI_VARS is not set
 
 #
 # File systems
@@ -5815,6 +5873,7 @@ CONFIG_F2FS_FS=m
 CONFIG_F2FS_STAT_FS=y
 CONFIG_F2FS_FS_XATTR=y
 CONFIG_F2FS_FS_POSIX_ACL=y
+CONFIG_F2FS_FS_SECURITY=y
 CONFIG_EFIVAR_FS=y
 CONFIG_ORE=m
 CONFIG_NETWORK_FILESYSTEMS=y
@@ -5825,10 +5884,12 @@ CONFIG_NFS_V3_ACL=y
 CONFIG_NFS_V4=m
 CONFIG_NFS_SWAP=y
 CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
 CONFIG_PNFS_FILE_LAYOUT=m
 CONFIG_PNFS_BLOCK=m
 CONFIG_PNFS_OBJLAYOUT=m
 CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org"
+CONFIG_NFS_V4_SECURITY_LABEL=y
 CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
@@ -5838,6 +5899,7 @@ CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3=y
 CONFIG_NFSD_V3_ACL=y
 CONFIG_NFSD_V4=y
+CONFIG_NFSD_V4_SECURITY_LABEL=y
 # CONFIG_NFSD_FAULT_INJECTION is not set
 CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
@@ -5878,6 +5940,7 @@ CONFIG_AFS_FSCACHE=y
 CONFIG_9P_FS=m
 CONFIG_9P_FSCACHE=y
 CONFIG_9P_FS_POSIX_ACL=y
+CONFIG_9P_FS_SECURITY=y
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
 CONFIG_NLS_CODEPAGE_437=m
@@ -5936,68 +5999,95 @@ CONFIG_DLM=m
 # Kernel hacking
 #
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+
+#
+# printk and dmesg options
+#
 CONFIG_PRINTK_TIME=y
 CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
+# CONFIG_BOOT_PRINTK_DELAY is not set
+CONFIG_DYNAMIC_DEBUG=y
+
+#
+# Compile-time checks and compiler options
+#
+# CONFIG_DEBUG_INFO is not set
 CONFIG_ENABLE_WARN_DEPRECATED=y
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_FRAME_WARN=1024
-CONFIG_MAGIC_SYSRQ=y
 CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_READABLE_ASM is not set
 CONFIG_UNUSED_SYMBOLS=y
 CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
+CONFIG_FRAME_POINTER=y
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_KERNEL=y
+
+#
+# Memory Debugging
+#
+# CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_VIRTUAL is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+# CONFIG_DEBUG_HIGHMEM is not set
+CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+CONFIG_HAVE_ARCH_KMEMCHECK=y
 # CONFIG_DEBUG_SHIRQ is not set
+
+#
+# Debug Lockups and Hangs
+#
 CONFIG_LOCKUP_DETECTOR=y
 CONFIG_HARDLOCKUP_DETECTOR=y
 # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
 CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
-# CONFIG_PANIC_ON_OOPS is not set
-CONFIG_PANIC_ON_OOPS_VALUE=0
 CONFIG_DETECT_HUNG_TASK=y
 CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
 CONFIG_SCHED_DEBUG=y
 CONFIG_SCHEDSTATS=y
 CONFIG_TIMER_STATS=y
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_SLUB_DEBUG_ON is not set
-# CONFIG_SLUB_STATS is not set
-CONFIG_HAVE_DEBUG_KMEMLEAK=y
-# CONFIG_DEBUG_KMEMLEAK is not set
 # CONFIG_DEBUG_PREEMPT is not set
+
+#
+# Lock Debugging (spinlocks, mutexes, etc...)
+#
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
 CONFIG_DEBUG_MUTEXES=y
+# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
 # CONFIG_DEBUG_LOCK_ALLOC is not set
 # CONFIG_PROVE_LOCKING is not set
 # CONFIG_LOCK_STAT is not set
 # CONFIG_DEBUG_ATOMIC_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 CONFIG_STACKTRACE=y
-# CONFIG_DEBUG_STACK_USAGE is not set
 # CONFIG_DEBUG_KOBJECT is not set
-# CONFIG_DEBUG_HIGHMEM is not set
 CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_DEBUG_INFO is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_VIRTUAL is not set
 # CONFIG_DEBUG_WRITECOUNT is not set
-CONFIG_DEBUG_MEMORY_INIT=y
 # CONFIG_DEBUG_LIST is not set
-# CONFIG_TEST_LIST_SORT is not set
 # CONFIG_DEBUG_SG is not set
 # CONFIG_DEBUG_NOTIFIERS is not set
 # CONFIG_DEBUG_CREDENTIALS is not set
-CONFIG_ARCH_WANT_FRAME_POINTERS=y
-CONFIG_FRAME_POINTER=y
-# CONFIG_BOOT_PRINTK_DELAY is not set
 
 #
 # RCU Debugging
@@ -6009,18 +6099,12 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_RCU_CPU_STALL_VERBOSE is not set
 # CONFIG_RCU_CPU_STALL_INFO is not set
 # CONFIG_RCU_TRACE is not set
-# CONFIG_KPROBES_SANITY_TEST is not set
-# CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-CONFIG_LKDTM=m
 # CONFIG_NOTIFIER_ERROR_INJECTION is not set
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_LATENCYTOP is not set
 CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y
 # CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
 CONFIG_USER_STACKTRACE_SUPPORT=y
 CONFIG_NOP_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
@@ -6067,25 +6151,30 @@ CONFIG_MMIOTRACE=y
 # CONFIG_MMIOTRACE_TEST is not set
 CONFIG_RING_BUFFER_BENCHMARK=m
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
+
+#
+# Runtime Testing
+#
+CONFIG_LKDTM=m
+# CONFIG_TEST_LIST_SORT is not set
+# CONFIG_KPROBES_SANITY_TEST is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_RBTREE_TEST is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
+# CONFIG_ATOMIC64_SELFTEST is not set
+CONFIG_ASYNC_RAID6_TEST=m
+# CONFIG_TEST_STRING_HELPERS is not set
+CONFIG_TEST_KSTRTOX=m
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
 # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
-CONFIG_DYNAMIC_DEBUG=y
 # CONFIG_DMA_API_DEBUG is not set
-# CONFIG_ATOMIC64_SELFTEST is not set
-CONFIG_ASYNC_RAID6_TEST=m
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
-CONFIG_HAVE_ARCH_KMEMCHECK=y
-# CONFIG_TEST_STRING_HELPERS is not set
-CONFIG_TEST_KSTRTOX=m
 CONFIG_STRICT_DEVMEM=y
 CONFIG_X86_VERBOSE_BOOTUP=y
 CONFIG_EARLY_PRINTK=y
 # CONFIG_EARLY_PRINTK_DBGP is not set
-# CONFIG_DEBUG_STACKOVERFLOW is not set
 # CONFIG_X86_PTDUMP is not set
 CONFIG_DEBUG_RODATA=y
 # CONFIG_DEBUG_RODATA_TEST is not set
@@ -6109,6 +6198,7 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
 # CONFIG_CPA_DEBUG is not set
 # CONFIG_OPTIMIZE_INLINING is not set
 # CONFIG_DEBUG_NMI_SELFTEST is not set
+# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set
 
 #
 # Security options
@@ -6134,10 +6224,12 @@ CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/usr/bin/tomoyo-init"
 CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd"
 CONFIG_SECURITY_APPARMOR=y
 CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0
-# CONFIG_SECURITY_YAMA is not set
+CONFIG_SECURITY_YAMA=y
+CONFIG_SECURITY_YAMA_STACKED=y
 # CONFIG_IMA is not set
 # CONFIG_DEFAULT_SECURITY_TOMOYO is not set
 # CONFIG_DEFAULT_SECURITY_APPARMOR is not set
+# CONFIG_DEFAULT_SECURITY_YAMA is not set
 CONFIG_DEFAULT_SECURITY_DAC=y
 CONFIG_DEFAULT_SECURITY=""
 CONFIG_XOR_BLOCKS=m
@@ -6257,6 +6349,8 @@ CONFIG_CRYPTO_TWOFISH_586=m
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_ZLIB=m
 CONFIG_CRYPTO_LZO=y
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
 
 #
 # Random Number Generation
@@ -6301,6 +6395,7 @@ CONFIG_RAID6_PQ=m
 CONFIG_BITREVERSE=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GENERIC_NET_UTILS=y
 CONFIG_GENERIC_FIND_FIRST_BIT=y
 CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_IOMAP=y
@@ -6324,6 +6419,9 @@ CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 CONFIG_LZO_COMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
+CONFIG_LZ4_COMPRESS=m
+CONFIG_LZ4HC_COMPRESS=m
+CONFIG_LZ4_DECOMPRESS=y
 CONFIG_XZ_DEC=y
 CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC_POWERPC=y
@@ -6338,6 +6436,7 @@ CONFIG_DECOMPRESS_BZIP2=y
 CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DECOMPRESS_XZ=y
 CONFIG_DECOMPRESS_LZO=y
+CONFIG_DECOMPRESS_LZ4=y
 CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_REED_SOLOMON=m
 CONFIG_REED_SOLOMON_ENC8=y
@@ -6366,3 +6465,16 @@ CONFIG_DDR=y
 CONFIG_MPILIB=m
 CONFIG_OID_REGISTRY=m
 CONFIG_UCS2_STRING=y
+CONFIG_FONT_SUPPORT=y
+CONFIG_FONTS=y
+# CONFIG_FONT_8x8 is not set
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
+CONFIG_FONT_AUTOSELECT=y
diff --git a/libre-testing/linux-libre/Kbuild b/libre-testing/linux-libre/Kbuild
deleted file mode 100644
index 8a9d7dceb..000000000
--- a/libre-testing/linux-libre/Kbuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Fail on warnings - also for files referenced in subdirs
-# -Werror can be disabled for specific files using:
-# CFLAGS_<file.o> := -Wno-error
-subdir-ccflags-y := -Wno-error
-
-# platform specific definitions
-include arch/mips/Kbuild.platforms
-obj-y := $(platform-y)
-
-# make clean traverses $(obj-) without having included .config, so
-# everything ends up here
-obj- := $(platform-)
-
-# mips object files
-# The object files are linked as core-y files would be linked
-
-obj-y += kernel/
-obj-y += mm/
-obj-y += math-emu/
diff --git a/libre-testing/linux-libre/Kbuild.platforms b/libre-testing/linux-libre/Kbuild.platforms
deleted file mode 100644
index 90a226888..000000000
--- a/libre-testing/linux-libre/Kbuild.platforms
+++ /dev/null
@@ -1,6 +0,0 @@
-# All platforms listed in alphabetic order
-
-platforms += loongson
-
-# include the platform specific files
-include $(patsubst %, $(srctree)/arch/mips/%/Platform, $(platforms))
diff --git a/libre-testing/linux-libre/PKGBUILD b/libre-testing/linux-libre/PKGBUILD
deleted file mode 100644
index bc4e821dd..000000000
--- a/libre-testing/linux-libre/PKGBUILD
+++ /dev/null
@@ -1,422 +0,0 @@
-# $Id: PKGBUILD 193873 2013-09-03 07:49:19Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Maintainer: Thomas Baechler <thomas@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
-# Contributor (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
-# Contributor (Parabola): Sorin-Mihai Vârgolici <smv@yobicore.org>
-# Contributor (Parabola): Michał Masłowski <mtjm@mtjm.eu>
-# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
-
-pkgbase=linux-libre         # Build stock -LIBRE kernel
-#pkgbase=linux-libre-custom # Build kernel with a different name
-_basekernel=3.11
-#_sublevel=10
-#pkgver=${_basekernel}.${_sublevel}
-pkgver=${_basekernel}
-pkgrel=1
-_lxopkgver=${_basekernel}.0 # nearly always the same as pkgver
-arch=('i686' 'x86_64' 'mips64el')
-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}-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.i686' 'config.x86_64'
-        # standard config files for mkinitcpio ramdisk
-        "${pkgbase}.preset"
-        'Kbuild'
-        'Kbuild.platforms'
-        'boot-logo.patch'
-        'change-default-console-loglevel.patch'
-        'criu-no-expert.patch'
-        "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
-md5sums=('7ec84223c7adcf01a5287eb7af96b7e7'
-         #'673ae6d60b4ce8acad930a06f9fe2e3f'
-         'b677535858e784fbfe924884941ea81c'
-         '0048b12cb4bbb449c25e83e38f99f5b8'
-         'e49ac236dfeef709f91a3d993ea7b62c'
-         '2967cecc3af9f954ccc822fd63dca6ff'
-         '8267264d9a8966e57fdacd1fa1fc65c4'
-         '36e90334b12b2e9d53fd92129ee98f5b'
-         '98beb36f9b8cf16e58de2483ea9985e3'
-         'd50c1ac47394e9aec637002ef3392bd1'
-         '57770a810cc7efb650a7ea15f8cba633')
-if [ "$CARCH" != "mips64el" ]; then
-    # don't use the Loongson-specific patches on non-mips64el arches.
-    unset source[${#source[@]}-1]
-    unset md5sums[${#md5sums[@]}-1]
-fi
-
-_kernelname=${pkgbase#linux-libre}
-_localversionname=-LIBRE
-
-prepare() {
-  cd "${srcdir}/linux-${_basekernel}"
-
-  if [ "${_basekernel}" != "${pkgver}" ]; then
-    patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu"
-  fi
-
-  # add freedo as boot logo
-  patch -Np1 -i "${srcdir}/boot-logo.patch"
-
-  # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
-  # remove this when a Kconfig knob is made available by upstream
-  # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
-  patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
-
-  # allow criu without expert option set
-  # patch from fedora
-  patch -Np1 -i "${srcdir}/criu-no-expert.patch"
-
-  if [ "$CARCH" == "mips64el" ]; then
-    sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile
-    sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
-        < "${srcdir}/lxo-config.patch" > lxo-config.patch
-    msg2 "Adding loongson-community patches"
-    patch -Np1 -i ${srcdir}/${_basekernel}*-*-loongson-community.patch
-    patch -Np0 -i lxo-config.patch
-
-  # ensure N32, add localversion, remove uevent helper as per
-  # https://git.kernel.org/?p=linux/hotplug/udev.git;a=blob_plain;f=README
-  # and make USB storage support builtin (e.g. for booting from USB
-  # disks without slowly loading an initramfs)
-    sed -ri \
-        -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \
-        -e "s|CONFIG_UEVENT_HELPER_PATH=.*|CONFIG_UEVENT_HELPER_PATH=\"\"|g" \
-        -e "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_localversionname}\"|g" \
-        -e "s;(CONFIG_USB(_COMMON|_EHCI_HCD|_OHCI_HCD|_STORAGE.*|_UAS)?)=.*;\1=y;g" \
-        ./.config
-  else
-    cat "${srcdir}/config.${CARCH}" > ./.config # simpler
-  fi
-
-  if [ "${_kernelname}" != "" ]; then
-    sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_localversionname}\"|g" ./.config
-    sed -i "s|CONFIG_LOCALVERSION_AUTO=.*|CONFIG_LOCALVERSION_AUTO=n|" ./.config
-  fi
-
-  # set extraversion to pkgrel
-  sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile
-
-  # don't run depmod on 'make install'. We'll do this ourselves in packaging
-  sed -i '2iexit 0' scripts/depmod.sh
-}
-
-build() {
-  cd "${srcdir}/linux-${_basekernel}"
-
-  # get kernel version
-  make prepare
-
-  # load configuration
-  # Configure the kernel. Replace the line below with one of your choice.
-  #make menuconfig # CLI menu for configuration
-  #make nconfig # new CLI menu for configuration
-  #make xconfig # X-based configuration
-  #make oldconfig # using old config from previous kernel version
-  # ... or manually edit .config
-
-  # rewrite configuration
-  yes "" | make config >/dev/null
-
-  # save configuration for later reuse
-  if [ "${CARCH}" = "x86_64" ]; then
-    cat .config > "${startdir}/config.x86_64.last"
-  else
-    cat .config > "${startdir}/config.i686.last"
-  fi
-
-  ####################
-  # stop here
-  # this is useful to configure the kernel
-  #msg "Stopping build"; return 1
-  ####################
-
-  # build!
-  if [ "$CARCH" == "mips64el" ]; then
-    # The build system passes it directly to linker, disable to avoid
-    # having unknown -Wl,... options.
-    export LDFLAGS=""
-    # bzImage is arch-specific and not supported on mips; vmlinux is
-    # useful for oprofile.
-    make ${MAKEFLAGS} LOCALVERSION= vmlinux vmlinuz modules
-  else
-    make ${MAKEFLAGS} LOCALVERSION= bzImage modules
-  fi
-}
-
-_package() {
-  pkgdesc="The ${pkgbase^} kernel and modules"
-  [ "${pkgbase}" = "linux-libre" ] && groups=('base')
-  depends=('coreutils' 'linux-libre-firmware' 'kmod')
-  optdepends=('crda: to set the correct wireless channels of your country')
-  provides=("kernel26${_kernelname}=${pkgver}" "linux${_kernelname}=${pkgver}")
-  conflicts=("kernel26${_kernelname}" "kernel26-libre${_kernelname}" "linux${_kernelname}")
-  replaces=("kernel26${_kernelname}" "kernel26-libre${_kernelname}" "linux${_kernelname}")
-  backup=("etc/mkinitcpio.d/${pkgbase}.preset")
-  install=${pkgbase}.install
-  if [ "$CARCH" != "mips64el" ]; then
-     provides+=('linux-libre-kmod-alx')
-     conflicts+=('linux-libre-kmod-alx')
-     replaces+=('linux-libre-kmod-alx')
-  fi
-  if [ "$CARCH" = "mips64el" ]; then
-      optdepends+=('mkinitcpio: to make the initramfs (needs reinstall of this package)')
-      conflicts+=('mkinitcpio<0.7')
-  else
-      depends+=('mkinitcpio>=0.7')
-  fi
-
-  cd "${srcdir}/linux-${_basekernel}"
-
-  KARCH=x86
-  [ $CARCH = "mips64el" ] && KARCH=mips
-
-  # get kernel version
-  _kernver="$(make LOCALVERSION= kernelrelease)"
-  _basekernel=${_kernver%%-*}
-  _basekernel=${_basekernel%.*}
-
-  mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot}
-  make LOCALVERSION= INSTALL_MOD_PATH="${pkgdir}" modules_install
-
-  if [ "$CARCH" == "mips64el" ]; then
-    cp vmlinuz "${pkgdir}/boot/vmlinuz-${pkgbase}"
-    cp vmlinux "${pkgdir}/boot/vmlinux-${pkgbase}"
-  else
-    cp "arch/${KARCH}/boot/bzImage" "${pkgdir}/boot/vmlinuz-${pkgbase}"
-  fi
-
-  # add vmlinux
-  install -D -m644 vmlinux "${pkgdir}/usr/src/linux-${_kernver}/vmlinux"
-
-  # set correct depmod command for install
-  cp -f "${startdir}/${install}" "${startdir}/${install}.pkg"
-  true && install=${install}.pkg
-  sed \
-    -e  "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/" \
-    -e  "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/" \
-    -i "${startdir}/${install}"
-
-  # install mkinitcpio preset file for kernel
-  install -D -m644 "${srcdir}/${pkgbase}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
-  sed \
-    -e "1s|'linux*.*'|'${pkgbase}'|" \
-    -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgbase}\"|" \
-    -e "s|default_image=.*|default_image=\"/boot/initramfs-${pkgbase}.img\"|" \
-    -e "s|fallback_image=.*|fallback_image=\"/boot/initramfs-${pkgbase}-fallback.img\"|" \
-    -i "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
-
-  # mkinitcpio 0.7 relies on bzImage to find the kernel version
-  if [ "$CARCH" == "mips64el" ]; then
-    sed -e "s|ALL_kver=.*|ALL_kver=\"${_kernver}\"|" \
-        -i "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
-  fi
-
-  # remove build and source links
-  rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build}
-  # remove the firmware
-  rm -rf "${pkgdir}/lib/firmware"
-  # gzip -9 all modules to save 100MB of space
-  find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
-  # make room for external modules
-  ln -s "../extramodules-${_basekernel}${_localversionname:--LIBRE}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
-  # add real version for building modules and running depmod from post_install/upgrade
-  mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE}"
-  echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE}/version"
-
-  # Now we call depmod...
-  depmod -b "$pkgdir" -F System.map "$_kernver"
-
-  # move module tree /lib -> /usr/lib
-  mv "$pkgdir/lib" "$pkgdir/usr"
-}
-
-_package-headers() {
-  pkgdesc="Header files and scripts for building modules for ${pkgbase^} kernel"
-  provides=("kernel26${_kernelname}-headers=${pkgver}" "linux${_kernelname}-headers=${pkgver}")
-  conflicts=("kernel26${_kernelname}-headers" "kernel26-libre${_kernelname}-headers" "linux${_kernelname}-headers")
-  replaces=("kernel26${_kernelname}-headers" "kernel26-libre${_kernelname}-headers" "linux${_kernelname}-headers")
-
-  KARCH=x86
-  [ $CARCH = "mips64el" ] && KARCH=mips
-
-  # in case of repackaging this is empty
-  if [ -z "${_kernver}" ]; then
-    cd "${srcdir}/linux-${_basekernel}"
-    _kernver="$(make LOCALVERSION= kernelrelease)"
-  fi
-
-  install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}"
-
-  cd "${pkgdir}/usr/lib/modules/${_kernver}"
-  ln -sf ../../../src/linux-${_kernver} build
-
-  cd "${srcdir}/linux-${_basekernel}"
-  install -D -m644 Makefile \
-    "${pkgdir}/usr/src/linux-${_kernver}/Makefile"
-  install -D -m644 kernel/Makefile \
-    "${pkgdir}/usr/src/linux-${_kernver}/kernel/Makefile"
-  install -D -m644 .config \
-    "${pkgdir}/usr/src/linux-${_kernver}/.config"
-
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include"
-
-  for i in acpi asm-generic config crypto drm generated keys linux math-emu \
-    media net pcmcia scsi sound trace uapi video xen; do
-    cp -a include/${i} "${pkgdir}/usr/src/linux-${_kernver}/include/"
-  done
-
-  # copy arch includes for external modules
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}"
-  cp -a "arch/${KARCH}/include" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
-
-  # copy files necessary for later builds
-  cp Module.symvers "${pkgdir}/usr/src/linux-${_kernver}"
-  cp -a scripts "${pkgdir}/usr/src/linux-${_kernver}"
-
-  if [ "$CARCH" = "mips64el" ]; then
-    cp "arch/${KARCH}/Kbuild" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
-    cp -a "arch/${KARCH}/loongson" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
-    cp "${srcdir}/Kbuild.platforms" "${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/"
-  fi
-
-  # fix permissions on scripts dir
-  chmod og-w -R "${pkgdir}/usr/src/linux-${_kernver}/scripts"
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/.tmp_versions"
-
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel"
-
-  cp arch/${KARCH}/Makefile "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
-
-  if [ "${CARCH}" = "i686" ]; then
-    cp arch/${KARCH}/Makefile_32.cpu "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
-  fi
-
-  cp arch/${KARCH}/kernel/asm-offsets.s "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel/"
-
-  # add headers for lirc package
-  # pci
-  for i in bt8xx cx88 saa7134; do
-    mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/pci/${i}"
-    cp -a drivers/media/pci/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/pci/${i}"
-  done
-  # usb
-  for i in cpia2 em28xx pwc sn9c102; do
-    mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/${i}"
-    cp -a drivers/media/usb/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/${i}"
-  done
-  # i2c
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c"
-  cp drivers/media/i2c/*.h  "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/"
-  for i in cx25840; do
-    mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/${i}"
-    cp -a drivers/media/i2c/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/${i}"
-  done
-
-  # add docbook makefile
-  install -D -m644 Documentation/DocBook/Makefile \
-    "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile"
-
-  # add dm headers
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/md"
-  cp drivers/md/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/md"
-
-  # add inotify.h
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/linux"
-  cp include/linux/inotify.h "${pkgdir}/usr/src/linux-${_kernver}/include/linux/"
-
-  # add wireless headers
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/"
-  cp net/mac80211/*.h "${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/"
-
-  # add dvb headers for external modules
-  # in reference to:
-  # http://bugs.archlinux.org/task/9912
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-core"
-  cp drivers/media/dvb-core/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-core/"
-  # and...
-  # http://bugs.archlinux.org/task/11194
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/"
-  cp include/config/dvb/*.h "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/"
-
-  # add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
-  # in reference to:
-  # http://bugs.archlinux.org/task/13146
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends/"
-  cp drivers/media/dvb-frontends/lgdt330x.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends/"
-  cp drivers/media/i2c/msp3400-driver.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/"
-
-  # add dvb headers
-  # in reference to:
-  # http://bugs.archlinux.org/task/20402
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/dvb-usb"
-  cp drivers/media/usb/dvb-usb/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/dvb-usb/"
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends"
-  cp drivers/media/dvb-frontends/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends/"
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/tuners"
-  cp drivers/media/tuners/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/tuners/"
-
-  # add xfs and shmem for aufs building
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/fs/xfs"
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/mm"
-  cp fs/xfs/xfs_sb.h "${pkgdir}/usr/src/linux-${_kernver}/fs/xfs/xfs_sb.h"
-
-  # copy in Kconfig files
-  for i in `find . -name "Kconfig*"`; do
-    mkdir -p "${pkgdir}"/usr/src/linux-${_kernver}/`echo ${i} | sed 's|/Kconfig.*||'`
-    cp ${i} "${pkgdir}/usr/src/linux-${_kernver}/${i}"
-  done
-
-  chown -R root.root "${pkgdir}/usr/src/linux-${_kernver}"
-  find "${pkgdir}/usr/src/linux-${_kernver}" -type d -exec chmod 755 {} \;
-
-  # strip scripts directory
-  find "${pkgdir}/usr/src/linux-${_kernver}/scripts" -type f -perm -u+w 2>/dev/null | while read binary ; do
-    case "$(file -bi "${binary}")" in
-      *application/x-sharedlib*) # Libraries (.so)
-        /usr/bin/strip ${STRIP_SHARED} "${binary}";;
-      *application/x-archive*) # Libraries (.a)
-        /usr/bin/strip ${STRIP_STATIC} "${binary}";;
-      *application/x-executable*) # Binaries
-        /usr/bin/strip ${STRIP_BINARIES} "${binary}";;
-    esac
-  done
-
-  # remove unneeded architectures
-  rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arc,arm,arm26,arm64,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,metag,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa}
-  if [ "$CARCH" = "mips64el" ]; then
-    rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/x86
-  else
-    rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/mips
-  fi
-}
-
-_package-docs() {
-  pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase^} kernel"
-  provides=("kernel26${_kernelname}-docs=${pkgver}" "linux${_kernelname}-docs=${pkgver}")
-  conflicts=("kernel26${_kernelname}-docs" "kernel26-libre${_kernelname}-docs" "linux${_kernelname}-docs")
-  replaces=("kernel26${_kernelname}-docs" "kernel26-libre${_kernelname}-docs" "linux${_kernelname}-docs")
-
-  cd "${srcdir}/linux-${_basekernel}"
-
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}"
-  cp -al Documentation "${pkgdir}/usr/src/linux-${_kernver}"
-  find "${pkgdir}" -type f -exec chmod 444 {} \;
-  find "${pkgdir}" -type d -exec chmod 755 {} \;
-
-  # remove a file already in linux package
-  rm -f "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile"
-}
-
-pkgname=("${pkgbase}" "${pkgbase}-headers" "${pkgbase}-docs")
-for _p in ${pkgname[@]}; do
-  eval "package_${_p}() {
-    _package${_p#${pkgbase}}
-  }"
-done
-
-# vim:set ts=8 sts=2 sw=2 et:
diff --git a/libre-testing/linux-libre/boot-logo.patch b/libre-testing/linux-libre/boot-logo.patch
deleted file mode 100644
index cbd52ea22..000000000
--- a/libre-testing/linux-libre/boot-logo.patch
+++ /dev/null
@@ -1,22445 +0,0 @@
-diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
-index 285d552..c9d8373 100644
---- a/drivers/video/logo/logo_linux_clut224.ppm
-+++ b/drivers/video/logo/logo_linux_clut224.ppm
-@@ -1,883 +1,861 @@
- P3
--80 80
-+80 78
- 255
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 11 15 17 33 49 54 59 85 92 73 97 106 
--83 116 129 105 131 142 115 114 122 74 88 93 20 29 31 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 6 6 6 10 10 10 10 10 10 
--10 10 10 6 6 6 6 6 6 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 2 3 3 17 23 26 50 67 72 73 97 106 59 85 92 73 97 106 
--105 131 142 124 127 131 105 131 142 105 131 142 53 75 83 6 8 8 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 6 6 6 10 10 10 14 14 14 22 22 22 26 26 26 30 30 30 34 34 34 
--30 30 30 30 30 30 26 26 26 18 18 18 14 14 14 10 10 10 6 6 6 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 
--0 0 0 1 1 1 26 35 39 59 85 92 59 85 92 59 85 92 29 43 47 53 75 83 
--108 122 132 132 98 104 108 122 132 105 131 142 101 101 101 43 45 48 6 8 8 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--6 6 6 14 14 14 26 26 26 42 42 42 54 54 54 66 66 66 78 78 78 78 78 78 
--78 78 78 74 74 74 66 66 66 54 54 54 42 42 42 26 26 26 18 18 18 10 10 10 
--6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 
--11 15 17 27 40 45 59 85 92 59 85 92 27 40 45 31 45 49 73 97 106 93 121 133 
--108 122 132 108 122 132 105 131 142 108 122 132 105 131 142 73 97 106 26 35 39 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 
--22 22 22 42 42 42 66 66 66 86 86 86 66 66 66 38 38 38 38 38 38 22 22 22 
--26 26 26 34 34 34 54 54 54 66 66 66 86 86 86 70 70 70 46 46 46 26 26 26 
--14 14 14 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 7 12 13 21 31 35 42 59 64 
--53 75 83 53 75 83 50 67 72 42 59 64 32 40 45 42 59 64 73 97 106 116 116 116 
--132 98 104 116 116 116 108 122 132 117 104 110 105 131 142 83 116 129 50 67 72 7 12 13 
--1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 26 26 26 
--50 50 50 82 82 82 58 58 58 6 6 6 2 2 6 2 2 6 2 2 6 2 2 6 
--2 2 6 2 2 6 2 2 6 2 2 6 6 6 6 54 54 54 86 86 86 66 66 66 
--38 38 38 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 1 1 1 6 8 8 15 22 25 26 35 39 36 54 60 53 75 83 59 85 92 
--59 85 92 48 63 69 15 22 25 12 17 20 52 67 79 94 94 94 132 98 104 132 98 104 
--117 104 110 108 122 132 108 122 132 115 114 122 105 131 142 77 105 114 59 85 92 36 54 60 
--7 12 13 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 22 22 22 50 50 50 
--78 78 78 34 34 34 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
--2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 6 6 6 70 70 70 
--78 78 78 46 46 46 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 15 22 25 29 43 47 36 54 60 42 59 64 42 59 64 48 63 69 21 31 35 
--6 8 8 29 43 47 36 50 56 43 45 48 79 78 84 132 98 104 165 78 79 132 98 104 
--108 122 132 117 104 110 117 104 110 108 122 132 77 105 114 73 97 106 95 131 149 78 102 129 
--36 50 56 0 0 0 0 0 0 0 0 0 6 6 6 18 18 18 42 42 42 82 82 82 
--26 26 26 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
--2 2 6 2 2 6 2 2 6 14 14 14 46 46 46 34 34 34 6 6 6 2 2 6 
--42 42 42 78 78 78 42 42 42 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--27 40 45 53 75 83 48 63 69 24 31 37 6 8 12 0 0 0 18 25 28 26 35 39 
--12 17 20 26 35 39 65 78 84 112 81 86 152 81 83 137 83 86 132 98 104 117 104 110 
--117 104 110 132 98 104 132 98 104 115 114 122 73 97 106 53 75 83 95 131 149 93 124 152 
--68 78 128 15 22 25 0 0 0 0 0 0 10 10 10 30 30 30 66 66 66 58 58 58 
--2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
--2 2 6 2 2 6 2 2 6 26 26 26 86 86 86 101 101 101 46 46 46 10 10 10 
--2 2 6 58 58 58 70 70 70 34 34 34 10 10 10 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--36 50 56 21 30 33 4 7 7 0 0 0 1 1 1 17 12 12 69 31 31 68 59 64 
--57 59 63 21 31 35 32 40 45 86 73 69 152 81 83 152 81 83 117 104 110 132 98 104 
--152 81 83 132 98 104 108 122 132 77 105 114 77 105 114 93 121 133 95 131 149 93 124 152 
--95 131 149 53 75 83 11 15 17 0 0 0 14 14 14 42 42 42 86 86 86 10 10 10 
--2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
--2 2 6 2 2 6 2 2 6 30 30 30 94 94 94 94 94 94 58 58 58 26 26 26 
--2 2 6 6 6 6 78 78 78 54 54 54 22 22 22 6 6 6 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--17 23 26 2 3 3 0 0 0 17 12 12 69 31 31 123 55 55 123 55 55 152 81 83 
--86 73 69 17 23 26 7 12 13 45 54 57 101 101 101 137 83 86 132 98 104 132 98 104 
--137 83 86 117 104 110 77 105 114 42 59 64 50 67 72 78 102 129 91 117 157 91 117 157 
--95 131 149 83 116 129 40 48 73 6 6 6 22 22 22 62 62 62 62 62 62 2 2 6 
--2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
--2 2 6 2 2 6 2 2 6 26 26 26 54 54 54 38 38 38 18 18 18 10 10 10 
--2 2 6 2 2 6 34 34 34 82 82 82 38 38 38 14 14 14 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--1 1 1 1 2 2 2 3 3 28 12 12 123 55 55 174 79 79 174 79 79 174 79 79 
--152 81 83 68 59 64 26 35 39 27 40 45 79 78 84 137 83 86 165 78 79 137 83 86 
--94 94 94 48 63 69 36 50 56 50 67 72 73 97 106 93 121 133 93 124 152 93 124 152 
--95 131 149 91 118 149 78 102 129 27 40 45 30 30 30 78 78 78 30 30 30 2 2 6 
--2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
--2 2 6 2 2 6 2 2 6 10 10 10 10 10 10 2 2 6 2 2 6 2 2 6 
--2 2 6 2 2 6 2 2 6 78 78 78 50 50 50 18 18 18 6 6 6 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--4 5 3 24 53 24 19 31 15 8 7 3 90 61 47 165 78 79 174 79 79 174 79 79 
--174 79 79 137 83 86 60 52 57 7 12 13 17 23 26 70 70 70 132 98 104 112 81 86 
--79 78 84 31 45 49 15 22 25 53 75 83 91 118 149 86 106 160 91 117 157 93 124 152 
--91 117 157 93 124 152 95 131 149 53 75 83 50 50 50 86 86 86 14 14 14 2 2 6 
--2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
--2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
--2 2 6 2 2 6 2 2 6 54 54 54 66 66 66 26 26 26 6 6 6 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--19 31 15 34 76 34 34 76 34 19 31 15 28 12 12 123 55 55 174 79 79 174 79 79 
--174 79 79 165 78 79 112 81 86 32 40 45 15 22 25 38 53 58 65 78 84 29 31 32 
--21 30 33 42 59 64 60 80 103 78 102 129 87 112 149 84 96 162 91 117 157 93 124 152 
--91 117 157 93 124 152 93 121 133 59 85 92 57 68 71 82 85 86 2 2 6 2 2 6 
--2 2 6 6 6 6 10 10 10 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
--2 2 6 2 2 6 2 2 6 6 6 6 14 14 14 10 10 10 2 2 6 2 2 6 
--2 2 6 2 2 6 2 2 6 18 18 18 82 82 82 34 34 34 10 10 10 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--34 76 34 40 89 40 40 89 40 34 76 34 8 15 6 48 26 18 123 55 55 174 79 79 
--174 79 79 174 79 79 137 83 86 68 59 64 32 40 45 21 30 33 31 45 49 21 31 35 
--12 17 20 48 63 69 78 102 129 81 88 166 84 96 162 91 117 157 93 124 152 91 117 157 
--93 124 152 95 131 149 83 116 129 59 85 92 57 68 71 86 86 86 2 2 6 2 2 6 
--6 6 6 6 6 6 22 22 22 34 34 34 6 6 6 2 2 6 2 2 6 2 2 6 
--2 2 6 2 2 6 18 18 18 34 34 34 10 10 10 50 50 50 22 22 22 2 2 6 
--2 2 6 2 2 6 2 2 6 10 10 10 86 86 86 42 42 42 14 14 14 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--40 89 40 40 89 40 40 89 40 40 89 40 24 53 24 6 6 6 69 31 31 123 55 55 
--123 55 55 90 61 47 69 31 31 36 32 33 21 31 35 7 12 13 18 25 28 48 63 69 
--60 80 103 68 78 128 84 101 153 84 96 162 84 96 162 91 117 157 91 117 157 84 96 162 
--91 117 157 73 97 106 48 63 69 50 67 72 57 59 63 86 86 86 2 2 6 2 2 6 
--38 38 38 116 116 116 94 94 94 22 22 22 22 22 22 2 2 6 2 2 6 2 2 6 
--14 14 14 86 86 86 124 131 137 170 170 170 151 151 151 38 38 38 26 26 26 6 6 6 
--2 2 6 2 2 6 2 2 6 2 2 6 86 86 86 46 46 46 14 14 14 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--34 76 34 40 89 40 40 89 40 40 89 40 34 76 34 19 31 15 17 12 12 48 26 18 
--48 26 18 8 7 3 10 10 22 23 29 47 51 61 92 42 59 64 21 30 33 34 45 54 
--68 78 128 81 88 166 81 82 173 86 106 160 86 106 160 84 96 162 86 106 160 87 112 149 
--91 118 149 77 105 114 52 67 79 32 40 45 50 50 50 86 86 86 2 2 6 14 14 14 
--124 131 137 198 198 198 195 195 195 116 116 116 10 10 10 2 2 6 2 2 6 6 6 6 
--101 98 89 187 187 187 210 210 210 218 218 218 214 214 214 124 131 137 14 14 14 6 6 6 
--2 2 6 2 2 6 2 2 6 2 2 6 86 86 86 50 50 50 18 18 18 6 6 6 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--19 31 15 34 76 34 40 89 40 40 89 40 40 89 40 24 53 24 8 7 3 0 0 0 
--6 8 12 28 32 52 51 61 92 54 54 122 74 77 160 68 78 128 26 35 39 6 8 8 
--34 45 54 68 78 128 84 96 162 86 106 160 86 106 160 81 88 166 84 96 162 87 112 149 
--73 97 106 36 50 56 33 49 54 18 18 18 46 46 46 86 86 86 2 2 6 54 54 54 
--218 218 218 195 195 195 226 226 226 246 246 246 58 58 58 2 2 6 2 2 6 30 30 30 
--210 210 210 253 253 253 170 170 170 124 127 131 221 221 221 234 234 234 74 74 74 2 2 6 
--2 2 6 2 2 6 2 2 6 2 2 6 70 70 70 58 58 58 22 22 22 6 6 6 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--4 5 3 24 53 24 40 89 40 40 89 40 34 76 34 12 22 15 4 5 3 4 5 3 
--13 17 26 54 54 122 78 78 174 78 78 174 78 78 174 74 77 160 51 61 92 21 31 35 
--26 35 39 53 75 83 84 101 153 81 82 173 81 88 166 84 101 153 60 80 103 60 80 103 
--53 75 83 38 53 58 42 59 64 22 22 22 46 46 46 82 82 82 2 2 6 106 106 106 
--170 170 170 26 26 26 86 86 86 226 226 226 124 127 131 10 10 10 14 14 14 46 46 46 
--231 231 231 190 190 190 6 6 6 70 70 70 90 90 90 238 238 238 151 151 151 2 2 6 
--2 2 6 2 2 6 2 2 6 2 2 6 70 70 70 58 58 58 22 22 22 6 6 6 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--1 2 2 8 15 6 24 53 24 34 76 34 19 31 15 8 15 6 63 55 20 63 55 20 
--18 18 18 40 48 73 74 77 160 78 78 174 78 78 174 81 82 173 74 77 160 52 67 79 
--17 23 26 21 31 35 60 80 103 81 88 166 74 77 160 78 102 129 36 54 60 12 17 20 
--42 59 64 48 63 69 21 31 35 18 18 18 42 42 42 86 86 86 6 6 6 116 116 116 
--106 106 106 6 6 6 70 70 70 151 151 151 124 127 131 18 18 18 38 38 38 54 54 54 
--221 221 221 106 106 106 2 2 6 14 14 14 46 46 46 190 190 190 198 198 198 2 2 6 
--2 2 6 2 2 6 2 2 6 2 2 6 74 74 74 62 62 62 22 22 22 6 6 6 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--11 15 17 0 0 0 12 22 15 19 31 15 8 15 6 63 55 20 149 139 69 149 139 69 
--63 55 20 10 10 22 54 54 122 78 78 174 78 78 174 78 78 174 81 82 173 68 78 128 
--24 31 37 6 6 6 36 50 56 60 80 103 51 61 92 42 59 64 36 50 56 31 45 49 
--29 43 47 27 40 45 6 8 8 14 14 14 42 42 42 94 94 94 14 14 14 101 101 101 
--124 127 131 2 2 6 18 18 18 116 116 116 106 107 48 121 92 8 121 92 8 98 70 6 
--170 170 170 106 106 106 2 2 6 2 2 6 2 2 6 195 195 195 195 195 195 6 6 6 
--2 2 6 2 2 6 2 2 6 2 2 6 74 74 74 62 62 62 22 22 22 6 6 6 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--26 35 39 3 5 6 1 1 1 2 3 3 35 31 12 133 118 54 175 176 80 175 176 80 
--133 118 54 35 31 12 23 29 47 54 54 122 78 78 174 78 78 174 74 77 160 68 78 128 
--51 61 92 31 45 49 26 35 39 36 50 56 29 43 47 7 12 13 21 30 33 42 59 64 
--18 25 28 7 12 13 1 1 1 10 10 10 38 38 38 90 90 90 14 14 14 58 58 58 
--210 210 210 26 26 26 62 42 6 154 114 10 226 170 11 237 188 10 220 174 15 184 138 11 
--220 174 15 174 140 55 35 31 12 2 2 6 70 70 70 246 246 246 124 131 137 2 2 6 
--2 2 6 2 2 6 2 2 6 2 2 6 70 70 70 66 66 66 26 26 26 6 6 6 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--27 40 45 17 23 26 2 3 3 1 1 1 56 77 35 165 152 80 175 176 80 175 176 80 
--175 176 80 106 107 48 22 22 22 28 32 52 54 54 122 54 54 122 51 61 92 28 32 52 
--20 27 34 31 45 49 11 15 17 7 12 13 36 50 56 31 45 49 29 43 47 36 50 56 
--6 8 8 0 0 0 0 0 0 10 10 10 38 38 38 86 86 86 14 14 14 10 10 10 
--195 195 195 198 179 130 192 133 9 220 174 15 239 182 13 237 188 10 232 195 16 239 207 25 
--237 201 50 241 208 19 232 195 16 184 138 11 198 179 130 208 206 196 42 42 42 2 2 6 
--2 2 6 2 2 6 2 2 6 2 2 6 50 50 50 74 74 74 30 30 30 6 6 6 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--15 22 25 26 35 39 15 22 25 0 0 0 35 31 12 133 118 54 175 176 80 175 176 80 
--175 176 80 165 152 80 56 77 35 6 8 12 23 29 47 13 17 26 2 2 6 0 0 0 
--1 2 2 26 35 39 26 35 39 26 35 39 42 59 64 42 59 64 20 29 31 6 8 8 
--0 0 0 0 0 0 0 0 0 10 10 10 34 34 34 86 86 86 14 14 14 2 2 6 
--121 92 8 192 133 9 219 162 10 239 182 13 237 188 10 232 195 16 241 208 19 237 201 50 
--237 201 50 239 207 25 241 208 19 241 208 19 241 208 19 230 187 11 121 92 8 2 2 6 
--2 2 6 2 2 6 2 2 6 2 2 6 50 50 50 82 82 82 34 34 34 10 10 10 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--1 2 2 15 22 25 31 45 49 6 8 12 4 5 3 63 55 20 149 139 69 175 176 80 
--175 176 80 175 176 80 106 107 48 20 16 6 1 1 1 0 0 0 2 3 3 11 15 17 
--21 30 33 36 50 56 36 50 56 24 31 37 15 22 25 6 8 8 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 10 10 10 34 34 34 82 82 82 30 30 30 62 42 6 
--180 123 7 206 145 10 230 174 11 239 182 13 237 188 10 238 202 15 241 208 19 237 201 50 
--239 207 25 241 208 19 241 208 19 241 208 19 230 187 11 220 174 15 184 138 11 6 6 6 
--2 2 6 2 2 6 2 2 6 2 2 6 26 26 26 94 94 94 42 42 42 14 14 14 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 1 2 2 29 43 47 26 35 39 3 5 6 8 7 3 106 107 48 165 152 80 
--175 176 80 149 139 69 63 55 20 4 5 3 2 3 3 12 17 20 26 35 39 26 35 39 
--17 23 26 7 12 13 6 8 8 3 5 6 1 2 2 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 10 10 10 30 30 30 78 78 78 50 50 50 104 69 6 
--192 133 9 216 158 10 236 178 12 237 188 10 232 195 16 241 208 19 237 201 50 237 201 50 
--241 208 19 241 208 19 241 208 19 204 160 10 200 144 11 216 158 10 156 118 10 2 2 6 
--2 2 6 2 2 6 2 2 6 2 2 6 6 6 6 90 90 90 54 54 54 18 18 18 
--6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 12 17 20 27 40 45 18 25 28 1 1 1 35 31 12 106 107 48 
--149 139 69 56 77 35 8 7 3 1 2 2 12 17 20 26 35 39 21 31 35 11 15 17 
--3 5 6 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 10 10 10 30 30 30 78 78 78 46 46 46 22 22 22 
--137 92 6 204 160 10 239 182 13 237 188 10 238 202 15 241 208 19 241 208 19 241 208 19 
--241 208 19 204 160 10 184 138 11 210 150 10 216 158 10 210 150 10 98 70 6 2 2 6 
--6 6 6 54 54 54 14 14 14 2 2 6 2 2 6 62 62 62 74 74 74 30 30 30 
--10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 1 1 1 15 22 25 33 49 54 12 17 20 2 3 3 35 31 12 
--56 77 35 20 16 6 1 1 1 18 25 28 21 31 35 11 15 17 1 1 1 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 10 10 10 34 34 34 78 78 78 50 50 50 6 6 6 
--88 55 22 139 102 15 190 146 13 230 187 11 239 207 25 232 195 16 220 174 15 190 146 13 
--171 120 8 192 133 9 210 150 10 213 154 11 185 146 40 165 152 80 101 98 89 2 2 6 
--2 2 6 78 78 78 116 116 116 58 58 58 2 2 6 22 22 22 90 90 90 46 46 46 
--18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 1 1 1 27 40 45 29 43 47 3 5 6 2 3 3 
--8 7 3 1 1 1 17 23 26 31 45 49 15 22 25 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 10 10 10 38 38 38 86 86 86 50 50 50 6 6 6 
--124 127 131 168 158 138 156 107 11 171 120 8 204 160 10 184 138 11 197 138 11 200 144 11 
--206 145 10 206 145 10 197 138 11 198 179 130 195 195 195 198 198 198 170 170 170 14 14 14 
--2 2 6 22 22 22 116 116 116 116 116 116 22 22 22 2 2 6 74 74 74 70 70 70 
--30 30 30 10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 11 15 17 31 45 49 26 35 39 3 5 6 
--0 0 0 7 12 13 27 40 45 18 25 28 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 6 6 6 18 18 18 50 50 50 101 101 101 26 26 26 10 10 10 
--124 131 137 190 190 190 168 158 138 156 107 11 197 138 11 200 144 11 197 138 11 192 133 9 
--180 123 7 185 146 40 198 179 130 187 187 187 202 202 202 221 221 221 214 214 214 66 66 66 
--2 2 6 2 2 6 50 50 50 62 62 62 6 6 6 2 2 6 10 10 10 90 90 90 
--50 50 50 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 15 22 25 36 54 60 18 25 28 
--0 0 0 21 30 33 27 40 45 2 3 3 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 10 10 10 34 34 34 74 74 74 74 74 74 2 2 6 6 6 6 
--151 151 151 198 198 198 190 190 190 168 158 138 148 132 55 156 107 11 156 107 11 169 125 40 
--168 158 138 187 187 187 190 190 190 210 210 210 246 246 246 253 253 253 253 253 253 180 180 180 
--6 6 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 62 62 62 
--74 74 74 34 34 34 14 14 14 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 27 40 45 35 52 58 
--18 25 28 35 52 58 17 23 26 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 10 10 10 22 22 22 54 54 54 94 94 94 18 18 18 2 2 6 46 46 46 
--234 234 234 221 221 221 190 190 190 190 190 190 190 190 190 187 187 187 187 187 187 190 190 190 
--190 190 190 195 195 195 214 214 214 242 242 242 253 253 253 253 253 253 253 253 253 253 253 253 
--82 82 82 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 14 14 14 
--86 86 86 54 54 54 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 12 13 33 49 54 
--52 72 81 36 54 60 6 8 8 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--6 6 6 18 18 18 46 46 46 90 90 90 46 46 46 18 18 18 6 6 6 180 180 180 
--253 253 253 246 246 246 202 202 202 190 190 190 190 190 190 190 190 190 190 190 190 190 190 190 
--202 202 202 231 231 231 250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--202 202 202 14 14 14 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
--42 42 42 86 86 86 42 42 42 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 12 17 20 
--36 54 60 29 43 47 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 
--14 14 14 38 38 38 74 74 74 66 66 66 2 2 6 6 6 6 90 90 90 250 250 250 
--253 253 253 253 253 253 238 238 238 198 198 198 190 190 190 190 190 190 195 195 195 221 221 221 
--246 246 246 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 82 82 82 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
--2 2 6 78 78 78 70 70 70 34 34 34 14 14 14 6 6 6 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--21 30 33 35 52 58 6 8 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 14 14 14 
--34 34 34 66 66 66 78 78 78 6 6 6 2 2 6 18 18 18 218 218 218 253 253 253 
--253 253 253 253 253 253 253 253 253 246 246 246 226 226 226 231 231 231 246 246 246 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 180 180 180 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
--2 2 6 18 18 18 90 90 90 62 62 62 30 30 30 10 10 10 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--12 17 20 36 54 60 29 43 47 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 26 26 26 
--58 58 58 90 90 90 18 18 18 2 2 6 2 2 6 106 106 106 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 250 250 250 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 231 231 231 18 18 18 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
--2 2 6 2 2 6 18 18 18 94 94 94 54 54 54 26 26 26 10 10 10 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 21 30 33 35 52 58 6 8 12 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 22 22 22 50 50 50 
--90 90 90 26 26 26 2 2 6 2 2 6 14 14 14 195 195 195 250 250 250 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--250 250 250 242 242 242 54 54 54 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
--2 2 6 2 2 6 2 2 6 38 38 38 86 86 86 50 50 50 22 22 22 6 6 6 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 12 17 20 36 54 60 29 43 47 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 14 14 14 38 38 38 82 82 82 
--34 34 34 2 2 6 2 2 6 2 2 6 42 42 42 195 195 195 246 246 246 253 253 253 
--253 253 253 253 253 253 253 253 253 250 250 250 242 242 242 242 242 242 250 250 250 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 250 250 250 246 246 246 238 238 238 
--226 226 226 231 231 231 101 101 101 6 6 6 2 2 6 2 2 6 2 2 6 2 2 6 
--2 2 6 2 2 6 2 2 6 2 2 6 38 38 38 82 82 82 42 42 42 14 14 14 
--6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 21 30 33 35 52 58 6 8 12 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 26 26 26 62 62 62 66 66 66 
--2 2 6 2 2 6 2 2 6 6 6 6 70 70 70 170 170 170 202 202 202 234 234 234 
--246 246 246 250 250 250 250 250 250 238 238 238 226 226 226 231 231 231 238 238 238 250 250 250 
--250 250 250 250 250 250 246 246 246 231 231 231 214 214 214 202 202 202 202 202 202 202 202 202 
--198 198 198 202 202 202 180 180 180 18 18 18 2 2 6 2 2 6 2 2 6 2 2 6 
--2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 62 62 62 66 66 66 30 30 30 
--10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 12 17 20 36 54 60 29 43 47 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 14 14 14 42 42 42 82 82 82 18 18 18 
--2 2 6 2 2 6 2 2 6 10 10 10 94 94 94 180 180 180 218 218 218 242 242 242 
--250 250 250 253 253 253 253 253 253 250 250 250 234 234 234 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 246 246 246 238 238 238 226 226 226 210 210 210 202 202 202 
--195 195 195 195 195 195 210 210 210 151 151 151 6 6 6 14 14 14 50 50 50 14 14 14 
--2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 6 6 6 86 86 86 46 46 46 
--18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 21 30 33 35 52 58 6 8 12 0 0 0 
--0 0 0 0 0 0 0 0 0 6 6 6 22 22 22 54 54 54 70 70 70 2 2 6 
--2 2 6 10 10 10 2 2 6 22 22 22 170 170 170 231 231 231 250 250 250 253 253 253 
--253 253 253 253 253 253 253 253 253 250 250 250 242 242 242 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 246 246 246 
--231 231 231 202 202 202 198 198 198 226 226 226 94 94 94 2 2 6 6 6 6 38 38 38 
--30 30 30 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 62 62 62 66 66 66 
--26 26 26 10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 6 8 8 33 49 54 29 43 47 6 8 12 
--0 0 0 0 0 0 0 0 0 10 10 10 30 30 30 74 74 74 50 50 50 2 2 6 
--26 26 26 26 26 26 2 2 6 106 106 106 238 238 238 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 246 246 246 218 218 218 202 202 202 210 210 210 14 14 14 2 2 6 2 2 6 
--30 30 30 22 22 22 2 2 6 2 2 6 2 2 6 2 2 6 18 18 18 86 86 86 
--42 42 42 14 14 14 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 12 17 20 33 49 54 17 23 26 
--0 0 0 0 0 0 0 0 0 14 14 14 42 42 42 90 90 90 22 22 22 2 2 6 
--42 42 42 2 2 6 18 18 18 218 218 218 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 250 250 250 221 221 221 218 218 218 101 101 101 2 2 6 14 14 14 
--18 18 18 38 38 38 10 10 10 2 2 6 2 2 6 2 2 6 2 2 6 78 78 78 
--58 58 58 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 15 22 25 36 54 60 
--0 0 0 0 0 0 0 0 0 18 18 18 54 54 54 82 82 82 2 2 6 26 26 26 
--22 22 22 2 2 6 124 127 131 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 250 250 250 238 238 238 198 198 198 6 6 6 38 38 38 
--58 58 58 26 26 26 38 38 38 2 2 6 2 2 6 2 2 6 2 2 6 46 46 46 
--78 78 78 30 30 30 10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 21 30 33 
--36 54 60 0 0 0 0 0 0 30 30 30 74 74 74 58 58 58 2 2 6 42 42 42 
--2 2 6 22 22 22 231 231 231 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 246 246 246 46 46 46 38 38 38 
--42 42 42 14 14 14 38 38 38 14 14 14 2 2 6 2 2 6 2 2 6 6 6 6 
--86 86 86 46 46 46 14 14 14 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--36 54 60 0 0 0 0 0 0 42 42 42 90 90 90 18 18 18 18 18 18 26 26 26 
--2 2 6 116 116 116 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 250 250 250 238 238 238 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 94 94 94 6 6 6 
--2 2 6 2 2 6 10 10 10 34 34 34 2 2 6 2 2 6 2 2 6 2 2 6 
--74 74 74 58 58 58 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 36 54 60 26 26 26 66 66 66 82 82 82 2 2 6 38 38 38 6 6 6 
--14 14 14 210 210 210 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 246 246 246 242 242 242 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 151 151 151 2 2 6 
--2 2 6 2 2 6 2 2 6 46 46 46 2 2 6 2 2 6 2 2 6 2 2 6 
--42 42 42 74 74 74 30 30 30 10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--6 6 6 36 54 60 21 30 33 90 90 90 26 26 26 6 6 6 42 42 42 2 2 6 
--74 74 74 250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 242 242 242 242 242 242 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 180 180 180 2 2 6 
--2 2 6 2 2 6 2 2 6 46 46 46 2 2 6 2 2 6 2 2 6 2 2 6 
--10 10 10 86 86 86 38 38 38 10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--10 10 10 26 26 26 36 54 60 82 82 82 2 2 6 22 22 22 18 18 18 2 2 6 
--151 151 151 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 234 234 234 242 242 242 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 202 202 202 2 2 6 
--2 2 6 2 2 6 2 2 6 38 38 38 2 2 6 2 2 6 2 2 6 2 2 6 
--6 6 6 86 86 86 46 46 46 14 14 14 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 
--18 18 18 46 46 46 86 86 86 36 54 60 2 2 6 34 34 34 10 10 10 6 6 6 
--210 210 210 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 234 234 234 242 242 242 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 221 221 221 6 6 6 
--2 2 6 2 2 6 6 6 6 30 30 30 2 2 6 2 2 6 2 2 6 2 2 6 
--2 2 6 82 82 82 54 54 54 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 
--26 26 26 66 66 66 62 62 62 2 2 6 2 2 6 38 38 38 10 10 10 26 26 26 
--238 238 238 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 231 231 231 238 238 238 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 231 231 231 6 6 6 
--2 2 6 2 2 6 10 10 10 30 30 30 2 2 6 2 2 6 2 2 6 2 2 6 
--2 2 6 66 66 66 58 58 58 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 
--38 38 38 78 78 78 6 6 6 2 2 6 2 2 6 46 46 46 14 14 14 42 42 42 
--246 246 246 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 231 231 231 242 242 242 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 234 234 234 10 10 10 
--2 2 6 2 2 6 22 22 22 14 14 14 2 2 6 2 2 6 2 2 6 2 2 6 
--2 2 6 66 66 66 62 62 62 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 18 18 18 
--50 50 50 74 74 74 2 2 6 2 2 6 14 14 14 70 70 70 34 34 34 62 62 62 
--250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 231 231 231 246 246 246 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 234 234 234 14 14 14 
--2 2 6 2 2 6 30 30 30 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
--2 2 6 66 66 66 62 62 62 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 18 18 18 
--54 54 54 62 62 62 2 2 6 2 2 6 2 2 6 30 30 30 46 46 46 70 70 70 
--250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 231 231 231 246 246 246 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 226 226 226 10 10 10 
--2 2 6 6 6 6 30 30 30 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
--2 2 6 66 66 66 58 58 58 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 22 22 22 
--58 58 58 62 62 62 2 2 6 2 2 6 2 2 6 2 2 6 30 30 30 78 78 78 
--250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 231 231 231 246 246 246 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 202 202 202 2 2 6 
--22 22 22 34 34 34 20 16 6 22 22 22 26 26 26 18 18 18 6 6 6 2 2 6 
--2 2 6 82 82 82 54 54 54 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 26 26 26 
--62 62 62 106 106 106 63 55 20 184 138 11 204 160 10 121 92 8 6 6 6 62 62 62 
--238 238 238 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 231 231 231 246 246 246 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 151 151 151 18 18 18 
--14 14 14 2 2 6 2 2 6 2 2 6 6 6 6 18 18 18 66 66 66 38 38 38 
--6 6 6 94 94 94 50 50 50 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 6 6 6 10 10 10 10 10 10 18 18 18 38 38 38 
--78 78 78 138 132 106 216 158 10 242 186 14 246 190 14 246 190 14 156 118 10 10 10 10 
--90 90 90 238 238 238 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 231 231 231 250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 246 230 190 214 187 87 214 187 87 185 146 40 35 31 12 
--2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 38 38 38 46 46 46 
--26 26 26 106 106 106 54 54 54 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 6 6 6 14 14 14 22 22 22 30 30 30 38 38 38 50 50 50 70 70 70 
--106 106 106 185 146 40 226 170 11 242 186 14 246 190 14 246 190 14 246 190 14 154 114 10 
--6 6 6 74 74 74 226 226 226 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 231 231 231 250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 237 201 50 241 196 14 241 208 19 232 195 16 35 31 12 
--2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 6 6 6 30 30 30 26 26 26 
--204 160 10 165 152 80 66 66 66 26 26 26 6 6 6 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--6 6 6 18 18 18 38 38 38 58 58 58 78 78 78 86 86 86 101 101 101 124 127 131 
--174 140 55 210 150 10 234 174 13 246 186 14 246 190 14 246 190 14 246 190 14 237 188 10 
--98 70 6 2 2 6 46 46 46 198 198 198 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 234 234 234 242 242 242 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 214 187 87 242 186 14 241 196 14 204 160 10 20 16 6 
--2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 6 6 6 121 92 8 
--238 202 15 232 195 16 82 82 82 34 34 34 10 10 10 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--14 14 14 38 38 38 70 70 70 148 132 55 185 146 40 200 144 11 197 138 11 197 138 11 
--213 154 11 226 170 11 242 186 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
--220 174 15 35 31 12 2 2 6 22 22 22 151 151 151 250 250 250 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 250 250 250 242 242 242 214 187 87 239 182 13 237 188 10 213 154 11 35 31 12 
--2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 62 42 6 220 174 15 
--237 188 10 237 188 10 113 101 86 42 42 42 14 14 14 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 
--22 22 22 54 54 54 148 132 55 213 154 11 226 170 11 230 174 11 226 170 11 226 170 11 
--236 178 12 242 186 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
--241 196 14 184 138 11 10 10 10 2 2 6 6 6 6 116 116 116 242 242 242 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 231 231 231 198 198 198 213 164 39 236 178 12 236 178 12 210 150 10 137 92 6 
--20 16 6 2 2 6 2 2 6 2 2 6 6 6 6 62 42 6 200 144 11 236 178 12 
--239 182 13 239 182 13 124 112 88 58 58 58 22 22 22 6 6 6 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 
--30 30 30 70 70 70 169 125 40 226 170 11 239 182 13 242 186 14 242 186 14 246 186 14 
--246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
--246 190 14 232 195 16 98 70 6 2 2 6 2 2 6 2 2 6 66 66 66 221 221 221 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 202 202 202 198 198 198 213 164 39 230 174 11 230 174 11 216 158 10 192 133 9 
--163 110 8 120 80 7 98 70 6 120 80 7 167 114 7 197 138 11 226 170 11 239 182 13 
--242 186 14 242 186 14 165 152 80 78 78 78 34 34 34 14 14 14 6 6 6 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 
--30 30 30 78 78 78 185 146 40 226 170 11 239 182 13 246 190 14 246 190 14 246 190 14 
--246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
--246 190 14 241 196 14 204 160 10 20 16 6 2 2 6 2 2 6 2 2 6 38 38 38 
--218 218 218 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--250 250 250 202 202 202 198 198 198 213 164 39 226 170 11 236 178 12 224 166 10 210 150 10 
--200 144 11 197 138 11 192 133 9 197 138 11 210 150 10 226 170 11 242 186 14 246 190 14 
--246 190 14 246 186 14 220 174 15 124 112 88 62 62 62 30 30 30 14 14 14 6 6 6 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 
--30 30 30 78 78 78 174 140 55 224 166 10 239 182 13 246 190 14 246 190 14 246 190 14 
--246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
--246 190 14 246 190 14 241 196 14 139 102 15 2 2 6 2 2 6 2 2 6 2 2 6 
--78 78 78 250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--250 250 250 214 214 214 198 198 198 185 146 40 219 162 10 236 178 12 234 174 13 224 166 10 
--216 158 10 213 154 11 213 154 11 216 158 10 226 170 11 239 182 13 246 190 14 246 190 14 
--246 190 14 246 190 14 242 186 14 213 164 39 101 101 101 58 58 58 30 30 30 14 14 14 
--6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 
--30 30 30 74 74 74 174 140 55 216 158 10 236 178 12 246 190 14 246 190 14 246 190 14 
--246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
--246 190 14 246 190 14 241 196 14 230 187 11 62 42 6 2 2 6 2 2 6 2 2 6 
--22 22 22 238 238 238 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 226 226 226 187 187 187 169 125 40 216 158 10 236 178 12 239 182 13 236 178 12 
--230 174 11 226 170 11 226 170 11 230 174 11 236 178 12 242 186 14 246 190 14 246 190 14 
--246 190 14 246 190 14 246 186 14 239 182 13 213 164 39 106 106 106 66 66 66 34 34 34 
--14 14 14 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 
--26 26 26 70 70 70 149 139 69 213 154 11 236 178 12 246 190 14 246 190 14 246 190 14 
--246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
--246 190 14 246 190 14 246 190 14 241 196 14 190 146 13 20 16 6 2 2 6 2 2 6 
--46 46 46 246 246 246 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 221 221 221 86 86 86 156 107 11 216 158 10 236 178 12 242 186 14 246 186 14 
--242 186 14 239 182 13 239 182 13 242 186 14 242 186 14 246 186 14 246 190 14 246 190 14 
--246 190 14 246 190 14 246 190 14 246 190 14 242 186 14 220 174 15 149 139 69 66 66 66 
--30 30 30 10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 
--26 26 26 70 70 70 149 139 69 210 150 10 236 178 12 246 190 14 246 190 14 246 190 14 
--246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
--246 190 14 246 190 14 246 190 14 246 190 14 232 195 16 121 92 8 34 34 34 106 106 106 
--221 221 221 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--242 242 242 82 82 82 20 16 6 163 110 8 216 158 10 236 178 12 242 186 14 246 190 14 
--246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
--246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 242 186 14 149 139 69 
--46 46 46 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 
--30 30 30 78 78 78 149 139 69 210 150 10 236 178 12 246 186 14 246 190 14 246 190 14 
--246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
--246 190 14 246 190 14 246 190 14 246 190 14 241 196 14 220 174 15 198 179 130 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 218 218 218 
--58 58 58 2 2 6 20 16 6 167 114 7 216 158 10 236 178 12 246 186 14 246 190 14 
--246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
--246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 186 14 242 186 14 185 146 40 
--54 54 54 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 14 14 14 
--38 38 38 86 86 86 169 125 40 213 154 11 236 178 12 246 186 14 246 190 14 246 190 14 
--246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
--246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 232 195 16 190 146 13 214 214 214 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 250 250 250 170 170 170 26 26 26 
--2 2 6 2 2 6 35 31 12 163 110 8 219 162 10 239 182 13 246 186 14 246 190 14 
--246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
--246 190 14 246 190 14 246 190 14 246 190 14 246 186 14 236 178 12 224 166 10 149 139 69 
--46 46 46 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 18 18 18 
--50 50 50 113 101 86 192 133 9 224 166 10 242 186 14 246 190 14 246 190 14 246 190 14 
--246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
--246 190 14 246 190 14 246 190 14 246 190 14 242 186 14 230 187 11 204 160 10 133 118 54 
--226 226 226 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
--253 253 253 253 253 253 253 253 253 253 253 253 198 198 198 66 66 66 2 2 6 2 2 6 
--2 2 6 2 2 6 62 42 6 156 107 11 219 162 10 239 182 13 246 186 14 246 190 14 
--246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
--246 190 14 246 190 14 246 190 14 242 186 14 234 174 13 213 154 11 148 132 55 66 66 66 
--30 30 30 10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 22 22 22 
--58 58 58 148 132 55 206 145 10 234 174 13 242 186 14 246 186 14 246 190 14 246 190 14 
--246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
--246 190 14 246 190 14 246 190 14 246 190 14 246 186 14 236 178 12 204 160 10 163 110 8 
--62 42 6 124 131 137 218 218 218 250 250 250 253 253 253 253 253 253 253 253 253 250 250 250 
--242 242 242 210 210 210 151 151 151 66 66 66 6 6 6 2 2 6 2 2 6 2 2 6 
--2 2 6 2 2 6 62 42 6 163 110 8 216 158 10 236 178 12 246 190 14 246 190 14 
--246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
--246 190 14 239 182 13 230 174 11 216 158 10 185 146 40 124 112 88 70 70 70 38 38 38 
--18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 22 22 22 
--62 62 62 169 125 40 206 145 10 224 166 10 236 178 12 239 182 13 242 186 14 242 186 14 
--246 186 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
--246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 236 178 12 216 158 10 171 120 8 
--85 57 6 2 2 6 6 6 6 30 30 30 54 54 54 62 62 62 50 50 50 38 38 38 
--14 14 14 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
--2 2 6 6 6 6 85 57 6 167 114 7 213 154 11 236 178 12 246 190 14 246 190 14 
--246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 242 186 14 239 182 13 239 182 13 
--230 174 11 210 150 10 174 140 55 124 112 88 82 82 82 54 54 54 34 34 34 18 18 18 
--6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 18 18 18 
--50 50 50 169 125 40 192 133 9 200 144 11 216 158 10 219 162 10 224 166 10 226 170 11 
--230 174 11 236 178 12 239 182 13 239 182 13 242 186 14 246 186 14 246 190 14 246 190 14 
--246 190 14 246 190 14 246 190 14 246 190 14 246 186 14 230 174 11 210 150 10 163 110 8 
--104 69 6 10 10 10 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
--2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
--2 2 6 6 6 6 85 57 6 167 114 7 206 145 10 230 174 11 242 186 14 246 190 14 
--246 190 14 246 190 14 246 186 14 242 186 14 239 182 13 230 174 11 224 166 10 213 154 11 
--169 125 40 124 112 88 86 86 86 58 58 58 38 38 38 22 22 22 10 10 10 6 6 6 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 14 14 14 
--34 34 34 70 70 70 133 118 54 169 125 40 167 114 7 180 123 7 192 133 9 197 138 11 
--200 144 11 206 145 10 213 154 11 219 162 10 224 166 10 230 174 11 239 182 13 242 186 14 
--246 186 14 246 186 14 246 186 14 246 186 14 239 182 13 216 158 10 184 138 11 152 99 6 
--104 69 6 20 16 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
--2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
--2 2 6 6 6 6 85 57 6 152 99 6 192 133 9 219 162 10 236 178 12 239 182 13 
--246 186 14 242 186 14 239 182 13 236 178 12 224 166 10 206 145 10 192 133 9 148 132 55 
--94 94 94 62 62 62 42 42 42 22 22 22 14 14 14 6 6 6 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 
--18 18 18 34 34 34 58 58 58 78 78 78 101 98 89 124 112 88 133 118 54 156 107 11 
--163 110 8 167 114 7 171 120 8 180 123 7 184 138 11 197 138 11 210 150 10 219 162 10 
--226 170 11 236 178 12 236 178 12 234 174 13 219 162 10 197 138 11 163 110 8 134 84 6 
--85 57 6 10 10 10 2 2 6 2 2 6 18 18 18 38 38 38 38 38 38 38 38 38 
--38 38 38 38 38 38 38 38 38 38 38 38 38 38 38 38 38 38 26 26 26 2 2 6 
--2 2 6 6 6 6 62 42 6 137 92 6 171 120 8 200 144 11 219 162 10 230 174 11 
--234 174 13 230 174 11 219 162 10 210 150 10 192 133 9 163 110 8 124 112 88 82 82 82 
--50 50 50 30 30 30 14 14 14 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--6 6 6 14 14 14 22 22 22 34 34 34 42 42 42 58 58 58 74 74 74 86 86 86 
--101 98 89 113 101 86 133 118 54 121 92 8 137 92 6 152 99 6 163 110 8 180 123 7 
--184 138 11 197 138 11 206 145 10 200 144 11 180 123 7 156 107 11 134 84 6 104 69 6 
--62 42 6 54 54 54 106 106 106 101 98 89 86 86 86 82 82 82 78 78 78 78 78 78 
--78 78 78 78 78 78 78 78 78 78 78 78 78 78 78 82 82 82 86 86 86 94 94 94 
--106 106 106 101 101 101 90 61 47 120 80 7 156 107 11 180 123 7 192 133 9 200 144 11 
--206 145 10 200 144 11 192 133 9 171 120 8 139 102 15 113 101 86 70 70 70 42 42 42 
--22 22 22 10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 6 6 6 10 10 10 14 14 14 22 22 22 30 30 30 38 38 38 
--50 50 50 62 62 62 74 74 74 90 90 90 101 98 89 113 101 86 121 92 8 120 80 7 
--137 92 6 152 99 6 152 99 6 152 99 6 134 84 6 120 80 7 98 70 6 88 55 22 
--101 98 89 82 82 82 58 58 58 46 46 46 38 38 38 34 34 34 34 34 34 34 34 34 
--34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 38 38 38 42 42 42 
--54 54 54 82 82 82 94 86 71 85 57 6 134 84 6 156 107 11 167 114 7 171 120 8 
--171 120 8 167 114 7 152 99 6 121 92 8 101 98 89 62 62 62 34 34 34 18 18 18 
--6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 6 6 6 10 10 10 
--18 18 18 22 22 22 30 30 30 42 42 42 50 50 50 66 66 66 86 86 86 101 98 89 
--94 86 71 98 70 6 104 69 6 104 69 6 104 69 6 85 57 6 88 55 22 90 90 90 
--62 62 62 38 38 38 22 22 22 14 14 14 10 10 10 10 10 10 10 10 10 10 10 10 
--10 10 10 10 10 10 6 6 6 10 10 10 10 10 10 10 10 10 10 10 10 14 14 14 
--22 22 22 42 42 42 70 70 70 94 86 71 85 57 6 104 69 6 120 80 7 137 92 6 
--134 84 6 120 80 7 94 86 71 86 86 86 58 58 58 30 30 30 14 14 14 6 6 6 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 6 6 6 10 10 10 14 14 14 18 18 18 26 26 26 38 38 38 54 54 54 
--70 70 70 86 86 86 94 86 71 94 86 71 94 86 71 86 86 86 74 74 74 50 50 50 
--30 30 30 14 14 14 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--6 6 6 18 18 18 34 34 34 58 58 58 82 82 82 94 86 71 94 86 71 94 86 71 
--94 86 71 94 86 71 74 74 74 50 50 50 26 26 26 14 14 14 6 6 6 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 6 6 6 14 14 14 18 18 18 
--30 30 30 38 38 38 46 46 46 54 54 54 50 50 50 42 42 42 30 30 30 18 18 18 
--10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 6 6 6 14 14 14 26 26 26 38 38 38 50 50 50 58 58 58 58 58 58 
--54 54 54 42 42 42 30 30 30 18 18 18 10 10 10 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 
--6 6 6 10 10 10 14 14 14 18 18 18 18 18 18 14 14 14 10 10 10 6 6 6 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 6 6 6 14 14 14 18 18 18 22 22 22 22 22 22 
--18 18 18 14 14 14 10 10 10 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 6 9 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 6 9 23 30 36 44 54 65 57 72 88 44 54 65 6 12 15 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 31 41 52 
-+103 134 161 163 205 246 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 143 185 225 
-+82 108 129 8 14 16 0 2 0 0 6 9 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 17 24 30 126 162 196 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 161 203 243 92 119 140 0 6 9 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 44 54 65 154 195 235 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 138 174 208 21 27 33 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 70 96 117 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 157 198 239 49 59 70 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 7 0 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 3 6 52 62 74 170 212 252 170 212 252 170 212 252 170 212 252 129 165 199 
-+82 108 129 149 191 231 170 212 252 170 212 252 170 212 252 129 165 199 82 108 129 149 191 231 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 166 207 248 37 48 59 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 21 13 4 31 23 12 0 2 0 0 2 0 105 75 32 155 111 43 23 15 7 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 6 9 3 10 13 146 188 228 170 212 252 170 212 252 170 212 252 157 198 239 0 6 9 
-+0 2 0 52 62 74 170 212 252 170 212 252 154 195 235 0 6 9 0 2 0 55 66 77 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 151 193 233 17 24 30 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+10 12 8 23 15 7 139 99 44 206 148 61 67 49 21 0 2 0 125 92 35 206 148 61 
-+15 9 7 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 96 127 154 170 212 252 170 212 252 170 212 252 170 212 252 92 119 140 21 22 20 
-+10 12 8 53 68 84 170 212 252 170 212 252 92 119 140 10 12 8 7 10 5 53 68 84 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 134 170 204 
-+0 6 9 0 3 6 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 21 22 20 
-+62 64 61 38 40 37 0 2 0 34 26 8 212 153 66 64 46 18 0 2 0 170 124 49 
-+180 132 57 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+18 22 24 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 65 87 102 115 117 114 
-+43 44 42 88 115 136 170 212 252 170 212 252 68 83 99 108 110 107 60 62 59 88 115 136 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+80 98 121 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 10 12 8 56 58 55 95 96 94 178 180 177 215 217 214 198 200 197 
-+158 160 156 138 140 137 82 83 81 0 2 0 64 46 18 228 167 73 23 15 7 41 31 10 
-+250 179 73 55 39 17 7 0 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+75 94 116 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 63 78 94 0 2 0 
-+0 2 0 126 162 196 170 212 252 170 212 252 57 72 88 0 2 0 0 2 0 126 162 196 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+157 198 239 8 14 16 0 6 9 0 2 0 45 47 44 195 197 194 192 194 191 38 40 37 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 192 194 191 234 236 233 176 178 175 118 120 117 143 145 142 176 178 175 
-+215 217 214 234 236 233 234 236 233 104 106 103 0 2 0 142 101 40 134 100 43 0 2 0 
-+164 119 51 170 124 49 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+134 170 204 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 115 152 185 8 14 16 
-+49 59 70 166 207 248 170 212 252 170 212 252 119 150 178 8 14 16 55 66 77 166 207 248 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 92 119 140 0 2 0 0 2 0 200 202 199 254 255 252 254 255 252 244 246 243 
-+40 41 39 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 38 40 37 234 236 233 234 236 233 234 236 233 135 137 134 215 217 214 171 173 170 
-+141 142 139 138 140 137 138 140 137 135 137 134 31 32 30 3 6 2 212 153 66 15 9 7 
-+78 58 25 248 178 79 41 31 10 7 0 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 3 6 21 27 33 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 163 205 246 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 154 195 235 0 6 9 82 83 81 254 255 252 254 255 252 254 255 252 254 255 252 
-+188 190 187 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 62 64 61 234 236 233 234 236 233 234 236 233 198 200 197 131 133 130 198 200 197 
-+232 234 231 234 236 233 234 236 233 234 236 233 152 154 151 0 2 0 147 105 44 67 49 21 
-+23 15 7 250 179 73 158 114 46 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 6 9 61 76 92 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 154 195 235 103 134 161 80 98 121 
-+52 62 74 18 22 24 0 2 0 3 10 13 38 45 51 80 98 121 151 193 233 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 109 141 168 0 2 0 169 171 168 254 255 252 254 255 252 254 255 252 254 255 252 
-+226 228 225 65 66 64 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 43 44 42 234 236 233 234 236 233 234 236 233 234 236 233 131 133 130 192 194 191 
-+152 154 151 141 142 139 141 142 139 141 142 139 158 160 156 3 6 2 82 62 28 129 95 39 
-+0 2 0 206 148 61 248 178 79 21 13 4 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 96 115 138 
-+170 212 252 170 212 252 170 212 252 170 212 252 129 165 199 18 22 24 0 2 0 0 2 0 
-+34 26 8 75 55 22 114 83 33 95 68 30 55 39 17 7 0 0 0 6 9 84 103 125 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 84 103 125 0 2 0 229 231 228 254 255 252 254 255 252 254 255 252 171 173 170 
-+0 2 0 0 2 0 0 6 9 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 18 20 17 234 236 233 234 236 233 234 236 233 234 236 233 138 140 137 178 180 177 
-+226 228 225 234 236 233 234 236 233 234 236 233 231 233 230 45 47 44 23 15 7 190 136 56 
-+0 2 0 147 105 44 250 179 73 64 46 18 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 122 159 192 
-+170 212 252 170 212 252 170 212 252 126 162 196 0 2 0 26 20 13 190 136 56 245 175 76 
-+250 179 73 161 117 49 164 119 51 245 175 76 250 179 73 206 148 61 75 55 22 0 2 0 
-+126 162 196 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 68 83 99 0 2 0 252 254 250 254 255 252 254 255 252 254 255 252 71 73 70 
-+8 14 16 88 115 136 17 24 30 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 232 234 231 234 236 233 234 236 233 234 236 233 215 217 214 148 150 147 
-+183 185 181 141 142 139 135 137 134 135 137 134 141 142 139 87 89 86 0 2 0 202 145 58 
-+3 6 2 88 66 26 250 179 73 109 79 35 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 157 198 239 
-+170 212 252 170 212 252 166 207 248 26 33 39 26 20 13 224 163 69 250 179 73 250 179 73 
-+250 179 73 197 142 62 202 145 58 250 179 73 250 179 73 250 179 73 234 172 70 21 13 4 
-+38 45 51 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 52 62 74 21 22 20 254 255 252 254 255 252 254 255 252 254 255 252 21 22 20 
-+49 59 70 170 212 252 166 207 248 91 123 149 8 14 16 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 215 217 214 234 236 233 234 236 233 234 236 233 234 236 233 123 125 122 
-+188 190 187 229 231 228 234 236 233 234 236 233 222 224 221 118 120 117 0 2 0 168 123 54 
-+34 26 8 67 49 21 250 179 73 134 100 43 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 34 41 47 170 212 252 
-+170 212 252 170 212 252 85 112 133 0 2 0 164 119 51 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 129 95 39 
-+0 2 0 138 174 208 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 34 44 55 45 47 44 254 255 252 254 255 252 254 255 252 254 255 252 24 22 25 
-+52 62 74 170 212 252 170 212 252 170 212 252 138 174 208 10 16 18 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 178 180 177 234 236 233 234 236 233 234 236 233 234 236 233 141 142 139 
-+198 200 197 148 150 147 135 137 134 135 137 134 148 150 147 123 125 122 0 2 0 190 136 56 
-+21 13 4 78 58 25 250 179 73 129 95 39 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 82 108 129 170 212 252 
-+170 212 252 170 212 252 23 30 36 58 42 19 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 147 105 44 
-+0 2 0 139 181 221 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 34 41 47 45 47 44 254 255 252 254 255 252 254 255 252 254 255 252 56 58 55 
-+25 32 38 170 212 252 170 212 252 170 212 252 170 212 252 138 174 208 10 16 18 0 6 9 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 91 93 90 234 236 233 234 236 233 234 236 233 234 236 233 126 127 125 
-+169 171 168 222 224 221 234 236 233 229 231 228 178 180 177 71 73 70 0 2 0 212 153 66 
-+0 2 0 95 68 30 250 179 73 119 87 37 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 138 174 208 170 212 252 
-+170 212 252 154 195 235 0 2 0 125 92 35 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 119 87 37 
-+0 2 0 157 198 239 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 57 72 88 7 10 5 252 254 250 254 255 252 254 255 252 254 255 252 95 96 94 
-+0 6 9 166 207 248 170 212 252 170 212 252 170 212 252 170 212 252 138 174 208 8 14 16 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 7 10 5 222 224 221 234 236 233 234 236 233 234 236 233 141 142 139 
-+183 185 181 138 140 137 131 133 130 141 142 139 192 194 191 102 104 101 0 2 0 224 163 69 
-+0 2 0 105 75 32 250 179 73 55 39 17 7 0 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 21 27 33 170 212 252 170 212 252 
-+170 212 252 115 152 185 0 2 0 180 132 57 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 228 167 73 10 12 8 
-+38 45 51 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 82 108 129 0 2 0 222 224 221 254 255 252 254 255 252 254 255 252 158 160 156 
-+0 2 0 92 119 140 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 122 159 192 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 141 142 139 234 236 233 234 236 233 234 236 233 131 133 130 
-+185 187 183 231 233 230 222 224 221 158 160 156 138 140 137 48 50 48 3 6 2 250 179 73 
-+134 100 43 206 148 61 218 158 64 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 75 94 116 170 212 252 170 212 252 
-+170 212 252 92 119 140 0 2 0 224 163 69 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 87 61 23 7 0 0 
-+134 170 204 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 109 141 168 0 2 0 178 180 177 254 255 252 254 255 252 254 255 252 252 254 250 
-+39 43 45 10 16 18 157 198 239 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+88 115 136 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 45 47 44 234 236 233 234 236 233 234 236 233 131 133 130 
-+148 150 147 138 140 137 148 150 147 210 212 209 152 154 151 26 27 25 29 21 8 250 179 73 
-+250 179 73 234 172 70 55 39 17 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 126 162 196 170 212 252 170 212 252 
-+170 212 252 103 134 161 0 2 0 202 145 58 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 238 175 73 75 55 22 0 2 0 75 102 123 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 140 177 211 0 2 0 135 137 134 254 255 252 254 255 252 254 255 252 254 255 252 
-+183 185 181 0 2 0 75 94 116 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 57 72 88 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 162 164 161 234 236 233 234 236 233 135 137 134 
-+226 228 225 198 200 197 104 106 103 15 17 14 0 2 0 15 9 7 147 105 44 250 179 73 
-+248 178 79 55 39 17 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 6 9 21 27 33 170 212 252 170 212 252 170 212 252 
-+170 212 252 122 159 192 0 2 0 175 129 54 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 250 179 73 202 145 58 55 39 17 0 2 0 82 108 129 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 12 17 20 60 62 59 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 69 71 68 0 6 9 143 185 225 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 159 201 241 26 33 39 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 7 10 5 162 164 161 215 217 214 95 96 94 
-+56 58 55 0 2 0 0 2 0 0 2 0 61 44 16 238 175 73 250 179 73 250 179 73 
-+218 158 64 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 88 115 136 170 212 252 170 212 252 170 212 252 
-+170 212 252 143 185 225 0 2 0 147 105 44 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 212 153 66 95 68 30 0 2 0 8 14 16 103 134 161 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 68 83 99 0 2 0 231 233 230 254 255 252 254 255 252 254 255 252 
-+254 255 252 210 212 209 0 6 9 53 68 84 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 126 162 196 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 7 0 0 23 15 7 250 179 73 250 179 73 250 179 73 
-+250 179 73 29 21 8 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 6 9 154 195 235 170 212 252 170 212 252 170 212 252 
-+170 212 252 166 207 248 0 2 0 52 36 13 158 114 46 180 132 57 161 117 49 119 87 37 
-+41 31 10 0 2 0 0 2 0 72 87 103 154 195 235 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 115 152 185 0 2 0 152 154 151 254 255 252 238 241 237 85 87 84 
-+229 231 228 254 255 252 99 101 98 0 2 0 126 162 196 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 63 78 94 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 202 145 58 250 179 73 250 179 73 
-+250 179 73 105 75 32 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 32 39 45 0 2 0 57 72 88 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 85 112 133 12 17 20 0 2 0 0 2 0 0 2 0 0 2 0 
-+34 41 47 92 110 133 143 185 225 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 166 207 248 6 12 15 71 73 70 254 255 252 229 231 228 0 2 0 
-+141 142 139 254 255 252 231 233 230 10 12 8 34 44 55 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 154 195 235 6 12 15 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 125 92 35 250 179 73 250 179 73 
-+250 179 73 180 132 57 0 2 0 0 2 0 0 2 0 0 2 0 3 10 13 68 83 99 
-+129 165 199 85 112 133 0 2 0 122 159 192 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 126 162 196 119 156 189 134 170 204 149 191 231 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 57 72 88 3 6 2 242 244 240 254 255 252 35 37 34 
-+78 80 77 254 255 252 254 255 252 128 130 127 0 2 0 105 137 164 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 91 123 149 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 7 0 0 55 39 17 250 179 73 250 179 73 
-+250 179 73 245 175 76 7 10 5 0 2 0 44 54 65 103 134 161 161 203 243 170 212 252 
-+170 212 252 21 27 33 25 32 38 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 61 76 92 0 2 0 242 244 240 254 255 252 102 104 101 
-+10 12 8 231 233 230 254 255 252 244 246 243 26 27 25 21 27 33 159 201 241 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 32 39 45 0 6 9 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 218 158 64 250 179 73 
-+250 179 73 250 179 73 75 55 22 0 2 0 161 203 243 170 212 252 170 212 252 170 212 252 
-+115 147 174 0 2 0 91 123 149 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 159 201 241 146 188 228 
-+140 177 211 134 170 204 146 188 228 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 17 24 30 62 64 61 254 255 252 254 255 252 215 217 214 
-+0 2 0 102 104 101 254 255 252 254 255 252 166 168 165 0 2 0 72 87 103 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 129 165 199 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 105 75 32 250 179 73 
-+250 179 73 250 179 73 150 108 46 0 2 0 113 145 172 170 212 252 170 212 252 170 212 252 
-+49 59 70 3 10 13 157 198 239 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 166 207 248 109 141 168 65 87 102 28 35 41 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 6 9 28 35 41 70 96 117 138 174 208 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 0 2 0 102 104 101 254 255 252 254 255 252 254 255 252 
-+102 104 101 0 2 0 192 194 191 254 255 252 254 255 252 78 80 77 0 2 0 122 159 192 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 34 44 55 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 61 76 92 154 195 235 0 6 9 29 21 8 250 179 73 
-+250 179 73 250 179 73 224 163 69 0 2 0 68 83 99 170 212 252 170 212 252 143 179 213 
-+0 2 0 72 87 103 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+161 203 243 96 115 138 17 24 30 0 2 0 0 2 0 45 47 44 102 104 101 123 125 122 
-+138 140 137 143 145 142 115 117 114 82 83 81 43 44 42 0 2 0 0 2 0 32 39 45 
-+126 162 196 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 0 2 0 85 87 84 254 255 252 254 255 252 254 255 252 
-+242 244 240 27 29 27 35 37 34 254 255 252 254 255 252 231 233 230 10 12 8 21 27 33 
-+159 201 241 170 212 252 170 212 252 170 212 252 170 212 252 163 205 246 0 6 9 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 6 9 44 54 65 170 212 252 170 212 252 34 44 55 0 2 0 82 62 28 
-+109 79 35 224 163 69 250 179 73 52 36 13 15 20 22 170 212 252 170 212 252 75 89 106 
-+0 2 0 143 179 213 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 134 170 204 
-+25 32 38 0 2 0 40 41 39 155 157 153 238 241 237 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 210 212 209 115 117 114 18 20 17 
-+0 2 0 68 83 99 157 198 239 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 52 62 74 7 10 5 234 236 233 254 255 252 254 255 252 
-+254 255 252 195 197 194 102 104 101 254 255 252 254 255 252 254 255 252 162 164 161 0 2 0 
-+72 87 103 170 212 252 170 212 252 170 212 252 170 212 252 119 156 189 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 115 147 174 170 212 252 91 123 149 0 2 0 0 2 0 6 12 15 
-+0 2 0 15 9 7 197 142 62 125 92 35 0 2 0 115 152 185 113 145 172 3 6 2 
-+41 51 62 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 113 145 172 0 6 9 
-+10 12 8 155 157 153 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 232 234 231 
-+87 89 86 0 2 0 32 39 45 154 195 235 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 115 152 185 0 2 0 138 140 137 254 255 252 254 255 252 
-+254 255 252 254 255 252 249 251 248 254 255 252 254 255 252 254 255 252 254 255 252 65 66 64 
-+0 2 0 122 159 192 170 212 252 170 212 252 170 212 252 66 80 97 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 154 195 235 170 212 252 143 179 213 88 115 136 149 191 231 170 212 252 
-+126 162 196 3 6 2 64 46 18 202 145 58 0 2 0 0 2 0 0 2 0 0 2 0 
-+92 119 140 170 212 252 170 212 252 170 212 252 170 212 252 143 179 213 3 10 13 27 29 27 
-+215 217 214 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 155 157 153 0 2 0 32 39 45 154 195 235 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 23 30 36 27 29 27 249 251 248 254 255 252 
-+254 255 252 188 190 187 7 10 5 226 228 225 254 255 252 254 255 252 254 255 252 231 233 230 
-+7 10 5 21 27 33 159 201 241 170 212 252 103 134 161 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 119 156 189 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 55 66 77 11 4 3 250 179 73 24 17 10 0 2 0 0 2 0 0 2 0 
-+143 185 225 170 212 252 170 212 252 170 212 252 159 201 241 28 35 41 7 10 5 200 202 199 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 155 157 153 0 2 0 55 66 77 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 96 127 154 0 2 0 158 160 156 254 255 252 
-+254 255 252 192 194 191 0 2 0 176 178 175 254 255 252 254 255 252 254 255 252 254 255 252 
-+141 142 139 0 2 0 72 87 103 129 165 199 0 6 9 0 6 9 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 6 9 12 17 20 143 185 225 170 212 252 170 212 252 170 212 252 170 212 252 
-+138 174 208 17 24 30 29 21 8 250 179 73 101 72 28 0 2 0 0 2 0 32 39 45 
-+170 212 252 170 212 252 170 212 252 170 212 252 57 72 88 0 2 0 152 154 151 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 108 110 107 0 2 0 115 152 185 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 166 207 248 18 22 24 40 41 39 254 255 252 
-+254 255 252 232 234 231 0 2 0 148 150 147 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 10 12 8 0 2 0 8 14 16 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 6 9 41 51 62 61 76 92 34 44 55 3 10 13 
-+0 2 0 11 4 3 164 119 51 250 179 73 175 129 54 0 2 0 0 2 0 82 108 129 
-+170 212 252 170 212 252 170 212 252 98 129 156 0 2 0 95 96 94 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 238 241 237 18 20 17 25 32 38 166 207 248 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 85 112 133 0 2 0 188 190 187 
-+254 255 252 254 255 252 198 200 197 242 244 240 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 120 122 119 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 6 9 0 2 0 0 6 9 7 0 0 
-+31 23 12 202 145 58 250 179 73 250 179 73 238 175 73 0 2 0 0 2 0 122 159 192 
-+170 212 252 170 212 252 170 212 252 28 35 41 31 32 30 244 246 243 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 152 154 151 0 2 0 85 112 133 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 138 174 208 0 2 0 148 150 147 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 222 224 221 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+7 0 0 234 172 70 250 179 73 250 179 73 250 179 73 34 26 8 0 2 0 149 191 231 
-+170 212 252 170 212 252 129 165 199 0 2 0 128 130 127 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 252 254 250 48 50 48 3 10 13 146 188 228 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 157 198 239 0 2 0 118 120 117 
-+254 255 252 254 255 252 254 255 252 169 171 168 231 233 230 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 40 41 39 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 170 124 49 250 179 73 250 179 73 250 179 73 48 33 15 6 12 15 170 212 252 
-+170 212 252 170 212 252 65 87 102 0 2 0 222 224 221 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 195 197 194 0 2 0 84 103 125 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 3 10 13 85 87 84 
-+254 255 252 254 255 252 234 236 233 0 2 0 128 130 127 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 99 101 98 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 95 68 30 250 179 73 250 179 73 250 179 73 34 26 8 34 44 55 170 212 252 
-+170 212 252 163 205 246 8 14 16 62 64 61 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 35 37 34 34 44 55 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 26 33 39 60 62 59 
-+254 255 252 254 255 252 238 241 237 0 2 0 108 110 107 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 158 160 156 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 23 15 7 248 178 79 250 179 73 245 175 76 0 2 0 63 78 94 170 212 252 
-+170 212 252 109 141 168 0 2 0 158 160 156 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 104 106 103 0 2 0 
-+154 195 235 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 21 27 33 69 71 68 
-+254 255 252 254 255 252 244 246 243 0 2 0 91 93 90 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 215 217 214 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 197 142 62 250 179 73 212 153 66 0 2 0 92 110 133 170 212 252 
-+170 212 252 80 98 121 0 2 0 231 233 230 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 176 178 175 0 2 0 
-+105 137 164 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 8 14 16 87 89 86 
-+254 255 252 254 255 252 254 255 252 40 41 39 21 22 20 252 254 250 254 255 252 254 255 252 
-+254 255 252 254 255 252 252 254 250 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 125 92 35 250 179 73 170 124 49 0 2 0 113 145 172 170 212 252 
-+170 212 252 53 68 84 15 17 14 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 242 244 240 0 2 0 
-+63 78 94 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 0 2 0 104 106 103 
-+254 255 252 254 255 252 254 255 252 123 125 122 0 2 0 166 168 165 254 255 252 254 255 252 
-+254 255 252 254 255 252 234 236 233 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 7 0 0 52 36 13 250 179 73 129 95 39 0 2 0 143 179 213 170 212 252 
-+170 212 252 32 39 45 48 50 48 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 60 62 59 
-+18 22 24 170 212 252 170 212 252 170 212 252 170 212 252 163 205 246 0 2 0 102 104 101 
-+254 255 252 254 255 252 254 255 252 226 228 225 15 17 14 10 12 8 215 217 214 254 255 252 
-+254 255 252 254 255 252 210 212 209 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 88 66 26 29 21 8 0 2 0 166 207 248 170 212 252 
-+170 212 252 3 10 13 85 87 84 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 123 125 122 
-+0 2 0 149 191 231 170 212 252 170 212 252 170 212 252 170 212 252 21 27 33 56 58 55 
-+254 255 252 254 255 252 254 255 252 254 255 252 178 180 177 0 2 0 38 40 37 238 241 237 
-+254 255 252 254 255 252 210 212 209 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 7 0 0 7 0 0 0 2 0 161 203 243 170 212 252 
-+149 191 231 0 2 0 123 125 122 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 141 142 139 
-+0 2 0 143 179 213 170 212 252 170 212 252 170 212 252 170 212 252 66 80 97 0 2 0 
-+210 212 209 254 255 252 254 255 252 254 255 252 254 255 252 120 122 119 0 2 0 21 22 20 
-+143 145 142 244 246 243 219 221 218 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 149 191 231 170 212 252 
-+129 165 199 0 2 0 158 160 156 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 155 157 153 
-+0 2 0 134 170 204 170 212 252 170 212 252 170 212 252 170 212 252 143 185 225 0 6 9 
-+69 71 68 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 71 73 70 0 2 0 
-+0 2 0 0 2 0 40 41 39 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 139 181 221 170 212 252 
-+129 165 199 0 2 0 162 164 161 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 169 171 168 
-+0 2 0 119 156 189 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 75 94 116 
-+0 2 0 135 137 134 254 255 252 254 255 252 254 255 252 254 255 252 69 71 68 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 134 170 204 170 212 252 
-+134 170 204 0 2 0 152 154 151 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 183 185 181 
-+0 2 0 113 145 172 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 166 207 248 
-+44 54 65 0 2 0 162 164 161 254 255 252 254 255 252 254 255 252 35 37 34 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 126 162 196 170 212 252 
-+138 174 208 0 2 0 143 145 142 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 198 200 197 
-+0 2 0 103 134 161 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+157 198 239 28 35 41 0 2 0 188 190 187 254 255 252 252 254 250 3 6 2 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 115 152 185 170 212 252 
-+143 179 213 0 2 0 135 137 134 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 210 212 209 
-+0 2 0 91 123 149 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 146 188 228 0 6 9 26 27 25 242 244 240 176 178 175 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 105 137 164 170 212 252 
-+143 185 225 0 2 0 128 130 127 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 185 187 183 
-+0 2 0 105 137 164 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 163 205 246 0 2 0 0 2 0 102 104 101 60 62 59 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 80 98 121 170 212 252 
-+149 191 231 0 2 0 118 120 117 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 143 145 142 
-+0 2 0 134 170 204 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 143 179 213 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 44 54 65 170 212 252 
-+170 212 252 3 10 13 85 87 84 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 108 110 107 
-+0 2 0 157 198 239 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 115 152 185 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 3 10 13 170 212 252 
-+170 212 252 34 44 55 43 44 42 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 69 71 68 
-+15 20 22 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 75 94 116 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 139 181 221 
-+170 212 252 63 78 94 3 6 2 249 251 248 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 31 32 30 
-+41 51 62 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+161 203 243 6 12 15 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 105 137 164 
-+170 212 252 88 115 136 0 2 0 210 212 209 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 249 251 248 0 2 0 
-+68 83 99 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+96 127 154 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 61 76 92 
-+170 212 252 119 150 178 0 2 0 169 171 168 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 183 185 181 0 2 0 
-+91 123 149 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+28 35 41 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 6 9 
-+146 188 228 143 185 225 0 2 0 126 127 125 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 85 87 84 0 6 9 
-+154 195 235 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 98 129 156 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+72 90 112 170 212 252 18 22 24 56 58 55 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 238 241 237 7 10 5 55 66 77 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 122 159 192 0 6 9 
-+0 6 9 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 122 159 192 72 87 103 0 2 0 229 231 228 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 152 154 151 0 2 0 113 145 172 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 139 181 221 8 14 16 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 18 22 24 109 141 168 0 2 0 148 150 147 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 56 58 55 12 17 20 166 207 248 
-+170 212 252 170 212 252 170 212 252 170 212 252 146 188 228 23 30 36 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 101 72 28 202 145 58 
-+180 132 57 0 2 0 38 45 51 3 10 13 69 71 68 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 200 202 199 0 2 0 75 89 106 170 212 252 
-+170 212 252 170 212 252 170 212 252 109 141 168 8 14 16 0 2 0 21 13 4 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 7 0 0 0 2 0 101 72 28 218 158 64 250 179 73 250 179 73 
-+250 179 73 139 99 44 0 2 0 8 14 16 0 2 0 238 241 237 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 244 246 243 38 40 37 3 10 13 139 181 221 170 212 252 
-+170 212 252 161 203 243 66 80 97 0 2 0 31 23 12 191 142 60 248 183 74 180 132 57 
-+44 34 15 0 2 0 7 0 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 23 15 7 190 136 56 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 150 108 46 0 2 0 0 2 0 82 83 81 222 224 221 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 102 104 101 0 2 0 98 129 156 170 212 252 163 205 246 
-+98 129 156 23 30 36 0 2 0 82 62 28 234 172 70 248 183 74 248 183 74 248 183 74 
-+248 183 74 158 114 46 29 21 8 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 64 46 18 109 79 35 150 108 46 224 163 69 250 179 73 
-+250 179 73 250 179 73 250 179 73 158 114 46 0 2 0 0 2 0 3 6 2 115 117 114 
-+234 236 233 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 176 178 175 0 2 0 57 72 88 146 188 228 80 98 121 8 14 16 
-+0 2 0 24 17 10 158 114 46 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 
-+248 183 74 248 183 74 242 178 77 58 42 19 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 7 0 0 0 2 0 0 2 0 67 49 21 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 228 167 73 95 68 30 0 2 0 0 2 0 
-+0 2 0 52 54 51 108 110 107 162 164 161 219 221 218 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 252 254 250 
-+219 221 218 178 180 177 18 20 17 6 12 15 26 33 39 0 2 0 0 2 0 52 36 13 
-+164 119 51 242 178 77 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 242 178 77 
-+187 138 56 175 129 54 158 114 46 82 62 28 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 78 58 25 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 234 172 70 142 101 40 
-+44 34 15 10 12 8 0 2 0 0 2 0 0 2 0 18 20 17 60 62 59 71 73 70 
-+82 83 81 95 96 94 104 106 103 118 120 117 115 117 114 78 80 77 40 41 39 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 44 34 15 105 75 32 191 142 60 248 183 74 
-+248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 105 75 32 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 187 138 56 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 142 101 40 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 206 148 61 248 183 74 248 183 74 248 183 74 
-+248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 161 117 49 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 228 167 73 250 179 73 
-+238 175 73 190 136 56 158 114 46 234 172 70 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 147 105 44 0 2 0 7 0 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 67 49 21 248 183 74 248 183 74 248 183 74 
-+248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 
-+31 23 12 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 7 10 5 21 13 4 
-+0 2 0 0 2 0 0 2 0 147 105 44 250 179 73 250 179 73 250 179 73 250 179 73 
-+134 100 43 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 155 111 43 248 183 74 248 183 74 
-+248 183 74 248 183 74 224 163 69 55 39 17 64 46 18 164 119 51 242 178 77 248 183 74 
-+75 55 22 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 202 145 58 250 179 73 250 179 73 228 167 73 88 66 26 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 7 0 0 0 2 0 168 123 54 248 183 74 
-+248 183 74 248 183 74 158 114 46 0 2 0 7 0 0 0 2 0 10 12 8 44 34 15 
-+15 9 7 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 29 21 8 250 179 73 250 179 73 158 114 46 15 14 3 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 7 0 0 0 2 0 175 129 54 
-+248 183 74 248 183 74 114 83 33 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 29 21 8 147 105 44 58 42 19 0 2 0 7 0 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+105 75 32 218 158 64 23 15 7 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 7 0 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
- 
-diff --git a/drivers/video/logo/logo_linux_mono.pbm b/drivers/video/logo/logo_linux_mono.pbm
-index 2f14d9f..3d3c358 100644
---- a/drivers/video/logo/logo_linux_mono.pbm
-+++ b/drivers/video/logo/logo_linux_mono.pbm
-@@ -1,203 +1,159 @@
--P1
--# Standard black and white Linux logo
--80 80
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 1 1 1 1 1 1 1 1 0 0 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 0 1 1 1 1 1 1 1 1 1 1 1 1 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 1 1
--1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1
--1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--1 0 0 1 1 1 1 1 1 0 0 0 0 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 0 0 0 0 1 1 1 1 0 0 0 0 0 0 1 1
--1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--0 1 1 0 0 1 1 1 0 0 1 1 0 0 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0 1 1 1 0 1 1 1 1 0 0 1
--1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--1 1 1 1 0 1 1 1 0 1 1 1 1 0 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 1
--1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--0 1 1 0 0 0 0 0 0 0 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 0 0 0 1 0 0 1 0 0 0 0 0 1 1 1
--1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 1
--1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--1 0 0 0 0 0 0 0 0 0 1 1 0 0 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 0 0 0 0 0 0 1 1 0 0 0 0 1 1
--1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--1 1 1 1 1 1 1 1 0 0 0 0 1 1 0 1 1 1 0 1 1 1 0 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 0 1 0 0 0 0 0 0 0 0 1 1 0 0 0 1
--1 1 1 0 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1
--0 0 1 0 0 0 0 0 1 1 0 0 0 0 0 1 1 1 1 0 1 1 1 0 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 0 0 0 1 1 1 1 1 0 0 0 0 0 0 0 0
--1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 0 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 0 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1
--0 0 0 1 1 1 0 0 0 0 0 0 0 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 0 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 0 1 1 1 1 1 1 1 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 1 1 1
--1 1 1 0 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 0 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 0
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 1 1 1 1 1 1
--0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1
--1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1
--1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0
--0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1
--1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0
--0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1
--1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0
--0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 1 1
--1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 1 0 1 1 1 1 1 1 0 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 0 0 0 1 1 1 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 0 0 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 1 0 0 0 1 1 1 1 1 1 1 1 1 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 1 1 1 1 1 1 1 1 0
--0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 1 0 0 0 0 1 1 1 1 1 1 1 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 1 1 1 1 1 0 0 0
--0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1
--1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1
--1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1
--1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--1 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0
--1 1 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0
--1 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 0 0 1 0 0 0 0 0 0 0 0 0 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-+P2
-+80  78
-+255 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 255 255 255 255 255 0 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 255 255 255 0 0 0 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 0 255 255 0 0 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 0 255 255 0 0 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 255 255 255 255 255 0 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 255 0 0 0 0 255 255 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 0 0 0 0 0 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 0 0 0 255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 255 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 255 
-+255 0 0 0 0 0 0 0 0 0 
-+0 0 0 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 255 255 255 255 
-+255 255 0 0 0 0 0 0 0 0 
-+0 0 0 255 255 255 255 255 255 255 255 255 255 0 0 255 0 255 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 0 0 255 255 255 255 
-+255 255 0 0 0 0 0 0 0 0 
-+0 0 0 0 255 255 255 255 255 255 255 255 255 0 0 255 255 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 0 0 255 255 255 
-+255 255 255 0 0 0 0 0 0 0 
-+0 0 0 0 255 255 255 255 255 255 0 0 0 0 0 255 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 255 255 255 
-+255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 255 255 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 255 255 
-+255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 255 255 255 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 0 255 255 0 0 255 255 
-+255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 0 255 255 255 0 0 255 
-+255 255 255 255 255 255 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 0 0 255 255 255 0 255 
-+255 255 255 255 255 255 255 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 0 0 255 255 255 0 0 
-+255 255 255 255 255 255 255 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 0 0 255 255 255 0 
-+0 255 255 255 255 255 255 255 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 0 0 255 255 255 0 
-+0 255 255 255 255 255 255 255 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 255 255 255 255 0 0 255 255 255 0 0 255 255 255 255 255 255 255 0 0 0 0 0 0 255 255 255 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 
-+0 0 255 255 255 255 255 255 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 0 0 255 255 0 0 255 255 0 0 255 255 255 255 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 255 255 255 
-+255 0 0 255 255 255 255 255 0 0 
-+0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 0 0 0 255 0 0 255 255 0 0 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 
-+255 0 0 255 255 255 255 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 0 0 255 0 0 0 0 0 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 255 255 255 
-+255 255 0 0 255 255 255 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 0 0 255 0 0 0 0 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 255 255 255 255 0 255 255 255 
-+255 255 255 0 0 255 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 255 0 0 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 0 255 255 255 
-+255 255 255 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 
-+255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 
-+255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 
-+255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 255 255 255 0 255 255 
-+255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 255 255 255 0 0 255 
-+255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 255 255 255 0 0 255 
-+255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 0 0 255 255 255 0 0 255 
-+255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 255 255 255 255 0 255 
-+255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 255 255 255 255 0 0 
-+255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 0 0 255 255 255 255 255 0 
-+0 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 0 0 255 255 255 255 255 255 
-+0 0 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 0 0 255 255 255 255 255 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 0 0 255 255 255 255 255 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 0 0 255 255 255 255 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 0 0 255 255 255 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 0 0 255 255 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 0 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 0 255 255 255 255 255 255 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 0 0 255 255 255 255 255 255 255 255 255 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-diff --git a/drivers/video/logo/logo_linux_vga16.ppm b/drivers/video/logo/logo_linux_vga16.ppm
-index 1850c15..f279f97 100644
---- a/drivers/video/logo/logo_linux_vga16.ppm
-+++ b/drivers/video/logo/logo_linux_vga16.ppm
-@@ -1,1604 +1,18724 @@
- P3
--# Standard 16-color Linux logo
--80 80
--255
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85  85  85  85  85  85  85  85  85  85
-- 85  85  85  85  85  85  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85  85  85  85
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
-- 85  85  85  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85 170 170 170   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--170 170 170 170 170 170  85  85  85   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0  85  85  85 170 170 170   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170 170 170 170 170 170
--170 170 170   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
-- 85  85  85 170 170 170 170 170 170 170 170 170
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0 170 170 170 255 255 255 255 255 255
--255 255 255 170 170 170   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
--170 170 170 170 170 170 255 255 255 255 255 255
--  0   0   0   0   0   0   0   0   0   0   0   0
--170 170 170 255 255 255 170 170 170 170 170 170
--255 255 255 170 170 170   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
--170 170 170   0   0   0   0   0   0 255 255 255
-- 85  85  85   0   0   0   0   0   0   0   0   0
--255 255 255 170 170 170   0   0   0  85  85  85
--170 170 170 255 255 255 170 170 170   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
-- 85  85  85   0   0   0   0   0   0 170 170 170
-- 85  85  85   0   0   0   0   0   0   0   0   0
--255 255 255  85  85  85   0   0   0   0   0   0
-- 85  85  85 255 255 255 170 170 170   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
--170 170 170   0   0   0   0   0   0 170 170 170
-- 85  85  85  85  85  85  85  85  85  85  85  85
--255 255 255  85  85  85   0   0   0   0   0   0
-- 85  85  85 255 255 255 170 170 170   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--255 255 255   0   0   0   0   0   0 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0   0   0   0   0   0   0
-- 85  85  85 255 255 255   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--170 170 170 170 170 170 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170 170 170 170 170 170   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85  85  85  85   0   0   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85  85  85  85   0   0   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 170  85   0
--170  85   0 170  85   0  85  85  85   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85  85  85  85   0   0   0
-- 85  85  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0  85  85  85   0   0   0
--  0   0   0  85  85  85 170 170 170  85  85  85
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85  85  85  85   0   0   0
-- 85  85  85 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170 170 170 170 170 170 170 170 170   0   0   0
--  0   0   0   0   0   0 170 170 170 170 170 170
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
-- 85  85  85 170 170 170 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 170 170 170 170 170 170
--170 170 170 170 170 170 170 170 170  85  85  85
--  0   0   0   0   0   0  85  85  85  85  85  85
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
-- 85  85  85 170 170 170 170 170 170 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170 170 170 170 170 170 170 170 170 170 170 170
--255 255 255 255 255 255 255 255 255 170 170 170
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0  85  85  85
--255 255 255 255 255 255 170 170 170 170 170 170
--170 170 170 170 170 170 170 170 170 170 170 170
--170 170 170 170 170 170 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0 170 170 170
--255 255 255 255 255 255 170 170 170 170 170 170
--170 170 170 170 170 170 170 170 170 170 170 170
--170 170 170 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--170 170 170   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0  85  85  85 255 255 255
--255 255 255 255 255 255 255 255 255 170 170 170
--170 170 170 170 170 170 170 170 170 170 170 170
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0  85  85  85 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0  85  85  85 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0  85  85  85 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
-- 85  85  85 170 170 170 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85 170 170 170 170 170 170 170 170 170
--255 255 255 255 255 255 255 255 255 170 170 170
--170 170 170 170 170 170 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--170 170 170 170 170 170 170 170 170 170 170 170
--170 170 170 170 170 170 170 170 170  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--170 170 170 170 170 170 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--170 170 170 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 170 170 170
--170 170 170 170 170 170 170 170 170  85  85  85
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--170 170 170 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170 170 170 170 170 170 170
--  0   0   0   0   0   0   0   0   0  85  85  85
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
-- 85  85  85   0   0   0   0   0   0  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 170 170 170
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0 170 170 170
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--170 170 170  85  85  85   0   0   0   0   0   0
--  0   0   0  85  85  85  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
--  0   0   0   0   0   0  85  85  85 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170   0   0   0  85  85  85
-- 85  85  85   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
--  0   0   0  85  85  85 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170   0   0   0  85  85  85
-- 85  85  85   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0  85  85  85
--  0   0   0 170 170 170 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0  85  85  85   0   0   0
--  0   0   0 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0  85  85  85   0   0   0
-- 85  85  85 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0  85  85  85   0   0   0   0   0   0
--170 170 170 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255   0   0   0
-- 85  85  85  85  85  85  85  85  85  85  85  85
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0 170  85   0
--255 255  85 170  85   0   0   0   0   0   0   0
-- 85  85  85 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85  85  85  85   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0   0   0   0
--  0   0   0  85  85  85 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255  85 170  85   0 255 255  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85  85  85  85
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--  0   0   0   0   0   0  85  85  85 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255  85
--170  85   0 255 255  85 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--170  85   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0   0   0   0   0   0   0  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 170  85   0
--255 255  85 170  85   0 255 255  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0 170  85   0
--255 255  85 170  85   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85   0   0   0   0   0   0   0   0   0
-- 85  85  85 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255  85
--170  85   0 255 255  85 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0 255 255  85
--170  85   0 255 255  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85   0   0   0   0   0   0
--  0   0   0  85  85  85 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 255 255  85 170  85   0
--255 255  85 170  85   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85   0   0   0
--  0   0   0   0   0   0  85  85  85 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170 170 170 170 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170 170 170 170 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170 170 170 170 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0   0   0   0   0   0   0   0   0   0
--  0   0   0 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170 170 170 170 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85   0   0   0   0   0   0   0   0   0
-- 85  85  85 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170  85  85  85 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85  85  85  85  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--170 170 170  85  85  85  85  85  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 170 170 170
-- 85  85  85   0   0   0   0   0   0 170  85   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170  85  85  85
--  0   0   0   0   0   0   0   0   0 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--170 170 170 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--170 170 170  85  85  85  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0 170  85   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 170  85   0
--170  85   0 170 170 170 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170  85  85  85
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--170  85   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85 170  85   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 170  85   0 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 170  85   0
--170  85   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--170  85   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--170  85   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85 170  85   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 170  85   0 170  85   0 170  85   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 170  85   0
--170  85   0   0   0   0   0   0   0   0   0   0
-- 85  85  85  85  85  85  85  85  85  85  85  85
-- 85  85  85  85  85  85  85  85  85  85  85  85
-- 85  85  85  85  85  85  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0 170  85   0
--170  85   0 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--170  85   0 170  85   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 170  85   0 170  85   0
-- 85  85  85  85  85  85  85  85  85  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
-- 85  85  85  85  85  85  85  85  85 170  85   0
--170  85   0 170  85   0 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 170  85   0
--170  85   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-+# CREATOR: GIMP PNM Filter Version 1.1
-+80 78
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+170
-+170
-+170
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+170
-+170
-+170
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+170
-+170
-+170
-+85
-+85
-+85
-+170
-+170
-+170
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+255
-+255
-+255
-+170
-+170
-+170
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+170
-+170
-+170
-+170
-+170
-+170
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
diff --git a/libre-testing/linux-libre/change-default-console-loglevel.patch b/libre-testing/linux-libre/change-default-console-loglevel.patch
deleted file mode 100644
index 22cd69a09..000000000
--- a/libre-testing/linux-libre/change-default-console-loglevel.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -upr linux-3.0.orig/kernel/printk.c linux-3.0/kernel/printk.c
---- linux-3.0.orig/kernel/printk/printk.c	2011-07-22 05:17:23.000000000 +0300
-+++ linux-3.0/kernel/printk/printk.c	2011-07-27 14:43:07.000000000 +0300
-@@ -58,7 +58,7 @@ void asmlinkage __attribute__((weak)) ea
- 
- /* We show everything that is MORE important than this.. */
- #define MINIMUM_CONSOLE_LOGLEVEL 1 /* Minimum loglevel we let people use */
--#define DEFAULT_CONSOLE_LOGLEVEL 7 /* anything MORE serious than KERN_DEBUG */
-+#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_WARNING */
- 
- DECLARE_WAIT_QUEUE_HEAD(log_wait);
- 
diff --git a/libre-testing/linux-libre/config.i686 b/libre-testing/linux-libre/config.i686
deleted file mode 100644
index 65bb11f0a..000000000
--- a/libre-testing/linux-libre/config.i686
+++ /dev/null
@@ -1,6440 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.11.0-1 Kernel Configuration
-#
-# CONFIG_64BIT is not set
-CONFIG_X86_32=y
-CONFIG_X86=y
-CONFIG_INSTRUCTION_DECODER=y
-CONFIG_OUTPUT_FORMAT="elf32-i386"
-CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_MMU=y
-CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_NEED_SG_DMA_LENGTH=y
-CONFIG_GENERIC_ISA_DMA=y
-CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_ARCH_HAS_CPU_RELAX=y
-CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
-CONFIG_ARCH_HAS_CPU_AUTOPROBE=y
-CONFIG_HAVE_SETUP_PER_CPU_AREA=y
-CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
-CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
-CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
-# CONFIG_ZONE_DMA32 is not set
-# CONFIG_AUDIT_ARCH is not set
-CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
-CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
-CONFIG_HAVE_INTEL_TXT=y
-CONFIG_X86_32_SMP=y
-CONFIG_X86_HT=y
-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_IRQ_WORK=y
-CONFIG_BUILDTIME_EXTABLE_SORT=y
-
-#
-# General setup
-#
-CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_CROSS_COMPILE=""
-# CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="-LIBRE"
-CONFIG_LOCALVERSION_AUTO=y
-CONFIG_HAVE_KERNEL_GZIP=y
-CONFIG_HAVE_KERNEL_BZIP2=y
-CONFIG_HAVE_KERNEL_LZMA=y
-CONFIG_HAVE_KERNEL_XZ=y
-CONFIG_HAVE_KERNEL_LZO=y
-CONFIG_HAVE_KERNEL_LZ4=y
-CONFIG_KERNEL_GZIP=y
-# CONFIG_KERNEL_BZIP2 is not set
-# CONFIG_KERNEL_LZMA is not set
-# CONFIG_KERNEL_XZ is not set
-# CONFIG_KERNEL_LZO is not set
-# CONFIG_KERNEL_LZ4 is not set
-CONFIG_DEFAULT_HOSTNAME="(none)"
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_POSIX_MQUEUE_SYSCTL=y
-CONFIG_FHANDLE=y
-CONFIG_AUDIT=y
-CONFIG_AUDITSYSCALL=y
-CONFIG_AUDIT_WATCH=y
-CONFIG_AUDIT_TREE=y
-CONFIG_AUDIT_LOGINUID_IMMUTABLE=y
-CONFIG_HAVE_GENERIC_HARDIRQS=y
-
-#
-# IRQ subsystem
-#
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_GENERIC_PENDING_IRQ=y
-CONFIG_IRQ_DOMAIN=y
-# CONFIG_IRQ_DOMAIN_DEBUG is not set
-CONFIG_IRQ_FORCED_THREADING=y
-CONFIG_SPARSE_IRQ=y
-CONFIG_CLOCKSOURCE_WATCHDOG=y
-CONFIG_KTIME_SCALAR=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
-CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-
-#
-# Timers subsystem
-#
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ_COMMON=y
-# CONFIG_HZ_PERIODIC is not set
-CONFIG_NO_HZ_IDLE=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-
-#
-# CPU/Task time and stats accounting
-#
-CONFIG_TICK_CPU_ACCOUNTING=y
-# CONFIG_IRQ_TIME_ACCOUNTING is not set
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
-CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TASK_XACCT=y
-CONFIG_TASK_IO_ACCOUNTING=y
-
-#
-# RCU Subsystem
-#
-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
-CONFIG_RCU_FAST_NO_HZ=y
-# CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_RCU_BOOST is not set
-CONFIG_RCU_NOCB_CPU=y
-CONFIG_RCU_NOCB_CPU_NONE=y
-# CONFIG_RCU_NOCB_CPU_ZERO is not set
-# CONFIG_RCU_NOCB_CPU_ALL is not set
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=19
-CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
-CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
-CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=y
-CONFIG_CGROUPS=y
-# CONFIG_CGROUP_DEBUG is not set
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CPUSETS=y
-CONFIG_PROC_PID_CPUSET=y
-CONFIG_CGROUP_CPUACCT=y
-CONFIG_RESOURCE_COUNTERS=y
-CONFIG_MEMCG=y
-CONFIG_MEMCG_SWAP=y
-# CONFIG_MEMCG_SWAP_ENABLED is not set
-CONFIG_MEMCG_KMEM=y
-# CONFIG_CGROUP_HUGETLB is not set
-# CONFIG_CGROUP_PERF is not set
-CONFIG_CGROUP_SCHED=y
-CONFIG_FAIR_GROUP_SCHED=y
-CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=y
-CONFIG_BLK_CGROUP=y
-# CONFIG_DEBUG_BLK_CGROUP is not set
-# CONFIG_CHECKPOINT_RESTORE is not set
-CONFIG_NAMESPACES=y
-CONFIG_UTS_NS=y
-CONFIG_IPC_NS=y
-CONFIG_PID_NS=y
-CONFIG_NET_NS=y
-CONFIG_SCHED_AUTOGROUP=y
-CONFIG_MM_OWNER=y
-# CONFIG_SYSFS_DEPRECATED is not set
-CONFIG_RELAY=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_RD_GZIP=y
-CONFIG_RD_BZIP2=y
-CONFIG_RD_LZMA=y
-CONFIG_RD_XZ=y
-CONFIG_RD_LZO=y
-CONFIG_RD_LZ4=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_SYSCTL=y
-CONFIG_ANON_INODES=y
-CONFIG_HAVE_UID16=y
-CONFIG_SYSCTL_EXCEPTION_TRACE=y
-CONFIG_HAVE_PCSPKR_PLATFORM=y
-# CONFIG_EXPERT is not set
-CONFIG_UID16=y
-# CONFIG_SYSCTL_SYSCALL is not set
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_ALL is not set
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_PCSPKR_PLATFORM=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
-CONFIG_EVENTFD=y
-CONFIG_SHMEM=y
-CONFIG_AIO=y
-CONFIG_PCI_QUIRKS=y
-# CONFIG_EMBEDDED is not set
-CONFIG_HAVE_PERF_EVENTS=y
-
-#
-# Kernel Performance Events And Counters
-#
-CONFIG_PERF_EVENTS=y
-# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLUB_DEBUG=y
-# CONFIG_COMPAT_BRK is not set
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-CONFIG_SLUB_CPU_PARTIAL=y
-CONFIG_PROFILING=y
-CONFIG_TRACEPOINTS=y
-CONFIG_OPROFILE=m
-# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
-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
-CONFIG_USE_GENERIC_SMP_HELPERS=y
-CONFIG_GENERIC_SMP_IDLE_THREAD=y
-CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
-CONFIG_HAVE_DMA_API_DEBUG=y
-CONFIG_HAVE_HW_BREAKPOINT=y
-CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
-CONFIG_HAVE_USER_RETURN_NOTIFIER=y
-CONFIG_HAVE_PERF_EVENTS_NMI=y
-CONFIG_HAVE_PERF_REGS=y
-CONFIG_HAVE_PERF_USER_STACK_DUMP=y
-CONFIG_HAVE_ARCH_JUMP_LABEL=y
-CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
-CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
-CONFIG_HAVE_CMPXCHG_LOCAL=y
-CONFIG_HAVE_CMPXCHG_DOUBLE=y
-CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
-CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
-CONFIG_SECCOMP_FILTER=y
-CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
-CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
-CONFIG_HAVE_ARCH_SOFT_DIRTY=y
-CONFIG_MODULES_USE_ELF_REL=y
-CONFIG_CLONE_BACKWARDS=y
-CONFIG_OLD_SIGSUSPEND3=y
-CONFIG_OLD_SIGACTION=y
-
-#
-# GCOV-based kernel profiling
-#
-# CONFIG_GCOV_KERNEL is not set
-CONFIG_HAVE_GENERIC_DMA_COHERENT=y
-CONFIG_SLABINFO=y
-CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
-CONFIG_MODULES=y
-CONFIG_MODULE_FORCE_LOAD=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-CONFIG_MODVERSIONS=y
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-# CONFIG_MODULE_SIG is not set
-CONFIG_STOP_MACHINE=y
-CONFIG_BLOCK=y
-CONFIG_LBDAF=y
-CONFIG_BLK_DEV_BSG=y
-CONFIG_BLK_DEV_BSGLIB=y
-# CONFIG_BLK_DEV_INTEGRITY is not set
-CONFIG_BLK_DEV_THROTTLING=y
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-CONFIG_AIX_PARTITION=y
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_MAC_PARTITION=y
-CONFIG_MSDOS_PARTITION=y
-CONFIG_BSD_DISKLABEL=y
-CONFIG_MINIX_SUBPARTITION=y
-CONFIG_SOLARIS_X86_PARTITION=y
-# CONFIG_UNIXWARE_DISKLABEL is not set
-CONFIG_LDM_PARTITION=y
-# CONFIG_LDM_DEBUG is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-CONFIG_KARMA_PARTITION=y
-CONFIG_EFI_PARTITION=y
-# CONFIG_SYSV68_PARTITION is not set
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-CONFIG_CFQ_GROUP_IOSCHED=y
-# CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_CFQ=y
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="cfq"
-CONFIG_PREEMPT_NOTIFIERS=y
-CONFIG_PADATA=y
-CONFIG_ASN1=m
-CONFIG_UNINLINE_SPIN_UNLOCK=y
-CONFIG_FREEZER=y
-
-#
-# Processor type and features
-#
-CONFIG_ZONE_DMA=y
-CONFIG_SMP=y
-CONFIG_X86_MPPARSE=y
-# CONFIG_X86_BIGSMP is not set
-# CONFIG_X86_EXTENDED_PLATFORM 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
-CONFIG_HYPERVISOR_GUEST=y
-CONFIG_PARAVIRT=y
-# CONFIG_PARAVIRT_DEBUG is not set
-# CONFIG_PARAVIRT_SPINLOCKS is not set
-# CONFIG_XEN_PRIVILEGED_GUEST is not set
-CONFIG_KVM_GUEST=y
-CONFIG_LGUEST_GUEST=y
-CONFIG_PARAVIRT_TIME_ACCOUNTING=y
-CONFIG_PARAVIRT_CLOCK=y
-CONFIG_NO_BOOTMEM=y
-# CONFIG_MEMTEST is not set
-# CONFIG_M486 is not set
-# CONFIG_M586 is not set
-# CONFIG_M586TSC is not set
-# CONFIG_M586MMX is not set
-CONFIG_M686=y
-# CONFIG_MPENTIUMII is not set
-# CONFIG_MPENTIUMIII is not set
-# CONFIG_MPENTIUMM is not set
-# CONFIG_MPENTIUM4 is not set
-# CONFIG_MK6 is not set
-# CONFIG_MK7 is not set
-# CONFIG_MK8 is not set
-# CONFIG_MCRUSOE is not set
-# CONFIG_MEFFICEON is not set
-# CONFIG_MWINCHIPC6 is not set
-# CONFIG_MWINCHIP3D is not set
-# CONFIG_MELAN is not set
-# CONFIG_MGEODEGX1 is not set
-# CONFIG_MGEODE_LX is not set
-# CONFIG_MCYRIXIII is not set
-# CONFIG_MVIAC3_2 is not set
-# CONFIG_MVIAC7 is not set
-# CONFIG_MCORE2 is not set
-# CONFIG_MATOM is not set
-CONFIG_X86_GENERIC=y
-CONFIG_X86_INTERNODE_CACHE_SHIFT=6
-CONFIG_X86_L1_CACHE_SHIFT=6
-# CONFIG_X86_PPRO_FENCE is not set
-CONFIG_X86_INTEL_USERCOPY=y
-CONFIG_X86_USE_PPRO_CHECKSUM=y
-CONFIG_X86_TSC=y
-CONFIG_X86_CMPXCHG64=y
-CONFIG_X86_CMOV=y
-CONFIG_X86_MINIMUM_CPU_FAMILY=5
-CONFIG_X86_DEBUGCTLMSR=y
-CONFIG_CPU_SUP_INTEL=y
-CONFIG_CPU_SUP_AMD=y
-CONFIG_CPU_SUP_CENTAUR=y
-CONFIG_CPU_SUP_TRANSMETA_32=y
-CONFIG_HPET_TIMER=y
-CONFIG_HPET_EMULATE_RTC=y
-CONFIG_DMI=y
-CONFIG_NR_CPUS=8
-CONFIG_SCHED_SMT=y
-CONFIG_SCHED_MC=y
-# CONFIG_PREEMPT_NONE is not set
-# CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_PREEMPT=y
-CONFIG_PREEMPT_COUNT=y
-CONFIG_X86_LOCAL_APIC=y
-CONFIG_X86_IO_APIC=y
-CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
-CONFIG_X86_MCE=y
-CONFIG_X86_MCE_INTEL=y
-CONFIG_X86_MCE_AMD=y
-# CONFIG_X86_ANCIENT_MCE is not set
-CONFIG_X86_MCE_THRESHOLD=y
-# CONFIG_X86_MCE_INJECT is not set
-CONFIG_X86_THERMAL_VECTOR=y
-CONFIG_VM86=y
-CONFIG_TOSHIBA=m
-CONFIG_I8K=m
-CONFIG_X86_REBOOTFIXUPS=y
-CONFIG_MICROCODE=m
-# CONFIG_MICROCODE_INTEL is not set
-# CONFIG_MICROCODE_AMD is not set
-CONFIG_MICROCODE_OLD_INTERFACE=y
-CONFIG_X86_MSR=m
-CONFIG_X86_CPUID=m
-# CONFIG_NOHIGHMEM is not set
-CONFIG_HIGHMEM4G=y
-# CONFIG_HIGHMEM64G is not set
-CONFIG_PAGE_OFFSET=0xC0000000
-CONFIG_HIGHMEM=y
-CONFIG_ARCH_FLATMEM_ENABLE=y
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_ILLEGAL_POINTER_VALUE=0
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_FLATMEM_MANUAL=y
-# CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-CONFIG_SPARSEMEM_STATIC=y
-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
-CONFIG_COMPACTION=y
-CONFIG_MIGRATION=y
-# CONFIG_PHYS_ADDR_T_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=1
-CONFIG_BOUNCE=y
-CONFIG_VIRT_TO_BUS=y
-CONFIG_MMU_NOTIFIER=y
-CONFIG_KSM=y
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
-CONFIG_MEMORY_FAILURE=y
-CONFIG_HWPOISON_INJECT=m
-CONFIG_TRANSPARENT_HUGEPAGE=y
-CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
-# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
-CONFIG_CROSS_MEMORY_ATTACH=y
-CONFIG_CLEANCACHE=y
-CONFIG_FRONTSWAP=y
-CONFIG_ZBUD=y
-CONFIG_ZSWAP=y
-# CONFIG_HIGHPTE is not set
-CONFIG_X86_CHECK_BIOS_CORRUPTION=y
-CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
-CONFIG_X86_RESERVE_LOW=64
-# CONFIG_MATH_EMULATION is not set
-CONFIG_MTRR=y
-CONFIG_MTRR_SANITIZER=y
-CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
-CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
-CONFIG_X86_PAT=y
-CONFIG_ARCH_USES_PG_UNCACHED=y
-CONFIG_ARCH_RANDOM=y
-CONFIG_X86_SMAP=y
-CONFIG_EFI=y
-CONFIG_EFI_STUB=y
-CONFIG_SECCOMP=y
-CONFIG_CC_STACKPROTECTOR=y
-# CONFIG_HZ_100 is not set
-# CONFIG_HZ_250 is not set
-CONFIG_HZ_300=y
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ=300
-CONFIG_SCHED_HRTICK=y
-CONFIG_KEXEC=y
-# CONFIG_CRASH_DUMP is not set
-# CONFIG_KEXEC_JUMP is not set
-CONFIG_PHYSICAL_START=0x1000000
-CONFIG_RELOCATABLE=y
-CONFIG_X86_NEED_RELOCS=y
-CONFIG_PHYSICAL_ALIGN=0x100000
-CONFIG_HOTPLUG_CPU=y
-# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
-# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
-# CONFIG_COMPAT_VDSO is not set
-# CONFIG_CMDLINE_BOOL is not set
-CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-
-#
-# Power management and ACPI options
-#
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-CONFIG_HIBERNATE_CALLBACKS=y
-CONFIG_HIBERNATION=y
-CONFIG_PM_STD_PARTITION=""
-CONFIG_PM_SLEEP=y
-CONFIG_PM_SLEEP_SMP=y
-CONFIG_PM_AUTOSLEEP=y
-CONFIG_PM_WAKELOCKS=y
-CONFIG_PM_WAKELOCKS_LIMIT=100
-CONFIG_PM_WAKELOCKS_GC=y
-CONFIG_PM_RUNTIME=y
-CONFIG_PM=y
-CONFIG_PM_DEBUG=y
-CONFIG_PM_ADVANCED_DEBUG=y
-# CONFIG_PM_TEST_SUSPEND is not set
-CONFIG_PM_SLEEP_DEBUG=y
-CONFIG_PM_TRACE=y
-CONFIG_PM_TRACE_RTC=y
-CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
-CONFIG_ACPI=y
-CONFIG_ACPI_SLEEP=y
-# CONFIG_ACPI_PROCFS is not set
-# CONFIG_ACPI_PROCFS_POWER is not set
-CONFIG_ACPI_EC_DEBUGFS=m
-# CONFIG_ACPI_PROC_EVENT is not set
-CONFIG_ACPI_AC=m
-CONFIG_ACPI_BATTERY=m
-CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_VIDEO=m
-CONFIG_ACPI_FAN=m
-CONFIG_ACPI_DOCK=y
-CONFIG_ACPI_I2C=m
-CONFIG_ACPI_PROCESSOR=m
-CONFIG_ACPI_IPMI=m
-CONFIG_ACPI_HOTPLUG_CPU=y
-CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
-CONFIG_ACPI_THERMAL=m
-# CONFIG_ACPI_CUSTOM_DSDT is not set
-CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y
-CONFIG_ACPI_BLACKLIST_YEAR=0
-# CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_PCI_SLOT=y
-CONFIG_X86_PM_TIMER=y
-CONFIG_ACPI_CONTAINER=y
-CONFIG_ACPI_SBS=m
-CONFIG_ACPI_HED=y
-CONFIG_ACPI_CUSTOM_METHOD=m
-CONFIG_ACPI_BGRT=y
-CONFIG_ACPI_APEI=y
-CONFIG_ACPI_APEI_GHES=y
-CONFIG_ACPI_APEI_PCIEAER=y
-CONFIG_ACPI_APEI_MEMORY_FAILURE=y
-CONFIG_ACPI_APEI_EINJ=m
-CONFIG_ACPI_APEI_ERST_DEBUG=m
-CONFIG_SFI=y
-CONFIG_X86_APM_BOOT=y
-CONFIG_APM=y
-# CONFIG_APM_IGNORE_USER_SUSPEND is not set
-CONFIG_APM_DO_ENABLE=y
-# CONFIG_APM_CPU_IDLE is not set
-# CONFIG_APM_DISPLAY_BLANK is not set
-# CONFIG_APM_ALLOW_INTS is not set
-
-#
-# CPU Frequency scaling
-#
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_TABLE=y
-CONFIG_CPU_FREQ_GOV_COMMON=y
-CONFIG_CPU_FREQ_STAT=m
-CONFIG_CPU_FREQ_STAT_DETAILS=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_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
-CONFIG_X86_POWERNOW_K6=m
-CONFIG_X86_POWERNOW_K7=m
-CONFIG_X86_POWERNOW_K7_ACPI=y
-CONFIG_X86_POWERNOW_K8=m
-CONFIG_X86_AMD_FREQ_SENSITIVITY=m
-CONFIG_X86_GX_SUSPMOD=m
-# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
-CONFIG_X86_SPEEDSTEP_ICH=m
-CONFIG_X86_SPEEDSTEP_SMI=m
-CONFIG_X86_P4_CLOCKMOD=m
-CONFIG_X86_CPUFREQ_NFORCE2=m
-CONFIG_X86_LONGRUN=m
-CONFIG_X86_LONGHAUL=m
-CONFIG_X86_E_POWERSAVER=m
-
-#
-# shared options
-#
-CONFIG_X86_SPEEDSTEP_LIB=m
-CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y
-CONFIG_CPU_IDLE=y
-# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
-CONFIG_CPU_IDLE_GOV_LADDER=y
-CONFIG_CPU_IDLE_GOV_MENU=y
-# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
-CONFIG_INTEL_IDLE=y
-
-#
-# Bus options (PCI etc.)
-#
-CONFIG_PCI=y
-# CONFIG_PCI_GOBIOS is not set
-# CONFIG_PCI_GOMMCONFIG is not set
-# CONFIG_PCI_GODIRECT is not set
-# CONFIG_PCI_GOOLPC is not set
-CONFIG_PCI_GOANY=y
-CONFIG_PCI_BIOS=y
-CONFIG_PCI_DIRECT=y
-CONFIG_PCI_MMCONFIG=y
-CONFIG_PCI_OLPC=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=y
-CONFIG_PCIEAER=y
-# CONFIG_PCIE_ECRC is not set
-# CONFIG_PCIEAER_INJECT is not set
-CONFIG_PCIEASPM=y
-# CONFIG_PCIEASPM_DEBUG is not set
-CONFIG_PCIEASPM_DEFAULT=y
-# CONFIG_PCIEASPM_POWERSAVE is not set
-# CONFIG_PCIEASPM_PERFORMANCE is not set
-CONFIG_PCIE_PME=y
-CONFIG_ARCH_SUPPORTS_MSI=y
-CONFIG_PCI_MSI=y
-# CONFIG_PCI_DEBUG is not set
-CONFIG_PCI_REALLOC_ENABLE_AUTO=y
-CONFIG_PCI_STUB=m
-CONFIG_HT_IRQ=y
-CONFIG_PCI_ATS=y
-CONFIG_PCI_IOV=y
-CONFIG_PCI_PRI=y
-CONFIG_PCI_PASID=y
-CONFIG_PCI_IOAPIC=y
-CONFIG_PCI_LABEL=y
-
-#
-# PCI host controller drivers
-#
-CONFIG_ISA_DMA_API=y
-CONFIG_ISA=y
-# CONFIG_EISA is not set
-# CONFIG_SCx200 is not set
-CONFIG_OLPC=y
-CONFIG_OLPC_XO1_PM=y
-CONFIG_OLPC_XO1_RTC=y
-CONFIG_OLPC_XO1_SCI=y
-CONFIG_OLPC_XO15_SCI=y
-# CONFIG_ALIX is not set
-# CONFIG_NET5501 is not set
-# CONFIG_GEOS is not set
-CONFIG_AMD_NB=y
-CONFIG_PCCARD=m
-CONFIG_PCMCIA=m
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_CARDBUS=y
-
-#
-# PC-card bridges
-#
-CONFIG_YENTA=m
-CONFIG_YENTA_O2=y
-CONFIG_YENTA_RICOH=y
-CONFIG_YENTA_TI=y
-CONFIG_YENTA_ENE_TUNE=y
-CONFIG_YENTA_TOSHIBA=y
-CONFIG_PD6729=m
-CONFIG_I82092=m
-CONFIG_I82365=m
-CONFIG_TCIC=m
-CONFIG_PCMCIA_PROBE=y
-CONFIG_PCCARD_NONSTATIC=y
-CONFIG_HOTPLUG_PCI=y
-CONFIG_HOTPLUG_PCI_COMPAQ=m
-# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
-CONFIG_HOTPLUG_PCI_IBM=m
-CONFIG_HOTPLUG_PCI_ACPI=y
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m
-CONFIG_HOTPLUG_PCI_CPCI=y
-CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
-CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
-CONFIG_HOTPLUG_PCI_SHPC=m
-CONFIG_RAPIDIO=y
-CONFIG_RAPIDIO_TSI721=y
-CONFIG_RAPIDIO_DISC_TIMEOUT=30
-# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set
-CONFIG_RAPIDIO_DMA_ENGINE=y
-CONFIG_RAPIDIO_DEBUG=y
-CONFIG_RAPIDIO_ENUM_BASIC=m
-
-#
-# RapidIO Switch drivers
-#
-CONFIG_RAPIDIO_TSI57X=y
-CONFIG_RAPIDIO_CPS_XX=y
-CONFIG_RAPIDIO_TSI568=y
-CONFIG_RAPIDIO_CPS_GEN2=y
-
-#
-# Executable file formats / Emulations
-#
-CONFIG_BINFMT_ELF=y
-CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_BINFMT_SCRIPT=y
-CONFIG_HAVE_AOUT=y
-CONFIG_BINFMT_AOUT=m
-CONFIG_BINFMT_MISC=y
-CONFIG_COREDUMP=y
-CONFIG_HAVE_ATOMIC_IOMAP=y
-CONFIG_HAVE_TEXT_POKE_SMP=y
-CONFIG_NET=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-CONFIG_PACKET_DIAG=m
-CONFIG_UNIX=y
-CONFIG_UNIX_DIAG=m
-CONFIG_XFRM=y
-CONFIG_XFRM_ALGO=m
-CONFIG_XFRM_USER=m
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_MIGRATE is not set
-# CONFIG_XFRM_STATISTICS is not set
-CONFIG_XFRM_IPCOMP=m
-CONFIG_NET_KEY=m
-# CONFIG_NET_KEY_MIGRATE is not set
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_FIB_TRIE_STATS=y
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-CONFIG_IP_ROUTE_CLASSID=y
-# CONFIG_IP_PNP is not set
-CONFIG_NET_IPIP=m
-CONFIG_NET_IPGRE_DEMUX=m
-CONFIG_NET_IP_TUNNEL=m
-CONFIG_NET_IPGRE=m
-# CONFIG_NET_IPGRE_BROADCAST is not set
-CONFIG_IP_MROUTE=y
-# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-CONFIG_ARPD=y
-CONFIG_SYN_COOKIES=y
-CONFIG_NET_IPVTI=m
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_XFRM_TUNNEL=m
-CONFIG_INET_TUNNEL=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=m
-CONFIG_INET_LRO=y
-CONFIG_INET_DIAG=m
-CONFIG_INET_TCP_DIAG=m
-CONFIG_INET_UDP_DIAG=m
-CONFIG_TCP_CONG_ADVANCED=y
-CONFIG_TCP_CONG_BIC=m
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_TCP_CONG_WESTWOOD=m
-CONFIG_TCP_CONG_HTCP=m
-CONFIG_TCP_CONG_HSTCP=m
-CONFIG_TCP_CONG_HYBLA=m
-CONFIG_TCP_CONG_VEGAS=m
-CONFIG_TCP_CONG_SCALABLE=m
-CONFIG_TCP_CONG_LP=m
-CONFIG_TCP_CONG_VENO=m
-CONFIG_TCP_CONG_YEAH=m
-CONFIG_TCP_CONG_ILLINOIS=m
-CONFIG_DEFAULT_CUBIC=y
-# CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="cubic"
-# CONFIG_TCP_MD5SIG is not set
-CONFIG_IPV6=y
-CONFIG_IPV6_PRIVACY=y
-CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_ROUTE_INFO=y
-CONFIG_IPV6_OPTIMISTIC_DAD=y
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-CONFIG_INET6_IPCOMP=m
-CONFIG_IPV6_MIP6=m
-CONFIG_INET6_XFRM_TUNNEL=m
-CONFIG_INET6_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
-CONFIG_IPV6_SIT=m
-CONFIG_IPV6_SIT_6RD=y
-CONFIG_IPV6_NDISC_NODETYPE=y
-CONFIG_IPV6_TUNNEL=m
-CONFIG_IPV6_GRE=m
-CONFIG_IPV6_MULTIPLE_TABLES=y
-CONFIG_IPV6_SUBTREES=y
-# CONFIG_IPV6_MROUTE is not set
-CONFIG_NETLABEL=y
-CONFIG_NETWORK_SECMARK=y
-CONFIG_NETWORK_PHY_TIMESTAMPING=y
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-CONFIG_NETFILTER_ADVANCED=y
-CONFIG_BRIDGE_NETFILTER=y
-
-#
-# Core Netfilter Configuration
-#
-CONFIG_NETFILTER_NETLINK=m
-CONFIG_NETFILTER_NETLINK_ACCT=m
-CONFIG_NETFILTER_NETLINK_QUEUE=m
-CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NF_CONNTRACK=m
-CONFIG_NF_CONNTRACK_MARK=y
-CONFIG_NF_CONNTRACK_SECMARK=y
-CONFIG_NF_CONNTRACK_ZONES=y
-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
-CONFIG_NF_CT_PROTO_UDPLITE=m
-CONFIG_NF_CONNTRACK_AMANDA=m
-CONFIG_NF_CONNTRACK_FTP=m
-CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IRC=m
-CONFIG_NF_CONNTRACK_BROADCAST=m
-CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-CONFIG_NF_CONNTRACK_SNMP=m
-CONFIG_NF_CONNTRACK_PPTP=m
-CONFIG_NF_CONNTRACK_SANE=m
-CONFIG_NF_CONNTRACK_SIP=m
-CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_CT_NETLINK=m
-CONFIG_NF_CT_NETLINK_TIMEOUT=m
-CONFIG_NF_CT_NETLINK_HELPER=m
-CONFIG_NETFILTER_NETLINK_QUEUE_CT=y
-CONFIG_NF_NAT=m
-CONFIG_NF_NAT_NEEDED=y
-CONFIG_NF_NAT_PROTO_DCCP=m
-CONFIG_NF_NAT_PROTO_UDPLITE=m
-CONFIG_NF_NAT_PROTO_SCTP=m
-CONFIG_NF_NAT_AMANDA=m
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_IRC=m
-CONFIG_NF_NAT_SIP=m
-CONFIG_NF_NAT_TFTP=m
-CONFIG_NETFILTER_TPROXY=m
-CONFIG_NETFILTER_XTABLES=m
-
-#
-# Xtables combined modules
-#
-CONFIG_NETFILTER_XT_MARK=m
-CONFIG_NETFILTER_XT_CONNMARK=m
-CONFIG_NETFILTER_XT_SET=m
-
-#
-# Xtables targets
-#
-CONFIG_NETFILTER_XT_TARGET_AUDIT=m
-CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
-CONFIG_NETFILTER_XT_TARGET_CT=m
-CONFIG_NETFILTER_XT_TARGET_DSCP=m
-CONFIG_NETFILTER_XT_TARGET_HL=m
-CONFIG_NETFILTER_XT_TARGET_HMARK=m
-CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
-CONFIG_NETFILTER_XT_TARGET_LED=m
-CONFIG_NETFILTER_XT_TARGET_LOG=m
-CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_TARGET_NETMAP=m
-CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-CONFIG_NETFILTER_XT_TARGET_RATEEST=m
-CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
-CONFIG_NETFILTER_XT_TARGET_TEE=m
-CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-CONFIG_NETFILTER_XT_TARGET_TRACE=m
-CONFIG_NETFILTER_XT_TARGET_SECMARK=m
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-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
-CONFIG_NETFILTER_XT_MATCH_CPU=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
-CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
-CONFIG_NETFILTER_XT_MATCH_DSCP=m
-CONFIG_NETFILTER_XT_MATCH_ECN=m
-CONFIG_NETFILTER_XT_MATCH_ESP=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_HELPER=m
-CONFIG_NETFILTER_XT_MATCH_HL=m
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-CONFIG_NETFILTER_XT_MATCH_IPVS=m
-CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-CONFIG_NETFILTER_XT_MATCH_MAC=m
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-CONFIG_NETFILTER_XT_MATCH_NFACCT=m
-CONFIG_NETFILTER_XT_MATCH_OSF=m
-CONFIG_NETFILTER_XT_MATCH_OWNER=m
-CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-CONFIG_NETFILTER_XT_MATCH_RATEEST=m
-CONFIG_NETFILTER_XT_MATCH_REALM=m
-CONFIG_NETFILTER_XT_MATCH_RECENT=m
-CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_SOCKET=m
-CONFIG_NETFILTER_XT_MATCH_STATE=m
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-CONFIG_NETFILTER_XT_MATCH_STRING=m
-CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-CONFIG_NETFILTER_XT_MATCH_TIME=m
-CONFIG_NETFILTER_XT_MATCH_U32=m
-CONFIG_IP_SET=m
-CONFIG_IP_SET_MAX=256
-CONFIG_IP_SET_BITMAP_IP=m
-CONFIG_IP_SET_BITMAP_IPMAC=m
-CONFIG_IP_SET_BITMAP_PORT=m
-CONFIG_IP_SET_HASH_IP=m
-CONFIG_IP_SET_HASH_IPPORT=m
-CONFIG_IP_SET_HASH_IPPORTIP=m
-CONFIG_IP_SET_HASH_IPPORTNET=m
-CONFIG_IP_SET_HASH_NET=m
-CONFIG_IP_SET_HASH_NETPORT=m
-CONFIG_IP_SET_HASH_NETIFACE=m
-CONFIG_IP_SET_LIST_SET=m
-CONFIG_IP_VS=m
-# CONFIG_IP_VS_IPV6 is not set
-# CONFIG_IP_VS_DEBUG is not set
-CONFIG_IP_VS_TAB_BITS=12
-
-#
-# IPVS transport protocol load balancing support
-#
-CONFIG_IP_VS_PROTO_TCP=y
-CONFIG_IP_VS_PROTO_UDP=y
-CONFIG_IP_VS_PROTO_AH_ESP=y
-CONFIG_IP_VS_PROTO_ESP=y
-CONFIG_IP_VS_PROTO_AH=y
-CONFIG_IP_VS_PROTO_SCTP=y
-
-#
-# IPVS scheduler
-#
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_WRR=m
-CONFIG_IP_VS_LC=m
-CONFIG_IP_VS_WLC=m
-CONFIG_IP_VS_LBLC=m
-CONFIG_IP_VS_LBLCR=m
-CONFIG_IP_VS_DH=m
-CONFIG_IP_VS_SH=m
-CONFIG_IP_VS_SED=m
-CONFIG_IP_VS_NQ=m
-
-#
-# IPVS SH scheduler
-#
-CONFIG_IP_VS_SH_TAB_BITS=8
-
-#
-# IPVS application helper
-#
-CONFIG_IP_VS_FTP=m
-CONFIG_IP_VS_NFCT=y
-CONFIG_IP_VS_PE_SIP=m
-
-#
-# IP: Netfilter Configuration
-#
-CONFIG_NF_DEFRAG_IPV4=m
-CONFIG_NF_CONNTRACK_IPV4=m
-# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_RPFILTER=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_NF_NAT_IPV4=m
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_PROTO_GRE=m
-CONFIG_NF_NAT_PPTP=m
-CONFIG_NF_NAT_H323=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_RAW=m
-CONFIG_IP_NF_SECURITY=m
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-
-#
-# IPv6: Netfilter Configuration
-#
-CONFIG_NF_DEFRAG_IPV6=m
-CONFIG_NF_CONNTRACK_IPV6=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_RPFILTER=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_RAW=m
-CONFIG_IP6_NF_SECURITY=m
-CONFIG_NF_NAT_IPV6=m
-CONFIG_IP6_NF_TARGET_MASQUERADE=m
-CONFIG_IP6_NF_TARGET_NPT=m
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_IP6=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_ULOG=m
-CONFIG_BRIDGE_EBT_NFLOG=m
-CONFIG_IP_DCCP=m
-CONFIG_INET_DCCP_DIAG=m
-
-#
-# DCCP CCIDs Configuration
-#
-# CONFIG_IP_DCCP_CCID2_DEBUG is not set
-CONFIG_IP_DCCP_CCID3=y
-# CONFIG_IP_DCCP_CCID3_DEBUG is not set
-CONFIG_IP_DCCP_TFRC_LIB=y
-
-#
-# DCCP Kernel Hacking
-#
-# CONFIG_IP_DCCP_DEBUG is not set
-CONFIG_NET_DCCPPROBE=m
-CONFIG_IP_SCTP=m
-CONFIG_NET_SCTPPROBE=m
-# CONFIG_SCTP_DBG_OBJCNT is not set
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
-CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
-CONFIG_SCTP_COOKIE_HMAC_MD5=y
-CONFIG_SCTP_COOKIE_HMAC_SHA1=y
-# CONFIG_RDS is not set
-# CONFIG_TIPC is not set
-CONFIG_ATM=m
-CONFIG_ATM_CLIP=m
-# CONFIG_ATM_CLIP_NO_ICMP is not set
-CONFIG_ATM_LANE=m
-CONFIG_ATM_MPOA=m
-CONFIG_ATM_BR2684=m
-# CONFIG_ATM_BR2684_IPFILTER is not set
-CONFIG_L2TP=m
-# CONFIG_L2TP_DEBUGFS is not set
-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
-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
-CONFIG_IPX=m
-# CONFIG_IPX_INTERN is not set
-CONFIG_ATALK=m
-CONFIG_DEV_APPLETALK=m
-CONFIG_LTPC=m
-CONFIG_COPS=m
-CONFIG_COPS_DAYNA=y
-CONFIG_COPS_TANGENT=y
-CONFIG_IPDDP=m
-CONFIG_IPDDP_ENCAP=y
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-CONFIG_PHONET=m
-CONFIG_IEEE802154=m
-CONFIG_IEEE802154_6LOWPAN=m
-CONFIG_MAC802154=m
-CONFIG_NET_SCHED=y
-
-#
-# Queueing/Scheduling
-#
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_ATM=m
-CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_MULTIQ=m
-CONFIG_NET_SCH_RED=m
-CONFIG_NET_SCH_SFB=m
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SCH_TBF=m
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCH_NETEM=m
-CONFIG_NET_SCH_DRR=m
-CONFIG_NET_SCH_MQPRIO=m
-CONFIG_NET_SCH_CHOKE=m
-CONFIG_NET_SCH_QFQ=m
-CONFIG_NET_SCH_CODEL=m
-CONFIG_NET_SCH_FQ_CODEL=m
-CONFIG_NET_SCH_INGRESS=m
-CONFIG_NET_SCH_PLUG=m
-
-#
-# Classification
-#
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-# CONFIG_CLS_U32_PERF is not set
-# CONFIG_CLS_U32_MARK is not set
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_FLOW=m
-CONFIG_NET_CLS_CGROUP=y
-# CONFIG_NET_EMATCH is not set
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_ACT_POLICE=m
-CONFIG_NET_ACT_GACT=m
-CONFIG_GACT_PROB=y
-CONFIG_NET_ACT_MIRRED=m
-CONFIG_NET_ACT_IPT=m
-CONFIG_NET_ACT_NAT=m
-CONFIG_NET_ACT_PEDIT=m
-CONFIG_NET_ACT_SIMP=m
-CONFIG_NET_ACT_SKBEDIT=m
-CONFIG_NET_ACT_CSUM=m
-CONFIG_NET_CLS_IND=y
-CONFIG_NET_SCH_FIFO=y
-# CONFIG_DCB is not set
-CONFIG_DNS_RESOLVER=y
-CONFIG_BATMAN_ADV=m
-CONFIG_BATMAN_ADV_BLA=y
-CONFIG_BATMAN_ADV_DAT=y
-CONFIG_BATMAN_ADV_NC=y
-# CONFIG_BATMAN_ADV_DEBUG is not set
-CONFIG_OPENVSWITCH=m
-CONFIG_OPENVSWITCH_GRE=y
-CONFIG_VSOCKETS=m
-CONFIG_VMWARE_VMCI_VSOCKETS=m
-CONFIG_NETLINK_MMAP=y
-CONFIG_NETLINK_DIAG=m
-CONFIG_NET_MPLS_GSO=m
-CONFIG_RPS=y
-CONFIG_RFS_ACCEL=y
-CONFIG_XPS=y
-CONFIG_NETPRIO_CGROUP=m
-CONFIG_NET_RX_BUSY_POLL=y
-CONFIG_BQL=y
-CONFIG_NET_FLOW_LIMIT=y
-
-#
-# Network testing
-#
-CONFIG_NET_PKTGEN=m
-CONFIG_NET_TCPPROBE=m
-CONFIG_NET_DROP_MONITOR=y
-CONFIG_HAMRADIO=y
-
-#
-# Packet Radio protocols
-#
-CONFIG_AX25=m
-CONFIG_AX25_DAMA_SLAVE=y
-CONFIG_NETROM=m
-CONFIG_ROSE=m
-
-#
-# AX.25 network device drivers
-#
-CONFIG_MKISS=m
-CONFIG_6PACK=m
-CONFIG_BPQETHER=m
-CONFIG_SCC=m
-# CONFIG_SCC_DELAY is not set
-# CONFIG_SCC_TRXECHO is not set
-CONFIG_BAYCOM_SER_FDX=m
-CONFIG_BAYCOM_SER_HDX=m
-CONFIG_BAYCOM_PAR=m
-CONFIG_BAYCOM_EPP=m
-CONFIG_YAM=m
-# CONFIG_CAN is not set
-CONFIG_IRDA=m
-
-#
-# IrDA protocols
-#
-CONFIG_IRLAN=m
-CONFIG_IRNET=m
-CONFIG_IRCOMM=m
-CONFIG_IRDA_ULTRA=y
-
-#
-# IrDA options
-#
-CONFIG_IRDA_CACHE_LAST_LSAP=y
-CONFIG_IRDA_FAST_RR=y
-# CONFIG_IRDA_DEBUG is not set
-
-#
-# Infrared-port device drivers
-#
-
-#
-# SIR device drivers
-#
-CONFIG_IRTTY_SIR=m
-
-#
-# Dongle support
-#
-CONFIG_DONGLE=y
-CONFIG_ESI_DONGLE=m
-CONFIG_ACTISYS_DONGLE=m
-CONFIG_TEKRAM_DONGLE=m
-CONFIG_TOIM3232_DONGLE=m
-CONFIG_LITELINK_DONGLE=m
-CONFIG_MA600_DONGLE=m
-CONFIG_GIRBIL_DONGLE=m
-CONFIG_MCP2120_DONGLE=m
-CONFIG_OLD_BELKIN_DONGLE=m
-CONFIG_ACT200L_DONGLE=m
-CONFIG_KINGSUN_DONGLE=m
-CONFIG_KSDAZZLE_DONGLE=m
-CONFIG_KS959_DONGLE=m
-
-#
-# FIR device drivers
-#
-CONFIG_USB_IRDA=m
-CONFIG_SIGMATEL_FIR=m
-CONFIG_NSC_FIR=m
-CONFIG_WINBOND_FIR=m
-CONFIG_TOSHIBA_FIR=m
-CONFIG_SMC_IRCC_FIR=m
-CONFIG_ALI_FIR=m
-CONFIG_VLSI_FIR=m
-CONFIG_VIA_FIR=m
-CONFIG_MCS_FIR=m
-CONFIG_BT=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-# CONFIG_BT_BNEP_MC_FILTER is not set
-# CONFIG_BT_BNEP_PROTO_FILTER is not set
-# CONFIG_BT_CMTP is not set
-CONFIG_BT_HIDP=m
-
-#
-# Bluetooth device drivers
-#
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBTSDIO=m
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_ATH3K=y
-CONFIG_BT_HCIUART_LL=y
-CONFIG_BT_HCIUART_3WIRE=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIDTL1=m
-CONFIG_BT_HCIBT3C=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIBTUART=m
-CONFIG_BT_HCIVHCI=m
-CONFIG_BT_MRVL=m
-CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_ATH3K=m
-CONFIG_BT_WILINK=m
-CONFIG_AF_RXRPC=m
-# CONFIG_AF_RXRPC_DEBUG is not set
-CONFIG_RXKAD=m
-CONFIG_FIB_RULES=y
-CONFIG_WIRELESS=y
-CONFIG_WIRELESS_EXT=y
-CONFIG_WEXT_CORE=y
-CONFIG_WEXT_PROC=y
-CONFIG_WEXT_SPY=y
-CONFIG_WEXT_PRIV=y
-CONFIG_CFG80211=m
-# CONFIG_NL80211_TESTMODE is not set
-# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
-# CONFIG_CFG80211_REG_DEBUG is not set
-CONFIG_CFG80211_DEFAULT_PS=y
-# CONFIG_CFG80211_DEBUGFS is not set
-# CONFIG_CFG80211_INTERNAL_REGDB is not set
-CONFIG_CFG80211_WEXT=y
-CONFIG_LIB80211=m
-CONFIG_LIB80211_CRYPT_WEP=m
-CONFIG_LIB80211_CRYPT_CCMP=m
-CONFIG_LIB80211_CRYPT_TKIP=m
-# CONFIG_LIB80211_DEBUG is not set
-CONFIG_MAC80211=m
-CONFIG_MAC80211_HAS_RC=y
-CONFIG_MAC80211_RC_MINSTREL=y
-CONFIG_MAC80211_RC_MINSTREL_HT=y
-CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
-CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
-CONFIG_MAC80211_MESH=y
-CONFIG_MAC80211_LEDS=y
-# CONFIG_MAC80211_DEBUGFS is not set
-# CONFIG_MAC80211_MESSAGE_TRACING is not set
-# CONFIG_MAC80211_DEBUG_MENU is not set
-CONFIG_WIMAX=m
-CONFIG_WIMAX_DEBUG_LEVEL=8
-CONFIG_RFKILL=m
-CONFIG_RFKILL_LEDS=y
-CONFIG_RFKILL_INPUT=y
-CONFIG_NET_9P=m
-CONFIG_NET_9P_VIRTIO=m
-# CONFIG_NET_9P_DEBUG is not set
-CONFIG_CAIF=m
-# CONFIG_CAIF_DEBUG is not set
-CONFIG_CAIF_NETDEV=m
-CONFIG_CAIF_USB=m
-CONFIG_CEPH_LIB=m
-# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
-# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
-CONFIG_NFC=m
-CONFIG_NFC_NCI=m
-# CONFIG_NFC_NCI_SPI is not set
-CONFIG_NFC_HCI=m
-# CONFIG_NFC_SHDLC is not set
-
-#
-# Near Field Communication (NFC) devices
-#
-CONFIG_NFC_PN533=m
-CONFIG_NFC_WILINK=m
-CONFIG_NFC_MEI_PHY=m
-CONFIG_NFC_SIM=m
-CONFIG_NFC_PN544=m
-CONFIG_NFC_PN544_MEI=m
-CONFIG_NFC_MICROREAD=m
-CONFIG_NFC_MICROREAD_MEI=m
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_UEVENT_HELPER_PATH=""
-CONFIG_DEVTMPFS=y
-# CONFIG_DEVTMPFS_MOUNT is not set
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_FW_LOADER=y
-CONFIG_FIRMWARE_IN_KERNEL=y
-CONFIG_EXTRA_FIRMWARE=""
-CONFIG_FW_LOADER_USER_HELPER=y
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_DEVRES is not set
-# CONFIG_SYS_HYPERVISOR is not set
-# CONFIG_GENERIC_CPU_DEVICES is not set
-CONFIG_REGMAP=y
-CONFIG_REGMAP_I2C=m
-CONFIG_REGMAP_MMIO=m
-CONFIG_REGMAP_IRQ=y
-CONFIG_DMA_SHARED_BUFFER=y
-# CONFIG_CMA is not set
-
-#
-# Bus devices
-#
-CONFIG_CONNECTOR=y
-CONFIG_PROC_EVENTS=y
-CONFIG_MTD=m
-CONFIG_MTD_TESTS=m
-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
-
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_BLKDEVS=m
-CONFIG_MTD_BLOCK=m
-CONFIG_MTD_BLOCK_RO=m
-CONFIG_FTL=m
-CONFIG_NFTL=m
-CONFIG_NFTL_RW=y
-CONFIG_INFTL=m
-CONFIG_RFD_FTL=m
-CONFIG_SSFDC=m
-# CONFIG_SM_FTL is not set
-CONFIG_MTD_OOPS=m
-CONFIG_MTD_SWAP=m
-
-#
-# RAM/ROM/Flash chip drivers
-#
-CONFIG_MTD_CFI=m
-CONFIG_MTD_JEDECPROBE=m
-CONFIG_MTD_GEN_PROBE=m
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-CONFIG_MTD_CFI_INTELEXT=m
-CONFIG_MTD_CFI_AMDSTD=m
-CONFIG_MTD_CFI_STAA=m
-CONFIG_MTD_CFI_UTIL=m
-CONFIG_MTD_RAM=m
-CONFIG_MTD_ROM=m
-CONFIG_MTD_ABSENT=m
-
-#
-# Mapping drivers for chip access
-#
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-# CONFIG_MTD_PHYSMAP is not set
-CONFIG_MTD_PHYSMAP_OF=m
-CONFIG_MTD_SC520CDP=m
-CONFIG_MTD_NETSC520=m
-CONFIG_MTD_TS5500=m
-# CONFIG_MTD_SBC_GXX is not set
-# CONFIG_MTD_AMD76XROM is not set
-# CONFIG_MTD_ICHXROM is not set
-# CONFIG_MTD_ESB2ROM is not set
-# CONFIG_MTD_CK804XROM is not set
-CONFIG_MTD_SCB2_FLASH=m
-# CONFIG_MTD_NETtel is not set
-# CONFIG_MTD_L440GX is not set
-CONFIG_MTD_PCI=m
-# CONFIG_MTD_PCMCIA is not set
-# CONFIG_MTD_GPIO_ADDR is not set
-# CONFIG_MTD_INTEL_VR_NOR is not set
-CONFIG_MTD_PLATRAM=m
-# CONFIG_MTD_LATCH_ADDR is not set
-
-#
-# Self-contained MTD device drivers
-#
-CONFIG_MTD_PMC551=m
-# CONFIG_MTD_PMC551_BUGFIX is not set
-# CONFIG_MTD_PMC551_DEBUG is not set
-# CONFIG_MTD_DATAFLASH is not set
-# CONFIG_MTD_M25P80 is not set
-# CONFIG_MTD_SST25L is not set
-# CONFIG_MTD_SLRAM is not set
-CONFIG_MTD_PHRAM=m
-CONFIG_MTD_MTDRAM=m
-CONFIG_MTDRAM_TOTAL_SIZE=4096
-CONFIG_MTDRAM_ERASE_SIZE=128
-CONFIG_MTD_BLOCK2MTD=m
-
-#
-# Disk-On-Chip Device Drivers
-#
-CONFIG_MTD_DOCG3=m
-CONFIG_BCH_CONST_M=14
-CONFIG_BCH_CONST_T=4
-CONFIG_MTD_NAND_ECC=m
-CONFIG_MTD_NAND_ECC_SMC=y
-CONFIG_MTD_NAND=m
-# CONFIG_MTD_NAND_ECC_BCH is not set
-CONFIG_MTD_SM_COMMON=m
-# CONFIG_MTD_NAND_DENALI is not set
-CONFIG_MTD_NAND_IDS=m
-CONFIG_MTD_NAND_RICOH=m
-CONFIG_MTD_NAND_DISKONCHIP=m
-# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
-CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
-# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
-CONFIG_MTD_NAND_DOCG4=m
-# CONFIG_MTD_NAND_CAFE is not set
-CONFIG_MTD_NAND_CS553X=m
-CONFIG_MTD_NAND_NANDSIM=m
-# CONFIG_MTD_NAND_PLATFORM is not set
-CONFIG_MTD_ALAUDA=m
-# CONFIG_MTD_ONENAND is not set
-
-#
-# LPDDR flash memory drivers
-#
-CONFIG_MTD_LPDDR=m
-CONFIG_MTD_QINFO_PROBE=m
-CONFIG_MTD_UBI=m
-CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MTD_UBI_BEB_LIMIT=20
-# CONFIG_MTD_UBI_FASTMAP is not set
-# CONFIG_MTD_UBI_GLUEBI is not set
-CONFIG_OF=y
-
-#
-# Device Tree and Open Firmware support
-#
-CONFIG_PROC_DEVICETREE=y
-# CONFIG_OF_SELFTEST is not set
-CONFIG_OF_PROMTREE=y
-CONFIG_OF_ADDRESS=y
-CONFIG_OF_IRQ=y
-CONFIG_OF_I2C=m
-CONFIG_OF_NET=y
-CONFIG_OF_MDIO=m
-CONFIG_OF_PCI=y
-CONFIG_OF_PCI_IRQ=y
-CONFIG_OF_MTD=y
-CONFIG_PARPORT=m
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_SERIAL=m
-# CONFIG_PARPORT_PC_FIFO is not set
-# CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_PC_PCMCIA=m
-# CONFIG_PARPORT_GSC is not set
-CONFIG_PARPORT_AX88796=m
-CONFIG_PARPORT_1284=y
-CONFIG_PARPORT_NOT_PC=y
-CONFIG_PNP=y
-# CONFIG_PNP_DEBUG_MESSAGES is not set
-
-#
-# Protocols
-#
-CONFIG_ISAPNP=y
-# CONFIG_PNPBIOS is not set
-CONFIG_PNPACPI=y
-CONFIG_BLK_DEV=y
-CONFIG_BLK_DEV_FD=m
-# CONFIG_PARIDE is not set
-CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
-CONFIG_BLK_CPQ_DA=m
-CONFIG_BLK_CPQ_CISS_DA=m
-# CONFIG_CISS_SCSI_TAPE is not set
-CONFIG_BLK_DEV_DAC960=m
-# CONFIG_BLK_DEV_UMEM is not set
-# CONFIG_BLK_DEV_COW_COMMON is not set
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
-CONFIG_BLK_DEV_CRYPTOLOOP=m
-CONFIG_BLK_DEV_DRBD=m
-# CONFIG_DRBD_FAULT_INJECTION is not set
-CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_NVME=m
-CONFIG_BLK_DEV_OSD=m
-CONFIG_BLK_DEV_SX8=m
-CONFIG_BLK_DEV_RAM=m
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=16384
-# CONFIG_BLK_DEV_XIP is not set
-CONFIG_CDROM_PKTCDVD=m
-CONFIG_CDROM_PKTCDVD_BUFFERS=8
-# CONFIG_CDROM_PKTCDVD_WCACHE is not set
-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
-#
-CONFIG_SENSORS_LIS3LV02D=m
-CONFIG_AD525X_DPOT=m
-CONFIG_AD525X_DPOT_I2C=m
-# CONFIG_AD525X_DPOT_SPI is not set
-# CONFIG_DUMMY_IRQ is not set
-# CONFIG_IBM_ASM is not set
-CONFIG_PHANTOM=m
-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
-CONFIG_CS5535_CLOCK_EVENT_SRC=m
-CONFIG_HP_ILO=m
-CONFIG_APDS9802ALS=m
-CONFIG_ISL29003=m
-CONFIG_ISL29020=m
-CONFIG_SENSORS_TSL2550=m
-CONFIG_SENSORS_BH1780=m
-CONFIG_SENSORS_BH1770=m
-CONFIG_SENSORS_APDS990X=m
-CONFIG_HMC6352=m
-CONFIG_DS1682=m
-# CONFIG_TI_DAC7512 is not set
-CONFIG_VMWARE_BALLOON=m
-CONFIG_BMP085=y
-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_SRAM is not set
-CONFIG_C2PORT=m
-CONFIG_C2PORT_DURAMAR_2150=m
-
-#
-# EEPROM support
-#
-CONFIG_EEPROM_AT24=m
-# CONFIG_EEPROM_AT25 is not set
-CONFIG_EEPROM_LEGACY=m
-CONFIG_EEPROM_MAX6875=m
-CONFIG_EEPROM_93CX6=m
-# CONFIG_EEPROM_93XX46 is not set
-CONFIG_CB710_CORE=m
-# CONFIG_CB710_DEBUG is not set
-CONFIG_CB710_DEBUG_ASSUMPTIONS=y
-
-#
-# Texas Instruments shared transport line discipline
-#
-CONFIG_TI_ST=m
-CONFIG_SENSORS_LIS3_I2C=m
-
-#
-# Altera FPGA firmware download module
-#
-CONFIG_ALTERA_STAPL=m
-CONFIG_INTEL_MEI=m
-CONFIG_INTEL_MEI_ME=m
-CONFIG_VMWARE_VMCI=m
-CONFIG_HAVE_IDE=y
-# CONFIG_IDE is not set
-
-#
-# SCSI device support
-#
-CONFIG_SCSI_MOD=m
-CONFIG_RAID_ATTRS=m
-CONFIG_SCSI=m
-CONFIG_SCSI_DMA=y
-CONFIG_SCSI_TGT=m
-CONFIG_SCSI_NETLINK=y
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=m
-CONFIG_CHR_DEV_ST=m
-CONFIG_CHR_DEV_OSST=m
-CONFIG_BLK_DEV_SR=m
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SG=m
-CONFIG_CHR_DEV_SCH=m
-CONFIG_SCSI_ENCLOSURE=m
-CONFIG_SCSI_MULTI_LUN=y
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
-
-#
-# SCSI Transports
-#
-CONFIG_SCSI_SPI_ATTRS=m
-CONFIG_SCSI_FC_ATTRS=m
-# CONFIG_SCSI_FC_TGT_ATTRS is not set
-CONFIG_SCSI_ISCSI_ATTRS=m
-CONFIG_SCSI_SAS_ATTRS=m
-CONFIG_SCSI_SAS_LIBSAS=m
-CONFIG_SCSI_SAS_ATA=y
-CONFIG_SCSI_SAS_HOST_SMP=y
-CONFIG_SCSI_SRP_ATTRS=m
-CONFIG_SCSI_SRP_TGT_ATTRS=y
-CONFIG_SCSI_LOWLEVEL=y
-CONFIG_ISCSI_TCP=m
-CONFIG_ISCSI_BOOT_SYSFS=m
-CONFIG_SCSI_CXGB3_ISCSI=m
-CONFIG_SCSI_CXGB4_ISCSI=m
-CONFIG_SCSI_BNX2_ISCSI=m
-CONFIG_SCSI_BNX2X_FCOE=m
-CONFIG_BE2ISCSI=m
-CONFIG_BLK_DEV_3W_XXXX_RAID=m
-CONFIG_SCSI_HPSA=m
-CONFIG_SCSI_3W_9XXX=m
-CONFIG_SCSI_3W_SAS=m
-CONFIG_SCSI_7000FASST=m
-CONFIG_SCSI_ACARD=m
-CONFIG_SCSI_AHA152X=m
-CONFIG_SCSI_AHA1542=m
-CONFIG_SCSI_AACRAID=m
-CONFIG_SCSI_AIC7XXX=m
-CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
-CONFIG_AIC7XXX_RESET_DELAY_MS=15000
-# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
-CONFIG_AIC7XXX_DEBUG_MASK=0
-CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
-# CONFIG_SCSI_AIC7XXX_OLD is not set
-CONFIG_SCSI_AIC79XX=m
-CONFIG_AIC79XX_CMDS_PER_DEVICE=32
-CONFIG_AIC79XX_RESET_DELAY_MS=15000
-# CONFIG_AIC79XX_DEBUG_ENABLE is not set
-CONFIG_AIC79XX_DEBUG_MASK=0
-CONFIG_AIC79XX_REG_PRETTY_PRINT=y
-CONFIG_SCSI_AIC94XX=m
-# CONFIG_AIC94XX_DEBUG is not set
-CONFIG_SCSI_MVSAS=m
-# CONFIG_SCSI_MVSAS_DEBUG is not set
-CONFIG_SCSI_MVSAS_TASKLET=y
-CONFIG_SCSI_MVUMI=m
-CONFIG_SCSI_DPT_I2O=m
-CONFIG_SCSI_ADVANSYS=m
-CONFIG_SCSI_IN2000=m
-CONFIG_SCSI_ARCMSR=m
-CONFIG_MEGARAID_NEWGEN=y
-CONFIG_MEGARAID_MM=m
-CONFIG_MEGARAID_MAILBOX=m
-CONFIG_MEGARAID_LEGACY=m
-CONFIG_MEGARAID_SAS=m
-CONFIG_SCSI_MPT2SAS=m
-CONFIG_SCSI_MPT2SAS_MAX_SGE=128
-# CONFIG_SCSI_MPT2SAS_LOGGING is not set
-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_UFSHCD_PLATFORM=m
-CONFIG_SCSI_HPTIOP=m
-CONFIG_SCSI_BUSLOGIC=m
-# CONFIG_SCSI_FLASHPOINT is not set
-CONFIG_VMWARE_PVSCSI=m
-CONFIG_HYPERV_STORAGE=m
-CONFIG_LIBFC=m
-CONFIG_LIBFCOE=m
-CONFIG_FCOE=m
-CONFIG_FCOE_FNIC=m
-CONFIG_SCSI_DMX3191D=m
-CONFIG_SCSI_DTC3280=m
-CONFIG_SCSI_EATA=m
-# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set
-# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set
-CONFIG_SCSI_EATA_MAX_TAGS=16
-CONFIG_SCSI_FUTURE_DOMAIN=m
-CONFIG_SCSI_GDTH=m
-CONFIG_SCSI_ISCI=m
-CONFIG_SCSI_GENERIC_NCR5380=m
-CONFIG_SCSI_GENERIC_NCR5380_MMIO=m
-CONFIG_SCSI_GENERIC_NCR53C400=y
-CONFIG_SCSI_IPS=m
-CONFIG_SCSI_INITIO=m
-CONFIG_SCSI_INIA100=m
-CONFIG_SCSI_PPA=m
-CONFIG_SCSI_IMM=m
-# CONFIG_SCSI_IZIP_EPP16 is not set
-# CONFIG_SCSI_IZIP_SLOW_CTR is not set
-CONFIG_SCSI_NCR53C406A=m
-CONFIG_SCSI_STEX=m
-CONFIG_SCSI_SYM53C8XX_2=m
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
-CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-CONFIG_SCSI_SYM53C8XX_MMIO=y
-CONFIG_SCSI_IPR=m
-# CONFIG_SCSI_IPR_TRACE is not set
-# CONFIG_SCSI_IPR_DUMP is not set
-CONFIG_SCSI_PAS16=m
-CONFIG_SCSI_QLOGIC_FAS=m
-CONFIG_SCSI_QLOGIC_1280=m
-CONFIG_SCSI_QLA_FC=m
-CONFIG_TCM_QLA2XXX=m
-CONFIG_SCSI_QLA_ISCSI=m
-CONFIG_SCSI_LPFC=m
-# CONFIG_SCSI_LPFC_DEBUG_FS is not set
-CONFIG_SCSI_SYM53C416=m
-CONFIG_SCSI_DC395x=m
-CONFIG_SCSI_DC390T=m
-CONFIG_SCSI_T128=m
-CONFIG_SCSI_U14_34F=m
-# CONFIG_SCSI_U14_34F_TAGGED_QUEUE is not set
-# CONFIG_SCSI_U14_34F_LINKED_COMMANDS is not set
-CONFIG_SCSI_U14_34F_MAX_TAGS=8
-CONFIG_SCSI_ULTRASTOR=m
-CONFIG_SCSI_NSP32=m
-# CONFIG_SCSI_DEBUG is not set
-CONFIG_SCSI_PMCRAID=m
-CONFIG_SCSI_PM8001=m
-CONFIG_SCSI_SRP=m
-CONFIG_SCSI_BFA_FC=m
-CONFIG_SCSI_VIRTIO=m
-CONFIG_SCSI_CHELSIO_FCOE=m
-CONFIG_SCSI_LOWLEVEL_PCMCIA=y
-CONFIG_PCMCIA_AHA152X=m
-CONFIG_PCMCIA_FDOMAIN=m
-CONFIG_PCMCIA_NINJA_SCSI=m
-CONFIG_PCMCIA_QLOGIC=m
-CONFIG_PCMCIA_SYM53C500=m
-CONFIG_SCSI_DH=m
-CONFIG_SCSI_DH_RDAC=m
-CONFIG_SCSI_DH_HP_SW=m
-CONFIG_SCSI_DH_EMC=m
-CONFIG_SCSI_DH_ALUA=m
-CONFIG_SCSI_OSD_INITIATOR=m
-CONFIG_SCSI_OSD_ULD=m
-CONFIG_SCSI_OSD_DPRINT_SENSE=0
-# CONFIG_SCSI_OSD_DEBUG is not set
-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
-
-#
-# Controllers with non-SFF native interface
-#
-CONFIG_SATA_AHCI=m
-CONFIG_SATA_AHCI_PLATFORM=m
-CONFIG_SATA_INIC162X=m
-CONFIG_SATA_ACARD_AHCI=m
-CONFIG_SATA_SIL24=m
-CONFIG_ATA_SFF=y
-
-#
-# SFF controllers with custom DMA interface
-#
-CONFIG_PDC_ADMA=m
-CONFIG_SATA_QSTOR=m
-CONFIG_SATA_SX4=m
-CONFIG_ATA_BMDMA=y
-
-#
-# SATA SFF controllers with BMDMA
-#
-CONFIG_ATA_PIIX=m
-CONFIG_SATA_HIGHBANK=m
-CONFIG_SATA_MV=m
-CONFIG_SATA_NV=m
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_RCAR=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SVW=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_VIA=m
-CONFIG_SATA_VITESSE=m
-
-#
-# PATA SFF controllers with BMDMA
-#
-CONFIG_PATA_ALI=m
-CONFIG_PATA_AMD=m
-CONFIG_PATA_ARASAN_CF=m
-CONFIG_PATA_ARTOP=m
-CONFIG_PATA_ATIIXP=m
-CONFIG_PATA_ATP867X=m
-CONFIG_PATA_CMD64X=m
-CONFIG_PATA_CS5520=m
-CONFIG_PATA_CS5530=m
-CONFIG_PATA_CS5535=m
-CONFIG_PATA_CS5536=m
-CONFIG_PATA_CYPRESS=m
-CONFIG_PATA_EFAR=m
-CONFIG_PATA_HPT366=m
-CONFIG_PATA_HPT37X=m
-CONFIG_PATA_HPT3X2N=m
-CONFIG_PATA_HPT3X3=m
-# CONFIG_PATA_HPT3X3_DMA is not set
-CONFIG_PATA_IT8213=m
-CONFIG_PATA_IT821X=m
-CONFIG_PATA_JMICRON=m
-CONFIG_PATA_MARVELL=m
-CONFIG_PATA_NETCELL=m
-CONFIG_PATA_NINJA32=m
-CONFIG_PATA_NS87415=m
-CONFIG_PATA_OLDPIIX=m
-CONFIG_PATA_OPTIDMA=m
-CONFIG_PATA_PDC2027X=m
-CONFIG_PATA_PDC_OLD=m
-CONFIG_PATA_RADISYS=m
-CONFIG_PATA_RDC=m
-CONFIG_PATA_SC1200=m
-CONFIG_PATA_SCH=m
-CONFIG_PATA_SERVERWORKS=m
-CONFIG_PATA_SIL680=m
-CONFIG_PATA_SIS=m
-CONFIG_PATA_TOSHIBA=m
-CONFIG_PATA_TRIFLEX=m
-CONFIG_PATA_VIA=m
-CONFIG_PATA_WINBOND=m
-
-#
-# PIO-only SFF controllers
-#
-CONFIG_PATA_CMD640_PCI=m
-CONFIG_PATA_ISAPNP=m
-CONFIG_PATA_MPIIX=m
-CONFIG_PATA_NS87410=m
-CONFIG_PATA_OPTI=m
-CONFIG_PATA_PCMCIA=m
-CONFIG_PATA_QDI=m
-CONFIG_PATA_RZ1000=m
-CONFIG_PATA_WINBOND_VLB=m
-
-#
-# Generic fallback / legacy drivers
-#
-CONFIG_PATA_ACPI=m
-CONFIG_ATA_GENERIC=m
-CONFIG_PATA_LEGACY=m
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=m
-CONFIG_MD_LINEAR=m
-CONFIG_MD_RAID0=m
-CONFIG_MD_RAID1=m
-CONFIG_MD_RAID10=m
-CONFIG_MD_RAID456=m
-CONFIG_MD_MULTIPATH=m
-CONFIG_MD_FAULTY=m
-CONFIG_BCACHE=m
-# CONFIG_BCACHE_DEBUG is not set
-# CONFIG_BCACHE_EDEBUG is not set
-# CONFIG_BCACHE_CLOSURES_DEBUG is not set
-CONFIG_BLK_DEV_DM=m
-# CONFIG_DM_DEBUG is not set
-CONFIG_DM_BUFIO=m
-CONFIG_DM_BIO_PRISON=m
-CONFIG_DM_PERSISTENT_DATA=m
-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
-CONFIG_DM_ZERO=m
-CONFIG_DM_MULTIPATH=m
-CONFIG_DM_MULTIPATH_QL=m
-CONFIG_DM_MULTIPATH_ST=m
-CONFIG_DM_DELAY=m
-CONFIG_DM_UEVENT=y
-CONFIG_DM_FLAKEY=m
-CONFIG_DM_VERITY=m
-CONFIG_DM_SWITCH=m
-CONFIG_TARGET_CORE=m
-CONFIG_TCM_IBLOCK=m
-CONFIG_TCM_FILEIO=m
-CONFIG_TCM_PSCSI=m
-CONFIG_LOOPBACK_TARGET=m
-CONFIG_TCM_FC=m
-CONFIG_ISCSI_TARGET=m
-CONFIG_SBP_TARGET=m
-CONFIG_FUSION=y
-CONFIG_FUSION_SPI=m
-CONFIG_FUSION_FC=m
-CONFIG_FUSION_SAS=m
-CONFIG_FUSION_MAX_SGE=128
-CONFIG_FUSION_CTL=m
-# CONFIG_FUSION_LOGGING is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-CONFIG_FIREWIRE=m
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-CONFIG_FIREWIRE_NET=m
-CONFIG_FIREWIRE_NOSY=m
-CONFIG_I2O=m
-CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
-CONFIG_I2O_EXT_ADAPTEC=y
-CONFIG_I2O_CONFIG=m
-CONFIG_I2O_CONFIG_OLD_IOCTL=y
-CONFIG_I2O_BUS=m
-CONFIG_I2O_BLOCK=m
-CONFIG_I2O_SCSI=m
-CONFIG_I2O_PROC=m
-CONFIG_MACINTOSH_DRIVERS=y
-CONFIG_MAC_EMUMOUSEBTN=y
-CONFIG_NETDEVICES=y
-CONFIG_MII=m
-CONFIG_NET_CORE=y
-CONFIG_BONDING=m
-CONFIG_DUMMY=m
-CONFIG_EQUALIZER=m
-# CONFIG_NET_FC is not set
-CONFIG_IFB=m
-CONFIG_NET_TEAM=m
-CONFIG_NET_TEAM_MODE_BROADCAST=m
-CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
-CONFIG_NET_TEAM_MODE_RANDOM=m
-CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
-CONFIG_NET_TEAM_MODE_LOADBALANCE=m
-CONFIG_MACVLAN=m
-CONFIG_MACVTAP=m
-CONFIG_VXLAN=m
-CONFIG_NETCONSOLE=m
-CONFIG_NETCONSOLE_DYNAMIC=y
-CONFIG_NETPOLL=y
-# CONFIG_NETPOLL_TRAP is not set
-CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_RIONET=m
-CONFIG_RIONET_TX_SIZE=128
-CONFIG_RIONET_RX_SIZE=128
-CONFIG_TUN=m
-CONFIG_VETH=m
-CONFIG_VIRTIO_NET=m
-CONFIG_NLMON=m
-CONFIG_SUNGEM_PHY=m
-# CONFIG_ARCNET is not set
-CONFIG_ATM_DRIVERS=y
-# CONFIG_ATM_DUMMY is not set
-CONFIG_ATM_TCP=m
-CONFIG_ATM_LANAI=m
-CONFIG_ATM_ENI=m
-# CONFIG_ATM_ENI_DEBUG is not set
-# CONFIG_ATM_ENI_TUNE_BURST is not set
-CONFIG_ATM_FIRESTREAM=m
-CONFIG_ATM_ZATM=m
-# CONFIG_ATM_ZATM_DEBUG is not set
-CONFIG_ATM_NICSTAR=m
-# CONFIG_ATM_NICSTAR_USE_SUNI is not set
-# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
-CONFIG_ATM_IDT77252=m
-# CONFIG_ATM_IDT77252_DEBUG is not set
-# CONFIG_ATM_IDT77252_RCV_ALL is not set
-CONFIG_ATM_IDT77252_USE_SUNI=y
-CONFIG_ATM_AMBASSADOR=m
-# CONFIG_ATM_AMBASSADOR_DEBUG is not set
-CONFIG_ATM_HORIZON=m
-# CONFIG_ATM_HORIZON_DEBUG is not set
-CONFIG_ATM_IA=m
-# CONFIG_ATM_IA_DEBUG is not set
-CONFIG_ATM_FORE200E=m
-# CONFIG_ATM_FORE200E_USE_TASKLET is not set
-CONFIG_ATM_FORE200E_TX_RETRY=16
-CONFIG_ATM_FORE200E_DEBUG=0
-CONFIG_ATM_HE=m
-# CONFIG_ATM_HE_USE_SUNI is not set
-CONFIG_ATM_SOLOS=m
-
-#
-# CAIF transport drivers
-#
-CONFIG_CAIF_TTY=m
-CONFIG_CAIF_SPI_SLAVE=m
-CONFIG_CAIF_SPI_SYNC=y
-CONFIG_CAIF_HSI=m
-CONFIG_CAIF_VIRTIO=m
-CONFIG_VHOST_NET=m
-CONFIG_VHOST_SCSI=m
-CONFIG_VHOST_RING=m
-CONFIG_VHOST=m
-
-#
-# Distributed Switch Architecture drivers
-#
-CONFIG_NET_DSA_MV88E6XXX=m
-CONFIG_NET_DSA_MV88E6060=m
-CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y
-CONFIG_NET_DSA_MV88E6131=m
-CONFIG_NET_DSA_MV88E6123_61_65=m
-CONFIG_ETHERNET=y
-CONFIG_MDIO=m
-CONFIG_NET_VENDOR_3COM=y
-CONFIG_EL3=m
-CONFIG_3C515=m
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_3C589=m
-CONFIG_VORTEX=m
-CONFIG_TYPHOON=m
-CONFIG_NET_VENDOR_ADAPTEC=y
-CONFIG_ADAPTEC_STARFIRE=m
-CONFIG_NET_VENDOR_ALTEON=y
-CONFIG_ACENIC=m
-# CONFIG_ACENIC_OMIT_TIGON_I is not set
-CONFIG_NET_VENDOR_AMD=y
-CONFIG_AMD8111_ETH=m
-CONFIG_LANCE=m
-CONFIG_PCNET32=m
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_NI65=m
-CONFIG_NET_VENDOR_ARC=y
-CONFIG_ARC_EMAC=m
-CONFIG_NET_VENDOR_ATHEROS=y
-CONFIG_ATL2=m
-CONFIG_ATL1=m
-CONFIG_ATL1E=m
-CONFIG_ATL1C=m
-CONFIG_ALX=m
-CONFIG_NET_CADENCE=y
-CONFIG_ARM_AT91_ETHER=m
-CONFIG_MACB=m
-CONFIG_NET_VENDOR_BROADCOM=y
-CONFIG_B44=m
-CONFIG_B44_PCI_AUTOSELECT=y
-CONFIG_B44_PCICORE_AUTOSELECT=y
-CONFIG_B44_PCI=y
-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
-CONFIG_NET_VENDOR_CHELSIO=y
-CONFIG_CHELSIO_T1=m
-CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T3=m
-CONFIG_CHELSIO_T4=m
-CONFIG_CHELSIO_T4VF=m
-CONFIG_NET_VENDOR_CIRRUS=y
-CONFIG_CS89x0=m
-# CONFIG_CS89x0_PLATFORM is not set
-CONFIG_NET_VENDOR_CISCO=y
-CONFIG_ENIC=m
-CONFIG_DNET=m
-CONFIG_NET_VENDOR_DEC=y
-CONFIG_NET_TULIP=y
-CONFIG_DE2104X=m
-CONFIG_DE2104X_DSL=0
-CONFIG_TULIP=m
-# CONFIG_TULIP_MWI is not set
-# CONFIG_TULIP_MMIO is not set
-# CONFIG_TULIP_NAPI is not set
-CONFIG_DE4X5=m
-CONFIG_WINBOND_840=m
-CONFIG_DM9102=m
-CONFIG_ULI526X=m
-CONFIG_PCMCIA_XIRCOM=m
-CONFIG_NET_VENDOR_DLINK=y
-CONFIG_DL2K=m
-CONFIG_SUNDANCE=m
-# CONFIG_SUNDANCE_MMIO is not set
-CONFIG_NET_VENDOR_EMULEX=y
-CONFIG_BE2NET=m
-CONFIG_NET_VENDOR_EXAR=y
-CONFIG_S2IO=m
-CONFIG_VXGE=m
-# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
-CONFIG_NET_VENDOR_FUJITSU=y
-CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_NET_VENDOR_HP=y
-CONFIG_HP100=m
-CONFIG_NET_VENDOR_INTEL=y
-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
-CONFIG_IXGBE=m
-CONFIG_IXGBE_HWMON=y
-CONFIG_IXGBE_DCA=y
-CONFIG_IXGBEVF=m
-CONFIG_NET_VENDOR_I825XX=y
-CONFIG_IP1000=m
-CONFIG_JME=m
-CONFIG_NET_VENDOR_MARVELL=y
-CONFIG_MVMDIO=m
-CONFIG_SKGE=m
-# CONFIG_SKGE_DEBUG is not set
-CONFIG_SKGE_GENESIS=y
-CONFIG_SKY2=m
-# CONFIG_SKY2_DEBUG is not set
-CONFIG_NET_VENDOR_MELLANOX=y
-CONFIG_MLX4_EN=m
-CONFIG_MLX4_CORE=m
-CONFIG_MLX4_DEBUG=y
-# CONFIG_MLX5_CORE is not set
-CONFIG_NET_VENDOR_MICREL=y
-CONFIG_KS8842=m
-# CONFIG_KS8851 is not set
-CONFIG_KS8851_MLL=m
-CONFIG_KSZ884X_PCI=m
-CONFIG_NET_VENDOR_MICROCHIP=y
-# CONFIG_ENC28J60 is not set
-CONFIG_NET_VENDOR_MYRI=y
-CONFIG_MYRI10GE=m
-CONFIG_MYRI10GE_DCA=y
-CONFIG_FEALNX=m
-CONFIG_NET_VENDOR_NATSEMI=y
-CONFIG_NATSEMI=m
-CONFIG_NS83820=m
-CONFIG_NET_VENDOR_8390=y
-CONFIG_PCMCIA_AXNET=m
-CONFIG_NE2000=m
-CONFIG_NE2K_PCI=m
-CONFIG_PCMCIA_PCNET=m
-CONFIG_ULTRA=m
-CONFIG_WD80x3=m
-CONFIG_NET_VENDOR_NVIDIA=y
-CONFIG_FORCEDETH=m
-CONFIG_NET_VENDOR_OKI=y
-CONFIG_PCH_GBE=m
-CONFIG_ETHOC=m
-CONFIG_NET_PACKET_ENGINE=y
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_NET_VENDOR_QLOGIC=y
-CONFIG_QLA3XXX=m
-CONFIG_QLCNIC=m
-CONFIG_QLCNIC_SRIOV=y
-CONFIG_QLGE=m
-CONFIG_NETXEN_NIC=m
-CONFIG_NET_VENDOR_REALTEK=y
-CONFIG_ATP=m
-CONFIG_8139CP=m
-CONFIG_8139TOO=m
-# CONFIG_8139TOO_PIO is not set
-CONFIG_8139TOO_TUNE_TWISTER=y
-CONFIG_8139TOO_8129=y
-# CONFIG_8139_OLD_RX_RESET is not set
-CONFIG_R8169=m
-CONFIG_SH_ETH=m
-CONFIG_NET_VENDOR_RDC=y
-CONFIG_R6040=m
-CONFIG_NET_VENDOR_SEEQ=y
-CONFIG_NET_VENDOR_SILAN=y
-CONFIG_SC92031=m
-CONFIG_NET_VENDOR_SIS=y
-CONFIG_SIS900=m
-CONFIG_SIS190=m
-CONFIG_SFC=m
-CONFIG_SFC_MTD=y
-CONFIG_SFC_MCDI_MON=y
-CONFIG_SFC_SRIOV=y
-CONFIG_NET_VENDOR_SMSC=y
-CONFIG_SMC9194=m
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_EPIC100=m
-CONFIG_SMSC911X=m
-# CONFIG_SMSC911X_ARCH_HOOKS is not set
-CONFIG_SMSC9420=m
-CONFIG_NET_VENDOR_STMICRO=y
-CONFIG_STMMAC_ETH=m
-# CONFIG_STMMAC_PLATFORM is not set
-CONFIG_STMMAC_PCI=y
-# CONFIG_STMMAC_DEBUG_FS is not set
-# CONFIG_STMMAC_DA is not set
-CONFIG_NET_VENDOR_SUN=y
-CONFIG_HAPPYMEAL=m
-CONFIG_SUNGEM=m
-CONFIG_CASSINI=m
-CONFIG_NIU=m
-CONFIG_NET_VENDOR_TEHUTI=y
-CONFIG_TEHUTI=m
-CONFIG_NET_VENDOR_TI=y
-CONFIG_TLAN=m
-CONFIG_NET_VENDOR_VIA=y
-CONFIG_VIA_RHINE=m
-# CONFIG_VIA_RHINE_MMIO is not set
-CONFIG_VIA_VELOCITY=m
-CONFIG_NET_VENDOR_WIZNET=y
-CONFIG_WIZNET_W5100=m
-CONFIG_WIZNET_W5300=m
-# CONFIG_WIZNET_BUS_DIRECT is not set
-# CONFIG_WIZNET_BUS_INDIRECT is not set
-CONFIG_WIZNET_BUS_ANY=y
-CONFIG_NET_VENDOR_XIRCOM=y
-CONFIG_PCMCIA_XIRC2PS=m
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-CONFIG_NET_SB1000=m
-CONFIG_PHYLIB=m
-
-#
-# MII PHY device drivers
-#
-CONFIG_AT803X_PHY=m
-CONFIG_AMD_PHY=m
-CONFIG_MARVELL_PHY=m
-CONFIG_DAVICOM_PHY=m
-CONFIG_QSEMI_PHY=m
-CONFIG_LXT_PHY=m
-CONFIG_CICADA_PHY=m
-CONFIG_VITESSE_PHY=m
-CONFIG_SMSC_PHY=m
-CONFIG_BROADCOM_PHY=m
-CONFIG_BCM87XX_PHY=m
-CONFIG_ICPLUS_PHY=m
-CONFIG_REALTEK_PHY=m
-CONFIG_NATIONAL_PHY=m
-CONFIG_STE10XP=m
-CONFIG_LSI_ET1011C_PHY=m
-CONFIG_MICREL_PHY=m
-CONFIG_MDIO_BITBANG=m
-# CONFIG_MDIO_GPIO is not set
-CONFIG_MDIO_BUS_MUX=m
-CONFIG_MDIO_BUS_MUX_GPIO=m
-CONFIG_MDIO_BUS_MUX_MMIOREG=m
-# CONFIG_MICREL_KS8995MA is not set
-CONFIG_PLIP=m
-CONFIG_PPP=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_MPPE=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPPOATM=m
-CONFIG_PPPOE=m
-CONFIG_PPTP=m
-CONFIG_PPPOL2TP=m
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_SLIP=m
-CONFIG_SLHC=m
-# CONFIG_SLIP_COMPRESSED is not set
-# CONFIG_SLIP_SMART is not set
-# CONFIG_SLIP_MODE_SLIP6 is not set
-
-#
-# USB Network Adapters
-#
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_RTL8152=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
-CONFIG_USB_NET_CDC_MBIM=m
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_SMSC75XX=m
-CONFIG_USB_NET_SMSC95XX=m
-CONFIG_USB_NET_GL620A=m
-CONFIG_USB_NET_NET1080=m
-CONFIG_USB_NET_PLUSB=m
-CONFIG_USB_NET_MCS7830=m
-CONFIG_USB_NET_RNDIS_HOST=m
-CONFIG_USB_NET_CDC_SUBSET=m
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-CONFIG_USB_BELKIN=y
-CONFIG_USB_ARMLINUX=y
-CONFIG_USB_EPSON2888=y
-CONFIG_USB_KC2190=y
-CONFIG_USB_NET_ZAURUS=m
-CONFIG_USB_NET_CX82310_ETH=m
-CONFIG_USB_NET_KALMIA=m
-CONFIG_USB_NET_QMI_WWAN=m
-CONFIG_USB_HSO=m
-CONFIG_USB_NET_INT51X1=m
-CONFIG_USB_CDC_PHONET=m
-CONFIG_USB_IPHETH=m
-CONFIG_USB_SIERRA_NET=m
-CONFIG_USB_VL600=m
-CONFIG_WLAN=y
-CONFIG_PCMCIA_RAYCS=m
-CONFIG_LIBERTAS_THINFIRM=m
-# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
-CONFIG_LIBERTAS_THINFIRM_USB=m
-CONFIG_AIRO=m
-CONFIG_ATMEL=m
-CONFIG_PCI_ATMEL=m
-CONFIG_PCMCIA_ATMEL=m
-CONFIG_AT76C50X_USB=m
-CONFIG_AIRO_CS=m
-CONFIG_PCMCIA_WL3501=m
-CONFIG_PRISM54=m
-CONFIG_USB_ZD1201=m
-CONFIG_USB_NET_RNDIS_WLAN=m
-CONFIG_RTL8180=m
-CONFIG_RTL8187=m
-CONFIG_RTL8187_LEDS=y
-CONFIG_ADM8211=m
-# CONFIG_MAC80211_HWSIM is not set
-CONFIG_MWL8K=m
-CONFIG_ATH_COMMON=m
-CONFIG_ATH_CARDS=m
-# CONFIG_ATH_DEBUG is not set
-CONFIG_ATH5K=m
-# CONFIG_ATH5K_DEBUG is not set
-# CONFIG_ATH5K_TRACER is not set
-CONFIG_ATH5K_PCI=y
-CONFIG_ATH9K_HW=m
-CONFIG_ATH9K_COMMON=m
-CONFIG_ATH9K_BTCOEX_SUPPORT=y
-CONFIG_ATH9K=m
-CONFIG_ATH9K_PCI=y
-CONFIG_ATH9K_AHB=y
-# CONFIG_ATH9K_DEBUGFS is not set
-# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set
-CONFIG_ATH9K_HTC=m
-# CONFIG_ATH9K_HTC_DEBUGFS is not set
-CONFIG_CARL9170=m
-CONFIG_CARL9170_LEDS=y
-CONFIG_CARL9170_WPC=y
-# CONFIG_CARL9170_HWRNG is not set
-CONFIG_ATH6KL=m
-CONFIG_ATH6KL_SDIO=m
-CONFIG_ATH6KL_USB=m
-# CONFIG_ATH6KL_DEBUG is not set
-# CONFIG_ATH6KL_TRACING is not set
-CONFIG_AR5523=m
-CONFIG_WIL6210=m
-CONFIG_WIL6210_ISR_COR=y
-# CONFIG_WIL6210_TRACING is not set
-CONFIG_ATH10K=m
-CONFIG_ATH10K_PCI=m
-# CONFIG_ATH10K_DEBUG is not set
-CONFIG_ATH10K_DEBUGFS=y
-# CONFIG_ATH10K_TRACING is not set
-CONFIG_B43=m
-CONFIG_B43_BCMA=y
-CONFIG_B43_SSB=y
-CONFIG_B43_PCI_AUTOSELECT=y
-CONFIG_B43_PCICORE_AUTOSELECT=y
-CONFIG_B43_PCMCIA=y
-CONFIG_B43_SDIO=y
-CONFIG_B43_BCMA_PIO=y
-CONFIG_B43_PIO=y
-CONFIG_B43_PHY_N=y
-CONFIG_B43_PHY_LP=y
-CONFIG_B43_PHY_HT=y
-CONFIG_B43_LEDS=y
-CONFIG_B43_HWRNG=y
-# CONFIG_B43_DEBUG is not set
-CONFIG_B43LEGACY=m
-CONFIG_B43LEGACY_PCI_AUTOSELECT=y
-CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
-CONFIG_B43LEGACY_LEDS=y
-CONFIG_B43LEGACY_HWRNG=y
-# CONFIG_B43LEGACY_DEBUG is not set
-CONFIG_B43LEGACY_DMA=y
-CONFIG_B43LEGACY_PIO=y
-CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
-# CONFIG_B43LEGACY_DMA_MODE is not set
-# CONFIG_B43LEGACY_PIO_MODE is not set
-CONFIG_BRCMUTIL=m
-CONFIG_BRCMSMAC=m
-CONFIG_BRCMFMAC=m
-CONFIG_BRCMFMAC_SDIO=y
-CONFIG_BRCMFMAC_USB=y
-# CONFIG_BRCM_TRACING is not set
-# CONFIG_BRCMDBG is not set
-CONFIG_HOSTAP=m
-CONFIG_HOSTAP_FIRMWARE=y
-# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
-CONFIG_HOSTAP_PLX=m
-CONFIG_HOSTAP_PCI=m
-CONFIG_HOSTAP_CS=m
-# CONFIG_IPW2100 is not set
-# CONFIG_IPW2200 is not set
-CONFIG_IWLWIFI=m
-CONFIG_IWLDVM=m
-CONFIG_IWLMVM=m
-CONFIG_IWLWIFI_OPMODE_MODULAR=y
-
-#
-# Debugging Options
-#
-# CONFIG_IWLWIFI_DEBUG is not set
-CONFIG_IWLWIFI_DEVICE_TRACING=y
-# CONFIG_IWLWIFI_P2P is not set
-CONFIG_IWLEGACY=m
-CONFIG_IWL4965=m
-CONFIG_IWL3945=m
-
-#
-# iwl3945 / iwl4965 Debugging Options
-#
-# CONFIG_IWLEGACY_DEBUG is not set
-CONFIG_LIBERTAS=m
-CONFIG_LIBERTAS_USB=m
-CONFIG_LIBERTAS_CS=m
-CONFIG_LIBERTAS_SDIO=m
-# CONFIG_LIBERTAS_SPI is not set
-# CONFIG_LIBERTAS_DEBUG is not set
-CONFIG_LIBERTAS_MESH=y
-CONFIG_HERMES=m
-CONFIG_HERMES_PRISM=y
-CONFIG_HERMES_CACHE_FW_ON_INIT=y
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_NORTEL_HERMES=m
-CONFIG_PCI_HERMES=m
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA_SPECTRUM=m
-CONFIG_ORINOCO_USB=m
-CONFIG_P54_COMMON=m
-CONFIG_P54_USB=m
-CONFIG_P54_PCI=m
-# CONFIG_P54_SPI is not set
-CONFIG_P54_LEDS=y
-CONFIG_RT2X00=m
-CONFIG_RT2400PCI=m
-CONFIG_RT2500PCI=m
-CONFIG_RT61PCI=m
-CONFIG_RT2800PCI=m
-CONFIG_RT2800PCI_RT33XX=y
-CONFIG_RT2800PCI_RT35XX=y
-CONFIG_RT2800PCI_RT53XX=y
-CONFIG_RT2800PCI_RT3290=y
-CONFIG_RT2500USB=m
-CONFIG_RT73USB=m
-CONFIG_RT2800USB=m
-CONFIG_RT2800USB_RT33XX=y
-CONFIG_RT2800USB_RT35XX=y
-CONFIG_RT2800USB_RT53XX=y
-CONFIG_RT2800USB_RT55XX=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
-CONFIG_RT2X00_LIB_FIRMWARE=y
-CONFIG_RT2X00_LIB_CRYPTO=y
-CONFIG_RT2X00_LIB_LEDS=y
-# CONFIG_RT2X00_DEBUG is not set
-CONFIG_RTL_CARDS=m
-CONFIG_RTL8192CE=m
-CONFIG_RTL8192SE=m
-CONFIG_RTL8192DE=m
-CONFIG_RTL8723AE=m
-CONFIG_RTL8188EE=m
-CONFIG_RTL8192CU=m
-CONFIG_RTLWIFI=m
-CONFIG_RTLWIFI_PCI=m
-CONFIG_RTLWIFI_USB=m
-# CONFIG_RTLWIFI_DEBUG is not set
-CONFIG_RTL8192C_COMMON=m
-CONFIG_WL_TI=y
-CONFIG_WL1251=m
-# CONFIG_WL1251_SPI is not set
-CONFIG_WL1251_SDIO=m
-CONFIG_WL12XX=m
-CONFIG_WL18XX=m
-CONFIG_WLCORE=m
-# CONFIG_WLCORE_SPI is not set
-CONFIG_WLCORE_SDIO=m
-CONFIG_WILINK_PLATFORM_DATA=y
-CONFIG_ZD1211RW=m
-# CONFIG_ZD1211RW_DEBUG is not set
-CONFIG_MWIFIEX=m
-CONFIG_MWIFIEX_SDIO=m
-CONFIG_MWIFIEX_PCIE=m
-CONFIG_MWIFIEX_USB=m
-CONFIG_CW1200=m
-CONFIG_CW1200_WLAN_SDIO=m
-CONFIG_CW1200_WLAN_SPI=m
-
-#
-# WiMAX Wireless Broadband devices
-#
-CONFIG_WIMAX_I2400M=m
-CONFIG_WIMAX_I2400M_USB=m
-CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
-# CONFIG_WAN is not set
-CONFIG_IEEE802154_DRIVERS=m
-CONFIG_IEEE802154_FAKEHARD=m
-CONFIG_IEEE802154_FAKELB=m
-CONFIG_IEEE802154_AT86RF230=m
-# CONFIG_IEEE802154_MRF24J40 is not set
-CONFIG_VMXNET3=m
-CONFIG_HYPERV_NET=m
-CONFIG_ISDN=y
-CONFIG_ISDN_I4L=m
-CONFIG_ISDN_PPP=y
-CONFIG_ISDN_PPP_VJ=y
-CONFIG_ISDN_MPP=y
-CONFIG_IPPP_FILTER=y
-CONFIG_ISDN_PPP_BSDCOMP=m
-CONFIG_ISDN_AUDIO=y
-CONFIG_ISDN_TTY_FAX=y
-
-#
-# ISDN feature submodules
-#
-CONFIG_ISDN_DIVERSION=m
-
-#
-# ISDN4Linux hardware drivers
-#
-
-#
-# Passive cards
-#
-CONFIG_ISDN_DRV_HISAX=m
-
-#
-# D-channel protocol features
-#
-CONFIG_HISAX_EURO=y
-CONFIG_DE_AOC=y
-# CONFIG_HISAX_NO_SENDCOMPLETE is not set
-# CONFIG_HISAX_NO_LLC is not set
-# CONFIG_HISAX_NO_KEYPAD is not set
-CONFIG_HISAX_1TR6=y
-CONFIG_HISAX_NI1=y
-CONFIG_HISAX_MAX_CARDS=8
-
-#
-# HiSax supported cards
-#
-CONFIG_HISAX_16_0=y
-CONFIG_HISAX_16_3=y
-CONFIG_HISAX_TELESPCI=y
-CONFIG_HISAX_S0BOX=y
-CONFIG_HISAX_AVM_A1=y
-CONFIG_HISAX_FRITZPCI=y
-CONFIG_HISAX_AVM_A1_PCMCIA=y
-CONFIG_HISAX_ELSA=y
-CONFIG_HISAX_IX1MICROR2=y
-CONFIG_HISAX_DIEHLDIVA=y
-CONFIG_HISAX_ASUSCOM=y
-CONFIG_HISAX_TELEINT=y
-CONFIG_HISAX_HFCS=y
-CONFIG_HISAX_SEDLBAUER=y
-CONFIG_HISAX_SPORTSTER=y
-CONFIG_HISAX_MIC=y
-CONFIG_HISAX_NETJET=y
-CONFIG_HISAX_NETJET_U=y
-CONFIG_HISAX_NICCY=y
-CONFIG_HISAX_ISURF=y
-CONFIG_HISAX_HSTSAPHIR=y
-CONFIG_HISAX_BKM_A4T=y
-CONFIG_HISAX_SCT_QUADRO=y
-CONFIG_HISAX_GAZEL=y
-CONFIG_HISAX_HFC_PCI=y
-CONFIG_HISAX_W6692=y
-CONFIG_HISAX_HFC_SX=y
-CONFIG_HISAX_ENTERNOW_PCI=y
-# CONFIG_HISAX_DEBUG is not set
-
-#
-# HiSax PCMCIA card service modules
-#
-CONFIG_HISAX_SEDLBAUER_CS=m
-CONFIG_HISAX_ELSA_CS=m
-CONFIG_HISAX_AVM_A1_CS=m
-CONFIG_HISAX_TELES_CS=m
-
-#
-# HiSax sub driver modules
-#
-CONFIG_HISAX_ST5481=m
-CONFIG_HISAX_HFCUSB=m
-CONFIG_HISAX_HFC4S8S=m
-CONFIG_HISAX_FRITZ_PCIPNP=m
-
-#
-# Active cards
-#
-CONFIG_ISDN_DRV_ICN=m
-CONFIG_ISDN_DRV_PCBIT=m
-CONFIG_ISDN_DRV_SC=m
-CONFIG_ISDN_DRV_ACT2000=m
-CONFIG_ISDN_CAPI=m
-CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
-CONFIG_CAPI_TRACE=y
-CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_ISDN_CAPI_CAPI20=m
-CONFIG_ISDN_CAPI_CAPIDRV=m
-
-#
-# CAPI hardware drivers
-#
-CONFIG_CAPI_AVM=y
-CONFIG_ISDN_DRV_AVMB1_B1ISA=m
-CONFIG_ISDN_DRV_AVMB1_B1PCI=m
-CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
-CONFIG_ISDN_DRV_AVMB1_T1ISA=m
-CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
-CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
-CONFIG_ISDN_DRV_AVMB1_T1PCI=m
-CONFIG_ISDN_DRV_AVMB1_C4=m
-CONFIG_CAPI_EICON=y
-CONFIG_ISDN_DIVAS=m
-CONFIG_ISDN_DIVAS_BRIPCI=y
-CONFIG_ISDN_DIVAS_PRIPCI=y
-CONFIG_ISDN_DIVAS_DIVACAPI=m
-CONFIG_ISDN_DIVAS_USERIDI=m
-CONFIG_ISDN_DIVAS_MAINT=m
-CONFIG_ISDN_DRV_GIGASET=m
-CONFIG_GIGASET_CAPI=y
-# CONFIG_GIGASET_I4L is not set
-# CONFIG_GIGASET_DUMMYLL is not set
-CONFIG_GIGASET_BASE=m
-CONFIG_GIGASET_M105=m
-CONFIG_GIGASET_M101=m
-# CONFIG_GIGASET_DEBUG is not set
-CONFIG_HYSDN=m
-CONFIG_HYSDN_CAPI=y
-CONFIG_MISDN=m
-CONFIG_MISDN_DSP=m
-CONFIG_MISDN_L1OIP=m
-
-#
-# mISDN hardware drivers
-#
-CONFIG_MISDN_HFCPCI=m
-CONFIG_MISDN_HFCMULTI=m
-CONFIG_MISDN_HFCUSB=m
-CONFIG_MISDN_AVMFRITZ=m
-CONFIG_MISDN_SPEEDFAX=m
-CONFIG_MISDN_INFINEON=m
-CONFIG_MISDN_W6692=m
-CONFIG_MISDN_NETJET=m
-CONFIG_MISDN_IPAC=m
-CONFIG_MISDN_ISAR=m
-CONFIG_ISDN_HDLC=m
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-CONFIG_INPUT_FF_MEMLESS=m
-CONFIG_INPUT_POLLDEV=m
-CONFIG_INPUT_SPARSEKMAP=m
-CONFIG_INPUT_MATRIXKMAP=m
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_JOYDEV=m
-CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_KEYBOARD_ADP5588=m
-CONFIG_KEYBOARD_ADP5589=m
-CONFIG_KEYBOARD_ATKBD=y
-CONFIG_KEYBOARD_QT1070=m
-CONFIG_KEYBOARD_QT2160=m
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_GPIO is not set
-# CONFIG_KEYBOARD_GPIO_POLLED is not set
-CONFIG_KEYBOARD_TCA6416=m
-CONFIG_KEYBOARD_TCA8418=m
-CONFIG_KEYBOARD_MATRIX=m
-# CONFIG_KEYBOARD_LM8323 is not set
-CONFIG_KEYBOARD_LM8333=m
-# CONFIG_KEYBOARD_MAX7359 is not set
-CONFIG_KEYBOARD_MCS=m
-CONFIG_KEYBOARD_MPR121=m
-# CONFIG_KEYBOARD_NEWTON is not set
-# CONFIG_KEYBOARD_OPENCORES is not set
-# CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-CONFIG_INPUT_MOUSE=y
-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
-CONFIG_MOUSE_PS2_SENTELIC=y
-# CONFIG_MOUSE_PS2_TOUCHKIT is not set
-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
-CONFIG_MOUSE_PC110PAD=m
-CONFIG_MOUSE_VSXXXAA=m
-# CONFIG_MOUSE_GPIO is not set
-CONFIG_MOUSE_SYNAPTICS_I2C=m
-CONFIG_MOUSE_SYNAPTICS_USB=m
-CONFIG_INPUT_JOYSTICK=y
-CONFIG_JOYSTICK_ANALOG=m
-CONFIG_JOYSTICK_A3D=m
-CONFIG_JOYSTICK_ADI=m
-CONFIG_JOYSTICK_COBRA=m
-CONFIG_JOYSTICK_GF2K=m
-CONFIG_JOYSTICK_GRIP=m
-CONFIG_JOYSTICK_GRIP_MP=m
-CONFIG_JOYSTICK_GUILLEMOT=m
-CONFIG_JOYSTICK_INTERACT=m
-CONFIG_JOYSTICK_SIDEWINDER=m
-CONFIG_JOYSTICK_TMDC=m
-CONFIG_JOYSTICK_IFORCE=m
-CONFIG_JOYSTICK_IFORCE_USB=y
-CONFIG_JOYSTICK_IFORCE_232=y
-CONFIG_JOYSTICK_WARRIOR=m
-CONFIG_JOYSTICK_MAGELLAN=m
-CONFIG_JOYSTICK_SPACEORB=m
-CONFIG_JOYSTICK_SPACEBALL=m
-CONFIG_JOYSTICK_STINGER=m
-CONFIG_JOYSTICK_TWIDJOY=m
-CONFIG_JOYSTICK_ZHENHUA=m
-CONFIG_JOYSTICK_DB9=m
-CONFIG_JOYSTICK_GAMECON=m
-CONFIG_JOYSTICK_TURBOGRAFX=m
-CONFIG_JOYSTICK_AS5011=m
-CONFIG_JOYSTICK_JOYDUMP=m
-CONFIG_JOYSTICK_XPAD=m
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-CONFIG_JOYSTICK_WALKERA0701=m
-CONFIG_INPUT_TABLET=y
-CONFIG_TABLET_USB_ACECAD=m
-CONFIG_TABLET_USB_AIPTEK=m
-CONFIG_TABLET_USB_GTCO=m
-CONFIG_TABLET_USB_HANWANG=m
-CONFIG_TABLET_USB_KBTAB=m
-CONFIG_TABLET_USB_WACOM=m
-CONFIG_INPUT_TOUCHSCREEN=y
-# CONFIG_TOUCHSCREEN_ADS7846 is not set
-# CONFIG_TOUCHSCREEN_AD7877 is not set
-CONFIG_TOUCHSCREEN_AD7879=m
-CONFIG_TOUCHSCREEN_AD7879_I2C=m
-# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
-CONFIG_TOUCHSCREEN_ATMEL_MXT=m
-CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
-CONFIG_TOUCHSCREEN_BU21013=m
-CONFIG_TOUCHSCREEN_CY8CTMG110=m
-CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
-CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
-# CONFIG_TOUCHSCREEN_CYTTSP_SPI is not set
-CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m
-CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m
-CONFIG_TOUCHSCREEN_CYTTSP4_SPI=m
-CONFIG_TOUCHSCREEN_DYNAPRO=m
-CONFIG_TOUCHSCREEN_HAMPSHIRE=m
-CONFIG_TOUCHSCREEN_EETI=m
-CONFIG_TOUCHSCREEN_EGALAX=m
-CONFIG_TOUCHSCREEN_FUJITSU=m
-CONFIG_TOUCHSCREEN_ILI210X=m
-CONFIG_TOUCHSCREEN_GUNZE=m
-CONFIG_TOUCHSCREEN_ELO=m
-CONFIG_TOUCHSCREEN_WACOM_W8001=m
-CONFIG_TOUCHSCREEN_WACOM_I2C=m
-CONFIG_TOUCHSCREEN_MAX11801=m
-CONFIG_TOUCHSCREEN_MCS5000=m
-CONFIG_TOUCHSCREEN_MMS114=m
-CONFIG_TOUCHSCREEN_MTOUCH=m
-CONFIG_TOUCHSCREEN_INEXIO=m
-CONFIG_TOUCHSCREEN_MK712=m
-CONFIG_TOUCHSCREEN_HTCPEN=m
-CONFIG_TOUCHSCREEN_PENMOUNT=m
-CONFIG_TOUCHSCREEN_EDT_FT5X06=m
-CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
-CONFIG_TOUCHSCREEN_TOUCHWIN=m
-CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m
-CONFIG_TOUCHSCREEN_UCB1400=m
-CONFIG_TOUCHSCREEN_PIXCIR=m
-CONFIG_TOUCHSCREEN_WM97XX=m
-CONFIG_TOUCHSCREEN_WM9705=y
-CONFIG_TOUCHSCREEN_WM9712=y
-CONFIG_TOUCHSCREEN_WM9713=y
-CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
-CONFIG_TOUCHSCREEN_MC13783=m
-CONFIG_TOUCHSCREEN_USB_EGALAX=y
-CONFIG_TOUCHSCREEN_USB_PANJIT=y
-CONFIG_TOUCHSCREEN_USB_3M=y
-CONFIG_TOUCHSCREEN_USB_ITM=y
-CONFIG_TOUCHSCREEN_USB_ETURBO=y
-CONFIG_TOUCHSCREEN_USB_GUNZE=y
-CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
-CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
-CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
-CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
-CONFIG_TOUCHSCREEN_USB_GOTOP=y
-CONFIG_TOUCHSCREEN_USB_JASTEC=y
-CONFIG_TOUCHSCREEN_USB_ELO=y
-CONFIG_TOUCHSCREEN_USB_E2I=y
-CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
-CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
-CONFIG_TOUCHSCREEN_USB_NEXIO=y
-CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
-CONFIG_TOUCHSCREEN_TOUCHIT213=m
-CONFIG_TOUCHSCREEN_TSC_SERIO=m
-# CONFIG_TOUCHSCREEN_TSC2005 is not set
-CONFIG_TOUCHSCREEN_TSC2007=m
-CONFIG_TOUCHSCREEN_ST1232=m
-CONFIG_TOUCHSCREEN_TPS6507X=m
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_AD714X=m
-CONFIG_INPUT_AD714X_I2C=m
-CONFIG_INPUT_AD714X_SPI=m
-CONFIG_INPUT_BMA150=m
-CONFIG_INPUT_PCSPKR=m
-CONFIG_INPUT_MC13783_PWRBUTTON=m
-CONFIG_INPUT_MMA8450=m
-CONFIG_INPUT_MPU3050=m
-CONFIG_INPUT_APANEL=m
-CONFIG_INPUT_GP2A=m
-# CONFIG_INPUT_GPIO_TILT_POLLED is not set
-CONFIG_INPUT_WISTRON_BTNS=m
-CONFIG_INPUT_ATLAS_BTNS=m
-CONFIG_INPUT_ATI_REMOTE2=m
-CONFIG_INPUT_KEYSPAN_REMOTE=m
-CONFIG_INPUT_KXTJ9=m
-# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set
-CONFIG_INPUT_POWERMATE=m
-CONFIG_INPUT_YEALINK=m
-CONFIG_INPUT_CM109=m
-CONFIG_INPUT_RETU_PWRBUTTON=m
-CONFIG_INPUT_UINPUT=m
-CONFIG_INPUT_PCF50633_PMU=m
-CONFIG_INPUT_PCF8574=m
-# CONFIG_INPUT_PWM_BEEPER is not set
-CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
-CONFIG_INPUT_ADXL34X=m
-CONFIG_INPUT_ADXL34X_I2C=m
-CONFIG_INPUT_ADXL34X_SPI=m
-# CONFIG_INPUT_IMS_PCU is not set
-CONFIG_INPUT_CMA3000=m
-CONFIG_INPUT_CMA3000_I2C=m
-
-#
-# Hardware I/O ports
-#
-CONFIG_SERIO=y
-CONFIG_SERIO_I8042=y
-CONFIG_SERIO_SERPORT=m
-CONFIG_SERIO_CT82C710=m
-CONFIG_SERIO_PARKBD=m
-CONFIG_SERIO_PCIPS2=m
-CONFIG_SERIO_LIBPS2=y
-CONFIG_SERIO_RAW=m
-CONFIG_SERIO_ALTERA_PS2=m
-CONFIG_SERIO_PS2MULT=m
-CONFIG_SERIO_ARC_PS2=m
-CONFIG_SERIO_APBPS2=m
-CONFIG_SERIO_OLPC_APSP=m
-CONFIG_GAMEPORT=m
-CONFIG_GAMEPORT_NS558=m
-CONFIG_GAMEPORT_L4=m
-CONFIG_GAMEPORT_EMU10K1=m
-CONFIG_GAMEPORT_FM801=m
-
-#
-# Character devices
-#
-CONFIG_TTY=y
-CONFIG_VT=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_VT_CONSOLE=y
-CONFIG_VT_CONSOLE_SLEEP=y
-CONFIG_HW_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_UNIX98_PTYS=y
-CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_SERIAL_NONSTANDARD=y
-CONFIG_ROCKETPORT=m
-CONFIG_CYCLADES=m
-# CONFIG_CYZ_INTR is not set
-# CONFIG_MOXA_INTELLIO is not set
-# CONFIG_MOXA_SMARTIO is not set
-CONFIG_SYNCLINK=m
-CONFIG_SYNCLINKMP=m
-# CONFIG_SYNCLINK_GT is not set
-CONFIG_NOZOMI=m
-# CONFIG_ISI is not set
-CONFIG_N_HDLC=m
-CONFIG_N_GSM=m
-CONFIG_TRACE_ROUTER=m
-CONFIG_TRACE_SINK=m
-# CONFIG_DEVKMEM is not set
-
-#
-# 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
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-# CONFIG_SERIAL_8250_EXTENDED is not set
-CONFIG_SERIAL_8250_DW=m
-
-#
-# Non-8250 serial port support
-#
-# CONFIG_SERIAL_MAX3100 is not set
-# CONFIG_SERIAL_MAX310X is not set
-CONFIG_SERIAL_MFD_HSU=m
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_JSM=m
-CONFIG_SERIAL_OF_PLATFORM=m
-CONFIG_SERIAL_SCCNXP=m
-# CONFIG_SERIAL_TIMBERDALE is not set
-CONFIG_SERIAL_ALTERA_JTAGUART=m
-CONFIG_SERIAL_ALTERA_UART=m
-CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
-CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
-# CONFIG_SERIAL_IFX6X60 is not set
-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_SERIAL_FSL_LPUART=m
-CONFIG_PRINTER=m
-# CONFIG_LP_CONSOLE is not set
-CONFIG_PPDEV=m
-CONFIG_HVC_DRIVER=y
-CONFIG_VIRTIO_CONSOLE=y
-CONFIG_IPMI_HANDLER=m
-# CONFIG_IPMI_PANIC_EVENT is not set
-CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_SI=m
-CONFIG_IPMI_WATCHDOG=m
-CONFIG_IPMI_POWEROFF=m
-CONFIG_HW_RANDOM=y
-CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_INTEL=m
-CONFIG_HW_RANDOM_AMD=m
-CONFIG_HW_RANDOM_GEODE=m
-CONFIG_HW_RANDOM_VIA=m
-CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_HW_RANDOM_TPM=m
-CONFIG_NVRAM=m
-CONFIG_DTLK=m
-CONFIG_R3964=m
-CONFIG_APPLICOM=m
-CONFIG_SONYPI=m
-
-#
-# PCMCIA character devices
-#
-CONFIG_SYNCLINK_CS=m
-CONFIG_CARDMAN_4000=m
-CONFIG_CARDMAN_4040=m
-CONFIG_IPWIRELESS=m
-CONFIG_MWAVE=m
-CONFIG_PC8736x_GPIO=m
-CONFIG_NSC_GPIO=m
-# CONFIG_RAW_DRIVER is not set
-CONFIG_HPET=y
-CONFIG_HPET_MMAP=y
-CONFIG_HANGCHECK_TIMER=m
-CONFIG_TCG_TPM=m
-CONFIG_TCG_TIS=m
-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
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
-CONFIG_I2C_CHARDEV=m
-# CONFIG_I2C_MUX is not set
-CONFIG_I2C_HELPER_AUTO=y
-CONFIG_I2C_SMBUS=m
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_ALGOPCA=m
-
-#
-# I2C Hardware Bus support
-#
-
-#
-# PC SMBus host controller drivers
-#
-CONFIG_I2C_ALI1535=m
-CONFIG_I2C_ALI1563=m
-CONFIG_I2C_ALI15X3=m
-CONFIG_I2C_AMD756=m
-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
-CONFIG_I2C_SIS5595=m
-CONFIG_I2C_SIS630=m
-CONFIG_I2C_SIS96X=m
-CONFIG_I2C_VIA=m
-CONFIG_I2C_VIAPRO=m
-
-#
-# ACPI drivers
-#
-CONFIG_I2C_SCMI=m
-
-#
-# I2C system bus drivers (mostly embedded / system-on-chip)
-#
-# CONFIG_I2C_CBUS_GPIO is not set
-CONFIG_I2C_DESIGNWARE_CORE=m
-CONFIG_I2C_DESIGNWARE_PCI=m
-CONFIG_I2C_EG20T=m
-# CONFIG_I2C_GPIO is not set
-CONFIG_I2C_OCORES=m
-CONFIG_I2C_PCA_PLATFORM=m
-CONFIG_I2C_PXA=m
-CONFIG_I2C_PXA_PCI=y
-CONFIG_I2C_SIMTEC=m
-CONFIG_I2C_XILINX=m
-
-#
-# External I2C/SMBus adapter drivers
-#
-CONFIG_I2C_DIOLAN_U2C=m
-CONFIG_I2C_PARPORT=m
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_TAOS_EVM=m
-CONFIG_I2C_TINY_USB=m
-CONFIG_I2C_VIPERBOARD=m
-
-#
-# Other I2C/SMBus bus drivers
-#
-CONFIG_I2C_PCA_ISA=m
-CONFIG_SCx200_ACB=m
-# CONFIG_I2C_STUB is not set
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-CONFIG_SPI=y
-# CONFIG_SPI_DEBUG is not set
-CONFIG_SPI_MASTER=y
-
-#
-# SPI Master Controller Drivers
-#
-# CONFIG_SPI_ALTERA is not set
-# CONFIG_SPI_BITBANG is not set
-# CONFIG_SPI_BUTTERFLY is not set
-# CONFIG_SPI_GPIO is not set
-# CONFIG_SPI_LM70_LLP is not set
-# CONFIG_SPI_FSL_SPI is not set
-# CONFIG_SPI_OC_TINY is not set
-# CONFIG_SPI_PXA2XX is not set
-# CONFIG_SPI_PXA2XX_PCI is not set
-# CONFIG_SPI_SC18IS602 is not set
-# CONFIG_SPI_TOPCLIFF_PCH is not set
-# CONFIG_SPI_XCOMM is not set
-# CONFIG_SPI_XILINX is not set
-# CONFIG_SPI_DESIGNWARE is not set
-
-#
-# SPI Protocol Masters
-#
-# CONFIG_SPI_SPIDEV is not set
-# CONFIG_SPI_TLE62X0 is not set
-# CONFIG_HSI is not set
-
-#
-# PPS support
-#
-CONFIG_PPS=m
-# CONFIG_PPS_DEBUG is not set
-
-#
-# PPS clients support
-#
-CONFIG_PPS_CLIENT_KTIMER=m
-CONFIG_PPS_CLIENT_LDISC=m
-CONFIG_PPS_CLIENT_PARPORT=m
-CONFIG_PPS_CLIENT_GPIO=m
-
-#
-# PPS generators support
-#
-
-#
-# PTP clock support
-#
-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
-# CONFIG_DEBUG_GPIO is not set
-CONFIG_GPIO_SYSFS=y
-
-#
-# Memory mapped GPIO drivers:
-#
-# CONFIG_GPIO_GENERIC_PLATFORM is not set
-# CONFIG_GPIO_IT8761E is not set
-# CONFIG_GPIO_TS5500 is not set
-CONFIG_GPIO_SCH=m
-CONFIG_GPIO_ICH=m
-# CONFIG_GPIO_VX855 is not set
-# CONFIG_GPIO_LYNXPOINT is not set
-# CONFIG_GPIO_GRGPIO is not set
-
-#
-# I2C GPIO expanders:
-#
-CONFIG_GPIO_ARIZONA=m
-# CONFIG_GPIO_MAX7300 is not set
-# CONFIG_GPIO_MAX732X is not set
-# CONFIG_GPIO_PCA953X is not set
-# CONFIG_GPIO_PCF857X is not set
-# CONFIG_GPIO_ADP5588 is not set
-# CONFIG_GPIO_ADNP is not set
-
-#
-# PCI GPIO expanders:
-#
-CONFIG_GPIO_CS5535=y
-CONFIG_GPIO_AMD8111=m
-# CONFIG_GPIO_LANGWELL is not set
-# CONFIG_GPIO_PCH is not set
-# CONFIG_GPIO_ML_IOH is not set
-# CONFIG_GPIO_SODAVILLE is not set
-# CONFIG_GPIO_RDC321X is not set
-
-#
-# SPI GPIO expanders:
-#
-# CONFIG_GPIO_MAX7301 is not set
-# CONFIG_GPIO_MCP23S08 is not set
-# CONFIG_GPIO_MC33880 is not set
-# CONFIG_GPIO_74X164 is not set
-
-#
-# AC97 GPIO expanders:
-#
-CONFIG_GPIO_UCB1400=y
-
-#
-# MODULbus GPIO expanders:
-#
-
-#
-# USB GPIO expanders:
-#
-CONFIG_GPIO_VIPERBOARD=m
-# CONFIG_W1 is not set
-CONFIG_POWER_SUPPLY=y
-# CONFIG_POWER_SUPPLY_DEBUG is not set
-CONFIG_PDA_POWER=m
-CONFIG_TEST_POWER=m
-# CONFIG_BATTERY_DS2780 is not set
-# CONFIG_BATTERY_DS2781 is not set
-# CONFIG_BATTERY_DS2782 is not set
-CONFIG_BATTERY_OLPC=m
-# CONFIG_BATTERY_SBS is not set
-# CONFIG_BATTERY_BQ27x00 is not set
-# CONFIG_BATTERY_MAX17040 is not set
-# CONFIG_BATTERY_MAX17042 is not set
-# CONFIG_CHARGER_PCF50633 is not set
-# CONFIG_CHARGER_ISP1704 is not set
-# CONFIG_CHARGER_MAX8903 is not set
-# CONFIG_CHARGER_LP8727 is not set
-# 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
-CONFIG_HWMON=y
-CONFIG_HWMON_VID=m
-# CONFIG_HWMON_DEBUG_CHIP is not set
-
-#
-# Native drivers
-#
-CONFIG_SENSORS_ABITUGURU=m
-CONFIG_SENSORS_ABITUGURU3=m
-# CONFIG_SENSORS_AD7314 is not set
-CONFIG_SENSORS_AD7414=m
-CONFIG_SENSORS_AD7418=m
-# CONFIG_SENSORS_ADCXX is not set
-CONFIG_SENSORS_ADM1021=m
-CONFIG_SENSORS_ADM1025=m
-CONFIG_SENSORS_ADM1026=m
-CONFIG_SENSORS_ADM1029=m
-CONFIG_SENSORS_ADM1031=m
-CONFIG_SENSORS_ADM9240=m
-CONFIG_SENSORS_ADT7X10=m
-CONFIG_SENSORS_ADT7310=m
-CONFIG_SENSORS_ADT7410=m
-CONFIG_SENSORS_ADT7411=m
-CONFIG_SENSORS_ADT7462=m
-CONFIG_SENSORS_ADT7470=m
-CONFIG_SENSORS_ADT7475=m
-CONFIG_SENSORS_ASC7621=m
-CONFIG_SENSORS_K8TEMP=m
-CONFIG_SENSORS_K10TEMP=m
-CONFIG_SENSORS_FAM15H_POWER=m
-CONFIG_SENSORS_ASB100=m
-CONFIG_SENSORS_ATXP1=m
-CONFIG_SENSORS_DS620=m
-CONFIG_SENSORS_DS1621=m
-CONFIG_SENSORS_I5K_AMB=m
-CONFIG_SENSORS_F71805F=m
-CONFIG_SENSORS_F71882FG=m
-CONFIG_SENSORS_F75375S=m
-CONFIG_SENSORS_FSCHMD=m
-CONFIG_SENSORS_G760A=m
-CONFIG_SENSORS_G762=m
-CONFIG_SENSORS_GL518SM=m
-CONFIG_SENSORS_GL520SM=m
-# CONFIG_SENSORS_GPIO_FAN is not set
-CONFIG_SENSORS_HIH6130=m
-CONFIG_SENSORS_CORETEMP=m
-CONFIG_SENSORS_IBMAEM=m
-CONFIG_SENSORS_IBMPEX=m
-CONFIG_SENSORS_IT87=m
-CONFIG_SENSORS_JC42=m
-CONFIG_SENSORS_LINEAGE=m
-CONFIG_SENSORS_LM63=m
-# CONFIG_SENSORS_LM70 is not set
-CONFIG_SENSORS_LM73=m
-CONFIG_SENSORS_LM75=m
-CONFIG_SENSORS_LM77=m
-CONFIG_SENSORS_LM78=m
-CONFIG_SENSORS_LM80=m
-CONFIG_SENSORS_LM83=m
-CONFIG_SENSORS_LM85=m
-CONFIG_SENSORS_LM87=m
-CONFIG_SENSORS_LM90=m
-CONFIG_SENSORS_LM92=m
-CONFIG_SENSORS_LM93=m
-CONFIG_SENSORS_LTC4151=m
-CONFIG_SENSORS_LTC4215=m
-CONFIG_SENSORS_LTC4245=m
-CONFIG_SENSORS_LTC4261=m
-CONFIG_SENSORS_LM95234=m
-CONFIG_SENSORS_LM95241=m
-CONFIG_SENSORS_LM95245=m
-# CONFIG_SENSORS_MAX1111 is not set
-CONFIG_SENSORS_MAX16065=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_MAX1668=m
-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_NCT6775=m
-CONFIG_SENSORS_PC87360=m
-CONFIG_SENSORS_PC87427=m
-CONFIG_SENSORS_PCF8591=m
-CONFIG_PMBUS=m
-CONFIG_SENSORS_PMBUS=m
-CONFIG_SENSORS_ADM1275=m
-CONFIG_SENSORS_LM25066=m
-CONFIG_SENSORS_LTC2978=m
-CONFIG_SENSORS_MAX16064=m
-CONFIG_SENSORS_MAX34440=m
-CONFIG_SENSORS_MAX8688=m
-CONFIG_SENSORS_UCD9000=m
-CONFIG_SENSORS_UCD9200=m
-CONFIG_SENSORS_ZL6100=m
-CONFIG_SENSORS_SHT15=m
-CONFIG_SENSORS_SHT21=m
-CONFIG_SENSORS_SIS5595=m
-CONFIG_SENSORS_SMM665=m
-CONFIG_SENSORS_DME1737=m
-CONFIG_SENSORS_EMC1403=m
-CONFIG_SENSORS_EMC2103=m
-CONFIG_SENSORS_EMC6W201=m
-CONFIG_SENSORS_SMSC47M1=m
-CONFIG_SENSORS_SMSC47M192=m
-CONFIG_SENSORS_SMSC47B397=m
-CONFIG_SENSORS_SCH56XX_COMMON=m
-CONFIG_SENSORS_SCH5627=m
-CONFIG_SENSORS_SCH5636=m
-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
-CONFIG_SENSORS_TMP401=m
-CONFIG_SENSORS_TMP421=m
-CONFIG_SENSORS_VIA_CPUTEMP=m
-CONFIG_SENSORS_VIA686A=m
-CONFIG_SENSORS_VT1211=m
-CONFIG_SENSORS_VT8231=m
-CONFIG_SENSORS_W83781D=m
-CONFIG_SENSORS_W83791D=m
-CONFIG_SENSORS_W83792D=m
-CONFIG_SENSORS_W83793=m
-CONFIG_SENSORS_W83795=m
-# CONFIG_SENSORS_W83795_FANCTRL is not set
-CONFIG_SENSORS_W83L785TS=m
-CONFIG_SENSORS_W83L786NG=m
-CONFIG_SENSORS_W83627HF=m
-CONFIG_SENSORS_W83627EHF=m
-CONFIG_SENSORS_APPLESMC=m
-CONFIG_SENSORS_MC13783_ADC=m
-
-#
-# ACPI drivers
-#
-CONFIG_SENSORS_ACPI_POWER=m
-CONFIG_SENSORS_ATK0110=m
-CONFIG_THERMAL=y
-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_THERMAL_GOV_FAIR_SHARE=y
-CONFIG_THERMAL_GOV_STEP_WISE=y
-CONFIG_THERMAL_GOV_USER_SPACE=y
-# CONFIG_CPU_THERMAL is not set
-# CONFIG_THERMAL_EMULATION is not set
-CONFIG_INTEL_POWERCLAMP=m
-CONFIG_X86_PKG_TEMP_THERMAL=m
-
-#
-# Texas Instruments thermal drivers
-#
-CONFIG_WATCHDOG=y
-CONFIG_WATCHDOG_CORE=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-
-#
-# Watchdog Device Drivers
-#
-CONFIG_SOFT_WATCHDOG=m
-CONFIG_RETU_WATCHDOG=m
-CONFIG_ACQUIRE_WDT=m
-CONFIG_ADVANTECH_WDT=m
-CONFIG_ALIM1535_WDT=m
-CONFIG_ALIM7101_WDT=m
-CONFIG_F71808E_WDT=m
-CONFIG_SP5100_TCO=m
-CONFIG_GEODE_WDT=m
-CONFIG_SC520_WDT=m
-CONFIG_SBC_FITPC2_WATCHDOG=m
-CONFIG_EUROTECH_WDT=m
-CONFIG_IB700_WDT=m
-CONFIG_IBMASR=m
-CONFIG_WAFER_WDT=m
-CONFIG_I6300ESB_WDT=m
-CONFIG_IE6XX_WDT=m
-CONFIG_ITCO_WDT=m
-CONFIG_ITCO_VENDOR_SUPPORT=y
-CONFIG_IT8712F_WDT=m
-CONFIG_IT87_WDT=m
-CONFIG_HP_WATCHDOG=m
-CONFIG_HPWDT_NMI_DECODING=y
-CONFIG_SC1200_WDT=m
-CONFIG_PC87413_WDT=m
-CONFIG_NV_TCO=m
-CONFIG_60XX_WDT=m
-CONFIG_SBC8360_WDT=m
-CONFIG_SBC7240_WDT=m
-CONFIG_CPU5_WDT=m
-CONFIG_SMSC_SCH311X_WDT=m
-CONFIG_SMSC37B787_WDT=m
-CONFIG_VIA_WDT=m
-CONFIG_W83627HF_WDT=m
-CONFIG_W83697HF_WDT=m
-CONFIG_W83697UG_WDT=m
-CONFIG_W83877F_WDT=m
-CONFIG_W83977F_WDT=m
-CONFIG_MACHZ_WDT=m
-CONFIG_SBC_EPX_C3_WATCHDOG=m
-CONFIG_MEN_A21_WDT=m
-
-#
-# ISA-based Watchdog Cards
-#
-CONFIG_PCWATCHDOG=m
-CONFIG_MIXCOMWD=m
-CONFIG_WDT=m
-
-#
-# PCI-based Watchdog Cards
-#
-CONFIG_PCIPCWATCHDOG=m
-CONFIG_WDTPCI=m
-
-#
-# USB-based Watchdog Cards
-#
-CONFIG_USBPCWATCHDOG=m
-CONFIG_SSB_POSSIBLE=y
-
-#
-# Sonics Silicon Backplane
-#
-CONFIG_SSB=m
-CONFIG_SSB_SPROM=y
-CONFIG_SSB_BLOCKIO=y
-CONFIG_SSB_PCIHOST_POSSIBLE=y
-CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_B43_PCI_BRIDGE=y
-CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
-CONFIG_SSB_PCMCIAHOST=y
-CONFIG_SSB_SDIOHOST_POSSIBLE=y
-CONFIG_SSB_SDIOHOST=y
-# CONFIG_SSB_DEBUG is not set
-CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
-CONFIG_SSB_DRIVER_PCICORE=y
-CONFIG_SSB_DRIVER_GPIO=y
-CONFIG_BCMA_POSSIBLE=y
-
-#
-# Broadcom specific AMBA
-#
-CONFIG_BCMA=m
-CONFIG_BCMA_BLOCKIO=y
-CONFIG_BCMA_HOST_PCI_POSSIBLE=y
-CONFIG_BCMA_HOST_PCI=y
-CONFIG_BCMA_DRIVER_GMAC_CMN=y
-CONFIG_BCMA_DRIVER_GPIO=y
-# CONFIG_BCMA_DEBUG is not set
-
-#
-# Multifunction device drivers
-#
-CONFIG_MFD_CORE=y
-CONFIG_MFD_CS5535=m
-# CONFIG_MFD_CROS_EC is not set
-# CONFIG_MFD_DA9052_SPI is not set
-CONFIG_MFD_MC13783=m
-CONFIG_MFD_MC13XXX=m
-# CONFIG_MFD_MC13XXX_SPI is not set
-CONFIG_MFD_MC13XXX_I2C=m
-CONFIG_HTC_PASIC3=m
-CONFIG_LPC_ICH=m
-CONFIG_LPC_SCH=m
-# CONFIG_MFD_JANZ_CMODIO is not set
-# CONFIG_MFD_KEMPLD is not set
-# CONFIG_EZX_PCAP is not set
-CONFIG_MFD_VIPERBOARD=m
-CONFIG_MFD_RETU=m
-CONFIG_MFD_PCF50633=m
-CONFIG_PCF50633_ADC=m
-CONFIG_PCF50633_GPIO=m
-CONFIG_UCB1400_CORE=m
-CONFIG_MFD_RDC321X=m
-CONFIG_MFD_RTSX_PCI=m
-CONFIG_MFD_SI476X_CORE=m
-CONFIG_MFD_SM501=m
-CONFIG_MFD_SM501_GPIO=y
-CONFIG_ABX500_CORE=y
-# CONFIG_MFD_STMPE is not set
-# CONFIG_MFD_SYSCON is not set
-CONFIG_MFD_TI_AM335X_TSCADC=m
-# CONFIG_TPS6105X is not set
-CONFIG_TPS65010=m
-CONFIG_TPS6507X=m
-CONFIG_MFD_TPS65217=m
-# CONFIG_MFD_TPS65912 is not set
-# CONFIG_MFD_TPS65912_SPI is not set
-CONFIG_MFD_WL1273_CORE=m
-CONFIG_MFD_LM3533=m
-# CONFIG_MFD_TIMBERDALE is not set
-# CONFIG_MFD_TMIO is not set
-CONFIG_MFD_VX855=m
-CONFIG_MFD_ARIZONA=y
-CONFIG_MFD_ARIZONA_I2C=m
-# CONFIG_MFD_ARIZONA_SPI is not set
-CONFIG_MFD_WM5102=y
-CONFIG_MFD_WM5110=y
-# CONFIG_MFD_WM8997 is not set
-# CONFIG_MFD_WM831X_SPI is not set
-# CONFIG_REGULATOR is not set
-CONFIG_MEDIA_SUPPORT=m
-
-#
-# Multimedia core support
-#
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
-CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
-CONFIG_MEDIA_RADIO_SUPPORT=y
-CONFIG_MEDIA_RC_SUPPORT=y
-CONFIG_MEDIA_CONTROLLER=y
-CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L2_SUBDEV_API=y
-CONFIG_VIDEO_V4L2=m
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-CONFIG_VIDEO_TUNER=m
-CONFIG_V4L2_MEM2MEM_DEV=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEOBUF_DVB=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_DMA_CONTIG=m
-CONFIG_VIDEOBUF2_VMALLOC=m
-CONFIG_VIDEOBUF2_DMA_SG=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
-
-#
-# Media drivers
-#
-CONFIG_RC_CORE=m
-CONFIG_RC_MAP=m
-CONFIG_RC_DECODERS=y
-CONFIG_LIRC=m
-CONFIG_IR_LIRC_CODEC=m
-CONFIG_IR_NEC_DECODER=m
-CONFIG_IR_RC5_DECODER=m
-CONFIG_IR_RC6_DECODER=m
-CONFIG_IR_JVC_DECODER=m
-CONFIG_IR_SONY_DECODER=m
-CONFIG_IR_RC5_SZ_DECODER=m
-CONFIG_IR_SANYO_DECODER=m
-CONFIG_IR_MCE_KBD_DECODER=m
-CONFIG_RC_DEVICES=y
-CONFIG_RC_ATI_REMOTE=m
-CONFIG_IR_ENE=m
-CONFIG_IR_IMON=m
-CONFIG_IR_MCEUSB=m
-CONFIG_IR_ITE_CIR=m
-CONFIG_IR_FINTEK=m
-CONFIG_IR_NUVOTON=m
-CONFIG_IR_REDRAT3=m
-CONFIG_IR_STREAMZAP=m
-CONFIG_IR_WINBOND_CIR=m
-CONFIG_IR_IGUANA=m
-CONFIG_IR_TTUSBIR=m
-CONFIG_RC_LOOPBACK=m
-CONFIG_IR_GPIO_CIR=m
-CONFIG_MEDIA_USB_SUPPORT=y
-
-#
-# Webcam devices
-#
-CONFIG_USB_VIDEO_CLASS=m
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-CONFIG_USB_GSPCA=m
-CONFIG_USB_M5602=m
-CONFIG_USB_STV06XX=m
-CONFIG_USB_GL860=m
-CONFIG_USB_GSPCA_BENQ=m
-CONFIG_USB_GSPCA_CONEX=m
-CONFIG_USB_GSPCA_CPIA1=m
-CONFIG_USB_GSPCA_ETOMS=m
-CONFIG_USB_GSPCA_FINEPIX=m
-CONFIG_USB_GSPCA_JEILINJ=m
-CONFIG_USB_GSPCA_JL2005BCD=m
-CONFIG_USB_GSPCA_KINECT=m
-CONFIG_USB_GSPCA_KONICA=m
-CONFIG_USB_GSPCA_MARS=m
-CONFIG_USB_GSPCA_MR97310A=m
-CONFIG_USB_GSPCA_NW80X=m
-CONFIG_USB_GSPCA_OV519=m
-CONFIG_USB_GSPCA_OV534=m
-CONFIG_USB_GSPCA_OV534_9=m
-CONFIG_USB_GSPCA_PAC207=m
-CONFIG_USB_GSPCA_PAC7302=m
-CONFIG_USB_GSPCA_PAC7311=m
-CONFIG_USB_GSPCA_SE401=m
-CONFIG_USB_GSPCA_SN9C2028=m
-CONFIG_USB_GSPCA_SN9C20X=m
-CONFIG_USB_GSPCA_SONIXB=m
-CONFIG_USB_GSPCA_SONIXJ=m
-CONFIG_USB_GSPCA_SPCA500=m
-CONFIG_USB_GSPCA_SPCA501=m
-CONFIG_USB_GSPCA_SPCA505=m
-CONFIG_USB_GSPCA_SPCA506=m
-CONFIG_USB_GSPCA_SPCA508=m
-CONFIG_USB_GSPCA_SPCA561=m
-CONFIG_USB_GSPCA_SPCA1528=m
-CONFIG_USB_GSPCA_SQ905=m
-CONFIG_USB_GSPCA_SQ905C=m
-CONFIG_USB_GSPCA_SQ930X=m
-CONFIG_USB_GSPCA_STK014=m
-CONFIG_USB_GSPCA_STV0680=m
-CONFIG_USB_GSPCA_SUNPLUS=m
-CONFIG_USB_GSPCA_T613=m
-CONFIG_USB_GSPCA_TOPRO=m
-CONFIG_USB_GSPCA_TV8532=m
-CONFIG_USB_GSPCA_VC032X=m
-CONFIG_USB_GSPCA_VICAM=m
-CONFIG_USB_GSPCA_XIRLINK_CIT=m
-CONFIG_USB_GSPCA_ZC3XX=m
-CONFIG_USB_PWC=m
-# CONFIG_USB_PWC_DEBUG is not set
-CONFIG_USB_PWC_INPUT_EVDEV=y
-CONFIG_VIDEO_CPIA2=m
-CONFIG_USB_ZR364XX=m
-CONFIG_USB_STKWEBCAM=m
-CONFIG_USB_S2255=m
-CONFIG_USB_SN9C102=m
-CONFIG_VIDEO_USBTV=m
-
-#
-# Analog TV USB devices
-#
-CONFIG_VIDEO_PVRUSB2=m
-CONFIG_VIDEO_PVRUSB2_SYSFS=y
-CONFIG_VIDEO_PVRUSB2_DVB=y
-# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
-CONFIG_VIDEO_HDPVR=m
-CONFIG_VIDEO_TLG2300=m
-CONFIG_VIDEO_USBVISION=m
-CONFIG_VIDEO_STK1160=m
-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
-CONFIG_VIDEO_CX231XX_DVB=m
-CONFIG_VIDEO_TM6000=m
-CONFIG_VIDEO_TM6000_ALSA=m
-CONFIG_VIDEO_TM6000_DVB=m
-
-#
-# Digital TV USB devices
-#
-CONFIG_DVB_USB=m
-# CONFIG_DVB_USB_DEBUG is not set
-CONFIG_DVB_USB_A800=m
-CONFIG_DVB_USB_DIBUSB_MB=m
-CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
-CONFIG_DVB_USB_DIBUSB_MC=m
-CONFIG_DVB_USB_DIB0700=m
-CONFIG_DVB_USB_UMT_010=m
-CONFIG_DVB_USB_CXUSB=m
-CONFIG_DVB_USB_M920X=m
-CONFIG_DVB_USB_DIGITV=m
-CONFIG_DVB_USB_VP7045=m
-CONFIG_DVB_USB_VP702X=m
-CONFIG_DVB_USB_GP8PSK=m
-CONFIG_DVB_USB_NOVA_T_USB2=m
-CONFIG_DVB_USB_TTUSB2=m
-CONFIG_DVB_USB_DTT200U=m
-CONFIG_DVB_USB_OPERA1=m
-CONFIG_DVB_USB_AF9005=m
-CONFIG_DVB_USB_AF9005_REMOTE=m
-CONFIG_DVB_USB_PCTV452E=m
-CONFIG_DVB_USB_DW2102=m
-CONFIG_DVB_USB_CINERGY_T2=m
-CONFIG_DVB_USB_DTV5100=m
-CONFIG_DVB_USB_FRIIO=m
-CONFIG_DVB_USB_AZ6027=m
-CONFIG_DVB_USB_TECHNISAT_USB2=m
-CONFIG_DVB_USB_V2=m
-CONFIG_DVB_USB_AF9015=m
-CONFIG_DVB_USB_AF9035=m
-CONFIG_DVB_USB_ANYSEE=m
-CONFIG_DVB_USB_AU6610=m
-CONFIG_DVB_USB_AZ6007=m
-CONFIG_DVB_USB_CE6230=m
-CONFIG_DVB_USB_EC168=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_IT913X=m
-CONFIG_DVB_USB_LME2510=m
-CONFIG_DVB_USB_MXL111SF=m
-CONFIG_DVB_USB_RTL28XXU=m
-CONFIG_DVB_TTUSB_BUDGET=m
-CONFIG_DVB_TTUSB_DEC=m
-CONFIG_SMS_USB_DRV=m
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
-
-#
-# Webcam, TV (analog/digital) USB devices
-#
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_EM28XX_RC=m
-CONFIG_MEDIA_PCI_SUPPORT=y
-
-#
-# Media capture support
-#
-CONFIG_VIDEO_MEYE=m
-
-#
-# Media capture/analog TV support
-#
-CONFIG_VIDEO_IVTV=m
-CONFIG_VIDEO_IVTV_ALSA=m
-CONFIG_VIDEO_FB_IVTV=m
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_ZR36060=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN_AVS6EYES=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_MXB=m
-
-#
-# Media capture/analog/hybrid TV support
-#
-CONFIG_VIDEO_CX18=m
-CONFIG_VIDEO_CX18_ALSA=m
-CONFIG_VIDEO_CX23885=m
-CONFIG_MEDIA_ALTERA_CI=m
-CONFIG_VIDEO_CX25821=m
-CONFIG_VIDEO_CX25821_ALSA=m
-CONFIG_VIDEO_CX88=m
-CONFIG_VIDEO_CX88_ALSA=m
-CONFIG_VIDEO_CX88_BLACKBIRD=m
-CONFIG_VIDEO_CX88_DVB=m
-CONFIG_VIDEO_CX88_VP3054=m
-CONFIG_VIDEO_CX88_MPEG=m
-CONFIG_VIDEO_BT848=m
-CONFIG_DVB_BT8XX=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7134_ALSA=m
-CONFIG_VIDEO_SAA7134_RC=y
-CONFIG_VIDEO_SAA7134_DVB=m
-CONFIG_VIDEO_SAA7164=m
-
-#
-# Media digital TV PCI Adapters
-#
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
-CONFIG_DVB_BUDGET_CORE=m
-CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_CI=m
-CONFIG_DVB_BUDGET_AV=m
-CONFIG_DVB_BUDGET_PATCH=m
-CONFIG_DVB_B2C2_FLEXCOP_PCI=m
-# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
-CONFIG_DVB_PLUTO2=m
-CONFIG_DVB_DM1105=m
-CONFIG_DVB_PT1=m
-CONFIG_MANTIS_CORE=m
-CONFIG_DVB_MANTIS=m
-CONFIG_DVB_HOPPER=m
-CONFIG_DVB_NGENE=m
-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
-
-#
-# Supported MMC/SDIO adapters
-#
-CONFIG_SMS_SDIO_DRV=m
-CONFIG_MEDIA_PARPORT_SUPPORT=y
-CONFIG_VIDEO_BWQCAM=m
-CONFIG_VIDEO_CQCAM=m
-CONFIG_VIDEO_PMS=m
-CONFIG_VIDEO_W9966=m
-CONFIG_RADIO_ADAPTERS=y
-CONFIG_RADIO_SI470X=y
-CONFIG_USB_SI470X=m
-CONFIG_I2C_SI470X=m
-CONFIG_USB_MR800=m
-CONFIG_USB_DSBR=m
-CONFIG_RADIO_MAXIRADIO=m
-CONFIG_RADIO_SHARK=m
-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
-CONFIG_RADIO_WL1273=m
-
-#
-# Texas Instruments WL128x FM driver (ST based)
-#
-CONFIG_RADIO_WL128X=m
-# CONFIG_V4L_RADIO_ISA_DRIVERS is not set
-
-#
-# Supported FireWire (IEEE 1394) Adapters
-#
-CONFIG_DVB_FIREDTV=m
-CONFIG_DVB_FIREDTV_INPUT=y
-CONFIG_MEDIA_COMMON_OPTIONS=y
-
-#
-# common driver options
-#
-CONFIG_VIDEO_CX2341X=m
-CONFIG_VIDEO_BTCX=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_CYPRESS_FIRMWARE=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_SMS_SIANO_DEBUGFS is not set
-
-#
-# Media ancillary drivers (tuners, sensors, i2c, frontends)
-#
-CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
-CONFIG_MEDIA_ATTACH=y
-CONFIG_VIDEO_IR_I2C=m
-
-#
-# Audio decoders, processors and mixers
-#
-CONFIG_VIDEO_TVAUDIO=m
-CONFIG_VIDEO_TDA7432=m
-CONFIG_VIDEO_TDA9840=m
-CONFIG_VIDEO_TEA6415C=m
-CONFIG_VIDEO_TEA6420=m
-CONFIG_VIDEO_MSP3400=m
-CONFIG_VIDEO_CS5345=m
-CONFIG_VIDEO_CS53L32A=m
-CONFIG_VIDEO_UDA1342=m
-CONFIG_VIDEO_WM8775=m
-CONFIG_VIDEO_WM8739=m
-CONFIG_VIDEO_VP27SMPX=m
-CONFIG_VIDEO_SONY_BTF_MPX=m
-
-#
-# RDS decoders
-#
-CONFIG_VIDEO_SAA6588=m
-
-#
-# Video decoders
-#
-CONFIG_VIDEO_BT819=m
-CONFIG_VIDEO_BT856=m
-CONFIG_VIDEO_BT866=m
-CONFIG_VIDEO_KS0127=m
-CONFIG_VIDEO_SAA7110=m
-CONFIG_VIDEO_SAA711X=m
-CONFIG_VIDEO_TVP5150=m
-CONFIG_VIDEO_TW2804=m
-CONFIG_VIDEO_TW9903=m
-CONFIG_VIDEO_TW9906=m
-CONFIG_VIDEO_VPX3220=m
-
-#
-# Video and audio decoders
-#
-CONFIG_VIDEO_SAA717X=m
-CONFIG_VIDEO_CX25840=m
-
-#
-# Video encoders
-#
-CONFIG_VIDEO_SAA7127=m
-CONFIG_VIDEO_SAA7185=m
-CONFIG_VIDEO_ADV7170=m
-CONFIG_VIDEO_ADV7175=m
-
-#
-# Camera sensor devices
-#
-CONFIG_VIDEO_OV7640=m
-CONFIG_VIDEO_MT9V011=m
-
-#
-# Flash devices
-#
-
-#
-# Video improvement chips
-#
-CONFIG_VIDEO_UPD64031A=m
-CONFIG_VIDEO_UPD64083=m
-
-#
-# Miscelaneous helper chips
-#
-CONFIG_VIDEO_M52790=m
-
-#
-# Sensors used on soc_camera driver
-#
-CONFIG_MEDIA_TUNER=m
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_TEA5761=m
-CONFIG_MEDIA_TUNER_TEA5767=m
-CONFIG_MEDIA_TUNER_MT20XX=m
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2063=m
-CONFIG_MEDIA_TUNER_MT2266=m
-CONFIG_MEDIA_TUNER_MT2131=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC5000=m
-CONFIG_MEDIA_TUNER_XC4000=m
-CONFIG_MEDIA_TUNER_MXL5005S=m
-CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=m
-CONFIG_MEDIA_TUNER_MAX2165=m
-CONFIG_MEDIA_TUNER_TDA18218=m
-CONFIG_MEDIA_TUNER_FC0011=m
-CONFIG_MEDIA_TUNER_FC0012=m
-CONFIG_MEDIA_TUNER_FC0013=m
-CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_MEDIA_TUNER_E4000=m
-CONFIG_MEDIA_TUNER_FC2580=m
-CONFIG_MEDIA_TUNER_TUA9001=m
-CONFIG_MEDIA_TUNER_IT913X=m
-CONFIG_MEDIA_TUNER_R820T=m
-
-#
-# Multistandard (satellite) frontends
-#
-CONFIG_DVB_STB0899=m
-CONFIG_DVB_STB6100=m
-CONFIG_DVB_STV090x=m
-CONFIG_DVB_STV6110x=m
-
-#
-# Multistandard (cable + terrestrial) frontends
-#
-CONFIG_DVB_DRXK=m
-CONFIG_DVB_TDA18271C2DD=m
-
-#
-# DVB-S (satellite) frontends
-#
-CONFIG_DVB_CX24110=m
-CONFIG_DVB_CX24123=m
-CONFIG_DVB_MT312=m
-CONFIG_DVB_ZL10036=m
-CONFIG_DVB_ZL10039=m
-CONFIG_DVB_S5H1420=m
-CONFIG_DVB_STV0288=m
-CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=m
-CONFIG_DVB_STV6110=m
-CONFIG_DVB_STV0900=m
-CONFIG_DVB_TDA8083=m
-CONFIG_DVB_TDA10086=m
-CONFIG_DVB_TDA8261=m
-CONFIG_DVB_VES1X93=m
-CONFIG_DVB_TUNER_ITD1000=m
-CONFIG_DVB_TUNER_CX24113=m
-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
-
-#
-# DVB-T (terrestrial) frontends
-#
-CONFIG_DVB_SP8870=m
-CONFIG_DVB_SP887X=m
-CONFIG_DVB_CX22700=m
-CONFIG_DVB_CX22702=m
-CONFIG_DVB_DRXD=m
-CONFIG_DVB_L64781=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_NXT6000=m
-CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=m
-CONFIG_DVB_DIB3000MB=m
-CONFIG_DVB_DIB3000MC=m
-CONFIG_DVB_DIB7000M=m
-CONFIG_DVB_DIB7000P=m
-CONFIG_DVB_TDA10048=m
-CONFIG_DVB_AF9013=m
-CONFIG_DVB_EC100=m
-CONFIG_DVB_STV0367=m
-CONFIG_DVB_CXD2820R=m
-CONFIG_DVB_RTL2830=m
-CONFIG_DVB_RTL2832=m
-
-#
-# DVB-C (cable) frontends
-#
-CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=m
-CONFIG_DVB_TDA10023=m
-CONFIG_DVB_STV0297=m
-
-#
-# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
-#
-CONFIG_DVB_NXT200X=m
-CONFIG_DVB_OR51211=m
-CONFIG_DVB_OR51132=m
-CONFIG_DVB_BCM3510=m
-CONFIG_DVB_LGDT330X=m
-CONFIG_DVB_LGDT3305=m
-CONFIG_DVB_LG2160=m
-CONFIG_DVB_S5H1409=m
-CONFIG_DVB_AU8522=m
-CONFIG_DVB_AU8522_DTV=m
-CONFIG_DVB_AU8522_V4L=m
-CONFIG_DVB_S5H1411=m
-
-#
-# ISDB-T (terrestrial) frontends
-#
-CONFIG_DVB_S921=m
-CONFIG_DVB_DIB8000=m
-CONFIG_DVB_MB86A20S=m
-
-#
-# Digital terrestrial only tuners/PLL
-#
-CONFIG_DVB_PLL=m
-CONFIG_DVB_TUNER_DIB0070=m
-CONFIG_DVB_TUNER_DIB0090=m
-
-#
-# SEC control devices for DVB-S
-#
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_LNBP22=m
-CONFIG_DVB_ISL6405=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_ISL6423=m
-CONFIG_DVB_A8293=m
-CONFIG_DVB_LGS8GXX=m
-CONFIG_DVB_ATBM8830=m
-CONFIG_DVB_TDA665x=m
-CONFIG_DVB_IX2505V=m
-CONFIG_DVB_IT913X_FE=m
-CONFIG_DVB_M88RS2000=m
-CONFIG_DVB_AF9033=m
-
-#
-# Tools to develop new frontends
-#
-# CONFIG_DVB_DUMMY_FE is not set
-
-#
-# Graphics support
-#
-CONFIG_AGP=m
-CONFIG_AGP_ALI=m
-CONFIG_AGP_ATI=m
-CONFIG_AGP_AMD=m
-CONFIG_AGP_AMD64=m
-CONFIG_AGP_INTEL=m
-CONFIG_AGP_NVIDIA=m
-CONFIG_AGP_SIS=m
-CONFIG_AGP_SWORKS=m
-CONFIG_AGP_VIA=m
-CONFIG_AGP_EFFICEON=m
-CONFIG_VGA_ARB=y
-CONFIG_VGA_ARB_MAX_GPUS=16
-CONFIG_VGA_SWITCHEROO=y
-CONFIG_DRM=m
-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_UMS is not set
-CONFIG_DRM_NOUVEAU=m
-CONFIG_NOUVEAU_DEBUG=5
-CONFIG_NOUVEAU_DEBUG_DEFAULT=3
-CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-CONFIG_DRM_I915=m
-CONFIG_DRM_I915_KMS=y
-CONFIG_DRM_MGA=m
-CONFIG_DRM_SIS=m
-CONFIG_DRM_VIA=m
-CONFIG_DRM_SAVAGE=m
-CONFIG_DRM_VMWGFX=m
-CONFIG_DRM_VMWGFX_FBCON=y
-CONFIG_DRM_GMA500=m
-CONFIG_DRM_GMA600=y
-CONFIG_DRM_GMA3600=y
-CONFIG_DRM_UDL=m
-CONFIG_DRM_AST=m
-CONFIG_DRM_MGAG200=m
-CONFIG_DRM_CIRRUS_QEMU=m
-CONFIG_DRM_QXL=m
-CONFIG_VGASTATE=m
-CONFIG_VIDEO_OUTPUT_CONTROL=m
-CONFIG_HDMI=y
-CONFIG_FB=y
-CONFIG_FIRMWARE_EDID=y
-CONFIG_FB_DDC=m
-CONFIG_FB_BOOT_VESA_SUPPORT=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_IMAGEBLIT=m
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-CONFIG_FB_SYS_FOPS=m
-CONFIG_FB_DEFERRED_IO=y
-# CONFIG_FB_SVGALIB is not set
-# CONFIG_FB_MACMODES is not set
-CONFIG_FB_BACKLIGHT=y
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_TILEBLITTING=y
-
-#
-# Frame buffer hardware drivers
-#
-# CONFIG_FB_CIRRUS is not set
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_ARC is not set
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_IMSTT is not set
-CONFIG_FB_VGA16=m
-CONFIG_FB_UVESA=m
-CONFIG_FB_VESA=y
-CONFIG_FB_EFI=y
-# CONFIG_FB_N411 is not set
-# CONFIG_FB_HGA is not set
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_NVIDIA is not set
-# CONFIG_FB_RIVA is not set
-# CONFIG_FB_I740 is not set
-CONFIG_FB_I810=m
-CONFIG_FB_I810_GTF=y
-CONFIG_FB_I810_I2C=y
-# CONFIG_FB_LE80578 is not set
-# CONFIG_FB_MATROX is not set
-# CONFIG_FB_RADEON is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_ATY is not set
-# CONFIG_FB_S3 is not set
-# CONFIG_FB_SAVAGE is not set
-# CONFIG_FB_SIS is not set
-CONFIG_FB_VIA=m
-CONFIG_FB_VIA_DIRECT_PROCFS=y
-CONFIG_FB_VIA_X_COMPATIBILITY=y
-# CONFIG_FB_NEOMAGIC is not set
-# CONFIG_FB_KYRO is not set
-# CONFIG_FB_3DFX is not set
-CONFIG_FB_VOODOO1=m
-CONFIG_FB_VT8623=m
-# CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_ARK is not set
-# CONFIG_FB_PM3 is not set
-# CONFIG_FB_CARMINE is not set
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_TMIO is not set
-# 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
-# CONFIG_FB_BROADSHEET is not set
-# CONFIG_FB_AUO_K190X is not set
-CONFIG_FB_HYPERV=m
-# CONFIG_FB_SIMPLE is not set
-# CONFIG_EXYNOS_VIDEO is not set
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=m
-# CONFIG_LCD_L4F00242T03 is not set
-# CONFIG_LCD_LMS283GF05 is not set
-# CONFIG_LCD_LTV350QV is not set
-# CONFIG_LCD_ILI922X is not set
-# CONFIG_LCD_ILI9320 is not set
-# CONFIG_LCD_TDO24M is not set
-# CONFIG_LCD_VGG2432A4 is not set
-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
-# CONFIG_BACKLIGHT_PWM is not set
-CONFIG_BACKLIGHT_APPLE=m
-# CONFIG_BACKLIGHT_SAHARA is not set
-# CONFIG_BACKLIGHT_ADP8860 is not set
-# CONFIG_BACKLIGHT_ADP8870 is not set
-CONFIG_BACKLIGHT_PCF50633=m
-# CONFIG_BACKLIGHT_LM3630 is not set
-# CONFIG_BACKLIGHT_LM3639 is not set
-# CONFIG_BACKLIGHT_LP855X is not set
-# CONFIG_BACKLIGHT_OT200 is not set
-# CONFIG_BACKLIGHT_TPS65217 is not set
-
-#
-# Console display driver support
-#
-CONFIG_VGA_CONSOLE=y
-# CONFIG_VGACON_SOFT_SCROLLBACK is not set
-# CONFIG_MDA_CONSOLE is not set
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-# CONFIG_LOGO is not set
-CONFIG_FB_SSD1307=m
-CONFIG_SOUND=m
-CONFIG_SOUND_OSS_CORE=y
-# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
-CONFIG_SND=m
-CONFIG_SND_TIMER=m
-CONFIG_SND_PCM=m
-CONFIG_SND_HWDEP=m
-CONFIG_SND_RAWMIDI=m
-CONFIG_SND_JACK=y
-CONFIG_SND_SEQUENCER=m
-CONFIG_SND_SEQ_DUMMY=m
-CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_PCM_OSS_PLUGINS=y
-CONFIG_SND_SEQUENCER_OSS=y
-CONFIG_SND_HRTIMER=m
-CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
-CONFIG_SND_DYNAMIC_MINORS=y
-CONFIG_SND_MAX_CARDS=32
-CONFIG_SND_SUPPORT_OLD_API=y
-CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
-# CONFIG_SND_DEBUG is not set
-CONFIG_SND_VMASTER=y
-CONFIG_SND_KCTL_JACK=y
-CONFIG_SND_DMA_SGBUF=y
-CONFIG_SND_RAWMIDI_SEQ=m
-CONFIG_SND_OPL3_LIB_SEQ=m
-CONFIG_SND_OPL4_LIB_SEQ=m
-CONFIG_SND_SBAWE_SEQ=m
-CONFIG_SND_EMU10K1_SEQ=m
-CONFIG_SND_MPU401_UART=m
-CONFIG_SND_OPL3_LIB=m
-CONFIG_SND_OPL4_LIB=m
-CONFIG_SND_VX_LIB=m
-CONFIG_SND_AC97_CODEC=m
-CONFIG_SND_DRIVERS=y
-# CONFIG_SND_PCSP is not set
-CONFIG_SND_DUMMY=m
-CONFIG_SND_ALOOP=m
-CONFIG_SND_VIRMIDI=m
-CONFIG_SND_MTPAV=m
-CONFIG_SND_MTS64=m
-CONFIG_SND_SERIAL_U16550=m
-CONFIG_SND_MPU401=m
-CONFIG_SND_PORTMAN2X4=m
-CONFIG_SND_AC97_POWER_SAVE=y
-CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
-CONFIG_SND_WSS_LIB=m
-CONFIG_SND_SB_COMMON=m
-CONFIG_SND_SB8_DSP=m
-CONFIG_SND_SB16_DSP=m
-CONFIG_SND_ISA=y
-CONFIG_SND_ADLIB=m
-CONFIG_SND_AD1816A=m
-CONFIG_SND_AD1848=m
-CONFIG_SND_ALS100=m
-CONFIG_SND_AZT1605=m
-CONFIG_SND_AZT2316=m
-CONFIG_SND_AZT2320=m
-CONFIG_SND_CMI8328=m
-CONFIG_SND_CMI8330=m
-CONFIG_SND_CS4231=m
-CONFIG_SND_CS4236=m
-CONFIG_SND_ES1688=m
-CONFIG_SND_ES18XX=m
-CONFIG_SND_SC6000=m
-CONFIG_SND_GUSCLASSIC=m
-CONFIG_SND_GUSEXTREME=m
-CONFIG_SND_GUSMAX=m
-CONFIG_SND_INTERWAVE=m
-CONFIG_SND_INTERWAVE_STB=m
-CONFIG_SND_JAZZ16=m
-CONFIG_SND_OPL3SA2=m
-CONFIG_SND_OPTI92X_AD1848=m
-CONFIG_SND_OPTI92X_CS4231=m
-CONFIG_SND_OPTI93X=m
-CONFIG_SND_MIRO=m
-CONFIG_SND_SB8=m
-CONFIG_SND_SB16=m
-CONFIG_SND_SBAWE=m
-CONFIG_SND_SB16_CSP=y
-CONFIG_SND_SSCAPE=m
-CONFIG_SND_WAVEFRONT=m
-CONFIG_SND_MSND_PINNACLE=m
-CONFIG_SND_MSND_CLASSIC=m
-CONFIG_SND_TEA575X=m
-CONFIG_SND_PCI=y
-CONFIG_SND_AD1889=m
-CONFIG_SND_ALS300=m
-CONFIG_SND_ALS4000=m
-CONFIG_SND_ALI5451=m
-CONFIG_SND_ASIHPI=m
-CONFIG_SND_ATIIXP=m
-CONFIG_SND_ATIIXP_MODEM=m
-CONFIG_SND_AU8810=m
-CONFIG_SND_AU8820=m
-CONFIG_SND_AU8830=m
-CONFIG_SND_AW2=m
-CONFIG_SND_AZT3328=m
-CONFIG_SND_BT87X=m
-# CONFIG_SND_BT87X_OVERCLOCK is not set
-CONFIG_SND_CA0106=m
-CONFIG_SND_CMIPCI=m
-CONFIG_SND_OXYGEN_LIB=m
-CONFIG_SND_OXYGEN=m
-CONFIG_SND_CS4281=m
-CONFIG_SND_CS46XX=m
-CONFIG_SND_CS46XX_NEW_DSP=y
-CONFIG_SND_CS5530=m
-CONFIG_SND_CS5535AUDIO=m
-CONFIG_SND_CTXFI=m
-CONFIG_SND_DARLA20=m
-CONFIG_SND_GINA20=m
-CONFIG_SND_LAYLA20=m
-CONFIG_SND_DARLA24=m
-CONFIG_SND_GINA24=m
-CONFIG_SND_LAYLA24=m
-CONFIG_SND_MONA=m
-CONFIG_SND_MIA=m
-CONFIG_SND_ECHO3G=m
-CONFIG_SND_INDIGO=m
-CONFIG_SND_INDIGOIO=m
-CONFIG_SND_INDIGODJ=m
-CONFIG_SND_INDIGOIOX=m
-CONFIG_SND_INDIGODJX=m
-CONFIG_SND_EMU10K1=m
-CONFIG_SND_EMU10K1X=m
-CONFIG_SND_ENS1370=m
-CONFIG_SND_ENS1371=m
-CONFIG_SND_ES1938=m
-CONFIG_SND_ES1968=m
-CONFIG_SND_ES1968_INPUT=y
-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
-CONFIG_SND_HDA_INPUT_BEEP=y
-CONFIG_SND_HDA_INPUT_BEEP_MODE=1
-CONFIG_SND_HDA_INPUT_JACK=y
-CONFIG_SND_HDA_PATCH_LOADER=y
-CONFIG_SND_HDA_CODEC_REALTEK=y
-CONFIG_SND_HDA_CODEC_ANALOG=y
-CONFIG_SND_HDA_CODEC_SIGMATEL=y
-CONFIG_SND_HDA_CODEC_VIA=y
-CONFIG_SND_HDA_CODEC_HDMI=y
-CONFIG_SND_HDA_I915=y
-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
-CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
-CONFIG_SND_HDSP=m
-CONFIG_SND_HDSPM=m
-CONFIG_SND_ICE1712=m
-CONFIG_SND_ICE1724=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
-CONFIG_SND_KORG1212=m
-CONFIG_SND_LOLA=m
-CONFIG_SND_LX6464ES=m
-CONFIG_SND_MAESTRO3=m
-CONFIG_SND_MAESTRO3_INPUT=y
-CONFIG_SND_MIXART=m
-CONFIG_SND_NM256=m
-CONFIG_SND_PCXHR=m
-CONFIG_SND_RIPTIDE=m
-CONFIG_SND_RME32=m
-CONFIG_SND_RME96=m
-CONFIG_SND_RME9652=m
-CONFIG_SND_SIS7019=m
-CONFIG_SND_SONICVIBES=m
-CONFIG_SND_TRIDENT=m
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
-CONFIG_SND_VIRTUOSO=m
-CONFIG_SND_VX222=m
-CONFIG_SND_YMFPCI=m
-CONFIG_SND_SPI=y
-CONFIG_SND_USB=y
-CONFIG_SND_USB_AUDIO=m
-CONFIG_SND_USB_UA101=m
-CONFIG_SND_USB_USX2Y=m
-CONFIG_SND_USB_CAIAQ=m
-CONFIG_SND_USB_CAIAQ_INPUT=y
-CONFIG_SND_USB_US122L=m
-CONFIG_SND_USB_6FIRE=m
-CONFIG_SND_USB_HIFACE=m
-CONFIG_SND_FIREWIRE=y
-CONFIG_SND_FIREWIRE_LIB=m
-CONFIG_SND_FIREWIRE_SPEAKERS=m
-CONFIG_SND_ISIGHT=m
-CONFIG_SND_SCS1X=m
-CONFIG_SND_PCMCIA=y
-CONFIG_SND_VXPOCKET=m
-CONFIG_SND_PDAUDIOCF=m
-# CONFIG_SND_SOC is not set
-# CONFIG_SOUND_PRIME is not set
-CONFIG_AC97_BUS=m
-
-#
-# HID support
-#
-CONFIG_HID=m
-CONFIG_HIDRAW=y
-CONFIG_UHID=m
-CONFIG_HID_GENERIC=m
-
-#
-# Special HID drivers
-#
-CONFIG_HID_A4TECH=m
-CONFIG_HID_ACRUX=m
-CONFIG_HID_ACRUX_FF=y
-CONFIG_HID_APPLE=m
-CONFIG_HID_APPLEIR=m
-CONFIG_HID_AUREAL=m
-CONFIG_HID_BELKIN=m
-CONFIG_HID_CHERRY=m
-CONFIG_HID_CHICONY=m
-CONFIG_HID_PRODIKEYS=m
-CONFIG_HID_CYPRESS=m
-CONFIG_HID_DRAGONRISE=m
-CONFIG_DRAGONRISE_FF=y
-CONFIG_HID_EMS_FF=m
-CONFIG_HID_ELECOM=m
-CONFIG_HID_ELO=m
-CONFIG_HID_EZKEY=m
-CONFIG_HID_HOLTEK=m
-CONFIG_HOLTEK_FF=y
-CONFIG_HID_HUION=m
-CONFIG_HID_KEYTOUCH=m
-CONFIG_HID_KYE=m
-CONFIG_HID_UCLOGIC=m
-CONFIG_HID_WALTOP=m
-CONFIG_HID_GYRATION=m
-CONFIG_HID_ICADE=m
-CONFIG_HID_TWINHAN=m
-CONFIG_HID_KENSINGTON=m
-CONFIG_HID_LCPOWER=m
-CONFIG_HID_LENOVO_TPKBD=m
-CONFIG_HID_LOGITECH=m
-CONFIG_HID_LOGITECH_DJ=m
-CONFIG_LOGITECH_FF=y
-CONFIG_LOGIRUMBLEPAD2_FF=y
-CONFIG_LOGIG940_FF=y
-CONFIG_LOGIWHEELS_FF=y
-CONFIG_HID_MAGICMOUSE=m
-CONFIG_HID_MICROSOFT=m
-CONFIG_HID_MONTEREY=m
-CONFIG_HID_MULTITOUCH=m
-CONFIG_HID_NTRIG=m
-CONFIG_HID_ORTEK=m
-CONFIG_HID_PANTHERLORD=m
-CONFIG_PANTHERLORD_FF=y
-CONFIG_HID_PETALYNX=m
-CONFIG_HID_PICOLCD=m
-CONFIG_HID_PICOLCD_FB=y
-CONFIG_HID_PICOLCD_BACKLIGHT=y
-CONFIG_HID_PICOLCD_LCD=y
-CONFIG_HID_PICOLCD_LEDS=y
-CONFIG_HID_PICOLCD_CIR=y
-CONFIG_HID_PRIMAX=m
-CONFIG_HID_ROCCAT=m
-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
-CONFIG_HID_HYPERV_MOUSE=m
-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
-CONFIG_HID_WIIMOTE=m
-CONFIG_HID_ZEROPLUS=m
-CONFIG_ZEROPLUS_FF=y
-CONFIG_HID_ZYDACRON=m
-CONFIG_HID_SENSOR_HUB=m
-
-#
-# USB HID support
-#
-CONFIG_USB_HID=m
-CONFIG_HID_PID=y
-CONFIG_USB_HIDDEV=y
-
-#
-# I2C HID support
-#
-CONFIG_I2C_HID=m
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_COMMON=m
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB=m
-# CONFIG_USB_DEBUG is not set
-# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-
-#
-# Miscellaneous USB options
-#
-CONFIG_USB_DEFAULT_PERSIST=y
-CONFIG_USB_DYNAMIC_MINORS=y
-# CONFIG_USB_OTG is not set
-CONFIG_USB_MON=m
-CONFIG_USB_WUSB=m
-CONFIG_USB_WUSB_CBAF=m
-# CONFIG_USB_WUSB_CBAF_DEBUG is not set
-
-#
-# USB Host Controller Drivers
-#
-CONFIG_USB_C67X00_HCD=m
-CONFIG_USB_XHCI_HCD=m
-# CONFIG_USB_XHCI_HCD_DEBUGGING is not set
-CONFIG_USB_EHCI_HCD=m
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_EHCI_TT_NEWSCHED=y
-CONFIG_USB_EHCI_PCI=m
-# CONFIG_USB_EHCI_HCD_PLATFORM is not set
-CONFIG_USB_OXU210HP_HCD=m
-CONFIG_USB_ISP116X_HCD=m
-CONFIG_USB_ISP1760_HCD=m
-CONFIG_USB_ISP1362_HCD=m
-CONFIG_USB_FUSBH200_HCD=m
-CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_OHCI_HCD_PCI=m
-# CONFIG_USB_OHCI_HCD_SSB is not set
-# CONFIG_USB_OHCI_HCD_PLATFORM is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-CONFIG_USB_UHCI_HCD=m
-CONFIG_USB_U132_HCD=m
-CONFIG_USB_SL811_HCD=m
-# CONFIG_USB_SL811_HCD_ISO is not set
-CONFIG_USB_SL811_CS=m
-CONFIG_USB_R8A66597_HCD=m
-CONFIG_USB_RENESAS_USBHS_HCD=m
-CONFIG_USB_WHCI_HCD=m
-CONFIG_USB_HWA_HCD=m
-# CONFIG_USB_HCD_BCMA is not set
-# CONFIG_USB_HCD_SSB is not set
-CONFIG_USB_MUSB_HDRC=m
-# CONFIG_USB_MUSB_HOST is not set
-# CONFIG_USB_MUSB_GADGET is not set
-CONFIG_USB_MUSB_DUAL_ROLE=y
-CONFIG_USB_MUSB_TUSB6010=m
-CONFIG_USB_MUSB_DSPS=m
-CONFIG_USB_MUSB_UX500=m
-# CONFIG_USB_UX500_DMA is not set
-CONFIG_MUSB_PIO_ONLY=y
-CONFIG_USB_RENESAS_USBHS=m
-
-#
-# USB Device Class drivers
-#
-CONFIG_USB_ACM=m
-CONFIG_USB_PRINTER=m
-CONFIG_USB_WDM=m
-CONFIG_USB_TMC=m
-
-#
-# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
-#
-
-#
-# also be needed; see USB_STORAGE Help for more info
-#
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_REALTEK=m
-CONFIG_REALTEK_AUTOPM=y
-CONFIG_USB_STORAGE_DATAFAB=m
-CONFIG_USB_STORAGE_FREECOM=m
-CONFIG_USB_STORAGE_ISD200=m
-CONFIG_USB_STORAGE_USBAT=m
-CONFIG_USB_STORAGE_SDDR09=m
-CONFIG_USB_STORAGE_SDDR55=m
-CONFIG_USB_STORAGE_JUMPSHOT=m
-CONFIG_USB_STORAGE_ALAUDA=m
-CONFIG_USB_STORAGE_ONETOUCH=m
-CONFIG_USB_STORAGE_KARMA=m
-CONFIG_USB_STORAGE_CYPRESS_ATACB=m
-CONFIG_USB_STORAGE_ENE_UB6250=m
-
-#
-# USB Imaging devices
-#
-CONFIG_USB_MDC800=m
-CONFIG_USB_MICROTEK=m
-# CONFIG_USB_DWC3 is not set
-CONFIG_USB_CHIPIDEA=m
-CONFIG_USB_CHIPIDEA_UDC=y
-# CONFIG_USB_CHIPIDEA_DEBUG is not set
-
-#
-# USB port drivers
-#
-CONFIG_USB_USS720=m
-CONFIG_USB_SERIAL=m
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_AIRCABLE=m
-CONFIG_USB_SERIAL_ARK3116=m
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_CH341=m
-CONFIG_USB_SERIAL_WHITEHEAT=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-CONFIG_USB_SERIAL_CP210X=m
-CONFIG_USB_SERIAL_CYPRESS_M8=m
-CONFIG_USB_SERIAL_EMPEG=m
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_FUNSOFT=m
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_IPAQ=m
-CONFIG_USB_SERIAL_IR=m
-CONFIG_USB_SERIAL_EDGEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT_TI=m
-CONFIG_USB_SERIAL_F81232=m
-CONFIG_USB_SERIAL_GARMIN=m
-CONFIG_USB_SERIAL_IPW=m
-CONFIG_USB_SERIAL_IUU=m
-CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KEYSPAN_MPR=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19=y
-CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
-CONFIG_USB_SERIAL_KLSI=m
-CONFIG_USB_SERIAL_KOBIL_SCT=m
-CONFIG_USB_SERIAL_MCT_U232=m
-CONFIG_USB_SERIAL_METRO=m
-CONFIG_USB_SERIAL_MOS7720=m
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
-CONFIG_USB_SERIAL_MOS7840=m
-CONFIG_USB_SERIAL_MOTOROLA=m
-CONFIG_USB_SERIAL_NAVMAN=m
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_SERIAL_OTI6858=m
-CONFIG_USB_SERIAL_QCAUX=m
-CONFIG_USB_SERIAL_QUALCOMM=m
-CONFIG_USB_SERIAL_SPCP8X5=m
-CONFIG_USB_SERIAL_HP4X=m
-CONFIG_USB_SERIAL_SAFE=m
-# CONFIG_USB_SERIAL_SAFE_PADDED is not set
-CONFIG_USB_SERIAL_SIEMENS_MPI=m
-CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-CONFIG_USB_SERIAL_SYMBOL=m
-CONFIG_USB_SERIAL_TI=m
-CONFIG_USB_SERIAL_CYBERJACK=m
-CONFIG_USB_SERIAL_XIRCOM=m
-CONFIG_USB_SERIAL_WWAN=m
-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_WISHBONE=m
-CONFIG_USB_SERIAL_ZTE=m
-CONFIG_USB_SERIAL_SSU100=m
-CONFIG_USB_SERIAL_QT2=m
-CONFIG_USB_SERIAL_FLASHLOADER=m
-CONFIG_USB_SERIAL_SUUNTO=m
-# CONFIG_USB_SERIAL_DEBUG is not set
-
-#
-# USB Miscellaneous drivers
-#
-CONFIG_USB_EMI62=m
-CONFIG_USB_EMI26=m
-CONFIG_USB_ADUTUX=m
-CONFIG_USB_SEVSEG=m
-CONFIG_USB_RIO500=m
-CONFIG_USB_LEGOTOWER=m
-CONFIG_USB_LCD=m
-CONFIG_USB_LED=m
-CONFIG_USB_CYPRESS_CY7C63=m
-CONFIG_USB_CYTHERM=m
-CONFIG_USB_IDMOUSE=m
-CONFIG_USB_FTDI_ELAN=m
-CONFIG_USB_APPLEDISPLAY=m
-CONFIG_USB_SISUSBVGA=m
-# CONFIG_USB_SISUSBVGA_CON is not set
-CONFIG_USB_LD=m
-CONFIG_USB_TRANCEVIBRATOR=m
-CONFIG_USB_IOWARRIOR=m
-CONFIG_USB_TEST=m
-CONFIG_USB_ISIGHTFW=m
-CONFIG_USB_YUREX=m
-CONFIG_USB_EZUSB_FX2=m
-CONFIG_USB_HSIC_USB3503=m
-CONFIG_USB_ATM=m
-CONFIG_USB_SPEEDTOUCH=m
-CONFIG_USB_CXACRU=m
-CONFIG_USB_UEAGLEATM=m
-CONFIG_USB_XUSBATM=m
-CONFIG_USB_PHY=y
-CONFIG_NOP_USB_XCEIV=m
-# CONFIG_OMAP_CONTROL_USB is not set
-# CONFIG_OMAP_USB3 is not set
-CONFIG_SAMSUNG_USBPHY=m
-CONFIG_SAMSUNG_USB2PHY=m
-CONFIG_SAMSUNG_USB3PHY=m
-# CONFIG_USB_GPIO_VBUS is not set
-CONFIG_USB_ISP1301=m
-CONFIG_USB_RCAR_PHY=m
-CONFIG_USB_GADGET=m
-# CONFIG_USB_GADGET_DEBUG is not set
-# CONFIG_USB_GADGET_DEBUG_FILES is not set
-# CONFIG_USB_GADGET_DEBUG_FS is not set
-CONFIG_USB_GADGET_VBUS_DRAW=2
-CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
-
-#
-# USB Peripheral Controller
-#
-CONFIG_USB_FUSB300=m
-CONFIG_USB_FOTG210_UDC=m
-CONFIG_USB_R8A66597=m
-CONFIG_USB_RENESAS_USBHS_UDC=m
-CONFIG_USB_PXA27X=m
-CONFIG_USB_MV_UDC=m
-CONFIG_USB_MV_U3D=m
-CONFIG_USB_M66592=m
-CONFIG_USB_AMD5536UDC=m
-CONFIG_USB_NET2272=m
-CONFIG_USB_NET2272_DMA=y
-CONFIG_USB_NET2280=m
-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_U_ETHER=m
-CONFIG_USB_U_RNDIS=m
-CONFIG_USB_F_SERIAL=m
-CONFIG_USB_F_OBEX=m
-CONFIG_USB_F_NCM=m
-CONFIG_USB_F_ECM=m
-CONFIG_USB_F_SUBSET=m
-CONFIG_USB_F_RNDIS=m
-# CONFIG_USB_CONFIGFS is not set
-# CONFIG_USB_ZERO is not set
-CONFIG_USB_AUDIO=m
-# CONFIG_GADGET_UAC1 is not set
-CONFIG_USB_ETH=m
-CONFIG_USB_ETH_RNDIS=y
-# CONFIG_USB_ETH_EEM is not set
-CONFIG_USB_G_NCM=m
-CONFIG_USB_GADGETFS=m
-CONFIG_USB_FUNCTIONFS=m
-CONFIG_USB_FUNCTIONFS_ETH=y
-CONFIG_USB_FUNCTIONFS_RNDIS=y
-CONFIG_USB_FUNCTIONFS_GENERIC=y
-CONFIG_USB_MASS_STORAGE=m
-CONFIG_USB_GADGET_TARGET=m
-CONFIG_USB_G_SERIAL=m
-CONFIG_USB_MIDI_GADGET=m
-CONFIG_USB_G_PRINTER=m
-# CONFIG_USB_CDC_COMPOSITE is not set
-# CONFIG_USB_G_NOKIA is not set
-# CONFIG_USB_G_ACM_MS is not set
-# CONFIG_USB_G_MULTI is not set
-CONFIG_USB_G_HID=m
-CONFIG_USB_G_DBGP=m
-# CONFIG_USB_G_DBGP_PRINTK is not set
-CONFIG_USB_G_DBGP_SERIAL=y
-CONFIG_USB_G_WEBCAM=m
-CONFIG_UWB=m
-CONFIG_UWB_HWA=m
-CONFIG_UWB_WHCI=m
-CONFIG_UWB_I1480U=m
-CONFIG_MMC=m
-# CONFIG_MMC_DEBUG is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
-# CONFIG_MMC_CLKGATE is not set
-
-#
-# MMC/SD/SDIO Card Drivers
-#
-CONFIG_MMC_BLOCK=m
-CONFIG_MMC_BLOCK_MINORS=8
-CONFIG_MMC_BLOCK_BOUNCE=y
-CONFIG_SDIO_UART=m
-# CONFIG_MMC_TEST is not set
-
-#
-# MMC/SD/SDIO Host Controller Drivers
-#
-CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_PCI=m
-CONFIG_MMC_RICOH_MMC=y
-CONFIG_MMC_SDHCI_ACPI=m
-CONFIG_MMC_SDHCI_PLTFM=m
-CONFIG_MMC_WBSD=m
-CONFIG_MMC_TIFM_SD=m
-CONFIG_MMC_SDRICOH_CS=m
-CONFIG_MMC_CB710=m
-CONFIG_MMC_VIA_SDMMC=m
-CONFIG_MMC_VUB300=m
-CONFIG_MMC_USHC=m
-CONFIG_MMC_REALTEK_PCI=m
-CONFIG_MEMSTICK=m
-# CONFIG_MEMSTICK_DEBUG is not set
-
-#
-# MemoryStick drivers
-#
-# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
-CONFIG_MSPRO_BLOCK=m
-
-#
-# MemoryStick Host Controller Drivers
-#
-CONFIG_MEMSTICK_TIFM_MS=m
-CONFIG_MEMSTICK_JMICRON_38X=m
-CONFIG_MEMSTICK_R592=m
-CONFIG_MEMSTICK_REALTEK_PCI=m
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-
-#
-# LED drivers
-#
-CONFIG_LEDS_LM3530=m
-CONFIG_LEDS_LM3533=m
-CONFIG_LEDS_LM3642=m
-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_LP5562=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
-CONFIG_LEDS_DELL_NETBOOKS=m
-CONFIG_LEDS_MC13783=m
-CONFIG_LEDS_TCA6507=m
-CONFIG_LEDS_LM355x=m
-CONFIG_LEDS_OT200=m
-CONFIG_LEDS_BLINKM=m
-
-#
-# LED Triggers
-#
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_ONESHOT=m
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
-CONFIG_LEDS_TRIGGER_BACKLIGHT=m
-# CONFIG_LEDS_TRIGGER_CPU is not set
-CONFIG_LEDS_TRIGGER_GPIO=m
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
-
-#
-# iptables trigger is under Netfilter config (LED target)
-#
-CONFIG_LEDS_TRIGGER_TRANSIENT=m
-CONFIG_LEDS_TRIGGER_CAMERA=m
-CONFIG_ACCESSIBILITY=y
-CONFIG_A11Y_BRAILLE_CONSOLE=y
-# CONFIG_INFINIBAND is not set
-CONFIG_EDAC=y
-CONFIG_EDAC_LEGACY_SYSFS=y
-# CONFIG_EDAC_DEBUG is not set
-CONFIG_EDAC_DECODE_MCE=m
-CONFIG_EDAC_MCE_INJ=m
-CONFIG_EDAC_MM_EDAC=m
-CONFIG_EDAC_AMD76X=m
-CONFIG_EDAC_E7XXX=m
-CONFIG_EDAC_E752X=m
-CONFIG_EDAC_I82875P=m
-CONFIG_EDAC_I82975X=m
-CONFIG_EDAC_I3000=m
-CONFIG_EDAC_I3200=m
-CONFIG_EDAC_X38=m
-CONFIG_EDAC_I5400=m
-CONFIG_EDAC_I7CORE=m
-CONFIG_EDAC_I82860=m
-CONFIG_EDAC_R82600=m
-CONFIG_EDAC_I5000=m
-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
-
-#
-# RTC interfaces
-#
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
-CONFIG_RTC_INTF_DEV_UIE_EMUL=y
-CONFIG_RTC_DRV_TEST=m
-
-#
-# I2C RTC drivers
-#
-CONFIG_RTC_DRV_DS1307=m
-CONFIG_RTC_DRV_DS1374=m
-CONFIG_RTC_DRV_DS1672=m
-CONFIG_RTC_DRV_DS3232=m
-CONFIG_RTC_DRV_MAX6900=m
-CONFIG_RTC_DRV_RS5C372=m
-CONFIG_RTC_DRV_ISL1208=m
-CONFIG_RTC_DRV_ISL12022=m
-CONFIG_RTC_DRV_X1205=m
-CONFIG_RTC_DRV_PCF2127=m
-CONFIG_RTC_DRV_PCF8523=m
-CONFIG_RTC_DRV_PCF8563=m
-CONFIG_RTC_DRV_PCF8583=m
-CONFIG_RTC_DRV_M41T80=m
-CONFIG_RTC_DRV_M41T80_WDT=y
-CONFIG_RTC_DRV_BQ32K=m
-CONFIG_RTC_DRV_S35390A=m
-CONFIG_RTC_DRV_FM3130=m
-CONFIG_RTC_DRV_RX8581=m
-CONFIG_RTC_DRV_RX8025=m
-CONFIG_RTC_DRV_EM3027=m
-CONFIG_RTC_DRV_RV3029C2=m
-
-#
-# SPI RTC drivers
-#
-# CONFIG_RTC_DRV_M41T93 is not set
-# CONFIG_RTC_DRV_M41T94 is not set
-# CONFIG_RTC_DRV_DS1305 is not set
-# CONFIG_RTC_DRV_DS1390 is not set
-# CONFIG_RTC_DRV_MAX6902 is not set
-# CONFIG_RTC_DRV_R9701 is not set
-# 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
-#
-CONFIG_RTC_DRV_CMOS=y
-CONFIG_RTC_DRV_DS1286=m
-CONFIG_RTC_DRV_DS1511=m
-CONFIG_RTC_DRV_DS1553=m
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_STK17TA8=m
-CONFIG_RTC_DRV_M48T86=m
-CONFIG_RTC_DRV_M48T35=m
-CONFIG_RTC_DRV_M48T59=m
-CONFIG_RTC_DRV_MSM6242=m
-CONFIG_RTC_DRV_BQ4802=m
-CONFIG_RTC_DRV_RP5C01=m
-CONFIG_RTC_DRV_V3020=m
-CONFIG_RTC_DRV_DS2404=m
-CONFIG_RTC_DRV_PCF50633=m
-
-#
-# on-CPU RTC drivers
-#
-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
-
-#
-# DMA Devices
-#
-CONFIG_INTEL_MID_DMAC=m
-CONFIG_INTEL_IOATDMA=m
-CONFIG_DW_DMAC_CORE=m
-CONFIG_DW_DMAC=m
-CONFIG_DW_DMAC_PCI=m
-CONFIG_TIMB_DMA=m
-CONFIG_PCH_DMA=m
-CONFIG_DMA_ENGINE=y
-CONFIG_DMA_ACPI=y
-CONFIG_DMA_OF=y
-
-#
-# DMA Clients
-#
-CONFIG_NET_DMA=y
-CONFIG_ASYNC_TX_DMA=y
-# CONFIG_DMATEST is not set
-CONFIG_DCA=m
-CONFIG_AUXDISPLAY=y
-CONFIG_KS0108=m
-CONFIG_KS0108_PORT=0x378
-CONFIG_KS0108_DELAY=2
-CONFIG_CFAG12864B=m
-CONFIG_CFAG12864B_RATE=20
-CONFIG_UIO=m
-CONFIG_UIO_CIF=m
-CONFIG_UIO_PDRV=m
-CONFIG_UIO_PDRV_GENIRQ=m
-# CONFIG_UIO_DMEM_GENIRQ is not set
-CONFIG_UIO_AEC=m
-CONFIG_UIO_SERCOS3=m
-CONFIG_UIO_PCI_GENERIC=m
-CONFIG_UIO_NETX=m
-CONFIG_VFIO_IOMMU_TYPE1=m
-CONFIG_VFIO=m
-CONFIG_VFIO_PCI=m
-CONFIG_VFIO_PCI_VGA=y
-CONFIG_VIRT_DRIVERS=y
-CONFIG_VIRTIO=y
-
-#
-# Virtio drivers
-#
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_BALLOON=m
-CONFIG_VIRTIO_MMIO=m
-CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
-
-#
-# Microsoft Hyper-V guest support
-#
-CONFIG_HYPERV=m
-CONFIG_HYPERV_UTILS=m
-CONFIG_HYPERV_BALLOON=m
-CONFIG_STAGING=y
-CONFIG_ET131X=m
-CONFIG_SLICOSS=m
-CONFIG_USBIP_CORE=m
-CONFIG_USBIP_VHCI_HCD=m
-CONFIG_USBIP_HOST=m
-# CONFIG_USBIP_DEBUG is not set
-CONFIG_W35UND=m
-CONFIG_PRISM2_USB=m
-CONFIG_ECHO=m
-CONFIG_COMEDI=m
-# CONFIG_COMEDI_DEBUG is not set
-CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048
-CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480
-CONFIG_COMEDI_MISC_DRIVERS=y
-CONFIG_COMEDI_KCOMEDILIB=m
-CONFIG_COMEDI_BOND=m
-CONFIG_COMEDI_TEST=m
-CONFIG_COMEDI_PARPORT=m
-CONFIG_COMEDI_SERIAL2002=m
-CONFIG_COMEDI_SKEL=m
-CONFIG_COMEDI_ISA_DRIVERS=y
-CONFIG_COMEDI_PCL711=m
-CONFIG_COMEDI_PCL724=m
-CONFIG_COMEDI_PCL726=m
-CONFIG_COMEDI_PCL730=m
-CONFIG_COMEDI_PCL812=m
-CONFIG_COMEDI_PCL816=m
-CONFIG_COMEDI_PCL818=m
-CONFIG_COMEDI_PCM3724=m
-CONFIG_COMEDI_AMPLC_DIO200_ISA=m
-CONFIG_COMEDI_AMPLC_PC236_ISA=m
-CONFIG_COMEDI_AMPLC_PC263_ISA=m
-CONFIG_COMEDI_RTI800=m
-CONFIG_COMEDI_RTI802=m
-CONFIG_COMEDI_DAS16M1=m
-CONFIG_COMEDI_DAS08_ISA=m
-CONFIG_COMEDI_DAS16=m
-CONFIG_COMEDI_DAS800=m
-CONFIG_COMEDI_DAS1800=m
-CONFIG_COMEDI_DAS6402=m
-CONFIG_COMEDI_DT2801=m
-CONFIG_COMEDI_DT2811=m
-CONFIG_COMEDI_DT2814=m
-CONFIG_COMEDI_DT2815=m
-CONFIG_COMEDI_DT2817=m
-CONFIG_COMEDI_DT282X=m
-CONFIG_COMEDI_DMM32AT=m
-CONFIG_COMEDI_FL512=m
-CONFIG_COMEDI_AIO_AIO12_8=m
-CONFIG_COMEDI_AIO_IIRO_16=m
-CONFIG_COMEDI_C6XDIGIO=m
-CONFIG_COMEDI_MPC624=m
-CONFIG_COMEDI_ADQ12B=m
-CONFIG_COMEDI_NI_AT_A2150=m
-CONFIG_COMEDI_NI_AT_AO=m
-CONFIG_COMEDI_NI_ATMIO=m
-CONFIG_COMEDI_NI_ATMIO16D=m
-CONFIG_COMEDI_NI_LABPC_ISA=m
-CONFIG_COMEDI_PCMAD=m
-CONFIG_COMEDI_PCMDA12=m
-CONFIG_COMEDI_PCMMIO=m
-CONFIG_COMEDI_PCMUIO=m
-CONFIG_COMEDI_MULTIQ3=m
-CONFIG_COMEDI_POC=m
-CONFIG_COMEDI_S526=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
-CONFIG_COMEDI_ADDI_APCI_1516=m
-CONFIG_COMEDI_ADDI_APCI_1564=m
-CONFIG_COMEDI_ADDI_APCI_16XX=m
-CONFIG_COMEDI_ADDI_APCI_2032=m
-CONFIG_COMEDI_ADDI_APCI_2200=m
-CONFIG_COMEDI_ADDI_APCI_3120=m
-CONFIG_COMEDI_ADDI_APCI_3501=m
-CONFIG_COMEDI_ADDI_APCI_3XXX=m
-CONFIG_COMEDI_ADL_PCI6208=m
-CONFIG_COMEDI_ADL_PCI7X3X=m
-CONFIG_COMEDI_ADL_PCI8164=m
-CONFIG_COMEDI_ADL_PCI9111=m
-CONFIG_COMEDI_ADL_PCI9118=m
-CONFIG_COMEDI_ADV_PCI1710=m
-CONFIG_COMEDI_ADV_PCI1723=m
-CONFIG_COMEDI_ADV_PCI1724=m
-CONFIG_COMEDI_ADV_PCI_DIO=m
-CONFIG_COMEDI_AMPLC_DIO200_PCI=m
-CONFIG_COMEDI_AMPLC_PC236_PCI=m
-CONFIG_COMEDI_AMPLC_PC263_PCI=m
-CONFIG_COMEDI_AMPLC_PCI224=m
-CONFIG_COMEDI_AMPLC_PCI230=m
-CONFIG_COMEDI_CONTEC_PCI_DIO=m
-CONFIG_COMEDI_DAS08_PCI=m
-CONFIG_COMEDI_DT3000=m
-CONFIG_COMEDI_DYNA_PCI10XX=m
-CONFIG_COMEDI_UNIOXX5=m
-CONFIG_COMEDI_GSC_HPDI=m
-CONFIG_COMEDI_ICP_MULTI=m
-CONFIG_COMEDI_II_PCI20KC=m
-CONFIG_COMEDI_DAQBOARD2000=m
-CONFIG_COMEDI_JR3_PCI=m
-CONFIG_COMEDI_KE_COUNTER=m
-CONFIG_COMEDI_CB_PCIDAS64=m
-CONFIG_COMEDI_CB_PCIDAS=m
-CONFIG_COMEDI_CB_PCIDDA=m
-# CONFIG_COMEDI_CB_PCIMDAS is not set
-CONFIG_COMEDI_CB_PCIMDDA=m
-CONFIG_COMEDI_ME4000=m
-CONFIG_COMEDI_ME_DAQ=m
-CONFIG_COMEDI_NI_6527=m
-CONFIG_COMEDI_NI_65XX=m
-CONFIG_COMEDI_NI_660X=m
-CONFIG_COMEDI_NI_670X=m
-CONFIG_COMEDI_NI_LABPC_PCI=m
-CONFIG_COMEDI_NI_PCIDIO=m
-CONFIG_COMEDI_NI_PCIMIO=m
-CONFIG_COMEDI_RTD520=m
-CONFIG_COMEDI_S626=m
-CONFIG_COMEDI_SSV_DNP=m
-CONFIG_COMEDI_MITE=m
-CONFIG_COMEDI_NI_TIOCMD=m
-CONFIG_COMEDI_PCMCIA_DRIVERS=y
-CONFIG_COMEDI_CB_DAS16_CS=m
-CONFIG_COMEDI_DAS08_CS=m
-CONFIG_COMEDI_NI_DAQ_700_CS=m
-CONFIG_COMEDI_NI_DAQ_DIO24_CS=m
-CONFIG_COMEDI_NI_LABPC_CS=m
-CONFIG_COMEDI_NI_MIO_CS=m
-CONFIG_COMEDI_QUATECH_DAQP_CS=m
-CONFIG_COMEDI_USB_DRIVERS=y
-CONFIG_COMEDI_DT9812=m
-CONFIG_COMEDI_USBDUX=m
-CONFIG_COMEDI_USBDUXFAST=m
-CONFIG_COMEDI_USBDUXSIGMA=m
-CONFIG_COMEDI_VMK80XX=m
-CONFIG_COMEDI_8255=m
-CONFIG_COMEDI_FC=m
-CONFIG_COMEDI_AMPLC_DIO200=m
-CONFIG_COMEDI_AMPLC_PC236=m
-CONFIG_COMEDI_DAS08=m
-CONFIG_COMEDI_NI_LABPC=m
-CONFIG_COMEDI_NI_TIO=m
-# CONFIG_FB_OLPC_DCON is not set
-CONFIG_ASUS_OLED=m
-# CONFIG_PANEL is not set
-CONFIG_R8187SE=m
-CONFIG_RTL8192U=m
-CONFIG_RTLLIB=m
-CONFIG_RTLLIB_CRYPTO_CCMP=m
-CONFIG_RTLLIB_CRYPTO_TKIP=m
-CONFIG_RTLLIB_CRYPTO_WEP=m
-CONFIG_RTL8192E=m
-CONFIG_R8712U=m
-CONFIG_RTS5139=m
-# CONFIG_RTS5139_DEBUG is not set
-# CONFIG_TRANZPORT is not set
-CONFIG_IDE_PHISON=m
-CONFIG_LINE6_USB=m
-# CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set
-CONFIG_USB_SERIAL_QUATECH2=m
-CONFIG_VT6655=m
-CONFIG_VT6656=m
-CONFIG_DX_SEP=m
-CONFIG_ZSMALLOC=y
-CONFIG_ZRAM=m
-# CONFIG_ZRAM_DEBUG is not set
-CONFIG_WLAGS49_H2=m
-CONFIG_WLAGS49_H25=m
-CONFIG_FB_SM7XX=m
-CONFIG_CRYSTALHD=m
-CONFIG_FB_XGI=m
-CONFIG_ACPI_QUICKSTART=m
-CONFIG_USB_ENESTORAGE=m
-CONFIG_BCM_WIMAX=m
-CONFIG_FT1000=m
-CONFIG_FT1000_USB=m
-CONFIG_FT1000_PCMCIA=m
-
-#
-# Speakup console speech
-#
-CONFIG_SPEAKUP=m
-CONFIG_SPEAKUP_SYNTH_ACNTSA=m
-CONFIG_SPEAKUP_SYNTH_ACNTPC=m
-CONFIG_SPEAKUP_SYNTH_APOLLO=m
-CONFIG_SPEAKUP_SYNTH_AUDPTR=m
-CONFIG_SPEAKUP_SYNTH_BNS=m
-CONFIG_SPEAKUP_SYNTH_DECTLK=m
-CONFIG_SPEAKUP_SYNTH_DECEXT=m
-CONFIG_SPEAKUP_SYNTH_DECPC=m
-CONFIG_SPEAKUP_SYNTH_DTLK=m
-CONFIG_SPEAKUP_SYNTH_KEYPC=m
-CONFIG_SPEAKUP_SYNTH_LTLK=m
-CONFIG_SPEAKUP_SYNTH_SOFT=m
-CONFIG_SPEAKUP_SYNTH_SPKOUT=m
-CONFIG_SPEAKUP_SYNTH_TXPRT=m
-CONFIG_SPEAKUP_SYNTH_DUMMY=m
-CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
-CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
-CONFIG_STAGING_MEDIA=y
-CONFIG_DVB_AS102=m
-CONFIG_DVB_CXD2099=m
-CONFIG_VIDEO_DT3155=m
-CONFIG_DT3155_CCIR=y
-CONFIG_DT3155_STREAMING=y
-CONFIG_VIDEO_GO7007=m
-CONFIG_VIDEO_GO7007_USB=m
-CONFIG_VIDEO_GO7007_LOADER=m
-# CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set
-CONFIG_SOLO6X10=m
-CONFIG_LIRC_STAGING=y
-CONFIG_LIRC_BT829=m
-CONFIG_LIRC_IGORPLUGUSB=m
-CONFIG_LIRC_IMON=m
-CONFIG_LIRC_PARALLEL=m
-CONFIG_LIRC_SASEM=m
-CONFIG_LIRC_SERIAL=m
-CONFIG_LIRC_SERIAL_TRANSMITTER=y
-CONFIG_LIRC_SIR=m
-CONFIG_LIRC_ZILOG=m
-
-#
-# Android
-#
-# CONFIG_ANDROID is not set
-CONFIG_USB_WPAN_HCD=m
-CONFIG_WIMAX_GDM72XX=m
-CONFIG_WIMAX_GDM72XX_QOS=y
-CONFIG_WIMAX_GDM72XX_K_MODE=y
-CONFIG_WIMAX_GDM72XX_WIMAX2=y
-CONFIG_WIMAX_GDM72XX_USB=y
-# CONFIG_WIMAX_GDM72XX_SDIO is not set
-CONFIG_WIMAX_GDM72XX_USB_PM=y
-CONFIG_NET_VENDOR_SILICOM=y
-CONFIG_SBYPASS=m
-CONFIG_BPCTL=m
-CONFIG_CED1401=m
-CONFIG_DGRP=m
-CONFIG_FIREWIRE_SERIAL=m
-CONFIG_ZCACHE=m
-# CONFIG_ZCACHE_DEBUG is not set
-# CONFIG_USB_DWC2 is not set
-CONFIG_USB_BTMTK=m
-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
-CONFIG_FUJITSU_LAPTOP=m
-# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
-CONFIG_FUJITSU_TABLET=m
-CONFIG_AMILO_RFKILL=m
-CONFIG_TC1100_WMI=m
-CONFIG_HP_ACCEL=m
-CONFIG_HP_WMI=m
-CONFIG_MSI_LAPTOP=m
-CONFIG_PANASONIC_LAPTOP=m
-CONFIG_COMPAL_LAPTOP=m
-CONFIG_SONY_LAPTOP=m
-# CONFIG_SONYPI_COMPAT is not set
-CONFIG_IDEAPAD_LAPTOP=m
-CONFIG_THINKPAD_ACPI=m
-CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
-# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
-# CONFIG_THINKPAD_ACPI_DEBUG is not set
-# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
-CONFIG_THINKPAD_ACPI_VIDEO=y
-CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
-CONFIG_SENSORS_HDAPS=m
-CONFIG_INTEL_MENLOW=m
-CONFIG_EEEPC_LAPTOP=m
-CONFIG_ASUS_WMI=m
-CONFIG_ASUS_NB_WMI=m
-CONFIG_EEEPC_WMI=m
-CONFIG_ACPI_WMI=m
-CONFIG_MSI_WMI=m
-CONFIG_TOPSTAR_LAPTOP=m
-CONFIG_ACPI_TOSHIBA=m
-CONFIG_TOSHIBA_BT_RFKILL=m
-CONFIG_ACPI_CMPC=m
-CONFIG_INTEL_IPS=m
-CONFIG_IBM_RTL=m
-CONFIG_XO1_RFKILL=m
-CONFIG_XO15_EBOOK=m
-CONFIG_SAMSUNG_LAPTOP=m
-CONFIG_MXM_WMI=m
-CONFIG_INTEL_OAKTRAIL=m
-CONFIG_SAMSUNG_Q10=m
-CONFIG_APPLE_GMUX=m
-CONFIG_INTEL_RST=y
-CONFIG_INTEL_SMARTCONNECT=y
-CONFIG_PVPANIC=m
-
-#
-# Hardware Spinlock drivers
-#
-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
-CONFIG_DMAR_TABLE=y
-CONFIG_INTEL_IOMMU=y
-# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
-CONFIG_INTEL_IOMMU_FLOPPY_WA=y
-
-#
-# Remoteproc drivers
-#
-CONFIG_REMOTEPROC=m
-CONFIG_STE_MODEM_RPROC=m
-
-#
-# Rpmsg drivers
-#
-# CONFIG_PM_DEVFREQ is not set
-CONFIG_EXTCON=m
-
-#
-# Extcon Device Drivers
-#
-CONFIG_EXTCON_GPIO=m
-CONFIG_MEMORY=y
-# CONFIG_IIO is not set
-# CONFIG_VME_BUS is not set
-CONFIG_PWM=y
-CONFIG_PWM_SYSFS=y
-# CONFIG_PWM_PCA9685 is not set
-CONFIG_IRQCHIP=y
-CONFIG_IPACK_BUS=m
-CONFIG_BOARD_TPCI200=m
-CONFIG_SERIAL_IPOCTAL=m
-# CONFIG_RESET_CONTROLLER is not set
-CONFIG_FMC=m
-CONFIG_FMC_FAKEDEV=m
-CONFIG_FMC_TRIVIAL=m
-CONFIG_FMC_WRITE_EEPROM=m
-CONFIG_FMC_CHARDEV=m
-
-#
-# Firmware Drivers
-#
-CONFIG_EDD=m
-# CONFIG_EDD_OFF is not set
-CONFIG_FIRMWARE_MEMMAP=y
-CONFIG_DELL_RBU=m
-CONFIG_DCDBAS=m
-CONFIG_DMIID=y
-CONFIG_DMI_SYSFS=m
-CONFIG_ISCSI_IBFT_FIND=y
-CONFIG_ISCSI_IBFT=m
-# CONFIG_GOOGLE_FIRMWARE is not set
-
-#
-# EFI (Extensible Firmware Interface) Support
-#
-CONFIG_EFI_VARS=m
-CONFIG_EFI_VARS_PSTORE=m
-CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
-
-#
-# File systems
-#
-CONFIG_DCACHE_WORD_ACCESS=y
-# CONFIG_EXT2_FS is not set
-# CONFIG_EXT3_FS is not set
-CONFIG_EXT4_FS=m
-CONFIG_EXT4_USE_FOR_EXT23=y
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-# CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD2=m
-# CONFIG_JBD2_DEBUG is not set
-CONFIG_FS_MBCACHE=m
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
-CONFIG_REISERFS_PROC_INFO=y
-CONFIG_REISERFS_FS_XATTR=y
-CONFIG_REISERFS_FS_POSIX_ACL=y
-CONFIG_REISERFS_FS_SECURITY=y
-CONFIG_JFS_FS=m
-CONFIG_JFS_POSIX_ACL=y
-CONFIG_JFS_SECURITY=y
-# CONFIG_JFS_DEBUG is not set
-CONFIG_JFS_STATISTICS=y
-CONFIG_XFS_FS=m
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_POSIX_ACL=y
-CONFIG_XFS_RT=y
-# CONFIG_XFS_WARN is not set
-# CONFIG_XFS_DEBUG is not set
-CONFIG_GFS2_FS=m
-CONFIG_GFS2_FS_LOCKING_DLM=y
-CONFIG_OCFS2_FS=m
-CONFIG_OCFS2_FS_O2CB=m
-CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
-CONFIG_OCFS2_FS_STATS=y
-# CONFIG_OCFS2_DEBUG_MASKLOG is not set
-# CONFIG_OCFS2_DEBUG_FS is not set
-CONFIG_BTRFS_FS=m
-CONFIG_BTRFS_FS_POSIX_ACL=y
-# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
-# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-# CONFIG_BTRFS_DEBUG is not set
-CONFIG_NILFS2_FS=m
-CONFIG_FS_POSIX_ACL=y
-CONFIG_EXPORTFS=y
-CONFIG_FILE_LOCKING=y
-CONFIG_FSNOTIFY=y
-CONFIG_DNOTIFY=y
-CONFIG_INOTIFY_USER=y
-CONFIG_FANOTIFY=y
-CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
-CONFIG_QUOTA=y
-CONFIG_QUOTA_NETLINK_INTERFACE=y
-# CONFIG_PRINT_QUOTA_WARNING is not set
-# CONFIG_QUOTA_DEBUG is not set
-CONFIG_QUOTA_TREE=m
-CONFIG_QFMT_V1=m
-CONFIG_QFMT_V2=m
-CONFIG_QUOTACTL=y
-CONFIG_AUTOFS4_FS=y
-CONFIG_FUSE_FS=m
-CONFIG_CUSE=m
-CONFIG_GENERIC_ACL=y
-
-#
-# Caches
-#
-CONFIG_FSCACHE=m
-CONFIG_FSCACHE_STATS=y
-CONFIG_FSCACHE_HISTOGRAM=y
-# CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_OBJECT_LIST is not set
-CONFIG_CACHEFILES=m
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
-
-#
-# CD-ROM/DVD Filesystems
-#
-CONFIG_ISO9660_FS=m
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_UDF_FS=m
-CONFIG_UDF_NLS=y
-
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-CONFIG_NTFS_FS=m
-# CONFIG_NTFS_DEBUG is not set
-CONFIG_NTFS_RW=y
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_PROC_SYSCTL=y
-CONFIG_PROC_PAGE_MONITOR=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_TMPFS_XATTR=y
-CONFIG_HUGETLBFS=y
-CONFIG_HUGETLB_PAGE=y
-CONFIG_CONFIGFS_FS=y
-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
-# CONFIG_BEFS_DEBUG is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-CONFIG_JFFS2_FS=m
-CONFIG_JFFS2_FS_DEBUG=0
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-# CONFIG_JFFS2_SUMMARY is not set
-# CONFIG_JFFS2_FS_XATTR is not set
-# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-CONFIG_JFFS2_ZLIB=y
-# CONFIG_JFFS2_LZO is not set
-CONFIG_JFFS2_RTIME=y
-# CONFIG_JFFS2_RUBIN is not set
-CONFIG_UBIFS_FS=m
-# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
-CONFIG_LOGFS=m
-CONFIG_CRAMFS=m
-CONFIG_SQUASHFS=m
-CONFIG_SQUASHFS_XATTR=y
-CONFIG_SQUASHFS_ZLIB=y
-CONFIG_SQUASHFS_LZO=y
-CONFIG_SQUASHFS_XZ=y
-# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
-# CONFIG_SQUASHFS_EMBEDDED is not set
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-# CONFIG_VXFS_FS is not set
-CONFIG_MINIX_FS=m
-CONFIG_OMFS_FS=m
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_QNX6FS_FS is not set
-# CONFIG_ROMFS_FS is not set
-CONFIG_PSTORE=y
-# CONFIG_PSTORE_CONSOLE is not set
-# CONFIG_PSTORE_FTRACE is not set
-CONFIG_PSTORE_RAM=m
-# CONFIG_SYSV_FS is not set
-CONFIG_UFS_FS=m
-# CONFIG_UFS_FS_WRITE is not set
-# CONFIG_UFS_DEBUG is not set
-CONFIG_EXOFS_FS=m
-# CONFIG_EXOFS_DEBUG is not set
-CONFIG_F2FS_FS=m
-CONFIG_F2FS_STAT_FS=y
-CONFIG_F2FS_FS_XATTR=y
-CONFIG_F2FS_FS_POSIX_ACL=y
-CONFIG_F2FS_FS_SECURITY=y
-CONFIG_EFIVAR_FS=y
-CONFIG_ORE=m
-CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_NFS_FS=m
-CONFIG_NFS_V2=m
-CONFIG_NFS_V3=m
-CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=m
-CONFIG_NFS_SWAP=y
-CONFIG_NFS_V4_1=y
-CONFIG_NFS_V4_2=y
-CONFIG_PNFS_FILE_LAYOUT=m
-CONFIG_PNFS_BLOCK=m
-CONFIG_PNFS_OBJLAYOUT=m
-CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org"
-CONFIG_NFS_V4_SECURITY_LABEL=y
-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
-CONFIG_NFSD_V3_ACL=y
-CONFIG_NFSD_V4=y
-CONFIG_NFSD_V4_SECURITY_LABEL=y
-# CONFIG_NFSD_FAULT_INJECTION is not set
-CONFIG_LOCKD=m
-CONFIG_LOCKD_V4=y
-CONFIG_NFS_ACL_SUPPORT=m
-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
-CONFIG_CIFS=m
-CONFIG_CIFS_STATS=y
-# CONFIG_CIFS_STATS2 is not set
-CONFIG_CIFS_WEAK_PW_HASH=y
-CONFIG_CIFS_UPCALL=y
-CONFIG_CIFS_XATTR=y
-CONFIG_CIFS_POSIX=y
-CONFIG_CIFS_ACL=y
-# CONFIG_CIFS_DEBUG is not set
-CONFIG_CIFS_DFS_UPCALL=y
-CONFIG_CIFS_SMB2=y
-CONFIG_CIFS_FSCACHE=y
-CONFIG_NCP_FS=m
-# CONFIG_NCPFS_PACKET_SIGNING is not set
-# CONFIG_NCPFS_IOCTL_LOCKING is not set
-# CONFIG_NCPFS_STRONG is not set
-CONFIG_NCPFS_NFS_NS=y
-CONFIG_NCPFS_OS2_NS=y
-CONFIG_NCPFS_SMALLDOS=y
-CONFIG_NCPFS_NLS=y
-# CONFIG_NCPFS_EXTRAS is not set
-CONFIG_CODA_FS=m
-CONFIG_AFS_FS=m
-# CONFIG_AFS_DEBUG is not set
-CONFIG_AFS_FSCACHE=y
-CONFIG_9P_FS=m
-CONFIG_9P_FSCACHE=y
-CONFIG_9P_FS_POSIX_ACL=y
-CONFIG_9P_FS_SECURITY=y
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_737=m
-CONFIG_NLS_CODEPAGE_775=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_852=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_857=m
-CONFIG_NLS_CODEPAGE_860=m
-CONFIG_NLS_CODEPAGE_861=m
-CONFIG_NLS_CODEPAGE_862=m
-CONFIG_NLS_CODEPAGE_863=m
-CONFIG_NLS_CODEPAGE_864=m
-CONFIG_NLS_CODEPAGE_865=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_CODEPAGE_869=m
-CONFIG_NLS_CODEPAGE_936=m
-CONFIG_NLS_CODEPAGE_950=m
-CONFIG_NLS_CODEPAGE_932=m
-CONFIG_NLS_CODEPAGE_949=m
-CONFIG_NLS_CODEPAGE_874=m
-CONFIG_NLS_ISO8859_8=m
-CONFIG_NLS_CODEPAGE_1250=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_ASCII=m
-CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_ISO8859_2=m
-CONFIG_NLS_ISO8859_3=m
-CONFIG_NLS_ISO8859_4=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_ISO8859_6=m
-CONFIG_NLS_ISO8859_7=m
-CONFIG_NLS_ISO8859_9=m
-CONFIG_NLS_ISO8859_13=m
-CONFIG_NLS_ISO8859_14=m
-CONFIG_NLS_ISO8859_15=m
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_MAC_ROMAN=m
-CONFIG_NLS_MAC_CELTIC=m
-CONFIG_NLS_MAC_CENTEURO=m
-CONFIG_NLS_MAC_CROATIAN=m
-CONFIG_NLS_MAC_CYRILLIC=m
-CONFIG_NLS_MAC_GAELIC=m
-CONFIG_NLS_MAC_GREEK=m
-CONFIG_NLS_MAC_ICELAND=m
-CONFIG_NLS_MAC_INUIT=m
-CONFIG_NLS_MAC_ROMANIAN=m
-CONFIG_NLS_MAC_TURKISH=m
-CONFIG_NLS_UTF8=m
-CONFIG_DLM=m
-# CONFIG_DLM_DEBUG is not set
-
-#
-# Kernel hacking
-#
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-
-#
-# printk and dmesg options
-#
-CONFIG_PRINTK_TIME=y
-CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
-# CONFIG_BOOT_PRINTK_DELAY is not set
-CONFIG_DYNAMIC_DEBUG=y
-
-#
-# Compile-time checks and compiler options
-#
-# CONFIG_DEBUG_INFO is not set
-CONFIG_ENABLE_WARN_DEPRECATED=y
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_FRAME_WARN=1024
-CONFIG_STRIP_ASM_SYMS=y
-# CONFIG_READABLE_ASM is not set
-CONFIG_UNUSED_SYMBOLS=y
-CONFIG_DEBUG_FS=y
-# CONFIG_HEADERS_CHECK is not set
-# CONFIG_DEBUG_SECTION_MISMATCH is not set
-CONFIG_ARCH_WANT_FRAME_POINTERS=y
-CONFIG_FRAME_POINTER=y
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_DEBUG_KERNEL=y
-
-#
-# Memory Debugging
-#
-# CONFIG_DEBUG_PAGEALLOC is not set
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_SLUB_DEBUG_ON is not set
-# CONFIG_SLUB_STATS is not set
-CONFIG_HAVE_DEBUG_KMEMLEAK=y
-# CONFIG_DEBUG_KMEMLEAK is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_VIRTUAL is not set
-CONFIG_DEBUG_MEMORY_INIT=y
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-# CONFIG_DEBUG_HIGHMEM is not set
-CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
-# CONFIG_DEBUG_STACKOVERFLOW is not set
-CONFIG_HAVE_ARCH_KMEMCHECK=y
-# CONFIG_DEBUG_SHIRQ is not set
-
-#
-# Debug Lockups and Hangs
-#
-CONFIG_LOCKUP_DETECTOR=y
-CONFIG_HARDLOCKUP_DETECTOR=y
-# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
-CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
-# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
-CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
-CONFIG_DETECT_HUNG_TASK=y
-CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
-# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
-CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
-# CONFIG_PANIC_ON_OOPS is not set
-CONFIG_PANIC_ON_OOPS_VALUE=0
-CONFIG_SCHED_DEBUG=y
-CONFIG_SCHEDSTATS=y
-CONFIG_TIMER_STATS=y
-# CONFIG_DEBUG_PREEMPT is not set
-
-#
-# Lock Debugging (spinlocks, mutexes, etc...)
-#
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_RT_MUTEX_TESTER is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-CONFIG_DEBUG_MUTEXES=y
-# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_ATOMIC_SLEEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-CONFIG_STACKTRACE=y
-# CONFIG_DEBUG_KOBJECT is not set
-CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_DEBUG_WRITECOUNT is not set
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-# CONFIG_DEBUG_CREDENTIALS 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
-# CONFIG_RCU_CPU_STALL_INFO is not set
-# CONFIG_RCU_TRACE is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_NOTIFIER_ERROR_INJECTION is not set
-# CONFIG_FAULT_INJECTION is not set
-# CONFIG_LATENCYTOP is not set
-CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y
-# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
-CONFIG_USER_STACKTRACE_SUPPORT=y
-CONFIG_NOP_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-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
-CONFIG_TRACER_MAX_TRACE=y
-CONFIG_TRACE_CLOCK=y
-CONFIG_RING_BUFFER=y
-CONFIG_EVENT_TRACING=y
-CONFIG_CONTEXT_SWITCH_TRACER=y
-CONFIG_RING_BUFFER_ALLOW_SWAP=y
-CONFIG_TRACING=y
-CONFIG_GENERIC_TRACER=y
-CONFIG_TRACING_SUPPORT=y
-CONFIG_FTRACE=y
-CONFIG_FUNCTION_TRACER=y
-CONFIG_FUNCTION_GRAPH_TRACER=y
-# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_PREEMPT_TRACER is not set
-CONFIG_SCHED_TRACER=y
-CONFIG_FTRACE_SYSCALLS=y
-CONFIG_TRACER_SNAPSHOT=y
-# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
-CONFIG_BRANCH_PROFILE_NONE=y
-# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
-# CONFIG_PROFILE_ALL_BRANCHES is not set
-CONFIG_STACK_TRACER=y
-CONFIG_BLK_DEV_IO_TRACE=y
-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
-CONFIG_MMIOTRACE=y
-# CONFIG_MMIOTRACE_TEST is not set
-CONFIG_RING_BUFFER_BENCHMARK=m
-# CONFIG_RING_BUFFER_STARTUP_TEST is not set
-
-#
-# Runtime Testing
-#
-CONFIG_LKDTM=m
-# CONFIG_TEST_LIST_SORT is not set
-# CONFIG_KPROBES_SANITY_TEST is not set
-# CONFIG_BACKTRACE_SELF_TEST is not set
-# CONFIG_RBTREE_TEST is not set
-# CONFIG_INTERVAL_TREE_TEST is not set
-# CONFIG_ATOMIC64_SELFTEST is not set
-CONFIG_ASYNC_RAID6_TEST=m
-# CONFIG_TEST_STRING_HELPERS is not set
-CONFIG_TEST_KSTRTOX=m
-# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
-# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
-# CONFIG_DMA_API_DEBUG is not set
-# CONFIG_SAMPLES is not set
-CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_KGDB is not set
-CONFIG_STRICT_DEVMEM=y
-CONFIG_X86_VERBOSE_BOOTUP=y
-CONFIG_EARLY_PRINTK=y
-# CONFIG_EARLY_PRINTK_DBGP is not set
-# CONFIG_X86_PTDUMP is not set
-CONFIG_DEBUG_RODATA=y
-# CONFIG_DEBUG_RODATA_TEST is not set
-# CONFIG_DEBUG_SET_MODULE_RONX is not set
-# CONFIG_DEBUG_NX_TEST is not set
-CONFIG_DOUBLEFAULT=y
-# CONFIG_DEBUG_TLBFLUSH is not set
-# CONFIG_IOMMU_STRESS is not set
-CONFIG_HAVE_MMIOTRACE_SUPPORT=y
-# CONFIG_X86_DECODER_SELFTEST is not set
-CONFIG_IO_DELAY_TYPE_0X80=0
-CONFIG_IO_DELAY_TYPE_0XED=1
-CONFIG_IO_DELAY_TYPE_UDELAY=2
-CONFIG_IO_DELAY_TYPE_NONE=3
-CONFIG_IO_DELAY_0X80=y
-# CONFIG_IO_DELAY_0XED is not set
-# CONFIG_IO_DELAY_UDELAY is not set
-# CONFIG_IO_DELAY_NONE is not set
-CONFIG_DEFAULT_IO_DELAY_TYPE=0
-# CONFIG_DEBUG_BOOT_PARAMS is not set
-# CONFIG_CPA_DEBUG is not set
-# CONFIG_OPTIMIZE_INLINING is not set
-# CONFIG_DEBUG_NMI_SELFTEST is not set
-# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set
-
-#
-# Security options
-#
-CONFIG_KEYS=y
-CONFIG_TRUSTED_KEYS=m
-CONFIG_ENCRYPTED_KEYS=m
-# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
-# CONFIG_SECURITY_DMESG_RESTRICT is not set
-CONFIG_SECURITY=y
-CONFIG_SECURITYFS=y
-CONFIG_SECURITY_NETWORK=y
-# CONFIG_SECURITY_NETWORK_XFRM is not set
-CONFIG_SECURITY_PATH=y
-# CONFIG_INTEL_TXT is not set
-# CONFIG_SECURITY_SELINUX is not set
-# CONFIG_SECURITY_SMACK is not set
-CONFIG_SECURITY_TOMOYO=y
-CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
-CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
-# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
-CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/usr/bin/tomoyo-init"
-CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd"
-CONFIG_SECURITY_APPARMOR=y
-CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0
-# CONFIG_SECURITY_YAMA is not set
-# CONFIG_IMA is not set
-# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
-# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_DEFAULT_SECURITY=""
-CONFIG_XOR_BLOCKS=m
-CONFIG_ASYNC_CORE=m
-CONFIG_ASYNC_MEMCPY=m
-CONFIG_ASYNC_XOR=m
-CONFIG_ASYNC_PQ=m
-CONFIG_ASYNC_RAID6_RECOV=m
-CONFIG_CRYPTO=y
-
-#
-# Crypto core or helper
-#
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_AEAD=m
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_BLKCIPHER=m
-CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_HASH=m
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_RNG=m
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_PCOMP=m
-CONFIG_CRYPTO_PCOMP2=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_USER=m
-CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
-CONFIG_CRYPTO_GF128MUL=m
-CONFIG_CRYPTO_NULL=m
-CONFIG_CRYPTO_PCRYPT=m
-CONFIG_CRYPTO_WORKQUEUE=y
-CONFIG_CRYPTO_CRYPTD=m
-CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_ABLK_HELPER_X86=m
-CONFIG_CRYPTO_GLUE_HELPER_X86=m
-
-#
-# Authenticated Encryption with Associated Data
-#
-CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_GCM=m
-CONFIG_CRYPTO_SEQIV=m
-
-#
-# Block modes
-#
-CONFIG_CRYPTO_CBC=m
-CONFIG_CRYPTO_CTR=m
-CONFIG_CRYPTO_CTS=m
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_LRW=m
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_XTS=m
-
-#
-# Hash modes
-#
-CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_HMAC=m
-CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_VMAC=m
-
-#
-# Digest
-#
-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
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_RMD128=m
-CONFIG_CRYPTO_RMD160=m
-CONFIG_CRYPTO_RMD256=m
-CONFIG_CRYPTO_RMD320=m
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_SHA256=m
-CONFIG_CRYPTO_SHA512=m
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_WP512=m
-
-#
-# Ciphers
-#
-CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_AES_586=m
-CONFIG_CRYPTO_AES_NI_INTEL=m
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_BLOWFISH_COMMON=m
-CONFIG_CRYPTO_CAMELLIA=m
-CONFIG_CRYPTO_CAST_COMMON=m
-CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_FCRYPT=m
-CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_SALSA20=m
-CONFIG_CRYPTO_SALSA20_586=m
-CONFIG_CRYPTO_SEED=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_SERPENT_SSE2_586=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-CONFIG_CRYPTO_TWOFISH_586=m
-
-#
-# Compression
-#
-CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_ZLIB=m
-CONFIG_CRYPTO_LZO=y
-CONFIG_CRYPTO_LZ4=m
-CONFIG_CRYPTO_LZ4HC=m
-
-#
-# Random Number Generation
-#
-CONFIG_CRYPTO_ANSI_CPRNG=m
-CONFIG_CRYPTO_USER_API=m
-CONFIG_CRYPTO_USER_API_HASH=m
-CONFIG_CRYPTO_USER_API_SKCIPHER=m
-CONFIG_CRYPTO_HW=y
-CONFIG_CRYPTO_DEV_PADLOCK=m
-CONFIG_CRYPTO_DEV_PADLOCK_AES=m
-CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
-CONFIG_CRYPTO_DEV_GEODE=m
-CONFIG_CRYPTO_DEV_HIFN_795X=m
-CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
-CONFIG_ASYMMETRIC_KEY_TYPE=m
-CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m
-CONFIG_PUBLIC_KEY_ALGO_RSA=m
-CONFIG_X509_CERTIFICATE_PARSER=m
-CONFIG_HAVE_KVM=y
-CONFIG_HAVE_KVM_IRQCHIP=y
-CONFIG_HAVE_KVM_IRQ_ROUTING=y
-CONFIG_HAVE_KVM_EVENTFD=y
-CONFIG_KVM_APIC_ARCHITECTURE=y
-CONFIG_KVM_MMIO=y
-CONFIG_KVM_ASYNC_PF=y
-CONFIG_HAVE_KVM_MSI=y
-CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
-CONFIG_VIRTUALIZATION=y
-CONFIG_KVM=m
-CONFIG_KVM_INTEL=m
-CONFIG_KVM_AMD=m
-CONFIG_KVM_MMU_AUDIT=y
-CONFIG_KVM_DEVICE_ASSIGNMENT=y
-CONFIG_LGUEST=m
-CONFIG_BINARY_PRINTF=y
-
-#
-# Library routines
-#
-CONFIG_RAID6_PQ=m
-CONFIG_BITREVERSE=y
-CONFIG_GENERIC_STRNCPY_FROM_USER=y
-CONFIG_GENERIC_STRNLEN_USER=y
-CONFIG_GENERIC_NET_UTILS=y
-CONFIG_GENERIC_FIND_FIRST_BIT=y
-CONFIG_GENERIC_PCI_IOMAP=y
-CONFIG_GENERIC_IOMAP=y
-CONFIG_GENERIC_IO=y
-CONFIG_PERCPU_RWSEM=y
-CONFIG_CRC_CCITT=m
-CONFIG_CRC16=m
-CONFIG_CRC_T10DIF=m
-CONFIG_CRC_ITU_T=m
-CONFIG_CRC32=y
-# CONFIG_CRC32_SELFTEST is not set
-CONFIG_CRC32_SLICEBY8=y
-# CONFIG_CRC32_SLICEBY4 is not set
-# CONFIG_CRC32_SARWATE is not set
-# CONFIG_CRC32_BIT is not set
-CONFIG_CRC7=m
-CONFIG_LIBCRC32C=m
-CONFIG_CRC8=m
-CONFIG_AUDIT_GENERIC=y
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=m
-CONFIG_LZO_COMPRESS=y
-CONFIG_LZO_DECOMPRESS=y
-CONFIG_LZ4_COMPRESS=m
-CONFIG_LZ4HC_COMPRESS=m
-CONFIG_LZ4_DECOMPRESS=y
-CONFIG_XZ_DEC=y
-CONFIG_XZ_DEC_X86=y
-CONFIG_XZ_DEC_POWERPC=y
-CONFIG_XZ_DEC_IA64=y
-CONFIG_XZ_DEC_ARM=y
-CONFIG_XZ_DEC_ARMTHUMB=y
-CONFIG_XZ_DEC_SPARC=y
-CONFIG_XZ_DEC_BCJ=y
-# CONFIG_XZ_DEC_TEST is not set
-CONFIG_DECOMPRESS_GZIP=y
-CONFIG_DECOMPRESS_BZIP2=y
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DECOMPRESS_XZ=y
-CONFIG_DECOMPRESS_LZO=y
-CONFIG_DECOMPRESS_LZ4=y
-CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_REED_SOLOMON=m
-CONFIG_REED_SOLOMON_ENC8=y
-CONFIG_REED_SOLOMON_DEC8=y
-CONFIG_REED_SOLOMON_DEC16=y
-CONFIG_BCH=m
-CONFIG_BCH_CONST_PARAMS=y
-CONFIG_TEXTSEARCH=y
-CONFIG_TEXTSEARCH_KMP=m
-CONFIG_TEXTSEARCH_BM=m
-CONFIG_TEXTSEARCH_FSM=m
-CONFIG_BTREE=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAS_DMA=y
-CONFIG_CHECK_SIGNATURE=y
-CONFIG_CPU_RMAP=y
-CONFIG_DQL=y
-CONFIG_NLATTR=y
-CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
-CONFIG_LRU_CACHE=m
-CONFIG_AVERAGE=y
-CONFIG_CLZ_TAB=y
-CONFIG_CORDIC=m
-CONFIG_DDR=y
-CONFIG_MPILIB=m
-CONFIG_OID_REGISTRY=m
-CONFIG_UCS2_STRING=y
-CONFIG_FONT_SUPPORT=y
-CONFIG_FONTS=y
-# CONFIG_FONT_8x8 is not set
-CONFIG_FONT_8x16=y
-# CONFIG_FONT_6x11 is not set
-# CONFIG_FONT_7x14 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_ACORN_8x8 is not set
-# CONFIG_FONT_MINI_4x6 is not set
-# CONFIG_FONT_SUN8x16 is not set
-# CONFIG_FONT_SUN12x22 is not set
-# CONFIG_FONT_10x18 is not set
-CONFIG_FONT_AUTOSELECT=y
diff --git a/libre-testing/linux-libre/config.x86_64 b/libre-testing/linux-libre/config.x86_64
deleted file mode 100644
index 707d093aa..000000000
--- a/libre-testing/linux-libre/config.x86_64
+++ /dev/null
@@ -1,6242 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.11.0-1 Kernel Configuration
-#
-CONFIG_64BIT=y
-CONFIG_X86_64=y
-CONFIG_X86=y
-CONFIG_INSTRUCTION_DECODER=y
-CONFIG_OUTPUT_FORMAT="elf64-x86-64"
-CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_MMU=y
-CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_NEED_SG_DMA_LENGTH=y
-CONFIG_GENERIC_ISA_DMA=y
-CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_ARCH_HAS_CPU_RELAX=y
-CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
-CONFIG_ARCH_HAS_CPU_AUTOPROBE=y
-CONFIG_HAVE_SETUP_PER_CPU_AREA=y
-CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
-CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
-CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
-CONFIG_ZONE_DMA32=y
-CONFIG_AUDIT_ARCH=y
-CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
-CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
-CONFIG_HAVE_INTEL_TXT=y
-CONFIG_X86_64_SMP=y
-CONFIG_X86_HT=y
-CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
-CONFIG_ARCH_CPU_PROBE_RELEASE=y
-CONFIG_ARCH_SUPPORTS_UPROBES=y
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-CONFIG_IRQ_WORK=y
-CONFIG_BUILDTIME_EXTABLE_SORT=y
-
-#
-# General setup
-#
-CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_CROSS_COMPILE=""
-# CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="-LIBRE"
-CONFIG_LOCALVERSION_AUTO=y
-CONFIG_HAVE_KERNEL_GZIP=y
-CONFIG_HAVE_KERNEL_BZIP2=y
-CONFIG_HAVE_KERNEL_LZMA=y
-CONFIG_HAVE_KERNEL_XZ=y
-CONFIG_HAVE_KERNEL_LZO=y
-CONFIG_HAVE_KERNEL_LZ4=y
-CONFIG_KERNEL_GZIP=y
-# CONFIG_KERNEL_BZIP2 is not set
-# CONFIG_KERNEL_LZMA is not set
-# CONFIG_KERNEL_XZ is not set
-# CONFIG_KERNEL_LZO is not set
-# CONFIG_KERNEL_LZ4 is not set
-CONFIG_DEFAULT_HOSTNAME="(none)"
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_POSIX_MQUEUE_SYSCTL=y
-CONFIG_FHANDLE=y
-CONFIG_AUDIT=y
-CONFIG_AUDITSYSCALL=y
-CONFIG_AUDIT_WATCH=y
-CONFIG_AUDIT_TREE=y
-CONFIG_AUDIT_LOGINUID_IMMUTABLE=y
-CONFIG_HAVE_GENERIC_HARDIRQS=y
-
-#
-# IRQ subsystem
-#
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_GENERIC_PENDING_IRQ=y
-CONFIG_IRQ_DOMAIN=y
-# CONFIG_IRQ_DOMAIN_DEBUG is not set
-CONFIG_IRQ_FORCED_THREADING=y
-CONFIG_SPARSE_IRQ=y
-CONFIG_CLOCKSOURCE_WATCHDOG=y
-CONFIG_ARCH_CLOCKSOURCE_DATA=y
-CONFIG_GENERIC_TIME_VSYSCALL=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
-CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-
-#
-# Timers subsystem
-#
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ_COMMON=y
-# CONFIG_HZ_PERIODIC is not set
-CONFIG_NO_HZ_IDLE=y
-# CONFIG_NO_HZ_FULL is not set
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-
-#
-# CPU/Task time and stats accounting
-#
-CONFIG_TICK_CPU_ACCOUNTING=y
-# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
-# CONFIG_IRQ_TIME_ACCOUNTING is not set
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
-CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TASK_XACCT=y
-CONFIG_TASK_IO_ACCOUNTING=y
-
-#
-# RCU Subsystem
-#
-CONFIG_TREE_PREEMPT_RCU=y
-CONFIG_PREEMPT_RCU=y
-CONFIG_RCU_STALL_COMMON=y
-# CONFIG_RCU_USER_QS is not set
-CONFIG_RCU_FANOUT=64
-CONFIG_RCU_FANOUT_LEAF=16
-# CONFIG_RCU_FANOUT_EXACT is not set
-CONFIG_RCU_FAST_NO_HZ=y
-# CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_RCU_BOOST is not set
-CONFIG_RCU_NOCB_CPU=y
-CONFIG_RCU_NOCB_CPU_NONE=y
-# CONFIG_RCU_NOCB_CPU_ZERO is not set
-# CONFIG_RCU_NOCB_CPU_ALL is not set
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=19
-CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
-CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
-CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=y
-CONFIG_ARCH_USES_NUMA_PROT_NONE=y
-CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
-CONFIG_NUMA_BALANCING=y
-CONFIG_CGROUPS=y
-# CONFIG_CGROUP_DEBUG is not set
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CPUSETS=y
-CONFIG_PROC_PID_CPUSET=y
-CONFIG_CGROUP_CPUACCT=y
-CONFIG_RESOURCE_COUNTERS=y
-CONFIG_MEMCG=y
-CONFIG_MEMCG_SWAP=y
-# CONFIG_MEMCG_SWAP_ENABLED is not set
-CONFIG_MEMCG_KMEM=y
-# CONFIG_CGROUP_HUGETLB is not set
-# CONFIG_CGROUP_PERF is not set
-CONFIG_CGROUP_SCHED=y
-CONFIG_FAIR_GROUP_SCHED=y
-CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=y
-CONFIG_BLK_CGROUP=y
-# CONFIG_DEBUG_BLK_CGROUP is not set
-CONFIG_CHECKPOINT_RESTORE=y
-CONFIG_NAMESPACES=y
-CONFIG_UTS_NS=y
-CONFIG_IPC_NS=y
-CONFIG_PID_NS=y
-CONFIG_NET_NS=y
-CONFIG_SCHED_AUTOGROUP=y
-CONFIG_MM_OWNER=y
-# CONFIG_SYSFS_DEPRECATED is not set
-CONFIG_RELAY=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_RD_GZIP=y
-CONFIG_RD_BZIP2=y
-CONFIG_RD_LZMA=y
-CONFIG_RD_XZ=y
-CONFIG_RD_LZO=y
-CONFIG_RD_LZ4=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_SYSCTL=y
-CONFIG_ANON_INODES=y
-CONFIG_HAVE_UID16=y
-CONFIG_SYSCTL_EXCEPTION_TRACE=y
-CONFIG_HAVE_PCSPKR_PLATFORM=y
-# CONFIG_EXPERT is not set
-CONFIG_UID16=y
-# CONFIG_SYSCTL_SYSCALL is not set
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_ALL is not set
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_PCSPKR_PLATFORM=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
-CONFIG_EVENTFD=y
-CONFIG_SHMEM=y
-CONFIG_AIO=y
-CONFIG_PCI_QUIRKS=y
-# CONFIG_EMBEDDED is not set
-CONFIG_HAVE_PERF_EVENTS=y
-
-#
-# Kernel Performance Events And Counters
-#
-CONFIG_PERF_EVENTS=y
-# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLUB_DEBUG=y
-# CONFIG_COMPAT_BRK is not set
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-CONFIG_SLUB_CPU_PARTIAL=y
-CONFIG_PROFILING=y
-CONFIG_TRACEPOINTS=y
-CONFIG_OPROFILE=m
-# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
-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_USE_GENERIC_SMP_HELPERS=y
-CONFIG_GENERIC_SMP_IDLE_THREAD=y
-CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
-CONFIG_HAVE_DMA_API_DEBUG=y
-CONFIG_HAVE_HW_BREAKPOINT=y
-CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
-CONFIG_HAVE_USER_RETURN_NOTIFIER=y
-CONFIG_HAVE_PERF_EVENTS_NMI=y
-CONFIG_HAVE_PERF_REGS=y
-CONFIG_HAVE_PERF_USER_STACK_DUMP=y
-CONFIG_HAVE_ARCH_JUMP_LABEL=y
-CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
-CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
-CONFIG_HAVE_CMPXCHG_LOCAL=y
-CONFIG_HAVE_CMPXCHG_DOUBLE=y
-CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
-CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
-CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
-CONFIG_SECCOMP_FILTER=y
-CONFIG_HAVE_CONTEXT_TRACKING=y
-CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
-CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
-CONFIG_HAVE_ARCH_SOFT_DIRTY=y
-CONFIG_MODULES_USE_ELF_RELA=y
-CONFIG_OLD_SIGSUSPEND3=y
-CONFIG_COMPAT_OLD_SIGACTION=y
-
-#
-# GCOV-based kernel profiling
-#
-# CONFIG_GCOV_KERNEL is not set
-# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
-CONFIG_SLABINFO=y
-CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
-CONFIG_MODULES=y
-CONFIG_MODULE_FORCE_LOAD=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-CONFIG_MODVERSIONS=y
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-# CONFIG_MODULE_SIG is not set
-CONFIG_STOP_MACHINE=y
-CONFIG_BLOCK=y
-CONFIG_BLK_DEV_BSG=y
-CONFIG_BLK_DEV_BSGLIB=y
-# CONFIG_BLK_DEV_INTEGRITY is not set
-CONFIG_BLK_DEV_THROTTLING=y
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-CONFIG_AIX_PARTITION=y
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_MAC_PARTITION=y
-CONFIG_MSDOS_PARTITION=y
-CONFIG_BSD_DISKLABEL=y
-CONFIG_MINIX_SUBPARTITION=y
-CONFIG_SOLARIS_X86_PARTITION=y
-# CONFIG_UNIXWARE_DISKLABEL is not set
-CONFIG_LDM_PARTITION=y
-# CONFIG_LDM_DEBUG is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-CONFIG_KARMA_PARTITION=y
-CONFIG_EFI_PARTITION=y
-# CONFIG_SYSV68_PARTITION is not set
-CONFIG_BLOCK_COMPAT=y
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-CONFIG_CFQ_GROUP_IOSCHED=y
-# CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_CFQ=y
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="cfq"
-CONFIG_PREEMPT_NOTIFIERS=y
-CONFIG_PADATA=y
-CONFIG_ASN1=m
-CONFIG_UNINLINE_SPIN_UNLOCK=y
-CONFIG_FREEZER=y
-
-#
-# Processor type and features
-#
-CONFIG_ZONE_DMA=y
-CONFIG_SMP=y
-CONFIG_X86_X2APIC=y
-CONFIG_X86_MPPARSE=y
-# CONFIG_X86_EXTENDED_PLATFORM is not set
-# CONFIG_X86_INTEL_LPSS is not set
-CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-CONFIG_HYPERVISOR_GUEST=y
-CONFIG_PARAVIRT=y
-# CONFIG_PARAVIRT_DEBUG is not set
-# CONFIG_PARAVIRT_SPINLOCKS is not set
-CONFIG_XEN=y
-CONFIG_XEN_DOM0=y
-CONFIG_XEN_PRIVILEGED_GUEST=y
-CONFIG_XEN_PVHVM=y
-CONFIG_XEN_MAX_DOMAIN_MEMORY=500
-CONFIG_XEN_SAVE_RESTORE=y
-# CONFIG_XEN_DEBUG_FS is not set
-CONFIG_KVM_GUEST=y
-CONFIG_PARAVIRT_TIME_ACCOUNTING=y
-CONFIG_PARAVIRT_CLOCK=y
-CONFIG_NO_BOOTMEM=y
-# CONFIG_MEMTEST is not set
-# CONFIG_MK8 is not set
-# CONFIG_MPSC is not set
-# CONFIG_MCORE2 is not set
-# CONFIG_MATOM is not set
-CONFIG_GENERIC_CPU=y
-CONFIG_X86_INTERNODE_CACHE_SHIFT=6
-CONFIG_X86_L1_CACHE_SHIFT=6
-CONFIG_X86_TSC=y
-CONFIG_X86_CMPXCHG64=y
-CONFIG_X86_CMOV=y
-CONFIG_X86_MINIMUM_CPU_FAMILY=64
-CONFIG_X86_DEBUGCTLMSR=y
-CONFIG_CPU_SUP_INTEL=y
-CONFIG_CPU_SUP_AMD=y
-CONFIG_CPU_SUP_CENTAUR=y
-CONFIG_HPET_TIMER=y
-CONFIG_HPET_EMULATE_RTC=y
-CONFIG_DMI=y
-CONFIG_GART_IOMMU=y
-CONFIG_CALGARY_IOMMU=y
-CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
-CONFIG_SWIOTLB=y
-CONFIG_IOMMU_HELPER=y
-# CONFIG_MAXSMP is not set
-CONFIG_NR_CPUS=64
-CONFIG_SCHED_SMT=y
-CONFIG_SCHED_MC=y
-# CONFIG_PREEMPT_NONE is not set
-# CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_PREEMPT=y
-CONFIG_PREEMPT_COUNT=y
-CONFIG_X86_LOCAL_APIC=y
-CONFIG_X86_IO_APIC=y
-CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
-CONFIG_X86_MCE=y
-CONFIG_X86_MCE_INTEL=y
-CONFIG_X86_MCE_AMD=y
-CONFIG_X86_MCE_THRESHOLD=y
-# CONFIG_X86_MCE_INJECT is not set
-CONFIG_X86_THERMAL_VECTOR=y
-CONFIG_I8K=m
-CONFIG_MICROCODE=m
-# CONFIG_MICROCODE_INTEL is not set
-# CONFIG_MICROCODE_AMD is not set
-CONFIG_MICROCODE_OLD_INTERFACE=y
-CONFIG_X86_MSR=m
-CONFIG_X86_CPUID=m
-CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
-CONFIG_ARCH_DMA_ADDR_T_64BIT=y
-CONFIG_DIRECT_GBPAGES=y
-CONFIG_NUMA=y
-CONFIG_AMD_NUMA=y
-CONFIG_X86_64_ACPI_NUMA=y
-CONFIG_NODES_SPAN_OTHER_NODES=y
-# CONFIG_NUMA_EMU is not set
-CONFIG_NODES_SHIFT=6
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SPARSEMEM_DEFAULT=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_ARCH_MEMORY_PROBE=y
-CONFIG_ARCH_PROC_KCORE_TEXT=y
-CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_SPARSEMEM_MANUAL=y
-CONFIG_SPARSEMEM=y
-CONFIG_NEED_MULTIPLE_NODES=y
-CONFIG_HAVE_MEMORY_PRESENT=y
-CONFIG_SPARSEMEM_EXTREME=y
-CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
-CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y
-CONFIG_SPARSEMEM_VMEMMAP=y
-CONFIG_HAVE_MEMBLOCK=y
-CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
-CONFIG_ARCH_DISCARD_MEMBLOCK=y
-CONFIG_MEMORY_ISOLATION=y
-# CONFIG_MOVABLE_NODE is not set
-CONFIG_HAVE_BOOTMEM_INFO_NODE=y
-CONFIG_MEMORY_HOTPLUG=y
-CONFIG_MEMORY_HOTPLUG_SPARSE=y
-CONFIG_MEMORY_HOTREMOVE=y
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_BALLOON_COMPACTION=y
-CONFIG_COMPACTION=y
-CONFIG_MIGRATION=y
-CONFIG_PHYS_ADDR_T_64BIT=y
-CONFIG_ZONE_DMA_FLAG=1
-CONFIG_BOUNCE=y
-CONFIG_VIRT_TO_BUS=y
-CONFIG_MMU_NOTIFIER=y
-CONFIG_KSM=y
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
-CONFIG_MEMORY_FAILURE=y
-CONFIG_HWPOISON_INJECT=m
-CONFIG_TRANSPARENT_HUGEPAGE=y
-CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
-# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
-CONFIG_CROSS_MEMORY_ATTACH=y
-CONFIG_CLEANCACHE=y
-CONFIG_FRONTSWAP=y
-CONFIG_ZBUD=y
-CONFIG_ZSWAP=y
-CONFIG_MEM_SOFT_DIRTY=y
-CONFIG_X86_CHECK_BIOS_CORRUPTION=y
-CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
-CONFIG_X86_RESERVE_LOW=64
-CONFIG_MTRR=y
-CONFIG_MTRR_SANITIZER=y
-CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
-CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
-CONFIG_X86_PAT=y
-CONFIG_ARCH_USES_PG_UNCACHED=y
-CONFIG_ARCH_RANDOM=y
-CONFIG_X86_SMAP=y
-CONFIG_EFI=y
-CONFIG_EFI_STUB=y
-CONFIG_SECCOMP=y
-CONFIG_CC_STACKPROTECTOR=y
-# CONFIG_HZ_100 is not set
-# CONFIG_HZ_250 is not set
-CONFIG_HZ_300=y
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ=300
-CONFIG_SCHED_HRTICK=y
-CONFIG_KEXEC=y
-# CONFIG_CRASH_DUMP is not set
-CONFIG_KEXEC_JUMP=y
-CONFIG_PHYSICAL_START=0x1000000
-CONFIG_RELOCATABLE=y
-CONFIG_PHYSICAL_ALIGN=0x1000000
-CONFIG_HOTPLUG_CPU=y
-# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
-# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
-# CONFIG_COMPAT_VDSO is not set
-# CONFIG_CMDLINE_BOOL is not set
-CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-CONFIG_USE_PERCPU_NUMA_NODE_ID=y
-
-#
-# Power management and ACPI options
-#
-CONFIG_ARCH_HIBERNATION_HEADER=y
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-CONFIG_HIBERNATE_CALLBACKS=y
-CONFIG_HIBERNATION=y
-CONFIG_PM_STD_PARTITION=""
-CONFIG_PM_SLEEP=y
-CONFIG_PM_SLEEP_SMP=y
-CONFIG_PM_AUTOSLEEP=y
-CONFIG_PM_WAKELOCKS=y
-CONFIG_PM_WAKELOCKS_LIMIT=100
-CONFIG_PM_WAKELOCKS_GC=y
-CONFIG_PM_RUNTIME=y
-CONFIG_PM=y
-CONFIG_PM_DEBUG=y
-CONFIG_PM_ADVANCED_DEBUG=y
-# CONFIG_PM_TEST_SUSPEND is not set
-CONFIG_PM_SLEEP_DEBUG=y
-CONFIG_PM_TRACE=y
-CONFIG_PM_TRACE_RTC=y
-# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
-CONFIG_ACPI=y
-CONFIG_ACPI_SLEEP=y
-# CONFIG_ACPI_PROCFS is not set
-# CONFIG_ACPI_PROCFS_POWER is not set
-CONFIG_ACPI_EC_DEBUGFS=m
-# CONFIG_ACPI_PROC_EVENT is not set
-CONFIG_ACPI_AC=m
-CONFIG_ACPI_BATTERY=m
-CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_VIDEO=m
-CONFIG_ACPI_FAN=m
-CONFIG_ACPI_DOCK=y
-CONFIG_ACPI_I2C=m
-CONFIG_ACPI_PROCESSOR=m
-CONFIG_ACPI_IPMI=m
-CONFIG_ACPI_HOTPLUG_CPU=y
-CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
-CONFIG_ACPI_THERMAL=m
-CONFIG_ACPI_NUMA=y
-# CONFIG_ACPI_CUSTOM_DSDT is not set
-CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y
-CONFIG_ACPI_BLACKLIST_YEAR=0
-# CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_PCI_SLOT=y
-CONFIG_X86_PM_TIMER=y
-CONFIG_ACPI_CONTAINER=y
-CONFIG_ACPI_HOTPLUG_MEMORY=y
-CONFIG_ACPI_SBS=m
-CONFIG_ACPI_HED=y
-CONFIG_ACPI_CUSTOM_METHOD=m
-CONFIG_ACPI_BGRT=y
-CONFIG_ACPI_APEI=y
-CONFIG_ACPI_APEI_GHES=y
-CONFIG_ACPI_APEI_PCIEAER=y
-CONFIG_ACPI_APEI_MEMORY_FAILURE=y
-CONFIG_ACPI_APEI_EINJ=m
-CONFIG_ACPI_APEI_ERST_DEBUG=m
-CONFIG_SFI=y
-
-#
-# CPU Frequency scaling
-#
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_TABLE=y
-CONFIG_CPU_FREQ_GOV_COMMON=y
-CONFIG_CPU_FREQ_STAT=m
-CONFIG_CPU_FREQ_STAT_DETAILS=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_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
-CONFIG_X86_POWERNOW_K8=m
-CONFIG_X86_AMD_FREQ_SENSITIVITY=m
-# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
-CONFIG_X86_P4_CLOCKMOD=m
-
-#
-# shared options
-#
-CONFIG_X86_SPEEDSTEP_LIB=m
-CONFIG_CPU_IDLE=y
-# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
-CONFIG_CPU_IDLE_GOV_LADDER=y
-CONFIG_CPU_IDLE_GOV_MENU=y
-# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
-CONFIG_INTEL_IDLE=y
-
-#
-# Memory power savings
-#
-CONFIG_I7300_IDLE_IOAT_CHANNEL=y
-CONFIG_I7300_IDLE=m
-
-#
-# Bus options (PCI etc.)
-#
-CONFIG_PCI=y
-CONFIG_PCI_DIRECT=y
-CONFIG_PCI_MMCONFIG=y
-CONFIG_PCI_XEN=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=y
-CONFIG_PCIEAER=y
-# CONFIG_PCIE_ECRC is not set
-# CONFIG_PCIEAER_INJECT is not set
-CONFIG_PCIEASPM=y
-# CONFIG_PCIEASPM_DEBUG is not set
-CONFIG_PCIEASPM_DEFAULT=y
-# CONFIG_PCIEASPM_POWERSAVE is not set
-# CONFIG_PCIEASPM_PERFORMANCE is not set
-CONFIG_PCIE_PME=y
-CONFIG_ARCH_SUPPORTS_MSI=y
-CONFIG_PCI_MSI=y
-# CONFIG_PCI_DEBUG is not set
-CONFIG_PCI_REALLOC_ENABLE_AUTO=y
-CONFIG_PCI_STUB=m
-CONFIG_XEN_PCIDEV_FRONTEND=m
-CONFIG_HT_IRQ=y
-CONFIG_PCI_ATS=y
-CONFIG_PCI_IOV=y
-CONFIG_PCI_PRI=y
-CONFIG_PCI_PASID=y
-CONFIG_PCI_IOAPIC=y
-CONFIG_PCI_LABEL=y
-
-#
-# PCI host controller drivers
-#
-CONFIG_ISA_DMA_API=y
-CONFIG_AMD_NB=y
-CONFIG_PCCARD=m
-CONFIG_PCMCIA=m
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_CARDBUS=y
-
-#
-# PC-card bridges
-#
-CONFIG_YENTA=m
-CONFIG_YENTA_O2=y
-CONFIG_YENTA_RICOH=y
-CONFIG_YENTA_TI=y
-CONFIG_YENTA_ENE_TUNE=y
-CONFIG_YENTA_TOSHIBA=y
-CONFIG_PD6729=m
-CONFIG_I82092=m
-CONFIG_PCCARD_NONSTATIC=y
-CONFIG_HOTPLUG_PCI=y
-CONFIG_HOTPLUG_PCI_ACPI=y
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m
-CONFIG_HOTPLUG_PCI_CPCI=y
-CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
-CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
-CONFIG_HOTPLUG_PCI_SHPC=m
-CONFIG_RAPIDIO=y
-CONFIG_RAPIDIO_TSI721=y
-CONFIG_RAPIDIO_DISC_TIMEOUT=30
-# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set
-CONFIG_RAPIDIO_DMA_ENGINE=y
-CONFIG_RAPIDIO_DEBUG=y
-CONFIG_RAPIDIO_ENUM_BASIC=m
-
-#
-# RapidIO Switch drivers
-#
-CONFIG_RAPIDIO_TSI57X=y
-CONFIG_RAPIDIO_CPS_XX=y
-CONFIG_RAPIDIO_TSI568=y
-CONFIG_RAPIDIO_CPS_GEN2=y
-
-#
-# Executable file formats / Emulations
-#
-CONFIG_BINFMT_ELF=y
-CONFIG_COMPAT_BINFMT_ELF=y
-CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_BINFMT_SCRIPT=y
-# CONFIG_HAVE_AOUT is not set
-CONFIG_BINFMT_MISC=y
-CONFIG_COREDUMP=y
-CONFIG_IA32_EMULATION=y
-CONFIG_IA32_AOUT=m
-CONFIG_X86_X32=y
-CONFIG_COMPAT=y
-CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
-CONFIG_SYSVIPC_COMPAT=y
-CONFIG_KEYS_COMPAT=y
-CONFIG_HAVE_TEXT_POKE_SMP=y
-CONFIG_X86_DEV_DMA_OPS=y
-CONFIG_NET=y
-CONFIG_COMPAT_NETLINK_MESSAGES=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-CONFIG_PACKET_DIAG=m
-CONFIG_UNIX=y
-CONFIG_UNIX_DIAG=m
-CONFIG_XFRM=y
-CONFIG_XFRM_ALGO=m
-CONFIG_XFRM_USER=m
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_MIGRATE is not set
-# CONFIG_XFRM_STATISTICS is not set
-CONFIG_XFRM_IPCOMP=m
-CONFIG_NET_KEY=m
-# CONFIG_NET_KEY_MIGRATE is not set
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_FIB_TRIE_STATS=y
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-CONFIG_IP_ROUTE_CLASSID=y
-# CONFIG_IP_PNP is not set
-CONFIG_NET_IPIP=m
-CONFIG_NET_IPGRE_DEMUX=m
-CONFIG_NET_IP_TUNNEL=m
-CONFIG_NET_IPGRE=m
-# CONFIG_NET_IPGRE_BROADCAST is not set
-CONFIG_IP_MROUTE=y
-# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-CONFIG_ARPD=y
-CONFIG_SYN_COOKIES=y
-CONFIG_NET_IPVTI=m
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_XFRM_TUNNEL=m
-CONFIG_INET_TUNNEL=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=m
-CONFIG_INET_LRO=y
-CONFIG_INET_DIAG=m
-CONFIG_INET_TCP_DIAG=m
-CONFIG_INET_UDP_DIAG=m
-CONFIG_TCP_CONG_ADVANCED=y
-CONFIG_TCP_CONG_BIC=m
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_TCP_CONG_WESTWOOD=m
-CONFIG_TCP_CONG_HTCP=m
-CONFIG_TCP_CONG_HSTCP=m
-CONFIG_TCP_CONG_HYBLA=m
-CONFIG_TCP_CONG_VEGAS=m
-CONFIG_TCP_CONG_SCALABLE=m
-CONFIG_TCP_CONG_LP=m
-CONFIG_TCP_CONG_VENO=m
-CONFIG_TCP_CONG_YEAH=m
-CONFIG_TCP_CONG_ILLINOIS=m
-CONFIG_DEFAULT_CUBIC=y
-# CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="cubic"
-# CONFIG_TCP_MD5SIG is not set
-CONFIG_IPV6=y
-CONFIG_IPV6_PRIVACY=y
-CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_ROUTE_INFO=y
-CONFIG_IPV6_OPTIMISTIC_DAD=y
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-CONFIG_INET6_IPCOMP=m
-CONFIG_IPV6_MIP6=m
-CONFIG_INET6_XFRM_TUNNEL=m
-CONFIG_INET6_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
-CONFIG_IPV6_SIT=m
-CONFIG_IPV6_SIT_6RD=y
-CONFIG_IPV6_NDISC_NODETYPE=y
-CONFIG_IPV6_TUNNEL=m
-CONFIG_IPV6_GRE=m
-CONFIG_IPV6_MULTIPLE_TABLES=y
-CONFIG_IPV6_SUBTREES=y
-# CONFIG_IPV6_MROUTE is not set
-CONFIG_NETLABEL=y
-CONFIG_NETWORK_SECMARK=y
-CONFIG_NETWORK_PHY_TIMESTAMPING=y
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-CONFIG_NETFILTER_ADVANCED=y
-CONFIG_BRIDGE_NETFILTER=y
-
-#
-# Core Netfilter Configuration
-#
-CONFIG_NETFILTER_NETLINK=m
-CONFIG_NETFILTER_NETLINK_ACCT=m
-CONFIG_NETFILTER_NETLINK_QUEUE=m
-CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NF_CONNTRACK=m
-CONFIG_NF_CONNTRACK_MARK=y
-CONFIG_NF_CONNTRACK_SECMARK=y
-CONFIG_NF_CONNTRACK_ZONES=y
-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
-CONFIG_NF_CT_PROTO_UDPLITE=m
-CONFIG_NF_CONNTRACK_AMANDA=m
-CONFIG_NF_CONNTRACK_FTP=m
-CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IRC=m
-CONFIG_NF_CONNTRACK_BROADCAST=m
-CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-CONFIG_NF_CONNTRACK_SNMP=m
-CONFIG_NF_CONNTRACK_PPTP=m
-CONFIG_NF_CONNTRACK_SANE=m
-CONFIG_NF_CONNTRACK_SIP=m
-CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_CT_NETLINK=m
-CONFIG_NF_CT_NETLINK_TIMEOUT=m
-CONFIG_NF_CT_NETLINK_HELPER=m
-CONFIG_NETFILTER_NETLINK_QUEUE_CT=y
-CONFIG_NF_NAT=m
-CONFIG_NF_NAT_NEEDED=y
-CONFIG_NF_NAT_PROTO_DCCP=m
-CONFIG_NF_NAT_PROTO_UDPLITE=m
-CONFIG_NF_NAT_PROTO_SCTP=m
-CONFIG_NF_NAT_AMANDA=m
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_IRC=m
-CONFIG_NF_NAT_SIP=m
-CONFIG_NF_NAT_TFTP=m
-CONFIG_NETFILTER_TPROXY=m
-CONFIG_NETFILTER_XTABLES=m
-
-#
-# Xtables combined modules
-#
-CONFIG_NETFILTER_XT_MARK=m
-CONFIG_NETFILTER_XT_CONNMARK=m
-CONFIG_NETFILTER_XT_SET=m
-
-#
-# Xtables targets
-#
-CONFIG_NETFILTER_XT_TARGET_AUDIT=m
-CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
-CONFIG_NETFILTER_XT_TARGET_CT=m
-CONFIG_NETFILTER_XT_TARGET_DSCP=m
-CONFIG_NETFILTER_XT_TARGET_HL=m
-CONFIG_NETFILTER_XT_TARGET_HMARK=m
-CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
-CONFIG_NETFILTER_XT_TARGET_LED=m
-CONFIG_NETFILTER_XT_TARGET_LOG=m
-CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_TARGET_NETMAP=m
-CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-CONFIG_NETFILTER_XT_TARGET_RATEEST=m
-CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
-CONFIG_NETFILTER_XT_TARGET_TEE=m
-CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-CONFIG_NETFILTER_XT_TARGET_TRACE=m
-CONFIG_NETFILTER_XT_TARGET_SECMARK=m
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-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
-CONFIG_NETFILTER_XT_MATCH_CPU=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
-CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
-CONFIG_NETFILTER_XT_MATCH_DSCP=m
-CONFIG_NETFILTER_XT_MATCH_ECN=m
-CONFIG_NETFILTER_XT_MATCH_ESP=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_HELPER=m
-CONFIG_NETFILTER_XT_MATCH_HL=m
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-CONFIG_NETFILTER_XT_MATCH_IPVS=m
-CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-CONFIG_NETFILTER_XT_MATCH_MAC=m
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-CONFIG_NETFILTER_XT_MATCH_NFACCT=m
-CONFIG_NETFILTER_XT_MATCH_OSF=m
-CONFIG_NETFILTER_XT_MATCH_OWNER=m
-CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-CONFIG_NETFILTER_XT_MATCH_RATEEST=m
-CONFIG_NETFILTER_XT_MATCH_REALM=m
-CONFIG_NETFILTER_XT_MATCH_RECENT=m
-CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_SOCKET=m
-CONFIG_NETFILTER_XT_MATCH_STATE=m
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-CONFIG_NETFILTER_XT_MATCH_STRING=m
-CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-CONFIG_NETFILTER_XT_MATCH_TIME=m
-CONFIG_NETFILTER_XT_MATCH_U32=m
-CONFIG_IP_SET=m
-CONFIG_IP_SET_MAX=256
-CONFIG_IP_SET_BITMAP_IP=m
-CONFIG_IP_SET_BITMAP_IPMAC=m
-CONFIG_IP_SET_BITMAP_PORT=m
-CONFIG_IP_SET_HASH_IP=m
-CONFIG_IP_SET_HASH_IPPORT=m
-CONFIG_IP_SET_HASH_IPPORTIP=m
-CONFIG_IP_SET_HASH_IPPORTNET=m
-CONFIG_IP_SET_HASH_NET=m
-CONFIG_IP_SET_HASH_NETPORT=m
-CONFIG_IP_SET_HASH_NETIFACE=m
-CONFIG_IP_SET_LIST_SET=m
-CONFIG_IP_VS=m
-# CONFIG_IP_VS_IPV6 is not set
-# CONFIG_IP_VS_DEBUG is not set
-CONFIG_IP_VS_TAB_BITS=12
-
-#
-# IPVS transport protocol load balancing support
-#
-CONFIG_IP_VS_PROTO_TCP=y
-CONFIG_IP_VS_PROTO_UDP=y
-CONFIG_IP_VS_PROTO_AH_ESP=y
-CONFIG_IP_VS_PROTO_ESP=y
-CONFIG_IP_VS_PROTO_AH=y
-CONFIG_IP_VS_PROTO_SCTP=y
-
-#
-# IPVS scheduler
-#
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_WRR=m
-CONFIG_IP_VS_LC=m
-CONFIG_IP_VS_WLC=m
-CONFIG_IP_VS_LBLC=m
-CONFIG_IP_VS_LBLCR=m
-CONFIG_IP_VS_DH=m
-CONFIG_IP_VS_SH=m
-CONFIG_IP_VS_SED=m
-CONFIG_IP_VS_NQ=m
-
-#
-# IPVS SH scheduler
-#
-CONFIG_IP_VS_SH_TAB_BITS=8
-
-#
-# IPVS application helper
-#
-CONFIG_IP_VS_FTP=m
-CONFIG_IP_VS_NFCT=y
-CONFIG_IP_VS_PE_SIP=m
-
-#
-# IP: Netfilter Configuration
-#
-CONFIG_NF_DEFRAG_IPV4=m
-CONFIG_NF_CONNTRACK_IPV4=m
-# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_RPFILTER=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_NF_NAT_IPV4=m
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_PROTO_GRE=m
-CONFIG_NF_NAT_PPTP=m
-CONFIG_NF_NAT_H323=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_RAW=m
-CONFIG_IP_NF_SECURITY=m
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-
-#
-# IPv6: Netfilter Configuration
-#
-CONFIG_NF_DEFRAG_IPV6=m
-CONFIG_NF_CONNTRACK_IPV6=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_RPFILTER=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_RAW=m
-CONFIG_IP6_NF_SECURITY=m
-CONFIG_NF_NAT_IPV6=m
-CONFIG_IP6_NF_TARGET_MASQUERADE=m
-CONFIG_IP6_NF_TARGET_NPT=m
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_IP6=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_ULOG=m
-CONFIG_BRIDGE_EBT_NFLOG=m
-CONFIG_IP_DCCP=m
-CONFIG_INET_DCCP_DIAG=m
-
-#
-# DCCP CCIDs Configuration
-#
-# CONFIG_IP_DCCP_CCID2_DEBUG is not set
-CONFIG_IP_DCCP_CCID3=y
-# CONFIG_IP_DCCP_CCID3_DEBUG is not set
-CONFIG_IP_DCCP_TFRC_LIB=y
-
-#
-# DCCP Kernel Hacking
-#
-# CONFIG_IP_DCCP_DEBUG is not set
-CONFIG_NET_DCCPPROBE=m
-CONFIG_IP_SCTP=m
-CONFIG_NET_SCTPPROBE=m
-# CONFIG_SCTP_DBG_OBJCNT is not set
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
-CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
-CONFIG_SCTP_COOKIE_HMAC_MD5=y
-CONFIG_SCTP_COOKIE_HMAC_SHA1=y
-# CONFIG_RDS is not set
-# CONFIG_TIPC is not set
-CONFIG_ATM=m
-CONFIG_ATM_CLIP=m
-# CONFIG_ATM_CLIP_NO_ICMP is not set
-CONFIG_ATM_LANE=m
-CONFIG_ATM_MPOA=m
-CONFIG_ATM_BR2684=m
-# CONFIG_ATM_BR2684_IPFILTER is not set
-CONFIG_L2TP=m
-# CONFIG_L2TP_DEBUGFS is not set
-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
-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
-CONFIG_IPX=m
-# CONFIG_IPX_INTERN is not set
-CONFIG_ATALK=m
-CONFIG_DEV_APPLETALK=m
-CONFIG_IPDDP=m
-CONFIG_IPDDP_ENCAP=y
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-CONFIG_PHONET=m
-CONFIG_IEEE802154=m
-CONFIG_IEEE802154_6LOWPAN=m
-CONFIG_MAC802154=m
-CONFIG_NET_SCHED=y
-
-#
-# Queueing/Scheduling
-#
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_ATM=m
-CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_MULTIQ=m
-CONFIG_NET_SCH_RED=m
-CONFIG_NET_SCH_SFB=m
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SCH_TBF=m
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCH_NETEM=m
-CONFIG_NET_SCH_DRR=m
-CONFIG_NET_SCH_MQPRIO=m
-CONFIG_NET_SCH_CHOKE=m
-CONFIG_NET_SCH_QFQ=m
-CONFIG_NET_SCH_CODEL=m
-CONFIG_NET_SCH_FQ_CODEL=m
-CONFIG_NET_SCH_INGRESS=m
-CONFIG_NET_SCH_PLUG=m
-
-#
-# Classification
-#
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-# CONFIG_CLS_U32_PERF is not set
-# CONFIG_CLS_U32_MARK is not set
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_FLOW=m
-CONFIG_NET_CLS_CGROUP=y
-# CONFIG_NET_EMATCH is not set
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_ACT_POLICE=m
-CONFIG_NET_ACT_GACT=m
-CONFIG_GACT_PROB=y
-CONFIG_NET_ACT_MIRRED=m
-CONFIG_NET_ACT_IPT=m
-CONFIG_NET_ACT_NAT=m
-CONFIG_NET_ACT_PEDIT=m
-CONFIG_NET_ACT_SIMP=m
-CONFIG_NET_ACT_SKBEDIT=m
-CONFIG_NET_ACT_CSUM=m
-CONFIG_NET_CLS_IND=y
-CONFIG_NET_SCH_FIFO=y
-# CONFIG_DCB is not set
-CONFIG_DNS_RESOLVER=y
-CONFIG_BATMAN_ADV=m
-CONFIG_BATMAN_ADV_BLA=y
-CONFIG_BATMAN_ADV_DAT=y
-CONFIG_BATMAN_ADV_NC=y
-# CONFIG_BATMAN_ADV_DEBUG is not set
-CONFIG_OPENVSWITCH=m
-CONFIG_OPENVSWITCH_GRE=y
-CONFIG_VSOCKETS=m
-CONFIG_VMWARE_VMCI_VSOCKETS=m
-CONFIG_NETLINK_MMAP=y
-CONFIG_NETLINK_DIAG=m
-CONFIG_NET_MPLS_GSO=m
-CONFIG_RPS=y
-CONFIG_RFS_ACCEL=y
-CONFIG_XPS=y
-CONFIG_NETPRIO_CGROUP=m
-CONFIG_NET_RX_BUSY_POLL=y
-CONFIG_BQL=y
-CONFIG_BPF_JIT=y
-CONFIG_NET_FLOW_LIMIT=y
-
-#
-# Network testing
-#
-CONFIG_NET_PKTGEN=m
-CONFIG_NET_TCPPROBE=m
-CONFIG_NET_DROP_MONITOR=y
-CONFIG_HAMRADIO=y
-
-#
-# Packet Radio protocols
-#
-CONFIG_AX25=m
-CONFIG_AX25_DAMA_SLAVE=y
-CONFIG_NETROM=m
-CONFIG_ROSE=m
-
-#
-# AX.25 network device drivers
-#
-CONFIG_MKISS=m
-CONFIG_6PACK=m
-CONFIG_BPQETHER=m
-CONFIG_BAYCOM_SER_FDX=m
-CONFIG_BAYCOM_SER_HDX=m
-CONFIG_BAYCOM_PAR=m
-CONFIG_YAM=m
-# CONFIG_CAN is not set
-CONFIG_IRDA=m
-
-#
-# IrDA protocols
-#
-CONFIG_IRLAN=m
-CONFIG_IRNET=m
-CONFIG_IRCOMM=m
-CONFIG_IRDA_ULTRA=y
-
-#
-# IrDA options
-#
-CONFIG_IRDA_CACHE_LAST_LSAP=y
-CONFIG_IRDA_FAST_RR=y
-# CONFIG_IRDA_DEBUG is not set
-
-#
-# Infrared-port device drivers
-#
-
-#
-# SIR device drivers
-#
-CONFIG_IRTTY_SIR=m
-
-#
-# Dongle support
-#
-CONFIG_DONGLE=y
-CONFIG_ESI_DONGLE=m
-CONFIG_ACTISYS_DONGLE=m
-CONFIG_TEKRAM_DONGLE=m
-CONFIG_TOIM3232_DONGLE=m
-CONFIG_LITELINK_DONGLE=m
-CONFIG_MA600_DONGLE=m
-CONFIG_GIRBIL_DONGLE=m
-CONFIG_MCP2120_DONGLE=m
-CONFIG_OLD_BELKIN_DONGLE=m
-CONFIG_ACT200L_DONGLE=m
-CONFIG_KINGSUN_DONGLE=m
-CONFIG_KSDAZZLE_DONGLE=m
-CONFIG_KS959_DONGLE=m
-
-#
-# FIR device drivers
-#
-CONFIG_USB_IRDA=m
-CONFIG_SIGMATEL_FIR=m
-CONFIG_NSC_FIR=m
-CONFIG_WINBOND_FIR=m
-CONFIG_SMC_IRCC_FIR=m
-CONFIG_ALI_FIR=m
-CONFIG_VLSI_FIR=m
-CONFIG_VIA_FIR=m
-CONFIG_MCS_FIR=m
-CONFIG_BT=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-# CONFIG_BT_BNEP_MC_FILTER is not set
-# CONFIG_BT_BNEP_PROTO_FILTER is not set
-# CONFIG_BT_CMTP is not set
-CONFIG_BT_HIDP=m
-
-#
-# Bluetooth device drivers
-#
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBTSDIO=m
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_ATH3K=y
-CONFIG_BT_HCIUART_LL=y
-CONFIG_BT_HCIUART_3WIRE=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIDTL1=m
-CONFIG_BT_HCIBT3C=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIBTUART=m
-CONFIG_BT_HCIVHCI=m
-CONFIG_BT_MRVL=m
-CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_ATH3K=m
-CONFIG_BT_WILINK=m
-CONFIG_AF_RXRPC=m
-# CONFIG_AF_RXRPC_DEBUG is not set
-CONFIG_RXKAD=m
-CONFIG_FIB_RULES=y
-CONFIG_WIRELESS=y
-CONFIG_WIRELESS_EXT=y
-CONFIG_WEXT_CORE=y
-CONFIG_WEXT_PROC=y
-CONFIG_WEXT_SPY=y
-CONFIG_WEXT_PRIV=y
-CONFIG_CFG80211=m
-# CONFIG_NL80211_TESTMODE is not set
-# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
-# CONFIG_CFG80211_REG_DEBUG is not set
-CONFIG_CFG80211_DEFAULT_PS=y
-# CONFIG_CFG80211_DEBUGFS is not set
-# CONFIG_CFG80211_INTERNAL_REGDB is not set
-CONFIG_CFG80211_WEXT=y
-CONFIG_LIB80211=m
-CONFIG_LIB80211_CRYPT_WEP=m
-CONFIG_LIB80211_CRYPT_CCMP=m
-CONFIG_LIB80211_CRYPT_TKIP=m
-# CONFIG_LIB80211_DEBUG is not set
-CONFIG_MAC80211=m
-CONFIG_MAC80211_HAS_RC=y
-CONFIG_MAC80211_RC_MINSTREL=y
-CONFIG_MAC80211_RC_MINSTREL_HT=y
-CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
-CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
-CONFIG_MAC80211_MESH=y
-CONFIG_MAC80211_LEDS=y
-# CONFIG_MAC80211_DEBUGFS is not set
-# CONFIG_MAC80211_MESSAGE_TRACING is not set
-# CONFIG_MAC80211_DEBUG_MENU is not set
-CONFIG_WIMAX=m
-CONFIG_WIMAX_DEBUG_LEVEL=8
-CONFIG_RFKILL=m
-CONFIG_RFKILL_LEDS=y
-CONFIG_RFKILL_INPUT=y
-CONFIG_NET_9P=m
-CONFIG_NET_9P_VIRTIO=m
-# CONFIG_NET_9P_DEBUG is not set
-CONFIG_CAIF=m
-# CONFIG_CAIF_DEBUG is not set
-CONFIG_CAIF_NETDEV=m
-CONFIG_CAIF_USB=m
-CONFIG_CEPH_LIB=m
-# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
-# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
-CONFIG_NFC=m
-CONFIG_NFC_NCI=m
-# CONFIG_NFC_NCI_SPI is not set
-CONFIG_NFC_HCI=m
-# CONFIG_NFC_SHDLC is not set
-
-#
-# Near Field Communication (NFC) devices
-#
-CONFIG_NFC_PN533=m
-CONFIG_NFC_WILINK=m
-CONFIG_NFC_MEI_PHY=m
-CONFIG_NFC_SIM=m
-CONFIG_NFC_PN544=m
-CONFIG_NFC_PN544_MEI=m
-CONFIG_NFC_MICROREAD=m
-CONFIG_NFC_MICROREAD_MEI=m
-CONFIG_HAVE_BPF_JIT=y
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_UEVENT_HELPER_PATH=""
-CONFIG_DEVTMPFS=y
-# CONFIG_DEVTMPFS_MOUNT is not set
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_FW_LOADER=y
-CONFIG_FIRMWARE_IN_KERNEL=y
-CONFIG_EXTRA_FIRMWARE=""
-CONFIG_FW_LOADER_USER_HELPER=y
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_DEVRES is not set
-CONFIG_SYS_HYPERVISOR=y
-# CONFIG_GENERIC_CPU_DEVICES is not set
-CONFIG_REGMAP=y
-CONFIG_REGMAP_I2C=m
-CONFIG_REGMAP_MMIO=m
-CONFIG_REGMAP_IRQ=y
-CONFIG_DMA_SHARED_BUFFER=y
-
-#
-# Bus devices
-#
-CONFIG_CONNECTOR=y
-CONFIG_PROC_EVENTS=y
-CONFIG_MTD=m
-CONFIG_MTD_TESTS=m
-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_AR7_PARTS=m
-
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_BLKDEVS=m
-CONFIG_MTD_BLOCK=m
-CONFIG_MTD_BLOCK_RO=m
-CONFIG_FTL=m
-CONFIG_NFTL=m
-CONFIG_NFTL_RW=y
-CONFIG_INFTL=m
-CONFIG_RFD_FTL=m
-CONFIG_SSFDC=m
-# CONFIG_SM_FTL is not set
-CONFIG_MTD_OOPS=m
-CONFIG_MTD_SWAP=m
-
-#
-# RAM/ROM/Flash chip drivers
-#
-CONFIG_MTD_CFI=m
-CONFIG_MTD_JEDECPROBE=m
-CONFIG_MTD_GEN_PROBE=m
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-CONFIG_MTD_CFI_INTELEXT=m
-CONFIG_MTD_CFI_AMDSTD=m
-CONFIG_MTD_CFI_STAA=m
-CONFIG_MTD_CFI_UTIL=m
-CONFIG_MTD_RAM=m
-CONFIG_MTD_ROM=m
-CONFIG_MTD_ABSENT=m
-
-#
-# Mapping drivers for chip access
-#
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-# CONFIG_MTD_PHYSMAP is not set
-CONFIG_MTD_SC520CDP=m
-CONFIG_MTD_NETSC520=m
-CONFIG_MTD_TS5500=m
-# CONFIG_MTD_SBC_GXX is not set
-# CONFIG_MTD_AMD76XROM is not set
-# CONFIG_MTD_ICHXROM is not set
-# CONFIG_MTD_ESB2ROM is not set
-# CONFIG_MTD_CK804XROM is not set
-CONFIG_MTD_SCB2_FLASH=m
-# CONFIG_MTD_NETtel is not set
-# CONFIG_MTD_L440GX is not set
-CONFIG_MTD_PCI=m
-# CONFIG_MTD_PCMCIA is not set
-# CONFIG_MTD_GPIO_ADDR is not set
-# CONFIG_MTD_INTEL_VR_NOR is not set
-CONFIG_MTD_PLATRAM=m
-# CONFIG_MTD_LATCH_ADDR is not set
-
-#
-# Self-contained MTD device drivers
-#
-CONFIG_MTD_PMC551=m
-# CONFIG_MTD_PMC551_BUGFIX is not set
-# CONFIG_MTD_PMC551_DEBUG is not set
-# CONFIG_MTD_DATAFLASH is not set
-# CONFIG_MTD_M25P80 is not set
-# CONFIG_MTD_SST25L is not set
-# CONFIG_MTD_SLRAM is not set
-CONFIG_MTD_PHRAM=m
-CONFIG_MTD_MTDRAM=m
-CONFIG_MTDRAM_TOTAL_SIZE=4096
-CONFIG_MTDRAM_ERASE_SIZE=128
-CONFIG_MTD_BLOCK2MTD=m
-
-#
-# Disk-On-Chip Device Drivers
-#
-CONFIG_MTD_DOCG3=m
-CONFIG_BCH_CONST_M=14
-CONFIG_BCH_CONST_T=4
-CONFIG_MTD_NAND_ECC=m
-CONFIG_MTD_NAND_ECC_SMC=y
-CONFIG_MTD_NAND=m
-# CONFIG_MTD_NAND_ECC_BCH is not set
-CONFIG_MTD_SM_COMMON=m
-# CONFIG_MTD_NAND_DENALI is not set
-CONFIG_MTD_NAND_IDS=m
-CONFIG_MTD_NAND_RICOH=m
-CONFIG_MTD_NAND_DISKONCHIP=m
-# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
-CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
-# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
-CONFIG_MTD_NAND_DOCG4=m
-# CONFIG_MTD_NAND_CAFE is not set
-CONFIG_MTD_NAND_NANDSIM=m
-# CONFIG_MTD_NAND_PLATFORM is not set
-CONFIG_MTD_ALAUDA=m
-# CONFIG_MTD_ONENAND is not set
-
-#
-# LPDDR flash memory drivers
-#
-CONFIG_MTD_LPDDR=m
-CONFIG_MTD_QINFO_PROBE=m
-CONFIG_MTD_UBI=m
-CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MTD_UBI_BEB_LIMIT=20
-# CONFIG_MTD_UBI_FASTMAP is not set
-# CONFIG_MTD_UBI_GLUEBI is not set
-CONFIG_PARPORT=m
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_SERIAL=m
-# CONFIG_PARPORT_PC_FIFO is not set
-# CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_PC_PCMCIA=m
-# CONFIG_PARPORT_GSC is not set
-CONFIG_PARPORT_AX88796=m
-CONFIG_PARPORT_1284=y
-CONFIG_PARPORT_NOT_PC=y
-CONFIG_PNP=y
-# CONFIG_PNP_DEBUG_MESSAGES is not set
-
-#
-# Protocols
-#
-CONFIG_PNPACPI=y
-CONFIG_BLK_DEV=y
-CONFIG_BLK_DEV_FD=m
-# CONFIG_PARIDE is not set
-CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
-CONFIG_BLK_CPQ_DA=m
-CONFIG_BLK_CPQ_CISS_DA=m
-# CONFIG_CISS_SCSI_TAPE is not set
-CONFIG_BLK_DEV_DAC960=m
-# CONFIG_BLK_DEV_UMEM is not set
-# CONFIG_BLK_DEV_COW_COMMON is not set
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
-CONFIG_BLK_DEV_CRYPTOLOOP=m
-CONFIG_BLK_DEV_DRBD=m
-# CONFIG_DRBD_FAULT_INJECTION is not set
-CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_NVME=m
-CONFIG_BLK_DEV_OSD=m
-CONFIG_BLK_DEV_SX8=m
-CONFIG_BLK_DEV_RAM=m
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=16384
-# CONFIG_BLK_DEV_XIP is not set
-CONFIG_CDROM_PKTCDVD=m
-CONFIG_CDROM_PKTCDVD_BUFFERS=8
-# CONFIG_CDROM_PKTCDVD_WCACHE is not set
-CONFIG_ATA_OVER_ETH=m
-CONFIG_XEN_BLKDEV_FRONTEND=m
-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
-#
-CONFIG_SENSORS_LIS3LV02D=m
-CONFIG_AD525X_DPOT=m
-CONFIG_AD525X_DPOT_I2C=m
-# CONFIG_AD525X_DPOT_SPI is not set
-# CONFIG_DUMMY_IRQ is not set
-# CONFIG_IBM_ASM is not set
-CONFIG_PHANTOM=m
-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
-CONFIG_CS5535_CLOCK_EVENT_SRC=m
-CONFIG_HP_ILO=m
-CONFIG_APDS9802ALS=m
-CONFIG_ISL29003=m
-CONFIG_ISL29020=m
-CONFIG_SENSORS_TSL2550=m
-CONFIG_SENSORS_BH1780=m
-CONFIG_SENSORS_BH1770=m
-CONFIG_SENSORS_APDS990X=m
-CONFIG_HMC6352=m
-CONFIG_DS1682=m
-# CONFIG_TI_DAC7512 is not set
-CONFIG_VMWARE_BALLOON=m
-CONFIG_BMP085=y
-CONFIG_BMP085_I2C=m
-# CONFIG_BMP085_SPI is not set
-CONFIG_PCH_PHUB=m
-CONFIG_USB_SWITCH_FSA9480=m
-# CONFIG_LATTICE_ECP3_CONFIG is not set
-# CONFIG_SRAM is not set
-CONFIG_C2PORT=m
-CONFIG_C2PORT_DURAMAR_2150=m
-
-#
-# EEPROM support
-#
-CONFIG_EEPROM_AT24=m
-# CONFIG_EEPROM_AT25 is not set
-CONFIG_EEPROM_LEGACY=m
-CONFIG_EEPROM_MAX6875=m
-CONFIG_EEPROM_93CX6=m
-# CONFIG_EEPROM_93XX46 is not set
-CONFIG_CB710_CORE=m
-# CONFIG_CB710_DEBUG is not set
-CONFIG_CB710_DEBUG_ASSUMPTIONS=y
-
-#
-# Texas Instruments shared transport line discipline
-#
-CONFIG_TI_ST=m
-CONFIG_SENSORS_LIS3_I2C=m
-
-#
-# Altera FPGA firmware download module
-#
-CONFIG_ALTERA_STAPL=m
-CONFIG_INTEL_MEI=m
-CONFIG_INTEL_MEI_ME=m
-CONFIG_VMWARE_VMCI=m
-CONFIG_HAVE_IDE=y
-# CONFIG_IDE is not set
-
-#
-# SCSI device support
-#
-CONFIG_SCSI_MOD=m
-CONFIG_RAID_ATTRS=m
-CONFIG_SCSI=m
-CONFIG_SCSI_DMA=y
-CONFIG_SCSI_TGT=m
-CONFIG_SCSI_NETLINK=y
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=m
-CONFIG_CHR_DEV_ST=m
-CONFIG_CHR_DEV_OSST=m
-CONFIG_BLK_DEV_SR=m
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SG=m
-CONFIG_CHR_DEV_SCH=m
-CONFIG_SCSI_ENCLOSURE=m
-CONFIG_SCSI_MULTI_LUN=y
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
-
-#
-# SCSI Transports
-#
-CONFIG_SCSI_SPI_ATTRS=m
-CONFIG_SCSI_FC_ATTRS=m
-# CONFIG_SCSI_FC_TGT_ATTRS is not set
-CONFIG_SCSI_ISCSI_ATTRS=m
-CONFIG_SCSI_SAS_ATTRS=m
-CONFIG_SCSI_SAS_LIBSAS=m
-CONFIG_SCSI_SAS_ATA=y
-CONFIG_SCSI_SAS_HOST_SMP=y
-CONFIG_SCSI_SRP_ATTRS=m
-CONFIG_SCSI_SRP_TGT_ATTRS=y
-CONFIG_SCSI_LOWLEVEL=y
-CONFIG_ISCSI_TCP=m
-CONFIG_ISCSI_BOOT_SYSFS=m
-CONFIG_SCSI_CXGB3_ISCSI=m
-CONFIG_SCSI_CXGB4_ISCSI=m
-CONFIG_SCSI_BNX2_ISCSI=m
-CONFIG_SCSI_BNX2X_FCOE=m
-CONFIG_BE2ISCSI=m
-CONFIG_BLK_DEV_3W_XXXX_RAID=m
-CONFIG_SCSI_HPSA=m
-CONFIG_SCSI_3W_9XXX=m
-CONFIG_SCSI_3W_SAS=m
-CONFIG_SCSI_ACARD=m
-CONFIG_SCSI_AACRAID=m
-CONFIG_SCSI_AIC7XXX=m
-CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
-CONFIG_AIC7XXX_RESET_DELAY_MS=15000
-# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
-CONFIG_AIC7XXX_DEBUG_MASK=0
-CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
-# CONFIG_SCSI_AIC7XXX_OLD is not set
-CONFIG_SCSI_AIC79XX=m
-CONFIG_AIC79XX_CMDS_PER_DEVICE=32
-CONFIG_AIC79XX_RESET_DELAY_MS=15000
-# CONFIG_AIC79XX_DEBUG_ENABLE is not set
-CONFIG_AIC79XX_DEBUG_MASK=0
-CONFIG_AIC79XX_REG_PRETTY_PRINT=y
-CONFIG_SCSI_AIC94XX=m
-# CONFIG_AIC94XX_DEBUG is not set
-CONFIG_SCSI_MVSAS=m
-# CONFIG_SCSI_MVSAS_DEBUG is not set
-CONFIG_SCSI_MVSAS_TASKLET=y
-CONFIG_SCSI_MVUMI=m
-CONFIG_SCSI_DPT_I2O=m
-CONFIG_SCSI_ADVANSYS=m
-CONFIG_SCSI_ARCMSR=m
-CONFIG_MEGARAID_NEWGEN=y
-CONFIG_MEGARAID_MM=m
-CONFIG_MEGARAID_MAILBOX=m
-CONFIG_MEGARAID_LEGACY=m
-CONFIG_MEGARAID_SAS=m
-CONFIG_SCSI_MPT2SAS=m
-CONFIG_SCSI_MPT2SAS_MAX_SGE=128
-# CONFIG_SCSI_MPT2SAS_LOGGING is not set
-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_UFSHCD_PLATFORM=m
-CONFIG_SCSI_HPTIOP=m
-CONFIG_SCSI_BUSLOGIC=m
-CONFIG_SCSI_FLASHPOINT=y
-CONFIG_VMWARE_PVSCSI=m
-CONFIG_HYPERV_STORAGE=m
-CONFIG_LIBFC=m
-CONFIG_LIBFCOE=m
-CONFIG_FCOE=m
-CONFIG_FCOE_FNIC=m
-CONFIG_SCSI_DMX3191D=m
-CONFIG_SCSI_EATA=m
-# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set
-# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set
-CONFIG_SCSI_EATA_MAX_TAGS=16
-CONFIG_SCSI_FUTURE_DOMAIN=m
-CONFIG_SCSI_GDTH=m
-CONFIG_SCSI_ISCI=m
-CONFIG_SCSI_IPS=m
-CONFIG_SCSI_INITIO=m
-CONFIG_SCSI_INIA100=m
-CONFIG_SCSI_PPA=m
-CONFIG_SCSI_IMM=m
-# CONFIG_SCSI_IZIP_EPP16 is not set
-# CONFIG_SCSI_IZIP_SLOW_CTR is not set
-CONFIG_SCSI_STEX=m
-CONFIG_SCSI_SYM53C8XX_2=m
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
-CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-CONFIG_SCSI_SYM53C8XX_MMIO=y
-CONFIG_SCSI_IPR=m
-# CONFIG_SCSI_IPR_TRACE is not set
-# CONFIG_SCSI_IPR_DUMP is not set
-CONFIG_SCSI_QLOGIC_1280=m
-CONFIG_SCSI_QLA_FC=m
-CONFIG_TCM_QLA2XXX=m
-CONFIG_SCSI_QLA_ISCSI=m
-CONFIG_SCSI_LPFC=m
-# CONFIG_SCSI_LPFC_DEBUG_FS is not set
-CONFIG_SCSI_DC395x=m
-CONFIG_SCSI_DC390T=m
-# CONFIG_SCSI_DEBUG is not set
-CONFIG_SCSI_PMCRAID=m
-CONFIG_SCSI_PM8001=m
-CONFIG_SCSI_SRP=m
-CONFIG_SCSI_BFA_FC=m
-CONFIG_SCSI_VIRTIO=m
-CONFIG_SCSI_CHELSIO_FCOE=m
-CONFIG_SCSI_LOWLEVEL_PCMCIA=y
-CONFIG_PCMCIA_AHA152X=m
-CONFIG_PCMCIA_FDOMAIN=m
-CONFIG_PCMCIA_QLOGIC=m
-CONFIG_PCMCIA_SYM53C500=m
-CONFIG_SCSI_DH=m
-CONFIG_SCSI_DH_RDAC=m
-CONFIG_SCSI_DH_HP_SW=m
-CONFIG_SCSI_DH_EMC=m
-CONFIG_SCSI_DH_ALUA=m
-CONFIG_SCSI_OSD_INITIATOR=m
-CONFIG_SCSI_OSD_ULD=m
-CONFIG_SCSI_OSD_DPRINT_SENSE=0
-# CONFIG_SCSI_OSD_DEBUG is not set
-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
-
-#
-# Controllers with non-SFF native interface
-#
-CONFIG_SATA_AHCI=m
-CONFIG_SATA_AHCI_PLATFORM=m
-CONFIG_SATA_INIC162X=m
-CONFIG_SATA_ACARD_AHCI=m
-CONFIG_SATA_SIL24=m
-CONFIG_ATA_SFF=y
-
-#
-# SFF controllers with custom DMA interface
-#
-CONFIG_PDC_ADMA=m
-CONFIG_SATA_QSTOR=m
-CONFIG_SATA_SX4=m
-CONFIG_ATA_BMDMA=y
-
-#
-# SATA SFF controllers with BMDMA
-#
-CONFIG_ATA_PIIX=m
-CONFIG_SATA_HIGHBANK=m
-CONFIG_SATA_MV=m
-CONFIG_SATA_NV=m
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_RCAR=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SVW=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_VIA=m
-CONFIG_SATA_VITESSE=m
-
-#
-# PATA SFF controllers with BMDMA
-#
-CONFIG_PATA_ALI=m
-CONFIG_PATA_AMD=m
-CONFIG_PATA_ARASAN_CF=m
-CONFIG_PATA_ARTOP=m
-CONFIG_PATA_ATIIXP=m
-CONFIG_PATA_ATP867X=m
-CONFIG_PATA_CMD64X=m
-CONFIG_PATA_CS5520=m
-CONFIG_PATA_CS5530=m
-CONFIG_PATA_CS5536=m
-CONFIG_PATA_CYPRESS=m
-CONFIG_PATA_EFAR=m
-CONFIG_PATA_HPT366=m
-CONFIG_PATA_HPT37X=m
-CONFIG_PATA_HPT3X2N=m
-CONFIG_PATA_HPT3X3=m
-# CONFIG_PATA_HPT3X3_DMA is not set
-CONFIG_PATA_IT8213=m
-CONFIG_PATA_IT821X=m
-CONFIG_PATA_JMICRON=m
-CONFIG_PATA_MARVELL=m
-CONFIG_PATA_NETCELL=m
-CONFIG_PATA_NINJA32=m
-CONFIG_PATA_NS87415=m
-CONFIG_PATA_OLDPIIX=m
-CONFIG_PATA_OPTIDMA=m
-CONFIG_PATA_PDC2027X=m
-CONFIG_PATA_PDC_OLD=m
-CONFIG_PATA_RADISYS=m
-CONFIG_PATA_RDC=m
-CONFIG_PATA_SC1200=m
-CONFIG_PATA_SCH=m
-CONFIG_PATA_SERVERWORKS=m
-CONFIG_PATA_SIL680=m
-CONFIG_PATA_SIS=m
-CONFIG_PATA_TOSHIBA=m
-CONFIG_PATA_TRIFLEX=m
-CONFIG_PATA_VIA=m
-CONFIG_PATA_WINBOND=m
-
-#
-# PIO-only SFF controllers
-#
-CONFIG_PATA_CMD640_PCI=m
-CONFIG_PATA_MPIIX=m
-CONFIG_PATA_NS87410=m
-CONFIG_PATA_OPTI=m
-CONFIG_PATA_PCMCIA=m
-CONFIG_PATA_RZ1000=m
-
-#
-# Generic fallback / legacy drivers
-#
-CONFIG_PATA_ACPI=m
-CONFIG_ATA_GENERIC=m
-CONFIG_PATA_LEGACY=m
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=m
-CONFIG_MD_LINEAR=m
-CONFIG_MD_RAID0=m
-CONFIG_MD_RAID1=m
-CONFIG_MD_RAID10=m
-CONFIG_MD_RAID456=m
-CONFIG_MD_MULTIPATH=m
-CONFIG_MD_FAULTY=m
-CONFIG_BCACHE=m
-# CONFIG_BCACHE_DEBUG is not set
-# CONFIG_BCACHE_EDEBUG is not set
-# CONFIG_BCACHE_CLOSURES_DEBUG is not set
-CONFIG_BLK_DEV_DM=m
-# CONFIG_DM_DEBUG is not set
-CONFIG_DM_BUFIO=m
-CONFIG_DM_BIO_PRISON=m
-CONFIG_DM_PERSISTENT_DATA=m
-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
-CONFIG_DM_ZERO=m
-CONFIG_DM_MULTIPATH=m
-CONFIG_DM_MULTIPATH_QL=m
-CONFIG_DM_MULTIPATH_ST=m
-CONFIG_DM_DELAY=m
-CONFIG_DM_UEVENT=y
-CONFIG_DM_FLAKEY=m
-CONFIG_DM_VERITY=m
-CONFIG_DM_SWITCH=m
-CONFIG_TARGET_CORE=m
-CONFIG_TCM_IBLOCK=m
-CONFIG_TCM_FILEIO=m
-CONFIG_TCM_PSCSI=m
-CONFIG_LOOPBACK_TARGET=m
-CONFIG_TCM_FC=m
-CONFIG_ISCSI_TARGET=m
-CONFIG_SBP_TARGET=m
-CONFIG_FUSION=y
-CONFIG_FUSION_SPI=m
-CONFIG_FUSION_FC=m
-CONFIG_FUSION_SAS=m
-CONFIG_FUSION_MAX_SGE=128
-CONFIG_FUSION_CTL=m
-# CONFIG_FUSION_LOGGING is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-CONFIG_FIREWIRE=m
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-CONFIG_FIREWIRE_NET=m
-CONFIG_FIREWIRE_NOSY=m
-CONFIG_I2O=m
-CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
-CONFIG_I2O_EXT_ADAPTEC=y
-CONFIG_I2O_EXT_ADAPTEC_DMA64=y
-CONFIG_I2O_CONFIG=m
-CONFIG_I2O_CONFIG_OLD_IOCTL=y
-CONFIG_I2O_BUS=m
-CONFIG_I2O_BLOCK=m
-CONFIG_I2O_SCSI=m
-CONFIG_I2O_PROC=m
-CONFIG_MACINTOSH_DRIVERS=y
-CONFIG_MAC_EMUMOUSEBTN=y
-CONFIG_NETDEVICES=y
-CONFIG_MII=m
-CONFIG_NET_CORE=y
-CONFIG_BONDING=m
-CONFIG_DUMMY=m
-CONFIG_EQUALIZER=m
-# CONFIG_NET_FC is not set
-CONFIG_IFB=m
-CONFIG_NET_TEAM=m
-CONFIG_NET_TEAM_MODE_BROADCAST=m
-CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
-CONFIG_NET_TEAM_MODE_RANDOM=m
-CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
-CONFIG_NET_TEAM_MODE_LOADBALANCE=m
-CONFIG_MACVLAN=m
-CONFIG_MACVTAP=m
-CONFIG_VXLAN=m
-CONFIG_NETCONSOLE=m
-CONFIG_NETCONSOLE_DYNAMIC=y
-CONFIG_NETPOLL=y
-# CONFIG_NETPOLL_TRAP is not set
-CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_RIONET=m
-CONFIG_RIONET_TX_SIZE=128
-CONFIG_RIONET_RX_SIZE=128
-CONFIG_TUN=m
-CONFIG_VETH=m
-CONFIG_VIRTIO_NET=m
-CONFIG_NLMON=m
-CONFIG_SUNGEM_PHY=m
-# CONFIG_ARCNET is not set
-CONFIG_ATM_DRIVERS=y
-# CONFIG_ATM_DUMMY is not set
-CONFIG_ATM_TCP=m
-CONFIG_ATM_LANAI=m
-CONFIG_ATM_ENI=m
-# CONFIG_ATM_ENI_DEBUG is not set
-# CONFIG_ATM_ENI_TUNE_BURST is not set
-CONFIG_ATM_FIRESTREAM=m
-CONFIG_ATM_ZATM=m
-# CONFIG_ATM_ZATM_DEBUG is not set
-CONFIG_ATM_NICSTAR=m
-# CONFIG_ATM_NICSTAR_USE_SUNI is not set
-# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
-CONFIG_ATM_IDT77252=m
-# CONFIG_ATM_IDT77252_DEBUG is not set
-# CONFIG_ATM_IDT77252_RCV_ALL is not set
-CONFIG_ATM_IDT77252_USE_SUNI=y
-CONFIG_ATM_AMBASSADOR=m
-# CONFIG_ATM_AMBASSADOR_DEBUG is not set
-CONFIG_ATM_HORIZON=m
-# CONFIG_ATM_HORIZON_DEBUG is not set
-CONFIG_ATM_IA=m
-# CONFIG_ATM_IA_DEBUG is not set
-CONFIG_ATM_FORE200E=m
-# CONFIG_ATM_FORE200E_USE_TASKLET is not set
-CONFIG_ATM_FORE200E_TX_RETRY=16
-CONFIG_ATM_FORE200E_DEBUG=0
-CONFIG_ATM_HE=m
-# CONFIG_ATM_HE_USE_SUNI is not set
-CONFIG_ATM_SOLOS=m
-
-#
-# CAIF transport drivers
-#
-CONFIG_CAIF_TTY=m
-CONFIG_CAIF_SPI_SLAVE=m
-CONFIG_CAIF_SPI_SYNC=y
-CONFIG_CAIF_HSI=m
-CONFIG_CAIF_VIRTIO=m
-CONFIG_VHOST_NET=m
-CONFIG_VHOST_SCSI=m
-CONFIG_VHOST_RING=m
-CONFIG_VHOST=m
-
-#
-# Distributed Switch Architecture drivers
-#
-CONFIG_NET_DSA_MV88E6XXX=m
-CONFIG_NET_DSA_MV88E6060=m
-CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y
-CONFIG_NET_DSA_MV88E6131=m
-CONFIG_NET_DSA_MV88E6123_61_65=m
-CONFIG_ETHERNET=y
-CONFIG_MDIO=m
-CONFIG_NET_VENDOR_3COM=y
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_3C589=m
-CONFIG_VORTEX=m
-CONFIG_TYPHOON=m
-CONFIG_NET_VENDOR_ADAPTEC=y
-CONFIG_ADAPTEC_STARFIRE=m
-CONFIG_NET_VENDOR_ALTEON=y
-CONFIG_ACENIC=m
-# CONFIG_ACENIC_OMIT_TIGON_I is not set
-CONFIG_NET_VENDOR_AMD=y
-CONFIG_AMD8111_ETH=m
-CONFIG_PCNET32=m
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_NET_VENDOR_ARC=y
-CONFIG_NET_VENDOR_ATHEROS=y
-CONFIG_ATL2=m
-CONFIG_ATL1=m
-CONFIG_ATL1E=m
-CONFIG_ATL1C=m
-CONFIG_ALX=m
-CONFIG_NET_CADENCE=y
-CONFIG_ARM_AT91_ETHER=m
-CONFIG_MACB=m
-CONFIG_NET_VENDOR_BROADCOM=y
-CONFIG_B44=m
-CONFIG_B44_PCI_AUTOSELECT=y
-CONFIG_B44_PCICORE_AUTOSELECT=y
-CONFIG_B44_PCI=y
-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
-CONFIG_NET_VENDOR_CHELSIO=y
-CONFIG_CHELSIO_T1=m
-CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T3=m
-CONFIG_CHELSIO_T4=m
-CONFIG_CHELSIO_T4VF=m
-CONFIG_NET_VENDOR_CISCO=y
-CONFIG_ENIC=m
-CONFIG_DNET=m
-CONFIG_NET_VENDOR_DEC=y
-CONFIG_NET_TULIP=y
-CONFIG_DE2104X=m
-CONFIG_DE2104X_DSL=0
-CONFIG_TULIP=m
-# CONFIG_TULIP_MWI is not set
-# CONFIG_TULIP_MMIO is not set
-# CONFIG_TULIP_NAPI is not set
-CONFIG_DE4X5=m
-CONFIG_WINBOND_840=m
-CONFIG_DM9102=m
-CONFIG_ULI526X=m
-CONFIG_PCMCIA_XIRCOM=m
-CONFIG_NET_VENDOR_DLINK=y
-CONFIG_DL2K=m
-CONFIG_SUNDANCE=m
-# CONFIG_SUNDANCE_MMIO is not set
-CONFIG_NET_VENDOR_EMULEX=y
-CONFIG_BE2NET=m
-CONFIG_NET_VENDOR_EXAR=y
-CONFIG_S2IO=m
-CONFIG_VXGE=m
-# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
-CONFIG_NET_VENDOR_FUJITSU=y
-CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_NET_VENDOR_HP=y
-CONFIG_HP100=m
-CONFIG_NET_VENDOR_INTEL=y
-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
-CONFIG_IXGBE=m
-CONFIG_IXGBE_HWMON=y
-CONFIG_IXGBE_DCA=y
-CONFIG_IXGBEVF=m
-CONFIG_NET_VENDOR_I825XX=y
-CONFIG_IP1000=m
-CONFIG_JME=m
-CONFIG_NET_VENDOR_MARVELL=y
-CONFIG_MVMDIO=m
-CONFIG_SKGE=m
-# CONFIG_SKGE_DEBUG is not set
-CONFIG_SKGE_GENESIS=y
-CONFIG_SKY2=m
-# CONFIG_SKY2_DEBUG is not set
-CONFIG_NET_VENDOR_MELLANOX=y
-CONFIG_MLX4_EN=m
-CONFIG_MLX4_CORE=m
-CONFIG_MLX4_DEBUG=y
-# CONFIG_MLX5_CORE is not set
-CONFIG_NET_VENDOR_MICREL=y
-CONFIG_KS8842=m
-# CONFIG_KS8851 is not set
-CONFIG_KS8851_MLL=m
-CONFIG_KSZ884X_PCI=m
-CONFIG_NET_VENDOR_MICROCHIP=y
-# CONFIG_ENC28J60 is not set
-CONFIG_NET_VENDOR_MYRI=y
-CONFIG_MYRI10GE=m
-CONFIG_MYRI10GE_DCA=y
-CONFIG_FEALNX=m
-CONFIG_NET_VENDOR_NATSEMI=y
-CONFIG_NATSEMI=m
-CONFIG_NS83820=m
-CONFIG_NET_VENDOR_8390=y
-CONFIG_PCMCIA_AXNET=m
-CONFIG_NE2K_PCI=m
-CONFIG_PCMCIA_PCNET=m
-CONFIG_NET_VENDOR_NVIDIA=y
-CONFIG_FORCEDETH=m
-CONFIG_NET_VENDOR_OKI=y
-CONFIG_PCH_GBE=m
-CONFIG_ETHOC=m
-CONFIG_NET_PACKET_ENGINE=y
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_NET_VENDOR_QLOGIC=y
-CONFIG_QLA3XXX=m
-CONFIG_QLCNIC=m
-CONFIG_QLCNIC_SRIOV=y
-CONFIG_QLGE=m
-CONFIG_NETXEN_NIC=m
-CONFIG_NET_VENDOR_REALTEK=y
-CONFIG_ATP=m
-CONFIG_8139CP=m
-CONFIG_8139TOO=m
-# CONFIG_8139TOO_PIO is not set
-CONFIG_8139TOO_TUNE_TWISTER=y
-CONFIG_8139TOO_8129=y
-# CONFIG_8139_OLD_RX_RESET is not set
-CONFIG_R8169=m
-CONFIG_SH_ETH=m
-CONFIG_NET_VENDOR_RDC=y
-CONFIG_R6040=m
-CONFIG_NET_VENDOR_SEEQ=y
-CONFIG_NET_VENDOR_SILAN=y
-CONFIG_SC92031=m
-CONFIG_NET_VENDOR_SIS=y
-CONFIG_SIS900=m
-CONFIG_SIS190=m
-CONFIG_SFC=m
-CONFIG_SFC_MTD=y
-CONFIG_SFC_MCDI_MON=y
-CONFIG_SFC_SRIOV=y
-CONFIG_NET_VENDOR_SMSC=y
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_EPIC100=m
-CONFIG_SMSC911X=m
-# CONFIG_SMSC911X_ARCH_HOOKS is not set
-CONFIG_SMSC9420=m
-CONFIG_NET_VENDOR_STMICRO=y
-CONFIG_STMMAC_ETH=m
-# CONFIG_STMMAC_PLATFORM is not set
-CONFIG_STMMAC_PCI=y
-# CONFIG_STMMAC_DEBUG_FS is not set
-# CONFIG_STMMAC_DA is not set
-CONFIG_NET_VENDOR_SUN=y
-CONFIG_HAPPYMEAL=m
-CONFIG_SUNGEM=m
-CONFIG_CASSINI=m
-CONFIG_NIU=m
-CONFIG_NET_VENDOR_TEHUTI=y
-CONFIG_TEHUTI=m
-CONFIG_NET_VENDOR_TI=y
-CONFIG_TLAN=m
-CONFIG_NET_VENDOR_VIA=y
-CONFIG_VIA_RHINE=m
-# CONFIG_VIA_RHINE_MMIO is not set
-CONFIG_VIA_VELOCITY=m
-CONFIG_NET_VENDOR_WIZNET=y
-CONFIG_WIZNET_W5100=m
-CONFIG_WIZNET_W5300=m
-# CONFIG_WIZNET_BUS_DIRECT is not set
-# CONFIG_WIZNET_BUS_INDIRECT is not set
-CONFIG_WIZNET_BUS_ANY=y
-CONFIG_NET_VENDOR_XIRCOM=y
-CONFIG_PCMCIA_XIRC2PS=m
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-CONFIG_NET_SB1000=m
-CONFIG_PHYLIB=m
-
-#
-# MII PHY device drivers
-#
-CONFIG_AT803X_PHY=m
-CONFIG_AMD_PHY=m
-CONFIG_MARVELL_PHY=m
-CONFIG_DAVICOM_PHY=m
-CONFIG_QSEMI_PHY=m
-CONFIG_LXT_PHY=m
-CONFIG_CICADA_PHY=m
-CONFIG_VITESSE_PHY=m
-CONFIG_SMSC_PHY=m
-CONFIG_BROADCOM_PHY=m
-CONFIG_BCM87XX_PHY=m
-CONFIG_ICPLUS_PHY=m
-CONFIG_REALTEK_PHY=m
-CONFIG_NATIONAL_PHY=m
-CONFIG_STE10XP=m
-CONFIG_LSI_ET1011C_PHY=m
-CONFIG_MICREL_PHY=m
-CONFIG_MDIO_BITBANG=m
-# CONFIG_MDIO_GPIO is not set
-# CONFIG_MICREL_KS8995MA is not set
-CONFIG_PLIP=m
-CONFIG_PPP=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_MPPE=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPPOATM=m
-CONFIG_PPPOE=m
-CONFIG_PPTP=m
-CONFIG_PPPOL2TP=m
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_SLIP=m
-CONFIG_SLHC=m
-# CONFIG_SLIP_COMPRESSED is not set
-# CONFIG_SLIP_SMART is not set
-# CONFIG_SLIP_MODE_SLIP6 is not set
-
-#
-# USB Network Adapters
-#
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_RTL8152=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
-CONFIG_USB_NET_CDC_MBIM=m
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_SMSC75XX=m
-CONFIG_USB_NET_SMSC95XX=m
-CONFIG_USB_NET_GL620A=m
-CONFIG_USB_NET_NET1080=m
-CONFIG_USB_NET_PLUSB=m
-CONFIG_USB_NET_MCS7830=m
-CONFIG_USB_NET_RNDIS_HOST=m
-CONFIG_USB_NET_CDC_SUBSET=m
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-CONFIG_USB_BELKIN=y
-CONFIG_USB_ARMLINUX=y
-CONFIG_USB_EPSON2888=y
-CONFIG_USB_KC2190=y
-CONFIG_USB_NET_ZAURUS=m
-CONFIG_USB_NET_CX82310_ETH=m
-CONFIG_USB_NET_KALMIA=m
-CONFIG_USB_NET_QMI_WWAN=m
-CONFIG_USB_HSO=m
-CONFIG_USB_NET_INT51X1=m
-CONFIG_USB_CDC_PHONET=m
-CONFIG_USB_IPHETH=m
-CONFIG_USB_SIERRA_NET=m
-CONFIG_USB_VL600=m
-CONFIG_WLAN=y
-CONFIG_PCMCIA_RAYCS=m
-CONFIG_LIBERTAS_THINFIRM=m
-# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
-CONFIG_LIBERTAS_THINFIRM_USB=m
-CONFIG_AIRO=m
-CONFIG_ATMEL=m
-CONFIG_PCI_ATMEL=m
-CONFIG_PCMCIA_ATMEL=m
-CONFIG_AT76C50X_USB=m
-CONFIG_AIRO_CS=m
-CONFIG_PCMCIA_WL3501=m
-CONFIG_PRISM54=m
-CONFIG_USB_ZD1201=m
-CONFIG_USB_NET_RNDIS_WLAN=m
-CONFIG_RTL8180=m
-CONFIG_RTL8187=m
-CONFIG_RTL8187_LEDS=y
-CONFIG_ADM8211=m
-# CONFIG_MAC80211_HWSIM is not set
-CONFIG_MWL8K=m
-CONFIG_ATH_COMMON=m
-CONFIG_ATH_CARDS=m
-# CONFIG_ATH_DEBUG is not set
-CONFIG_ATH5K=m
-# CONFIG_ATH5K_DEBUG is not set
-# CONFIG_ATH5K_TRACER is not set
-CONFIG_ATH5K_PCI=y
-CONFIG_ATH9K_HW=m
-CONFIG_ATH9K_COMMON=m
-CONFIG_ATH9K_BTCOEX_SUPPORT=y
-CONFIG_ATH9K=m
-CONFIG_ATH9K_PCI=y
-CONFIG_ATH9K_AHB=y
-# CONFIG_ATH9K_DEBUGFS is not set
-# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set
-CONFIG_ATH9K_HTC=m
-# CONFIG_ATH9K_HTC_DEBUGFS is not set
-CONFIG_CARL9170=m
-CONFIG_CARL9170_LEDS=y
-CONFIG_CARL9170_WPC=y
-# CONFIG_CARL9170_HWRNG is not set
-CONFIG_ATH6KL=m
-CONFIG_ATH6KL_SDIO=m
-CONFIG_ATH6KL_USB=m
-# CONFIG_ATH6KL_DEBUG is not set
-# CONFIG_ATH6KL_TRACING is not set
-CONFIG_AR5523=m
-CONFIG_WIL6210=m
-CONFIG_WIL6210_ISR_COR=y
-# CONFIG_WIL6210_TRACING is not set
-CONFIG_ATH10K=m
-CONFIG_ATH10K_PCI=m
-# CONFIG_ATH10K_DEBUG is not set
-CONFIG_ATH10K_DEBUGFS=y
-# CONFIG_ATH10K_TRACING is not set
-CONFIG_B43=m
-CONFIG_B43_BCMA=y
-CONFIG_B43_SSB=y
-CONFIG_B43_PCI_AUTOSELECT=y
-CONFIG_B43_PCICORE_AUTOSELECT=y
-CONFIG_B43_PCMCIA=y
-CONFIG_B43_SDIO=y
-CONFIG_B43_BCMA_PIO=y
-CONFIG_B43_PIO=y
-CONFIG_B43_PHY_N=y
-CONFIG_B43_PHY_LP=y
-CONFIG_B43_PHY_HT=y
-CONFIG_B43_LEDS=y
-CONFIG_B43_HWRNG=y
-# CONFIG_B43_DEBUG is not set
-CONFIG_B43LEGACY=m
-CONFIG_B43LEGACY_PCI_AUTOSELECT=y
-CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
-CONFIG_B43LEGACY_LEDS=y
-CONFIG_B43LEGACY_HWRNG=y
-# CONFIG_B43LEGACY_DEBUG is not set
-CONFIG_B43LEGACY_DMA=y
-CONFIG_B43LEGACY_PIO=y
-CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
-# CONFIG_B43LEGACY_DMA_MODE is not set
-# CONFIG_B43LEGACY_PIO_MODE is not set
-CONFIG_BRCMUTIL=m
-CONFIG_BRCMSMAC=m
-CONFIG_BRCMFMAC=m
-CONFIG_BRCMFMAC_SDIO=y
-CONFIG_BRCMFMAC_USB=y
-# CONFIG_BRCM_TRACING is not set
-# CONFIG_BRCMDBG is not set
-CONFIG_HOSTAP=m
-CONFIG_HOSTAP_FIRMWARE=y
-# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
-CONFIG_HOSTAP_PLX=m
-CONFIG_HOSTAP_PCI=m
-CONFIG_HOSTAP_CS=m
-# CONFIG_IPW2100 is not set
-# CONFIG_IPW2200 is not set
-CONFIG_IWLWIFI=m
-CONFIG_IWLDVM=m
-CONFIG_IWLMVM=m
-CONFIG_IWLWIFI_OPMODE_MODULAR=y
-
-#
-# Debugging Options
-#
-# CONFIG_IWLWIFI_DEBUG is not set
-CONFIG_IWLWIFI_DEVICE_TRACING=y
-# CONFIG_IWLWIFI_P2P is not set
-CONFIG_IWLEGACY=m
-CONFIG_IWL4965=m
-CONFIG_IWL3945=m
-
-#
-# iwl3945 / iwl4965 Debugging Options
-#
-# CONFIG_IWLEGACY_DEBUG is not set
-CONFIG_LIBERTAS=m
-CONFIG_LIBERTAS_USB=m
-CONFIG_LIBERTAS_CS=m
-CONFIG_LIBERTAS_SDIO=m
-# CONFIG_LIBERTAS_SPI is not set
-# CONFIG_LIBERTAS_DEBUG is not set
-CONFIG_LIBERTAS_MESH=y
-CONFIG_HERMES=m
-CONFIG_HERMES_PRISM=y
-CONFIG_HERMES_CACHE_FW_ON_INIT=y
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_NORTEL_HERMES=m
-CONFIG_PCI_HERMES=m
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA_SPECTRUM=m
-CONFIG_ORINOCO_USB=m
-CONFIG_P54_COMMON=m
-CONFIG_P54_USB=m
-CONFIG_P54_PCI=m
-# CONFIG_P54_SPI is not set
-CONFIG_P54_LEDS=y
-CONFIG_RT2X00=m
-CONFIG_RT2400PCI=m
-CONFIG_RT2500PCI=m
-CONFIG_RT61PCI=m
-CONFIG_RT2800PCI=m
-CONFIG_RT2800PCI_RT33XX=y
-CONFIG_RT2800PCI_RT35XX=y
-CONFIG_RT2800PCI_RT53XX=y
-CONFIG_RT2800PCI_RT3290=y
-CONFIG_RT2500USB=m
-CONFIG_RT73USB=m
-CONFIG_RT2800USB=m
-CONFIG_RT2800USB_RT33XX=y
-CONFIG_RT2800USB_RT35XX=y
-CONFIG_RT2800USB_RT53XX=y
-CONFIG_RT2800USB_RT55XX=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
-CONFIG_RT2X00_LIB_FIRMWARE=y
-CONFIG_RT2X00_LIB_CRYPTO=y
-CONFIG_RT2X00_LIB_LEDS=y
-# CONFIG_RT2X00_DEBUG is not set
-CONFIG_RTL_CARDS=m
-CONFIG_RTL8192CE=m
-CONFIG_RTL8192SE=m
-CONFIG_RTL8192DE=m
-CONFIG_RTL8723AE=m
-CONFIG_RTL8188EE=m
-CONFIG_RTL8192CU=m
-CONFIG_RTLWIFI=m
-CONFIG_RTLWIFI_PCI=m
-CONFIG_RTLWIFI_USB=m
-# CONFIG_RTLWIFI_DEBUG is not set
-CONFIG_RTL8192C_COMMON=m
-CONFIG_WL_TI=y
-CONFIG_WL1251=m
-# CONFIG_WL1251_SPI is not set
-CONFIG_WL1251_SDIO=m
-CONFIG_WL12XX=m
-CONFIG_WL18XX=m
-CONFIG_WLCORE=m
-# CONFIG_WLCORE_SPI is not set
-CONFIG_WLCORE_SDIO=m
-CONFIG_WILINK_PLATFORM_DATA=y
-CONFIG_ZD1211RW=m
-# CONFIG_ZD1211RW_DEBUG is not set
-CONFIG_MWIFIEX=m
-CONFIG_MWIFIEX_SDIO=m
-CONFIG_MWIFIEX_PCIE=m
-CONFIG_MWIFIEX_USB=m
-CONFIG_CW1200=m
-CONFIG_CW1200_WLAN_SDIO=m
-CONFIG_CW1200_WLAN_SPI=m
-
-#
-# WiMAX Wireless Broadband devices
-#
-CONFIG_WIMAX_I2400M=m
-CONFIG_WIMAX_I2400M_USB=m
-CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
-# CONFIG_WAN is not set
-CONFIG_IEEE802154_DRIVERS=m
-CONFIG_IEEE802154_FAKEHARD=m
-CONFIG_IEEE802154_FAKELB=m
-CONFIG_IEEE802154_AT86RF230=m
-# CONFIG_IEEE802154_MRF24J40 is not set
-CONFIG_XEN_NETDEV_FRONTEND=m
-CONFIG_XEN_NETDEV_BACKEND=m
-CONFIG_VMXNET3=m
-CONFIG_HYPERV_NET=m
-CONFIG_ISDN=y
-CONFIG_ISDN_I4L=m
-CONFIG_ISDN_PPP=y
-CONFIG_ISDN_PPP_VJ=y
-CONFIG_ISDN_MPP=y
-CONFIG_IPPP_FILTER=y
-CONFIG_ISDN_PPP_BSDCOMP=m
-CONFIG_ISDN_AUDIO=y
-CONFIG_ISDN_TTY_FAX=y
-
-#
-# ISDN feature submodules
-#
-CONFIG_ISDN_DIVERSION=m
-
-#
-# ISDN4Linux hardware drivers
-#
-
-#
-# Passive cards
-#
-CONFIG_ISDN_DRV_HISAX=m
-
-#
-# D-channel protocol features
-#
-CONFIG_HISAX_EURO=y
-CONFIG_DE_AOC=y
-# CONFIG_HISAX_NO_SENDCOMPLETE is not set
-# CONFIG_HISAX_NO_LLC is not set
-# CONFIG_HISAX_NO_KEYPAD is not set
-CONFIG_HISAX_1TR6=y
-CONFIG_HISAX_NI1=y
-CONFIG_HISAX_MAX_CARDS=8
-
-#
-# HiSax supported cards
-#
-CONFIG_HISAX_16_3=y
-CONFIG_HISAX_TELESPCI=y
-CONFIG_HISAX_S0BOX=y
-CONFIG_HISAX_FRITZPCI=y
-CONFIG_HISAX_AVM_A1_PCMCIA=y
-CONFIG_HISAX_ELSA=y
-CONFIG_HISAX_DIEHLDIVA=y
-CONFIG_HISAX_SEDLBAUER=y
-CONFIG_HISAX_NETJET=y
-CONFIG_HISAX_NETJET_U=y
-CONFIG_HISAX_NICCY=y
-CONFIG_HISAX_BKM_A4T=y
-CONFIG_HISAX_SCT_QUADRO=y
-CONFIG_HISAX_GAZEL=y
-CONFIG_HISAX_HFC_PCI=y
-CONFIG_HISAX_W6692=y
-CONFIG_HISAX_HFC_SX=y
-CONFIG_HISAX_ENTERNOW_PCI=y
-# CONFIG_HISAX_DEBUG is not set
-
-#
-# HiSax PCMCIA card service modules
-#
-CONFIG_HISAX_SEDLBAUER_CS=m
-CONFIG_HISAX_ELSA_CS=m
-CONFIG_HISAX_AVM_A1_CS=m
-CONFIG_HISAX_TELES_CS=m
-
-#
-# HiSax sub driver modules
-#
-CONFIG_HISAX_ST5481=m
-CONFIG_HISAX_HFCUSB=m
-CONFIG_HISAX_HFC4S8S=m
-CONFIG_HISAX_FRITZ_PCIPNP=m
-
-#
-# Active cards
-#
-CONFIG_ISDN_CAPI=m
-CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
-CONFIG_CAPI_TRACE=y
-CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_ISDN_CAPI_CAPI20=m
-CONFIG_ISDN_CAPI_CAPIDRV=m
-
-#
-# CAPI hardware drivers
-#
-CONFIG_CAPI_AVM=y
-CONFIG_ISDN_DRV_AVMB1_B1PCI=m
-CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
-CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
-CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
-CONFIG_ISDN_DRV_AVMB1_T1PCI=m
-CONFIG_ISDN_DRV_AVMB1_C4=m
-CONFIG_CAPI_EICON=y
-CONFIG_ISDN_DIVAS=m
-CONFIG_ISDN_DIVAS_BRIPCI=y
-CONFIG_ISDN_DIVAS_PRIPCI=y
-CONFIG_ISDN_DIVAS_DIVACAPI=m
-CONFIG_ISDN_DIVAS_USERIDI=m
-CONFIG_ISDN_DIVAS_MAINT=m
-CONFIG_ISDN_DRV_GIGASET=m
-CONFIG_GIGASET_CAPI=y
-# CONFIG_GIGASET_I4L is not set
-# CONFIG_GIGASET_DUMMYLL is not set
-CONFIG_GIGASET_BASE=m
-CONFIG_GIGASET_M105=m
-CONFIG_GIGASET_M101=m
-# CONFIG_GIGASET_DEBUG is not set
-CONFIG_HYSDN=m
-CONFIG_HYSDN_CAPI=y
-CONFIG_MISDN=m
-CONFIG_MISDN_DSP=m
-CONFIG_MISDN_L1OIP=m
-
-#
-# mISDN hardware drivers
-#
-CONFIG_MISDN_HFCPCI=m
-CONFIG_MISDN_HFCMULTI=m
-CONFIG_MISDN_HFCUSB=m
-CONFIG_MISDN_AVMFRITZ=m
-CONFIG_MISDN_SPEEDFAX=m
-CONFIG_MISDN_INFINEON=m
-CONFIG_MISDN_W6692=m
-CONFIG_MISDN_NETJET=m
-CONFIG_MISDN_IPAC=m
-CONFIG_MISDN_ISAR=m
-CONFIG_ISDN_HDLC=m
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-CONFIG_INPUT_FF_MEMLESS=m
-CONFIG_INPUT_POLLDEV=m
-CONFIG_INPUT_SPARSEKMAP=m
-CONFIG_INPUT_MATRIXKMAP=m
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_JOYDEV=m
-CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_KEYBOARD_ADP5588=m
-CONFIG_KEYBOARD_ADP5589=m
-CONFIG_KEYBOARD_ATKBD=y
-CONFIG_KEYBOARD_QT1070=m
-CONFIG_KEYBOARD_QT2160=m
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_GPIO is not set
-# CONFIG_KEYBOARD_GPIO_POLLED is not set
-CONFIG_KEYBOARD_TCA6416=m
-CONFIG_KEYBOARD_TCA8418=m
-CONFIG_KEYBOARD_MATRIX=m
-# CONFIG_KEYBOARD_LM8323 is not set
-CONFIG_KEYBOARD_LM8333=m
-# CONFIG_KEYBOARD_MAX7359 is not set
-CONFIG_KEYBOARD_MCS=m
-CONFIG_KEYBOARD_MPR121=m
-# CONFIG_KEYBOARD_NEWTON is not set
-# CONFIG_KEYBOARD_OPENCORES is not set
-# CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-CONFIG_INPUT_MOUSE=y
-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
-CONFIG_MOUSE_PS2_SENTELIC=y
-# CONFIG_MOUSE_PS2_TOUCHKIT is not set
-CONFIG_MOUSE_SERIAL=y
-CONFIG_MOUSE_APPLETOUCH=m
-CONFIG_MOUSE_BCM5974=m
-CONFIG_MOUSE_CYAPA=m
-CONFIG_MOUSE_VSXXXAA=m
-# CONFIG_MOUSE_GPIO is not set
-CONFIG_MOUSE_SYNAPTICS_I2C=m
-CONFIG_MOUSE_SYNAPTICS_USB=m
-CONFIG_INPUT_JOYSTICK=y
-CONFIG_JOYSTICK_ANALOG=m
-CONFIG_JOYSTICK_A3D=m
-CONFIG_JOYSTICK_ADI=m
-CONFIG_JOYSTICK_COBRA=m
-CONFIG_JOYSTICK_GF2K=m
-CONFIG_JOYSTICK_GRIP=m
-CONFIG_JOYSTICK_GRIP_MP=m
-CONFIG_JOYSTICK_GUILLEMOT=m
-CONFIG_JOYSTICK_INTERACT=m
-CONFIG_JOYSTICK_SIDEWINDER=m
-CONFIG_JOYSTICK_TMDC=m
-CONFIG_JOYSTICK_IFORCE=m
-CONFIG_JOYSTICK_IFORCE_USB=y
-CONFIG_JOYSTICK_IFORCE_232=y
-CONFIG_JOYSTICK_WARRIOR=m
-CONFIG_JOYSTICK_MAGELLAN=m
-CONFIG_JOYSTICK_SPACEORB=m
-CONFIG_JOYSTICK_SPACEBALL=m
-CONFIG_JOYSTICK_STINGER=m
-CONFIG_JOYSTICK_TWIDJOY=m
-CONFIG_JOYSTICK_ZHENHUA=m
-CONFIG_JOYSTICK_DB9=m
-CONFIG_JOYSTICK_GAMECON=m
-CONFIG_JOYSTICK_TURBOGRAFX=m
-CONFIG_JOYSTICK_AS5011=m
-CONFIG_JOYSTICK_JOYDUMP=m
-CONFIG_JOYSTICK_XPAD=m
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-CONFIG_JOYSTICK_WALKERA0701=m
-CONFIG_INPUT_TABLET=y
-CONFIG_TABLET_USB_ACECAD=m
-CONFIG_TABLET_USB_AIPTEK=m
-CONFIG_TABLET_USB_GTCO=m
-CONFIG_TABLET_USB_HANWANG=m
-CONFIG_TABLET_USB_KBTAB=m
-CONFIG_TABLET_USB_WACOM=m
-CONFIG_INPUT_TOUCHSCREEN=y
-# CONFIG_TOUCHSCREEN_ADS7846 is not set
-# CONFIG_TOUCHSCREEN_AD7877 is not set
-CONFIG_TOUCHSCREEN_AD7879=m
-CONFIG_TOUCHSCREEN_AD7879_I2C=m
-# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
-CONFIG_TOUCHSCREEN_ATMEL_MXT=m
-CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
-CONFIG_TOUCHSCREEN_BU21013=m
-CONFIG_TOUCHSCREEN_CY8CTMG110=m
-CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
-CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
-# CONFIG_TOUCHSCREEN_CYTTSP_SPI is not set
-CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m
-CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m
-CONFIG_TOUCHSCREEN_CYTTSP4_SPI=m
-CONFIG_TOUCHSCREEN_DYNAPRO=m
-CONFIG_TOUCHSCREEN_HAMPSHIRE=m
-CONFIG_TOUCHSCREEN_EETI=m
-CONFIG_TOUCHSCREEN_FUJITSU=m
-CONFIG_TOUCHSCREEN_ILI210X=m
-CONFIG_TOUCHSCREEN_GUNZE=m
-CONFIG_TOUCHSCREEN_ELO=m
-CONFIG_TOUCHSCREEN_WACOM_W8001=m
-CONFIG_TOUCHSCREEN_WACOM_I2C=m
-CONFIG_TOUCHSCREEN_MAX11801=m
-CONFIG_TOUCHSCREEN_MCS5000=m
-CONFIG_TOUCHSCREEN_MMS114=m
-CONFIG_TOUCHSCREEN_MTOUCH=m
-CONFIG_TOUCHSCREEN_INEXIO=m
-CONFIG_TOUCHSCREEN_MK712=m
-CONFIG_TOUCHSCREEN_PENMOUNT=m
-CONFIG_TOUCHSCREEN_EDT_FT5X06=m
-CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
-CONFIG_TOUCHSCREEN_TOUCHWIN=m
-CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m
-CONFIG_TOUCHSCREEN_UCB1400=m
-CONFIG_TOUCHSCREEN_PIXCIR=m
-CONFIG_TOUCHSCREEN_WM97XX=m
-CONFIG_TOUCHSCREEN_WM9705=y
-CONFIG_TOUCHSCREEN_WM9712=y
-CONFIG_TOUCHSCREEN_WM9713=y
-CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
-CONFIG_TOUCHSCREEN_MC13783=m
-CONFIG_TOUCHSCREEN_USB_EGALAX=y
-CONFIG_TOUCHSCREEN_USB_PANJIT=y
-CONFIG_TOUCHSCREEN_USB_3M=y
-CONFIG_TOUCHSCREEN_USB_ITM=y
-CONFIG_TOUCHSCREEN_USB_ETURBO=y
-CONFIG_TOUCHSCREEN_USB_GUNZE=y
-CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
-CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
-CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
-CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
-CONFIG_TOUCHSCREEN_USB_GOTOP=y
-CONFIG_TOUCHSCREEN_USB_JASTEC=y
-CONFIG_TOUCHSCREEN_USB_ELO=y
-CONFIG_TOUCHSCREEN_USB_E2I=y
-CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
-CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
-CONFIG_TOUCHSCREEN_USB_NEXIO=y
-CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
-CONFIG_TOUCHSCREEN_TOUCHIT213=m
-CONFIG_TOUCHSCREEN_TSC_SERIO=m
-# CONFIG_TOUCHSCREEN_TSC2005 is not set
-CONFIG_TOUCHSCREEN_TSC2007=m
-CONFIG_TOUCHSCREEN_ST1232=m
-CONFIG_TOUCHSCREEN_TPS6507X=m
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_AD714X=m
-CONFIG_INPUT_AD714X_I2C=m
-CONFIG_INPUT_AD714X_SPI=m
-CONFIG_INPUT_BMA150=m
-CONFIG_INPUT_PCSPKR=m
-CONFIG_INPUT_MC13783_PWRBUTTON=m
-CONFIG_INPUT_MMA8450=m
-CONFIG_INPUT_MPU3050=m
-CONFIG_INPUT_APANEL=m
-CONFIG_INPUT_GP2A=m
-# CONFIG_INPUT_GPIO_TILT_POLLED is not set
-CONFIG_INPUT_ATLAS_BTNS=m
-CONFIG_INPUT_ATI_REMOTE2=m
-CONFIG_INPUT_KEYSPAN_REMOTE=m
-CONFIG_INPUT_KXTJ9=m
-# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set
-CONFIG_INPUT_POWERMATE=m
-CONFIG_INPUT_YEALINK=m
-CONFIG_INPUT_CM109=m
-CONFIG_INPUT_RETU_PWRBUTTON=m
-CONFIG_INPUT_UINPUT=m
-CONFIG_INPUT_PCF50633_PMU=m
-CONFIG_INPUT_PCF8574=m
-CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
-CONFIG_INPUT_ADXL34X=m
-CONFIG_INPUT_ADXL34X_I2C=m
-CONFIG_INPUT_ADXL34X_SPI=m
-# CONFIG_INPUT_IMS_PCU is not set
-CONFIG_INPUT_CMA3000=m
-CONFIG_INPUT_CMA3000_I2C=m
-CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m
-
-#
-# Hardware I/O ports
-#
-CONFIG_SERIO=y
-CONFIG_SERIO_I8042=y
-CONFIG_SERIO_SERPORT=m
-CONFIG_SERIO_CT82C710=m
-CONFIG_SERIO_PARKBD=m
-CONFIG_SERIO_PCIPS2=m
-CONFIG_SERIO_LIBPS2=y
-CONFIG_SERIO_RAW=m
-CONFIG_SERIO_ALTERA_PS2=m
-CONFIG_SERIO_PS2MULT=m
-CONFIG_SERIO_ARC_PS2=m
-CONFIG_GAMEPORT=m
-CONFIG_GAMEPORT_NS558=m
-CONFIG_GAMEPORT_L4=m
-CONFIG_GAMEPORT_EMU10K1=m
-CONFIG_GAMEPORT_FM801=m
-
-#
-# Character devices
-#
-CONFIG_TTY=y
-CONFIG_VT=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_VT_CONSOLE=y
-CONFIG_VT_CONSOLE_SLEEP=y
-CONFIG_HW_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_UNIX98_PTYS=y
-CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_SERIAL_NONSTANDARD=y
-CONFIG_ROCKETPORT=m
-CONFIG_CYCLADES=m
-# CONFIG_CYZ_INTR is not set
-# CONFIG_MOXA_INTELLIO is not set
-# CONFIG_MOXA_SMARTIO is not set
-CONFIG_SYNCLINK=m
-CONFIG_SYNCLINKMP=m
-# CONFIG_SYNCLINK_GT is not set
-CONFIG_NOZOMI=m
-# CONFIG_ISI is not set
-CONFIG_N_HDLC=m
-CONFIG_N_GSM=m
-CONFIG_TRACE_ROUTER=m
-CONFIG_TRACE_SINK=m
-# CONFIG_DEVKMEM is not set
-
-#
-# 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
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-# CONFIG_SERIAL_8250_EXTENDED is not set
-CONFIG_SERIAL_8250_DW=m
-
-#
-# Non-8250 serial port support
-#
-# CONFIG_SERIAL_MAX3100 is not set
-# CONFIG_SERIAL_MAX310X is not set
-CONFIG_SERIAL_MFD_HSU=m
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_JSM=m
-CONFIG_SERIAL_SCCNXP=m
-# CONFIG_SERIAL_TIMBERDALE is not set
-CONFIG_SERIAL_ALTERA_JTAGUART=m
-CONFIG_SERIAL_ALTERA_UART=m
-CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
-CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
-# CONFIG_SERIAL_IFX6X60 is not set
-CONFIG_SERIAL_PCH_UART=m
-CONFIG_SERIAL_ARC=m
-CONFIG_SERIAL_ARC_NR_PORTS=1
-CONFIG_SERIAL_RP2=m
-CONFIG_SERIAL_RP2_NR_UARTS=32
-CONFIG_SERIAL_FSL_LPUART=m
-CONFIG_PRINTER=m
-# CONFIG_LP_CONSOLE is not set
-CONFIG_PPDEV=m
-CONFIG_HVC_DRIVER=y
-CONFIG_HVC_IRQ=y
-CONFIG_HVC_XEN=y
-CONFIG_HVC_XEN_FRONTEND=y
-CONFIG_VIRTIO_CONSOLE=m
-CONFIG_IPMI_HANDLER=m
-# CONFIG_IPMI_PANIC_EVENT is not set
-CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_SI=m
-CONFIG_IPMI_WATCHDOG=m
-CONFIG_IPMI_POWEROFF=m
-CONFIG_HW_RANDOM=y
-CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_INTEL=m
-CONFIG_HW_RANDOM_AMD=m
-CONFIG_HW_RANDOM_VIA=m
-CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_HW_RANDOM_TPM=m
-CONFIG_NVRAM=m
-CONFIG_R3964=m
-CONFIG_APPLICOM=m
-
-#
-# PCMCIA character devices
-#
-CONFIG_SYNCLINK_CS=m
-CONFIG_CARDMAN_4000=m
-CONFIG_CARDMAN_4040=m
-CONFIG_IPWIRELESS=m
-CONFIG_MWAVE=m
-# CONFIG_RAW_DRIVER is not set
-CONFIG_HPET=y
-CONFIG_HPET_MMAP=y
-CONFIG_HANGCHECK_TIMER=m
-CONFIG_TCG_TPM=m
-CONFIG_TCG_TIS=m
-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
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
-CONFIG_I2C_CHARDEV=m
-# CONFIG_I2C_MUX is not set
-CONFIG_I2C_HELPER_AUTO=y
-CONFIG_I2C_SMBUS=m
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_ALGOPCA=m
-
-#
-# I2C Hardware Bus support
-#
-
-#
-# PC SMBus host controller drivers
-#
-CONFIG_I2C_ALI1535=m
-CONFIG_I2C_ALI1563=m
-CONFIG_I2C_ALI15X3=m
-CONFIG_I2C_AMD756=m
-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
-CONFIG_I2C_SIS5595=m
-CONFIG_I2C_SIS630=m
-CONFIG_I2C_SIS96X=m
-CONFIG_I2C_VIA=m
-CONFIG_I2C_VIAPRO=m
-
-#
-# ACPI drivers
-#
-CONFIG_I2C_SCMI=m
-
-#
-# I2C system bus drivers (mostly embedded / system-on-chip)
-#
-# CONFIG_I2C_CBUS_GPIO is not set
-CONFIG_I2C_DESIGNWARE_CORE=m
-CONFIG_I2C_DESIGNWARE_PCI=m
-CONFIG_I2C_EG20T=m
-# CONFIG_I2C_GPIO is not set
-CONFIG_I2C_OCORES=m
-CONFIG_I2C_PCA_PLATFORM=m
-# CONFIG_I2C_PXA_PCI is not set
-CONFIG_I2C_SIMTEC=m
-CONFIG_I2C_XILINX=m
-
-#
-# External I2C/SMBus adapter drivers
-#
-CONFIG_I2C_DIOLAN_U2C=m
-CONFIG_I2C_PARPORT=m
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_TAOS_EVM=m
-CONFIG_I2C_TINY_USB=m
-CONFIG_I2C_VIPERBOARD=m
-
-#
-# Other I2C/SMBus bus drivers
-#
-# CONFIG_I2C_STUB is not set
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-CONFIG_SPI=y
-# CONFIG_SPI_DEBUG is not set
-CONFIG_SPI_MASTER=y
-
-#
-# SPI Master Controller Drivers
-#
-# CONFIG_SPI_ALTERA is not set
-# CONFIG_SPI_BITBANG is not set
-# CONFIG_SPI_BUTTERFLY is not set
-# CONFIG_SPI_GPIO is not set
-# CONFIG_SPI_LM70_LLP is not set
-# CONFIG_SPI_OC_TINY is not set
-CONFIG_SPI_PXA2XX_DMA=y
-CONFIG_SPI_PXA2XX=m
-CONFIG_SPI_PXA2XX_PCI=m
-# CONFIG_SPI_SC18IS602 is not set
-# CONFIG_SPI_TOPCLIFF_PCH is not set
-# CONFIG_SPI_XCOMM is not set
-# CONFIG_SPI_XILINX is not set
-# CONFIG_SPI_DESIGNWARE is not set
-
-#
-# SPI Protocol Masters
-#
-# CONFIG_SPI_SPIDEV is not set
-# CONFIG_SPI_TLE62X0 is not set
-# CONFIG_HSI is not set
-
-#
-# PPS support
-#
-CONFIG_PPS=m
-# CONFIG_PPS_DEBUG is not set
-
-#
-# PPS clients support
-#
-CONFIG_PPS_CLIENT_KTIMER=m
-CONFIG_PPS_CLIENT_LDISC=m
-CONFIG_PPS_CLIENT_PARPORT=m
-CONFIG_PPS_CLIENT_GPIO=m
-
-#
-# PPS generators support
-#
-
-#
-# PTP clock support
-#
-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_GPIO_ACPI=y
-# CONFIG_DEBUG_GPIO is not set
-CONFIG_GPIO_SYSFS=y
-
-#
-# Memory mapped GPIO drivers:
-#
-# CONFIG_GPIO_GENERIC_PLATFORM is not set
-# CONFIG_GPIO_IT8761E is not set
-# CONFIG_GPIO_TS5500 is not set
-CONFIG_GPIO_SCH=m
-CONFIG_GPIO_ICH=m
-# CONFIG_GPIO_VX855 is not set
-# CONFIG_GPIO_LYNXPOINT is not set
-
-#
-# I2C GPIO expanders:
-#
-CONFIG_GPIO_ARIZONA=m
-# CONFIG_GPIO_MAX7300 is not set
-# CONFIG_GPIO_MAX732X is not set
-# CONFIG_GPIO_PCA953X is not set
-# CONFIG_GPIO_PCF857X is not set
-# CONFIG_GPIO_ADP5588 is not set
-
-#
-# PCI GPIO expanders:
-#
-CONFIG_GPIO_CS5535=m
-CONFIG_GPIO_AMD8111=m
-CONFIG_GPIO_LANGWELL=y
-# CONFIG_GPIO_PCH is not set
-# CONFIG_GPIO_ML_IOH is not set
-# CONFIG_GPIO_RDC321X is not set
-
-#
-# SPI GPIO expanders:
-#
-# CONFIG_GPIO_MAX7301 is not set
-# CONFIG_GPIO_MCP23S08 is not set
-# CONFIG_GPIO_MC33880 is not set
-# CONFIG_GPIO_74X164 is not set
-
-#
-# AC97 GPIO expanders:
-#
-CONFIG_GPIO_UCB1400=y
-
-#
-# MODULbus GPIO expanders:
-#
-
-#
-# USB GPIO expanders:
-#
-CONFIG_GPIO_VIPERBOARD=m
-# CONFIG_W1 is not set
-CONFIG_POWER_SUPPLY=y
-# CONFIG_POWER_SUPPLY_DEBUG is not set
-CONFIG_PDA_POWER=m
-CONFIG_TEST_POWER=m
-# CONFIG_BATTERY_DS2780 is not set
-# CONFIG_BATTERY_DS2781 is not set
-# CONFIG_BATTERY_DS2782 is not set
-# CONFIG_BATTERY_SBS is not set
-# CONFIG_BATTERY_BQ27x00 is not set
-# CONFIG_BATTERY_MAX17040 is not set
-# CONFIG_BATTERY_MAX17042 is not set
-# CONFIG_CHARGER_PCF50633 is not set
-# CONFIG_CHARGER_ISP1704 is not set
-# CONFIG_CHARGER_MAX8903 is not set
-# CONFIG_CHARGER_LP8727 is not set
-# 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_AVS=y
-CONFIG_HWMON=y
-CONFIG_HWMON_VID=m
-# CONFIG_HWMON_DEBUG_CHIP is not set
-
-#
-# Native drivers
-#
-CONFIG_SENSORS_ABITUGURU=m
-CONFIG_SENSORS_ABITUGURU3=m
-# CONFIG_SENSORS_AD7314 is not set
-CONFIG_SENSORS_AD7414=m
-CONFIG_SENSORS_AD7418=m
-# CONFIG_SENSORS_ADCXX is not set
-CONFIG_SENSORS_ADM1021=m
-CONFIG_SENSORS_ADM1025=m
-CONFIG_SENSORS_ADM1026=m
-CONFIG_SENSORS_ADM1029=m
-CONFIG_SENSORS_ADM1031=m
-CONFIG_SENSORS_ADM9240=m
-CONFIG_SENSORS_ADT7X10=m
-CONFIG_SENSORS_ADT7310=m
-CONFIG_SENSORS_ADT7410=m
-CONFIG_SENSORS_ADT7411=m
-CONFIG_SENSORS_ADT7462=m
-CONFIG_SENSORS_ADT7470=m
-CONFIG_SENSORS_ADT7475=m
-CONFIG_SENSORS_ASC7621=m
-CONFIG_SENSORS_K8TEMP=m
-CONFIG_SENSORS_K10TEMP=m
-CONFIG_SENSORS_FAM15H_POWER=m
-CONFIG_SENSORS_ASB100=m
-CONFIG_SENSORS_ATXP1=m
-CONFIG_SENSORS_DS620=m
-CONFIG_SENSORS_DS1621=m
-CONFIG_SENSORS_I5K_AMB=m
-CONFIG_SENSORS_F71805F=m
-CONFIG_SENSORS_F71882FG=m
-CONFIG_SENSORS_F75375S=m
-CONFIG_SENSORS_FSCHMD=m
-CONFIG_SENSORS_G760A=m
-CONFIG_SENSORS_G762=m
-CONFIG_SENSORS_GL518SM=m
-CONFIG_SENSORS_GL520SM=m
-# CONFIG_SENSORS_GPIO_FAN is not set
-CONFIG_SENSORS_HIH6130=m
-CONFIG_SENSORS_CORETEMP=m
-CONFIG_SENSORS_IBMAEM=m
-CONFIG_SENSORS_IBMPEX=m
-CONFIG_SENSORS_IT87=m
-CONFIG_SENSORS_JC42=m
-CONFIG_SENSORS_LINEAGE=m
-CONFIG_SENSORS_LM63=m
-# CONFIG_SENSORS_LM70 is not set
-CONFIG_SENSORS_LM73=m
-CONFIG_SENSORS_LM75=m
-CONFIG_SENSORS_LM77=m
-CONFIG_SENSORS_LM78=m
-CONFIG_SENSORS_LM80=m
-CONFIG_SENSORS_LM83=m
-CONFIG_SENSORS_LM85=m
-CONFIG_SENSORS_LM87=m
-CONFIG_SENSORS_LM90=m
-CONFIG_SENSORS_LM92=m
-CONFIG_SENSORS_LM93=m
-CONFIG_SENSORS_LTC4151=m
-CONFIG_SENSORS_LTC4215=m
-CONFIG_SENSORS_LTC4245=m
-CONFIG_SENSORS_LTC4261=m
-CONFIG_SENSORS_LM95234=m
-CONFIG_SENSORS_LM95241=m
-CONFIG_SENSORS_LM95245=m
-# CONFIG_SENSORS_MAX1111 is not set
-CONFIG_SENSORS_MAX16065=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_MAX1668=m
-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_NCT6775=m
-CONFIG_SENSORS_NTC_THERMISTOR=m
-CONFIG_SENSORS_PC87360=m
-CONFIG_SENSORS_PC87427=m
-CONFIG_SENSORS_PCF8591=m
-CONFIG_PMBUS=m
-CONFIG_SENSORS_PMBUS=m
-CONFIG_SENSORS_ADM1275=m
-CONFIG_SENSORS_LM25066=m
-CONFIG_SENSORS_LTC2978=m
-CONFIG_SENSORS_MAX16064=m
-CONFIG_SENSORS_MAX34440=m
-CONFIG_SENSORS_MAX8688=m
-CONFIG_SENSORS_UCD9000=m
-CONFIG_SENSORS_UCD9200=m
-CONFIG_SENSORS_ZL6100=m
-CONFIG_SENSORS_SHT15=m
-CONFIG_SENSORS_SHT21=m
-CONFIG_SENSORS_SIS5595=m
-CONFIG_SENSORS_SMM665=m
-CONFIG_SENSORS_DME1737=m
-CONFIG_SENSORS_EMC1403=m
-CONFIG_SENSORS_EMC2103=m
-CONFIG_SENSORS_EMC6W201=m
-CONFIG_SENSORS_SMSC47M1=m
-CONFIG_SENSORS_SMSC47M192=m
-CONFIG_SENSORS_SMSC47B397=m
-CONFIG_SENSORS_SCH56XX_COMMON=m
-CONFIG_SENSORS_SCH5627=m
-CONFIG_SENSORS_SCH5636=m
-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
-CONFIG_SENSORS_TMP401=m
-CONFIG_SENSORS_TMP421=m
-CONFIG_SENSORS_VIA_CPUTEMP=m
-CONFIG_SENSORS_VIA686A=m
-CONFIG_SENSORS_VT1211=m
-CONFIG_SENSORS_VT8231=m
-CONFIG_SENSORS_W83781D=m
-CONFIG_SENSORS_W83791D=m
-CONFIG_SENSORS_W83792D=m
-CONFIG_SENSORS_W83793=m
-CONFIG_SENSORS_W83795=m
-# CONFIG_SENSORS_W83795_FANCTRL is not set
-CONFIG_SENSORS_W83L785TS=m
-CONFIG_SENSORS_W83L786NG=m
-CONFIG_SENSORS_W83627HF=m
-CONFIG_SENSORS_W83627EHF=m
-CONFIG_SENSORS_APPLESMC=m
-CONFIG_SENSORS_MC13783_ADC=m
-
-#
-# ACPI drivers
-#
-CONFIG_SENSORS_ACPI_POWER=m
-CONFIG_SENSORS_ATK0110=m
-CONFIG_THERMAL=y
-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_THERMAL_GOV_FAIR_SHARE=y
-CONFIG_THERMAL_GOV_STEP_WISE=y
-CONFIG_THERMAL_GOV_USER_SPACE=y
-# CONFIG_CPU_THERMAL is not set
-# CONFIG_THERMAL_EMULATION is not set
-CONFIG_INTEL_POWERCLAMP=m
-CONFIG_X86_PKG_TEMP_THERMAL=m
-
-#
-# Texas Instruments thermal drivers
-#
-CONFIG_WATCHDOG=y
-CONFIG_WATCHDOG_CORE=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-
-#
-# Watchdog Device Drivers
-#
-CONFIG_SOFT_WATCHDOG=m
-CONFIG_RETU_WATCHDOG=m
-CONFIG_ACQUIRE_WDT=m
-CONFIG_ADVANTECH_WDT=m
-CONFIG_ALIM1535_WDT=m
-CONFIG_ALIM7101_WDT=m
-CONFIG_F71808E_WDT=m
-CONFIG_SP5100_TCO=m
-CONFIG_GEODE_WDT=m
-CONFIG_SC520_WDT=m
-CONFIG_SBC_FITPC2_WATCHDOG=m
-CONFIG_EUROTECH_WDT=m
-CONFIG_IB700_WDT=m
-CONFIG_IBMASR=m
-CONFIG_WAFER_WDT=m
-CONFIG_I6300ESB_WDT=m
-CONFIG_IE6XX_WDT=m
-CONFIG_ITCO_WDT=m
-CONFIG_ITCO_VENDOR_SUPPORT=y
-CONFIG_IT8712F_WDT=m
-CONFIG_IT87_WDT=m
-CONFIG_HP_WATCHDOG=m
-CONFIG_HPWDT_NMI_DECODING=y
-CONFIG_SC1200_WDT=m
-CONFIG_PC87413_WDT=m
-CONFIG_NV_TCO=m
-CONFIG_60XX_WDT=m
-CONFIG_SBC8360_WDT=m
-CONFIG_CPU5_WDT=m
-CONFIG_SMSC_SCH311X_WDT=m
-CONFIG_SMSC37B787_WDT=m
-CONFIG_VIA_WDT=m
-CONFIG_W83627HF_WDT=m
-CONFIG_W83697HF_WDT=m
-CONFIG_W83697UG_WDT=m
-CONFIG_W83877F_WDT=m
-CONFIG_W83977F_WDT=m
-CONFIG_MACHZ_WDT=m
-CONFIG_SBC_EPX_C3_WATCHDOG=m
-CONFIG_MEN_A21_WDT=m
-CONFIG_XEN_WDT=m
-
-#
-# PCI-based Watchdog Cards
-#
-CONFIG_PCIPCWATCHDOG=m
-CONFIG_WDTPCI=m
-
-#
-# USB-based Watchdog Cards
-#
-CONFIG_USBPCWATCHDOG=m
-CONFIG_SSB_POSSIBLE=y
-
-#
-# Sonics Silicon Backplane
-#
-CONFIG_SSB=m
-CONFIG_SSB_SPROM=y
-CONFIG_SSB_BLOCKIO=y
-CONFIG_SSB_PCIHOST_POSSIBLE=y
-CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_B43_PCI_BRIDGE=y
-CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
-CONFIG_SSB_PCMCIAHOST=y
-CONFIG_SSB_SDIOHOST_POSSIBLE=y
-CONFIG_SSB_SDIOHOST=y
-# CONFIG_SSB_DEBUG is not set
-CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
-CONFIG_SSB_DRIVER_PCICORE=y
-CONFIG_SSB_DRIVER_GPIO=y
-CONFIG_BCMA_POSSIBLE=y
-
-#
-# Broadcom specific AMBA
-#
-CONFIG_BCMA=m
-CONFIG_BCMA_BLOCKIO=y
-CONFIG_BCMA_HOST_PCI_POSSIBLE=y
-CONFIG_BCMA_HOST_PCI=y
-CONFIG_BCMA_DRIVER_GMAC_CMN=y
-CONFIG_BCMA_DRIVER_GPIO=y
-# CONFIG_BCMA_DEBUG is not set
-
-#
-# Multifunction device drivers
-#
-CONFIG_MFD_CORE=y
-CONFIG_MFD_CS5535=m
-# CONFIG_MFD_CROS_EC is not set
-# CONFIG_MFD_DA9052_SPI is not set
-CONFIG_MFD_MC13783=m
-CONFIG_MFD_MC13XXX=m
-# CONFIG_MFD_MC13XXX_SPI is not set
-CONFIG_MFD_MC13XXX_I2C=m
-CONFIG_HTC_PASIC3=m
-CONFIG_LPC_ICH=m
-CONFIG_LPC_SCH=m
-# CONFIG_MFD_JANZ_CMODIO is not set
-# CONFIG_MFD_KEMPLD is not set
-# CONFIG_EZX_PCAP is not set
-CONFIG_MFD_VIPERBOARD=m
-CONFIG_MFD_RETU=m
-CONFIG_MFD_PCF50633=m
-CONFIG_PCF50633_ADC=m
-CONFIG_PCF50633_GPIO=m
-CONFIG_UCB1400_CORE=m
-CONFIG_MFD_RDC321X=m
-CONFIG_MFD_RTSX_PCI=m
-CONFIG_MFD_SI476X_CORE=m
-CONFIG_MFD_SM501=m
-CONFIG_MFD_SM501_GPIO=y
-CONFIG_ABX500_CORE=y
-# CONFIG_MFD_STMPE is not set
-# CONFIG_MFD_SYSCON is not set
-CONFIG_MFD_TI_AM335X_TSCADC=m
-# CONFIG_TPS6105X is not set
-CONFIG_TPS65010=m
-CONFIG_TPS6507X=m
-CONFIG_MFD_TPS65217=m
-# CONFIG_MFD_TPS65912 is not set
-# CONFIG_MFD_TPS65912_SPI is not set
-CONFIG_MFD_WL1273_CORE=m
-CONFIG_MFD_LM3533=m
-# CONFIG_MFD_TIMBERDALE is not set
-# CONFIG_MFD_TMIO is not set
-CONFIG_MFD_VX855=m
-CONFIG_MFD_ARIZONA=y
-CONFIG_MFD_ARIZONA_I2C=m
-# CONFIG_MFD_ARIZONA_SPI is not set
-CONFIG_MFD_WM5102=y
-CONFIG_MFD_WM5110=y
-# CONFIG_MFD_WM8997 is not set
-# CONFIG_MFD_WM831X_SPI is not set
-# CONFIG_REGULATOR is not set
-CONFIG_MEDIA_SUPPORT=m
-
-#
-# Multimedia core support
-#
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
-CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
-CONFIG_MEDIA_RADIO_SUPPORT=y
-CONFIG_MEDIA_RC_SUPPORT=y
-CONFIG_MEDIA_CONTROLLER=y
-CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L2_SUBDEV_API=y
-CONFIG_VIDEO_V4L2=m
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-CONFIG_VIDEO_TUNER=m
-CONFIG_V4L2_MEM2MEM_DEV=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEOBUF_DVB=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_DMA_CONTIG=m
-CONFIG_VIDEOBUF2_VMALLOC=m
-CONFIG_VIDEOBUF2_DMA_SG=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
-
-#
-# Media drivers
-#
-CONFIG_RC_CORE=m
-CONFIG_RC_MAP=m
-CONFIG_RC_DECODERS=y
-CONFIG_LIRC=m
-CONFIG_IR_LIRC_CODEC=m
-CONFIG_IR_NEC_DECODER=m
-CONFIG_IR_RC5_DECODER=m
-CONFIG_IR_RC6_DECODER=m
-CONFIG_IR_JVC_DECODER=m
-CONFIG_IR_SONY_DECODER=m
-CONFIG_IR_RC5_SZ_DECODER=m
-CONFIG_IR_SANYO_DECODER=m
-CONFIG_IR_MCE_KBD_DECODER=m
-CONFIG_RC_DEVICES=y
-CONFIG_RC_ATI_REMOTE=m
-CONFIG_IR_ENE=m
-CONFIG_IR_IMON=m
-CONFIG_IR_MCEUSB=m
-CONFIG_IR_ITE_CIR=m
-CONFIG_IR_FINTEK=m
-CONFIG_IR_NUVOTON=m
-CONFIG_IR_REDRAT3=m
-CONFIG_IR_STREAMZAP=m
-CONFIG_IR_WINBOND_CIR=m
-CONFIG_IR_IGUANA=m
-CONFIG_IR_TTUSBIR=m
-CONFIG_RC_LOOPBACK=m
-CONFIG_IR_GPIO_CIR=m
-CONFIG_MEDIA_USB_SUPPORT=y
-
-#
-# Webcam devices
-#
-CONFIG_USB_VIDEO_CLASS=m
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-CONFIG_USB_GSPCA=m
-CONFIG_USB_M5602=m
-CONFIG_USB_STV06XX=m
-CONFIG_USB_GL860=m
-CONFIG_USB_GSPCA_BENQ=m
-CONFIG_USB_GSPCA_CONEX=m
-CONFIG_USB_GSPCA_CPIA1=m
-CONFIG_USB_GSPCA_ETOMS=m
-CONFIG_USB_GSPCA_FINEPIX=m
-CONFIG_USB_GSPCA_JEILINJ=m
-CONFIG_USB_GSPCA_JL2005BCD=m
-CONFIG_USB_GSPCA_KINECT=m
-CONFIG_USB_GSPCA_KONICA=m
-CONFIG_USB_GSPCA_MARS=m
-CONFIG_USB_GSPCA_MR97310A=m
-CONFIG_USB_GSPCA_NW80X=m
-CONFIG_USB_GSPCA_OV519=m
-CONFIG_USB_GSPCA_OV534=m
-CONFIG_USB_GSPCA_OV534_9=m
-CONFIG_USB_GSPCA_PAC207=m
-CONFIG_USB_GSPCA_PAC7302=m
-CONFIG_USB_GSPCA_PAC7311=m
-CONFIG_USB_GSPCA_SE401=m
-CONFIG_USB_GSPCA_SN9C2028=m
-CONFIG_USB_GSPCA_SN9C20X=m
-CONFIG_USB_GSPCA_SONIXB=m
-CONFIG_USB_GSPCA_SONIXJ=m
-CONFIG_USB_GSPCA_SPCA500=m
-CONFIG_USB_GSPCA_SPCA501=m
-CONFIG_USB_GSPCA_SPCA505=m
-CONFIG_USB_GSPCA_SPCA506=m
-CONFIG_USB_GSPCA_SPCA508=m
-CONFIG_USB_GSPCA_SPCA561=m
-CONFIG_USB_GSPCA_SPCA1528=m
-CONFIG_USB_GSPCA_SQ905=m
-CONFIG_USB_GSPCA_SQ905C=m
-CONFIG_USB_GSPCA_SQ930X=m
-CONFIG_USB_GSPCA_STK014=m
-CONFIG_USB_GSPCA_STV0680=m
-CONFIG_USB_GSPCA_SUNPLUS=m
-CONFIG_USB_GSPCA_T613=m
-CONFIG_USB_GSPCA_TOPRO=m
-CONFIG_USB_GSPCA_TV8532=m
-CONFIG_USB_GSPCA_VC032X=m
-CONFIG_USB_GSPCA_VICAM=m
-CONFIG_USB_GSPCA_XIRLINK_CIT=m
-CONFIG_USB_GSPCA_ZC3XX=m
-CONFIG_USB_PWC=m
-# CONFIG_USB_PWC_DEBUG is not set
-CONFIG_USB_PWC_INPUT_EVDEV=y
-CONFIG_VIDEO_CPIA2=m
-CONFIG_USB_ZR364XX=m
-CONFIG_USB_STKWEBCAM=m
-CONFIG_USB_S2255=m
-CONFIG_USB_SN9C102=m
-CONFIG_VIDEO_USBTV=m
-
-#
-# Analog TV USB devices
-#
-CONFIG_VIDEO_PVRUSB2=m
-CONFIG_VIDEO_PVRUSB2_SYSFS=y
-CONFIG_VIDEO_PVRUSB2_DVB=y
-# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
-CONFIG_VIDEO_HDPVR=m
-CONFIG_VIDEO_TLG2300=m
-CONFIG_VIDEO_USBVISION=m
-CONFIG_VIDEO_STK1160=m
-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
-CONFIG_VIDEO_CX231XX_DVB=m
-CONFIG_VIDEO_TM6000=m
-CONFIG_VIDEO_TM6000_ALSA=m
-CONFIG_VIDEO_TM6000_DVB=m
-
-#
-# Digital TV USB devices
-#
-CONFIG_DVB_USB=m
-# CONFIG_DVB_USB_DEBUG is not set
-CONFIG_DVB_USB_A800=m
-CONFIG_DVB_USB_DIBUSB_MB=m
-CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
-CONFIG_DVB_USB_DIBUSB_MC=m
-CONFIG_DVB_USB_DIB0700=m
-CONFIG_DVB_USB_UMT_010=m
-CONFIG_DVB_USB_CXUSB=m
-CONFIG_DVB_USB_M920X=m
-CONFIG_DVB_USB_DIGITV=m
-CONFIG_DVB_USB_VP7045=m
-CONFIG_DVB_USB_VP702X=m
-CONFIG_DVB_USB_GP8PSK=m
-CONFIG_DVB_USB_NOVA_T_USB2=m
-CONFIG_DVB_USB_TTUSB2=m
-CONFIG_DVB_USB_DTT200U=m
-CONFIG_DVB_USB_OPERA1=m
-CONFIG_DVB_USB_AF9005=m
-CONFIG_DVB_USB_AF9005_REMOTE=m
-CONFIG_DVB_USB_PCTV452E=m
-CONFIG_DVB_USB_DW2102=m
-CONFIG_DVB_USB_CINERGY_T2=m
-CONFIG_DVB_USB_DTV5100=m
-CONFIG_DVB_USB_FRIIO=m
-CONFIG_DVB_USB_AZ6027=m
-CONFIG_DVB_USB_TECHNISAT_USB2=m
-CONFIG_DVB_USB_V2=m
-CONFIG_DVB_USB_AF9015=m
-CONFIG_DVB_USB_AF9035=m
-CONFIG_DVB_USB_ANYSEE=m
-CONFIG_DVB_USB_AU6610=m
-CONFIG_DVB_USB_AZ6007=m
-CONFIG_DVB_USB_CE6230=m
-CONFIG_DVB_USB_EC168=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_IT913X=m
-CONFIG_DVB_USB_LME2510=m
-CONFIG_DVB_USB_MXL111SF=m
-CONFIG_DVB_USB_RTL28XXU=m
-CONFIG_DVB_TTUSB_BUDGET=m
-CONFIG_DVB_TTUSB_DEC=m
-CONFIG_SMS_USB_DRV=m
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
-
-#
-# Webcam, TV (analog/digital) USB devices
-#
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_EM28XX_RC=m
-CONFIG_MEDIA_PCI_SUPPORT=y
-
-#
-# Media capture support
-#
-CONFIG_VIDEO_MEYE=m
-
-#
-# Media capture/analog TV support
-#
-CONFIG_VIDEO_IVTV=m
-CONFIG_VIDEO_IVTV_ALSA=m
-CONFIG_VIDEO_FB_IVTV=m
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_ZR36060=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN_AVS6EYES=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_MXB=m
-
-#
-# Media capture/analog/hybrid TV support
-#
-CONFIG_VIDEO_CX18=m
-CONFIG_VIDEO_CX18_ALSA=m
-CONFIG_VIDEO_CX23885=m
-CONFIG_MEDIA_ALTERA_CI=m
-CONFIG_VIDEO_CX25821=m
-CONFIG_VIDEO_CX25821_ALSA=m
-CONFIG_VIDEO_CX88=m
-CONFIG_VIDEO_CX88_ALSA=m
-CONFIG_VIDEO_CX88_BLACKBIRD=m
-CONFIG_VIDEO_CX88_DVB=m
-CONFIG_VIDEO_CX88_VP3054=m
-CONFIG_VIDEO_CX88_MPEG=m
-CONFIG_VIDEO_BT848=m
-CONFIG_DVB_BT8XX=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7134_ALSA=m
-CONFIG_VIDEO_SAA7134_RC=y
-CONFIG_VIDEO_SAA7134_DVB=m
-CONFIG_VIDEO_SAA7164=m
-
-#
-# Media digital TV PCI Adapters
-#
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
-CONFIG_DVB_BUDGET_CORE=m
-CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_CI=m
-CONFIG_DVB_BUDGET_AV=m
-CONFIG_DVB_BUDGET_PATCH=m
-CONFIG_DVB_B2C2_FLEXCOP_PCI=m
-# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
-CONFIG_DVB_PLUTO2=m
-CONFIG_DVB_DM1105=m
-CONFIG_DVB_PT1=m
-CONFIG_MANTIS_CORE=m
-CONFIG_DVB_MANTIS=m
-CONFIG_DVB_HOPPER=m
-CONFIG_DVB_NGENE=m
-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
-
-#
-# Supported MMC/SDIO adapters
-#
-CONFIG_SMS_SDIO_DRV=m
-CONFIG_MEDIA_PARPORT_SUPPORT=y
-CONFIG_VIDEO_BWQCAM=m
-CONFIG_VIDEO_CQCAM=m
-CONFIG_VIDEO_W9966=m
-CONFIG_RADIO_ADAPTERS=y
-CONFIG_RADIO_SI470X=y
-CONFIG_USB_SI470X=m
-CONFIG_I2C_SI470X=m
-CONFIG_USB_MR800=m
-CONFIG_USB_DSBR=m
-CONFIG_RADIO_MAXIRADIO=m
-CONFIG_RADIO_SHARK=m
-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
-CONFIG_RADIO_WL1273=m
-
-#
-# Texas Instruments WL128x FM driver (ST based)
-#
-CONFIG_RADIO_WL128X=m
-
-#
-# Supported FireWire (IEEE 1394) Adapters
-#
-CONFIG_DVB_FIREDTV=m
-CONFIG_DVB_FIREDTV_INPUT=y
-CONFIG_MEDIA_COMMON_OPTIONS=y
-
-#
-# common driver options
-#
-CONFIG_VIDEO_CX2341X=m
-CONFIG_VIDEO_BTCX=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_CYPRESS_FIRMWARE=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_SMS_SIANO_DEBUGFS is not set
-
-#
-# Media ancillary drivers (tuners, sensors, i2c, frontends)
-#
-CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
-CONFIG_MEDIA_ATTACH=y
-CONFIG_VIDEO_IR_I2C=m
-
-#
-# Audio decoders, processors and mixers
-#
-CONFIG_VIDEO_TVAUDIO=m
-CONFIG_VIDEO_TDA7432=m
-CONFIG_VIDEO_TDA9840=m
-CONFIG_VIDEO_TEA6415C=m
-CONFIG_VIDEO_TEA6420=m
-CONFIG_VIDEO_MSP3400=m
-CONFIG_VIDEO_CS5345=m
-CONFIG_VIDEO_CS53L32A=m
-CONFIG_VIDEO_UDA1342=m
-CONFIG_VIDEO_WM8775=m
-CONFIG_VIDEO_WM8739=m
-CONFIG_VIDEO_VP27SMPX=m
-CONFIG_VIDEO_SONY_BTF_MPX=m
-
-#
-# RDS decoders
-#
-CONFIG_VIDEO_SAA6588=m
-
-#
-# Video decoders
-#
-CONFIG_VIDEO_BT819=m
-CONFIG_VIDEO_BT856=m
-CONFIG_VIDEO_BT866=m
-CONFIG_VIDEO_KS0127=m
-CONFIG_VIDEO_SAA7110=m
-CONFIG_VIDEO_SAA711X=m
-CONFIG_VIDEO_TVP5150=m
-CONFIG_VIDEO_TW2804=m
-CONFIG_VIDEO_TW9903=m
-CONFIG_VIDEO_TW9906=m
-CONFIG_VIDEO_VPX3220=m
-
-#
-# Video and audio decoders
-#
-CONFIG_VIDEO_SAA717X=m
-CONFIG_VIDEO_CX25840=m
-
-#
-# Video encoders
-#
-CONFIG_VIDEO_SAA7127=m
-CONFIG_VIDEO_SAA7185=m
-CONFIG_VIDEO_ADV7170=m
-CONFIG_VIDEO_ADV7175=m
-
-#
-# Camera sensor devices
-#
-CONFIG_VIDEO_OV7640=m
-CONFIG_VIDEO_MT9V011=m
-
-#
-# Flash devices
-#
-
-#
-# Video improvement chips
-#
-CONFIG_VIDEO_UPD64031A=m
-CONFIG_VIDEO_UPD64083=m
-
-#
-# Miscelaneous helper chips
-#
-CONFIG_VIDEO_M52790=m
-
-#
-# Sensors used on soc_camera driver
-#
-CONFIG_MEDIA_TUNER=m
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_TEA5761=m
-CONFIG_MEDIA_TUNER_TEA5767=m
-CONFIG_MEDIA_TUNER_MT20XX=m
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2063=m
-CONFIG_MEDIA_TUNER_MT2266=m
-CONFIG_MEDIA_TUNER_MT2131=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC5000=m
-CONFIG_MEDIA_TUNER_XC4000=m
-CONFIG_MEDIA_TUNER_MXL5005S=m
-CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=m
-CONFIG_MEDIA_TUNER_MAX2165=m
-CONFIG_MEDIA_TUNER_TDA18218=m
-CONFIG_MEDIA_TUNER_FC0011=m
-CONFIG_MEDIA_TUNER_FC0012=m
-CONFIG_MEDIA_TUNER_FC0013=m
-CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_MEDIA_TUNER_E4000=m
-CONFIG_MEDIA_TUNER_FC2580=m
-CONFIG_MEDIA_TUNER_TUA9001=m
-CONFIG_MEDIA_TUNER_IT913X=m
-CONFIG_MEDIA_TUNER_R820T=m
-
-#
-# Multistandard (satellite) frontends
-#
-CONFIG_DVB_STB0899=m
-CONFIG_DVB_STB6100=m
-CONFIG_DVB_STV090x=m
-CONFIG_DVB_STV6110x=m
-
-#
-# Multistandard (cable + terrestrial) frontends
-#
-CONFIG_DVB_DRXK=m
-CONFIG_DVB_TDA18271C2DD=m
-
-#
-# DVB-S (satellite) frontends
-#
-CONFIG_DVB_CX24110=m
-CONFIG_DVB_CX24123=m
-CONFIG_DVB_MT312=m
-CONFIG_DVB_ZL10036=m
-CONFIG_DVB_ZL10039=m
-CONFIG_DVB_S5H1420=m
-CONFIG_DVB_STV0288=m
-CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=m
-CONFIG_DVB_STV6110=m
-CONFIG_DVB_STV0900=m
-CONFIG_DVB_TDA8083=m
-CONFIG_DVB_TDA10086=m
-CONFIG_DVB_TDA8261=m
-CONFIG_DVB_VES1X93=m
-CONFIG_DVB_TUNER_ITD1000=m
-CONFIG_DVB_TUNER_CX24113=m
-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
-
-#
-# DVB-T (terrestrial) frontends
-#
-CONFIG_DVB_SP8870=m
-CONFIG_DVB_SP887X=m
-CONFIG_DVB_CX22700=m
-CONFIG_DVB_CX22702=m
-CONFIG_DVB_DRXD=m
-CONFIG_DVB_L64781=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_NXT6000=m
-CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=m
-CONFIG_DVB_DIB3000MB=m
-CONFIG_DVB_DIB3000MC=m
-CONFIG_DVB_DIB7000M=m
-CONFIG_DVB_DIB7000P=m
-CONFIG_DVB_TDA10048=m
-CONFIG_DVB_AF9013=m
-CONFIG_DVB_EC100=m
-CONFIG_DVB_STV0367=m
-CONFIG_DVB_CXD2820R=m
-CONFIG_DVB_RTL2830=m
-CONFIG_DVB_RTL2832=m
-
-#
-# DVB-C (cable) frontends
-#
-CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=m
-CONFIG_DVB_TDA10023=m
-CONFIG_DVB_STV0297=m
-
-#
-# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
-#
-CONFIG_DVB_NXT200X=m
-CONFIG_DVB_OR51211=m
-CONFIG_DVB_OR51132=m
-CONFIG_DVB_BCM3510=m
-CONFIG_DVB_LGDT330X=m
-CONFIG_DVB_LGDT3305=m
-CONFIG_DVB_LG2160=m
-CONFIG_DVB_S5H1409=m
-CONFIG_DVB_AU8522=m
-CONFIG_DVB_AU8522_DTV=m
-CONFIG_DVB_AU8522_V4L=m
-CONFIG_DVB_S5H1411=m
-
-#
-# ISDB-T (terrestrial) frontends
-#
-CONFIG_DVB_S921=m
-CONFIG_DVB_DIB8000=m
-CONFIG_DVB_MB86A20S=m
-
-#
-# Digital terrestrial only tuners/PLL
-#
-CONFIG_DVB_PLL=m
-CONFIG_DVB_TUNER_DIB0070=m
-CONFIG_DVB_TUNER_DIB0090=m
-
-#
-# SEC control devices for DVB-S
-#
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_LNBP22=m
-CONFIG_DVB_ISL6405=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_ISL6423=m
-CONFIG_DVB_A8293=m
-CONFIG_DVB_LGS8GXX=m
-CONFIG_DVB_ATBM8830=m
-CONFIG_DVB_TDA665x=m
-CONFIG_DVB_IX2505V=m
-CONFIG_DVB_IT913X_FE=m
-CONFIG_DVB_M88RS2000=m
-CONFIG_DVB_AF9033=m
-
-#
-# Tools to develop new frontends
-#
-# CONFIG_DVB_DUMMY_FE is not set
-
-#
-# Graphics support
-#
-CONFIG_AGP=y
-CONFIG_AGP_AMD64=y
-CONFIG_AGP_INTEL=m
-CONFIG_AGP_SIS=m
-CONFIG_AGP_VIA=m
-CONFIG_VGA_ARB=y
-CONFIG_VGA_ARB_MAX_GPUS=16
-CONFIG_VGA_SWITCHEROO=y
-CONFIG_DRM=m
-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_UMS is not set
-CONFIG_DRM_NOUVEAU=m
-CONFIG_NOUVEAU_DEBUG=5
-CONFIG_NOUVEAU_DEBUG_DEFAULT=3
-CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-CONFIG_DRM_I915=m
-CONFIG_DRM_I915_KMS=y
-CONFIG_DRM_MGA=m
-CONFIG_DRM_SIS=m
-CONFIG_DRM_VIA=m
-CONFIG_DRM_SAVAGE=m
-CONFIG_DRM_VMWGFX=m
-CONFIG_DRM_VMWGFX_FBCON=y
-CONFIG_DRM_GMA500=m
-CONFIG_DRM_GMA600=y
-CONFIG_DRM_GMA3600=y
-CONFIG_DRM_UDL=m
-CONFIG_DRM_AST=m
-CONFIG_DRM_MGAG200=m
-CONFIG_DRM_CIRRUS_QEMU=m
-CONFIG_DRM_QXL=m
-CONFIG_VGASTATE=m
-CONFIG_VIDEO_OUTPUT_CONTROL=m
-CONFIG_HDMI=y
-CONFIG_FB=y
-CONFIG_FIRMWARE_EDID=y
-# CONFIG_FB_DDC is not set
-CONFIG_FB_BOOT_VESA_SUPPORT=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_IMAGEBLIT=m
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-CONFIG_FB_SYS_FOPS=m
-CONFIG_FB_DEFERRED_IO=y
-# CONFIG_FB_SVGALIB is not set
-# CONFIG_FB_MACMODES is not set
-CONFIG_FB_BACKLIGHT=y
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_TILEBLITTING=y
-
-#
-# Frame buffer hardware drivers
-#
-# CONFIG_FB_CIRRUS is not set
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_ARC is not set
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_IMSTT is not set
-CONFIG_FB_VGA16=m
-CONFIG_FB_UVESA=m
-CONFIG_FB_VESA=y
-CONFIG_FB_EFI=y
-# CONFIG_FB_N411 is not set
-# CONFIG_FB_HGA is not set
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_NVIDIA is not set
-# CONFIG_FB_RIVA is not set
-# CONFIG_FB_I740 is not set
-# CONFIG_FB_LE80578 is not set
-# CONFIG_FB_MATROX is not set
-# CONFIG_FB_RADEON is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_ATY is not set
-# CONFIG_FB_S3 is not set
-# CONFIG_FB_SAVAGE is not set
-# CONFIG_FB_SIS is not set
-CONFIG_FB_VIA=m
-CONFIG_FB_VIA_DIRECT_PROCFS=y
-CONFIG_FB_VIA_X_COMPATIBILITY=y
-# CONFIG_FB_NEOMAGIC is not set
-# CONFIG_FB_KYRO is not set
-# CONFIG_FB_3DFX is not set
-CONFIG_FB_VOODOO1=m
-CONFIG_FB_VT8623=m
-# CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_ARK is not set
-# CONFIG_FB_PM3 is not set
-# CONFIG_FB_CARMINE is not set
-# CONFIG_FB_TMIO is not set
-# 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
-# CONFIG_FB_MB862XX is not set
-# CONFIG_FB_BROADSHEET is not set
-# CONFIG_FB_AUO_K190X is not set
-CONFIG_FB_HYPERV=m
-# CONFIG_EXYNOS_VIDEO is not set
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=m
-# CONFIG_LCD_L4F00242T03 is not set
-# CONFIG_LCD_LMS283GF05 is not set
-# CONFIG_LCD_LTV350QV is not set
-# CONFIG_LCD_ILI922X is not set
-# CONFIG_LCD_ILI9320 is not set
-# CONFIG_LCD_TDO24M is not set
-# CONFIG_LCD_VGG2432A4 is not set
-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
-CONFIG_BACKLIGHT_APPLE=m
-# CONFIG_BACKLIGHT_SAHARA is not set
-# CONFIG_BACKLIGHT_ADP8860 is not set
-# CONFIG_BACKLIGHT_ADP8870 is not set
-CONFIG_BACKLIGHT_PCF50633=m
-# CONFIG_BACKLIGHT_LM3630 is not set
-# CONFIG_BACKLIGHT_LM3639 is not set
-# CONFIG_BACKLIGHT_LP855X is not set
-# CONFIG_BACKLIGHT_OT200 is not set
-# CONFIG_BACKLIGHT_TPS65217 is not set
-
-#
-# Console display driver support
-#
-CONFIG_VGA_CONSOLE=y
-# CONFIG_VGACON_SOFT_SCROLLBACK is not set
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-# CONFIG_LOGO is not set
-CONFIG_SOUND=m
-CONFIG_SOUND_OSS_CORE=y
-# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
-CONFIG_SND=m
-CONFIG_SND_TIMER=m
-CONFIG_SND_PCM=m
-CONFIG_SND_HWDEP=m
-CONFIG_SND_RAWMIDI=m
-CONFIG_SND_JACK=y
-CONFIG_SND_SEQUENCER=m
-CONFIG_SND_SEQ_DUMMY=m
-CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_PCM_OSS_PLUGINS=y
-CONFIG_SND_SEQUENCER_OSS=y
-CONFIG_SND_HRTIMER=m
-CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
-CONFIG_SND_DYNAMIC_MINORS=y
-CONFIG_SND_MAX_CARDS=32
-CONFIG_SND_SUPPORT_OLD_API=y
-CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
-# CONFIG_SND_DEBUG is not set
-CONFIG_SND_VMASTER=y
-CONFIG_SND_KCTL_JACK=y
-CONFIG_SND_DMA_SGBUF=y
-CONFIG_SND_RAWMIDI_SEQ=m
-CONFIG_SND_OPL3_LIB_SEQ=m
-# CONFIG_SND_OPL4_LIB_SEQ is not set
-# CONFIG_SND_SBAWE_SEQ is not set
-CONFIG_SND_EMU10K1_SEQ=m
-CONFIG_SND_MPU401_UART=m
-CONFIG_SND_OPL3_LIB=m
-CONFIG_SND_VX_LIB=m
-CONFIG_SND_AC97_CODEC=m
-CONFIG_SND_DRIVERS=y
-# CONFIG_SND_PCSP is not set
-CONFIG_SND_DUMMY=m
-CONFIG_SND_ALOOP=m
-CONFIG_SND_VIRMIDI=m
-CONFIG_SND_MTPAV=m
-CONFIG_SND_MTS64=m
-CONFIG_SND_SERIAL_U16550=m
-CONFIG_SND_MPU401=m
-CONFIG_SND_PORTMAN2X4=m
-CONFIG_SND_AC97_POWER_SAVE=y
-CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
-CONFIG_SND_SB_COMMON=m
-CONFIG_SND_SB16_DSP=m
-CONFIG_SND_TEA575X=m
-CONFIG_SND_PCI=y
-CONFIG_SND_AD1889=m
-CONFIG_SND_ALS300=m
-CONFIG_SND_ALS4000=m
-CONFIG_SND_ALI5451=m
-CONFIG_SND_ASIHPI=m
-CONFIG_SND_ATIIXP=m
-CONFIG_SND_ATIIXP_MODEM=m
-CONFIG_SND_AU8810=m
-CONFIG_SND_AU8820=m
-CONFIG_SND_AU8830=m
-CONFIG_SND_AW2=m
-CONFIG_SND_AZT3328=m
-CONFIG_SND_BT87X=m
-# CONFIG_SND_BT87X_OVERCLOCK is not set
-CONFIG_SND_CA0106=m
-CONFIG_SND_CMIPCI=m
-CONFIG_SND_OXYGEN_LIB=m
-CONFIG_SND_OXYGEN=m
-CONFIG_SND_CS4281=m
-CONFIG_SND_CS46XX=m
-CONFIG_SND_CS46XX_NEW_DSP=y
-CONFIG_SND_CS5530=m
-CONFIG_SND_CS5535AUDIO=m
-CONFIG_SND_CTXFI=m
-CONFIG_SND_DARLA20=m
-CONFIG_SND_GINA20=m
-CONFIG_SND_LAYLA20=m
-CONFIG_SND_DARLA24=m
-CONFIG_SND_GINA24=m
-CONFIG_SND_LAYLA24=m
-CONFIG_SND_MONA=m
-CONFIG_SND_MIA=m
-CONFIG_SND_ECHO3G=m
-CONFIG_SND_INDIGO=m
-CONFIG_SND_INDIGOIO=m
-CONFIG_SND_INDIGODJ=m
-CONFIG_SND_INDIGOIOX=m
-CONFIG_SND_INDIGODJX=m
-CONFIG_SND_EMU10K1=m
-CONFIG_SND_EMU10K1X=m
-CONFIG_SND_ENS1370=m
-CONFIG_SND_ENS1371=m
-CONFIG_SND_ES1938=m
-CONFIG_SND_ES1968=m
-CONFIG_SND_ES1968_INPUT=y
-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
-CONFIG_SND_HDA_INPUT_BEEP=y
-CONFIG_SND_HDA_INPUT_BEEP_MODE=1
-CONFIG_SND_HDA_INPUT_JACK=y
-CONFIG_SND_HDA_PATCH_LOADER=y
-CONFIG_SND_HDA_CODEC_REALTEK=y
-CONFIG_SND_HDA_CODEC_ANALOG=y
-CONFIG_SND_HDA_CODEC_SIGMATEL=y
-CONFIG_SND_HDA_CODEC_VIA=y
-CONFIG_SND_HDA_CODEC_HDMI=y
-CONFIG_SND_HDA_I915=y
-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
-CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
-CONFIG_SND_HDSP=m
-CONFIG_SND_HDSPM=m
-CONFIG_SND_ICE1712=m
-CONFIG_SND_ICE1724=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
-CONFIG_SND_KORG1212=m
-CONFIG_SND_LOLA=m
-CONFIG_SND_LX6464ES=m
-CONFIG_SND_MAESTRO3=m
-CONFIG_SND_MAESTRO3_INPUT=y
-CONFIG_SND_MIXART=m
-CONFIG_SND_NM256=m
-CONFIG_SND_PCXHR=m
-CONFIG_SND_RIPTIDE=m
-CONFIG_SND_RME32=m
-CONFIG_SND_RME96=m
-CONFIG_SND_RME9652=m
-CONFIG_SND_SONICVIBES=m
-CONFIG_SND_TRIDENT=m
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
-CONFIG_SND_VIRTUOSO=m
-CONFIG_SND_VX222=m
-CONFIG_SND_YMFPCI=m
-CONFIG_SND_SPI=y
-CONFIG_SND_USB=y
-CONFIG_SND_USB_AUDIO=m
-CONFIG_SND_USB_UA101=m
-CONFIG_SND_USB_USX2Y=m
-CONFIG_SND_USB_CAIAQ=m
-CONFIG_SND_USB_CAIAQ_INPUT=y
-CONFIG_SND_USB_US122L=m
-CONFIG_SND_USB_6FIRE=m
-CONFIG_SND_USB_HIFACE=m
-CONFIG_SND_FIREWIRE=y
-CONFIG_SND_FIREWIRE_LIB=m
-CONFIG_SND_FIREWIRE_SPEAKERS=m
-CONFIG_SND_ISIGHT=m
-CONFIG_SND_SCS1X=m
-CONFIG_SND_PCMCIA=y
-CONFIG_SND_VXPOCKET=m
-CONFIG_SND_PDAUDIOCF=m
-# CONFIG_SND_SOC is not set
-# CONFIG_SOUND_PRIME is not set
-CONFIG_AC97_BUS=m
-
-#
-# HID support
-#
-CONFIG_HID=m
-CONFIG_HIDRAW=y
-CONFIG_UHID=m
-CONFIG_HID_GENERIC=m
-
-#
-# Special HID drivers
-#
-CONFIG_HID_A4TECH=m
-CONFIG_HID_ACRUX=m
-CONFIG_HID_ACRUX_FF=y
-CONFIG_HID_APPLE=m
-CONFIG_HID_APPLEIR=m
-CONFIG_HID_AUREAL=m
-CONFIG_HID_BELKIN=m
-CONFIG_HID_CHERRY=m
-CONFIG_HID_CHICONY=m
-CONFIG_HID_PRODIKEYS=m
-CONFIG_HID_CYPRESS=m
-CONFIG_HID_DRAGONRISE=m
-CONFIG_DRAGONRISE_FF=y
-CONFIG_HID_EMS_FF=m
-CONFIG_HID_ELECOM=m
-CONFIG_HID_ELO=m
-CONFIG_HID_EZKEY=m
-CONFIG_HID_HOLTEK=m
-CONFIG_HOLTEK_FF=y
-CONFIG_HID_HUION=m
-CONFIG_HID_KEYTOUCH=m
-CONFIG_HID_KYE=m
-CONFIG_HID_UCLOGIC=m
-CONFIG_HID_WALTOP=m
-CONFIG_HID_GYRATION=m
-CONFIG_HID_ICADE=m
-CONFIG_HID_TWINHAN=m
-CONFIG_HID_KENSINGTON=m
-CONFIG_HID_LCPOWER=m
-CONFIG_HID_LENOVO_TPKBD=m
-CONFIG_HID_LOGITECH=m
-CONFIG_HID_LOGITECH_DJ=m
-CONFIG_LOGITECH_FF=y
-CONFIG_LOGIRUMBLEPAD2_FF=y
-CONFIG_LOGIG940_FF=y
-CONFIG_LOGIWHEELS_FF=y
-CONFIG_HID_MAGICMOUSE=m
-CONFIG_HID_MICROSOFT=m
-CONFIG_HID_MONTEREY=m
-CONFIG_HID_MULTITOUCH=m
-CONFIG_HID_NTRIG=m
-CONFIG_HID_ORTEK=m
-CONFIG_HID_PANTHERLORD=m
-CONFIG_PANTHERLORD_FF=y
-CONFIG_HID_PETALYNX=m
-CONFIG_HID_PICOLCD=m
-CONFIG_HID_PICOLCD_FB=y
-CONFIG_HID_PICOLCD_BACKLIGHT=y
-CONFIG_HID_PICOLCD_LCD=y
-CONFIG_HID_PICOLCD_LEDS=y
-CONFIG_HID_PICOLCD_CIR=y
-CONFIG_HID_PRIMAX=m
-CONFIG_HID_ROCCAT=m
-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
-CONFIG_HID_HYPERV_MOUSE=m
-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
-CONFIG_HID_WIIMOTE=m
-CONFIG_HID_ZEROPLUS=m
-CONFIG_ZEROPLUS_FF=y
-CONFIG_HID_ZYDACRON=m
-CONFIG_HID_SENSOR_HUB=m
-
-#
-# USB HID support
-#
-CONFIG_USB_HID=m
-CONFIG_HID_PID=y
-CONFIG_USB_HIDDEV=y
-
-#
-# I2C HID support
-#
-CONFIG_I2C_HID=m
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_COMMON=m
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB=m
-# CONFIG_USB_DEBUG is not set
-# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-
-#
-# Miscellaneous USB options
-#
-CONFIG_USB_DEFAULT_PERSIST=y
-CONFIG_USB_DYNAMIC_MINORS=y
-# CONFIG_USB_OTG is not set
-CONFIG_USB_MON=m
-CONFIG_USB_WUSB=m
-CONFIG_USB_WUSB_CBAF=m
-# CONFIG_USB_WUSB_CBAF_DEBUG is not set
-
-#
-# USB Host Controller Drivers
-#
-CONFIG_USB_C67X00_HCD=m
-CONFIG_USB_XHCI_HCD=m
-# CONFIG_USB_XHCI_HCD_DEBUGGING is not set
-CONFIG_USB_EHCI_HCD=m
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_EHCI_TT_NEWSCHED=y
-CONFIG_USB_EHCI_PCI=m
-# CONFIG_USB_EHCI_HCD_PLATFORM is not set
-CONFIG_USB_OXU210HP_HCD=m
-CONFIG_USB_ISP116X_HCD=m
-CONFIG_USB_ISP1760_HCD=m
-CONFIG_USB_ISP1362_HCD=m
-CONFIG_USB_FUSBH200_HCD=m
-CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_OHCI_HCD_PCI=m
-# CONFIG_USB_OHCI_HCD_SSB is not set
-# CONFIG_USB_OHCI_HCD_PLATFORM is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-CONFIG_USB_UHCI_HCD=m
-CONFIG_USB_U132_HCD=m
-CONFIG_USB_SL811_HCD=m
-# CONFIG_USB_SL811_HCD_ISO is not set
-CONFIG_USB_SL811_CS=m
-CONFIG_USB_R8A66597_HCD=m
-CONFIG_USB_RENESAS_USBHS_HCD=m
-CONFIG_USB_WHCI_HCD=m
-CONFIG_USB_HWA_HCD=m
-# CONFIG_USB_HCD_BCMA is not set
-# CONFIG_USB_HCD_SSB is not set
-CONFIG_USB_MUSB_HDRC=m
-# CONFIG_USB_MUSB_HOST is not set
-# CONFIG_USB_MUSB_GADGET is not set
-CONFIG_USB_MUSB_DUAL_ROLE=y
-CONFIG_USB_MUSB_TUSB6010=m
-CONFIG_USB_MUSB_DSPS=m
-CONFIG_USB_MUSB_UX500=m
-# CONFIG_USB_UX500_DMA is not set
-CONFIG_MUSB_PIO_ONLY=y
-CONFIG_USB_RENESAS_USBHS=m
-
-#
-# USB Device Class drivers
-#
-CONFIG_USB_ACM=m
-CONFIG_USB_PRINTER=m
-CONFIG_USB_WDM=m
-CONFIG_USB_TMC=m
-
-#
-# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
-#
-
-#
-# also be needed; see USB_STORAGE Help for more info
-#
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_REALTEK=m
-CONFIG_REALTEK_AUTOPM=y
-CONFIG_USB_STORAGE_DATAFAB=m
-CONFIG_USB_STORAGE_FREECOM=m
-CONFIG_USB_STORAGE_ISD200=m
-CONFIG_USB_STORAGE_USBAT=m
-CONFIG_USB_STORAGE_SDDR09=m
-CONFIG_USB_STORAGE_SDDR55=m
-CONFIG_USB_STORAGE_JUMPSHOT=m
-CONFIG_USB_STORAGE_ALAUDA=m
-CONFIG_USB_STORAGE_ONETOUCH=m
-CONFIG_USB_STORAGE_KARMA=m
-CONFIG_USB_STORAGE_CYPRESS_ATACB=m
-CONFIG_USB_STORAGE_ENE_UB6250=m
-
-#
-# USB Imaging devices
-#
-CONFIG_USB_MDC800=m
-CONFIG_USB_MICROTEK=m
-# CONFIG_USB_DWC3 is not set
-CONFIG_USB_CHIPIDEA=m
-CONFIG_USB_CHIPIDEA_UDC=y
-# CONFIG_USB_CHIPIDEA_DEBUG is not set
-
-#
-# USB port drivers
-#
-CONFIG_USB_USS720=m
-CONFIG_USB_SERIAL=m
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_AIRCABLE=m
-CONFIG_USB_SERIAL_ARK3116=m
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_CH341=m
-CONFIG_USB_SERIAL_WHITEHEAT=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-CONFIG_USB_SERIAL_CP210X=m
-CONFIG_USB_SERIAL_CYPRESS_M8=m
-CONFIG_USB_SERIAL_EMPEG=m
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_FUNSOFT=m
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_IPAQ=m
-CONFIG_USB_SERIAL_IR=m
-CONFIG_USB_SERIAL_EDGEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT_TI=m
-CONFIG_USB_SERIAL_F81232=m
-CONFIG_USB_SERIAL_GARMIN=m
-CONFIG_USB_SERIAL_IPW=m
-CONFIG_USB_SERIAL_IUU=m
-CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KEYSPAN_MPR=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19=y
-CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
-CONFIG_USB_SERIAL_KLSI=m
-CONFIG_USB_SERIAL_KOBIL_SCT=m
-CONFIG_USB_SERIAL_MCT_U232=m
-CONFIG_USB_SERIAL_METRO=m
-CONFIG_USB_SERIAL_MOS7720=m
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
-CONFIG_USB_SERIAL_MOS7840=m
-CONFIG_USB_SERIAL_MOTOROLA=m
-CONFIG_USB_SERIAL_NAVMAN=m
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_SERIAL_OTI6858=m
-CONFIG_USB_SERIAL_QCAUX=m
-CONFIG_USB_SERIAL_QUALCOMM=m
-CONFIG_USB_SERIAL_SPCP8X5=m
-CONFIG_USB_SERIAL_HP4X=m
-CONFIG_USB_SERIAL_SAFE=m
-# CONFIG_USB_SERIAL_SAFE_PADDED is not set
-CONFIG_USB_SERIAL_SIEMENS_MPI=m
-CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-CONFIG_USB_SERIAL_SYMBOL=m
-CONFIG_USB_SERIAL_TI=m
-CONFIG_USB_SERIAL_CYBERJACK=m
-CONFIG_USB_SERIAL_XIRCOM=m
-CONFIG_USB_SERIAL_WWAN=m
-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_WISHBONE=m
-CONFIG_USB_SERIAL_ZTE=m
-CONFIG_USB_SERIAL_SSU100=m
-CONFIG_USB_SERIAL_QT2=m
-CONFIG_USB_SERIAL_FLASHLOADER=m
-CONFIG_USB_SERIAL_SUUNTO=m
-# CONFIG_USB_SERIAL_DEBUG is not set
-
-#
-# USB Miscellaneous drivers
-#
-CONFIG_USB_EMI62=m
-CONFIG_USB_EMI26=m
-CONFIG_USB_ADUTUX=m
-CONFIG_USB_SEVSEG=m
-CONFIG_USB_RIO500=m
-CONFIG_USB_LEGOTOWER=m
-CONFIG_USB_LCD=m
-CONFIG_USB_LED=m
-CONFIG_USB_CYPRESS_CY7C63=m
-CONFIG_USB_CYTHERM=m
-CONFIG_USB_IDMOUSE=m
-CONFIG_USB_FTDI_ELAN=m
-CONFIG_USB_APPLEDISPLAY=m
-CONFIG_USB_SISUSBVGA=m
-# CONFIG_USB_SISUSBVGA_CON is not set
-CONFIG_USB_LD=m
-CONFIG_USB_TRANCEVIBRATOR=m
-CONFIG_USB_IOWARRIOR=m
-CONFIG_USB_TEST=m
-CONFIG_USB_ISIGHTFW=m
-CONFIG_USB_YUREX=m
-CONFIG_USB_EZUSB_FX2=m
-CONFIG_USB_HSIC_USB3503=m
-CONFIG_USB_ATM=m
-CONFIG_USB_SPEEDTOUCH=m
-CONFIG_USB_CXACRU=m
-CONFIG_USB_UEAGLEATM=m
-CONFIG_USB_XUSBATM=m
-CONFIG_USB_PHY=y
-CONFIG_NOP_USB_XCEIV=m
-# CONFIG_OMAP_CONTROL_USB is not set
-# CONFIG_OMAP_USB3 is not set
-CONFIG_SAMSUNG_USBPHY=m
-CONFIG_SAMSUNG_USB2PHY=m
-CONFIG_SAMSUNG_USB3PHY=m
-# CONFIG_USB_GPIO_VBUS is not set
-CONFIG_USB_ISP1301=m
-CONFIG_USB_RCAR_PHY=m
-CONFIG_USB_GADGET=m
-# CONFIG_USB_GADGET_DEBUG is not set
-# CONFIG_USB_GADGET_DEBUG_FILES is not set
-# CONFIG_USB_GADGET_DEBUG_FS is not set
-CONFIG_USB_GADGET_VBUS_DRAW=2
-CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
-
-#
-# USB Peripheral Controller
-#
-CONFIG_USB_FOTG210_UDC=m
-CONFIG_USB_R8A66597=m
-CONFIG_USB_RENESAS_USBHS_UDC=m
-CONFIG_USB_PXA27X=m
-CONFIG_USB_MV_UDC=m
-CONFIG_USB_MV_U3D=m
-CONFIG_USB_M66592=m
-CONFIG_USB_AMD5536UDC=m
-CONFIG_USB_NET2272=m
-CONFIG_USB_NET2272_DMA=y
-CONFIG_USB_NET2280=m
-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_U_ETHER=m
-CONFIG_USB_U_RNDIS=m
-CONFIG_USB_F_SERIAL=m
-CONFIG_USB_F_OBEX=m
-CONFIG_USB_F_NCM=m
-CONFIG_USB_F_ECM=m
-CONFIG_USB_F_SUBSET=m
-CONFIG_USB_F_RNDIS=m
-# CONFIG_USB_CONFIGFS is not set
-# CONFIG_USB_ZERO is not set
-CONFIG_USB_AUDIO=m
-# CONFIG_GADGET_UAC1 is not set
-CONFIG_USB_ETH=m
-CONFIG_USB_ETH_RNDIS=y
-# CONFIG_USB_ETH_EEM is not set
-CONFIG_USB_G_NCM=m
-CONFIG_USB_GADGETFS=m
-CONFIG_USB_FUNCTIONFS=m
-CONFIG_USB_FUNCTIONFS_ETH=y
-CONFIG_USB_FUNCTIONFS_RNDIS=y
-CONFIG_USB_FUNCTIONFS_GENERIC=y
-CONFIG_USB_MASS_STORAGE=m
-CONFIG_USB_GADGET_TARGET=m
-CONFIG_USB_G_SERIAL=m
-CONFIG_USB_MIDI_GADGET=m
-CONFIG_USB_G_PRINTER=m
-# CONFIG_USB_CDC_COMPOSITE is not set
-# CONFIG_USB_G_NOKIA is not set
-# CONFIG_USB_G_ACM_MS is not set
-# CONFIG_USB_G_MULTI is not set
-CONFIG_USB_G_HID=m
-CONFIG_USB_G_DBGP=m
-# CONFIG_USB_G_DBGP_PRINTK is not set
-CONFIG_USB_G_DBGP_SERIAL=y
-CONFIG_USB_G_WEBCAM=m
-CONFIG_UWB=m
-CONFIG_UWB_HWA=m
-CONFIG_UWB_WHCI=m
-CONFIG_UWB_I1480U=m
-CONFIG_MMC=m
-# CONFIG_MMC_DEBUG is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
-# CONFIG_MMC_CLKGATE is not set
-
-#
-# MMC/SD/SDIO Card Drivers
-#
-CONFIG_MMC_BLOCK=m
-CONFIG_MMC_BLOCK_MINORS=8
-CONFIG_MMC_BLOCK_BOUNCE=y
-CONFIG_SDIO_UART=m
-# CONFIG_MMC_TEST is not set
-
-#
-# MMC/SD/SDIO Host Controller Drivers
-#
-CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_PCI=m
-CONFIG_MMC_RICOH_MMC=y
-CONFIG_MMC_SDHCI_ACPI=m
-CONFIG_MMC_SDHCI_PLTFM=m
-CONFIG_MMC_WBSD=m
-CONFIG_MMC_TIFM_SD=m
-# CONFIG_MMC_SPI is not set
-CONFIG_MMC_SDRICOH_CS=m
-CONFIG_MMC_CB710=m
-CONFIG_MMC_VIA_SDMMC=m
-CONFIG_MMC_VUB300=m
-CONFIG_MMC_USHC=m
-CONFIG_MMC_REALTEK_PCI=m
-CONFIG_MEMSTICK=m
-# CONFIG_MEMSTICK_DEBUG is not set
-
-#
-# MemoryStick drivers
-#
-# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
-CONFIG_MSPRO_BLOCK=m
-
-#
-# MemoryStick Host Controller Drivers
-#
-CONFIG_MEMSTICK_TIFM_MS=m
-CONFIG_MEMSTICK_JMICRON_38X=m
-CONFIG_MEMSTICK_R592=m
-CONFIG_MEMSTICK_REALTEK_PCI=m
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-
-#
-# LED drivers
-#
-CONFIG_LEDS_LM3530=m
-CONFIG_LEDS_LM3533=m
-CONFIG_LEDS_LM3642=m
-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_LP5562=m
-CONFIG_LEDS_CLEVO_MAIL=m
-CONFIG_LEDS_PCA955X=m
-CONFIG_LEDS_PCA9633=m
-# CONFIG_LEDS_DAC124S085 is not set
-CONFIG_LEDS_BD2802=m
-CONFIG_LEDS_INTEL_SS4200=m
-CONFIG_LEDS_LT3593=m
-CONFIG_LEDS_DELL_NETBOOKS=m
-CONFIG_LEDS_MC13783=m
-CONFIG_LEDS_TCA6507=m
-CONFIG_LEDS_LM355x=m
-CONFIG_LEDS_OT200=m
-CONFIG_LEDS_BLINKM=m
-
-#
-# LED Triggers
-#
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_ONESHOT=m
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
-CONFIG_LEDS_TRIGGER_BACKLIGHT=m
-# CONFIG_LEDS_TRIGGER_CPU is not set
-CONFIG_LEDS_TRIGGER_GPIO=m
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
-
-#
-# iptables trigger is under Netfilter config (LED target)
-#
-CONFIG_LEDS_TRIGGER_TRANSIENT=m
-CONFIG_LEDS_TRIGGER_CAMERA=m
-CONFIG_ACCESSIBILITY=y
-CONFIG_A11Y_BRAILLE_CONSOLE=y
-# CONFIG_INFINIBAND is not set
-CONFIG_EDAC=y
-CONFIG_EDAC_LEGACY_SYSFS=y
-# CONFIG_EDAC_DEBUG is not set
-CONFIG_EDAC_DECODE_MCE=m
-CONFIG_EDAC_MCE_INJ=m
-CONFIG_EDAC_MM_EDAC=m
-CONFIG_EDAC_AMD64=m
-# CONFIG_EDAC_AMD64_ERROR_INJECTION is not set
-CONFIG_EDAC_E752X=m
-CONFIG_EDAC_I82975X=m
-CONFIG_EDAC_I3000=m
-CONFIG_EDAC_I3200=m
-CONFIG_EDAC_X38=m
-CONFIG_EDAC_I5400=m
-CONFIG_EDAC_I7CORE=m
-CONFIG_EDAC_I5000=m
-CONFIG_EDAC_I5100=m
-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
-
-#
-# RTC interfaces
-#
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
-CONFIG_RTC_INTF_DEV_UIE_EMUL=y
-CONFIG_RTC_DRV_TEST=m
-
-#
-# I2C RTC drivers
-#
-CONFIG_RTC_DRV_DS1307=m
-CONFIG_RTC_DRV_DS1374=m
-CONFIG_RTC_DRV_DS1672=m
-CONFIG_RTC_DRV_DS3232=m
-CONFIG_RTC_DRV_MAX6900=m
-CONFIG_RTC_DRV_RS5C372=m
-CONFIG_RTC_DRV_ISL1208=m
-CONFIG_RTC_DRV_ISL12022=m
-CONFIG_RTC_DRV_X1205=m
-CONFIG_RTC_DRV_PCF2127=m
-CONFIG_RTC_DRV_PCF8523=m
-CONFIG_RTC_DRV_PCF8563=m
-CONFIG_RTC_DRV_PCF8583=m
-CONFIG_RTC_DRV_M41T80=m
-CONFIG_RTC_DRV_M41T80_WDT=y
-CONFIG_RTC_DRV_BQ32K=m
-CONFIG_RTC_DRV_S35390A=m
-CONFIG_RTC_DRV_FM3130=m
-CONFIG_RTC_DRV_RX8581=m
-CONFIG_RTC_DRV_RX8025=m
-CONFIG_RTC_DRV_EM3027=m
-CONFIG_RTC_DRV_RV3029C2=m
-
-#
-# SPI RTC drivers
-#
-# CONFIG_RTC_DRV_M41T93 is not set
-# CONFIG_RTC_DRV_M41T94 is not set
-# CONFIG_RTC_DRV_DS1305 is not set
-# CONFIG_RTC_DRV_DS1390 is not set
-# CONFIG_RTC_DRV_MAX6902 is not set
-# CONFIG_RTC_DRV_R9701 is not set
-# 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
-#
-CONFIG_RTC_DRV_CMOS=y
-CONFIG_RTC_DRV_DS1286=m
-CONFIG_RTC_DRV_DS1511=m
-CONFIG_RTC_DRV_DS1553=m
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_STK17TA8=m
-CONFIG_RTC_DRV_M48T86=m
-CONFIG_RTC_DRV_M48T35=m
-CONFIG_RTC_DRV_M48T59=m
-CONFIG_RTC_DRV_MSM6242=m
-CONFIG_RTC_DRV_BQ4802=m
-CONFIG_RTC_DRV_RP5C01=m
-CONFIG_RTC_DRV_V3020=m
-CONFIG_RTC_DRV_DS2404=m
-CONFIG_RTC_DRV_PCF50633=m
-
-#
-# on-CPU RTC drivers
-#
-CONFIG_RTC_DRV_MC13XXX=m
-
-#
-# HID Sensor RTC drivers
-#
-# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
-CONFIG_DMADEVICES=y
-# CONFIG_DMADEVICES_DEBUG is not set
-
-#
-# DMA Devices
-#
-CONFIG_INTEL_MID_DMAC=m
-CONFIG_INTEL_IOATDMA=m
-CONFIG_DW_DMAC_CORE=m
-CONFIG_DW_DMAC=m
-CONFIG_DW_DMAC_PCI=m
-CONFIG_TIMB_DMA=m
-CONFIG_PCH_DMA=m
-CONFIG_DMA_ENGINE=y
-CONFIG_DMA_ACPI=y
-
-#
-# DMA Clients
-#
-CONFIG_NET_DMA=y
-CONFIG_ASYNC_TX_DMA=y
-# CONFIG_DMATEST is not set
-CONFIG_DCA=m
-CONFIG_AUXDISPLAY=y
-CONFIG_KS0108=m
-CONFIG_KS0108_PORT=0x378
-CONFIG_KS0108_DELAY=2
-CONFIG_CFAG12864B=m
-CONFIG_CFAG12864B_RATE=20
-CONFIG_UIO=m
-CONFIG_UIO_CIF=m
-CONFIG_UIO_PDRV=m
-CONFIG_UIO_PDRV_GENIRQ=m
-# CONFIG_UIO_DMEM_GENIRQ is not set
-CONFIG_UIO_AEC=m
-CONFIG_UIO_SERCOS3=m
-CONFIG_UIO_PCI_GENERIC=m
-CONFIG_UIO_NETX=m
-CONFIG_VFIO_IOMMU_TYPE1=m
-CONFIG_VFIO=m
-CONFIG_VFIO_PCI=m
-CONFIG_VFIO_PCI_VGA=y
-CONFIG_VIRT_DRIVERS=y
-CONFIG_VIRTIO=m
-
-#
-# Virtio drivers
-#
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_BALLOON=m
-CONFIG_VIRTIO_MMIO=m
-CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
-
-#
-# Microsoft Hyper-V guest support
-#
-CONFIG_HYPERV=m
-CONFIG_HYPERV_UTILS=m
-CONFIG_HYPERV_BALLOON=m
-
-#
-# Xen driver support
-#
-CONFIG_XEN_BALLOON=y
-# CONFIG_XEN_SELFBALLOONING is not set
-CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y
-CONFIG_XEN_SCRUB_PAGES=y
-CONFIG_XEN_DEV_EVTCHN=m
-CONFIG_XEN_BACKEND=y
-CONFIG_XENFS=m
-CONFIG_XEN_COMPAT_XENFS=y
-CONFIG_XEN_SYS_HYPERVISOR=y
-CONFIG_XEN_XENBUS_FRONTEND=y
-CONFIG_XEN_GNTDEV=m
-CONFIG_XEN_GRANT_DEV_ALLOC=m
-CONFIG_SWIOTLB_XEN=y
-CONFIG_XEN_TMEM=m
-CONFIG_XEN_PCIDEV_BACKEND=m
-CONFIG_XEN_PRIVCMD=m
-CONFIG_XEN_ACPI_PROCESSOR=m
-# CONFIG_XEN_MCE_LOG is not set
-CONFIG_XEN_HAVE_PVMMU=y
-CONFIG_STAGING=y
-CONFIG_ET131X=m
-CONFIG_SLICOSS=m
-CONFIG_USBIP_CORE=m
-CONFIG_USBIP_VHCI_HCD=m
-CONFIG_USBIP_HOST=m
-# CONFIG_USBIP_DEBUG is not set
-CONFIG_W35UND=m
-CONFIG_PRISM2_USB=m
-CONFIG_ECHO=m
-CONFIG_COMEDI=m
-# CONFIG_COMEDI_DEBUG is not set
-CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048
-CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480
-CONFIG_COMEDI_MISC_DRIVERS=y
-CONFIG_COMEDI_KCOMEDILIB=m
-CONFIG_COMEDI_BOND=m
-CONFIG_COMEDI_TEST=m
-CONFIG_COMEDI_PARPORT=m
-CONFIG_COMEDI_SERIAL2002=m
-CONFIG_COMEDI_SKEL=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
-CONFIG_COMEDI_ADDI_APCI_1516=m
-CONFIG_COMEDI_ADDI_APCI_1564=m
-CONFIG_COMEDI_ADDI_APCI_16XX=m
-CONFIG_COMEDI_ADDI_APCI_2032=m
-CONFIG_COMEDI_ADDI_APCI_2200=m
-CONFIG_COMEDI_ADDI_APCI_3120=m
-CONFIG_COMEDI_ADDI_APCI_3501=m
-CONFIG_COMEDI_ADDI_APCI_3XXX=m
-CONFIG_COMEDI_ADL_PCI6208=m
-CONFIG_COMEDI_ADL_PCI7X3X=m
-CONFIG_COMEDI_ADL_PCI8164=m
-CONFIG_COMEDI_ADL_PCI9111=m
-CONFIG_COMEDI_ADL_PCI9118=m
-CONFIG_COMEDI_ADV_PCI1710=m
-CONFIG_COMEDI_ADV_PCI1723=m
-CONFIG_COMEDI_ADV_PCI1724=m
-CONFIG_COMEDI_ADV_PCI_DIO=m
-CONFIG_COMEDI_AMPLC_DIO200_PCI=m
-CONFIG_COMEDI_AMPLC_PC236_PCI=m
-CONFIG_COMEDI_AMPLC_PC263_PCI=m
-CONFIG_COMEDI_AMPLC_PCI224=m
-CONFIG_COMEDI_AMPLC_PCI230=m
-CONFIG_COMEDI_CONTEC_PCI_DIO=m
-CONFIG_COMEDI_DAS08_PCI=m
-CONFIG_COMEDI_DT3000=m
-CONFIG_COMEDI_DYNA_PCI10XX=m
-CONFIG_COMEDI_UNIOXX5=m
-CONFIG_COMEDI_GSC_HPDI=m
-CONFIG_COMEDI_ICP_MULTI=m
-CONFIG_COMEDI_II_PCI20KC=m
-CONFIG_COMEDI_DAQBOARD2000=m
-CONFIG_COMEDI_JR3_PCI=m
-CONFIG_COMEDI_KE_COUNTER=m
-CONFIG_COMEDI_CB_PCIDAS64=m
-CONFIG_COMEDI_CB_PCIDAS=m
-CONFIG_COMEDI_CB_PCIDDA=m
-CONFIG_COMEDI_CB_PCIMDAS=m
-CONFIG_COMEDI_CB_PCIMDDA=m
-CONFIG_COMEDI_ME4000=m
-CONFIG_COMEDI_ME_DAQ=m
-CONFIG_COMEDI_NI_6527=m
-CONFIG_COMEDI_NI_65XX=m
-CONFIG_COMEDI_NI_660X=m
-CONFIG_COMEDI_NI_670X=m
-CONFIG_COMEDI_NI_LABPC_PCI=m
-CONFIG_COMEDI_NI_PCIDIO=m
-CONFIG_COMEDI_NI_PCIMIO=m
-CONFIG_COMEDI_RTD520=m
-CONFIG_COMEDI_S626=m
-CONFIG_COMEDI_SSV_DNP=m
-CONFIG_COMEDI_MITE=m
-CONFIG_COMEDI_NI_TIOCMD=m
-CONFIG_COMEDI_PCMCIA_DRIVERS=y
-CONFIG_COMEDI_CB_DAS16_CS=m
-CONFIG_COMEDI_DAS08_CS=m
-CONFIG_COMEDI_NI_DAQ_700_CS=m
-CONFIG_COMEDI_NI_DAQ_DIO24_CS=m
-CONFIG_COMEDI_NI_LABPC_CS=m
-CONFIG_COMEDI_NI_MIO_CS=m
-CONFIG_COMEDI_QUATECH_DAQP_CS=m
-CONFIG_COMEDI_USB_DRIVERS=y
-CONFIG_COMEDI_DT9812=m
-CONFIG_COMEDI_USBDUX=m
-CONFIG_COMEDI_USBDUXFAST=m
-CONFIG_COMEDI_USBDUXSIGMA=m
-CONFIG_COMEDI_VMK80XX=m
-CONFIG_COMEDI_8255=m
-CONFIG_COMEDI_FC=m
-CONFIG_COMEDI_AMPLC_DIO200=m
-CONFIG_COMEDI_AMPLC_PC236=m
-CONFIG_COMEDI_DAS08=m
-CONFIG_COMEDI_NI_LABPC=m
-CONFIG_COMEDI_NI_TIO=m
-CONFIG_ASUS_OLED=m
-# CONFIG_PANEL is not set
-CONFIG_R8187SE=m
-CONFIG_RTL8192U=m
-CONFIG_RTLLIB=m
-CONFIG_RTLLIB_CRYPTO_CCMP=m
-CONFIG_RTLLIB_CRYPTO_TKIP=m
-CONFIG_RTLLIB_CRYPTO_WEP=m
-CONFIG_RTL8192E=m
-CONFIG_R8712U=m
-CONFIG_RTS5139=m
-# CONFIG_RTS5139_DEBUG is not set
-# CONFIG_TRANZPORT is not set
-CONFIG_IDE_PHISON=m
-CONFIG_LINE6_USB=m
-# CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set
-CONFIG_USB_SERIAL_QUATECH2=m
-CONFIG_VT6655=m
-CONFIG_VT6656=m
-CONFIG_DX_SEP=m
-CONFIG_ZSMALLOC=y
-CONFIG_ZRAM=m
-# CONFIG_ZRAM_DEBUG is not set
-CONFIG_WLAGS49_H2=m
-CONFIG_WLAGS49_H25=m
-CONFIG_FB_SM7XX=m
-CONFIG_CRYSTALHD=m
-CONFIG_FB_XGI=m
-CONFIG_ACPI_QUICKSTART=m
-CONFIG_USB_ENESTORAGE=m
-CONFIG_BCM_WIMAX=m
-CONFIG_FT1000=m
-CONFIG_FT1000_USB=m
-CONFIG_FT1000_PCMCIA=m
-
-#
-# Speakup console speech
-#
-CONFIG_SPEAKUP=m
-CONFIG_SPEAKUP_SYNTH_ACNTSA=m
-CONFIG_SPEAKUP_SYNTH_ACNTPC=m
-CONFIG_SPEAKUP_SYNTH_APOLLO=m
-CONFIG_SPEAKUP_SYNTH_AUDPTR=m
-CONFIG_SPEAKUP_SYNTH_BNS=m
-CONFIG_SPEAKUP_SYNTH_DECTLK=m
-CONFIG_SPEAKUP_SYNTH_DECEXT=m
-CONFIG_SPEAKUP_SYNTH_DECPC=m
-CONFIG_SPEAKUP_SYNTH_DTLK=m
-CONFIG_SPEAKUP_SYNTH_KEYPC=m
-CONFIG_SPEAKUP_SYNTH_LTLK=m
-CONFIG_SPEAKUP_SYNTH_SOFT=m
-CONFIG_SPEAKUP_SYNTH_SPKOUT=m
-CONFIG_SPEAKUP_SYNTH_TXPRT=m
-CONFIG_SPEAKUP_SYNTH_DUMMY=m
-CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
-CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
-CONFIG_STAGING_MEDIA=y
-CONFIG_DVB_AS102=m
-CONFIG_DVB_CXD2099=m
-CONFIG_VIDEO_DT3155=m
-CONFIG_DT3155_CCIR=y
-CONFIG_DT3155_STREAMING=y
-CONFIG_VIDEO_GO7007=m
-CONFIG_VIDEO_GO7007_USB=m
-CONFIG_VIDEO_GO7007_LOADER=m
-# CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set
-CONFIG_SOLO6X10=m
-CONFIG_LIRC_STAGING=y
-CONFIG_LIRC_BT829=m
-CONFIG_LIRC_IGORPLUGUSB=m
-CONFIG_LIRC_IMON=m
-CONFIG_LIRC_PARALLEL=m
-CONFIG_LIRC_SASEM=m
-CONFIG_LIRC_SERIAL=m
-CONFIG_LIRC_SERIAL_TRANSMITTER=y
-CONFIG_LIRC_SIR=m
-CONFIG_LIRC_ZILOG=m
-
-#
-# Android
-#
-# CONFIG_ANDROID is not set
-CONFIG_USB_WPAN_HCD=m
-CONFIG_WIMAX_GDM72XX=m
-CONFIG_WIMAX_GDM72XX_QOS=y
-CONFIG_WIMAX_GDM72XX_K_MODE=y
-CONFIG_WIMAX_GDM72XX_WIMAX2=y
-CONFIG_WIMAX_GDM72XX_USB=y
-# CONFIG_WIMAX_GDM72XX_SDIO is not set
-CONFIG_WIMAX_GDM72XX_USB_PM=y
-CONFIG_NET_VENDOR_SILICOM=y
-CONFIG_SBYPASS=m
-CONFIG_BPCTL=m
-CONFIG_CED1401=m
-CONFIG_DGRP=m
-CONFIG_FIREWIRE_SERIAL=m
-CONFIG_ZCACHE=m
-# CONFIG_ZCACHE_DEBUG is not set
-CONFIG_RAMSTER=m
-# CONFIG_RAMSTER_DEBUG is not set
-# CONFIG_USB_DWC2 is not set
-CONFIG_USB_BTMTK=m
-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
-CONFIG_FUJITSU_LAPTOP=m
-# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
-CONFIG_FUJITSU_TABLET=m
-CONFIG_AMILO_RFKILL=m
-CONFIG_HP_ACCEL=m
-CONFIG_HP_WMI=m
-CONFIG_MSI_LAPTOP=m
-CONFIG_PANASONIC_LAPTOP=m
-CONFIG_COMPAL_LAPTOP=m
-CONFIG_SONY_LAPTOP=m
-# CONFIG_SONYPI_COMPAT is not set
-CONFIG_IDEAPAD_LAPTOP=m
-CONFIG_THINKPAD_ACPI=m
-CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
-# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
-# CONFIG_THINKPAD_ACPI_DEBUG is not set
-# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
-CONFIG_THINKPAD_ACPI_VIDEO=y
-CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
-CONFIG_SENSORS_HDAPS=m
-CONFIG_INTEL_MENLOW=m
-CONFIG_EEEPC_LAPTOP=m
-CONFIG_ASUS_WMI=m
-CONFIG_ASUS_NB_WMI=m
-CONFIG_EEEPC_WMI=m
-CONFIG_ACPI_WMI=m
-CONFIG_MSI_WMI=m
-CONFIG_TOPSTAR_LAPTOP=m
-CONFIG_ACPI_TOSHIBA=m
-CONFIG_TOSHIBA_BT_RFKILL=m
-CONFIG_ACPI_CMPC=m
-CONFIG_INTEL_IPS=m
-CONFIG_IBM_RTL=m
-CONFIG_XO15_EBOOK=m
-CONFIG_SAMSUNG_LAPTOP=m
-CONFIG_MXM_WMI=m
-CONFIG_INTEL_OAKTRAIL=m
-CONFIG_SAMSUNG_Q10=m
-CONFIG_APPLE_GMUX=m
-CONFIG_INTEL_RST=m
-CONFIG_INTEL_SMARTCONNECT=y
-CONFIG_PVPANIC=m
-
-#
-# Hardware Spinlock drivers
-#
-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_AMD_IOMMU=y
-# CONFIG_AMD_IOMMU_STATS is not set
-CONFIG_AMD_IOMMU_V2=m
-CONFIG_DMAR_TABLE=y
-CONFIG_INTEL_IOMMU=y
-# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
-CONFIG_INTEL_IOMMU_FLOPPY_WA=y
-CONFIG_IRQ_REMAP=y
-
-#
-# Remoteproc drivers
-#
-CONFIG_REMOTEPROC=m
-CONFIG_STE_MODEM_RPROC=m
-
-#
-# Rpmsg drivers
-#
-# CONFIG_PM_DEVFREQ is not set
-CONFIG_EXTCON=m
-
-#
-# Extcon Device Drivers
-#
-CONFIG_EXTCON_GPIO=m
-CONFIG_MEMORY=y
-# CONFIG_IIO is not set
-# CONFIG_NTB is not set
-# CONFIG_VME_BUS is not set
-# CONFIG_PWM is not set
-CONFIG_IPACK_BUS=m
-CONFIG_BOARD_TPCI200=m
-CONFIG_SERIAL_IPOCTAL=m
-# CONFIG_RESET_CONTROLLER is not set
-CONFIG_FMC=m
-CONFIG_FMC_FAKEDEV=m
-CONFIG_FMC_TRIVIAL=m
-CONFIG_FMC_WRITE_EEPROM=m
-CONFIG_FMC_CHARDEV=m
-
-#
-# Firmware Drivers
-#
-CONFIG_EDD=m
-# CONFIG_EDD_OFF is not set
-CONFIG_FIRMWARE_MEMMAP=y
-CONFIG_DELL_RBU=m
-CONFIG_DCDBAS=m
-CONFIG_DMIID=y
-CONFIG_DMI_SYSFS=m
-CONFIG_ISCSI_IBFT_FIND=y
-CONFIG_ISCSI_IBFT=m
-# CONFIG_GOOGLE_FIRMWARE is not set
-
-#
-# EFI (Extensible Firmware Interface) Support
-#
-CONFIG_EFI_VARS=m
-CONFIG_EFI_VARS_PSTORE=m
-CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
-
-#
-# File systems
-#
-CONFIG_DCACHE_WORD_ACCESS=y
-# CONFIG_EXT2_FS is not set
-# CONFIG_EXT3_FS is not set
-CONFIG_EXT4_FS=m
-CONFIG_EXT4_USE_FOR_EXT23=y
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-# CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD2=m
-# CONFIG_JBD2_DEBUG is not set
-CONFIG_FS_MBCACHE=m
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
-CONFIG_REISERFS_PROC_INFO=y
-CONFIG_REISERFS_FS_XATTR=y
-CONFIG_REISERFS_FS_POSIX_ACL=y
-CONFIG_REISERFS_FS_SECURITY=y
-CONFIG_JFS_FS=m
-CONFIG_JFS_POSIX_ACL=y
-CONFIG_JFS_SECURITY=y
-# CONFIG_JFS_DEBUG is not set
-CONFIG_JFS_STATISTICS=y
-CONFIG_XFS_FS=m
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_POSIX_ACL=y
-CONFIG_XFS_RT=y
-# CONFIG_XFS_WARN is not set
-# CONFIG_XFS_DEBUG is not set
-CONFIG_GFS2_FS=m
-CONFIG_GFS2_FS_LOCKING_DLM=y
-CONFIG_OCFS2_FS=m
-CONFIG_OCFS2_FS_O2CB=m
-CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
-CONFIG_OCFS2_FS_STATS=y
-# CONFIG_OCFS2_DEBUG_MASKLOG is not set
-# CONFIG_OCFS2_DEBUG_FS is not set
-CONFIG_BTRFS_FS=m
-CONFIG_BTRFS_FS_POSIX_ACL=y
-# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
-# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-# CONFIG_BTRFS_DEBUG is not set
-CONFIG_NILFS2_FS=m
-CONFIG_FS_POSIX_ACL=y
-CONFIG_EXPORTFS=y
-CONFIG_FILE_LOCKING=y
-CONFIG_FSNOTIFY=y
-CONFIG_DNOTIFY=y
-CONFIG_INOTIFY_USER=y
-CONFIG_FANOTIFY=y
-CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
-CONFIG_QUOTA=y
-CONFIG_QUOTA_NETLINK_INTERFACE=y
-# CONFIG_PRINT_QUOTA_WARNING is not set
-# CONFIG_QUOTA_DEBUG is not set
-CONFIG_QUOTA_TREE=m
-CONFIG_QFMT_V1=m
-CONFIG_QFMT_V2=m
-CONFIG_QUOTACTL=y
-CONFIG_QUOTACTL_COMPAT=y
-CONFIG_AUTOFS4_FS=y
-CONFIG_FUSE_FS=m
-CONFIG_CUSE=m
-CONFIG_GENERIC_ACL=y
-
-#
-# Caches
-#
-CONFIG_FSCACHE=m
-CONFIG_FSCACHE_STATS=y
-CONFIG_FSCACHE_HISTOGRAM=y
-# CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_OBJECT_LIST is not set
-CONFIG_CACHEFILES=m
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
-
-#
-# CD-ROM/DVD Filesystems
-#
-CONFIG_ISO9660_FS=m
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_UDF_FS=m
-CONFIG_UDF_NLS=y
-
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-CONFIG_NTFS_FS=m
-# CONFIG_NTFS_DEBUG is not set
-CONFIG_NTFS_RW=y
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_PROC_SYSCTL=y
-CONFIG_PROC_PAGE_MONITOR=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_TMPFS_XATTR=y
-CONFIG_HUGETLBFS=y
-CONFIG_HUGETLB_PAGE=y
-CONFIG_CONFIGFS_FS=y
-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
-# CONFIG_BEFS_DEBUG is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-CONFIG_JFFS2_FS=m
-CONFIG_JFFS2_FS_DEBUG=0
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-# CONFIG_JFFS2_SUMMARY is not set
-# CONFIG_JFFS2_FS_XATTR is not set
-# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-CONFIG_JFFS2_ZLIB=y
-# CONFIG_JFFS2_LZO is not set
-CONFIG_JFFS2_RTIME=y
-# CONFIG_JFFS2_RUBIN is not set
-CONFIG_UBIFS_FS=m
-# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
-CONFIG_LOGFS=m
-CONFIG_CRAMFS=m
-CONFIG_SQUASHFS=m
-CONFIG_SQUASHFS_XATTR=y
-CONFIG_SQUASHFS_ZLIB=y
-CONFIG_SQUASHFS_LZO=y
-CONFIG_SQUASHFS_XZ=y
-# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
-# CONFIG_SQUASHFS_EMBEDDED is not set
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-# CONFIG_VXFS_FS is not set
-CONFIG_MINIX_FS=m
-CONFIG_OMFS_FS=m
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_QNX6FS_FS is not set
-# CONFIG_ROMFS_FS is not set
-CONFIG_PSTORE=y
-# CONFIG_PSTORE_CONSOLE is not set
-# CONFIG_PSTORE_FTRACE is not set
-CONFIG_PSTORE_RAM=m
-# CONFIG_SYSV_FS is not set
-CONFIG_UFS_FS=m
-# CONFIG_UFS_FS_WRITE is not set
-# CONFIG_UFS_DEBUG is not set
-CONFIG_EXOFS_FS=m
-# CONFIG_EXOFS_DEBUG is not set
-CONFIG_F2FS_FS=m
-CONFIG_F2FS_STAT_FS=y
-CONFIG_F2FS_FS_XATTR=y
-CONFIG_F2FS_FS_POSIX_ACL=y
-CONFIG_F2FS_FS_SECURITY=y
-CONFIG_EFIVAR_FS=y
-CONFIG_ORE=m
-CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_NFS_FS=m
-CONFIG_NFS_V2=m
-CONFIG_NFS_V3=m
-CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=m
-CONFIG_NFS_SWAP=y
-CONFIG_NFS_V4_1=y
-CONFIG_NFS_V4_2=y
-CONFIG_PNFS_FILE_LAYOUT=m
-CONFIG_PNFS_BLOCK=m
-CONFIG_PNFS_OBJLAYOUT=m
-CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org"
-CONFIG_NFS_V4_SECURITY_LABEL=y
-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
-CONFIG_NFSD_V3_ACL=y
-CONFIG_NFSD_V4=y
-CONFIG_NFSD_V4_SECURITY_LABEL=y
-# CONFIG_NFSD_FAULT_INJECTION is not set
-CONFIG_LOCKD=m
-CONFIG_LOCKD_V4=y
-CONFIG_NFS_ACL_SUPPORT=m
-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
-CONFIG_CIFS=m
-CONFIG_CIFS_STATS=y
-# CONFIG_CIFS_STATS2 is not set
-CONFIG_CIFS_WEAK_PW_HASH=y
-CONFIG_CIFS_UPCALL=y
-CONFIG_CIFS_XATTR=y
-CONFIG_CIFS_POSIX=y
-CONFIG_CIFS_ACL=y
-# CONFIG_CIFS_DEBUG is not set
-CONFIG_CIFS_DFS_UPCALL=y
-CONFIG_CIFS_SMB2=y
-CONFIG_CIFS_FSCACHE=y
-CONFIG_NCP_FS=m
-# CONFIG_NCPFS_PACKET_SIGNING is not set
-# CONFIG_NCPFS_IOCTL_LOCKING is not set
-# CONFIG_NCPFS_STRONG is not set
-CONFIG_NCPFS_NFS_NS=y
-CONFIG_NCPFS_OS2_NS=y
-CONFIG_NCPFS_SMALLDOS=y
-CONFIG_NCPFS_NLS=y
-# CONFIG_NCPFS_EXTRAS is not set
-CONFIG_CODA_FS=m
-CONFIG_AFS_FS=m
-# CONFIG_AFS_DEBUG is not set
-CONFIG_AFS_FSCACHE=y
-CONFIG_9P_FS=m
-CONFIG_9P_FSCACHE=y
-CONFIG_9P_FS_POSIX_ACL=y
-CONFIG_9P_FS_SECURITY=y
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_737=m
-CONFIG_NLS_CODEPAGE_775=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_852=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_857=m
-CONFIG_NLS_CODEPAGE_860=m
-CONFIG_NLS_CODEPAGE_861=m
-CONFIG_NLS_CODEPAGE_862=m
-CONFIG_NLS_CODEPAGE_863=m
-CONFIG_NLS_CODEPAGE_864=m
-CONFIG_NLS_CODEPAGE_865=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_CODEPAGE_869=m
-CONFIG_NLS_CODEPAGE_936=m
-CONFIG_NLS_CODEPAGE_950=m
-CONFIG_NLS_CODEPAGE_932=m
-CONFIG_NLS_CODEPAGE_949=m
-CONFIG_NLS_CODEPAGE_874=m
-CONFIG_NLS_ISO8859_8=m
-CONFIG_NLS_CODEPAGE_1250=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_ASCII=m
-CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_ISO8859_2=m
-CONFIG_NLS_ISO8859_3=m
-CONFIG_NLS_ISO8859_4=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_ISO8859_6=m
-CONFIG_NLS_ISO8859_7=m
-CONFIG_NLS_ISO8859_9=m
-CONFIG_NLS_ISO8859_13=m
-CONFIG_NLS_ISO8859_14=m
-CONFIG_NLS_ISO8859_15=m
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_MAC_ROMAN=m
-CONFIG_NLS_MAC_CELTIC=m
-CONFIG_NLS_MAC_CENTEURO=m
-CONFIG_NLS_MAC_CROATIAN=m
-CONFIG_NLS_MAC_CYRILLIC=m
-CONFIG_NLS_MAC_GAELIC=m
-CONFIG_NLS_MAC_GREEK=m
-CONFIG_NLS_MAC_ICELAND=m
-CONFIG_NLS_MAC_INUIT=m
-CONFIG_NLS_MAC_ROMANIAN=m
-CONFIG_NLS_MAC_TURKISH=m
-CONFIG_NLS_UTF8=m
-CONFIG_DLM=m
-# CONFIG_DLM_DEBUG is not set
-
-#
-# Kernel hacking
-#
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-
-#
-# printk and dmesg options
-#
-CONFIG_PRINTK_TIME=y
-CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
-# CONFIG_BOOT_PRINTK_DELAY is not set
-CONFIG_DYNAMIC_DEBUG=y
-
-#
-# Compile-time checks and compiler options
-#
-# CONFIG_DEBUG_INFO is not set
-CONFIG_ENABLE_WARN_DEPRECATED=y
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_FRAME_WARN=2048
-CONFIG_STRIP_ASM_SYMS=y
-# CONFIG_READABLE_ASM is not set
-CONFIG_UNUSED_SYMBOLS=y
-CONFIG_DEBUG_FS=y
-# CONFIG_HEADERS_CHECK is not set
-# CONFIG_DEBUG_SECTION_MISMATCH is not set
-CONFIG_ARCH_WANT_FRAME_POINTERS=y
-CONFIG_FRAME_POINTER=y
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_DEBUG_KERNEL=y
-
-#
-# Memory Debugging
-#
-# CONFIG_DEBUG_PAGEALLOC is not set
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_SLUB_DEBUG_ON is not set
-# CONFIG_SLUB_STATS is not set
-CONFIG_HAVE_DEBUG_KMEMLEAK=y
-# CONFIG_DEBUG_KMEMLEAK is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_VIRTUAL is not set
-CONFIG_DEBUG_MEMORY_INIT=y
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
-# CONFIG_DEBUG_STACKOVERFLOW is not set
-CONFIG_HAVE_ARCH_KMEMCHECK=y
-# CONFIG_DEBUG_SHIRQ is not set
-
-#
-# Debug Lockups and Hangs
-#
-CONFIG_LOCKUP_DETECTOR=y
-CONFIG_HARDLOCKUP_DETECTOR=y
-# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
-CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
-# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
-CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
-CONFIG_DETECT_HUNG_TASK=y
-CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
-# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
-CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
-# CONFIG_PANIC_ON_OOPS is not set
-CONFIG_PANIC_ON_OOPS_VALUE=0
-CONFIG_SCHED_DEBUG=y
-CONFIG_SCHEDSTATS=y
-CONFIG_TIMER_STATS=y
-# CONFIG_DEBUG_PREEMPT is not set
-
-#
-# Lock Debugging (spinlocks, mutexes, etc...)
-#
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_RT_MUTEX_TESTER is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-CONFIG_DEBUG_MUTEXES=y
-# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_ATOMIC_SLEEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-CONFIG_STACKTRACE=y
-# CONFIG_DEBUG_KOBJECT is not set
-CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_DEBUG_WRITECOUNT is not set
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-# CONFIG_DEBUG_CREDENTIALS 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
-# CONFIG_RCU_CPU_STALL_INFO is not set
-# CONFIG_RCU_TRACE is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_NOTIFIER_ERROR_INJECTION is not set
-# CONFIG_FAULT_INJECTION is not set
-# CONFIG_LATENCYTOP is not set
-CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y
-# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
-CONFIG_USER_STACKTRACE_SUPPORT=y
-CONFIG_NOP_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-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_FENTRY=y
-CONFIG_HAVE_C_RECORDMCOUNT=y
-CONFIG_TRACER_MAX_TRACE=y
-CONFIG_TRACE_CLOCK=y
-CONFIG_RING_BUFFER=y
-CONFIG_EVENT_TRACING=y
-CONFIG_CONTEXT_SWITCH_TRACER=y
-CONFIG_RING_BUFFER_ALLOW_SWAP=y
-CONFIG_TRACING=y
-CONFIG_GENERIC_TRACER=y
-CONFIG_TRACING_SUPPORT=y
-CONFIG_FTRACE=y
-CONFIG_FUNCTION_TRACER=y
-CONFIG_FUNCTION_GRAPH_TRACER=y
-# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_PREEMPT_TRACER is not set
-CONFIG_SCHED_TRACER=y
-CONFIG_FTRACE_SYSCALLS=y
-CONFIG_TRACER_SNAPSHOT=y
-# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
-CONFIG_BRANCH_PROFILE_NONE=y
-# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
-# CONFIG_PROFILE_ALL_BRANCHES is not set
-CONFIG_STACK_TRACER=y
-CONFIG_BLK_DEV_IO_TRACE=y
-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
-CONFIG_MMIOTRACE=y
-# CONFIG_MMIOTRACE_TEST is not set
-CONFIG_RING_BUFFER_BENCHMARK=m
-# CONFIG_RING_BUFFER_STARTUP_TEST is not set
-
-#
-# Runtime Testing
-#
-CONFIG_LKDTM=m
-# CONFIG_TEST_LIST_SORT is not set
-# CONFIG_KPROBES_SANITY_TEST is not set
-# CONFIG_BACKTRACE_SELF_TEST is not set
-# CONFIG_RBTREE_TEST is not set
-# CONFIG_INTERVAL_TREE_TEST is not set
-# CONFIG_ATOMIC64_SELFTEST is not set
-CONFIG_ASYNC_RAID6_TEST=m
-# CONFIG_TEST_STRING_HELPERS is not set
-CONFIG_TEST_KSTRTOX=m
-# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
-# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
-# CONFIG_DMA_API_DEBUG is not set
-# CONFIG_SAMPLES is not set
-CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_KGDB is not set
-CONFIG_STRICT_DEVMEM=y
-CONFIG_X86_VERBOSE_BOOTUP=y
-CONFIG_EARLY_PRINTK=y
-# CONFIG_EARLY_PRINTK_DBGP is not set
-# CONFIG_X86_PTDUMP is not set
-CONFIG_DEBUG_RODATA=y
-# CONFIG_DEBUG_RODATA_TEST is not set
-# CONFIG_DEBUG_SET_MODULE_RONX is not set
-# CONFIG_DEBUG_NX_TEST is not set
-CONFIG_DOUBLEFAULT=y
-# CONFIG_DEBUG_TLBFLUSH is not set
-# CONFIG_IOMMU_DEBUG is not set
-# CONFIG_IOMMU_STRESS is not set
-CONFIG_HAVE_MMIOTRACE_SUPPORT=y
-# CONFIG_X86_DECODER_SELFTEST is not set
-CONFIG_IO_DELAY_TYPE_0X80=0
-CONFIG_IO_DELAY_TYPE_0XED=1
-CONFIG_IO_DELAY_TYPE_UDELAY=2
-CONFIG_IO_DELAY_TYPE_NONE=3
-CONFIG_IO_DELAY_0X80=y
-# CONFIG_IO_DELAY_0XED is not set
-# CONFIG_IO_DELAY_UDELAY is not set
-# CONFIG_IO_DELAY_NONE is not set
-CONFIG_DEFAULT_IO_DELAY_TYPE=0
-# CONFIG_DEBUG_BOOT_PARAMS is not set
-# CONFIG_CPA_DEBUG is not set
-# CONFIG_OPTIMIZE_INLINING is not set
-# CONFIG_DEBUG_NMI_SELFTEST is not set
-# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set
-
-#
-# Security options
-#
-CONFIG_KEYS=y
-CONFIG_TRUSTED_KEYS=m
-CONFIG_ENCRYPTED_KEYS=m
-# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
-# CONFIG_SECURITY_DMESG_RESTRICT is not set
-CONFIG_SECURITY=y
-CONFIG_SECURITYFS=y
-CONFIG_SECURITY_NETWORK=y
-# CONFIG_SECURITY_NETWORK_XFRM is not set
-CONFIG_SECURITY_PATH=y
-# CONFIG_INTEL_TXT is not set
-# CONFIG_SECURITY_SELINUX is not set
-# CONFIG_SECURITY_SMACK is not set
-CONFIG_SECURITY_TOMOYO=y
-CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
-CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
-# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
-CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/usr/bin/tomoyo-init"
-CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd"
-CONFIG_SECURITY_APPARMOR=y
-CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0
-# CONFIG_SECURITY_YAMA is not set
-# CONFIG_IMA is not set
-# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
-# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_DEFAULT_SECURITY=""
-CONFIG_XOR_BLOCKS=m
-CONFIG_ASYNC_CORE=m
-CONFIG_ASYNC_MEMCPY=m
-CONFIG_ASYNC_XOR=m
-CONFIG_ASYNC_PQ=m
-CONFIG_ASYNC_RAID6_RECOV=m
-CONFIG_CRYPTO=y
-
-#
-# Crypto core or helper
-#
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_AEAD=m
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_BLKCIPHER=m
-CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_HASH=m
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_RNG=m
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_PCOMP=m
-CONFIG_CRYPTO_PCOMP2=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_USER=m
-CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
-CONFIG_CRYPTO_GF128MUL=m
-CONFIG_CRYPTO_NULL=m
-CONFIG_CRYPTO_PCRYPT=m
-CONFIG_CRYPTO_WORKQUEUE=y
-CONFIG_CRYPTO_CRYPTD=m
-CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_ABLK_HELPER_X86=m
-CONFIG_CRYPTO_GLUE_HELPER_X86=m
-
-#
-# Authenticated Encryption with Associated Data
-#
-CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_GCM=m
-CONFIG_CRYPTO_SEQIV=m
-
-#
-# Block modes
-#
-CONFIG_CRYPTO_CBC=m
-CONFIG_CRYPTO_CTR=m
-CONFIG_CRYPTO_CTS=m
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_LRW=m
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_XTS=m
-
-#
-# Hash modes
-#
-CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_HMAC=m
-CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_VMAC=m
-
-#
-# Digest
-#
-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
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_RMD128=m
-CONFIG_CRYPTO_RMD160=m
-CONFIG_CRYPTO_RMD256=m
-CONFIG_CRYPTO_RMD320=m
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_SHA1_SSSE3=m
-CONFIG_CRYPTO_SHA256_SSSE3=m
-CONFIG_CRYPTO_SHA512_SSSE3=m
-CONFIG_CRYPTO_SHA256=m
-CONFIG_CRYPTO_SHA512=m
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_WP512=m
-CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
-
-#
-# Ciphers
-#
-CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_AES_X86_64=m
-CONFIG_CRYPTO_AES_NI_INTEL=m
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_BLOWFISH_COMMON=m
-CONFIG_CRYPTO_BLOWFISH_X86_64=m
-CONFIG_CRYPTO_CAMELLIA=m
-CONFIG_CRYPTO_CAMELLIA_X86_64=m
-CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m
-CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m
-CONFIG_CRYPTO_CAST_COMMON=m
-CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST5_AVX_X86_64=m
-CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_CAST6_AVX_X86_64=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_FCRYPT=m
-CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_SALSA20=m
-CONFIG_CRYPTO_SALSA20_X86_64=m
-CONFIG_CRYPTO_SEED=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
-CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
-CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-CONFIG_CRYPTO_TWOFISH_X86_64=m
-CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
-CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
-
-#
-# Compression
-#
-CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_ZLIB=m
-CONFIG_CRYPTO_LZO=y
-CONFIG_CRYPTO_LZ4=m
-CONFIG_CRYPTO_LZ4HC=m
-
-#
-# Random Number Generation
-#
-CONFIG_CRYPTO_ANSI_CPRNG=m
-CONFIG_CRYPTO_USER_API=m
-CONFIG_CRYPTO_USER_API_HASH=m
-CONFIG_CRYPTO_USER_API_SKCIPHER=m
-CONFIG_CRYPTO_HW=y
-CONFIG_CRYPTO_DEV_PADLOCK=m
-CONFIG_CRYPTO_DEV_PADLOCK_AES=m
-CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
-CONFIG_ASYMMETRIC_KEY_TYPE=m
-CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m
-CONFIG_PUBLIC_KEY_ALGO_RSA=m
-CONFIG_X509_CERTIFICATE_PARSER=m
-CONFIG_HAVE_KVM=y
-CONFIG_HAVE_KVM_IRQCHIP=y
-CONFIG_HAVE_KVM_IRQ_ROUTING=y
-CONFIG_HAVE_KVM_EVENTFD=y
-CONFIG_KVM_APIC_ARCHITECTURE=y
-CONFIG_KVM_MMIO=y
-CONFIG_KVM_ASYNC_PF=y
-CONFIG_HAVE_KVM_MSI=y
-CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
-CONFIG_VIRTUALIZATION=y
-CONFIG_KVM=m
-CONFIG_KVM_INTEL=m
-CONFIG_KVM_AMD=m
-CONFIG_KVM_MMU_AUDIT=y
-CONFIG_KVM_DEVICE_ASSIGNMENT=y
-CONFIG_BINARY_PRINTF=y
-
-#
-# Library routines
-#
-CONFIG_RAID6_PQ=m
-CONFIG_BITREVERSE=y
-CONFIG_GENERIC_STRNCPY_FROM_USER=y
-CONFIG_GENERIC_STRNLEN_USER=y
-CONFIG_GENERIC_NET_UTILS=y
-CONFIG_GENERIC_FIND_FIRST_BIT=y
-CONFIG_GENERIC_PCI_IOMAP=y
-CONFIG_GENERIC_IOMAP=y
-CONFIG_GENERIC_IO=y
-CONFIG_PERCPU_RWSEM=y
-CONFIG_CRC_CCITT=m
-CONFIG_CRC16=m
-CONFIG_CRC_T10DIF=m
-CONFIG_CRC_ITU_T=m
-CONFIG_CRC32=y
-# CONFIG_CRC32_SELFTEST is not set
-CONFIG_CRC32_SLICEBY8=y
-# CONFIG_CRC32_SLICEBY4 is not set
-# CONFIG_CRC32_SARWATE is not set
-# CONFIG_CRC32_BIT is not set
-CONFIG_CRC7=m
-CONFIG_LIBCRC32C=m
-CONFIG_CRC8=m
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=m
-CONFIG_LZO_COMPRESS=y
-CONFIG_LZO_DECOMPRESS=y
-CONFIG_LZ4_COMPRESS=m
-CONFIG_LZ4HC_COMPRESS=m
-CONFIG_LZ4_DECOMPRESS=y
-CONFIG_XZ_DEC=y
-CONFIG_XZ_DEC_X86=y
-CONFIG_XZ_DEC_POWERPC=y
-CONFIG_XZ_DEC_IA64=y
-CONFIG_XZ_DEC_ARM=y
-CONFIG_XZ_DEC_ARMTHUMB=y
-CONFIG_XZ_DEC_SPARC=y
-CONFIG_XZ_DEC_BCJ=y
-# CONFIG_XZ_DEC_TEST is not set
-CONFIG_DECOMPRESS_GZIP=y
-CONFIG_DECOMPRESS_BZIP2=y
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DECOMPRESS_XZ=y
-CONFIG_DECOMPRESS_LZO=y
-CONFIG_DECOMPRESS_LZ4=y
-CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_REED_SOLOMON=m
-CONFIG_REED_SOLOMON_ENC8=y
-CONFIG_REED_SOLOMON_DEC8=y
-CONFIG_REED_SOLOMON_DEC16=y
-CONFIG_BCH=m
-CONFIG_BCH_CONST_PARAMS=y
-CONFIG_TEXTSEARCH=y
-CONFIG_TEXTSEARCH_KMP=m
-CONFIG_TEXTSEARCH_BM=m
-CONFIG_TEXTSEARCH_FSM=m
-CONFIG_BTREE=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAS_DMA=y
-CONFIG_CHECK_SIGNATURE=y
-CONFIG_CPU_RMAP=y
-CONFIG_DQL=y
-CONFIG_NLATTR=y
-CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
-CONFIG_LRU_CACHE=m
-CONFIG_AVERAGE=y
-CONFIG_CLZ_TAB=y
-CONFIG_CORDIC=m
-CONFIG_DDR=y
-CONFIG_MPILIB=m
-CONFIG_OID_REGISTRY=m
-CONFIG_UCS2_STRING=y
-CONFIG_FONT_SUPPORT=y
-CONFIG_FONTS=y
-# CONFIG_FONT_8x8 is not set
-CONFIG_FONT_8x16=y
-# CONFIG_FONT_6x11 is not set
-# CONFIG_FONT_7x14 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_ACORN_8x8 is not set
-# CONFIG_FONT_MINI_4x6 is not set
-# CONFIG_FONT_SUN8x16 is not set
-# CONFIG_FONT_SUN12x22 is not set
-# CONFIG_FONT_10x18 is not set
-CONFIG_FONT_AUTOSELECT=y
diff --git a/libre-testing/linux-libre/linux-libre.install b/libre-testing/linux-libre/linux-libre.install
deleted file mode 100644
index 8d5658aab..000000000
--- a/libre-testing/linux-libre/linux-libre.install
+++ /dev/null
@@ -1,35 +0,0 @@
-# arg 1:  the new package version
-# arg 2:  the old package version
-
-KERNEL_NAME=
-KERNEL_VERSION=
-
-post_install () {
-  # updating module dependencies
-  echo ">>> Updating module dependencies. Please wait ..."
-  depmod ${KERNEL_VERSION}
-  if command -v mkinitcpio 2>&1 > /dev/null; then
-    echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
-    mkinitcpio -p linux-libre${KERNEL_NAME}
-  fi
-}
-
-post_upgrade() {
-  if findmnt --fstab -uno SOURCE /boot &>/dev/null && ! mountpoint -q /boot; then
-    echo "WARNING: /boot appears to be a separate partition but is not mounted."
-  fi
-
-  # updating module dependencies
-  echo ">>> Updating module dependencies. Please wait ..."
-  depmod ${KERNEL_VERSION}
-  if command -v mkinitcpio 2>&1 > /dev/null; then
-    echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
-    mkinitcpio -p linux-libre${KERNEL_NAME}
-  fi
-}
-
-post_remove() {
-  # also remove the compat symlinks
-  rm -f boot/initramfs-linux-libre${KERNEL_NAME}.img
-  rm -f boot/initramfs-linux-libre${KERNEL_NAME}-fallback.img
-}
diff --git a/libre-testing/linux-libre/linux-libre.preset b/libre-testing/linux-libre/linux-libre.preset
deleted file mode 100644
index 0ac59eb14..000000000
--- a/libre-testing/linux-libre/linux-libre.preset
+++ /dev/null
@@ -1,14 +0,0 @@
-# mkinitcpio preset file for the 'linux-libre' package
-
-ALL_config="/etc/mkinitcpio.conf"
-ALL_kver="/boot/vmlinuz-linux-libre"
-
-PRESETS=('default' 'fallback')
-
-#default_config="/etc/mkinitcpio.conf"
-default_image="/boot/initramfs-linux-libre.img"
-#default_options=""
-
-#fallback_config="/etc/mkinitcpio.conf"
-fallback_image="/boot/initramfs-linux-libre-fallback.img" 
-fallback_options="-S autodetect"
diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD
index 090f4b722..0924dc371 100644
--- a/libre/audacious-plugins-libre/PKGBUILD
+++ b/libre/audacious-plugins-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193871 2013-09-03 05:58:51Z bisson $
+# $Id: PKGBUILD 195219 2013-09-28 02:25:20Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: William Rea <sillywilly@gmail.com>
@@ -9,7 +9,7 @@
 _pkgname=audacious-plugins
 pkgname=audacious-plugins-libre
 pkgver=3.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Plugins for Audacious, without nonfree plugins'
 url='http://audacious-media-player.org/'
 license=('GPL' 'GPL3' 'LGPL' 'custom:BSD')
@@ -34,9 +34,9 @@ makedepends=("audacious>=${pkgver}"
              'mpg123' 'faad2' 'ffmpeg' 'libmodplug' 'fluidsynth' 'libcdio-paranoia' 'libsidplayfp' 'wavpack'
              'libnotify' 'curl' 'libmtp'
              'neon' 'libmms' 'libcue')
-[ "$CARCH" = "mips64el" ] || makedepends+=('lirc-utils-libre' 'oss-libre')
-optdepends=('oss-libre: Open Sound System v4 output'
-            'alsa-lib: Advanced Linux Sound Arch. output'
+[ "$CARCH" = "mips64el" ] || makedepends+=('lirc-utils-libre')
+
+optdepends=('alsa-lib: Advanced Linux Sound Arch. output'
             'pulseaudio: PulseAudio output'
             'jack2: Jack Audio Connection Kit output'
             'lame: FileWriter MP3 output'
diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD
index 3696452e4..6e88bce94 100644
--- a/libre/bbswitch-libre/PKGBUILD
+++ b/libre/bbswitch-libre/PKGBUILD
@@ -6,14 +6,14 @@
 _pkgname=bbswitch
 pkgname=bbswitch-libre
 pkgver=0.7
-_extramodules=extramodules-3.10-LIBRE # Don't forget to update bbswitch.install
-pkgrel=12
+_extramodules=extramodules-3.11-LIBRE # Don't forget to update bbswitch.install
+pkgrel=16
 pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops (built for the linux-libre kernel package)"
 arch=('i686' 'x86_64' 'mips64el')
 url=("http://github.com/Bumblebee-Project/bbswitch")
 license=('GPL')
-depends=('linux-libre>=3.10' 'linux-libre<3.11')
-makedepends=('linux-libre-headers>=3.10' 'linux-libre-headers<3.11')
+depends=('linux-libre>=3.11' 'linux-libre<3.12')
+makedepends=('linux-libre-headers>=3.11' 'linux-libre-headers<3.12')
 replaces=$_pkgname
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
diff --git a/libre/bbswitch-libre/bbswitch.install b/libre/bbswitch-libre/bbswitch.install
index ec796a1b4..089d52715 100644
--- a/libre/bbswitch-libre/bbswitch.install
+++ b/libre/bbswitch-libre/bbswitch.install
@@ -1,5 +1,5 @@
 post_install() {
-    EXTRAMODULES='extramodules-3.10-LIBRE'
+    EXTRAMODULES='extramodules-3.11-LIBRE'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
diff --git a/libre/bfgminer-libre/PKGBUILD b/libre/bfgminer-libre/PKGBUILD
index 43e862669..80e3d75e0 100644
--- a/libre/bfgminer-libre/PKGBUILD
+++ b/libre/bfgminer-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 96038 2013-08-19 11:41:39Z tredaelli $
+# $Id: PKGBUILD 97509 2013-09-23 12:27:29Z tredaelli $
 # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor: Andy Weidenbaum <archbaum@gmail.com>
 
 _pkgname=bfgminer
 pkgname=bfgminer-libre
-pkgver=3.1.4
+pkgver=3.2.1
 pkgrel=1
 pkgdesc="Bitcoin miner featuring overclocking, monitoring, fan speed control and remote management. For FPGA/GPU/CPU Bitcoin mining, without nonfree OpenCL recommendation."
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +18,7 @@ license=('GPL3')
 options=(!libtool)
 source=(http://luke.dashjr.org/programs/bitcoin/files/$_pkgname/$pkgver/$_pkgname-$pkgver.tbz2
         remove-dangerous-rpath.patch)
-sha256sums=('ec59618b7d5c81e110871ce6d10563e01d7670bbe2559428836474a9f2eace1a'
+sha256sums=('db8cdc4272950e12804961d21365ed96f3ef5262549cc0dfd6ebd2004e5d57d8'
             'd26d07ca23ae25798c4db37cfda1a6a76f22d06e73efab1ddf62b3e1a7eef04c')
 
 prepare() {
diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD
index 33370e958..f1eab5401 100644
--- a/libre/calibre-libre/PKGBUILD
+++ b/libre/calibre-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96478 2013-08-30 14:11:37Z jelle $
+# $Id: PKGBUILD 98047 2013-10-04 15:29:48Z jelle $
 # Maintainer: jelle van der Waa <jelle@vdwaa.nl>
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
@@ -9,16 +9,16 @@
 
 _pkgname=calibre
 pkgname=calibre-libre
-pkgver=1.1.0
-pkgrel=1
-pkgdesc="Ebook management application, with unar support included and nonfree fonts removed"
+pkgver=1.5
+pkgrel=2
+pkgdesc="Ebook management application, with unar support"
 arch=('i686' 'x86_64' 'mips64el') 
 url="http://calibre-ebook.com/"
 license=('GPL3')
 depends=('python2-six' 'python2-dateutil' 'python2-cssutils' 'python2-cherrypy' 
          'python2-mechanize' 'podofo' 'libwmf' 'python2-beautifulsoup3' 
          'imagemagick' 'poppler-qt' 'chmlib' 'python2-lxml' 'libusbx' 
-         'python2-imaging' 'shared-mime-info' 'python2-dnspython' 
+         'python2-pillow' 'shared-mime-info' 'python2-dnspython' 
          'unar' 'python2-pyqt4' 'python2-psutil' 'icu' 'libmtp' 
          'python2-netifaces' 'python2-cssselect' 'python2-apsw')
 makedepends=('python2-pycountry' 'qt4-private-headers')
@@ -27,10 +27,10 @@ replaces=$_pkgname
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
 install=calibre.install
-source=("http://sourceforge.net/projects/calibre/files/${pkgver}/calibre-${pkgver}.tar.xz"
+source=('http://download.calibre-ebook.com/1.5.0/calibre-1.5.0.tar.xz'
         'desktop_integration.patch'
         'calibre-mount-helper')
-md5sums=('8f76d0776012cb6a5d2b8269552c1b98'
+md5sums=('adb8543044f81f93d6faef372710bcb5'
          '8353d1878c5a498b3e49eddef473605f'
          '675cd87d41342119827ef706055491e7')
 
@@ -50,12 +50,6 @@ prepare(){
 
 build() {
   cd "${srcdir}/${_pkgname}"
-  # Remove nonfree fonts
-  cd resources/fonts; \
-    rm prs500/tt0003m_.ttf; ln -s ../liberation/LiberationSans-Regular.ttf prs500/tt0003m_.ttf; \
-    rm prs500/tt0011m_.ttf; ln -s ../liberation/LiberationSerif-Regular.ttf prs500/tt0011m_.ttf; \
-    rm prs500/tt0419m_.ttf; ln -s ../liberation/LiberationMono-Regular.ttf prs500/tt0419m_.ttf; \
-  cd ../..
 
   LANG='en_US.UTF-8' python2 setup.py build
   # LANG='en_US.UTF-8' python2 setup.py resources
diff --git a/libre/cgminer-libre/PKGBUILD b/libre/cgminer-libre/PKGBUILD
index c44b6b787..2d081f8e3 100644
--- a/libre/cgminer-libre/PKGBUILD
+++ b/libre/cgminer-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96688 2013-09-03 03:01:25Z fyan $
+# $Id: PKGBUILD 97769 2013-09-29 14:35:16Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: monson <holymonson@gmail.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
@@ -7,7 +7,7 @@
 
 _pkgname=cgminer
 pkgname=cgminer-libre
-pkgver=3.4.2
+pkgver=3.5.0
 pkgrel=1
 pkgdesc="Multi-threaded multi-pool GPU, FPGA and ASIC miner for bitcoin and derivative coins, without nonfree OpenCL recommendation"
 url='http://forum.bitcoin.org/index.php?topic=28402.0'
@@ -73,6 +73,6 @@ package() {
   install -Dm644 $_pkgname.conf "$pkgdir"/etc/$_pkgname.conf
 }
 
-sha512sums=('cccdab8de11b9bc740ba387685a24ae07729eedba0dd02d83d708d66b208cff2c719157a90cc157fa4900a386ae76e7692bdc893f3de9928dbcaacc86a4c05f1'
+sha512sums=('21dbf036012e331676e6dfd85501f04f10e1f0ae7f4fce3bffd3ffe4ccd8c9544b0166f0024cba00177edbe6b70c4d02803ca05af33a2612a5be7bb5a8ec11fc'
             '99c38bc395848f9712ce172343d31f5c60f5d8ac1cfe2f48df8f3ec6c488fc275763a79c5ef36b99f32faa465b5a65284b38e8a63ef9b144075ee13971313b41'
             '3317b60c6b1f14c47d8ee636113ef40a4023ab14054129de80a37947b381fd2b647a7053f4e1bb639efa225a514e862fa531908714c34040dda2d6221dde7f5f')
diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD
index 7eda9f68a..b8e9e825e 100644
--- a/libre/cups-filters-libre/PKGBUILD
+++ b/libre/cups-filters-libre/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 193721 2013-08-29 11:50:04Z andyrtr $
+# $Id: PKGBUILD 194325 2013-09-13 11:45:16Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=cups-filters-libre
 _pkgname=cups-filters
-pkgver=1.0.37
+pkgver=1.0.38
 pkgrel=1
 pkgdesc="OpenPrinting CUPS Filters, without foomatic-db-nonfree recommendation"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +18,7 @@ backup=(etc/fonts/conf.d/99pdftoopvp.conf
         etc/cups/cups-browsed.conf)
 options=(!libtool)
 source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz)
-md5sums=('42d2dd9745d4d5d626c7b871155cb430')
+md5sums=('610da4c62141d294bf456ca8725324dd')
 replaces=("${_pkgname}")
 conflicts=("${_pkgname}")
 provides=("${_pkgname}=${pkgver}")
diff --git a/libre/doublecmd-libre/PKGBUILD b/libre/doublecmd-libre/PKGBUILD
index 9c51e7fbf..8b8ec9477 100644
--- a/libre/doublecmd-libre/PKGBUILD
+++ b/libre/doublecmd-libre/PKGBUILD
@@ -1,12 +1,12 @@
 # vim:set ft=sh:
-# $Id: PKGBUILD 94327 2013-07-20 16:50:58Z idevolder $
+# $Id: PKGBUILD 97498 2013-09-22 18:08:53Z idevolder $
 # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
 # Contributor: (sirocco AT ngs.ru)
 
 _pkgbase=doublecmd
 pkgbase=doublecmd-libre
 pkgname=('doublecmd-libre-gtk2' 'doublecmd-libre-qt')
-pkgver=0.5.6
+pkgver=0.5.7
 _helpver=0.5.5
 pkgrel=1
 url="http://doublecmd.sourceforge.net/"
@@ -24,7 +24,7 @@ source=(
 	"http://downloads.sourceforge.net/project/$_pkgbase/Double%20Commander%20Source/$_pkgbase-$pkgver-src.tar.gz"
 	"http://downloads.sourceforge.net/project/$_pkgbase/Double%20Commander%20Source/$_pkgbase-help-$_helpver-src.tar.gz"
 )
-sha256sums=('b909ee5c57cb2803e4393163f5c44513144cb32e304fa2e1dfee6f33d0999bc5'
+sha256sums=('8e2059f986fff26da5d7b98af95be64b12c5cef6b50fe3cacd9a2805947aa343'
             '5c5d00187df811df0734bf751a581bce7e1bdd4cf4639b2a1101f1da8743daaf')
 
 build() {
diff --git a/libre/epiphany-libre/PKGBUILD b/libre/epiphany-libre/PKGBUILD
index d6a1c77b2..0fcc1a491 100644
--- a/libre/epiphany-libre/PKGBUILD
+++ b/libre/epiphany-libre/PKGBUILD
@@ -1,36 +1,32 @@
-# $Id: PKGBUILD 186904 2013-05-31 18:08:27Z heftig $
+# $Id: PKGBUILD 195129 2013-09-25 11:58:35Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 # Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
 
 _pkgname=epiphany
 pkgname=epiphany-libre
-pkgver=3.8.2
-pkgrel=1
+pkgver=3.10.0
+pkgrel=2
 install=epiphany.install
 pkgdesc="A GNOME web browser based on the WebKit rendering engine, with DuckDuckGo HTML support"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-depends=('libsoup' 'libnotify' 'gsettings-desktop-schemas' 'webkitgtk3' 'nss' 'iso-codes' 'dconf' 'desktop-file-utils'
-         'hicolor-icon-theme' 'gcr' 'gnome-desktop' 'libwnck3')
-makedepends=('intltool' 'gnome-doc-utils' 'startup-notification' 'gobject-introspection')
+depends=('libsoup' 'libnotify' 'gsettings-desktop-schemas' 'webkitgtk' 'nss' 'iso-codes' 'dconf' 'desktop-file-utils' 'gnome-icon-theme-symbolic' 'gcr' 'gnome-desktop' 'libwnck3' 'gnome-themes-standard')
+makedepends=('intltool' 'itstool' 'docbook-xml' 'startup-notification' 'gobject-introspection')
 replaces=$_pkgname
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
 options=('!libtool' '!emptydirs')
 groups=('gnome')
 url="http://www.gnome.org/projects/epiphany/"
-source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz)
-sha256sums=('ae89d6902ed243304d2cbf2fa361f6dd0cb3401fdaf726e6fdd4acc09197d50a')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pkgver.tar.xz)
+sha256sums=('7bd2c3b21464a83909d75befe2f9501c1ab2f00e2371f26023f79818faec351e')
 
 prepare() {
   cd $_pkgname-$pkgver
 
   # Replace Google support to DuckDuckGo HTML
-  sed -i 's|http://www[.]google[.]com/search?q=search[&]ie=UTF-8[&]oe=UTF-8|https://duckduckgo.com/html/?q=search|g' $(grep -rlI 'http://www[.]google[.]com/search?q=search&ie=UTF-8&oe=UTF-8')
-  sed -i 's|http://www[.]google[.]com/search?q=lala%2Elala[&]ie=UTF-8[&]oe=UTF-8|https://duckduckgo.com/html/?q=lala.lala|g' $(grep -rlI 'http://www[.]google[.]com/search?q=lala%2Elala&ie=UTF-8&oe=UTF-8')
-  sed -i 's|http://www[.]google[.]com/search?q=totalgarbage0xdeadbeef[&]ie=UTF-8[&]oe=UTF-8|https://duckduckgo.com/html/?q=totalgarbage0xdeadbeef|g' $(grep -rlI 'http://www[.]google[.]com/search?q=totalgarbage0xdeadbeef&ie=UTF-8&oe=UTF-8')
-  sed -i 's|http://www[.]google[.]com/search?q=search+separated+words+please[&]ie=UTF-8[&]oe=UTF-8|https://duckduckgo.com/html/?q=search+separated+words+please|g' $(grep -rlI 'http://www[.]google[.]com/search?q=search+separated+words+please&ie=UTF-8&oe=UTF-8')
+  sed -i 's|http://www[.]google[.]com/search?q=%s[&]ie=UTF-8[&]oe=UTF-8|https://duckduckgo.com/html/?q=search|g' $(grep -rlI 'http://www[.]google[.]com/search?q=%s&ie=UTF-8&oe=UTF-8')
   sed -i '\|a quoted string should be searched|d' $(grep -rlI 'a quoted string should be searched')
   sed -i 's|http://www[.]google[.]com/search?q=%s[&]amp;ie=UTF-8[&]amp;oe=UTF-8|https://duckduckgo.com/html/?q=%s|g' $(grep -rlI 'http://www[.]google[.]com/search')
   sed -i 's|http://www[.]google[.]com|https://duckduckgo.com/html|g' $(grep -rlI 'google[.]com')
diff --git a/libre/file-roller-libre/PKGBUILD b/libre/file-roller-libre/PKGBUILD
index 5c6865833..8289eb471 100644
--- a/libre/file-roller-libre/PKGBUILD
+++ b/libre/file-roller-libre/PKGBUILD
@@ -1,20 +1,17 @@
-# $Id: PKGBUILD 193443 2013-08-20 09:36:30Z jgc $
+# $Id: PKGBUILD 195293 2013-09-30 08:01:47Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 _pkgname=file-roller
 pkgname=file-roller-libre
-pkgver=3.8.4
-pkgrel=1
-pkgdesc="Create and modify archives, with unar recommendation included and nonfree unace recommendation removed"
+pkgver=3.10.0
+pkgrel=2
+pkgdesc="Create and modify archives, with unar support included and nonfree unace recommendation removed"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-depends=('desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'dconf' 'libarchive' 'file' 'json-glib' 'libnotify')
+depends=('desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'dconf' 'libarchive' 'file' 'json-glib' 'libnotify' 'p7zip' 'unar')
 makedepends=('intltool' 'gnome-doc-utils' 'pkg-config' 'libnautilus-extension' 'itstool' 'docbook-xsl')
-optdepends=('unar: the free RAR uncompression utility'
-            'zip: creates PKZIP-compatible .zip files'
-            'p7zip: 7zip compression utility'
-            'arj: ARJ archiver')
+optdepends=('lrzip: lrzip archive support')
 groups=('gnome-extra')
 provides=("$_pkgname=$pkgver")
 replaces=("$_pkgname")
@@ -22,8 +19,18 @@ conflicts=("$_pkgname")
 options=('!libtool' '!emptydirs')
 install=file-roller.install
 url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver::3}/$_pkgname-$pkgver.tar.xz)
-sha256sums=('3615bc41bbe28030d16ee414a8f5f9a3e37f745733c39032ef1559a06be3eea8')
+source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz
+        bug708854.patch
+        bug709035.patch)
+sha256sums=('d889bb9904146e5715c082aa9a6d96b0606a066ba2bf05fbfb7030f2bf274f13'
+            'a8f4e856924b6b78e47cc134c723d1d93119f90ec9ab69dd0b59ec8a934688ba'
+            '59f07968b720ccd9c70e6232b2bfcaa3cf9298d6ce48be4882154d69cbe7a909')
+
+prepare() {
+  cd $_pkgname-$pkgver
+  patch -Np1 -i ../bug708854.patch
+  patch -Np1 -i ../bug709035.patch
+}
 
 build() {
   cd $_pkgname-$pkgver
diff --git a/libre/file-roller-libre/bug708854.patch b/libre/file-roller-libre/bug708854.patch
new file mode 100644
index 000000000..6a5591a59
--- /dev/null
+++ b/libre/file-roller-libre/bug708854.patch
@@ -0,0 +1,92 @@
+From d3ce6fe6964857c89212ab1a5a7aaa052d93c584 Mon Sep 17 00:00:00 2001
+From: Aleksander Morgado <aleksander@lanedo.com>
+Date: Thu, 26 Sep 2013 16:06:21 +0000
+Subject: 7z: allow extracting/opening/adding files prefixed with '@'
+
+7z uses '@' to specify a listfile; i.e. a file with a list of files to add or
+extract. Therefore, if working with single files (e.g. open, add or extract a
+single file from the archive), the filenames need to be escaped with '!' and
+specified with '-i'. It is ok to mix files specified with '-i' and the ones
+given after the archive filename.
+
+E.g. instead of:
+  7z x -bd -y -o/tmp/.fr-2z9FXz -- HS04603.ZIP @HS04603.PDF
+
+it should be:
+  7z x -bd -y -o/tmp/.fr-2z9FXz -i!@HS04603.PDF -- HS04603.ZIP
+
+https://bugzilla.gnome.org/show_bug.cgi?id=708854
+---
+diff --git a/src/fr-command-7z.c b/src/fr-command-7z.c
+index f2e70a6..a9d15fd 100644
+--- a/src/fr-command-7z.c
++++ b/src/fr-command-7z.c
+@@ -375,11 +375,20 @@ fr_command_7z_add (FrCommand  *command,
+ 	if (from_file != NULL)
+ 		fr_process_add_arg_concat (command->process, "-i@", from_file, NULL);
+ 
++	if (from_file == NULL)
++		for (scan = file_list; scan; scan = scan->next)
++			/* Files prefixed with '@' need to be handled specially */
++			if (g_str_has_prefix (scan->data, "@"))
++				fr_process_add_arg_concat (command->process, "-i!", scan->data, NULL);
++
+ 	fr_process_add_arg (command->process, "--");
+ 	fr_process_add_arg (command->process, command->filename);
++
+ 	if (from_file == NULL)
+ 		for (scan = file_list; scan; scan = scan->next)
+-			fr_process_add_arg (command->process, scan->data);
++			/* Skip files prefixed with '@', already added */
++			if (!g_str_has_prefix (scan->data, "@"))
++				fr_process_add_arg (command->process, scan->data);
+ 
+ 	fr_process_end_command (command->process);
+ }
+@@ -409,11 +418,20 @@ fr_command_7z_delete (FrCommand  *command,
+ 	if (from_file != NULL)
+ 		fr_process_add_arg_concat (command->process, "-i@", from_file, NULL);
+ 
++	if (from_file == NULL)
++		for (scan = file_list; scan; scan = scan->next)
++			/* Files prefixed with '@' need to be handled specially */
++			if (g_str_has_prefix (scan->data, "@"))
++				fr_process_add_arg_concat (command->process, "-i!", scan->data, NULL);
++
+ 	fr_process_add_arg (command->process, "--");
+ 	fr_process_add_arg (command->process, command->filename);
++
+ 	if (from_file == NULL)
+ 		for (scan = file_list; scan; scan = scan->next)
+-			fr_process_add_arg (command->process, scan->data);
++			/* Skip files prefixed with '@', already added */
++			if (!g_str_has_prefix (scan->data, "@"))
++				fr_process_add_arg (command->process, scan->data);
+ 
+ 	fr_process_end_command (command->process);
+ }
+@@ -463,11 +481,21 @@ fr_command_7z_extract (FrCommand  *command,
+ 	if (from_file != NULL)
+ 		fr_process_add_arg_concat (command->process, "-i@", from_file, NULL);
+ 
++	if (from_file == NULL)
++		for (scan = file_list; scan; scan = scan->next)
++			/* Files prefixed with '@' need to be handled specially */
++			if (g_str_has_prefix (scan->data, "@"))
++				fr_process_add_arg_concat (command->process, "-i!", scan->data, NULL);
++
++
+ 	fr_process_add_arg (command->process, "--");
+ 	fr_process_add_arg (command->process, command->filename);
++
+ 	if (from_file == NULL)
+ 		for (scan = file_list; scan; scan = scan->next)
+-			fr_process_add_arg (command->process, scan->data);
++			/* Skip files prefixed with '@', already added */
++			if (!g_str_has_prefix (scan->data, "@"))
++				fr_process_add_arg (command->process, scan->data);
+ 
+ 	fr_process_end_command (command->process);
+ }
+--
+cgit v0.9.2
diff --git a/libre/file-roller-libre/bug709035.patch b/libre/file-roller-libre/bug709035.patch
new file mode 100644
index 000000000..f82e33f30
--- /dev/null
+++ b/libre/file-roller-libre/bug709035.patch
@@ -0,0 +1,43 @@
+From d05bdc3b60d928f1f40338208419f0ffa41195f6 Mon Sep 17 00:00:00 2001
+From: Paolo Bacchilega <paobac@src.gnome.org>
+Date: Sun, 29 Sep 2013 16:30:29 +0000
+Subject: libarchive: fixed failure when extracting some tar archives
+
+do not try to restore the creation time;
+do not set the G_FILE_ATTRIBUTE_TIME_CREATED_USEC attribute
+
+[bug #709035]
+---
+diff --git a/src/fr-archive-libarchive.c b/src/fr-archive-libarchive.c
+index 42673df..44aaad2 100644
+--- a/src/fr-archive-libarchive.c
++++ b/src/fr-archive-libarchive.c
+@@ -428,15 +428,8 @@ _g_file_info_create_from_entry (struct archive_entry *entry,
+ 
+ 	/* times */
+ 
+-	if (archive_entry_ctime_is_set (entry)) {
+-		g_file_info_set_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_CREATED, archive_entry_ctime (entry));
+-		g_file_info_set_attribute_uint32 (info, G_FILE_ATTRIBUTE_TIME_CREATED_USEC, archive_entry_ctime_nsec (entry));
+-	}
+-
+-	if (archive_entry_mtime_is_set (entry)) {
++	if (archive_entry_mtime_is_set (entry))
+ 		g_file_info_set_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED, archive_entry_mtime (entry));
+-		g_file_info_set_attribute_uint32 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC, archive_entry_mtime_nsec (entry));
+-	}
+ 
+ 	/* username */
+ 
+@@ -529,7 +522,8 @@ restore_modification_time (GHashTable    *created_folders,
+ 
+ 		info = g_file_info_new ();
+ 		g_file_info_set_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED, g_file_info_get_attribute_uint64 (original_info, G_FILE_ATTRIBUTE_TIME_MODIFIED));
+-		g_file_info_set_attribute_uint32 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC, g_file_info_get_attribute_uint32 (original_info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC));
++		if (g_file_info_get_attribute_status (original_info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC) == G_FILE_ATTRIBUTE_STATUS_SET)
++			g_file_info_set_attribute_uint32 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC, g_file_info_get_attribute_uint32 (original_info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC));
+ 		result = _g_file_set_attributes_from_info (file, info, cancellable, error);
+ 
+ 		g_object_unref (info);
+--
+cgit v0.9.2
diff --git a/libre/gst-plugins-bad-libre/PKGBUILD b/libre/gst-plugins-bad-libre/PKGBUILD
index 0eef753de..17d1105e3 100644
--- a/libre/gst-plugins-bad-libre/PKGBUILD
+++ b/libre/gst-plugins-bad-libre/PKGBUILD
@@ -1,35 +1,36 @@
-# $Id: PKGBUILD 193745 2013-08-30 07:49:47Z heftig $
+# $Id: PKGBUILD 195012 2013-09-24 14:12:15Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
 _pkgname=gst-plugins-bad
 pkgname=$_pkgname-libre
-pkgver=1.0.10
+pkgver=1.2.0
 pkgrel=1
-pkgdesc='GStreamer Multimedia Framework Bad Plugins, without nonfree faac support'
+pkgdesc="GStreamer Multimedia Framework Bad Plugins, without nonfree faac support"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="http://gstreamer.freedesktop.org/"
-depends=('mjpegtools' 'gst-plugins-base-libs' 'curl' 'chromaprint' 'libmms' 'faad2' 'mpg123' 'celt' 'libdca' 'soundtouch' 'spandsp' 'libdvdnav' 'libmodplug' 'libgme' 'opus' 'wayland' 'neon' 'libofa' 'fluidsynth' 'openjpeg')
-makedepends=('schroedinger' 'libexif' 'libdvdread' 'libvdpau' 'libmpeg2')
+depends=('mjpegtools' 'gst-plugins-base-libs' 'curl' 'chromaprint' 'libmms' 'faad2' 'mpg123' 'celt' 'libdca' 'soundtouch' 'spandsp' 'libdvdnav' 'libmodplug' 'libgme' 'opus' 'wayland' 'neon' 'libofa' 'fluidsynth' 'openjpeg' 'libwebp' 'libsrtp' 'gnutls')
+makedepends=('schroedinger' 'libexif' 'libdvdread' 'libvdpau' 'libmpeg2' 'python' 'valgrind' 'wildmidi')
 provides=($_pkgname=$pkgver)
 conflicts=$_pkgname
 replaces=$_pkgname
 options=(!libtool !emptydirs)
 source=(${url}/src/$_pkgname/$_pkgname-$pkgver.tar.xz)
-sha256sums=('91da60ba2ee5c681f11188a4a456894e7f989435c2102c15eff97bbd4fc4c726')
+sha256sums=('a12fac6c106a7e4ae8bb2c7da508688d7db532b818319df2202f497cbd930afa')
 
 build() {
   cd $_pkgname-$pkgver
-  sed -i '/AC_PATH_XTRA/d' configure.ac
-  aclocal -I m4 -I common/m4
-  autoconf
-  automake --add-missing
+
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --disable-static --enable-experimental \
-    --with-package-name='GStreamer Bad Plugins (Parabola GNU/Linux-libre)' \
-    --with-package-origin='https://parabolagnulinux.org/' \
+    --with-package-name="GStreamer Bad Plugins (Parabola GNU/Linux-libre)" \
+    --with-package-origin="https://parabolagnulinux.org/" \
     --with-gtk=3.0
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
   make
 }
 
diff --git a/libre/gummiboot/PKGBUILD b/libre/gummiboot/PKGBUILD
index 156525eef..eebb9744c 100644
--- a/libre/gummiboot/PKGBUILD
+++ b/libre/gummiboot/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188624 2013-06-17 06:29:16Z tpowa $
+# $Id: PKGBUILD 194708 2013-09-23 00:31:07Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
@@ -6,7 +6,7 @@
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname="gummiboot"
-pkgver="33"
+pkgver="38"
 pkgrel="1"
 pkgdesc="Simple text-mode UEFI Boot Manager (Parabola rebranded)"
 url="http://freedesktop.org/wiki/Software/gummiboot"
@@ -27,7 +27,7 @@ build() {
 	cd ${srcdir}/${pkgname}
 
 	./autogen.sh
-	./configure --sysconfdir=/etc --libexecdir=/usr/lib --libdir=/usr/lib
+	./configure --sysconfdir=/etc  --with-efi-ldsdir=/usr/lib --libexecdir=/usr/lib --libdir=/usr/lib
 	
 	make
 }
diff --git a/libre/hexchat-libre/PKGBUILD b/libre/hexchat-libre/PKGBUILD
index a377c189c..161f78e82 100644
--- a/libre/hexchat-libre/PKGBUILD
+++ b/libre/hexchat-libre/PKGBUILD
@@ -1,57 +1,47 @@
-# $Id: PKGBUILD 91125 2013-05-19 21:58:09Z alucryd $
+# $Id: PKGBUILD 97268 2013-09-15 22:44:23Z alucryd $
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 # Contributor: TingPing <tingping@tingping.se>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=hexchat
 pkgname=hexchat-libre
-pkgver=2.9.5
-pkgrel=5
+pkgver=2.9.6.1
+pkgrel=1
 pkgdesc="A popular and easy to use graphical IRC (chat) client, without nonfree browser reference (Parabola rebranded)"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://www.hexchat.org/"
+url="http://hexchat.github.io/"
 license=('GPL')
-depends=('dbus-glib' 'desktop-file-utils' 'hicolor-icon-theme' 'libnotify' 'libproxy' 'libsexy' 'pciutils')
-makedepends=('perl' 'python2')
+depends=('dbus-glib' 'desktop-file-utils' 'hicolor-icon-theme' 'libcanberra' 'libnotify' 'libproxy' 'libsexy' 'pciutils')
+makedepends=('perl' 'python')
 optdepends=('enchant: Spell check'
             'perl: Perl plugin'
-            'python2: Python plugin')
+            'python: Python plugin')
 options=('!libtool')
-install=${_pkgname}.install
+install="${_pkgname}.install"
 replaces=$_pkgname
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
-source=("http://dl.hexchat.org/hexchat/hexchat-${pkgver}.tar.xz"
-        'remove-non-free-suggestion.patch'
-        'no-firefox.patch')
-sha256sums=('11dfd0fbfb88d8dbb38f631fab8a7dffbb179f7f7dafe316953ed6f513ac623d'
-            '61040cb2a369b1b8801509c88019d68d1ab4c2505b1dfd859de1a4c22503f02d'
-            'de338821e1a8790a6fbdba2ce41d323002f51e3ae3e99ee8d815fcf087197e45')
+source=("http://dl.hexchat.org/${_pkgname}/${_pkgname}-${pkgver}.tar.xz")
+sha256sums=('6267ff3c4d0aec8a808365b384115a769d5001d99dbb10403634667c43966470')
 
 build() {
-  cd "${srcdir}"/${_pkgname}-${pkgver}
+  cd ${_pkgname}-${pkgver}
 
 # Rebrand to Parabola
-  sed -i -e 's#ArchLinux#Parabola GNU/Linux-libre#' plugins/sysinfo/parse.c
+  sed -i 's#ArchLinux#Parabola GNU/Linux-libre#' plugins/sysinfo/parse.c
 
 # Remove nonfree browser references
-  patch -p1 -i "${srcdir}/remove-non-free-suggestion.patch"
-  patch -p1 -i "${srcdir}/no-firefox.patch"
+  sed -i '\|NAME Open Link| s|Firefox|Iceweasel|' src/common/hexchat.c
+  sed -i '\|NAME Open Link| s|firefox -private %s\\n\\n";|iceweasel -private %s\\n\\n"\\\n		"NAME Open Link in Private Icecat Window\\n"		"CMD !icecat -private %s\\n\\n";|' src/common/hexchat.c
 
-# Build
-  ./autogen.sh
-  ./configure --prefix=/usr --enable-{shm,spell=libsexy,textfe}
+  ./configure --prefix='/usr' --enable-{python='python3',shm,spell='libsexy',textfe}
   make
 }
 
 package() {
-  cd "${srcdir}"/${_pkgname}-${pkgver}
+  cd ${_pkgname}-${pkgver}
 
-# Install
   make DESTDIR="$pkgdir" install
-
-# IRC Mime Types
-  desktop-file-edit --add-mime-type='x-scheme-handler/irc;x-scheme-handler/ircs' --set-key=Exec --set-value='sh -c "hexchat --existing --url %u || exec hexchat"' "$pkgdir/usr/share/applications/hexchat.desktop"
 }
 
 # vim: ts=2 sw=2 et:
diff --git a/libre/hexchat-libre/no-firefox.patch b/libre/hexchat-libre/no-firefox.patch
deleted file mode 100644
index 998ff4dca..000000000
--- a/libre/hexchat-libre/no-firefox.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Nur hexchat-2.9.4.orig/src/fe-gtk/fe-gtk.c hexchat-2.9.4/src/fe-gtk/fe-gtk.c
---- hexchat-2.9.4.orig/src/fe-gtk/fe-gtk.c	2012-11-11 07:08:30.000000000 -0200
-+++ hexchat-2.9.4/src/fe-gtk/fe-gtk.c	2013-01-30 23:06:38.670239405 -0200
-@@ -1039,8 +1039,10 @@
- 			return;
- 	}
- 
--	/* everything failed, what now? just try firefox */
--	if (try_browser ("firefox", NULL, url))
-+	/* everything failed, what now? just try iceweasel or icecat */
-+	if (try_browser ("iceweasel", NULL, url))
-+		return;
-+	if (try_browser ("icecat", NULL, url))
- 		return;
- 
- 	/* fresh out of ideas... */
diff --git a/libre/hexchat-libre/remove-non-free-suggestion.patch b/libre/hexchat-libre/remove-non-free-suggestion.patch
deleted file mode 100644
index a83a71f17..000000000
--- a/libre/hexchat-libre/remove-non-free-suggestion.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur hexchat-2.9.4.orig/src/common/hexchat.c hexchat-2.9.4/src/common/hexchat.c
---- hexchat-2.9.4.orig/src/common/hexchat.c	2012-11-11 07:08:30.000000000 -0200
-+++ hexchat-2.9.4/src/common/hexchat.c	2013-01-30 23:02:12.884864062 -0200
-@@ -618,7 +618,7 @@
- 	"NAME WII\n"			"CMD quote WHOIS %2 %2\n\n";
- 
- static char defaultconf_urlhandlers[] =
--		"NAME Open Link in Opera\n"		"CMD !opera -remote 'openURL(%s)'\n\n";
-+		""		"";
- 
- #ifdef USE_SIGACTION
- /* Close and open log files on SIGUSR1. Usefull for log rotating */
diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD
index 03c91db7a..7d2dceae8 100644
--- a/libre/hplip-libre/PKGBUILD
+++ b/libre/hplip-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193075 2013-08-15 15:25:13Z andyrtr $
+# $Id: PKGBUILD 194375 2013-09-15 08:00:33Z andyrtr $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor : Rémy Oudompheng <remy@archlinux.org>
 # Contributor: Morgan LEFIEUX <comete@archlinuxfr.org>
@@ -6,8 +6,8 @@
 
 _pkgname=hplip
 pkgname=hplip-libre
-pkgver=3.13.8
-pkgrel=1
+pkgver=3.13.9
+pkgrel=2
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet, without hplip-plugin binary blobs recommendation"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://hplipopensource.com"
@@ -18,7 +18,7 @@ makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups' 'libusbx'
 optdepends=('cups: for printing support'
             'python2-dbus: for dbus support'
             'sane: for scanner support'
-            'python2-imaging: for commandline scanning support'
+            'python2-pillow: for commandline scanning support'
             'python2-notify: for Desktop notification support'
             'rpcbind: for network support'
             'python2-pyqt: for running hp-toolbox'
@@ -31,7 +31,7 @@ options=('!libtool')
 install=hplip.install
 source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc}
         hp-mkuri.patch)
-md5sums=('44de6a1e4d295ae6f1f0f0ef1cdc7301'
+md5sums=('8fcbbd0d3a0b76550f325bd6cf46d9d9'
          'SKIP'
          '0bd7779fdbc4d7a9386df04dce2cb8d4')
 
diff --git a/libre/icecat-noscript/PKGBUILD b/libre/icecat-noscript/PKGBUILD
index 3f83618e0..60c4d2d5d 100644
--- a/libre/icecat-noscript/PKGBUILD
+++ b/libre/icecat-noscript/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 93410 2013-07-03 10:50:31Z spupykin $
+# $Id: PKGBUILD 97930 2013-10-01 15:58:44Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=firefox-noscript
 pkgname=icecat-noscript
-pkgver=2.6.6.7
+pkgver=2.6.8.1
 pkgrel=1
 pkgdesc="plugin for icecat which disables script"
 arch=('any')
@@ -14,7 +14,7 @@ depends=()
 provides=$_pkgname=$pkgver
 makedepends=('unzip')
 source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi)
-md5sums=('10b6704f34568d226fb5fe69b7d6043d')
+md5sums=('955e4c5706a73977c09d7b4d0bc6dd9f')
 
 package() {
 #  _ffver=`pacman -Q icecat | cut -f2 -d\ | cut -f1 -d-`
@@ -23,7 +23,7 @@ package() {
 
   cd $srcdir
   local emid=$(sed -n -e '/<\?em:id>\?/!d; s/.*\([\"{].*[}\"]\).*/\1/; s/\"//g; p; q' install.rdf)
-  local dstdir=$pkgdir/usr/lib/icecat/browser/extensions/${emid}
+  local dstdir=$pkgdir/usr/lib/icecat/extensions/${emid}
   install -d $dstdir
 #  sed -i 's#<em:maxVersion>.*</em:maxVersion>#<em:maxVersion>7.*</em:maxVersion>#' install.rdf
   cp -R * $dstdir
diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD
index bbd3e1213..8ebc5657f 100644
--- a/libre/icedove-l10n/PKGBUILD
+++ b/libre/icedove-l10n/PKGBUILD
@@ -3,8 +3,8 @@
 
 pkgbase=icedove-l10n
 epoch=1
-_pkgver=17.0.8
-pkgver=17.0.8.deb1
+_pkgver=17.0.9esr
+pkgver=17.0.9.deb2
 
 _langpacks=(ar ast be bg bn-BD br ca cs da de el en-GB en-US es-AR es-ES et eu fi fr fy-NL ga-IE gd gl he hr hu hy-AM id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW)
 
@@ -65,58 +65,58 @@ done
 
 md5sums=('d5b2567a8cc8f64591f313a6efdaaffc'
          'f3719964e893c1002b7a923e8f95f923'
-         'ad61f2a7632c8ce1251d5952181398df'
-         '3fd84e4b803bca0fedb737440a040e45'
-         '4586a2dabddfcc16855edf6b8d69962a'
-         'c584f31ae8b2c24da15666fc4fa3563b'
-         '702f3257cf019843d74fbaadb99e2886'
-         '6551ad7767aa87ee42e6d31ff9590648'
-         'd1b275d962f96166e2a459f58b1709d6'
-         'ca7a944cd07ee0c0d04a454a2516d49d'
-         '76d452fada4e133f6dc3b3584c6fac08'
-         '3b4b2cee9016abd15da1bcd6286dbc6c'
-         '028c90f0c31ab3a7b071a718d08258bb'
-         '12355d30501f1ac7a10831763bc1f354'
-         '23b28003c65f5df1be2e8008c97edc15'
-         'afc8052118c343e867718ef8561e831e'
-         '65db2679e3a8c1868739da2e27783484'
-         '1334e12708bf352a2be09d5795c95213'
-         'f73ac3d0baedb8f525676118f51426f9'
-         '4c31cb388ccaff76c95d5b46f49c4ecc'
-         '2bd1d5f69bee27da325f8298f0d1e134'
-         '6bdd8f7a3beee272d7cdfc24882d254b'
-         'e6d1dc109c9a934277aaab7e696d389b'
-         '70408d96a8bbd4aceccf1c56d05f15ce'
-         'd8fbf504de160554a9bc1e4fe13492ce'
-         '094d2815ab1668f1ebf8fcb3a764a4ec'
-         'e6b14831bdc3ce639b390175ac04113b'
-         'cf7743c55272ba14d6804a1121f9ab6b'
-         '44be8dbc2d025afa4730bfa025fa7a42'
-         'c4e95ec094792b880a1ddb8b9aff48aa'
-         'b91510b33bc07ae10f97c223f652517f'
-         '2f6364f530d8f57d104cb4f4e7b28409'
-         '5375575fd2e6721505a9fc06b0247c49'
-         '18ee8f5eaa26ec1f60e81541d5ebc6ca'
-         'ba23f860392aefa18ff50bcdc450af52'
-         '36573ca497ecd8ab8df6b1155546e698'
-         '239622a8ed51b43791d34f4c09b3f6ec'
-         '850cc70db0785d88afe03a4d9964ccd3'
-         'ed3293f4b84e4984d67f44977fccccd5'
-         '9604a4e8c42e605c04e77d204bad5664'
-         '9d5a4a6f6a6b905bb509502972682a04'
-         'ad9c38941f4a8ce055406c1bb5e7ef35'
-         '25e04c4c5a1c0c0eff21e94f75a51f5b'
-         'a369031e02f05a10b68d8ef032cb4105'
-         '4657f4f697459aa51a09915dbc3270bb'
-         '09817688b547c5a20bc8422ce1f7eab1'
-         'd194d43d1dbf60c94028a5a718ba7e36'
-         '0ebbfcf410b53596fc8fb99df51ed030'
-         'cfa588e76644846f31fbc5360cfa89a1'
-         '06141e939e5c53251c7af6d23935024d'
-         'd07936ae70c5baa32ac5f4ecdb691c8e'
-         'e5c0f2ebac114fdc2a0db275ea385858'
-         'dac675a37e160aafb0e052ae561fe189'
-         '5e112c628766e03cdae62f64d42020ca'
-         '85d89ffd10bba250f4ce8acd39b3d6f8'
-         'f068603a927801bc0c5386e61bcc8b4e'
-         '2e6f3b969a175bbe2f88b266482f4c2e')
+         'cc32b8aa30e0e54fcea11b76a9a030f4'
+         'a18431241d61f6f517c1b8c3d8ce884f'
+         '28b6143d9dea47b9bd89453fea455457'
+         'e1139e6b943a02af2be130f66db99390'
+         '6c446ab3cfc39b1b177f0b7c4558ffd6'
+         'f6a88413d68fff4451fb675586539705'
+         '8e77e2d1236ee08c690edd6617bc61ec'
+         '7a5748c07c863745540e4dc48773bdfe'
+         'fabe0a051dfedeee5b7301ae1f886aa2'
+         '171068c63cb0819a5c8769d92a713c6e'
+         '64d5d905bba39a9c857e16e2deed8d92'
+         '41a11fedd4f0721c7dfa7b4f294c4578'
+         '8a23d4d6616428292c9edf432e747543'
+         '41aa0520d62b7f257938bae83a3fc72b'
+         '2b1f30b215838a256a15eb87f93825a8'
+         '1c125ec400fa3d9de88cf6a775f5deae'
+         'd85151b34d12e265f3df28dfbc78dd1b'
+         '0ab58f3f0ee604e1af3dc5c16b0c2ea0'
+         'e7a3d71e609efcefe71c57b7890fb37c'
+         '166efd822691c91a722d53e8e9c6d7a8'
+         'f7837a358208e6720f18e9858478915a'
+         '58b38fd78be414cf4d10c2ac6dfd128c'
+         'aceb524b1e843668405b762ee7258756'
+         '2dfc7c8760aa197efe662a389614e284'
+         '5886ef068a1b73bfd7d8c3c2628d8674'
+         'ab535a80c409fd0b4b732fdb79f525ad'
+         '12dd37921eedcd2c9e5a4484315bed6d'
+         '0766135b41053a1b168b8a5d2b865025'
+         'fb61057edad48f619a4943d7033ea4ac'
+         'e7eb605e77a7dcf2093c78fee22432a8'
+         'ac3455b559e3be6bba9b801e54fba4a6'
+         '1ab817dd1e0b2a20c7b95b3821626e4b'
+         '239a2ce9ada5bee297a3abc5d382fbc0'
+         '5159ca357d344d48e4a1ed7f5d0c6148'
+         'b260be89e9ae689a2285995541055f06'
+         'fe3a462afcb4a9e0a4228f0f5a894790'
+         'e775993988b93497c062c0e0b5cf8c5e'
+         '67fec92b3bdaa8267467e96cde7145e1'
+         '36d0044c7e1808bc80fb7aa27c37f540'
+         'fcea0c7480719cf77b7d38a23114ac25'
+         '205bd5873fcb142b3c3828a8a6bbe4f9'
+         'e82f9a3ef19ec74d235c71d4162bef28'
+         'e38119f6bfc43aec4016120c970fa1eb'
+         '9e89b3c89bc8f6e4dd1c80e25591b634'
+         'af4688e2617a18410165da9474de7fdc'
+         '09f10be4a94a6eb9f91aa9be6fd65a65'
+         '864fe0fae10e437dd764454f87ad0cc1'
+         'b2e7cbfa68bcb2e7eac21e18d87a3d93'
+         '171a1064054f4fd185ce896738d50cbc'
+         '2f34b234825e28993eb244862cef607b'
+         'ad7814da5ccddfbba70fc9389b7b1368'
+         '41513e2cef7b5a311e8f3de988f2594b'
+         'a929204d41eba4631b97892f4a915591'
+         '6a36f76040d930fa8a448c1d7b6c7c22'
+         'be9c55a9994069fa8ebac022201cdaf3')
diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD
index 246f228bc..8728e2e87 100644
--- a/libre/icedove-libre/PKGBUILD
+++ b/libre/icedove-libre/PKGBUILD
@@ -3,8 +3,8 @@
 
 # We're getting this from Debian Sid
 _debname=icedove
-_debver=17.0.8
-_debrel=deb1
+_debver=17.0.9
+_debrel=deb2
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
@@ -31,8 +31,8 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
         vendor.js
         ${_pkgname}.desktop)
 options=(!emptydirs)
-md5sums=('37a706e6b2c17049ab70739600ef47b0'
-         '0524d248bd0e83fa62c261700640ac0d'
+md5sums=('4c2aacece253be8f177a74d90d782f45'
+         'dd8ccad23583cc0d8c3b77066711f077'
          '5cf95ea94f69cdd36604890cfbf7b954'
          'a8fc4658d45b6bf9350023e5c3f34e56'
          '4eecc4fc5aafaf0da651a09eadc90bee'
diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD
index 19400ce5f..a135d161e 100644
--- a/libre/iceweasel-l10n/PKGBUILD
+++ b/libre/iceweasel-l10n/PKGBUILD
@@ -11,8 +11,8 @@
 # - Run 'make'. It will take care of everything else for you.
 
 _debname=iceweasel
-_debver=23.0.1
-_debrel=deb1
+_debver=24.0
+_debrel=deb2
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
@@ -24,7 +24,7 @@ pkgname=($(for lang in ${_langpacks[@]}
         done))
 epoch=1
 pkgver=$_debver.$_debrel
-pkgrel=2
+pkgrel=1
 
 pkgdesc="Language packs for Debian Iceweasel."
 arch=('any')
@@ -76,91 +76,91 @@ package_iceweasel-l10n-$(echo $lang | tr A-Z a-z)() {
 done
 
 md5sums=('e88728730ecf9f0f145de5f70e362b15'
-         'beec7ff5243399aaa490eeb908f89635'
-         'd76b30288dc5aa89c5c73327dd93e1f1'
-         '0d7a7d3f9afd4f4f535813ddbe295979'
-         'a3e395704283a7b04f5a2b622f4a3639'
-         '4957794086a29eb2aab2f9486a0749dd'
-         'd42f22d4e8f0877b94e129d5898074ea'
-         '8d87c38d9e07847e774152f7f34b0d3a'
-         'd5442982475a1948794267c6f2e8dab7'
-         'cbe6d536bb393a71827721acc8b5a592'
-         '92966282e3cb266006c1814af8e0ff0a'
-         '8dc3cd2b6892457752e8232ff0bdacd2'
-         '36fa29d00055b28c40276ada3008da20'
-         '4535bbb5f058fad2635c65a77ca948af'
-         'd55e19c70c143893334d76d803c6ad19'
-         '48ecdc05f12a84745e1f170790ab427f'
-         'c50af900a16d3e7f95dd7768dd04e8a2'
-         'd8f113de7e79743d4cb9beb127f0f95b'
-         'ee686438c9a3ea9041c19bb75f53651a'
-         '358203acae7af9752fa65550ca98f02e'
-         '726be61d6cfefcd671c24f2f49e3bf21'
-         'c15c9b35ef2bf000f3f7f8b2946aee6d'
-         '086b14122e3e45dac497ffe7f0873c02'
-         'c9c80acbc1651ebf9d025d0d3d1cd022'
-         '15ef0474ce040d9600690cdd2b257ffd'
-         '4da96de48891501d947bce50f30d0f1a'
-         '05945026206a9b0f99b09c5ce788ca6b'
-         'd636a741c3711d111ad0e04d905b2fd0'
-         '05d3bac10f8d7fc19f7941b479f44363'
-         '5abaab886f963e387444e47d993d9c1a'
-         '1a89211f0ec11c0541e4d4e983209ce9'
-         '815e0f6a34ed7c63c21403473bab0ac6'
-         'b2e768d738718f20cf6e27f6a393f093'
-         'ea65c30d06da6172848c84dc6e4e2be4'
-         '49e108b2ed86ae25acae56731685170d'
-         '8222761ee3bea5d67cd66d461e698fe6'
-         'a04b35692c4df0f410bf2d196de96928'
-         '861e047041ef3a8f6a92967d40fe8e5f'
-         'd43c967887b437c67c6d39d3c4273c49'
-         'fb8a80a7d82d5a37b926e0a946240df8'
-         'ffdcc759130ad0f23adee6ca8933190d'
-         'dcd9b3889b7050bc3e977cfa013fc2c1'
-         'd59b7828235ed96da7e309e43093923c'
-         '723db17fbf3ac58ed3402b44eb25c953'
-         '3f27760db7543ad953bf3b87bd1f61b1'
-         'ac675403c62a5b898c58ab3e95770275'
-         '7295a8115d6a0d8706ee5ea4a4a0e1fc'
-         '4073b8aca4a5eb905df761ab90e8d63a'
-         'f437bf5c2bdc9a29b6deff2bf3913af2'
-         '1a4f3e90be3aaf92763b6aa7c09db41c'
-         'dbd3ae230ca8f898f55d73406881fb4b'
-         '2d99549940ab6ec77cabb6dacf1ecc22'
-         '71eba86c8ba6c60aedccbac67d730f64'
-         '327e3808ed2318335ddb17480254098b'
-         'b3880a5392906d7547cf6f1f460fb587'
-         'd3831ed5839155fedd6afe140d9b82d3'
-         '4bbc2b071e3a691c7e31eb203473e4fe'
-         'b6a0a5958b8d7715bff75998f7a2db5a'
-         '12d766edda51a500763cab832d456f1c'
-         '7d8836f1beba05abd2f4980a739b88f6'
-         '6e6c387f87e66fcd0256e7dd493bd3b0'
-         'acf3313e15e39c40a5e4a81a8ad8f082'
-         'b297d9639d918543c6d49be2b41ecb7a'
-         '1a44e1284df3dea096ba6d66babcb627'
-         '59eff511de5712076688a1fdc1ad7cab'
-         '2c6d376215919347a3700e5ca189fbae'
-         'c4721d42d1c5ca7c864ea676fb0eaa67'
-         '099efdf95306a754ff96b3b40e9442aa'
-         '41800618dfebb2793473d24469b42648'
-         'd3af544bb441f124434a8494ea90803d'
-         '279690d65ff8c2d8327476df378cb560'
-         'ec8d0c327f8ab2b1a4a4db2956e35aa1'
-         '6ac9eddd9eb0080bc0ed130f293212a6'
-         'f18b1756afbfc609e474987713463cb0'
-         '5aa659699e413ee6c1581dd5f8abc982'
-         '51d5f2d0832b3e112505d097f927e237'
-         '194772120040d425c0f9caf7e39cd859'
-         '16e341fc147ac7c59927aa9fcd1d9bda'
-         '0f03f21b274f83dab26b13f24c62b10c'
-         '08e4f2dbb5812c26108043c921f96f52'
-         'e698080ded6dd46631a82d4c5e2714a4'
-         '1ec71119addcae00dc488bce157e730b'
-         '52a0d08f300889601ede8f7ab149c402'
-         '75a0dd75f495e8b45dc8b5529cdac123'
-         '751faf67d7395acdf647e944582f1720'
-         '58da93b8de0d043e2c875bede1d339b7'
-         'c7472e6661159c338b29a9f0d67534eb'
-         '90df70450031fbeeef121170875e2a56'
-         'c34f1814457e56a2f922da4c630d6c98')
+         '8b54f8c36f8465987871145fd70956ce'
+         'ad3a11f1485a58a0ad59d861d37a08a5'
+         '9761805e9011c371bb443d8f74fede3c'
+         '87bb6a20535feb2692aa2a6a1afa11e5'
+         '656dca2918d356fbe368b18fb9eac7ec'
+         'e1c793ac7d7beed9d21631154c3dbe1c'
+         '862470f8d5ee8f8d2f68afc7f4a3d5c1'
+         '5d7d027fe8c821689a4fdb022fdf7b1f'
+         'ab298b1e9d86dfccb6797a8f2f28c8af'
+         '4c3dd02509c0f7a8506b7303a410692b'
+         'ebe4f9e91981bbe85d4f2024325d4cf2'
+         'c7e1dae44043c1236f96739ad1117fbe'
+         'b33da7699c2a2f5e0febd11e4489d382'
+         '63c8b3e4c079fbbd98e321035b5c6317'
+         'f14d3462af09d8094393ee16f679e5ab'
+         '0eac6ddbcce45fd8e9a202c93a3738cb'
+         'c837f374f56c0bd6efdde745dce89f8a'
+         '5f780c1b42835050c39db15493dff728'
+         '69303505295c74467a56aa2a43ea2b82'
+         '7c44dba21f5d03604b5dd120231a00ae'
+         'a401bc653b544ac4f259cca56b79d96d'
+         'abdac5ba27fc5cd2ec4d5bc514772670'
+         '0ddc4de7b3050ed2a49233fbe18eebb3'
+         '7d09b317736ba78bd6bcf86f5f6e1e11'
+         '14d1ceaaef00130134e017ae868db8ea'
+         '9ddedfef7ffea213ef4d4e1773b3ad15'
+         'ae89977182d5998204b8ebc1e2603e9f'
+         '642cdf237587093072412720fb36485a'
+         '113ef967c5c05ae9ceae093064fdc116'
+         '90425e1d17c39090a68014c6ce7fb17b'
+         '0d9e0fc7162eb0aca197866ef427f481'
+         '95cc1695aa5bffbdcbcb773fb0430319'
+         '1475a2ad88c8699a9c36e07baed988e0'
+         '26fd5bf6e4e0a6c634ca7632fb20d69d'
+         '1cfb6db8de12e0698f0663fffe651962'
+         '47cbb471101ed09e1d43f85a38cac91f'
+         'e8cb435f70c0d62b07cddf051b2e6a5b'
+         'bc58060bf3539ab408f1a331ec617949'
+         '01e8eedc1594c13db4f8a991fcf87f83'
+         '91179c0d3ee8f003a848eedd2435ea3c'
+         '0bac7e153488e965f164d61d81de87cb'
+         '4dabbdfa4fe6477e862eb381eb2c4fd0'
+         'a83a772712ae74ddb309cb4a7cb52f75'
+         'e16444075ca17e7b5961f7e1e0a828bf'
+         '4df54bf6c1b1cb35a130d34f9a981eec'
+         '27e8f49d9a73c79515aa75304758ae22'
+         '4ad85b335fd26d3474548433fd20d919'
+         '7f63adfe80832afc40cc3774b48fdefc'
+         'dbeac803ed5906af388d2130cdac5c32'
+         'f82ba92549541e2d89d5040d175a11d8'
+         'bd46bc7902cba8866ffedbb50c8ca2f8'
+         '203f1fcb9dd3de9396787fc9dab0312a'
+         'da685c4c4bd727b337bb720d83de8cf5'
+         '42fbbda5287dfbf11619e6046bd06f8b'
+         '65844655106abc5fba71a2cd9bec2d26'
+         '4ad3f9cbb469aeca27443e39a53e8c73'
+         '9225277738d7a0fb8b585314ecdb642f'
+         '292574470c2daeda3c005b12d8a66269'
+         '954554b04d7aee0c6662d2edf7b48c1b'
+         'f15824595b7aab31ce8cc91de781ea03'
+         'c5f2c9ddb5775179be5eea13b12f843f'
+         'def21db04a3b606c603412d7a0091041'
+         '686fcc1eefcce197c8b27363c5db6f34'
+         '9eb2657a7af95927274b0453056173b3'
+         '58e3dedcb8c0f85766aaaa0d35746b94'
+         '209670672c37d4befa4375528385ae4a'
+         'f3b09defe2dd33f94c5aa4f3c19d726e'
+         '3f05b588ddea099c873203267287e296'
+         '91180565b17731d4ff40e6612f499527'
+         'fac9050297be0dfe64473d3fe3bce03b'
+         'd72a455cd79e304627db71c0ad42e42c'
+         'f271b0a4b2d348edca352611da9fa79e'
+         '367a12e148e94885d5141a7b374523f7'
+         '18fb3c7bbfdf0b81a40ef5f0bd9d3c2c'
+         '4e5418b69f62e5d281aa98b0089149de'
+         'bfdf7ae55a0994fbe3ed2359dfd2d437'
+         'e7b4b504e518b16bb5d9cea8770b1b7a'
+         'a8719e1294071e9e0366f686b89a793f'
+         'c422789ab794748200b3d33f660b0076'
+         'ac040347a410692fea6b7fdda06802cf'
+         '97c066c4bd823d8f3157fbb390cbaaac'
+         '3167b085b038f6f1bde2530a167e7405'
+         'e969d0185a8c34341edba2ea2e70a476'
+         'aff3452e3b6663a2e2f8870924bfded6'
+         '44519549cf6b052b49519c9960f97481'
+         'fe67796800cb807148a39722d689a4c7'
+         'b947f013e632c6d262ebdbfac53e3958'
+         '677267c8284fca2b3749f53eba598121')
diff --git a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
index 9fbb5f84a..5d56ee23b 100644
--- a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
+++ b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
@@ -268,10 +268,10 @@ index f35c227..7062886 100644
  

  %{C++

 diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp

-index 90641ed..1806e0c 100644

+index cc3f65e..cdd4305 100644

 --- a/toolkit/xre/nsAppRunner.cpp

 +++ b/toolkit/xre/nsAppRunner.cpp

-@@ -3747,7 +3747,7 @@ XREMain::XRE_mainRun()

+@@ -3731,7 +3731,7 @@ XREMain::XRE_mainRun()

          if (gDoProfileReset) {

            // Automatically migrate from the current application if we just

            // reset the profile.

diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 1918e27a6..069b2827d 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -14,8 +14,8 @@ _pgo=true
 
 # We're getting this from Debian Sid
 _debname=iceweasel
-_debver=23.0.1
-_debrel=deb1
+_debver=24.0
+_debrel=deb2
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
@@ -23,13 +23,13 @@ _pkgname=iceweasel
 pkgname=iceweasel-libre
 epoch=1
 pkgver=$_debver.$_debrel
-pkgrel=2
+pkgrel=1
 
 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox."
 arch=(i686 x86_64 mips64el)
 license=(MPL GPL LGPL)
-depends=(alsa-lib dbus-glib desktop-file-utils gtk2 gstreamer0.10-base hicolor-icon-theme hunspell libevent libnotify libvpx libxt mime-types mozilla-common mozilla-searchplugins nss sqlite startup-notification)
-makedepends=(autoconf2.13 diffutils imagemagick libidl2 libpulse librsvg libxslt mesa pkg-config python2 quilt unzip zip)
+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=(autoconf2.13 diffutils gstreamer0.10-base imagemagick imake inetutils libidl2 libpulse librsvg libxslt mesa pkg-config python2 quilt unzip zip)
 [ "$CARCH" != "mips64el" ] && makedepends+=('yasm')
 options=(!emptydirs !makeflags)
 if $_pgo; then
@@ -37,6 +37,10 @@ if $_pgo; then
   options+=(!ccache)
 fi
 optdepends=('networkmanager: Location detection via available WiFi networks'
+            'gstreamer0.10-base-plugins: vorbis decoding, ogg demuxing'
+            'gstreamer0.10-bad-libre-plugins: aac, vp8 and opus decoding'
+            'gstreamer0.10-good-plugins: webm and mp4 demuxing'
+            'gstreamer0.10-ugly-plugins: h.264 decoding'
             'libpulse: PulseAudio audio driver')
 url="http://packages.debian.org/sid/${_pkgname}"
 install=iceweasel.install
@@ -51,22 +55,18 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
         iceweasel.desktop
         iceweasel-install-dir.patch
         vendor.js
-        shared-libs.patch
         replace-urls.txt
-        $_pkgname-20.0.1-fixed-loading-icon.png
         Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
-md5sums=('43ca6c80e00f5812cb1a38d87f838e06'
-         '0eb0d65b6dbb035b7b8d753c68fda6aa'
-         '2d7ac85c32df6a4ccfcc6de7a1420bf7'
+md5sums=('8f24807d67599516850a4bdca2b2fbd6'
+         '1f4f1347e05b15f5af137787d614ecdf'
+         '350feec44d359c31679dbec3de6685df'
          'df08eaa1ac3bc6c2356be4fbf8ec8932'
-         '4f656688fe7bc0b11899369e0e23e516'
+         '5b32b39c033a33f45e2cfc6c3e80f20c'
          '7b9e5996dd9fe0b186a43a297db1c6b5'
          'abf5ecb74caa857abb42bcfbb3442d9c'
-         '0b88d6142f6131711dcb1a2d87a12ad2'
-         '52e52f840a49eb1d14be1c0065b03a93'
+         '121fefaa040936c3b96298da0c49f450'
          'a8fc4658d45b6bf9350023e5c3f34e56'
-         '6e335a517c68488941340ee1c23f97b0'
-         'c8ee0925def9f018cde65950f66e5844')
+         'f1594fa3567e5b70202c3432d7c00202')
 
 prepare() {
   export DEBIAN_BUILD="mozilla-release"
@@ -88,7 +88,6 @@ prepare() {
 
   patch -Np1 -i "$srcdir/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch" # Adding fixed Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
   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
@@ -144,14 +143,12 @@ prepare() {
   # WebRTC build tries to execute "python" and expects Python 2
   ln -s /usr/bin/python2 "$srcdir/path/python"
 
+  # Use gold, as Mozilla can use some of its features, such as safe ICF
+  #ln -s /usr/bin/ld.gold "$srcdir/path/ld"
+
   # configure script misdetects the preprocessor without an optimization level
   # https://bugs.archlinux.org/task/34644
   sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure
-
-  # Fix tab loading icon (flickers with libpng 1.6)
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=841734
-  cp "$srcdir/$_pkgname-20.0.1-fixed-loading-icon.png" \
-    browser/themes/linux/tabbrowser/loading.png
 }
 
 build() {
@@ -163,20 +160,26 @@ build() {
   export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname"
   export PYTHON="/usr/bin/python2"
 
-  # Work around memory address space exhaustion during linking on i686
   if [[ $CARCH == i686 ]]; then
+    # Work around memory address space exhaustion during linking on i686
     LDFLAGS+=' -Wl,--no-keep-memory'
   fi
 
   if $_pgo; then
-    Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY &
-
-    if ! make -f client.mk build MOZ_PGO=1; then
-      kill $!
-      return 1
+    if [[ $CARCH != i686 ]]; then
+      # Set up PGO
+      export DISPLAY=:99
+      Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY &
+
+      if ! make -f client.mk build MOZ_PGO=1; then
+        kill $!
+        return 1
+      fi
+
+      kill $! || true
+    else
+      make -f client.mk build
     fi
-
-    kill $! || true
   else
     make -f client.mk build
   fi
diff --git a/libre/iceweasel-libre/iceweasel-20.0.1-fixed-loading-icon.png b/libre/iceweasel-libre/iceweasel-20.0.1-fixed-loading-icon.png
deleted file mode 100644
index 55f25e591..000000000
--- a/libre/iceweasel-libre/iceweasel-20.0.1-fixed-loading-icon.png
+++ /dev/null
diff --git a/libre/iceweasel-libre/iceweasel-22.0-do-not-fallback-to-manual-proxy-settings.patch b/libre/iceweasel-libre/iceweasel-22.0-do-not-fallback-to-manual-proxy-settings.patch
deleted file mode 100644
index 56e4bfc45..000000000
--- a/libre/iceweasel-libre/iceweasel-22.0-do-not-fallback-to-manual-proxy-settings.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-
-# HG changeset patch
-# User Patrick McManus <mcmanus@ducksong.com>
-# Date 1365623297 14400
-# Node ID 85f1d207f52546e0e5fe78990cdefe6efae485fb
-# Parent  2bb26d742f5ffd2d946291fd3c688dc3d6d34f67
-bug 817533 - failed system proxy lookups should not fallback to manual configs r=jduell
-
-diff --git a/netwerk/base/src/nsProtocolProxyService.cpp b/netwerk/base/src/nsProtocolProxyService.cpp
---- a/netwerk/base/src/nsProtocolProxyService.cpp
-+++ b/netwerk/base/src/nsProtocolProxyService.cpp
-@@ -1553,17 +1553,22 @@ nsProtocolProxyService::Resolve_Internal
- 
-     // Proxy auto config magic...
-     if (mProxyConfig == PROXYCONFIG_PAC || mProxyConfig == PROXYCONFIG_WPAD) {
-         // Do not query PAC now.
-         *usePACThread = true;
-         return NS_OK;
-     }
- 
--    // proxy info values
-+    // If we aren't in manual proxy configuration mode then we don't
-+    // want to honor any manual specific prefs that might be still set
-+    if (mProxyConfig != PROXYCONFIG_MANUAL)
-+        return NS_OK;
-+
-+    // proxy info values for manual configuration mode
-     const char *type = nullptr;
-     const nsACString *host = nullptr;
-     int32_t port = -1;
- 
-     uint32_t proxyFlags = 0;
- 
-     if ((flags & RESOLVE_PREFER_SOCKS_PROXY) &&
-         !mSOCKSProxyHost.IsEmpty() && mSOCKSProxyPort > 0) {
-
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index 1539c709b..504ebca91 100644
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -209,8 +209,8 @@ diff -urN mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi
  
  #searchText {
 diff -urN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties
---- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties	2013-06-18 08:01:12.000000000 -0300
-+++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties	2013-06-26 22:44:10.393864883 -0300
+--- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties	2013-09-10 20:14:52.000000000 -0300
++++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties	2013-09-18 17:24:08.209539436 -0300
 @@ -3,17 +3,12 @@
  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
@@ -243,7 +243,7 @@ diff -urN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/regio
 -
 -# The default set of protocol handlers for mailto:
 -gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail
--gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s 
+-gecko.handlerService.schemes.mailto.0.uriTemplate=https://compose.mail.yahoo.com/?To=%s
 -gecko.handlerService.schemes.mailto.1.name=Gmail
 -gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s
 -
@@ -281,22 +281,22 @@ diff -ruN mozilla-release.orig/layout/ipc/test-ipcbrowser.xul mozilla-release/la
             remote="true"/>
  </window>
 diff -urN mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in mozilla-release/browser/locales/generic/profile/bookmarks.html.in
---- mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in
-+++ mozilla-release/browser/locales/generic/profile/bookmarks.html.in
+--- mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in	2013-09-10 20:14:52.000000000 -0300
++++ mozilla-release/browser/locales/generic/profile/bookmarks.html.in	2013-09-18 17:41:28.559462661 -0300
 @@ -15,13 +15,20 @@
      <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3>
  <DD>@bookmarks_toolbarfolder_description@
      <DL><p>
--        <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/central/" ID="rdf:#$GvPhC3">@getting_started@</A>
+-        <DT><A HREF="https://www.mozilla.org/@AB_CD@/firefox/central/" ID="rdf:#$GvPhC3">@getting_started@</A>
 +        <DT><A HREF="https://parabolagnulinux.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre</A>
      </DL><p>
 -    <DT><H3 ID="rdf:#$ZvPhC3">@firefox_heading@</H3>
 +    <DT><H3 ID="rdf:#$YvPhC3">Parabola GNU/Linux-libre</H3>
      <DL><p>
--        <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/help/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$22iCK1">@firefox_help@</A>
--        <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/customize/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$32iCK1">@firefox_customize@</A>
--        <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/community/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$42iCK1">@firefox_community@</A>
--        <DT><A HREF="http://www.mozilla.com/@AB_CD@/about/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$52iCK1">@firefox_about@</A>
+-        <DT><A HREF="https://www.mozilla.org/@AB_CD@/firefox/help/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$22iCK1">@firefox_help@</A>
+-        <DT><A HREF="https://www.mozilla.org/@AB_CD@/firefox/customize/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$32iCK1">@firefox_customize@</A>
+-        <DT><A HREF="https://www.mozilla.org/@AB_CD@/contribute/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$42iCK1">@firefox_community@</A>
+-        <DT><A HREF="https://www.mozilla.org/@AB_CD@/about/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$52iCK1">@firefox_about@</A>
 +        <DT><A HREF="https://parabolagnulinux.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre</A>
 +        <DT><A HREF="https://parabolagnulinux.org/packages/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre Packages</A>
 +        <DT><A HREF="https://wiki.parabolagnulinux.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre Wiki</A>
diff --git a/libre/iceweasel-libre/mozconfig b/libre/iceweasel-libre/mozconfig
index a5af10e63..d2ea098d2 100644
--- a/libre/iceweasel-libre/mozconfig
+++ b/libre/iceweasel-libre/mozconfig
@@ -24,7 +24,6 @@ ac_add_options --enable-system-pixman
 
 # Features
 ac_add_options --enable-startup-notification
-ac_add_options --enable-gstreamer
 ac_add_options --enable-pulseaudio
 
 ac_add_options --disable-crashreporter
diff --git a/libre/iceweasel-libre/shared-libs.patch b/libre/iceweasel-libre/shared-libs.patch
deleted file mode 100644
index 1f22b2b0d..000000000
--- a/libre/iceweasel-libre/shared-libs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur mozilla-release.orig/browser/installer/Makefile.in mozilla-release/browser/installer/Makefile.in
---- mozilla-release.orig/browser/installer/Makefile.in	2012-07-17 16:19:29.480356991 +0000
-+++ mozilla-release/browser/installer/Makefile.in	2012-07-17 17:32:41.250937293 +0000
-@@ -50,7 +50,7 @@
- MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in
- # Some files have been already bundled with xulrunner
- ifndef SYSTEM_LIBXUL
--MOZ_PKG_FATAL_WARNINGS = 1
-+MOZ_PKG_FATAL_WARNINGS = 0
- endif
- 
- MOZ_NONLOCALIZED_PKG_LIST = \
diff --git a/libre/iceweasel-libre/vendor.js b/libre/iceweasel-libre/vendor.js
index ff42f10b0..91414dbbd 100644
--- a/libre/iceweasel-libre/vendor.js
+++ b/libre/iceweasel-libre/vendor.js
@@ -17,9 +17,6 @@ pref("app.update.enabled", false);
 pref("app.update.auto", false);
 pref("dom.storage.enabled", false);
 
-// Enable gstreamer support
-pref("media.gstreamer.enabled", true);
-
 // Disable Social API
 pref("social.remote-install.enabled", false);
 
diff --git a/libre/iceweasel-noscript/PKGBUILD b/libre/iceweasel-noscript/PKGBUILD
index 2d5f48040..ba04053d1 100644
--- a/libre/iceweasel-noscript/PKGBUILD
+++ b/libre/iceweasel-noscript/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 93410 2013-07-03 10:50:31Z spupykin $
+# $Id: PKGBUILD 97930 2013-10-01 15:58:44Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=firefox-noscript
 pkgname=iceweasel-noscript
-pkgver=2.6.6.7
+pkgver=2.6.8.1
 pkgrel=1
 pkgdesc="plugin for iceweasel which disables script"
 arch=('any')
@@ -14,7 +14,7 @@ depends=()
 provides=$_pkgname=$pkgver
 makedepends=('unzip')
 source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi)
-md5sums=('10b6704f34568d226fb5fe69b7d6043d')
+md5sums=('955e4c5706a73977c09d7b4d0bc6dd9f')
 
 package() {
 #  _ffver=`pacman -Q iceweasel-libre | cut -f2 -d\ | cut -f1 -d-`
diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD
index e360ef443..077e6aee3 100644
--- a/libre/kdebase-konqueror-libre/PKGBUILD
+++ b/libre/kdebase-konqueror-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 192541 2013-08-13 18:47:05Z andrea $
+# $Id: PKGBUILD 195531 2013-10-01 15:16:11Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
@@ -6,7 +6,7 @@
 
 _pkgname='kdebase-konqueror'
 pkgname='kdebase-konqueror-libre'
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://kde.org/applications/internet/konqueror/"
@@ -14,8 +14,8 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdebase')
 makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml' 'nepomuk-widgets')
 source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz"
-    	"konq-about-fsdg.diff")
-sha1sums=('2a1e0e902016f0dc6f39cbe4fc776e5f20554088'
+        'konq-about-fsdg.diff')
+sha1sums=('6a988adf54e9f499365dce0ce1691d020411bd0d'
           'd6cbb53c04179b8180f9439eca156b7ff2e76b3a')
 pkgdesc='KDE File Manager & Web Browser, without Google and nonfree software recommendation'
 depends=('kdebase-dolphin' 'kdebase-keditbookmarks')
@@ -25,15 +25,15 @@ conflicts=('kdebase-nsplugins' 'kdebase-konqueror')
 replaces=('kdebase-nsplugins' 'kdebase-konqueror')
 provides=("kdebase-konqueror=$pkgver")
 
-build() {
-    cd kde-baseapps-${pkgver}
-
-    # Don't recommend nonfree software or Google.
-    patch -Np1 -i "${srcdir}/konq-about-fsdg.diff"
+prepare() {
+  mkdir build
 
-    cd ..
+  cd kde-baseapps-${pkgver}
+  # Don't recommend nonfree software or Google.
+  patch -Np1 -i "${srcdir}/konq-about-fsdg.diff"
+}
 
-	mkdir build
+build() {
 	cd build
 	cmake ../kde-baseapps-${pkgver} \
 		-DCMAKE_BUILD_TYPE=Release \
diff --git a/libre/kdebase-konqueror-libre/kdebug-324511.patch b/libre/kdebase-konqueror-libre/kdebug-324511.patch
new file mode 100644
index 000000000..cca2a7254
--- /dev/null
+++ b/libre/kdebase-konqueror-libre/kdebug-324511.patch
@@ -0,0 +1,25 @@
+commit 43a981481ab9161a83dd200db39c093e2502f68a
+Author: Bernd Buschinski <b.buschinski@googlemail.com>
+Date:   Wed Sep 4 16:23:35 2013 +0200
+
+    Fix toplevel bookmarks not showing in toolbar
+    regression from d1963e23
+
+diff --git a/konqueror/src/konqbookmarkbar.cpp b/konqueror/src/konqbookmarkbar.cpp
+index 2141575..199e15f 100644
+--- a/konqueror/src/konqbookmarkbar.cpp
++++ b/konqueror/src/konqbookmarkbar.cpp
+@@ -184,10 +184,12 @@ void KBookmarkBar::fillBookmarkBar(const KBookmarkGroup & parent)
+ 
+         if (!bm.isGroup())
+         {
+-	    if ( bm.isSeparator() )
++            if ( bm.isSeparator() )
++            {
+                 if (m_toolBar) {
+                     m_toolBar->addSeparator();
+                 }
++            }
+             else
+             {
+                 KAction *action = new KBookmarkAction( bm, m_pOwner, 0 );
diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD
index 88735feed..fe99bd935 100644
--- a/libre/kdebase-runtime-libre/PKGBUILD
+++ b/libre/kdebase-runtime-libre/PKGBUILD
@@ -1,16 +1,19 @@
-# $Id: PKGBUILD 192541 2013-08-13 18:47:05Z andrea $
+# $Id: PKGBUILD 195503 2013-10-01 15:14:05Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=kdebase-runtime
 pkgname=kdebase-runtime-libre
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="Plugins and applications necessary for the running of KDE applications, without non-privacy search providers"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/kde/kde-runtime'
 license=('GPL' 'LGPL')
+replaces=("${_pkgname}")
+conflicts=("${_pkgname}")
+provides=("${_pkgname}=${pkgver}")
 depends=("kdelibs>=${pkgver}" 'kactivities' 'smbclient' 'libssh' 'libcanberra'
          'oxygen-icons' 'xorg-xauth' 'libwebp')
 makedepends=('pkg-config' 'cmake' 'automoc4' 'kdepimlibs' 'openslp' 'doxygen'
@@ -19,48 +22,52 @@ optdepends=('kdepimlibs: needed by DrKonqi to send crash reports to KDE.org'
             'gdb: needed by DrKonqi to generate backtrace'
             'htdig: to build the search index in the KHelpCenter'
             'rarian: needed by KHelpCenter')
-replaces=("${_pkgname}")
-conflicts=("${_pkgname}")
-provides=("${_pkgname}=${pkgver}")
 install="${_pkgname}.install"
 source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz"
         'duckduckgo_html.desktop'
         'duckduckgo_lite.desktop')
-sha1sums=('87f693a9cbb149dfa2be49d98562b2bc7add99b7'
+sha1sums=('b896ef9d8fe770720dc16ae3eae33538e4e699da'
           'aa6f39f4b0ad3c110fd05cd6c41190afae9773dd'
           'ac3bac94a2c4b1444642524bc5fb539c4c5dcc5b')
 
 prepare() {
-    mkdir build
+  mkdir build
+
+  cd kde-runtime-${pkgver}
 }
 
 build() {
-	cd "${srcdir}"
+  cd "${srcdir}"
 
-	# Removing non-privacy search providers 
-	rm -v kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders/{7digital,acronym,amazon{,_mp3},amg,backports,baidu,bing,blip,cia,dbug,deb,duckduckgo{,_info,_shopping},facebook,ecosia,feedster,flickr,flickrcc,google,google_advanced,google_code,google_groups,google_images,google_lucky,google_maps,google_movie,google_news,imdb,jamendo,jeeves,magnatune,metacrawler,msdn,nl-telephone,nl-teletekst,python,rpmfind,tvtome,uspto,vimeo,voila,yahoo,yahoo_image,yahoo_local,yahoo_shopping,yahoo_video,youtube}.desktop
+  # Removing non-privacy search providers 
+  rm -v kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders/{7digital,acronym,amazon{,_mp3},amg,backports,baidu,bing,blip,cia,dbug,deb,duckduckgo{,_info,_shopping},facebook,ecosia,feedster,flickr,flickrcc,google,google_advanced,google_code,google_groups,google_images,google_lucky,google_maps,google_movie,google_news,imdb,jamendo,jeeves,magnatune,metacrawler,msdn,nl-telephone,nl-teletekst,python,rpmfind,tvtome,uspto,vimeo,voila,yahoo,yahoo_image,yahoo_local,yahoo_shopping,yahoo_video,youtube}.desktop
 
-	# Adding DuckDuckGo HTML
-	cp -v duckduckgo_html.desktop "kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders"
+  # Adding DuckDuckGo HTML
+  cp -v duckduckgo_html.desktop "kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders"
 
-	# Adding DuckDuckGo Lite
-	cp -v duckduckgo_lite.desktop "kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders"
+  # Adding DuckDuckGo Lite
+  cp -v duckduckgo_lite.desktop "kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders"
 
-	cd build
-	cmake ../kde-runtime-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DKDE4_BUILD_TESTS=OFF \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DWITH_QNtrack=OFF \
-        -DSAMBA_INCLUDE_DIR=/usr/include/samba-4.0
-	make
+  cd build
+  cmake ../kde-runtime-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DKDE4_BUILD_TESTS=OFF \
+    -DCMAKE_SKIP_RPATH=ON \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DWITH_QNtrack=OFF \
+    -DSAMBA_INCLUDE_DIR=/usr/include/samba-4.0
+  make
 }
 
 package() {
-	cd build
-	make DESTDIR="$pkgdir" install
-	rm -f "${pkgdir}/usr/share/icons/hicolor/index.theme"
+  cd build
+  make DESTDIR="$pkgdir" install
+
+  rm "${pkgdir}"/usr/share/icons/hicolor/index.theme
+
+  ln -sf /usr/lib/kde4/libexec/kdesu "${pkgdir}/usr/bin/"
 
-	ln -sf /usr/lib/kde4/libexec/kdesu "${pkgdir}/usr/bin/"
+  # FS#36668
+  chown :nobody "${pkgdir}"/usr/lib/kde4/libexec/kdesud
+  chmod g+s "${pkgdir}"/usr/lib/kde4/libexec/kdesud
 }
diff --git a/libre/kdebase-runtime-libre/kdebug-324470.patch b/libre/kdebase-runtime-libre/kdebug-324470.patch
new file mode 100644
index 000000000..4269df829
--- /dev/null
+++ b/libre/kdebase-runtime-libre/kdebug-324470.patch
@@ -0,0 +1,49 @@
+commit be1a5d484c70f4f6a383150810afbfbb367db2ac
+Author: Eike Hein <hein@kde.org>
+Date:   Tue Sep 3 20:29:23 2013 +0200
+
+    Discard the recorded events in the item-local handlers.
+    
+    Solves problems with identical events being ignored due to
+    QGraphicsView's reuse of QGraphicsSceneMouseEvent instances.
+    
+    CCMAIL:rdieter@fedoraproject.org
+    BUG:324470
+    BUG:324471
+
+diff --git a/plasma/declarativeimports/qtextracomponents/mouseeventlistener.cpp b/plasma/declarativeimports/qtextracomponents/mouseeventlistener.cpp
+index b534845..36530e0 100644
+--- a/plasma/declarativeimports/qtextracomponents/mouseeventlistener.cpp
++++ b/plasma/declarativeimports/qtextracomponents/mouseeventlistener.cpp
+@@ -90,6 +90,7 @@ bool MouseEventListener::containsMouse() const
+ void MouseEventListener::mousePressEvent(QGraphicsSceneMouseEvent *me)
+ {
+     if (m_lastEvent == me) {
++        m_lastEvent = 0;
+         return;
+     }
+ 
+@@ -112,6 +113,7 @@ void MouseEventListener::mousePressEvent(QGraphicsSceneMouseEvent *me)
+ void MouseEventListener::mouseMoveEvent(QGraphicsSceneMouseEvent *me)
+ {
+     if (m_lastEvent == me) {
++        m_lastEvent = 0;
+         return;
+     }
+ 
+@@ -122,6 +124,7 @@ void MouseEventListener::mouseMoveEvent(QGraphicsSceneMouseEvent *me)
+ void MouseEventListener::mouseReleaseEvent(QGraphicsSceneMouseEvent *me)
+ {
+     if (m_lastEvent == me) {
++        m_lastEvent = 0;
+         return;
+     }
+ 
+@@ -138,6 +141,7 @@ void MouseEventListener::mouseReleaseEvent(QGraphicsSceneMouseEvent *me)
+ void MouseEventListener::wheelEvent(QGraphicsSceneWheelEvent *we)
+ {
+     if (m_lastEvent == we) {
++        m_lastEvent = 0;
+         return;
+     }
+ 
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD
index c046bd4ce..bb657d4f3 100644
--- a/libre/kdelibs-libre/PKGBUILD
+++ b/libre/kdelibs-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 192541 2013-08-13 18:47:05Z andrea $
+# $Id: PKGBUILD 195493 2013-10-01 15:12:48Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=kdelibs
 pkgname=kdelibs-libre
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64' 'mips64el')
@@ -24,7 +24,7 @@ install=${_pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
         'kde-applications-menu.patch' 'qt4.patch' 
         'khtml-fsdg.diff')
-sha1sums=('fd5bf73784497245af3c6d5b94a1a8168f95e4e4'
+sha1sums=('f9aec4ec00389067e6d2ea37f5042c926c07fd6a'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
           'ed1f57ee661e5c7440efcaba7e51d2554709701c'
           'a1502a964081ad583a00cf90c56e74bf60121830')
diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD
index e5136d719..ef67d28c9 100644
--- a/libre/kdenetwork-kopete-libre/PKGBUILD
+++ b/libre/kdenetwork-kopete-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 192541 2013-08-13 18:47:05Z andrea $
+# $Id: PKGBUILD 195745 2013-10-01 15:33:32Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=kdenetwork-kopete
 pkgname=kdenetwork-kopete-libre
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc='Instant Messenger, without skype support'
 url='http://kde.org/applications/internet/kopete/'
@@ -21,7 +21,7 @@ provides=$_pkgname=$pkgver
 source=("http://download.kde.org/stable/${pkgver}/src/kopete-${pkgver}.tar.xz"
         'libotr3.patch'
         'mediastreamer29.patch')
-sha1sums=('a67716f14a07cdbacf3df40983db17f594eb768b'
+sha1sums=('d7616376d7488050ce2c6ec6b7a1f4010fe91084'
           '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384'
           '317683a5c2acd0a0058c5ab42f6006e9db511ef3')
 
diff --git a/libre/kdepim-libre/PKGBUILD b/libre/kdepim-libre/PKGBUILD
index 2876fd947..7725d7c2c 100644
--- a/libre/kdepim-libre/PKGBUILD
+++ b/libre/kdepim-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193480 2013-08-21 08:55:25Z andrea $
+# $Id: PKGBUILD 195755 2013-10-01 15:34:16Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -22,8 +22,8 @@ pkgname=('kdepim-akonadiconsole-libre'
          'kdepim-ktimetracker-libre'
          'kdepim-ktnef-libre'
          'kdepim-libkdepim-libre')
-pkgver=4.11.0
-pkgrel=2
+pkgver=4.11.2
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://pim.kde.org'
 license=('GPL' 'LGPL' 'FDL')
@@ -31,7 +31,7 @@ groups=('kde' 'kdepim-libre')
 makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss'
              'kde-agent' 'nepomuk-widgets' 'link-grammar')
 source=("http://download.kde.org/stable/${pkgver}/src/${_pkgbase}-${pkgver}.tar.xz")
-sha1sums=('e71f685a06acef59f49540fba763541fb4b9f5a5')
+sha1sums=('027a6560bcd8f55659f642f2041f1265453a02ad')
 
 build() {
 	mkdir build
diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD
index 1d58e5f89..8dc8d1828 100644
--- a/libre/kdeutils-ark-libre/PKGBUILD
+++ b/libre/kdeutils-ark-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 192541 2013-08-13 18:47:05Z andrea $
+# $Id: PKGBUILD 195793 2013-10-01 15:36:58Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=kdeutils-ark
 pkgname=kdeutils-ark-libre
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc='Archiving Tool, with unar support'
 url='http://kde.org/applications/utilities/ark/'
@@ -20,7 +20,7 @@ replaces=('kdeutils-ark')
 conflicts=('kdeutils-ark')
 source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz"
         'ark-unar-06.patch')
-sha1sums=('aa8e91d415096a55ad910dad83f7eb6abdf88f1f'
+sha1sums=('4314876715804f52ca09f6555173b1542a406f0e'
           'a0a836950f185d9b2245204579f969203036fdec')
 
 build() {
diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index ea427333b..1c9d0251c 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -4,14 +4,14 @@
 # Contributor: Márcio Silva <coadde@lavabit.com>
 
 pkgbase=libretools
-pkgname=(libretools libretools-mips64el librelib)
+pkgname=(libretools libretools-mips64el librelib libregit)
 pkgdesc="Programs for Parabola development"
 url="https://projects.parabolagnulinux.org/packages/libretools.git/"
 license=('GPL3' 'GPL2')
 
-pkgver=20130812
-_libretools_commit=42f606f4fe3c2df5db876098cda9eba9d0e7f1c7
-_devtools_commit=bf8513ae631484a0c292ad085ea7ede9859f8e0f
+pkgver=20131007
+_libretools_commit=75bef554ce82c3c086cc04a4c12ccd2e9644290f
+_devtools_commit=f566ebf8345cf39f1d50eaa6a679b3ca7088f4eb
 
 _packages_url=https://projects.parabolagnulinux.org/packages
 source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.tar.bz2
@@ -32,7 +32,7 @@ build() {
 check() {
   cd "$srcdir/$pkgbase-$_libretools_commit"
 
-  make check TESTENVFLAGS='--no-network --no-sudo'
+  SUDO_USER= make check TESTENVFLAGS='--no-network --no-sudo'
 }
 
 package_librelib() {
@@ -45,6 +45,13 @@ package_librelib() {
   make install-librelib DESTDIR="$pkgdir"
 }
 
+package_libregit() {
+  depends=("librelib=$pkgver" git)
+
+  cd "$srcdir/$pkgbase-$_libretools_commit"
+  make install-libregit DESTDIR="$pkgdir"
+}
+
 package_libretools() {
   backup=(etc/libretools.conf etc/libretools.d/chroot.conf etc/libretools.d/librefetch.conf)
   install=libretools.install
@@ -54,7 +61,7 @@ package_libretools() {
   depends=(
     "librelib=$pkgver"
     arch-install-scripts # `archroot` uses `pacstrap`
-    git # `createworkdir` and `libregit` (also mips-add in -mips64el)
+    git # `createworkdir`
     openssh # `librerelease`
     rsync # `librerelease` and `makechrootpkg.sh`
     subversion # `diff-unfree`
@@ -68,11 +75,13 @@ package_libretools() {
 
 package_libretools-mips64el() {
   pkgdesc="Scripts for Parabola development (for mips64el architecture)"
-  depends=("$pkgbase=$pkgver")
+  depends=("$pkgbase=$pkgver"
+    git # mips-add
+  )
 
   cd "$srcdir/$pkgbase-$_libretools_commit"
   make install-libretools-mips64el DESTDIR="$pkgdir"
 }
 
-md5sums=('12d470d89f05730b0481030526361ddb'
-         'b28b1492fda205be7c577fc03cbc3399')
+md5sums=('938d9909ed3ed3af9f31f82bbc54e788'
+         'a3cc8d8fc2daa370799249a4ea5caafc')
diff --git a/libre/libretools/libretools.install b/libre/libretools/libretools.install
index ff6a238fe..d46990da8 100644
--- a/libre/libretools/libretools.install
+++ b/libre/libretools/libretools.install
@@ -21,7 +21,7 @@ post_upgrade() {
 pre_remove() {
 	if fgrep -q "$_makepkgconf_append" etc/makepkg.conf; then
 		libremessages msg2 "libretools: removing librefetch from /etc/makepkg.conf"
-		sed -i '/libre::/d'
+		sed -i '/libre::/d' etc/makepkg.conf
 	else
 		libremessages msg2 "libretools: librefetch is not in /etc/makepkg.conf as we added it"
 	fi
diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD
index c59e1d08a..1de6c3a1f 100644
--- a/libre/liferea-libre/PKGBUILD
+++ b/libre/liferea-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 191729 2013-07-29 18:51:12Z eric $
+# $Id: PKGBUILD 193917 2013-09-06 04:31:29Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Contributor (Parabola): bitlord
 # Contributor (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=liferea
 pkgname=liferea-libre
-pkgver=1.10.1.a
+pkgver=1.10.2
 pkgrel=1
 pkgdesc="A desktop news aggregator for online news feeds and weblogs, without nonfree suggestions"
 arch=('i686' 'x86_64' 'mips64el')
@@ -24,19 +24,20 @@ optdepends=('gnome-keyring: for keyring plugin support'
 	    'gst-plugins-bad-libre: for media player plugin support')
 options=('!libtool' '!emptydirs')
 install=liferea.install
-source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver%*.*}a.tar.bz2
+source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.bz2
         remove-non-free-suggestions.patch)
-sha1sums=('c0c8508adb6ccfda46453b6a213c15ab78ad5d2c'
+sha1sums=('24d533af7dcd985d3cc8b2589fc3443c17b5acd7'
           '855de60c91b5fee71c7ec88dd04b7d24a02dc0d1')
 
 build() {
-  cd liferea-${pkgver%*.*}a
+  cd liferea-${pkgver}
+  # remove nonfree suggestions
   patch -Np1 -i "$srcdir/remove-non-free-suggestions.patch"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-schemas-compile
   make
 }
 
 package() {
-  cd liferea-${pkgver%*.*}a
+  cd liferea-${pkgver}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD
deleted file mode 100644
index 22ddcf9a0..000000000
--- a/libre/linux-libre-lts-kmod-alx/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Maintainer: André Silva <emulatorman@lavabit.com>
-
-_kernver=3.0.94
-_kernrel=1
-pkgname=('linux-libre-lts-kmod-alx')
-_version=v3.9-rc4
-_pkgver=3.9-rc4-2-su
-pkgver=3.9rc4.2
-pkgrel=16
-pkgdesc='Atheros alx ethernet device driver for Linux-libre-lts kernel'
-arch=('i686' 'x86_64')
-url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx'
-license=('GPL2')
-depends=("linux-libre-lts=$_kernver-$_kernrel")
-makedepends=("linux-libre-lts-headers=$_kernver-$_kernrel")
-install=linux-libre-lts-kmod-alx.install
-replaces=('alx' 'alx-driver' 'dkms-alx')
-provides=('alx' 'alx-driver' 'dkms-alx')
-conflicts=('alx' 'alx-driver' 'dkms-alx')
-source=(http://www.kernel.org/pub/linux/kernel/projects/backports/stable/$_version/compat-drivers-$_pkgver.tar.xz)
-
-md5sums=('a00e82e212fe7533c9059e5b78cc3c1c')
-
-
-package() {
-	# current extramodules version
-	_extraver=extramodules-3.0-LIBRE-LTS
-
-	cd $srcdir/compat-drivers-$_pkgver
-
-	# replacing to specific linux-libre-lts kernel version
-	sed -i -e "s/lib\/modules\/\$(shell uname -r)/usr\/lib\/modules\/$_kernver-$_kernrel-LIBRE-LTS/" Makefile
-
-	./scripts/driver-select alx
-	make
-	cd $srcdir/compat-drivers-$_pkgver/compat
-	gzip -9 compat.ko
-	install -D -m 0644 compat.ko.gz $pkgdir/lib/modules/$_extraver/compat.ko.gz
-	cd $srcdir/compat-drivers-$_pkgver/drivers/net/ethernet/atheros/alx
-	gzip -9 alx.ko
-	install -D -m 0644 alx.ko.gz $pkgdir/lib/modules/$_extraver/alx.ko.gz
-}
diff --git a/libre/linux-libre-lts-kmod-alx/linux-libre-lts-kmod-alx.install b/libre/linux-libre-lts-kmod-alx/linux-libre-lts-kmod-alx.install
deleted file mode 100644
index aad4270cd..000000000
--- a/libre/linux-libre-lts-kmod-alx/linux-libre-lts-kmod-alx.install
+++ /dev/null
@@ -1,33 +0,0 @@
-generic() {
-    echo " > Running depmod now..."
-    depmod -a
-}
-
-unload() {
-    lsmod | grep alx > /dev/null
-    if [ "$?" = "0" ]; then
-        rmmod alx
-    fi
-}
-
-post_install() {
-    generic
-    echo " > Reloading alx module..."
-    echo "   Please note that you may REBOOT your system to get it works!"
-    unload
-    sleep 0.5
-    modprobe alx
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    generic
-    echo " > Unloading memory resident module..."
-    unload
-    rmmod compat
-    echo "  Module unloaded!."
-}
-
diff --git a/libre/linux-libre-lts/3.0.54-ptrace-i686-build.patch b/libre/linux-libre-lts/3.0.54-ptrace-i686-build.patch
deleted file mode 100644
index 6ef275bda..000000000
--- a/libre/linux-libre-lts/3.0.54-ptrace-i686-build.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: H. Peter Anvin <hpa@linux.intel.com>
-Date: Wed, 21 Nov 2012 06:21:02 +0000 (-0800)
-Subject: x86-32: Export kernel_stack_pointer() for modules
-X-Git-Tag: v3.6.9~50
-X-Git-Url: https://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fstable%2Flinux-stable.git;a=commitdiff_plain;h=051d62f6f239a9427fcab244a310610ed8bedb43
-
-x86-32: Export kernel_stack_pointer() for modules
-
-commit cb57a2b4cff7edf2a4e32c0163200e9434807e0a upstream.
-
-Modules, in particular oprofile (and possibly other similar tools)
-need kernel_stack_pointer(), so export it using EXPORT_SYMBOL_GPL().
-
-Link: http://lkml.kernel.org/r/20120912135059.GZ8285@erda.amd.com
-Cc: Yang Wei <wei.yang@windriver.com>
-Cc: Robert Richter <robert.richter@amd.com>
-Cc: Jun Zhang <jun.zhang@intel.com>
-Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
-
-diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
-index 947cf90..9ee1787 100644
---- a/arch/x86/kernel/ptrace.c
-+++ b/arch/x86/kernel/ptrace.c
-@@ -21,6 +21,7 @@
- #include <linux/signal.h>
- #include <linux/perf_event.h>
- #include <linux/hw_breakpoint.h>
-+#include <linux/module.h>
- 
- #include <asm/uaccess.h>
- #include <asm/pgtable.h>
-@@ -192,6 +193,7 @@ unsigned long kernel_stack_pointer(struct pt_regs *regs)
- 
- 	return (unsigned long)regs;
- }
-+EXPORT_SYMBOL_GPL(kernel_stack_pointer);
- 
- static unsigned long *pt_regs_access(struct pt_regs *regs, unsigned long regno)
- {
diff --git a/kernels/linux-libre-pae/3.10.6-logitech-dj.patch b/libre/linux-libre-lts/3.10.6-logitech-dj.patch
index 1c112ccde..1c112ccde 100644
--- a/kernels/linux-libre-pae/3.10.6-logitech-dj.patch
+++ b/libre/linux-libre-lts/3.10.6-logitech-dj.patch
diff --git a/libre-testing/linux-libre/ChangeLog b/libre/linux-libre-lts/ChangeLog
index 7bff7d34d..7bff7d34d 100644
--- a/libre-testing/linux-libre/ChangeLog
+++ b/libre/linux-libre-lts/ChangeLog
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index e1fa76aaf..29e2366e1 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -1,24 +1,26 @@
-# $Id: PKGBUILD 193759 2013-08-30 10:08:14Z andyrtr $
+# $Id: PKGBUILD 195951 2013-10-06 10:39:36Z bpiotrowski $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
-# Contributor (Parabola): Jorge L�pez <jorginho@lavabit.com>
+# Contributor (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
+# Contributor (Parabola): Sorin-Mihai Vârgolici <smv@yobicore.org>
+# Contributor (Parabola): Michał Masłowski <mtjm@mtjm.eu>
 # Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
 
 pkgbase=linux-libre-lts     # Build stock -LIBRE-LTS kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
-_basekernel=3.0
-_sublevel=94
+_basekernel=3.10
+_sublevel=15
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.94 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.15 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
-makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils')
+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.i686' 'config.x86_64'
         # standard config files for mkinitcpio ramdisk
@@ -27,25 +29,21 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'Kbuild.platforms'
         'boot-logo.patch'
         'change-default-console-loglevel.patch'
-        'i915-fix-ghost-tv-output.patch'
-        'ext4-options.patch'
-        'module-symbol-waiting-3.0.patch'
-        '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'
-         'f488335cb6f6cbae9dd5d07d31a532b3'
-         '7373cc3ac66342156a7fc32af8577b46'
-         'b7229f80282337979514f9640a969ff5'
+        'criu-no-expert.patch'
+        '3.10.6-logitech-dj.patch'
+        "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
+md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
+         '9d85508aaa75442ec6e480a248102c5a'
+         '678afb6322e0b0caad6b08bdb2b23dc8'
+         '13e5a0aa3faf60f791403d0b367dca86'
          'c072b17032e80debc6a8626299245d46'
          '2967cecc3af9f954ccc822fd63dca6ff'
          '8267264d9a8966e57fdacd1fa1fc65c4'
          '04b21c79df0a952c22d681dd4f4562df'
          'f3def2cefdcbb954c21d8505d23cc83c'
-         '263725f20c0b9eb9c353040792d644e5'
-         'f36222e7ce20c8e4dc27376f9be60f6c'
-         '670931649c60fcb3ef2e0119ed532bd4'
-         '8a71abc4224f575008f974a099b5cf6f'
-         'f7faae4e260abb9dceb30d7b233d355d')
+         'd50c1ac47394e9aec637002ef3392bd1'
+         '3ff40ca684cfe719723e627e2cef7cea'
+         '8aab6ab727f49dffcae5fd1c3c7c5bdb')
 if [ "$CARCH" != "mips64el" ]; then
     # don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
@@ -59,34 +57,23 @@ 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
   patch -Np1 -i "${srcdir}/boot-logo.patch"
 
-  # Some chips detect a ghost TV output
-  # mailing list discussion: http://lists.freedesktop.org/archives/intel-gfx/2011-April/010371.html
-  # Arch Linux bug report: FS#19234
-  #
-  # It is unclear why this patch wasn't merged upstream, it was accepted,
-  # then dropped because the reasoning was unclear. However, it is clearly
-  # needed.
-  patch -Np1 -i "${srcdir}/i915-fix-ghost-tv-output.patch"
-
   # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
   # remove this when a Kconfig knob is made available by upstream
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
   patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
 
-  # fix ext4 module to mount ext3/2 correct
-  # https://bugs.archlinux.org/task/28653
-  patch -Np1 -i "${srcdir}/ext4-options.patch"
-
-  # fix module initialisation
-  # https://bugs.archlinux.org/task/32122
-  patch -Np1 -i "${srcdir}/module-symbol-waiting-3.0.patch"
-  patch -Np1 -i "${srcdir}/module-init-wait-3.0.patch"
+  # allow criu without expert option set
+  # patch from fedora
+  patch -Np1 -i "${srcdir}/criu-no-expert.patch"
+ 
+  # fix https://bugs.archlinux.org/task/35991 - [linux] 3.10.x renders Logitech Unified Receivers useless
+  patch -Np1 -i  "${srcdir}/3.10.6-logitech-dj.patch"
 
   if [ "$CARCH" == "mips64el" ]; then
     sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre-lts|" Makefile
@@ -175,6 +162,11 @@ _package() {
   replaces=("kernel26${_kernelname}" "kernel26-libre${_kernelname}" "linux${_kernelname}")
   backup=("etc/mkinitcpio.d/${pkgbase}.preset")
   install=${pkgbase}.install
+  if [ "$CARCH" != "mips64el" ]; then
+     provides+=('linux-libre-lts-kmod-alx')
+     conflicts+=('linux-libre-lts-kmod-alx')
+     replaces+=('linux-libre-lts-kmod-alx')
+  fi
   if [ "$CARCH" = "mips64el" ]; then
       optdepends+=('mkinitcpio: to make the initramfs (needs reinstall of this package)')
       conflicts+=('mkinitcpio<0.7')
@@ -205,7 +197,6 @@ _package() {
   # add vmlinux
   install -D -m644 vmlinux "${pkgdir}/usr/src/linux-${_kernver}/vmlinux"
 
-
   # set correct depmod command for install
   cp -f "${startdir}/${install}" "${startdir}/${install}.pkg"
   true && install=${install}.pkg
@@ -214,9 +205,8 @@ _package() {
     -e  "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/" \
     -i "${startdir}/${install}"
 
-  # install fallback mkinitcpio.conf file and preset file for kernel
+  # install mkinitcpio preset file for kernel
   install -D -m644 "${srcdir}/${pkgbase}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
-
   sed \
     -e "1s|'linux*.*'|'${pkgbase}'|" \
     -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgbase}\"|" \
@@ -279,8 +269,8 @@ _package-headers() {
 
   mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include"
 
-  for i in acpi asm-generic config crypto drm generated linux math-emu \
-    media mtd net pcmcia scsi sound trace video xen; do
+  for i in acpi asm-generic config crypto drm generated keys linux math-emu \
+    media net pcmcia scsi sound trace uapi video xen; do
     cp -a include/${i} "${pkgdir}/usr/src/linux-${_kernver}/include/"
   done
 
@@ -313,13 +303,22 @@ _package-headers() {
   cp arch/${KARCH}/kernel/asm-offsets.s "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel/"
 
   # add headers for lirc package
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video"
-
-  cp drivers/media/video/*.h  "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/"
-
-  for i in bt8xx cpia2 cx25840 cx88 em28xx et61x251 pwc saa7134 sn9c102; do
-    mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/${i}"
-    cp -a drivers/media/video/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/${i}"
+  # pci
+  for i in bt8xx cx88 saa7134; do
+    mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/pci/${i}"
+    cp -a drivers/media/pci/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/pci/${i}"
+  done
+  # usb
+  for i in cpia2 em28xx pwc sn9c102; do
+    mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/${i}"
+    cp -a drivers/media/usb/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/${i}"
+  done
+  # i2c
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c"
+  cp drivers/media/i2c/*.h  "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/"
+  for i in cx25840; do
+    mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/${i}"
+    cp -a drivers/media/i2c/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/${i}"
   done
 
   # add docbook makefile
@@ -341,8 +340,8 @@ _package-headers() {
   # add dvb headers for external modules
   # in reference to:
   # http://bugs.archlinux.org/task/9912
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core"
-  cp drivers/media/dvb/dvb-core/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core/"
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-core"
+  cp drivers/media/dvb-core/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-core/"
   # and...
   # http://bugs.archlinux.org/task/11194
   mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/"
@@ -351,19 +350,19 @@ _package-headers() {
   # add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
   # in reference to:
   # http://bugs.archlinux.org/task/13146
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/"
-  cp drivers/media/dvb/frontends/lgdt330x.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/"
-  cp drivers/media/video/msp3400-driver.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/"
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends/"
+  cp drivers/media/dvb-frontends/lgdt330x.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends/"
+  cp drivers/media/i2c/msp3400-driver.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/"
 
   # add dvb headers
   # in reference to:
   # http://bugs.archlinux.org/task/20402
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb"
-  cp drivers/media/dvb/dvb-usb/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb/"
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends"
-  cp drivers/media/dvb/frontends/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/"
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners"
-  cp drivers/media/common/tuners/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners/"
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/dvb-usb"
+  cp drivers/media/usb/dvb-usb/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/dvb-usb/"
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends"
+  cp drivers/media/dvb-frontends/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends/"
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/tuners"
+  cp drivers/media/tuners/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/tuners/"
 
   # add xfs and shmem for aufs building
   mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/fs/xfs"
@@ -392,7 +391,7 @@ _package-headers() {
   done
 
   # remove unneeded architectures
-  rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,microblaze,mn10300,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,um,unicore32,v850,xtensa}
+  rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arc,arm,arm26,arm64,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,metag,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa}
   if [ "$CARCH" = "mips64el" ]; then
     rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/x86
   else
diff --git a/libre/linux-libre-lts/config.i686 b/libre/linux-libre-lts/config.i686
index 47ddf3921..3a2a9a4a5 100644
--- a/libre/linux-libre-lts/config.i686
+++ b/libre/linux-libre-lts/config.i686
@@ -1,47 +1,34 @@
 #
-# Automatically generated make config: don't edit
-# Linux/i386 3.0.54-1 Kernel Configuration
+# Automatically generated file; DO NOT EDIT.
+# Linux/x86 3.10.10-1 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
-# CONFIG_X86_64 is not set
 CONFIG_X86=y
 CONFIG_INSTRUCTION_DECODER=y
 CONFIG_OUTPUT_FORMAT="elf32-i386"
 CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
-CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_CLOCKSOURCE_WATCHDOG=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_MMU=y
-CONFIG_ZONE_DMA=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_SG_DMA_LENGTH=y
 CONFIG_GENERIC_ISA_DMA=y
-CONFIG_GENERIC_IOMAP=y
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_GPIO=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
-# CONFIG_GENERIC_TIME_VSYSCALL is not set
 CONFIG_ARCH_HAS_CPU_RELAX=y
-CONFIG_ARCH_HAS_DEFAULT_IDLE=y
 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+CONFIG_ARCH_HAS_CPU_AUTOPROBE=y
 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
 CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
 CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
-# CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 # CONFIG_ZONE_DMA32 is not set
-CONFIG_ARCH_POPULATES_NODE_MAP=y
 # CONFIG_AUDIT_ARCH is not set
 CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -49,16 +36,15 @@ CONFIG_HAVE_INTEL_TXT=y
 CONFIG_X86_32_SMP=y
 CONFIG_X86_HT=y
 CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
-CONFIG_KTIME_SCALAR=y
 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-LTS"
@@ -79,44 +65,77 @@ CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
 CONFIG_POSIX_MQUEUE_SYSCTL=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_FHANDLE=y
-CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TASK_XACCT=y
-CONFIG_TASK_IO_ACCOUNTING=y
 CONFIG_AUDIT=y
 CONFIG_AUDITSYSCALL=y
 CONFIG_AUDIT_WATCH=y
 CONFIG_AUDIT_TREE=y
+CONFIG_AUDIT_LOGINUID_IMMUTABLE=y
 CONFIG_HAVE_GENERIC_HARDIRQS=y
 
 #
 # IRQ subsystem
 #
 CONFIG_GENERIC_HARDIRQS=y
-CONFIG_HAVE_SPARSE_IRQ=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_IRQ_SHOW=y
 CONFIG_GENERIC_PENDING_IRQ=y
+CONFIG_IRQ_DOMAIN=y
+# CONFIG_IRQ_DOMAIN_DEBUG is not set
 CONFIG_IRQ_FORCED_THREADING=y
-# CONFIG_SPARSE_IRQ is not set
+CONFIG_SPARSE_IRQ=y
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_KTIME_SCALAR=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+
+#
+# Timers subsystem
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ_COMMON=y
+# CONFIG_HZ_PERIODIC is not set
+CONFIG_NO_HZ_IDLE=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+
+#
+# CPU/Task time and stats accounting
+#
+CONFIG_TICK_CPU_ACCOUNTING=y
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
 
 #
 # RCU Subsystem
 #
 CONFIG_TREE_RCU=y
+# CONFIG_TREE_PREEMPT_RCU is not set
 # CONFIG_PREEMPT_RCU is not set
-# CONFIG_RCU_TRACE is not set
+CONFIG_RCU_STALL_COMMON=y
 CONFIG_RCU_FANOUT=32
+CONFIG_RCU_FANOUT_LEAF=16
 # CONFIG_RCU_FANOUT_EXACT is not set
 # CONFIG_RCU_FAST_NO_HZ is not set
 # CONFIG_TREE_RCU_TRACE is not set
+CONFIG_RCU_NOCB_CPU=y
+CONFIG_RCU_NOCB_CPU_NONE=y
+# CONFIG_RCU_NOCB_CPU_ZERO is not set
+# CONFIG_RCU_NOCB_CPU_ALL is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=19
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
+CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=y
 CONFIG_CGROUPS=y
 # CONFIG_CGROUP_DEBUG is not set
 CONFIG_CGROUP_FREEZER=y
@@ -125,19 +144,22 @@ CONFIG_CPUSETS=y
 CONFIG_PROC_PID_CPUSET=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_RESOURCE_COUNTERS=y
-CONFIG_CGROUP_MEM_RES_CTLR=y
-CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
-# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
+CONFIG_MEMCG=y
+CONFIG_MEMCG_SWAP=y
+# CONFIG_MEMCG_SWAP_ENABLED is not set
+CONFIG_MEMCG_KMEM=y
+# CONFIG_CGROUP_HUGETLB is not set
 # CONFIG_CGROUP_PERF is not set
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_CFS_BANDWIDTH=y
 CONFIG_RT_GROUP_SCHED=y
 CONFIG_BLK_CGROUP=y
 # CONFIG_DEBUG_BLK_CGROUP is not set
+# CONFIG_CHECKPOINT_RESTORE is not set
 CONFIG_NAMESPACES=y
 CONFIG_UTS_NS=y
 CONFIG_IPC_NS=y
-CONFIG_USER_NS=y
 CONFIG_PID_NS=y
 CONFIG_NET_NS=y
 CONFIG_SCHED_AUTOGROUP=y
@@ -154,12 +176,15 @@ CONFIG_RD_LZO=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
+CONFIG_HAVE_UID16=y
+CONFIG_SYSCTL_EXCEPTION_TRACE=y
+CONFIG_HOTPLUG=y
+CONFIG_HAVE_PCSPKR_PLATFORM=y
 # CONFIG_EXPERT is not set
 CONFIG_UID16=y
-CONFIG_SYSCTL_SYSCALL=y
+# CONFIG_SYSCTL_SYSCALL is not set
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
-CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
@@ -172,6 +197,7 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_AIO=y
+CONFIG_PCI_QUIRKS=y
 # CONFIG_EMBEDDED is not set
 CONFIG_HAVE_PERF_EVENTS=y
 
@@ -179,10 +205,8 @@ CONFIG_HAVE_PERF_EVENTS=y
 # Kernel Performance Events And Counters
 #
 CONFIG_PERF_EVENTS=y
-CONFIG_PERF_COUNTERS=y
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_PCI_QUIRKS=y
 CONFIG_SLUB_DEBUG=y
 # CONFIG_COMPAT_BRK is not set
 # CONFIG_SLAB is not set
@@ -192,26 +216,49 @@ CONFIG_TRACEPOINTS=y
 CONFIG_OPROFILE=m
 # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
 CONFIG_HAVE_OPROFILE=y
+CONFIG_OPROFILE_NMI_TIMER=y
 CONFIG_KPROBES=y
 CONFIG_JUMP_LABEL=y
 CONFIG_OPTPROBES=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
 CONFIG_USE_GENERIC_SMP_HELPERS=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_DMA_API_DEBUG=y
 CONFIG_HAVE_HW_BREAKPOINT=y
 CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
 CONFIG_HAVE_USER_RETURN_NOTIFIER=y
 CONFIG_HAVE_PERF_EVENTS_NMI=y
+CONFIG_HAVE_PERF_REGS=y
+CONFIG_HAVE_PERF_USER_STACK_DUMP=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
+CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
+CONFIG_HAVE_CMPXCHG_LOCAL=y
+CONFIG_HAVE_CMPXCHG_DOUBLE=y
+CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP_FILTER=y
+CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+CONFIG_MODULES_USE_ELF_REL=y
+CONFIG_CLONE_BACKWARDS=y
+CONFIG_OLD_SIGSUSPEND3=y
+CONFIG_OLD_SIGACTION=y
 
 #
 # GCOV-based kernel profiling
@@ -227,14 +274,39 @@ CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MODVERSIONS=y
 # CONFIG_MODULE_SRCVERSION_ALL is not set
+# CONFIG_MODULE_SIG is not set
 CONFIG_STOP_MACHINE=y
 CONFIG_BLOCK=y
 CONFIG_LBDAF=y
 CONFIG_BLK_DEV_BSG=y
+CONFIG_BLK_DEV_BSGLIB=y
 # CONFIG_BLK_DEV_INTEGRITY is not set
 CONFIG_BLK_DEV_THROTTLING=y
 
 #
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+CONFIG_MAC_PARTITION=y
+CONFIG_MSDOS_PARTITION=y
+CONFIG_BSD_DISKLABEL=y
+CONFIG_MINIX_SUBPARTITION=y
+CONFIG_SOLARIS_X86_PARTITION=y
+# CONFIG_UNIXWARE_DISKLABEL is not set
+CONFIG_LDM_PARTITION=y
+# CONFIG_LDM_DEBUG is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+CONFIG_KARMA_PARTITION=y
+CONFIG_EFI_PARTITION=y
+# CONFIG_SYSV68_PARTITION is not set
+
+#
 # IO Schedulers
 #
 CONFIG_IOSCHED_NOOP=y
@@ -247,63 +319,38 @@ CONFIG_DEFAULT_DEADLINE=y
 CONFIG_DEFAULT_IOSCHED="deadline"
 CONFIG_PREEMPT_NOTIFIERS=y
 CONFIG_PADATA=y
-# CONFIG_INLINE_SPIN_TRYLOCK is not set
-# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK is not set
-# CONFIG_INLINE_SPIN_LOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
-CONFIG_INLINE_SPIN_UNLOCK=y
-# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+CONFIG_ASN1=m
 CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_READ_TRYLOCK is not set
-# CONFIG_INLINE_READ_LOCK is not set
-# CONFIG_INLINE_READ_LOCK_BH is not set
-# CONFIG_INLINE_READ_LOCK_IRQ is not set
-# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
 CONFIG_INLINE_READ_UNLOCK=y
-# CONFIG_INLINE_READ_UNLOCK_BH is not set
 CONFIG_INLINE_READ_UNLOCK_IRQ=y
-# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_WRITE_TRYLOCK is not set
-# CONFIG_INLINE_WRITE_LOCK is not set
-# CONFIG_INLINE_WRITE_LOCK_BH is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
 CONFIG_INLINE_WRITE_UNLOCK=y
-# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
 CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
-# CONFIG_MUTEX_SPIN_ON_OWNER is not set
 CONFIG_FREEZER=y
 
 #
 # Processor type and features
 #
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_ZONE_DMA=y
 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
-CONFIG_PARAVIRT_GUEST=y
+CONFIG_HYPERVISOR_GUEST=y
+CONFIG_PARAVIRT=y
+# CONFIG_PARAVIRT_DEBUG is not set
+# CONFIG_PARAVIRT_SPINLOCKS is not set
 # CONFIG_XEN_PRIVILEGED_GUEST is not set
-CONFIG_KVM_CLOCK=y
 CONFIG_KVM_GUEST=y
 CONFIG_LGUEST_GUEST=y
-CONFIG_PARAVIRT=y
-# CONFIG_PARAVIRT_SPINLOCKS is not set
+CONFIG_PARAVIRT_TIME_ACCOUNTING=y
 CONFIG_PARAVIRT_CLOCK=y
-# CONFIG_PARAVIRT_DEBUG is not set
 CONFIG_NO_BOOTMEM=y
 # CONFIG_MEMTEST is not set
-# CONFIG_M386 is not set
 # CONFIG_M486 is not set
 # CONFIG_M586 is not set
 # CONFIG_M586TSC is not set
@@ -330,15 +377,8 @@ CONFIG_M686=y
 # CONFIG_MATOM is not set
 CONFIG_X86_GENERIC=y
 CONFIG_X86_INTERNODE_CACHE_SHIFT=6
-CONFIG_X86_CMPXCHG=y
-CONFIG_CMPXCHG_LOCAL=y
 CONFIG_X86_L1_CACHE_SHIFT=6
-CONFIG_X86_XADD=y
 # CONFIG_X86_PPRO_FENCE is not set
-CONFIG_X86_WP_WORKS_OK=y
-CONFIG_X86_INVLPG=y
-CONFIG_X86_BSWAP=y
-CONFIG_X86_POPAD_OK=y
 CONFIG_X86_INTEL_USERCOPY=y
 CONFIG_X86_USE_PPRO_CHECKSUM=y
 CONFIG_X86_TSC=y
@@ -347,20 +387,15 @@ CONFIG_X86_CMOV=y
 CONFIG_X86_MINIMUM_CPU_FAMILY=5
 CONFIG_X86_DEBUGCTLMSR=y
 CONFIG_CPU_SUP_INTEL=y
-CONFIG_CPU_SUP_CYRIX_32=y
 CONFIG_CPU_SUP_AMD=y
 CONFIG_CPU_SUP_CENTAUR=y
 CONFIG_CPU_SUP_TRANSMETA_32=y
-CONFIG_CPU_SUP_UMC_32=y
 CONFIG_HPET_TIMER=y
 CONFIG_HPET_EMULATE_RTC=y
 CONFIG_DMI=y
-# CONFIG_IOMMU_HELPER is not set
-CONFIG_IOMMU_API=y
 CONFIG_NR_CPUS=8
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
-# CONFIG_IRQ_TIME_ACCOUNTING is not set
 CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PREEMPT is not set
@@ -389,8 +424,6 @@ CONFIG_HIGHMEM4G=y
 # CONFIG_HIGHMEM64G is not set
 CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_HIGHMEM=y
-# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
-# CONFIG_ARCH_DMA_ADDR_T_64BIT is not set
 CONFIG_ARCH_FLATMEM_ENABLE=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
@@ -402,8 +435,13 @@ CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_SPARSEMEM_STATIC=y
 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
 CONFIG_COMPACTION=y
 CONFIG_MIGRATION=y
 # CONFIG_PHYS_ADDR_T_64BIT is not set
@@ -417,9 +455,11 @@ CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_MEMORY_FAILURE=y
 CONFIG_HWPOISON_INJECT=m
 CONFIG_TRANSPARENT_HUGEPAGE=y
-# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
-CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
+CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
+# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
+CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CLEANCACHE=y
+CONFIG_FRONTSWAP=y
 # CONFIG_HIGHPTE is not set
 CONFIG_X86_CHECK_BIOS_CORRUPTION=y
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
@@ -432,7 +472,9 @@ CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
 CONFIG_X86_PAT=y
 CONFIG_ARCH_USES_PG_UNCACHED=y
 CONFIG_ARCH_RANDOM=y
+CONFIG_X86_SMAP=y
 CONFIG_EFI=y
+CONFIG_EFI_STUB=y
 CONFIG_SECCOMP=y
 CONFIG_CC_STACKPROTECTOR=y
 CONFIG_HZ_100=y
@@ -449,6 +491,8 @@ CONFIG_RELOCATABLE=y
 CONFIG_X86_NEED_RELOCS=y
 CONFIG_PHYSICAL_ALIGN=0x100000
 CONFIG_HOTPLUG_CPU=y
+# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
+# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
 # CONFIG_COMPAT_VDSO is not set
 # CONFIG_CMDLINE_BOOL is not set
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@@ -463,42 +507,51 @@ CONFIG_HIBERNATION=y
 CONFIG_PM_STD_PARTITION=""
 CONFIG_PM_SLEEP=y
 CONFIG_PM_SLEEP_SMP=y
+CONFIG_PM_AUTOSLEEP=y
+CONFIG_PM_WAKELOCKS=y
+CONFIG_PM_WAKELOCKS_LIMIT=100
+CONFIG_PM_WAKELOCKS_GC=y
 CONFIG_PM_RUNTIME=y
 CONFIG_PM=y
 CONFIG_PM_DEBUG=y
 CONFIG_PM_ADVANCED_DEBUG=y
 # CONFIG_PM_TEST_SUSPEND is not set
-CONFIG_CAN_PM_TRACE=y
+CONFIG_PM_SLEEP_DEBUG=y
+CONFIG_PM_TRACE=y
 CONFIG_PM_TRACE_RTC=y
 CONFIG_ACPI=y
 CONFIG_ACPI_SLEEP=y
-CONFIG_ACPI_PROCFS=y
+# CONFIG_ACPI_PROCFS is not set
 # CONFIG_ACPI_PROCFS_POWER is not set
 CONFIG_ACPI_EC_DEBUGFS=m
-CONFIG_ACPI_PROC_EVENT=y
+# CONFIG_ACPI_PROC_EVENT is not set
 CONFIG_ACPI_AC=m
 CONFIG_ACPI_BATTERY=m
 CONFIG_ACPI_BUTTON=m
 CONFIG_ACPI_VIDEO=m
 CONFIG_ACPI_FAN=m
 CONFIG_ACPI_DOCK=y
+CONFIG_ACPI_I2C=m
 CONFIG_ACPI_PROCESSOR=m
 CONFIG_ACPI_IPMI=m
 CONFIG_ACPI_HOTPLUG_CPU=y
 CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
 CONFIG_ACPI_THERMAL=m
 # CONFIG_ACPI_CUSTOM_DSDT is not set
+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=m
+CONFIG_ACPI_HED=y
 CONFIG_ACPI_CUSTOM_METHOD=m
+CONFIG_ACPI_BGRT=y
 CONFIG_ACPI_APEI=y
-CONFIG_ACPI_APEI_GHES=m
+CONFIG_ACPI_APEI_GHES=y
 CONFIG_ACPI_APEI_PCIEAER=y
+CONFIG_ACPI_APEI_MEMORY_FAILURE=y
 CONFIG_ACPI_APEI_EINJ=m
 CONFIG_ACPI_APEI_ERST_DEBUG=m
 CONFIG_SFI=y
@@ -515,6 +568,7 @@ CONFIG_APM_DO_ENABLE=y
 #
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_TABLE=y
+CONFIG_CPU_FREQ_GOV_COMMON=y
 CONFIG_CPU_FREQ_STAT=m
 CONFIG_CPU_FREQ_STAT_DETAILS=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
@@ -530,12 +584,15 @@ 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
 CONFIG_X86_POWERNOW_K6=m
 CONFIG_X86_POWERNOW_K7=m
 CONFIG_X86_POWERNOW_K7_ACPI=y
 CONFIG_X86_POWERNOW_K8=m
+CONFIG_X86_AMD_FREQ_SENSITIVITY=m
 CONFIG_X86_GX_SUSPMOD=m
 # CONFIG_X86_SPEEDSTEP_CENTRINO is not set
 CONFIG_X86_SPEEDSTEP_ICH=m
@@ -552,8 +609,10 @@ CONFIG_X86_E_POWERSAVER=m
 CONFIG_X86_SPEEDSTEP_LIB=m
 CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y
 CONFIG_CPU_IDLE=y
+# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
+# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
 CONFIG_INTEL_IDLE=y
 
 #
@@ -570,10 +629,6 @@ CONFIG_PCI_DIRECT=y
 CONFIG_PCI_MMCONFIG=y
 CONFIG_PCI_OLPC=y
 CONFIG_PCI_DOMAINS=y
-# CONFIG_PCI_CNB20LE_QUIRK is not set
-CONFIG_DMAR=y
-# CONFIG_DMAR_DEFAULT_ON is not set
-CONFIG_DMAR_FLOPPY_WA=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_HOTPLUG_PCI_PCIE=m
 CONFIG_PCIEAER=y
@@ -581,22 +636,34 @@ CONFIG_PCIEAER=y
 # CONFIG_PCIEAER_INJECT is not set
 CONFIG_PCIEASPM=y
 # CONFIG_PCIEASPM_DEBUG is not set
+CONFIG_PCIEASPM_DEFAULT=y
+# CONFIG_PCIEASPM_POWERSAVE is not set
+# CONFIG_PCIEASPM_PERFORMANCE is not set
 CONFIG_PCIE_PME=y
 CONFIG_ARCH_SUPPORTS_MSI=y
 CONFIG_PCI_MSI=y
 # CONFIG_PCI_DEBUG is not set
+CONFIG_PCI_REALLOC_ENABLE_AUTO=y
 CONFIG_PCI_STUB=m
 CONFIG_HT_IRQ=y
+CONFIG_PCI_ATS=y
 CONFIG_PCI_IOV=y
+CONFIG_PCI_PRI=y
+CONFIG_PCI_PASID=y
 CONFIG_PCI_IOAPIC=y
 CONFIG_PCI_LABEL=y
 CONFIG_ISA_DMA_API=y
 CONFIG_ISA=y
 # CONFIG_EISA is not set
-# CONFIG_MCA is not set
 # CONFIG_SCx200 is not set
 CONFIG_OLPC=y
-CONFIG_OLPC_XO1=m
+CONFIG_OLPC_XO1_PM=y
+CONFIG_OLPC_XO1_RTC=y
+CONFIG_OLPC_XO1_SCI=y
+CONFIG_OLPC_XO15_SCI=y
+# CONFIG_ALIX is not set
+# CONFIG_NET5501 is not set
+# CONFIG_GEOS is not set
 CONFIG_AMD_NB=y
 CONFIG_PCCARD=m
 CONFIG_PCMCIA=m
@@ -618,35 +685,40 @@ CONFIG_I82365=m
 CONFIG_TCIC=m
 CONFIG_PCMCIA_PROBE=y
 CONFIG_PCCARD_NONSTATIC=y
-CONFIG_HOTPLUG_PCI=m
-CONFIG_HOTPLUG_PCI_FAKE=m
+CONFIG_HOTPLUG_PCI=y
 CONFIG_HOTPLUG_PCI_COMPAQ=m
 # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
 CONFIG_HOTPLUG_PCI_IBM=m
-CONFIG_HOTPLUG_PCI_ACPI=m
+CONFIG_HOTPLUG_PCI_ACPI=y
 CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 CONFIG_HOTPLUG_PCI_CPCI=y
 CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
 CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
 CONFIG_HOTPLUG_PCI_SHPC=m
 CONFIG_RAPIDIO=y
+CONFIG_RAPIDIO_TSI721=y
 CONFIG_RAPIDIO_DISC_TIMEOUT=30
 # CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set
+CONFIG_RAPIDIO_DMA_ENGINE=y
+CONFIG_RAPIDIO_DEBUG=y
+CONFIG_RAPIDIO_ENUM_BASIC=m
 CONFIG_RAPIDIO_TSI57X=y
 CONFIG_RAPIDIO_CPS_XX=y
 CONFIG_RAPIDIO_TSI568=y
 CONFIG_RAPIDIO_CPS_GEN2=y
 CONFIG_RAPIDIO_TSI500=y
-CONFIG_RAPIDIO_DEBUG=y
 
 #
 # Executable file formats / Emulations
 #
 CONFIG_BINFMT_ELF=y
+CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_BINFMT_SCRIPT=y
 CONFIG_HAVE_AOUT=y
 CONFIG_BINFMT_AOUT=m
 CONFIG_BINFMT_MISC=y
+CONFIG_COREDUMP=y
 CONFIG_HAVE_ATOMIC_IOMAP=y
 CONFIG_HAVE_TEXT_POKE_SMP=y
 CONFIG_NET=y
@@ -655,8 +727,11 @@ CONFIG_NET=y
 # Networking options
 #
 CONFIG_PACKET=y
+CONFIG_PACKET_DIAG=m
 CONFIG_UNIX=y
+CONFIG_UNIX_DIAG=m
 CONFIG_XFRM=y
+CONFIG_XFRM_ALGO=m
 CONFIG_XFRM_USER=m
 # CONFIG_XFRM_SUB_POLICY is not set
 # CONFIG_XFRM_MIGRATE is not set
@@ -675,6 +750,7 @@ CONFIG_IP_ROUTE_CLASSID=y
 # CONFIG_IP_PNP is not set
 CONFIG_NET_IPIP=m
 CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IP_TUNNEL=m
 CONFIG_NET_IPGRE=m
 # CONFIG_NET_IPGRE_BROADCAST is not set
 CONFIG_IP_MROUTE=y
@@ -683,6 +759,7 @@ CONFIG_IP_PIMSM_V1=y
 CONFIG_IP_PIMSM_V2=y
 CONFIG_ARPD=y
 CONFIG_SYN_COOKIES=y
+CONFIG_NET_IPVTI=m
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
@@ -692,8 +769,9 @@ CONFIG_INET_XFRM_MODE_TRANSPORT=m
 CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_LRO=y
-CONFIG_INET_DIAG=y
-CONFIG_INET_TCP_DIAG=y
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
+CONFIG_INET_UDP_DIAG=m
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_CONG_BIC=m
 CONFIG_TCP_CONG_CUBIC=y
@@ -730,6 +808,7 @@ CONFIG_IPV6_SIT=m
 CONFIG_IPV6_SIT_6RD=y
 CONFIG_IPV6_NDISC_NODETYPE=y
 CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_GRE=m
 CONFIG_IPV6_MULTIPLE_TABLES=y
 CONFIG_IPV6_SUBTREES=y
 # CONFIG_IPV6_MROUTE is not set
@@ -745,14 +824,18 @@ CONFIG_BRIDGE_NETFILTER=y
 # Core Netfilter Configuration
 #
 CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_ACCT=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_SECMARK=y
 CONFIG_NF_CONNTRACK_ZONES=y
+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
@@ -769,6 +852,19 @@ CONFIG_NF_CONNTRACK_SANE=m
 CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CT_NETLINK=m
+CONFIG_NF_CT_NETLINK_TIMEOUT=m
+CONFIG_NF_CT_NETLINK_HELPER=m
+CONFIG_NETFILTER_NETLINK_QUEUE_CT=y
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_NF_NAT_PROTO_DCCP=m
+CONFIG_NF_NAT_PROTO_UDPLITE=m
+CONFIG_NF_NAT_PROTO_SCTP=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_NF_NAT_TFTP=m
 CONFIG_NETFILTER_TPROXY=m
 CONFIG_NETFILTER_XTABLES=m
 
@@ -790,13 +886,17 @@ CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
 CONFIG_NETFILTER_XT_TARGET_CT=m
 CONFIG_NETFILTER_XT_TARGET_DSCP=m
 CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_HMARK=m
 CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
 CONFIG_NETFILTER_XT_TARGET_LED=m
+CONFIG_NETFILTER_XT_TARGET_LOG=m
 CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NETMAP=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
 CONFIG_NETFILTER_XT_TARGET_TEE=m
 CONFIG_NETFILTER_XT_TARGET_TPROXY=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
@@ -808,9 +908,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
@@ -818,6 +920,7 @@ CONFIG_NETFILTER_XT_MATCH_CPU=m
 CONFIG_NETFILTER_XT_MATCH_DCCP=m
 CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
 CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ECN=m
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
@@ -829,6 +932,7 @@ CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 CONFIG_NETFILTER_XT_MATCH_MAC=m
 CONFIG_NETFILTER_XT_MATCH_MARK=m
 CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
 CONFIG_NETFILTER_XT_MATCH_OSF=m
 CONFIG_NETFILTER_XT_MATCH_OWNER=m
 CONFIG_NETFILTER_XT_MATCH_POLICY=m
@@ -857,6 +961,7 @@ CONFIG_IP_SET_HASH_IPPORTIP=m
 CONFIG_IP_SET_HASH_IPPORTNET=m
 CONFIG_IP_SET_HASH_NET=m
 CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_HASH_NETIFACE=m
 CONFIG_IP_SET_LIST_SET=m
 CONFIG_IP_VS=m
 # CONFIG_IP_VS_IPV6 is not set
@@ -888,6 +993,11 @@ CONFIG_IP_VS_SED=m
 CONFIG_IP_VS_NQ=m
 
 #
+# IPVS SH scheduler
+#
+CONFIG_IP_VS_SH_TAB_BITS=8
+
+#
 # IPVS application helper
 #
 CONFIG_IP_VS_FTP=m
@@ -899,33 +1009,23 @@ CONFIG_IP_VS_PE_SIP=m
 #
 CONFIG_NF_DEFRAG_IPV4=m
 CONFIG_NF_CONNTRACK_IPV4=m
-CONFIG_NF_CONNTRACK_PROC_COMPAT=y
-CONFIG_IP_NF_QUEUE=m
+# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
 CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_RPFILTER=m
 CONFIG_IP_NF_MATCH_TTL=m
 CONFIG_IP_NF_FILTER=m
 CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_LOG=m
 CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_NF_NAT=m
-CONFIG_NF_NAT_NEEDED=y
+CONFIG_NF_NAT_IPV4=m
 CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_TARGET_NETMAP=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
 CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_PROTO_DCCP=m
 CONFIG_NF_NAT_PROTO_GRE=m
-CONFIG_NF_NAT_PROTO_UDPLITE=m
-CONFIG_NF_NAT_PROTO_SCTP=m
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_IRC=m
-CONFIG_NF_NAT_TFTP=m
-CONFIG_NF_NAT_AMANDA=m
 CONFIG_NF_NAT_PPTP=m
 CONFIG_NF_NAT_H323=m
-CONFIG_NF_NAT_SIP=m
 CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_TARGET_CLUSTERIP=m
 CONFIG_IP_NF_TARGET_ECN=m
@@ -941,7 +1041,6 @@ CONFIG_IP_NF_ARP_MANGLE=m
 #
 CONFIG_NF_DEFRAG_IPV6=m
 CONFIG_NF_CONNTRACK_IPV6=m
-CONFIG_IP6_NF_QUEUE=m
 CONFIG_IP6_NF_IPTABLES=m
 CONFIG_IP6_NF_MATCH_AH=m
 CONFIG_IP6_NF_MATCH_EUI64=m
@@ -950,14 +1049,17 @@ CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_HL=m
 CONFIG_IP6_NF_MATCH_IPV6HEADER=m
 CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RPFILTER=m
 CONFIG_IP6_NF_MATCH_RT=m
 CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_TARGET_LOG=m
 CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_TARGET_REJECT=m
 CONFIG_IP6_NF_MANGLE=m
 CONFIG_IP6_NF_RAW=m
 CONFIG_IP6_NF_SECURITY=m
+CONFIG_NF_NAT_IPV6=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+CONFIG_IP6_NF_TARGET_NPT=m
 CONFIG_BRIDGE_NF_EBTABLES=m
 CONFIG_BRIDGE_EBT_BROUTE=m
 CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -984,7 +1086,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
@@ -1000,9 +1102,11 @@ CONFIG_IP_SCTP=m
 CONFIG_NET_SCTPPROBE=m
 # CONFIG_SCTP_DBG_MSG is not set
 # CONFIG_SCTP_DBG_OBJCNT is not set
-# CONFIG_SCTP_HMAC_NONE is not set
-CONFIG_SCTP_HMAC_SHA1=y
-# CONFIG_SCTP_HMAC_MD5 is not set
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
+CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
+CONFIG_SCTP_COOKIE_HMAC_MD5=y
+CONFIG_SCTP_COOKIE_HMAC_SHA1=y
 # CONFIG_RDS is not set
 # CONFIG_TIPC is not set
 CONFIG_ATM=m
@@ -1018,11 +1122,18 @@ 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_NET_DSA is not set
+CONFIG_BRIDGE_VLAN_FILTERING=y
+CONFIG_HAVE_NET_DSA=y
+CONFIG_NET_DSA=m
+CONFIG_NET_DSA_TAG_DSA=y
+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
@@ -1036,13 +1147,12 @@ CONFIG_COPS_DAYNA=y
 CONFIG_COPS_TANGENT=y
 CONFIG_IPDDP=m
 CONFIG_IPDDP_ENCAP=y
-CONFIG_IPDDP_DECAP=y
 # CONFIG_X25 is not set
 # CONFIG_LAPB is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
 CONFIG_PHONET=m
 CONFIG_IEEE802154=m
+CONFIG_IEEE802154_6LOWPAN=m
+CONFIG_MAC802154=m
 CONFIG_NET_SCHED=y
 
 #
@@ -1066,7 +1176,10 @@ CONFIG_NET_SCH_DRR=m
 CONFIG_NET_SCH_MQPRIO=m
 CONFIG_NET_SCH_CHOKE=m
 CONFIG_NET_SCH_QFQ=m
+CONFIG_NET_SCH_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=m
 CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_SCH_PLUG=m
 
 #
 # Classification
@@ -1100,10 +1213,20 @@ CONFIG_NET_SCH_FIFO=y
 # CONFIG_DCB is not set
 CONFIG_DNS_RESOLVER=y
 CONFIG_BATMAN_ADV=m
+CONFIG_BATMAN_ADV_BLA=y
+CONFIG_BATMAN_ADV_DAT=y
+CONFIG_BATMAN_ADV_NC=y
 # CONFIG_BATMAN_ADV_DEBUG is not set
+CONFIG_OPENVSWITCH=m
+CONFIG_VSOCKETS=m
+CONFIG_VMWARE_VMCI_VSOCKETS=m
+CONFIG_NETLINK_MMAP=y
+CONFIG_NETLINK_DIAG=m
 CONFIG_RPS=y
 CONFIG_RFS_ACCEL=y
 CONFIG_XPS=y
+CONFIG_NETPRIO_CGROUP=m
+CONFIG_BQL=y
 
 #
 # Network testing
@@ -1194,8 +1317,6 @@ CONFIG_VLSI_FIR=m
 CONFIG_VIA_FIR=m
 CONFIG_MCS_FIR=m
 CONFIG_BT=m
-CONFIG_BT_L2CAP=y
-CONFIG_BT_SCO=y
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BT_BNEP=m
@@ -1214,6 +1335,7 @@ CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y
 CONFIG_BT_HCIUART_ATH3K=y
 CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_HCIUART_3WIRE=y
 CONFIG_BT_HCIBCM203X=m
 CONFIG_BT_HCIBPA10X=m
 CONFIG_BT_HCIBFUSB=m
@@ -1237,14 +1359,13 @@ CONFIG_WEXT_PROC=y
 CONFIG_WEXT_SPY=y
 CONFIG_WEXT_PRIV=y
 CONFIG_CFG80211=m
-CONFIG_NL80211_TESTMODE=y
+# CONFIG_NL80211_TESTMODE is not set
 # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
 # CONFIG_CFG80211_REG_DEBUG is not set
 CONFIG_CFG80211_DEFAULT_PS=y
 # CONFIG_CFG80211_DEBUGFS is not set
 # CONFIG_CFG80211_INTERNAL_REGDB is not set
 CONFIG_CFG80211_WEXT=y
-CONFIG_WIRELESS_EXT_SYSFS=y
 CONFIG_LIB80211=m
 CONFIG_LIB80211_CRYPT_WEP=m
 CONFIG_LIB80211_CRYPT_CCMP=m
@@ -1259,6 +1380,7 @@ CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
 CONFIG_MAC80211_MESH=y
 CONFIG_MAC80211_LEDS=y
 # CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_MESSAGE_TRACING is not set
 # CONFIG_MAC80211_DEBUG_MENU is not set
 CONFIG_WIMAX=m
 CONFIG_WIMAX_DEBUG_LEVEL=8
@@ -1271,8 +1393,25 @@ CONFIG_NET_9P_VIRTIO=m
 CONFIG_CAIF=m
 # CONFIG_CAIF_DEBUG is not set
 CONFIG_CAIF_NETDEV=m
+CONFIG_CAIF_USB=m
 CONFIG_CEPH_LIB=m
 # CONFIG_CEPH_LIB_PRETTYDEBUG is not set
+# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
+CONFIG_NFC=m
+CONFIG_NFC_NCI=m
+CONFIG_NFC_HCI=m
+# CONFIG_NFC_SHDLC is not set
+
+#
+# Near Field Communication (NFC) devices
+#
+CONFIG_NFC_PN533=m
+CONFIG_NFC_WILINK=m
+CONFIG_NFC_MEI_PHY=m
+CONFIG_NFC_PN544=m
+CONFIG_NFC_PN544_MEI=m
+CONFIG_NFC_MICROREAD=m
+CONFIG_NFC_MICROREAD_MEI=m
 
 #
 # Device Drivers
@@ -1289,25 +1428,36 @@ 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
+# CONFIG_GENERIC_CPU_DEVICES is not set
+CONFIG_REGMAP=y
+CONFIG_REGMAP_I2C=m
+CONFIG_REGMAP_MMIO=m
+CONFIG_REGMAP_IRQ=y
+CONFIG_DMA_SHARED_BUFFER=y
+# CONFIG_CMA is not set
+
+#
+# Bus devices
+#
 CONFIG_CONNECTOR=y
 CONFIG_PROC_EVENTS=y
 CONFIG_MTD=m
-# CONFIG_MTD_DEBUG is not set
 CONFIG_MTD_TESTS=m
 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_OF_PARTS=y
+CONFIG_MTD_CMDLINE_PARTS=m
+CONFIG_MTD_OF_PARTS=m
 CONFIG_MTD_AR7_PARTS=m
 
 #
 # User Modules And Translation Layers
 #
-CONFIG_MTD_CHAR=m
 CONFIG_MTD_BLKDEVS=m
 CONFIG_MTD_BLOCK=m
 CONFIG_MTD_BLOCK_RO=m
@@ -1376,6 +1526,9 @@ CONFIG_MTD_PLATRAM=m
 CONFIG_MTD_PMC551=m
 # CONFIG_MTD_PMC551_BUGFIX is not set
 # CONFIG_MTD_PMC551_DEBUG is not set
+# CONFIG_MTD_DATAFLASH is not set
+# CONFIG_MTD_M25P80 is not set
+# CONFIG_MTD_SST25L is not set
 # CONFIG_MTD_SLRAM is not set
 CONFIG_MTD_PHRAM=m
 CONFIG_MTD_MTDRAM=m
@@ -1386,16 +1539,14 @@ CONFIG_MTD_BLOCK2MTD=m
 #
 # Disk-On-Chip Device Drivers
 #
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
+CONFIG_MTD_DOCG3=m
+CONFIG_BCH_CONST_M=14
+CONFIG_BCH_CONST_T=4
 CONFIG_MTD_NAND_ECC=m
 CONFIG_MTD_NAND_ECC_SMC=y
 CONFIG_MTD_NAND=m
-# CONFIG_MTD_NAND_VERIFY_WRITE is not set
 # CONFIG_MTD_NAND_ECC_BCH is not set
 CONFIG_MTD_SM_COMMON=m
-# CONFIG_MTD_NAND_MUSEUM_IDS is not set
 # CONFIG_MTD_NAND_DENALI is not set
 CONFIG_MTD_NAND_IDS=m
 CONFIG_MTD_NAND_RICOH=m
@@ -1403,6 +1554,7 @@ CONFIG_MTD_NAND_DISKONCHIP=m
 # CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
 CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
 # CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
+CONFIG_MTD_NAND_DOCG4=m
 # CONFIG_MTD_NAND_CAFE is not set
 CONFIG_MTD_NAND_CS553X=m
 CONFIG_MTD_NAND_NANDSIM=m
@@ -1417,24 +1569,26 @@ CONFIG_MTD_LPDDR=m
 CONFIG_MTD_QINFO_PROBE=m
 CONFIG_MTD_UBI=m
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MTD_UBI_BEB_RESERVE=1
+CONFIG_MTD_UBI_BEB_LIMIT=20
+# CONFIG_MTD_UBI_FASTMAP is not set
 # CONFIG_MTD_UBI_GLUEBI is not set
-# CONFIG_MTD_UBI_DEBUG is not set
 CONFIG_OF=y
 
 #
 # Device Tree and Open Firmware support
 #
 CONFIG_PROC_DEVICETREE=y
+# CONFIG_OF_SELFTEST is not set
 CONFIG_OF_PROMTREE=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_IRQ=y
 CONFIG_OF_DEVICE=y
-CONFIG_OF_GPIO=y
 CONFIG_OF_I2C=m
 CONFIG_OF_NET=y
 CONFIG_OF_MDIO=m
 CONFIG_OF_PCI=y
+CONFIG_OF_PCI_IRQ=y
+CONFIG_OF_MTD=y
 CONFIG_PARPORT=m
 CONFIG_PARPORT_PC=m
 CONFIG_PARPORT_SERIAL=m
@@ -1456,8 +1610,8 @@ 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
 CONFIG_BLK_CPQ_CISS_DA=m
 # CONFIG_CISS_SCSI_TAPE is not set
@@ -1465,13 +1619,14 @@ CONFIG_BLK_DEV_DAC960=m
 # CONFIG_BLK_DEV_UMEM is not set
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_DRBD=m
 # CONFIG_DRBD_FAULT_INJECTION is not set
 CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_NVME=m
 CONFIG_BLK_DEV_OSD=m
 CONFIG_BLK_DEV_SX8=m
-# CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_RAM=m
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=16384
@@ -1483,10 +1638,16 @@ 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
+#
 CONFIG_SENSORS_LIS3LV02D=m
-CONFIG_MISC_DEVICES=y
 CONFIG_AD525X_DPOT=m
 CONFIG_AD525X_DPOT_I2C=m
+# CONFIG_AD525X_DPOT_SPI is not set
+# CONFIG_DUMMY_IRQ is not set
 # CONFIG_IBM_ASM is not set
 CONFIG_PHANTOM=m
 CONFIG_INTEL_MID_PTI=m
@@ -1494,6 +1655,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
@@ -1508,9 +1670,15 @@ CONFIG_SENSORS_BH1770=m
 CONFIG_SENSORS_APDS990X=m
 CONFIG_HMC6352=m
 CONFIG_DS1682=m
+# CONFIG_TI_DAC7512 is not set
 CONFIG_VMWARE_BALLOON=m
-CONFIG_BMP085=m
+CONFIG_BMP085=y
+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_SRAM is not set
 CONFIG_C2PORT=m
 CONFIG_C2PORT_DURAMAR_2150=m
 
@@ -1518,21 +1686,28 @@ CONFIG_C2PORT_DURAMAR_2150=m
 # EEPROM support
 #
 CONFIG_EEPROM_AT24=m
+# CONFIG_EEPROM_AT25 is not set
 CONFIG_EEPROM_LEGACY=m
 CONFIG_EEPROM_MAX6875=m
 CONFIG_EEPROM_93CX6=m
+# CONFIG_EEPROM_93XX46 is not set
 CONFIG_CB710_CORE=m
 # CONFIG_CB710_DEBUG is not set
 CONFIG_CB710_DEBUG_ASSUMPTIONS=y
-CONFIG_IWMC3200TOP=m
-# CONFIG_IWMC3200TOP_DEBUG is not set
-# CONFIG_IWMC3200TOP_DEBUGFS is not set
 
 #
 # Texas Instruments shared transport line discipline
 #
 CONFIG_TI_ST=m
 CONFIG_SENSORS_LIS3_I2C=m
+
+#
+# Altera FPGA firmware download module
+#
+CONFIG_ALTERA_STAPL=m
+CONFIG_INTEL_MEI=m
+CONFIG_INTEL_MEI_ME=m
+CONFIG_VMWARE_VMCI=m
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
 
@@ -1562,7 +1737,6 @@ CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
 # CONFIG_SCSI_SCAN_ASYNC is not set
-CONFIG_SCSI_WAIT_SCAN=m
 
 #
 # SCSI Transports
@@ -1611,11 +1785,12 @@ CONFIG_SCSI_AIC94XX=m
 # CONFIG_AIC94XX_DEBUG is not set
 CONFIG_SCSI_MVSAS=m
 # CONFIG_SCSI_MVSAS_DEBUG is not set
+CONFIG_SCSI_MVSAS_TASKLET=y
+CONFIG_SCSI_MVUMI=m
 CONFIG_SCSI_DPT_I2O=m
 CONFIG_SCSI_ADVANSYS=m
 CONFIG_SCSI_IN2000=m
 CONFIG_SCSI_ARCMSR=m
-CONFIG_SCSI_ARCMSR_AER=y
 CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_MAILBOX=m
@@ -1624,10 +1799,17 @@ CONFIG_MEGARAID_SAS=m
 CONFIG_SCSI_MPT2SAS=m
 CONFIG_SCSI_MPT2SAS_MAX_SGE=128
 # CONFIG_SCSI_MPT2SAS_LOGGING is not set
+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_UFSHCD_PLATFORM=m
 CONFIG_SCSI_HPTIOP=m
 CONFIG_SCSI_BUSLOGIC=m
 # CONFIG_SCSI_FLASHPOINT is not set
 CONFIG_VMWARE_PVSCSI=m
+CONFIG_HYPERV_STORAGE=m
 CONFIG_LIBFC=m
 CONFIG_LIBFCOE=m
 CONFIG_FCOE=m
@@ -1665,6 +1847,7 @@ CONFIG_SCSI_PAS16=m
 CONFIG_SCSI_QLOGIC_FAS=m
 CONFIG_SCSI_QLOGIC_1280=m
 CONFIG_SCSI_QLA_FC=m
+CONFIG_TCM_QLA2XXX=m
 CONFIG_SCSI_QLA_ISCSI=m
 CONFIG_SCSI_LPFC=m
 # CONFIG_SCSI_LPFC_DEBUG_FS is not set
@@ -1683,6 +1866,8 @@ CONFIG_SCSI_PMCRAID=m
 CONFIG_SCSI_PM8001=m
 CONFIG_SCSI_SRP=m
 CONFIG_SCSI_BFA_FC=m
+CONFIG_SCSI_VIRTIO=m
+CONFIG_SCSI_CHELSIO_FCOE=m
 CONFIG_SCSI_LOWLEVEL_PCMCIA=y
 CONFIG_PCMCIA_AHA152X=m
 CONFIG_PCMCIA_FDOMAIN=m
@@ -1702,6 +1887,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
 
 #
@@ -1726,6 +1912,7 @@ CONFIG_ATA_BMDMA=y
 # SATA SFF controllers with BMDMA
 #
 CONFIG_ATA_PIIX=m
+CONFIG_SATA_HIGHBANK=m
 CONFIG_SATA_MV=m
 CONFIG_SATA_NV=m
 CONFIG_SATA_PROMISE=m
@@ -1806,13 +1993,24 @@ 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_BCACHE=m
+# CONFIG_BCACHE_DEBUG is not set
+# CONFIG_BCACHE_EDEBUG is not set
+# CONFIG_BCACHE_CLOSURES_DEBUG is not set
 CONFIG_BLK_DEV_DM=m
 # CONFIG_DM_DEBUG is not set
+CONFIG_DM_BUFIO=m
+CONFIG_DM_BIO_PRISON=m
+CONFIG_DM_PERSISTENT_DATA=m
 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
@@ -1823,13 +2021,15 @@ CONFIG_DM_MULTIPATH_ST=m
 CONFIG_DM_DELAY=m
 CONFIG_DM_UEVENT=y
 CONFIG_DM_FLAKEY=m
+CONFIG_DM_VERITY=m
 CONFIG_TARGET_CORE=m
 CONFIG_TCM_IBLOCK=m
 CONFIG_TCM_FILEIO=m
 CONFIG_TCM_PSCSI=m
 CONFIG_LOOPBACK_TARGET=m
-# CONFIG_LOOPBACK_TARGET_CDB_DEBUG is not set
 CONFIG_TCM_FC=m
+CONFIG_ISCSI_TARGET=m
+CONFIG_SBP_TARGET=m
 CONFIG_FUSION=y
 CONFIG_FUSION_SPI=m
 CONFIG_FUSION_FC=m
@@ -1843,7 +2043,6 @@ CONFIG_FUSION_CTL=m
 #
 CONFIG_FIREWIRE=m
 CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_OHCI_DEBUG=y
 CONFIG_FIREWIRE_SBP2=m
 CONFIG_FIREWIRE_NET=m
 CONFIG_FIREWIRE_NOSY=m
@@ -1859,60 +2058,141 @@ CONFIG_I2O_PROC=m
 CONFIG_MACINTOSH_DRIVERS=y
 CONFIG_MAC_EMUMOUSEBTN=y
 CONFIG_NETDEVICES=y
-CONFIG_IFB=m
-CONFIG_DUMMY=m
+CONFIG_NET_CORE=y
 CONFIG_BONDING=m
+CONFIG_DUMMY=m
+CONFIG_EQUALIZER=m
+# CONFIG_NET_FC is not set
+CONFIG_MII=m
+CONFIG_IFB=m
+CONFIG_NET_TEAM=m
+CONFIG_NET_TEAM_MODE_BROADCAST=m
+CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
+CONFIG_NET_TEAM_MODE_RANDOM=m
+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
+CONFIG_NET_TEAM_MODE_LOADBALANCE=m
 CONFIG_MACVLAN=m
 CONFIG_MACVTAP=m
-CONFIG_EQUALIZER=m
+CONFIG_VXLAN=m
+CONFIG_NETCONSOLE=m
+CONFIG_NETCONSOLE_DYNAMIC=y
+CONFIG_NETPOLL=y
+# CONFIG_NETPOLL_TRAP is not set
+CONFIG_NET_POLL_CONTROLLER=y
+CONFIG_RIONET=m
+CONFIG_RIONET_TX_SIZE=128
+CONFIG_RIONET_RX_SIZE=128
 CONFIG_TUN=m
 CONFIG_VETH=m
-CONFIG_NET_SB1000=m
+CONFIG_VIRTIO_NET=m
+CONFIG_SUNGEM_PHY=m
 # CONFIG_ARCNET is not set
-CONFIG_MII=m
-CONFIG_PHYLIB=m
+CONFIG_ATM_DRIVERS=y
+# CONFIG_ATM_DUMMY is not set
+CONFIG_ATM_TCP=m
+CONFIG_ATM_LANAI=m
+CONFIG_ATM_ENI=m
+# CONFIG_ATM_ENI_DEBUG is not set
+# CONFIG_ATM_ENI_TUNE_BURST is not set
+CONFIG_ATM_FIRESTREAM=m
+CONFIG_ATM_ZATM=m
+# CONFIG_ATM_ZATM_DEBUG is not set
+CONFIG_ATM_NICSTAR=m
+# CONFIG_ATM_NICSTAR_USE_SUNI is not set
+# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
+CONFIG_ATM_IDT77252=m
+# CONFIG_ATM_IDT77252_DEBUG is not set
+# CONFIG_ATM_IDT77252_RCV_ALL is not set
+CONFIG_ATM_IDT77252_USE_SUNI=y
+CONFIG_ATM_AMBASSADOR=m
+# CONFIG_ATM_AMBASSADOR_DEBUG is not set
+CONFIG_ATM_HORIZON=m
+# CONFIG_ATM_HORIZON_DEBUG is not set
+CONFIG_ATM_IA=m
+# CONFIG_ATM_IA_DEBUG is not set
+CONFIG_ATM_FORE200E=m
+# CONFIG_ATM_FORE200E_USE_TASKLET is not set
+CONFIG_ATM_FORE200E_TX_RETRY=16
+CONFIG_ATM_FORE200E_DEBUG=0
+CONFIG_ATM_HE=m
+# CONFIG_ATM_HE_USE_SUNI is not set
+CONFIG_ATM_SOLOS=m
 
 #
-# MII PHY device drivers
+# CAIF transport drivers
 #
-CONFIG_MARVELL_PHY=m
-CONFIG_DAVICOM_PHY=m
-CONFIG_QSEMI_PHY=m
-CONFIG_LXT_PHY=m
-CONFIG_CICADA_PHY=m
-CONFIG_VITESSE_PHY=m
-CONFIG_SMSC_PHY=m
-CONFIG_BROADCOM_PHY=m
-CONFIG_ICPLUS_PHY=m
-CONFIG_REALTEK_PHY=m
-CONFIG_NATIONAL_PHY=m
-CONFIG_STE10XP=m
-CONFIG_LSI_ET1011C_PHY=m
-CONFIG_MICREL_PHY=m
-# CONFIG_MDIO_BITBANG is not set
-CONFIG_NET_ETHERNET=y
-CONFIG_HAPPYMEAL=m
-CONFIG_SUNGEM=m
-CONFIG_CASSINI=m
+CONFIG_CAIF_TTY=m
+CONFIG_CAIF_SPI_SLAVE=m
+CONFIG_CAIF_SPI_SYNC=y
+CONFIG_CAIF_HSI=m
+CONFIG_CAIF_VIRTIO=m
+CONFIG_VHOST_NET=m
+CONFIG_VHOST_SCSI=m
+CONFIG_VHOST_RING=m
+
+#
+# Distributed Switch Architecture drivers
+#
+CONFIG_NET_DSA_MV88E6XXX=m
+CONFIG_NET_DSA_MV88E6060=m
+CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y
+CONFIG_NET_DSA_MV88E6131=m
+CONFIG_NET_DSA_MV88E6123_61_65=m
+CONFIG_ETHERNET=y
+CONFIG_MDIO=m
 CONFIG_NET_VENDOR_3COM=y
-CONFIG_EL1=m
-CONFIG_EL2=m
-CONFIG_ELPLUS=m
-CONFIG_EL16=m
 CONFIG_EL3=m
 CONFIG_3C515=m
+CONFIG_PCMCIA_3C574=m
+CONFIG_PCMCIA_3C589=m
 CONFIG_VORTEX=m
 CONFIG_TYPHOON=m
+CONFIG_NET_VENDOR_ADAPTEC=y
+CONFIG_ADAPTEC_STARFIRE=m
+CONFIG_NET_VENDOR_ALTEON=y
+CONFIG_ACENIC=m
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+CONFIG_NET_VENDOR_AMD=y
+CONFIG_AMD8111_ETH=m
 CONFIG_LANCE=m
-CONFIG_NET_VENDOR_SMC=y
-CONFIG_WD80x3=m
-CONFIG_ULTRA=m
-CONFIG_SMC9194=m
-CONFIG_ETHOC=m
-CONFIG_NET_VENDOR_RACAL=y
-CONFIG_NI52=m
+CONFIG_PCNET32=m
+CONFIG_PCMCIA_NMCLAN=m
 CONFIG_NI65=m
+CONFIG_NET_VENDOR_ATHEROS=y
+CONFIG_ATL2=m
+CONFIG_ATL1=m
+CONFIG_ATL1E=m
+CONFIG_ATL1C=m
+CONFIG_ALX=m
+CONFIG_NET_CADENCE=y
+CONFIG_ARM_AT91_ETHER=m
+CONFIG_MACB=m
+CONFIG_NET_VENDOR_BROADCOM=y
+CONFIG_B44=m
+CONFIG_B44_PCI_AUTOSELECT=y
+CONFIG_B44_PCICORE_AUTOSELECT=y
+CONFIG_B44_PCI=y
+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
+CONFIG_NET_VENDOR_CHELSIO=y
+CONFIG_CHELSIO_T1=m
+CONFIG_CHELSIO_T1_1G=y
+CONFIG_CHELSIO_T3=m
+CONFIG_CHELSIO_T4=m
+CONFIG_CHELSIO_T4VF=m
+CONFIG_NET_VENDOR_CIRRUS=y
+CONFIG_CS89x0=m
+# CONFIG_CS89x0_PLATFORM is not set
+CONFIG_NET_VENDOR_CISCO=y
+CONFIG_ENIC=m
 CONFIG_DNET=m
+CONFIG_NET_VENDOR_DEC=y
 CONFIG_NET_TULIP=y
 CONFIG_DE2104X=m
 CONFIG_DE2104X_DSL=0
@@ -1925,131 +2205,224 @@ CONFIG_WINBOND_840=m
 CONFIG_DM9102=m
 CONFIG_ULI526X=m
 CONFIG_PCMCIA_XIRCOM=m
-CONFIG_AT1700=m
-CONFIG_DEPCA=m
+CONFIG_NET_VENDOR_DLINK=y
+CONFIG_DL2K=m
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+CONFIG_NET_VENDOR_EMULEX=y
+CONFIG_BE2NET=m
+CONFIG_NET_VENDOR_EXAR=y
+CONFIG_S2IO=m
+CONFIG_VXGE=m
+# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
+CONFIG_NET_VENDOR_FUJITSU=y
+CONFIG_PCMCIA_FMVJ18X=m
+CONFIG_NET_VENDOR_HP=y
 CONFIG_HP100=m
-CONFIG_NET_ISA=y
-CONFIG_E2100=m
-CONFIG_EWRK3=m
-CONFIG_EEXPRESS=m
-CONFIG_EEXPRESS_PRO=m
-CONFIG_HPLAN_PLUS=m
-CONFIG_HPLAN=m
-CONFIG_LP486E=m
-CONFIG_ETH16I=m
-CONFIG_NE2000=m
-CONFIG_ZNET=m
-CONFIG_SEEQ8005=m
-# CONFIG_IBM_NEW_EMAC_ZMII is not set
-# CONFIG_IBM_NEW_EMAC_RGMII is not set
-# CONFIG_IBM_NEW_EMAC_TAH is not set
-# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
-# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
-# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
-CONFIG_NET_PCI=y
-CONFIG_PCNET32=m
-CONFIG_AMD8111_ETH=m
-CONFIG_ADAPTEC_STARFIRE=m
-CONFIG_AC3200=m
-CONFIG_KSZ884X_PCI=m
-CONFIG_APRICOT=m
-CONFIG_B44=m
-CONFIG_B44_PCI_AUTOSELECT=y
-CONFIG_B44_PCICORE_AUTOSELECT=y
-CONFIG_B44_PCI=y
-CONFIG_FORCEDETH=m
-CONFIG_CS89x0=m
+CONFIG_NET_VENDOR_INTEL=y
 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
+CONFIG_IXGBE=m
+CONFIG_IXGBE_HWMON=y
+CONFIG_IXGBE_DCA=y
+CONFIG_IXGBEVF=m
+CONFIG_NET_VENDOR_I825XX=y
+CONFIG_IP1000=m
+CONFIG_JME=m
+CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_MVMDIO=m
+CONFIG_SKGE=m
+# CONFIG_SKGE_DEBUG is not set
+CONFIG_SKGE_GENESIS=y
+CONFIG_SKY2=m
+# CONFIG_SKY2_DEBUG is not set
+CONFIG_NET_VENDOR_MELLANOX=y
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_CORE=m
+CONFIG_MLX4_DEBUG=y
+CONFIG_NET_VENDOR_MICREL=y
+CONFIG_KS8842=m
+# CONFIG_KS8851 is not set
+CONFIG_KS8851_MLL=m
+CONFIG_KSZ884X_PCI=m
+CONFIG_NET_VENDOR_MICROCHIP=y
+# CONFIG_ENC28J60 is not set
+CONFIG_NET_VENDOR_MYRI=y
+CONFIG_MYRI10GE=m
+CONFIG_MYRI10GE_DCA=y
 CONFIG_FEALNX=m
+CONFIG_NET_VENDOR_NATSEMI=y
 CONFIG_NATSEMI=m
+CONFIG_NS83820=m
+CONFIG_NET_VENDOR_8390=y
+CONFIG_PCMCIA_AXNET=m
+CONFIG_NE2000=m
 CONFIG_NE2K_PCI=m
+CONFIG_PCMCIA_PCNET=m
+CONFIG_ULTRA=m
+CONFIG_WD80x3=m
+CONFIG_NET_VENDOR_NVIDIA=y
+CONFIG_FORCEDETH=m
+CONFIG_NET_VENDOR_OKI=y
+CONFIG_PCH_GBE=m
+CONFIG_ETHOC=m
+CONFIG_NET_PACKET_ENGINE=y
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+CONFIG_NET_VENDOR_QLOGIC=y
+CONFIG_QLA3XXX=m
+CONFIG_QLCNIC=m
+CONFIG_QLCNIC_SRIOV=y
+CONFIG_QLGE=m
+CONFIG_NETXEN_NIC=m
+CONFIG_NET_VENDOR_REALTEK=y
+CONFIG_ATP=m
 CONFIG_8139CP=m
 CONFIG_8139TOO=m
 # CONFIG_8139TOO_PIO is not set
 CONFIG_8139TOO_TUNE_TWISTER=y
 CONFIG_8139TOO_8129=y
 # CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_R8169=m
+CONFIG_NET_VENDOR_RDC=y
 CONFIG_R6040=m
+CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_SC92031=m
+CONFIG_NET_VENDOR_SIS=y
 CONFIG_SIS900=m
+CONFIG_SIS190=m
+CONFIG_SFC=m
+CONFIG_SFC_MTD=y
+CONFIG_SFC_MCDI_MON=y
+CONFIG_SFC_SRIOV=y
+CONFIG_NET_VENDOR_SMSC=y
+CONFIG_SMC9194=m
+CONFIG_PCMCIA_SMC91C92=m
 CONFIG_EPIC100=m
 CONFIG_SMSC9420=m
-CONFIG_SUNDANCE=m
-# CONFIG_SUNDANCE_MMIO is not set
-CONFIG_TLAN=m
-CONFIG_KS8842=m
-CONFIG_KS8851_MLL=m
-CONFIG_VIA_RHINE=m
-# CONFIG_VIA_RHINE_MMIO is not set
-CONFIG_SC92031=m
-CONFIG_NET_POCKET=y
-CONFIG_ATP=m
-CONFIG_DE600=m
-CONFIG_DE620=m
-CONFIG_ATL2=m
-CONFIG_NETDEV_1000=y
-CONFIG_ACENIC=m
-# CONFIG_ACENIC_OMIT_TIGON_I is not set
-CONFIG_DL2K=m
-CONFIG_E1000=m
-CONFIG_E1000E=m
-CONFIG_IP1000=m
-CONFIG_IGB=m
-CONFIG_IGB_DCA=y
-CONFIG_IGBVF=m
-CONFIG_NS83820=m
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_R8169=m
-CONFIG_SIS190=m
-CONFIG_SKGE=m
-# CONFIG_SKGE_DEBUG is not set
-CONFIG_SKY2=m
-# CONFIG_SKY2_DEBUG is not set
-CONFIG_VIA_VELOCITY=m
-CONFIG_TIGON3=m
-CONFIG_BNX2=m
-CONFIG_CNIC=m
-CONFIG_QLA3XXX=m
-CONFIG_ATL1=m
-CONFIG_ATL1E=m
-CONFIG_ATL1C=m
-CONFIG_JME=m
+CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_STMMAC_ETH=m
+# CONFIG_STMMAC_PLATFORM is not set
+CONFIG_STMMAC_PCI=y
+# CONFIG_STMMAC_DEBUG_FS is not set
 # CONFIG_STMMAC_DA is not set
-CONFIG_STMMAC_DUAL_MAC=y
-CONFIG_PCH_GBE=m
-CONFIG_NETDEV_10000=y
-CONFIG_MDIO=m
-CONFIG_CHELSIO_T1=m
-CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T3=m
-CONFIG_CHELSIO_T4=m
-CONFIG_CHELSIO_T4VF=m
-CONFIG_ENIC=m
-CONFIG_IXGBE=m
-CONFIG_IXGBE_DCA=y
-CONFIG_IXGBEVF=m
-CONFIG_IXGB=m
-CONFIG_S2IO=m
-CONFIG_VXGE=m
-# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
-CONFIG_MYRI10GE=m
-CONFIG_MYRI10GE_DCA=y
-CONFIG_NETXEN_NIC=m
+CONFIG_NET_VENDOR_SUN=y
+CONFIG_HAPPYMEAL=m
+CONFIG_SUNGEM=m
+CONFIG_CASSINI=m
 CONFIG_NIU=m
-CONFIG_MLX4_EN=m
-CONFIG_MLX4_CORE=m
-CONFIG_MLX4_DEBUG=y
+CONFIG_NET_VENDOR_TEHUTI=y
 CONFIG_TEHUTI=m
-CONFIG_BNX2X=m
-CONFIG_QLCNIC=m
-CONFIG_QLGE=m
-CONFIG_BNA=m
-CONFIG_SFC=m
-CONFIG_SFC_MTD=y
-CONFIG_BE2NET=m
-# CONFIG_TR is not set
+CONFIG_NET_VENDOR_TI=y
+CONFIG_TLAN=m
+CONFIG_NET_VENDOR_VIA=y
+CONFIG_VIA_RHINE=m
+# CONFIG_VIA_RHINE_MMIO is not set
+CONFIG_VIA_VELOCITY=m
+CONFIG_NET_VENDOR_WIZNET=y
+CONFIG_WIZNET_W5100=m
+CONFIG_WIZNET_W5300=m
+# CONFIG_WIZNET_BUS_DIRECT is not set
+# CONFIG_WIZNET_BUS_INDIRECT is not set
+CONFIG_WIZNET_BUS_ANY=y
+CONFIG_NET_VENDOR_XIRCOM=y
+CONFIG_PCMCIA_XIRC2PS=m
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+CONFIG_NET_SB1000=m
+CONFIG_PHYLIB=m
+
+#
+# MII PHY device drivers
+#
+CONFIG_AT803X_PHY=m
+CONFIG_AMD_PHY=m
+CONFIG_MARVELL_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_CICADA_PHY=m
+CONFIG_VITESSE_PHY=m
+CONFIG_SMSC_PHY=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_BCM87XX_PHY=m
+CONFIG_ICPLUS_PHY=m
+CONFIG_REALTEK_PHY=m
+CONFIG_NATIONAL_PHY=m
+CONFIG_STE10XP=m
+CONFIG_LSI_ET1011C_PHY=m
+CONFIG_MICREL_PHY=m
+# CONFIG_MDIO_BITBANG is not set
+CONFIG_MDIO_BUS_MUX=m
+CONFIG_MDIO_BUS_MUX_GPIO=m
+CONFIG_MDIO_BUS_MUX_MMIOREG=m
+# CONFIG_MICREL_KS8995MA is not set
+CONFIG_PLIP=m
+CONFIG_PPP=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_MPPE=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPPOATM=m
+CONFIG_PPPOE=m
+CONFIG_PPTP=m
+CONFIG_PPPOL2TP=m
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_SLIP=m
+CONFIG_SLHC=m
+# CONFIG_SLIP_COMPRESSED is not set
+# CONFIG_SLIP_SMART is not set
+# CONFIG_SLIP_MODE_SLIP6 is not set
+
+#
+# USB Network Adapters
+#
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_RTL8152=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
+CONFIG_USB_NET_CDC_MBIM=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
+CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_NET_CX82310_ETH=m
+CONFIG_USB_NET_KALMIA=m
+CONFIG_USB_NET_QMI_WWAN=m
+CONFIG_USB_HSO=m
+CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_CDC_PHONET=m
+CONFIG_USB_IPHETH=m
+CONFIG_USB_SIERRA_NET=m
+CONFIG_USB_VL600=m
 CONFIG_WLAN=y
 CONFIG_PCMCIA_RAYCS=m
 CONFIG_LIBERTAS_THINFIRM=m
@@ -2072,6 +2445,7 @@ CONFIG_ADM8211=m
 # CONFIG_MAC80211_HWSIM is not set
 CONFIG_MWL8K=m
 CONFIG_ATH_COMMON=m
+CONFIG_ATH_CARDS=m
 # CONFIG_ATH_DEBUG is not set
 CONFIG_ATH5K=m
 # CONFIG_ATH5K_DEBUG is not set
@@ -2079,24 +2453,39 @@ CONFIG_ATH5K=m
 CONFIG_ATH5K_PCI=y
 CONFIG_ATH9K_HW=m
 CONFIG_ATH9K_COMMON=m
+CONFIG_ATH9K_BTCOEX_SUPPORT=y
 CONFIG_ATH9K=m
 CONFIG_ATH9K_PCI=y
 CONFIG_ATH9K_AHB=y
 # CONFIG_ATH9K_DEBUGFS is not set
-CONFIG_ATH9K_RATE_CONTROL=y
+# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set
 CONFIG_ATH9K_HTC=m
 # CONFIG_ATH9K_HTC_DEBUGFS is not set
 CONFIG_CARL9170=m
 CONFIG_CARL9170_LEDS=y
 CONFIG_CARL9170_WPC=y
+# CONFIG_CARL9170_HWRNG is not set
+CONFIG_ATH6KL=m
+CONFIG_ATH6KL_SDIO=m
+CONFIG_ATH6KL_USB=m
+# CONFIG_ATH6KL_DEBUG is not set
+# CONFIG_ATH6KL_TRACING is not set
+CONFIG_AR5523=m
+CONFIG_WIL6210=m
+CONFIG_WIL6210_ISR_COR=y
 CONFIG_B43=m
+CONFIG_B43_BCMA=y
+# CONFIG_B43_BCMA_EXTRA is not set
+CONFIG_B43_SSB=y
 CONFIG_B43_PCI_AUTOSELECT=y
 CONFIG_B43_PCICORE_AUTOSELECT=y
 CONFIG_B43_PCMCIA=y
 CONFIG_B43_SDIO=y
+CONFIG_B43_BCMA_PIO=y
 CONFIG_B43_PIO=y
 CONFIG_B43_PHY_N=y
 CONFIG_B43_PHY_LP=y
+CONFIG_B43_PHY_HT=y
 CONFIG_B43_LEDS=y
 CONFIG_B43_HWRNG=y
 # CONFIG_B43_DEBUG is not set
@@ -2111,6 +2500,13 @@ CONFIG_B43LEGACY_PIO=y
 CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
 # CONFIG_B43LEGACY_DMA_MODE is not set
 # CONFIG_B43LEGACY_PIO_MODE is not set
+CONFIG_BRCMUTIL=m
+CONFIG_BRCMSMAC=m
+CONFIG_BRCMFMAC=m
+CONFIG_BRCMFMAC_SDIO=y
+CONFIG_BRCMFMAC_USB=y
+# CONFIG_BRCM_TRACING is not set
+# CONFIG_BRCMDBG is not set
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
 # CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
@@ -2119,31 +2515,30 @@ CONFIG_HOSTAP_PCI=m
 CONFIG_HOSTAP_CS=m
 # CONFIG_IPW2100 is not set
 # CONFIG_IPW2200 is not set
-CONFIG_IWLAGN=m
+CONFIG_IWLWIFI=m
+CONFIG_IWLDVM=m
+CONFIG_IWLMVM=m
+CONFIG_IWLWIFI_OPMODE_MODULAR=y
 
 #
 # Debugging Options
 #
 # CONFIG_IWLWIFI_DEBUG is not set
 CONFIG_IWLWIFI_DEVICE_TRACING=y
-CONFIG_IWLWIFI_DEVICE_SVTOOL=y
-CONFIG_IWL_P2P=y
-CONFIG_IWLWIFI_LEGACY=m
+# CONFIG_IWLWIFI_P2P is not set
+CONFIG_IWLEGACY=m
+CONFIG_IWL4965=m
+CONFIG_IWL3945=m
 
 #
-# Debugging Options
+# iwl3945 / iwl4965 Debugging Options
 #
-# CONFIG_IWLWIFI_LEGACY_DEBUG is not set
-# CONFIG_IWLWIFI_LEGACY_DEVICE_TRACING is not set
-CONFIG_IWL4965=m
-CONFIG_IWL3945=m
-CONFIG_IWM=m
-# CONFIG_IWM_DEBUG is not set
-CONFIG_IWM_TRACING=y
+# CONFIG_IWLEGACY_DEBUG is not set
 CONFIG_LIBERTAS=m
 CONFIG_LIBERTAS_USB=m
 CONFIG_LIBERTAS_CS=m
 CONFIG_LIBERTAS_SDIO=m
+# CONFIG_LIBERTAS_SPI is not set
 # CONFIG_LIBERTAS_DEBUG is not set
 CONFIG_LIBERTAS_MESH=y
 CONFIG_HERMES=m
@@ -2159,6 +2554,7 @@ CONFIG_ORINOCO_USB=m
 CONFIG_P54_COMMON=m
 CONFIG_P54_USB=m
 CONFIG_P54_PCI=m
+# CONFIG_P54_SPI is not set
 CONFIG_P54_LEDS=y
 CONFIG_RT2X00=m
 CONFIG_RT2400PCI=m
@@ -2168,14 +2564,17 @@ CONFIG_RT2800PCI=m
 CONFIG_RT2800PCI_RT33XX=y
 CONFIG_RT2800PCI_RT35XX=y
 CONFIG_RT2800PCI_RT53XX=y
+CONFIG_RT2800PCI_RT3290=y
 CONFIG_RT2500USB=m
 CONFIG_RT73USB=m
 CONFIG_RT2800USB=m
 CONFIG_RT2800USB_RT33XX=y
 CONFIG_RT2800USB_RT35XX=y
 CONFIG_RT2800USB_RT53XX=y
+CONFIG_RT2800USB_RT55XX=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
@@ -2183,149 +2582,46 @@ 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_RTL8188EE=m
 CONFIG_RTL8192CU=m
-CONFIG_RTLWIFI=m
 CONFIG_RTL8192C_COMMON=m
+CONFIG_WL_TI=y
 CONFIG_WL1251=m
+# CONFIG_WL1251_SPI is not set
 CONFIG_WL1251_SDIO=m
-CONFIG_WL12XX_MENU=m
 CONFIG_WL12XX=m
-CONFIG_WL12XX_HT=y
-CONFIG_WL12XX_SDIO=m
-CONFIG_WL12XX_SDIO_TEST=m
-CONFIG_WL12XX_PLATFORM_DATA=y
+CONFIG_WL18XX=m
+CONFIG_WLCORE=m
+# CONFIG_WLCORE_SPI is not set
+CONFIG_WLCORE_SDIO=m
+CONFIG_WILINK_PLATFORM_DATA=y
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
 CONFIG_MWIFIEX=m
 CONFIG_MWIFIEX_SDIO=m
+CONFIG_MWIFIEX_PCIE=m
+CONFIG_MWIFIEX_USB=m
 
 #
 # WiMAX Wireless Broadband devices
 #
 CONFIG_WIMAX_I2400M=m
 CONFIG_WIMAX_I2400M_USB=m
-CONFIG_WIMAX_I2400M_SDIO=m
-# CONFIG_WIMAX_IWMC3200_SDIO is not set
 CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
-
-#
-# USB Network Adapters
-#
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_USBNET=m
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_CDCETHER=m
-CONFIG_USB_NET_CDC_EEM=m
-CONFIG_USB_NET_CDC_NCM=m
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_SMSC75XX=m
-CONFIG_USB_NET_SMSC95XX=m
-CONFIG_USB_NET_GL620A=m
-CONFIG_USB_NET_NET1080=m
-CONFIG_USB_NET_PLUSB=m
-CONFIG_USB_NET_MCS7830=m
-CONFIG_USB_NET_RNDIS_HOST=m
-CONFIG_USB_NET_CDC_SUBSET=m
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-CONFIG_USB_BELKIN=y
-CONFIG_USB_ARMLINUX=y
-CONFIG_USB_EPSON2888=y
-CONFIG_USB_KC2190=y
-CONFIG_USB_NET_ZAURUS=m
-CONFIG_USB_NET_CX82310_ETH=m
-CONFIG_USB_NET_KALMIA=m
-CONFIG_USB_HSO=m
-CONFIG_USB_NET_INT51X1=m
-CONFIG_USB_CDC_PHONET=m
-CONFIG_USB_IPHETH=m
-CONFIG_USB_SIERRA_NET=m
-CONFIG_USB_VL600=m
-CONFIG_NET_PCMCIA=y
-CONFIG_PCMCIA_3C589=m
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_PCMCIA_PCNET=m
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_PCMCIA_XIRC2PS=m
-CONFIG_PCMCIA_AXNET=m
 # CONFIG_WAN is not set
-CONFIG_ATM_DRIVERS=y
-# CONFIG_ATM_DUMMY is not set
-CONFIG_ATM_TCP=m
-CONFIG_ATM_LANAI=m
-CONFIG_ATM_ENI=m
-# CONFIG_ATM_ENI_DEBUG is not set
-# CONFIG_ATM_ENI_TUNE_BURST is not set
-CONFIG_ATM_FIRESTREAM=m
-CONFIG_ATM_ZATM=m
-# CONFIG_ATM_ZATM_DEBUG is not set
-CONFIG_ATM_NICSTAR=m
-# CONFIG_ATM_NICSTAR_USE_SUNI is not set
-# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
-CONFIG_ATM_IDT77252=m
-# CONFIG_ATM_IDT77252_DEBUG is not set
-# CONFIG_ATM_IDT77252_RCV_ALL is not set
-CONFIG_ATM_IDT77252_USE_SUNI=y
-CONFIG_ATM_AMBASSADOR=m
-# CONFIG_ATM_AMBASSADOR_DEBUG is not set
-CONFIG_ATM_HORIZON=m
-# CONFIG_ATM_HORIZON_DEBUG is not set
-CONFIG_ATM_IA=m
-# CONFIG_ATM_IA_DEBUG is not set
-CONFIG_ATM_FORE200E=m
-# CONFIG_ATM_FORE200E_USE_TASKLET is not set
-CONFIG_ATM_FORE200E_TX_RETRY=16
-CONFIG_ATM_FORE200E_DEBUG=0
-CONFIG_ATM_HE=m
-# CONFIG_ATM_HE_USE_SUNI is not set
-CONFIG_ATM_SOLOS=m
 CONFIG_IEEE802154_DRIVERS=m
 CONFIG_IEEE802154_FAKEHARD=m
-
-#
-# CAIF transport drivers
-#
-CONFIG_CAIF_TTY=m
-CONFIG_CAIF_SPI_SLAVE=m
-CONFIG_CAIF_SPI_SYNC=y
-CONFIG_RIONET=m
-CONFIG_RIONET_TX_SIZE=128
-CONFIG_RIONET_RX_SIZE=128
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-CONFIG_PLIP=m
-CONFIG_PPP=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_MPPE=m
-CONFIG_PPPOE=m
-CONFIG_PPTP=m
-CONFIG_PPPOATM=m
-CONFIG_PPPOL2TP=m
-CONFIG_SLIP=m
-# CONFIG_SLIP_COMPRESSED is not set
-CONFIG_SLHC=m
-# CONFIG_SLIP_SMART is not set
-# CONFIG_SLIP_MODE_SLIP6 is not set
-# CONFIG_NET_FC is not set
-CONFIG_NETCONSOLE=m
-CONFIG_NETCONSOLE_DYNAMIC=y
-CONFIG_NETPOLL=y
-# CONFIG_NETPOLL_TRAP is not set
-CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_VIRTIO_NET=m
+CONFIG_IEEE802154_FAKELB=m
+CONFIG_IEEE802154_AT86RF230=m
+# CONFIG_IEEE802154_MRF24J40 is not set
 CONFIG_VMXNET3=m
+CONFIG_HYPERV_NET=m
 CONFIG_ISDN=y
 CONFIG_ISDN_I4L=m
 CONFIG_ISDN_PPP=y
@@ -2472,7 +2768,6 @@ CONFIG_MISDN_NETJET=m
 CONFIG_MISDN_IPAC=m
 CONFIG_MISDN_ISAR=m
 CONFIG_ISDN_HDLC=m
-# CONFIG_PHONE is not set
 
 #
 # Input device support
@@ -2481,6 +2776,7 @@ CONFIG_INPUT=y
 CONFIG_INPUT_FF_MEMLESS=m
 CONFIG_INPUT_POLLDEV=m
 CONFIG_INPUT_SPARSEKMAP=m
+CONFIG_INPUT_MATRIXKMAP=m
 
 #
 # Userland interfaces
@@ -2506,8 +2802,10 @@ CONFIG_KEYBOARD_QT2160=m
 # CONFIG_KEYBOARD_GPIO is not set
 # CONFIG_KEYBOARD_GPIO_POLLED is not set
 CONFIG_KEYBOARD_TCA6416=m
+CONFIG_KEYBOARD_TCA8418=m
 CONFIG_KEYBOARD_MATRIX=m
 # CONFIG_KEYBOARD_LM8323 is not set
+CONFIG_KEYBOARD_LM8333=m
 # CONFIG_KEYBOARD_MAX7359 is not set
 CONFIG_KEYBOARD_MCS=m
 CONFIG_KEYBOARD_MPR121=m
@@ -2521,6 +2819,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
@@ -2530,6 +2829,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
@@ -2537,6 +2837,7 @@ CONFIG_MOUSE_PC110PAD=m
 CONFIG_MOUSE_VSXXXAA=m
 # CONFIG_MOUSE_GPIO is not set
 CONFIG_MOUSE_SYNAPTICS_I2C=m
+CONFIG_MOUSE_SYNAPTICS_USB=m
 CONFIG_INPUT_JOYSTICK=y
 CONFIG_JOYSTICK_ANALOG=m
 CONFIG_JOYSTICK_A3D=m
@@ -2576,33 +2877,48 @@ CONFIG_TABLET_USB_HANWANG=m
 CONFIG_TABLET_USB_KBTAB=m
 CONFIG_TABLET_USB_WACOM=m
 CONFIG_INPUT_TOUCHSCREEN=y
+# CONFIG_TOUCHSCREEN_ADS7846 is not set
+# CONFIG_TOUCHSCREEN_AD7877 is not set
 CONFIG_TOUCHSCREEN_AD7879=m
 CONFIG_TOUCHSCREEN_AD7879_I2C=m
+# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
 CONFIG_TOUCHSCREEN_ATMEL_MXT=m
+CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
 CONFIG_TOUCHSCREEN_BU21013=m
 CONFIG_TOUCHSCREEN_CY8CTMG110=m
+CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
+CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
+# CONFIG_TOUCHSCREEN_CYTTSP_SPI is not set
 CONFIG_TOUCHSCREEN_DYNAPRO=m
 CONFIG_TOUCHSCREEN_HAMPSHIRE=m
 CONFIG_TOUCHSCREEN_EETI=m
+CONFIG_TOUCHSCREEN_EGALAX=m
 CONFIG_TOUCHSCREEN_FUJITSU=m
+CONFIG_TOUCHSCREEN_ILI210X=m
 CONFIG_TOUCHSCREEN_GUNZE=m
 CONFIG_TOUCHSCREEN_ELO=m
 CONFIG_TOUCHSCREEN_WACOM_W8001=m
+CONFIG_TOUCHSCREEN_WACOM_I2C=m
 CONFIG_TOUCHSCREEN_MAX11801=m
 CONFIG_TOUCHSCREEN_MCS5000=m
+CONFIG_TOUCHSCREEN_MMS114=m
 CONFIG_TOUCHSCREEN_MTOUCH=m
 CONFIG_TOUCHSCREEN_INEXIO=m
 CONFIG_TOUCHSCREEN_MK712=m
 CONFIG_TOUCHSCREEN_HTCPEN=m
 CONFIG_TOUCHSCREEN_PENMOUNT=m
+CONFIG_TOUCHSCREEN_EDT_FT5X06=m
 CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
 CONFIG_TOUCHSCREEN_TOUCHWIN=m
+CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m
 CONFIG_TOUCHSCREEN_UCB1400=m
+CONFIG_TOUCHSCREEN_PIXCIR=m
 CONFIG_TOUCHSCREEN_WM97XX=m
 CONFIG_TOUCHSCREEN_WM9705=y
 CONFIG_TOUCHSCREEN_WM9712=y
 CONFIG_TOUCHSCREEN_WM9713=y
 CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+CONFIG_TOUCHSCREEN_MC13783=m
 CONFIG_TOUCHSCREEN_USB_EGALAX=y
 CONFIG_TOUCHSCREEN_USB_PANJIT=y
 CONFIG_TOUCHSCREEN_USB_3M=y
@@ -2615,34 +2931,49 @@ CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
 CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
 CONFIG_TOUCHSCREEN_USB_GOTOP=y
 CONFIG_TOUCHSCREEN_USB_JASTEC=y
+CONFIG_TOUCHSCREEN_USB_ELO=y
 CONFIG_TOUCHSCREEN_USB_E2I=y
 CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
 CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
 CONFIG_TOUCHSCREEN_USB_NEXIO=y
+CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
 CONFIG_TOUCHSCREEN_TOUCHIT213=m
+CONFIG_TOUCHSCREEN_TSC_SERIO=m
+# CONFIG_TOUCHSCREEN_TSC2005 is not set
 CONFIG_TOUCHSCREEN_TSC2007=m
 CONFIG_TOUCHSCREEN_ST1232=m
 CONFIG_TOUCHSCREEN_TPS6507X=m
 CONFIG_INPUT_MISC=y
-CONFIG_INPUT_AB8500_PONKEY=m
 CONFIG_INPUT_AD714X=m
 CONFIG_INPUT_AD714X_I2C=m
+CONFIG_INPUT_AD714X_SPI=m
+CONFIG_INPUT_BMA150=m
 CONFIG_INPUT_PCSPKR=m
+CONFIG_INPUT_MC13783_PWRBUTTON=m
+CONFIG_INPUT_MMA8450=m
+CONFIG_INPUT_MPU3050=m
 CONFIG_INPUT_APANEL=m
+CONFIG_INPUT_GP2A=m
+# CONFIG_INPUT_GPIO_TILT_POLLED is not set
 CONFIG_INPUT_WISTRON_BTNS=m
 CONFIG_INPUT_ATLAS_BTNS=m
-CONFIG_INPUT_ATI_REMOTE=m
 CONFIG_INPUT_ATI_REMOTE2=m
 CONFIG_INPUT_KEYSPAN_REMOTE=m
+CONFIG_INPUT_KXTJ9=m
+# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set
 CONFIG_INPUT_POWERMATE=m
 CONFIG_INPUT_YEALINK=m
 CONFIG_INPUT_CM109=m
+CONFIG_INPUT_RETU_PWRBUTTON=m
 CONFIG_INPUT_UINPUT=m
 CONFIG_INPUT_PCF50633_PMU=m
 CONFIG_INPUT_PCF8574=m
+CONFIG_INPUT_PWM_BEEPER=m
 CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
 CONFIG_INPUT_ADXL34X=m
 CONFIG_INPUT_ADXL34X_I2C=m
+CONFIG_INPUT_ADXL34X_SPI=m
+# CONFIG_INPUT_IMS_PCU is not set
 CONFIG_INPUT_CMA3000=m
 CONFIG_INPUT_CMA3000_I2C=m
 
@@ -2659,6 +2990,8 @@ CONFIG_SERIO_LIBPS2=y
 CONFIG_SERIO_RAW=m
 CONFIG_SERIO_ALTERA_PS2=m
 CONFIG_SERIO_PS2MULT=m
+CONFIG_SERIO_ARC_PS2=m
+CONFIG_SERIO_APBPS2=m
 CONFIG_GAMEPORT=m
 CONFIG_GAMEPORT_NS558=m
 CONFIG_GAMEPORT_L4=m
@@ -2668,9 +3001,11 @@ CONFIG_GAMEPORT_FM801=m
 #
 # Character devices
 #
+CONFIG_TTY=y
 CONFIG_VT=y
 CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_VT_CONSOLE=y
+CONFIG_VT_CONSOLE_SLEEP=y
 CONFIG_HW_CONSOLE=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_UNIX98_PTYS=y
@@ -2698,30 +3033,41 @@ 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_PNP=y
 CONFIG_SERIAL_8250_CS=m
 CONFIG_SERIAL_8250_NR_UARTS=32
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 # CONFIG_SERIAL_8250_EXTENDED is not set
+CONFIG_SERIAL_8250_DW=m
 
 #
 # Non-8250 serial port support
 #
+# CONFIG_SERIAL_MAX3100 is not set
+# CONFIG_SERIAL_MAX310X is not set
 CONFIG_SERIAL_MFD_HSU=m
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_SERIAL_JSM=m
 CONFIG_SERIAL_OF_PLATFORM=m
+CONFIG_SERIAL_SCCNXP=m
 # CONFIG_SERIAL_TIMBERDALE is not set
 CONFIG_SERIAL_ALTERA_JTAGUART=m
 CONFIG_SERIAL_ALTERA_UART=m
 CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
 CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
+# CONFIG_SERIAL_IFX6X60 is not set
 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
@@ -2740,6 +3086,7 @@ CONFIG_HW_RANDOM_AMD=m
 CONFIG_HW_RANDOM_GEODE=m
 CONFIG_HW_RANDOM_VIA=m
 CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_HW_RANDOM_TPM=m
 CONFIG_NVRAM=m
 CONFIG_DTLK=m
 CONFIG_R3964=m
@@ -2762,12 +3109,13 @@ CONFIG_HPET_MMAP=y
 CONFIG_HANGCHECK_TIMER=m
 CONFIG_TCG_TPM=m
 CONFIG_TCG_TIS=m
+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_RAMOOPS=m
 CONFIG_I2C=m
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_COMPAT=y
@@ -2793,6 +3141,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
@@ -2810,6 +3159,10 @@ CONFIG_I2C_SCMI=m
 #
 # I2C system bus drivers (mostly embedded / system-on-chip)
 #
+# CONFIG_I2C_CBUS_GPIO is not set
+CONFIG_I2C_DESIGNWARE_CORE=m
+CONFIG_I2C_DESIGNWARE_PCI=m
+CONFIG_I2C_EG20T=m
 # CONFIG_I2C_GPIO is not set
 CONFIG_I2C_INTEL_MID=m
 CONFIG_I2C_OCORES=m
@@ -2818,7 +3171,6 @@ CONFIG_I2C_PXA=m
 CONFIG_I2C_PXA_PCI=y
 CONFIG_I2C_SIMTEC=m
 CONFIG_I2C_XILINX=m
-CONFIG_I2C_EG20T=m
 
 #
 # External I2C/SMBus adapter drivers
@@ -2828,17 +3180,50 @@ CONFIG_I2C_PARPORT=m
 CONFIG_I2C_PARPORT_LIGHT=m
 CONFIG_I2C_TAOS_EVM=m
 CONFIG_I2C_TINY_USB=m
+CONFIG_I2C_VIPERBOARD=m
 
 #
 # Other I2C/SMBus bus drivers
 #
 CONFIG_I2C_PCA_ISA=m
-# CONFIG_I2C_STUB is not set
 CONFIG_SCx200_ACB=m
+# CONFIG_I2C_STUB is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_SPI is not set
+CONFIG_SPI=y
+# CONFIG_SPI_DEBUG is not set
+CONFIG_SPI_MASTER=y
+
+#
+# SPI Master Controller Drivers
+#
+# CONFIG_SPI_ALTERA is not set
+# CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_BUTTERFLY is not set
+# CONFIG_SPI_GPIO is not set
+# CONFIG_SPI_LM70_LLP is not set
+# CONFIG_SPI_FSL_SPI is not set
+# CONFIG_SPI_OC_TINY is not set
+# CONFIG_SPI_PXA2XX is not set
+# CONFIG_SPI_PXA2XX_PCI is not set
+# CONFIG_SPI_SC18IS602 is not set
+# CONFIG_SPI_TOPCLIFF_PCH is not set
+# CONFIG_SPI_XCOMM is not set
+# CONFIG_SPI_XILINX is not set
+# CONFIG_SPI_DESIGNWARE is not set
+
+#
+# SPI Protocol Masters
+#
+# CONFIG_SPI_SPIDEV is not set
+# CONFIG_SPI_TLE62X0 is not set
+
+#
+# Qualcomm MSM SSBI bus support
+#
+# CONFIG_SSBI is not set
+# CONFIG_HSI is not set
 
 #
 # PPS support
@@ -2852,6 +3237,7 @@ CONFIG_PPS=m
 CONFIG_PPS_CLIENT_KTIMER=m
 CONFIG_PPS_CLIENT_LDISC=m
 CONFIG_PPS_CLIENT_PARPORT=m
+CONFIG_PPS_CLIENT_GPIO=m
 
 #
 # PPS generators support
@@ -2862,41 +3248,56 @@ CONFIG_PPS_CLIENT_PARPORT=m
 #
 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
 # CONFIG_DEBUG_GPIO is not set
 CONFIG_GPIO_SYSFS=y
 
 #
 # Memory mapped GPIO drivers:
 #
-CONFIG_GPIO_BASIC_MMIO_CORE=m
-CONFIG_GPIO_BASIC_MMIO=m
+# CONFIG_GPIO_GENERIC_PLATFORM is not set
 # CONFIG_GPIO_IT8761E is not set
+# CONFIG_GPIO_TS5500 is not set
 CONFIG_GPIO_SCH=m
+CONFIG_GPIO_ICH=m
 # CONFIG_GPIO_VX855 is not set
+# CONFIG_GPIO_LYNXPOINT is not set
+# CONFIG_GPIO_GRGPIO is not set
 
 #
 # I2C GPIO expanders:
 #
+CONFIG_GPIO_ARIZONA=m
 # CONFIG_GPIO_MAX7300 is not set
 # CONFIG_GPIO_MAX732X is not set
 # CONFIG_GPIO_PCA953X is not set
 # CONFIG_GPIO_PCF857X is not set
 # CONFIG_GPIO_ADP5588 is not set
+# CONFIG_GPIO_ADNP is not set
 
 #
 # PCI GPIO expanders:
 #
-CONFIG_GPIO_CS5535=m
+CONFIG_GPIO_CS5535=y
+CONFIG_GPIO_AMD8111=m
 # CONFIG_GPIO_LANGWELL is not set
 # CONFIG_GPIO_PCH is not set
 # CONFIG_GPIO_ML_IOH is not set
+# CONFIG_GPIO_SODAVILLE is not set
 # CONFIG_GPIO_RDC321X is not set
 
 #
 # SPI GPIO expanders:
 #
+# CONFIG_GPIO_MAX7301 is not set
+# CONFIG_GPIO_MCP23S08 is not set
+# CONFIG_GPIO_MC33880 is not set
+# CONFIG_GPIO_74X164 is not set
 
 #
 # AC97 GPIO expanders:
@@ -2906,22 +3307,35 @@ CONFIG_GPIO_UCB1400=y
 #
 # MODULbus GPIO expanders:
 #
+
+#
+# USB GPIO expanders:
+#
+CONFIG_GPIO_VIPERBOARD=m
 # CONFIG_W1 is not set
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 CONFIG_PDA_POWER=m
 CONFIG_TEST_POWER=m
 # CONFIG_BATTERY_DS2780 is not set
+# CONFIG_BATTERY_DS2781 is not set
 # CONFIG_BATTERY_DS2782 is not set
-# CONFIG_BATTERY_OLPC is not set
-# CONFIG_BATTERY_BQ20Z75 is not set
+CONFIG_BATTERY_OLPC=m
+# CONFIG_BATTERY_SBS is not set
 # CONFIG_BATTERY_BQ27x00 is not set
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
 # CONFIG_CHARGER_PCF50633 is not set
 # CONFIG_CHARGER_ISP1704 is not set
 # CONFIG_CHARGER_MAX8903 is not set
+# CONFIG_CHARGER_LP8727 is not set
 # 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
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
@@ -2931,14 +3345,19 @@ CONFIG_HWMON_VID=m
 #
 CONFIG_SENSORS_ABITUGURU=m
 CONFIG_SENSORS_ABITUGURU3=m
+# CONFIG_SENSORS_AD7314 is not set
 CONFIG_SENSORS_AD7414=m
 CONFIG_SENSORS_AD7418=m
+# CONFIG_SENSORS_ADCXX is not set
 CONFIG_SENSORS_ADM1021=m
 CONFIG_SENSORS_ADM1025=m
 CONFIG_SENSORS_ADM1026=m
 CONFIG_SENSORS_ADM1029=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_ADT7X10=m
+CONFIG_SENSORS_ADT7310=m
+CONFIG_SENSORS_ADT7410=m
 CONFIG_SENSORS_ADT7411=m
 CONFIG_SENSORS_ADT7462=m
 CONFIG_SENSORS_ADT7470=m
@@ -2960,6 +3379,7 @@ CONFIG_SENSORS_G760A=m
 CONFIG_SENSORS_GL518SM=m
 CONFIG_SENSORS_GL520SM=m
 # CONFIG_SENSORS_GPIO_FAN is not set
+CONFIG_SENSORS_HIH6130=m
 CONFIG_SENSORS_CORETEMP=m
 CONFIG_SENSORS_IBMAEM=m
 CONFIG_SENSORS_IBMPEX=m
@@ -2967,6 +3387,7 @@ CONFIG_SENSORS_IT87=m
 CONFIG_SENSORS_JC42=m
 CONFIG_SENSORS_LINEAGE=m
 CONFIG_SENSORS_LM63=m
+# CONFIG_SENSORS_LM70 is not set
 CONFIG_SENSORS_LM73=m
 CONFIG_SENSORS_LM75=m
 CONFIG_SENSORS_LM77=m
@@ -2982,23 +3403,34 @@ CONFIG_SENSORS_LTC4151=m
 CONFIG_SENSORS_LTC4215=m
 CONFIG_SENSORS_LTC4245=m
 CONFIG_SENSORS_LTC4261=m
+CONFIG_SENSORS_LM95234=m
 CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_LM95245=m
+# CONFIG_SENSORS_MAX1111 is not set
 CONFIG_SENSORS_MAX16065=m
 CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX1668=m
+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_NCT6775=m
 CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PC87427=m
 CONFIG_SENSORS_PCF8591=m
 CONFIG_PMBUS=m
 CONFIG_SENSORS_PMBUS=m
 CONFIG_SENSORS_ADM1275=m
+CONFIG_SENSORS_LM25066=m
+CONFIG_SENSORS_LTC2978=m
 CONFIG_SENSORS_MAX16064=m
 CONFIG_SENSORS_MAX34440=m
 CONFIG_SENSORS_MAX8688=m
 CONFIG_SENSORS_UCD9000=m
 CONFIG_SENSORS_UCD9200=m
+CONFIG_SENSORS_ZL6100=m
 CONFIG_SENSORS_SHT15=m
 CONFIG_SENSORS_SHT21=m
 CONFIG_SENSORS_SIS5595=m
@@ -3010,10 +3442,15 @@ CONFIG_SENSORS_EMC6W201=m
 CONFIG_SENSORS_SMSC47M1=m
 CONFIG_SENSORS_SMSC47M192=m
 CONFIG_SENSORS_SMSC47B397=m
+CONFIG_SENSORS_SCH56XX_COMMON=m
 CONFIG_SENSORS_SCH5627=m
+CONFIG_SENSORS_SCH5636=m
 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
 CONFIG_SENSORS_TMP401=m
@@ -3033,6 +3470,7 @@ CONFIG_SENSORS_W83L786NG=m
 CONFIG_SENSORS_W83627HF=m
 CONFIG_SENSORS_W83627EHF=m
 CONFIG_SENSORS_APPLESMC=m
+CONFIG_SENSORS_MC13783_ADC=m
 
 #
 # ACPI drivers
@@ -3041,13 +3479,24 @@ CONFIG_SENSORS_ACPI_POWER=m
 CONFIG_SENSORS_ATK0110=m
 CONFIG_THERMAL=y
 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_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
 
 #
 # Watchdog Device Drivers
 #
 CONFIG_SOFT_WATCHDOG=m
+CONFIG_RETU_WATCHDOG=m
 CONFIG_ACQUIRE_WDT=m
 CONFIG_ADVANTECH_WDT=m
 CONFIG_ALIM1535_WDT=m
@@ -3062,6 +3511,7 @@ CONFIG_IB700_WDT=m
 CONFIG_IBMASR=m
 CONFIG_WAFER_WDT=m
 CONFIG_I6300ESB_WDT=m
+CONFIG_IE6XX_WDT=m
 CONFIG_ITCO_WDT=m
 CONFIG_ITCO_VENDOR_SUPPORT=y
 CONFIG_IT8712F_WDT=m
@@ -3077,6 +3527,7 @@ CONFIG_SBC7240_WDT=m
 CONFIG_CPU5_WDT=m
 CONFIG_SMSC_SCH311X_WDT=m
 CONFIG_SMSC37B787_WDT=m
+CONFIG_VIA_WDT=m
 CONFIG_W83627HF_WDT=m
 CONFIG_W83697HF_WDT=m
 CONFIG_W83697UG_WDT=m
@@ -3120,67 +3571,121 @@ CONFIG_SSB_SDIOHOST=y
 # CONFIG_SSB_DEBUG is not set
 CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
 CONFIG_SSB_DRIVER_PCICORE=y
+CONFIG_SSB_DRIVER_GPIO=y
 CONFIG_BCMA_POSSIBLE=y
 
 #
 # Broadcom specific AMBA
 #
 CONFIG_BCMA=m
+CONFIG_BCMA_BLOCKIO=y
 CONFIG_BCMA_HOST_PCI_POSSIBLE=y
 CONFIG_BCMA_HOST_PCI=y
+CONFIG_BCMA_DRIVER_GMAC_CMN=y
+CONFIG_BCMA_DRIVER_GPIO=y
 # CONFIG_BCMA_DEBUG is not set
-CONFIG_MFD_SUPPORT=y
+
+#
+# Multifunction device drivers
+#
 CONFIG_MFD_CORE=y
-CONFIG_MFD_SM501=m
-CONFIG_MFD_SM501_GPIO=y
+CONFIG_MFD_CS5535=m
+# CONFIG_MFD_CROS_EC is not set
+# CONFIG_MFD_DA9052_SPI is not set
+CONFIG_MFD_MC13783=m
+CONFIG_MFD_MC13XXX=m
+# CONFIG_MFD_MC13XXX_SPI is not set
+CONFIG_MFD_MC13XXX_I2C=m
 CONFIG_HTC_PASIC3=m
-CONFIG_UCB1400_CORE=m
-# CONFIG_TPS6105X is not set
-CONFIG_TPS65010=m
-CONFIG_TPS6507X=m
-# CONFIG_MFD_TMIO is not set
-CONFIG_MFD_WM8400=m
+CONFIG_LPC_ICH=m
+CONFIG_LPC_SCH=m
+# CONFIG_MFD_JANZ_CMODIO is not set
+# CONFIG_EZX_PCAP is not set
+CONFIG_MFD_VIPERBOARD=m
+CONFIG_MFD_RETU=m
 CONFIG_MFD_PCF50633=m
 CONFIG_PCF50633_ADC=m
 CONFIG_PCF50633_GPIO=m
+CONFIG_UCB1400_CORE=m
+CONFIG_MFD_RDC321X=m
+CONFIG_MFD_RTSX_PCI=m
+CONFIG_MFD_SI476X_CORE=m
+CONFIG_MFD_SM501=m
+CONFIG_MFD_SM501_GPIO=y
 CONFIG_ABX500_CORE=y
-CONFIG_AB8500_CORE=y
-# CONFIG_AB8500_DEBUG is not set
-CONFIG_MFD_CS5535=m
+# CONFIG_MFD_STMPE is not set
+# CONFIG_MFD_SYSCON is not set
+CONFIG_MFD_TI_AM335X_TSCADC=m
+# CONFIG_TPS6105X is not set
+CONFIG_TPS65010=m
+CONFIG_TPS6507X=m
+CONFIG_MFD_TPS65217=m
+# CONFIG_MFD_TPS65912 is not set
+# CONFIG_MFD_TPS65912_SPI is not set
+CONFIG_MFD_WL1273_CORE=m
+CONFIG_MFD_LM3533=m
 # CONFIG_MFD_TIMBERDALE is not set
-CONFIG_LPC_SCH=m
-CONFIG_MFD_RDC321X=m
-# CONFIG_MFD_JANZ_CMODIO is not set
+# CONFIG_MFD_TMIO is not set
 CONFIG_MFD_VX855=m
-CONFIG_MFD_WL1273_CORE=m
+CONFIG_MFD_ARIZONA=y
+CONFIG_MFD_ARIZONA_I2C=m
+# CONFIG_MFD_ARIZONA_SPI is not set
+CONFIG_MFD_WM5102=y
+CONFIG_MFD_WM5110=y
+# CONFIG_MFD_WM831X_SPI is not set
 # CONFIG_REGULATOR is not set
 CONFIG_MEDIA_SUPPORT=m
 
 #
 # Multimedia core support
 #
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
+CONFIG_MEDIA_RADIO_SUPPORT=y
+CONFIG_MEDIA_RC_SUPPORT=y
 CONFIG_MEDIA_CONTROLLER=y
 CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L2_COMMON=m
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
+CONFIG_VIDEO_V4L2=m
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+CONFIG_VIDEO_TUNER=m
+CONFIG_V4L2_MEM2MEM_DEV=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_DMA_SG=m
+CONFIG_VIDEOBUF_VMALLOC=m
+CONFIG_VIDEOBUF_DVB=m
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_DMA_CONTIG=m
+CONFIG_VIDEOBUF2_VMALLOC=m
+CONFIG_VIDEOBUF2_DMA_SG=m
+# CONFIG_VIDEO_V4L2_INT_DEVICE is not set
 CONFIG_DVB_CORE=m
-CONFIG_VIDEO_MEDIA=m
+CONFIG_DVB_NET=y
+CONFIG_TTPCI_EEPROM=m
+CONFIG_DVB_MAX_ADAPTERS=8
+# CONFIG_DVB_DYNAMIC_MINORS is not set
 
 #
-# Multimedia drivers
+# Media drivers
 #
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
 CONFIG_RC_CORE=m
-CONFIG_LIRC=m
 CONFIG_RC_MAP=m
+CONFIG_RC_DECODERS=y
+CONFIG_LIRC=m
+CONFIG_IR_LIRC_CODEC=m
 CONFIG_IR_NEC_DECODER=m
 CONFIG_IR_RC5_DECODER=m
 CONFIG_IR_RC6_DECODER=m
 CONFIG_IR_JVC_DECODER=m
 CONFIG_IR_SONY_DECODER=m
 CONFIG_IR_RC5_SZ_DECODER=m
-CONFIG_IR_LIRC_CODEC=m
+CONFIG_IR_SANYO_DECODER=m
+CONFIG_IR_MCE_KBD_DECODER=m
+CONFIG_RC_DEVICES=y
+CONFIG_RC_ATI_REMOTE=m
 CONFIG_IR_ENE=m
 CONFIG_IR_IMON=m
 CONFIG_IR_MCEUSB=m
@@ -3190,190 +3695,15 @@ CONFIG_IR_NUVOTON=m
 CONFIG_IR_REDRAT3=m
 CONFIG_IR_STREAMZAP=m
 CONFIG_IR_WINBOND_CIR=m
+CONFIG_IR_IGUANA=m
+CONFIG_IR_TTUSBIR=m
 CONFIG_RC_LOOPBACK=m
-CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_TUNER=m
-# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_TEA5761=m
-CONFIG_MEDIA_TUNER_TEA5767=m
-CONFIG_MEDIA_TUNER_MT20XX=m
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2266=m
-CONFIG_MEDIA_TUNER_MT2131=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC5000=m
-CONFIG_MEDIA_TUNER_MXL5005S=m
-CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=m
-CONFIG_MEDIA_TUNER_MAX2165=m
-CONFIG_MEDIA_TUNER_TDA18218=m
-CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEOBUF_DMA_CONTIG=m
-CONFIG_VIDEOBUF_DVB=m
-CONFIG_VIDEO_BTCX=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_VIDEO_TUNER=m
-CONFIG_V4L2_MEM2MEM_DEV=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_VMALLOC=m
-CONFIG_VIDEO_CAPTURE_DRIVERS=y
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
-CONFIG_VIDEO_IR_I2C=m
-
-#
-# Encoders, decoders, sensors and other helper chips
-#
+CONFIG_IR_GPIO_CIR=m
+CONFIG_MEDIA_USB_SUPPORT=y
 
 #
-# Audio decoders, processors and mixers
+# Webcam devices
 #
-CONFIG_VIDEO_TVAUDIO=m
-CONFIG_VIDEO_TDA7432=m
-CONFIG_VIDEO_TDA9840=m
-CONFIG_VIDEO_TEA6415C=m
-CONFIG_VIDEO_TEA6420=m
-CONFIG_VIDEO_MSP3400=m
-CONFIG_VIDEO_CS5345=m
-CONFIG_VIDEO_CS53L32A=m
-CONFIG_VIDEO_TLV320AIC23B=m
-CONFIG_VIDEO_WM8775=m
-CONFIG_VIDEO_WM8739=m
-CONFIG_VIDEO_VP27SMPX=m
-
-#
-# RDS decoders
-#
-CONFIG_VIDEO_SAA6588=m
-
-#
-# Video decoders
-#
-CONFIG_VIDEO_ADV7180=m
-CONFIG_VIDEO_BT819=m
-CONFIG_VIDEO_BT856=m
-CONFIG_VIDEO_BT866=m
-CONFIG_VIDEO_KS0127=m
-CONFIG_VIDEO_SAA7110=m
-CONFIG_VIDEO_SAA711X=m
-CONFIG_VIDEO_SAA7191=m
-CONFIG_VIDEO_TVP514X=m
-CONFIG_VIDEO_TVP5150=m
-CONFIG_VIDEO_TVP7002=m
-CONFIG_VIDEO_VPX3220=m
-
-#
-# Video and audio decoders
-#
-CONFIG_VIDEO_SAA717X=m
-CONFIG_VIDEO_CX25840=m
-
-#
-# MPEG video encoders
-#
-CONFIG_VIDEO_CX2341X=m
-
-#
-# Video encoders
-#
-CONFIG_VIDEO_SAA7127=m
-CONFIG_VIDEO_SAA7185=m
-CONFIG_VIDEO_ADV7170=m
-CONFIG_VIDEO_ADV7175=m
-CONFIG_VIDEO_ADV7343=m
-CONFIG_VIDEO_AK881X=m
-
-#
-# Camera sensor devices
-#
-CONFIG_VIDEO_OV7670=m
-CONFIG_VIDEO_MT9V011=m
-CONFIG_VIDEO_MT9V032=m
-CONFIG_VIDEO_TCM825X=m
-
-#
-# Video improvement chips
-#
-CONFIG_VIDEO_UPD64031A=m
-CONFIG_VIDEO_UPD64083=m
-
-#
-# Miscelaneous helper chips
-#
-CONFIG_VIDEO_THS7303=m
-CONFIG_VIDEO_M52790=m
-CONFIG_VIDEO_VIVI=m
-CONFIG_VIDEO_BT848=m
-CONFIG_VIDEO_BT848_DVB=y
-CONFIG_VIDEO_PMS=m
-CONFIG_VIDEO_BWQCAM=m
-CONFIG_VIDEO_CQCAM=m
-CONFIG_VIDEO_W9966=m
-CONFIG_VIDEO_CPIA2=m
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_ZR36060=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN_AVS6EYES=m
-CONFIG_VIDEO_MEYE=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7134_ALSA=m
-CONFIG_VIDEO_SAA7134_RC=y
-CONFIG_VIDEO_SAA7134_DVB=m
-CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_TIMBERDALE=m
-CONFIG_VIDEO_CX88=m
-CONFIG_VIDEO_CX88_ALSA=m
-CONFIG_VIDEO_CX88_BLACKBIRD=m
-CONFIG_VIDEO_CX88_DVB=m
-CONFIG_VIDEO_CX88_MPEG=m
-CONFIG_VIDEO_CX88_VP3054=m
-CONFIG_VIDEO_CX23885=m
-CONFIG_MEDIA_ALTERA_CI=m
-CONFIG_VIDEO_AU0828=m
-CONFIG_VIDEO_IVTV=m
-CONFIG_VIDEO_FB_IVTV=m
-CONFIG_VIDEO_CX18=m
-CONFIG_VIDEO_CX18_ALSA=m
-CONFIG_VIDEO_SAA7164=m
-CONFIG_VIDEO_CAFE_CCIC=m
-CONFIG_VIDEO_SR030PC30=m
-CONFIG_VIDEO_VIA_CAMERA=m
-CONFIG_VIDEO_NOON010PC30=m
-CONFIG_VIDEO_M5MOLS=m
-CONFIG_SOC_CAMERA=m
-CONFIG_SOC_CAMERA_IMX074=m
-CONFIG_SOC_CAMERA_MT9M001=m
-CONFIG_SOC_CAMERA_MT9M111=m
-CONFIG_SOC_CAMERA_MT9T031=m
-CONFIG_SOC_CAMERA_MT9T112=m
-CONFIG_SOC_CAMERA_MT9V022=m
-CONFIG_SOC_CAMERA_RJ54N1=m
-CONFIG_SOC_CAMERA_TW9910=m
-CONFIG_SOC_CAMERA_PLATFORM=m
-CONFIG_SOC_CAMERA_OV2640=m
-CONFIG_SOC_CAMERA_OV6650=m
-CONFIG_SOC_CAMERA_OV772X=m
-CONFIG_SOC_CAMERA_OV9640=m
-CONFIG_SOC_CAMERA_OV9740=m
-CONFIG_V4L_USB_DRIVERS=y
 CONFIG_USB_VIDEO_CLASS=m
 CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
 CONFIG_USB_GSPCA=m
@@ -3386,6 +3716,7 @@ CONFIG_USB_GSPCA_CPIA1=m
 CONFIG_USB_GSPCA_ETOMS=m
 CONFIG_USB_GSPCA_FINEPIX=m
 CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_JL2005BCD=m
 CONFIG_USB_GSPCA_KINECT=m
 CONFIG_USB_GSPCA_KONICA=m
 CONFIG_USB_GSPCA_MARS=m
@@ -3397,6 +3728,7 @@ CONFIG_USB_GSPCA_OV534_9=m
 CONFIG_USB_GSPCA_PAC207=m
 CONFIG_USB_GSPCA_PAC7302=m
 CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SE401=m
 CONFIG_USB_GSPCA_SN9C2028=m
 CONFIG_USB_GSPCA_SN9C20X=m
 CONFIG_USB_GSPCA_SONIXB=m
@@ -3415,83 +3747,49 @@ CONFIG_USB_GSPCA_STK014=m
 CONFIG_USB_GSPCA_STV0680=m
 CONFIG_USB_GSPCA_SUNPLUS=m
 CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TOPRO=m
 CONFIG_USB_GSPCA_TV8532=m
 CONFIG_USB_GSPCA_VC032X=m
 CONFIG_USB_GSPCA_VICAM=m
 CONFIG_USB_GSPCA_XIRLINK_CIT=m
 CONFIG_USB_GSPCA_ZC3XX=m
-CONFIG_VIDEO_PVRUSB2=m
-CONFIG_VIDEO_PVRUSB2_SYSFS=y
-CONFIG_VIDEO_PVRUSB2_DVB=y
-# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
-CONFIG_VIDEO_HDPVR=m
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_TLG2300=m
-CONFIG_VIDEO_CX231XX=m
-CONFIG_VIDEO_CX231XX_RC=y
-CONFIG_VIDEO_CX231XX_ALSA=m
-CONFIG_VIDEO_CX231XX_DVB=m
-CONFIG_VIDEO_USBVISION=m
-CONFIG_USB_ET61X251=m
-CONFIG_USB_SN9C102=m
 CONFIG_USB_PWC=m
 # CONFIG_USB_PWC_DEBUG is not set
 CONFIG_USB_PWC_INPUT_EVDEV=y
+CONFIG_VIDEO_CPIA2=m
 CONFIG_USB_ZR364XX=m
 CONFIG_USB_STKWEBCAM=m
 CONFIG_USB_S2255=m
-CONFIG_V4L_MEM2MEM_DRIVERS=y
-CONFIG_VIDEO_MEM2MEM_TESTDEV=m
-CONFIG_RADIO_ADAPTERS=y
-CONFIG_RADIO_CADET=m
-CONFIG_RADIO_RTRACK=m
-CONFIG_RADIO_RTRACK2=m
-CONFIG_RADIO_AZTECH=m
-CONFIG_RADIO_GEMTEK=m
-CONFIG_RADIO_MAXIRADIO=m
-CONFIG_RADIO_MIROPCM20=m
-CONFIG_RADIO_SF16FMI=m
-CONFIG_RADIO_SF16FMR2=m
-CONFIG_RADIO_TERRATEC=m
-CONFIG_RADIO_TRUST=m
-CONFIG_RADIO_TYPHOON=m
-CONFIG_RADIO_ZOLTRIX=m
-CONFIG_I2C_SI4713=m
-CONFIG_RADIO_SI4713=m
-CONFIG_USB_DSBR=m
-CONFIG_RADIO_SI470X=y
-CONFIG_USB_SI470X=m
-CONFIG_I2C_SI470X=m
-CONFIG_USB_MR800=m
-CONFIG_RADIO_TEA5764=m
-CONFIG_RADIO_SAA7706H=m
-CONFIG_RADIO_TEF6862=m
-CONFIG_RADIO_WL1273=m
+CONFIG_USB_SN9C102=m
 
 #
-# Texas Instruments WL128x FM driver (ST based)
+# Analog TV USB devices
 #
-CONFIG_RADIO_WL128X=m
-CONFIG_DVB_MAX_ADAPTERS=8
-# CONFIG_DVB_DYNAMIC_MINORS is not set
-CONFIG_DVB_CAPTURE_DRIVERS=y
+CONFIG_VIDEO_PVRUSB2=m
+CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_PVRUSB2_DVB=y
+# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
+CONFIG_VIDEO_HDPVR=m
+CONFIG_VIDEO_TLG2300=m
+CONFIG_VIDEO_USBVISION=m
+CONFIG_VIDEO_STK1160=m
+CONFIG_VIDEO_STK1160_AC97=y
 
 #
-# Supported SAA7146 based PCI Adapters
+# Analog/digital TV USB devices
 #
-CONFIG_TTPCI_EEPROM=m
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
-CONFIG_DVB_BUDGET_CORE=m
-CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_CI=m
-CONFIG_DVB_BUDGET_AV=m
-CONFIG_DVB_BUDGET_PATCH=m
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_AU0828_V4L2=y
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_RC=y
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
+CONFIG_VIDEO_TM6000=m
+CONFIG_VIDEO_TM6000_ALSA=m
+CONFIG_VIDEO_TM6000_DVB=m
 
 #
-# Supported USB Adapters
+# Digital TV USB devices
 #
 CONFIG_DVB_USB=m
 # CONFIG_DVB_USB_DEBUG is not set
@@ -3503,8 +3801,6 @@ CONFIG_DVB_USB_DIB0700=m
 CONFIG_DVB_USB_UMT_010=m
 CONFIG_DVB_USB_CXUSB=m
 CONFIG_DVB_USB_M920X=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_AU6610=m
 CONFIG_DVB_USB_DIGITV=m
 CONFIG_DVB_USB_VP7045=m
 CONFIG_DVB_USB_VP702X=m
@@ -3515,77 +3811,280 @@ CONFIG_DVB_USB_DTT200U=m
 CONFIG_DVB_USB_OPERA1=m
 CONFIG_DVB_USB_AF9005=m
 CONFIG_DVB_USB_AF9005_REMOTE=m
+CONFIG_DVB_USB_PCTV452E=m
 CONFIG_DVB_USB_DW2102=m
 CONFIG_DVB_USB_CINERGY_T2=m
-CONFIG_DVB_USB_ANYSEE=m
 CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_FRIIO=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_USB_V2=m
 CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_AF9035=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_AZ6007=m
 CONFIG_DVB_USB_CE6230=m
-CONFIG_DVB_USB_FRIIO=m
 CONFIG_DVB_USB_EC168=m
-CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_IT913X=m
 CONFIG_DVB_USB_LME2510=m
-CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_USB_MXL111SF=m
+CONFIG_DVB_USB_RTL28XXU=m
 CONFIG_DVB_TTUSB_BUDGET=m
 CONFIG_DVB_TTUSB_DEC=m
-CONFIG_SMS_SIANO_MDTV=m
+CONFIG_SMS_USB_DRV=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
 
 #
-# Siano module components
+# Webcam, TV (analog/digital) USB devices
 #
-CONFIG_SMS_USB_DRV=m
-CONFIG_SMS_SDIO_DRV=m
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_EM28XX_RC=m
+CONFIG_MEDIA_PCI_SUPPORT=y
 
 #
-# Supported FlexCopII (B2C2) Adapters
+# Media capture support
 #
-CONFIG_DVB_B2C2_FLEXCOP=m
-CONFIG_DVB_B2C2_FLEXCOP_PCI=m
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set
+CONFIG_VIDEO_MEYE=m
+
+#
+# Media capture/analog TV support
+#
+CONFIG_VIDEO_IVTV=m
+CONFIG_VIDEO_IVTV_ALSA=m
+CONFIG_VIDEO_FB_IVTV=m
+CONFIG_VIDEO_ZORAN=m
+CONFIG_VIDEO_ZORAN_DC30=m
+CONFIG_VIDEO_ZORAN_ZR36060=m
+CONFIG_VIDEO_ZORAN_BUZ=m
+CONFIG_VIDEO_ZORAN_DC10=m
+CONFIG_VIDEO_ZORAN_LML33=m
+CONFIG_VIDEO_ZORAN_LML33R10=m
+CONFIG_VIDEO_ZORAN_AVS6EYES=m
+CONFIG_VIDEO_HEXIUM_GEMINI=m
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_MXB=m
 
 #
-# Supported BT878 Adapters
+# Media capture/analog/hybrid TV support
 #
+CONFIG_VIDEO_CX18=m
+CONFIG_VIDEO_CX18_ALSA=m
+CONFIG_VIDEO_CX23885=m
+CONFIG_MEDIA_ALTERA_CI=m
+CONFIG_VIDEO_CX25821=m
+CONFIG_VIDEO_CX25821_ALSA=m
+CONFIG_VIDEO_CX88=m
+CONFIG_VIDEO_CX88_ALSA=m
+CONFIG_VIDEO_CX88_BLACKBIRD=m
+CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_VP3054=m
+CONFIG_VIDEO_CX88_MPEG=m
+CONFIG_VIDEO_BT848=m
 CONFIG_DVB_BT8XX=m
+CONFIG_VIDEO_SAA7134=m
+CONFIG_VIDEO_SAA7134_ALSA=m
+CONFIG_VIDEO_SAA7134_RC=y
+CONFIG_VIDEO_SAA7134_DVB=m
+CONFIG_VIDEO_SAA7164=m
 
 #
-# Supported Pluto2 Adapters
+# Media digital TV PCI Adapters
 #
+CONFIG_DVB_AV7110=m
+CONFIG_DVB_AV7110_OSD=y
+CONFIG_DVB_BUDGET_CORE=m
+CONFIG_DVB_BUDGET=m
+CONFIG_DVB_BUDGET_CI=m
+CONFIG_DVB_BUDGET_AV=m
+CONFIG_DVB_BUDGET_PATCH=m
+CONFIG_DVB_B2C2_FLEXCOP_PCI=m
+# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
 CONFIG_DVB_PLUTO2=m
+CONFIG_DVB_DM1105=m
+CONFIG_DVB_PT1=m
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
+CONFIG_DVB_HOPPER=m
+CONFIG_DVB_NGENE=m
+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
 
 #
-# Supported SDMC DM1105 Adapters
+# Supported MMC/SDIO adapters
 #
-CONFIG_DVB_DM1105=m
+CONFIG_SMS_SDIO_DRV=m
+CONFIG_MEDIA_PARPORT_SUPPORT=y
+CONFIG_VIDEO_BWQCAM=m
+CONFIG_VIDEO_CQCAM=m
+CONFIG_VIDEO_PMS=m
+CONFIG_VIDEO_W9966=m
+CONFIG_RADIO_ADAPTERS=y
+CONFIG_RADIO_SI470X=y
+CONFIG_USB_SI470X=m
+CONFIG_I2C_SI470X=m
+CONFIG_USB_MR800=m
+CONFIG_USB_DSBR=m
+CONFIG_RADIO_MAXIRADIO=m
+CONFIG_RADIO_SHARK=m
+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
+CONFIG_RADIO_WL1273=m
+
+#
+# Texas Instruments WL128x FM driver (ST based)
+#
+CONFIG_RADIO_WL128X=m
+# CONFIG_V4L_RADIO_ISA_DRIVERS is not set
 
 #
 # Supported FireWire (IEEE 1394) Adapters
 #
 CONFIG_DVB_FIREDTV=m
 CONFIG_DVB_FIREDTV_INPUT=y
+CONFIG_MEDIA_COMMON_OPTIONS=y
 
 #
-# Supported Earthsoft PT1 Adapters
+# common driver options
 #
-CONFIG_DVB_PT1=m
+CONFIG_VIDEO_CX2341X=m
+CONFIG_VIDEO_BTCX=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_CYPRESS_FIRMWARE=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_SMS_SIANO_DEBUGFS is not set
 
 #
-# Supported Mantis Adapters
+# Media ancillary drivers (tuners, sensors, i2c, frontends)
 #
-CONFIG_MANTIS_CORE=m
-CONFIG_DVB_MANTIS=m
-CONFIG_DVB_HOPPER=m
+CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
+CONFIG_MEDIA_ATTACH=y
+CONFIG_VIDEO_IR_I2C=m
 
 #
-# Supported nGene Adapters
+# Audio decoders, processors and mixers
 #
-CONFIG_DVB_NGENE=m
+CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_TDA9840=m
+CONFIG_VIDEO_TEA6415C=m
+CONFIG_VIDEO_TEA6420=m
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_CS5345=m
+CONFIG_VIDEO_CS53L32A=m
+CONFIG_VIDEO_UDA1342=m
+CONFIG_VIDEO_WM8775=m
+CONFIG_VIDEO_WM8739=m
+CONFIG_VIDEO_VP27SMPX=m
+CONFIG_VIDEO_SONY_BTF_MPX=m
 
 #
-# Supported DVB Frontends
+# RDS decoders
 #
-# CONFIG_DVB_FE_CUSTOMISE is not set
+CONFIG_VIDEO_SAA6588=m
+
+#
+# Video decoders
+#
+CONFIG_VIDEO_BT819=m
+CONFIG_VIDEO_BT856=m
+CONFIG_VIDEO_BT866=m
+CONFIG_VIDEO_KS0127=m
+CONFIG_VIDEO_SAA7110=m
+CONFIG_VIDEO_SAA711X=m
+CONFIG_VIDEO_TVP5150=m
+CONFIG_VIDEO_TW2804=m
+CONFIG_VIDEO_TW9903=m
+CONFIG_VIDEO_TW9906=m
+CONFIG_VIDEO_VPX3220=m
+
+#
+# Video and audio decoders
+#
+CONFIG_VIDEO_SAA717X=m
+CONFIG_VIDEO_CX25840=m
+
+#
+# Video encoders
+#
+CONFIG_VIDEO_SAA7127=m
+CONFIG_VIDEO_SAA7185=m
+CONFIG_VIDEO_ADV7170=m
+CONFIG_VIDEO_ADV7175=m
+
+#
+# Camera sensor devices
+#
+CONFIG_VIDEO_OV7640=m
+CONFIG_VIDEO_MT9V011=m
+
+#
+# Flash devices
+#
+
+#
+# Video improvement chips
+#
+CONFIG_VIDEO_UPD64031A=m
+CONFIG_VIDEO_UPD64083=m
+
+#
+# Miscelaneous helper chips
+#
+CONFIG_VIDEO_M52790=m
+
+#
+# Sensors used on soc_camera driver
+#
+CONFIG_MEDIA_TUNER=m
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_MT2060=m
+CONFIG_MEDIA_TUNER_MT2063=m
+CONFIG_MEDIA_TUNER_MT2266=m
+CONFIG_MEDIA_TUNER_MT2131=m
+CONFIG_MEDIA_TUNER_QT1010=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
+CONFIG_MEDIA_TUNER_MXL5005S=m
+CONFIG_MEDIA_TUNER_MXL5007T=m
+CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
+CONFIG_MEDIA_TUNER_TDA18218=m
+CONFIG_MEDIA_TUNER_FC0011=m
+CONFIG_MEDIA_TUNER_FC0012=m
+CONFIG_MEDIA_TUNER_FC0013=m
+CONFIG_MEDIA_TUNER_TDA18212=m
+CONFIG_MEDIA_TUNER_E4000=m
+CONFIG_MEDIA_TUNER_FC2580=m
+CONFIG_MEDIA_TUNER_TUA9001=m
+CONFIG_MEDIA_TUNER_IT913X=m
+CONFIG_MEDIA_TUNER_R820T=m
 
 #
 # Multistandard (satellite) frontends
@@ -3596,6 +4095,12 @@ CONFIG_DVB_STV090x=m
 CONFIG_DVB_STV6110x=m
 
 #
+# Multistandard (cable + terrestrial) frontends
+#
+CONFIG_DVB_DRXK=m
+CONFIG_DVB_TDA18271C2DD=m
+
+#
 # DVB-S (satellite) frontends
 #
 CONFIG_DVB_CX24110=m
@@ -3619,8 +4124,10 @@ 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
 
 #
 # DVB-T (terrestrial) frontends
@@ -3644,6 +4151,8 @@ CONFIG_DVB_AF9013=m
 CONFIG_DVB_EC100=m
 CONFIG_DVB_STV0367=m
 CONFIG_DVB_CXD2820R=m
+CONFIG_DVB_RTL2830=m
+CONFIG_DVB_RTL2832=m
 
 #
 # DVB-C (cable) frontends
@@ -3662,8 +4171,11 @@ CONFIG_DVB_OR51132=m
 CONFIG_DVB_BCM3510=m
 CONFIG_DVB_LGDT330X=m
 CONFIG_DVB_LGDT3305=m
+CONFIG_DVB_LG2160=m
 CONFIG_DVB_S5H1409=m
 CONFIG_DVB_AU8522=m
+CONFIG_DVB_AU8522_DTV=m
+CONFIG_DVB_AU8522_V4L=m
 CONFIG_DVB_S5H1411=m
 
 #
@@ -3684,13 +4196,18 @@ CONFIG_DVB_TUNER_DIB0090=m
 # SEC control devices for DVB-S
 #
 CONFIG_DVB_LNBP21=m
+CONFIG_DVB_LNBP22=m
 CONFIG_DVB_ISL6405=m
 CONFIG_DVB_ISL6421=m
 CONFIG_DVB_ISL6423=m
+CONFIG_DVB_A8293=m
 CONFIG_DVB_LGS8GXX=m
 CONFIG_DVB_ATBM8830=m
 CONFIG_DVB_TDA665x=m
 CONFIG_DVB_IX2505V=m
+CONFIG_DVB_IT913X_FE=m
+CONFIG_DVB_M88RS2000=m
+CONFIG_DVB_AF9033=m
 
 #
 # Tools to develop new frontends
@@ -3715,12 +4232,25 @@ CONFIG_VGA_ARB=y
 CONFIG_VGA_ARB_MAX_GPUS=16
 CONFIG_VGA_SWITCHEROO=y
 CONFIG_DRM=m
+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
 # CONFIG_DRM_I810 is not set
 CONFIG_DRM_I915=m
 CONFIG_DRM_I915_KMS=y
@@ -3728,9 +4258,19 @@ CONFIG_DRM_MGA=m
 CONFIG_DRM_SIS=m
 CONFIG_DRM_VIA=m
 CONFIG_DRM_SAVAGE=m
-# CONFIG_STUB_POULSBO is not set
+CONFIG_DRM_VMWGFX=m
+CONFIG_DRM_VMWGFX_FBCON=y
+CONFIG_DRM_GMA500=m
+CONFIG_DRM_GMA600=y
+CONFIG_DRM_GMA3600=y
+CONFIG_DRM_UDL=m
+CONFIG_DRM_AST=m
+CONFIG_DRM_MGAG200=m
+CONFIG_DRM_CIRRUS_QEMU=m
+CONFIG_DRM_QXL=m
 CONFIG_VGASTATE=m
 CONFIG_VIDEO_OUTPUT_CONTROL=m
+CONFIG_HDMI=y
 CONFIG_FB=y
 CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_DDC=m
@@ -3744,7 +4284,6 @@ CONFIG_FB_SYS_COPYAREA=m
 CONFIG_FB_SYS_IMAGEBLIT=m
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 CONFIG_FB_SYS_FOPS=m
-# CONFIG_FB_WMT_GE_ROPS is not set
 CONFIG_FB_DEFERRED_IO=y
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
@@ -3770,6 +4309,7 @@ CONFIG_FB_EFI=y
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_NVIDIA is not set
 # CONFIG_FB_RIVA is not set
+# CONFIG_FB_I740 is not set
 CONFIG_FB_I810=m
 CONFIG_FB_I810_GTF=y
 CONFIG_FB_I810_I2C=y
@@ -3796,31 +4336,46 @@ CONFIG_FB_VT8623=m
 # CONFIG_FB_GEODE is not set
 # CONFIG_FB_TMIO is not set
 # 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
 # CONFIG_FB_BROADSHEET is not set
+# CONFIG_FB_AUO_K190X is not set
+CONFIG_FB_HYPERV=m
+# CONFIG_FB_SIMPLE is not set
+# CONFIG_EXYNOS_VIDEO is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=m
-# CONFIG_LCD_PLATFORM is not set
+# CONFIG_LCD_L4F00242T03 is not set
+# CONFIG_LCD_LMS283GF05 is not set
+# CONFIG_LCD_LTV350QV is not set
+# CONFIG_LCD_ILI922X is not set
+# CONFIG_LCD_ILI9320 is not set
+# CONFIG_LCD_TDO24M is not set
+# CONFIG_LCD_VGG2432A4 is not set
+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_PROGEAR=m
+CONFIG_BACKLIGHT_LM3533=m
+CONFIG_BACKLIGHT_PWM=m
 CONFIG_BACKLIGHT_APPLE=m
 # CONFIG_BACKLIGHT_SAHARA is not set
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
 CONFIG_BACKLIGHT_PCF50633=m
-
-#
-# Display device support
-#
-CONFIG_DISPLAY_SUPPORT=m
-
-#
-# Display hardware drivers
-#
+# CONFIG_BACKLIGHT_LM3630 is not set
+# CONFIG_BACKLIGHT_LM3639 is not set
+# CONFIG_BACKLIGHT_LP855X is not set
+# CONFIG_BACKLIGHT_OT200 is not set
+# CONFIG_BACKLIGHT_TPS65217 is not set
 
 #
 # Console display driver support
@@ -3843,7 +4398,9 @@ CONFIG_FONT_8x16=y
 # CONFIG_FONT_SUN8x16 is not set
 # CONFIG_FONT_SUN12x22 is not set
 # CONFIG_FONT_10x18 is not set
+CONFIG_FONT_AUTOSELECT=y
 # CONFIG_LOGO is not set
+CONFIG_FB_SSD1307=m
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE=y
 # CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
@@ -3868,6 +4425,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SND_VERBOSE_PRINTK is not set
 # CONFIG_SND_DEBUG is not set
 CONFIG_SND_VMASTER=y
+CONFIG_SND_KCTL_JACK=y
 CONFIG_SND_DMA_SGBUF=y
 CONFIG_SND_RAWMIDI_SEQ=m
 CONFIG_SND_OPL3_LIB_SEQ=m
@@ -3903,6 +4461,7 @@ CONFIG_SND_ALS100=m
 CONFIG_SND_AZT1605=m
 CONFIG_SND_AZT2316=m
 CONFIG_SND_AZT2320=m
+CONFIG_SND_CMI8328=m
 CONFIG_SND_CMI8330=m
 CONFIG_SND_CS4231=m
 CONFIG_SND_CS4236=m
@@ -3928,6 +4487,7 @@ CONFIG_SND_SSCAPE=m
 CONFIG_SND_WAVEFRONT=m
 CONFIG_SND_MSND_PINNACLE=m
 CONFIG_SND_MSND_CLASSIC=m
+CONFIG_SND_TEA575X=m
 CONFIG_SND_PCI=y
 CONFIG_SND_AD1889=m
 CONFIG_SND_ALS300=m
@@ -3977,8 +4537,9 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FM801=m
 CONFIG_SND_FM801_TEA575X_BOOL=y
-CONFIG_SND_TEA575X=m
 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
 CONFIG_SND_HDA_INPUT_BEEP=y
@@ -3993,10 +4554,11 @@ CONFIG_SND_HDA_CODEC_HDMI=y
 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
-CONFIG_SND_HDA_POWER_SAVE=y
 CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
 CONFIG_SND_HDSP=m
 CONFIG_SND_HDSPM=m
@@ -4024,6 +4586,7 @@ CONFIG_SND_VIA82XX_MODEM=m
 CONFIG_SND_VIRTUOSO=m
 CONFIG_SND_VX222=m
 CONFIG_SND_YMFPCI=m
+CONFIG_SND_SPI=y
 CONFIG_SND_USB=y
 CONFIG_SND_USB_AUDIO=m
 CONFIG_SND_USB_UA101=m
@@ -4036,22 +4599,21 @@ CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWIRE_LIB=m
 CONFIG_SND_FIREWIRE_SPEAKERS=m
 CONFIG_SND_ISIGHT=m
+CONFIG_SND_SCS1X=m
 CONFIG_SND_PCMCIA=y
 CONFIG_SND_VXPOCKET=m
 CONFIG_SND_PDAUDIOCF=m
 # CONFIG_SND_SOC is not set
 # CONFIG_SOUND_PRIME is not set
 CONFIG_AC97_BUS=m
-CONFIG_HID_SUPPORT=y
-CONFIG_HID=m
-CONFIG_HIDRAW=y
 
 #
-# USB Input Devices
+# HID support
 #
-CONFIG_USB_HID=m
-CONFIG_HID_PID=y
-CONFIG_USB_HIDDEV=y
+CONFIG_HID=m
+CONFIG_HIDRAW=y
+CONFIG_UHID=m
+CONFIG_HID_GENERIC=m
 
 #
 # Special HID drivers
@@ -4060,6 +4622,8 @@ CONFIG_HID_A4TECH=m
 CONFIG_HID_ACRUX=m
 CONFIG_HID_ACRUX_FF=y
 CONFIG_HID_APPLE=m
+CONFIG_HID_APPLEIR=m
+CONFIG_HID_AUREAL=m
 CONFIG_HID_BELKIN=m
 CONFIG_HID_CHERRY=m
 CONFIG_HID_CHICONY=m
@@ -4070,19 +4634,24 @@ CONFIG_DRAGONRISE_FF=y
 CONFIG_HID_EMS_FF=m
 CONFIG_HID_ELECOM=m
 CONFIG_HID_EZKEY=m
+CONFIG_HID_HOLTEK=m
+CONFIG_HOLTEK_FF=y
 CONFIG_HID_KEYTOUCH=m
 CONFIG_HID_KYE=m
 CONFIG_HID_UCLOGIC=m
 CONFIG_HID_WALTOP=m
 CONFIG_HID_GYRATION=m
+CONFIG_HID_ICADE=m
 CONFIG_HID_TWINHAN=m
 CONFIG_HID_KENSINGTON=m
 CONFIG_HID_LCPOWER=m
+CONFIG_HID_LENOVO_TPKBD=m
 CONFIG_HID_LOGITECH=m
+CONFIG_HID_LOGITECH_DJ=m
 CONFIG_LOGITECH_FF=y
 CONFIG_LOGIRUMBLEPAD2_FF=y
 CONFIG_LOGIG940_FF=y
-CONFIG_LOGIWII_FF=y
+CONFIG_LOGIWHEELS_FF=y
 CONFIG_HID_MAGICMOUSE=m
 CONFIG_HID_MICROSOFT=m
 CONFIG_HID_MONTEREY=m
@@ -4097,33 +4666,51 @@ CONFIG_HID_PICOLCD_FB=y
 CONFIG_HID_PICOLCD_BACKLIGHT=y
 CONFIG_HID_PICOLCD_LCD=y
 CONFIG_HID_PICOLCD_LEDS=y
-CONFIG_HID_QUANTA=m
+CONFIG_HID_PICOLCD_CIR=y
+CONFIG_HID_PRIMAX=m
+CONFIG_HID_PS3REMOTE=m
 CONFIG_HID_ROCCAT=m
-CONFIG_HID_ROCCAT_COMMON=m
-CONFIG_HID_ROCCAT_ARVO=m
-CONFIG_HID_ROCCAT_KONE=m
-CONFIG_HID_ROCCAT_KONEPLUS=m
-CONFIG_HID_ROCCAT_KOVAPLUS=m
-CONFIG_HID_ROCCAT_PYRA=m
+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
+CONFIG_HID_HYPERV_MOUSE=m
 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
-CONFIG_HID_WACOM_POWER_SUPPLY=y
+CONFIG_HID_WIIMOTE=m
+CONFIG_HID_WIIMOTE_EXT=y
 CONFIG_HID_ZEROPLUS=m
 CONFIG_ZEROPLUS_FF=y
 CONFIG_HID_ZYDACRON=m
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_HID_SENSOR_HUB=m
+
+#
+# USB HID support
+#
+CONFIG_USB_HID=m
+CONFIG_HID_PID=y
+CONFIG_USB_HIDDEV=y
+
+#
+# I2C HID support
+#
+CONFIG_I2C_HID=m
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
+CONFIG_USB_ARCH_HAS_XHCI=y
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_COMMON=m
+CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB=m
 # CONFIG_USB_DEBUG is not set
 # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
@@ -4131,10 +4718,8 @@ CONFIG_USB=m
 #
 # Miscellaneous USB options
 #
-CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_DEVICE_CLASS is not set
+CONFIG_USB_DEFAULT_PERSIST=y
 CONFIG_USB_DYNAMIC_MINORS=y
-CONFIG_USB_SUSPEND=y
 # CONFIG_USB_OTG is not set
 CONFIG_USB_MON=m
 CONFIG_USB_WUSB=m
@@ -4150,12 +4735,15 @@ CONFIG_USB_XHCI_HCD=m
 CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_EHCI_PCI=m
+# CONFIG_USB_EHCI_HCD_PLATFORM is not set
 CONFIG_USB_OXU210HP_HCD=m
 CONFIG_USB_ISP116X_HCD=m
 CONFIG_USB_ISP1760_HCD=m
 CONFIG_USB_ISP1362_HCD=m
 CONFIG_USB_OHCI_HCD=m
 # CONFIG_USB_OHCI_HCD_SSB is not set
+# CONFIG_USB_OHCI_HCD_PLATFORM is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
@@ -4165,8 +4753,18 @@ CONFIG_USB_SL811_HCD=m
 # CONFIG_USB_SL811_HCD_ISO is not set
 CONFIG_USB_SL811_CS=m
 CONFIG_USB_R8A66597_HCD=m
+CONFIG_USB_RENESAS_USBHS_HCD=m
 CONFIG_USB_WHCI_HCD=m
 CONFIG_USB_HWA_HCD=m
+# CONFIG_USB_HCD_BCMA is not set
+# CONFIG_USB_HCD_SSB is not set
+CONFIG_USB_MUSB_HDRC=m
+CONFIG_USB_MUSB_TUSB6010=m
+CONFIG_USB_MUSB_DSPS=m
+CONFIG_USB_MUSB_UX500=m
+# CONFIG_USB_UX500_DMA is not set
+CONFIG_MUSB_PIO_ONLY=y
+CONFIG_USB_RENESAS_USBHS=m
 
 #
 # USB Device Class drivers
@@ -4186,6 +4784,7 @@ CONFIG_USB_TMC=m
 CONFIG_USB_STORAGE=m
 # CONFIG_USB_STORAGE_DEBUG is not set
 CONFIG_USB_STORAGE_REALTEK=m
+CONFIG_REALTEK_AUTOPM=y
 CONFIG_USB_STORAGE_DATAFAB=m
 CONFIG_USB_STORAGE_FREECOM=m
 CONFIG_USB_STORAGE_ISD200=m
@@ -4198,21 +4797,22 @@ CONFIG_USB_STORAGE_ONETOUCH=m
 CONFIG_USB_STORAGE_KARMA=m
 CONFIG_USB_STORAGE_CYPRESS_ATACB=m
 CONFIG_USB_STORAGE_ENE_UB6250=m
-CONFIG_USB_UAS=m
-# CONFIG_USB_LIBUSUAL is not set
 
 #
 # USB Imaging devices
 #
 CONFIG_USB_MDC800=m
 CONFIG_USB_MICROTEK=m
+# CONFIG_USB_DWC3 is not set
+CONFIG_USB_CHIPIDEA=m
+CONFIG_USB_CHIPIDEA_UDC=y
+# CONFIG_USB_CHIPIDEA_DEBUG is not set
 
 #
 # USB port drivers
 #
 CONFIG_USB_USS720=m
 CONFIG_USB_SERIAL=m
-CONFIG_USB_EZUSB=y
 CONFIG_USB_SERIAL_GENERIC=y
 CONFIG_USB_SERIAL_AIRCABLE=m
 CONFIG_USB_SERIAL_ARK3116=m
@@ -4230,6 +4830,7 @@ CONFIG_USB_SERIAL_IPAQ=m
 CONFIG_USB_SERIAL_IR=m
 CONFIG_USB_SERIAL_EDGEPORT=m
 CONFIG_USB_SERIAL_EDGEPORT_TI=m
+CONFIG_USB_SERIAL_F81232=m
 CONFIG_USB_SERIAL_GARMIN=m
 CONFIG_USB_SERIAL_IPW=m
 CONFIG_USB_SERIAL_IUU=m
@@ -4250,6 +4851,7 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
 CONFIG_USB_SERIAL_KLSI=m
 CONFIG_USB_SERIAL_KOBIL_SCT=m
 CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_METRO=m
 CONFIG_USB_SERIAL_MOS7720=m
 CONFIG_USB_SERIAL_MOS7715_PARPORT=y
 CONFIG_USB_SERIAL_MOS7840=m
@@ -4274,8 +4876,12 @@ 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_WISHBONE=m
+CONFIG_USB_SERIAL_ZTE=m
 CONFIG_USB_SERIAL_SSU100=m
+CONFIG_USB_SERIAL_QT2=m
 # CONFIG_USB_SERIAL_DEBUG is not set
 
 #
@@ -4302,32 +4908,56 @@ CONFIG_USB_IOWARRIOR=m
 CONFIG_USB_TEST=m
 CONFIG_USB_ISIGHTFW=m
 CONFIG_USB_YUREX=m
+CONFIG_USB_EZUSB_FX2=m
+CONFIG_USB_HSIC_USB3503=m
 CONFIG_USB_ATM=m
 CONFIG_USB_SPEEDTOUCH=m
 CONFIG_USB_CXACRU=m
 CONFIG_USB_UEAGLEATM=m
 CONFIG_USB_XUSBATM=m
+CONFIG_USB_PHY=y
+CONFIG_NOP_USB_XCEIV=m
+# CONFIG_OMAP_CONTROL_USB is not set
+# CONFIG_OMAP_USB3 is not set
+CONFIG_SAMSUNG_USBPHY=m
+CONFIG_SAMSUNG_USB2PHY=m
+CONFIG_SAMSUNG_USB3PHY=m
+# CONFIG_USB_GPIO_VBUS is not set
+CONFIG_USB_ISP1301=m
+CONFIG_USB_RCAR_PHY=m
 CONFIG_USB_GADGET=m
 # CONFIG_USB_GADGET_DEBUG is not set
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
 # CONFIG_USB_GADGET_DEBUG_FS is not set
 CONFIG_USB_GADGET_VBUS_DRAW=2
-CONFIG_USB_GADGET_SELECTED=y
-# CONFIG_USB_GADGET_FUSB300 is not set
-# CONFIG_USB_GADGET_R8A66597 is not set
-# CONFIG_USB_GADGET_PXA_U2O is not set
-# CONFIG_USB_GADGET_M66592 is not set
-# CONFIG_USB_GADGET_AMD5536UDC is not set
-# CONFIG_USB_GADGET_CI13XXX_PCI is not set
-CONFIG_USB_GADGET_NET2280=y
+CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+
+#
+# USB Peripheral Controller
+#
+CONFIG_USB_FUSB300=m
+CONFIG_USB_R8A66597=m
+CONFIG_USB_RENESAS_USBHS_UDC=m
+CONFIG_USB_PXA27X=m
+CONFIG_USB_MV_UDC=m
+CONFIG_USB_MV_U3D=m
+CONFIG_USB_GADGET_MUSB_HDRC=m
+CONFIG_USB_M66592=m
+CONFIG_USB_AMD5536UDC=m
+CONFIG_USB_NET2272=m
+CONFIG_USB_NET2272_DMA=y
 CONFIG_USB_NET2280=m
-# CONFIG_USB_GADGET_GOKU is not set
-# CONFIG_USB_GADGET_LANGWELL is not set
-# CONFIG_USB_GADGET_EG20T is not set
-# CONFIG_USB_GADGET_DUMMY_HCD is not set
-CONFIG_USB_GADGET_DUALSPEED=y
+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_F_SERIAL=m
+CONFIG_USB_F_OBEX=m
 # CONFIG_USB_ZERO is not set
 CONFIG_USB_AUDIO=m
+# CONFIG_GADGET_UAC1 is not set
 CONFIG_USB_ETH=m
 CONFIG_USB_ETH_RNDIS=y
 # CONFIG_USB_ETH_EEM is not set
@@ -4337,28 +4967,20 @@ CONFIG_USB_FUNCTIONFS=m
 CONFIG_USB_FUNCTIONFS_ETH=y
 CONFIG_USB_FUNCTIONFS_RNDIS=y
 CONFIG_USB_FUNCTIONFS_GENERIC=y
-CONFIG_USB_FILE_STORAGE=m
-# CONFIG_USB_FILE_STORAGE_TEST is not set
-# 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
 CONFIG_USB_G_PRINTER=m
 # CONFIG_USB_CDC_COMPOSITE is not set
 # CONFIG_USB_G_NOKIA is not set
+# CONFIG_USB_G_ACM_MS is not set
 # CONFIG_USB_G_MULTI is not set
 CONFIG_USB_G_HID=m
 CONFIG_USB_G_DBGP=m
 # CONFIG_USB_G_DBGP_PRINTK is not set
 CONFIG_USB_G_DBGP_SERIAL=y
 CONFIG_USB_G_WEBCAM=m
-
-#
-# OTG and related infrastructure
-#
-CONFIG_USB_OTG_UTILS=y
-CONFIG_USB_GPIO_VBUS=m
-CONFIG_NOP_USB_XCEIV=m
-CONFIG_AB8500_USB=m
 CONFIG_UWB=m
 CONFIG_UWB_HWA=m
 CONFIG_UWB_WHCI=m
@@ -4366,7 +4988,7 @@ CONFIG_UWB_I1480U=m
 CONFIG_MMC=m
 # CONFIG_MMC_DEBUG is not set
 # CONFIG_MMC_UNSAFE_RESUME is not set
-CONFIG_MMC_CLKGATE=y
+# CONFIG_MMC_CLKGATE is not set
 
 #
 # MMC/SD/SDIO Card Drivers
@@ -4383,7 +5005,7 @@ CONFIG_SDIO_UART=m
 CONFIG_MMC_SDHCI=m
 CONFIG_MMC_SDHCI_PCI=m
 CONFIG_MMC_RICOH_MMC=y
-CONFIG_MMC_SDHCI_OF=m
+CONFIG_MMC_SDHCI_ACPI=m
 CONFIG_MMC_SDHCI_PLTFM=m
 CONFIG_MMC_WBSD=m
 CONFIG_MMC_TIFM_SD=m
@@ -4392,6 +5014,7 @@ CONFIG_MMC_CB710=m
 CONFIG_MMC_VIA_SDMMC=m
 CONFIG_MMC_VUB300=m
 CONFIG_MMC_USHC=m
+CONFIG_MMC_REALTEK_PCI=m
 CONFIG_MEMSTICK=m
 # CONFIG_MEMSTICK_DEBUG is not set
 
@@ -4407,6 +5030,7 @@ CONFIG_MSPRO_BLOCK=m
 CONFIG_MEMSTICK_TIFM_MS=m
 CONFIG_MEMSTICK_JMICRON_38X=m
 CONFIG_MEMSTICK_R592=m
+CONFIG_MEMSTICK_REALTEK_PCI=m
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 
@@ -4414,48 +5038,57 @@ CONFIG_LEDS_CLASS=y
 # LED drivers
 #
 CONFIG_LEDS_LM3530=m
-CONFIG_LEDS_ALIX2=m
+CONFIG_LEDS_LM3533=m
+CONFIG_LEDS_LM3642=m
 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_LP5562=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
 CONFIG_LEDS_DELL_NETBOOKS=m
-CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_MC13783=m
+CONFIG_LEDS_TCA6507=m
+CONFIG_LEDS_LM355x=m
+CONFIG_LEDS_OT200=m
+CONFIG_LEDS_BLINKM=m
 
 #
 # LED Triggers
 #
+CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_ONESHOT=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+# CONFIG_LEDS_TRIGGER_CPU is not set
 CONFIG_LEDS_TRIGGER_GPIO=m
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
 
 #
 # iptables trigger is under Netfilter config (LED target)
 #
-CONFIG_NFC_DEVICES=y
-CONFIG_PN544_NFC=m
+CONFIG_LEDS_TRIGGER_TRANSIENT=m
+CONFIG_LEDS_TRIGGER_CAMERA=m
 CONFIG_ACCESSIBILITY=y
 CONFIG_A11Y_BRAILLE_CONSOLE=y
 # CONFIG_INFINIBAND is not set
 CONFIG_EDAC=y
-
-#
-# Reporting subsystems
-#
+CONFIG_EDAC_LEGACY_SYSFS=y
 # CONFIG_EDAC_DEBUG is not set
 CONFIG_EDAC_DECODE_MCE=m
 CONFIG_EDAC_MCE_INJ=m
 CONFIG_EDAC_MM_EDAC=m
-CONFIG_EDAC_MCE=y
 CONFIG_EDAC_AMD76X=m
 CONFIG_EDAC_E7XXX=m
 CONFIG_EDAC_E752X=m
@@ -4474,6 +5107,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
 
@@ -4498,6 +5132,7 @@ CONFIG_RTC_DRV_RS5C372=m
 CONFIG_RTC_DRV_ISL1208=m
 CONFIG_RTC_DRV_ISL12022=m
 CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF8523=m
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_M41T80=m
@@ -4513,6 +5148,16 @@ CONFIG_RTC_DRV_RV3029C2=m
 #
 # SPI RTC drivers
 #
+# CONFIG_RTC_DRV_M41T93 is not set
+# CONFIG_RTC_DRV_M41T94 is not set
+# CONFIG_RTC_DRV_DS1305 is not set
+# CONFIG_RTC_DRV_DS1390 is not set
+# CONFIG_RTC_DRV_MAX6902 is not set
+# CONFIG_RTC_DRV_R9701 is not set
+# 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
@@ -4530,12 +5175,19 @@ CONFIG_RTC_DRV_MSM6242=m
 CONFIG_RTC_DRV_BQ4802=m
 CONFIG_RTC_DRV_RP5C01=m
 CONFIG_RTC_DRV_V3020=m
+CONFIG_RTC_DRV_DS2404=m
 CONFIG_RTC_DRV_PCF50633=m
-CONFIG_RTC_DRV_AB8500=m
 
 #
 # on-CPU RTC drivers
 #
+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
 
@@ -4544,9 +5196,13 @@ 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_ACPI=y
+CONFIG_DMA_OF=y
 
 #
 # DMA Clients
@@ -4565,34 +5221,35 @@ CONFIG_UIO=m
 CONFIG_UIO_CIF=m
 CONFIG_UIO_PDRV=m
 CONFIG_UIO_PDRV_GENIRQ=m
+# CONFIG_UIO_DMEM_GENIRQ is not set
 CONFIG_UIO_AEC=m
 CONFIG_UIO_SERCOS3=m
 CONFIG_UIO_PCI_GENERIC=m
 CONFIG_UIO_NETX=m
+CONFIG_VFIO_IOMMU_TYPE1=m
+CONFIG_VFIO=m
+CONFIG_VFIO_PCI=m
+CONFIG_VFIO_PCI_VGA=y
+CONFIG_VIRT_DRIVERS=y
+CONFIG_VIRTIO=y
+
+#
+# Virtio drivers
+#
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_MMIO=m
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
+
+#
+# Microsoft Hyper-V guest support
+#
+CONFIG_HYPERV=m
+CONFIG_HYPERV_UTILS=m
+CONFIG_HYPERV_BALLOON=m
 CONFIG_STAGING=y
-# CONFIG_DIGIEPCA is not set
-# CONFIG_RISCOM8 is not set
-# CONFIG_SPECIALIX is not set
-# CONFIG_COMPUTONE is not set
 CONFIG_ET131X=m
-# CONFIG_ET131X_DEBUG is not set
 CONFIG_SLICOSS=m
-CONFIG_VIDEO_GO7007=m
-CONFIG_VIDEO_GO7007_USB=m
-# CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set
-CONFIG_VIDEO_GO7007_OV7640=m
-CONFIG_VIDEO_GO7007_SAA7113=m
-CONFIG_VIDEO_GO7007_SAA7115=m
-CONFIG_VIDEO_GO7007_TW9903=m
-CONFIG_VIDEO_GO7007_UDA1342=m
-CONFIG_VIDEO_GO7007_SONY_TUNER=m
-CONFIG_VIDEO_GO7007_TW2804=m
-CONFIG_VIDEO_CX25821=m
-CONFIG_VIDEO_CX25821_ALSA=m
-CONFIG_VIDEO_TM6000=m
-CONFIG_VIDEO_TM6000_ALSA=m
-CONFIG_VIDEO_TM6000_DVB=m
-CONFIG_DVB_CXD2099=m
 CONFIG_USBIP_CORE=m
 CONFIG_USBIP_VHCI_HCD=m
 CONFIG_USBIP_HOST=m
@@ -4600,20 +5257,18 @@ CONFIG_USBIP_HOST=m
 CONFIG_W35UND=m
 CONFIG_PRISM2_USB=m
 CONFIG_ECHO=m
-CONFIG_BRCMUTIL=m
-CONFIG_BRCMSMAC=m
-# CONFIG_BRCMFMAC is not set
-# CONFIG_BRCMDBG is not set
 CONFIG_COMEDI=m
 # CONFIG_COMEDI_DEBUG is not set
-CONFIG_COMEDI_MISC_DRIVERS=m
+CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048
+CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480
+CONFIG_COMEDI_MISC_DRIVERS=y
 CONFIG_COMEDI_KCOMEDILIB=m
 CONFIG_COMEDI_BOND=m
 CONFIG_COMEDI_TEST=m
 CONFIG_COMEDI_PARPORT=m
 CONFIG_COMEDI_SERIAL2002=m
 CONFIG_COMEDI_SKEL=m
-CONFIG_COMEDI_ISA_DRIVERS=m
+CONFIG_COMEDI_ISA_DRIVERS=y
 CONFIG_COMEDI_ACL7225B=m
 CONFIG_COMEDI_PCL711=m
 CONFIG_COMEDI_PCL724=m
@@ -4625,9 +5280,13 @@ CONFIG_COMEDI_PCL816=m
 CONFIG_COMEDI_PCL818=m
 CONFIG_COMEDI_PCM3724=m
 CONFIG_COMEDI_PCM3730=m
+CONFIG_COMEDI_AMPLC_DIO200_ISA=m
+CONFIG_COMEDI_AMPLC_PC236_ISA=m
+CONFIG_COMEDI_AMPLC_PC263_ISA=m
 CONFIG_COMEDI_RTI800=m
 CONFIG_COMEDI_RTI802=m
 CONFIG_COMEDI_DAS16M1=m
+CONFIG_COMEDI_DAS08_ISA=m
 CONFIG_COMEDI_DAS16=m
 CONFIG_COMEDI_DAS800=m
 CONFIG_COMEDI_DAS1800=m
@@ -4649,43 +5308,45 @@ CONFIG_COMEDI_NI_AT_A2150=m
 CONFIG_COMEDI_NI_AT_AO=m
 CONFIG_COMEDI_NI_ATMIO=m
 CONFIG_COMEDI_NI_ATMIO16D=m
+CONFIG_COMEDI_NI_LABPC_ISA=m
 CONFIG_COMEDI_PCMAD=m
 CONFIG_COMEDI_PCMDA12=m
 CONFIG_COMEDI_PCMMIO=m
 CONFIG_COMEDI_PCMUIO=m
 CONFIG_COMEDI_MULTIQ3=m
 CONFIG_COMEDI_POC=m
-CONFIG_COMEDI_PCI_DRIVERS=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
 CONFIG_COMEDI_ADDI_APCI_1516=m
 CONFIG_COMEDI_ADDI_APCI_1564=m
 CONFIG_COMEDI_ADDI_APCI_16XX=m
-CONFIG_COMEDI_ADDI_APCI_2016=m
 CONFIG_COMEDI_ADDI_APCI_2032=m
 CONFIG_COMEDI_ADDI_APCI_2200=m
-CONFIG_COMEDI_ADDI_APCI_3001=m
 CONFIG_COMEDI_ADDI_APCI_3120=m
 CONFIG_COMEDI_ADDI_APCI_3501=m
 CONFIG_COMEDI_ADDI_APCI_3XXX=m
 CONFIG_COMEDI_ADL_PCI6208=m
-CONFIG_COMEDI_ADL_PCI7230=m
-CONFIG_COMEDI_ADL_PCI7296=m
-CONFIG_COMEDI_ADL_PCI7432=m
+CONFIG_COMEDI_ADL_PCI7X3X=m
 CONFIG_COMEDI_ADL_PCI8164=m
 CONFIG_COMEDI_ADL_PCI9111=m
 CONFIG_COMEDI_ADL_PCI9118=m
 CONFIG_COMEDI_ADV_PCI1710=m
 CONFIG_COMEDI_ADV_PCI1723=m
+CONFIG_COMEDI_ADV_PCI1724=m
 CONFIG_COMEDI_ADV_PCI_DIO=m
-CONFIG_COMEDI_AMPLC_DIO200=m
-CONFIG_COMEDI_AMPLC_PC236=m
-CONFIG_COMEDI_AMPLC_PC263=m
+CONFIG_COMEDI_AMPLC_DIO200_PCI=m
+CONFIG_COMEDI_AMPLC_PC236_PCI=m
+CONFIG_COMEDI_AMPLC_PC263_PCI=m
 CONFIG_COMEDI_AMPLC_PCI224=m
 CONFIG_COMEDI_AMPLC_PCI230=m
 CONFIG_COMEDI_CONTEC_PCI_DIO=m
+CONFIG_COMEDI_DAS08_PCI=m
 CONFIG_COMEDI_DT3000=m
+CONFIG_COMEDI_DYNA_PCI10XX=m
 CONFIG_COMEDI_UNIOXX5=m
 CONFIG_COMEDI_GSC_HPDI=m
 CONFIG_COMEDI_ICP_MULTI=m
@@ -4696,7 +5357,6 @@ CONFIG_COMEDI_KE_COUNTER=m
 CONFIG_COMEDI_CB_PCIDAS64=m
 CONFIG_COMEDI_CB_PCIDAS=m
 CONFIG_COMEDI_CB_PCIDDA=m
-CONFIG_COMEDI_CB_PCIDIO=m
 # CONFIG_COMEDI_CB_PCIMDAS is not set
 CONFIG_COMEDI_CB_PCIMDDA=m
 CONFIG_COMEDI_ME4000=m
@@ -4705,13 +5365,16 @@ CONFIG_COMEDI_NI_6527=m
 CONFIG_COMEDI_NI_65XX=m
 CONFIG_COMEDI_NI_660X=m
 CONFIG_COMEDI_NI_670X=m
+CONFIG_COMEDI_NI_LABPC_PCI=m
 CONFIG_COMEDI_NI_PCIDIO=m
 CONFIG_COMEDI_NI_PCIMIO=m
 CONFIG_COMEDI_RTD520=m
 CONFIG_COMEDI_S526=m
 CONFIG_COMEDI_S626=m
 CONFIG_COMEDI_SSV_DNP=m
-CONFIG_COMEDI_PCMCIA_DRIVERS=m
+CONFIG_COMEDI_MITE=m
+CONFIG_COMEDI_NI_TIOCMD=m
+CONFIG_COMEDI_PCMCIA_DRIVERS=y
 CONFIG_COMEDI_CB_DAS16_CS=m
 CONFIG_COMEDI_DAS08_CS=m
 CONFIG_COMEDI_NI_DAQ_700_CS=m
@@ -4719,111 +5382,49 @@ CONFIG_COMEDI_NI_DAQ_DIO24_CS=m
 CONFIG_COMEDI_NI_LABPC_CS=m
 CONFIG_COMEDI_NI_MIO_CS=m
 CONFIG_COMEDI_QUATECH_DAQP_CS=m
-CONFIG_COMEDI_USB_DRIVERS=m
+CONFIG_COMEDI_USB_DRIVERS=y
 CONFIG_COMEDI_DT9812=m
 CONFIG_COMEDI_USBDUX=m
 CONFIG_COMEDI_USBDUXFAST=m
+CONFIG_COMEDI_USBDUXSIGMA=m
 CONFIG_COMEDI_VMK80XX=m
-CONFIG_COMEDI_NI_COMMON=m
-CONFIG_COMEDI_MITE=m
-CONFIG_COMEDI_NI_TIO=m
-CONFIG_COMEDI_NI_LABPC=m
 CONFIG_COMEDI_8255=m
-CONFIG_COMEDI_DAS08=m
 CONFIG_COMEDI_FC=m
+CONFIG_COMEDI_AMPLC_DIO200=m
+CONFIG_COMEDI_AMPLC_PC236=m
+CONFIG_COMEDI_DAS08=m
+CONFIG_COMEDI_NI_LABPC=m
+CONFIG_COMEDI_NI_TIO=m
 # CONFIG_FB_OLPC_DCON is not set
 CONFIG_ASUS_OLED=m
 # CONFIG_PANEL is not set
 CONFIG_R8187SE=m
 CONFIG_RTL8192U=m
+CONFIG_RTLLIB=m
+CONFIG_RTLLIB_CRYPTO_CCMP=m
+CONFIG_RTLLIB_CRYPTO_TKIP=m
+CONFIG_RTLLIB_CRYPTO_WEP=m
 CONFIG_RTL8192E=m
 CONFIG_R8712U=m
-CONFIG_R8712_AP=y
-CONFIG_RTS_PSTOR=m
-# CONFIG_RTS_PSTOR_DEBUG is not set
+CONFIG_RTS5139=m
+# CONFIG_RTS5139_DEBUG is not set
 # CONFIG_TRANZPORT is not set
-CONFIG_POHMELFS=m
-# CONFIG_POHMELFS_DEBUG is not set
-CONFIG_POHMELFS_CRYPTO=y
 CONFIG_IDE_PHISON=m
 CONFIG_LINE6_USB=m
-# CONFIG_LINE6_USB_DEBUG is not set
-# CONFIG_LINE6_USB_DUMP_CTRL is not set
-# CONFIG_LINE6_USB_DUMP_MIDI is not set
-# CONFIG_LINE6_USB_DUMP_PCM is not set
-# CONFIG_LINE6_USB_RAW is not set
 # CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set
-CONFIG_DRM_VMWGFX=m
-CONFIG_DRM_NOUVEAU=m
-CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-CONFIG_DRM_NOUVEAU_DEBUG=y
-
-#
-# I2C encoder or helper chips
-#
-CONFIG_DRM_I2C_CH7006=m
-CONFIG_DRM_I2C_SIL164=m
 CONFIG_USB_SERIAL_QUATECH2=m
-CONFIG_USB_SERIAL_QUATECH_USB2=m
 CONFIG_VT6655=m
 CONFIG_VT6656=m
-CONFIG_HYPERV=m
-CONFIG_HYPERV_STORAGE=m
-CONFIG_HYPERV_BLOCK=m
-CONFIG_HYPERV_NET=m
-CONFIG_HYPERV_UTILS=m
-CONFIG_HYPERV_MOUSE=m
-# CONFIG_VME_BUS is not set
 CONFIG_DX_SEP=m
-# CONFIG_IIO is not set
-CONFIG_CS5535_GPIO=m
-CONFIG_XVMALLOC=y
+CONFIG_ZSMALLOC=y
 CONFIG_ZRAM=m
 # CONFIG_ZRAM_DEBUG is not set
-CONFIG_ZCACHE=m
 CONFIG_WLAGS49_H2=m
 CONFIG_WLAGS49_H25=m
 CONFIG_FB_SM7XX=m
-CONFIG_VIDEO_DT3155=m
-CONFIG_DT3155_CCIR=y
 CONFIG_CRYSTALHD=m
 CONFIG_FB_XGI=m
-CONFIG_LIRC_STAGING=y
-CONFIG_LIRC_BT829=m
-CONFIG_LIRC_IGORPLUGUSB=m
-CONFIG_LIRC_IMON=m
-CONFIG_LIRC_PARALLEL=m
-CONFIG_LIRC_SASEM=m
-CONFIG_LIRC_SERIAL=m
-CONFIG_LIRC_SERIAL_TRANSMITTER=y
-CONFIG_LIRC_SIR=m
-CONFIG_LIRC_TTUSBIR=m
-CONFIG_LIRC_ZILOG=m
-CONFIG_EASYCAP=m
-CONFIG_EASYCAP_SND=y
-# CONFIG_EASYCAP_OSS is not set
-# CONFIG_EASYCAP_DEBUG is not set
-CONFIG_SOLO6X10=m
 CONFIG_ACPI_QUICKSTART=m
-CONFIG_MACH_NO_WESTBRIDGE=y
-CONFIG_ATH6K_LEGACY=m
-CONFIG_AR600x_SD31_XXX=y
-# CONFIG_AR600x_WB31_XXX is not set
-# CONFIG_AR600x_SD32_XXX is not set
-# CONFIG_AR600x_CUSTOM_XXX is not set
-CONFIG_ATH6KL_ENABLE_COEXISTENCE=y
-CONFIG_AR600x_DUAL_ANTENNA=y
-# CONFIG_AR600x_SINGLE_ANTENNA is not set
-# CONFIG_AR600x_BT_QCOM is not set
-# CONFIG_AR600x_BT_CSR is not set
-CONFIG_AR600x_BT_AR3001=y
-CONFIG_ATH6KL_HCI_BRIDGE=y
-CONFIG_ATH6KL_CONFIG_GPIO_BT_RESET=y
-CONFIG_AR600x_BT_RESET_PIN=22
-CONFIG_ATH6KL_HTC_RAW_INTERFACE=y
-CONFIG_ATH6KL_VIRTUAL_SCATTER_GATHER=y
-CONFIG_ATH6KL_SKIP_ABI_VERSION_CHECK=y
-# CONFIG_ATH6KL_DEBUG is not set
 CONFIG_USB_ENESTORAGE=m
 CONFIG_BCM_WIMAX=m
 CONFIG_FT1000=m
@@ -4851,22 +5452,62 @@ CONFIG_SPEAKUP_SYNTH_TXPRT=m
 CONFIG_SPEAKUP_SYNTH_DUMMY=m
 CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
 CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
-CONFIG_DRM_PSB=m
+CONFIG_STAGING_MEDIA=y
+CONFIG_DVB_AS102=m
+CONFIG_DVB_CXD2099=m
+CONFIG_VIDEO_DT3155=m
+CONFIG_DT3155_CCIR=y
+CONFIG_DT3155_STREAMING=y
+CONFIG_VIDEO_GO7007=m
+CONFIG_VIDEO_GO7007_USB=m
+CONFIG_VIDEO_GO7007_LOADER=m
+# CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set
+CONFIG_SOLO6X10=m
+CONFIG_LIRC_STAGING=y
+CONFIG_LIRC_BT829=m
+CONFIG_LIRC_IGORPLUGUSB=m
+CONFIG_LIRC_IMON=m
+CONFIG_LIRC_PARALLEL=m
+CONFIG_LIRC_SASEM=m
+CONFIG_LIRC_SERIAL=m
+CONFIG_LIRC_SERIAL_TRANSMITTER=y
+CONFIG_LIRC_SIR=m
+CONFIG_LIRC_ZILOG=m
 
 #
-# Altera FPGA firmware download module
-#
-CONFIG_ALTERA_STAPL=m
-CONFIG_INTEL_MEI=m
+# Android
+#
+# CONFIG_ANDROID is not set
+CONFIG_USB_WPAN_HCD=m
+CONFIG_WIMAX_GDM72XX=m
+CONFIG_WIMAX_GDM72XX_QOS=y
+CONFIG_WIMAX_GDM72XX_K_MODE=y
+CONFIG_WIMAX_GDM72XX_WIMAX2=y
+CONFIG_WIMAX_GDM72XX_USB=y
+# CONFIG_WIMAX_GDM72XX_SDIO is not set
+CONFIG_WIMAX_GDM72XX_USB_PM=y
+CONFIG_CSR_WIFI=m
+CONFIG_NET_VENDOR_SILICOM=y
+CONFIG_SBYPASS=m
+CONFIG_BPCTL=m
+CONFIG_CED1401=m
+CONFIG_DGRP=m
+CONFIG_FIREWIRE_SERIAL=m
+CONFIG_ZCACHE=m
+# CONFIG_ZCACHE_DEBUG is not set
+# CONFIG_USB_DWC2 is not set
 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
 CONFIG_FUJITSU_LAPTOP=m
 # CONFIG_FUJITSU_LAPTOP_DEBUG is not set
+CONFIG_FUJITSU_TABLET=m
+CONFIG_AMILO_RFKILL=m
 CONFIG_TC1100_WMI=m
 CONFIG_HP_ACCEL=m
 CONFIG_HP_WMI=m
@@ -4891,7 +5532,6 @@ CONFIG_ASUS_NB_WMI=m
 CONFIG_EEEPC_WMI=m
 CONFIG_ACPI_WMI=m
 CONFIG_MSI_WMI=m
-CONFIG_ACPI_ASUS=m
 CONFIG_TOPSTAR_LAPTOP=m
 CONFIG_ACPI_TOSHIBA=m
 CONFIG_TOSHIBA_BT_RFKILL=m
@@ -4903,7 +5543,51 @@ CONFIG_XO15_EBOOK=m
 CONFIG_SAMSUNG_LAPTOP=m
 CONFIG_MXM_WMI=m
 CONFIG_INTEL_OAKTRAIL=m
+CONFIG_SAMSUNG_Q10=m
+CONFIG_APPLE_GMUX=m
+CONFIG_PVPANIC=m
+
+#
+# Hardware Spinlock drivers
+#
 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
+CONFIG_DMAR_TABLE=y
+CONFIG_INTEL_IOMMU=y
+# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
+CONFIG_INTEL_IOMMU_FLOPPY_WA=y
+
+#
+# Remoteproc drivers
+#
+CONFIG_REMOTEPROC=m
+CONFIG_STE_MODEM_RPROC=m
+
+#
+# Rpmsg drivers
+#
+# CONFIG_PM_DEVFREQ is not set
+CONFIG_EXTCON=m
+
+#
+# Extcon Device Drivers
+#
+CONFIG_EXTCON_GPIO=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
+# CONFIG_RESET_CONTROLLER is not set
 
 #
 # Firmware Drivers
@@ -4911,24 +5595,27 @@ CONFIG_CLKSRC_I8253=y
 CONFIG_EDD=m
 # CONFIG_EDD_OFF is not set
 CONFIG_FIRMWARE_MEMMAP=y
-CONFIG_EFI_VARS=y
 CONFIG_DELL_RBU=m
 CONFIG_DCDBAS=m
 CONFIG_DMIID=y
 CONFIG_DMI_SYSFS=m
 CONFIG_ISCSI_IBFT_FIND=y
 CONFIG_ISCSI_IBFT=m
-CONFIG_SIGMA=m
 # CONFIG_GOOGLE_FIRMWARE is not set
 
 #
+# EFI (Extensible Firmware Interface) Support
+#
+# CONFIG_EFI_VARS is not set
+
+#
 # File systems
 #
+CONFIG_DCACHE_WORD_ACCESS=y
 # CONFIG_EXT2_FS is not set
 # CONFIG_EXT3_FS is not set
 CONFIG_EXT4_FS=m
 CONFIG_EXT4_USE_FOR_EXT23=y
-CONFIG_EXT4_FS_XATTR=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 # CONFIG_EXT4_DEBUG is not set
@@ -4950,6 +5637,7 @@ CONFIG_XFS_FS=m
 CONFIG_XFS_QUOTA=y
 CONFIG_XFS_POSIX_ACL=y
 CONFIG_XFS_RT=y
+# CONFIG_XFS_WARN is not set
 # CONFIG_XFS_DEBUG is not set
 CONFIG_GFS2_FS=m
 CONFIG_GFS2_FS_LOCKING_DLM=y
@@ -4961,6 +5649,9 @@ CONFIG_OCFS2_FS_STATS=y
 # CONFIG_OCFS2_DEBUG_FS is not set
 CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
+# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
+# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+# CONFIG_BTRFS_DEBUG is not set
 CONFIG_NILFS2_FS=m
 CONFIG_FS_POSIX_ACL=y
 CONFIG_EXPORTFS=y
@@ -4969,7 +5660,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
@@ -5029,11 +5720,12 @@ CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TMPFS_XATTR=y
 CONFIG_HUGETLBFS=y
 CONFIG_HUGETLB_PAGE=y
-CONFIG_CONFIGFS_FS=m
+CONFIG_CONFIGFS_FS=y
 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
@@ -5052,17 +5744,17 @@ CONFIG_JFFS2_ZLIB=y
 CONFIG_JFFS2_RTIME=y
 # CONFIG_JFFS2_RUBIN is not set
 CONFIG_UBIFS_FS=m
-CONFIG_UBIFS_FS_XATTR=y
 # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
 CONFIG_UBIFS_FS_LZO=y
 CONFIG_UBIFS_FS_ZLIB=y
-# CONFIG_UBIFS_FS_DEBUG is not set
 CONFIG_LOGFS=m
 CONFIG_CRAMFS=m
 CONFIG_SQUASHFS=m
 CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_ZLIB=y
 CONFIG_SQUASHFS_LZO=y
 CONFIG_SQUASHFS_XZ=y
+# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_EMBEDDED is not set
 CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # CONFIG_VXFS_FS is not set
@@ -5070,37 +5762,56 @@ CONFIG_MINIX_FS=m
 CONFIG_OMFS_FS=m
 # CONFIG_HPFS_FS is not set
 # CONFIG_QNX4FS_FS is not set
+# CONFIG_QNX6FS_FS is not set
 # CONFIG_ROMFS_FS is not set
 CONFIG_PSTORE=y
+# CONFIG_PSTORE_CONSOLE is not set
+# CONFIG_PSTORE_FTRACE is not set
+CONFIG_PSTORE_RAM=m
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
 # CONFIG_UFS_DEBUG is not set
 CONFIG_EXOFS_FS=m
 # CONFIG_EXOFS_DEBUG is not set
+CONFIG_F2FS_FS=m
+CONFIG_F2FS_STAT_FS=y
+CONFIG_F2FS_FS_XATTR=y
+CONFIG_F2FS_FS_POSIX_ACL=y
+CONFIG_EFIVAR_FS=y
+CONFIG_ORE=m
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=m
-CONFIG_NFS_V3=y
+CONFIG_NFS_V2=m
+CONFIG_NFS_V3=m
 CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=y
-# CONFIG_NFS_V4_1 is not set
+CONFIG_NFS_V4=m
+CONFIG_NFS_SWAP=y
+CONFIG_NFS_V4_1=y
+CONFIG_PNFS_FILE_LAYOUT=m
+CONFIG_PNFS_BLOCK=m
+CONFIG_PNFS_OBJLAYOUT=m
+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_USE_NEW_IDMAPPER is not set
+CONFIG_NFS_DEBUG=y
 CONFIG_NFSD=m
-# CONFIG_NFSD_DEPRECATED is not set
 CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3=y
 CONFIG_NFSD_V3_ACL=y
 CONFIG_NFSD_V4=y
+# CONFIG_NFSD_FAULT_INJECTION is not set
 CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
 CONFIG_NFS_ACL_SUPPORT=m
 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
 CONFIG_CIFS=m
 CONFIG_CIFS_STATS=y
@@ -5109,10 +5820,11 @@ CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_POSIX=y
-# CONFIG_CIFS_DEBUG2 is not set
+CONFIG_CIFS_ACL=y
+# CONFIG_CIFS_DEBUG is not set
 CONFIG_CIFS_DFS_UPCALL=y
+CONFIG_CIFS_SMB2=y
 CONFIG_CIFS_FSCACHE=y
-CONFIG_CIFS_ACL=y
 CONFIG_NCP_FS=m
 # CONFIG_NCPFS_PACKET_SIGNING is not set
 # CONFIG_NCPFS_IOCTL_LOCKING is not set
@@ -5129,29 +5841,6 @@ CONFIG_AFS_FSCACHE=y
 CONFIG_9P_FS=m
 CONFIG_9P_FSCACHE=y
 CONFIG_9P_FS_POSIX_ACL=y
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_MAC_PARTITION=y
-CONFIG_MSDOS_PARTITION=y
-CONFIG_BSD_DISKLABEL=y
-CONFIG_MINIX_SUBPARTITION=y
-CONFIG_SOLARIS_X86_PARTITION=y
-# CONFIG_UNIXWARE_DISKLABEL is not set
-CONFIG_LDM_PARTITION=y
-# CONFIG_LDM_DEBUG is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-CONFIG_KARMA_PARTITION=y
-CONFIG_EFI_PARTITION=y
-# CONFIG_SYSV68_PARTITION is not set
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
 CONFIG_NLS_CODEPAGE_437=m
@@ -5191,6 +5880,17 @@ CONFIG_NLS_ISO8859_14=m
 CONFIG_NLS_ISO8859_15=m
 CONFIG_NLS_KOI8_R=m
 CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_MAC_ROMAN=m
+CONFIG_NLS_MAC_CELTIC=m
+CONFIG_NLS_MAC_CENTEURO=m
+CONFIG_NLS_MAC_CROATIAN=m
+CONFIG_NLS_MAC_CYRILLIC=m
+CONFIG_NLS_MAC_GAELIC=m
+CONFIG_NLS_MAC_GREEK=m
+CONFIG_NLS_MAC_ICELAND=m
+CONFIG_NLS_MAC_INUIT=m
+CONFIG_NLS_MAC_ROMANIAN=m
+CONFIG_NLS_MAC_TURKISH=m
 CONFIG_NLS_UTF8=m
 CONFIG_DLM=m
 # CONFIG_DLM_DEBUG is not set
@@ -5206,6 +5906,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
 CONFIG_FRAME_WARN=1024
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_STRIP_ASM_SYMS=y
+# CONFIG_READABLE_ASM is not set
 CONFIG_UNUSED_SYMBOLS=y
 CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
@@ -5218,6 +5919,8 @@ CONFIG_HARDLOCKUP_DETECTOR=y
 CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
 CONFIG_DETECT_HUNG_TASK=y
 CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
@@ -5228,6 +5931,7 @@ CONFIG_TIMER_STATS=y
 # CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_SLUB_STATS is not set
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
 # CONFIG_DEBUG_KMEMLEAK is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
@@ -5235,9 +5939,8 @@ CONFIG_TIMER_STATS=y
 CONFIG_DEBUG_MUTEXES=y
 # CONFIG_DEBUG_LOCK_ALLOC is not set
 # CONFIG_PROVE_LOCKING is not set
-# CONFIG_SPARSE_RCU_POINTER is not set
 # CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 CONFIG_STACKTRACE=y
 # CONFIG_DEBUG_STACK_USAGE is not set
@@ -5257,35 +5960,42 @@ 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_SPARSE_RCU_POINTER is not set
 # CONFIG_RCU_TORTURE_TEST is not set
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
+# CONFIG_RCU_CPU_STALL_INFO is not set
+# CONFIG_RCU_TRACE is not set
 # CONFIG_KPROBES_SANITY_TEST is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
 CONFIG_LKDTM=m
-CONFIG_CPU_NOTIFIER_ERROR_INJECT=m
+# CONFIG_NOTIFIER_ERROR_INJECTION is not set
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_LATENCYTOP is not set
-CONFIG_SYSCTL_SYSCALL_CHECK=y
+CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y
+# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
 # CONFIG_DEBUG_PAGEALLOC is not set
 CONFIG_USER_STACKTRACE_SUPPORT=y
 CONFIG_NOP_TRACER=y
-CONFIG_HAVE_FTRACE_NMI_ENTER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
 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
 CONFIG_TRACER_MAX_TRACE=y
+CONFIG_TRACE_CLOCK=y
 CONFIG_RING_BUFFER=y
-CONFIG_FTRACE_NMI_ENTER=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
@@ -5297,19 +6007,27 @@ CONFIG_FUNCTION_GRAPH_TRACER=y
 # CONFIG_IRQSOFF_TRACER is not set
 CONFIG_SCHED_TRACER=y
 CONFIG_FTRACE_SYSCALLS=y
+CONFIG_TRACER_SNAPSHOT=y
+# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
 CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
 # CONFIG_PROFILE_ALL_BRANCHES is not set
 CONFIG_STACK_TRACER=y
 CONFIG_BLK_DEV_IO_TRACE=y
 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
 CONFIG_MMIOTRACE=y
 # CONFIG_MMIOTRACE_TEST is not set
 CONFIG_RING_BUFFER_BENCHMARK=m
+# CONFIG_RING_BUFFER_STARTUP_TEST is not set
+# CONFIG_RBTREE_TEST is not set
+# CONFIG_INTERVAL_TREE_TEST is not set
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
 # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
 CONFIG_DYNAMIC_DEBUG=y
@@ -5320,6 +6038,7 @@ CONFIG_ASYNC_RAID6_TEST=m
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
 CONFIG_HAVE_ARCH_KMEMCHECK=y
+# CONFIG_TEST_STRING_HELPERS is not set
 CONFIG_TEST_KSTRTOX=m
 CONFIG_STRICT_DEVMEM=y
 CONFIG_X86_VERBOSE_BOOTUP=y
@@ -5332,6 +6051,7 @@ CONFIG_DEBUG_RODATA=y
 # CONFIG_DEBUG_SET_MODULE_RONX is not set
 # CONFIG_DEBUG_NX_TEST is not set
 CONFIG_DOUBLEFAULT=y
+# CONFIG_DEBUG_TLBFLUSH is not set
 # CONFIG_IOMMU_STRESS is not set
 CONFIG_HAVE_MMIOTRACE_SUPPORT=y
 # CONFIG_X86_DECODER_SELFTEST is not set
@@ -5347,7 +6067,7 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
 # CONFIG_DEBUG_BOOT_PARAMS is not set
 # CONFIG_CPA_DEBUG is not set
 # CONFIG_OPTIMIZE_INLINING is not set
-# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
+# CONFIG_DEBUG_NMI_SELFTEST is not set
 
 #
 # Security options
@@ -5366,11 +6086,19 @@ CONFIG_SECURITY_PATH=y
 # CONFIG_SECURITY_SELINUX is not set
 # CONFIG_SECURITY_SMACK is not set
 CONFIG_SECURITY_TOMOYO=y
+CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
+CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
+# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
+CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/usr/bin/tomoyo-init"
+CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd"
 CONFIG_SECURITY_APPARMOR=y
 CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0
+CONFIG_SECURITY_YAMA=y
+CONFIG_SECURITY_YAMA_STACKED=y 
 # CONFIG_IMA is not set
 # CONFIG_DEFAULT_SECURITY_TOMOYO is not set
 # CONFIG_DEFAULT_SECURITY_APPARMOR is not set
+# CONFIG_DEFAULT_SECURITY_YAMA is not set
 CONFIG_DEFAULT_SECURITY_DAC=y
 CONFIG_DEFAULT_SECURITY=""
 CONFIG_XOR_BLOCKS=m
@@ -5379,14 +6107,12 @@ CONFIG_ASYNC_MEMCPY=m
 CONFIG_ASYNC_XOR=m
 CONFIG_ASYNC_PQ=m
 CONFIG_ASYNC_RAID6_RECOV=m
-CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y
-CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y
 CONFIG_CRYPTO=y
 
 #
 # Crypto core or helper
 #
-CONFIG_CRYPTO_ALGAPI=m
+CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_ALGAPI2=y
 CONFIG_CRYPTO_AEAD=m
 CONFIG_CRYPTO_AEAD2=y
@@ -5400,6 +6126,7 @@ CONFIG_CRYPTO_PCOMP=m
 CONFIG_CRYPTO_PCOMP2=y
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_USER=m
 CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
 CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CRYPTO_NULL=m
@@ -5408,6 +6135,8 @@ CONFIG_CRYPTO_WORKQUEUE=y
 CONFIG_CRYPTO_CRYPTD=m
 CONFIG_CRYPTO_AUTHENC=m
 CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_ABLK_HELPER_X86=m
+CONFIG_CRYPTO_GLUE_HELPER_X86=m
 
 #
 # Authenticated Encryption with Associated Data
@@ -5430,6 +6159,7 @@ CONFIG_CRYPTO_XTS=m
 #
 # Hash modes
 #
+CONFIG_CRYPTO_CMAC=m
 CONFIG_CRYPTO_HMAC=m
 CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_VMAC=m
@@ -5439,6 +6169,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
@@ -5456,13 +6188,15 @@ CONFIG_CRYPTO_WP512=m
 #
 # Ciphers
 #
-CONFIG_CRYPTO_AES=m
+CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_AES_586=m
 CONFIG_CRYPTO_AES_NI_INTEL=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_BLOWFISH_COMMON=m
 CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAST_COMMON=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_DES=m
@@ -5472,6 +6206,7 @@ CONFIG_CRYPTO_SALSA20=m
 CONFIG_CRYPTO_SALSA20_586=m
 CONFIG_CRYPTO_SEED=m
 CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_SERPENT_SSE2_586=m
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TWOFISH=m
 CONFIG_CRYPTO_TWOFISH_COMMON=m
@@ -5482,7 +6217,7 @@ CONFIG_CRYPTO_TWOFISH_586=m
 #
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_ZLIB=m
-CONFIG_CRYPTO_LZO=m
+CONFIG_CRYPTO_LZO=y
 
 #
 # Random Number Generation
@@ -5498,23 +6233,26 @@ CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
 CONFIG_CRYPTO_DEV_GEODE=m
 CONFIG_CRYPTO_DEV_HIFN_795X=m
 CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
+CONFIG_ASYMMETRIC_KEY_TYPE=m
+CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m
+CONFIG_PUBLIC_KEY_ALGO_RSA=m
+CONFIG_X509_CERTIFICATE_PARSER=m
 CONFIG_HAVE_KVM=y
 CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM_IRQ_ROUTING=y
 CONFIG_HAVE_KVM_EVENTFD=y
 CONFIG_KVM_APIC_ARCHITECTURE=y
 CONFIG_KVM_MMIO=y
 CONFIG_KVM_ASYNC_PF=y
+CONFIG_HAVE_KVM_MSI=y
+CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=m
 CONFIG_KVM_INTEL=m
 CONFIG_KVM_AMD=m
 CONFIG_KVM_MMU_AUDIT=y
-CONFIG_VHOST_NET=m
+CONFIG_KVM_DEVICE_ASSIGNMENT=y
 CONFIG_LGUEST=m
-CONFIG_VIRTIO=y
-CONFIG_VIRTIO_RING=y
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_BALLOON=m
 CONFIG_BINARY_PRINTF=y
 
 #
@@ -5522,14 +6260,26 @@ CONFIG_BINARY_PRINTF=y
 #
 CONFIG_RAID6_PQ=m
 CONFIG_BITREVERSE=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_GENERIC_IOMAP=y
+CONFIG_GENERIC_IO=y
+CONFIG_PERCPU_RWSEM=y
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
 CONFIG_CRC_T10DIF=m
 CONFIG_CRC_ITU_T=m
 CONFIG_CRC32=y
+# CONFIG_CRC32_SELFTEST is not set
+CONFIG_CRC32_SLICEBY8=y
+# CONFIG_CRC32_SLICEBY4 is not set
+# CONFIG_CRC32_SARWATE is not set
+# CONFIG_CRC32_BIT is not set
 CONFIG_CRC7=m
 CONFIG_LIBCRC32C=m
+CONFIG_CRC8=m
 CONFIG_AUDIT_GENERIC=y
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
@@ -5549,8 +6299,13 @@ CONFIG_DECOMPRESS_BZIP2=y
 CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DECOMPRESS_XZ=y
 CONFIG_DECOMPRESS_LZO=y
+CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_REED_SOLOMON=m
+CONFIG_REED_SOLOMON_ENC8=y
+CONFIG_REED_SOLOMON_DEC8=y
 CONFIG_REED_SOLOMON_DEC16=y
+CONFIG_BCH=m
+CONFIG_BCH_CONST_PARAMS=y
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m
 CONFIG_TEXTSEARCH_BM=m
@@ -5561,6 +6316,14 @@ CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
 CONFIG_CHECK_SIGNATURE=y
 CONFIG_CPU_RMAP=y
+CONFIG_DQL=y
 CONFIG_NLATTR=y
+CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
 CONFIG_LRU_CACHE=m
 CONFIG_AVERAGE=y
+CONFIG_CLZ_TAB=y
+CONFIG_CORDIC=m
+CONFIG_DDR=y
+CONFIG_MPILIB=m
+CONFIG_OID_REGISTRY=m
+CONFIG_UCS2_STRING=y
diff --git a/libre/linux-libre-lts/config.x86_64 b/libre/linux-libre-lts/config.x86_64
index 092d3f4fa..36e06facd 100644
--- a/libre/linux-libre-lts/config.x86_64
+++ b/libre/linux-libre-lts/config.x86_64
@@ -1,48 +1,35 @@
 #
-# Automatically generated make config: don't edit
-# Linux/x86_64 3.0.54-1 Kernel Configuration
+# Automatically generated file; DO NOT EDIT.
+# Linux/x86 3.10.10-1 Kernel Configuration
 #
 CONFIG_64BIT=y
-# CONFIG_X86_32 is not set
 CONFIG_X86_64=y
 CONFIG_X86=y
 CONFIG_INSTRUCTION_DECODER=y
 CONFIG_OUTPUT_FORMAT="elf64-x86-64"
 CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
-CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_CLOCKSOURCE_WATCHDOG=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_MMU=y
-CONFIG_ZONE_DMA=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_SG_DMA_LENGTH=y
 CONFIG_GENERIC_ISA_DMA=y
-CONFIG_GENERIC_IOMAP=y
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
 CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_GPIO=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_ARCH_HAS_CPU_RELAX=y
-CONFIG_ARCH_HAS_DEFAULT_IDLE=y
 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+CONFIG_ARCH_HAS_CPU_AUTOPROBE=y
 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
 CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
 CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
-CONFIG_HAVE_CPUMASK_OF_CPU_MAP=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ZONE_DMA32=y
-CONFIG_ARCH_POPULATES_NODE_MAP=y
 CONFIG_AUDIT_ARCH=y
 CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -50,16 +37,15 @@ CONFIG_HAVE_INTEL_TXT=y
 CONFIG_X86_64_SMP=y
 CONFIG_X86_HT=y
 CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
-# CONFIG_KTIME_SCALAR is not set
 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-LTS"
@@ -80,44 +66,84 @@ CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
 CONFIG_POSIX_MQUEUE_SYSCTL=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_FHANDLE=y
-CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TASK_XACCT=y
-CONFIG_TASK_IO_ACCOUNTING=y
 CONFIG_AUDIT=y
 CONFIG_AUDITSYSCALL=y
 CONFIG_AUDIT_WATCH=y
 CONFIG_AUDIT_TREE=y
+CONFIG_AUDIT_LOGINUID_IMMUTABLE=y
 CONFIG_HAVE_GENERIC_HARDIRQS=y
 
 #
 # IRQ subsystem
 #
 CONFIG_GENERIC_HARDIRQS=y
-CONFIG_HAVE_SPARSE_IRQ=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_IRQ_SHOW=y
 CONFIG_GENERIC_PENDING_IRQ=y
+CONFIG_IRQ_DOMAIN=y
+# CONFIG_IRQ_DOMAIN_DEBUG is not set
 CONFIG_IRQ_FORCED_THREADING=y
-# CONFIG_SPARSE_IRQ is not set
+CONFIG_SPARSE_IRQ=y
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_ARCH_CLOCKSOURCE_DATA=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+
+#
+# Timers subsystem
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ_COMMON=y
+# CONFIG_HZ_PERIODIC is not set
+CONFIG_NO_HZ_IDLE=y
+# CONFIG_NO_HZ_FULL is not set
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+
+#
+# CPU/Task time and stats accounting
+#
+CONFIG_TICK_CPU_ACCOUNTING=y
+# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
 
 #
 # RCU Subsystem
 #
 CONFIG_TREE_RCU=y
+# CONFIG_TREE_PREEMPT_RCU is not set
 # CONFIG_PREEMPT_RCU is not set
-# CONFIG_RCU_TRACE is not set
+CONFIG_RCU_STALL_COMMON=y
+# CONFIG_RCU_USER_QS is not set
 CONFIG_RCU_FANOUT=64
+CONFIG_RCU_FANOUT_LEAF=16
 # CONFIG_RCU_FANOUT_EXACT is not set
 # CONFIG_RCU_FAST_NO_HZ is not set
 # CONFIG_TREE_RCU_TRACE is not set
+CONFIG_RCU_NOCB_CPU=y
+CONFIG_RCU_NOCB_CPU_NONE=y
+# CONFIG_RCU_NOCB_CPU_ZERO is not set
+# CONFIG_RCU_NOCB_CPU_ALL is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=19
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
+CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=y
+CONFIG_ARCH_USES_NUMA_PROT_NONE=y
+CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
+CONFIG_NUMA_BALANCING=y
 CONFIG_CGROUPS=y
 # CONFIG_CGROUP_DEBUG is not set
 CONFIG_CGROUP_FREEZER=y
@@ -126,19 +152,22 @@ CONFIG_CPUSETS=y
 CONFIG_PROC_PID_CPUSET=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_RESOURCE_COUNTERS=y
-CONFIG_CGROUP_MEM_RES_CTLR=y
-CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
-# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
+CONFIG_MEMCG=y
+CONFIG_MEMCG_SWAP=y
+# CONFIG_MEMCG_SWAP_ENABLED is not set
+CONFIG_MEMCG_KMEM=y
+# CONFIG_CGROUP_HUGETLB is not set
 # CONFIG_CGROUP_PERF is not set
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_CFS_BANDWIDTH=y
 CONFIG_RT_GROUP_SCHED=y
 CONFIG_BLK_CGROUP=y
 # CONFIG_DEBUG_BLK_CGROUP is not set
+CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_NAMESPACES=y
 CONFIG_UTS_NS=y
 CONFIG_IPC_NS=y
-CONFIG_USER_NS=y
 CONFIG_PID_NS=y
 CONFIG_NET_NS=y
 CONFIG_SCHED_AUTOGROUP=y
@@ -155,12 +184,15 @@ CONFIG_RD_LZO=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
+CONFIG_HAVE_UID16=y
+CONFIG_SYSCTL_EXCEPTION_TRACE=y
+CONFIG_HOTPLUG=y
+CONFIG_HAVE_PCSPKR_PLATFORM=y
 # CONFIG_EXPERT is not set
 CONFIG_UID16=y
-CONFIG_SYSCTL_SYSCALL=y
+# CONFIG_SYSCTL_SYSCALL is not set
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
-CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
@@ -173,6 +205,7 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_AIO=y
+CONFIG_PCI_QUIRKS=y
 # CONFIG_EMBEDDED is not set
 CONFIG_HAVE_PERF_EVENTS=y
 
@@ -180,10 +213,8 @@ CONFIG_HAVE_PERF_EVENTS=y
 # Kernel Performance Events And Counters
 #
 CONFIG_PERF_EVENTS=y
-CONFIG_PERF_COUNTERS=y
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_PCI_QUIRKS=y
 CONFIG_SLUB_DEBUG=y
 # CONFIG_COMPAT_BRK is not set
 # CONFIG_SLAB is not set
@@ -193,26 +224,49 @@ CONFIG_TRACEPOINTS=y
 CONFIG_OPROFILE=m
 # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
 CONFIG_HAVE_OPROFILE=y
+CONFIG_OPROFILE_NMI_TIMER=y
 CONFIG_KPROBES=y
 CONFIG_JUMP_LABEL=y
 CONFIG_OPTPROBES=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_USE_GENERIC_SMP_HELPERS=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_DMA_API_DEBUG=y
 CONFIG_HAVE_HW_BREAKPOINT=y
 CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
 CONFIG_HAVE_USER_RETURN_NOTIFIER=y
 CONFIG_HAVE_PERF_EVENTS_NMI=y
+CONFIG_HAVE_PERF_REGS=y
+CONFIG_HAVE_PERF_USER_STACK_DUMP=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
+CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
+CONFIG_HAVE_CMPXCHG_LOCAL=y
+CONFIG_HAVE_CMPXCHG_DOUBLE=y
+CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
+CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP_FILTER=y
+CONFIG_HAVE_CONTEXT_TRACKING=y
+CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+CONFIG_MODULES_USE_ELF_RELA=y
+CONFIG_OLD_SIGSUSPEND3=y
+CONFIG_COMPAT_OLD_SIGACTION=y
 
 #
 # GCOV-based kernel profiling
@@ -228,11 +282,36 @@ CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MODVERSIONS=y
 # CONFIG_MODULE_SRCVERSION_ALL is not set
+# CONFIG_MODULE_SIG is not set
 CONFIG_STOP_MACHINE=y
 CONFIG_BLOCK=y
 CONFIG_BLK_DEV_BSG=y
+CONFIG_BLK_DEV_BSGLIB=y
 # CONFIG_BLK_DEV_INTEGRITY is not set
 CONFIG_BLK_DEV_THROTTLING=y
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+CONFIG_MAC_PARTITION=y
+CONFIG_MSDOS_PARTITION=y
+CONFIG_BSD_DISKLABEL=y
+CONFIG_MINIX_SUBPARTITION=y
+CONFIG_SOLARIS_X86_PARTITION=y
+# CONFIG_UNIXWARE_DISKLABEL is not set
+CONFIG_LDM_PARTITION=y
+# CONFIG_LDM_DEBUG is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+CONFIG_KARMA_PARTITION=y
+CONFIG_EFI_PARTITION=y
+# CONFIG_SYSV68_PARTITION is not set
 CONFIG_BLOCK_COMPAT=y
 
 #
@@ -248,64 +327,39 @@ CONFIG_DEFAULT_DEADLINE=y
 CONFIG_DEFAULT_IOSCHED="deadline"
 CONFIG_PREEMPT_NOTIFIERS=y
 CONFIG_PADATA=y
-# CONFIG_INLINE_SPIN_TRYLOCK is not set
-# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK is not set
-# CONFIG_INLINE_SPIN_LOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
-CONFIG_INLINE_SPIN_UNLOCK=y
-# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+CONFIG_ASN1=m
 CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_READ_TRYLOCK is not set
-# CONFIG_INLINE_READ_LOCK is not set
-# CONFIG_INLINE_READ_LOCK_BH is not set
-# CONFIG_INLINE_READ_LOCK_IRQ is not set
-# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
 CONFIG_INLINE_READ_UNLOCK=y
-# CONFIG_INLINE_READ_UNLOCK_BH is not set
 CONFIG_INLINE_READ_UNLOCK_IRQ=y
-# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_WRITE_TRYLOCK is not set
-# CONFIG_INLINE_WRITE_LOCK is not set
-# CONFIG_INLINE_WRITE_LOCK_BH is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
 CONFIG_INLINE_WRITE_UNLOCK=y
-# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
 CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
-# CONFIG_MUTEX_SPIN_ON_OWNER is not set
 CONFIG_FREEZER=y
 
 #
 # Processor type and features
 #
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_ZONE_DMA=y
 CONFIG_SMP=y
+CONFIG_X86_X2APIC=y
 CONFIG_X86_MPPARSE=y
 # CONFIG_X86_EXTENDED_PLATFORM is not set
+# CONFIG_X86_INTEL_LPSS is not set
 CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
-CONFIG_PARAVIRT_GUEST=y
+CONFIG_HYPERVISOR_GUEST=y
+CONFIG_PARAVIRT=y
+# CONFIG_PARAVIRT_DEBUG is not set
+# CONFIG_PARAVIRT_SPINLOCKS is not set
 CONFIG_XEN=y
 CONFIG_XEN_DOM0=y
 CONFIG_XEN_PRIVILEGED_GUEST=y
 CONFIG_XEN_PVHVM=y
-CONFIG_XEN_MAX_DOMAIN_MEMORY=128
+CONFIG_XEN_MAX_DOMAIN_MEMORY=500
 CONFIG_XEN_SAVE_RESTORE=y
 # CONFIG_XEN_DEBUG_FS is not set
-# CONFIG_XEN_DEBUG is not set
-CONFIG_KVM_CLOCK=y
 CONFIG_KVM_GUEST=y
-CONFIG_PARAVIRT=y
-# CONFIG_PARAVIRT_SPINLOCKS is not set
+CONFIG_PARAVIRT_TIME_ACCOUNTING=y
 CONFIG_PARAVIRT_CLOCK=y
-# CONFIG_PARAVIRT_DEBUG is not set
 CONFIG_NO_BOOTMEM=y
 # CONFIG_MEMTEST is not set
 # CONFIG_MK8 is not set
@@ -313,12 +367,8 @@ CONFIG_NO_BOOTMEM=y
 # CONFIG_MCORE2 is not set
 # CONFIG_MATOM is not set
 CONFIG_GENERIC_CPU=y
-CONFIG_X86_INTERNODE_CACHE_SHIFT=7
-CONFIG_X86_CMPXCHG=y
-CONFIG_CMPXCHG_LOCAL=y
+CONFIG_X86_INTERNODE_CACHE_SHIFT=6
 CONFIG_X86_L1_CACHE_SHIFT=6
-CONFIG_X86_XADD=y
-CONFIG_X86_WP_WORKS_OK=y
 CONFIG_X86_TSC=y
 CONFIG_X86_CMPXCHG64=y
 CONFIG_X86_CMOV=y
@@ -333,16 +383,12 @@ CONFIG_DMI=y
 CONFIG_GART_IOMMU=y
 CONFIG_CALGARY_IOMMU=y
 CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
-CONFIG_AMD_IOMMU=y
-# CONFIG_AMD_IOMMU_STATS is not set
 CONFIG_SWIOTLB=y
 CONFIG_IOMMU_HELPER=y
-CONFIG_IOMMU_API=y
 # CONFIG_MAXSMP is not set
 CONFIG_NR_CPUS=64
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
-# CONFIG_IRQ_TIME_ACCOUNTING is not set
 CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PREEMPT is not set
@@ -387,11 +433,17 @@ CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
 CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y
 CONFIG_SPARSEMEM_VMEMMAP=y
 CONFIG_HAVE_MEMBLOCK=y
+CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
+CONFIG_ARCH_DISCARD_MEMBLOCK=y
+CONFIG_MEMORY_ISOLATION=y
+# CONFIG_MOVABLE_NODE is not set
+CONFIG_HAVE_BOOTMEM_INFO_NODE=y
 CONFIG_MEMORY_HOTPLUG=y
 CONFIG_MEMORY_HOTPLUG_SPARSE=y
 CONFIG_MEMORY_HOTREMOVE=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_BALLOON_COMPACTION=y
 CONFIG_COMPACTION=y
 CONFIG_MIGRATION=y
 CONFIG_PHYS_ADDR_T_64BIT=y
@@ -405,9 +457,11 @@ CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_MEMORY_FAILURE=y
 CONFIG_HWPOISON_INJECT=m
 CONFIG_TRANSPARENT_HUGEPAGE=y
-# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
-CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
+CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
+# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
+CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CLEANCACHE=y
+CONFIG_FRONTSWAP=y
 CONFIG_X86_CHECK_BIOS_CORRUPTION=y
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
 CONFIG_X86_RESERVE_LOW=64
@@ -418,7 +472,9 @@ CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
 CONFIG_X86_PAT=y
 CONFIG_ARCH_USES_PG_UNCACHED=y
 CONFIG_ARCH_RANDOM=y
+CONFIG_X86_SMAP=y
 CONFIG_EFI=y
+CONFIG_EFI_STUB=y
 CONFIG_SECCOMP=y
 CONFIG_CC_STACKPROTECTOR=y
 CONFIG_HZ_100=y
@@ -434,6 +490,8 @@ CONFIG_PHYSICAL_START=0x1000000
 CONFIG_RELOCATABLE=y
 CONFIG_PHYSICAL_ALIGN=0x1000000
 CONFIG_HOTPLUG_CPU=y
+# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
+# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
 # CONFIG_COMPAT_VDSO is not set
 # CONFIG_CMDLINE_BOOL is not set
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@@ -451,25 +509,31 @@ CONFIG_HIBERNATION=y
 CONFIG_PM_STD_PARTITION=""
 CONFIG_PM_SLEEP=y
 CONFIG_PM_SLEEP_SMP=y
+CONFIG_PM_AUTOSLEEP=y
+CONFIG_PM_WAKELOCKS=y
+CONFIG_PM_WAKELOCKS_LIMIT=100
+CONFIG_PM_WAKELOCKS_GC=y
 CONFIG_PM_RUNTIME=y
 CONFIG_PM=y
 CONFIG_PM_DEBUG=y
 CONFIG_PM_ADVANCED_DEBUG=y
 # CONFIG_PM_TEST_SUSPEND is not set
-CONFIG_CAN_PM_TRACE=y
+CONFIG_PM_SLEEP_DEBUG=y
+CONFIG_PM_TRACE=y
 CONFIG_PM_TRACE_RTC=y
 CONFIG_ACPI=y
 CONFIG_ACPI_SLEEP=y
-CONFIG_ACPI_PROCFS=y
+# CONFIG_ACPI_PROCFS is not set
 # CONFIG_ACPI_PROCFS_POWER is not set
 CONFIG_ACPI_EC_DEBUGFS=m
-CONFIG_ACPI_PROC_EVENT=y
+# CONFIG_ACPI_PROC_EVENT is not set
 CONFIG_ACPI_AC=m
 CONFIG_ACPI_BATTERY=m
 CONFIG_ACPI_BUTTON=m
 CONFIG_ACPI_VIDEO=m
 CONFIG_ACPI_FAN=m
 CONFIG_ACPI_DOCK=y
+CONFIG_ACPI_I2C=m
 CONFIG_ACPI_PROCESSOR=m
 CONFIG_ACPI_IPMI=m
 CONFIG_ACPI_HOTPLUG_CPU=y
@@ -477,18 +541,21 @@ CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
 CONFIG_ACPI_THERMAL=m
 CONFIG_ACPI_NUMA=y
 # CONFIG_ACPI_CUSTOM_DSDT is not set
+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_HOTPLUG_MEMORY=m
+CONFIG_ACPI_CONTAINER=y
+CONFIG_ACPI_HOTPLUG_MEMORY=y
 CONFIG_ACPI_SBS=m
-CONFIG_ACPI_HED=m
+CONFIG_ACPI_HED=y
 CONFIG_ACPI_CUSTOM_METHOD=m
+CONFIG_ACPI_BGRT=y
 CONFIG_ACPI_APEI=y
-CONFIG_ACPI_APEI_GHES=m
+CONFIG_ACPI_APEI_GHES=y
 CONFIG_ACPI_APEI_PCIEAER=y
+CONFIG_ACPI_APEI_MEMORY_FAILURE=y
 CONFIG_ACPI_APEI_EINJ=m
 CONFIG_ACPI_APEI_ERST_DEBUG=m
 CONFIG_SFI=y
@@ -498,6 +565,7 @@ CONFIG_SFI=y
 #
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_TABLE=y
+CONFIG_CPU_FREQ_GOV_COMMON=y
 CONFIG_CPU_FREQ_STAT=m
 CONFIG_CPU_FREQ_STAT_DETAILS=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
@@ -513,9 +581,12 @@ 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
 CONFIG_X86_POWERNOW_K8=m
+CONFIG_X86_AMD_FREQ_SENSITIVITY=m
 # CONFIG_X86_SPEEDSTEP_CENTRINO is not set
 CONFIG_X86_P4_CLOCKMOD=m
 
@@ -524,8 +595,10 @@ CONFIG_X86_P4_CLOCKMOD=m
 #
 CONFIG_X86_SPEEDSTEP_LIB=m
 CONFIG_CPU_IDLE=y
+# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
+# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
 CONFIG_INTEL_IDLE=y
 
 #
@@ -542,11 +615,6 @@ CONFIG_PCI_DIRECT=y
 CONFIG_PCI_MMCONFIG=y
 CONFIG_PCI_XEN=y
 CONFIG_PCI_DOMAINS=y
-# CONFIG_PCI_CNB20LE_QUIRK is not set
-CONFIG_DMAR=y
-# CONFIG_DMAR_DEFAULT_ON is not set
-CONFIG_DMAR_FLOPPY_WA=y
-# CONFIG_INTR_REMAP is not set
 CONFIG_PCIEPORTBUS=y
 CONFIG_HOTPLUG_PCI_PCIE=m
 CONFIG_PCIEAER=y
@@ -554,14 +622,21 @@ CONFIG_PCIEAER=y
 # CONFIG_PCIEAER_INJECT is not set
 CONFIG_PCIEASPM=y
 # CONFIG_PCIEASPM_DEBUG is not set
+CONFIG_PCIEASPM_DEFAULT=y
+# CONFIG_PCIEASPM_POWERSAVE is not set
+# CONFIG_PCIEASPM_PERFORMANCE is not set
 CONFIG_PCIE_PME=y
 CONFIG_ARCH_SUPPORTS_MSI=y
 CONFIG_PCI_MSI=y
 # CONFIG_PCI_DEBUG is not set
+CONFIG_PCI_REALLOC_ENABLE_AUTO=y
 CONFIG_PCI_STUB=m
 CONFIG_XEN_PCIDEV_FRONTEND=m
 CONFIG_HT_IRQ=y
+CONFIG_PCI_ATS=y
 CONFIG_PCI_IOV=y
+CONFIG_PCI_PRI=y
+CONFIG_PCI_PASID=y
 CONFIG_PCI_IOAPIC=y
 CONFIG_PCI_LABEL=y
 CONFIG_ISA_DMA_API=y
@@ -583,39 +658,46 @@ CONFIG_YENTA_TOSHIBA=y
 CONFIG_PD6729=m
 CONFIG_I82092=m
 CONFIG_PCCARD_NONSTATIC=y
-CONFIG_HOTPLUG_PCI=m
-CONFIG_HOTPLUG_PCI_FAKE=m
-CONFIG_HOTPLUG_PCI_ACPI=m
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_ACPI=y
 CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 CONFIG_HOTPLUG_PCI_CPCI=y
 CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
 CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
 CONFIG_HOTPLUG_PCI_SHPC=m
 CONFIG_RAPIDIO=y
+CONFIG_RAPIDIO_TSI721=y
 CONFIG_RAPIDIO_DISC_TIMEOUT=30
 # CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set
+CONFIG_RAPIDIO_DMA_ENGINE=y
+CONFIG_RAPIDIO_DEBUG=y
+CONFIG_RAPIDIO_ENUM_BASIC=m
 CONFIG_RAPIDIO_TSI57X=y
 CONFIG_RAPIDIO_CPS_XX=y
 CONFIG_RAPIDIO_TSI568=y
 CONFIG_RAPIDIO_CPS_GEN2=y
 CONFIG_RAPIDIO_TSI500=y
-CONFIG_RAPIDIO_DEBUG=y
 
 #
 # Executable file formats / Emulations
 #
 CONFIG_BINFMT_ELF=y
 CONFIG_COMPAT_BINFMT_ELF=y
+CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_BINFMT_SCRIPT=y
 # CONFIG_HAVE_AOUT is not set
 CONFIG_BINFMT_MISC=y
+CONFIG_COREDUMP=y
 CONFIG_IA32_EMULATION=y
 CONFIG_IA32_AOUT=m
+CONFIG_X86_X32=y
 CONFIG_COMPAT=y
 CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
 CONFIG_SYSVIPC_COMPAT=y
 CONFIG_KEYS_COMPAT=y
 CONFIG_HAVE_TEXT_POKE_SMP=y
+CONFIG_X86_DEV_DMA_OPS=y
 CONFIG_NET=y
 CONFIG_COMPAT_NETLINK_MESSAGES=y
 
@@ -623,8 +705,11 @@ CONFIG_COMPAT_NETLINK_MESSAGES=y
 # Networking options
 #
 CONFIG_PACKET=y
+CONFIG_PACKET_DIAG=m
 CONFIG_UNIX=y
+CONFIG_UNIX_DIAG=m
 CONFIG_XFRM=y
+CONFIG_XFRM_ALGO=m
 CONFIG_XFRM_USER=m
 # CONFIG_XFRM_SUB_POLICY is not set
 # CONFIG_XFRM_MIGRATE is not set
@@ -643,6 +728,7 @@ CONFIG_IP_ROUTE_CLASSID=y
 # CONFIG_IP_PNP is not set
 CONFIG_NET_IPIP=m
 CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IP_TUNNEL=m
 CONFIG_NET_IPGRE=m
 # CONFIG_NET_IPGRE_BROADCAST is not set
 CONFIG_IP_MROUTE=y
@@ -651,6 +737,7 @@ CONFIG_IP_PIMSM_V1=y
 CONFIG_IP_PIMSM_V2=y
 CONFIG_ARPD=y
 CONFIG_SYN_COOKIES=y
+CONFIG_NET_IPVTI=m
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
@@ -660,8 +747,9 @@ CONFIG_INET_XFRM_MODE_TRANSPORT=m
 CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_LRO=y
-CONFIG_INET_DIAG=y
-CONFIG_INET_TCP_DIAG=y
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
+CONFIG_INET_UDP_DIAG=m
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_CONG_BIC=m
 CONFIG_TCP_CONG_CUBIC=y
@@ -698,6 +786,7 @@ CONFIG_IPV6_SIT=m
 CONFIG_IPV6_SIT_6RD=y
 CONFIG_IPV6_NDISC_NODETYPE=y
 CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_GRE=m
 CONFIG_IPV6_MULTIPLE_TABLES=y
 CONFIG_IPV6_SUBTREES=y
 # CONFIG_IPV6_MROUTE is not set
@@ -713,14 +802,18 @@ CONFIG_BRIDGE_NETFILTER=y
 # Core Netfilter Configuration
 #
 CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_ACCT=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_SECMARK=y
 CONFIG_NF_CONNTRACK_ZONES=y
+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
@@ -737,6 +830,19 @@ CONFIG_NF_CONNTRACK_SANE=m
 CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CT_NETLINK=m
+CONFIG_NF_CT_NETLINK_TIMEOUT=m
+CONFIG_NF_CT_NETLINK_HELPER=m
+CONFIG_NETFILTER_NETLINK_QUEUE_CT=y
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_NF_NAT_PROTO_DCCP=m
+CONFIG_NF_NAT_PROTO_UDPLITE=m
+CONFIG_NF_NAT_PROTO_SCTP=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_NF_NAT_TFTP=m
 CONFIG_NETFILTER_TPROXY=m
 CONFIG_NETFILTER_XTABLES=m
 
@@ -758,13 +864,17 @@ CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
 CONFIG_NETFILTER_XT_TARGET_CT=m
 CONFIG_NETFILTER_XT_TARGET_DSCP=m
 CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_HMARK=m
 CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
 CONFIG_NETFILTER_XT_TARGET_LED=m
+CONFIG_NETFILTER_XT_TARGET_LOG=m
 CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NETMAP=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
 CONFIG_NETFILTER_XT_TARGET_TEE=m
 CONFIG_NETFILTER_XT_TARGET_TPROXY=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
@@ -776,9 +886,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
@@ -786,6 +898,7 @@ CONFIG_NETFILTER_XT_MATCH_CPU=m
 CONFIG_NETFILTER_XT_MATCH_DCCP=m
 CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
 CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ECN=m
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
@@ -797,6 +910,7 @@ CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 CONFIG_NETFILTER_XT_MATCH_MAC=m
 CONFIG_NETFILTER_XT_MATCH_MARK=m
 CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
 CONFIG_NETFILTER_XT_MATCH_OSF=m
 CONFIG_NETFILTER_XT_MATCH_OWNER=m
 CONFIG_NETFILTER_XT_MATCH_POLICY=m
@@ -825,6 +939,7 @@ CONFIG_IP_SET_HASH_IPPORTIP=m
 CONFIG_IP_SET_HASH_IPPORTNET=m
 CONFIG_IP_SET_HASH_NET=m
 CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_HASH_NETIFACE=m
 CONFIG_IP_SET_LIST_SET=m
 CONFIG_IP_VS=m
 # CONFIG_IP_VS_IPV6 is not set
@@ -856,6 +971,11 @@ CONFIG_IP_VS_SED=m
 CONFIG_IP_VS_NQ=m
 
 #
+# IPVS SH scheduler
+#
+CONFIG_IP_VS_SH_TAB_BITS=8
+
+#
 # IPVS application helper
 #
 CONFIG_IP_VS_FTP=m
@@ -867,33 +987,23 @@ CONFIG_IP_VS_PE_SIP=m
 #
 CONFIG_NF_DEFRAG_IPV4=m
 CONFIG_NF_CONNTRACK_IPV4=m
-CONFIG_NF_CONNTRACK_PROC_COMPAT=y
-CONFIG_IP_NF_QUEUE=m
+# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
 CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_RPFILTER=m
 CONFIG_IP_NF_MATCH_TTL=m
 CONFIG_IP_NF_FILTER=m
 CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_LOG=m
 CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_NF_NAT=m
-CONFIG_NF_NAT_NEEDED=y
+CONFIG_NF_NAT_IPV4=m
 CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_TARGET_NETMAP=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
 CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_PROTO_DCCP=m
 CONFIG_NF_NAT_PROTO_GRE=m
-CONFIG_NF_NAT_PROTO_UDPLITE=m
-CONFIG_NF_NAT_PROTO_SCTP=m
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_IRC=m
-CONFIG_NF_NAT_TFTP=m
-CONFIG_NF_NAT_AMANDA=m
 CONFIG_NF_NAT_PPTP=m
 CONFIG_NF_NAT_H323=m
-CONFIG_NF_NAT_SIP=m
 CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_TARGET_CLUSTERIP=m
 CONFIG_IP_NF_TARGET_ECN=m
@@ -909,7 +1019,6 @@ CONFIG_IP_NF_ARP_MANGLE=m
 #
 CONFIG_NF_DEFRAG_IPV6=m
 CONFIG_NF_CONNTRACK_IPV6=m
-CONFIG_IP6_NF_QUEUE=m
 CONFIG_IP6_NF_IPTABLES=m
 CONFIG_IP6_NF_MATCH_AH=m
 CONFIG_IP6_NF_MATCH_EUI64=m
@@ -918,14 +1027,17 @@ CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_HL=m
 CONFIG_IP6_NF_MATCH_IPV6HEADER=m
 CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RPFILTER=m
 CONFIG_IP6_NF_MATCH_RT=m
 CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_TARGET_LOG=m
 CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_TARGET_REJECT=m
 CONFIG_IP6_NF_MANGLE=m
 CONFIG_IP6_NF_RAW=m
 CONFIG_IP6_NF_SECURITY=m
+CONFIG_NF_NAT_IPV6=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+CONFIG_IP6_NF_TARGET_NPT=m
 CONFIG_BRIDGE_NF_EBTABLES=m
 CONFIG_BRIDGE_EBT_BROUTE=m
 CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -952,7 +1064,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
@@ -968,9 +1080,11 @@ CONFIG_IP_SCTP=m
 CONFIG_NET_SCTPPROBE=m
 # CONFIG_SCTP_DBG_MSG is not set
 # CONFIG_SCTP_DBG_OBJCNT is not set
-# CONFIG_SCTP_HMAC_NONE is not set
-CONFIG_SCTP_HMAC_SHA1=y
-# CONFIG_SCTP_HMAC_MD5 is not set
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
+CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
+CONFIG_SCTP_COOKIE_HMAC_MD5=y
+CONFIG_SCTP_COOKIE_HMAC_SHA1=y
 # CONFIG_RDS is not set
 # CONFIG_TIPC is not set
 CONFIG_ATM=m
@@ -986,11 +1100,18 @@ 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_NET_DSA is not set
+CONFIG_BRIDGE_VLAN_FILTERING=y
+CONFIG_HAVE_NET_DSA=y
+CONFIG_NET_DSA=m
+CONFIG_NET_DSA_TAG_DSA=y
+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
@@ -1000,13 +1121,12 @@ CONFIG_ATALK=m
 CONFIG_DEV_APPLETALK=m
 CONFIG_IPDDP=m
 CONFIG_IPDDP_ENCAP=y
-CONFIG_IPDDP_DECAP=y
 # CONFIG_X25 is not set
 # CONFIG_LAPB is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
 CONFIG_PHONET=m
 CONFIG_IEEE802154=m
+CONFIG_IEEE802154_6LOWPAN=m
+CONFIG_MAC802154=m
 CONFIG_NET_SCHED=y
 
 #
@@ -1030,7 +1150,10 @@ CONFIG_NET_SCH_DRR=m
 CONFIG_NET_SCH_MQPRIO=m
 CONFIG_NET_SCH_CHOKE=m
 CONFIG_NET_SCH_QFQ=m
+CONFIG_NET_SCH_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=m
 CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_SCH_PLUG=m
 
 #
 # Classification
@@ -1064,11 +1187,20 @@ CONFIG_NET_SCH_FIFO=y
 # CONFIG_DCB is not set
 CONFIG_DNS_RESOLVER=y
 CONFIG_BATMAN_ADV=m
+CONFIG_BATMAN_ADV_BLA=y
+CONFIG_BATMAN_ADV_DAT=y
+CONFIG_BATMAN_ADV_NC=y
 # CONFIG_BATMAN_ADV_DEBUG is not set
+CONFIG_OPENVSWITCH=m
+CONFIG_VSOCKETS=m
+CONFIG_VMWARE_VMCI_VSOCKETS=m
+CONFIG_NETLINK_MMAP=y
+CONFIG_NETLINK_DIAG=m
 CONFIG_RPS=y
 CONFIG_RFS_ACCEL=y
 CONFIG_XPS=y
-CONFIG_HAVE_BPF_JIT=y
+CONFIG_NETPRIO_CGROUP=m
+CONFIG_BQL=y
 CONFIG_BPF_JIT=y
 
 #
@@ -1155,8 +1287,6 @@ CONFIG_VLSI_FIR=m
 CONFIG_VIA_FIR=m
 CONFIG_MCS_FIR=m
 CONFIG_BT=m
-CONFIG_BT_L2CAP=y
-CONFIG_BT_SCO=y
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BT_BNEP=m
@@ -1175,6 +1305,7 @@ CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y
 CONFIG_BT_HCIUART_ATH3K=y
 CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_HCIUART_3WIRE=y
 CONFIG_BT_HCIBCM203X=m
 CONFIG_BT_HCIBPA10X=m
 CONFIG_BT_HCIBFUSB=m
@@ -1198,14 +1329,13 @@ CONFIG_WEXT_PROC=y
 CONFIG_WEXT_SPY=y
 CONFIG_WEXT_PRIV=y
 CONFIG_CFG80211=m
-CONFIG_NL80211_TESTMODE=y
+# CONFIG_NL80211_TESTMODE is not set
 # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
 # CONFIG_CFG80211_REG_DEBUG is not set
 CONFIG_CFG80211_DEFAULT_PS=y
 # CONFIG_CFG80211_DEBUGFS is not set
 # CONFIG_CFG80211_INTERNAL_REGDB is not set
 CONFIG_CFG80211_WEXT=y
-CONFIG_WIRELESS_EXT_SYSFS=y
 CONFIG_LIB80211=m
 CONFIG_LIB80211_CRYPT_WEP=m
 CONFIG_LIB80211_CRYPT_CCMP=m
@@ -1220,6 +1350,7 @@ CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
 CONFIG_MAC80211_MESH=y
 CONFIG_MAC80211_LEDS=y
 # CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_MESSAGE_TRACING is not set
 # CONFIG_MAC80211_DEBUG_MENU is not set
 CONFIG_WIMAX=m
 CONFIG_WIMAX_DEBUG_LEVEL=8
@@ -1232,8 +1363,26 @@ CONFIG_NET_9P_VIRTIO=m
 CONFIG_CAIF=m
 # CONFIG_CAIF_DEBUG is not set
 CONFIG_CAIF_NETDEV=m
+CONFIG_CAIF_USB=m
 CONFIG_CEPH_LIB=m
 # CONFIG_CEPH_LIB_PRETTYDEBUG is not set
+# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
+CONFIG_NFC=m
+CONFIG_NFC_NCI=m
+CONFIG_NFC_HCI=m
+# CONFIG_NFC_SHDLC is not set
+
+#
+# Near Field Communication (NFC) devices
+#
+CONFIG_NFC_PN533=m
+CONFIG_NFC_WILINK=m
+CONFIG_NFC_MEI_PHY=m
+CONFIG_NFC_PN544=m
+CONFIG_NFC_PN544_MEI=m
+CONFIG_NFC_MICROREAD=m
+CONFIG_NFC_MICROREAD_MEI=m
+CONFIG_HAVE_BPF_JIT=y
 
 #
 # Device Drivers
@@ -1250,24 +1399,34 @@ 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
+# CONFIG_GENERIC_CPU_DEVICES is not set
+CONFIG_REGMAP=y
+CONFIG_REGMAP_I2C=m
+CONFIG_REGMAP_MMIO=m
+CONFIG_REGMAP_IRQ=y
+CONFIG_DMA_SHARED_BUFFER=y
+
+#
+# Bus devices
+#
 CONFIG_CONNECTOR=y
 CONFIG_PROC_EVENTS=y
 CONFIG_MTD=m
-# CONFIG_MTD_DEBUG is not set
 CONFIG_MTD_TESTS=m
 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_AR7_PARTS=m
 
 #
 # User Modules And Translation Layers
 #
-CONFIG_MTD_CHAR=m
 CONFIG_MTD_BLKDEVS=m
 CONFIG_MTD_BLOCK=m
 CONFIG_MTD_BLOCK_RO=m
@@ -1335,6 +1494,9 @@ CONFIG_MTD_PLATRAM=m
 CONFIG_MTD_PMC551=m
 # CONFIG_MTD_PMC551_BUGFIX is not set
 # CONFIG_MTD_PMC551_DEBUG is not set
+# CONFIG_MTD_DATAFLASH is not set
+# CONFIG_MTD_M25P80 is not set
+# CONFIG_MTD_SST25L is not set
 # CONFIG_MTD_SLRAM is not set
 CONFIG_MTD_PHRAM=m
 CONFIG_MTD_MTDRAM=m
@@ -1345,16 +1507,14 @@ CONFIG_MTD_BLOCK2MTD=m
 #
 # Disk-On-Chip Device Drivers
 #
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
+CONFIG_MTD_DOCG3=m
+CONFIG_BCH_CONST_M=14
+CONFIG_BCH_CONST_T=4
 CONFIG_MTD_NAND_ECC=m
 CONFIG_MTD_NAND_ECC_SMC=y
 CONFIG_MTD_NAND=m
-# CONFIG_MTD_NAND_VERIFY_WRITE is not set
 # CONFIG_MTD_NAND_ECC_BCH is not set
 CONFIG_MTD_SM_COMMON=m
-# CONFIG_MTD_NAND_MUSEUM_IDS is not set
 # CONFIG_MTD_NAND_DENALI is not set
 CONFIG_MTD_NAND_IDS=m
 CONFIG_MTD_NAND_RICOH=m
@@ -1362,6 +1522,7 @@ CONFIG_MTD_NAND_DISKONCHIP=m
 # CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
 CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
 # CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
+CONFIG_MTD_NAND_DOCG4=m
 # CONFIG_MTD_NAND_CAFE is not set
 CONFIG_MTD_NAND_NANDSIM=m
 # CONFIG_MTD_NAND_PLATFORM is not set
@@ -1375,9 +1536,9 @@ CONFIG_MTD_LPDDR=m
 CONFIG_MTD_QINFO_PROBE=m
 CONFIG_MTD_UBI=m
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MTD_UBI_BEB_RESERVE=1
+CONFIG_MTD_UBI_BEB_LIMIT=20
+# CONFIG_MTD_UBI_FASTMAP is not set
 # CONFIG_MTD_UBI_GLUEBI is not set
-# CONFIG_MTD_UBI_DEBUG is not set
 CONFIG_PARPORT=m
 CONFIG_PARPORT_PC=m
 CONFIG_PARPORT_SERIAL=m
@@ -1398,6 +1559,7 @@ CONFIG_PNPACPI=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_FD=m
 # CONFIG_PARIDE is not set
+CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
 CONFIG_BLK_CPQ_DA=m
 CONFIG_BLK_CPQ_CISS_DA=m
 # CONFIG_CISS_SCSI_TAPE is not set
@@ -1405,13 +1567,14 @@ CONFIG_BLK_DEV_DAC960=m
 # CONFIG_BLK_DEV_UMEM is not set
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_DRBD=m
 # CONFIG_DRBD_FAULT_INJECTION is not set
 CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_NVME=m
 CONFIG_BLK_DEV_OSD=m
 CONFIG_BLK_DEV_SX8=m
-# CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_RAM=m
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=16384
@@ -1425,10 +1588,16 @@ 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
+#
 CONFIG_SENSORS_LIS3LV02D=m
-CONFIG_MISC_DEVICES=y
 CONFIG_AD525X_DPOT=m
 CONFIG_AD525X_DPOT_I2C=m
+# CONFIG_AD525X_DPOT_SPI is not set
+# CONFIG_DUMMY_IRQ is not set
 # CONFIG_IBM_ASM is not set
 CONFIG_PHANTOM=m
 CONFIG_INTEL_MID_PTI=m
@@ -1436,6 +1605,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
@@ -1450,9 +1620,15 @@ CONFIG_SENSORS_BH1770=m
 CONFIG_SENSORS_APDS990X=m
 CONFIG_HMC6352=m
 CONFIG_DS1682=m
+# CONFIG_TI_DAC7512 is not set
 CONFIG_VMWARE_BALLOON=m
-CONFIG_BMP085=m
+CONFIG_BMP085=y
+CONFIG_BMP085_I2C=m
+# CONFIG_BMP085_SPI is not set
 CONFIG_PCH_PHUB=m
+CONFIG_USB_SWITCH_FSA9480=m
+# CONFIG_LATTICE_ECP3_CONFIG is not set
+# CONFIG_SRAM is not set
 CONFIG_C2PORT=m
 CONFIG_C2PORT_DURAMAR_2150=m
 
@@ -1460,21 +1636,28 @@ CONFIG_C2PORT_DURAMAR_2150=m
 # EEPROM support
 #
 CONFIG_EEPROM_AT24=m
+# CONFIG_EEPROM_AT25 is not set
 CONFIG_EEPROM_LEGACY=m
 CONFIG_EEPROM_MAX6875=m
 CONFIG_EEPROM_93CX6=m
+# CONFIG_EEPROM_93XX46 is not set
 CONFIG_CB710_CORE=m
 # CONFIG_CB710_DEBUG is not set
 CONFIG_CB710_DEBUG_ASSUMPTIONS=y
-CONFIG_IWMC3200TOP=m
-# CONFIG_IWMC3200TOP_DEBUG is not set
-# CONFIG_IWMC3200TOP_DEBUGFS is not set
 
 #
 # Texas Instruments shared transport line discipline
 #
 CONFIG_TI_ST=m
 CONFIG_SENSORS_LIS3_I2C=m
+
+#
+# Altera FPGA firmware download module
+#
+CONFIG_ALTERA_STAPL=m
+CONFIG_INTEL_MEI=m
+CONFIG_INTEL_MEI_ME=m
+CONFIG_VMWARE_VMCI=m
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
 
@@ -1504,7 +1687,6 @@ CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
 # CONFIG_SCSI_SCAN_ASYNC is not set
-CONFIG_SCSI_WAIT_SCAN=m
 
 #
 # SCSI Transports
@@ -1550,10 +1732,11 @@ CONFIG_SCSI_AIC94XX=m
 # CONFIG_AIC94XX_DEBUG is not set
 CONFIG_SCSI_MVSAS=m
 # CONFIG_SCSI_MVSAS_DEBUG is not set
+CONFIG_SCSI_MVSAS_TASKLET=y
+CONFIG_SCSI_MVUMI=m
 CONFIG_SCSI_DPT_I2O=m
 CONFIG_SCSI_ADVANSYS=m
 CONFIG_SCSI_ARCMSR=m
-CONFIG_SCSI_ARCMSR_AER=y
 CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_MAILBOX=m
@@ -1562,9 +1745,16 @@ CONFIG_MEGARAID_SAS=m
 CONFIG_SCSI_MPT2SAS=m
 CONFIG_SCSI_MPT2SAS_MAX_SGE=128
 # CONFIG_SCSI_MPT2SAS_LOGGING is not set
+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_UFSHCD_PLATFORM=m
 CONFIG_SCSI_HPTIOP=m
 CONFIG_SCSI_BUSLOGIC=m
 CONFIG_VMWARE_PVSCSI=m
+CONFIG_HYPERV_STORAGE=m
 CONFIG_LIBFC=m
 CONFIG_LIBFCOE=m
 CONFIG_FCOE=m
@@ -1595,6 +1785,7 @@ CONFIG_SCSI_IPR=m
 # CONFIG_SCSI_IPR_DUMP is not set
 CONFIG_SCSI_QLOGIC_1280=m
 CONFIG_SCSI_QLA_FC=m
+CONFIG_TCM_QLA2XXX=m
 CONFIG_SCSI_QLA_ISCSI=m
 CONFIG_SCSI_LPFC=m
 # CONFIG_SCSI_LPFC_DEBUG_FS is not set
@@ -1605,6 +1796,8 @@ CONFIG_SCSI_PMCRAID=m
 CONFIG_SCSI_PM8001=m
 CONFIG_SCSI_SRP=m
 CONFIG_SCSI_BFA_FC=m
+CONFIG_SCSI_VIRTIO=m
+CONFIG_SCSI_CHELSIO_FCOE=m
 CONFIG_SCSI_LOWLEVEL_PCMCIA=y
 CONFIG_PCMCIA_AHA152X=m
 CONFIG_PCMCIA_FDOMAIN=m
@@ -1623,6 +1816,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
 
 #
@@ -1647,6 +1841,7 @@ CONFIG_ATA_BMDMA=y
 # SATA SFF controllers with BMDMA
 #
 CONFIG_ATA_PIIX=m
+CONFIG_SATA_HIGHBANK=m
 CONFIG_SATA_MV=m
 CONFIG_SATA_NV=m
 CONFIG_SATA_PROMISE=m
@@ -1723,13 +1918,24 @@ 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_BCACHE=m
+# CONFIG_BCACHE_DEBUG is not set
+# CONFIG_BCACHE_EDEBUG is not set
+# CONFIG_BCACHE_CLOSURES_DEBUG is not set
 CONFIG_BLK_DEV_DM=m
 # CONFIG_DM_DEBUG is not set
+CONFIG_DM_BUFIO=m
+CONFIG_DM_BIO_PRISON=m
+CONFIG_DM_PERSISTENT_DATA=m
 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
@@ -1740,13 +1946,15 @@ CONFIG_DM_MULTIPATH_ST=m
 CONFIG_DM_DELAY=m
 CONFIG_DM_UEVENT=y
 CONFIG_DM_FLAKEY=m
+CONFIG_DM_VERITY=m
 CONFIG_TARGET_CORE=m
 CONFIG_TCM_IBLOCK=m
 CONFIG_TCM_FILEIO=m
 CONFIG_TCM_PSCSI=m
 CONFIG_LOOPBACK_TARGET=m
-# CONFIG_LOOPBACK_TARGET_CDB_DEBUG is not set
 CONFIG_TCM_FC=m
+CONFIG_ISCSI_TARGET=m
+CONFIG_SBP_TARGET=m
 CONFIG_FUSION=y
 CONFIG_FUSION_SPI=m
 CONFIG_FUSION_FC=m
@@ -1760,7 +1968,6 @@ CONFIG_FUSION_CTL=m
 #
 CONFIG_FIREWIRE=m
 CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_OHCI_DEBUG=y
 CONFIG_FIREWIRE_SBP2=m
 CONFIG_FIREWIRE_NET=m
 CONFIG_FIREWIRE_NOSY=m
@@ -1777,46 +1984,134 @@ CONFIG_I2O_PROC=m
 CONFIG_MACINTOSH_DRIVERS=y
 CONFIG_MAC_EMUMOUSEBTN=y
 CONFIG_NETDEVICES=y
-CONFIG_IFB=m
-CONFIG_DUMMY=m
+CONFIG_NET_CORE=y
 CONFIG_BONDING=m
+CONFIG_DUMMY=m
+CONFIG_EQUALIZER=m
+# CONFIG_NET_FC is not set
+CONFIG_MII=m
+CONFIG_IFB=m
+CONFIG_NET_TEAM=m
+CONFIG_NET_TEAM_MODE_BROADCAST=m
+CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
+CONFIG_NET_TEAM_MODE_RANDOM=m
+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
+CONFIG_NET_TEAM_MODE_LOADBALANCE=m
 CONFIG_MACVLAN=m
 CONFIG_MACVTAP=m
-CONFIG_EQUALIZER=m
+CONFIG_VXLAN=m
+CONFIG_NETCONSOLE=m
+CONFIG_NETCONSOLE_DYNAMIC=y
+CONFIG_NETPOLL=y
+# CONFIG_NETPOLL_TRAP is not set
+CONFIG_NET_POLL_CONTROLLER=y
+CONFIG_RIONET=m
+CONFIG_RIONET_TX_SIZE=128
+CONFIG_RIONET_RX_SIZE=128
 CONFIG_TUN=m
 CONFIG_VETH=m
-CONFIG_NET_SB1000=m
+CONFIG_VIRTIO_NET=m
+CONFIG_SUNGEM_PHY=m
 # CONFIG_ARCNET is not set
-CONFIG_MII=m
-CONFIG_PHYLIB=m
+CONFIG_ATM_DRIVERS=y
+# CONFIG_ATM_DUMMY is not set
+CONFIG_ATM_TCP=m
+CONFIG_ATM_LANAI=m
+CONFIG_ATM_ENI=m
+# CONFIG_ATM_ENI_DEBUG is not set
+# CONFIG_ATM_ENI_TUNE_BURST is not set
+CONFIG_ATM_FIRESTREAM=m
+CONFIG_ATM_ZATM=m
+# CONFIG_ATM_ZATM_DEBUG is not set
+CONFIG_ATM_NICSTAR=m
+# CONFIG_ATM_NICSTAR_USE_SUNI is not set
+# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
+CONFIG_ATM_IDT77252=m
+# CONFIG_ATM_IDT77252_DEBUG is not set
+# CONFIG_ATM_IDT77252_RCV_ALL is not set
+CONFIG_ATM_IDT77252_USE_SUNI=y
+CONFIG_ATM_AMBASSADOR=m
+# CONFIG_ATM_AMBASSADOR_DEBUG is not set
+CONFIG_ATM_HORIZON=m
+# CONFIG_ATM_HORIZON_DEBUG is not set
+CONFIG_ATM_IA=m
+# CONFIG_ATM_IA_DEBUG is not set
+CONFIG_ATM_FORE200E=m
+# CONFIG_ATM_FORE200E_USE_TASKLET is not set
+CONFIG_ATM_FORE200E_TX_RETRY=16
+CONFIG_ATM_FORE200E_DEBUG=0
+CONFIG_ATM_HE=m
+# CONFIG_ATM_HE_USE_SUNI is not set
+CONFIG_ATM_SOLOS=m
 
 #
-# MII PHY device drivers
+# CAIF transport drivers
 #
-CONFIG_MARVELL_PHY=m
-CONFIG_DAVICOM_PHY=m
-CONFIG_QSEMI_PHY=m
-CONFIG_LXT_PHY=m
-CONFIG_CICADA_PHY=m
-CONFIG_VITESSE_PHY=m
-CONFIG_SMSC_PHY=m
-CONFIG_BROADCOM_PHY=m
-CONFIG_ICPLUS_PHY=m
-CONFIG_REALTEK_PHY=m
-CONFIG_NATIONAL_PHY=m
-CONFIG_STE10XP=m
-CONFIG_LSI_ET1011C_PHY=m
-CONFIG_MICREL_PHY=m
-# CONFIG_MDIO_BITBANG is not set
-CONFIG_NET_ETHERNET=y
-CONFIG_HAPPYMEAL=m
-CONFIG_SUNGEM=m
-CONFIG_CASSINI=m
+CONFIG_CAIF_TTY=m
+CONFIG_CAIF_SPI_SLAVE=m
+CONFIG_CAIF_SPI_SYNC=y
+CONFIG_CAIF_HSI=m
+CONFIG_CAIF_VIRTIO=m
+CONFIG_VHOST_NET=m
+CONFIG_VHOST_SCSI=m
+CONFIG_VHOST_RING=m
+
+#
+# Distributed Switch Architecture drivers
+#
+CONFIG_NET_DSA_MV88E6XXX=m
+CONFIG_NET_DSA_MV88E6060=m
+CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y
+CONFIG_NET_DSA_MV88E6131=m
+CONFIG_NET_DSA_MV88E6123_61_65=m
+CONFIG_ETHERNET=y
+CONFIG_MDIO=m
 CONFIG_NET_VENDOR_3COM=y
+CONFIG_PCMCIA_3C574=m
+CONFIG_PCMCIA_3C589=m
 CONFIG_VORTEX=m
 CONFIG_TYPHOON=m
-CONFIG_ETHOC=m
+CONFIG_NET_VENDOR_ADAPTEC=y
+CONFIG_ADAPTEC_STARFIRE=m
+CONFIG_NET_VENDOR_ALTEON=y
+CONFIG_ACENIC=m
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+CONFIG_NET_VENDOR_AMD=y
+CONFIG_AMD8111_ETH=m
+CONFIG_PCNET32=m
+CONFIG_PCMCIA_NMCLAN=m
+CONFIG_NET_VENDOR_ATHEROS=y
+CONFIG_ATL2=m
+CONFIG_ATL1=m
+CONFIG_ATL1E=m
+CONFIG_ATL1C=m
+CONFIG_ALX=m
+CONFIG_NET_CADENCE=y
+CONFIG_ARM_AT91_ETHER=m
+CONFIG_MACB=m
+CONFIG_NET_VENDOR_BROADCOM=y
+CONFIG_B44=m
+CONFIG_B44_PCI_AUTOSELECT=y
+CONFIG_B44_PCICORE_AUTOSELECT=y
+CONFIG_B44_PCI=y
+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
+CONFIG_NET_VENDOR_CHELSIO=y
+CONFIG_CHELSIO_T1=m
+CONFIG_CHELSIO_T1_1G=y
+CONFIG_CHELSIO_T3=m
+CONFIG_CHELSIO_T4=m
+CONFIG_CHELSIO_T4VF=m
+CONFIG_NET_VENDOR_CISCO=y
+CONFIG_ENIC=m
 CONFIG_DNET=m
+CONFIG_NET_VENDOR_DEC=y
 CONFIG_NET_TULIP=y
 CONFIG_DE2104X=m
 CONFIG_DE2104X_DSL=0
@@ -1829,114 +2124,217 @@ CONFIG_WINBOND_840=m
 CONFIG_DM9102=m
 CONFIG_ULI526X=m
 CONFIG_PCMCIA_XIRCOM=m
+CONFIG_NET_VENDOR_DLINK=y
+CONFIG_DL2K=m
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+CONFIG_NET_VENDOR_EMULEX=y
+CONFIG_BE2NET=m
+CONFIG_NET_VENDOR_EXAR=y
+CONFIG_S2IO=m
+CONFIG_VXGE=m
+# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
+CONFIG_NET_VENDOR_FUJITSU=y
+CONFIG_PCMCIA_FMVJ18X=m
+CONFIG_NET_VENDOR_HP=y
 CONFIG_HP100=m
-# CONFIG_IBM_NEW_EMAC_ZMII is not set
-# CONFIG_IBM_NEW_EMAC_RGMII is not set
-# CONFIG_IBM_NEW_EMAC_TAH is not set
-# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
-# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
-# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
-CONFIG_NET_PCI=y
-CONFIG_PCNET32=m
-CONFIG_AMD8111_ETH=m
-CONFIG_ADAPTEC_STARFIRE=m
-CONFIG_KSZ884X_PCI=m
-CONFIG_B44=m
-CONFIG_B44_PCI_AUTOSELECT=y
-CONFIG_B44_PCICORE_AUTOSELECT=y
-CONFIG_B44_PCI=y
-CONFIG_FORCEDETH=m
+CONFIG_NET_VENDOR_INTEL=y
 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
+CONFIG_IXGBE=m
+CONFIG_IXGBE_HWMON=y
+CONFIG_IXGBE_DCA=y
+CONFIG_IXGBEVF=m
+CONFIG_NET_VENDOR_I825XX=y
+CONFIG_IP1000=m
+CONFIG_JME=m
+CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_MVMDIO=m
+CONFIG_SKGE=m
+# CONFIG_SKGE_DEBUG is not set
+CONFIG_SKGE_GENESIS=y
+CONFIG_SKY2=m
+# CONFIG_SKY2_DEBUG is not set
+CONFIG_NET_VENDOR_MELLANOX=y
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_CORE=m
+CONFIG_MLX4_DEBUG=y
+CONFIG_NET_VENDOR_MICREL=y
+CONFIG_KS8842=m
+# CONFIG_KS8851 is not set
+CONFIG_KS8851_MLL=m
+CONFIG_KSZ884X_PCI=m
+CONFIG_NET_VENDOR_MICROCHIP=y
+# CONFIG_ENC28J60 is not set
+CONFIG_NET_VENDOR_MYRI=y
+CONFIG_MYRI10GE=m
+CONFIG_MYRI10GE_DCA=y
 CONFIG_FEALNX=m
+CONFIG_NET_VENDOR_NATSEMI=y
 CONFIG_NATSEMI=m
+CONFIG_NS83820=m
+CONFIG_NET_VENDOR_8390=y
+CONFIG_PCMCIA_AXNET=m
 CONFIG_NE2K_PCI=m
+CONFIG_PCMCIA_PCNET=m
+CONFIG_NET_VENDOR_NVIDIA=y
+CONFIG_FORCEDETH=m
+CONFIG_NET_VENDOR_OKI=y
+CONFIG_PCH_GBE=m
+CONFIG_ETHOC=m
+CONFIG_NET_PACKET_ENGINE=y
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+CONFIG_NET_VENDOR_QLOGIC=y
+CONFIG_QLA3XXX=m
+CONFIG_QLCNIC=m
+CONFIG_QLCNIC_SRIOV=y
+CONFIG_QLGE=m
+CONFIG_NETXEN_NIC=m
+CONFIG_NET_VENDOR_REALTEK=y
+CONFIG_ATP=m
 CONFIG_8139CP=m
 CONFIG_8139TOO=m
 # CONFIG_8139TOO_PIO is not set
 CONFIG_8139TOO_TUNE_TWISTER=y
 CONFIG_8139TOO_8129=y
 # CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_R8169=m
+CONFIG_NET_VENDOR_RDC=y
 CONFIG_R6040=m
+CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_SC92031=m
+CONFIG_NET_VENDOR_SIS=y
 CONFIG_SIS900=m
+CONFIG_SIS190=m
+CONFIG_SFC=m
+CONFIG_SFC_MTD=y
+CONFIG_SFC_MCDI_MON=y
+CONFIG_SFC_SRIOV=y
+CONFIG_NET_VENDOR_SMSC=y
+CONFIG_PCMCIA_SMC91C92=m
 CONFIG_EPIC100=m
 CONFIG_SMSC9420=m
-CONFIG_SUNDANCE=m
-# CONFIG_SUNDANCE_MMIO is not set
-CONFIG_TLAN=m
-CONFIG_KS8842=m
-CONFIG_KS8851_MLL=m
-CONFIG_VIA_RHINE=m
-# CONFIG_VIA_RHINE_MMIO is not set
-CONFIG_SC92031=m
-CONFIG_NET_POCKET=y
-CONFIG_ATP=m
-CONFIG_DE600=m
-CONFIG_DE620=m
-CONFIG_ATL2=m
-CONFIG_NETDEV_1000=y
-CONFIG_ACENIC=m
-# CONFIG_ACENIC_OMIT_TIGON_I is not set
-CONFIG_DL2K=m
-CONFIG_E1000=m
-CONFIG_E1000E=m
-CONFIG_IP1000=m
-CONFIG_IGB=m
-CONFIG_IGB_DCA=y
-CONFIG_IGBVF=m
-CONFIG_NS83820=m
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_R8169=m
-CONFIG_SIS190=m
-CONFIG_SKGE=m
-# CONFIG_SKGE_DEBUG is not set
-CONFIG_SKY2=m
-# CONFIG_SKY2_DEBUG is not set
-CONFIG_VIA_VELOCITY=m
-CONFIG_TIGON3=m
-CONFIG_BNX2=m
-CONFIG_CNIC=m
-CONFIG_QLA3XXX=m
-CONFIG_ATL1=m
-CONFIG_ATL1E=m
-CONFIG_ATL1C=m
-CONFIG_JME=m
+CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_STMMAC_ETH=m
+# CONFIG_STMMAC_PLATFORM is not set
+CONFIG_STMMAC_PCI=y
+# CONFIG_STMMAC_DEBUG_FS is not set
 # CONFIG_STMMAC_DA is not set
-CONFIG_STMMAC_DUAL_MAC=y
-CONFIG_PCH_GBE=m
-CONFIG_NETDEV_10000=y
-CONFIG_MDIO=m
-CONFIG_CHELSIO_T1=m
-CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T3=m
-CONFIG_CHELSIO_T4=m
-CONFIG_CHELSIO_T4VF=m
-CONFIG_ENIC=m
-CONFIG_IXGBE=m
-CONFIG_IXGBE_DCA=y
-CONFIG_IXGBEVF=m
-CONFIG_IXGB=m
-CONFIG_S2IO=m
-CONFIG_VXGE=m
-# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
-CONFIG_MYRI10GE=m
-CONFIG_MYRI10GE_DCA=y
-CONFIG_NETXEN_NIC=m
+CONFIG_NET_VENDOR_SUN=y
+CONFIG_HAPPYMEAL=m
+CONFIG_SUNGEM=m
+CONFIG_CASSINI=m
 CONFIG_NIU=m
-CONFIG_MLX4_EN=m
-CONFIG_MLX4_CORE=m
-CONFIG_MLX4_DEBUG=y
+CONFIG_NET_VENDOR_TEHUTI=y
 CONFIG_TEHUTI=m
-CONFIG_BNX2X=m
-CONFIG_QLCNIC=m
-CONFIG_QLGE=m
-CONFIG_BNA=m
-CONFIG_SFC=m
-CONFIG_SFC_MTD=y
-CONFIG_BE2NET=m
-# CONFIG_TR is not set
+CONFIG_NET_VENDOR_TI=y
+CONFIG_TLAN=m
+CONFIG_NET_VENDOR_VIA=y
+CONFIG_VIA_RHINE=m
+# CONFIG_VIA_RHINE_MMIO is not set
+CONFIG_VIA_VELOCITY=m
+CONFIG_NET_VENDOR_WIZNET=y
+CONFIG_WIZNET_W5100=m
+CONFIG_WIZNET_W5300=m
+# CONFIG_WIZNET_BUS_DIRECT is not set
+# CONFIG_WIZNET_BUS_INDIRECT is not set
+CONFIG_WIZNET_BUS_ANY=y
+CONFIG_NET_VENDOR_XIRCOM=y
+CONFIG_PCMCIA_XIRC2PS=m
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+CONFIG_NET_SB1000=m
+CONFIG_PHYLIB=m
+
+#
+# MII PHY device drivers
+#
+CONFIG_AT803X_PHY=m
+CONFIG_AMD_PHY=m
+CONFIG_MARVELL_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_CICADA_PHY=m
+CONFIG_VITESSE_PHY=m
+CONFIG_SMSC_PHY=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_BCM87XX_PHY=m
+CONFIG_ICPLUS_PHY=m
+CONFIG_REALTEK_PHY=m
+CONFIG_NATIONAL_PHY=m
+CONFIG_STE10XP=m
+CONFIG_LSI_ET1011C_PHY=m
+CONFIG_MICREL_PHY=m
+# CONFIG_MDIO_BITBANG is not set
+# CONFIG_MICREL_KS8995MA is not set
+CONFIG_PLIP=m
+CONFIG_PPP=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_MPPE=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPPOATM=m
+CONFIG_PPPOE=m
+CONFIG_PPTP=m
+CONFIG_PPPOL2TP=m
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_SLIP=m
+CONFIG_SLHC=m
+# CONFIG_SLIP_COMPRESSED is not set
+# CONFIG_SLIP_SMART is not set
+# CONFIG_SLIP_MODE_SLIP6 is not set
+
+#
+# USB Network Adapters
+#
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_RTL8152=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
+CONFIG_USB_NET_CDC_MBIM=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
+CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_NET_CX82310_ETH=m
+CONFIG_USB_NET_KALMIA=m
+CONFIG_USB_NET_QMI_WWAN=m
+CONFIG_USB_HSO=m
+CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_CDC_PHONET=m
+CONFIG_USB_IPHETH=m
+CONFIG_USB_SIERRA_NET=m
+CONFIG_USB_VL600=m
 CONFIG_WLAN=y
 CONFIG_PCMCIA_RAYCS=m
 CONFIG_LIBERTAS_THINFIRM=m
@@ -1959,6 +2357,7 @@ CONFIG_ADM8211=m
 # CONFIG_MAC80211_HWSIM is not set
 CONFIG_MWL8K=m
 CONFIG_ATH_COMMON=m
+CONFIG_ATH_CARDS=m
 # CONFIG_ATH_DEBUG is not set
 CONFIG_ATH5K=m
 # CONFIG_ATH5K_DEBUG is not set
@@ -1966,24 +2365,39 @@ CONFIG_ATH5K=m
 CONFIG_ATH5K_PCI=y
 CONFIG_ATH9K_HW=m
 CONFIG_ATH9K_COMMON=m
+CONFIG_ATH9K_BTCOEX_SUPPORT=y
 CONFIG_ATH9K=m
 CONFIG_ATH9K_PCI=y
 CONFIG_ATH9K_AHB=y
 # CONFIG_ATH9K_DEBUGFS is not set
-CONFIG_ATH9K_RATE_CONTROL=y
+# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set
 CONFIG_ATH9K_HTC=m
 # CONFIG_ATH9K_HTC_DEBUGFS is not set
 CONFIG_CARL9170=m
 CONFIG_CARL9170_LEDS=y
 CONFIG_CARL9170_WPC=y
+# CONFIG_CARL9170_HWRNG is not set
+CONFIG_ATH6KL=m
+CONFIG_ATH6KL_SDIO=m
+CONFIG_ATH6KL_USB=m
+# CONFIG_ATH6KL_DEBUG is not set
+# CONFIG_ATH6KL_TRACING is not set
+CONFIG_AR5523=m
+CONFIG_WIL6210=m
+CONFIG_WIL6210_ISR_COR=y
 CONFIG_B43=m
+CONFIG_B43_BCMA=y
+# CONFIG_B43_BCMA_EXTRA is not set
+CONFIG_B43_SSB=y
 CONFIG_B43_PCI_AUTOSELECT=y
 CONFIG_B43_PCICORE_AUTOSELECT=y
 CONFIG_B43_PCMCIA=y
 CONFIG_B43_SDIO=y
+CONFIG_B43_BCMA_PIO=y
 CONFIG_B43_PIO=y
 CONFIG_B43_PHY_N=y
 CONFIG_B43_PHY_LP=y
+CONFIG_B43_PHY_HT=y
 CONFIG_B43_LEDS=y
 CONFIG_B43_HWRNG=y
 # CONFIG_B43_DEBUG is not set
@@ -1998,6 +2412,13 @@ CONFIG_B43LEGACY_PIO=y
 CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
 # CONFIG_B43LEGACY_DMA_MODE is not set
 # CONFIG_B43LEGACY_PIO_MODE is not set
+CONFIG_BRCMUTIL=m
+CONFIG_BRCMSMAC=m
+CONFIG_BRCMFMAC=m
+CONFIG_BRCMFMAC_SDIO=y
+CONFIG_BRCMFMAC_USB=y
+# CONFIG_BRCM_TRACING is not set
+# CONFIG_BRCMDBG is not set
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
 # CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
@@ -2006,31 +2427,30 @@ CONFIG_HOSTAP_PCI=m
 CONFIG_HOSTAP_CS=m
 # CONFIG_IPW2100 is not set
 # CONFIG_IPW2200 is not set
-CONFIG_IWLAGN=m
+CONFIG_IWLWIFI=m
+CONFIG_IWLDVM=m
+CONFIG_IWLMVM=m
+CONFIG_IWLWIFI_OPMODE_MODULAR=y
 
 #
 # Debugging Options
 #
 # CONFIG_IWLWIFI_DEBUG is not set
 CONFIG_IWLWIFI_DEVICE_TRACING=y
-CONFIG_IWLWIFI_DEVICE_SVTOOL=y
-CONFIG_IWL_P2P=y
-CONFIG_IWLWIFI_LEGACY=m
+# CONFIG_IWLWIFI_P2P is not set
+CONFIG_IWLEGACY=m
+CONFIG_IWL4965=m
+CONFIG_IWL3945=m
 
 #
-# Debugging Options
+# iwl3945 / iwl4965 Debugging Options
 #
-# CONFIG_IWLWIFI_LEGACY_DEBUG is not set
-# CONFIG_IWLWIFI_LEGACY_DEVICE_TRACING is not set
-CONFIG_IWL4965=m
-CONFIG_IWL3945=m
-CONFIG_IWM=m
-# CONFIG_IWM_DEBUG is not set
-CONFIG_IWM_TRACING=y
+# CONFIG_IWLEGACY_DEBUG is not set
 CONFIG_LIBERTAS=m
 CONFIG_LIBERTAS_USB=m
 CONFIG_LIBERTAS_CS=m
 CONFIG_LIBERTAS_SDIO=m
+# CONFIG_LIBERTAS_SPI is not set
 # CONFIG_LIBERTAS_DEBUG is not set
 CONFIG_LIBERTAS_MESH=y
 CONFIG_HERMES=m
@@ -2046,6 +2466,7 @@ CONFIG_ORINOCO_USB=m
 CONFIG_P54_COMMON=m
 CONFIG_P54_USB=m
 CONFIG_P54_PCI=m
+# CONFIG_P54_SPI is not set
 CONFIG_P54_LEDS=y
 CONFIG_RT2X00=m
 CONFIG_RT2400PCI=m
@@ -2055,14 +2476,17 @@ CONFIG_RT2800PCI=m
 CONFIG_RT2800PCI_RT33XX=y
 CONFIG_RT2800PCI_RT35XX=y
 CONFIG_RT2800PCI_RT53XX=y
+CONFIG_RT2800PCI_RT3290=y
 CONFIG_RT2500USB=m
 CONFIG_RT73USB=m
 CONFIG_RT2800USB=m
 CONFIG_RT2800USB_RT33XX=y
 CONFIG_RT2800USB_RT35XX=y
 CONFIG_RT2800USB_RT53XX=y
+CONFIG_RT2800USB_RT55XX=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
@@ -2070,151 +2494,48 @@ 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_RTL8188EE=m
 CONFIG_RTL8192CU=m
-CONFIG_RTLWIFI=m
 CONFIG_RTL8192C_COMMON=m
+CONFIG_WL_TI=y
 CONFIG_WL1251=m
+# CONFIG_WL1251_SPI is not set
 CONFIG_WL1251_SDIO=m
-CONFIG_WL12XX_MENU=m
 CONFIG_WL12XX=m
-CONFIG_WL12XX_HT=y
-CONFIG_WL12XX_SDIO=m
-CONFIG_WL12XX_SDIO_TEST=m
-CONFIG_WL12XX_PLATFORM_DATA=y
+CONFIG_WL18XX=m
+CONFIG_WLCORE=m
+# CONFIG_WLCORE_SPI is not set
+CONFIG_WLCORE_SDIO=m
+CONFIG_WILINK_PLATFORM_DATA=y
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
 CONFIG_MWIFIEX=m
 CONFIG_MWIFIEX_SDIO=m
+CONFIG_MWIFIEX_PCIE=m
+CONFIG_MWIFIEX_USB=m
 
 #
 # WiMAX Wireless Broadband devices
 #
 CONFIG_WIMAX_I2400M=m
 CONFIG_WIMAX_I2400M_USB=m
-CONFIG_WIMAX_I2400M_SDIO=m
-# CONFIG_WIMAX_IWMC3200_SDIO is not set
 CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
-
-#
-# USB Network Adapters
-#
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_USBNET=m
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_CDCETHER=m
-CONFIG_USB_NET_CDC_EEM=m
-CONFIG_USB_NET_CDC_NCM=m
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_SMSC75XX=m
-CONFIG_USB_NET_SMSC95XX=m
-CONFIG_USB_NET_GL620A=m
-CONFIG_USB_NET_NET1080=m
-CONFIG_USB_NET_PLUSB=m
-CONFIG_USB_NET_MCS7830=m
-CONFIG_USB_NET_RNDIS_HOST=m
-CONFIG_USB_NET_CDC_SUBSET=m
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-CONFIG_USB_BELKIN=y
-CONFIG_USB_ARMLINUX=y
-CONFIG_USB_EPSON2888=y
-CONFIG_USB_KC2190=y
-CONFIG_USB_NET_ZAURUS=m
-CONFIG_USB_NET_CX82310_ETH=m
-CONFIG_USB_NET_KALMIA=m
-CONFIG_USB_HSO=m
-CONFIG_USB_NET_INT51X1=m
-CONFIG_USB_CDC_PHONET=m
-CONFIG_USB_IPHETH=m
-CONFIG_USB_SIERRA_NET=m
-CONFIG_USB_VL600=m
-CONFIG_NET_PCMCIA=y
-CONFIG_PCMCIA_3C589=m
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_PCMCIA_PCNET=m
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_PCMCIA_XIRC2PS=m
-CONFIG_PCMCIA_AXNET=m
 # CONFIG_WAN is not set
-CONFIG_ATM_DRIVERS=y
-# CONFIG_ATM_DUMMY is not set
-CONFIG_ATM_TCP=m
-CONFIG_ATM_LANAI=m
-CONFIG_ATM_ENI=m
-# CONFIG_ATM_ENI_DEBUG is not set
-# CONFIG_ATM_ENI_TUNE_BURST is not set
-CONFIG_ATM_FIRESTREAM=m
-CONFIG_ATM_ZATM=m
-# CONFIG_ATM_ZATM_DEBUG is not set
-CONFIG_ATM_NICSTAR=m
-# CONFIG_ATM_NICSTAR_USE_SUNI is not set
-# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
-CONFIG_ATM_IDT77252=m
-# CONFIG_ATM_IDT77252_DEBUG is not set
-# CONFIG_ATM_IDT77252_RCV_ALL is not set
-CONFIG_ATM_IDT77252_USE_SUNI=y
-CONFIG_ATM_AMBASSADOR=m
-# CONFIG_ATM_AMBASSADOR_DEBUG is not set
-CONFIG_ATM_HORIZON=m
-# CONFIG_ATM_HORIZON_DEBUG is not set
-CONFIG_ATM_IA=m
-# CONFIG_ATM_IA_DEBUG is not set
-CONFIG_ATM_FORE200E=m
-# CONFIG_ATM_FORE200E_USE_TASKLET is not set
-CONFIG_ATM_FORE200E_TX_RETRY=16
-CONFIG_ATM_FORE200E_DEBUG=0
-CONFIG_ATM_HE=m
-# CONFIG_ATM_HE_USE_SUNI is not set
-CONFIG_ATM_SOLOS=m
 CONFIG_IEEE802154_DRIVERS=m
 CONFIG_IEEE802154_FAKEHARD=m
-
-#
-# CAIF transport drivers
-#
-CONFIG_CAIF_TTY=m
-CONFIG_CAIF_SPI_SLAVE=m
-CONFIG_CAIF_SPI_SYNC=y
+CONFIG_IEEE802154_FAKELB=m
+CONFIG_IEEE802154_AT86RF230=m
+# CONFIG_IEEE802154_MRF24J40 is not set
 CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_BACKEND=m
-CONFIG_RIONET=m
-CONFIG_RIONET_TX_SIZE=128
-CONFIG_RIONET_RX_SIZE=128
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-CONFIG_PLIP=m
-CONFIG_PPP=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_MPPE=m
-CONFIG_PPPOE=m
-CONFIG_PPTP=m
-CONFIG_PPPOATM=m
-CONFIG_PPPOL2TP=m
-CONFIG_SLIP=m
-# CONFIG_SLIP_COMPRESSED is not set
-CONFIG_SLHC=m
-# CONFIG_SLIP_SMART is not set
-# CONFIG_SLIP_MODE_SLIP6 is not set
-# CONFIG_NET_FC is not set
-CONFIG_NETCONSOLE=m
-CONFIG_NETCONSOLE_DYNAMIC=y
-CONFIG_NETPOLL=y
-# CONFIG_NETPOLL_TRAP is not set
-CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_VIRTIO_NET=m
 CONFIG_VMXNET3=m
+CONFIG_HYPERV_NET=m
 CONFIG_ISDN=y
 CONFIG_ISDN_I4L=m
 CONFIG_ISDN_PPP=y
@@ -2345,7 +2666,6 @@ CONFIG_MISDN_NETJET=m
 CONFIG_MISDN_IPAC=m
 CONFIG_MISDN_ISAR=m
 CONFIG_ISDN_HDLC=m
-# CONFIG_PHONE is not set
 
 #
 # Input device support
@@ -2354,6 +2674,7 @@ CONFIG_INPUT=y
 CONFIG_INPUT_FF_MEMLESS=m
 CONFIG_INPUT_POLLDEV=m
 CONFIG_INPUT_SPARSEKMAP=m
+CONFIG_INPUT_MATRIXKMAP=m
 
 #
 # Userland interfaces
@@ -2379,8 +2700,10 @@ CONFIG_KEYBOARD_QT2160=m
 # CONFIG_KEYBOARD_GPIO is not set
 # CONFIG_KEYBOARD_GPIO_POLLED is not set
 CONFIG_KEYBOARD_TCA6416=m
+CONFIG_KEYBOARD_TCA8418=m
 CONFIG_KEYBOARD_MATRIX=m
 # CONFIG_KEYBOARD_LM8323 is not set
+CONFIG_KEYBOARD_LM8333=m
 # CONFIG_KEYBOARD_MAX7359 is not set
 CONFIG_KEYBOARD_MCS=m
 CONFIG_KEYBOARD_MPR121=m
@@ -2394,6 +2717,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
@@ -2402,9 +2726,11 @@ CONFIG_MOUSE_PS2_SENTELIC=y
 CONFIG_MOUSE_SERIAL=y
 CONFIG_MOUSE_APPLETOUCH=m
 CONFIG_MOUSE_BCM5974=m
+CONFIG_MOUSE_CYAPA=m
 CONFIG_MOUSE_VSXXXAA=m
 # CONFIG_MOUSE_GPIO is not set
 CONFIG_MOUSE_SYNAPTICS_I2C=m
+CONFIG_MOUSE_SYNAPTICS_USB=m
 CONFIG_INPUT_JOYSTICK=y
 CONFIG_JOYSTICK_ANALOG=m
 CONFIG_JOYSTICK_A3D=m
@@ -2444,32 +2770,46 @@ CONFIG_TABLET_USB_HANWANG=m
 CONFIG_TABLET_USB_KBTAB=m
 CONFIG_TABLET_USB_WACOM=m
 CONFIG_INPUT_TOUCHSCREEN=y
+# CONFIG_TOUCHSCREEN_ADS7846 is not set
+# CONFIG_TOUCHSCREEN_AD7877 is not set
 CONFIG_TOUCHSCREEN_AD7879=m
 CONFIG_TOUCHSCREEN_AD7879_I2C=m
+# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
 CONFIG_TOUCHSCREEN_ATMEL_MXT=m
+CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
 CONFIG_TOUCHSCREEN_BU21013=m
 CONFIG_TOUCHSCREEN_CY8CTMG110=m
+CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
+CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
+# CONFIG_TOUCHSCREEN_CYTTSP_SPI is not set
 CONFIG_TOUCHSCREEN_DYNAPRO=m
 CONFIG_TOUCHSCREEN_HAMPSHIRE=m
 CONFIG_TOUCHSCREEN_EETI=m
 CONFIG_TOUCHSCREEN_FUJITSU=m
+CONFIG_TOUCHSCREEN_ILI210X=m
 CONFIG_TOUCHSCREEN_GUNZE=m
 CONFIG_TOUCHSCREEN_ELO=m
 CONFIG_TOUCHSCREEN_WACOM_W8001=m
+CONFIG_TOUCHSCREEN_WACOM_I2C=m
 CONFIG_TOUCHSCREEN_MAX11801=m
 CONFIG_TOUCHSCREEN_MCS5000=m
+CONFIG_TOUCHSCREEN_MMS114=m
 CONFIG_TOUCHSCREEN_MTOUCH=m
 CONFIG_TOUCHSCREEN_INEXIO=m
 CONFIG_TOUCHSCREEN_MK712=m
 CONFIG_TOUCHSCREEN_PENMOUNT=m
+CONFIG_TOUCHSCREEN_EDT_FT5X06=m
 CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
 CONFIG_TOUCHSCREEN_TOUCHWIN=m
+CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m
 CONFIG_TOUCHSCREEN_UCB1400=m
+CONFIG_TOUCHSCREEN_PIXCIR=m
 CONFIG_TOUCHSCREEN_WM97XX=m
 CONFIG_TOUCHSCREEN_WM9705=y
 CONFIG_TOUCHSCREEN_WM9712=y
 CONFIG_TOUCHSCREEN_WM9713=y
 CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+CONFIG_TOUCHSCREEN_MC13783=m
 CONFIG_TOUCHSCREEN_USB_EGALAX=y
 CONFIG_TOUCHSCREEN_USB_PANJIT=y
 CONFIG_TOUCHSCREEN_USB_3M=y
@@ -2482,33 +2822,47 @@ CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
 CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
 CONFIG_TOUCHSCREEN_USB_GOTOP=y
 CONFIG_TOUCHSCREEN_USB_JASTEC=y
+CONFIG_TOUCHSCREEN_USB_ELO=y
 CONFIG_TOUCHSCREEN_USB_E2I=y
 CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
 CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
 CONFIG_TOUCHSCREEN_USB_NEXIO=y
+CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
 CONFIG_TOUCHSCREEN_TOUCHIT213=m
+CONFIG_TOUCHSCREEN_TSC_SERIO=m
+# CONFIG_TOUCHSCREEN_TSC2005 is not set
 CONFIG_TOUCHSCREEN_TSC2007=m
 CONFIG_TOUCHSCREEN_ST1232=m
 CONFIG_TOUCHSCREEN_TPS6507X=m
 CONFIG_INPUT_MISC=y
-CONFIG_INPUT_AB8500_PONKEY=m
 CONFIG_INPUT_AD714X=m
 CONFIG_INPUT_AD714X_I2C=m
+CONFIG_INPUT_AD714X_SPI=m
+CONFIG_INPUT_BMA150=m
 CONFIG_INPUT_PCSPKR=m
+CONFIG_INPUT_MC13783_PWRBUTTON=m
+CONFIG_INPUT_MMA8450=m
+CONFIG_INPUT_MPU3050=m
 CONFIG_INPUT_APANEL=m
+CONFIG_INPUT_GP2A=m
+# CONFIG_INPUT_GPIO_TILT_POLLED is not set
 CONFIG_INPUT_ATLAS_BTNS=m
-CONFIG_INPUT_ATI_REMOTE=m
 CONFIG_INPUT_ATI_REMOTE2=m
 CONFIG_INPUT_KEYSPAN_REMOTE=m
+CONFIG_INPUT_KXTJ9=m
+# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set
 CONFIG_INPUT_POWERMATE=m
 CONFIG_INPUT_YEALINK=m
 CONFIG_INPUT_CM109=m
+CONFIG_INPUT_RETU_PWRBUTTON=m
 CONFIG_INPUT_UINPUT=m
 CONFIG_INPUT_PCF50633_PMU=m
 CONFIG_INPUT_PCF8574=m
 CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
 CONFIG_INPUT_ADXL34X=m
 CONFIG_INPUT_ADXL34X_I2C=m
+CONFIG_INPUT_ADXL34X_SPI=m
+# CONFIG_INPUT_IMS_PCU is not set
 CONFIG_INPUT_CMA3000=m
 CONFIG_INPUT_CMA3000_I2C=m
 CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m
@@ -2526,6 +2880,7 @@ CONFIG_SERIO_LIBPS2=y
 CONFIG_SERIO_RAW=m
 CONFIG_SERIO_ALTERA_PS2=m
 CONFIG_SERIO_PS2MULT=m
+CONFIG_SERIO_ARC_PS2=m
 CONFIG_GAMEPORT=m
 CONFIG_GAMEPORT_NS558=m
 CONFIG_GAMEPORT_L4=m
@@ -2535,9 +2890,11 @@ CONFIG_GAMEPORT_FM801=m
 #
 # Character devices
 #
+CONFIG_TTY=y
 CONFIG_VT=y
 CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_VT_CONSOLE=y
+CONFIG_VT_CONSOLE_SLEEP=y
 CONFIG_HW_CONSOLE=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_UNIX98_PTYS=y
@@ -2565,35 +2922,46 @@ 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_PNP=y
 CONFIG_SERIAL_8250_CS=m
 CONFIG_SERIAL_8250_NR_UARTS=32
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 # CONFIG_SERIAL_8250_EXTENDED is not set
+CONFIG_SERIAL_8250_DW=m
 
 #
 # Non-8250 serial port support
 #
+# CONFIG_SERIAL_MAX3100 is not set
+# CONFIG_SERIAL_MAX310X is not set
 CONFIG_SERIAL_MFD_HSU=m
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_SCCNXP=m
 # CONFIG_SERIAL_TIMBERDALE is not set
 CONFIG_SERIAL_ALTERA_JTAGUART=m
 CONFIG_SERIAL_ALTERA_UART=m
 CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
 CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
+# CONFIG_SERIAL_IFX6X60 is not set
 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
 CONFIG_HVC_DRIVER=y
 CONFIG_HVC_IRQ=y
 CONFIG_HVC_XEN=y
+CONFIG_HVC_XEN_FRONTEND=y
 CONFIG_VIRTIO_CONSOLE=m
 CONFIG_IPMI_HANDLER=m
 # CONFIG_IPMI_PANIC_EVENT is not set
@@ -2607,6 +2975,7 @@ CONFIG_HW_RANDOM_INTEL=m
 CONFIG_HW_RANDOM_AMD=m
 CONFIG_HW_RANDOM_VIA=m
 CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_HW_RANDOM_TPM=m
 CONFIG_NVRAM=m
 CONFIG_R3964=m
 CONFIG_APPLICOM=m
@@ -2625,12 +2994,13 @@ CONFIG_HPET_MMAP=y
 CONFIG_HANGCHECK_TIMER=m
 CONFIG_TCG_TPM=m
 CONFIG_TCG_TIS=m
+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_RAMOOPS=m
 CONFIG_I2C=m
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_COMPAT=y
@@ -2656,6 +3026,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
@@ -2673,6 +3044,10 @@ CONFIG_I2C_SCMI=m
 #
 # I2C system bus drivers (mostly embedded / system-on-chip)
 #
+# CONFIG_I2C_CBUS_GPIO is not set
+CONFIG_I2C_DESIGNWARE_CORE=m
+CONFIG_I2C_DESIGNWARE_PCI=m
+CONFIG_I2C_EG20T=m
 # CONFIG_I2C_GPIO is not set
 CONFIG_I2C_INTEL_MID=m
 CONFIG_I2C_OCORES=m
@@ -2680,7 +3055,6 @@ CONFIG_I2C_PCA_PLATFORM=m
 # CONFIG_I2C_PXA_PCI is not set
 CONFIG_I2C_SIMTEC=m
 CONFIG_I2C_XILINX=m
-CONFIG_I2C_EG20T=m
 
 #
 # External I2C/SMBus adapter drivers
@@ -2690,6 +3064,7 @@ CONFIG_I2C_PARPORT=m
 CONFIG_I2C_PARPORT_LIGHT=m
 CONFIG_I2C_TAOS_EVM=m
 CONFIG_I2C_TINY_USB=m
+CONFIG_I2C_VIPERBOARD=m
 
 #
 # Other I2C/SMBus bus drivers
@@ -2698,7 +3073,39 @@ CONFIG_I2C_TINY_USB=m
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_SPI is not set
+CONFIG_SPI=y
+# CONFIG_SPI_DEBUG is not set
+CONFIG_SPI_MASTER=y
+
+#
+# SPI Master Controller Drivers
+#
+# CONFIG_SPI_ALTERA is not set
+# CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_BUTTERFLY is not set
+# CONFIG_SPI_GPIO is not set
+# CONFIG_SPI_LM70_LLP is not set
+# CONFIG_SPI_OC_TINY is not set
+CONFIG_SPI_PXA2XX_DMA=y
+CONFIG_SPI_PXA2XX=m
+CONFIG_SPI_PXA2XX_PCI=m
+# CONFIG_SPI_SC18IS602 is not set
+# CONFIG_SPI_TOPCLIFF_PCH is not set
+# CONFIG_SPI_XCOMM is not set
+# CONFIG_SPI_XILINX is not set
+# CONFIG_SPI_DESIGNWARE is not set
+
+#
+# SPI Protocol Masters
+#
+# CONFIG_SPI_SPIDEV is not set
+# CONFIG_SPI_TLE62X0 is not set
+
+#
+# Qualcomm MSM SSBI bus support
+#
+CONFIG_SSBI=m
+# CONFIG_HSI is not set
 
 #
 # PPS support
@@ -2712,6 +3119,7 @@ CONFIG_PPS=m
 CONFIG_PPS_CLIENT_KTIMER=m
 CONFIG_PPS_CLIENT_LDISC=m
 CONFIG_PPS_CLIENT_PARPORT=m
+CONFIG_PPS_CLIENT_GPIO=m
 
 #
 # PPS generators support
@@ -2722,23 +3130,29 @@ CONFIG_PPS_CLIENT_PARPORT=m
 #
 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_GPIO_ACPI=y
 # CONFIG_DEBUG_GPIO is not set
 CONFIG_GPIO_SYSFS=y
 
 #
 # Memory mapped GPIO drivers:
 #
-CONFIG_GPIO_BASIC_MMIO_CORE=m
-CONFIG_GPIO_BASIC_MMIO=m
+# CONFIG_GPIO_GENERIC_PLATFORM is not set
 # CONFIG_GPIO_IT8761E is not set
+# CONFIG_GPIO_TS5500 is not set
 CONFIG_GPIO_SCH=m
+CONFIG_GPIO_ICH=m
 # CONFIG_GPIO_VX855 is not set
+# CONFIG_GPIO_LYNXPOINT is not set
 
 #
 # I2C GPIO expanders:
 #
+CONFIG_GPIO_ARIZONA=m
 # CONFIG_GPIO_MAX7300 is not set
 # CONFIG_GPIO_MAX732X is not set
 # CONFIG_GPIO_PCA953X is not set
@@ -2749,6 +3163,7 @@ CONFIG_GPIO_SCH=m
 # PCI GPIO expanders:
 #
 CONFIG_GPIO_CS5535=m
+CONFIG_GPIO_AMD8111=m
 CONFIG_GPIO_LANGWELL=y
 # CONFIG_GPIO_PCH is not set
 # CONFIG_GPIO_ML_IOH is not set
@@ -2757,6 +3172,10 @@ CONFIG_GPIO_LANGWELL=y
 #
 # SPI GPIO expanders:
 #
+# CONFIG_GPIO_MAX7301 is not set
+# CONFIG_GPIO_MCP23S08 is not set
+# CONFIG_GPIO_MC33880 is not set
+# CONFIG_GPIO_74X164 is not set
 
 #
 # AC97 GPIO expanders:
@@ -2766,21 +3185,33 @@ CONFIG_GPIO_UCB1400=y
 #
 # MODULbus GPIO expanders:
 #
+
+#
+# USB GPIO expanders:
+#
+CONFIG_GPIO_VIPERBOARD=m
 # CONFIG_W1 is not set
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 CONFIG_PDA_POWER=m
 CONFIG_TEST_POWER=m
 # CONFIG_BATTERY_DS2780 is not set
+# CONFIG_BATTERY_DS2781 is not set
 # CONFIG_BATTERY_DS2782 is not set
-# CONFIG_BATTERY_BQ20Z75 is not set
+# CONFIG_BATTERY_SBS is not set
 # CONFIG_BATTERY_BQ27x00 is not set
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
 # CONFIG_CHARGER_PCF50633 is not set
 # CONFIG_CHARGER_ISP1704 is not set
 # CONFIG_CHARGER_MAX8903 is not set
+# CONFIG_CHARGER_LP8727 is not set
 # 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_AVS=y
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
@@ -2790,14 +3221,19 @@ CONFIG_HWMON_VID=m
 #
 CONFIG_SENSORS_ABITUGURU=m
 CONFIG_SENSORS_ABITUGURU3=m
+# CONFIG_SENSORS_AD7314 is not set
 CONFIG_SENSORS_AD7414=m
 CONFIG_SENSORS_AD7418=m
+# CONFIG_SENSORS_ADCXX is not set
 CONFIG_SENSORS_ADM1021=m
 CONFIG_SENSORS_ADM1025=m
 CONFIG_SENSORS_ADM1026=m
 CONFIG_SENSORS_ADM1029=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_ADT7X10=m
+CONFIG_SENSORS_ADT7310=m
+CONFIG_SENSORS_ADT7410=m
 CONFIG_SENSORS_ADT7411=m
 CONFIG_SENSORS_ADT7462=m
 CONFIG_SENSORS_ADT7470=m
@@ -2819,6 +3255,7 @@ CONFIG_SENSORS_G760A=m
 CONFIG_SENSORS_GL518SM=m
 CONFIG_SENSORS_GL520SM=m
 # CONFIG_SENSORS_GPIO_FAN is not set
+CONFIG_SENSORS_HIH6130=m
 CONFIG_SENSORS_CORETEMP=m
 CONFIG_SENSORS_IBMAEM=m
 CONFIG_SENSORS_IBMPEX=m
@@ -2826,6 +3263,7 @@ CONFIG_SENSORS_IT87=m
 CONFIG_SENSORS_JC42=m
 CONFIG_SENSORS_LINEAGE=m
 CONFIG_SENSORS_LM63=m
+# CONFIG_SENSORS_LM70 is not set
 CONFIG_SENSORS_LM73=m
 CONFIG_SENSORS_LM75=m
 CONFIG_SENSORS_LM77=m
@@ -2841,23 +3279,35 @@ CONFIG_SENSORS_LTC4151=m
 CONFIG_SENSORS_LTC4215=m
 CONFIG_SENSORS_LTC4245=m
 CONFIG_SENSORS_LTC4261=m
+CONFIG_SENSORS_LM95234=m
 CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_LM95245=m
+# CONFIG_SENSORS_MAX1111 is not set
 CONFIG_SENSORS_MAX16065=m
 CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX1668=m
+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_NCT6775=m
+CONFIG_SENSORS_NTC_THERMISTOR=m
 CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PC87427=m
 CONFIG_SENSORS_PCF8591=m
 CONFIG_PMBUS=m
 CONFIG_SENSORS_PMBUS=m
 CONFIG_SENSORS_ADM1275=m
+CONFIG_SENSORS_LM25066=m
+CONFIG_SENSORS_LTC2978=m
 CONFIG_SENSORS_MAX16064=m
 CONFIG_SENSORS_MAX34440=m
 CONFIG_SENSORS_MAX8688=m
 CONFIG_SENSORS_UCD9000=m
 CONFIG_SENSORS_UCD9200=m
+CONFIG_SENSORS_ZL6100=m
 CONFIG_SENSORS_SHT15=m
 CONFIG_SENSORS_SHT21=m
 CONFIG_SENSORS_SIS5595=m
@@ -2869,10 +3319,15 @@ CONFIG_SENSORS_EMC6W201=m
 CONFIG_SENSORS_SMSC47M1=m
 CONFIG_SENSORS_SMSC47M192=m
 CONFIG_SENSORS_SMSC47B397=m
+CONFIG_SENSORS_SCH56XX_COMMON=m
 CONFIG_SENSORS_SCH5627=m
+CONFIG_SENSORS_SCH5636=m
 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
 CONFIG_SENSORS_TMP401=m
@@ -2892,6 +3347,7 @@ CONFIG_SENSORS_W83L786NG=m
 CONFIG_SENSORS_W83627HF=m
 CONFIG_SENSORS_W83627EHF=m
 CONFIG_SENSORS_APPLESMC=m
+CONFIG_SENSORS_MC13783_ADC=m
 
 #
 # ACPI drivers
@@ -2900,13 +3356,24 @@ CONFIG_SENSORS_ACPI_POWER=m
 CONFIG_SENSORS_ATK0110=m
 CONFIG_THERMAL=y
 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_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
 
 #
 # Watchdog Device Drivers
 #
 CONFIG_SOFT_WATCHDOG=m
+CONFIG_RETU_WATCHDOG=m
 CONFIG_ACQUIRE_WDT=m
 CONFIG_ADVANTECH_WDT=m
 CONFIG_ALIM1535_WDT=m
@@ -2921,6 +3388,7 @@ CONFIG_IB700_WDT=m
 CONFIG_IBMASR=m
 CONFIG_WAFER_WDT=m
 CONFIG_I6300ESB_WDT=m
+CONFIG_IE6XX_WDT=m
 CONFIG_ITCO_WDT=m
 CONFIG_ITCO_VENDOR_SUPPORT=y
 CONFIG_IT8712F_WDT=m
@@ -2935,6 +3403,7 @@ CONFIG_SBC8360_WDT=m
 CONFIG_CPU5_WDT=m
 CONFIG_SMSC_SCH311X_WDT=m
 CONFIG_SMSC37B787_WDT=m
+CONFIG_VIA_WDT=m
 CONFIG_W83627HF_WDT=m
 CONFIG_W83697HF_WDT=m
 CONFIG_W83697UG_WDT=m
@@ -2972,67 +3441,121 @@ CONFIG_SSB_SDIOHOST=y
 # CONFIG_SSB_DEBUG is not set
 CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
 CONFIG_SSB_DRIVER_PCICORE=y
+CONFIG_SSB_DRIVER_GPIO=y
 CONFIG_BCMA_POSSIBLE=y
 
 #
 # Broadcom specific AMBA
 #
 CONFIG_BCMA=m
+CONFIG_BCMA_BLOCKIO=y
 CONFIG_BCMA_HOST_PCI_POSSIBLE=y
 CONFIG_BCMA_HOST_PCI=y
+CONFIG_BCMA_DRIVER_GMAC_CMN=y
+CONFIG_BCMA_DRIVER_GPIO=y
 # CONFIG_BCMA_DEBUG is not set
-CONFIG_MFD_SUPPORT=y
+
+#
+# Multifunction device drivers
+#
 CONFIG_MFD_CORE=y
-CONFIG_MFD_SM501=m
-CONFIG_MFD_SM501_GPIO=y
+CONFIG_MFD_CS5535=m
+# CONFIG_MFD_CROS_EC is not set
+# CONFIG_MFD_DA9052_SPI is not set
+CONFIG_MFD_MC13783=m
+CONFIG_MFD_MC13XXX=m
+# CONFIG_MFD_MC13XXX_SPI is not set
+CONFIG_MFD_MC13XXX_I2C=m
 CONFIG_HTC_PASIC3=m
-CONFIG_UCB1400_CORE=m
-# CONFIG_TPS6105X is not set
-CONFIG_TPS65010=m
-CONFIG_TPS6507X=m
-# CONFIG_MFD_TMIO is not set
-CONFIG_MFD_WM8400=m
+CONFIG_LPC_ICH=m
+CONFIG_LPC_SCH=m
+# CONFIG_MFD_JANZ_CMODIO is not set
+# CONFIG_EZX_PCAP is not set
+CONFIG_MFD_VIPERBOARD=m
+CONFIG_MFD_RETU=m
 CONFIG_MFD_PCF50633=m
 CONFIG_PCF50633_ADC=m
 CONFIG_PCF50633_GPIO=m
+CONFIG_UCB1400_CORE=m
+CONFIG_MFD_RDC321X=m
+CONFIG_MFD_RTSX_PCI=m
+CONFIG_MFD_SI476X_CORE=m
+CONFIG_MFD_SM501=m
+CONFIG_MFD_SM501_GPIO=y
 CONFIG_ABX500_CORE=y
-CONFIG_AB8500_CORE=y
-# CONFIG_AB8500_DEBUG is not set
-CONFIG_MFD_CS5535=m
+# CONFIG_MFD_STMPE is not set
+# CONFIG_MFD_SYSCON is not set
+CONFIG_MFD_TI_AM335X_TSCADC=m
+# CONFIG_TPS6105X is not set
+CONFIG_TPS65010=m
+CONFIG_TPS6507X=m
+CONFIG_MFD_TPS65217=m
+# CONFIG_MFD_TPS65912 is not set
+# CONFIG_MFD_TPS65912_SPI is not set
+CONFIG_MFD_WL1273_CORE=m
+CONFIG_MFD_LM3533=m
 # CONFIG_MFD_TIMBERDALE is not set
-CONFIG_LPC_SCH=m
-CONFIG_MFD_RDC321X=m
-# CONFIG_MFD_JANZ_CMODIO is not set
+# CONFIG_MFD_TMIO is not set
 CONFIG_MFD_VX855=m
-CONFIG_MFD_WL1273_CORE=m
+CONFIG_MFD_ARIZONA=y
+CONFIG_MFD_ARIZONA_I2C=m
+# CONFIG_MFD_ARIZONA_SPI is not set
+CONFIG_MFD_WM5102=y
+CONFIG_MFD_WM5110=y
+# CONFIG_MFD_WM831X_SPI is not set
 # CONFIG_REGULATOR is not set
 CONFIG_MEDIA_SUPPORT=m
 
 #
 # Multimedia core support
 #
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
+CONFIG_MEDIA_RADIO_SUPPORT=y
+CONFIG_MEDIA_RC_SUPPORT=y
 CONFIG_MEDIA_CONTROLLER=y
 CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L2_COMMON=m
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
+CONFIG_VIDEO_V4L2=m
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+CONFIG_VIDEO_TUNER=m
+CONFIG_V4L2_MEM2MEM_DEV=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_DMA_SG=m
+CONFIG_VIDEOBUF_VMALLOC=m
+CONFIG_VIDEOBUF_DVB=m
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_DMA_CONTIG=m
+CONFIG_VIDEOBUF2_VMALLOC=m
+CONFIG_VIDEOBUF2_DMA_SG=m
+# CONFIG_VIDEO_V4L2_INT_DEVICE is not set
 CONFIG_DVB_CORE=m
-CONFIG_VIDEO_MEDIA=m
+CONFIG_DVB_NET=y
+CONFIG_TTPCI_EEPROM=m
+CONFIG_DVB_MAX_ADAPTERS=8
+# CONFIG_DVB_DYNAMIC_MINORS is not set
 
 #
-# Multimedia drivers
+# Media drivers
 #
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
 CONFIG_RC_CORE=m
-CONFIG_LIRC=m
 CONFIG_RC_MAP=m
+CONFIG_RC_DECODERS=y
+CONFIG_LIRC=m
+CONFIG_IR_LIRC_CODEC=m
 CONFIG_IR_NEC_DECODER=m
 CONFIG_IR_RC5_DECODER=m
 CONFIG_IR_RC6_DECODER=m
 CONFIG_IR_JVC_DECODER=m
 CONFIG_IR_SONY_DECODER=m
 CONFIG_IR_RC5_SZ_DECODER=m
-CONFIG_IR_LIRC_CODEC=m
+CONFIG_IR_SANYO_DECODER=m
+CONFIG_IR_MCE_KBD_DECODER=m
+CONFIG_RC_DEVICES=y
+CONFIG_RC_ATI_REMOTE=m
 CONFIG_IR_ENE=m
 CONFIG_IR_IMON=m
 CONFIG_IR_MCEUSB=m
@@ -3042,189 +3565,15 @@ CONFIG_IR_NUVOTON=m
 CONFIG_IR_REDRAT3=m
 CONFIG_IR_STREAMZAP=m
 CONFIG_IR_WINBOND_CIR=m
+CONFIG_IR_IGUANA=m
+CONFIG_IR_TTUSBIR=m
 CONFIG_RC_LOOPBACK=m
-CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_TUNER=m
-# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_TEA5761=m
-CONFIG_MEDIA_TUNER_TEA5767=m
-CONFIG_MEDIA_TUNER_MT20XX=m
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2266=m
-CONFIG_MEDIA_TUNER_MT2131=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC5000=m
-CONFIG_MEDIA_TUNER_MXL5005S=m
-CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=m
-CONFIG_MEDIA_TUNER_MAX2165=m
-CONFIG_MEDIA_TUNER_TDA18218=m
-CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEOBUF_DMA_CONTIG=m
-CONFIG_VIDEOBUF_DVB=m
-CONFIG_VIDEO_BTCX=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_VIDEO_TUNER=m
-CONFIG_V4L2_MEM2MEM_DEV=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_VMALLOC=m
-CONFIG_VIDEO_CAPTURE_DRIVERS=y
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
-CONFIG_VIDEO_IR_I2C=m
-
-#
-# Encoders, decoders, sensors and other helper chips
-#
-
-#
-# Audio decoders, processors and mixers
-#
-CONFIG_VIDEO_TVAUDIO=m
-CONFIG_VIDEO_TDA7432=m
-CONFIG_VIDEO_TDA9840=m
-CONFIG_VIDEO_TEA6415C=m
-CONFIG_VIDEO_TEA6420=m
-CONFIG_VIDEO_MSP3400=m
-CONFIG_VIDEO_CS5345=m
-CONFIG_VIDEO_CS53L32A=m
-CONFIG_VIDEO_TLV320AIC23B=m
-CONFIG_VIDEO_WM8775=m
-CONFIG_VIDEO_WM8739=m
-CONFIG_VIDEO_VP27SMPX=m
-
-#
-# RDS decoders
-#
-CONFIG_VIDEO_SAA6588=m
+CONFIG_IR_GPIO_CIR=m
+CONFIG_MEDIA_USB_SUPPORT=y
 
 #
-# Video decoders
-#
-CONFIG_VIDEO_ADV7180=m
-CONFIG_VIDEO_BT819=m
-CONFIG_VIDEO_BT856=m
-CONFIG_VIDEO_BT866=m
-CONFIG_VIDEO_KS0127=m
-CONFIG_VIDEO_SAA7110=m
-CONFIG_VIDEO_SAA711X=m
-CONFIG_VIDEO_SAA7191=m
-CONFIG_VIDEO_TVP514X=m
-CONFIG_VIDEO_TVP5150=m
-CONFIG_VIDEO_TVP7002=m
-CONFIG_VIDEO_VPX3220=m
-
-#
-# Video and audio decoders
-#
-CONFIG_VIDEO_SAA717X=m
-CONFIG_VIDEO_CX25840=m
-
-#
-# MPEG video encoders
-#
-CONFIG_VIDEO_CX2341X=m
-
-#
-# Video encoders
-#
-CONFIG_VIDEO_SAA7127=m
-CONFIG_VIDEO_SAA7185=m
-CONFIG_VIDEO_ADV7170=m
-CONFIG_VIDEO_ADV7175=m
-CONFIG_VIDEO_ADV7343=m
-CONFIG_VIDEO_AK881X=m
-
-#
-# Camera sensor devices
-#
-CONFIG_VIDEO_OV7670=m
-CONFIG_VIDEO_MT9V011=m
-CONFIG_VIDEO_MT9V032=m
-CONFIG_VIDEO_TCM825X=m
-
-#
-# Video improvement chips
-#
-CONFIG_VIDEO_UPD64031A=m
-CONFIG_VIDEO_UPD64083=m
-
+# Webcam devices
 #
-# Miscelaneous helper chips
-#
-CONFIG_VIDEO_THS7303=m
-CONFIG_VIDEO_M52790=m
-CONFIG_VIDEO_VIVI=m
-CONFIG_VIDEO_BT848=m
-CONFIG_VIDEO_BT848_DVB=y
-CONFIG_VIDEO_BWQCAM=m
-CONFIG_VIDEO_CQCAM=m
-CONFIG_VIDEO_W9966=m
-CONFIG_VIDEO_CPIA2=m
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_ZR36060=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN_AVS6EYES=m
-CONFIG_VIDEO_MEYE=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7134_ALSA=m
-CONFIG_VIDEO_SAA7134_RC=y
-CONFIG_VIDEO_SAA7134_DVB=m
-CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_TIMBERDALE=m
-CONFIG_VIDEO_CX88=m
-CONFIG_VIDEO_CX88_ALSA=m
-CONFIG_VIDEO_CX88_BLACKBIRD=m
-CONFIG_VIDEO_CX88_DVB=m
-CONFIG_VIDEO_CX88_MPEG=m
-CONFIG_VIDEO_CX88_VP3054=m
-CONFIG_VIDEO_CX23885=m
-CONFIG_MEDIA_ALTERA_CI=m
-CONFIG_VIDEO_AU0828=m
-CONFIG_VIDEO_IVTV=m
-CONFIG_VIDEO_FB_IVTV=m
-CONFIG_VIDEO_CX18=m
-CONFIG_VIDEO_CX18_ALSA=m
-CONFIG_VIDEO_SAA7164=m
-CONFIG_VIDEO_CAFE_CCIC=m
-CONFIG_VIDEO_SR030PC30=m
-CONFIG_VIDEO_VIA_CAMERA=m
-CONFIG_VIDEO_NOON010PC30=m
-CONFIG_VIDEO_M5MOLS=m
-CONFIG_SOC_CAMERA=m
-CONFIG_SOC_CAMERA_IMX074=m
-CONFIG_SOC_CAMERA_MT9M001=m
-CONFIG_SOC_CAMERA_MT9M111=m
-CONFIG_SOC_CAMERA_MT9T031=m
-CONFIG_SOC_CAMERA_MT9T112=m
-CONFIG_SOC_CAMERA_MT9V022=m
-CONFIG_SOC_CAMERA_RJ54N1=m
-CONFIG_SOC_CAMERA_TW9910=m
-CONFIG_SOC_CAMERA_PLATFORM=m
-CONFIG_SOC_CAMERA_OV2640=m
-CONFIG_SOC_CAMERA_OV6650=m
-CONFIG_SOC_CAMERA_OV772X=m
-CONFIG_SOC_CAMERA_OV9640=m
-CONFIG_SOC_CAMERA_OV9740=m
-CONFIG_V4L_USB_DRIVERS=y
 CONFIG_USB_VIDEO_CLASS=m
 CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
 CONFIG_USB_GSPCA=m
@@ -3237,6 +3586,7 @@ CONFIG_USB_GSPCA_CPIA1=m
 CONFIG_USB_GSPCA_ETOMS=m
 CONFIG_USB_GSPCA_FINEPIX=m
 CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_JL2005BCD=m
 CONFIG_USB_GSPCA_KINECT=m
 CONFIG_USB_GSPCA_KONICA=m
 CONFIG_USB_GSPCA_MARS=m
@@ -3248,6 +3598,7 @@ CONFIG_USB_GSPCA_OV534_9=m
 CONFIG_USB_GSPCA_PAC207=m
 CONFIG_USB_GSPCA_PAC7302=m
 CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SE401=m
 CONFIG_USB_GSPCA_SN9C2028=m
 CONFIG_USB_GSPCA_SN9C20X=m
 CONFIG_USB_GSPCA_SONIXB=m
@@ -3266,71 +3617,49 @@ CONFIG_USB_GSPCA_STK014=m
 CONFIG_USB_GSPCA_STV0680=m
 CONFIG_USB_GSPCA_SUNPLUS=m
 CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TOPRO=m
 CONFIG_USB_GSPCA_TV8532=m
 CONFIG_USB_GSPCA_VC032X=m
 CONFIG_USB_GSPCA_VICAM=m
 CONFIG_USB_GSPCA_XIRLINK_CIT=m
 CONFIG_USB_GSPCA_ZC3XX=m
-CONFIG_VIDEO_PVRUSB2=m
-CONFIG_VIDEO_PVRUSB2_SYSFS=y
-CONFIG_VIDEO_PVRUSB2_DVB=y
-# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
-CONFIG_VIDEO_HDPVR=m
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_TLG2300=m
-CONFIG_VIDEO_CX231XX=m
-CONFIG_VIDEO_CX231XX_RC=y
-CONFIG_VIDEO_CX231XX_ALSA=m
-CONFIG_VIDEO_CX231XX_DVB=m
-CONFIG_VIDEO_USBVISION=m
-CONFIG_USB_ET61X251=m
-CONFIG_USB_SN9C102=m
 CONFIG_USB_PWC=m
 # CONFIG_USB_PWC_DEBUG is not set
 CONFIG_USB_PWC_INPUT_EVDEV=y
+CONFIG_VIDEO_CPIA2=m
 CONFIG_USB_ZR364XX=m
 CONFIG_USB_STKWEBCAM=m
 CONFIG_USB_S2255=m
-CONFIG_V4L_MEM2MEM_DRIVERS=y
-CONFIG_VIDEO_MEM2MEM_TESTDEV=m
-CONFIG_RADIO_ADAPTERS=y
-CONFIG_RADIO_MAXIRADIO=m
-CONFIG_I2C_SI4713=m
-CONFIG_RADIO_SI4713=m
-CONFIG_USB_DSBR=m
-CONFIG_RADIO_SI470X=y
-CONFIG_USB_SI470X=m
-CONFIG_I2C_SI470X=m
-CONFIG_USB_MR800=m
-CONFIG_RADIO_TEA5764=m
-CONFIG_RADIO_SAA7706H=m
-CONFIG_RADIO_TEF6862=m
-CONFIG_RADIO_WL1273=m
+CONFIG_USB_SN9C102=m
 
 #
-# Texas Instruments WL128x FM driver (ST based)
+# Analog TV USB devices
 #
-CONFIG_RADIO_WL128X=m
-CONFIG_DVB_MAX_ADAPTERS=8
-# CONFIG_DVB_DYNAMIC_MINORS is not set
-CONFIG_DVB_CAPTURE_DRIVERS=y
+CONFIG_VIDEO_PVRUSB2=m
+CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_PVRUSB2_DVB=y
+# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
+CONFIG_VIDEO_HDPVR=m
+CONFIG_VIDEO_TLG2300=m
+CONFIG_VIDEO_USBVISION=m
+CONFIG_VIDEO_STK1160=m
+CONFIG_VIDEO_STK1160_AC97=y
 
 #
-# Supported SAA7146 based PCI Adapters
+# Analog/digital TV USB devices
 #
-CONFIG_TTPCI_EEPROM=m
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
-CONFIG_DVB_BUDGET_CORE=m
-CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_CI=m
-CONFIG_DVB_BUDGET_AV=m
-CONFIG_DVB_BUDGET_PATCH=m
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_AU0828_V4L2=y
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_RC=y
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
+CONFIG_VIDEO_TM6000=m
+CONFIG_VIDEO_TM6000_ALSA=m
+CONFIG_VIDEO_TM6000_DVB=m
 
 #
-# Supported USB Adapters
+# Digital TV USB devices
 #
 CONFIG_DVB_USB=m
 # CONFIG_DVB_USB_DEBUG is not set
@@ -3342,8 +3671,6 @@ CONFIG_DVB_USB_DIB0700=m
 CONFIG_DVB_USB_UMT_010=m
 CONFIG_DVB_USB_CXUSB=m
 CONFIG_DVB_USB_M920X=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_AU6610=m
 CONFIG_DVB_USB_DIGITV=m
 CONFIG_DVB_USB_VP7045=m
 CONFIG_DVB_USB_VP702X=m
@@ -3354,77 +3681,278 @@ CONFIG_DVB_USB_DTT200U=m
 CONFIG_DVB_USB_OPERA1=m
 CONFIG_DVB_USB_AF9005=m
 CONFIG_DVB_USB_AF9005_REMOTE=m
+CONFIG_DVB_USB_PCTV452E=m
 CONFIG_DVB_USB_DW2102=m
 CONFIG_DVB_USB_CINERGY_T2=m
-CONFIG_DVB_USB_ANYSEE=m
 CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_FRIIO=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_USB_V2=m
 CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_AF9035=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_AZ6007=m
 CONFIG_DVB_USB_CE6230=m
-CONFIG_DVB_USB_FRIIO=m
 CONFIG_DVB_USB_EC168=m
-CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_IT913X=m
 CONFIG_DVB_USB_LME2510=m
-CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_USB_MXL111SF=m
+CONFIG_DVB_USB_RTL28XXU=m
 CONFIG_DVB_TTUSB_BUDGET=m
 CONFIG_DVB_TTUSB_DEC=m
-CONFIG_SMS_SIANO_MDTV=m
+CONFIG_SMS_USB_DRV=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
 
 #
-# Siano module components
+# Webcam, TV (analog/digital) USB devices
 #
-CONFIG_SMS_USB_DRV=m
-CONFIG_SMS_SDIO_DRV=m
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_EM28XX_RC=m
+CONFIG_MEDIA_PCI_SUPPORT=y
 
 #
-# Supported FlexCopII (B2C2) Adapters
+# Media capture support
 #
-CONFIG_DVB_B2C2_FLEXCOP=m
-CONFIG_DVB_B2C2_FLEXCOP_PCI=m
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set
+CONFIG_VIDEO_MEYE=m
+
+#
+# Media capture/analog TV support
+#
+CONFIG_VIDEO_IVTV=m
+CONFIG_VIDEO_IVTV_ALSA=m
+CONFIG_VIDEO_FB_IVTV=m
+CONFIG_VIDEO_ZORAN=m
+CONFIG_VIDEO_ZORAN_DC30=m
+CONFIG_VIDEO_ZORAN_ZR36060=m
+CONFIG_VIDEO_ZORAN_BUZ=m
+CONFIG_VIDEO_ZORAN_DC10=m
+CONFIG_VIDEO_ZORAN_LML33=m
+CONFIG_VIDEO_ZORAN_LML33R10=m
+CONFIG_VIDEO_ZORAN_AVS6EYES=m
+CONFIG_VIDEO_HEXIUM_GEMINI=m
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_MXB=m
 
 #
-# Supported BT878 Adapters
+# Media capture/analog/hybrid TV support
 #
+CONFIG_VIDEO_CX18=m
+CONFIG_VIDEO_CX18_ALSA=m
+CONFIG_VIDEO_CX23885=m
+CONFIG_MEDIA_ALTERA_CI=m
+CONFIG_VIDEO_CX25821=m
+CONFIG_VIDEO_CX25821_ALSA=m
+CONFIG_VIDEO_CX88=m
+CONFIG_VIDEO_CX88_ALSA=m
+CONFIG_VIDEO_CX88_BLACKBIRD=m
+CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_VP3054=m
+CONFIG_VIDEO_CX88_MPEG=m
+CONFIG_VIDEO_BT848=m
 CONFIG_DVB_BT8XX=m
+CONFIG_VIDEO_SAA7134=m
+CONFIG_VIDEO_SAA7134_ALSA=m
+CONFIG_VIDEO_SAA7134_RC=y
+CONFIG_VIDEO_SAA7134_DVB=m
+CONFIG_VIDEO_SAA7164=m
 
 #
-# Supported Pluto2 Adapters
+# Media digital TV PCI Adapters
 #
+CONFIG_DVB_AV7110=m
+CONFIG_DVB_AV7110_OSD=y
+CONFIG_DVB_BUDGET_CORE=m
+CONFIG_DVB_BUDGET=m
+CONFIG_DVB_BUDGET_CI=m
+CONFIG_DVB_BUDGET_AV=m
+CONFIG_DVB_BUDGET_PATCH=m
+CONFIG_DVB_B2C2_FLEXCOP_PCI=m
+# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
 CONFIG_DVB_PLUTO2=m
+CONFIG_DVB_DM1105=m
+CONFIG_DVB_PT1=m
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
+CONFIG_DVB_HOPPER=m
+CONFIG_DVB_NGENE=m
+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
 
 #
-# Supported SDMC DM1105 Adapters
+# Supported MMC/SDIO adapters
 #
-CONFIG_DVB_DM1105=m
+CONFIG_SMS_SDIO_DRV=m
+CONFIG_MEDIA_PARPORT_SUPPORT=y
+CONFIG_VIDEO_BWQCAM=m
+CONFIG_VIDEO_CQCAM=m
+CONFIG_VIDEO_W9966=m
+CONFIG_RADIO_ADAPTERS=y
+CONFIG_RADIO_SI470X=y
+CONFIG_USB_SI470X=m
+CONFIG_I2C_SI470X=m
+CONFIG_USB_MR800=m
+CONFIG_USB_DSBR=m
+CONFIG_RADIO_MAXIRADIO=m
+CONFIG_RADIO_SHARK=m
+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
+CONFIG_RADIO_WL1273=m
+
+#
+# Texas Instruments WL128x FM driver (ST based)
+#
+CONFIG_RADIO_WL128X=m
 
 #
 # Supported FireWire (IEEE 1394) Adapters
 #
 CONFIG_DVB_FIREDTV=m
 CONFIG_DVB_FIREDTV_INPUT=y
+CONFIG_MEDIA_COMMON_OPTIONS=y
 
 #
-# Supported Earthsoft PT1 Adapters
+# common driver options
 #
-CONFIG_DVB_PT1=m
+CONFIG_VIDEO_CX2341X=m
+CONFIG_VIDEO_BTCX=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_CYPRESS_FIRMWARE=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_SMS_SIANO_DEBUGFS is not set
 
 #
-# Supported Mantis Adapters
+# Media ancillary drivers (tuners, sensors, i2c, frontends)
 #
-CONFIG_MANTIS_CORE=m
-CONFIG_DVB_MANTIS=m
-CONFIG_DVB_HOPPER=m
+CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
+CONFIG_MEDIA_ATTACH=y
+CONFIG_VIDEO_IR_I2C=m
+
+#
+# Audio decoders, processors and mixers
+#
+CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_TDA9840=m
+CONFIG_VIDEO_TEA6415C=m
+CONFIG_VIDEO_TEA6420=m
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_CS5345=m
+CONFIG_VIDEO_CS53L32A=m
+CONFIG_VIDEO_UDA1342=m
+CONFIG_VIDEO_WM8775=m
+CONFIG_VIDEO_WM8739=m
+CONFIG_VIDEO_VP27SMPX=m
+CONFIG_VIDEO_SONY_BTF_MPX=m
 
 #
-# Supported nGene Adapters
+# RDS decoders
 #
-CONFIG_DVB_NGENE=m
+CONFIG_VIDEO_SAA6588=m
+
+#
+# Video decoders
+#
+CONFIG_VIDEO_BT819=m
+CONFIG_VIDEO_BT856=m
+CONFIG_VIDEO_BT866=m
+CONFIG_VIDEO_KS0127=m
+CONFIG_VIDEO_SAA7110=m
+CONFIG_VIDEO_SAA711X=m
+CONFIG_VIDEO_TVP5150=m
+CONFIG_VIDEO_TW2804=m
+CONFIG_VIDEO_TW9903=m
+CONFIG_VIDEO_TW9906=m
+CONFIG_VIDEO_VPX3220=m
+
+#
+# Video and audio decoders
+#
+CONFIG_VIDEO_SAA717X=m
+CONFIG_VIDEO_CX25840=m
+
+#
+# Video encoders
+#
+CONFIG_VIDEO_SAA7127=m
+CONFIG_VIDEO_SAA7185=m
+CONFIG_VIDEO_ADV7170=m
+CONFIG_VIDEO_ADV7175=m
+
+#
+# Camera sensor devices
+#
+CONFIG_VIDEO_OV7640=m
+CONFIG_VIDEO_MT9V011=m
+
+#
+# Flash devices
+#
+
+#
+# Video improvement chips
+#
+CONFIG_VIDEO_UPD64031A=m
+CONFIG_VIDEO_UPD64083=m
 
 #
-# Supported DVB Frontends
+# Miscelaneous helper chips
+#
+CONFIG_VIDEO_M52790=m
+
+#
+# Sensors used on soc_camera driver
 #
-# CONFIG_DVB_FE_CUSTOMISE is not set
+CONFIG_MEDIA_TUNER=m
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_MT2060=m
+CONFIG_MEDIA_TUNER_MT2063=m
+CONFIG_MEDIA_TUNER_MT2266=m
+CONFIG_MEDIA_TUNER_MT2131=m
+CONFIG_MEDIA_TUNER_QT1010=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
+CONFIG_MEDIA_TUNER_MXL5005S=m
+CONFIG_MEDIA_TUNER_MXL5007T=m
+CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
+CONFIG_MEDIA_TUNER_TDA18218=m
+CONFIG_MEDIA_TUNER_FC0011=m
+CONFIG_MEDIA_TUNER_FC0012=m
+CONFIG_MEDIA_TUNER_FC0013=m
+CONFIG_MEDIA_TUNER_TDA18212=m
+CONFIG_MEDIA_TUNER_E4000=m
+CONFIG_MEDIA_TUNER_FC2580=m
+CONFIG_MEDIA_TUNER_TUA9001=m
+CONFIG_MEDIA_TUNER_IT913X=m
+CONFIG_MEDIA_TUNER_R820T=m
 
 #
 # Multistandard (satellite) frontends
@@ -3435,6 +3963,12 @@ CONFIG_DVB_STV090x=m
 CONFIG_DVB_STV6110x=m
 
 #
+# Multistandard (cable + terrestrial) frontends
+#
+CONFIG_DVB_DRXK=m
+CONFIG_DVB_TDA18271C2DD=m
+
+#
 # DVB-S (satellite) frontends
 #
 CONFIG_DVB_CX24110=m
@@ -3458,8 +3992,10 @@ 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
 
 #
 # DVB-T (terrestrial) frontends
@@ -3483,6 +4019,8 @@ CONFIG_DVB_AF9013=m
 CONFIG_DVB_EC100=m
 CONFIG_DVB_STV0367=m
 CONFIG_DVB_CXD2820R=m
+CONFIG_DVB_RTL2830=m
+CONFIG_DVB_RTL2832=m
 
 #
 # DVB-C (cable) frontends
@@ -3501,8 +4039,11 @@ CONFIG_DVB_OR51132=m
 CONFIG_DVB_BCM3510=m
 CONFIG_DVB_LGDT330X=m
 CONFIG_DVB_LGDT3305=m
+CONFIG_DVB_LG2160=m
 CONFIG_DVB_S5H1409=m
 CONFIG_DVB_AU8522=m
+CONFIG_DVB_AU8522_DTV=m
+CONFIG_DVB_AU8522_V4L=m
 CONFIG_DVB_S5H1411=m
 
 #
@@ -3523,13 +4064,18 @@ CONFIG_DVB_TUNER_DIB0090=m
 # SEC control devices for DVB-S
 #
 CONFIG_DVB_LNBP21=m
+CONFIG_DVB_LNBP22=m
 CONFIG_DVB_ISL6405=m
 CONFIG_DVB_ISL6421=m
 CONFIG_DVB_ISL6423=m
+CONFIG_DVB_A8293=m
 CONFIG_DVB_LGS8GXX=m
 CONFIG_DVB_ATBM8830=m
 CONFIG_DVB_TDA665x=m
 CONFIG_DVB_IX2505V=m
+CONFIG_DVB_IT913X_FE=m
+CONFIG_DVB_M88RS2000=m
+CONFIG_DVB_AF9033=m
 
 #
 # Tools to develop new frontends
@@ -3548,12 +4094,25 @@ CONFIG_VGA_ARB=y
 CONFIG_VGA_ARB_MAX_GPUS=16
 CONFIG_VGA_SWITCHEROO=y
 CONFIG_DRM=m
+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
 # CONFIG_DRM_I810 is not set
 CONFIG_DRM_I915=m
 CONFIG_DRM_I915_KMS=y
@@ -3561,9 +4120,19 @@ CONFIG_DRM_MGA=m
 CONFIG_DRM_SIS=m
 CONFIG_DRM_VIA=m
 CONFIG_DRM_SAVAGE=m
-# CONFIG_STUB_POULSBO is not set
+CONFIG_DRM_VMWGFX=m
+CONFIG_DRM_VMWGFX_FBCON=y
+CONFIG_DRM_GMA500=m
+CONFIG_DRM_GMA600=y
+CONFIG_DRM_GMA3600=y
+CONFIG_DRM_UDL=m
+CONFIG_DRM_AST=m
+CONFIG_DRM_MGAG200=m
+CONFIG_DRM_CIRRUS_QEMU=m
+CONFIG_DRM_QXL=m
 CONFIG_VGASTATE=m
 CONFIG_VIDEO_OUTPUT_CONTROL=m
+CONFIG_HDMI=y
 CONFIG_FB=y
 CONFIG_FIRMWARE_EDID=y
 # CONFIG_FB_DDC is not set
@@ -3577,7 +4146,6 @@ CONFIG_FB_SYS_COPYAREA=m
 CONFIG_FB_SYS_IMAGEBLIT=m
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 CONFIG_FB_SYS_FOPS=m
-# CONFIG_FB_WMT_GE_ROPS is not set
 CONFIG_FB_DEFERRED_IO=y
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
@@ -3603,6 +4171,7 @@ CONFIG_FB_EFI=y
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_NVIDIA is not set
 # CONFIG_FB_RIVA is not set
+# CONFIG_FB_I740 is not set
 # CONFIG_FB_LE80578 is not set
 # CONFIG_FB_MATROX is not set
 # CONFIG_FB_RADEON is not set
@@ -3626,32 +4195,45 @@ CONFIG_FB_VT8623=m
 # CONFIG_FB_GEODE is not set
 # CONFIG_FB_TMIO is not set
 # 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
 # CONFIG_FB_MB862XX is not set
 # CONFIG_FB_BROADSHEET is not set
+# CONFIG_FB_AUO_K190X is not set
+CONFIG_FB_HYPERV=m
+# CONFIG_EXYNOS_VIDEO is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=m
+# CONFIG_LCD_L4F00242T03 is not set
+# CONFIG_LCD_LMS283GF05 is not set
+# CONFIG_LCD_LTV350QV is not set
+# CONFIG_LCD_ILI922X is not set
+# CONFIG_LCD_ILI9320 is not set
+# CONFIG_LCD_TDO24M is not set
+# CONFIG_LCD_VGG2432A4 is not set
 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_PROGEAR=m
+CONFIG_BACKLIGHT_LM3533=m
 CONFIG_BACKLIGHT_APPLE=m
 # CONFIG_BACKLIGHT_SAHARA is not set
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
 CONFIG_BACKLIGHT_PCF50633=m
-
-#
-# Display device support
-#
-CONFIG_DISPLAY_SUPPORT=m
-
-#
-# Display hardware drivers
-#
+# CONFIG_BACKLIGHT_LM3630 is not set
+# CONFIG_BACKLIGHT_LM3639 is not set
+# CONFIG_BACKLIGHT_LP855X is not set
+# CONFIG_BACKLIGHT_OT200 is not set
+# CONFIG_BACKLIGHT_TPS65217 is not set
 
 #
 # Console display driver support
@@ -3673,6 +4255,7 @@ CONFIG_FONT_8x16=y
 # CONFIG_FONT_SUN8x16 is not set
 # CONFIG_FONT_SUN12x22 is not set
 # CONFIG_FONT_10x18 is not set
+CONFIG_FONT_AUTOSELECT=y
 # CONFIG_LOGO is not set
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE=y
@@ -3698,6 +4281,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SND_VERBOSE_PRINTK is not set
 # CONFIG_SND_DEBUG is not set
 CONFIG_SND_VMASTER=y
+CONFIG_SND_KCTL_JACK=y
 CONFIG_SND_DMA_SGBUF=y
 CONFIG_SND_RAWMIDI_SEQ=m
 CONFIG_SND_OPL3_LIB_SEQ=m
@@ -3722,6 +4306,7 @@ CONFIG_SND_AC97_POWER_SAVE=y
 CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
 CONFIG_SND_SB_COMMON=m
 CONFIG_SND_SB16_DSP=m
+CONFIG_SND_TEA575X=m
 CONFIG_SND_PCI=y
 CONFIG_SND_AD1889=m
 CONFIG_SND_ALS300=m
@@ -3771,8 +4356,9 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FM801=m
 CONFIG_SND_FM801_TEA575X_BOOL=y
-CONFIG_SND_TEA575X=m
 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
 CONFIG_SND_HDA_INPUT_BEEP=y
@@ -3787,10 +4373,11 @@ CONFIG_SND_HDA_CODEC_HDMI=y
 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
-CONFIG_SND_HDA_POWER_SAVE=y
 CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
 CONFIG_SND_HDSP=m
 CONFIG_SND_HDSPM=m
@@ -3817,6 +4404,7 @@ CONFIG_SND_VIA82XX_MODEM=m
 CONFIG_SND_VIRTUOSO=m
 CONFIG_SND_VX222=m
 CONFIG_SND_YMFPCI=m
+CONFIG_SND_SPI=y
 CONFIG_SND_USB=y
 CONFIG_SND_USB_AUDIO=m
 CONFIG_SND_USB_UA101=m
@@ -3829,22 +4417,21 @@ CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWIRE_LIB=m
 CONFIG_SND_FIREWIRE_SPEAKERS=m
 CONFIG_SND_ISIGHT=m
+CONFIG_SND_SCS1X=m
 CONFIG_SND_PCMCIA=y
 CONFIG_SND_VXPOCKET=m
 CONFIG_SND_PDAUDIOCF=m
 # CONFIG_SND_SOC is not set
 # CONFIG_SOUND_PRIME is not set
 CONFIG_AC97_BUS=m
-CONFIG_HID_SUPPORT=y
-CONFIG_HID=m
-CONFIG_HIDRAW=y
 
 #
-# USB Input Devices
+# HID support
 #
-CONFIG_USB_HID=m
-CONFIG_HID_PID=y
-CONFIG_USB_HIDDEV=y
+CONFIG_HID=m
+CONFIG_HIDRAW=y
+CONFIG_UHID=m
+CONFIG_HID_GENERIC=m
 
 #
 # Special HID drivers
@@ -3853,6 +4440,8 @@ CONFIG_HID_A4TECH=m
 CONFIG_HID_ACRUX=m
 CONFIG_HID_ACRUX_FF=y
 CONFIG_HID_APPLE=m
+CONFIG_HID_APPLEIR=m
+CONFIG_HID_AUREAL=m
 CONFIG_HID_BELKIN=m
 CONFIG_HID_CHERRY=m
 CONFIG_HID_CHICONY=m
@@ -3863,19 +4452,24 @@ CONFIG_DRAGONRISE_FF=y
 CONFIG_HID_EMS_FF=m
 CONFIG_HID_ELECOM=m
 CONFIG_HID_EZKEY=m
+CONFIG_HID_HOLTEK=m
+CONFIG_HOLTEK_FF=y
 CONFIG_HID_KEYTOUCH=m
 CONFIG_HID_KYE=m
 CONFIG_HID_UCLOGIC=m
 CONFIG_HID_WALTOP=m
 CONFIG_HID_GYRATION=m
+CONFIG_HID_ICADE=m
 CONFIG_HID_TWINHAN=m
 CONFIG_HID_KENSINGTON=m
 CONFIG_HID_LCPOWER=m
+CONFIG_HID_LENOVO_TPKBD=m
 CONFIG_HID_LOGITECH=m
+CONFIG_HID_LOGITECH_DJ=m
 CONFIG_LOGITECH_FF=y
 CONFIG_LOGIRUMBLEPAD2_FF=y
 CONFIG_LOGIG940_FF=y
-CONFIG_LOGIWII_FF=y
+CONFIG_LOGIWHEELS_FF=y
 CONFIG_HID_MAGICMOUSE=m
 CONFIG_HID_MICROSOFT=m
 CONFIG_HID_MONTEREY=m
@@ -3890,33 +4484,51 @@ CONFIG_HID_PICOLCD_FB=y
 CONFIG_HID_PICOLCD_BACKLIGHT=y
 CONFIG_HID_PICOLCD_LCD=y
 CONFIG_HID_PICOLCD_LEDS=y
-CONFIG_HID_QUANTA=m
+CONFIG_HID_PICOLCD_CIR=y
+CONFIG_HID_PRIMAX=m
+CONFIG_HID_PS3REMOTE=m
 CONFIG_HID_ROCCAT=m
-CONFIG_HID_ROCCAT_COMMON=m
-CONFIG_HID_ROCCAT_ARVO=m
-CONFIG_HID_ROCCAT_KONE=m
-CONFIG_HID_ROCCAT_KONEPLUS=m
-CONFIG_HID_ROCCAT_KOVAPLUS=m
-CONFIG_HID_ROCCAT_PYRA=m
+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
+CONFIG_HID_HYPERV_MOUSE=m
 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
-CONFIG_HID_WACOM_POWER_SUPPLY=y
+CONFIG_HID_WIIMOTE=m
+CONFIG_HID_WIIMOTE_EXT=y
 CONFIG_HID_ZEROPLUS=m
 CONFIG_ZEROPLUS_FF=y
 CONFIG_HID_ZYDACRON=m
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_HID_SENSOR_HUB=m
+
+#
+# USB HID support
+#
+CONFIG_USB_HID=m
+CONFIG_HID_PID=y
+CONFIG_USB_HIDDEV=y
+
+#
+# I2C HID support
+#
+CONFIG_I2C_HID=m
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
+CONFIG_USB_ARCH_HAS_XHCI=y
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_COMMON=m
+CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB=m
 # CONFIG_USB_DEBUG is not set
 # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
@@ -3924,10 +4536,8 @@ CONFIG_USB=m
 #
 # Miscellaneous USB options
 #
-CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_DEVICE_CLASS is not set
+CONFIG_USB_DEFAULT_PERSIST=y
 CONFIG_USB_DYNAMIC_MINORS=y
-CONFIG_USB_SUSPEND=y
 # CONFIG_USB_OTG is not set
 CONFIG_USB_MON=m
 CONFIG_USB_WUSB=m
@@ -3943,12 +4553,15 @@ CONFIG_USB_XHCI_HCD=m
 CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_EHCI_PCI=m
+# CONFIG_USB_EHCI_HCD_PLATFORM is not set
 CONFIG_USB_OXU210HP_HCD=m
 CONFIG_USB_ISP116X_HCD=m
 CONFIG_USB_ISP1760_HCD=m
 CONFIG_USB_ISP1362_HCD=m
 CONFIG_USB_OHCI_HCD=m
 # CONFIG_USB_OHCI_HCD_SSB is not set
+# CONFIG_USB_OHCI_HCD_PLATFORM is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
@@ -3958,8 +4571,18 @@ CONFIG_USB_SL811_HCD=m
 # CONFIG_USB_SL811_HCD_ISO is not set
 CONFIG_USB_SL811_CS=m
 CONFIG_USB_R8A66597_HCD=m
+CONFIG_USB_RENESAS_USBHS_HCD=m
 CONFIG_USB_WHCI_HCD=m
 CONFIG_USB_HWA_HCD=m
+# CONFIG_USB_HCD_BCMA is not set
+# CONFIG_USB_HCD_SSB is not set
+CONFIG_USB_MUSB_HDRC=m
+CONFIG_USB_MUSB_TUSB6010=m
+CONFIG_USB_MUSB_DSPS=m
+CONFIG_USB_MUSB_UX500=m
+# CONFIG_USB_UX500_DMA is not set
+CONFIG_MUSB_PIO_ONLY=y
+CONFIG_USB_RENESAS_USBHS=m
 
 #
 # USB Device Class drivers
@@ -3979,6 +4602,7 @@ CONFIG_USB_TMC=m
 CONFIG_USB_STORAGE=m
 # CONFIG_USB_STORAGE_DEBUG is not set
 CONFIG_USB_STORAGE_REALTEK=m
+CONFIG_REALTEK_AUTOPM=y
 CONFIG_USB_STORAGE_DATAFAB=m
 CONFIG_USB_STORAGE_FREECOM=m
 CONFIG_USB_STORAGE_ISD200=m
@@ -3991,21 +4615,22 @@ CONFIG_USB_STORAGE_ONETOUCH=m
 CONFIG_USB_STORAGE_KARMA=m
 CONFIG_USB_STORAGE_CYPRESS_ATACB=m
 CONFIG_USB_STORAGE_ENE_UB6250=m
-CONFIG_USB_UAS=m
-# CONFIG_USB_LIBUSUAL is not set
 
 #
 # USB Imaging devices
 #
 CONFIG_USB_MDC800=m
 CONFIG_USB_MICROTEK=m
+# CONFIG_USB_DWC3 is not set
+CONFIG_USB_CHIPIDEA=m
+CONFIG_USB_CHIPIDEA_UDC=y
+# CONFIG_USB_CHIPIDEA_DEBUG is not set
 
 #
 # USB port drivers
 #
 CONFIG_USB_USS720=m
 CONFIG_USB_SERIAL=m
-CONFIG_USB_EZUSB=y
 CONFIG_USB_SERIAL_GENERIC=y
 CONFIG_USB_SERIAL_AIRCABLE=m
 CONFIG_USB_SERIAL_ARK3116=m
@@ -4023,6 +4648,7 @@ CONFIG_USB_SERIAL_IPAQ=m
 CONFIG_USB_SERIAL_IR=m
 CONFIG_USB_SERIAL_EDGEPORT=m
 CONFIG_USB_SERIAL_EDGEPORT_TI=m
+CONFIG_USB_SERIAL_F81232=m
 CONFIG_USB_SERIAL_GARMIN=m
 CONFIG_USB_SERIAL_IPW=m
 CONFIG_USB_SERIAL_IUU=m
@@ -4043,6 +4669,7 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
 CONFIG_USB_SERIAL_KLSI=m
 CONFIG_USB_SERIAL_KOBIL_SCT=m
 CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_METRO=m
 CONFIG_USB_SERIAL_MOS7720=m
 CONFIG_USB_SERIAL_MOS7715_PARPORT=y
 CONFIG_USB_SERIAL_MOS7840=m
@@ -4067,8 +4694,12 @@ 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_WISHBONE=m
+CONFIG_USB_SERIAL_ZTE=m
 CONFIG_USB_SERIAL_SSU100=m
+CONFIG_USB_SERIAL_QT2=m
 # CONFIG_USB_SERIAL_DEBUG is not set
 
 #
@@ -4095,32 +4726,55 @@ CONFIG_USB_IOWARRIOR=m
 CONFIG_USB_TEST=m
 CONFIG_USB_ISIGHTFW=m
 CONFIG_USB_YUREX=m
+CONFIG_USB_EZUSB_FX2=m
+CONFIG_USB_HSIC_USB3503=m
 CONFIG_USB_ATM=m
 CONFIG_USB_SPEEDTOUCH=m
 CONFIG_USB_CXACRU=m
 CONFIG_USB_UEAGLEATM=m
 CONFIG_USB_XUSBATM=m
+CONFIG_USB_PHY=y
+CONFIG_NOP_USB_XCEIV=m
+# CONFIG_OMAP_CONTROL_USB is not set
+# CONFIG_OMAP_USB3 is not set
+CONFIG_SAMSUNG_USBPHY=m
+CONFIG_SAMSUNG_USB2PHY=m
+CONFIG_SAMSUNG_USB3PHY=m
+# CONFIG_USB_GPIO_VBUS is not set
+CONFIG_USB_ISP1301=m
+CONFIG_USB_RCAR_PHY=m
 CONFIG_USB_GADGET=m
 # CONFIG_USB_GADGET_DEBUG is not set
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
 # CONFIG_USB_GADGET_DEBUG_FS is not set
 CONFIG_USB_GADGET_VBUS_DRAW=2
-CONFIG_USB_GADGET_SELECTED=y
-# CONFIG_USB_GADGET_FUSB300 is not set
-# CONFIG_USB_GADGET_R8A66597 is not set
-# CONFIG_USB_GADGET_PXA_U2O is not set
-# CONFIG_USB_GADGET_M66592 is not set
-# CONFIG_USB_GADGET_AMD5536UDC is not set
-# CONFIG_USB_GADGET_CI13XXX_PCI is not set
-CONFIG_USB_GADGET_NET2280=y
+CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+
+#
+# USB Peripheral Controller
+#
+CONFIG_USB_R8A66597=m
+CONFIG_USB_RENESAS_USBHS_UDC=m
+CONFIG_USB_PXA27X=m
+CONFIG_USB_MV_UDC=m
+CONFIG_USB_MV_U3D=m
+CONFIG_USB_GADGET_MUSB_HDRC=m
+CONFIG_USB_M66592=m
+CONFIG_USB_AMD5536UDC=m
+CONFIG_USB_NET2272=m
+CONFIG_USB_NET2272_DMA=y
 CONFIG_USB_NET2280=m
-# CONFIG_USB_GADGET_GOKU is not set
-# CONFIG_USB_GADGET_LANGWELL is not set
-# CONFIG_USB_GADGET_EG20T is not set
-# CONFIG_USB_GADGET_DUMMY_HCD is not set
-CONFIG_USB_GADGET_DUALSPEED=y
+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_F_SERIAL=m
+CONFIG_USB_F_OBEX=m
 # CONFIG_USB_ZERO is not set
 CONFIG_USB_AUDIO=m
+# CONFIG_GADGET_UAC1 is not set
 CONFIG_USB_ETH=m
 CONFIG_USB_ETH_RNDIS=y
 # CONFIG_USB_ETH_EEM is not set
@@ -4130,28 +4784,20 @@ CONFIG_USB_FUNCTIONFS=m
 CONFIG_USB_FUNCTIONFS_ETH=y
 CONFIG_USB_FUNCTIONFS_RNDIS=y
 CONFIG_USB_FUNCTIONFS_GENERIC=y
-CONFIG_USB_FILE_STORAGE=m
-# CONFIG_USB_FILE_STORAGE_TEST is not set
-# 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
 CONFIG_USB_G_PRINTER=m
 # CONFIG_USB_CDC_COMPOSITE is not set
 # CONFIG_USB_G_NOKIA is not set
+# CONFIG_USB_G_ACM_MS is not set
 # CONFIG_USB_G_MULTI is not set
 CONFIG_USB_G_HID=m
 CONFIG_USB_G_DBGP=m
 # CONFIG_USB_G_DBGP_PRINTK is not set
 CONFIG_USB_G_DBGP_SERIAL=y
 CONFIG_USB_G_WEBCAM=m
-
-#
-# OTG and related infrastructure
-#
-CONFIG_USB_OTG_UTILS=y
-CONFIG_USB_GPIO_VBUS=m
-CONFIG_NOP_USB_XCEIV=m
-CONFIG_AB8500_USB=m
 CONFIG_UWB=m
 CONFIG_UWB_HWA=m
 CONFIG_UWB_WHCI=m
@@ -4159,7 +4805,7 @@ CONFIG_UWB_I1480U=m
 CONFIG_MMC=m
 # CONFIG_MMC_DEBUG is not set
 # CONFIG_MMC_UNSAFE_RESUME is not set
-CONFIG_MMC_CLKGATE=y
+# CONFIG_MMC_CLKGATE is not set
 
 #
 # MMC/SD/SDIO Card Drivers
@@ -4176,14 +4822,17 @@ CONFIG_SDIO_UART=m
 CONFIG_MMC_SDHCI=m
 CONFIG_MMC_SDHCI_PCI=m
 CONFIG_MMC_RICOH_MMC=y
+CONFIG_MMC_SDHCI_ACPI=m
 CONFIG_MMC_SDHCI_PLTFM=m
 CONFIG_MMC_WBSD=m
 CONFIG_MMC_TIFM_SD=m
+# CONFIG_MMC_SPI is not set
 CONFIG_MMC_SDRICOH_CS=m
 CONFIG_MMC_CB710=m
 CONFIG_MMC_VIA_SDMMC=m
 CONFIG_MMC_VUB300=m
 CONFIG_MMC_USHC=m
+CONFIG_MMC_REALTEK_PCI=m
 CONFIG_MEMSTICK=m
 # CONFIG_MEMSTICK_DEBUG is not set
 
@@ -4199,6 +4848,7 @@ CONFIG_MSPRO_BLOCK=m
 CONFIG_MEMSTICK_TIFM_MS=m
 CONFIG_MEMSTICK_JMICRON_38X=m
 CONFIG_MEMSTICK_R592=m
+CONFIG_MEMSTICK_REALTEK_PCI=m
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 
@@ -4206,48 +4856,56 @@ CONFIG_LEDS_CLASS=y
 # LED drivers
 #
 CONFIG_LEDS_LM3530=m
-CONFIG_LEDS_ALIX2=m
+CONFIG_LEDS_LM3533=m
+CONFIG_LEDS_LM3642=m
 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_LP5562=m
 CONFIG_LEDS_CLEVO_MAIL=m
 CONFIG_LEDS_PCA955X=m
+CONFIG_LEDS_PCA9633=m
+# CONFIG_LEDS_DAC124S085 is not set
 CONFIG_LEDS_BD2802=m
 CONFIG_LEDS_INTEL_SS4200=m
 CONFIG_LEDS_LT3593=m
 CONFIG_LEDS_DELL_NETBOOKS=m
-CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_MC13783=m
+CONFIG_LEDS_TCA6507=m
+CONFIG_LEDS_LM355x=m
+CONFIG_LEDS_OT200=m
+CONFIG_LEDS_BLINKM=m
 
 #
 # LED Triggers
 #
+CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_ONESHOT=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+# CONFIG_LEDS_TRIGGER_CPU is not set
 CONFIG_LEDS_TRIGGER_GPIO=m
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
 
 #
 # iptables trigger is under Netfilter config (LED target)
 #
-CONFIG_NFC_DEVICES=y
-CONFIG_PN544_NFC=m
+CONFIG_LEDS_TRIGGER_TRANSIENT=m
+CONFIG_LEDS_TRIGGER_CAMERA=m
 CONFIG_ACCESSIBILITY=y
 CONFIG_A11Y_BRAILLE_CONSOLE=y
 # CONFIG_INFINIBAND is not set
 CONFIG_EDAC=y
-
-#
-# Reporting subsystems
-#
+CONFIG_EDAC_LEGACY_SYSFS=y
 # CONFIG_EDAC_DEBUG is not set
 CONFIG_EDAC_DECODE_MCE=m
 CONFIG_EDAC_MCE_INJ=m
 CONFIG_EDAC_MM_EDAC=m
-CONFIG_EDAC_MCE=y
 CONFIG_EDAC_AMD64=m
 # CONFIG_EDAC_AMD64_ERROR_INJECTION is not set
 CONFIG_EDAC_E752X=m
@@ -4260,9 +4918,11 @@ CONFIG_EDAC_I7CORE=m
 CONFIG_EDAC_I5000=m
 CONFIG_EDAC_I5100=m
 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
 
@@ -4287,6 +4947,7 @@ CONFIG_RTC_DRV_RS5C372=m
 CONFIG_RTC_DRV_ISL1208=m
 CONFIG_RTC_DRV_ISL12022=m
 CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF8523=m
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_M41T80=m
@@ -4302,6 +4963,16 @@ CONFIG_RTC_DRV_RV3029C2=m
 #
 # SPI RTC drivers
 #
+# CONFIG_RTC_DRV_M41T93 is not set
+# CONFIG_RTC_DRV_M41T94 is not set
+# CONFIG_RTC_DRV_DS1305 is not set
+# CONFIG_RTC_DRV_DS1390 is not set
+# CONFIG_RTC_DRV_MAX6902 is not set
+# CONFIG_RTC_DRV_R9701 is not set
+# 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
@@ -4319,12 +4990,18 @@ CONFIG_RTC_DRV_MSM6242=m
 CONFIG_RTC_DRV_BQ4802=m
 CONFIG_RTC_DRV_RP5C01=m
 CONFIG_RTC_DRV_V3020=m
+CONFIG_RTC_DRV_DS2404=m
 CONFIG_RTC_DRV_PCF50633=m
-CONFIG_RTC_DRV_AB8500=m
 
 #
 # on-CPU RTC drivers
 #
+CONFIG_RTC_DRV_MC13XXX=m
+
+#
+# HID Sensor RTC drivers
+#
+# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
 CONFIG_DMADEVICES=y
 # CONFIG_DMADEVICES_DEBUG is not set
 
@@ -4333,9 +5010,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_ACPI=y
 
 #
 # DMA Clients
@@ -4354,50 +5034,58 @@ CONFIG_UIO=m
 CONFIG_UIO_CIF=m
 CONFIG_UIO_PDRV=m
 CONFIG_UIO_PDRV_GENIRQ=m
+# CONFIG_UIO_DMEM_GENIRQ is not set
 CONFIG_UIO_AEC=m
 CONFIG_UIO_SERCOS3=m
 CONFIG_UIO_PCI_GENERIC=m
 CONFIG_UIO_NETX=m
+CONFIG_VFIO_IOMMU_TYPE1=m
+CONFIG_VFIO=m
+CONFIG_VFIO_PCI=m
+CONFIG_VFIO_PCI_VGA=y
+CONFIG_VIRT_DRIVERS=y
+CONFIG_VIRTIO=m
+
+#
+# Virtio drivers
+#
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_MMIO=m
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
+
+#
+# Microsoft Hyper-V guest support
+#
+CONFIG_HYPERV=m
+CONFIG_HYPERV_UTILS=m
+CONFIG_HYPERV_BALLOON=m
 
 #
 # Xen driver support
 #
 CONFIG_XEN_BALLOON=y
+# CONFIG_XEN_SELFBALLOONING is not set
+CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y
 CONFIG_XEN_SCRUB_PAGES=y
 CONFIG_XEN_DEV_EVTCHN=m
 CONFIG_XEN_BACKEND=y
 CONFIG_XENFS=m
 CONFIG_XEN_COMPAT_XENFS=y
 CONFIG_XEN_SYS_HYPERVISOR=y
-CONFIG_XEN_XENBUS_FRONTEND=m
+CONFIG_XEN_XENBUS_FRONTEND=y
 CONFIG_XEN_GNTDEV=m
 CONFIG_XEN_GRANT_DEV_ALLOC=m
-CONFIG_XEN_PLATFORM_PCI=m
 CONFIG_SWIOTLB_XEN=y
+CONFIG_XEN_TMEM=m
+CONFIG_XEN_PCIDEV_BACKEND=m
+CONFIG_XEN_PRIVCMD=m
+CONFIG_XEN_ACPI_PROCESSOR=m
+# CONFIG_XEN_MCE_LOG is not set
+CONFIG_XEN_HAVE_PVMMU=y
 CONFIG_STAGING=y
-# CONFIG_DIGIEPCA is not set
-# CONFIG_RISCOM8 is not set
-# CONFIG_SPECIALIX is not set
-# CONFIG_COMPUTONE is not set
 CONFIG_ET131X=m
-# CONFIG_ET131X_DEBUG is not set
 CONFIG_SLICOSS=m
-CONFIG_VIDEO_GO7007=m
-CONFIG_VIDEO_GO7007_USB=m
-# CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set
-CONFIG_VIDEO_GO7007_OV7640=m
-CONFIG_VIDEO_GO7007_SAA7113=m
-CONFIG_VIDEO_GO7007_SAA7115=m
-CONFIG_VIDEO_GO7007_TW9903=m
-CONFIG_VIDEO_GO7007_UDA1342=m
-CONFIG_VIDEO_GO7007_SONY_TUNER=m
-CONFIG_VIDEO_GO7007_TW2804=m
-CONFIG_VIDEO_CX25821=m
-CONFIG_VIDEO_CX25821_ALSA=m
-CONFIG_VIDEO_TM6000=m
-CONFIG_VIDEO_TM6000_ALSA=m
-CONFIG_VIDEO_TM6000_DVB=m
-CONFIG_DVB_CXD2099=m
 CONFIG_USBIP_CORE=m
 CONFIG_USBIP_VHCI_HCD=m
 CONFIG_USBIP_HOST=m
@@ -4405,50 +5093,49 @@ CONFIG_USBIP_HOST=m
 CONFIG_W35UND=m
 CONFIG_PRISM2_USB=m
 CONFIG_ECHO=m
-CONFIG_BRCMUTIL=m
-CONFIG_BRCMSMAC=m
-# CONFIG_BRCMFMAC is not set
-# CONFIG_BRCMDBG is not set
 CONFIG_COMEDI=m
 # CONFIG_COMEDI_DEBUG is not set
-CONFIG_COMEDI_MISC_DRIVERS=m
+CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048
+CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480
+CONFIG_COMEDI_MISC_DRIVERS=y
 CONFIG_COMEDI_KCOMEDILIB=m
 CONFIG_COMEDI_BOND=m
 CONFIG_COMEDI_TEST=m
 CONFIG_COMEDI_PARPORT=m
 CONFIG_COMEDI_SERIAL2002=m
 CONFIG_COMEDI_SKEL=m
-CONFIG_COMEDI_PCI_DRIVERS=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
 CONFIG_COMEDI_ADDI_APCI_1516=m
 CONFIG_COMEDI_ADDI_APCI_1564=m
 CONFIG_COMEDI_ADDI_APCI_16XX=m
-CONFIG_COMEDI_ADDI_APCI_2016=m
 CONFIG_COMEDI_ADDI_APCI_2032=m
 CONFIG_COMEDI_ADDI_APCI_2200=m
-CONFIG_COMEDI_ADDI_APCI_3001=m
 CONFIG_COMEDI_ADDI_APCI_3120=m
 CONFIG_COMEDI_ADDI_APCI_3501=m
 CONFIG_COMEDI_ADDI_APCI_3XXX=m
 CONFIG_COMEDI_ADL_PCI6208=m
-CONFIG_COMEDI_ADL_PCI7230=m
-CONFIG_COMEDI_ADL_PCI7296=m
-CONFIG_COMEDI_ADL_PCI7432=m
+CONFIG_COMEDI_ADL_PCI7X3X=m
 CONFIG_COMEDI_ADL_PCI8164=m
 CONFIG_COMEDI_ADL_PCI9111=m
 CONFIG_COMEDI_ADL_PCI9118=m
 CONFIG_COMEDI_ADV_PCI1710=m
 CONFIG_COMEDI_ADV_PCI1723=m
+CONFIG_COMEDI_ADV_PCI1724=m
 CONFIG_COMEDI_ADV_PCI_DIO=m
-CONFIG_COMEDI_AMPLC_DIO200=m
-CONFIG_COMEDI_AMPLC_PC236=m
-CONFIG_COMEDI_AMPLC_PC263=m
+CONFIG_COMEDI_AMPLC_DIO200_PCI=m
+CONFIG_COMEDI_AMPLC_PC236_PCI=m
+CONFIG_COMEDI_AMPLC_PC263_PCI=m
 CONFIG_COMEDI_AMPLC_PCI224=m
 CONFIG_COMEDI_AMPLC_PCI230=m
 CONFIG_COMEDI_CONTEC_PCI_DIO=m
+CONFIG_COMEDI_DAS08_PCI=m
 CONFIG_COMEDI_DT3000=m
+CONFIG_COMEDI_DYNA_PCI10XX=m
 CONFIG_COMEDI_UNIOXX5=m
 CONFIG_COMEDI_GSC_HPDI=m
 CONFIG_COMEDI_ICP_MULTI=m
@@ -4459,7 +5146,6 @@ CONFIG_COMEDI_KE_COUNTER=m
 CONFIG_COMEDI_CB_PCIDAS64=m
 CONFIG_COMEDI_CB_PCIDAS=m
 CONFIG_COMEDI_CB_PCIDDA=m
-CONFIG_COMEDI_CB_PCIDIO=m
 CONFIG_COMEDI_CB_PCIMDAS=m
 CONFIG_COMEDI_CB_PCIMDDA=m
 CONFIG_COMEDI_ME4000=m
@@ -4468,13 +5154,16 @@ CONFIG_COMEDI_NI_6527=m
 CONFIG_COMEDI_NI_65XX=m
 CONFIG_COMEDI_NI_660X=m
 CONFIG_COMEDI_NI_670X=m
+CONFIG_COMEDI_NI_LABPC_PCI=m
 CONFIG_COMEDI_NI_PCIDIO=m
 CONFIG_COMEDI_NI_PCIMIO=m
 CONFIG_COMEDI_RTD520=m
 CONFIG_COMEDI_S526=m
 CONFIG_COMEDI_S626=m
 CONFIG_COMEDI_SSV_DNP=m
-CONFIG_COMEDI_PCMCIA_DRIVERS=m
+CONFIG_COMEDI_MITE=m
+CONFIG_COMEDI_NI_TIOCMD=m
+CONFIG_COMEDI_PCMCIA_DRIVERS=y
 CONFIG_COMEDI_CB_DAS16_CS=m
 CONFIG_COMEDI_DAS08_CS=m
 CONFIG_COMEDI_NI_DAQ_700_CS=m
@@ -4482,109 +5171,48 @@ CONFIG_COMEDI_NI_DAQ_DIO24_CS=m
 CONFIG_COMEDI_NI_LABPC_CS=m
 CONFIG_COMEDI_NI_MIO_CS=m
 CONFIG_COMEDI_QUATECH_DAQP_CS=m
-CONFIG_COMEDI_USB_DRIVERS=m
+CONFIG_COMEDI_USB_DRIVERS=y
 CONFIG_COMEDI_DT9812=m
 CONFIG_COMEDI_USBDUX=m
 CONFIG_COMEDI_USBDUXFAST=m
+CONFIG_COMEDI_USBDUXSIGMA=m
 CONFIG_COMEDI_VMK80XX=m
-CONFIG_COMEDI_NI_COMMON=m
-CONFIG_COMEDI_MITE=m
-CONFIG_COMEDI_NI_TIO=m
-CONFIG_COMEDI_NI_LABPC=m
 CONFIG_COMEDI_8255=m
-CONFIG_COMEDI_DAS08=m
 CONFIG_COMEDI_FC=m
+CONFIG_COMEDI_AMPLC_DIO200=m
+CONFIG_COMEDI_AMPLC_PC236=m
+CONFIG_COMEDI_DAS08=m
+CONFIG_COMEDI_NI_LABPC=m
+CONFIG_COMEDI_NI_TIO=m
 CONFIG_ASUS_OLED=m
 # CONFIG_PANEL is not set
 CONFIG_R8187SE=m
 CONFIG_RTL8192U=m
+CONFIG_RTLLIB=m
+CONFIG_RTLLIB_CRYPTO_CCMP=m
+CONFIG_RTLLIB_CRYPTO_TKIP=m
+CONFIG_RTLLIB_CRYPTO_WEP=m
 CONFIG_RTL8192E=m
 CONFIG_R8712U=m
-CONFIG_R8712_AP=y
-CONFIG_RTS_PSTOR=m
-# CONFIG_RTS_PSTOR_DEBUG is not set
+CONFIG_RTS5139=m
+# CONFIG_RTS5139_DEBUG is not set
 # CONFIG_TRANZPORT is not set
-CONFIG_POHMELFS=m
-# CONFIG_POHMELFS_DEBUG is not set
-CONFIG_POHMELFS_CRYPTO=y
 CONFIG_IDE_PHISON=m
 CONFIG_LINE6_USB=m
-# CONFIG_LINE6_USB_DEBUG is not set
-# CONFIG_LINE6_USB_DUMP_CTRL is not set
-# CONFIG_LINE6_USB_DUMP_MIDI is not set
-# CONFIG_LINE6_USB_DUMP_PCM is not set
-# CONFIG_LINE6_USB_RAW is not set
 # CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set
-CONFIG_DRM_VMWGFX=m
-CONFIG_DRM_NOUVEAU=m
-CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-CONFIG_DRM_NOUVEAU_DEBUG=y
-
-#
-# I2C encoder or helper chips
-#
-CONFIG_DRM_I2C_CH7006=m
-CONFIG_DRM_I2C_SIL164=m
 CONFIG_USB_SERIAL_QUATECH2=m
-CONFIG_USB_SERIAL_QUATECH_USB2=m
 CONFIG_VT6655=m
 CONFIG_VT6656=m
-CONFIG_HYPERV=m
-CONFIG_HYPERV_STORAGE=m
-CONFIG_HYPERV_BLOCK=m
-CONFIG_HYPERV_NET=m
-CONFIG_HYPERV_UTILS=m
-CONFIG_HYPERV_MOUSE=m
-# CONFIG_VME_BUS is not set
 CONFIG_DX_SEP=m
-# CONFIG_IIO is not set
-CONFIG_XVMALLOC=y
+CONFIG_ZSMALLOC=y
 CONFIG_ZRAM=m
 # CONFIG_ZRAM_DEBUG is not set
-CONFIG_ZCACHE=m
 CONFIG_WLAGS49_H2=m
 CONFIG_WLAGS49_H25=m
 CONFIG_FB_SM7XX=m
-CONFIG_VIDEO_DT3155=m
-CONFIG_DT3155_CCIR=y
 CONFIG_CRYSTALHD=m
 CONFIG_FB_XGI=m
-CONFIG_LIRC_STAGING=y
-CONFIG_LIRC_BT829=m
-CONFIG_LIRC_IGORPLUGUSB=m
-CONFIG_LIRC_IMON=m
-CONFIG_LIRC_PARALLEL=m
-CONFIG_LIRC_SASEM=m
-CONFIG_LIRC_SERIAL=m
-CONFIG_LIRC_SERIAL_TRANSMITTER=y
-CONFIG_LIRC_SIR=m
-CONFIG_LIRC_TTUSBIR=m
-CONFIG_LIRC_ZILOG=m
-CONFIG_EASYCAP=m
-CONFIG_EASYCAP_SND=y
-# CONFIG_EASYCAP_OSS is not set
-# CONFIG_EASYCAP_DEBUG is not set
-CONFIG_SOLO6X10=m
 CONFIG_ACPI_QUICKSTART=m
-CONFIG_MACH_NO_WESTBRIDGE=y
-CONFIG_ATH6K_LEGACY=m
-CONFIG_AR600x_SD31_XXX=y
-# CONFIG_AR600x_WB31_XXX is not set
-# CONFIG_AR600x_SD32_XXX is not set
-# CONFIG_AR600x_CUSTOM_XXX is not set
-CONFIG_ATH6KL_ENABLE_COEXISTENCE=y
-CONFIG_AR600x_DUAL_ANTENNA=y
-# CONFIG_AR600x_SINGLE_ANTENNA is not set
-# CONFIG_AR600x_BT_QCOM is not set
-# CONFIG_AR600x_BT_CSR is not set
-CONFIG_AR600x_BT_AR3001=y
-CONFIG_ATH6KL_HCI_BRIDGE=y
-CONFIG_ATH6KL_CONFIG_GPIO_BT_RESET=y
-CONFIG_AR600x_BT_RESET_PIN=22
-CONFIG_ATH6KL_HTC_RAW_INTERFACE=y
-CONFIG_ATH6KL_VIRTUAL_SCATTER_GATHER=y
-CONFIG_ATH6KL_SKIP_ABI_VERSION_CHECK=y
-# CONFIG_ATH6KL_DEBUG is not set
 CONFIG_USB_ENESTORAGE=m
 CONFIG_BCM_WIMAX=m
 CONFIG_FT1000=m
@@ -4612,22 +5240,64 @@ CONFIG_SPEAKUP_SYNTH_TXPRT=m
 CONFIG_SPEAKUP_SYNTH_DUMMY=m
 CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
 CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
-CONFIG_DRM_PSB=m
+CONFIG_STAGING_MEDIA=y
+CONFIG_DVB_AS102=m
+CONFIG_DVB_CXD2099=m
+CONFIG_VIDEO_DT3155=m
+CONFIG_DT3155_CCIR=y
+CONFIG_DT3155_STREAMING=y
+CONFIG_VIDEO_GO7007=m
+CONFIG_VIDEO_GO7007_USB=m
+CONFIG_VIDEO_GO7007_LOADER=m
+# CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set
+CONFIG_SOLO6X10=m
+CONFIG_LIRC_STAGING=y
+CONFIG_LIRC_BT829=m
+CONFIG_LIRC_IGORPLUGUSB=m
+CONFIG_LIRC_IMON=m
+CONFIG_LIRC_PARALLEL=m
+CONFIG_LIRC_SASEM=m
+CONFIG_LIRC_SERIAL=m
+CONFIG_LIRC_SERIAL_TRANSMITTER=y
+CONFIG_LIRC_SIR=m
+CONFIG_LIRC_ZILOG=m
 
 #
-# Altera FPGA firmware download module
-#
-CONFIG_ALTERA_STAPL=m
-CONFIG_INTEL_MEI=m
+# Android
+#
+# CONFIG_ANDROID is not set
+CONFIG_USB_WPAN_HCD=m
+CONFIG_WIMAX_GDM72XX=m
+CONFIG_WIMAX_GDM72XX_QOS=y
+CONFIG_WIMAX_GDM72XX_K_MODE=y
+CONFIG_WIMAX_GDM72XX_WIMAX2=y
+CONFIG_WIMAX_GDM72XX_USB=y
+# CONFIG_WIMAX_GDM72XX_SDIO is not set
+CONFIG_WIMAX_GDM72XX_USB_PM=y
+CONFIG_CSR_WIFI=m
+CONFIG_NET_VENDOR_SILICOM=y
+CONFIG_SBYPASS=m
+CONFIG_BPCTL=m
+CONFIG_CED1401=m
+CONFIG_DGRP=m
+CONFIG_FIREWIRE_SERIAL=m
+CONFIG_ZCACHE=m
+# CONFIG_ZCACHE_DEBUG is not set
+CONFIG_RAMSTER=m
+# CONFIG_RAMSTER_DEBUG is not set
+# CONFIG_USB_DWC2 is not set
 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
 CONFIG_FUJITSU_LAPTOP=m
 # CONFIG_FUJITSU_LAPTOP_DEBUG is not set
+CONFIG_FUJITSU_TABLET=m
+CONFIG_AMILO_RFKILL=m
 CONFIG_HP_ACCEL=m
 CONFIG_HP_WMI=m
 CONFIG_MSI_LAPTOP=m
@@ -4651,7 +5321,6 @@ CONFIG_ASUS_NB_WMI=m
 CONFIG_EEEPC_WMI=m
 CONFIG_ACPI_WMI=m
 CONFIG_MSI_WMI=m
-CONFIG_ACPI_ASUS=m
 CONFIG_TOPSTAR_LAPTOP=m
 CONFIG_ACPI_TOSHIBA=m
 CONFIG_TOSHIBA_BT_RFKILL=m
@@ -4662,6 +5331,53 @@ CONFIG_XO15_EBOOK=m
 CONFIG_SAMSUNG_LAPTOP=m
 CONFIG_MXM_WMI=m
 CONFIG_INTEL_OAKTRAIL=m
+CONFIG_SAMSUNG_Q10=m
+CONFIG_APPLE_GMUX=m
+CONFIG_PVPANIC=m
+
+#
+# Hardware Spinlock drivers
+#
+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_AMD_IOMMU=y
+# CONFIG_AMD_IOMMU_STATS is not set
+CONFIG_AMD_IOMMU_V2=m
+CONFIG_DMAR_TABLE=y
+CONFIG_INTEL_IOMMU=y
+# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
+CONFIG_INTEL_IOMMU_FLOPPY_WA=y
+CONFIG_IRQ_REMAP=y
+
+#
+# Remoteproc drivers
+#
+CONFIG_REMOTEPROC=m
+CONFIG_STE_MODEM_RPROC=m
+
+#
+# Rpmsg drivers
+#
+# CONFIG_PM_DEVFREQ is not set
+CONFIG_EXTCON=m
+
+#
+# Extcon Device Drivers
+#
+CONFIG_EXTCON_GPIO=m
+CONFIG_MEMORY=y
+# CONFIG_IIO is not set
+# CONFIG_NTB is not set
+# CONFIG_VME_BUS is not set
+# CONFIG_PWM is not set
+CONFIG_IPACK_BUS=m
+CONFIG_BOARD_TPCI200=m
+CONFIG_SERIAL_IPOCTAL=m
+# CONFIG_RESET_CONTROLLER is not set
 
 #
 # Firmware Drivers
@@ -4669,24 +5385,27 @@ CONFIG_INTEL_OAKTRAIL=m
 CONFIG_EDD=m
 # CONFIG_EDD_OFF is not set
 CONFIG_FIRMWARE_MEMMAP=y
-CONFIG_EFI_VARS=y
 CONFIG_DELL_RBU=m
 CONFIG_DCDBAS=m
 CONFIG_DMIID=y
 CONFIG_DMI_SYSFS=m
 CONFIG_ISCSI_IBFT_FIND=y
 CONFIG_ISCSI_IBFT=m
-CONFIG_SIGMA=m
 # CONFIG_GOOGLE_FIRMWARE is not set
 
 #
+# EFI (Extensible Firmware Interface) Support
+#
+# CONFIG_EFI_VARS is not set
+
+#
 # File systems
 #
+CONFIG_DCACHE_WORD_ACCESS=y
 # CONFIG_EXT2_FS is not set
 # CONFIG_EXT3_FS is not set
 CONFIG_EXT4_FS=m
 CONFIG_EXT4_USE_FOR_EXT23=y
-CONFIG_EXT4_FS_XATTR=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 # CONFIG_EXT4_DEBUG is not set
@@ -4708,6 +5427,7 @@ CONFIG_XFS_FS=m
 CONFIG_XFS_QUOTA=y
 CONFIG_XFS_POSIX_ACL=y
 CONFIG_XFS_RT=y
+# CONFIG_XFS_WARN is not set
 # CONFIG_XFS_DEBUG is not set
 CONFIG_GFS2_FS=m
 CONFIG_GFS2_FS_LOCKING_DLM=y
@@ -4719,6 +5439,9 @@ CONFIG_OCFS2_FS_STATS=y
 # CONFIG_OCFS2_DEBUG_FS is not set
 CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
+# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
+# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+# CONFIG_BTRFS_DEBUG is not set
 CONFIG_NILFS2_FS=m
 CONFIG_FS_POSIX_ACL=y
 CONFIG_EXPORTFS=y
@@ -4727,7 +5450,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
@@ -4788,11 +5511,12 @@ CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TMPFS_XATTR=y
 CONFIG_HUGETLBFS=y
 CONFIG_HUGETLB_PAGE=y
-CONFIG_CONFIGFS_FS=m
+CONFIG_CONFIGFS_FS=y
 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
@@ -4811,17 +5535,17 @@ CONFIG_JFFS2_ZLIB=y
 CONFIG_JFFS2_RTIME=y
 # CONFIG_JFFS2_RUBIN is not set
 CONFIG_UBIFS_FS=m
-CONFIG_UBIFS_FS_XATTR=y
 # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
 CONFIG_UBIFS_FS_LZO=y
 CONFIG_UBIFS_FS_ZLIB=y
-# CONFIG_UBIFS_FS_DEBUG is not set
 CONFIG_LOGFS=m
 CONFIG_CRAMFS=m
 CONFIG_SQUASHFS=m
 CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_ZLIB=y
 CONFIG_SQUASHFS_LZO=y
 CONFIG_SQUASHFS_XZ=y
+# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_EMBEDDED is not set
 CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # CONFIG_VXFS_FS is not set
@@ -4829,37 +5553,56 @@ CONFIG_MINIX_FS=m
 CONFIG_OMFS_FS=m
 # CONFIG_HPFS_FS is not set
 # CONFIG_QNX4FS_FS is not set
+# CONFIG_QNX6FS_FS is not set
 # CONFIG_ROMFS_FS is not set
 CONFIG_PSTORE=y
+# CONFIG_PSTORE_CONSOLE is not set
+# CONFIG_PSTORE_FTRACE is not set
+CONFIG_PSTORE_RAM=m
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
 # CONFIG_UFS_DEBUG is not set
 CONFIG_EXOFS_FS=m
 # CONFIG_EXOFS_DEBUG is not set
+CONFIG_F2FS_FS=m
+CONFIG_F2FS_STAT_FS=y
+CONFIG_F2FS_FS_XATTR=y
+CONFIG_F2FS_FS_POSIX_ACL=y
+CONFIG_EFIVAR_FS=y
+CONFIG_ORE=m
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=m
-CONFIG_NFS_V3=y
+CONFIG_NFS_V2=m
+CONFIG_NFS_V3=m
 CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=y
-# CONFIG_NFS_V4_1 is not set
+CONFIG_NFS_V4=m
+CONFIG_NFS_SWAP=y
+CONFIG_NFS_V4_1=y
+CONFIG_PNFS_FILE_LAYOUT=m
+CONFIG_PNFS_BLOCK=m
+CONFIG_PNFS_OBJLAYOUT=m
+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_USE_NEW_IDMAPPER is not set
+CONFIG_NFS_DEBUG=y
 CONFIG_NFSD=m
-# CONFIG_NFSD_DEPRECATED is not set
 CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3=y
 CONFIG_NFSD_V3_ACL=y
 CONFIG_NFSD_V4=y
+# CONFIG_NFSD_FAULT_INJECTION is not set
 CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
 CONFIG_NFS_ACL_SUPPORT=m
 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
 CONFIG_CIFS=m
 CONFIG_CIFS_STATS=y
@@ -4868,10 +5611,11 @@ CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_POSIX=y
-# CONFIG_CIFS_DEBUG2 is not set
+CONFIG_CIFS_ACL=y
+# CONFIG_CIFS_DEBUG is not set
 CONFIG_CIFS_DFS_UPCALL=y
+CONFIG_CIFS_SMB2=y
 CONFIG_CIFS_FSCACHE=y
-CONFIG_CIFS_ACL=y
 CONFIG_NCP_FS=m
 # CONFIG_NCPFS_PACKET_SIGNING is not set
 # CONFIG_NCPFS_IOCTL_LOCKING is not set
@@ -4888,29 +5632,6 @@ CONFIG_AFS_FSCACHE=y
 CONFIG_9P_FS=m
 CONFIG_9P_FSCACHE=y
 CONFIG_9P_FS_POSIX_ACL=y
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_MAC_PARTITION=y
-CONFIG_MSDOS_PARTITION=y
-CONFIG_BSD_DISKLABEL=y
-CONFIG_MINIX_SUBPARTITION=y
-CONFIG_SOLARIS_X86_PARTITION=y
-# CONFIG_UNIXWARE_DISKLABEL is not set
-CONFIG_LDM_PARTITION=y
-# CONFIG_LDM_DEBUG is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-CONFIG_KARMA_PARTITION=y
-CONFIG_EFI_PARTITION=y
-# CONFIG_SYSV68_PARTITION is not set
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
 CONFIG_NLS_CODEPAGE_437=m
@@ -4950,6 +5671,17 @@ CONFIG_NLS_ISO8859_14=m
 CONFIG_NLS_ISO8859_15=m
 CONFIG_NLS_KOI8_R=m
 CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_MAC_ROMAN=m
+CONFIG_NLS_MAC_CELTIC=m
+CONFIG_NLS_MAC_CENTEURO=m
+CONFIG_NLS_MAC_CROATIAN=m
+CONFIG_NLS_MAC_CYRILLIC=m
+CONFIG_NLS_MAC_GAELIC=m
+CONFIG_NLS_MAC_GREEK=m
+CONFIG_NLS_MAC_ICELAND=m
+CONFIG_NLS_MAC_INUIT=m
+CONFIG_NLS_MAC_ROMANIAN=m
+CONFIG_NLS_MAC_TURKISH=m
 CONFIG_NLS_UTF8=m
 CONFIG_DLM=m
 # CONFIG_DLM_DEBUG is not set
@@ -4965,6 +5697,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
 CONFIG_FRAME_WARN=2048
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_STRIP_ASM_SYMS=y
+# CONFIG_READABLE_ASM is not set
 CONFIG_UNUSED_SYMBOLS=y
 CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
@@ -4977,6 +5710,8 @@ CONFIG_HARDLOCKUP_DETECTOR=y
 CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
 CONFIG_DETECT_HUNG_TASK=y
 CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
@@ -4987,15 +5722,16 @@ CONFIG_TIMER_STATS=y
 # CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_SLUB_STATS is not set
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
+# CONFIG_DEBUG_KMEMLEAK is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
 CONFIG_DEBUG_MUTEXES=y
 # CONFIG_DEBUG_LOCK_ALLOC is not set
 # CONFIG_PROVE_LOCKING is not set
-# CONFIG_SPARSE_RCU_POINTER is not set
 # CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 CONFIG_STACKTRACE=y
 # CONFIG_DEBUG_STACK_USAGE is not set
@@ -5014,35 +5750,43 @@ 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_SPARSE_RCU_POINTER is not set
 # CONFIG_RCU_TORTURE_TEST is not set
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
+# CONFIG_RCU_CPU_STALL_INFO is not set
+# CONFIG_RCU_TRACE is not set
 # CONFIG_KPROBES_SANITY_TEST is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
 CONFIG_LKDTM=m
-CONFIG_CPU_NOTIFIER_ERROR_INJECT=m
+# CONFIG_NOTIFIER_ERROR_INJECTION is not set
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_LATENCYTOP is not set
-CONFIG_SYSCTL_SYSCALL_CHECK=y
+CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y
+# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
 # CONFIG_DEBUG_PAGEALLOC is not set
 CONFIG_USER_STACKTRACE_SUPPORT=y
 CONFIG_NOP_TRACER=y
-CONFIG_HAVE_FTRACE_NMI_ENTER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
 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_FENTRY=y
 CONFIG_HAVE_C_RECORDMCOUNT=y
 CONFIG_TRACER_MAX_TRACE=y
+CONFIG_TRACE_CLOCK=y
 CONFIG_RING_BUFFER=y
-CONFIG_FTRACE_NMI_ENTER=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
@@ -5054,19 +5798,27 @@ CONFIG_FUNCTION_GRAPH_TRACER=y
 # CONFIG_IRQSOFF_TRACER is not set
 CONFIG_SCHED_TRACER=y
 CONFIG_FTRACE_SYSCALLS=y
+CONFIG_TRACER_SNAPSHOT=y
+# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
 CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
 # CONFIG_PROFILE_ALL_BRANCHES is not set
 CONFIG_STACK_TRACER=y
 CONFIG_BLK_DEV_IO_TRACE=y
 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
 CONFIG_MMIOTRACE=y
 # CONFIG_MMIOTRACE_TEST is not set
 CONFIG_RING_BUFFER_BENCHMARK=m
+# CONFIG_RING_BUFFER_STARTUP_TEST is not set
+# CONFIG_RBTREE_TEST is not set
+# CONFIG_INTERVAL_TREE_TEST is not set
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
 # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
 CONFIG_DYNAMIC_DEBUG=y
@@ -5077,6 +5829,7 @@ CONFIG_ASYNC_RAID6_TEST=m
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
 CONFIG_HAVE_ARCH_KMEMCHECK=y
+# CONFIG_TEST_STRING_HELPERS is not set
 CONFIG_TEST_KSTRTOX=m
 CONFIG_STRICT_DEVMEM=y
 CONFIG_X86_VERBOSE_BOOTUP=y
@@ -5088,6 +5841,7 @@ CONFIG_DEBUG_RODATA=y
 # CONFIG_DEBUG_RODATA_TEST is not set
 # CONFIG_DEBUG_SET_MODULE_RONX is not set
 # CONFIG_DEBUG_NX_TEST is not set
+# CONFIG_DEBUG_TLBFLUSH is not set
 # CONFIG_IOMMU_DEBUG is not set
 # CONFIG_IOMMU_STRESS is not set
 CONFIG_HAVE_MMIOTRACE_SUPPORT=y
@@ -5104,7 +5858,7 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
 # CONFIG_DEBUG_BOOT_PARAMS is not set
 # CONFIG_CPA_DEBUG is not set
 # CONFIG_OPTIMIZE_INLINING is not set
-# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
+# CONFIG_DEBUG_NMI_SELFTEST is not set
 
 #
 # Security options
@@ -5123,11 +5877,19 @@ CONFIG_SECURITY_PATH=y
 # CONFIG_SECURITY_SELINUX is not set
 # CONFIG_SECURITY_SMACK is not set
 CONFIG_SECURITY_TOMOYO=y
+CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
+CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
+# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
+CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/usr/bin/tomoyo-init"
+CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd"
 CONFIG_SECURITY_APPARMOR=y
 CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0
+CONFIG_SECURITY_YAMA=y
+CONFIG_SECURITY_YAMA_STACKED=y 
 # CONFIG_IMA is not set
 # CONFIG_DEFAULT_SECURITY_TOMOYO is not set
 # CONFIG_DEFAULT_SECURITY_APPARMOR is not set
+# CONFIG_DEFAULT_SECURITY_YAMA is not set
 CONFIG_DEFAULT_SECURITY_DAC=y
 CONFIG_DEFAULT_SECURITY=""
 CONFIG_XOR_BLOCKS=m
@@ -5136,14 +5898,12 @@ CONFIG_ASYNC_MEMCPY=m
 CONFIG_ASYNC_XOR=m
 CONFIG_ASYNC_PQ=m
 CONFIG_ASYNC_RAID6_RECOV=m
-CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y
-CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y
 CONFIG_CRYPTO=y
 
 #
 # Crypto core or helper
 #
-CONFIG_CRYPTO_ALGAPI=m
+CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_ALGAPI2=y
 CONFIG_CRYPTO_AEAD=m
 CONFIG_CRYPTO_AEAD2=y
@@ -5157,6 +5917,7 @@ CONFIG_CRYPTO_PCOMP=m
 CONFIG_CRYPTO_PCOMP2=y
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_USER=m
 CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
 CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CRYPTO_NULL=m
@@ -5165,6 +5926,8 @@ CONFIG_CRYPTO_WORKQUEUE=y
 CONFIG_CRYPTO_CRYPTD=m
 CONFIG_CRYPTO_AUTHENC=m
 CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_ABLK_HELPER_X86=m
+CONFIG_CRYPTO_GLUE_HELPER_X86=m
 
 #
 # Authenticated Encryption with Associated Data
@@ -5187,6 +5950,7 @@ CONFIG_CRYPTO_XTS=m
 #
 # Hash modes
 #
+CONFIG_CRYPTO_CMAC=m
 CONFIG_CRYPTO_HMAC=m
 CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_VMAC=m
@@ -5196,6 +5960,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
@@ -5205,6 +5971,9 @@ CONFIG_CRYPTO_RMD160=m
 CONFIG_CRYPTO_RMD256=m
 CONFIG_CRYPTO_RMD320=m
 CONFIG_CRYPTO_SHA1=m
+CONFIG_CRYPTO_SHA1_SSSE3=m
+CONFIG_CRYPTO_SHA256_SSSE3=m
+CONFIG_CRYPTO_SHA512_SSSE3=m
 CONFIG_CRYPTO_SHA256=m
 CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_TGR192=m
@@ -5214,15 +5983,23 @@ CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
 #
 # Ciphers
 #
-CONFIG_CRYPTO_AES=m
+CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_AES_X86_64=m
 CONFIG_CRYPTO_AES_NI_INTEL=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_BLOWFISH_COMMON=m
+CONFIG_CRYPTO_BLOWFISH_X86_64=m
 CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAMELLIA_X86_64=m
+CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m
+CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m
+CONFIG_CRYPTO_CAST_COMMON=m
 CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST5_AVX_X86_64=m
 CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_CAST6_AVX_X86_64=m
 CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_KHAZAD=m
@@ -5230,17 +6007,22 @@ CONFIG_CRYPTO_SALSA20=m
 CONFIG_CRYPTO_SALSA20_X86_64=m
 CONFIG_CRYPTO_SEED=m
 CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
+CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
+CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TWOFISH=m
 CONFIG_CRYPTO_TWOFISH_COMMON=m
 CONFIG_CRYPTO_TWOFISH_X86_64=m
+CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
+CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
 
 #
 # Compression
 #
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_ZLIB=m
-CONFIG_CRYPTO_LZO=m
+CONFIG_CRYPTO_LZO=y
 
 #
 # Random Number Generation
@@ -5253,24 +6035,25 @@ CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
 CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
-CONFIG_CRYPTO_DEV_HIFN_795X=m
-CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
+CONFIG_ASYMMETRIC_KEY_TYPE=m
+CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m
+CONFIG_PUBLIC_KEY_ALGO_RSA=m
+CONFIG_X509_CERTIFICATE_PARSER=m
 CONFIG_HAVE_KVM=y
 CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM_IRQ_ROUTING=y
 CONFIG_HAVE_KVM_EVENTFD=y
 CONFIG_KVM_APIC_ARCHITECTURE=y
 CONFIG_KVM_MMIO=y
 CONFIG_KVM_ASYNC_PF=y
+CONFIG_HAVE_KVM_MSI=y
+CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=m
 CONFIG_KVM_INTEL=m
 CONFIG_KVM_AMD=m
 CONFIG_KVM_MMU_AUDIT=y
-CONFIG_VHOST_NET=m
-CONFIG_VIRTIO=m
-CONFIG_VIRTIO_RING=m
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_BALLOON=m
+CONFIG_KVM_DEVICE_ASSIGNMENT=y
 CONFIG_BINARY_PRINTF=y
 
 #
@@ -5278,14 +6061,26 @@ CONFIG_BINARY_PRINTF=y
 #
 CONFIG_RAID6_PQ=m
 CONFIG_BITREVERSE=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_GENERIC_IOMAP=y
+CONFIG_GENERIC_IO=y
+CONFIG_PERCPU_RWSEM=y
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
 CONFIG_CRC_T10DIF=m
 CONFIG_CRC_ITU_T=m
 CONFIG_CRC32=y
+# CONFIG_CRC32_SELFTEST is not set
+CONFIG_CRC32_SLICEBY8=y
+# CONFIG_CRC32_SLICEBY4 is not set
+# CONFIG_CRC32_SARWATE is not set
+# CONFIG_CRC32_BIT is not set
 CONFIG_CRC7=m
 CONFIG_LIBCRC32C=m
+CONFIG_CRC8=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 CONFIG_LZO_COMPRESS=y
@@ -5304,8 +6099,13 @@ CONFIG_DECOMPRESS_BZIP2=y
 CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DECOMPRESS_XZ=y
 CONFIG_DECOMPRESS_LZO=y
+CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_REED_SOLOMON=m
+CONFIG_REED_SOLOMON_ENC8=y
+CONFIG_REED_SOLOMON_DEC8=y
 CONFIG_REED_SOLOMON_DEC16=y
+CONFIG_BCH=m
+CONFIG_BCH_CONST_PARAMS=y
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m
 CONFIG_TEXTSEARCH_BM=m
@@ -5316,6 +6116,14 @@ CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
 CONFIG_CHECK_SIGNATURE=y
 CONFIG_CPU_RMAP=y
+CONFIG_DQL=y
 CONFIG_NLATTR=y
+CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
 CONFIG_LRU_CACHE=m
 CONFIG_AVERAGE=y
+CONFIG_CLZ_TAB=y
+CONFIG_CORDIC=m
+CONFIG_DDR=y
+CONFIG_MPILIB=m
+CONFIG_OID_REGISTRY=m
+CONFIG_UCS2_STRING=y
diff --git a/libre-testing/linux-libre/criu-no-expert.patch b/libre/linux-libre-lts/criu-no-expert.patch
index 2124427e9..2124427e9 100644
--- a/libre-testing/linux-libre/criu-no-expert.patch
+++ b/libre/linux-libre-lts/criu-no-expert.patch
diff --git a/libre/linux-libre-lts/ext4-options.patch b/libre/linux-libre-lts/ext4-options.patch
deleted file mode 100644
index ef1b2417d..000000000
--- a/libre/linux-libre-lts/ext4-options.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Report: https://bbs.archlinux.org/profile.php?id=33804
-Signed-off-by: Tom Gundersen <teg@jklm.no>
-Cc: Thomas Baechler <thomas@archlinux.org>
-Cc: Tobias Powalowski <tobias.powalowski@googlemail.com>
-Cc: Dave Reisner <d@falconindy.com>
----
- fs/ext4/super.c |   15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
-diff --git a/fs/ext4/super.c b/fs/ext4/super.c
-index 502c61f..30de9cd 100644
---- a/fs/ext4/super.c
-+++ b/fs/ext4/super.c
-@@ -1333,6 +1333,7 @@ enum {
- 	Opt_inode_readahead_blks, Opt_journal_ioprio,
- 	Opt_dioread_nolock, Opt_dioread_lock,
- 	Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable,
-+	Opt_nocheck, Opt_reservation, Opt_noreservation, Opt_journal_inum,
- };
- 
- static const match_table_t tokens = {
-@@ -1408,6 +1409,10 @@ static const match_table_t tokens = {
- 	{Opt_init_itable, "init_itable=%u"},
- 	{Opt_init_itable, "init_itable"},
- 	{Opt_noinit_itable, "noinit_itable"},
-+	{Opt_nocheck, "nocheck"},
-+	{Opt_reservation, "reservation"},
-+	{Opt_noreservation, "noreservation"},
-+	{Opt_journal_inum, "journal=%u"},
- 	{Opt_err, NULL},
- };
- 
-@@ -1904,6 +1909,16 @@ set_qf_format:
- 		case Opt_noinit_itable:
- 			clear_opt(sb, INIT_INODE_TABLE);
- 			break;
-+#ifdef CONFIG_EXT4_USE_FOR_EXT23
-+		case Opt_nocheck:
-+		case Opt_reservation:
-+		case Opt_noreservation:
-+		case Opt_journal_inum:
-+			ext4_msg(sb, KERN_WARNING,
-+			       "ext3 mount option \"%s\" ignored "
-+			       "by ext4 module", p);
-+			break;
-+#endif
- 		default:
- 			ext4_msg(sb, KERN_ERR,
- 			       "Unrecognized mount option \"%s\" "
diff --git a/libre/linux-libre-lts/ext4-use-atomic64_t-for-the-per-flexbg-free_clusters-count.patch b/libre/linux-libre-lts/ext4-use-atomic64_t-for-the-per-flexbg-free_clusters-count.patch
deleted file mode 100644
index be6f7d1e9..000000000
--- a/libre/linux-libre-lts/ext4-use-atomic64_t-for-the-per-flexbg-free_clusters-count.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-From 90ba983f6889e65a3b506b30dc606aa9d1d46cd2 Mon Sep 17 00:00:00 2001
-From: Theodore Ts'o <tytso@mit.edu>
-Date: Mon, 11 Mar 2013 23:39:59 -0400
-Subject: ext4: use atomic64_t for the per-flexbg free_clusters count
-
-From: Theodore Ts'o <tytso@mit.edu>
-
-commit 90ba983f6889e65a3b506b30dc606aa9d1d46cd2 upstream.
-
-A user who was using a 8TB+ file system and with a very large flexbg
-size (> 65536) could cause the atomic_t used in the struct flex_groups
-to overflow.  This was detected by PaX security patchset:
-
-http://forums.grsecurity.net/viewtopic.php?f=3&t=3289&p=12551#p12551
-
-This bug was introduced in commit 9f24e4208f7e, so it's been around
-since 2.6.30.  :-(
-
-Fix this by using an atomic64_t for struct orlav_stats's
-free_clusters.
-
-[Backported for 3.0-stable. Renamed free_clusters back to free_blocks;
-fixed a few more atomic_read's of free_blocks left in 3.0.]
-
-Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
-Reviewed-by: Lukas Czerner <lczerner@redhat.com>
-Signed-off-by: Lingzhu Xiang <lxiang@redhat.com>
-Reviewed-by: CAI Qian <caiqian@redhat.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
---- a/fs/ext4/ext4.h
-+++ b/fs/ext4/ext4.h
-@@ -288,9 +288,9 @@ struct ext4_group_desc
-  */
- 
- struct flex_groups {
--	atomic_t free_inodes;
--	atomic_t free_blocks;
--	atomic_t used_dirs;
-+	atomic64_t	free_blocks;
-+	atomic_t	free_inodes;
-+	atomic_t	used_dirs;
- };
- 
- #define EXT4_BG_INODE_UNINIT	0x0001 /* Inode table/bitmap not in use */
-diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
-index 29272de..dd732c7 100644
---- a/fs/ext4/ialloc.c
-+++ b/fs/ext4/ialloc.c
-@@ -345,8 +345,8 @@ static int find_group_flex(struct super_block *sb, struct inode *parent,
- 	ext4_group_t ngroups = ext4_get_groups_count(sb);
- 	int flex_size = ext4_flex_bg_size(sbi);
- 	ext4_group_t best_flex = parent_fbg_group;
--	int blocks_per_flex = sbi->s_blocks_per_group * flex_size;
--	int flexbg_free_blocks;
-+	ext4_fsblk_t blocks_per_flex = sbi->s_blocks_per_group * flex_size;
-+	ext4_fsblk_t flexbg_free_blocks;
- 	int flex_freeb_ratio;
- 	ext4_group_t n_fbg_groups;
- 	ext4_group_t i;
-@@ -355,7 +355,7 @@ static int find_group_flex(struct super_block *sb, struct inode *parent,
- 		sbi->s_log_groups_per_flex;
- 
- find_close_to_parent:
--	flexbg_free_blocks = atomic_read(&flex_group[best_flex].free_blocks);
-+	flexbg_free_blocks = atomic64_read(&flex_group[best_flex].free_blocks);
- 	flex_freeb_ratio = flexbg_free_blocks * 100 / blocks_per_flex;
- 	if (atomic_read(&flex_group[best_flex].free_inodes) &&
- 	    flex_freeb_ratio > free_block_ratio)
-@@ -370,7 +370,7 @@ find_close_to_parent:
- 		if (i == parent_fbg_group || i == parent_fbg_group - 1)
- 			continue;
- 
--		flexbg_free_blocks = atomic_read(&flex_group[i].free_blocks);
-+		flexbg_free_blocks = atomic64_read(&flex_group[i].free_blocks);
- 		flex_freeb_ratio = flexbg_free_blocks * 100 / blocks_per_flex;
- 
- 		if (flex_freeb_ratio > free_block_ratio &&
-@@ -380,14 +380,14 @@ find_close_to_parent:
- 		}
- 
- 		if ((atomic_read(&flex_group[best_flex].free_inodes) == 0) ||
--		    ((atomic_read(&flex_group[i].free_blocks) >
--		      atomic_read(&flex_group[best_flex].free_blocks)) &&
-+		    ((atomic64_read(&flex_group[i].free_blocks) >
-+		      atomic64_read(&flex_group[best_flex].free_blocks)) &&
- 		     atomic_read(&flex_group[i].free_inodes)))
- 			best_flex = i;
- 	}
- 
- 	if (!atomic_read(&flex_group[best_flex].free_inodes) ||
--	    !atomic_read(&flex_group[best_flex].free_blocks))
-+	    !atomic64_read(&flex_group[best_flex].free_blocks))
- 		return -1;
- 
- found_flexbg:
-@@ -406,8 +406,8 @@ out:
- }
- 
- struct orlov_stats {
-+	__u64 free_blocks;
- 	__u32 free_inodes;
--	__u32 free_blocks;
- 	__u32 used_dirs;
- };
- 
-@@ -424,7 +424,7 @@ static void get_orlov_stats(struct super_block *sb, ext4_group_t g,
- 
- 	if (flex_size > 1) {
- 		stats->free_inodes = atomic_read(&flex_group[g].free_inodes);
--		stats->free_blocks = atomic_read(&flex_group[g].free_blocks);
-+		stats->free_blocks = atomic64_read(&flex_group[g].free_blocks);
- 		stats->used_dirs = atomic_read(&flex_group[g].used_dirs);
- 		return;
- 	}
-diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
-index 31bbdb5..35959f6 100644
---- a/fs/ext4/mballoc.c
-+++ b/fs/ext4/mballoc.c
-@@ -2814,8 +2814,8 @@ ext4_mb_mark_diskspace_used(struct ext4_allocation_context *ac,
- 	if (sbi->s_log_groups_per_flex) {
- 		ext4_group_t flex_group = ext4_flex_group(sbi,
- 							  ac->ac_b_ex.fe_group);
--		atomic_sub(ac->ac_b_ex.fe_len,
--			   &sbi->s_flex_groups[flex_group].free_blocks);
-+		atomic64_sub(ac->ac_b_ex.fe_len,
-+			     &sbi->s_flex_groups[flex_group].free_blocks);
- 	}
- 
- 	err = ext4_handle_dirty_metadata(handle, NULL, bitmap_bh);
-@@ -4614,7 +4614,7 @@ do_more:
- 
- 	if (sbi->s_log_groups_per_flex) {
- 		ext4_group_t flex_group = ext4_flex_group(sbi, block_group);
--		atomic_add(count, &sbi->s_flex_groups[flex_group].free_blocks);
-+		atomic64_add(count, &sbi->s_flex_groups[flex_group].free_blocks);
- 	}
- 
- 	ext4_mb_unload_buddy(&e4b);
-@@ -4745,8 +4745,8 @@ void ext4_add_groupblocks(handle_t *handle, struct super_block *sb,
- 
- 	if (sbi->s_log_groups_per_flex) {
- 		ext4_group_t flex_group = ext4_flex_group(sbi, block_group);
--		atomic_add(blocks_freed,
--			   &sbi->s_flex_groups[flex_group].free_blocks);
-+		atomic64_add(blocks_freed,
-+			     &sbi->s_flex_groups[flex_group].free_blocks);
- 	}
- 
- 	ext4_mb_unload_buddy(&e4b);
-diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
-index 244100f..d2661aac 100644
---- a/fs/ext4/resize.c
-+++ b/fs/ext4/resize.c
-@@ -929,8 +929,8 @@ int ext4_group_add(struct super_block *sb, struct ext4_new_group_data *input)
- 	    sbi->s_log_groups_per_flex) {
- 		ext4_group_t flex_group;
- 		flex_group = ext4_flex_group(sbi, input->group);
--		atomic_add(input->free_blocks_count,
--			   &sbi->s_flex_groups[flex_group].free_blocks);
-+		atomic64_add(input->free_blocks_count,
-+			     &sbi->s_flex_groups[flex_group].free_blocks);
- 		atomic_add(EXT4_INODES_PER_GROUP(sb),
- 			   &sbi->s_flex_groups[flex_group].free_inodes);
- 	}
-diff --git a/fs/ext4/super.c b/fs/ext4/super.c
-index c6a3363..e05cd34 100644
---- a/fs/ext4/super.c
-+++ b/fs/ext4/super.c
-@@ -1992,8 +1992,8 @@ static int ext4_fill_flex_info(struct super_block *sb)
- 		flex_group = ext4_flex_group(sbi, i);
- 		atomic_add(ext4_free_inodes_count(sb, gdp),
- 			   &sbi->s_flex_groups[flex_group].free_inodes);
--		atomic_add(ext4_free_blks_count(sb, gdp),
--			   &sbi->s_flex_groups[flex_group].free_blocks);
-+		atomic64_add(ext4_free_blks_count(sb, gdp),
-+			     &sbi->s_flex_groups[flex_group].free_blocks);
- 		atomic_add(ext4_used_dirs_count(sb, gdp),
- 			   &sbi->s_flex_groups[flex_group].used_dirs);
- 	}
--- 
-1.7.11.7
-
---
-To unsubscribe from this list: send the line "unsubscribe stable" in
-the body of a message to majordomo@vger.kernel.org
-More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff --git a/libre/linux-libre-lts/i915-fix-ghost-tv-output.patch b/libre/linux-libre-lts/i915-fix-ghost-tv-output.patch
deleted file mode 100644
index 3b631361a..000000000
--- a/libre/linux-libre-lts/i915-fix-ghost-tv-output.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
-Tested-by: Santi <santi@agolina.net>
----
- drivers/gpu/drm/i915/intel_tv.c |    9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
-index dc83b7a..c8f67bf 100644
---- a/drivers/gpu/drm/i915/intel_tv.c
-+++ b/drivers/gpu/drm/i915/intel_tv.c
-@@ -1267,6 +1267,15 @@
- 		   DAC_B_0_7_V |
- 		   DAC_C_0_7_V);
- 
-+	/*
-+	 * The TV sense state should be cleared to zero on cantiga platform. Otherwise
-+	 * the TV is misdetected. This is hardware requirement.
-+	 */
-+	if (IS_GM45(dev))
-+		tv_dac &= ~(TVDAC_STATE_CHG_EN | TVDAC_A_SENSE_CTL |
-+			    TVDAC_B_SENSE_CTL | TVDAC_C_SENSE_CTL);
-+
-+	
- 	I915_WRITE(TV_CTL, tv_ctl);
- 	I915_WRITE(TV_DAC, tv_dac);
- 	POSTING_READ(TV_DAC);
diff --git a/libre/linux-libre-lts/module-init-wait-3.0.patch b/libre/linux-libre-lts/module-init-wait-3.0.patch
deleted file mode 100644
index 1bcfd2491..000000000
--- a/libre/linux-libre-lts/module-init-wait-3.0.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From: Rusty Russell <rusty@rustcorp.com.au>
-Date: Fri, 28 Sep 2012 05:01:03 +0000 (+0930)
-Subject: module: wait when loading a module which is currently initializing.
-X-Git-Tag: v3.7-rc1~2^2~32
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=9bb9c3be568346538
-
-module: wait when loading a module which is currently initializing.
-
-The original module-init-tools module loader used a fnctl lock on the
-.ko file to avoid attempts to simultaneously load a module.
-Unfortunately, you can't get an exclusive fcntl lock on a read-only
-fd, making this not work for read-only mounted filesystems.
-module-init-tools has a hacky sleep-and-loop for this now.
-
-It's not that hard to wait in the kernel, and only return -EEXIST once
-the first module has finished loading (or continue loading the module
-if the first one failed to initialize for some reason).  It's also
-consistent with what we do for dependent modules which are still loading.
-
-Suggested-by: Lucas De Marchi <lucas.demarchi@profusion.mobi>
-Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
----
-
-diff --git a/kernel/module.c b/kernel/module.c
-index 63cf6e7..74bc195 100644
---- a/kernel/module.c
-+++ b/kernel/module.c
-@@ -2845,6 +2845,20 @@ static int post_relocation(struct module *mod, const struct load_info *info)
- 	return module_finalize(info->hdr, info->sechdrs, mod);
- }
- 
-+/* Is this module of this name done loading?  No locks held. */
-+static bool finished_loading(const char *name)
-+{
-+	struct module *mod;
-+	bool ret;
-+
-+	mutex_lock(&module_mutex);
-+	mod = find_module(name);
-+	ret = !mod || mod->state != MODULE_STATE_COMING;
-+	mutex_unlock(&module_mutex);
-+
-+	return ret;
-+}
-+
- /* Allocate and load the module: note that size of section 0 is always
-    zero, and we rely on this for optional sections. */
- static struct module *load_module(void __user *umod,
-@@ -2852,7 +2866,7 @@ static struct module *load_module(void __user *umod,
- 				  const char __user *uargs)
- {
- 	struct load_info info = { NULL, };
--	struct module *mod;
-+	struct module *mod, *old;
- 	long err;
- 
- 	pr_debug("load_module: umod=%p, len=%lu, uargs=%p\n",
-@@ -2918,8 +2932,18 @@ static struct module *load_module(void __user *umod,
- 	 * function to insert in a way safe to concurrent readers.
- 	 * The mutex protects against concurrent writers.
- 	 */
-+again:
- 	mutex_lock(&module_mutex);
--	if (find_module(mod->name)) {
-+	if ((old = find_module(mod->name)) != NULL) {
-+		if (old->state == MODULE_STATE_COMING) {
-+			/* Wait in case it fails to load. */
-+			mutex_unlock(&module_mutex);
-+			err = wait_event_interruptible(module_wq,
-+					       finished_loading(mod->name));
-+			if (err)
-+				goto free_arch_cleanup;
-+			goto again;
-+		}
- 		err = -EEXIST;
- 		goto unlock;
- 	}
diff --git a/libre/linux-libre-lts/module-symbol-waiting-3.0.patch b/libre/linux-libre-lts/module-symbol-waiting-3.0.patch
deleted file mode 100644
index b87a38ff5..000000000
--- a/libre/linux-libre-lts/module-symbol-waiting-3.0.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From: Rusty Russell <rusty@rustcorp.com.au>
-Date: Fri, 28 Sep 2012 05:01:03 +0000 (+0930)
-Subject: module: fix symbol waiting when module fails before init
-X-Git-Tag: v3.7-rc1~2^2~33
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=6f13909f4fe9652f1
-
-module: fix symbol waiting when module fails before init
-
-We use resolve_symbol_wait(), which blocks if the module containing
-the symbol is still loading.  However:
-
-1) The module_wq we use is only woken after calling the modules' init
-   function, but there are other failure paths after the module is
-   placed in the linked list where we need to do the same thing.
-
-2) wake_up() only wakes one waiter, and our waitqueue is shared by all
-   modules, so we need to wake them all.
-
-3) wake_up_all() doesn't imply a memory barrier: I feel happier calling
-   it after we've grabbed and dropped the module_mutex, not just after
-   the state assignment.
-
-Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
----
-
-diff --git a/kernel/module.c b/kernel/module.c
-index 7f2ee45f..63cf6e7 100644
---- a/kernel/module.c
-+++ b/kernel/module.c
-@@ -2959,7 +2959,7 @@ static struct module *load_module(void __user *umod,
- 	/* Unlink carefully: kallsyms could be walking list. */
- 	list_del_rcu(&mod->list);
- 	module_bug_cleanup(mod);
--
-+	wake_up_all(&module_wq);
-  ddebug:
- 	dynamic_debug_remove(info.debug);
-  unlock:
-@@ -3034,7 +3034,7 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
- 		blocking_notifier_call_chain(&module_notify_list,
- 					     MODULE_STATE_GOING, mod);
- 		free_module(mod);
--		wake_up(&module_wq);
-+		wake_up_all(&module_wq);
- 		return ret;
- 	}
- 	if (ret > 0) {
-@@ -3046,9 +3046,8 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
- 		dump_stack();
- 	}
- 
--	/* Now it's a first class citizen!  Wake up anyone waiting for it. */
-+	/* Now it's a first class citizen! */
- 	mod->state = MODULE_STATE_LIVE;
--	wake_up(&module_wq);
- 	blocking_notifier_call_chain(&module_notify_list,
- 				     MODULE_STATE_LIVE, mod);
- 
-@@ -3071,6 +3070,7 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
- 	mod->init_ro_size = 0;
- 	mod->init_text_size = 0;
- 	mutex_unlock(&module_mutex);
-+	wake_up_all(&module_wq);
- 
- 	return 0;
- }
diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index e86f77e73..acaf04070 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 95398 2013-08-11 10:33:26Z seblu $
+# $Id: PKGBUILD 96809 2013-09-05 18:48:20Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
@@ -8,11 +8,11 @@ pkgname=('linux-libre-tools-meta'
          'perf-libre'
          'cpupower-libre'
          'usbip-libre')
-_basekernel=3.10
+_basekernel=3.11
 #_sublevel=6
-_pkgver=$_basekernel.$_sublevel
+#_pkgver=$_basekernel.$_sublevel
 pkgver=$_basekernel
-pkgrel=2
+pkgrel=1
 license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
 url='http://linux-libre.fsfla.org/'
@@ -28,13 +28,13 @@ makedepends+=('pciutils')
 makedepends+=('glib2' 'sysfsutils')
 groups=("$pkgbase")
 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"
+        #"http://linux-libre.fsfla.org/pub/linux-libre/releases/$_pkgver-gnu/patch-$_basekernel-gnu-$_pkgver-gnu.xz"
         'cpupower.default'
         'cpupower.systemd'
         'cpupower.service'
         'usbipd.service')
-sha256sums=('abee814b92422cfa3df90b62ad9ba888697fcc03a713adc2c7f68e0d0c23c329'
-            'a1ed93ea50bd6e19d2834556900c6ca3af37632b1eda3bde50ec9c305b7640fc'
+sha256sums=('f4ea56c7bc8b6c497562e7c36de9c7c1e67142aba694ff139bc1fb3d3b0193ee'
+            #'a1ed93ea50bd6e19d2834556900c6ca3af37632b1eda3bde50ec9c305b7640fc'
             '4fa509949d6863d001075fa3e8671eff2599c046d20c98bb4a70778595cd1c3f'
             'fbf6e0ce6eb0ef15703fe212958de6ca46e62188900b5e9f9272ed3cc9cfd54e'
             'a89284d0ecb556ca53a66d1c2087b5fd6d0a901ab2769cd3aebb93f4478905dc'
diff --git a/libre/linux-libre/3.10.6-logitech-dj.patch b/libre/linux-libre/3.10.6-logitech-dj.patch
deleted file mode 100644
index 1c112ccde..000000000
--- a/libre/linux-libre/3.10.6-logitech-dj.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-From c63e0e370028d7e4033bd40165f18499872b5183 Mon Sep 17 00:00:00 2001
-From: Nestor Lopez Casado <nlopezcasad@logitech.com>
-Date: Thu, 18 Jul 2013 13:21:30 +0000
-Subject: HID: Revert "Revert "HID: Fix logitech-dj: missing Unifying device issue""
-
-This reverts commit 8af6c08830b1ae114d1a8b548b1f8b056e068887.
-
-This patch re-adds the workaround introduced by 596264082f10dd4
-which was reverted by 8af6c08830b1ae114.
-
-The original patch 596264 was needed to overcome a situation where
-the hid-core would drop incoming reports while probe() was being
-executed.
-
-This issue was solved by c849a6143bec520af which added
-hid_device_io_start() and hid_device_io_stop() that enable a specific
-hid driver to opt-in for input reports while its probe() is being
-executed.
-
-Commit a9dd22b730857347 modified hid-logitech-dj so as to use the
-functionality added to hid-core. Having done that, workaround 596264
-was no longer necessary and was reverted by 8af6c08.
-
-We now encounter a different problem that ends up 'again' thwarting
-the Unifying receiver enumeration. The problem is time and usb controller
-dependent. Ocasionally the reports sent to the usb receiver to start
-the paired devices enumeration fail with -EPIPE and the receiver never
-gets to enumerate the paired devices.
-
-With dcd9006b1b053c7b1c the problem was "hidden" as the call to the usb
-driver became asynchronous and none was catching the error from the
-failing URB.
-
-As the root cause for this failing SET_REPORT is not understood yet,
--possibly a race on the usb controller drivers or a problem with the
-Unifying receiver- reintroducing this workaround solves the problem.
-
-Overall what this workaround does is: If an input report from an
-unknown device is received, then a (re)enumeration is performed.
-
-related bug:
-https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1194649
-
-Signed-off-by: Nestor Lopez Casado <nlopezcasad@logitech.com>
-Signed-off-by: Jiri Kosina <jkosina@suse.cz>
----
-diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-logitech-dj.c
-index 5207591a..cd33084 100644
---- a/drivers/hid/hid-logitech-dj.c
-+++ b/drivers/hid/hid-logitech-dj.c
-@@ -192,6 +192,7 @@ static struct hid_ll_driver logi_dj_ll_driver;
- static int logi_dj_output_hidraw_report(struct hid_device *hid, u8 * buf,
- 					size_t count,
- 					unsigned char report_type);
-+static int logi_dj_recv_query_paired_devices(struct dj_receiver_dev *djrcv_dev);
- 
- static void logi_dj_recv_destroy_djhid_device(struct dj_receiver_dev *djrcv_dev,
- 						struct dj_report *dj_report)
-@@ -232,6 +233,7 @@ static void logi_dj_recv_add_djhid_device(struct dj_receiver_dev *djrcv_dev,
- 	if (dj_report->report_params[DEVICE_PAIRED_PARAM_SPFUNCTION] &
- 	    SPFUNCTION_DEVICE_LIST_EMPTY) {
- 		dbg_hid("%s: device list is empty\n", __func__);
-+		djrcv_dev->querying_devices = false;
- 		return;
- 	}
- 
-@@ -242,6 +244,12 @@ static void logi_dj_recv_add_djhid_device(struct dj_receiver_dev *djrcv_dev,
- 		return;
- 	}
- 
-+	if (djrcv_dev->paired_dj_devices[dj_report->device_index]) {
-+		/* The device is already known. No need to reallocate it. */
-+		dbg_hid("%s: device is already known\n", __func__);
-+		return;
-+	}
-+
- 	dj_hiddev = hid_allocate_device();
- 	if (IS_ERR(dj_hiddev)) {
- 		dev_err(&djrcv_hdev->dev, "%s: hid_allocate_device failed\n",
-@@ -305,6 +313,7 @@ static void delayedwork_callback(struct work_struct *work)
- 	struct dj_report dj_report;
- 	unsigned long flags;
- 	int count;
-+	int retval;
- 
- 	dbg_hid("%s\n", __func__);
- 
-@@ -337,6 +346,25 @@ static void delayedwork_callback(struct work_struct *work)
- 		logi_dj_recv_destroy_djhid_device(djrcv_dev, &dj_report);
- 		break;
- 	default:
-+	/* A normal report (i. e. not belonging to a pair/unpair notification)
-+	 * arriving here, means that the report arrived but we did not have a
-+	 * paired dj_device associated to the report's device_index, this
-+	 * means that the original "device paired" notification corresponding
-+	 * to this dj_device never arrived to this driver. The reason is that
-+	 * hid-core discards all packets coming from a device while probe() is
-+	 * executing. */
-+	if (!djrcv_dev->paired_dj_devices[dj_report.device_index]) {
-+		/* ok, we don't know the device, just re-ask the
-+		 * receiver for the list of connected devices. */
-+		retval = logi_dj_recv_query_paired_devices(djrcv_dev);
-+		if (!retval) {
-+			/* everything went fine, so just leave */
-+			break;
-+		}
-+		dev_err(&djrcv_dev->hdev->dev,
-+			"%s:logi_dj_recv_query_paired_devices "
-+			"error:%d\n", __func__, retval);
-+		}
- 		dbg_hid("%s: unexpected report type\n", __func__);
- 	}
- }
-@@ -367,6 +395,12 @@ static void logi_dj_recv_forward_null_report(struct dj_receiver_dev *djrcv_dev,
- 	if (!djdev) {
- 		dbg_hid("djrcv_dev->paired_dj_devices[dj_report->device_index]"
- 			" is NULL, index %d\n", dj_report->device_index);
-+		kfifo_in(&djrcv_dev->notif_fifo, dj_report, sizeof(struct dj_report));
-+
-+		if (schedule_work(&djrcv_dev->work) == 0) {
-+			dbg_hid("%s: did not schedule the work item, was already "
-+			"queued\n", __func__);
-+		}
- 		return;
- 	}
- 
-@@ -397,6 +431,12 @@ static void logi_dj_recv_forward_report(struct dj_receiver_dev *djrcv_dev,
- 	if (dj_device == NULL) {
- 		dbg_hid("djrcv_dev->paired_dj_devices[dj_report->device_index]"
- 			" is NULL, index %d\n", dj_report->device_index);
-+		kfifo_in(&djrcv_dev->notif_fifo, dj_report, sizeof(struct dj_report));
-+
-+		if (schedule_work(&djrcv_dev->work) == 0) {
-+			dbg_hid("%s: did not schedule the work item, was already "
-+			"queued\n", __func__);
-+		}
- 		return;
- 	}
- 
-@@ -444,6 +484,10 @@ static int logi_dj_recv_query_paired_devices(struct dj_receiver_dev *djrcv_dev)
- 	struct dj_report *dj_report;
- 	int retval;
- 
-+	/* no need to protect djrcv_dev->querying_devices */
-+	if (djrcv_dev->querying_devices)
-+		return 0;
-+
- 	dj_report = kzalloc(sizeof(struct dj_report), GFP_KERNEL);
- 	if (!dj_report)
- 		return -ENOMEM;
-@@ -455,6 +499,7 @@ static int logi_dj_recv_query_paired_devices(struct dj_receiver_dev *djrcv_dev)
- 	return retval;
- }
- 
-+
- static int logi_dj_recv_switch_to_dj_mode(struct dj_receiver_dev *djrcv_dev,
- 					  unsigned timeout)
- {
-diff --git a/drivers/hid/hid-logitech-dj.h b/drivers/hid/hid-logitech-dj.h
-index fd28a5e..4a40003 100644
---- a/drivers/hid/hid-logitech-dj.h
-+++ b/drivers/hid/hid-logitech-dj.h
-@@ -101,6 +101,7 @@ struct dj_receiver_dev {
- 	struct work_struct work;
- 	struct kfifo notif_fifo;
- 	spinlock_t lock;
-+	bool querying_devices;
- };
- 
- struct dj_device {
---
-cgit v0.9.2
diff --git a/libre/linux-libre/3.11-haswell-intel_pstate.patch b/libre/linux-libre/3.11-haswell-intel_pstate.patch
new file mode 100644
index 000000000..1f376b518
--- /dev/null
+++ b/libre/linux-libre/3.11-haswell-intel_pstate.patch
@@ -0,0 +1,32 @@
+From 6cdcdb793791f776ea9408581b1242b636d43b37 Mon Sep 17 00:00:00 2001
+From: Nell Hardcastle <nell@spicious.com>
+Date: Sun, 30 Jun 2013 22:58:57 +0000
+Subject: intel_pstate: Add Haswell CPU models
+
+Enable the intel_pstate driver for Haswell CPUs. One missing Ivy Bridge
+model (0x3E) is also included. Models referenced from
+tools/power/x86/turbostat/turbostat.c:has_nehalem_turbo_ratio_limit
+
+Signed-off-by: Nell Hardcastle <nell@spicious.com>
+Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
+Acked-by: Dirk Brandewie <dirk.j.brandewie@intel.com>
+Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+---
+diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
+index 6efd96c..9733f29 100644
+--- a/drivers/cpufreq/intel_pstate.c
++++ b/drivers/cpufreq/intel_pstate.c
+@@ -522,6 +522,11 @@ static const struct x86_cpu_id intel_pstate_cpu_ids[] = {
+ 	ICPU(0x2a, default_policy),
+ 	ICPU(0x2d, default_policy),
+ 	ICPU(0x3a, default_policy),
++	ICPU(0x3c, default_policy),
++	ICPU(0x3e, default_policy),
++	ICPU(0x3f, default_policy),
++	ICPU(0x45, default_policy),
++	ICPU(0x46, default_policy),
+ 	{}
+ };
+ MODULE_DEVICE_TABLE(x86cpu, intel_pstate_cpu_ids);
+--
+cgit v0.9.2
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 24c52e954..3eddd3547 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193761 2013-08-30 11:11:43Z tpowa $
+# $Id: PKGBUILD 195930 2013-10-05 19:44:24Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -9,11 +9,11 @@
 
 pkgbase=linux-libre         # Build stock -LIBRE kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
-_basekernel=3.10
-_sublevel=10
+_basekernel=3.11
+_sublevel=4
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.10 # 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')
@@ -30,20 +30,20 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'boot-logo.patch'
         'change-default-console-loglevel.patch'
         'criu-no-expert.patch'
-        '3.10.6-logitech-dj.patch'
+        '3.11-haswell-intel_pstate.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
-md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
-         '673ae6d60b4ce8acad930a06f9fe2e3f'
-         '8ec987449e0e42a1c98d8ce92b9019c2'
-         '8efbd1f17f37bdaa8649c8a63761bf07'
+md5sums=('7ec84223c7adcf01a5287eb7af96b7e7'
+         'd09e8017d22370b873628942f3ece3b0'
+         'b7718a81faf845ab53234336122ad631'
+         'f7ee88ffc93b665345b6ee89ff192e1f'
          'e49ac236dfeef709f91a3d993ea7b62c'
          '2967cecc3af9f954ccc822fd63dca6ff'
          '8267264d9a8966e57fdacd1fa1fc65c4'
-         '04b21c79df0a952c22d681dd4f4562df'
-         'f3def2cefdcbb954c21d8505d23cc83c'
+         '36e90334b12b2e9d53fd92129ee98f5b'
+         '98beb36f9b8cf16e58de2483ea9985e3'
          'd50c1ac47394e9aec637002ef3392bd1'
-         '3ff40ca684cfe719723e627e2cef7cea'
-         '714134bcb52e243898036beacca2e7b7')
+         '1040ae6c10d4a68f89899f94a2318a17'
+         'e6db810c0d41180acca55f545b1681fb')
 if [ "$CARCH" != "mips64el" ]; then
     # don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
@@ -68,12 +68,14 @@ prepare() {
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
   patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
 
+  # add intel haswell support to intel_pstate
+  # https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=6cdcdb793791f776ea9408581b1242b636d43b37
+  # will be in 3.12
+  patch -Np1 -i "${srcdir}/3.11-haswell-intel_pstate.patch"
+ 
   # allow criu without expert option set
   # patch from fedora
   patch -Np1 -i "${srcdir}/criu-no-expert.patch"
- 
-  # fix https://bugs.archlinux.org/task/35991 - [linux] 3.10.x renders Logitech Unified Receivers useless
-  patch -Np1 -i  "${srcdir}/3.10.6-logitech-dj.patch"
 
   if [ "$CARCH" == "mips64el" ]; then
     sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile
diff --git a/libre/linux-libre/boot-logo.patch b/libre/linux-libre/boot-logo.patch
index c392928a5..cbd52ea22 100644
--- a/libre/linux-libre/boot-logo.patch
+++ b/libre/linux-libre/boot-logo.patch
@@ -1,1612 +1,891 @@
-diff -Nur linux-2.6.39.1/drivers/video/logo/logo_linux_clut224.ppm linux-2.6.39-LIBRE/drivers/video/logo/logo_linux_clut224.ppm
---- linux-2.6.39.1/drivers/video/logo/logo_linux_clut224.ppm	2011-06-02 21:34:20.000000000 -0300
-+++ linux-2.6.39-LIBRE/drivers/video/logo/logo_linux_clut224.ppm	2011-06-22 13:42:06.000000000 -0300
-@@ -1,1604 +1,861 @@
+diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
+index 285d552..c9d8373 100644
+--- a/drivers/video/logo/logo_linux_clut224.ppm
++++ b/drivers/video/logo/logo_linux_clut224.ppm
+@@ -1,883 +1,861 @@
  P3
--# Standard 224-color Linux logo
 -80 80
 +80 78
  255
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6   6   6   6  10  10  10  10  10  10
-- 10  10  10   6   6   6   6   6   6   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  10  10  10  14  14  14
-- 22  22  22  26  26  26  30  30  30  34  34  34
-- 30  30  30  30  30  30  26  26  26  18  18  18
-- 14  14  14  10  10  10   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  14  14  14  26  26  26  42  42  42
-- 54  54  54  66  66  66  78  78  78  78  78  78
-- 78  78  78  74  74  74  66  66  66  54  54  54
-- 42  42  42  26  26  26  18  18  18  10  10  10
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 22  22  22  42  42  42  66  66  66  86  86  86
-- 66  66  66  38  38  38  38  38  38  22  22  22
-- 26  26  26  34  34  34  54  54  54  66  66  66
-- 86  86  86  70  70  70  46  46  46  26  26  26
-- 14  14  14   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  10  10  10  26  26  26
-- 50  50  50  82  82  82  58  58  58   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  6   6   6  54  54  54  86  86  86  66  66  66
-- 38  38  38  18  18  18   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  22  22  22  50  50  50
-- 78  78  78  34  34  34   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   6   6   6  70  70  70
-- 78  78  78  46  46  46  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  18  18  18  42  42  42  82  82  82
-- 26  26  26   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  14  14  14
-- 46  46  46  34  34  34   6   6   6   2   2   6
-- 42  42  42  78  78  78  42  42  42  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   0   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 10  10  10  30  30  30  66  66  66  58  58  58
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  26  26  26
-- 86  86  86 101 101 101  46  46  46  10  10  10
--  2   2   6  58  58  58  70  70  70  34  34  34
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 14  14  14  42  42  42  86  86  86  10  10  10
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  30  30  30
-- 94  94  94  94  94  94  58  58  58  26  26  26
--  2   2   6   6   6   6  78  78  78  54  54  54
-- 22  22  22   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 22  22  22  62  62  62  62  62  62   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  26  26  26
-- 54  54  54  38  38  38  18  18  18  10  10  10
--  2   2   6   2   2   6  34  34  34  82  82  82
-- 38  38  38  14  14  14   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 30  30  30  78  78  78  30  30  30   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  10  10  10
-- 10  10  10   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  78  78  78
-- 50  50  50  18  18  18   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 38  38  38  86  86  86  14  14  14   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  54  54  54
-- 66  66  66  26  26  26   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 42  42  42  82  82  82   2   2   6   2   2   6
--  2   2   6   6   6   6  10  10  10   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   6   6   6
-- 14  14  14  10  10  10   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  18  18  18
-- 82  82  82  34  34  34  10  10  10   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 46  46  46  86  86  86   2   2   6   2   2   6
--  6   6   6   6   6   6  22  22  22  34  34  34
--  6   6   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  18  18  18  34  34  34
-- 10  10  10  50  50  50  22  22  22   2   2   6
--  2   2   6   2   2   6   2   2   6  10  10  10
-- 86  86  86  42  42  42  14  14  14   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 46  46  46  86  86  86   2   2   6   2   2   6
-- 38  38  38 116 116 116  94  94  94  22  22  22
-- 22  22  22   2   2   6   2   2   6   2   2   6
-- 14  14  14  86  86  86 138 138 138 162 162 162
--154 154 154  38  38  38  26  26  26   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 86  86  86  46  46  46  14  14  14   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 46  46  46  86  86  86   2   2   6  14  14  14
--134 134 134 198 198 198 195 195 195 116 116 116
-- 10  10  10   2   2   6   2   2   6   6   6   6
--101  98  89 187 187 187 210 210 210 218 218 218
--214 214 214 134 134 134  14  14  14   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 86  86  86  50  50  50  18  18  18   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   1   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 46  46  46  86  86  86   2   2   6  54  54  54
--218 218 218 195 195 195 226 226 226 246 246 246
-- 58  58  58   2   2   6   2   2   6  30  30  30
--210 210 210 253 253 253 174 174 174 123 123 123
--221 221 221 234 234 234  74  74  74   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 70  70  70  58  58  58  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 46  46  46  82  82  82   2   2   6 106 106 106
--170 170 170  26  26  26  86  86  86 226 226 226
--123 123 123  10  10  10  14  14  14  46  46  46
--231 231 231 190 190 190   6   6   6  70  70  70
-- 90  90  90 238 238 238 158 158 158   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 70  70  70  58  58  58  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   1   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 42  42  42  86  86  86   6   6   6 116 116 116
--106 106 106   6   6   6  70  70  70 149 149 149
--128 128 128  18  18  18  38  38  38  54  54  54
--221 221 221 106 106 106   2   2   6  14  14  14
-- 46  46  46 190 190 190 198 198 198   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 74  74  74  62  62  62  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   1   0   0   0
--  0   0   1   0   0   0   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 42  42  42  94  94  94  14  14  14 101 101 101
--128 128 128   2   2   6  18  18  18 116 116 116
--118  98  46 121  92   8 121  92   8  98  78  10
--162 162 162 106 106 106   2   2   6   2   2   6
--  2   2   6 195 195 195 195 195 195   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 74  74  74  62  62  62  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   1   0   0   1
--  0   0   1   0   0   0   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 38  38  38  90  90  90  14  14  14  58  58  58
--210 210 210  26  26  26  54  38   6 154 114  10
--226 170  11 236 186  11 225 175  15 184 144  12
--215 174  15 175 146  61  37  26   9   2   2   6
-- 70  70  70 246 246 246 138 138 138   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 70  70  70  66  66  66  26  26  26   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 38  38  38  86  86  86  14  14  14  10  10  10
--195 195 195 188 164 115 192 133   9 225 175  15
--239 182  13 234 190  10 232 195  16 232 200  30
--245 207  45 241 208  19 232 195  16 184 144  12
--218 194 134 211 206 186  42  42  42   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 50  50  50  74  74  74  30  30  30   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 34  34  34  86  86  86  14  14  14   2   2   6
--121  87  25 192 133   9 219 162  10 239 182  13
--236 186  11 232 195  16 241 208  19 244 214  54
--246 218  60 246 218  38 246 215  20 241 208  19
--241 208  19 226 184  13 121  87  25   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 50  50  50  82  82  82  34  34  34  10  10  10
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 34  34  34  82  82  82  30  30  30  61  42   6
--180 123   7 206 145  10 230 174  11 239 182  13
--234 190  10 238 202  15 241 208  19 246 218  74
--246 218  38 246 215  20 246 215  20 246 215  20
--226 184  13 215 174  15 184 144  12   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 26  26  26  94  94  94  42  42  42  14  14  14
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  78  78  78  50  50  50 104  69   6
--192 133   9 216 158  10 236 178  12 236 186  11
--232 195  16 241 208  19 244 214  54 245 215  43
--246 215  20 246 215  20 241 208  19 198 155  10
--200 144  11 216 158  10 156 118  10   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  6   6   6  90  90  90  54  54  54  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  78  78  78  46  46  46  22  22  22
--137  92   6 210 162  10 239 182  13 238 190  10
--238 202  15 241 208  19 246 215  20 246 215  20
--241 208  19 203 166  17 185 133  11 210 150  10
--216 158  10 210 150  10 102  78  10   2   2   6
--  6   6   6  54  54  54  14  14  14   2   2   6
--  2   2   6  62  62  62  74  74  74  30  30  30
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 34  34  34  78  78  78  50  50  50   6   6   6
-- 94  70  30 139 102  15 190 146  13 226 184  13
--232 200  30 232 195  16 215 174  15 190 146  13
--168 122  10 192 133   9 210 150  10 213 154  11
--202 150  34 182 157 106 101  98  89   2   2   6
--  2   2   6  78  78  78 116 116 116  58  58  58
--  2   2   6  22  22  22  90  90  90  46  46  46
-- 18  18  18   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 38  38  38  86  86  86  50  50  50   6   6   6
--128 128 128 174 154 114 156 107  11 168 122  10
--198 155  10 184 144  12 197 138  11 200 144  11
--206 145  10 206 145  10 197 138  11 188 164 115
--195 195 195 198 198 198 174 174 174  14  14  14
--  2   2   6  22  22  22 116 116 116 116 116 116
-- 22  22  22   2   2   6  74  74  74  70  70  70
-- 30  30  30  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 50  50  50 101 101 101  26  26  26  10  10  10
--138 138 138 190 190 190 174 154 114 156 107  11
--197 138  11 200 144  11 197 138  11 192 133   9
--180 123   7 190 142  34 190 178 144 187 187 187
--202 202 202 221 221 221 214 214 214  66  66  66
--  2   2   6   2   2   6  50  50  50  62  62  62
--  6   6   6   2   2   6  10  10  10  90  90  90
-- 50  50  50  18  18  18   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  10  10  10  34  34  34
-- 74  74  74  74  74  74   2   2   6   6   6   6
--144 144 144 198 198 198 190 190 190 178 166 146
--154 121  60 156 107  11 156 107  11 168 124  44
--174 154 114 187 187 187 190 190 190 210 210 210
--246 246 246 253 253 253 253 253 253 182 182 182
--  6   6   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  62  62  62
-- 74  74  74  34  34  34  14  14  14   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  10  10  10  22  22  22  54  54  54
-- 94  94  94  18  18  18   2   2   6  46  46  46
--234 234 234 221 221 221 190 190 190 190 190 190
--190 190 190 187 187 187 187 187 187 190 190 190
--190 190 190 195 195 195 214 214 214 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
-- 82  82  82   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  14  14  14
-- 86  86  86  54  54  54  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  18  18  18  46  46  46  90  90  90
-- 46  46  46  18  18  18   6   6   6 182 182 182
--253 253 253 246 246 246 206 206 206 190 190 190
--190 190 190 190 190 190 190 190 190 190 190 190
--206 206 206 231 231 231 250 250 250 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--202 202 202  14  14  14   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 42  42  42  86  86  86  42  42  42  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 14  14  14  38  38  38  74  74  74  66  66  66
--  2   2   6   6   6   6  90  90  90 250 250 250
--253 253 253 253 253 253 238 238 238 198 198 198
--190 190 190 190 190 190 195 195 195 221 221 221
--246 246 246 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253  82  82  82   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  78  78  78  70  70  70  34  34  34
-- 14  14  14   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 34  34  34  66  66  66  78  78  78   6   6   6
--  2   2   6  18  18  18 218 218 218 253 253 253
--253 253 253 253 253 253 253 253 253 246 246 246
--226 226 226 231 231 231 246 246 246 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 178 178 178   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  18  18  18  90  90  90  62  62  62
-- 30  30  30  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  10  10  10  26  26  26
-- 58  58  58  90  90  90  18  18  18   2   2   6
--  2   2   6 110 110 110 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--250 250 250 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 231 231 231  18  18  18   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  18  18  18  94  94  94
-- 54  54  54  26  26  26  10  10  10   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  22  22  22  50  50  50
-- 90  90  90  26  26  26   2   2   6   2   2   6
-- 14  14  14 195 195 195 250 250 250 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--250 250 250 242 242 242  54  54  54   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  38  38  38
-- 86  86  86  50  50  50  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  14  14  14  38  38  38  82  82  82
-- 34  34  34   2   2   6   2   2   6   2   2   6
-- 42  42  42 195 195 195 246 246 246 253 253 253
--253 253 253 253 253 253 253 253 253 250 250 250
--242 242 242 242 242 242 250 250 250 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 250 250 250 246 246 246 238 238 238
--226 226 226 231 231 231 101 101 101   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 38  38  38  82  82  82  42  42  42  14  14  14
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 10  10  10  26  26  26  62  62  62  66  66  66
--  2   2   6   2   2   6   2   2   6   6   6   6
-- 70  70  70 170 170 170 206 206 206 234 234 234
--246 246 246 250 250 250 250 250 250 238 238 238
--226 226 226 231 231 231 238 238 238 250 250 250
--250 250 250 250 250 250 246 246 246 231 231 231
--214 214 214 206 206 206 202 202 202 202 202 202
--198 198 198 202 202 202 182 182 182  18  18  18
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  62  62  62  66  66  66  30  30  30
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 14  14  14  42  42  42  82  82  82  18  18  18
--  2   2   6   2   2   6   2   2   6  10  10  10
-- 94  94  94 182 182 182 218 218 218 242 242 242
--250 250 250 253 253 253 253 253 253 250 250 250
--234 234 234 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 246 246 246
--238 238 238 226 226 226 210 210 210 202 202 202
--195 195 195 195 195 195 210 210 210 158 158 158
--  6   6   6  14  14  14  50  50  50  14  14  14
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   6   6   6  86  86  86  46  46  46
-- 18  18  18   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 22  22  22  54  54  54  70  70  70   2   2   6
--  2   2   6  10  10  10   2   2   6  22  22  22
--166 166 166 231 231 231 250 250 250 253 253 253
--253 253 253 253 253 253 253 253 253 250 250 250
--242 242 242 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 246 246 246
--231 231 231 206 206 206 198 198 198 226 226 226
-- 94  94  94   2   2   6   6   6   6  38  38  38
-- 30  30  30   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  62  62  62  66  66  66
-- 26  26  26  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  74  74  74  50  50  50   2   2   6
-- 26  26  26  26  26  26   2   2   6 106 106 106
--238 238 238 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 246 246 246 218 218 218 202 202 202
--210 210 210  14  14  14   2   2   6   2   2   6
-- 30  30  30  22  22  22   2   2   6   2   2   6
--  2   2   6   2   2   6  18  18  18  86  86  86
-- 42  42  42  14  14  14   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 42  42  42  90  90  90  22  22  22   2   2   6
-- 42  42  42   2   2   6  18  18  18 218 218 218
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 250 250 250 221 221 221
--218 218 218 101 101 101   2   2   6  14  14  14
-- 18  18  18  38  38  38  10  10  10   2   2   6
--  2   2   6   2   2   6   2   2   6  78  78  78
-- 58  58  58  22  22  22   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 54  54  54  82  82  82   2   2   6  26  26  26
-- 22  22  22   2   2   6 123 123 123 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 250 250 250
--238 238 238 198 198 198   6   6   6  38  38  38
-- 58  58  58  26  26  26  38  38  38   2   2   6
--  2   2   6   2   2   6   2   2   6  46  46  46
-- 78  78  78  30  30  30  10  10  10   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  10  10  10  30  30  30
-- 74  74  74  58  58  58   2   2   6  42  42  42
--  2   2   6  22  22  22 231 231 231 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 250 250 250
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 246 246 246  46  46  46  38  38  38
-- 42  42  42  14  14  14  38  38  38  14  14  14
--  2   2   6   2   2   6   2   2   6   6   6   6
-- 86  86  86  46  46  46  14  14  14   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  14  14  14  42  42  42
-- 90  90  90  18  18  18  18  18  18  26  26  26
--  2   2   6 116 116 116 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 250 250 250 238 238 238
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253  94  94  94   6   6   6
--  2   2   6   2   2   6  10  10  10  34  34  34
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 74  74  74  58  58  58  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  10  10  10  26  26  26  66  66  66
-- 82  82  82   2   2   6  38  38  38   6   6   6
-- 14  14  14 210 210 210 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 246 246 246 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 144 144 144   2   2   6
--  2   2   6   2   2   6   2   2   6  46  46  46
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 42  42  42  74  74  74  30  30  30  10  10  10
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  14  14  14  42  42  42  90  90  90
-- 26  26  26   6   6   6  42  42  42   2   2   6
-- 74  74  74 250 250 250 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 242 242 242 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 182 182 182   2   2   6
--  2   2   6   2   2   6   2   2   6  46  46  46
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 10  10  10  86  86  86  38  38  38  10  10  10
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 10  10  10  26  26  26  66  66  66  82  82  82
--  2   2   6  22  22  22  18  18  18   2   2   6
--149 149 149 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 234 234 234 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 206 206 206   2   2   6
--  2   2   6   2   2   6   2   2   6  38  38  38
--  2   2   6   2   2   6   2   2   6   2   2   6
--  6   6   6  86  86  86  46  46  46  14  14  14
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 18  18  18  46  46  46  86  86  86  18  18  18
--  2   2   6  34  34  34  10  10  10   6   6   6
--210 210 210 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 234 234 234 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 221 221 221   6   6   6
--  2   2   6   2   2   6   6   6   6  30  30  30
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  82  82  82  54  54  54  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 26  26  26  66  66  66  62  62  62   2   2   6
--  2   2   6  38  38  38  10  10  10  26  26  26
--238 238 238 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 238 238 238
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231   6   6   6
--  2   2   6   2   2   6  10  10  10  30  30  30
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  66  66  66  58  58  58  22  22  22
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 38  38  38  78  78  78   6   6   6   2   2   6
--  2   2   6  46  46  46  14  14  14  42  42  42
--246 246 246 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 234 234 234  10  10  10
--  2   2   6   2   2   6  22  22  22  14  14  14
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  66  66  66  62  62  62  22  22  22
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 50  50  50  74  74  74   2   2   6   2   2   6
-- 14  14  14  70  70  70  34  34  34  62  62  62
--250 250 250 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 246 246 246
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 234 234 234  14  14  14
--  2   2   6   2   2   6  30  30  30   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  66  66  66  62  62  62  22  22  22
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 54  54  54  62  62  62   2   2   6   2   2   6
--  2   2   6  30  30  30  46  46  46  70  70  70
--250 250 250 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 246 246 246
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 226 226 226  10  10  10
--  2   2   6   6   6   6  30  30  30   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  66  66  66  58  58  58  22  22  22
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  22  22  22
-- 58  58  58  62  62  62   2   2   6   2   2   6
--  2   2   6   2   2   6  30  30  30  78  78  78
--250 250 250 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 246 246 246
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 206 206 206   2   2   6
-- 22  22  22  34  34  34  18  14   6  22  22  22
-- 26  26  26  18  18  18   6   6   6   2   2   6
--  2   2   6  82  82  82  54  54  54  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  26  26  26
-- 62  62  62 106 106 106  74  54  14 185 133  11
--210 162  10 121  92   8   6   6   6  62  62  62
--238 238 238 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 246 246 246
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 158 158 158  18  18  18
-- 14  14  14   2   2   6   2   2   6   2   2   6
--  6   6   6  18  18  18  66  66  66  38  38  38
--  6   6   6  94  94  94  50  50  50  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 10  10  10  10  10  10  18  18  18  38  38  38
-- 78  78  78 142 134 106 216 158  10 242 186  14
--246 190  14 246 190  14 156 118  10  10  10  10
-- 90  90  90 238 238 238 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 250 250 250
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 246 230 190
--238 204  91 238 204  91 181 142  44  37  26   9
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  38  38  38  46  46  46
-- 26  26  26 106 106 106  54  54  54  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  14  14  14  22  22  22
-- 30  30  30  38  38  38  50  50  50  70  70  70
--106 106 106 190 142  34 226 170  11 242 186  14
--246 190  14 246 190  14 246 190  14 154 114  10
--  6   6   6  74  74  74 226 226 226 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 250 250 250
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 228 184  62
--241 196  14 241 208  19 232 195  16  38  30  10
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   6   6   6  30  30  30  26  26  26
--203 166  17 154 142  90  66  66  66  26  26  26
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  18  18  18  38  38  38  58  58  58
-- 78  78  78  86  86  86 101 101 101 123 123 123
--175 146  61 210 150  10 234 174  13 246 186  14
--246 190  14 246 190  14 246 190  14 238 190  10
--102  78  10   2   2   6  46  46  46 198 198 198
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 234 234 234 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 224 178  62
--242 186  14 241 196  14 210 166  10  22  18   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   6   6   6 121  92   8
--238 202  15 232 195  16  82  82  82  34  34  34
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 14  14  14  38  38  38  70  70  70 154 122  46
--190 142  34 200 144  11 197 138  11 197 138  11
--213 154  11 226 170  11 242 186  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--225 175  15  46  32   6   2   2   6  22  22  22
--158 158 158 250 250 250 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 250 250 250 242 242 242 224 178  62
--239 182  13 236 186  11 213 154  11  46  32   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  61  42   6 225 175  15
--238 190  10 236 186  11 112 100  78  42  42  42
-- 14  14  14   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 22  22  22  54  54  54 154 122  46 213 154  11
--226 170  11 230 174  11 226 170  11 226 170  11
--236 178  12 242 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--241 196  14 184 144  12  10  10  10   2   2   6
--  6   6   6 116 116 116 242 242 242 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 231 231 231 198 198 198 214 170  54
--236 178  12 236 178  12 210 150  10 137  92   6
-- 18  14   6   2   2   6   2   2   6   2   2   6
--  6   6   6  70  47   6 200 144  11 236 178  12
--239 182  13 239 182  13 124 112  88  58  58  58
-- 22  22  22   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  70  70  70 180 133  36 226 170  11
--239 182  13 242 186  14 242 186  14 246 186  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 232 195  16  98  70   6   2   2   6
--  2   2   6   2   2   6  66  66  66 221 221 221
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 206 206 206 198 198 198 214 166  58
--230 174  11 230 174  11 216 158  10 192 133   9
--163 110   8 116  81   8 102  78  10 116  81   8
--167 114   7 197 138  11 226 170  11 239 182  13
--242 186  14 242 186  14 162 146  94  78  78  78
-- 34  34  34  14  14  14   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 30  30  30  78  78  78 190 142  34 226 170  11
--239 182  13 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 241 196  14 203 166  17  22  18   6
--  2   2   6   2   2   6   2   2   6  38  38  38
--218 218 218 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--250 250 250 206 206 206 198 198 198 202 162  69
--226 170  11 236 178  12 224 166  10 210 150  10
--200 144  11 197 138  11 192 133   9 197 138  11
--210 150  10 226 170  11 242 186  14 246 190  14
--246 190  14 246 186  14 225 175  15 124 112  88
-- 62  62  62  30  30  30  14  14  14   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  78  78  78 174 135  50 224 166  10
--239 182  13 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 241 196  14 139 102  15
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 78  78  78 250 250 250 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--250 250 250 214 214 214 198 198 198 190 150  46
--219 162  10 236 178  12 234 174  13 224 166  10
--216 158  10 213 154  11 213 154  11 216 158  10
--226 170  11 239 182  13 246 190  14 246 190  14
--246 190  14 246 190  14 242 186  14 206 162  42
--101 101 101  58  58  58  30  30  30  14  14  14
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  74  74  74 174 135  50 216 158  10
--236 178  12 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 241 196  14 226 184  13
-- 61  42   6   2   2   6   2   2   6   2   2   6
-- 22  22  22 238 238 238 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 226 226 226 187 187 187 180 133  36
--216 158  10 236 178  12 239 182  13 236 178  12
--230 174  11 226 170  11 226 170  11 230 174  11
--236 178  12 242 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 186  14 239 182  13
--206 162  42 106 106 106  66  66  66  34  34  34
-- 14  14  14   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 26  26  26  70  70  70 163 133  67 213 154  11
--236 178  12 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 241 196  14
--190 146  13  18  14   6   2   2   6   2   2   6
-- 46  46  46 246 246 246 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 221 221 221  86  86  86 156 107  11
--216 158  10 236 178  12 242 186  14 246 186  14
--242 186  14 239 182  13 239 182  13 242 186  14
--242 186  14 246 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--242 186  14 225 175  15 142 122  72  66  66  66
-- 30  30  30  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 26  26  26  70  70  70 163 133  67 210 150  10
--236 178  12 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--232 195  16 121  92   8  34  34  34 106 106 106
--221 221 221 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--242 242 242  82  82  82  18  14   6 163 110   8
--216 158  10 236 178  12 242 186  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 242 186  14 163 133  67
-- 46  46  46  18  18  18   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  78  78  78 163 133  67 210 150  10
--236 178  12 246 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--241 196  14 215 174  15 190 178 144 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 218 218 218
-- 58  58  58   2   2   6  22  18   6 167 114   7
--216 158  10 236 178  12 246 186  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 186  14 242 186  14 190 150  46
-- 54  54  54  22  22  22   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 38  38  38  86  86  86 180 133  36 213 154  11
--236 178  12 246 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 232 195  16 190 146  13 214 214 214
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 250 250 250 170 170 170  26  26  26
--  2   2   6   2   2   6  37  26   9 163 110   8
--219 162  10 239 182  13 246 186  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 186  14 236 178  12 224 166  10 142 122  72
-- 46  46  46  18  18  18   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 50  50  50 109 106  95 192 133   9 224 166  10
--242 186  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--242 186  14 226 184  13 210 162  10 142 110  46
--226 226 226 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--198 198 198  66  66  66   2   2   6   2   2   6
--  2   2   6   2   2   6  50  34   6 156 107  11
--219 162  10 239 182  13 246 186  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 242 186  14
--234 174  13 213 154  11 154 122  46  66  66  66
-- 30  30  30  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  22  22  22
-- 58  58  58 154 121  60 206 145  10 234 174  13
--242 186  14 246 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 186  14 236 178  12 210 162  10 163 110   8
-- 61  42   6 138 138 138 218 218 218 250 250 250
--253 253 253 253 253 253 253 253 253 250 250 250
--242 242 242 210 210 210 144 144 144  66  66  66
--  6   6   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  61  42   6 163 110   8
--216 158  10 236 178  12 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 239 182  13 230 174  11 216 158  10
--190 142  34 124 112  88  70  70  70  38  38  38
-- 18  18  18   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  22  22  22
-- 62  62  62 168 124  44 206 145  10 224 166  10
--236 178  12 239 182  13 242 186  14 242 186  14
--246 186  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 236 178  12 216 158  10 175 118   6
-- 80  54   7   2   2   6   6   6   6  30  30  30
-- 54  54  54  62  62  62  50  50  50  38  38  38
-- 14  14  14   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   6   6   6  80  54   7 167 114   7
--213 154  11 236 178  12 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 242 186  14 239 182  13 239 182  13
--230 174  11 210 150  10 174 135  50 124 112  88
-- 82  82  82  54  54  54  34  34  34  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 50  50  50 158 118  36 192 133   9 200 144  11
--216 158  10 219 162  10 224 166  10 226 170  11
--230 174  11 236 178  12 239 182  13 239 182  13
--242 186  14 246 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 186  14 230 174  11 210 150  10 163 110   8
--104  69   6  10  10  10   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   6   6   6  91  60   6 167 114   7
--206 145  10 230 174  11 242 186  14 246 190  14
--246 190  14 246 190  14 246 186  14 242 186  14
--239 182  13 230 174  11 224 166  10 213 154  11
--180 133  36 124 112  88  86  86  86  58  58  58
-- 38  38  38  22  22  22  10  10  10   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 34  34  34  70  70  70 138 110  50 158 118  36
--167 114   7 180 123   7 192 133   9 197 138  11
--200 144  11 206 145  10 213 154  11 219 162  10
--224 166  10 230 174  11 239 182  13 242 186  14
--246 186  14 246 186  14 246 186  14 246 186  14
--239 182  13 216 158  10 185 133  11 152  99   6
--104  69   6  18  14   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   6   6   6  80  54   7 152  99   6
--192 133   9 219 162  10 236 178  12 239 182  13
--246 186  14 242 186  14 239 182  13 236 178  12
--224 166  10 206 145  10 192 133   9 154 121  60
-- 94  94  94  62  62  62  42  42  42  22  22  22
-- 14  14  14   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 18  18  18  34  34  34  58  58  58  78  78  78
--101  98  89 124 112  88 142 110  46 156 107  11
--163 110   8 167 114   7 175 118   6 180 123   7
--185 133  11 197 138  11 210 150  10 219 162  10
--226 170  11 236 178  12 236 178  12 234 174  13
--219 162  10 197 138  11 163 110   8 130  83   6
-- 91  60   6  10  10  10   2   2   6   2   2   6
-- 18  18  18  38  38  38  38  38  38  38  38  38
-- 38  38  38  38  38  38  38  38  38  38  38  38
-- 38  38  38  38  38  38  26  26  26   2   2   6
--  2   2   6   6   6   6  70  47   6 137  92   6
--175 118   6 200 144  11 219 162  10 230 174  11
--234 174  13 230 174  11 219 162  10 210 150  10
--192 133   9 163 110   8 124 112  88  82  82  82
-- 50  50  50  30  30  30  14  14  14   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  14  14  14  22  22  22  34  34  34
-- 42  42  42  58  58  58  74  74  74  86  86  86
--101  98  89 122 102  70 130  98  46 121  87  25
--137  92   6 152  99   6 163 110   8 180 123   7
--185 133  11 197 138  11 206 145  10 200 144  11
--180 123   7 156 107  11 130  83   6 104  69   6
-- 50  34   6  54  54  54 110 110 110 101  98  89
-- 86  86  86  82  82  82  78  78  78  78  78  78
-- 78  78  78  78  78  78  78  78  78  78  78  78
-- 78  78  78  82  82  82  86  86  86  94  94  94
--106 106 106 101 101 101  86  66  34 124  80   6
--156 107  11 180 123   7 192 133   9 200 144  11
--206 145  10 200 144  11 192 133   9 175 118   6
--139 102  15 109 106  95  70  70  70  42  42  42
-- 22  22  22  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  10  10  10
-- 14  14  14  22  22  22  30  30  30  38  38  38
-- 50  50  50  62  62  62  74  74  74  90  90  90
--101  98  89 112 100  78 121  87  25 124  80   6
--137  92   6 152  99   6 152  99   6 152  99   6
--138  86   6 124  80   6  98  70   6  86  66  30
--101  98  89  82  82  82  58  58  58  46  46  46
-- 38  38  38  34  34  34  34  34  34  34  34  34
-- 34  34  34  34  34  34  34  34  34  34  34  34
-- 34  34  34  34  34  34  38  38  38  42  42  42
-- 54  54  54  82  82  82  94  86  76  91  60   6
--134  86   6 156 107  11 167 114   7 175 118   6
--175 118   6 167 114   7 152  99   6 121  87  25
--101  98  89  62  62  62  34  34  34  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6   6   6   6  10  10  10
-- 18  18  18  22  22  22  30  30  30  42  42  42
-- 50  50  50  66  66  66  86  86  86 101  98  89
--106  86  58  98  70   6 104  69   6 104  69   6
--104  69   6  91  60   6  82  62  34  90  90  90
-- 62  62  62  38  38  38  22  22  22  14  14  14
-- 10  10  10  10  10  10  10  10  10  10  10  10
-- 10  10  10  10  10  10   6   6   6  10  10  10
-- 10  10  10  10  10  10  10  10  10  14  14  14
-- 22  22  22  42  42  42  70  70  70  89  81  66
-- 80  54   7 104  69   6 124  80   6 137  92   6
--134  86   6 116  81   8 100  82  52  86  86  86
-- 58  58  58  30  30  30  14  14  14   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  10  10  10  14  14  14
-- 18  18  18  26  26  26  38  38  38  54  54  54
-- 70  70  70  86  86  86  94  86  76  89  81  66
-- 89  81  66  86  86  86  74  74  74  50  50  50
-- 30  30  30  14  14  14   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  18  18  18  34  34  34  58  58  58
-- 82  82  82  89  81  66  89  81  66  89  81  66
-- 94  86  66  94  86  76  74  74  74  50  50  50
-- 26  26  26  14  14  14   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6   6   6   6  14  14  14  18  18  18
-- 30  30  30  38  38  38  46  46  46  54  54  54
-- 50  50  50  42  42  42  30  30  30  18  18  18
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  14  14  14  26  26  26
-- 38  38  38  50  50  50  58  58  58  58  58  58
-- 54  54  54  42  42  42  30  30  30  18  18  18
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
--  6   6   6  10  10  10  14  14  14  18  18  18
-- 18  18  18  14  14  14  10  10  10   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 14  14  14  18  18  18  22  22  22  22  22  22
-- 18  18  18  14  14  14  10  10  10   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 11 15 17 33 49 54 59 85 92 73 97 106 
+-83 116 129 105 131 142 115 114 122 74 88 93 20 29 31 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 6 6 6 10 10 10 10 10 10 
+-10 10 10 6 6 6 6 6 6 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 2 3 3 17 23 26 50 67 72 73 97 106 59 85 92 73 97 106 
+-105 131 142 124 127 131 105 131 142 105 131 142 53 75 83 6 8 8 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 6 6 6 10 10 10 14 14 14 22 22 22 26 26 26 30 30 30 34 34 34 
+-30 30 30 30 30 30 26 26 26 18 18 18 14 14 14 10 10 10 6 6 6 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 
+-0 0 0 1 1 1 26 35 39 59 85 92 59 85 92 59 85 92 29 43 47 53 75 83 
+-108 122 132 132 98 104 108 122 132 105 131 142 101 101 101 43 45 48 6 8 8 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-6 6 6 14 14 14 26 26 26 42 42 42 54 54 54 66 66 66 78 78 78 78 78 78 
+-78 78 78 74 74 74 66 66 66 54 54 54 42 42 42 26 26 26 18 18 18 10 10 10 
+-6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 
+-11 15 17 27 40 45 59 85 92 59 85 92 27 40 45 31 45 49 73 97 106 93 121 133 
+-108 122 132 108 122 132 105 131 142 108 122 132 105 131 142 73 97 106 26 35 39 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 
+-22 22 22 42 42 42 66 66 66 86 86 86 66 66 66 38 38 38 38 38 38 22 22 22 
+-26 26 26 34 34 34 54 54 54 66 66 66 86 86 86 70 70 70 46 46 46 26 26 26 
+-14 14 14 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 7 12 13 21 31 35 42 59 64 
+-53 75 83 53 75 83 50 67 72 42 59 64 32 40 45 42 59 64 73 97 106 116 116 116 
+-132 98 104 116 116 116 108 122 132 117 104 110 105 131 142 83 116 129 50 67 72 7 12 13 
+-1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 26 26 26 
+-50 50 50 82 82 82 58 58 58 6 6 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 6 6 6 54 54 54 86 86 86 66 66 66 
+-38 38 38 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 1 1 1 6 8 8 15 22 25 26 35 39 36 54 60 53 75 83 59 85 92 
+-59 85 92 48 63 69 15 22 25 12 17 20 52 67 79 94 94 94 132 98 104 132 98 104 
+-117 104 110 108 122 132 108 122 132 115 114 122 105 131 142 77 105 114 59 85 92 36 54 60 
+-7 12 13 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 22 22 22 50 50 50 
+-78 78 78 34 34 34 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 6 6 6 70 70 70 
+-78 78 78 46 46 46 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 15 22 25 29 43 47 36 54 60 42 59 64 42 59 64 48 63 69 21 31 35 
+-6 8 8 29 43 47 36 50 56 43 45 48 79 78 84 132 98 104 165 78 79 132 98 104 
+-108 122 132 117 104 110 117 104 110 108 122 132 77 105 114 73 97 106 95 131 149 78 102 129 
+-36 50 56 0 0 0 0 0 0 0 0 0 6 6 6 18 18 18 42 42 42 82 82 82 
+-26 26 26 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 2 2 6 14 14 14 46 46 46 34 34 34 6 6 6 2 2 6 
+-42 42 42 78 78 78 42 42 42 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-27 40 45 53 75 83 48 63 69 24 31 37 6 8 12 0 0 0 18 25 28 26 35 39 
+-12 17 20 26 35 39 65 78 84 112 81 86 152 81 83 137 83 86 132 98 104 117 104 110 
+-117 104 110 132 98 104 132 98 104 115 114 122 73 97 106 53 75 83 95 131 149 93 124 152 
+-68 78 128 15 22 25 0 0 0 0 0 0 10 10 10 30 30 30 66 66 66 58 58 58 
+-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 2 2 6 26 26 26 86 86 86 101 101 101 46 46 46 10 10 10 
+-2 2 6 58 58 58 70 70 70 34 34 34 10 10 10 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-36 50 56 21 30 33 4 7 7 0 0 0 1 1 1 17 12 12 69 31 31 68 59 64 
+-57 59 63 21 31 35 32 40 45 86 73 69 152 81 83 152 81 83 117 104 110 132 98 104 
+-152 81 83 132 98 104 108 122 132 77 105 114 77 105 114 93 121 133 95 131 149 93 124 152 
+-95 131 149 53 75 83 11 15 17 0 0 0 14 14 14 42 42 42 86 86 86 10 10 10 
+-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 2 2 6 30 30 30 94 94 94 94 94 94 58 58 58 26 26 26 
+-2 2 6 6 6 6 78 78 78 54 54 54 22 22 22 6 6 6 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-17 23 26 2 3 3 0 0 0 17 12 12 69 31 31 123 55 55 123 55 55 152 81 83 
+-86 73 69 17 23 26 7 12 13 45 54 57 101 101 101 137 83 86 132 98 104 132 98 104 
+-137 83 86 117 104 110 77 105 114 42 59 64 50 67 72 78 102 129 91 117 157 91 117 157 
+-95 131 149 83 116 129 40 48 73 6 6 6 22 22 22 62 62 62 62 62 62 2 2 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 2 2 6 26 26 26 54 54 54 38 38 38 18 18 18 10 10 10 
+-2 2 6 2 2 6 34 34 34 82 82 82 38 38 38 14 14 14 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-1 1 1 1 2 2 2 3 3 28 12 12 123 55 55 174 79 79 174 79 79 174 79 79 
+-152 81 83 68 59 64 26 35 39 27 40 45 79 78 84 137 83 86 165 78 79 137 83 86 
+-94 94 94 48 63 69 36 50 56 50 67 72 73 97 106 93 121 133 93 124 152 93 124 152 
+-95 131 149 91 118 149 78 102 129 27 40 45 30 30 30 78 78 78 30 30 30 2 2 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 2 2 6 10 10 10 10 10 10 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 2 2 6 78 78 78 50 50 50 18 18 18 6 6 6 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-4 5 3 24 53 24 19 31 15 8 7 3 90 61 47 165 78 79 174 79 79 174 79 79 
+-174 79 79 137 83 86 60 52 57 7 12 13 17 23 26 70 70 70 132 98 104 112 81 86 
+-79 78 84 31 45 49 15 22 25 53 75 83 91 118 149 86 106 160 91 117 157 93 124 152 
+-91 117 157 93 124 152 95 131 149 53 75 83 50 50 50 86 86 86 14 14 14 2 2 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 2 2 6 54 54 54 66 66 66 26 26 26 6 6 6 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-19 31 15 34 76 34 34 76 34 19 31 15 28 12 12 123 55 55 174 79 79 174 79 79 
+-174 79 79 165 78 79 112 81 86 32 40 45 15 22 25 38 53 58 65 78 84 29 31 32 
+-21 30 33 42 59 64 60 80 103 78 102 129 87 112 149 84 96 162 91 117 157 93 124 152 
+-91 117 157 93 124 152 93 121 133 59 85 92 57 68 71 82 85 86 2 2 6 2 2 6 
+-2 2 6 6 6 6 10 10 10 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 2 2 6 6 6 6 14 14 14 10 10 10 2 2 6 2 2 6 
+-2 2 6 2 2 6 2 2 6 18 18 18 82 82 82 34 34 34 10 10 10 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-34 76 34 40 89 40 40 89 40 34 76 34 8 15 6 48 26 18 123 55 55 174 79 79 
+-174 79 79 174 79 79 137 83 86 68 59 64 32 40 45 21 30 33 31 45 49 21 31 35 
+-12 17 20 48 63 69 78 102 129 81 88 166 84 96 162 91 117 157 93 124 152 91 117 157 
+-93 124 152 95 131 149 83 116 129 59 85 92 57 68 71 86 86 86 2 2 6 2 2 6 
+-6 6 6 6 6 6 22 22 22 34 34 34 6 6 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 18 18 18 34 34 34 10 10 10 50 50 50 22 22 22 2 2 6 
+-2 2 6 2 2 6 2 2 6 10 10 10 86 86 86 42 42 42 14 14 14 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-40 89 40 40 89 40 40 89 40 40 89 40 24 53 24 6 6 6 69 31 31 123 55 55 
+-123 55 55 90 61 47 69 31 31 36 32 33 21 31 35 7 12 13 18 25 28 48 63 69 
+-60 80 103 68 78 128 84 101 153 84 96 162 84 96 162 91 117 157 91 117 157 84 96 162 
+-91 117 157 73 97 106 48 63 69 50 67 72 57 59 63 86 86 86 2 2 6 2 2 6 
+-38 38 38 116 116 116 94 94 94 22 22 22 22 22 22 2 2 6 2 2 6 2 2 6 
+-14 14 14 86 86 86 124 131 137 170 170 170 151 151 151 38 38 38 26 26 26 6 6 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 86 86 86 46 46 46 14 14 14 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-34 76 34 40 89 40 40 89 40 40 89 40 34 76 34 19 31 15 17 12 12 48 26 18 
+-48 26 18 8 7 3 10 10 22 23 29 47 51 61 92 42 59 64 21 30 33 34 45 54 
+-68 78 128 81 88 166 81 82 173 86 106 160 86 106 160 84 96 162 86 106 160 87 112 149 
+-91 118 149 77 105 114 52 67 79 32 40 45 50 50 50 86 86 86 2 2 6 14 14 14 
+-124 131 137 198 198 198 195 195 195 116 116 116 10 10 10 2 2 6 2 2 6 6 6 6 
+-101 98 89 187 187 187 210 210 210 218 218 218 214 214 214 124 131 137 14 14 14 6 6 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 86 86 86 50 50 50 18 18 18 6 6 6 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-19 31 15 34 76 34 40 89 40 40 89 40 40 89 40 24 53 24 8 7 3 0 0 0 
+-6 8 12 28 32 52 51 61 92 54 54 122 74 77 160 68 78 128 26 35 39 6 8 8 
+-34 45 54 68 78 128 84 96 162 86 106 160 86 106 160 81 88 166 84 96 162 87 112 149 
+-73 97 106 36 50 56 33 49 54 18 18 18 46 46 46 86 86 86 2 2 6 54 54 54 
+-218 218 218 195 195 195 226 226 226 246 246 246 58 58 58 2 2 6 2 2 6 30 30 30 
+-210 210 210 253 253 253 170 170 170 124 127 131 221 221 221 234 234 234 74 74 74 2 2 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 70 70 70 58 58 58 22 22 22 6 6 6 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-4 5 3 24 53 24 40 89 40 40 89 40 34 76 34 12 22 15 4 5 3 4 5 3 
+-13 17 26 54 54 122 78 78 174 78 78 174 78 78 174 74 77 160 51 61 92 21 31 35 
+-26 35 39 53 75 83 84 101 153 81 82 173 81 88 166 84 101 153 60 80 103 60 80 103 
+-53 75 83 38 53 58 42 59 64 22 22 22 46 46 46 82 82 82 2 2 6 106 106 106 
+-170 170 170 26 26 26 86 86 86 226 226 226 124 127 131 10 10 10 14 14 14 46 46 46 
+-231 231 231 190 190 190 6 6 6 70 70 70 90 90 90 238 238 238 151 151 151 2 2 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 70 70 70 58 58 58 22 22 22 6 6 6 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-1 2 2 8 15 6 24 53 24 34 76 34 19 31 15 8 15 6 63 55 20 63 55 20 
+-18 18 18 40 48 73 74 77 160 78 78 174 78 78 174 81 82 173 74 77 160 52 67 79 
+-17 23 26 21 31 35 60 80 103 81 88 166 74 77 160 78 102 129 36 54 60 12 17 20 
+-42 59 64 48 63 69 21 31 35 18 18 18 42 42 42 86 86 86 6 6 6 116 116 116 
+-106 106 106 6 6 6 70 70 70 151 151 151 124 127 131 18 18 18 38 38 38 54 54 54 
+-221 221 221 106 106 106 2 2 6 14 14 14 46 46 46 190 190 190 198 198 198 2 2 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 74 74 74 62 62 62 22 22 22 6 6 6 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-11 15 17 0 0 0 12 22 15 19 31 15 8 15 6 63 55 20 149 139 69 149 139 69 
+-63 55 20 10 10 22 54 54 122 78 78 174 78 78 174 78 78 174 81 82 173 68 78 128 
+-24 31 37 6 6 6 36 50 56 60 80 103 51 61 92 42 59 64 36 50 56 31 45 49 
+-29 43 47 27 40 45 6 8 8 14 14 14 42 42 42 94 94 94 14 14 14 101 101 101 
+-124 127 131 2 2 6 18 18 18 116 116 116 106 107 48 121 92 8 121 92 8 98 70 6 
+-170 170 170 106 106 106 2 2 6 2 2 6 2 2 6 195 195 195 195 195 195 6 6 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 74 74 74 62 62 62 22 22 22 6 6 6 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-26 35 39 3 5 6 1 1 1 2 3 3 35 31 12 133 118 54 175 176 80 175 176 80 
+-133 118 54 35 31 12 23 29 47 54 54 122 78 78 174 78 78 174 74 77 160 68 78 128 
+-51 61 92 31 45 49 26 35 39 36 50 56 29 43 47 7 12 13 21 30 33 42 59 64 
+-18 25 28 7 12 13 1 1 1 10 10 10 38 38 38 90 90 90 14 14 14 58 58 58 
+-210 210 210 26 26 26 62 42 6 154 114 10 226 170 11 237 188 10 220 174 15 184 138 11 
+-220 174 15 174 140 55 35 31 12 2 2 6 70 70 70 246 246 246 124 131 137 2 2 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 70 70 70 66 66 66 26 26 26 6 6 6 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-27 40 45 17 23 26 2 3 3 1 1 1 56 77 35 165 152 80 175 176 80 175 176 80 
+-175 176 80 106 107 48 22 22 22 28 32 52 54 54 122 54 54 122 51 61 92 28 32 52 
+-20 27 34 31 45 49 11 15 17 7 12 13 36 50 56 31 45 49 29 43 47 36 50 56 
+-6 8 8 0 0 0 0 0 0 10 10 10 38 38 38 86 86 86 14 14 14 10 10 10 
+-195 195 195 198 179 130 192 133 9 220 174 15 239 182 13 237 188 10 232 195 16 239 207 25 
+-237 201 50 241 208 19 232 195 16 184 138 11 198 179 130 208 206 196 42 42 42 2 2 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 50 50 50 74 74 74 30 30 30 6 6 6 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-15 22 25 26 35 39 15 22 25 0 0 0 35 31 12 133 118 54 175 176 80 175 176 80 
+-175 176 80 165 152 80 56 77 35 6 8 12 23 29 47 13 17 26 2 2 6 0 0 0 
+-1 2 2 26 35 39 26 35 39 26 35 39 42 59 64 42 59 64 20 29 31 6 8 8 
+-0 0 0 0 0 0 0 0 0 10 10 10 34 34 34 86 86 86 14 14 14 2 2 6 
+-121 92 8 192 133 9 219 162 10 239 182 13 237 188 10 232 195 16 241 208 19 237 201 50 
+-237 201 50 239 207 25 241 208 19 241 208 19 241 208 19 230 187 11 121 92 8 2 2 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 50 50 50 82 82 82 34 34 34 10 10 10 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-1 2 2 15 22 25 31 45 49 6 8 12 4 5 3 63 55 20 149 139 69 175 176 80 
+-175 176 80 175 176 80 106 107 48 20 16 6 1 1 1 0 0 0 2 3 3 11 15 17 
+-21 30 33 36 50 56 36 50 56 24 31 37 15 22 25 6 8 8 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 10 10 10 34 34 34 82 82 82 30 30 30 62 42 6 
+-180 123 7 206 145 10 230 174 11 239 182 13 237 188 10 238 202 15 241 208 19 237 201 50 
+-239 207 25 241 208 19 241 208 19 241 208 19 230 187 11 220 174 15 184 138 11 6 6 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 26 26 26 94 94 94 42 42 42 14 14 14 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 1 2 2 29 43 47 26 35 39 3 5 6 8 7 3 106 107 48 165 152 80 
+-175 176 80 149 139 69 63 55 20 4 5 3 2 3 3 12 17 20 26 35 39 26 35 39 
+-17 23 26 7 12 13 6 8 8 3 5 6 1 2 2 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 10 10 10 30 30 30 78 78 78 50 50 50 104 69 6 
+-192 133 9 216 158 10 236 178 12 237 188 10 232 195 16 241 208 19 237 201 50 237 201 50 
+-241 208 19 241 208 19 241 208 19 204 160 10 200 144 11 216 158 10 156 118 10 2 2 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 6 6 6 90 90 90 54 54 54 18 18 18 
+-6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 12 17 20 27 40 45 18 25 28 1 1 1 35 31 12 106 107 48 
+-149 139 69 56 77 35 8 7 3 1 2 2 12 17 20 26 35 39 21 31 35 11 15 17 
+-3 5 6 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 10 10 10 30 30 30 78 78 78 46 46 46 22 22 22 
+-137 92 6 204 160 10 239 182 13 237 188 10 238 202 15 241 208 19 241 208 19 241 208 19 
+-241 208 19 204 160 10 184 138 11 210 150 10 216 158 10 210 150 10 98 70 6 2 2 6 
+-6 6 6 54 54 54 14 14 14 2 2 6 2 2 6 62 62 62 74 74 74 30 30 30 
+-10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 1 1 1 15 22 25 33 49 54 12 17 20 2 3 3 35 31 12 
+-56 77 35 20 16 6 1 1 1 18 25 28 21 31 35 11 15 17 1 1 1 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 10 10 10 34 34 34 78 78 78 50 50 50 6 6 6 
+-88 55 22 139 102 15 190 146 13 230 187 11 239 207 25 232 195 16 220 174 15 190 146 13 
+-171 120 8 192 133 9 210 150 10 213 154 11 185 146 40 165 152 80 101 98 89 2 2 6 
+-2 2 6 78 78 78 116 116 116 58 58 58 2 2 6 22 22 22 90 90 90 46 46 46 
+-18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 1 1 1 27 40 45 29 43 47 3 5 6 2 3 3 
+-8 7 3 1 1 1 17 23 26 31 45 49 15 22 25 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 10 10 10 38 38 38 86 86 86 50 50 50 6 6 6 
+-124 127 131 168 158 138 156 107 11 171 120 8 204 160 10 184 138 11 197 138 11 200 144 11 
+-206 145 10 206 145 10 197 138 11 198 179 130 195 195 195 198 198 198 170 170 170 14 14 14 
+-2 2 6 22 22 22 116 116 116 116 116 116 22 22 22 2 2 6 74 74 74 70 70 70 
+-30 30 30 10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 11 15 17 31 45 49 26 35 39 3 5 6 
+-0 0 0 7 12 13 27 40 45 18 25 28 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 6 6 6 18 18 18 50 50 50 101 101 101 26 26 26 10 10 10 
+-124 131 137 190 190 190 168 158 138 156 107 11 197 138 11 200 144 11 197 138 11 192 133 9 
+-180 123 7 185 146 40 198 179 130 187 187 187 202 202 202 221 221 221 214 214 214 66 66 66 
+-2 2 6 2 2 6 50 50 50 62 62 62 6 6 6 2 2 6 10 10 10 90 90 90 
+-50 50 50 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 15 22 25 36 54 60 18 25 28 
+-0 0 0 21 30 33 27 40 45 2 3 3 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 10 10 10 34 34 34 74 74 74 74 74 74 2 2 6 6 6 6 
+-151 151 151 198 198 198 190 190 190 168 158 138 148 132 55 156 107 11 156 107 11 169 125 40 
+-168 158 138 187 187 187 190 190 190 210 210 210 246 246 246 253 253 253 253 253 253 180 180 180 
+-6 6 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 62 62 62 
+-74 74 74 34 34 34 14 14 14 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 27 40 45 35 52 58 
+-18 25 28 35 52 58 17 23 26 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 10 10 10 22 22 22 54 54 54 94 94 94 18 18 18 2 2 6 46 46 46 
+-234 234 234 221 221 221 190 190 190 190 190 190 190 190 190 187 187 187 187 187 187 190 190 190 
+-190 190 190 195 195 195 214 214 214 242 242 242 253 253 253 253 253 253 253 253 253 253 253 253 
+-82 82 82 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 14 14 14 
+-86 86 86 54 54 54 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 12 13 33 49 54 
+-52 72 81 36 54 60 6 8 8 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-6 6 6 18 18 18 46 46 46 90 90 90 46 46 46 18 18 18 6 6 6 180 180 180 
+-253 253 253 246 246 246 202 202 202 190 190 190 190 190 190 190 190 190 190 190 190 190 190 190 
+-202 202 202 231 231 231 250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-202 202 202 14 14 14 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-42 42 42 86 86 86 42 42 42 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 12 17 20 
+-36 54 60 29 43 47 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 
+-14 14 14 38 38 38 74 74 74 66 66 66 2 2 6 6 6 6 90 90 90 250 250 250 
+-253 253 253 253 253 253 238 238 238 198 198 198 190 190 190 190 190 190 195 195 195 221 221 221 
+-246 246 246 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 82 82 82 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 78 78 78 70 70 70 34 34 34 14 14 14 6 6 6 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-21 30 33 35 52 58 6 8 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 14 14 14 
+-34 34 34 66 66 66 78 78 78 6 6 6 2 2 6 18 18 18 218 218 218 253 253 253 
+-253 253 253 253 253 253 253 253 253 246 246 246 226 226 226 231 231 231 246 246 246 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 180 180 180 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 18 18 18 90 90 90 62 62 62 30 30 30 10 10 10 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-12 17 20 36 54 60 29 43 47 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 26 26 26 
+-58 58 58 90 90 90 18 18 18 2 2 6 2 2 6 106 106 106 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 250 250 250 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 231 231 231 18 18 18 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 18 18 18 94 94 94 54 54 54 26 26 26 10 10 10 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 21 30 33 35 52 58 6 8 12 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 22 22 22 50 50 50 
+-90 90 90 26 26 26 2 2 6 2 2 6 14 14 14 195 195 195 250 250 250 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-250 250 250 242 242 242 54 54 54 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 2 2 6 38 38 38 86 86 86 50 50 50 22 22 22 6 6 6 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 12 17 20 36 54 60 29 43 47 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 14 14 14 38 38 38 82 82 82 
+-34 34 34 2 2 6 2 2 6 2 2 6 42 42 42 195 195 195 246 246 246 253 253 253 
+-253 253 253 253 253 253 253 253 253 250 250 250 242 242 242 242 242 242 250 250 250 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 250 250 250 246 246 246 238 238 238 
+-226 226 226 231 231 231 101 101 101 6 6 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 38 38 38 82 82 82 42 42 42 14 14 14 
+-6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 21 30 33 35 52 58 6 8 12 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 26 26 26 62 62 62 66 66 66 
+-2 2 6 2 2 6 2 2 6 6 6 6 70 70 70 170 170 170 202 202 202 234 234 234 
+-246 246 246 250 250 250 250 250 250 238 238 238 226 226 226 231 231 231 238 238 238 250 250 250 
+-250 250 250 250 250 250 246 246 246 231 231 231 214 214 214 202 202 202 202 202 202 202 202 202 
+-198 198 198 202 202 202 180 180 180 18 18 18 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 62 62 62 66 66 66 30 30 30 
+-10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 12 17 20 36 54 60 29 43 47 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 14 14 14 42 42 42 82 82 82 18 18 18 
+-2 2 6 2 2 6 2 2 6 10 10 10 94 94 94 180 180 180 218 218 218 242 242 242 
+-250 250 250 253 253 253 253 253 253 250 250 250 234 234 234 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 246 246 246 238 238 238 226 226 226 210 210 210 202 202 202 
+-195 195 195 195 195 195 210 210 210 151 151 151 6 6 6 14 14 14 50 50 50 14 14 14 
+-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 6 6 6 86 86 86 46 46 46 
+-18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 21 30 33 35 52 58 6 8 12 0 0 0 
+-0 0 0 0 0 0 0 0 0 6 6 6 22 22 22 54 54 54 70 70 70 2 2 6 
+-2 2 6 10 10 10 2 2 6 22 22 22 170 170 170 231 231 231 250 250 250 253 253 253 
+-253 253 253 253 253 253 253 253 253 250 250 250 242 242 242 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 246 246 246 
+-231 231 231 202 202 202 198 198 198 226 226 226 94 94 94 2 2 6 6 6 6 38 38 38 
+-30 30 30 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 62 62 62 66 66 66 
+-26 26 26 10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 6 8 8 33 49 54 29 43 47 6 8 12 
+-0 0 0 0 0 0 0 0 0 10 10 10 30 30 30 74 74 74 50 50 50 2 2 6 
+-26 26 26 26 26 26 2 2 6 106 106 106 238 238 238 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 246 246 246 218 218 218 202 202 202 210 210 210 14 14 14 2 2 6 2 2 6 
+-30 30 30 22 22 22 2 2 6 2 2 6 2 2 6 2 2 6 18 18 18 86 86 86 
+-42 42 42 14 14 14 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 12 17 20 33 49 54 17 23 26 
+-0 0 0 0 0 0 0 0 0 14 14 14 42 42 42 90 90 90 22 22 22 2 2 6 
+-42 42 42 2 2 6 18 18 18 218 218 218 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 250 250 250 221 221 221 218 218 218 101 101 101 2 2 6 14 14 14 
+-18 18 18 38 38 38 10 10 10 2 2 6 2 2 6 2 2 6 2 2 6 78 78 78 
+-58 58 58 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 15 22 25 36 54 60 
+-0 0 0 0 0 0 0 0 0 18 18 18 54 54 54 82 82 82 2 2 6 26 26 26 
+-22 22 22 2 2 6 124 127 131 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 250 250 250 238 238 238 198 198 198 6 6 6 38 38 38 
+-58 58 58 26 26 26 38 38 38 2 2 6 2 2 6 2 2 6 2 2 6 46 46 46 
+-78 78 78 30 30 30 10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 21 30 33 
+-36 54 60 0 0 0 0 0 0 30 30 30 74 74 74 58 58 58 2 2 6 42 42 42 
+-2 2 6 22 22 22 231 231 231 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 246 246 246 46 46 46 38 38 38 
+-42 42 42 14 14 14 38 38 38 14 14 14 2 2 6 2 2 6 2 2 6 6 6 6 
+-86 86 86 46 46 46 14 14 14 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-36 54 60 0 0 0 0 0 0 42 42 42 90 90 90 18 18 18 18 18 18 26 26 26 
+-2 2 6 116 116 116 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 250 250 250 238 238 238 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 94 94 94 6 6 6 
+-2 2 6 2 2 6 10 10 10 34 34 34 2 2 6 2 2 6 2 2 6 2 2 6 
+-74 74 74 58 58 58 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 36 54 60 26 26 26 66 66 66 82 82 82 2 2 6 38 38 38 6 6 6 
+-14 14 14 210 210 210 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 246 246 246 242 242 242 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 151 151 151 2 2 6 
+-2 2 6 2 2 6 2 2 6 46 46 46 2 2 6 2 2 6 2 2 6 2 2 6 
+-42 42 42 74 74 74 30 30 30 10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-6 6 6 36 54 60 21 30 33 90 90 90 26 26 26 6 6 6 42 42 42 2 2 6 
+-74 74 74 250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 242 242 242 242 242 242 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 180 180 180 2 2 6 
+-2 2 6 2 2 6 2 2 6 46 46 46 2 2 6 2 2 6 2 2 6 2 2 6 
+-10 10 10 86 86 86 38 38 38 10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-10 10 10 26 26 26 36 54 60 82 82 82 2 2 6 22 22 22 18 18 18 2 2 6 
+-151 151 151 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 234 234 234 242 242 242 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 202 202 202 2 2 6 
+-2 2 6 2 2 6 2 2 6 38 38 38 2 2 6 2 2 6 2 2 6 2 2 6 
+-6 6 6 86 86 86 46 46 46 14 14 14 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 
+-18 18 18 46 46 46 86 86 86 36 54 60 2 2 6 34 34 34 10 10 10 6 6 6 
+-210 210 210 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 234 234 234 242 242 242 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 221 221 221 6 6 6 
+-2 2 6 2 2 6 6 6 6 30 30 30 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 82 82 82 54 54 54 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 
+-26 26 26 66 66 66 62 62 62 2 2 6 2 2 6 38 38 38 10 10 10 26 26 26 
+-238 238 238 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 231 231 231 238 238 238 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 231 231 231 6 6 6 
+-2 2 6 2 2 6 10 10 10 30 30 30 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 66 66 66 58 58 58 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 
+-38 38 38 78 78 78 6 6 6 2 2 6 2 2 6 46 46 46 14 14 14 42 42 42 
+-246 246 246 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 231 231 231 242 242 242 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 234 234 234 10 10 10 
+-2 2 6 2 2 6 22 22 22 14 14 14 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 66 66 66 62 62 62 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 18 18 18 
+-50 50 50 74 74 74 2 2 6 2 2 6 14 14 14 70 70 70 34 34 34 62 62 62 
+-250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 231 231 231 246 246 246 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 234 234 234 14 14 14 
+-2 2 6 2 2 6 30 30 30 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 66 66 66 62 62 62 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 18 18 18 
+-54 54 54 62 62 62 2 2 6 2 2 6 2 2 6 30 30 30 46 46 46 70 70 70 
+-250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 231 231 231 246 246 246 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 226 226 226 10 10 10 
+-2 2 6 6 6 6 30 30 30 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 66 66 66 58 58 58 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 22 22 22 
+-58 58 58 62 62 62 2 2 6 2 2 6 2 2 6 2 2 6 30 30 30 78 78 78 
+-250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 231 231 231 246 246 246 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 202 202 202 2 2 6 
+-22 22 22 34 34 34 20 16 6 22 22 22 26 26 26 18 18 18 6 6 6 2 2 6 
+-2 2 6 82 82 82 54 54 54 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 26 26 26 
+-62 62 62 106 106 106 63 55 20 184 138 11 204 160 10 121 92 8 6 6 6 62 62 62 
+-238 238 238 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 231 231 231 246 246 246 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 151 151 151 18 18 18 
+-14 14 14 2 2 6 2 2 6 2 2 6 6 6 6 18 18 18 66 66 66 38 38 38 
+-6 6 6 94 94 94 50 50 50 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 6 6 6 10 10 10 10 10 10 18 18 18 38 38 38 
+-78 78 78 138 132 106 216 158 10 242 186 14 246 190 14 246 190 14 156 118 10 10 10 10 
+-90 90 90 238 238 238 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 231 231 231 250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 246 230 190 214 187 87 214 187 87 185 146 40 35 31 12 
+-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 38 38 38 46 46 46 
+-26 26 26 106 106 106 54 54 54 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 6 6 6 14 14 14 22 22 22 30 30 30 38 38 38 50 50 50 70 70 70 
+-106 106 106 185 146 40 226 170 11 242 186 14 246 190 14 246 190 14 246 190 14 154 114 10 
+-6 6 6 74 74 74 226 226 226 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 231 231 231 250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 237 201 50 241 196 14 241 208 19 232 195 16 35 31 12 
+-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 6 6 6 30 30 30 26 26 26 
+-204 160 10 165 152 80 66 66 66 26 26 26 6 6 6 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-6 6 6 18 18 18 38 38 38 58 58 58 78 78 78 86 86 86 101 101 101 124 127 131 
+-174 140 55 210 150 10 234 174 13 246 186 14 246 190 14 246 190 14 246 190 14 237 188 10 
+-98 70 6 2 2 6 46 46 46 198 198 198 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 234 234 234 242 242 242 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 214 187 87 242 186 14 241 196 14 204 160 10 20 16 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 6 6 6 121 92 8 
+-238 202 15 232 195 16 82 82 82 34 34 34 10 10 10 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-14 14 14 38 38 38 70 70 70 148 132 55 185 146 40 200 144 11 197 138 11 197 138 11 
+-213 154 11 226 170 11 242 186 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-220 174 15 35 31 12 2 2 6 22 22 22 151 151 151 250 250 250 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 250 250 250 242 242 242 214 187 87 239 182 13 237 188 10 213 154 11 35 31 12 
+-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 62 42 6 220 174 15 
+-237 188 10 237 188 10 113 101 86 42 42 42 14 14 14 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 
+-22 22 22 54 54 54 148 132 55 213 154 11 226 170 11 230 174 11 226 170 11 226 170 11 
+-236 178 12 242 186 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-241 196 14 184 138 11 10 10 10 2 2 6 6 6 6 116 116 116 242 242 242 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 231 231 231 198 198 198 213 164 39 236 178 12 236 178 12 210 150 10 137 92 6 
+-20 16 6 2 2 6 2 2 6 2 2 6 6 6 6 62 42 6 200 144 11 236 178 12 
+-239 182 13 239 182 13 124 112 88 58 58 58 22 22 22 6 6 6 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 
+-30 30 30 70 70 70 169 125 40 226 170 11 239 182 13 242 186 14 242 186 14 246 186 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-246 190 14 232 195 16 98 70 6 2 2 6 2 2 6 2 2 6 66 66 66 221 221 221 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 202 202 202 198 198 198 213 164 39 230 174 11 230 174 11 216 158 10 192 133 9 
+-163 110 8 120 80 7 98 70 6 120 80 7 167 114 7 197 138 11 226 170 11 239 182 13 
+-242 186 14 242 186 14 165 152 80 78 78 78 34 34 34 14 14 14 6 6 6 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 
+-30 30 30 78 78 78 185 146 40 226 170 11 239 182 13 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-246 190 14 241 196 14 204 160 10 20 16 6 2 2 6 2 2 6 2 2 6 38 38 38 
+-218 218 218 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-250 250 250 202 202 202 198 198 198 213 164 39 226 170 11 236 178 12 224 166 10 210 150 10 
+-200 144 11 197 138 11 192 133 9 197 138 11 210 150 10 226 170 11 242 186 14 246 190 14 
+-246 190 14 246 186 14 220 174 15 124 112 88 62 62 62 30 30 30 14 14 14 6 6 6 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 
+-30 30 30 78 78 78 174 140 55 224 166 10 239 182 13 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 241 196 14 139 102 15 2 2 6 2 2 6 2 2 6 2 2 6 
+-78 78 78 250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-250 250 250 214 214 214 198 198 198 185 146 40 219 162 10 236 178 12 234 174 13 224 166 10 
+-216 158 10 213 154 11 213 154 11 216 158 10 226 170 11 239 182 13 246 190 14 246 190 14 
+-246 190 14 246 190 14 242 186 14 213 164 39 101 101 101 58 58 58 30 30 30 14 14 14 
+-6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 
+-30 30 30 74 74 74 174 140 55 216 158 10 236 178 12 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 241 196 14 230 187 11 62 42 6 2 2 6 2 2 6 2 2 6 
+-22 22 22 238 238 238 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 226 226 226 187 187 187 169 125 40 216 158 10 236 178 12 239 182 13 236 178 12 
+-230 174 11 226 170 11 226 170 11 230 174 11 236 178 12 242 186 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 186 14 239 182 13 213 164 39 106 106 106 66 66 66 34 34 34 
+-14 14 14 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 
+-26 26 26 70 70 70 149 139 69 213 154 11 236 178 12 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 241 196 14 190 146 13 20 16 6 2 2 6 2 2 6 
+-46 46 46 246 246 246 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 221 221 221 86 86 86 156 107 11 216 158 10 236 178 12 242 186 14 246 186 14 
+-242 186 14 239 182 13 239 182 13 242 186 14 242 186 14 246 186 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 242 186 14 220 174 15 149 139 69 66 66 66 
+-30 30 30 10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 
+-26 26 26 70 70 70 149 139 69 210 150 10 236 178 12 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 232 195 16 121 92 8 34 34 34 106 106 106 
+-221 221 221 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-242 242 242 82 82 82 20 16 6 163 110 8 216 158 10 236 178 12 242 186 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 242 186 14 149 139 69 
+-46 46 46 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 
+-30 30 30 78 78 78 149 139 69 210 150 10 236 178 12 246 186 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 241 196 14 220 174 15 198 179 130 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 218 218 218 
+-58 58 58 2 2 6 20 16 6 167 114 7 216 158 10 236 178 12 246 186 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 186 14 242 186 14 185 146 40 
+-54 54 54 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 14 14 14 
+-38 38 38 86 86 86 169 125 40 213 154 11 236 178 12 246 186 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 232 195 16 190 146 13 214 214 214 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 250 250 250 170 170 170 26 26 26 
+-2 2 6 2 2 6 35 31 12 163 110 8 219 162 10 239 182 13 246 186 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 186 14 236 178 12 224 166 10 149 139 69 
+-46 46 46 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 18 18 18 
+-50 50 50 113 101 86 192 133 9 224 166 10 242 186 14 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 242 186 14 230 187 11 204 160 10 133 118 54 
+-226 226 226 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 198 198 198 66 66 66 2 2 6 2 2 6 
+-2 2 6 2 2 6 62 42 6 156 107 11 219 162 10 239 182 13 246 186 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 242 186 14 234 174 13 213 154 11 148 132 55 66 66 66 
+-30 30 30 10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 22 22 22 
+-58 58 58 148 132 55 206 145 10 234 174 13 242 186 14 246 186 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 186 14 236 178 12 204 160 10 163 110 8 
+-62 42 6 124 131 137 218 218 218 250 250 250 253 253 253 253 253 253 253 253 253 250 250 250 
+-242 242 242 210 210 210 151 151 151 66 66 66 6 6 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 62 42 6 163 110 8 216 158 10 236 178 12 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-246 190 14 239 182 13 230 174 11 216 158 10 185 146 40 124 112 88 70 70 70 38 38 38 
+-18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 22 22 22 
+-62 62 62 169 125 40 206 145 10 224 166 10 236 178 12 239 182 13 242 186 14 242 186 14 
+-246 186 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 236 178 12 216 158 10 171 120 8 
+-85 57 6 2 2 6 6 6 6 30 30 30 54 54 54 62 62 62 50 50 50 38 38 38 
+-14 14 14 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 6 6 6 85 57 6 167 114 7 213 154 11 236 178 12 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 242 186 14 239 182 13 239 182 13 
+-230 174 11 210 150 10 174 140 55 124 112 88 82 82 82 54 54 54 34 34 34 18 18 18 
+-6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 18 18 18 
+-50 50 50 169 125 40 192 133 9 200 144 11 216 158 10 219 162 10 224 166 10 226 170 11 
+-230 174 11 236 178 12 239 182 13 239 182 13 242 186 14 246 186 14 246 190 14 246 190 14 
+-246 190 14 246 190 14 246 190 14 246 190 14 246 186 14 230 174 11 210 150 10 163 110 8 
+-104 69 6 10 10 10 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 6 6 6 85 57 6 167 114 7 206 145 10 230 174 11 242 186 14 246 190 14 
+-246 190 14 246 190 14 246 186 14 242 186 14 239 182 13 230 174 11 224 166 10 213 154 11 
+-169 125 40 124 112 88 86 86 86 58 58 58 38 38 38 22 22 22 10 10 10 6 6 6 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 14 14 14 
+-34 34 34 70 70 70 133 118 54 169 125 40 167 114 7 180 123 7 192 133 9 197 138 11 
+-200 144 11 206 145 10 213 154 11 219 162 10 224 166 10 230 174 11 239 182 13 242 186 14 
+-246 186 14 246 186 14 246 186 14 246 186 14 239 182 13 216 158 10 184 138 11 152 99 6 
+-104 69 6 20 16 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 6 6 6 85 57 6 152 99 6 192 133 9 219 162 10 236 178 12 239 182 13 
+-246 186 14 242 186 14 239 182 13 236 178 12 224 166 10 206 145 10 192 133 9 148 132 55 
+-94 94 94 62 62 62 42 42 42 22 22 22 14 14 14 6 6 6 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 
+-18 18 18 34 34 34 58 58 58 78 78 78 101 98 89 124 112 88 133 118 54 156 107 11 
+-163 110 8 167 114 7 171 120 8 180 123 7 184 138 11 197 138 11 210 150 10 219 162 10 
+-226 170 11 236 178 12 236 178 12 234 174 13 219 162 10 197 138 11 163 110 8 134 84 6 
+-85 57 6 10 10 10 2 2 6 2 2 6 18 18 18 38 38 38 38 38 38 38 38 38 
+-38 38 38 38 38 38 38 38 38 38 38 38 38 38 38 38 38 38 26 26 26 2 2 6 
+-2 2 6 6 6 6 62 42 6 137 92 6 171 120 8 200 144 11 219 162 10 230 174 11 
+-234 174 13 230 174 11 219 162 10 210 150 10 192 133 9 163 110 8 124 112 88 82 82 82 
+-50 50 50 30 30 30 14 14 14 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-6 6 6 14 14 14 22 22 22 34 34 34 42 42 42 58 58 58 74 74 74 86 86 86 
+-101 98 89 113 101 86 133 118 54 121 92 8 137 92 6 152 99 6 163 110 8 180 123 7 
+-184 138 11 197 138 11 206 145 10 200 144 11 180 123 7 156 107 11 134 84 6 104 69 6 
+-62 42 6 54 54 54 106 106 106 101 98 89 86 86 86 82 82 82 78 78 78 78 78 78 
+-78 78 78 78 78 78 78 78 78 78 78 78 78 78 78 82 82 82 86 86 86 94 94 94 
+-106 106 106 101 101 101 90 61 47 120 80 7 156 107 11 180 123 7 192 133 9 200 144 11 
+-206 145 10 200 144 11 192 133 9 171 120 8 139 102 15 113 101 86 70 70 70 42 42 42 
+-22 22 22 10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 6 6 6 10 10 10 14 14 14 22 22 22 30 30 30 38 38 38 
+-50 50 50 62 62 62 74 74 74 90 90 90 101 98 89 113 101 86 121 92 8 120 80 7 
+-137 92 6 152 99 6 152 99 6 152 99 6 134 84 6 120 80 7 98 70 6 88 55 22 
+-101 98 89 82 82 82 58 58 58 46 46 46 38 38 38 34 34 34 34 34 34 34 34 34 
+-34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 38 38 38 42 42 42 
+-54 54 54 82 82 82 94 86 71 85 57 6 134 84 6 156 107 11 167 114 7 171 120 8 
+-171 120 8 167 114 7 152 99 6 121 92 8 101 98 89 62 62 62 34 34 34 18 18 18 
+-6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 6 6 6 10 10 10 
+-18 18 18 22 22 22 30 30 30 42 42 42 50 50 50 66 66 66 86 86 86 101 98 89 
+-94 86 71 98 70 6 104 69 6 104 69 6 104 69 6 85 57 6 88 55 22 90 90 90 
+-62 62 62 38 38 38 22 22 22 14 14 14 10 10 10 10 10 10 10 10 10 10 10 10 
+-10 10 10 10 10 10 6 6 6 10 10 10 10 10 10 10 10 10 10 10 10 14 14 14 
+-22 22 22 42 42 42 70 70 70 94 86 71 85 57 6 104 69 6 120 80 7 137 92 6 
+-134 84 6 120 80 7 94 86 71 86 86 86 58 58 58 30 30 30 14 14 14 6 6 6 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 6 6 6 10 10 10 14 14 14 18 18 18 26 26 26 38 38 38 54 54 54 
+-70 70 70 86 86 86 94 86 71 94 86 71 94 86 71 86 86 86 74 74 74 50 50 50 
+-30 30 30 14 14 14 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-6 6 6 18 18 18 34 34 34 58 58 58 82 82 82 94 86 71 94 86 71 94 86 71 
+-94 86 71 94 86 71 74 74 74 50 50 50 26 26 26 14 14 14 6 6 6 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 6 6 6 14 14 14 18 18 18 
+-30 30 30 38 38 38 46 46 46 54 54 54 50 50 50 42 42 42 30 30 30 18 18 18 
+-10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 6 6 6 14 14 14 26 26 26 38 38 38 50 50 50 58 58 58 58 58 58 
+-54 54 54 42 42 42 30 30 30 18 18 18 10 10 10 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 
+-6 6 6 10 10 10 14 14 14 18 18 18 18 18 18 14 14 14 10 10 10 6 6 6 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 6 6 6 14 14 14 18 18 18 22 22 22 22 22 22 
+-18 18 18 14 14 14 10 10 10 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
 +0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
 +0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
 +0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
@@ -2464,10 +1743,11 @@ diff -Nur linux-2.6.39.1/drivers/video/logo/logo_linux_clut224.ppm linux-2.6.39-
 +0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
 +0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
 +0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-diff -Nur linux-2.6.39.1/drivers/video/logo/logo_linux_mono.pbm linux-2.6.39-LIBRE/drivers/video/logo/logo_linux_mono.pbm
---- linux-2.6.39.1/drivers/video/logo/logo_linux_mono.pbm	2011-06-02 21:34:20.000000000 -0300
-+++ linux-2.6.39-LIBRE/drivers/video/logo/logo_linux_mono.pbm	2011-06-22 13:42:06.000000000 -0300
+ 
+diff --git a/drivers/video/logo/logo_linux_mono.pbm b/drivers/video/logo/logo_linux_mono.pbm
+index 2f14d9f..3d3c358 100644
+--- a/drivers/video/logo/logo_linux_mono.pbm
++++ b/drivers/video/logo/logo_linux_mono.pbm
 @@ -1,203 +1,159 @@
 -P1
 -# Standard black and white Linux logo
@@ -2831,16 +2111,15 @@ diff -Nur linux-2.6.39.1/drivers/video/logo/logo_linux_mono.pbm linux-2.6.39-LIB
 +0 0 0 0 0 0 0 0 0 0 
 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
 +0 0 0 0 0 0 0 0 0 0 
-diff -Nur linux-2.6.39.1/drivers/video/logo/logo_linux_vga16.ppm linux-2.6.39-LIBRE/drivers/video/logo/logo_linux_vga16.ppm
---- linux-2.6.39.1/drivers/video/logo/logo_linux_vga16.ppm	2011-06-02 21:34:20.000000000 -0300
-+++ linux-2.6.39-LIBRE/drivers/video/logo/logo_linux_vga16.ppm	2011-06-22 13:42:06.000000000 -0300
+diff --git a/drivers/video/logo/logo_linux_vga16.ppm b/drivers/video/logo/logo_linux_vga16.ppm
+index 1850c15..f279f97 100644
+--- a/drivers/video/logo/logo_linux_vga16.ppm
++++ b/drivers/video/logo/logo_linux_vga16.ppm
 @@ -1,1604 +1,18724 @@
  P3
 -# Standard 16-color Linux logo
 -80 80
-+# CREATOR: GIMP PNM Filter Version 1.1
-+80 78
- 255
+-255
 -  0   0   0   0   0   0   0   0   0   0   0   0
 -  0   0   0   0   0   0   0   0   0   0   0   0
 -  0   0   0   0   0   0   0   0   0   0   0   0
@@ -4441,6 +3720,9 @@ diff -Nur linux-2.6.39.1/drivers/video/logo/logo_linux_vga16.ppm linux-2.6.39-LI
 -  0   0   0   0   0   0   0   0   0   0   0   0
 -  0   0   0   0   0   0   0   0   0   0   0   0
 -  0   0   0   0   0   0   0   0   0   0   0   0
++# CREATOR: GIMP PNM Filter Version 1.1
++80 78
++255
 +0
 +0
 +0
diff --git a/libre/linux-libre/change-default-console-loglevel.patch b/libre/linux-libre/change-default-console-loglevel.patch
index 2685d4d23..22cd69a09 100644
--- a/libre/linux-libre/change-default-console-loglevel.patch
+++ b/libre/linux-libre/change-default-console-loglevel.patch
@@ -1,6 +1,6 @@
 diff -upr linux-3.0.orig/kernel/printk.c linux-3.0/kernel/printk.c
---- linux-3.0.orig/kernel/printk.c	2011-07-22 05:17:23.000000000 +0300
-+++ linux-3.0/kernel/printk.c	2011-07-27 14:43:07.000000000 +0300
+--- linux-3.0.orig/kernel/printk/printk.c	2011-07-22 05:17:23.000000000 +0300
++++ linux-3.0/kernel/printk/printk.c	2011-07-27 14:43:07.000000000 +0300
 @@ -58,7 +58,7 @@ void asmlinkage __attribute__((weak)) ea
  
  /* We show everything that is MORE important than this.. */
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index be09f460c..a19c09d75 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.10.5-1 Kernel Configuration
+# Linux/x86 3.11.0-1 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -28,6 +28,8 @@ CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
 CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
+CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
 # CONFIG_ZONE_DMA32 is not set
 # CONFIG_AUDIT_ARCH is not set
 CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
@@ -47,6 +49,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
 #
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
+# CONFIG_COMPILE_TEST is not set
 CONFIG_LOCALVERSION="-LIBRE"
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_HAVE_KERNEL_GZIP=y
@@ -54,11 +57,13 @@ CONFIG_HAVE_KERNEL_BZIP2=y
 CONFIG_HAVE_KERNEL_LZMA=y
 CONFIG_HAVE_KERNEL_XZ=y
 CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_HAVE_KERNEL_LZ4=y
 CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_BZIP2 is not set
 # CONFIG_KERNEL_LZMA is not set
 # CONFIG_KERNEL_XZ is not set
 # CONFIG_KERNEL_LZO is not set
+# CONFIG_KERNEL_LZ4 is not set
 CONFIG_DEFAULT_HOSTNAME="(none)"
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
@@ -173,12 +178,12 @@ CONFIG_RD_BZIP2=y
 CONFIG_RD_LZMA=y
 CONFIG_RD_XZ=y
 CONFIG_RD_LZO=y
+CONFIG_RD_LZ4=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
 CONFIG_HAVE_UID16=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
-CONFIG_HOTPLUG=y
 CONFIG_HAVE_PCSPKR_PLATFORM=y
 # CONFIG_EXPERT is not set
 CONFIG_UID16=y
@@ -211,6 +216,7 @@ CONFIG_SLUB_DEBUG=y
 # CONFIG_COMPAT_BRK is not set
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
+CONFIG_SLUB_CPU_PARTIAL=y
 CONFIG_PROFILING=y
 CONFIG_TRACEPOINTS=y
 CONFIG_OPROFILE=m
@@ -254,6 +260,7 @@ CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 CONFIG_SECCOMP_FILTER=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+CONFIG_HAVE_ARCH_SOFT_DIRTY=y
 CONFIG_MODULES_USE_ELF_REL=y
 CONFIG_CLONE_BACKWARDS=y
 CONFIG_OLD_SIGSUSPEND3=y
@@ -287,6 +294,7 @@ CONFIG_BLK_DEV_THROTTLING=y
 #
 CONFIG_PARTITION_ADVANCED=y
 # CONFIG_ACORN_PARTITION is not set
+CONFIG_AIX_PARTITION=y
 # CONFIG_OSF_PARTITION is not set
 # CONFIG_AMIGA_PARTITION is not set
 # CONFIG_ATARI_PARTITION is not set
@@ -330,7 +338,6 @@ 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
@@ -456,6 +463,8 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
 CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CLEANCACHE=y
 CONFIG_FRONTSWAP=y
+CONFIG_ZBUD=y
+CONFIG_ZSWAP=y
 # CONFIG_HIGHPTE is not set
 CONFIG_X86_CHECK_BIOS_CORRUPTION=y
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
@@ -515,6 +524,7 @@ CONFIG_PM_ADVANCED_DEBUG=y
 CONFIG_PM_SLEEP_DEBUG=y
 CONFIG_PM_TRACE=y
 CONFIG_PM_TRACE_RTC=y
+CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
 CONFIG_ACPI=y
 CONFIG_ACPI_SLEEP=y
 # CONFIG_ACPI_PROCFS is not set
@@ -626,7 +636,7 @@ CONFIG_PCI_MMCONFIG=y
 CONFIG_PCI_OLPC=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=m
+CONFIG_HOTPLUG_PCI_PCIE=y
 CONFIG_PCIEAER=y
 # CONFIG_PCIE_ECRC is not set
 # CONFIG_PCIEAER_INJECT is not set
@@ -648,6 +658,10 @@ CONFIG_PCI_PRI=y
 CONFIG_PCI_PASID=y
 CONFIG_PCI_IOAPIC=y
 CONFIG_PCI_LABEL=y
+
+#
+# PCI host controller drivers
+#
 CONFIG_ISA_DMA_API=y
 CONFIG_ISA=y
 # CONFIG_EISA is not set
@@ -698,11 +712,14 @@ CONFIG_RAPIDIO_DISC_TIMEOUT=30
 CONFIG_RAPIDIO_DMA_ENGINE=y
 CONFIG_RAPIDIO_DEBUG=y
 CONFIG_RAPIDIO_ENUM_BASIC=m
+
+#
+# RapidIO Switch drivers
+#
 CONFIG_RAPIDIO_TSI57X=y
 CONFIG_RAPIDIO_CPS_XX=y
 CONFIG_RAPIDIO_TSI568=y
 CONFIG_RAPIDIO_CPS_GEN2=y
-CONFIG_RAPIDIO_TSI500=y
 
 #
 # Executable file formats / Emulations
@@ -1096,7 +1113,6 @@ CONFIG_IP_DCCP_TFRC_LIB=y
 CONFIG_NET_DCCPPROBE=m
 CONFIG_IP_SCTP=m
 CONFIG_NET_SCTPPROBE=m
-# CONFIG_SCTP_DBG_MSG is not set
 # CONFIG_SCTP_DBG_OBJCNT is not set
 # CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
 CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y
@@ -1214,15 +1230,19 @@ CONFIG_BATMAN_ADV_DAT=y
 CONFIG_BATMAN_ADV_NC=y
 # CONFIG_BATMAN_ADV_DEBUG is not set
 CONFIG_OPENVSWITCH=m
+CONFIG_OPENVSWITCH_GRE=y
 CONFIG_VSOCKETS=m
 CONFIG_VMWARE_VMCI_VSOCKETS=m
 CONFIG_NETLINK_MMAP=y
 CONFIG_NETLINK_DIAG=m
+CONFIG_NET_MPLS_GSO=m
 CONFIG_RPS=y
 CONFIG_RFS_ACCEL=y
 CONFIG_XPS=y
 CONFIG_NETPRIO_CGROUP=m
+CONFIG_NET_RX_BUSY_POLL=y
 CONFIG_BQL=y
+CONFIG_NET_FLOW_LIMIT=y
 
 #
 # Network testing
@@ -1395,6 +1415,7 @@ CONFIG_CEPH_LIB=m
 # CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
 CONFIG_NFC=m
 CONFIG_NFC_NCI=m
+# CONFIG_NFC_NCI_SPI is not set
 CONFIG_NFC_HCI=m
 # CONFIG_NFC_SHDLC is not set
 
@@ -1404,6 +1425,7 @@ CONFIG_NFC_HCI=m
 CONFIG_NFC_PN533=m
 CONFIG_NFC_WILINK=m
 CONFIG_NFC_MEI_PHY=m
+CONFIG_NFC_SIM=m
 CONFIG_NFC_PN544=m
 CONFIG_NFC_PN544_MEI=m
 CONFIG_NFC_MICROREAD=m
@@ -1424,7 +1446,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_FW_LOADER_USER_HELPER=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
@@ -1578,7 +1600,6 @@ CONFIG_PROC_DEVICETREE=y
 CONFIG_OF_PROMTREE=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_IRQ=y
-CONFIG_OF_DEVICE=y
 CONFIG_OF_I2C=m
 CONFIG_OF_NET=y
 CONFIG_OF_MDIO=m
@@ -1646,7 +1667,6 @@ CONFIG_AD525X_DPOT_I2C=m
 # CONFIG_DUMMY_IRQ is not set
 # CONFIG_IBM_ASM is not set
 CONFIG_PHANTOM=m
-CONFIG_INTEL_MID_PTI=m
 CONFIG_SGI_IOC4=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIFM_7XX1=m
@@ -1912,6 +1932,7 @@ CONFIG_SATA_HIGHBANK=m
 CONFIG_SATA_MV=m
 CONFIG_SATA_NV=m
 CONFIG_SATA_PROMISE=m
+CONFIG_SATA_RCAR=m
 CONFIG_SATA_SIL=m
 CONFIG_SATA_SIS=m
 CONFIG_SATA_SVW=m
@@ -2018,6 +2039,7 @@ CONFIG_DM_DELAY=m
 CONFIG_DM_UEVENT=y
 CONFIG_DM_FLAKEY=m
 CONFIG_DM_VERITY=m
+CONFIG_DM_SWITCH=m
 CONFIG_TARGET_CORE=m
 CONFIG_TCM_IBLOCK=m
 CONFIG_TCM_FILEIO=m
@@ -2054,12 +2076,12 @@ CONFIG_I2O_PROC=m
 CONFIG_MACINTOSH_DRIVERS=y
 CONFIG_MAC_EMUMOUSEBTN=y
 CONFIG_NETDEVICES=y
+CONFIG_MII=m
 CONFIG_NET_CORE=y
 CONFIG_BONDING=m
 CONFIG_DUMMY=m
 CONFIG_EQUALIZER=m
 # CONFIG_NET_FC is not set
-CONFIG_MII=m
 CONFIG_IFB=m
 CONFIG_NET_TEAM=m
 CONFIG_NET_TEAM_MODE_BROADCAST=m
@@ -2081,6 +2103,7 @@ CONFIG_RIONET_RX_SIZE=128
 CONFIG_TUN=m
 CONFIG_VETH=m
 CONFIG_VIRTIO_NET=m
+CONFIG_NLMON=m
 CONFIG_SUNGEM_PHY=m
 # CONFIG_ARCNET is not set
 CONFIG_ATM_DRIVERS=y
@@ -2125,6 +2148,7 @@ CONFIG_CAIF_VIRTIO=m
 CONFIG_VHOST_NET=m
 CONFIG_VHOST_SCSI=m
 CONFIG_VHOST_RING=m
+CONFIG_VHOST=m
 
 #
 # Distributed Switch Architecture drivers
@@ -2154,6 +2178,8 @@ CONFIG_LANCE=m
 CONFIG_PCNET32=m
 CONFIG_PCMCIA_NMCLAN=m
 CONFIG_NI65=m
+CONFIG_NET_VENDOR_ARC=y
+CONFIG_ARC_EMAC=m
 CONFIG_NET_VENDOR_ATHEROS=y
 CONFIG_ATL2=m
 CONFIG_ATL1=m
@@ -2242,6 +2268,7 @@ CONFIG_NET_VENDOR_MELLANOX=y
 CONFIG_MLX4_EN=m
 CONFIG_MLX4_CORE=m
 CONFIG_MLX4_DEBUG=y
+# CONFIG_MLX5_CORE is not set
 CONFIG_NET_VENDOR_MICREL=y
 CONFIG_KS8842=m
 # CONFIG_KS8851 is not set
@@ -2286,6 +2313,7 @@ CONFIG_8139TOO_TUNE_TWISTER=y
 CONFIG_8139TOO_8129=y
 # CONFIG_8139_OLD_RX_RESET is not set
 CONFIG_R8169=m
+CONFIG_SH_ETH=m
 CONFIG_NET_VENDOR_RDC=y
 CONFIG_R6040=m
 CONFIG_NET_VENDOR_SEEQ=y
@@ -2302,6 +2330,8 @@ CONFIG_NET_VENDOR_SMSC=y
 CONFIG_SMC9194=m
 CONFIG_PCMCIA_SMC91C92=m
 CONFIG_EPIC100=m
+CONFIG_SMSC911X=m
+# CONFIG_SMSC911X_ARCH_HOOKS is not set
 CONFIG_SMSC9420=m
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_STMMAC_ETH=m
@@ -2355,7 +2385,8 @@ CONFIG_NATIONAL_PHY=m
 CONFIG_STE10XP=m
 CONFIG_LSI_ET1011C_PHY=m
 CONFIG_MICREL_PHY=m
-# CONFIG_MDIO_BITBANG is not set
+CONFIG_MDIO_BITBANG=m
+# CONFIG_MDIO_GPIO is not set
 CONFIG_MDIO_BUS_MUX=m
 CONFIG_MDIO_BUS_MUX_GPIO=m
 CONFIG_MDIO_BUS_MUX_MMIOREG=m
@@ -2469,9 +2500,14 @@ CONFIG_ATH6KL_USB=m
 CONFIG_AR5523=m
 CONFIG_WIL6210=m
 CONFIG_WIL6210_ISR_COR=y
+# CONFIG_WIL6210_TRACING is not set
+CONFIG_ATH10K=m
+CONFIG_ATH10K_PCI=m
+# CONFIG_ATH10K_DEBUG is not set
+CONFIG_ATH10K_DEBUGFS=y
+# CONFIG_ATH10K_TRACING is not set
 CONFIG_B43=m
 CONFIG_B43_BCMA=y
-# CONFIG_B43_BCMA_EXTRA is not set
 CONFIG_B43_SSB=y
 CONFIG_B43_PCI_AUTOSELECT=y
 CONFIG_B43_PCICORE_AUTOSELECT=y
@@ -2578,14 +2614,17 @@ 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_RTL_CARDS=m
 CONFIG_RTL8192CE=m
 CONFIG_RTL8192SE=m
 CONFIG_RTL8192DE=m
 CONFIG_RTL8723AE=m
 CONFIG_RTL8188EE=m
 CONFIG_RTL8192CU=m
+CONFIG_RTLWIFI=m
+CONFIG_RTLWIFI_PCI=m
+CONFIG_RTLWIFI_USB=m
+# CONFIG_RTLWIFI_DEBUG is not set
 CONFIG_RTL8192C_COMMON=m
 CONFIG_WL_TI=y
 CONFIG_WL1251=m
@@ -2603,6 +2642,9 @@ CONFIG_MWIFIEX=m
 CONFIG_MWIFIEX_SDIO=m
 CONFIG_MWIFIEX_PCIE=m
 CONFIG_MWIFIEX_USB=m
+CONFIG_CW1200=m
+CONFIG_CW1200_WLAN_SDIO=m
+CONFIG_CW1200_WLAN_SPI=m
 
 #
 # WiMAX Wireless Broadband devices
@@ -2885,6 +2927,9 @@ CONFIG_TOUCHSCREEN_CY8CTMG110=m
 CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
 CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
 # CONFIG_TOUCHSCREEN_CYTTSP_SPI is not set
+CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m
+CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m
+CONFIG_TOUCHSCREEN_CYTTSP4_SPI=m
 CONFIG_TOUCHSCREEN_DYNAPRO=m
 CONFIG_TOUCHSCREEN_HAMPSHIRE=m
 CONFIG_TOUCHSCREEN_EETI=m
@@ -2964,7 +3009,7 @@ CONFIG_INPUT_RETU_PWRBUTTON=m
 CONFIG_INPUT_UINPUT=m
 CONFIG_INPUT_PCF50633_PMU=m
 CONFIG_INPUT_PCF8574=m
-CONFIG_INPUT_PWM_BEEPER=m
+# CONFIG_INPUT_PWM_BEEPER is not set
 CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
 CONFIG_INPUT_ADXL34X=m
 CONFIG_INPUT_ADXL34X_I2C=m
@@ -2988,6 +3033,7 @@ CONFIG_SERIO_ALTERA_PS2=m
 CONFIG_SERIO_PS2MULT=m
 CONFIG_SERIO_ARC_PS2=m
 CONFIG_SERIO_APBPS2=m
+CONFIG_SERIO_OLPC_APSP=m
 CONFIG_GAMEPORT=m
 CONFIG_GAMEPORT_NS558=m
 CONFIG_GAMEPORT_L4=m
@@ -3023,7 +3069,6 @@ CONFIG_N_GSM=m
 CONFIG_TRACE_ROUTER=m
 CONFIG_TRACE_SINK=m
 # CONFIG_DEVKMEM is not set
-# CONFIG_STALDRV is not set
 
 #
 # Serial drivers
@@ -3064,6 +3109,7 @@ CONFIG_SERIAL_ARC=m
 CONFIG_SERIAL_ARC_NR_PORTS=1
 CONFIG_SERIAL_RP2=m
 CONFIG_SERIAL_RP2_NR_UARTS=32
+CONFIG_SERIAL_FSL_LPUART=m
 CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
 CONFIG_PPDEV=m
@@ -3160,7 +3206,6 @@ CONFIG_I2C_DESIGNWARE_CORE=m
 CONFIG_I2C_DESIGNWARE_PCI=m
 CONFIG_I2C_EG20T=m
 # CONFIG_I2C_GPIO is not set
-CONFIG_I2C_INTEL_MID=m
 CONFIG_I2C_OCORES=m
 CONFIG_I2C_PCA_PLATFORM=m
 CONFIG_I2C_PXA=m
@@ -3214,11 +3259,6 @@ CONFIG_SPI_MASTER=y
 #
 # CONFIG_SPI_SPIDEV is not set
 # CONFIG_SPI_TLE62X0 is not set
-
-#
-# Qualcomm MSM SSBI bus support
-#
-# CONFIG_SSBI is not set
 # CONFIG_HSI is not set
 
 #
@@ -3372,6 +3412,7 @@ CONFIG_SENSORS_F71882FG=m
 CONFIG_SENSORS_F75375S=m
 CONFIG_SENSORS_FSCHMD=m
 CONFIG_SENSORS_G760A=m
+CONFIG_SENSORS_G762=m
 CONFIG_SENSORS_GL518SM=m
 CONFIG_SENSORS_GL520SM=m
 # CONFIG_SENSORS_GPIO_FAN is not set
@@ -3480,10 +3521,15 @@ CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 # CONFIG_THERMAL_DEFAULT_GOV_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_THERMAL_GOV_USER_SPACE=y
 # CONFIG_CPU_THERMAL is not set
 # CONFIG_THERMAL_EMULATION is not set
 CONFIG_INTEL_POWERCLAMP=m
+CONFIG_X86_PKG_TEMP_THERMAL=m
+
+#
+# Texas Instruments thermal drivers
+#
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -3531,6 +3577,7 @@ CONFIG_W83877F_WDT=m
 CONFIG_W83977F_WDT=m
 CONFIG_MACHZ_WDT=m
 CONFIG_SBC_EPX_C3_WATCHDOG=m
+CONFIG_MEN_A21_WDT=m
 
 #
 # ISA-based Watchdog Cards
@@ -3596,6 +3643,7 @@ CONFIG_HTC_PASIC3=m
 CONFIG_LPC_ICH=m
 CONFIG_LPC_SCH=m
 # CONFIG_MFD_JANZ_CMODIO is not set
+# CONFIG_MFD_KEMPLD is not set
 # CONFIG_EZX_PCAP is not set
 CONFIG_MFD_VIPERBOARD=m
 CONFIG_MFD_RETU=m
@@ -3628,6 +3676,7 @@ CONFIG_MFD_ARIZONA_I2C=m
 # CONFIG_MFD_ARIZONA_SPI is not set
 CONFIG_MFD_WM5102=y
 CONFIG_MFD_WM5110=y
+# CONFIG_MFD_WM8997 is not set
 # CONFIG_MFD_WM831X_SPI is not set
 # CONFIG_REGULATOR is not set
 CONFIG_MEDIA_SUPPORT=m
@@ -3757,6 +3806,7 @@ CONFIG_USB_ZR364XX=m
 CONFIG_USB_STKWEBCAM=m
 CONFIG_USB_S2255=m
 CONFIG_USB_SN9C102=m
+CONFIG_VIDEO_USBTV=m
 
 #
 # Analog TV USB devices
@@ -4360,7 +4410,7 @@ CONFIG_LCD_PLATFORM=m
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_GENERIC is not set
 CONFIG_BACKLIGHT_LM3533=m
-CONFIG_BACKLIGHT_PWM=m
+# CONFIG_BACKLIGHT_PWM is not set
 CONFIG_BACKLIGHT_APPLE=m
 # CONFIG_BACKLIGHT_SAHARA is not set
 # CONFIG_BACKLIGHT_ADP8860 is not set
@@ -4382,18 +4432,6 @@ CONFIG_DUMMY_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_FONTS=y
-# CONFIG_FONT_8x8 is not set
-CONFIG_FONT_8x16=y
-# CONFIG_FONT_6x11 is not set
-# CONFIG_FONT_7x14 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_ACORN_8x8 is not set
-# CONFIG_FONT_MINI_4x6 is not set
-# CONFIG_FONT_SUN8x16 is not set
-# CONFIG_FONT_SUN12x22 is not set
-# CONFIG_FONT_10x18 is not set
-CONFIG_FONT_AUTOSELECT=y
 # CONFIG_LOGO is not set
 CONFIG_FB_SSD1307=m
 CONFIG_SOUND=m
@@ -4415,6 +4453,7 @@ CONFIG_SND_SEQUENCER_OSS=y
 CONFIG_SND_HRTIMER=m
 CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
 CONFIG_SND_DYNAMIC_MINORS=y
+CONFIG_SND_MAX_CARDS=32
 CONFIG_SND_SUPPORT_OLD_API=y
 CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SND_VERBOSE_PRINTK is not set
@@ -4546,6 +4585,7 @@ CONFIG_SND_HDA_CODEC_ANALOG=y
 CONFIG_SND_HDA_CODEC_SIGMATEL=y
 CONFIG_SND_HDA_CODEC_VIA=y
 CONFIG_SND_HDA_CODEC_HDMI=y
+CONFIG_SND_HDA_I915=y
 CONFIG_SND_HDA_CODEC_CIRRUS=y
 CONFIG_SND_HDA_CODEC_CONEXANT=y
 CONFIG_SND_HDA_CODEC_CA0110=y
@@ -4590,6 +4630,7 @@ CONFIG_SND_USB_CAIAQ=m
 CONFIG_SND_USB_CAIAQ_INPUT=y
 CONFIG_SND_USB_US122L=m
 CONFIG_SND_USB_6FIRE=m
+CONFIG_SND_USB_HIFACE=m
 CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWIRE_LIB=m
 CONFIG_SND_FIREWIRE_SPEAKERS=m
@@ -4628,9 +4669,11 @@ CONFIG_HID_DRAGONRISE=m
 CONFIG_DRAGONRISE_FF=y
 CONFIG_HID_EMS_FF=m
 CONFIG_HID_ELECOM=m
+CONFIG_HID_ELO=m
 CONFIG_HID_EZKEY=m
 CONFIG_HID_HOLTEK=m
 CONFIG_HOLTEK_FF=y
+CONFIG_HID_HUION=m
 CONFIG_HID_KEYTOUCH=m
 CONFIG_HID_KYE=m
 CONFIG_HID_UCLOGIC=m
@@ -4663,7 +4706,6 @@ CONFIG_HID_PICOLCD_LCD=y
 CONFIG_HID_PICOLCD_LEDS=y
 CONFIG_HID_PICOLCD_CIR=y
 CONFIG_HID_PRIMAX=m
-CONFIG_HID_PS3REMOTE=m
 CONFIG_HID_ROCCAT=m
 CONFIG_HID_SAITEK=m
 CONFIG_HID_SAMSUNG=m
@@ -4683,7 +4725,6 @@ CONFIG_HID_THRUSTMASTER=m
 CONFIG_THRUSTMASTER_FF=y
 CONFIG_HID_WACOM=m
 CONFIG_HID_WIIMOTE=m
-CONFIG_HID_WIIMOTE_EXT=y
 CONFIG_HID_ZEROPLUS=m
 CONFIG_ZEROPLUS_FF=y
 CONFIG_HID_ZYDACRON=m
@@ -4700,9 +4741,6 @@ CONFIG_USB_HIDDEV=y
 # I2C HID support
 #
 CONFIG_I2C_HID=m
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_USB_ARCH_HAS_XHCI=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_COMMON=m
 CONFIG_USB_ARCH_HAS_HCD=y
@@ -4736,7 +4774,9 @@ CONFIG_USB_OXU210HP_HCD=m
 CONFIG_USB_ISP116X_HCD=m
 CONFIG_USB_ISP1760_HCD=m
 CONFIG_USB_ISP1362_HCD=m
+CONFIG_USB_FUSBH200_HCD=m
 CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_PCI=m
 # CONFIG_USB_OHCI_HCD_SSB is not set
 # CONFIG_USB_OHCI_HCD_PLATFORM is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
@@ -4754,6 +4794,9 @@ CONFIG_USB_HWA_HCD=m
 # CONFIG_USB_HCD_BCMA is not set
 # CONFIG_USB_HCD_SSB is not set
 CONFIG_USB_MUSB_HDRC=m
+# CONFIG_USB_MUSB_HOST is not set
+# CONFIG_USB_MUSB_GADGET is not set
+CONFIG_USB_MUSB_DUAL_ROLE=y
 CONFIG_USB_MUSB_TUSB6010=m
 CONFIG_USB_MUSB_DSPS=m
 CONFIG_USB_MUSB_UX500=m
@@ -4877,6 +4920,8 @@ CONFIG_USB_SERIAL_WISHBONE=m
 CONFIG_USB_SERIAL_ZTE=m
 CONFIG_USB_SERIAL_SSU100=m
 CONFIG_USB_SERIAL_QT2=m
+CONFIG_USB_SERIAL_FLASHLOADER=m
+CONFIG_USB_SERIAL_SUUNTO=m
 # CONFIG_USB_SERIAL_DEBUG is not set
 
 #
@@ -4931,12 +4976,12 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 # USB Peripheral Controller
 #
 CONFIG_USB_FUSB300=m
+CONFIG_USB_FOTG210_UDC=m
 CONFIG_USB_R8A66597=m
 CONFIG_USB_RENESAS_USBHS_UDC=m
 CONFIG_USB_PXA27X=m
 CONFIG_USB_MV_UDC=m
 CONFIG_USB_MV_U3D=m
-CONFIG_USB_GADGET_MUSB_HDRC=m
 CONFIG_USB_M66592=m
 CONFIG_USB_AMD5536UDC=m
 CONFIG_USB_NET2272=m
@@ -4948,8 +4993,15 @@ CONFIG_USB_DUMMY_HCD=m
 CONFIG_USB_LIBCOMPOSITE=m
 CONFIG_USB_F_ACM=m
 CONFIG_USB_U_SERIAL=m
+CONFIG_USB_U_ETHER=m
+CONFIG_USB_U_RNDIS=m
 CONFIG_USB_F_SERIAL=m
 CONFIG_USB_F_OBEX=m
+CONFIG_USB_F_NCM=m
+CONFIG_USB_F_ECM=m
+CONFIG_USB_F_SUBSET=m
+CONFIG_USB_F_RNDIS=m
+# CONFIG_USB_CONFIGFS is not set
 # CONFIG_USB_ZERO is not set
 CONFIG_USB_AUDIO=m
 # CONFIG_GADGET_UAC1 is not set
@@ -5127,6 +5179,7 @@ CONFIG_RTC_DRV_RS5C372=m
 CONFIG_RTC_DRV_ISL1208=m
 CONFIG_RTC_DRV_ISL12022=m
 CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF2127=m
 CONFIG_RTC_DRV_PCF8523=m
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
@@ -5191,8 +5244,9 @@ CONFIG_DMADEVICES=y
 #
 CONFIG_INTEL_MID_DMAC=m
 CONFIG_INTEL_IOATDMA=m
+CONFIG_DW_DMAC_CORE=m
 CONFIG_DW_DMAC=m
-# CONFIG_DW_DMAC_BIG_ENDIAN_IO is not set
+CONFIG_DW_DMAC_PCI=m
 CONFIG_TIMB_DMA=m
 CONFIG_PCH_DMA=m
 CONFIG_DMA_ENGINE=y
@@ -5264,17 +5318,14 @@ CONFIG_COMEDI_PARPORT=m
 CONFIG_COMEDI_SERIAL2002=m
 CONFIG_COMEDI_SKEL=m
 CONFIG_COMEDI_ISA_DRIVERS=y
-CONFIG_COMEDI_ACL7225B=m
 CONFIG_COMEDI_PCL711=m
 CONFIG_COMEDI_PCL724=m
-CONFIG_COMEDI_PCL725=m
 CONFIG_COMEDI_PCL726=m
 CONFIG_COMEDI_PCL730=m
 CONFIG_COMEDI_PCL812=m
 CONFIG_COMEDI_PCL816=m
 CONFIG_COMEDI_PCL818=m
 CONFIG_COMEDI_PCM3724=m
-CONFIG_COMEDI_PCM3730=m
 CONFIG_COMEDI_AMPLC_DIO200_ISA=m
 CONFIG_COMEDI_AMPLC_PC236_ISA=m
 CONFIG_COMEDI_AMPLC_PC263_ISA=m
@@ -5310,6 +5361,7 @@ CONFIG_COMEDI_PCMMIO=m
 CONFIG_COMEDI_PCMUIO=m
 CONFIG_COMEDI_MULTIQ3=m
 CONFIG_COMEDI_POC=m
+CONFIG_COMEDI_S526=m
 CONFIG_COMEDI_PCI_DRIVERS=y
 CONFIG_COMEDI_8255_PCI=m
 CONFIG_COMEDI_ADDI_WATCHDOG=m
@@ -5364,7 +5416,6 @@ CONFIG_COMEDI_NI_LABPC_PCI=m
 CONFIG_COMEDI_NI_PCIDIO=m
 CONFIG_COMEDI_NI_PCIMIO=m
 CONFIG_COMEDI_RTD520=m
-CONFIG_COMEDI_S526=m
 CONFIG_COMEDI_S626=m
 CONFIG_COMEDI_SSV_DNP=m
 CONFIG_COMEDI_MITE=m
@@ -5481,7 +5532,6 @@ CONFIG_WIMAX_GDM72XX_WIMAX2=y
 CONFIG_WIMAX_GDM72XX_USB=y
 # CONFIG_WIMAX_GDM72XX_SDIO is not set
 CONFIG_WIMAX_GDM72XX_USB_PM=y
-CONFIG_CSR_WIFI=m
 CONFIG_NET_VENDOR_SILICOM=y
 CONFIG_SBYPASS=m
 CONFIG_BPCTL=m
@@ -5491,6 +5541,7 @@ CONFIG_FIREWIRE_SERIAL=m
 CONFIG_ZCACHE=m
 # CONFIG_ZCACHE_DEBUG is not set
 # CONFIG_USB_DWC2 is not set
+CONFIG_USB_BTMTK=m
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 CONFIG_ACERHDF=m
@@ -5540,6 +5591,8 @@ CONFIG_MXM_WMI=m
 CONFIG_INTEL_OAKTRAIL=m
 CONFIG_SAMSUNG_Q10=m
 CONFIG_APPLE_GMUX=m
+CONFIG_INTEL_RST=y
+CONFIG_INTEL_SMARTCONNECT=y
 CONFIG_PVPANIC=m
 
 #
@@ -5578,11 +5631,18 @@ CONFIG_MEMORY=y
 # CONFIG_IIO is not set
 # CONFIG_VME_BUS is not set
 CONFIG_PWM=y
+CONFIG_PWM_SYSFS=y
+# CONFIG_PWM_PCA9685 is not set
 CONFIG_IRQCHIP=y
 CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 # CONFIG_RESET_CONTROLLER is not set
+CONFIG_FMC=m
+CONFIG_FMC_FAKEDEV=m
+CONFIG_FMC_TRIVIAL=m
+CONFIG_FMC_WRITE_EEPROM=m
+CONFIG_FMC_CHARDEV=m
 
 #
 # Firmware Drivers
@@ -5601,9 +5661,7 @@ CONFIG_ISCSI_IBFT=m
 #
 # EFI (Extensible Firmware Interface) Support
 #
-CONFIG_EFI_VARS=m
-CONFIG_EFI_VARS_PSTORE=m
-CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
+# CONFIG_EFI_VARS is not set
 
 #
 # File systems
@@ -5775,6 +5833,7 @@ CONFIG_F2FS_FS=m
 CONFIG_F2FS_STAT_FS=y
 CONFIG_F2FS_FS_XATTR=y
 CONFIG_F2FS_FS_POSIX_ACL=y
+CONFIG_F2FS_FS_SECURITY=y
 CONFIG_EFIVAR_FS=y
 CONFIG_ORE=m
 CONFIG_NETWORK_FILESYSTEMS=y
@@ -5785,10 +5844,12 @@ CONFIG_NFS_V3_ACL=y
 CONFIG_NFS_V4=m
 CONFIG_NFS_SWAP=y
 CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
 CONFIG_PNFS_FILE_LAYOUT=m
 CONFIG_PNFS_BLOCK=m
 CONFIG_PNFS_OBJLAYOUT=m
 CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org"
+CONFIG_NFS_V4_SECURITY_LABEL=y
 CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
@@ -5798,6 +5859,7 @@ CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3=y
 CONFIG_NFSD_V3_ACL=y
 CONFIG_NFSD_V4=y
+CONFIG_NFSD_V4_SECURITY_LABEL=y
 # CONFIG_NFSD_FAULT_INJECTION is not set
 CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
@@ -5838,6 +5900,7 @@ CONFIG_AFS_FSCACHE=y
 CONFIG_9P_FS=m
 CONFIG_9P_FSCACHE=y
 CONFIG_9P_FS_POSIX_ACL=y
+CONFIG_9P_FS_SECURITY=y
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
 CONFIG_NLS_CODEPAGE_437=m
@@ -5896,68 +5959,95 @@ CONFIG_DLM=m
 # Kernel hacking
 #
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+
+#
+# printk and dmesg options
+#
 CONFIG_PRINTK_TIME=y
 CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
+# CONFIG_BOOT_PRINTK_DELAY is not set
+CONFIG_DYNAMIC_DEBUG=y
+
+#
+# Compile-time checks and compiler options
+#
+# CONFIG_DEBUG_INFO is not set
 CONFIG_ENABLE_WARN_DEPRECATED=y
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_FRAME_WARN=1024
-CONFIG_MAGIC_SYSRQ=y
 CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_READABLE_ASM is not set
 CONFIG_UNUSED_SYMBOLS=y
 CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
+CONFIG_FRAME_POINTER=y
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_KERNEL=y
+
+#
+# Memory Debugging
+#
+# CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_VIRTUAL is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+# CONFIG_DEBUG_HIGHMEM is not set
+CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+CONFIG_HAVE_ARCH_KMEMCHECK=y
 # CONFIG_DEBUG_SHIRQ is not set
+
+#
+# Debug Lockups and Hangs
+#
 CONFIG_LOCKUP_DETECTOR=y
 CONFIG_HARDLOCKUP_DETECTOR=y
 # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
 CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
-# CONFIG_PANIC_ON_OOPS is not set
-CONFIG_PANIC_ON_OOPS_VALUE=0
 CONFIG_DETECT_HUNG_TASK=y
 CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
 CONFIG_SCHED_DEBUG=y
 CONFIG_SCHEDSTATS=y
 CONFIG_TIMER_STATS=y
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_SLUB_DEBUG_ON is not set
-# CONFIG_SLUB_STATS is not set
-CONFIG_HAVE_DEBUG_KMEMLEAK=y
-# CONFIG_DEBUG_KMEMLEAK is not set
 # CONFIG_DEBUG_PREEMPT is not set
+
+#
+# Lock Debugging (spinlocks, mutexes, etc...)
+#
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
 CONFIG_DEBUG_MUTEXES=y
+# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
 # CONFIG_DEBUG_LOCK_ALLOC is not set
 # CONFIG_PROVE_LOCKING is not set
 # CONFIG_LOCK_STAT is not set
 # CONFIG_DEBUG_ATOMIC_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 CONFIG_STACKTRACE=y
-# CONFIG_DEBUG_STACK_USAGE is not set
 # CONFIG_DEBUG_KOBJECT is not set
-# CONFIG_DEBUG_HIGHMEM is not set
 CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_DEBUG_INFO is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_VIRTUAL is not set
 # CONFIG_DEBUG_WRITECOUNT is not set
-CONFIG_DEBUG_MEMORY_INIT=y
 # CONFIG_DEBUG_LIST is not set
-# CONFIG_TEST_LIST_SORT is not set
 # CONFIG_DEBUG_SG is not set
 # CONFIG_DEBUG_NOTIFIERS is not set
 # CONFIG_DEBUG_CREDENTIALS is not set
-CONFIG_ARCH_WANT_FRAME_POINTERS=y
-CONFIG_FRAME_POINTER=y
-# CONFIG_BOOT_PRINTK_DELAY is not set
 
 #
 # RCU Debugging
@@ -5969,18 +6059,12 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_RCU_CPU_STALL_VERBOSE is not set
 # CONFIG_RCU_CPU_STALL_INFO is not set
 # CONFIG_RCU_TRACE is not set
-# CONFIG_KPROBES_SANITY_TEST is not set
-# CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-CONFIG_LKDTM=m
 # CONFIG_NOTIFIER_ERROR_INJECTION is not set
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_LATENCYTOP is not set
 CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y
 # CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
 CONFIG_USER_STACKTRACE_SUPPORT=y
 CONFIG_NOP_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
@@ -6027,25 +6111,30 @@ CONFIG_MMIOTRACE=y
 # CONFIG_MMIOTRACE_TEST is not set
 CONFIG_RING_BUFFER_BENCHMARK=m
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
+
+#
+# Runtime Testing
+#
+CONFIG_LKDTM=m
+# CONFIG_TEST_LIST_SORT is not set
+# CONFIG_KPROBES_SANITY_TEST is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_RBTREE_TEST is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
+# CONFIG_ATOMIC64_SELFTEST is not set
+CONFIG_ASYNC_RAID6_TEST=m
+# CONFIG_TEST_STRING_HELPERS is not set
+CONFIG_TEST_KSTRTOX=m
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
 # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
-CONFIG_DYNAMIC_DEBUG=y
 # CONFIG_DMA_API_DEBUG is not set
-# CONFIG_ATOMIC64_SELFTEST is not set
-CONFIG_ASYNC_RAID6_TEST=m
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
-CONFIG_HAVE_ARCH_KMEMCHECK=y
-# CONFIG_TEST_STRING_HELPERS is not set
-CONFIG_TEST_KSTRTOX=m
 CONFIG_STRICT_DEVMEM=y
 CONFIG_X86_VERBOSE_BOOTUP=y
 CONFIG_EARLY_PRINTK=y
 # CONFIG_EARLY_PRINTK_DBGP is not set
-# CONFIG_DEBUG_STACKOVERFLOW is not set
 # CONFIG_X86_PTDUMP is not set
 CONFIG_DEBUG_RODATA=y
 # CONFIG_DEBUG_RODATA_TEST is not set
@@ -6069,6 +6158,7 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
 # CONFIG_CPA_DEBUG is not set
 # CONFIG_OPTIMIZE_INLINING is not set
 # CONFIG_DEBUG_NMI_SELFTEST is not set
+# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set
 
 #
 # Security options
@@ -6094,10 +6184,12 @@ CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/usr/bin/tomoyo-init"
 CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd"
 CONFIG_SECURITY_APPARMOR=y
 CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0
-# CONFIG_SECURITY_YAMA is not set
+CONFIG_SECURITY_YAMA=y
+CONFIG_SECURITY_YAMA_STACKED=y
 # CONFIG_IMA is not set
 # CONFIG_DEFAULT_SECURITY_TOMOYO is not set
 # CONFIG_DEFAULT_SECURITY_APPARMOR is not set
+# CONFIG_DEFAULT_SECURITY_YAMA is not set
 CONFIG_DEFAULT_SECURITY_DAC=y
 CONFIG_DEFAULT_SECURITY=""
 CONFIG_XOR_BLOCKS=m
@@ -6217,6 +6309,8 @@ CONFIG_CRYPTO_TWOFISH_586=m
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_ZLIB=m
 CONFIG_CRYPTO_LZO=y
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
 
 #
 # Random Number Generation
@@ -6261,6 +6355,7 @@ CONFIG_RAID6_PQ=m
 CONFIG_BITREVERSE=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GENERIC_NET_UTILS=y
 CONFIG_GENERIC_FIND_FIRST_BIT=y
 CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_IOMAP=y
@@ -6284,6 +6379,9 @@ CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 CONFIG_LZO_COMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
+CONFIG_LZ4_COMPRESS=m
+CONFIG_LZ4HC_COMPRESS=m
+CONFIG_LZ4_DECOMPRESS=y
 CONFIG_XZ_DEC=y
 CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC_POWERPC=y
@@ -6298,6 +6396,7 @@ CONFIG_DECOMPRESS_BZIP2=y
 CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DECOMPRESS_XZ=y
 CONFIG_DECOMPRESS_LZO=y
+CONFIG_DECOMPRESS_LZ4=y
 CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_REED_SOLOMON=m
 CONFIG_REED_SOLOMON_ENC8=y
@@ -6326,3 +6425,16 @@ CONFIG_DDR=y
 CONFIG_MPILIB=m
 CONFIG_OID_REGISTRY=m
 CONFIG_UCS2_STRING=y
+CONFIG_FONT_SUPPORT=y
+CONFIG_FONTS=y
+# CONFIG_FONT_8x8 is not set
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
+CONFIG_FONT_AUTOSELECT=y
diff --git a/libre/linux-libre/config.i686.3.11 b/libre/linux-libre/config.i686.3.11
deleted file mode 100644
index d8b8f5121..000000000
--- a/libre/linux-libre/config.i686.3.11
+++ /dev/null
@@ -1,6440 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.11.0-rc7 Kernel Configuration
-#
-# CONFIG_64BIT is not set
-CONFIG_X86_32=y
-CONFIG_X86=y
-CONFIG_INSTRUCTION_DECODER=y
-CONFIG_OUTPUT_FORMAT="elf32-i386"
-CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_MMU=y
-CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_NEED_SG_DMA_LENGTH=y
-CONFIG_GENERIC_ISA_DMA=y
-CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_ARCH_HAS_CPU_RELAX=y
-CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
-CONFIG_ARCH_HAS_CPU_AUTOPROBE=y
-CONFIG_HAVE_SETUP_PER_CPU_AREA=y
-CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
-CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
-CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
-# CONFIG_ZONE_DMA32 is not set
-# CONFIG_AUDIT_ARCH is not set
-CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
-CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
-CONFIG_HAVE_INTEL_TXT=y
-CONFIG_X86_32_SMP=y
-CONFIG_X86_HT=y
-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_IRQ_WORK=y
-CONFIG_BUILDTIME_EXTABLE_SORT=y
-
-#
-# General setup
-#
-CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_CROSS_COMPILE=""
-# CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="-LIBRE"
-CONFIG_LOCALVERSION_AUTO=y
-CONFIG_HAVE_KERNEL_GZIP=y
-CONFIG_HAVE_KERNEL_BZIP2=y
-CONFIG_HAVE_KERNEL_LZMA=y
-CONFIG_HAVE_KERNEL_XZ=y
-CONFIG_HAVE_KERNEL_LZO=y
-CONFIG_HAVE_KERNEL_LZ4=y
-CONFIG_KERNEL_GZIP=y
-# CONFIG_KERNEL_BZIP2 is not set
-# CONFIG_KERNEL_LZMA is not set
-# CONFIG_KERNEL_XZ is not set
-# CONFIG_KERNEL_LZO is not set
-# CONFIG_KERNEL_LZ4 is not set
-CONFIG_DEFAULT_HOSTNAME="(none)"
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_POSIX_MQUEUE_SYSCTL=y
-CONFIG_FHANDLE=y
-CONFIG_AUDIT=y
-CONFIG_AUDITSYSCALL=y
-CONFIG_AUDIT_WATCH=y
-CONFIG_AUDIT_TREE=y
-CONFIG_AUDIT_LOGINUID_IMMUTABLE=y
-CONFIG_HAVE_GENERIC_HARDIRQS=y
-
-#
-# IRQ subsystem
-#
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_GENERIC_PENDING_IRQ=y
-CONFIG_IRQ_DOMAIN=y
-# CONFIG_IRQ_DOMAIN_DEBUG is not set
-CONFIG_IRQ_FORCED_THREADING=y
-CONFIG_SPARSE_IRQ=y
-CONFIG_CLOCKSOURCE_WATCHDOG=y
-CONFIG_KTIME_SCALAR=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
-CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-
-#
-# Timers subsystem
-#
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ_COMMON=y
-# CONFIG_HZ_PERIODIC is not set
-CONFIG_NO_HZ_IDLE=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-
-#
-# CPU/Task time and stats accounting
-#
-CONFIG_TICK_CPU_ACCOUNTING=y
-# CONFIG_IRQ_TIME_ACCOUNTING is not set
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
-CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TASK_XACCT=y
-CONFIG_TASK_IO_ACCOUNTING=y
-
-#
-# RCU Subsystem
-#
-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
-CONFIG_RCU_FAST_NO_HZ=y
-# CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_RCU_BOOST is not set
-CONFIG_RCU_NOCB_CPU=y
-CONFIG_RCU_NOCB_CPU_NONE=y
-# CONFIG_RCU_NOCB_CPU_ZERO is not set
-# CONFIG_RCU_NOCB_CPU_ALL is not set
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=19
-CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
-CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
-CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=y
-CONFIG_CGROUPS=y
-# CONFIG_CGROUP_DEBUG is not set
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CPUSETS=y
-CONFIG_PROC_PID_CPUSET=y
-CONFIG_CGROUP_CPUACCT=y
-CONFIG_RESOURCE_COUNTERS=y
-CONFIG_MEMCG=y
-CONFIG_MEMCG_SWAP=y
-# CONFIG_MEMCG_SWAP_ENABLED is not set
-CONFIG_MEMCG_KMEM=y
-# CONFIG_CGROUP_HUGETLB is not set
-# CONFIG_CGROUP_PERF is not set
-CONFIG_CGROUP_SCHED=y
-CONFIG_FAIR_GROUP_SCHED=y
-CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=y
-CONFIG_BLK_CGROUP=y
-# CONFIG_DEBUG_BLK_CGROUP is not set
-# CONFIG_CHECKPOINT_RESTORE is not set
-CONFIG_NAMESPACES=y
-CONFIG_UTS_NS=y
-CONFIG_IPC_NS=y
-CONFIG_PID_NS=y
-CONFIG_NET_NS=y
-CONFIG_SCHED_AUTOGROUP=y
-CONFIG_MM_OWNER=y
-# CONFIG_SYSFS_DEPRECATED is not set
-CONFIG_RELAY=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_RD_GZIP=y
-CONFIG_RD_BZIP2=y
-CONFIG_RD_LZMA=y
-CONFIG_RD_XZ=y
-CONFIG_RD_LZO=y
-CONFIG_RD_LZ4=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_SYSCTL=y
-CONFIG_ANON_INODES=y
-CONFIG_HAVE_UID16=y
-CONFIG_SYSCTL_EXCEPTION_TRACE=y
-CONFIG_HAVE_PCSPKR_PLATFORM=y
-# CONFIG_EXPERT is not set
-CONFIG_UID16=y
-# CONFIG_SYSCTL_SYSCALL is not set
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_ALL is not set
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_PCSPKR_PLATFORM=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
-CONFIG_EVENTFD=y
-CONFIG_SHMEM=y
-CONFIG_AIO=y
-CONFIG_PCI_QUIRKS=y
-# CONFIG_EMBEDDED is not set
-CONFIG_HAVE_PERF_EVENTS=y
-
-#
-# Kernel Performance Events And Counters
-#
-CONFIG_PERF_EVENTS=y
-# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLUB_DEBUG=y
-# CONFIG_COMPAT_BRK is not set
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-CONFIG_SLUB_CPU_PARTIAL=y
-CONFIG_PROFILING=y
-CONFIG_TRACEPOINTS=y
-CONFIG_OPROFILE=m
-# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
-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
-CONFIG_USE_GENERIC_SMP_HELPERS=y
-CONFIG_GENERIC_SMP_IDLE_THREAD=y
-CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
-CONFIG_HAVE_DMA_API_DEBUG=y
-CONFIG_HAVE_HW_BREAKPOINT=y
-CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
-CONFIG_HAVE_USER_RETURN_NOTIFIER=y
-CONFIG_HAVE_PERF_EVENTS_NMI=y
-CONFIG_HAVE_PERF_REGS=y
-CONFIG_HAVE_PERF_USER_STACK_DUMP=y
-CONFIG_HAVE_ARCH_JUMP_LABEL=y
-CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
-CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
-CONFIG_HAVE_CMPXCHG_LOCAL=y
-CONFIG_HAVE_CMPXCHG_DOUBLE=y
-CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
-CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
-CONFIG_SECCOMP_FILTER=y
-CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
-CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
-CONFIG_HAVE_ARCH_SOFT_DIRTY=y
-CONFIG_MODULES_USE_ELF_REL=y
-CONFIG_CLONE_BACKWARDS=y
-CONFIG_OLD_SIGSUSPEND3=y
-CONFIG_OLD_SIGACTION=y
-
-#
-# GCOV-based kernel profiling
-#
-# CONFIG_GCOV_KERNEL is not set
-CONFIG_HAVE_GENERIC_DMA_COHERENT=y
-CONFIG_SLABINFO=y
-CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
-CONFIG_MODULES=y
-CONFIG_MODULE_FORCE_LOAD=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-CONFIG_MODVERSIONS=y
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-# CONFIG_MODULE_SIG is not set
-CONFIG_STOP_MACHINE=y
-CONFIG_BLOCK=y
-CONFIG_LBDAF=y
-CONFIG_BLK_DEV_BSG=y
-CONFIG_BLK_DEV_BSGLIB=y
-# CONFIG_BLK_DEV_INTEGRITY is not set
-CONFIG_BLK_DEV_THROTTLING=y
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-CONFIG_AIX_PARTITION=y
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_MAC_PARTITION=y
-CONFIG_MSDOS_PARTITION=y
-CONFIG_BSD_DISKLABEL=y
-CONFIG_MINIX_SUBPARTITION=y
-CONFIG_SOLARIS_X86_PARTITION=y
-# CONFIG_UNIXWARE_DISKLABEL is not set
-CONFIG_LDM_PARTITION=y
-# CONFIG_LDM_DEBUG is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-CONFIG_KARMA_PARTITION=y
-CONFIG_EFI_PARTITION=y
-# CONFIG_SYSV68_PARTITION is not set
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-CONFIG_CFQ_GROUP_IOSCHED=y
-# CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_CFQ=y
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="cfq"
-CONFIG_PREEMPT_NOTIFIERS=y
-CONFIG_PADATA=y
-CONFIG_ASN1=m
-CONFIG_UNINLINE_SPIN_UNLOCK=y
-CONFIG_FREEZER=y
-
-#
-# Processor type and features
-#
-CONFIG_ZONE_DMA=y
-CONFIG_SMP=y
-CONFIG_X86_MPPARSE=y
-# CONFIG_X86_BIGSMP is not set
-# CONFIG_X86_EXTENDED_PLATFORM 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
-CONFIG_HYPERVISOR_GUEST=y
-CONFIG_PARAVIRT=y
-# CONFIG_PARAVIRT_DEBUG is not set
-# CONFIG_PARAVIRT_SPINLOCKS is not set
-# CONFIG_XEN_PRIVILEGED_GUEST is not set
-CONFIG_KVM_GUEST=y
-CONFIG_LGUEST_GUEST=y
-CONFIG_PARAVIRT_TIME_ACCOUNTING=y
-CONFIG_PARAVIRT_CLOCK=y
-CONFIG_NO_BOOTMEM=y
-# CONFIG_MEMTEST is not set
-# CONFIG_M486 is not set
-# CONFIG_M586 is not set
-# CONFIG_M586TSC is not set
-# CONFIG_M586MMX is not set
-CONFIG_M686=y
-# CONFIG_MPENTIUMII is not set
-# CONFIG_MPENTIUMIII is not set
-# CONFIG_MPENTIUMM is not set
-# CONFIG_MPENTIUM4 is not set
-# CONFIG_MK6 is not set
-# CONFIG_MK7 is not set
-# CONFIG_MK8 is not set
-# CONFIG_MCRUSOE is not set
-# CONFIG_MEFFICEON is not set
-# CONFIG_MWINCHIPC6 is not set
-# CONFIG_MWINCHIP3D is not set
-# CONFIG_MELAN is not set
-# CONFIG_MGEODEGX1 is not set
-# CONFIG_MGEODE_LX is not set
-# CONFIG_MCYRIXIII is not set
-# CONFIG_MVIAC3_2 is not set
-# CONFIG_MVIAC7 is not set
-# CONFIG_MCORE2 is not set
-# CONFIG_MATOM is not set
-CONFIG_X86_GENERIC=y
-CONFIG_X86_INTERNODE_CACHE_SHIFT=6
-CONFIG_X86_L1_CACHE_SHIFT=6
-# CONFIG_X86_PPRO_FENCE is not set
-CONFIG_X86_INTEL_USERCOPY=y
-CONFIG_X86_USE_PPRO_CHECKSUM=y
-CONFIG_X86_TSC=y
-CONFIG_X86_CMPXCHG64=y
-CONFIG_X86_CMOV=y
-CONFIG_X86_MINIMUM_CPU_FAMILY=5
-CONFIG_X86_DEBUGCTLMSR=y
-CONFIG_CPU_SUP_INTEL=y
-CONFIG_CPU_SUP_AMD=y
-CONFIG_CPU_SUP_CENTAUR=y
-CONFIG_CPU_SUP_TRANSMETA_32=y
-CONFIG_HPET_TIMER=y
-CONFIG_HPET_EMULATE_RTC=y
-CONFIG_DMI=y
-CONFIG_NR_CPUS=8
-CONFIG_SCHED_SMT=y
-CONFIG_SCHED_MC=y
-# CONFIG_PREEMPT_NONE is not set
-# CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_PREEMPT=y
-CONFIG_PREEMPT_COUNT=y
-CONFIG_X86_LOCAL_APIC=y
-CONFIG_X86_IO_APIC=y
-CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
-CONFIG_X86_MCE=y
-CONFIG_X86_MCE_INTEL=y
-CONFIG_X86_MCE_AMD=y
-# CONFIG_X86_ANCIENT_MCE is not set
-CONFIG_X86_MCE_THRESHOLD=y
-# CONFIG_X86_MCE_INJECT is not set
-CONFIG_X86_THERMAL_VECTOR=y
-CONFIG_VM86=y
-CONFIG_TOSHIBA=m
-CONFIG_I8K=m
-CONFIG_X86_REBOOTFIXUPS=y
-CONFIG_MICROCODE=m
-# CONFIG_MICROCODE_INTEL is not set
-# CONFIG_MICROCODE_AMD is not set
-CONFIG_MICROCODE_OLD_INTERFACE=y
-CONFIG_X86_MSR=m
-CONFIG_X86_CPUID=m
-# CONFIG_NOHIGHMEM is not set
-CONFIG_HIGHMEM4G=y
-# CONFIG_HIGHMEM64G is not set
-CONFIG_PAGE_OFFSET=0xC0000000
-CONFIG_HIGHMEM=y
-CONFIG_ARCH_FLATMEM_ENABLE=y
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_ILLEGAL_POINTER_VALUE=0
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_FLATMEM_MANUAL=y
-# CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-CONFIG_SPARSEMEM_STATIC=y
-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
-CONFIG_COMPACTION=y
-CONFIG_MIGRATION=y
-# CONFIG_PHYS_ADDR_T_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=1
-CONFIG_BOUNCE=y
-CONFIG_VIRT_TO_BUS=y
-CONFIG_MMU_NOTIFIER=y
-CONFIG_KSM=y
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
-CONFIG_MEMORY_FAILURE=y
-CONFIG_HWPOISON_INJECT=m
-CONFIG_TRANSPARENT_HUGEPAGE=y
-CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
-# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
-CONFIG_CROSS_MEMORY_ATTACH=y
-CONFIG_CLEANCACHE=y
-CONFIG_FRONTSWAP=y
-CONFIG_ZBUD=y
-CONFIG_ZSWAP=y
-# CONFIG_HIGHPTE is not set
-CONFIG_X86_CHECK_BIOS_CORRUPTION=y
-CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
-CONFIG_X86_RESERVE_LOW=64
-# CONFIG_MATH_EMULATION is not set
-CONFIG_MTRR=y
-CONFIG_MTRR_SANITIZER=y
-CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
-CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
-CONFIG_X86_PAT=y
-CONFIG_ARCH_USES_PG_UNCACHED=y
-CONFIG_ARCH_RANDOM=y
-CONFIG_X86_SMAP=y
-CONFIG_EFI=y
-CONFIG_EFI_STUB=y
-CONFIG_SECCOMP=y
-CONFIG_CC_STACKPROTECTOR=y
-# CONFIG_HZ_100 is not set
-# CONFIG_HZ_250 is not set
-CONFIG_HZ_300=y
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ=300
-CONFIG_SCHED_HRTICK=y
-CONFIG_KEXEC=y
-# CONFIG_CRASH_DUMP is not set
-# CONFIG_KEXEC_JUMP is not set
-CONFIG_PHYSICAL_START=0x1000000
-CONFIG_RELOCATABLE=y
-CONFIG_X86_NEED_RELOCS=y
-CONFIG_PHYSICAL_ALIGN=0x100000
-CONFIG_HOTPLUG_CPU=y
-# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
-# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
-# CONFIG_COMPAT_VDSO is not set
-# CONFIG_CMDLINE_BOOL is not set
-CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-
-#
-# Power management and ACPI options
-#
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-CONFIG_HIBERNATE_CALLBACKS=y
-CONFIG_HIBERNATION=y
-CONFIG_PM_STD_PARTITION=""
-CONFIG_PM_SLEEP=y
-CONFIG_PM_SLEEP_SMP=y
-CONFIG_PM_AUTOSLEEP=y
-CONFIG_PM_WAKELOCKS=y
-CONFIG_PM_WAKELOCKS_LIMIT=100
-CONFIG_PM_WAKELOCKS_GC=y
-CONFIG_PM_RUNTIME=y
-CONFIG_PM=y
-CONFIG_PM_DEBUG=y
-CONFIG_PM_ADVANCED_DEBUG=y
-# CONFIG_PM_TEST_SUSPEND is not set
-CONFIG_PM_SLEEP_DEBUG=y
-CONFIG_PM_TRACE=y
-CONFIG_PM_TRACE_RTC=y
-CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
-CONFIG_ACPI=y
-CONFIG_ACPI_SLEEP=y
-# CONFIG_ACPI_PROCFS is not set
-# CONFIG_ACPI_PROCFS_POWER is not set
-CONFIG_ACPI_EC_DEBUGFS=m
-# CONFIG_ACPI_PROC_EVENT is not set
-CONFIG_ACPI_AC=m
-CONFIG_ACPI_BATTERY=m
-CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_VIDEO=m
-CONFIG_ACPI_FAN=m
-CONFIG_ACPI_DOCK=y
-CONFIG_ACPI_I2C=m
-CONFIG_ACPI_PROCESSOR=m
-CONFIG_ACPI_IPMI=m
-CONFIG_ACPI_HOTPLUG_CPU=y
-CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
-CONFIG_ACPI_THERMAL=m
-# CONFIG_ACPI_CUSTOM_DSDT is not set
-CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y
-CONFIG_ACPI_BLACKLIST_YEAR=0
-# CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_PCI_SLOT=y
-CONFIG_X86_PM_TIMER=y
-CONFIG_ACPI_CONTAINER=y
-CONFIG_ACPI_SBS=m
-CONFIG_ACPI_HED=y
-CONFIG_ACPI_CUSTOM_METHOD=m
-CONFIG_ACPI_BGRT=y
-CONFIG_ACPI_APEI=y
-CONFIG_ACPI_APEI_GHES=y
-CONFIG_ACPI_APEI_PCIEAER=y
-CONFIG_ACPI_APEI_MEMORY_FAILURE=y
-CONFIG_ACPI_APEI_EINJ=m
-CONFIG_ACPI_APEI_ERST_DEBUG=m
-CONFIG_SFI=y
-CONFIG_X86_APM_BOOT=y
-CONFIG_APM=y
-# CONFIG_APM_IGNORE_USER_SUSPEND is not set
-CONFIG_APM_DO_ENABLE=y
-# CONFIG_APM_CPU_IDLE is not set
-# CONFIG_APM_DISPLAY_BLANK is not set
-# CONFIG_APM_ALLOW_INTS is not set
-
-#
-# CPU Frequency scaling
-#
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_TABLE=y
-CONFIG_CPU_FREQ_GOV_COMMON=y
-CONFIG_CPU_FREQ_STAT=m
-CONFIG_CPU_FREQ_STAT_DETAILS=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_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
-CONFIG_X86_POWERNOW_K6=m
-CONFIG_X86_POWERNOW_K7=m
-CONFIG_X86_POWERNOW_K7_ACPI=y
-CONFIG_X86_POWERNOW_K8=m
-CONFIG_X86_AMD_FREQ_SENSITIVITY=m
-CONFIG_X86_GX_SUSPMOD=m
-# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
-CONFIG_X86_SPEEDSTEP_ICH=m
-CONFIG_X86_SPEEDSTEP_SMI=m
-CONFIG_X86_P4_CLOCKMOD=m
-CONFIG_X86_CPUFREQ_NFORCE2=m
-CONFIG_X86_LONGRUN=m
-CONFIG_X86_LONGHAUL=m
-CONFIG_X86_E_POWERSAVER=m
-
-#
-# shared options
-#
-CONFIG_X86_SPEEDSTEP_LIB=m
-CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y
-CONFIG_CPU_IDLE=y
-# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
-CONFIG_CPU_IDLE_GOV_LADDER=y
-CONFIG_CPU_IDLE_GOV_MENU=y
-# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
-CONFIG_INTEL_IDLE=y
-
-#
-# Bus options (PCI etc.)
-#
-CONFIG_PCI=y
-# CONFIG_PCI_GOBIOS is not set
-# CONFIG_PCI_GOMMCONFIG is not set
-# CONFIG_PCI_GODIRECT is not set
-# CONFIG_PCI_GOOLPC is not set
-CONFIG_PCI_GOANY=y
-CONFIG_PCI_BIOS=y
-CONFIG_PCI_DIRECT=y
-CONFIG_PCI_MMCONFIG=y
-CONFIG_PCI_OLPC=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=y
-CONFIG_PCIEAER=y
-# CONFIG_PCIE_ECRC is not set
-# CONFIG_PCIEAER_INJECT is not set
-CONFIG_PCIEASPM=y
-# CONFIG_PCIEASPM_DEBUG is not set
-CONFIG_PCIEASPM_DEFAULT=y
-# CONFIG_PCIEASPM_POWERSAVE is not set
-# CONFIG_PCIEASPM_PERFORMANCE is not set
-CONFIG_PCIE_PME=y
-CONFIG_ARCH_SUPPORTS_MSI=y
-CONFIG_PCI_MSI=y
-# CONFIG_PCI_DEBUG is not set
-CONFIG_PCI_REALLOC_ENABLE_AUTO=y
-CONFIG_PCI_STUB=m
-CONFIG_HT_IRQ=y
-CONFIG_PCI_ATS=y
-CONFIG_PCI_IOV=y
-CONFIG_PCI_PRI=y
-CONFIG_PCI_PASID=y
-CONFIG_PCI_IOAPIC=y
-CONFIG_PCI_LABEL=y
-
-#
-# PCI host controller drivers
-#
-CONFIG_ISA_DMA_API=y
-CONFIG_ISA=y
-# CONFIG_EISA is not set
-# CONFIG_SCx200 is not set
-CONFIG_OLPC=y
-CONFIG_OLPC_XO1_PM=y
-CONFIG_OLPC_XO1_RTC=y
-CONFIG_OLPC_XO1_SCI=y
-CONFIG_OLPC_XO15_SCI=y
-# CONFIG_ALIX is not set
-# CONFIG_NET5501 is not set
-# CONFIG_GEOS is not set
-CONFIG_AMD_NB=y
-CONFIG_PCCARD=m
-CONFIG_PCMCIA=m
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_CARDBUS=y
-
-#
-# PC-card bridges
-#
-CONFIG_YENTA=m
-CONFIG_YENTA_O2=y
-CONFIG_YENTA_RICOH=y
-CONFIG_YENTA_TI=y
-CONFIG_YENTA_ENE_TUNE=y
-CONFIG_YENTA_TOSHIBA=y
-CONFIG_PD6729=m
-CONFIG_I82092=m
-CONFIG_I82365=m
-CONFIG_TCIC=m
-CONFIG_PCMCIA_PROBE=y
-CONFIG_PCCARD_NONSTATIC=y
-CONFIG_HOTPLUG_PCI=y
-CONFIG_HOTPLUG_PCI_COMPAQ=m
-# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
-CONFIG_HOTPLUG_PCI_IBM=m
-CONFIG_HOTPLUG_PCI_ACPI=y
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m
-CONFIG_HOTPLUG_PCI_CPCI=y
-CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
-CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
-CONFIG_HOTPLUG_PCI_SHPC=m
-CONFIG_RAPIDIO=y
-CONFIG_RAPIDIO_TSI721=y
-CONFIG_RAPIDIO_DISC_TIMEOUT=30
-# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set
-CONFIG_RAPIDIO_DMA_ENGINE=y
-CONFIG_RAPIDIO_DEBUG=y
-CONFIG_RAPIDIO_ENUM_BASIC=m
-
-#
-# RapidIO Switch drivers
-#
-CONFIG_RAPIDIO_TSI57X=y
-CONFIG_RAPIDIO_CPS_XX=y
-CONFIG_RAPIDIO_TSI568=y
-CONFIG_RAPIDIO_CPS_GEN2=y
-
-#
-# Executable file formats / Emulations
-#
-CONFIG_BINFMT_ELF=y
-CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_BINFMT_SCRIPT=y
-CONFIG_HAVE_AOUT=y
-CONFIG_BINFMT_AOUT=m
-CONFIG_BINFMT_MISC=y
-CONFIG_COREDUMP=y
-CONFIG_HAVE_ATOMIC_IOMAP=y
-CONFIG_HAVE_TEXT_POKE_SMP=y
-CONFIG_NET=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-CONFIG_PACKET_DIAG=m
-CONFIG_UNIX=y
-CONFIG_UNIX_DIAG=m
-CONFIG_XFRM=y
-CONFIG_XFRM_ALGO=m
-CONFIG_XFRM_USER=m
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_MIGRATE is not set
-# CONFIG_XFRM_STATISTICS is not set
-CONFIG_XFRM_IPCOMP=m
-CONFIG_NET_KEY=m
-# CONFIG_NET_KEY_MIGRATE is not set
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_FIB_TRIE_STATS=y
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-CONFIG_IP_ROUTE_CLASSID=y
-# CONFIG_IP_PNP is not set
-CONFIG_NET_IPIP=m
-CONFIG_NET_IPGRE_DEMUX=m
-CONFIG_NET_IP_TUNNEL=m
-CONFIG_NET_IPGRE=m
-# CONFIG_NET_IPGRE_BROADCAST is not set
-CONFIG_IP_MROUTE=y
-# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-CONFIG_ARPD=y
-CONFIG_SYN_COOKIES=y
-CONFIG_NET_IPVTI=m
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_XFRM_TUNNEL=m
-CONFIG_INET_TUNNEL=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=m
-CONFIG_INET_LRO=y
-CONFIG_INET_DIAG=m
-CONFIG_INET_TCP_DIAG=m
-CONFIG_INET_UDP_DIAG=m
-CONFIG_TCP_CONG_ADVANCED=y
-CONFIG_TCP_CONG_BIC=m
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_TCP_CONG_WESTWOOD=m
-CONFIG_TCP_CONG_HTCP=m
-CONFIG_TCP_CONG_HSTCP=m
-CONFIG_TCP_CONG_HYBLA=m
-CONFIG_TCP_CONG_VEGAS=m
-CONFIG_TCP_CONG_SCALABLE=m
-CONFIG_TCP_CONG_LP=m
-CONFIG_TCP_CONG_VENO=m
-CONFIG_TCP_CONG_YEAH=m
-CONFIG_TCP_CONG_ILLINOIS=m
-CONFIG_DEFAULT_CUBIC=y
-# CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="cubic"
-# CONFIG_TCP_MD5SIG is not set
-CONFIG_IPV6=y
-CONFIG_IPV6_PRIVACY=y
-CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_ROUTE_INFO=y
-CONFIG_IPV6_OPTIMISTIC_DAD=y
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-CONFIG_INET6_IPCOMP=m
-CONFIG_IPV6_MIP6=m
-CONFIG_INET6_XFRM_TUNNEL=m
-CONFIG_INET6_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
-CONFIG_IPV6_SIT=m
-CONFIG_IPV6_SIT_6RD=y
-CONFIG_IPV6_NDISC_NODETYPE=y
-CONFIG_IPV6_TUNNEL=m
-CONFIG_IPV6_GRE=m
-CONFIG_IPV6_MULTIPLE_TABLES=y
-CONFIG_IPV6_SUBTREES=y
-# CONFIG_IPV6_MROUTE is not set
-CONFIG_NETLABEL=y
-CONFIG_NETWORK_SECMARK=y
-CONFIG_NETWORK_PHY_TIMESTAMPING=y
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-CONFIG_NETFILTER_ADVANCED=y
-CONFIG_BRIDGE_NETFILTER=y
-
-#
-# Core Netfilter Configuration
-#
-CONFIG_NETFILTER_NETLINK=m
-CONFIG_NETFILTER_NETLINK_ACCT=m
-CONFIG_NETFILTER_NETLINK_QUEUE=m
-CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NF_CONNTRACK=m
-CONFIG_NF_CONNTRACK_MARK=y
-CONFIG_NF_CONNTRACK_SECMARK=y
-CONFIG_NF_CONNTRACK_ZONES=y
-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
-CONFIG_NF_CT_PROTO_UDPLITE=m
-CONFIG_NF_CONNTRACK_AMANDA=m
-CONFIG_NF_CONNTRACK_FTP=m
-CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IRC=m
-CONFIG_NF_CONNTRACK_BROADCAST=m
-CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-CONFIG_NF_CONNTRACK_SNMP=m
-CONFIG_NF_CONNTRACK_PPTP=m
-CONFIG_NF_CONNTRACK_SANE=m
-CONFIG_NF_CONNTRACK_SIP=m
-CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_CT_NETLINK=m
-CONFIG_NF_CT_NETLINK_TIMEOUT=m
-CONFIG_NF_CT_NETLINK_HELPER=m
-CONFIG_NETFILTER_NETLINK_QUEUE_CT=y
-CONFIG_NF_NAT=m
-CONFIG_NF_NAT_NEEDED=y
-CONFIG_NF_NAT_PROTO_DCCP=m
-CONFIG_NF_NAT_PROTO_UDPLITE=m
-CONFIG_NF_NAT_PROTO_SCTP=m
-CONFIG_NF_NAT_AMANDA=m
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_IRC=m
-CONFIG_NF_NAT_SIP=m
-CONFIG_NF_NAT_TFTP=m
-CONFIG_NETFILTER_TPROXY=m
-CONFIG_NETFILTER_XTABLES=m
-
-#
-# Xtables combined modules
-#
-CONFIG_NETFILTER_XT_MARK=m
-CONFIG_NETFILTER_XT_CONNMARK=m
-CONFIG_NETFILTER_XT_SET=m
-
-#
-# Xtables targets
-#
-CONFIG_NETFILTER_XT_TARGET_AUDIT=m
-CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
-CONFIG_NETFILTER_XT_TARGET_CT=m
-CONFIG_NETFILTER_XT_TARGET_DSCP=m
-CONFIG_NETFILTER_XT_TARGET_HL=m
-CONFIG_NETFILTER_XT_TARGET_HMARK=m
-CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
-CONFIG_NETFILTER_XT_TARGET_LED=m
-CONFIG_NETFILTER_XT_TARGET_LOG=m
-CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_TARGET_NETMAP=m
-CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-CONFIG_NETFILTER_XT_TARGET_RATEEST=m
-CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
-CONFIG_NETFILTER_XT_TARGET_TEE=m
-CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-CONFIG_NETFILTER_XT_TARGET_TRACE=m
-CONFIG_NETFILTER_XT_TARGET_SECMARK=m
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-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
-CONFIG_NETFILTER_XT_MATCH_CPU=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
-CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
-CONFIG_NETFILTER_XT_MATCH_DSCP=m
-CONFIG_NETFILTER_XT_MATCH_ECN=m
-CONFIG_NETFILTER_XT_MATCH_ESP=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_HELPER=m
-CONFIG_NETFILTER_XT_MATCH_HL=m
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-CONFIG_NETFILTER_XT_MATCH_IPVS=m
-CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-CONFIG_NETFILTER_XT_MATCH_MAC=m
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-CONFIG_NETFILTER_XT_MATCH_NFACCT=m
-CONFIG_NETFILTER_XT_MATCH_OSF=m
-CONFIG_NETFILTER_XT_MATCH_OWNER=m
-CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-CONFIG_NETFILTER_XT_MATCH_RATEEST=m
-CONFIG_NETFILTER_XT_MATCH_REALM=m
-CONFIG_NETFILTER_XT_MATCH_RECENT=m
-CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_SOCKET=m
-CONFIG_NETFILTER_XT_MATCH_STATE=m
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-CONFIG_NETFILTER_XT_MATCH_STRING=m
-CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-CONFIG_NETFILTER_XT_MATCH_TIME=m
-CONFIG_NETFILTER_XT_MATCH_U32=m
-CONFIG_IP_SET=m
-CONFIG_IP_SET_MAX=256
-CONFIG_IP_SET_BITMAP_IP=m
-CONFIG_IP_SET_BITMAP_IPMAC=m
-CONFIG_IP_SET_BITMAP_PORT=m
-CONFIG_IP_SET_HASH_IP=m
-CONFIG_IP_SET_HASH_IPPORT=m
-CONFIG_IP_SET_HASH_IPPORTIP=m
-CONFIG_IP_SET_HASH_IPPORTNET=m
-CONFIG_IP_SET_HASH_NET=m
-CONFIG_IP_SET_HASH_NETPORT=m
-CONFIG_IP_SET_HASH_NETIFACE=m
-CONFIG_IP_SET_LIST_SET=m
-CONFIG_IP_VS=m
-# CONFIG_IP_VS_IPV6 is not set
-# CONFIG_IP_VS_DEBUG is not set
-CONFIG_IP_VS_TAB_BITS=12
-
-#
-# IPVS transport protocol load balancing support
-#
-CONFIG_IP_VS_PROTO_TCP=y
-CONFIG_IP_VS_PROTO_UDP=y
-CONFIG_IP_VS_PROTO_AH_ESP=y
-CONFIG_IP_VS_PROTO_ESP=y
-CONFIG_IP_VS_PROTO_AH=y
-CONFIG_IP_VS_PROTO_SCTP=y
-
-#
-# IPVS scheduler
-#
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_WRR=m
-CONFIG_IP_VS_LC=m
-CONFIG_IP_VS_WLC=m
-CONFIG_IP_VS_LBLC=m
-CONFIG_IP_VS_LBLCR=m
-CONFIG_IP_VS_DH=m
-CONFIG_IP_VS_SH=m
-CONFIG_IP_VS_SED=m
-CONFIG_IP_VS_NQ=m
-
-#
-# IPVS SH scheduler
-#
-CONFIG_IP_VS_SH_TAB_BITS=8
-
-#
-# IPVS application helper
-#
-CONFIG_IP_VS_FTP=m
-CONFIG_IP_VS_NFCT=y
-CONFIG_IP_VS_PE_SIP=m
-
-#
-# IP: Netfilter Configuration
-#
-CONFIG_NF_DEFRAG_IPV4=m
-CONFIG_NF_CONNTRACK_IPV4=m
-# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_RPFILTER=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_NF_NAT_IPV4=m
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_PROTO_GRE=m
-CONFIG_NF_NAT_PPTP=m
-CONFIG_NF_NAT_H323=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_RAW=m
-CONFIG_IP_NF_SECURITY=m
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-
-#
-# IPv6: Netfilter Configuration
-#
-CONFIG_NF_DEFRAG_IPV6=m
-CONFIG_NF_CONNTRACK_IPV6=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_RPFILTER=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_RAW=m
-CONFIG_IP6_NF_SECURITY=m
-CONFIG_NF_NAT_IPV6=m
-CONFIG_IP6_NF_TARGET_MASQUERADE=m
-CONFIG_IP6_NF_TARGET_NPT=m
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_IP6=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_ULOG=m
-CONFIG_BRIDGE_EBT_NFLOG=m
-CONFIG_IP_DCCP=m
-CONFIG_INET_DCCP_DIAG=m
-
-#
-# DCCP CCIDs Configuration
-#
-# CONFIG_IP_DCCP_CCID2_DEBUG is not set
-CONFIG_IP_DCCP_CCID3=y
-# CONFIG_IP_DCCP_CCID3_DEBUG is not set
-CONFIG_IP_DCCP_TFRC_LIB=y
-
-#
-# DCCP Kernel Hacking
-#
-# CONFIG_IP_DCCP_DEBUG is not set
-CONFIG_NET_DCCPPROBE=m
-CONFIG_IP_SCTP=m
-CONFIG_NET_SCTPPROBE=m
-# CONFIG_SCTP_DBG_OBJCNT is not set
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
-CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
-CONFIG_SCTP_COOKIE_HMAC_MD5=y
-CONFIG_SCTP_COOKIE_HMAC_SHA1=y
-# CONFIG_RDS is not set
-# CONFIG_TIPC is not set
-CONFIG_ATM=m
-CONFIG_ATM_CLIP=m
-# CONFIG_ATM_CLIP_NO_ICMP is not set
-CONFIG_ATM_LANE=m
-CONFIG_ATM_MPOA=m
-CONFIG_ATM_BR2684=m
-# CONFIG_ATM_BR2684_IPFILTER is not set
-CONFIG_L2TP=m
-# CONFIG_L2TP_DEBUGFS is not set
-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
-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
-CONFIG_IPX=m
-# CONFIG_IPX_INTERN is not set
-CONFIG_ATALK=m
-CONFIG_DEV_APPLETALK=m
-CONFIG_LTPC=m
-CONFIG_COPS=m
-CONFIG_COPS_DAYNA=y
-CONFIG_COPS_TANGENT=y
-CONFIG_IPDDP=m
-CONFIG_IPDDP_ENCAP=y
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-CONFIG_PHONET=m
-CONFIG_IEEE802154=m
-CONFIG_IEEE802154_6LOWPAN=m
-CONFIG_MAC802154=m
-CONFIG_NET_SCHED=y
-
-#
-# Queueing/Scheduling
-#
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_ATM=m
-CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_MULTIQ=m
-CONFIG_NET_SCH_RED=m
-CONFIG_NET_SCH_SFB=m
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SCH_TBF=m
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCH_NETEM=m
-CONFIG_NET_SCH_DRR=m
-CONFIG_NET_SCH_MQPRIO=m
-CONFIG_NET_SCH_CHOKE=m
-CONFIG_NET_SCH_QFQ=m
-CONFIG_NET_SCH_CODEL=m
-CONFIG_NET_SCH_FQ_CODEL=m
-CONFIG_NET_SCH_INGRESS=m
-CONFIG_NET_SCH_PLUG=m
-
-#
-# Classification
-#
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-# CONFIG_CLS_U32_PERF is not set
-# CONFIG_CLS_U32_MARK is not set
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_FLOW=m
-CONFIG_NET_CLS_CGROUP=y
-# CONFIG_NET_EMATCH is not set
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_ACT_POLICE=m
-CONFIG_NET_ACT_GACT=m
-CONFIG_GACT_PROB=y
-CONFIG_NET_ACT_MIRRED=m
-CONFIG_NET_ACT_IPT=m
-CONFIG_NET_ACT_NAT=m
-CONFIG_NET_ACT_PEDIT=m
-CONFIG_NET_ACT_SIMP=m
-CONFIG_NET_ACT_SKBEDIT=m
-CONFIG_NET_ACT_CSUM=m
-CONFIG_NET_CLS_IND=y
-CONFIG_NET_SCH_FIFO=y
-# CONFIG_DCB is not set
-CONFIG_DNS_RESOLVER=y
-CONFIG_BATMAN_ADV=m
-CONFIG_BATMAN_ADV_BLA=y
-CONFIG_BATMAN_ADV_DAT=y
-CONFIG_BATMAN_ADV_NC=y
-# CONFIG_BATMAN_ADV_DEBUG is not set
-CONFIG_OPENVSWITCH=m
-CONFIG_OPENVSWITCH_GRE=y
-CONFIG_VSOCKETS=m
-CONFIG_VMWARE_VMCI_VSOCKETS=m
-CONFIG_NETLINK_MMAP=y
-CONFIG_NETLINK_DIAG=m
-CONFIG_NET_MPLS_GSO=m
-CONFIG_RPS=y
-CONFIG_RFS_ACCEL=y
-CONFIG_XPS=y
-CONFIG_NETPRIO_CGROUP=m
-CONFIG_NET_RX_BUSY_POLL=y
-CONFIG_BQL=y
-CONFIG_NET_FLOW_LIMIT=y
-
-#
-# Network testing
-#
-CONFIG_NET_PKTGEN=m
-CONFIG_NET_TCPPROBE=m
-CONFIG_NET_DROP_MONITOR=y
-CONFIG_HAMRADIO=y
-
-#
-# Packet Radio protocols
-#
-CONFIG_AX25=m
-CONFIG_AX25_DAMA_SLAVE=y
-CONFIG_NETROM=m
-CONFIG_ROSE=m
-
-#
-# AX.25 network device drivers
-#
-CONFIG_MKISS=m
-CONFIG_6PACK=m
-CONFIG_BPQETHER=m
-CONFIG_SCC=m
-# CONFIG_SCC_DELAY is not set
-# CONFIG_SCC_TRXECHO is not set
-CONFIG_BAYCOM_SER_FDX=m
-CONFIG_BAYCOM_SER_HDX=m
-CONFIG_BAYCOM_PAR=m
-CONFIG_BAYCOM_EPP=m
-CONFIG_YAM=m
-# CONFIG_CAN is not set
-CONFIG_IRDA=m
-
-#
-# IrDA protocols
-#
-CONFIG_IRLAN=m
-CONFIG_IRNET=m
-CONFIG_IRCOMM=m
-CONFIG_IRDA_ULTRA=y
-
-#
-# IrDA options
-#
-CONFIG_IRDA_CACHE_LAST_LSAP=y
-CONFIG_IRDA_FAST_RR=y
-# CONFIG_IRDA_DEBUG is not set
-
-#
-# Infrared-port device drivers
-#
-
-#
-# SIR device drivers
-#
-CONFIG_IRTTY_SIR=m
-
-#
-# Dongle support
-#
-CONFIG_DONGLE=y
-CONFIG_ESI_DONGLE=m
-CONFIG_ACTISYS_DONGLE=m
-CONFIG_TEKRAM_DONGLE=m
-CONFIG_TOIM3232_DONGLE=m
-CONFIG_LITELINK_DONGLE=m
-CONFIG_MA600_DONGLE=m
-CONFIG_GIRBIL_DONGLE=m
-CONFIG_MCP2120_DONGLE=m
-CONFIG_OLD_BELKIN_DONGLE=m
-CONFIG_ACT200L_DONGLE=m
-CONFIG_KINGSUN_DONGLE=m
-CONFIG_KSDAZZLE_DONGLE=m
-CONFIG_KS959_DONGLE=m
-
-#
-# FIR device drivers
-#
-CONFIG_USB_IRDA=m
-CONFIG_SIGMATEL_FIR=m
-CONFIG_NSC_FIR=m
-CONFIG_WINBOND_FIR=m
-CONFIG_TOSHIBA_FIR=m
-CONFIG_SMC_IRCC_FIR=m
-CONFIG_ALI_FIR=m
-CONFIG_VLSI_FIR=m
-CONFIG_VIA_FIR=m
-CONFIG_MCS_FIR=m
-CONFIG_BT=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-# CONFIG_BT_BNEP_MC_FILTER is not set
-# CONFIG_BT_BNEP_PROTO_FILTER is not set
-# CONFIG_BT_CMTP is not set
-CONFIG_BT_HIDP=m
-
-#
-# Bluetooth device drivers
-#
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBTSDIO=m
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_ATH3K=y
-CONFIG_BT_HCIUART_LL=y
-CONFIG_BT_HCIUART_3WIRE=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIDTL1=m
-CONFIG_BT_HCIBT3C=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIBTUART=m
-CONFIG_BT_HCIVHCI=m
-CONFIG_BT_MRVL=m
-CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_ATH3K=m
-CONFIG_BT_WILINK=m
-CONFIG_AF_RXRPC=m
-# CONFIG_AF_RXRPC_DEBUG is not set
-CONFIG_RXKAD=m
-CONFIG_FIB_RULES=y
-CONFIG_WIRELESS=y
-CONFIG_WIRELESS_EXT=y
-CONFIG_WEXT_CORE=y
-CONFIG_WEXT_PROC=y
-CONFIG_WEXT_SPY=y
-CONFIG_WEXT_PRIV=y
-CONFIG_CFG80211=m
-# CONFIG_NL80211_TESTMODE is not set
-# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
-# CONFIG_CFG80211_REG_DEBUG is not set
-CONFIG_CFG80211_DEFAULT_PS=y
-# CONFIG_CFG80211_DEBUGFS is not set
-# CONFIG_CFG80211_INTERNAL_REGDB is not set
-CONFIG_CFG80211_WEXT=y
-CONFIG_LIB80211=m
-CONFIG_LIB80211_CRYPT_WEP=m
-CONFIG_LIB80211_CRYPT_CCMP=m
-CONFIG_LIB80211_CRYPT_TKIP=m
-# CONFIG_LIB80211_DEBUG is not set
-CONFIG_MAC80211=m
-CONFIG_MAC80211_HAS_RC=y
-CONFIG_MAC80211_RC_MINSTREL=y
-CONFIG_MAC80211_RC_MINSTREL_HT=y
-CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
-CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
-CONFIG_MAC80211_MESH=y
-CONFIG_MAC80211_LEDS=y
-# CONFIG_MAC80211_DEBUGFS is not set
-# CONFIG_MAC80211_MESSAGE_TRACING is not set
-# CONFIG_MAC80211_DEBUG_MENU is not set
-CONFIG_WIMAX=m
-CONFIG_WIMAX_DEBUG_LEVEL=8
-CONFIG_RFKILL=m
-CONFIG_RFKILL_LEDS=y
-CONFIG_RFKILL_INPUT=y
-CONFIG_NET_9P=m
-CONFIG_NET_9P_VIRTIO=m
-# CONFIG_NET_9P_DEBUG is not set
-CONFIG_CAIF=m
-# CONFIG_CAIF_DEBUG is not set
-CONFIG_CAIF_NETDEV=m
-CONFIG_CAIF_USB=m
-CONFIG_CEPH_LIB=m
-# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
-# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
-CONFIG_NFC=m
-CONFIG_NFC_NCI=m
-# CONFIG_NFC_NCI_SPI is not set
-CONFIG_NFC_HCI=m
-# CONFIG_NFC_SHDLC is not set
-
-#
-# Near Field Communication (NFC) devices
-#
-CONFIG_NFC_PN533=m
-CONFIG_NFC_WILINK=m
-CONFIG_NFC_MEI_PHY=m
-CONFIG_NFC_SIM=m
-CONFIG_NFC_PN544=m
-CONFIG_NFC_PN544_MEI=m
-CONFIG_NFC_MICROREAD=m
-CONFIG_NFC_MICROREAD_MEI=m
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_UEVENT_HELPER_PATH=""
-CONFIG_DEVTMPFS=y
-# CONFIG_DEVTMPFS_MOUNT is not set
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_FW_LOADER=y
-CONFIG_FIRMWARE_IN_KERNEL=y
-CONFIG_EXTRA_FIRMWARE=""
-CONFIG_FW_LOADER_USER_HELPER=y
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_DEVRES is not set
-# CONFIG_SYS_HYPERVISOR is not set
-# CONFIG_GENERIC_CPU_DEVICES is not set
-CONFIG_REGMAP=y
-CONFIG_REGMAP_I2C=m
-CONFIG_REGMAP_MMIO=m
-CONFIG_REGMAP_IRQ=y
-CONFIG_DMA_SHARED_BUFFER=y
-# CONFIG_CMA is not set
-
-#
-# Bus devices
-#
-CONFIG_CONNECTOR=y
-CONFIG_PROC_EVENTS=y
-CONFIG_MTD=m
-CONFIG_MTD_TESTS=m
-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
-
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_BLKDEVS=m
-CONFIG_MTD_BLOCK=m
-CONFIG_MTD_BLOCK_RO=m
-CONFIG_FTL=m
-CONFIG_NFTL=m
-CONFIG_NFTL_RW=y
-CONFIG_INFTL=m
-CONFIG_RFD_FTL=m
-CONFIG_SSFDC=m
-# CONFIG_SM_FTL is not set
-CONFIG_MTD_OOPS=m
-CONFIG_MTD_SWAP=m
-
-#
-# RAM/ROM/Flash chip drivers
-#
-CONFIG_MTD_CFI=m
-CONFIG_MTD_JEDECPROBE=m
-CONFIG_MTD_GEN_PROBE=m
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-CONFIG_MTD_CFI_INTELEXT=m
-CONFIG_MTD_CFI_AMDSTD=m
-CONFIG_MTD_CFI_STAA=m
-CONFIG_MTD_CFI_UTIL=m
-CONFIG_MTD_RAM=m
-CONFIG_MTD_ROM=m
-CONFIG_MTD_ABSENT=m
-
-#
-# Mapping drivers for chip access
-#
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-# CONFIG_MTD_PHYSMAP is not set
-CONFIG_MTD_PHYSMAP_OF=m
-CONFIG_MTD_SC520CDP=m
-CONFIG_MTD_NETSC520=m
-CONFIG_MTD_TS5500=m
-# CONFIG_MTD_SBC_GXX is not set
-# CONFIG_MTD_AMD76XROM is not set
-# CONFIG_MTD_ICHXROM is not set
-# CONFIG_MTD_ESB2ROM is not set
-# CONFIG_MTD_CK804XROM is not set
-CONFIG_MTD_SCB2_FLASH=m
-# CONFIG_MTD_NETtel is not set
-# CONFIG_MTD_L440GX is not set
-CONFIG_MTD_PCI=m
-# CONFIG_MTD_PCMCIA is not set
-# CONFIG_MTD_GPIO_ADDR is not set
-# CONFIG_MTD_INTEL_VR_NOR is not set
-CONFIG_MTD_PLATRAM=m
-# CONFIG_MTD_LATCH_ADDR is not set
-
-#
-# Self-contained MTD device drivers
-#
-CONFIG_MTD_PMC551=m
-# CONFIG_MTD_PMC551_BUGFIX is not set
-# CONFIG_MTD_PMC551_DEBUG is not set
-# CONFIG_MTD_DATAFLASH is not set
-# CONFIG_MTD_M25P80 is not set
-# CONFIG_MTD_SST25L is not set
-# CONFIG_MTD_SLRAM is not set
-CONFIG_MTD_PHRAM=m
-CONFIG_MTD_MTDRAM=m
-CONFIG_MTDRAM_TOTAL_SIZE=4096
-CONFIG_MTDRAM_ERASE_SIZE=128
-CONFIG_MTD_BLOCK2MTD=m
-
-#
-# Disk-On-Chip Device Drivers
-#
-CONFIG_MTD_DOCG3=m
-CONFIG_BCH_CONST_M=14
-CONFIG_BCH_CONST_T=4
-CONFIG_MTD_NAND_ECC=m
-CONFIG_MTD_NAND_ECC_SMC=y
-CONFIG_MTD_NAND=m
-# CONFIG_MTD_NAND_ECC_BCH is not set
-CONFIG_MTD_SM_COMMON=m
-# CONFIG_MTD_NAND_DENALI is not set
-CONFIG_MTD_NAND_IDS=m
-CONFIG_MTD_NAND_RICOH=m
-CONFIG_MTD_NAND_DISKONCHIP=m
-# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
-CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
-# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
-CONFIG_MTD_NAND_DOCG4=m
-# CONFIG_MTD_NAND_CAFE is not set
-CONFIG_MTD_NAND_CS553X=m
-CONFIG_MTD_NAND_NANDSIM=m
-# CONFIG_MTD_NAND_PLATFORM is not set
-CONFIG_MTD_ALAUDA=m
-# CONFIG_MTD_ONENAND is not set
-
-#
-# LPDDR flash memory drivers
-#
-CONFIG_MTD_LPDDR=m
-CONFIG_MTD_QINFO_PROBE=m
-CONFIG_MTD_UBI=m
-CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MTD_UBI_BEB_LIMIT=20
-# CONFIG_MTD_UBI_FASTMAP is not set
-# CONFIG_MTD_UBI_GLUEBI is not set
-CONFIG_OF=y
-
-#
-# Device Tree and Open Firmware support
-#
-CONFIG_PROC_DEVICETREE=y
-# CONFIG_OF_SELFTEST is not set
-CONFIG_OF_PROMTREE=y
-CONFIG_OF_ADDRESS=y
-CONFIG_OF_IRQ=y
-CONFIG_OF_I2C=m
-CONFIG_OF_NET=y
-CONFIG_OF_MDIO=m
-CONFIG_OF_PCI=y
-CONFIG_OF_PCI_IRQ=y
-CONFIG_OF_MTD=y
-CONFIG_PARPORT=m
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_SERIAL=m
-# CONFIG_PARPORT_PC_FIFO is not set
-# CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_PC_PCMCIA=m
-# CONFIG_PARPORT_GSC is not set
-CONFIG_PARPORT_AX88796=m
-CONFIG_PARPORT_1284=y
-CONFIG_PARPORT_NOT_PC=y
-CONFIG_PNP=y
-# CONFIG_PNP_DEBUG_MESSAGES is not set
-
-#
-# Protocols
-#
-CONFIG_ISAPNP=y
-# CONFIG_PNPBIOS is not set
-CONFIG_PNPACPI=y
-CONFIG_BLK_DEV=y
-CONFIG_BLK_DEV_FD=m
-# CONFIG_PARIDE is not set
-CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
-CONFIG_BLK_CPQ_DA=m
-CONFIG_BLK_CPQ_CISS_DA=m
-# CONFIG_CISS_SCSI_TAPE is not set
-CONFIG_BLK_DEV_DAC960=m
-# CONFIG_BLK_DEV_UMEM is not set
-# CONFIG_BLK_DEV_COW_COMMON is not set
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
-CONFIG_BLK_DEV_CRYPTOLOOP=m
-CONFIG_BLK_DEV_DRBD=m
-# CONFIG_DRBD_FAULT_INJECTION is not set
-CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_NVME=m
-CONFIG_BLK_DEV_OSD=m
-CONFIG_BLK_DEV_SX8=m
-CONFIG_BLK_DEV_RAM=m
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=16384
-# CONFIG_BLK_DEV_XIP is not set
-CONFIG_CDROM_PKTCDVD=m
-CONFIG_CDROM_PKTCDVD_BUFFERS=8
-# CONFIG_CDROM_PKTCDVD_WCACHE is not set
-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
-#
-CONFIG_SENSORS_LIS3LV02D=m
-CONFIG_AD525X_DPOT=m
-CONFIG_AD525X_DPOT_I2C=m
-# CONFIG_AD525X_DPOT_SPI is not set
-# CONFIG_DUMMY_IRQ is not set
-# CONFIG_IBM_ASM is not set
-CONFIG_PHANTOM=m
-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
-CONFIG_CS5535_CLOCK_EVENT_SRC=m
-CONFIG_HP_ILO=m
-CONFIG_APDS9802ALS=m
-CONFIG_ISL29003=m
-CONFIG_ISL29020=m
-CONFIG_SENSORS_TSL2550=m
-CONFIG_SENSORS_BH1780=m
-CONFIG_SENSORS_BH1770=m
-CONFIG_SENSORS_APDS990X=m
-CONFIG_HMC6352=m
-CONFIG_DS1682=m
-# CONFIG_TI_DAC7512 is not set
-CONFIG_VMWARE_BALLOON=m
-CONFIG_BMP085=y
-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_SRAM is not set
-CONFIG_C2PORT=m
-CONFIG_C2PORT_DURAMAR_2150=m
-
-#
-# EEPROM support
-#
-CONFIG_EEPROM_AT24=m
-# CONFIG_EEPROM_AT25 is not set
-CONFIG_EEPROM_LEGACY=m
-CONFIG_EEPROM_MAX6875=m
-CONFIG_EEPROM_93CX6=m
-# CONFIG_EEPROM_93XX46 is not set
-CONFIG_CB710_CORE=m
-# CONFIG_CB710_DEBUG is not set
-CONFIG_CB710_DEBUG_ASSUMPTIONS=y
-
-#
-# Texas Instruments shared transport line discipline
-#
-CONFIG_TI_ST=m
-CONFIG_SENSORS_LIS3_I2C=m
-
-#
-# Altera FPGA firmware download module
-#
-CONFIG_ALTERA_STAPL=m
-CONFIG_INTEL_MEI=m
-CONFIG_INTEL_MEI_ME=m
-CONFIG_VMWARE_VMCI=m
-CONFIG_HAVE_IDE=y
-# CONFIG_IDE is not set
-
-#
-# SCSI device support
-#
-CONFIG_SCSI_MOD=m
-CONFIG_RAID_ATTRS=m
-CONFIG_SCSI=m
-CONFIG_SCSI_DMA=y
-CONFIG_SCSI_TGT=m
-CONFIG_SCSI_NETLINK=y
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=m
-CONFIG_CHR_DEV_ST=m
-CONFIG_CHR_DEV_OSST=m
-CONFIG_BLK_DEV_SR=m
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SG=m
-CONFIG_CHR_DEV_SCH=m
-CONFIG_SCSI_ENCLOSURE=m
-CONFIG_SCSI_MULTI_LUN=y
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
-
-#
-# SCSI Transports
-#
-CONFIG_SCSI_SPI_ATTRS=m
-CONFIG_SCSI_FC_ATTRS=m
-# CONFIG_SCSI_FC_TGT_ATTRS is not set
-CONFIG_SCSI_ISCSI_ATTRS=m
-CONFIG_SCSI_SAS_ATTRS=m
-CONFIG_SCSI_SAS_LIBSAS=m
-CONFIG_SCSI_SAS_ATA=y
-CONFIG_SCSI_SAS_HOST_SMP=y
-CONFIG_SCSI_SRP_ATTRS=m
-CONFIG_SCSI_SRP_TGT_ATTRS=y
-CONFIG_SCSI_LOWLEVEL=y
-CONFIG_ISCSI_TCP=m
-CONFIG_ISCSI_BOOT_SYSFS=m
-CONFIG_SCSI_CXGB3_ISCSI=m
-CONFIG_SCSI_CXGB4_ISCSI=m
-CONFIG_SCSI_BNX2_ISCSI=m
-CONFIG_SCSI_BNX2X_FCOE=m
-CONFIG_BE2ISCSI=m
-CONFIG_BLK_DEV_3W_XXXX_RAID=m
-CONFIG_SCSI_HPSA=m
-CONFIG_SCSI_3W_9XXX=m
-CONFIG_SCSI_3W_SAS=m
-CONFIG_SCSI_7000FASST=m
-CONFIG_SCSI_ACARD=m
-CONFIG_SCSI_AHA152X=m
-CONFIG_SCSI_AHA1542=m
-CONFIG_SCSI_AACRAID=m
-CONFIG_SCSI_AIC7XXX=m
-CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
-CONFIG_AIC7XXX_RESET_DELAY_MS=15000
-# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
-CONFIG_AIC7XXX_DEBUG_MASK=0
-CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
-# CONFIG_SCSI_AIC7XXX_OLD is not set
-CONFIG_SCSI_AIC79XX=m
-CONFIG_AIC79XX_CMDS_PER_DEVICE=32
-CONFIG_AIC79XX_RESET_DELAY_MS=15000
-# CONFIG_AIC79XX_DEBUG_ENABLE is not set
-CONFIG_AIC79XX_DEBUG_MASK=0
-CONFIG_AIC79XX_REG_PRETTY_PRINT=y
-CONFIG_SCSI_AIC94XX=m
-# CONFIG_AIC94XX_DEBUG is not set
-CONFIG_SCSI_MVSAS=m
-# CONFIG_SCSI_MVSAS_DEBUG is not set
-CONFIG_SCSI_MVSAS_TASKLET=y
-CONFIG_SCSI_MVUMI=m
-CONFIG_SCSI_DPT_I2O=m
-CONFIG_SCSI_ADVANSYS=m
-CONFIG_SCSI_IN2000=m
-CONFIG_SCSI_ARCMSR=m
-CONFIG_MEGARAID_NEWGEN=y
-CONFIG_MEGARAID_MM=m
-CONFIG_MEGARAID_MAILBOX=m
-CONFIG_MEGARAID_LEGACY=m
-CONFIG_MEGARAID_SAS=m
-CONFIG_SCSI_MPT2SAS=m
-CONFIG_SCSI_MPT2SAS_MAX_SGE=128
-# CONFIG_SCSI_MPT2SAS_LOGGING is not set
-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_UFSHCD_PLATFORM=m
-CONFIG_SCSI_HPTIOP=m
-CONFIG_SCSI_BUSLOGIC=m
-# CONFIG_SCSI_FLASHPOINT is not set
-CONFIG_VMWARE_PVSCSI=m
-CONFIG_HYPERV_STORAGE=m
-CONFIG_LIBFC=m
-CONFIG_LIBFCOE=m
-CONFIG_FCOE=m
-CONFIG_FCOE_FNIC=m
-CONFIG_SCSI_DMX3191D=m
-CONFIG_SCSI_DTC3280=m
-CONFIG_SCSI_EATA=m
-# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set
-# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set
-CONFIG_SCSI_EATA_MAX_TAGS=16
-CONFIG_SCSI_FUTURE_DOMAIN=m
-CONFIG_SCSI_GDTH=m
-CONFIG_SCSI_ISCI=m
-CONFIG_SCSI_GENERIC_NCR5380=m
-CONFIG_SCSI_GENERIC_NCR5380_MMIO=m
-CONFIG_SCSI_GENERIC_NCR53C400=y
-CONFIG_SCSI_IPS=m
-CONFIG_SCSI_INITIO=m
-CONFIG_SCSI_INIA100=m
-CONFIG_SCSI_PPA=m
-CONFIG_SCSI_IMM=m
-# CONFIG_SCSI_IZIP_EPP16 is not set
-# CONFIG_SCSI_IZIP_SLOW_CTR is not set
-CONFIG_SCSI_NCR53C406A=m
-CONFIG_SCSI_STEX=m
-CONFIG_SCSI_SYM53C8XX_2=m
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
-CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-CONFIG_SCSI_SYM53C8XX_MMIO=y
-CONFIG_SCSI_IPR=m
-# CONFIG_SCSI_IPR_TRACE is not set
-# CONFIG_SCSI_IPR_DUMP is not set
-CONFIG_SCSI_PAS16=m
-CONFIG_SCSI_QLOGIC_FAS=m
-CONFIG_SCSI_QLOGIC_1280=m
-CONFIG_SCSI_QLA_FC=m
-CONFIG_TCM_QLA2XXX=m
-CONFIG_SCSI_QLA_ISCSI=m
-CONFIG_SCSI_LPFC=m
-# CONFIG_SCSI_LPFC_DEBUG_FS is not set
-CONFIG_SCSI_SYM53C416=m
-CONFIG_SCSI_DC395x=m
-CONFIG_SCSI_DC390T=m
-CONFIG_SCSI_T128=m
-CONFIG_SCSI_U14_34F=m
-# CONFIG_SCSI_U14_34F_TAGGED_QUEUE is not set
-# CONFIG_SCSI_U14_34F_LINKED_COMMANDS is not set
-CONFIG_SCSI_U14_34F_MAX_TAGS=8
-CONFIG_SCSI_ULTRASTOR=m
-CONFIG_SCSI_NSP32=m
-# CONFIG_SCSI_DEBUG is not set
-CONFIG_SCSI_PMCRAID=m
-CONFIG_SCSI_PM8001=m
-CONFIG_SCSI_SRP=m
-CONFIG_SCSI_BFA_FC=m
-CONFIG_SCSI_VIRTIO=m
-CONFIG_SCSI_CHELSIO_FCOE=m
-CONFIG_SCSI_LOWLEVEL_PCMCIA=y
-CONFIG_PCMCIA_AHA152X=m
-CONFIG_PCMCIA_FDOMAIN=m
-CONFIG_PCMCIA_NINJA_SCSI=m
-CONFIG_PCMCIA_QLOGIC=m
-CONFIG_PCMCIA_SYM53C500=m
-CONFIG_SCSI_DH=m
-CONFIG_SCSI_DH_RDAC=m
-CONFIG_SCSI_DH_HP_SW=m
-CONFIG_SCSI_DH_EMC=m
-CONFIG_SCSI_DH_ALUA=m
-CONFIG_SCSI_OSD_INITIATOR=m
-CONFIG_SCSI_OSD_ULD=m
-CONFIG_SCSI_OSD_DPRINT_SENSE=0
-# CONFIG_SCSI_OSD_DEBUG is not set
-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
-
-#
-# Controllers with non-SFF native interface
-#
-CONFIG_SATA_AHCI=m
-CONFIG_SATA_AHCI_PLATFORM=m
-CONFIG_SATA_INIC162X=m
-CONFIG_SATA_ACARD_AHCI=m
-CONFIG_SATA_SIL24=m
-CONFIG_ATA_SFF=y
-
-#
-# SFF controllers with custom DMA interface
-#
-CONFIG_PDC_ADMA=m
-CONFIG_SATA_QSTOR=m
-CONFIG_SATA_SX4=m
-CONFIG_ATA_BMDMA=y
-
-#
-# SATA SFF controllers with BMDMA
-#
-CONFIG_ATA_PIIX=m
-CONFIG_SATA_HIGHBANK=m
-CONFIG_SATA_MV=m
-CONFIG_SATA_NV=m
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_RCAR=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SVW=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_VIA=m
-CONFIG_SATA_VITESSE=m
-
-#
-# PATA SFF controllers with BMDMA
-#
-CONFIG_PATA_ALI=m
-CONFIG_PATA_AMD=m
-CONFIG_PATA_ARASAN_CF=m
-CONFIG_PATA_ARTOP=m
-CONFIG_PATA_ATIIXP=m
-CONFIG_PATA_ATP867X=m
-CONFIG_PATA_CMD64X=m
-CONFIG_PATA_CS5520=m
-CONFIG_PATA_CS5530=m
-CONFIG_PATA_CS5535=m
-CONFIG_PATA_CS5536=m
-CONFIG_PATA_CYPRESS=m
-CONFIG_PATA_EFAR=m
-CONFIG_PATA_HPT366=m
-CONFIG_PATA_HPT37X=m
-CONFIG_PATA_HPT3X2N=m
-CONFIG_PATA_HPT3X3=m
-# CONFIG_PATA_HPT3X3_DMA is not set
-CONFIG_PATA_IT8213=m
-CONFIG_PATA_IT821X=m
-CONFIG_PATA_JMICRON=m
-CONFIG_PATA_MARVELL=m
-CONFIG_PATA_NETCELL=m
-CONFIG_PATA_NINJA32=m
-CONFIG_PATA_NS87415=m
-CONFIG_PATA_OLDPIIX=m
-CONFIG_PATA_OPTIDMA=m
-CONFIG_PATA_PDC2027X=m
-CONFIG_PATA_PDC_OLD=m
-CONFIG_PATA_RADISYS=m
-CONFIG_PATA_RDC=m
-CONFIG_PATA_SC1200=m
-CONFIG_PATA_SCH=m
-CONFIG_PATA_SERVERWORKS=m
-CONFIG_PATA_SIL680=m
-CONFIG_PATA_SIS=m
-CONFIG_PATA_TOSHIBA=m
-CONFIG_PATA_TRIFLEX=m
-CONFIG_PATA_VIA=m
-CONFIG_PATA_WINBOND=m
-
-#
-# PIO-only SFF controllers
-#
-CONFIG_PATA_CMD640_PCI=m
-CONFIG_PATA_ISAPNP=m
-CONFIG_PATA_MPIIX=m
-CONFIG_PATA_NS87410=m
-CONFIG_PATA_OPTI=m
-CONFIG_PATA_PCMCIA=m
-CONFIG_PATA_QDI=m
-CONFIG_PATA_RZ1000=m
-CONFIG_PATA_WINBOND_VLB=m
-
-#
-# Generic fallback / legacy drivers
-#
-CONFIG_PATA_ACPI=m
-CONFIG_ATA_GENERIC=m
-CONFIG_PATA_LEGACY=m
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=m
-CONFIG_MD_LINEAR=m
-CONFIG_MD_RAID0=m
-CONFIG_MD_RAID1=m
-CONFIG_MD_RAID10=m
-CONFIG_MD_RAID456=m
-CONFIG_MD_MULTIPATH=m
-CONFIG_MD_FAULTY=m
-CONFIG_BCACHE=m
-# CONFIG_BCACHE_DEBUG is not set
-# CONFIG_BCACHE_EDEBUG is not set
-# CONFIG_BCACHE_CLOSURES_DEBUG is not set
-CONFIG_BLK_DEV_DM=m
-# CONFIG_DM_DEBUG is not set
-CONFIG_DM_BUFIO=m
-CONFIG_DM_BIO_PRISON=m
-CONFIG_DM_PERSISTENT_DATA=m
-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
-CONFIG_DM_ZERO=m
-CONFIG_DM_MULTIPATH=m
-CONFIG_DM_MULTIPATH_QL=m
-CONFIG_DM_MULTIPATH_ST=m
-CONFIG_DM_DELAY=m
-CONFIG_DM_UEVENT=y
-CONFIG_DM_FLAKEY=m
-CONFIG_DM_VERITY=m
-CONFIG_DM_SWITCH=m
-CONFIG_TARGET_CORE=m
-CONFIG_TCM_IBLOCK=m
-CONFIG_TCM_FILEIO=m
-CONFIG_TCM_PSCSI=m
-CONFIG_LOOPBACK_TARGET=m
-CONFIG_TCM_FC=m
-CONFIG_ISCSI_TARGET=m
-CONFIG_SBP_TARGET=m
-CONFIG_FUSION=y
-CONFIG_FUSION_SPI=m
-CONFIG_FUSION_FC=m
-CONFIG_FUSION_SAS=m
-CONFIG_FUSION_MAX_SGE=128
-CONFIG_FUSION_CTL=m
-# CONFIG_FUSION_LOGGING is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-CONFIG_FIREWIRE=m
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-CONFIG_FIREWIRE_NET=m
-CONFIG_FIREWIRE_NOSY=m
-CONFIG_I2O=m
-CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
-CONFIG_I2O_EXT_ADAPTEC=y
-CONFIG_I2O_CONFIG=m
-CONFIG_I2O_CONFIG_OLD_IOCTL=y
-CONFIG_I2O_BUS=m
-CONFIG_I2O_BLOCK=m
-CONFIG_I2O_SCSI=m
-CONFIG_I2O_PROC=m
-CONFIG_MACINTOSH_DRIVERS=y
-CONFIG_MAC_EMUMOUSEBTN=y
-CONFIG_NETDEVICES=y
-CONFIG_MII=m
-CONFIG_NET_CORE=y
-CONFIG_BONDING=m
-CONFIG_DUMMY=m
-CONFIG_EQUALIZER=m
-# CONFIG_NET_FC is not set
-CONFIG_IFB=m
-CONFIG_NET_TEAM=m
-CONFIG_NET_TEAM_MODE_BROADCAST=m
-CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
-CONFIG_NET_TEAM_MODE_RANDOM=m
-CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
-CONFIG_NET_TEAM_MODE_LOADBALANCE=m
-CONFIG_MACVLAN=m
-CONFIG_MACVTAP=m
-CONFIG_VXLAN=m
-CONFIG_NETCONSOLE=m
-CONFIG_NETCONSOLE_DYNAMIC=y
-CONFIG_NETPOLL=y
-# CONFIG_NETPOLL_TRAP is not set
-CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_RIONET=m
-CONFIG_RIONET_TX_SIZE=128
-CONFIG_RIONET_RX_SIZE=128
-CONFIG_TUN=m
-CONFIG_VETH=m
-CONFIG_VIRTIO_NET=m
-CONFIG_NLMON=m
-CONFIG_SUNGEM_PHY=m
-# CONFIG_ARCNET is not set
-CONFIG_ATM_DRIVERS=y
-# CONFIG_ATM_DUMMY is not set
-CONFIG_ATM_TCP=m
-CONFIG_ATM_LANAI=m
-CONFIG_ATM_ENI=m
-# CONFIG_ATM_ENI_DEBUG is not set
-# CONFIG_ATM_ENI_TUNE_BURST is not set
-CONFIG_ATM_FIRESTREAM=m
-CONFIG_ATM_ZATM=m
-# CONFIG_ATM_ZATM_DEBUG is not set
-CONFIG_ATM_NICSTAR=m
-# CONFIG_ATM_NICSTAR_USE_SUNI is not set
-# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
-CONFIG_ATM_IDT77252=m
-# CONFIG_ATM_IDT77252_DEBUG is not set
-# CONFIG_ATM_IDT77252_RCV_ALL is not set
-CONFIG_ATM_IDT77252_USE_SUNI=y
-CONFIG_ATM_AMBASSADOR=m
-# CONFIG_ATM_AMBASSADOR_DEBUG is not set
-CONFIG_ATM_HORIZON=m
-# CONFIG_ATM_HORIZON_DEBUG is not set
-CONFIG_ATM_IA=m
-# CONFIG_ATM_IA_DEBUG is not set
-CONFIG_ATM_FORE200E=m
-# CONFIG_ATM_FORE200E_USE_TASKLET is not set
-CONFIG_ATM_FORE200E_TX_RETRY=16
-CONFIG_ATM_FORE200E_DEBUG=0
-CONFIG_ATM_HE=m
-# CONFIG_ATM_HE_USE_SUNI is not set
-CONFIG_ATM_SOLOS=m
-
-#
-# CAIF transport drivers
-#
-CONFIG_CAIF_TTY=m
-CONFIG_CAIF_SPI_SLAVE=m
-CONFIG_CAIF_SPI_SYNC=y
-CONFIG_CAIF_HSI=m
-CONFIG_CAIF_VIRTIO=m
-CONFIG_VHOST_NET=m
-CONFIG_VHOST_SCSI=m
-CONFIG_VHOST_RING=m
-CONFIG_VHOST=m
-
-#
-# Distributed Switch Architecture drivers
-#
-CONFIG_NET_DSA_MV88E6XXX=m
-CONFIG_NET_DSA_MV88E6060=m
-CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y
-CONFIG_NET_DSA_MV88E6131=m
-CONFIG_NET_DSA_MV88E6123_61_65=m
-CONFIG_ETHERNET=y
-CONFIG_MDIO=m
-CONFIG_NET_VENDOR_3COM=y
-CONFIG_EL3=m
-CONFIG_3C515=m
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_3C589=m
-CONFIG_VORTEX=m
-CONFIG_TYPHOON=m
-CONFIG_NET_VENDOR_ADAPTEC=y
-CONFIG_ADAPTEC_STARFIRE=m
-CONFIG_NET_VENDOR_ALTEON=y
-CONFIG_ACENIC=m
-# CONFIG_ACENIC_OMIT_TIGON_I is not set
-CONFIG_NET_VENDOR_AMD=y
-CONFIG_AMD8111_ETH=m
-CONFIG_LANCE=m
-CONFIG_PCNET32=m
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_NI65=m
-CONFIG_NET_VENDOR_ARC=y
-CONFIG_ARC_EMAC=m
-CONFIG_NET_VENDOR_ATHEROS=y
-CONFIG_ATL2=m
-CONFIG_ATL1=m
-CONFIG_ATL1E=m
-CONFIG_ATL1C=m
-CONFIG_ALX=m
-CONFIG_NET_CADENCE=y
-CONFIG_ARM_AT91_ETHER=m
-CONFIG_MACB=m
-CONFIG_NET_VENDOR_BROADCOM=y
-CONFIG_B44=m
-CONFIG_B44_PCI_AUTOSELECT=y
-CONFIG_B44_PCICORE_AUTOSELECT=y
-CONFIG_B44_PCI=y
-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
-CONFIG_NET_VENDOR_CHELSIO=y
-CONFIG_CHELSIO_T1=m
-CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T3=m
-CONFIG_CHELSIO_T4=m
-CONFIG_CHELSIO_T4VF=m
-CONFIG_NET_VENDOR_CIRRUS=y
-CONFIG_CS89x0=m
-# CONFIG_CS89x0_PLATFORM is not set
-CONFIG_NET_VENDOR_CISCO=y
-CONFIG_ENIC=m
-CONFIG_DNET=m
-CONFIG_NET_VENDOR_DEC=y
-CONFIG_NET_TULIP=y
-CONFIG_DE2104X=m
-CONFIG_DE2104X_DSL=0
-CONFIG_TULIP=m
-# CONFIG_TULIP_MWI is not set
-# CONFIG_TULIP_MMIO is not set
-# CONFIG_TULIP_NAPI is not set
-CONFIG_DE4X5=m
-CONFIG_WINBOND_840=m
-CONFIG_DM9102=m
-CONFIG_ULI526X=m
-CONFIG_PCMCIA_XIRCOM=m
-CONFIG_NET_VENDOR_DLINK=y
-CONFIG_DL2K=m
-CONFIG_SUNDANCE=m
-# CONFIG_SUNDANCE_MMIO is not set
-CONFIG_NET_VENDOR_EMULEX=y
-CONFIG_BE2NET=m
-CONFIG_NET_VENDOR_EXAR=y
-CONFIG_S2IO=m
-CONFIG_VXGE=m
-# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
-CONFIG_NET_VENDOR_FUJITSU=y
-CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_NET_VENDOR_HP=y
-CONFIG_HP100=m
-CONFIG_NET_VENDOR_INTEL=y
-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
-CONFIG_IXGBE=m
-CONFIG_IXGBE_HWMON=y
-CONFIG_IXGBE_DCA=y
-CONFIG_IXGBEVF=m
-CONFIG_NET_VENDOR_I825XX=y
-CONFIG_IP1000=m
-CONFIG_JME=m
-CONFIG_NET_VENDOR_MARVELL=y
-CONFIG_MVMDIO=m
-CONFIG_SKGE=m
-# CONFIG_SKGE_DEBUG is not set
-CONFIG_SKGE_GENESIS=y
-CONFIG_SKY2=m
-# CONFIG_SKY2_DEBUG is not set
-CONFIG_NET_VENDOR_MELLANOX=y
-CONFIG_MLX4_EN=m
-CONFIG_MLX4_CORE=m
-CONFIG_MLX4_DEBUG=y
-# CONFIG_MLX5_CORE is not set
-CONFIG_NET_VENDOR_MICREL=y
-CONFIG_KS8842=m
-# CONFIG_KS8851 is not set
-CONFIG_KS8851_MLL=m
-CONFIG_KSZ884X_PCI=m
-CONFIG_NET_VENDOR_MICROCHIP=y
-# CONFIG_ENC28J60 is not set
-CONFIG_NET_VENDOR_MYRI=y
-CONFIG_MYRI10GE=m
-CONFIG_MYRI10GE_DCA=y
-CONFIG_FEALNX=m
-CONFIG_NET_VENDOR_NATSEMI=y
-CONFIG_NATSEMI=m
-CONFIG_NS83820=m
-CONFIG_NET_VENDOR_8390=y
-CONFIG_PCMCIA_AXNET=m
-CONFIG_NE2000=m
-CONFIG_NE2K_PCI=m
-CONFIG_PCMCIA_PCNET=m
-CONFIG_ULTRA=m
-CONFIG_WD80x3=m
-CONFIG_NET_VENDOR_NVIDIA=y
-CONFIG_FORCEDETH=m
-CONFIG_NET_VENDOR_OKI=y
-CONFIG_PCH_GBE=m
-CONFIG_ETHOC=m
-CONFIG_NET_PACKET_ENGINE=y
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_NET_VENDOR_QLOGIC=y
-CONFIG_QLA3XXX=m
-CONFIG_QLCNIC=m
-CONFIG_QLCNIC_SRIOV=y
-CONFIG_QLGE=m
-CONFIG_NETXEN_NIC=m
-CONFIG_NET_VENDOR_REALTEK=y
-CONFIG_ATP=m
-CONFIG_8139CP=m
-CONFIG_8139TOO=m
-# CONFIG_8139TOO_PIO is not set
-CONFIG_8139TOO_TUNE_TWISTER=y
-CONFIG_8139TOO_8129=y
-# CONFIG_8139_OLD_RX_RESET is not set
-CONFIG_R8169=m
-CONFIG_SH_ETH=m
-CONFIG_NET_VENDOR_RDC=y
-CONFIG_R6040=m
-CONFIG_NET_VENDOR_SEEQ=y
-CONFIG_NET_VENDOR_SILAN=y
-CONFIG_SC92031=m
-CONFIG_NET_VENDOR_SIS=y
-CONFIG_SIS900=m
-CONFIG_SIS190=m
-CONFIG_SFC=m
-CONFIG_SFC_MTD=y
-CONFIG_SFC_MCDI_MON=y
-CONFIG_SFC_SRIOV=y
-CONFIG_NET_VENDOR_SMSC=y
-CONFIG_SMC9194=m
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_EPIC100=m
-CONFIG_SMSC911X=m
-# CONFIG_SMSC911X_ARCH_HOOKS is not set
-CONFIG_SMSC9420=m
-CONFIG_NET_VENDOR_STMICRO=y
-CONFIG_STMMAC_ETH=m
-# CONFIG_STMMAC_PLATFORM is not set
-CONFIG_STMMAC_PCI=y
-# CONFIG_STMMAC_DEBUG_FS is not set
-# CONFIG_STMMAC_DA is not set
-CONFIG_NET_VENDOR_SUN=y
-CONFIG_HAPPYMEAL=m
-CONFIG_SUNGEM=m
-CONFIG_CASSINI=m
-CONFIG_NIU=m
-CONFIG_NET_VENDOR_TEHUTI=y
-CONFIG_TEHUTI=m
-CONFIG_NET_VENDOR_TI=y
-CONFIG_TLAN=m
-CONFIG_NET_VENDOR_VIA=y
-CONFIG_VIA_RHINE=m
-# CONFIG_VIA_RHINE_MMIO is not set
-CONFIG_VIA_VELOCITY=m
-CONFIG_NET_VENDOR_WIZNET=y
-CONFIG_WIZNET_W5100=m
-CONFIG_WIZNET_W5300=m
-# CONFIG_WIZNET_BUS_DIRECT is not set
-# CONFIG_WIZNET_BUS_INDIRECT is not set
-CONFIG_WIZNET_BUS_ANY=y
-CONFIG_NET_VENDOR_XIRCOM=y
-CONFIG_PCMCIA_XIRC2PS=m
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-CONFIG_NET_SB1000=m
-CONFIG_PHYLIB=m
-
-#
-# MII PHY device drivers
-#
-CONFIG_AT803X_PHY=m
-CONFIG_AMD_PHY=m
-CONFIG_MARVELL_PHY=m
-CONFIG_DAVICOM_PHY=m
-CONFIG_QSEMI_PHY=m
-CONFIG_LXT_PHY=m
-CONFIG_CICADA_PHY=m
-CONFIG_VITESSE_PHY=m
-CONFIG_SMSC_PHY=m
-CONFIG_BROADCOM_PHY=m
-CONFIG_BCM87XX_PHY=m
-CONFIG_ICPLUS_PHY=m
-CONFIG_REALTEK_PHY=m
-CONFIG_NATIONAL_PHY=m
-CONFIG_STE10XP=m
-CONFIG_LSI_ET1011C_PHY=m
-CONFIG_MICREL_PHY=m
-CONFIG_MDIO_BITBANG=m
-# CONFIG_MDIO_GPIO is not set
-CONFIG_MDIO_BUS_MUX=m
-CONFIG_MDIO_BUS_MUX_GPIO=m
-CONFIG_MDIO_BUS_MUX_MMIOREG=m
-# CONFIG_MICREL_KS8995MA is not set
-CONFIG_PLIP=m
-CONFIG_PPP=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_MPPE=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPPOATM=m
-CONFIG_PPPOE=m
-CONFIG_PPTP=m
-CONFIG_PPPOL2TP=m
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_SLIP=m
-CONFIG_SLHC=m
-# CONFIG_SLIP_COMPRESSED is not set
-# CONFIG_SLIP_SMART is not set
-# CONFIG_SLIP_MODE_SLIP6 is not set
-
-#
-# USB Network Adapters
-#
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_RTL8152=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
-CONFIG_USB_NET_CDC_MBIM=m
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_SMSC75XX=m
-CONFIG_USB_NET_SMSC95XX=m
-CONFIG_USB_NET_GL620A=m
-CONFIG_USB_NET_NET1080=m
-CONFIG_USB_NET_PLUSB=m
-CONFIG_USB_NET_MCS7830=m
-CONFIG_USB_NET_RNDIS_HOST=m
-CONFIG_USB_NET_CDC_SUBSET=m
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-CONFIG_USB_BELKIN=y
-CONFIG_USB_ARMLINUX=y
-CONFIG_USB_EPSON2888=y
-CONFIG_USB_KC2190=y
-CONFIG_USB_NET_ZAURUS=m
-CONFIG_USB_NET_CX82310_ETH=m
-CONFIG_USB_NET_KALMIA=m
-CONFIG_USB_NET_QMI_WWAN=m
-CONFIG_USB_HSO=m
-CONFIG_USB_NET_INT51X1=m
-CONFIG_USB_CDC_PHONET=m
-CONFIG_USB_IPHETH=m
-CONFIG_USB_SIERRA_NET=m
-CONFIG_USB_VL600=m
-CONFIG_WLAN=y
-CONFIG_PCMCIA_RAYCS=m
-CONFIG_LIBERTAS_THINFIRM=m
-# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
-CONFIG_LIBERTAS_THINFIRM_USB=m
-CONFIG_AIRO=m
-CONFIG_ATMEL=m
-CONFIG_PCI_ATMEL=m
-CONFIG_PCMCIA_ATMEL=m
-CONFIG_AT76C50X_USB=m
-CONFIG_AIRO_CS=m
-CONFIG_PCMCIA_WL3501=m
-CONFIG_PRISM54=m
-CONFIG_USB_ZD1201=m
-CONFIG_USB_NET_RNDIS_WLAN=m
-CONFIG_RTL8180=m
-CONFIG_RTL8187=m
-CONFIG_RTL8187_LEDS=y
-CONFIG_ADM8211=m
-# CONFIG_MAC80211_HWSIM is not set
-CONFIG_MWL8K=m
-CONFIG_ATH_COMMON=m
-CONFIG_ATH_CARDS=m
-# CONFIG_ATH_DEBUG is not set
-CONFIG_ATH5K=m
-# CONFIG_ATH5K_DEBUG is not set
-# CONFIG_ATH5K_TRACER is not set
-CONFIG_ATH5K_PCI=y
-CONFIG_ATH9K_HW=m
-CONFIG_ATH9K_COMMON=m
-CONFIG_ATH9K_BTCOEX_SUPPORT=y
-CONFIG_ATH9K=m
-CONFIG_ATH9K_PCI=y
-CONFIG_ATH9K_AHB=y
-# CONFIG_ATH9K_DEBUGFS is not set
-# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set
-CONFIG_ATH9K_HTC=m
-# CONFIG_ATH9K_HTC_DEBUGFS is not set
-CONFIG_CARL9170=m
-CONFIG_CARL9170_LEDS=y
-CONFIG_CARL9170_WPC=y
-# CONFIG_CARL9170_HWRNG is not set
-CONFIG_ATH6KL=m
-CONFIG_ATH6KL_SDIO=m
-CONFIG_ATH6KL_USB=m
-# CONFIG_ATH6KL_DEBUG is not set
-# CONFIG_ATH6KL_TRACING is not set
-CONFIG_AR5523=m
-CONFIG_WIL6210=m
-CONFIG_WIL6210_ISR_COR=y
-# CONFIG_WIL6210_TRACING is not set
-CONFIG_ATH10K=m
-CONFIG_ATH10K_PCI=m
-# CONFIG_ATH10K_DEBUG is not set
-CONFIG_ATH10K_DEBUGFS=y
-# CONFIG_ATH10K_TRACING is not set
-CONFIG_B43=m
-CONFIG_B43_BCMA=y
-CONFIG_B43_SSB=y
-CONFIG_B43_PCI_AUTOSELECT=y
-CONFIG_B43_PCICORE_AUTOSELECT=y
-CONFIG_B43_PCMCIA=y
-CONFIG_B43_SDIO=y
-CONFIG_B43_BCMA_PIO=y
-CONFIG_B43_PIO=y
-CONFIG_B43_PHY_N=y
-CONFIG_B43_PHY_LP=y
-CONFIG_B43_PHY_HT=y
-CONFIG_B43_LEDS=y
-CONFIG_B43_HWRNG=y
-# CONFIG_B43_DEBUG is not set
-CONFIG_B43LEGACY=m
-CONFIG_B43LEGACY_PCI_AUTOSELECT=y
-CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
-CONFIG_B43LEGACY_LEDS=y
-CONFIG_B43LEGACY_HWRNG=y
-# CONFIG_B43LEGACY_DEBUG is not set
-CONFIG_B43LEGACY_DMA=y
-CONFIG_B43LEGACY_PIO=y
-CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
-# CONFIG_B43LEGACY_DMA_MODE is not set
-# CONFIG_B43LEGACY_PIO_MODE is not set
-CONFIG_BRCMUTIL=m
-CONFIG_BRCMSMAC=m
-CONFIG_BRCMFMAC=m
-CONFIG_BRCMFMAC_SDIO=y
-CONFIG_BRCMFMAC_USB=y
-# CONFIG_BRCM_TRACING is not set
-# CONFIG_BRCMDBG is not set
-CONFIG_HOSTAP=m
-CONFIG_HOSTAP_FIRMWARE=y
-# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
-CONFIG_HOSTAP_PLX=m
-CONFIG_HOSTAP_PCI=m
-CONFIG_HOSTAP_CS=m
-# CONFIG_IPW2100 is not set
-# CONFIG_IPW2200 is not set
-CONFIG_IWLWIFI=m
-CONFIG_IWLDVM=m
-CONFIG_IWLMVM=m
-CONFIG_IWLWIFI_OPMODE_MODULAR=y
-
-#
-# Debugging Options
-#
-# CONFIG_IWLWIFI_DEBUG is not set
-CONFIG_IWLWIFI_DEVICE_TRACING=y
-# CONFIG_IWLWIFI_P2P is not set
-CONFIG_IWLEGACY=m
-CONFIG_IWL4965=m
-CONFIG_IWL3945=m
-
-#
-# iwl3945 / iwl4965 Debugging Options
-#
-# CONFIG_IWLEGACY_DEBUG is not set
-CONFIG_LIBERTAS=m
-CONFIG_LIBERTAS_USB=m
-CONFIG_LIBERTAS_CS=m
-CONFIG_LIBERTAS_SDIO=m
-# CONFIG_LIBERTAS_SPI is not set
-# CONFIG_LIBERTAS_DEBUG is not set
-CONFIG_LIBERTAS_MESH=y
-CONFIG_HERMES=m
-CONFIG_HERMES_PRISM=y
-CONFIG_HERMES_CACHE_FW_ON_INIT=y
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_NORTEL_HERMES=m
-CONFIG_PCI_HERMES=m
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA_SPECTRUM=m
-CONFIG_ORINOCO_USB=m
-CONFIG_P54_COMMON=m
-CONFIG_P54_USB=m
-CONFIG_P54_PCI=m
-# CONFIG_P54_SPI is not set
-CONFIG_P54_LEDS=y
-CONFIG_RT2X00=m
-CONFIG_RT2400PCI=m
-CONFIG_RT2500PCI=m
-CONFIG_RT61PCI=m
-CONFIG_RT2800PCI=m
-CONFIG_RT2800PCI_RT33XX=y
-CONFIG_RT2800PCI_RT35XX=y
-CONFIG_RT2800PCI_RT53XX=y
-CONFIG_RT2800PCI_RT3290=y
-CONFIG_RT2500USB=m
-CONFIG_RT73USB=m
-CONFIG_RT2800USB=m
-CONFIG_RT2800USB_RT33XX=y
-CONFIG_RT2800USB_RT35XX=y
-CONFIG_RT2800USB_RT53XX=y
-CONFIG_RT2800USB_RT55XX=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
-CONFIG_RT2X00_LIB_FIRMWARE=y
-CONFIG_RT2X00_LIB_CRYPTO=y
-CONFIG_RT2X00_LIB_LEDS=y
-# CONFIG_RT2X00_DEBUG is not set
-CONFIG_RTL_CARDS=m
-CONFIG_RTL8192CE=m
-CONFIG_RTL8192SE=m
-CONFIG_RTL8192DE=m
-CONFIG_RTL8723AE=m
-CONFIG_RTL8188EE=m
-CONFIG_RTL8192CU=m
-CONFIG_RTLWIFI=m
-CONFIG_RTLWIFI_PCI=m
-CONFIG_RTLWIFI_USB=m
-# CONFIG_RTLWIFI_DEBUG is not set
-CONFIG_RTL8192C_COMMON=m
-CONFIG_WL_TI=y
-CONFIG_WL1251=m
-# CONFIG_WL1251_SPI is not set
-CONFIG_WL1251_SDIO=m
-CONFIG_WL12XX=m
-CONFIG_WL18XX=m
-CONFIG_WLCORE=m
-# CONFIG_WLCORE_SPI is not set
-CONFIG_WLCORE_SDIO=m
-CONFIG_WILINK_PLATFORM_DATA=y
-CONFIG_ZD1211RW=m
-# CONFIG_ZD1211RW_DEBUG is not set
-CONFIG_MWIFIEX=m
-CONFIG_MWIFIEX_SDIO=m
-CONFIG_MWIFIEX_PCIE=m
-CONFIG_MWIFIEX_USB=m
-CONFIG_CW1200=m
-CONFIG_CW1200_WLAN_SDIO=m
-CONFIG_CW1200_WLAN_SPI=m
-
-#
-# WiMAX Wireless Broadband devices
-#
-CONFIG_WIMAX_I2400M=m
-CONFIG_WIMAX_I2400M_USB=m
-CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
-# CONFIG_WAN is not set
-CONFIG_IEEE802154_DRIVERS=m
-CONFIG_IEEE802154_FAKEHARD=m
-CONFIG_IEEE802154_FAKELB=m
-CONFIG_IEEE802154_AT86RF230=m
-# CONFIG_IEEE802154_MRF24J40 is not set
-CONFIG_VMXNET3=m
-CONFIG_HYPERV_NET=m
-CONFIG_ISDN=y
-CONFIG_ISDN_I4L=m
-CONFIG_ISDN_PPP=y
-CONFIG_ISDN_PPP_VJ=y
-CONFIG_ISDN_MPP=y
-CONFIG_IPPP_FILTER=y
-CONFIG_ISDN_PPP_BSDCOMP=m
-CONFIG_ISDN_AUDIO=y
-CONFIG_ISDN_TTY_FAX=y
-
-#
-# ISDN feature submodules
-#
-CONFIG_ISDN_DIVERSION=m
-
-#
-# ISDN4Linux hardware drivers
-#
-
-#
-# Passive cards
-#
-CONFIG_ISDN_DRV_HISAX=m
-
-#
-# D-channel protocol features
-#
-CONFIG_HISAX_EURO=y
-CONFIG_DE_AOC=y
-# CONFIG_HISAX_NO_SENDCOMPLETE is not set
-# CONFIG_HISAX_NO_LLC is not set
-# CONFIG_HISAX_NO_KEYPAD is not set
-CONFIG_HISAX_1TR6=y
-CONFIG_HISAX_NI1=y
-CONFIG_HISAX_MAX_CARDS=8
-
-#
-# HiSax supported cards
-#
-CONFIG_HISAX_16_0=y
-CONFIG_HISAX_16_3=y
-CONFIG_HISAX_TELESPCI=y
-CONFIG_HISAX_S0BOX=y
-CONFIG_HISAX_AVM_A1=y
-CONFIG_HISAX_FRITZPCI=y
-CONFIG_HISAX_AVM_A1_PCMCIA=y
-CONFIG_HISAX_ELSA=y
-CONFIG_HISAX_IX1MICROR2=y
-CONFIG_HISAX_DIEHLDIVA=y
-CONFIG_HISAX_ASUSCOM=y
-CONFIG_HISAX_TELEINT=y
-CONFIG_HISAX_HFCS=y
-CONFIG_HISAX_SEDLBAUER=y
-CONFIG_HISAX_SPORTSTER=y
-CONFIG_HISAX_MIC=y
-CONFIG_HISAX_NETJET=y
-CONFIG_HISAX_NETJET_U=y
-CONFIG_HISAX_NICCY=y
-CONFIG_HISAX_ISURF=y
-CONFIG_HISAX_HSTSAPHIR=y
-CONFIG_HISAX_BKM_A4T=y
-CONFIG_HISAX_SCT_QUADRO=y
-CONFIG_HISAX_GAZEL=y
-CONFIG_HISAX_HFC_PCI=y
-CONFIG_HISAX_W6692=y
-CONFIG_HISAX_HFC_SX=y
-CONFIG_HISAX_ENTERNOW_PCI=y
-# CONFIG_HISAX_DEBUG is not set
-
-#
-# HiSax PCMCIA card service modules
-#
-CONFIG_HISAX_SEDLBAUER_CS=m
-CONFIG_HISAX_ELSA_CS=m
-CONFIG_HISAX_AVM_A1_CS=m
-CONFIG_HISAX_TELES_CS=m
-
-#
-# HiSax sub driver modules
-#
-CONFIG_HISAX_ST5481=m
-CONFIG_HISAX_HFCUSB=m
-CONFIG_HISAX_HFC4S8S=m
-CONFIG_HISAX_FRITZ_PCIPNP=m
-
-#
-# Active cards
-#
-CONFIG_ISDN_DRV_ICN=m
-CONFIG_ISDN_DRV_PCBIT=m
-CONFIG_ISDN_DRV_SC=m
-CONFIG_ISDN_DRV_ACT2000=m
-CONFIG_ISDN_CAPI=m
-CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
-CONFIG_CAPI_TRACE=y
-CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_ISDN_CAPI_CAPI20=m
-CONFIG_ISDN_CAPI_CAPIDRV=m
-
-#
-# CAPI hardware drivers
-#
-CONFIG_CAPI_AVM=y
-CONFIG_ISDN_DRV_AVMB1_B1ISA=m
-CONFIG_ISDN_DRV_AVMB1_B1PCI=m
-CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
-CONFIG_ISDN_DRV_AVMB1_T1ISA=m
-CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
-CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
-CONFIG_ISDN_DRV_AVMB1_T1PCI=m
-CONFIG_ISDN_DRV_AVMB1_C4=m
-CONFIG_CAPI_EICON=y
-CONFIG_ISDN_DIVAS=m
-CONFIG_ISDN_DIVAS_BRIPCI=y
-CONFIG_ISDN_DIVAS_PRIPCI=y
-CONFIG_ISDN_DIVAS_DIVACAPI=m
-CONFIG_ISDN_DIVAS_USERIDI=m
-CONFIG_ISDN_DIVAS_MAINT=m
-CONFIG_ISDN_DRV_GIGASET=m
-CONFIG_GIGASET_CAPI=y
-# CONFIG_GIGASET_I4L is not set
-# CONFIG_GIGASET_DUMMYLL is not set
-CONFIG_GIGASET_BASE=m
-CONFIG_GIGASET_M105=m
-CONFIG_GIGASET_M101=m
-# CONFIG_GIGASET_DEBUG is not set
-CONFIG_HYSDN=m
-CONFIG_HYSDN_CAPI=y
-CONFIG_MISDN=m
-CONFIG_MISDN_DSP=m
-CONFIG_MISDN_L1OIP=m
-
-#
-# mISDN hardware drivers
-#
-CONFIG_MISDN_HFCPCI=m
-CONFIG_MISDN_HFCMULTI=m
-CONFIG_MISDN_HFCUSB=m
-CONFIG_MISDN_AVMFRITZ=m
-CONFIG_MISDN_SPEEDFAX=m
-CONFIG_MISDN_INFINEON=m
-CONFIG_MISDN_W6692=m
-CONFIG_MISDN_NETJET=m
-CONFIG_MISDN_IPAC=m
-CONFIG_MISDN_ISAR=m
-CONFIG_ISDN_HDLC=m
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-CONFIG_INPUT_FF_MEMLESS=m
-CONFIG_INPUT_POLLDEV=m
-CONFIG_INPUT_SPARSEKMAP=m
-CONFIG_INPUT_MATRIXKMAP=m
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_JOYDEV=m
-CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_KEYBOARD_ADP5588=m
-CONFIG_KEYBOARD_ADP5589=m
-CONFIG_KEYBOARD_ATKBD=y
-CONFIG_KEYBOARD_QT1070=m
-CONFIG_KEYBOARD_QT2160=m
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_GPIO is not set
-# CONFIG_KEYBOARD_GPIO_POLLED is not set
-CONFIG_KEYBOARD_TCA6416=m
-CONFIG_KEYBOARD_TCA8418=m
-CONFIG_KEYBOARD_MATRIX=m
-# CONFIG_KEYBOARD_LM8323 is not set
-CONFIG_KEYBOARD_LM8333=m
-# CONFIG_KEYBOARD_MAX7359 is not set
-CONFIG_KEYBOARD_MCS=m
-CONFIG_KEYBOARD_MPR121=m
-# CONFIG_KEYBOARD_NEWTON is not set
-# CONFIG_KEYBOARD_OPENCORES is not set
-# CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-CONFIG_INPUT_MOUSE=y
-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
-CONFIG_MOUSE_PS2_SENTELIC=y
-# CONFIG_MOUSE_PS2_TOUCHKIT is not set
-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
-CONFIG_MOUSE_PC110PAD=m
-CONFIG_MOUSE_VSXXXAA=m
-# CONFIG_MOUSE_GPIO is not set
-CONFIG_MOUSE_SYNAPTICS_I2C=m
-CONFIG_MOUSE_SYNAPTICS_USB=m
-CONFIG_INPUT_JOYSTICK=y
-CONFIG_JOYSTICK_ANALOG=m
-CONFIG_JOYSTICK_A3D=m
-CONFIG_JOYSTICK_ADI=m
-CONFIG_JOYSTICK_COBRA=m
-CONFIG_JOYSTICK_GF2K=m
-CONFIG_JOYSTICK_GRIP=m
-CONFIG_JOYSTICK_GRIP_MP=m
-CONFIG_JOYSTICK_GUILLEMOT=m
-CONFIG_JOYSTICK_INTERACT=m
-CONFIG_JOYSTICK_SIDEWINDER=m
-CONFIG_JOYSTICK_TMDC=m
-CONFIG_JOYSTICK_IFORCE=m
-CONFIG_JOYSTICK_IFORCE_USB=y
-CONFIG_JOYSTICK_IFORCE_232=y
-CONFIG_JOYSTICK_WARRIOR=m
-CONFIG_JOYSTICK_MAGELLAN=m
-CONFIG_JOYSTICK_SPACEORB=m
-CONFIG_JOYSTICK_SPACEBALL=m
-CONFIG_JOYSTICK_STINGER=m
-CONFIG_JOYSTICK_TWIDJOY=m
-CONFIG_JOYSTICK_ZHENHUA=m
-CONFIG_JOYSTICK_DB9=m
-CONFIG_JOYSTICK_GAMECON=m
-CONFIG_JOYSTICK_TURBOGRAFX=m
-CONFIG_JOYSTICK_AS5011=m
-CONFIG_JOYSTICK_JOYDUMP=m
-CONFIG_JOYSTICK_XPAD=m
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-CONFIG_JOYSTICK_WALKERA0701=m
-CONFIG_INPUT_TABLET=y
-CONFIG_TABLET_USB_ACECAD=m
-CONFIG_TABLET_USB_AIPTEK=m
-CONFIG_TABLET_USB_GTCO=m
-CONFIG_TABLET_USB_HANWANG=m
-CONFIG_TABLET_USB_KBTAB=m
-CONFIG_TABLET_USB_WACOM=m
-CONFIG_INPUT_TOUCHSCREEN=y
-# CONFIG_TOUCHSCREEN_ADS7846 is not set
-# CONFIG_TOUCHSCREEN_AD7877 is not set
-CONFIG_TOUCHSCREEN_AD7879=m
-CONFIG_TOUCHSCREEN_AD7879_I2C=m
-# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
-CONFIG_TOUCHSCREEN_ATMEL_MXT=m
-CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
-CONFIG_TOUCHSCREEN_BU21013=m
-CONFIG_TOUCHSCREEN_CY8CTMG110=m
-CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
-CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
-# CONFIG_TOUCHSCREEN_CYTTSP_SPI is not set
-CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m
-CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m
-CONFIG_TOUCHSCREEN_CYTTSP4_SPI=m
-CONFIG_TOUCHSCREEN_DYNAPRO=m
-CONFIG_TOUCHSCREEN_HAMPSHIRE=m
-CONFIG_TOUCHSCREEN_EETI=m
-CONFIG_TOUCHSCREEN_EGALAX=m
-CONFIG_TOUCHSCREEN_FUJITSU=m
-CONFIG_TOUCHSCREEN_ILI210X=m
-CONFIG_TOUCHSCREEN_GUNZE=m
-CONFIG_TOUCHSCREEN_ELO=m
-CONFIG_TOUCHSCREEN_WACOM_W8001=m
-CONFIG_TOUCHSCREEN_WACOM_I2C=m
-CONFIG_TOUCHSCREEN_MAX11801=m
-CONFIG_TOUCHSCREEN_MCS5000=m
-CONFIG_TOUCHSCREEN_MMS114=m
-CONFIG_TOUCHSCREEN_MTOUCH=m
-CONFIG_TOUCHSCREEN_INEXIO=m
-CONFIG_TOUCHSCREEN_MK712=m
-CONFIG_TOUCHSCREEN_HTCPEN=m
-CONFIG_TOUCHSCREEN_PENMOUNT=m
-CONFIG_TOUCHSCREEN_EDT_FT5X06=m
-CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
-CONFIG_TOUCHSCREEN_TOUCHWIN=m
-CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m
-CONFIG_TOUCHSCREEN_UCB1400=m
-CONFIG_TOUCHSCREEN_PIXCIR=m
-CONFIG_TOUCHSCREEN_WM97XX=m
-CONFIG_TOUCHSCREEN_WM9705=y
-CONFIG_TOUCHSCREEN_WM9712=y
-CONFIG_TOUCHSCREEN_WM9713=y
-CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
-CONFIG_TOUCHSCREEN_MC13783=m
-CONFIG_TOUCHSCREEN_USB_EGALAX=y
-CONFIG_TOUCHSCREEN_USB_PANJIT=y
-CONFIG_TOUCHSCREEN_USB_3M=y
-CONFIG_TOUCHSCREEN_USB_ITM=y
-CONFIG_TOUCHSCREEN_USB_ETURBO=y
-CONFIG_TOUCHSCREEN_USB_GUNZE=y
-CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
-CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
-CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
-CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
-CONFIG_TOUCHSCREEN_USB_GOTOP=y
-CONFIG_TOUCHSCREEN_USB_JASTEC=y
-CONFIG_TOUCHSCREEN_USB_ELO=y
-CONFIG_TOUCHSCREEN_USB_E2I=y
-CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
-CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
-CONFIG_TOUCHSCREEN_USB_NEXIO=y
-CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
-CONFIG_TOUCHSCREEN_TOUCHIT213=m
-CONFIG_TOUCHSCREEN_TSC_SERIO=m
-# CONFIG_TOUCHSCREEN_TSC2005 is not set
-CONFIG_TOUCHSCREEN_TSC2007=m
-CONFIG_TOUCHSCREEN_ST1232=m
-CONFIG_TOUCHSCREEN_TPS6507X=m
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_AD714X=m
-CONFIG_INPUT_AD714X_I2C=m
-CONFIG_INPUT_AD714X_SPI=m
-CONFIG_INPUT_BMA150=m
-CONFIG_INPUT_PCSPKR=m
-CONFIG_INPUT_MC13783_PWRBUTTON=m
-CONFIG_INPUT_MMA8450=m
-CONFIG_INPUT_MPU3050=m
-CONFIG_INPUT_APANEL=m
-CONFIG_INPUT_GP2A=m
-# CONFIG_INPUT_GPIO_TILT_POLLED is not set
-CONFIG_INPUT_WISTRON_BTNS=m
-CONFIG_INPUT_ATLAS_BTNS=m
-CONFIG_INPUT_ATI_REMOTE2=m
-CONFIG_INPUT_KEYSPAN_REMOTE=m
-CONFIG_INPUT_KXTJ9=m
-# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set
-CONFIG_INPUT_POWERMATE=m
-CONFIG_INPUT_YEALINK=m
-CONFIG_INPUT_CM109=m
-CONFIG_INPUT_RETU_PWRBUTTON=m
-CONFIG_INPUT_UINPUT=m
-CONFIG_INPUT_PCF50633_PMU=m
-CONFIG_INPUT_PCF8574=m
-# CONFIG_INPUT_PWM_BEEPER is not set
-CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
-CONFIG_INPUT_ADXL34X=m
-CONFIG_INPUT_ADXL34X_I2C=m
-CONFIG_INPUT_ADXL34X_SPI=m
-# CONFIG_INPUT_IMS_PCU is not set
-CONFIG_INPUT_CMA3000=m
-CONFIG_INPUT_CMA3000_I2C=m
-
-#
-# Hardware I/O ports
-#
-CONFIG_SERIO=y
-CONFIG_SERIO_I8042=y
-CONFIG_SERIO_SERPORT=m
-CONFIG_SERIO_CT82C710=m
-CONFIG_SERIO_PARKBD=m
-CONFIG_SERIO_PCIPS2=m
-CONFIG_SERIO_LIBPS2=y
-CONFIG_SERIO_RAW=m
-CONFIG_SERIO_ALTERA_PS2=m
-CONFIG_SERIO_PS2MULT=m
-CONFIG_SERIO_ARC_PS2=m
-CONFIG_SERIO_APBPS2=m
-CONFIG_SERIO_OLPC_APSP=m
-CONFIG_GAMEPORT=m
-CONFIG_GAMEPORT_NS558=m
-CONFIG_GAMEPORT_L4=m
-CONFIG_GAMEPORT_EMU10K1=m
-CONFIG_GAMEPORT_FM801=m
-
-#
-# Character devices
-#
-CONFIG_TTY=y
-CONFIG_VT=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_VT_CONSOLE=y
-CONFIG_VT_CONSOLE_SLEEP=y
-CONFIG_HW_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_UNIX98_PTYS=y
-CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_SERIAL_NONSTANDARD=y
-CONFIG_ROCKETPORT=m
-CONFIG_CYCLADES=m
-# CONFIG_CYZ_INTR is not set
-# CONFIG_MOXA_INTELLIO is not set
-# CONFIG_MOXA_SMARTIO is not set
-CONFIG_SYNCLINK=m
-CONFIG_SYNCLINKMP=m
-# CONFIG_SYNCLINK_GT is not set
-CONFIG_NOZOMI=m
-# CONFIG_ISI is not set
-CONFIG_N_HDLC=m
-CONFIG_N_GSM=m
-CONFIG_TRACE_ROUTER=m
-CONFIG_TRACE_SINK=m
-# CONFIG_DEVKMEM is not set
-
-#
-# 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
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-# CONFIG_SERIAL_8250_EXTENDED is not set
-CONFIG_SERIAL_8250_DW=m
-
-#
-# Non-8250 serial port support
-#
-# CONFIG_SERIAL_MAX3100 is not set
-# CONFIG_SERIAL_MAX310X is not set
-CONFIG_SERIAL_MFD_HSU=m
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_JSM=m
-CONFIG_SERIAL_OF_PLATFORM=m
-CONFIG_SERIAL_SCCNXP=m
-# CONFIG_SERIAL_TIMBERDALE is not set
-CONFIG_SERIAL_ALTERA_JTAGUART=m
-CONFIG_SERIAL_ALTERA_UART=m
-CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
-CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
-# CONFIG_SERIAL_IFX6X60 is not set
-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_SERIAL_FSL_LPUART=m
-CONFIG_PRINTER=m
-# CONFIG_LP_CONSOLE is not set
-CONFIG_PPDEV=m
-CONFIG_HVC_DRIVER=y
-CONFIG_VIRTIO_CONSOLE=y
-CONFIG_IPMI_HANDLER=m
-# CONFIG_IPMI_PANIC_EVENT is not set
-CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_SI=m
-CONFIG_IPMI_WATCHDOG=m
-CONFIG_IPMI_POWEROFF=m
-CONFIG_HW_RANDOM=y
-CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_INTEL=m
-CONFIG_HW_RANDOM_AMD=m
-CONFIG_HW_RANDOM_GEODE=m
-CONFIG_HW_RANDOM_VIA=m
-CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_HW_RANDOM_TPM=m
-CONFIG_NVRAM=m
-CONFIG_DTLK=m
-CONFIG_R3964=m
-CONFIG_APPLICOM=m
-CONFIG_SONYPI=m
-
-#
-# PCMCIA character devices
-#
-CONFIG_SYNCLINK_CS=m
-CONFIG_CARDMAN_4000=m
-CONFIG_CARDMAN_4040=m
-CONFIG_IPWIRELESS=m
-CONFIG_MWAVE=m
-CONFIG_PC8736x_GPIO=m
-CONFIG_NSC_GPIO=m
-# CONFIG_RAW_DRIVER is not set
-CONFIG_HPET=y
-CONFIG_HPET_MMAP=y
-CONFIG_HANGCHECK_TIMER=m
-CONFIG_TCG_TPM=m
-CONFIG_TCG_TIS=m
-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
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
-CONFIG_I2C_CHARDEV=m
-# CONFIG_I2C_MUX is not set
-CONFIG_I2C_HELPER_AUTO=y
-CONFIG_I2C_SMBUS=m
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_ALGOPCA=m
-
-#
-# I2C Hardware Bus support
-#
-
-#
-# PC SMBus host controller drivers
-#
-CONFIG_I2C_ALI1535=m
-CONFIG_I2C_ALI1563=m
-CONFIG_I2C_ALI15X3=m
-CONFIG_I2C_AMD756=m
-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
-CONFIG_I2C_SIS5595=m
-CONFIG_I2C_SIS630=m
-CONFIG_I2C_SIS96X=m
-CONFIG_I2C_VIA=m
-CONFIG_I2C_VIAPRO=m
-
-#
-# ACPI drivers
-#
-CONFIG_I2C_SCMI=m
-
-#
-# I2C system bus drivers (mostly embedded / system-on-chip)
-#
-# CONFIG_I2C_CBUS_GPIO is not set
-CONFIG_I2C_DESIGNWARE_CORE=m
-CONFIG_I2C_DESIGNWARE_PCI=m
-CONFIG_I2C_EG20T=m
-# CONFIG_I2C_GPIO is not set
-CONFIG_I2C_OCORES=m
-CONFIG_I2C_PCA_PLATFORM=m
-CONFIG_I2C_PXA=m
-CONFIG_I2C_PXA_PCI=y
-CONFIG_I2C_SIMTEC=m
-CONFIG_I2C_XILINX=m
-
-#
-# External I2C/SMBus adapter drivers
-#
-CONFIG_I2C_DIOLAN_U2C=m
-CONFIG_I2C_PARPORT=m
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_TAOS_EVM=m
-CONFIG_I2C_TINY_USB=m
-CONFIG_I2C_VIPERBOARD=m
-
-#
-# Other I2C/SMBus bus drivers
-#
-CONFIG_I2C_PCA_ISA=m
-CONFIG_SCx200_ACB=m
-# CONFIG_I2C_STUB is not set
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-CONFIG_SPI=y
-# CONFIG_SPI_DEBUG is not set
-CONFIG_SPI_MASTER=y
-
-#
-# SPI Master Controller Drivers
-#
-# CONFIG_SPI_ALTERA is not set
-# CONFIG_SPI_BITBANG is not set
-# CONFIG_SPI_BUTTERFLY is not set
-# CONFIG_SPI_GPIO is not set
-# CONFIG_SPI_LM70_LLP is not set
-# CONFIG_SPI_FSL_SPI is not set
-# CONFIG_SPI_OC_TINY is not set
-# CONFIG_SPI_PXA2XX is not set
-# CONFIG_SPI_PXA2XX_PCI is not set
-# CONFIG_SPI_SC18IS602 is not set
-# CONFIG_SPI_TOPCLIFF_PCH is not set
-# CONFIG_SPI_XCOMM is not set
-# CONFIG_SPI_XILINX is not set
-# CONFIG_SPI_DESIGNWARE is not set
-
-#
-# SPI Protocol Masters
-#
-# CONFIG_SPI_SPIDEV is not set
-# CONFIG_SPI_TLE62X0 is not set
-# CONFIG_HSI is not set
-
-#
-# PPS support
-#
-CONFIG_PPS=m
-# CONFIG_PPS_DEBUG is not set
-
-#
-# PPS clients support
-#
-CONFIG_PPS_CLIENT_KTIMER=m
-CONFIG_PPS_CLIENT_LDISC=m
-CONFIG_PPS_CLIENT_PARPORT=m
-CONFIG_PPS_CLIENT_GPIO=m
-
-#
-# PPS generators support
-#
-
-#
-# PTP clock support
-#
-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
-# CONFIG_DEBUG_GPIO is not set
-CONFIG_GPIO_SYSFS=y
-
-#
-# Memory mapped GPIO drivers:
-#
-# CONFIG_GPIO_GENERIC_PLATFORM is not set
-# CONFIG_GPIO_IT8761E is not set
-# CONFIG_GPIO_TS5500 is not set
-CONFIG_GPIO_SCH=m
-CONFIG_GPIO_ICH=m
-# CONFIG_GPIO_VX855 is not set
-# CONFIG_GPIO_LYNXPOINT is not set
-# CONFIG_GPIO_GRGPIO is not set
-
-#
-# I2C GPIO expanders:
-#
-CONFIG_GPIO_ARIZONA=m
-# CONFIG_GPIO_MAX7300 is not set
-# CONFIG_GPIO_MAX732X is not set
-# CONFIG_GPIO_PCA953X is not set
-# CONFIG_GPIO_PCF857X is not set
-# CONFIG_GPIO_ADP5588 is not set
-# CONFIG_GPIO_ADNP is not set
-
-#
-# PCI GPIO expanders:
-#
-CONFIG_GPIO_CS5535=y
-CONFIG_GPIO_AMD8111=m
-# CONFIG_GPIO_LANGWELL is not set
-# CONFIG_GPIO_PCH is not set
-# CONFIG_GPIO_ML_IOH is not set
-# CONFIG_GPIO_SODAVILLE is not set
-# CONFIG_GPIO_RDC321X is not set
-
-#
-# SPI GPIO expanders:
-#
-# CONFIG_GPIO_MAX7301 is not set
-# CONFIG_GPIO_MCP23S08 is not set
-# CONFIG_GPIO_MC33880 is not set
-# CONFIG_GPIO_74X164 is not set
-
-#
-# AC97 GPIO expanders:
-#
-CONFIG_GPIO_UCB1400=y
-
-#
-# MODULbus GPIO expanders:
-#
-
-#
-# USB GPIO expanders:
-#
-CONFIG_GPIO_VIPERBOARD=m
-# CONFIG_W1 is not set
-CONFIG_POWER_SUPPLY=y
-# CONFIG_POWER_SUPPLY_DEBUG is not set
-CONFIG_PDA_POWER=m
-CONFIG_TEST_POWER=m
-# CONFIG_BATTERY_DS2780 is not set
-# CONFIG_BATTERY_DS2781 is not set
-# CONFIG_BATTERY_DS2782 is not set
-CONFIG_BATTERY_OLPC=m
-# CONFIG_BATTERY_SBS is not set
-# CONFIG_BATTERY_BQ27x00 is not set
-# CONFIG_BATTERY_MAX17040 is not set
-# CONFIG_BATTERY_MAX17042 is not set
-# CONFIG_CHARGER_PCF50633 is not set
-# CONFIG_CHARGER_ISP1704 is not set
-# CONFIG_CHARGER_MAX8903 is not set
-# CONFIG_CHARGER_LP8727 is not set
-# 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
-CONFIG_HWMON=y
-CONFIG_HWMON_VID=m
-# CONFIG_HWMON_DEBUG_CHIP is not set
-
-#
-# Native drivers
-#
-CONFIG_SENSORS_ABITUGURU=m
-CONFIG_SENSORS_ABITUGURU3=m
-# CONFIG_SENSORS_AD7314 is not set
-CONFIG_SENSORS_AD7414=m
-CONFIG_SENSORS_AD7418=m
-# CONFIG_SENSORS_ADCXX is not set
-CONFIG_SENSORS_ADM1021=m
-CONFIG_SENSORS_ADM1025=m
-CONFIG_SENSORS_ADM1026=m
-CONFIG_SENSORS_ADM1029=m
-CONFIG_SENSORS_ADM1031=m
-CONFIG_SENSORS_ADM9240=m
-CONFIG_SENSORS_ADT7X10=m
-CONFIG_SENSORS_ADT7310=m
-CONFIG_SENSORS_ADT7410=m
-CONFIG_SENSORS_ADT7411=m
-CONFIG_SENSORS_ADT7462=m
-CONFIG_SENSORS_ADT7470=m
-CONFIG_SENSORS_ADT7475=m
-CONFIG_SENSORS_ASC7621=m
-CONFIG_SENSORS_K8TEMP=m
-CONFIG_SENSORS_K10TEMP=m
-CONFIG_SENSORS_FAM15H_POWER=m
-CONFIG_SENSORS_ASB100=m
-CONFIG_SENSORS_ATXP1=m
-CONFIG_SENSORS_DS620=m
-CONFIG_SENSORS_DS1621=m
-CONFIG_SENSORS_I5K_AMB=m
-CONFIG_SENSORS_F71805F=m
-CONFIG_SENSORS_F71882FG=m
-CONFIG_SENSORS_F75375S=m
-CONFIG_SENSORS_FSCHMD=m
-CONFIG_SENSORS_G760A=m
-CONFIG_SENSORS_G762=m
-CONFIG_SENSORS_GL518SM=m
-CONFIG_SENSORS_GL520SM=m
-# CONFIG_SENSORS_GPIO_FAN is not set
-CONFIG_SENSORS_HIH6130=m
-CONFIG_SENSORS_CORETEMP=m
-CONFIG_SENSORS_IBMAEM=m
-CONFIG_SENSORS_IBMPEX=m
-CONFIG_SENSORS_IT87=m
-CONFIG_SENSORS_JC42=m
-CONFIG_SENSORS_LINEAGE=m
-CONFIG_SENSORS_LM63=m
-# CONFIG_SENSORS_LM70 is not set
-CONFIG_SENSORS_LM73=m
-CONFIG_SENSORS_LM75=m
-CONFIG_SENSORS_LM77=m
-CONFIG_SENSORS_LM78=m
-CONFIG_SENSORS_LM80=m
-CONFIG_SENSORS_LM83=m
-CONFIG_SENSORS_LM85=m
-CONFIG_SENSORS_LM87=m
-CONFIG_SENSORS_LM90=m
-CONFIG_SENSORS_LM92=m
-CONFIG_SENSORS_LM93=m
-CONFIG_SENSORS_LTC4151=m
-CONFIG_SENSORS_LTC4215=m
-CONFIG_SENSORS_LTC4245=m
-CONFIG_SENSORS_LTC4261=m
-CONFIG_SENSORS_LM95234=m
-CONFIG_SENSORS_LM95241=m
-CONFIG_SENSORS_LM95245=m
-# CONFIG_SENSORS_MAX1111 is not set
-CONFIG_SENSORS_MAX16065=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_MAX1668=m
-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_NCT6775=m
-CONFIG_SENSORS_PC87360=m
-CONFIG_SENSORS_PC87427=m
-CONFIG_SENSORS_PCF8591=m
-CONFIG_PMBUS=m
-CONFIG_SENSORS_PMBUS=m
-CONFIG_SENSORS_ADM1275=m
-CONFIG_SENSORS_LM25066=m
-CONFIG_SENSORS_LTC2978=m
-CONFIG_SENSORS_MAX16064=m
-CONFIG_SENSORS_MAX34440=m
-CONFIG_SENSORS_MAX8688=m
-CONFIG_SENSORS_UCD9000=m
-CONFIG_SENSORS_UCD9200=m
-CONFIG_SENSORS_ZL6100=m
-CONFIG_SENSORS_SHT15=m
-CONFIG_SENSORS_SHT21=m
-CONFIG_SENSORS_SIS5595=m
-CONFIG_SENSORS_SMM665=m
-CONFIG_SENSORS_DME1737=m
-CONFIG_SENSORS_EMC1403=m
-CONFIG_SENSORS_EMC2103=m
-CONFIG_SENSORS_EMC6W201=m
-CONFIG_SENSORS_SMSC47M1=m
-CONFIG_SENSORS_SMSC47M192=m
-CONFIG_SENSORS_SMSC47B397=m
-CONFIG_SENSORS_SCH56XX_COMMON=m
-CONFIG_SENSORS_SCH5627=m
-CONFIG_SENSORS_SCH5636=m
-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
-CONFIG_SENSORS_TMP401=m
-CONFIG_SENSORS_TMP421=m
-CONFIG_SENSORS_VIA_CPUTEMP=m
-CONFIG_SENSORS_VIA686A=m
-CONFIG_SENSORS_VT1211=m
-CONFIG_SENSORS_VT8231=m
-CONFIG_SENSORS_W83781D=m
-CONFIG_SENSORS_W83791D=m
-CONFIG_SENSORS_W83792D=m
-CONFIG_SENSORS_W83793=m
-CONFIG_SENSORS_W83795=m
-# CONFIG_SENSORS_W83795_FANCTRL is not set
-CONFIG_SENSORS_W83L785TS=m
-CONFIG_SENSORS_W83L786NG=m
-CONFIG_SENSORS_W83627HF=m
-CONFIG_SENSORS_W83627EHF=m
-CONFIG_SENSORS_APPLESMC=m
-CONFIG_SENSORS_MC13783_ADC=m
-
-#
-# ACPI drivers
-#
-CONFIG_SENSORS_ACPI_POWER=m
-CONFIG_SENSORS_ATK0110=m
-CONFIG_THERMAL=y
-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_THERMAL_GOV_FAIR_SHARE=y
-CONFIG_THERMAL_GOV_STEP_WISE=y
-CONFIG_THERMAL_GOV_USER_SPACE=y
-# CONFIG_CPU_THERMAL is not set
-# CONFIG_THERMAL_EMULATION is not set
-CONFIG_INTEL_POWERCLAMP=m
-CONFIG_X86_PKG_TEMP_THERMAL=m
-
-#
-# Texas Instruments thermal drivers
-#
-CONFIG_WATCHDOG=y
-CONFIG_WATCHDOG_CORE=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-
-#
-# Watchdog Device Drivers
-#
-CONFIG_SOFT_WATCHDOG=m
-CONFIG_RETU_WATCHDOG=m
-CONFIG_ACQUIRE_WDT=m
-CONFIG_ADVANTECH_WDT=m
-CONFIG_ALIM1535_WDT=m
-CONFIG_ALIM7101_WDT=m
-CONFIG_F71808E_WDT=m
-CONFIG_SP5100_TCO=m
-CONFIG_GEODE_WDT=m
-CONFIG_SC520_WDT=m
-CONFIG_SBC_FITPC2_WATCHDOG=m
-CONFIG_EUROTECH_WDT=m
-CONFIG_IB700_WDT=m
-CONFIG_IBMASR=m
-CONFIG_WAFER_WDT=m
-CONFIG_I6300ESB_WDT=m
-CONFIG_IE6XX_WDT=m
-CONFIG_ITCO_WDT=m
-CONFIG_ITCO_VENDOR_SUPPORT=y
-CONFIG_IT8712F_WDT=m
-CONFIG_IT87_WDT=m
-CONFIG_HP_WATCHDOG=m
-CONFIG_HPWDT_NMI_DECODING=y
-CONFIG_SC1200_WDT=m
-CONFIG_PC87413_WDT=m
-CONFIG_NV_TCO=m
-CONFIG_60XX_WDT=m
-CONFIG_SBC8360_WDT=m
-CONFIG_SBC7240_WDT=m
-CONFIG_CPU5_WDT=m
-CONFIG_SMSC_SCH311X_WDT=m
-CONFIG_SMSC37B787_WDT=m
-CONFIG_VIA_WDT=m
-CONFIG_W83627HF_WDT=m
-CONFIG_W83697HF_WDT=m
-CONFIG_W83697UG_WDT=m
-CONFIG_W83877F_WDT=m
-CONFIG_W83977F_WDT=m
-CONFIG_MACHZ_WDT=m
-CONFIG_SBC_EPX_C3_WATCHDOG=m
-CONFIG_MEN_A21_WDT=m
-
-#
-# ISA-based Watchdog Cards
-#
-CONFIG_PCWATCHDOG=m
-CONFIG_MIXCOMWD=m
-CONFIG_WDT=m
-
-#
-# PCI-based Watchdog Cards
-#
-CONFIG_PCIPCWATCHDOG=m
-CONFIG_WDTPCI=m
-
-#
-# USB-based Watchdog Cards
-#
-CONFIG_USBPCWATCHDOG=m
-CONFIG_SSB_POSSIBLE=y
-
-#
-# Sonics Silicon Backplane
-#
-CONFIG_SSB=m
-CONFIG_SSB_SPROM=y
-CONFIG_SSB_BLOCKIO=y
-CONFIG_SSB_PCIHOST_POSSIBLE=y
-CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_B43_PCI_BRIDGE=y
-CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
-CONFIG_SSB_PCMCIAHOST=y
-CONFIG_SSB_SDIOHOST_POSSIBLE=y
-CONFIG_SSB_SDIOHOST=y
-# CONFIG_SSB_DEBUG is not set
-CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
-CONFIG_SSB_DRIVER_PCICORE=y
-CONFIG_SSB_DRIVER_GPIO=y
-CONFIG_BCMA_POSSIBLE=y
-
-#
-# Broadcom specific AMBA
-#
-CONFIG_BCMA=m
-CONFIG_BCMA_BLOCKIO=y
-CONFIG_BCMA_HOST_PCI_POSSIBLE=y
-CONFIG_BCMA_HOST_PCI=y
-CONFIG_BCMA_DRIVER_GMAC_CMN=y
-CONFIG_BCMA_DRIVER_GPIO=y
-# CONFIG_BCMA_DEBUG is not set
-
-#
-# Multifunction device drivers
-#
-CONFIG_MFD_CORE=y
-CONFIG_MFD_CS5535=m
-# CONFIG_MFD_CROS_EC is not set
-# CONFIG_MFD_DA9052_SPI is not set
-CONFIG_MFD_MC13783=m
-CONFIG_MFD_MC13XXX=m
-# CONFIG_MFD_MC13XXX_SPI is not set
-CONFIG_MFD_MC13XXX_I2C=m
-CONFIG_HTC_PASIC3=m
-CONFIG_LPC_ICH=m
-CONFIG_LPC_SCH=m
-# CONFIG_MFD_JANZ_CMODIO is not set
-# CONFIG_MFD_KEMPLD is not set
-# CONFIG_EZX_PCAP is not set
-CONFIG_MFD_VIPERBOARD=m
-CONFIG_MFD_RETU=m
-CONFIG_MFD_PCF50633=m
-CONFIG_PCF50633_ADC=m
-CONFIG_PCF50633_GPIO=m
-CONFIG_UCB1400_CORE=m
-CONFIG_MFD_RDC321X=m
-CONFIG_MFD_RTSX_PCI=m
-CONFIG_MFD_SI476X_CORE=m
-CONFIG_MFD_SM501=m
-CONFIG_MFD_SM501_GPIO=y
-CONFIG_ABX500_CORE=y
-# CONFIG_MFD_STMPE is not set
-# CONFIG_MFD_SYSCON is not set
-CONFIG_MFD_TI_AM335X_TSCADC=m
-# CONFIG_TPS6105X is not set
-CONFIG_TPS65010=m
-CONFIG_TPS6507X=m
-CONFIG_MFD_TPS65217=m
-# CONFIG_MFD_TPS65912 is not set
-# CONFIG_MFD_TPS65912_SPI is not set
-CONFIG_MFD_WL1273_CORE=m
-CONFIG_MFD_LM3533=m
-# CONFIG_MFD_TIMBERDALE is not set
-# CONFIG_MFD_TMIO is not set
-CONFIG_MFD_VX855=m
-CONFIG_MFD_ARIZONA=y
-CONFIG_MFD_ARIZONA_I2C=m
-# CONFIG_MFD_ARIZONA_SPI is not set
-CONFIG_MFD_WM5102=y
-CONFIG_MFD_WM5110=y
-# CONFIG_MFD_WM8997 is not set
-# CONFIG_MFD_WM831X_SPI is not set
-# CONFIG_REGULATOR is not set
-CONFIG_MEDIA_SUPPORT=m
-
-#
-# Multimedia core support
-#
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
-CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
-CONFIG_MEDIA_RADIO_SUPPORT=y
-CONFIG_MEDIA_RC_SUPPORT=y
-CONFIG_MEDIA_CONTROLLER=y
-CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L2_SUBDEV_API=y
-CONFIG_VIDEO_V4L2=m
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-CONFIG_VIDEO_TUNER=m
-CONFIG_V4L2_MEM2MEM_DEV=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEOBUF_DVB=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_DMA_CONTIG=m
-CONFIG_VIDEOBUF2_VMALLOC=m
-CONFIG_VIDEOBUF2_DMA_SG=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
-
-#
-# Media drivers
-#
-CONFIG_RC_CORE=m
-CONFIG_RC_MAP=m
-CONFIG_RC_DECODERS=y
-CONFIG_LIRC=m
-CONFIG_IR_LIRC_CODEC=m
-CONFIG_IR_NEC_DECODER=m
-CONFIG_IR_RC5_DECODER=m
-CONFIG_IR_RC6_DECODER=m
-CONFIG_IR_JVC_DECODER=m
-CONFIG_IR_SONY_DECODER=m
-CONFIG_IR_RC5_SZ_DECODER=m
-CONFIG_IR_SANYO_DECODER=m
-CONFIG_IR_MCE_KBD_DECODER=m
-CONFIG_RC_DEVICES=y
-CONFIG_RC_ATI_REMOTE=m
-CONFIG_IR_ENE=m
-CONFIG_IR_IMON=m
-CONFIG_IR_MCEUSB=m
-CONFIG_IR_ITE_CIR=m
-CONFIG_IR_FINTEK=m
-CONFIG_IR_NUVOTON=m
-CONFIG_IR_REDRAT3=m
-CONFIG_IR_STREAMZAP=m
-CONFIG_IR_WINBOND_CIR=m
-CONFIG_IR_IGUANA=m
-CONFIG_IR_TTUSBIR=m
-CONFIG_RC_LOOPBACK=m
-CONFIG_IR_GPIO_CIR=m
-CONFIG_MEDIA_USB_SUPPORT=y
-
-#
-# Webcam devices
-#
-CONFIG_USB_VIDEO_CLASS=m
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-CONFIG_USB_GSPCA=m
-CONFIG_USB_M5602=m
-CONFIG_USB_STV06XX=m
-CONFIG_USB_GL860=m
-CONFIG_USB_GSPCA_BENQ=m
-CONFIG_USB_GSPCA_CONEX=m
-CONFIG_USB_GSPCA_CPIA1=m
-CONFIG_USB_GSPCA_ETOMS=m
-CONFIG_USB_GSPCA_FINEPIX=m
-CONFIG_USB_GSPCA_JEILINJ=m
-CONFIG_USB_GSPCA_JL2005BCD=m
-CONFIG_USB_GSPCA_KINECT=m
-CONFIG_USB_GSPCA_KONICA=m
-CONFIG_USB_GSPCA_MARS=m
-CONFIG_USB_GSPCA_MR97310A=m
-CONFIG_USB_GSPCA_NW80X=m
-CONFIG_USB_GSPCA_OV519=m
-CONFIG_USB_GSPCA_OV534=m
-CONFIG_USB_GSPCA_OV534_9=m
-CONFIG_USB_GSPCA_PAC207=m
-CONFIG_USB_GSPCA_PAC7302=m
-CONFIG_USB_GSPCA_PAC7311=m
-CONFIG_USB_GSPCA_SE401=m
-CONFIG_USB_GSPCA_SN9C2028=m
-CONFIG_USB_GSPCA_SN9C20X=m
-CONFIG_USB_GSPCA_SONIXB=m
-CONFIG_USB_GSPCA_SONIXJ=m
-CONFIG_USB_GSPCA_SPCA500=m
-CONFIG_USB_GSPCA_SPCA501=m
-CONFIG_USB_GSPCA_SPCA505=m
-CONFIG_USB_GSPCA_SPCA506=m
-CONFIG_USB_GSPCA_SPCA508=m
-CONFIG_USB_GSPCA_SPCA561=m
-CONFIG_USB_GSPCA_SPCA1528=m
-CONFIG_USB_GSPCA_SQ905=m
-CONFIG_USB_GSPCA_SQ905C=m
-CONFIG_USB_GSPCA_SQ930X=m
-CONFIG_USB_GSPCA_STK014=m
-CONFIG_USB_GSPCA_STV0680=m
-CONFIG_USB_GSPCA_SUNPLUS=m
-CONFIG_USB_GSPCA_T613=m
-CONFIG_USB_GSPCA_TOPRO=m
-CONFIG_USB_GSPCA_TV8532=m
-CONFIG_USB_GSPCA_VC032X=m
-CONFIG_USB_GSPCA_VICAM=m
-CONFIG_USB_GSPCA_XIRLINK_CIT=m
-CONFIG_USB_GSPCA_ZC3XX=m
-CONFIG_USB_PWC=m
-# CONFIG_USB_PWC_DEBUG is not set
-CONFIG_USB_PWC_INPUT_EVDEV=y
-CONFIG_VIDEO_CPIA2=m
-CONFIG_USB_ZR364XX=m
-CONFIG_USB_STKWEBCAM=m
-CONFIG_USB_S2255=m
-CONFIG_USB_SN9C102=m
-CONFIG_VIDEO_USBTV=m
-
-#
-# Analog TV USB devices
-#
-CONFIG_VIDEO_PVRUSB2=m
-CONFIG_VIDEO_PVRUSB2_SYSFS=y
-CONFIG_VIDEO_PVRUSB2_DVB=y
-# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
-CONFIG_VIDEO_HDPVR=m
-CONFIG_VIDEO_TLG2300=m
-CONFIG_VIDEO_USBVISION=m
-CONFIG_VIDEO_STK1160=m
-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
-CONFIG_VIDEO_CX231XX_DVB=m
-CONFIG_VIDEO_TM6000=m
-CONFIG_VIDEO_TM6000_ALSA=m
-CONFIG_VIDEO_TM6000_DVB=m
-
-#
-# Digital TV USB devices
-#
-CONFIG_DVB_USB=m
-# CONFIG_DVB_USB_DEBUG is not set
-CONFIG_DVB_USB_A800=m
-CONFIG_DVB_USB_DIBUSB_MB=m
-CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
-CONFIG_DVB_USB_DIBUSB_MC=m
-CONFIG_DVB_USB_DIB0700=m
-CONFIG_DVB_USB_UMT_010=m
-CONFIG_DVB_USB_CXUSB=m
-CONFIG_DVB_USB_M920X=m
-CONFIG_DVB_USB_DIGITV=m
-CONFIG_DVB_USB_VP7045=m
-CONFIG_DVB_USB_VP702X=m
-CONFIG_DVB_USB_GP8PSK=m
-CONFIG_DVB_USB_NOVA_T_USB2=m
-CONFIG_DVB_USB_TTUSB2=m
-CONFIG_DVB_USB_DTT200U=m
-CONFIG_DVB_USB_OPERA1=m
-CONFIG_DVB_USB_AF9005=m
-CONFIG_DVB_USB_AF9005_REMOTE=m
-CONFIG_DVB_USB_PCTV452E=m
-CONFIG_DVB_USB_DW2102=m
-CONFIG_DVB_USB_CINERGY_T2=m
-CONFIG_DVB_USB_DTV5100=m
-CONFIG_DVB_USB_FRIIO=m
-CONFIG_DVB_USB_AZ6027=m
-CONFIG_DVB_USB_TECHNISAT_USB2=m
-CONFIG_DVB_USB_V2=m
-CONFIG_DVB_USB_AF9015=m
-CONFIG_DVB_USB_AF9035=m
-CONFIG_DVB_USB_ANYSEE=m
-CONFIG_DVB_USB_AU6610=m
-CONFIG_DVB_USB_AZ6007=m
-CONFIG_DVB_USB_CE6230=m
-CONFIG_DVB_USB_EC168=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_IT913X=m
-CONFIG_DVB_USB_LME2510=m
-CONFIG_DVB_USB_MXL111SF=m
-CONFIG_DVB_USB_RTL28XXU=m
-CONFIG_DVB_TTUSB_BUDGET=m
-CONFIG_DVB_TTUSB_DEC=m
-CONFIG_SMS_USB_DRV=m
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
-
-#
-# Webcam, TV (analog/digital) USB devices
-#
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_EM28XX_RC=m
-CONFIG_MEDIA_PCI_SUPPORT=y
-
-#
-# Media capture support
-#
-CONFIG_VIDEO_MEYE=m
-
-#
-# Media capture/analog TV support
-#
-CONFIG_VIDEO_IVTV=m
-CONFIG_VIDEO_IVTV_ALSA=m
-CONFIG_VIDEO_FB_IVTV=m
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_ZR36060=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN_AVS6EYES=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_MXB=m
-
-#
-# Media capture/analog/hybrid TV support
-#
-CONFIG_VIDEO_CX18=m
-CONFIG_VIDEO_CX18_ALSA=m
-CONFIG_VIDEO_CX23885=m
-CONFIG_MEDIA_ALTERA_CI=m
-CONFIG_VIDEO_CX25821=m
-CONFIG_VIDEO_CX25821_ALSA=m
-CONFIG_VIDEO_CX88=m
-CONFIG_VIDEO_CX88_ALSA=m
-CONFIG_VIDEO_CX88_BLACKBIRD=m
-CONFIG_VIDEO_CX88_DVB=m
-CONFIG_VIDEO_CX88_VP3054=m
-CONFIG_VIDEO_CX88_MPEG=m
-CONFIG_VIDEO_BT848=m
-CONFIG_DVB_BT8XX=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7134_ALSA=m
-CONFIG_VIDEO_SAA7134_RC=y
-CONFIG_VIDEO_SAA7134_DVB=m
-CONFIG_VIDEO_SAA7164=m
-
-#
-# Media digital TV PCI Adapters
-#
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
-CONFIG_DVB_BUDGET_CORE=m
-CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_CI=m
-CONFIG_DVB_BUDGET_AV=m
-CONFIG_DVB_BUDGET_PATCH=m
-CONFIG_DVB_B2C2_FLEXCOP_PCI=m
-# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
-CONFIG_DVB_PLUTO2=m
-CONFIG_DVB_DM1105=m
-CONFIG_DVB_PT1=m
-CONFIG_MANTIS_CORE=m
-CONFIG_DVB_MANTIS=m
-CONFIG_DVB_HOPPER=m
-CONFIG_DVB_NGENE=m
-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
-
-#
-# Supported MMC/SDIO adapters
-#
-CONFIG_SMS_SDIO_DRV=m
-CONFIG_MEDIA_PARPORT_SUPPORT=y
-CONFIG_VIDEO_BWQCAM=m
-CONFIG_VIDEO_CQCAM=m
-CONFIG_VIDEO_PMS=m
-CONFIG_VIDEO_W9966=m
-CONFIG_RADIO_ADAPTERS=y
-CONFIG_RADIO_SI470X=y
-CONFIG_USB_SI470X=m
-CONFIG_I2C_SI470X=m
-CONFIG_USB_MR800=m
-CONFIG_USB_DSBR=m
-CONFIG_RADIO_MAXIRADIO=m
-CONFIG_RADIO_SHARK=m
-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
-CONFIG_RADIO_WL1273=m
-
-#
-# Texas Instruments WL128x FM driver (ST based)
-#
-CONFIG_RADIO_WL128X=m
-# CONFIG_V4L_RADIO_ISA_DRIVERS is not set
-
-#
-# Supported FireWire (IEEE 1394) Adapters
-#
-CONFIG_DVB_FIREDTV=m
-CONFIG_DVB_FIREDTV_INPUT=y
-CONFIG_MEDIA_COMMON_OPTIONS=y
-
-#
-# common driver options
-#
-CONFIG_VIDEO_CX2341X=m
-CONFIG_VIDEO_BTCX=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_CYPRESS_FIRMWARE=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_SMS_SIANO_DEBUGFS is not set
-
-#
-# Media ancillary drivers (tuners, sensors, i2c, frontends)
-#
-CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
-CONFIG_MEDIA_ATTACH=y
-CONFIG_VIDEO_IR_I2C=m
-
-#
-# Audio decoders, processors and mixers
-#
-CONFIG_VIDEO_TVAUDIO=m
-CONFIG_VIDEO_TDA7432=m
-CONFIG_VIDEO_TDA9840=m
-CONFIG_VIDEO_TEA6415C=m
-CONFIG_VIDEO_TEA6420=m
-CONFIG_VIDEO_MSP3400=m
-CONFIG_VIDEO_CS5345=m
-CONFIG_VIDEO_CS53L32A=m
-CONFIG_VIDEO_UDA1342=m
-CONFIG_VIDEO_WM8775=m
-CONFIG_VIDEO_WM8739=m
-CONFIG_VIDEO_VP27SMPX=m
-CONFIG_VIDEO_SONY_BTF_MPX=m
-
-#
-# RDS decoders
-#
-CONFIG_VIDEO_SAA6588=m
-
-#
-# Video decoders
-#
-CONFIG_VIDEO_BT819=m
-CONFIG_VIDEO_BT856=m
-CONFIG_VIDEO_BT866=m
-CONFIG_VIDEO_KS0127=m
-CONFIG_VIDEO_SAA7110=m
-CONFIG_VIDEO_SAA711X=m
-CONFIG_VIDEO_TVP5150=m
-CONFIG_VIDEO_TW2804=m
-CONFIG_VIDEO_TW9903=m
-CONFIG_VIDEO_TW9906=m
-CONFIG_VIDEO_VPX3220=m
-
-#
-# Video and audio decoders
-#
-CONFIG_VIDEO_SAA717X=m
-CONFIG_VIDEO_CX25840=m
-
-#
-# Video encoders
-#
-CONFIG_VIDEO_SAA7127=m
-CONFIG_VIDEO_SAA7185=m
-CONFIG_VIDEO_ADV7170=m
-CONFIG_VIDEO_ADV7175=m
-
-#
-# Camera sensor devices
-#
-CONFIG_VIDEO_OV7640=m
-CONFIG_VIDEO_MT9V011=m
-
-#
-# Flash devices
-#
-
-#
-# Video improvement chips
-#
-CONFIG_VIDEO_UPD64031A=m
-CONFIG_VIDEO_UPD64083=m
-
-#
-# Miscelaneous helper chips
-#
-CONFIG_VIDEO_M52790=m
-
-#
-# Sensors used on soc_camera driver
-#
-CONFIG_MEDIA_TUNER=m
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_TEA5761=m
-CONFIG_MEDIA_TUNER_TEA5767=m
-CONFIG_MEDIA_TUNER_MT20XX=m
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2063=m
-CONFIG_MEDIA_TUNER_MT2266=m
-CONFIG_MEDIA_TUNER_MT2131=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC5000=m
-CONFIG_MEDIA_TUNER_XC4000=m
-CONFIG_MEDIA_TUNER_MXL5005S=m
-CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=m
-CONFIG_MEDIA_TUNER_MAX2165=m
-CONFIG_MEDIA_TUNER_TDA18218=m
-CONFIG_MEDIA_TUNER_FC0011=m
-CONFIG_MEDIA_TUNER_FC0012=m
-CONFIG_MEDIA_TUNER_FC0013=m
-CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_MEDIA_TUNER_E4000=m
-CONFIG_MEDIA_TUNER_FC2580=m
-CONFIG_MEDIA_TUNER_TUA9001=m
-CONFIG_MEDIA_TUNER_IT913X=m
-CONFIG_MEDIA_TUNER_R820T=m
-
-#
-# Multistandard (satellite) frontends
-#
-CONFIG_DVB_STB0899=m
-CONFIG_DVB_STB6100=m
-CONFIG_DVB_STV090x=m
-CONFIG_DVB_STV6110x=m
-
-#
-# Multistandard (cable + terrestrial) frontends
-#
-CONFIG_DVB_DRXK=m
-CONFIG_DVB_TDA18271C2DD=m
-
-#
-# DVB-S (satellite) frontends
-#
-CONFIG_DVB_CX24110=m
-CONFIG_DVB_CX24123=m
-CONFIG_DVB_MT312=m
-CONFIG_DVB_ZL10036=m
-CONFIG_DVB_ZL10039=m
-CONFIG_DVB_S5H1420=m
-CONFIG_DVB_STV0288=m
-CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=m
-CONFIG_DVB_STV6110=m
-CONFIG_DVB_STV0900=m
-CONFIG_DVB_TDA8083=m
-CONFIG_DVB_TDA10086=m
-CONFIG_DVB_TDA8261=m
-CONFIG_DVB_VES1X93=m
-CONFIG_DVB_TUNER_ITD1000=m
-CONFIG_DVB_TUNER_CX24113=m
-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
-
-#
-# DVB-T (terrestrial) frontends
-#
-CONFIG_DVB_SP8870=m
-CONFIG_DVB_SP887X=m
-CONFIG_DVB_CX22700=m
-CONFIG_DVB_CX22702=m
-CONFIG_DVB_DRXD=m
-CONFIG_DVB_L64781=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_NXT6000=m
-CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=m
-CONFIG_DVB_DIB3000MB=m
-CONFIG_DVB_DIB3000MC=m
-CONFIG_DVB_DIB7000M=m
-CONFIG_DVB_DIB7000P=m
-CONFIG_DVB_TDA10048=m
-CONFIG_DVB_AF9013=m
-CONFIG_DVB_EC100=m
-CONFIG_DVB_STV0367=m
-CONFIG_DVB_CXD2820R=m
-CONFIG_DVB_RTL2830=m
-CONFIG_DVB_RTL2832=m
-
-#
-# DVB-C (cable) frontends
-#
-CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=m
-CONFIG_DVB_TDA10023=m
-CONFIG_DVB_STV0297=m
-
-#
-# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
-#
-CONFIG_DVB_NXT200X=m
-CONFIG_DVB_OR51211=m
-CONFIG_DVB_OR51132=m
-CONFIG_DVB_BCM3510=m
-CONFIG_DVB_LGDT330X=m
-CONFIG_DVB_LGDT3305=m
-CONFIG_DVB_LG2160=m
-CONFIG_DVB_S5H1409=m
-CONFIG_DVB_AU8522=m
-CONFIG_DVB_AU8522_DTV=m
-CONFIG_DVB_AU8522_V4L=m
-CONFIG_DVB_S5H1411=m
-
-#
-# ISDB-T (terrestrial) frontends
-#
-CONFIG_DVB_S921=m
-CONFIG_DVB_DIB8000=m
-CONFIG_DVB_MB86A20S=m
-
-#
-# Digital terrestrial only tuners/PLL
-#
-CONFIG_DVB_PLL=m
-CONFIG_DVB_TUNER_DIB0070=m
-CONFIG_DVB_TUNER_DIB0090=m
-
-#
-# SEC control devices for DVB-S
-#
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_LNBP22=m
-CONFIG_DVB_ISL6405=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_ISL6423=m
-CONFIG_DVB_A8293=m
-CONFIG_DVB_LGS8GXX=m
-CONFIG_DVB_ATBM8830=m
-CONFIG_DVB_TDA665x=m
-CONFIG_DVB_IX2505V=m
-CONFIG_DVB_IT913X_FE=m
-CONFIG_DVB_M88RS2000=m
-CONFIG_DVB_AF9033=m
-
-#
-# Tools to develop new frontends
-#
-# CONFIG_DVB_DUMMY_FE is not set
-
-#
-# Graphics support
-#
-CONFIG_AGP=m
-CONFIG_AGP_ALI=m
-CONFIG_AGP_ATI=m
-CONFIG_AGP_AMD=m
-CONFIG_AGP_AMD64=m
-CONFIG_AGP_INTEL=m
-CONFIG_AGP_NVIDIA=m
-CONFIG_AGP_SIS=m
-CONFIG_AGP_SWORKS=m
-CONFIG_AGP_VIA=m
-CONFIG_AGP_EFFICEON=m
-CONFIG_VGA_ARB=y
-CONFIG_VGA_ARB_MAX_GPUS=16
-CONFIG_VGA_SWITCHEROO=y
-CONFIG_DRM=m
-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_UMS is not set
-CONFIG_DRM_NOUVEAU=m
-CONFIG_NOUVEAU_DEBUG=5
-CONFIG_NOUVEAU_DEBUG_DEFAULT=3
-CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-CONFIG_DRM_I915=m
-CONFIG_DRM_I915_KMS=y
-CONFIG_DRM_MGA=m
-CONFIG_DRM_SIS=m
-CONFIG_DRM_VIA=m
-CONFIG_DRM_SAVAGE=m
-CONFIG_DRM_VMWGFX=m
-CONFIG_DRM_VMWGFX_FBCON=y
-CONFIG_DRM_GMA500=m
-CONFIG_DRM_GMA600=y
-CONFIG_DRM_GMA3600=y
-CONFIG_DRM_UDL=m
-CONFIG_DRM_AST=m
-CONFIG_DRM_MGAG200=m
-CONFIG_DRM_CIRRUS_QEMU=m
-CONFIG_DRM_QXL=m
-CONFIG_VGASTATE=m
-CONFIG_VIDEO_OUTPUT_CONTROL=m
-CONFIG_HDMI=y
-CONFIG_FB=y
-CONFIG_FIRMWARE_EDID=y
-CONFIG_FB_DDC=m
-CONFIG_FB_BOOT_VESA_SUPPORT=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_IMAGEBLIT=m
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-CONFIG_FB_SYS_FOPS=m
-CONFIG_FB_DEFERRED_IO=y
-# CONFIG_FB_SVGALIB is not set
-# CONFIG_FB_MACMODES is not set
-CONFIG_FB_BACKLIGHT=y
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_TILEBLITTING=y
-
-#
-# Frame buffer hardware drivers
-#
-# CONFIG_FB_CIRRUS is not set
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_ARC is not set
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_IMSTT is not set
-CONFIG_FB_VGA16=m
-CONFIG_FB_UVESA=m
-CONFIG_FB_VESA=y
-CONFIG_FB_EFI=y
-# CONFIG_FB_N411 is not set
-# CONFIG_FB_HGA is not set
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_NVIDIA is not set
-# CONFIG_FB_RIVA is not set
-# CONFIG_FB_I740 is not set
-CONFIG_FB_I810=m
-CONFIG_FB_I810_GTF=y
-CONFIG_FB_I810_I2C=y
-# CONFIG_FB_LE80578 is not set
-# CONFIG_FB_MATROX is not set
-# CONFIG_FB_RADEON is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_ATY is not set
-# CONFIG_FB_S3 is not set
-# CONFIG_FB_SAVAGE is not set
-# CONFIG_FB_SIS is not set
-CONFIG_FB_VIA=m
-CONFIG_FB_VIA_DIRECT_PROCFS=y
-CONFIG_FB_VIA_X_COMPATIBILITY=y
-# CONFIG_FB_NEOMAGIC is not set
-# CONFIG_FB_KYRO is not set
-# CONFIG_FB_3DFX is not set
-CONFIG_FB_VOODOO1=m
-CONFIG_FB_VT8623=m
-# CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_ARK is not set
-# CONFIG_FB_PM3 is not set
-# CONFIG_FB_CARMINE is not set
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_TMIO is not set
-# 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
-# CONFIG_FB_BROADSHEET is not set
-# CONFIG_FB_AUO_K190X is not set
-CONFIG_FB_HYPERV=m
-# CONFIG_FB_SIMPLE is not set
-# CONFIG_EXYNOS_VIDEO is not set
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=m
-# CONFIG_LCD_L4F00242T03 is not set
-# CONFIG_LCD_LMS283GF05 is not set
-# CONFIG_LCD_LTV350QV is not set
-# CONFIG_LCD_ILI922X is not set
-# CONFIG_LCD_ILI9320 is not set
-# CONFIG_LCD_TDO24M is not set
-# CONFIG_LCD_VGG2432A4 is not set
-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
-# CONFIG_BACKLIGHT_PWM is not set
-CONFIG_BACKLIGHT_APPLE=m
-# CONFIG_BACKLIGHT_SAHARA is not set
-# CONFIG_BACKLIGHT_ADP8860 is not set
-# CONFIG_BACKLIGHT_ADP8870 is not set
-CONFIG_BACKLIGHT_PCF50633=m
-# CONFIG_BACKLIGHT_LM3630 is not set
-# CONFIG_BACKLIGHT_LM3639 is not set
-# CONFIG_BACKLIGHT_LP855X is not set
-# CONFIG_BACKLIGHT_OT200 is not set
-# CONFIG_BACKLIGHT_TPS65217 is not set
-
-#
-# Console display driver support
-#
-CONFIG_VGA_CONSOLE=y
-# CONFIG_VGACON_SOFT_SCROLLBACK is not set
-# CONFIG_MDA_CONSOLE is not set
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-# CONFIG_LOGO is not set
-CONFIG_FB_SSD1307=m
-CONFIG_SOUND=m
-CONFIG_SOUND_OSS_CORE=y
-# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
-CONFIG_SND=m
-CONFIG_SND_TIMER=m
-CONFIG_SND_PCM=m
-CONFIG_SND_HWDEP=m
-CONFIG_SND_RAWMIDI=m
-CONFIG_SND_JACK=y
-CONFIG_SND_SEQUENCER=m
-CONFIG_SND_SEQ_DUMMY=m
-CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_PCM_OSS_PLUGINS=y
-CONFIG_SND_SEQUENCER_OSS=y
-CONFIG_SND_HRTIMER=m
-CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
-CONFIG_SND_DYNAMIC_MINORS=y
-CONFIG_SND_MAX_CARDS=32
-CONFIG_SND_SUPPORT_OLD_API=y
-CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
-# CONFIG_SND_DEBUG is not set
-CONFIG_SND_VMASTER=y
-CONFIG_SND_KCTL_JACK=y
-CONFIG_SND_DMA_SGBUF=y
-CONFIG_SND_RAWMIDI_SEQ=m
-CONFIG_SND_OPL3_LIB_SEQ=m
-CONFIG_SND_OPL4_LIB_SEQ=m
-CONFIG_SND_SBAWE_SEQ=m
-CONFIG_SND_EMU10K1_SEQ=m
-CONFIG_SND_MPU401_UART=m
-CONFIG_SND_OPL3_LIB=m
-CONFIG_SND_OPL4_LIB=m
-CONFIG_SND_VX_LIB=m
-CONFIG_SND_AC97_CODEC=m
-CONFIG_SND_DRIVERS=y
-# CONFIG_SND_PCSP is not set
-CONFIG_SND_DUMMY=m
-CONFIG_SND_ALOOP=m
-CONFIG_SND_VIRMIDI=m
-CONFIG_SND_MTPAV=m
-CONFIG_SND_MTS64=m
-CONFIG_SND_SERIAL_U16550=m
-CONFIG_SND_MPU401=m
-CONFIG_SND_PORTMAN2X4=m
-CONFIG_SND_AC97_POWER_SAVE=y
-CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
-CONFIG_SND_WSS_LIB=m
-CONFIG_SND_SB_COMMON=m
-CONFIG_SND_SB8_DSP=m
-CONFIG_SND_SB16_DSP=m
-CONFIG_SND_ISA=y
-CONFIG_SND_ADLIB=m
-CONFIG_SND_AD1816A=m
-CONFIG_SND_AD1848=m
-CONFIG_SND_ALS100=m
-CONFIG_SND_AZT1605=m
-CONFIG_SND_AZT2316=m
-CONFIG_SND_AZT2320=m
-CONFIG_SND_CMI8328=m
-CONFIG_SND_CMI8330=m
-CONFIG_SND_CS4231=m
-CONFIG_SND_CS4236=m
-CONFIG_SND_ES1688=m
-CONFIG_SND_ES18XX=m
-CONFIG_SND_SC6000=m
-CONFIG_SND_GUSCLASSIC=m
-CONFIG_SND_GUSEXTREME=m
-CONFIG_SND_GUSMAX=m
-CONFIG_SND_INTERWAVE=m
-CONFIG_SND_INTERWAVE_STB=m
-CONFIG_SND_JAZZ16=m
-CONFIG_SND_OPL3SA2=m
-CONFIG_SND_OPTI92X_AD1848=m
-CONFIG_SND_OPTI92X_CS4231=m
-CONFIG_SND_OPTI93X=m
-CONFIG_SND_MIRO=m
-CONFIG_SND_SB8=m
-CONFIG_SND_SB16=m
-CONFIG_SND_SBAWE=m
-CONFIG_SND_SB16_CSP=y
-CONFIG_SND_SSCAPE=m
-CONFIG_SND_WAVEFRONT=m
-CONFIG_SND_MSND_PINNACLE=m
-CONFIG_SND_MSND_CLASSIC=m
-CONFIG_SND_TEA575X=m
-CONFIG_SND_PCI=y
-CONFIG_SND_AD1889=m
-CONFIG_SND_ALS300=m
-CONFIG_SND_ALS4000=m
-CONFIG_SND_ALI5451=m
-CONFIG_SND_ASIHPI=m
-CONFIG_SND_ATIIXP=m
-CONFIG_SND_ATIIXP_MODEM=m
-CONFIG_SND_AU8810=m
-CONFIG_SND_AU8820=m
-CONFIG_SND_AU8830=m
-CONFIG_SND_AW2=m
-CONFIG_SND_AZT3328=m
-CONFIG_SND_BT87X=m
-# CONFIG_SND_BT87X_OVERCLOCK is not set
-CONFIG_SND_CA0106=m
-CONFIG_SND_CMIPCI=m
-CONFIG_SND_OXYGEN_LIB=m
-CONFIG_SND_OXYGEN=m
-CONFIG_SND_CS4281=m
-CONFIG_SND_CS46XX=m
-CONFIG_SND_CS46XX_NEW_DSP=y
-CONFIG_SND_CS5530=m
-CONFIG_SND_CS5535AUDIO=m
-CONFIG_SND_CTXFI=m
-CONFIG_SND_DARLA20=m
-CONFIG_SND_GINA20=m
-CONFIG_SND_LAYLA20=m
-CONFIG_SND_DARLA24=m
-CONFIG_SND_GINA24=m
-CONFIG_SND_LAYLA24=m
-CONFIG_SND_MONA=m
-CONFIG_SND_MIA=m
-CONFIG_SND_ECHO3G=m
-CONFIG_SND_INDIGO=m
-CONFIG_SND_INDIGOIO=m
-CONFIG_SND_INDIGODJ=m
-CONFIG_SND_INDIGOIOX=m
-CONFIG_SND_INDIGODJX=m
-CONFIG_SND_EMU10K1=m
-CONFIG_SND_EMU10K1X=m
-CONFIG_SND_ENS1370=m
-CONFIG_SND_ENS1371=m
-CONFIG_SND_ES1938=m
-CONFIG_SND_ES1968=m
-CONFIG_SND_ES1968_INPUT=y
-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
-CONFIG_SND_HDA_INPUT_BEEP=y
-CONFIG_SND_HDA_INPUT_BEEP_MODE=1
-CONFIG_SND_HDA_INPUT_JACK=y
-CONFIG_SND_HDA_PATCH_LOADER=y
-CONFIG_SND_HDA_CODEC_REALTEK=y
-CONFIG_SND_HDA_CODEC_ANALOG=y
-CONFIG_SND_HDA_CODEC_SIGMATEL=y
-CONFIG_SND_HDA_CODEC_VIA=y
-CONFIG_SND_HDA_CODEC_HDMI=y
-CONFIG_SND_HDA_I915=y
-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
-CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
-CONFIG_SND_HDSP=m
-CONFIG_SND_HDSPM=m
-CONFIG_SND_ICE1712=m
-CONFIG_SND_ICE1724=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
-CONFIG_SND_KORG1212=m
-CONFIG_SND_LOLA=m
-CONFIG_SND_LX6464ES=m
-CONFIG_SND_MAESTRO3=m
-CONFIG_SND_MAESTRO3_INPUT=y
-CONFIG_SND_MIXART=m
-CONFIG_SND_NM256=m
-CONFIG_SND_PCXHR=m
-CONFIG_SND_RIPTIDE=m
-CONFIG_SND_RME32=m
-CONFIG_SND_RME96=m
-CONFIG_SND_RME9652=m
-CONFIG_SND_SIS7019=m
-CONFIG_SND_SONICVIBES=m
-CONFIG_SND_TRIDENT=m
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
-CONFIG_SND_VIRTUOSO=m
-CONFIG_SND_VX222=m
-CONFIG_SND_YMFPCI=m
-CONFIG_SND_SPI=y
-CONFIG_SND_USB=y
-CONFIG_SND_USB_AUDIO=m
-CONFIG_SND_USB_UA101=m
-CONFIG_SND_USB_USX2Y=m
-CONFIG_SND_USB_CAIAQ=m
-CONFIG_SND_USB_CAIAQ_INPUT=y
-CONFIG_SND_USB_US122L=m
-CONFIG_SND_USB_6FIRE=m
-CONFIG_SND_USB_HIFACE=m
-CONFIG_SND_FIREWIRE=y
-CONFIG_SND_FIREWIRE_LIB=m
-CONFIG_SND_FIREWIRE_SPEAKERS=m
-CONFIG_SND_ISIGHT=m
-CONFIG_SND_SCS1X=m
-CONFIG_SND_PCMCIA=y
-CONFIG_SND_VXPOCKET=m
-CONFIG_SND_PDAUDIOCF=m
-# CONFIG_SND_SOC is not set
-# CONFIG_SOUND_PRIME is not set
-CONFIG_AC97_BUS=m
-
-#
-# HID support
-#
-CONFIG_HID=m
-CONFIG_HIDRAW=y
-CONFIG_UHID=m
-CONFIG_HID_GENERIC=m
-
-#
-# Special HID drivers
-#
-CONFIG_HID_A4TECH=m
-CONFIG_HID_ACRUX=m
-CONFIG_HID_ACRUX_FF=y
-CONFIG_HID_APPLE=m
-CONFIG_HID_APPLEIR=m
-CONFIG_HID_AUREAL=m
-CONFIG_HID_BELKIN=m
-CONFIG_HID_CHERRY=m
-CONFIG_HID_CHICONY=m
-CONFIG_HID_PRODIKEYS=m
-CONFIG_HID_CYPRESS=m
-CONFIG_HID_DRAGONRISE=m
-CONFIG_DRAGONRISE_FF=y
-CONFIG_HID_EMS_FF=m
-CONFIG_HID_ELECOM=m
-CONFIG_HID_ELO=m
-CONFIG_HID_EZKEY=m
-CONFIG_HID_HOLTEK=m
-CONFIG_HOLTEK_FF=y
-CONFIG_HID_HUION=m
-CONFIG_HID_KEYTOUCH=m
-CONFIG_HID_KYE=m
-CONFIG_HID_UCLOGIC=m
-CONFIG_HID_WALTOP=m
-CONFIG_HID_GYRATION=m
-CONFIG_HID_ICADE=m
-CONFIG_HID_TWINHAN=m
-CONFIG_HID_KENSINGTON=m
-CONFIG_HID_LCPOWER=m
-CONFIG_HID_LENOVO_TPKBD=m
-CONFIG_HID_LOGITECH=m
-CONFIG_HID_LOGITECH_DJ=m
-CONFIG_LOGITECH_FF=y
-CONFIG_LOGIRUMBLEPAD2_FF=y
-CONFIG_LOGIG940_FF=y
-CONFIG_LOGIWHEELS_FF=y
-CONFIG_HID_MAGICMOUSE=m
-CONFIG_HID_MICROSOFT=m
-CONFIG_HID_MONTEREY=m
-CONFIG_HID_MULTITOUCH=m
-CONFIG_HID_NTRIG=m
-CONFIG_HID_ORTEK=m
-CONFIG_HID_PANTHERLORD=m
-CONFIG_PANTHERLORD_FF=y
-CONFIG_HID_PETALYNX=m
-CONFIG_HID_PICOLCD=m
-CONFIG_HID_PICOLCD_FB=y
-CONFIG_HID_PICOLCD_BACKLIGHT=y
-CONFIG_HID_PICOLCD_LCD=y
-CONFIG_HID_PICOLCD_LEDS=y
-CONFIG_HID_PICOLCD_CIR=y
-CONFIG_HID_PRIMAX=m
-CONFIG_HID_ROCCAT=m
-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
-CONFIG_HID_HYPERV_MOUSE=m
-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
-CONFIG_HID_WIIMOTE=m
-CONFIG_HID_ZEROPLUS=m
-CONFIG_ZEROPLUS_FF=y
-CONFIG_HID_ZYDACRON=m
-CONFIG_HID_SENSOR_HUB=m
-
-#
-# USB HID support
-#
-CONFIG_USB_HID=m
-CONFIG_HID_PID=y
-CONFIG_USB_HIDDEV=y
-
-#
-# I2C HID support
-#
-CONFIG_I2C_HID=m
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_COMMON=m
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB=m
-# CONFIG_USB_DEBUG is not set
-# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-
-#
-# Miscellaneous USB options
-#
-CONFIG_USB_DEFAULT_PERSIST=y
-CONFIG_USB_DYNAMIC_MINORS=y
-# CONFIG_USB_OTG is not set
-CONFIG_USB_MON=m
-CONFIG_USB_WUSB=m
-CONFIG_USB_WUSB_CBAF=m
-# CONFIG_USB_WUSB_CBAF_DEBUG is not set
-
-#
-# USB Host Controller Drivers
-#
-CONFIG_USB_C67X00_HCD=m
-CONFIG_USB_XHCI_HCD=m
-# CONFIG_USB_XHCI_HCD_DEBUGGING is not set
-CONFIG_USB_EHCI_HCD=m
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_EHCI_TT_NEWSCHED=y
-CONFIG_USB_EHCI_PCI=m
-# CONFIG_USB_EHCI_HCD_PLATFORM is not set
-CONFIG_USB_OXU210HP_HCD=m
-CONFIG_USB_ISP116X_HCD=m
-CONFIG_USB_ISP1760_HCD=m
-CONFIG_USB_ISP1362_HCD=m
-CONFIG_USB_FUSBH200_HCD=m
-CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_OHCI_HCD_PCI=m
-# CONFIG_USB_OHCI_HCD_SSB is not set
-# CONFIG_USB_OHCI_HCD_PLATFORM is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-CONFIG_USB_UHCI_HCD=m
-CONFIG_USB_U132_HCD=m
-CONFIG_USB_SL811_HCD=m
-# CONFIG_USB_SL811_HCD_ISO is not set
-CONFIG_USB_SL811_CS=m
-CONFIG_USB_R8A66597_HCD=m
-CONFIG_USB_RENESAS_USBHS_HCD=m
-CONFIG_USB_WHCI_HCD=m
-CONFIG_USB_HWA_HCD=m
-# CONFIG_USB_HCD_BCMA is not set
-# CONFIG_USB_HCD_SSB is not set
-CONFIG_USB_MUSB_HDRC=m
-# CONFIG_USB_MUSB_HOST is not set
-# CONFIG_USB_MUSB_GADGET is not set
-CONFIG_USB_MUSB_DUAL_ROLE=y
-CONFIG_USB_MUSB_TUSB6010=m
-CONFIG_USB_MUSB_DSPS=m
-CONFIG_USB_MUSB_UX500=m
-# CONFIG_USB_UX500_DMA is not set
-CONFIG_MUSB_PIO_ONLY=y
-CONFIG_USB_RENESAS_USBHS=m
-
-#
-# USB Device Class drivers
-#
-CONFIG_USB_ACM=m
-CONFIG_USB_PRINTER=m
-CONFIG_USB_WDM=m
-CONFIG_USB_TMC=m
-
-#
-# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
-#
-
-#
-# also be needed; see USB_STORAGE Help for more info
-#
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_REALTEK=m
-CONFIG_REALTEK_AUTOPM=y
-CONFIG_USB_STORAGE_DATAFAB=m
-CONFIG_USB_STORAGE_FREECOM=m
-CONFIG_USB_STORAGE_ISD200=m
-CONFIG_USB_STORAGE_USBAT=m
-CONFIG_USB_STORAGE_SDDR09=m
-CONFIG_USB_STORAGE_SDDR55=m
-CONFIG_USB_STORAGE_JUMPSHOT=m
-CONFIG_USB_STORAGE_ALAUDA=m
-CONFIG_USB_STORAGE_ONETOUCH=m
-CONFIG_USB_STORAGE_KARMA=m
-CONFIG_USB_STORAGE_CYPRESS_ATACB=m
-CONFIG_USB_STORAGE_ENE_UB6250=m
-
-#
-# USB Imaging devices
-#
-CONFIG_USB_MDC800=m
-CONFIG_USB_MICROTEK=m
-# CONFIG_USB_DWC3 is not set
-CONFIG_USB_CHIPIDEA=m
-CONFIG_USB_CHIPIDEA_UDC=y
-# CONFIG_USB_CHIPIDEA_DEBUG is not set
-
-#
-# USB port drivers
-#
-CONFIG_USB_USS720=m
-CONFIG_USB_SERIAL=m
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_AIRCABLE=m
-CONFIG_USB_SERIAL_ARK3116=m
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_CH341=m
-CONFIG_USB_SERIAL_WHITEHEAT=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-CONFIG_USB_SERIAL_CP210X=m
-CONFIG_USB_SERIAL_CYPRESS_M8=m
-CONFIG_USB_SERIAL_EMPEG=m
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_FUNSOFT=m
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_IPAQ=m
-CONFIG_USB_SERIAL_IR=m
-CONFIG_USB_SERIAL_EDGEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT_TI=m
-CONFIG_USB_SERIAL_F81232=m
-CONFIG_USB_SERIAL_GARMIN=m
-CONFIG_USB_SERIAL_IPW=m
-CONFIG_USB_SERIAL_IUU=m
-CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KEYSPAN_MPR=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19=y
-CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
-CONFIG_USB_SERIAL_KLSI=m
-CONFIG_USB_SERIAL_KOBIL_SCT=m
-CONFIG_USB_SERIAL_MCT_U232=m
-CONFIG_USB_SERIAL_METRO=m
-CONFIG_USB_SERIAL_MOS7720=m
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
-CONFIG_USB_SERIAL_MOS7840=m
-CONFIG_USB_SERIAL_MOTOROLA=m
-CONFIG_USB_SERIAL_NAVMAN=m
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_SERIAL_OTI6858=m
-CONFIG_USB_SERIAL_QCAUX=m
-CONFIG_USB_SERIAL_QUALCOMM=m
-CONFIG_USB_SERIAL_SPCP8X5=m
-CONFIG_USB_SERIAL_HP4X=m
-CONFIG_USB_SERIAL_SAFE=m
-# CONFIG_USB_SERIAL_SAFE_PADDED is not set
-CONFIG_USB_SERIAL_SIEMENS_MPI=m
-CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-CONFIG_USB_SERIAL_SYMBOL=m
-CONFIG_USB_SERIAL_TI=m
-CONFIG_USB_SERIAL_CYBERJACK=m
-CONFIG_USB_SERIAL_XIRCOM=m
-CONFIG_USB_SERIAL_WWAN=m
-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_WISHBONE=m
-CONFIG_USB_SERIAL_ZTE=m
-CONFIG_USB_SERIAL_SSU100=m
-CONFIG_USB_SERIAL_QT2=m
-CONFIG_USB_SERIAL_FLASHLOADER=m
-CONFIG_USB_SERIAL_SUUNTO=m
-# CONFIG_USB_SERIAL_DEBUG is not set
-
-#
-# USB Miscellaneous drivers
-#
-CONFIG_USB_EMI62=m
-CONFIG_USB_EMI26=m
-CONFIG_USB_ADUTUX=m
-CONFIG_USB_SEVSEG=m
-CONFIG_USB_RIO500=m
-CONFIG_USB_LEGOTOWER=m
-CONFIG_USB_LCD=m
-CONFIG_USB_LED=m
-CONFIG_USB_CYPRESS_CY7C63=m
-CONFIG_USB_CYTHERM=m
-CONFIG_USB_IDMOUSE=m
-CONFIG_USB_FTDI_ELAN=m
-CONFIG_USB_APPLEDISPLAY=m
-CONFIG_USB_SISUSBVGA=m
-# CONFIG_USB_SISUSBVGA_CON is not set
-CONFIG_USB_LD=m
-CONFIG_USB_TRANCEVIBRATOR=m
-CONFIG_USB_IOWARRIOR=m
-CONFIG_USB_TEST=m
-CONFIG_USB_ISIGHTFW=m
-CONFIG_USB_YUREX=m
-CONFIG_USB_EZUSB_FX2=m
-CONFIG_USB_HSIC_USB3503=m
-CONFIG_USB_ATM=m
-CONFIG_USB_SPEEDTOUCH=m
-CONFIG_USB_CXACRU=m
-CONFIG_USB_UEAGLEATM=m
-CONFIG_USB_XUSBATM=m
-CONFIG_USB_PHY=y
-CONFIG_NOP_USB_XCEIV=m
-# CONFIG_OMAP_CONTROL_USB is not set
-# CONFIG_OMAP_USB3 is not set
-CONFIG_SAMSUNG_USBPHY=m
-CONFIG_SAMSUNG_USB2PHY=m
-CONFIG_SAMSUNG_USB3PHY=m
-# CONFIG_USB_GPIO_VBUS is not set
-CONFIG_USB_ISP1301=m
-CONFIG_USB_RCAR_PHY=m
-CONFIG_USB_GADGET=m
-# CONFIG_USB_GADGET_DEBUG is not set
-# CONFIG_USB_GADGET_DEBUG_FILES is not set
-# CONFIG_USB_GADGET_DEBUG_FS is not set
-CONFIG_USB_GADGET_VBUS_DRAW=2
-CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
-
-#
-# USB Peripheral Controller
-#
-CONFIG_USB_FUSB300=m
-CONFIG_USB_FOTG210_UDC=m
-CONFIG_USB_R8A66597=m
-CONFIG_USB_RENESAS_USBHS_UDC=m
-CONFIG_USB_PXA27X=m
-CONFIG_USB_MV_UDC=m
-CONFIG_USB_MV_U3D=m
-CONFIG_USB_M66592=m
-CONFIG_USB_AMD5536UDC=m
-CONFIG_USB_NET2272=m
-CONFIG_USB_NET2272_DMA=y
-CONFIG_USB_NET2280=m
-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_U_ETHER=m
-CONFIG_USB_U_RNDIS=m
-CONFIG_USB_F_SERIAL=m
-CONFIG_USB_F_OBEX=m
-CONFIG_USB_F_NCM=m
-CONFIG_USB_F_ECM=m
-CONFIG_USB_F_SUBSET=m
-CONFIG_USB_F_RNDIS=m
-# CONFIG_USB_CONFIGFS is not set
-# CONFIG_USB_ZERO is not set
-CONFIG_USB_AUDIO=m
-# CONFIG_GADGET_UAC1 is not set
-CONFIG_USB_ETH=m
-CONFIG_USB_ETH_RNDIS=y
-# CONFIG_USB_ETH_EEM is not set
-CONFIG_USB_G_NCM=m
-CONFIG_USB_GADGETFS=m
-CONFIG_USB_FUNCTIONFS=m
-CONFIG_USB_FUNCTIONFS_ETH=y
-CONFIG_USB_FUNCTIONFS_RNDIS=y
-CONFIG_USB_FUNCTIONFS_GENERIC=y
-CONFIG_USB_MASS_STORAGE=m
-CONFIG_USB_GADGET_TARGET=m
-CONFIG_USB_G_SERIAL=m
-CONFIG_USB_MIDI_GADGET=m
-CONFIG_USB_G_PRINTER=m
-# CONFIG_USB_CDC_COMPOSITE is not set
-# CONFIG_USB_G_NOKIA is not set
-# CONFIG_USB_G_ACM_MS is not set
-# CONFIG_USB_G_MULTI is not set
-CONFIG_USB_G_HID=m
-CONFIG_USB_G_DBGP=m
-# CONFIG_USB_G_DBGP_PRINTK is not set
-CONFIG_USB_G_DBGP_SERIAL=y
-CONFIG_USB_G_WEBCAM=m
-CONFIG_UWB=m
-CONFIG_UWB_HWA=m
-CONFIG_UWB_WHCI=m
-CONFIG_UWB_I1480U=m
-CONFIG_MMC=m
-# CONFIG_MMC_DEBUG is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
-# CONFIG_MMC_CLKGATE is not set
-
-#
-# MMC/SD/SDIO Card Drivers
-#
-CONFIG_MMC_BLOCK=m
-CONFIG_MMC_BLOCK_MINORS=8
-CONFIG_MMC_BLOCK_BOUNCE=y
-CONFIG_SDIO_UART=m
-# CONFIG_MMC_TEST is not set
-
-#
-# MMC/SD/SDIO Host Controller Drivers
-#
-CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_PCI=m
-CONFIG_MMC_RICOH_MMC=y
-CONFIG_MMC_SDHCI_ACPI=m
-CONFIG_MMC_SDHCI_PLTFM=m
-CONFIG_MMC_WBSD=m
-CONFIG_MMC_TIFM_SD=m
-CONFIG_MMC_SDRICOH_CS=m
-CONFIG_MMC_CB710=m
-CONFIG_MMC_VIA_SDMMC=m
-CONFIG_MMC_VUB300=m
-CONFIG_MMC_USHC=m
-CONFIG_MMC_REALTEK_PCI=m
-CONFIG_MEMSTICK=m
-# CONFIG_MEMSTICK_DEBUG is not set
-
-#
-# MemoryStick drivers
-#
-# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
-CONFIG_MSPRO_BLOCK=m
-
-#
-# MemoryStick Host Controller Drivers
-#
-CONFIG_MEMSTICK_TIFM_MS=m
-CONFIG_MEMSTICK_JMICRON_38X=m
-CONFIG_MEMSTICK_R592=m
-CONFIG_MEMSTICK_REALTEK_PCI=m
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-
-#
-# LED drivers
-#
-CONFIG_LEDS_LM3530=m
-CONFIG_LEDS_LM3533=m
-CONFIG_LEDS_LM3642=m
-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_LP5562=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
-CONFIG_LEDS_DELL_NETBOOKS=m
-CONFIG_LEDS_MC13783=m
-CONFIG_LEDS_TCA6507=m
-CONFIG_LEDS_LM355x=m
-CONFIG_LEDS_OT200=m
-CONFIG_LEDS_BLINKM=m
-
-#
-# LED Triggers
-#
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_ONESHOT=m
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
-CONFIG_LEDS_TRIGGER_BACKLIGHT=m
-# CONFIG_LEDS_TRIGGER_CPU is not set
-CONFIG_LEDS_TRIGGER_GPIO=m
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
-
-#
-# iptables trigger is under Netfilter config (LED target)
-#
-CONFIG_LEDS_TRIGGER_TRANSIENT=m
-CONFIG_LEDS_TRIGGER_CAMERA=m
-CONFIG_ACCESSIBILITY=y
-CONFIG_A11Y_BRAILLE_CONSOLE=y
-# CONFIG_INFINIBAND is not set
-CONFIG_EDAC=y
-CONFIG_EDAC_LEGACY_SYSFS=y
-# CONFIG_EDAC_DEBUG is not set
-CONFIG_EDAC_DECODE_MCE=m
-CONFIG_EDAC_MCE_INJ=m
-CONFIG_EDAC_MM_EDAC=m
-CONFIG_EDAC_AMD76X=m
-CONFIG_EDAC_E7XXX=m
-CONFIG_EDAC_E752X=m
-CONFIG_EDAC_I82875P=m
-CONFIG_EDAC_I82975X=m
-CONFIG_EDAC_I3000=m
-CONFIG_EDAC_I3200=m
-CONFIG_EDAC_X38=m
-CONFIG_EDAC_I5400=m
-CONFIG_EDAC_I7CORE=m
-CONFIG_EDAC_I82860=m
-CONFIG_EDAC_R82600=m
-CONFIG_EDAC_I5000=m
-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
-
-#
-# RTC interfaces
-#
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
-CONFIG_RTC_INTF_DEV_UIE_EMUL=y
-CONFIG_RTC_DRV_TEST=m
-
-#
-# I2C RTC drivers
-#
-CONFIG_RTC_DRV_DS1307=m
-CONFIG_RTC_DRV_DS1374=m
-CONFIG_RTC_DRV_DS1672=m
-CONFIG_RTC_DRV_DS3232=m
-CONFIG_RTC_DRV_MAX6900=m
-CONFIG_RTC_DRV_RS5C372=m
-CONFIG_RTC_DRV_ISL1208=m
-CONFIG_RTC_DRV_ISL12022=m
-CONFIG_RTC_DRV_X1205=m
-CONFIG_RTC_DRV_PCF2127=m
-CONFIG_RTC_DRV_PCF8523=m
-CONFIG_RTC_DRV_PCF8563=m
-CONFIG_RTC_DRV_PCF8583=m
-CONFIG_RTC_DRV_M41T80=m
-CONFIG_RTC_DRV_M41T80_WDT=y
-CONFIG_RTC_DRV_BQ32K=m
-CONFIG_RTC_DRV_S35390A=m
-CONFIG_RTC_DRV_FM3130=m
-CONFIG_RTC_DRV_RX8581=m
-CONFIG_RTC_DRV_RX8025=m
-CONFIG_RTC_DRV_EM3027=m
-CONFIG_RTC_DRV_RV3029C2=m
-
-#
-# SPI RTC drivers
-#
-# CONFIG_RTC_DRV_M41T93 is not set
-# CONFIG_RTC_DRV_M41T94 is not set
-# CONFIG_RTC_DRV_DS1305 is not set
-# CONFIG_RTC_DRV_DS1390 is not set
-# CONFIG_RTC_DRV_MAX6902 is not set
-# CONFIG_RTC_DRV_R9701 is not set
-# 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
-#
-CONFIG_RTC_DRV_CMOS=y
-CONFIG_RTC_DRV_DS1286=m
-CONFIG_RTC_DRV_DS1511=m
-CONFIG_RTC_DRV_DS1553=m
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_STK17TA8=m
-CONFIG_RTC_DRV_M48T86=m
-CONFIG_RTC_DRV_M48T35=m
-CONFIG_RTC_DRV_M48T59=m
-CONFIG_RTC_DRV_MSM6242=m
-CONFIG_RTC_DRV_BQ4802=m
-CONFIG_RTC_DRV_RP5C01=m
-CONFIG_RTC_DRV_V3020=m
-CONFIG_RTC_DRV_DS2404=m
-CONFIG_RTC_DRV_PCF50633=m
-
-#
-# on-CPU RTC drivers
-#
-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
-
-#
-# DMA Devices
-#
-CONFIG_INTEL_MID_DMAC=m
-CONFIG_INTEL_IOATDMA=m
-CONFIG_DW_DMAC_CORE=m
-CONFIG_DW_DMAC=m
-CONFIG_DW_DMAC_PCI=m
-CONFIG_TIMB_DMA=m
-CONFIG_PCH_DMA=m
-CONFIG_DMA_ENGINE=y
-CONFIG_DMA_ACPI=y
-CONFIG_DMA_OF=y
-
-#
-# DMA Clients
-#
-CONFIG_NET_DMA=y
-CONFIG_ASYNC_TX_DMA=y
-# CONFIG_DMATEST is not set
-CONFIG_DCA=m
-CONFIG_AUXDISPLAY=y
-CONFIG_KS0108=m
-CONFIG_KS0108_PORT=0x378
-CONFIG_KS0108_DELAY=2
-CONFIG_CFAG12864B=m
-CONFIG_CFAG12864B_RATE=20
-CONFIG_UIO=m
-CONFIG_UIO_CIF=m
-CONFIG_UIO_PDRV=m
-CONFIG_UIO_PDRV_GENIRQ=m
-# CONFIG_UIO_DMEM_GENIRQ is not set
-CONFIG_UIO_AEC=m
-CONFIG_UIO_SERCOS3=m
-CONFIG_UIO_PCI_GENERIC=m
-CONFIG_UIO_NETX=m
-CONFIG_VFIO_IOMMU_TYPE1=m
-CONFIG_VFIO=m
-CONFIG_VFIO_PCI=m
-CONFIG_VFIO_PCI_VGA=y
-CONFIG_VIRT_DRIVERS=y
-CONFIG_VIRTIO=y
-
-#
-# Virtio drivers
-#
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_BALLOON=m
-CONFIG_VIRTIO_MMIO=m
-CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
-
-#
-# Microsoft Hyper-V guest support
-#
-CONFIG_HYPERV=m
-CONFIG_HYPERV_UTILS=m
-CONFIG_HYPERV_BALLOON=m
-CONFIG_STAGING=y
-CONFIG_ET131X=m
-CONFIG_SLICOSS=m
-CONFIG_USBIP_CORE=m
-CONFIG_USBIP_VHCI_HCD=m
-CONFIG_USBIP_HOST=m
-# CONFIG_USBIP_DEBUG is not set
-CONFIG_W35UND=m
-CONFIG_PRISM2_USB=m
-CONFIG_ECHO=m
-CONFIG_COMEDI=m
-# CONFIG_COMEDI_DEBUG is not set
-CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048
-CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480
-CONFIG_COMEDI_MISC_DRIVERS=y
-CONFIG_COMEDI_KCOMEDILIB=m
-CONFIG_COMEDI_BOND=m
-CONFIG_COMEDI_TEST=m
-CONFIG_COMEDI_PARPORT=m
-CONFIG_COMEDI_SERIAL2002=m
-CONFIG_COMEDI_SKEL=m
-CONFIG_COMEDI_ISA_DRIVERS=y
-CONFIG_COMEDI_PCL711=m
-CONFIG_COMEDI_PCL724=m
-CONFIG_COMEDI_PCL726=m
-CONFIG_COMEDI_PCL730=m
-CONFIG_COMEDI_PCL812=m
-CONFIG_COMEDI_PCL816=m
-CONFIG_COMEDI_PCL818=m
-CONFIG_COMEDI_PCM3724=m
-CONFIG_COMEDI_AMPLC_DIO200_ISA=m
-CONFIG_COMEDI_AMPLC_PC236_ISA=m
-CONFIG_COMEDI_AMPLC_PC263_ISA=m
-CONFIG_COMEDI_RTI800=m
-CONFIG_COMEDI_RTI802=m
-CONFIG_COMEDI_DAS16M1=m
-CONFIG_COMEDI_DAS08_ISA=m
-CONFIG_COMEDI_DAS16=m
-CONFIG_COMEDI_DAS800=m
-CONFIG_COMEDI_DAS1800=m
-CONFIG_COMEDI_DAS6402=m
-CONFIG_COMEDI_DT2801=m
-CONFIG_COMEDI_DT2811=m
-CONFIG_COMEDI_DT2814=m
-CONFIG_COMEDI_DT2815=m
-CONFIG_COMEDI_DT2817=m
-CONFIG_COMEDI_DT282X=m
-CONFIG_COMEDI_DMM32AT=m
-CONFIG_COMEDI_FL512=m
-CONFIG_COMEDI_AIO_AIO12_8=m
-CONFIG_COMEDI_AIO_IIRO_16=m
-CONFIG_COMEDI_C6XDIGIO=m
-CONFIG_COMEDI_MPC624=m
-CONFIG_COMEDI_ADQ12B=m
-CONFIG_COMEDI_NI_AT_A2150=m
-CONFIG_COMEDI_NI_AT_AO=m
-CONFIG_COMEDI_NI_ATMIO=m
-CONFIG_COMEDI_NI_ATMIO16D=m
-CONFIG_COMEDI_NI_LABPC_ISA=m
-CONFIG_COMEDI_PCMAD=m
-CONFIG_COMEDI_PCMDA12=m
-CONFIG_COMEDI_PCMMIO=m
-CONFIG_COMEDI_PCMUIO=m
-CONFIG_COMEDI_MULTIQ3=m
-CONFIG_COMEDI_POC=m
-CONFIG_COMEDI_S526=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
-CONFIG_COMEDI_ADDI_APCI_1516=m
-CONFIG_COMEDI_ADDI_APCI_1564=m
-CONFIG_COMEDI_ADDI_APCI_16XX=m
-CONFIG_COMEDI_ADDI_APCI_2032=m
-CONFIG_COMEDI_ADDI_APCI_2200=m
-CONFIG_COMEDI_ADDI_APCI_3120=m
-CONFIG_COMEDI_ADDI_APCI_3501=m
-CONFIG_COMEDI_ADDI_APCI_3XXX=m
-CONFIG_COMEDI_ADL_PCI6208=m
-CONFIG_COMEDI_ADL_PCI7X3X=m
-CONFIG_COMEDI_ADL_PCI8164=m
-CONFIG_COMEDI_ADL_PCI9111=m
-CONFIG_COMEDI_ADL_PCI9118=m
-CONFIG_COMEDI_ADV_PCI1710=m
-CONFIG_COMEDI_ADV_PCI1723=m
-CONFIG_COMEDI_ADV_PCI1724=m
-CONFIG_COMEDI_ADV_PCI_DIO=m
-CONFIG_COMEDI_AMPLC_DIO200_PCI=m
-CONFIG_COMEDI_AMPLC_PC236_PCI=m
-CONFIG_COMEDI_AMPLC_PC263_PCI=m
-CONFIG_COMEDI_AMPLC_PCI224=m
-CONFIG_COMEDI_AMPLC_PCI230=m
-CONFIG_COMEDI_CONTEC_PCI_DIO=m
-CONFIG_COMEDI_DAS08_PCI=m
-CONFIG_COMEDI_DT3000=m
-CONFIG_COMEDI_DYNA_PCI10XX=m
-CONFIG_COMEDI_UNIOXX5=m
-CONFIG_COMEDI_GSC_HPDI=m
-CONFIG_COMEDI_ICP_MULTI=m
-CONFIG_COMEDI_II_PCI20KC=m
-CONFIG_COMEDI_DAQBOARD2000=m
-CONFIG_COMEDI_JR3_PCI=m
-CONFIG_COMEDI_KE_COUNTER=m
-CONFIG_COMEDI_CB_PCIDAS64=m
-CONFIG_COMEDI_CB_PCIDAS=m
-CONFIG_COMEDI_CB_PCIDDA=m
-# CONFIG_COMEDI_CB_PCIMDAS is not set
-CONFIG_COMEDI_CB_PCIMDDA=m
-CONFIG_COMEDI_ME4000=m
-CONFIG_COMEDI_ME_DAQ=m
-CONFIG_COMEDI_NI_6527=m
-CONFIG_COMEDI_NI_65XX=m
-CONFIG_COMEDI_NI_660X=m
-CONFIG_COMEDI_NI_670X=m
-CONFIG_COMEDI_NI_LABPC_PCI=m
-CONFIG_COMEDI_NI_PCIDIO=m
-CONFIG_COMEDI_NI_PCIMIO=m
-CONFIG_COMEDI_RTD520=m
-CONFIG_COMEDI_S626=m
-CONFIG_COMEDI_SSV_DNP=m
-CONFIG_COMEDI_MITE=m
-CONFIG_COMEDI_NI_TIOCMD=m
-CONFIG_COMEDI_PCMCIA_DRIVERS=y
-CONFIG_COMEDI_CB_DAS16_CS=m
-CONFIG_COMEDI_DAS08_CS=m
-CONFIG_COMEDI_NI_DAQ_700_CS=m
-CONFIG_COMEDI_NI_DAQ_DIO24_CS=m
-CONFIG_COMEDI_NI_LABPC_CS=m
-CONFIG_COMEDI_NI_MIO_CS=m
-CONFIG_COMEDI_QUATECH_DAQP_CS=m
-CONFIG_COMEDI_USB_DRIVERS=y
-CONFIG_COMEDI_DT9812=m
-CONFIG_COMEDI_USBDUX=m
-CONFIG_COMEDI_USBDUXFAST=m
-CONFIG_COMEDI_USBDUXSIGMA=m
-CONFIG_COMEDI_VMK80XX=m
-CONFIG_COMEDI_8255=m
-CONFIG_COMEDI_FC=m
-CONFIG_COMEDI_AMPLC_DIO200=m
-CONFIG_COMEDI_AMPLC_PC236=m
-CONFIG_COMEDI_DAS08=m
-CONFIG_COMEDI_NI_LABPC=m
-CONFIG_COMEDI_NI_TIO=m
-# CONFIG_FB_OLPC_DCON is not set
-CONFIG_ASUS_OLED=m
-# CONFIG_PANEL is not set
-CONFIG_R8187SE=m
-CONFIG_RTL8192U=m
-CONFIG_RTLLIB=m
-CONFIG_RTLLIB_CRYPTO_CCMP=m
-CONFIG_RTLLIB_CRYPTO_TKIP=m
-CONFIG_RTLLIB_CRYPTO_WEP=m
-CONFIG_RTL8192E=m
-CONFIG_R8712U=m
-CONFIG_RTS5139=m
-# CONFIG_RTS5139_DEBUG is not set
-# CONFIG_TRANZPORT is not set
-CONFIG_IDE_PHISON=m
-CONFIG_LINE6_USB=m
-# CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set
-CONFIG_USB_SERIAL_QUATECH2=m
-CONFIG_VT6655=m
-CONFIG_VT6656=m
-CONFIG_DX_SEP=m
-CONFIG_ZSMALLOC=y
-CONFIG_ZRAM=m
-# CONFIG_ZRAM_DEBUG is not set
-CONFIG_WLAGS49_H2=m
-CONFIG_WLAGS49_H25=m
-CONFIG_FB_SM7XX=m
-CONFIG_CRYSTALHD=m
-CONFIG_FB_XGI=m
-CONFIG_ACPI_QUICKSTART=m
-CONFIG_USB_ENESTORAGE=m
-CONFIG_BCM_WIMAX=m
-CONFIG_FT1000=m
-CONFIG_FT1000_USB=m
-CONFIG_FT1000_PCMCIA=m
-
-#
-# Speakup console speech
-#
-CONFIG_SPEAKUP=m
-CONFIG_SPEAKUP_SYNTH_ACNTSA=m
-CONFIG_SPEAKUP_SYNTH_ACNTPC=m
-CONFIG_SPEAKUP_SYNTH_APOLLO=m
-CONFIG_SPEAKUP_SYNTH_AUDPTR=m
-CONFIG_SPEAKUP_SYNTH_BNS=m
-CONFIG_SPEAKUP_SYNTH_DECTLK=m
-CONFIG_SPEAKUP_SYNTH_DECEXT=m
-CONFIG_SPEAKUP_SYNTH_DECPC=m
-CONFIG_SPEAKUP_SYNTH_DTLK=m
-CONFIG_SPEAKUP_SYNTH_KEYPC=m
-CONFIG_SPEAKUP_SYNTH_LTLK=m
-CONFIG_SPEAKUP_SYNTH_SOFT=m
-CONFIG_SPEAKUP_SYNTH_SPKOUT=m
-CONFIG_SPEAKUP_SYNTH_TXPRT=m
-CONFIG_SPEAKUP_SYNTH_DUMMY=m
-CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
-CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
-CONFIG_STAGING_MEDIA=y
-CONFIG_DVB_AS102=m
-CONFIG_DVB_CXD2099=m
-CONFIG_VIDEO_DT3155=m
-CONFIG_DT3155_CCIR=y
-CONFIG_DT3155_STREAMING=y
-CONFIG_VIDEO_GO7007=m
-CONFIG_VIDEO_GO7007_USB=m
-CONFIG_VIDEO_GO7007_LOADER=m
-# CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set
-CONFIG_SOLO6X10=m
-CONFIG_LIRC_STAGING=y
-CONFIG_LIRC_BT829=m
-CONFIG_LIRC_IGORPLUGUSB=m
-CONFIG_LIRC_IMON=m
-CONFIG_LIRC_PARALLEL=m
-CONFIG_LIRC_SASEM=m
-CONFIG_LIRC_SERIAL=m
-CONFIG_LIRC_SERIAL_TRANSMITTER=y
-CONFIG_LIRC_SIR=m
-CONFIG_LIRC_ZILOG=m
-
-#
-# Android
-#
-# CONFIG_ANDROID is not set
-CONFIG_USB_WPAN_HCD=m
-CONFIG_WIMAX_GDM72XX=m
-CONFIG_WIMAX_GDM72XX_QOS=y
-CONFIG_WIMAX_GDM72XX_K_MODE=y
-CONFIG_WIMAX_GDM72XX_WIMAX2=y
-CONFIG_WIMAX_GDM72XX_USB=y
-# CONFIG_WIMAX_GDM72XX_SDIO is not set
-CONFIG_WIMAX_GDM72XX_USB_PM=y
-CONFIG_NET_VENDOR_SILICOM=y
-CONFIG_SBYPASS=m
-CONFIG_BPCTL=m
-CONFIG_CED1401=m
-CONFIG_DGRP=m
-CONFIG_FIREWIRE_SERIAL=m
-CONFIG_ZCACHE=m
-# CONFIG_ZCACHE_DEBUG is not set
-# CONFIG_USB_DWC2 is not set
-CONFIG_USB_BTMTK=m
-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
-CONFIG_FUJITSU_LAPTOP=m
-# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
-CONFIG_FUJITSU_TABLET=m
-CONFIG_AMILO_RFKILL=m
-CONFIG_TC1100_WMI=m
-CONFIG_HP_ACCEL=m
-CONFIG_HP_WMI=m
-CONFIG_MSI_LAPTOP=m
-CONFIG_PANASONIC_LAPTOP=m
-CONFIG_COMPAL_LAPTOP=m
-CONFIG_SONY_LAPTOP=m
-# CONFIG_SONYPI_COMPAT is not set
-CONFIG_IDEAPAD_LAPTOP=m
-CONFIG_THINKPAD_ACPI=m
-CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
-# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
-# CONFIG_THINKPAD_ACPI_DEBUG is not set
-# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
-CONFIG_THINKPAD_ACPI_VIDEO=y
-CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
-CONFIG_SENSORS_HDAPS=m
-CONFIG_INTEL_MENLOW=m
-CONFIG_EEEPC_LAPTOP=m
-CONFIG_ASUS_WMI=m
-CONFIG_ASUS_NB_WMI=m
-CONFIG_EEEPC_WMI=m
-CONFIG_ACPI_WMI=m
-CONFIG_MSI_WMI=m
-CONFIG_TOPSTAR_LAPTOP=m
-CONFIG_ACPI_TOSHIBA=m
-CONFIG_TOSHIBA_BT_RFKILL=m
-CONFIG_ACPI_CMPC=m
-CONFIG_INTEL_IPS=m
-CONFIG_IBM_RTL=m
-CONFIG_XO1_RFKILL=m
-CONFIG_XO15_EBOOK=m
-CONFIG_SAMSUNG_LAPTOP=m
-CONFIG_MXM_WMI=m
-CONFIG_INTEL_OAKTRAIL=m
-CONFIG_SAMSUNG_Q10=m
-CONFIG_APPLE_GMUX=m
-CONFIG_INTEL_RST=y
-CONFIG_INTEL_SMARTCONNECT=y
-CONFIG_PVPANIC=m
-
-#
-# Hardware Spinlock drivers
-#
-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
-CONFIG_DMAR_TABLE=y
-CONFIG_INTEL_IOMMU=y
-# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
-CONFIG_INTEL_IOMMU_FLOPPY_WA=y
-
-#
-# Remoteproc drivers
-#
-CONFIG_REMOTEPROC=m
-CONFIG_STE_MODEM_RPROC=m
-
-#
-# Rpmsg drivers
-#
-# CONFIG_PM_DEVFREQ is not set
-CONFIG_EXTCON=m
-
-#
-# Extcon Device Drivers
-#
-CONFIG_EXTCON_GPIO=m
-CONFIG_MEMORY=y
-# CONFIG_IIO is not set
-# CONFIG_VME_BUS is not set
-CONFIG_PWM=y
-CONFIG_PWM_SYSFS=y
-# CONFIG_PWM_PCA9685 is not set
-CONFIG_IRQCHIP=y
-CONFIG_IPACK_BUS=m
-CONFIG_BOARD_TPCI200=m
-CONFIG_SERIAL_IPOCTAL=m
-# CONFIG_RESET_CONTROLLER is not set
-CONFIG_FMC=m
-CONFIG_FMC_FAKEDEV=m
-CONFIG_FMC_TRIVIAL=m
-CONFIG_FMC_WRITE_EEPROM=m
-CONFIG_FMC_CHARDEV=m
-
-#
-# Firmware Drivers
-#
-CONFIG_EDD=m
-# CONFIG_EDD_OFF is not set
-CONFIG_FIRMWARE_MEMMAP=y
-CONFIG_DELL_RBU=m
-CONFIG_DCDBAS=m
-CONFIG_DMIID=y
-CONFIG_DMI_SYSFS=m
-CONFIG_ISCSI_IBFT_FIND=y
-CONFIG_ISCSI_IBFT=m
-# CONFIG_GOOGLE_FIRMWARE is not set
-
-#
-# EFI (Extensible Firmware Interface) Support
-#
-CONFIG_EFI_VARS=m
-CONFIG_EFI_VARS_PSTORE=m
-CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
-
-#
-# File systems
-#
-CONFIG_DCACHE_WORD_ACCESS=y
-# CONFIG_EXT2_FS is not set
-# CONFIG_EXT3_FS is not set
-CONFIG_EXT4_FS=m
-CONFIG_EXT4_USE_FOR_EXT23=y
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-# CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD2=m
-# CONFIG_JBD2_DEBUG is not set
-CONFIG_FS_MBCACHE=m
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
-CONFIG_REISERFS_PROC_INFO=y
-CONFIG_REISERFS_FS_XATTR=y
-CONFIG_REISERFS_FS_POSIX_ACL=y
-CONFIG_REISERFS_FS_SECURITY=y
-CONFIG_JFS_FS=m
-CONFIG_JFS_POSIX_ACL=y
-CONFIG_JFS_SECURITY=y
-# CONFIG_JFS_DEBUG is not set
-CONFIG_JFS_STATISTICS=y
-CONFIG_XFS_FS=m
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_POSIX_ACL=y
-CONFIG_XFS_RT=y
-# CONFIG_XFS_WARN is not set
-# CONFIG_XFS_DEBUG is not set
-CONFIG_GFS2_FS=m
-CONFIG_GFS2_FS_LOCKING_DLM=y
-CONFIG_OCFS2_FS=m
-CONFIG_OCFS2_FS_O2CB=m
-CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
-CONFIG_OCFS2_FS_STATS=y
-# CONFIG_OCFS2_DEBUG_MASKLOG is not set
-# CONFIG_OCFS2_DEBUG_FS is not set
-CONFIG_BTRFS_FS=m
-CONFIG_BTRFS_FS_POSIX_ACL=y
-# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
-# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-# CONFIG_BTRFS_DEBUG is not set
-CONFIG_NILFS2_FS=m
-CONFIG_FS_POSIX_ACL=y
-CONFIG_EXPORTFS=y
-CONFIG_FILE_LOCKING=y
-CONFIG_FSNOTIFY=y
-CONFIG_DNOTIFY=y
-CONFIG_INOTIFY_USER=y
-CONFIG_FANOTIFY=y
-CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
-CONFIG_QUOTA=y
-CONFIG_QUOTA_NETLINK_INTERFACE=y
-# CONFIG_PRINT_QUOTA_WARNING is not set
-# CONFIG_QUOTA_DEBUG is not set
-CONFIG_QUOTA_TREE=m
-CONFIG_QFMT_V1=m
-CONFIG_QFMT_V2=m
-CONFIG_QUOTACTL=y
-CONFIG_AUTOFS4_FS=y
-CONFIG_FUSE_FS=m
-CONFIG_CUSE=m
-CONFIG_GENERIC_ACL=y
-
-#
-# Caches
-#
-CONFIG_FSCACHE=m
-CONFIG_FSCACHE_STATS=y
-CONFIG_FSCACHE_HISTOGRAM=y
-# CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_OBJECT_LIST is not set
-CONFIG_CACHEFILES=m
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
-
-#
-# CD-ROM/DVD Filesystems
-#
-CONFIG_ISO9660_FS=m
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_UDF_FS=m
-CONFIG_UDF_NLS=y
-
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-CONFIG_NTFS_FS=m
-# CONFIG_NTFS_DEBUG is not set
-CONFIG_NTFS_RW=y
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_PROC_SYSCTL=y
-CONFIG_PROC_PAGE_MONITOR=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_TMPFS_XATTR=y
-CONFIG_HUGETLBFS=y
-CONFIG_HUGETLB_PAGE=y
-CONFIG_CONFIGFS_FS=y
-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
-# CONFIG_BEFS_DEBUG is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-CONFIG_JFFS2_FS=m
-CONFIG_JFFS2_FS_DEBUG=0
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-# CONFIG_JFFS2_SUMMARY is not set
-# CONFIG_JFFS2_FS_XATTR is not set
-# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-CONFIG_JFFS2_ZLIB=y
-# CONFIG_JFFS2_LZO is not set
-CONFIG_JFFS2_RTIME=y
-# CONFIG_JFFS2_RUBIN is not set
-CONFIG_UBIFS_FS=m
-# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
-CONFIG_LOGFS=m
-CONFIG_CRAMFS=m
-CONFIG_SQUASHFS=m
-CONFIG_SQUASHFS_XATTR=y
-CONFIG_SQUASHFS_ZLIB=y
-CONFIG_SQUASHFS_LZO=y
-CONFIG_SQUASHFS_XZ=y
-# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
-# CONFIG_SQUASHFS_EMBEDDED is not set
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-# CONFIG_VXFS_FS is not set
-CONFIG_MINIX_FS=m
-CONFIG_OMFS_FS=m
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_QNX6FS_FS is not set
-# CONFIG_ROMFS_FS is not set
-CONFIG_PSTORE=y
-# CONFIG_PSTORE_CONSOLE is not set
-# CONFIG_PSTORE_FTRACE is not set
-CONFIG_PSTORE_RAM=m
-# CONFIG_SYSV_FS is not set
-CONFIG_UFS_FS=m
-# CONFIG_UFS_FS_WRITE is not set
-# CONFIG_UFS_DEBUG is not set
-CONFIG_EXOFS_FS=m
-# CONFIG_EXOFS_DEBUG is not set
-CONFIG_F2FS_FS=m
-CONFIG_F2FS_STAT_FS=y
-CONFIG_F2FS_FS_XATTR=y
-CONFIG_F2FS_FS_POSIX_ACL=y
-CONFIG_F2FS_FS_SECURITY=y
-CONFIG_EFIVAR_FS=y
-CONFIG_ORE=m
-CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_NFS_FS=m
-CONFIG_NFS_V2=m
-CONFIG_NFS_V3=m
-CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=m
-CONFIG_NFS_SWAP=y
-CONFIG_NFS_V4_1=y
-CONFIG_NFS_V4_2=y
-CONFIG_PNFS_FILE_LAYOUT=m
-CONFIG_PNFS_BLOCK=m
-CONFIG_PNFS_OBJLAYOUT=m
-CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org"
-CONFIG_NFS_V4_SECURITY_LABEL=y
-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
-CONFIG_NFSD_V3_ACL=y
-CONFIG_NFSD_V4=y
-CONFIG_NFSD_V4_SECURITY_LABEL=y
-# CONFIG_NFSD_FAULT_INJECTION is not set
-CONFIG_LOCKD=m
-CONFIG_LOCKD_V4=y
-CONFIG_NFS_ACL_SUPPORT=m
-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
-CONFIG_CIFS=m
-CONFIG_CIFS_STATS=y
-# CONFIG_CIFS_STATS2 is not set
-CONFIG_CIFS_WEAK_PW_HASH=y
-CONFIG_CIFS_UPCALL=y
-CONFIG_CIFS_XATTR=y
-CONFIG_CIFS_POSIX=y
-CONFIG_CIFS_ACL=y
-# CONFIG_CIFS_DEBUG is not set
-CONFIG_CIFS_DFS_UPCALL=y
-CONFIG_CIFS_SMB2=y
-CONFIG_CIFS_FSCACHE=y
-CONFIG_NCP_FS=m
-# CONFIG_NCPFS_PACKET_SIGNING is not set
-# CONFIG_NCPFS_IOCTL_LOCKING is not set
-# CONFIG_NCPFS_STRONG is not set
-CONFIG_NCPFS_NFS_NS=y
-CONFIG_NCPFS_OS2_NS=y
-CONFIG_NCPFS_SMALLDOS=y
-CONFIG_NCPFS_NLS=y
-# CONFIG_NCPFS_EXTRAS is not set
-CONFIG_CODA_FS=m
-CONFIG_AFS_FS=m
-# CONFIG_AFS_DEBUG is not set
-CONFIG_AFS_FSCACHE=y
-CONFIG_9P_FS=m
-CONFIG_9P_FSCACHE=y
-CONFIG_9P_FS_POSIX_ACL=y
-CONFIG_9P_FS_SECURITY=y
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_737=m
-CONFIG_NLS_CODEPAGE_775=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_852=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_857=m
-CONFIG_NLS_CODEPAGE_860=m
-CONFIG_NLS_CODEPAGE_861=m
-CONFIG_NLS_CODEPAGE_862=m
-CONFIG_NLS_CODEPAGE_863=m
-CONFIG_NLS_CODEPAGE_864=m
-CONFIG_NLS_CODEPAGE_865=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_CODEPAGE_869=m
-CONFIG_NLS_CODEPAGE_936=m
-CONFIG_NLS_CODEPAGE_950=m
-CONFIG_NLS_CODEPAGE_932=m
-CONFIG_NLS_CODEPAGE_949=m
-CONFIG_NLS_CODEPAGE_874=m
-CONFIG_NLS_ISO8859_8=m
-CONFIG_NLS_CODEPAGE_1250=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_ASCII=m
-CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_ISO8859_2=m
-CONFIG_NLS_ISO8859_3=m
-CONFIG_NLS_ISO8859_4=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_ISO8859_6=m
-CONFIG_NLS_ISO8859_7=m
-CONFIG_NLS_ISO8859_9=m
-CONFIG_NLS_ISO8859_13=m
-CONFIG_NLS_ISO8859_14=m
-CONFIG_NLS_ISO8859_15=m
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_MAC_ROMAN=m
-CONFIG_NLS_MAC_CELTIC=m
-CONFIG_NLS_MAC_CENTEURO=m
-CONFIG_NLS_MAC_CROATIAN=m
-CONFIG_NLS_MAC_CYRILLIC=m
-CONFIG_NLS_MAC_GAELIC=m
-CONFIG_NLS_MAC_GREEK=m
-CONFIG_NLS_MAC_ICELAND=m
-CONFIG_NLS_MAC_INUIT=m
-CONFIG_NLS_MAC_ROMANIAN=m
-CONFIG_NLS_MAC_TURKISH=m
-CONFIG_NLS_UTF8=m
-CONFIG_DLM=m
-# CONFIG_DLM_DEBUG is not set
-
-#
-# Kernel hacking
-#
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-
-#
-# printk and dmesg options
-#
-CONFIG_PRINTK_TIME=y
-CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
-# CONFIG_BOOT_PRINTK_DELAY is not set
-CONFIG_DYNAMIC_DEBUG=y
-
-#
-# Compile-time checks and compiler options
-#
-# CONFIG_DEBUG_INFO is not set
-CONFIG_ENABLE_WARN_DEPRECATED=y
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_FRAME_WARN=1024
-CONFIG_STRIP_ASM_SYMS=y
-# CONFIG_READABLE_ASM is not set
-CONFIG_UNUSED_SYMBOLS=y
-CONFIG_DEBUG_FS=y
-# CONFIG_HEADERS_CHECK is not set
-# CONFIG_DEBUG_SECTION_MISMATCH is not set
-CONFIG_ARCH_WANT_FRAME_POINTERS=y
-CONFIG_FRAME_POINTER=y
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_DEBUG_KERNEL=y
-
-#
-# Memory Debugging
-#
-# CONFIG_DEBUG_PAGEALLOC is not set
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_SLUB_DEBUG_ON is not set
-# CONFIG_SLUB_STATS is not set
-CONFIG_HAVE_DEBUG_KMEMLEAK=y
-# CONFIG_DEBUG_KMEMLEAK is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_VIRTUAL is not set
-CONFIG_DEBUG_MEMORY_INIT=y
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-# CONFIG_DEBUG_HIGHMEM is not set
-CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
-# CONFIG_DEBUG_STACKOVERFLOW is not set
-CONFIG_HAVE_ARCH_KMEMCHECK=y
-# CONFIG_DEBUG_SHIRQ is not set
-
-#
-# Debug Lockups and Hangs
-#
-CONFIG_LOCKUP_DETECTOR=y
-CONFIG_HARDLOCKUP_DETECTOR=y
-# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
-CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
-# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
-CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
-CONFIG_DETECT_HUNG_TASK=y
-CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
-# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
-CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
-# CONFIG_PANIC_ON_OOPS is not set
-CONFIG_PANIC_ON_OOPS_VALUE=0
-CONFIG_SCHED_DEBUG=y
-CONFIG_SCHEDSTATS=y
-CONFIG_TIMER_STATS=y
-# CONFIG_DEBUG_PREEMPT is not set
-
-#
-# Lock Debugging (spinlocks, mutexes, etc...)
-#
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_RT_MUTEX_TESTER is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-CONFIG_DEBUG_MUTEXES=y
-# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_ATOMIC_SLEEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-CONFIG_STACKTRACE=y
-# CONFIG_DEBUG_KOBJECT is not set
-CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_DEBUG_WRITECOUNT is not set
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-# CONFIG_DEBUG_CREDENTIALS 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
-# CONFIG_RCU_CPU_STALL_INFO is not set
-# CONFIG_RCU_TRACE is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_NOTIFIER_ERROR_INJECTION is not set
-# CONFIG_FAULT_INJECTION is not set
-# CONFIG_LATENCYTOP is not set
-CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y
-# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
-CONFIG_USER_STACKTRACE_SUPPORT=y
-CONFIG_NOP_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-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
-CONFIG_TRACER_MAX_TRACE=y
-CONFIG_TRACE_CLOCK=y
-CONFIG_RING_BUFFER=y
-CONFIG_EVENT_TRACING=y
-CONFIG_CONTEXT_SWITCH_TRACER=y
-CONFIG_RING_BUFFER_ALLOW_SWAP=y
-CONFIG_TRACING=y
-CONFIG_GENERIC_TRACER=y
-CONFIG_TRACING_SUPPORT=y
-CONFIG_FTRACE=y
-CONFIG_FUNCTION_TRACER=y
-CONFIG_FUNCTION_GRAPH_TRACER=y
-# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_PREEMPT_TRACER is not set
-CONFIG_SCHED_TRACER=y
-CONFIG_FTRACE_SYSCALLS=y
-CONFIG_TRACER_SNAPSHOT=y
-# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
-CONFIG_BRANCH_PROFILE_NONE=y
-# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
-# CONFIG_PROFILE_ALL_BRANCHES is not set
-CONFIG_STACK_TRACER=y
-CONFIG_BLK_DEV_IO_TRACE=y
-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
-CONFIG_MMIOTRACE=y
-# CONFIG_MMIOTRACE_TEST is not set
-CONFIG_RING_BUFFER_BENCHMARK=m
-# CONFIG_RING_BUFFER_STARTUP_TEST is not set
-
-#
-# Runtime Testing
-#
-CONFIG_LKDTM=m
-# CONFIG_TEST_LIST_SORT is not set
-# CONFIG_KPROBES_SANITY_TEST is not set
-# CONFIG_BACKTRACE_SELF_TEST is not set
-# CONFIG_RBTREE_TEST is not set
-# CONFIG_INTERVAL_TREE_TEST is not set
-# CONFIG_ATOMIC64_SELFTEST is not set
-CONFIG_ASYNC_RAID6_TEST=m
-# CONFIG_TEST_STRING_HELPERS is not set
-CONFIG_TEST_KSTRTOX=m
-# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
-# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
-# CONFIG_DMA_API_DEBUG is not set
-# CONFIG_SAMPLES is not set
-CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_KGDB is not set
-CONFIG_STRICT_DEVMEM=y
-CONFIG_X86_VERBOSE_BOOTUP=y
-CONFIG_EARLY_PRINTK=y
-# CONFIG_EARLY_PRINTK_DBGP is not set
-# CONFIG_X86_PTDUMP is not set
-CONFIG_DEBUG_RODATA=y
-# CONFIG_DEBUG_RODATA_TEST is not set
-# CONFIG_DEBUG_SET_MODULE_RONX is not set
-# CONFIG_DEBUG_NX_TEST is not set
-CONFIG_DOUBLEFAULT=y
-# CONFIG_DEBUG_TLBFLUSH is not set
-# CONFIG_IOMMU_STRESS is not set
-CONFIG_HAVE_MMIOTRACE_SUPPORT=y
-# CONFIG_X86_DECODER_SELFTEST is not set
-CONFIG_IO_DELAY_TYPE_0X80=0
-CONFIG_IO_DELAY_TYPE_0XED=1
-CONFIG_IO_DELAY_TYPE_UDELAY=2
-CONFIG_IO_DELAY_TYPE_NONE=3
-CONFIG_IO_DELAY_0X80=y
-# CONFIG_IO_DELAY_0XED is not set
-# CONFIG_IO_DELAY_UDELAY is not set
-# CONFIG_IO_DELAY_NONE is not set
-CONFIG_DEFAULT_IO_DELAY_TYPE=0
-# CONFIG_DEBUG_BOOT_PARAMS is not set
-# CONFIG_CPA_DEBUG is not set
-# CONFIG_OPTIMIZE_INLINING is not set
-# CONFIG_DEBUG_NMI_SELFTEST is not set
-# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set
-
-#
-# Security options
-#
-CONFIG_KEYS=y
-CONFIG_TRUSTED_KEYS=m
-CONFIG_ENCRYPTED_KEYS=m
-# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
-# CONFIG_SECURITY_DMESG_RESTRICT is not set
-CONFIG_SECURITY=y
-CONFIG_SECURITYFS=y
-CONFIG_SECURITY_NETWORK=y
-# CONFIG_SECURITY_NETWORK_XFRM is not set
-CONFIG_SECURITY_PATH=y
-# CONFIG_INTEL_TXT is not set
-# CONFIG_SECURITY_SELINUX is not set
-# CONFIG_SECURITY_SMACK is not set
-CONFIG_SECURITY_TOMOYO=y
-CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
-CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
-# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
-CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/usr/bin/tomoyo-init"
-CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd"
-CONFIG_SECURITY_APPARMOR=y
-CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0
-# CONFIG_SECURITY_YAMA is not set
-# CONFIG_IMA is not set
-# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
-# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_DEFAULT_SECURITY=""
-CONFIG_XOR_BLOCKS=m
-CONFIG_ASYNC_CORE=m
-CONFIG_ASYNC_MEMCPY=m
-CONFIG_ASYNC_XOR=m
-CONFIG_ASYNC_PQ=m
-CONFIG_ASYNC_RAID6_RECOV=m
-CONFIG_CRYPTO=y
-
-#
-# Crypto core or helper
-#
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_AEAD=m
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_BLKCIPHER=m
-CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_HASH=m
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_RNG=m
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_PCOMP=m
-CONFIG_CRYPTO_PCOMP2=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_USER=m
-CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
-CONFIG_CRYPTO_GF128MUL=m
-CONFIG_CRYPTO_NULL=m
-CONFIG_CRYPTO_PCRYPT=m
-CONFIG_CRYPTO_WORKQUEUE=y
-CONFIG_CRYPTO_CRYPTD=m
-CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_ABLK_HELPER_X86=m
-CONFIG_CRYPTO_GLUE_HELPER_X86=m
-
-#
-# Authenticated Encryption with Associated Data
-#
-CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_GCM=m
-CONFIG_CRYPTO_SEQIV=m
-
-#
-# Block modes
-#
-CONFIG_CRYPTO_CBC=m
-CONFIG_CRYPTO_CTR=m
-CONFIG_CRYPTO_CTS=m
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_LRW=m
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_XTS=m
-
-#
-# Hash modes
-#
-CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_HMAC=m
-CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_VMAC=m
-
-#
-# Digest
-#
-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
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_RMD128=m
-CONFIG_CRYPTO_RMD160=m
-CONFIG_CRYPTO_RMD256=m
-CONFIG_CRYPTO_RMD320=m
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_SHA256=m
-CONFIG_CRYPTO_SHA512=m
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_WP512=m
-
-#
-# Ciphers
-#
-CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_AES_586=m
-CONFIG_CRYPTO_AES_NI_INTEL=m
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_BLOWFISH_COMMON=m
-CONFIG_CRYPTO_CAMELLIA=m
-CONFIG_CRYPTO_CAST_COMMON=m
-CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_FCRYPT=m
-CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_SALSA20=m
-CONFIG_CRYPTO_SALSA20_586=m
-CONFIG_CRYPTO_SEED=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_SERPENT_SSE2_586=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-CONFIG_CRYPTO_TWOFISH_586=m
-
-#
-# Compression
-#
-CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_ZLIB=m
-CONFIG_CRYPTO_LZO=y
-CONFIG_CRYPTO_LZ4=m
-CONFIG_CRYPTO_LZ4HC=m
-
-#
-# Random Number Generation
-#
-CONFIG_CRYPTO_ANSI_CPRNG=m
-CONFIG_CRYPTO_USER_API=m
-CONFIG_CRYPTO_USER_API_HASH=m
-CONFIG_CRYPTO_USER_API_SKCIPHER=m
-CONFIG_CRYPTO_HW=y
-CONFIG_CRYPTO_DEV_PADLOCK=m
-CONFIG_CRYPTO_DEV_PADLOCK_AES=m
-CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
-CONFIG_CRYPTO_DEV_GEODE=m
-CONFIG_CRYPTO_DEV_HIFN_795X=m
-CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
-CONFIG_ASYMMETRIC_KEY_TYPE=m
-CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m
-CONFIG_PUBLIC_KEY_ALGO_RSA=m
-CONFIG_X509_CERTIFICATE_PARSER=m
-CONFIG_HAVE_KVM=y
-CONFIG_HAVE_KVM_IRQCHIP=y
-CONFIG_HAVE_KVM_IRQ_ROUTING=y
-CONFIG_HAVE_KVM_EVENTFD=y
-CONFIG_KVM_APIC_ARCHITECTURE=y
-CONFIG_KVM_MMIO=y
-CONFIG_KVM_ASYNC_PF=y
-CONFIG_HAVE_KVM_MSI=y
-CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
-CONFIG_VIRTUALIZATION=y
-CONFIG_KVM=m
-CONFIG_KVM_INTEL=m
-CONFIG_KVM_AMD=m
-CONFIG_KVM_MMU_AUDIT=y
-CONFIG_KVM_DEVICE_ASSIGNMENT=y
-CONFIG_LGUEST=m
-CONFIG_BINARY_PRINTF=y
-
-#
-# Library routines
-#
-CONFIG_RAID6_PQ=m
-CONFIG_BITREVERSE=y
-CONFIG_GENERIC_STRNCPY_FROM_USER=y
-CONFIG_GENERIC_STRNLEN_USER=y
-CONFIG_GENERIC_NET_UTILS=y
-CONFIG_GENERIC_FIND_FIRST_BIT=y
-CONFIG_GENERIC_PCI_IOMAP=y
-CONFIG_GENERIC_IOMAP=y
-CONFIG_GENERIC_IO=y
-CONFIG_PERCPU_RWSEM=y
-CONFIG_CRC_CCITT=m
-CONFIG_CRC16=m
-CONFIG_CRC_T10DIF=m
-CONFIG_CRC_ITU_T=m
-CONFIG_CRC32=y
-# CONFIG_CRC32_SELFTEST is not set
-CONFIG_CRC32_SLICEBY8=y
-# CONFIG_CRC32_SLICEBY4 is not set
-# CONFIG_CRC32_SARWATE is not set
-# CONFIG_CRC32_BIT is not set
-CONFIG_CRC7=m
-CONFIG_LIBCRC32C=m
-CONFIG_CRC8=m
-CONFIG_AUDIT_GENERIC=y
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=m
-CONFIG_LZO_COMPRESS=y
-CONFIG_LZO_DECOMPRESS=y
-CONFIG_LZ4_COMPRESS=m
-CONFIG_LZ4HC_COMPRESS=m
-CONFIG_LZ4_DECOMPRESS=y
-CONFIG_XZ_DEC=y
-CONFIG_XZ_DEC_X86=y
-CONFIG_XZ_DEC_POWERPC=y
-CONFIG_XZ_DEC_IA64=y
-CONFIG_XZ_DEC_ARM=y
-CONFIG_XZ_DEC_ARMTHUMB=y
-CONFIG_XZ_DEC_SPARC=y
-CONFIG_XZ_DEC_BCJ=y
-# CONFIG_XZ_DEC_TEST is not set
-CONFIG_DECOMPRESS_GZIP=y
-CONFIG_DECOMPRESS_BZIP2=y
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DECOMPRESS_XZ=y
-CONFIG_DECOMPRESS_LZO=y
-CONFIG_DECOMPRESS_LZ4=y
-CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_REED_SOLOMON=m
-CONFIG_REED_SOLOMON_ENC8=y
-CONFIG_REED_SOLOMON_DEC8=y
-CONFIG_REED_SOLOMON_DEC16=y
-CONFIG_BCH=m
-CONFIG_BCH_CONST_PARAMS=y
-CONFIG_TEXTSEARCH=y
-CONFIG_TEXTSEARCH_KMP=m
-CONFIG_TEXTSEARCH_BM=m
-CONFIG_TEXTSEARCH_FSM=m
-CONFIG_BTREE=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAS_DMA=y
-CONFIG_CHECK_SIGNATURE=y
-CONFIG_CPU_RMAP=y
-CONFIG_DQL=y
-CONFIG_NLATTR=y
-CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
-CONFIG_LRU_CACHE=m
-CONFIG_AVERAGE=y
-CONFIG_CLZ_TAB=y
-CONFIG_CORDIC=m
-CONFIG_DDR=y
-CONFIG_MPILIB=m
-CONFIG_OID_REGISTRY=m
-CONFIG_UCS2_STRING=y
-CONFIG_FONT_SUPPORT=y
-CONFIG_FONTS=y
-# CONFIG_FONT_8x8 is not set
-CONFIG_FONT_8x16=y
-# CONFIG_FONT_6x11 is not set
-# CONFIG_FONT_7x14 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_ACORN_8x8 is not set
-# CONFIG_FONT_MINI_4x6 is not set
-# CONFIG_FONT_SUN8x16 is not set
-# CONFIG_FONT_SUN12x22 is not set
-# CONFIG_FONT_10x18 is not set
-CONFIG_FONT_AUTOSELECT=y
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index e69a7a587..169a2285b 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.10.5-1 Kernel Configuration
+# Linux/x86 3.11.0-1 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -29,6 +29,8 @@ CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
 CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
+CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
 CONFIG_ZONE_DMA32=y
 CONFIG_AUDIT_ARCH=y
 CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
@@ -48,6 +50,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
 #
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
+# CONFIG_COMPILE_TEST is not set
 CONFIG_LOCALVERSION="-LIBRE"
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_HAVE_KERNEL_GZIP=y
@@ -55,11 +58,13 @@ CONFIG_HAVE_KERNEL_BZIP2=y
 CONFIG_HAVE_KERNEL_LZMA=y
 CONFIG_HAVE_KERNEL_XZ=y
 CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_HAVE_KERNEL_LZ4=y
 CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_BZIP2 is not set
 # CONFIG_KERNEL_LZMA is not set
 # CONFIG_KERNEL_XZ is not set
 # CONFIG_KERNEL_LZO is not set
+# CONFIG_KERNEL_LZ4 is not set
 CONFIG_DEFAULT_HOSTNAME="(none)"
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
@@ -181,12 +186,12 @@ CONFIG_RD_BZIP2=y
 CONFIG_RD_LZMA=y
 CONFIG_RD_XZ=y
 CONFIG_RD_LZO=y
+CONFIG_RD_LZ4=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
 CONFIG_HAVE_UID16=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
-CONFIG_HOTPLUG=y
 CONFIG_HAVE_PCSPKR_PLATFORM=y
 # CONFIG_EXPERT is not set
 CONFIG_UID16=y
@@ -219,6 +224,7 @@ CONFIG_SLUB_DEBUG=y
 # CONFIG_COMPAT_BRK is not set
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
+CONFIG_SLUB_CPU_PARTIAL=y
 CONFIG_PROFILING=y
 CONFIG_TRACEPOINTS=y
 CONFIG_OPROFILE=m
@@ -263,6 +269,7 @@ CONFIG_SECCOMP_FILTER=y
 CONFIG_HAVE_CONTEXT_TRACKING=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+CONFIG_HAVE_ARCH_SOFT_DIRTY=y
 CONFIG_MODULES_USE_ELF_RELA=y
 CONFIG_OLD_SIGSUSPEND3=y
 CONFIG_COMPAT_OLD_SIGACTION=y
@@ -294,6 +301,7 @@ CONFIG_BLK_DEV_THROTTLING=y
 #
 CONFIG_PARTITION_ADVANCED=y
 # CONFIG_ACORN_PARTITION is not set
+CONFIG_AIX_PARTITION=y
 # CONFIG_OSF_PARTITION is not set
 # CONFIG_AMIGA_PARTITION is not set
 # CONFIG_ATARI_PARTITION is not set
@@ -458,6 +466,9 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
 CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CLEANCACHE=y
 CONFIG_FRONTSWAP=y
+CONFIG_ZBUD=y
+CONFIG_ZSWAP=y
+CONFIG_MEM_SOFT_DIRTY=y
 CONFIG_X86_CHECK_BIOS_CORRUPTION=y
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
 CONFIG_X86_RESERVE_LOW=64
@@ -517,6 +528,7 @@ CONFIG_PM_ADVANCED_DEBUG=y
 CONFIG_PM_SLEEP_DEBUG=y
 CONFIG_PM_TRACE=y
 CONFIG_PM_TRACE_RTC=y
+# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
 CONFIG_ACPI=y
 CONFIG_ACPI_SLEEP=y
 # CONFIG_ACPI_PROCFS is not set
@@ -612,7 +624,7 @@ CONFIG_PCI_MMCONFIG=y
 CONFIG_PCI_XEN=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=m
+CONFIG_HOTPLUG_PCI_PCIE=y
 CONFIG_PCIEAER=y
 # CONFIG_PCIE_ECRC is not set
 # CONFIG_PCIEAER_INJECT is not set
@@ -635,6 +647,10 @@ CONFIG_PCI_PRI=y
 CONFIG_PCI_PASID=y
 CONFIG_PCI_IOAPIC=y
 CONFIG_PCI_LABEL=y
+
+#
+# PCI host controller drivers
+#
 CONFIG_ISA_DMA_API=y
 CONFIG_AMD_NB=y
 CONFIG_PCCARD=m
@@ -668,11 +684,14 @@ CONFIG_RAPIDIO_DISC_TIMEOUT=30
 CONFIG_RAPIDIO_DMA_ENGINE=y
 CONFIG_RAPIDIO_DEBUG=y
 CONFIG_RAPIDIO_ENUM_BASIC=m
+
+#
+# RapidIO Switch drivers
+#
 CONFIG_RAPIDIO_TSI57X=y
 CONFIG_RAPIDIO_CPS_XX=y
 CONFIG_RAPIDIO_TSI568=y
 CONFIG_RAPIDIO_CPS_GEN2=y
-CONFIG_RAPIDIO_TSI500=y
 
 #
 # Executable file formats / Emulations
@@ -1074,7 +1093,6 @@ CONFIG_IP_DCCP_TFRC_LIB=y
 CONFIG_NET_DCCPPROBE=m
 CONFIG_IP_SCTP=m
 CONFIG_NET_SCTPPROBE=m
-# CONFIG_SCTP_DBG_MSG is not set
 # CONFIG_SCTP_DBG_OBJCNT is not set
 # CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
 CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y
@@ -1188,16 +1206,20 @@ CONFIG_BATMAN_ADV_DAT=y
 CONFIG_BATMAN_ADV_NC=y
 # CONFIG_BATMAN_ADV_DEBUG is not set
 CONFIG_OPENVSWITCH=m
+CONFIG_OPENVSWITCH_GRE=y
 CONFIG_VSOCKETS=m
 CONFIG_VMWARE_VMCI_VSOCKETS=m
 CONFIG_NETLINK_MMAP=y
 CONFIG_NETLINK_DIAG=m
+CONFIG_NET_MPLS_GSO=m
 CONFIG_RPS=y
 CONFIG_RFS_ACCEL=y
 CONFIG_XPS=y
 CONFIG_NETPRIO_CGROUP=m
+CONFIG_NET_RX_BUSY_POLL=y
 CONFIG_BQL=y
 CONFIG_BPF_JIT=y
+CONFIG_NET_FLOW_LIMIT=y
 
 #
 # Network testing
@@ -1365,6 +1387,7 @@ CONFIG_CEPH_LIB=m
 # CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
 CONFIG_NFC=m
 CONFIG_NFC_NCI=m
+# CONFIG_NFC_NCI_SPI is not set
 CONFIG_NFC_HCI=m
 # CONFIG_NFC_SHDLC is not set
 
@@ -1374,6 +1397,7 @@ CONFIG_NFC_HCI=m
 CONFIG_NFC_PN533=m
 CONFIG_NFC_WILINK=m
 CONFIG_NFC_MEI_PHY=m
+CONFIG_NFC_SIM=m
 CONFIG_NFC_PN544=m
 CONFIG_NFC_PN544_MEI=m
 CONFIG_NFC_MICROREAD=m
@@ -1395,7 +1419,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_FW_LOADER_USER_HELPER=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 CONFIG_SYS_HYPERVISOR=y
@@ -1596,7 +1620,6 @@ CONFIG_AD525X_DPOT_I2C=m
 # CONFIG_DUMMY_IRQ is not set
 # CONFIG_IBM_ASM is not set
 CONFIG_PHANTOM=m
-CONFIG_INTEL_MID_PTI=m
 CONFIG_SGI_IOC4=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIFM_7XX1=m
@@ -1749,6 +1772,7 @@ CONFIG_SCSI_UFSHCD_PCI=m
 CONFIG_SCSI_UFSHCD_PLATFORM=m
 CONFIG_SCSI_HPTIOP=m
 CONFIG_SCSI_BUSLOGIC=m
+CONFIG_SCSI_FLASHPOINT=y
 CONFIG_VMWARE_PVSCSI=m
 CONFIG_HYPERV_STORAGE=m
 CONFIG_LIBFC=m
@@ -1841,6 +1865,7 @@ CONFIG_SATA_HIGHBANK=m
 CONFIG_SATA_MV=m
 CONFIG_SATA_NV=m
 CONFIG_SATA_PROMISE=m
+CONFIG_SATA_RCAR=m
 CONFIG_SATA_SIL=m
 CONFIG_SATA_SIS=m
 CONFIG_SATA_SVW=m
@@ -1943,6 +1968,7 @@ CONFIG_DM_DELAY=m
 CONFIG_DM_UEVENT=y
 CONFIG_DM_FLAKEY=m
 CONFIG_DM_VERITY=m
+CONFIG_DM_SWITCH=m
 CONFIG_TARGET_CORE=m
 CONFIG_TCM_IBLOCK=m
 CONFIG_TCM_FILEIO=m
@@ -1980,12 +2006,12 @@ CONFIG_I2O_PROC=m
 CONFIG_MACINTOSH_DRIVERS=y
 CONFIG_MAC_EMUMOUSEBTN=y
 CONFIG_NETDEVICES=y
+CONFIG_MII=m
 CONFIG_NET_CORE=y
 CONFIG_BONDING=m
 CONFIG_DUMMY=m
 CONFIG_EQUALIZER=m
 # CONFIG_NET_FC is not set
-CONFIG_MII=m
 CONFIG_IFB=m
 CONFIG_NET_TEAM=m
 CONFIG_NET_TEAM_MODE_BROADCAST=m
@@ -2007,6 +2033,7 @@ CONFIG_RIONET_RX_SIZE=128
 CONFIG_TUN=m
 CONFIG_VETH=m
 CONFIG_VIRTIO_NET=m
+CONFIG_NLMON=m
 CONFIG_SUNGEM_PHY=m
 # CONFIG_ARCNET is not set
 CONFIG_ATM_DRIVERS=y
@@ -2051,6 +2078,7 @@ CONFIG_CAIF_VIRTIO=m
 CONFIG_VHOST_NET=m
 CONFIG_VHOST_SCSI=m
 CONFIG_VHOST_RING=m
+CONFIG_VHOST=m
 
 #
 # Distributed Switch Architecture drivers
@@ -2076,6 +2104,7 @@ CONFIG_NET_VENDOR_AMD=y
 CONFIG_AMD8111_ETH=m
 CONFIG_PCNET32=m
 CONFIG_PCMCIA_NMCLAN=m
+CONFIG_NET_VENDOR_ARC=y
 CONFIG_NET_VENDOR_ATHEROS=y
 CONFIG_ATL2=m
 CONFIG_ATL1=m
@@ -2161,6 +2190,7 @@ CONFIG_NET_VENDOR_MELLANOX=y
 CONFIG_MLX4_EN=m
 CONFIG_MLX4_CORE=m
 CONFIG_MLX4_DEBUG=y
+# CONFIG_MLX5_CORE is not set
 CONFIG_NET_VENDOR_MICREL=y
 CONFIG_KS8842=m
 # CONFIG_KS8851 is not set
@@ -2202,6 +2232,7 @@ CONFIG_8139TOO_TUNE_TWISTER=y
 CONFIG_8139TOO_8129=y
 # CONFIG_8139_OLD_RX_RESET is not set
 CONFIG_R8169=m
+CONFIG_SH_ETH=m
 CONFIG_NET_VENDOR_RDC=y
 CONFIG_R6040=m
 CONFIG_NET_VENDOR_SEEQ=y
@@ -2217,6 +2248,8 @@ CONFIG_SFC_SRIOV=y
 CONFIG_NET_VENDOR_SMSC=y
 CONFIG_PCMCIA_SMC91C92=m
 CONFIG_EPIC100=m
+CONFIG_SMSC911X=m
+# CONFIG_SMSC911X_ARCH_HOOKS is not set
 CONFIG_SMSC9420=m
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_STMMAC_ETH=m
@@ -2270,7 +2303,8 @@ CONFIG_NATIONAL_PHY=m
 CONFIG_STE10XP=m
 CONFIG_LSI_ET1011C_PHY=m
 CONFIG_MICREL_PHY=m
-# CONFIG_MDIO_BITBANG is not set
+CONFIG_MDIO_BITBANG=m
+# CONFIG_MDIO_GPIO is not set
 # CONFIG_MICREL_KS8995MA is not set
 CONFIG_PLIP=m
 CONFIG_PPP=m
@@ -2381,9 +2415,14 @@ CONFIG_ATH6KL_USB=m
 CONFIG_AR5523=m
 CONFIG_WIL6210=m
 CONFIG_WIL6210_ISR_COR=y
+# CONFIG_WIL6210_TRACING is not set
+CONFIG_ATH10K=m
+CONFIG_ATH10K_PCI=m
+# CONFIG_ATH10K_DEBUG is not set
+CONFIG_ATH10K_DEBUGFS=y
+# CONFIG_ATH10K_TRACING is not set
 CONFIG_B43=m
 CONFIG_B43_BCMA=y
-# CONFIG_B43_BCMA_EXTRA is not set
 CONFIG_B43_SSB=y
 CONFIG_B43_PCI_AUTOSELECT=y
 CONFIG_B43_PCICORE_AUTOSELECT=y
@@ -2490,14 +2529,17 @@ 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_RTL_CARDS=m
 CONFIG_RTL8192CE=m
 CONFIG_RTL8192SE=m
 CONFIG_RTL8192DE=m
 CONFIG_RTL8723AE=m
 CONFIG_RTL8188EE=m
 CONFIG_RTL8192CU=m
+CONFIG_RTLWIFI=m
+CONFIG_RTLWIFI_PCI=m
+CONFIG_RTLWIFI_USB=m
+# CONFIG_RTLWIFI_DEBUG is not set
 CONFIG_RTL8192C_COMMON=m
 CONFIG_WL_TI=y
 CONFIG_WL1251=m
@@ -2515,6 +2557,9 @@ CONFIG_MWIFIEX=m
 CONFIG_MWIFIEX_SDIO=m
 CONFIG_MWIFIEX_PCIE=m
 CONFIG_MWIFIEX_USB=m
+CONFIG_CW1200=m
+CONFIG_CW1200_WLAN_SDIO=m
+CONFIG_CW1200_WLAN_SPI=m
 
 #
 # WiMAX Wireless Broadband devices
@@ -2778,6 +2823,9 @@ CONFIG_TOUCHSCREEN_CY8CTMG110=m
 CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
 CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
 # CONFIG_TOUCHSCREEN_CYTTSP_SPI is not set
+CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m
+CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m
+CONFIG_TOUCHSCREEN_CYTTSP4_SPI=m
 CONFIG_TOUCHSCREEN_DYNAPRO=m
 CONFIG_TOUCHSCREEN_HAMPSHIRE=m
 CONFIG_TOUCHSCREEN_EETI=m
@@ -2912,7 +2960,6 @@ CONFIG_N_GSM=m
 CONFIG_TRACE_ROUTER=m
 CONFIG_TRACE_SINK=m
 # CONFIG_DEVKMEM is not set
-# CONFIG_STALDRV is not set
 
 #
 # Serial drivers
@@ -2951,6 +2998,7 @@ CONFIG_SERIAL_ARC=m
 CONFIG_SERIAL_ARC_NR_PORTS=1
 CONFIG_SERIAL_RP2=m
 CONFIG_SERIAL_RP2_NR_UARTS=32
+CONFIG_SERIAL_FSL_LPUART=m
 CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
 CONFIG_PPDEV=m
@@ -3045,7 +3093,6 @@ CONFIG_I2C_DESIGNWARE_CORE=m
 CONFIG_I2C_DESIGNWARE_PCI=m
 CONFIG_I2C_EG20T=m
 # CONFIG_I2C_GPIO is not set
-CONFIG_I2C_INTEL_MID=m
 CONFIG_I2C_OCORES=m
 CONFIG_I2C_PCA_PLATFORM=m
 # CONFIG_I2C_PXA_PCI is not set
@@ -3096,11 +3143,6 @@ CONFIG_SPI_PXA2XX_PCI=m
 #
 # CONFIG_SPI_SPIDEV is not set
 # CONFIG_SPI_TLE62X0 is not set
-
-#
-# Qualcomm MSM SSBI bus support
-#
-CONFIG_SSBI=m
 # CONFIG_HSI is not set
 
 #
@@ -3248,6 +3290,7 @@ CONFIG_SENSORS_F71882FG=m
 CONFIG_SENSORS_F75375S=m
 CONFIG_SENSORS_FSCHMD=m
 CONFIG_SENSORS_G760A=m
+CONFIG_SENSORS_G762=m
 CONFIG_SENSORS_GL518SM=m
 CONFIG_SENSORS_GL520SM=m
 # CONFIG_SENSORS_GPIO_FAN is not set
@@ -3357,10 +3400,15 @@ CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 # CONFIG_THERMAL_DEFAULT_GOV_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_THERMAL_GOV_USER_SPACE=y
 # CONFIG_CPU_THERMAL is not set
 # CONFIG_THERMAL_EMULATION is not set
 CONFIG_INTEL_POWERCLAMP=m
+CONFIG_X86_PKG_TEMP_THERMAL=m
+
+#
+# Texas Instruments thermal drivers
+#
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -3407,6 +3455,7 @@ CONFIG_W83877F_WDT=m
 CONFIG_W83977F_WDT=m
 CONFIG_MACHZ_WDT=m
 CONFIG_SBC_EPX_C3_WATCHDOG=m
+CONFIG_MEN_A21_WDT=m
 CONFIG_XEN_WDT=m
 
 #
@@ -3466,6 +3515,7 @@ CONFIG_HTC_PASIC3=m
 CONFIG_LPC_ICH=m
 CONFIG_LPC_SCH=m
 # CONFIG_MFD_JANZ_CMODIO is not set
+# CONFIG_MFD_KEMPLD is not set
 # CONFIG_EZX_PCAP is not set
 CONFIG_MFD_VIPERBOARD=m
 CONFIG_MFD_RETU=m
@@ -3498,6 +3548,7 @@ CONFIG_MFD_ARIZONA_I2C=m
 # CONFIG_MFD_ARIZONA_SPI is not set
 CONFIG_MFD_WM5102=y
 CONFIG_MFD_WM5110=y
+# CONFIG_MFD_WM8997 is not set
 # CONFIG_MFD_WM831X_SPI is not set
 # CONFIG_REGULATOR is not set
 CONFIG_MEDIA_SUPPORT=m
@@ -3627,6 +3678,7 @@ CONFIG_USB_ZR364XX=m
 CONFIG_USB_STKWEBCAM=m
 CONFIG_USB_S2255=m
 CONFIG_USB_SN9C102=m
+CONFIG_VIDEO_USBTV=m
 
 #
 # Analog TV USB devices
@@ -4187,7 +4239,6 @@ CONFIG_FB_VT8623=m
 # CONFIG_FB_ARK is not set
 # CONFIG_FB_PM3 is not set
 # CONFIG_FB_CARMINE is not set
-# CONFIG_FB_GEODE is not set
 # CONFIG_FB_TMIO is not set
 # CONFIG_FB_SM501 is not set
 # CONFIG_FB_SMSCUFX is not set
@@ -4239,18 +4290,6 @@ CONFIG_DUMMY_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_FONTS=y
-# CONFIG_FONT_8x8 is not set
-CONFIG_FONT_8x16=y
-# CONFIG_FONT_6x11 is not set
-# CONFIG_FONT_7x14 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_ACORN_8x8 is not set
-# CONFIG_FONT_MINI_4x6 is not set
-# CONFIG_FONT_SUN8x16 is not set
-# CONFIG_FONT_SUN12x22 is not set
-# CONFIG_FONT_10x18 is not set
-CONFIG_FONT_AUTOSELECT=y
 # CONFIG_LOGO is not set
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE=y
@@ -4271,6 +4310,7 @@ CONFIG_SND_SEQUENCER_OSS=y
 CONFIG_SND_HRTIMER=m
 CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
 CONFIG_SND_DYNAMIC_MINORS=y
+CONFIG_SND_MAX_CARDS=32
 CONFIG_SND_SUPPORT_OLD_API=y
 CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SND_VERBOSE_PRINTK is not set
@@ -4365,6 +4405,7 @@ CONFIG_SND_HDA_CODEC_ANALOG=y
 CONFIG_SND_HDA_CODEC_SIGMATEL=y
 CONFIG_SND_HDA_CODEC_VIA=y
 CONFIG_SND_HDA_CODEC_HDMI=y
+CONFIG_SND_HDA_I915=y
 CONFIG_SND_HDA_CODEC_CIRRUS=y
 CONFIG_SND_HDA_CODEC_CONEXANT=y
 CONFIG_SND_HDA_CODEC_CA0110=y
@@ -4408,6 +4449,7 @@ CONFIG_SND_USB_CAIAQ=m
 CONFIG_SND_USB_CAIAQ_INPUT=y
 CONFIG_SND_USB_US122L=m
 CONFIG_SND_USB_6FIRE=m
+CONFIG_SND_USB_HIFACE=m
 CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWIRE_LIB=m
 CONFIG_SND_FIREWIRE_SPEAKERS=m
@@ -4446,9 +4488,11 @@ CONFIG_HID_DRAGONRISE=m
 CONFIG_DRAGONRISE_FF=y
 CONFIG_HID_EMS_FF=m
 CONFIG_HID_ELECOM=m
+CONFIG_HID_ELO=m
 CONFIG_HID_EZKEY=m
 CONFIG_HID_HOLTEK=m
 CONFIG_HOLTEK_FF=y
+CONFIG_HID_HUION=m
 CONFIG_HID_KEYTOUCH=m
 CONFIG_HID_KYE=m
 CONFIG_HID_UCLOGIC=m
@@ -4481,7 +4525,6 @@ CONFIG_HID_PICOLCD_LCD=y
 CONFIG_HID_PICOLCD_LEDS=y
 CONFIG_HID_PICOLCD_CIR=y
 CONFIG_HID_PRIMAX=m
-CONFIG_HID_PS3REMOTE=m
 CONFIG_HID_ROCCAT=m
 CONFIG_HID_SAITEK=m
 CONFIG_HID_SAMSUNG=m
@@ -4501,7 +4544,6 @@ CONFIG_HID_THRUSTMASTER=m
 CONFIG_THRUSTMASTER_FF=y
 CONFIG_HID_WACOM=m
 CONFIG_HID_WIIMOTE=m
-CONFIG_HID_WIIMOTE_EXT=y
 CONFIG_HID_ZEROPLUS=m
 CONFIG_ZEROPLUS_FF=y
 CONFIG_HID_ZYDACRON=m
@@ -4518,9 +4560,6 @@ CONFIG_USB_HIDDEV=y
 # I2C HID support
 #
 CONFIG_I2C_HID=m
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_USB_ARCH_HAS_XHCI=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_COMMON=m
 CONFIG_USB_ARCH_HAS_HCD=y
@@ -4554,7 +4593,9 @@ CONFIG_USB_OXU210HP_HCD=m
 CONFIG_USB_ISP116X_HCD=m
 CONFIG_USB_ISP1760_HCD=m
 CONFIG_USB_ISP1362_HCD=m
+CONFIG_USB_FUSBH200_HCD=m
 CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_PCI=m
 # CONFIG_USB_OHCI_HCD_SSB is not set
 # CONFIG_USB_OHCI_HCD_PLATFORM is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
@@ -4572,6 +4613,9 @@ CONFIG_USB_HWA_HCD=m
 # CONFIG_USB_HCD_BCMA is not set
 # CONFIG_USB_HCD_SSB is not set
 CONFIG_USB_MUSB_HDRC=m
+# CONFIG_USB_MUSB_HOST is not set
+# CONFIG_USB_MUSB_GADGET is not set
+CONFIG_USB_MUSB_DUAL_ROLE=y
 CONFIG_USB_MUSB_TUSB6010=m
 CONFIG_USB_MUSB_DSPS=m
 CONFIG_USB_MUSB_UX500=m
@@ -4695,6 +4739,8 @@ CONFIG_USB_SERIAL_WISHBONE=m
 CONFIG_USB_SERIAL_ZTE=m
 CONFIG_USB_SERIAL_SSU100=m
 CONFIG_USB_SERIAL_QT2=m
+CONFIG_USB_SERIAL_FLASHLOADER=m
+CONFIG_USB_SERIAL_SUUNTO=m
 # CONFIG_USB_SERIAL_DEBUG is not set
 
 #
@@ -4748,12 +4794,12 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 #
 # USB Peripheral Controller
 #
+CONFIG_USB_FOTG210_UDC=m
 CONFIG_USB_R8A66597=m
 CONFIG_USB_RENESAS_USBHS_UDC=m
 CONFIG_USB_PXA27X=m
 CONFIG_USB_MV_UDC=m
 CONFIG_USB_MV_U3D=m
-CONFIG_USB_GADGET_MUSB_HDRC=m
 CONFIG_USB_M66592=m
 CONFIG_USB_AMD5536UDC=m
 CONFIG_USB_NET2272=m
@@ -4765,8 +4811,15 @@ CONFIG_USB_DUMMY_HCD=m
 CONFIG_USB_LIBCOMPOSITE=m
 CONFIG_USB_F_ACM=m
 CONFIG_USB_U_SERIAL=m
+CONFIG_USB_U_ETHER=m
+CONFIG_USB_U_RNDIS=m
 CONFIG_USB_F_SERIAL=m
 CONFIG_USB_F_OBEX=m
+CONFIG_USB_F_NCM=m
+CONFIG_USB_F_ECM=m
+CONFIG_USB_F_SUBSET=m
+CONFIG_USB_F_RNDIS=m
+# CONFIG_USB_CONFIGFS is not set
 # CONFIG_USB_ZERO is not set
 CONFIG_USB_AUDIO=m
 # CONFIG_GADGET_UAC1 is not set
@@ -4942,6 +4995,7 @@ CONFIG_RTC_DRV_RS5C372=m
 CONFIG_RTC_DRV_ISL1208=m
 CONFIG_RTC_DRV_ISL12022=m
 CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF2127=m
 CONFIG_RTC_DRV_PCF8523=m
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
@@ -5005,8 +5059,9 @@ CONFIG_DMADEVICES=y
 #
 CONFIG_INTEL_MID_DMAC=m
 CONFIG_INTEL_IOATDMA=m
+CONFIG_DW_DMAC_CORE=m
 CONFIG_DW_DMAC=m
-# CONFIG_DW_DMAC_BIG_ENDIAN_IO is not set
+CONFIG_DW_DMAC_PCI=m
 CONFIG_TIMB_DMA=m
 CONFIG_PCH_DMA=m
 CONFIG_DMA_ENGINE=y
@@ -5153,7 +5208,6 @@ CONFIG_COMEDI_NI_LABPC_PCI=m
 CONFIG_COMEDI_NI_PCIDIO=m
 CONFIG_COMEDI_NI_PCIMIO=m
 CONFIG_COMEDI_RTD520=m
-CONFIG_COMEDI_S526=m
 CONFIG_COMEDI_S626=m
 CONFIG_COMEDI_SSV_DNP=m
 CONFIG_COMEDI_MITE=m
@@ -5269,7 +5323,6 @@ CONFIG_WIMAX_GDM72XX_WIMAX2=y
 CONFIG_WIMAX_GDM72XX_USB=y
 # CONFIG_WIMAX_GDM72XX_SDIO is not set
 CONFIG_WIMAX_GDM72XX_USB_PM=y
-CONFIG_CSR_WIFI=m
 CONFIG_NET_VENDOR_SILICOM=y
 CONFIG_SBYPASS=m
 CONFIG_BPCTL=m
@@ -5281,6 +5334,7 @@ CONFIG_ZCACHE=m
 CONFIG_RAMSTER=m
 # CONFIG_RAMSTER_DEBUG is not set
 # CONFIG_USB_DWC2 is not set
+CONFIG_USB_BTMTK=m
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 CONFIG_ACERHDF=m
@@ -5328,6 +5382,8 @@ CONFIG_MXM_WMI=m
 CONFIG_INTEL_OAKTRAIL=m
 CONFIG_SAMSUNG_Q10=m
 CONFIG_APPLE_GMUX=m
+CONFIG_INTEL_RST=m
+CONFIG_INTEL_SMARTCONNECT=y
 CONFIG_PVPANIC=m
 
 #
@@ -5373,6 +5429,11 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 # CONFIG_RESET_CONTROLLER is not set
+CONFIG_FMC=m
+CONFIG_FMC_FAKEDEV=m
+CONFIG_FMC_TRIVIAL=m
+CONFIG_FMC_WRITE_EEPROM=m
+CONFIG_FMC_CHARDEV=m
 
 #
 # Firmware Drivers
@@ -5391,9 +5452,7 @@ CONFIG_ISCSI_IBFT=m
 #
 # EFI (Extensible Firmware Interface) Support
 #
-CONFIG_EFI_VARS=m
-CONFIG_EFI_VARS_PSTORE=m
-CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
+# CONFIG_EFI_VARS is not set
 
 #
 # File systems
@@ -5566,6 +5625,7 @@ CONFIG_F2FS_FS=m
 CONFIG_F2FS_STAT_FS=y
 CONFIG_F2FS_FS_XATTR=y
 CONFIG_F2FS_FS_POSIX_ACL=y
+CONFIG_F2FS_FS_SECURITY=y
 CONFIG_EFIVAR_FS=y
 CONFIG_ORE=m
 CONFIG_NETWORK_FILESYSTEMS=y
@@ -5576,10 +5636,12 @@ CONFIG_NFS_V3_ACL=y
 CONFIG_NFS_V4=m
 CONFIG_NFS_SWAP=y
 CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
 CONFIG_PNFS_FILE_LAYOUT=m
 CONFIG_PNFS_BLOCK=m
 CONFIG_PNFS_OBJLAYOUT=m
 CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org"
+CONFIG_NFS_V4_SECURITY_LABEL=y
 CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
@@ -5589,6 +5651,7 @@ CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3=y
 CONFIG_NFSD_V3_ACL=y
 CONFIG_NFSD_V4=y
+CONFIG_NFSD_V4_SECURITY_LABEL=y
 # CONFIG_NFSD_FAULT_INJECTION is not set
 CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
@@ -5629,6 +5692,7 @@ CONFIG_AFS_FSCACHE=y
 CONFIG_9P_FS=m
 CONFIG_9P_FSCACHE=y
 CONFIG_9P_FS_POSIX_ACL=y
+CONFIG_9P_FS_SECURITY=y
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
 CONFIG_NLS_CODEPAGE_437=m
@@ -5687,67 +5751,94 @@ CONFIG_DLM=m
 # Kernel hacking
 #
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+
+#
+# printk and dmesg options
+#
 CONFIG_PRINTK_TIME=y
 CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
+# CONFIG_BOOT_PRINTK_DELAY is not set
+CONFIG_DYNAMIC_DEBUG=y
+
+#
+# Compile-time checks and compiler options
+#
+# CONFIG_DEBUG_INFO is not set
 CONFIG_ENABLE_WARN_DEPRECATED=y
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_FRAME_WARN=2048
-CONFIG_MAGIC_SYSRQ=y
 CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_READABLE_ASM is not set
 CONFIG_UNUSED_SYMBOLS=y
 CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
+CONFIG_FRAME_POINTER=y
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_KERNEL=y
+
+#
+# Memory Debugging
+#
+# CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_VIRTUAL is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+CONFIG_HAVE_ARCH_KMEMCHECK=y
 # CONFIG_DEBUG_SHIRQ is not set
+
+#
+# Debug Lockups and Hangs
+#
 CONFIG_LOCKUP_DETECTOR=y
 CONFIG_HARDLOCKUP_DETECTOR=y
 # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
 CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
-# CONFIG_PANIC_ON_OOPS is not set
-CONFIG_PANIC_ON_OOPS_VALUE=0
 CONFIG_DETECT_HUNG_TASK=y
 CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
 CONFIG_SCHED_DEBUG=y
 CONFIG_SCHEDSTATS=y
 CONFIG_TIMER_STATS=y
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_SLUB_DEBUG_ON is not set
-# CONFIG_SLUB_STATS is not set
-CONFIG_HAVE_DEBUG_KMEMLEAK=y
-# CONFIG_DEBUG_KMEMLEAK is not set
 # CONFIG_DEBUG_PREEMPT is not set
+
+#
+# Lock Debugging (spinlocks, mutexes, etc...)
+#
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
 CONFIG_DEBUG_MUTEXES=y
+# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
 # CONFIG_DEBUG_LOCK_ALLOC is not set
 # CONFIG_PROVE_LOCKING is not set
 # CONFIG_LOCK_STAT is not set
 # CONFIG_DEBUG_ATOMIC_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 CONFIG_STACKTRACE=y
-# CONFIG_DEBUG_STACK_USAGE is not set
 # CONFIG_DEBUG_KOBJECT is not set
 CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_DEBUG_INFO is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_VIRTUAL is not set
 # CONFIG_DEBUG_WRITECOUNT is not set
-CONFIG_DEBUG_MEMORY_INIT=y
 # CONFIG_DEBUG_LIST is not set
-# CONFIG_TEST_LIST_SORT is not set
 # CONFIG_DEBUG_SG is not set
 # CONFIG_DEBUG_NOTIFIERS is not set
 # CONFIG_DEBUG_CREDENTIALS is not set
-CONFIG_ARCH_WANT_FRAME_POINTERS=y
-CONFIG_FRAME_POINTER=y
-# CONFIG_BOOT_PRINTK_DELAY is not set
 
 #
 # RCU Debugging
@@ -5759,18 +5850,12 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_RCU_CPU_STALL_VERBOSE is not set
 # CONFIG_RCU_CPU_STALL_INFO is not set
 # CONFIG_RCU_TRACE is not set
-# CONFIG_KPROBES_SANITY_TEST is not set
-# CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-CONFIG_LKDTM=m
 # CONFIG_NOTIFIER_ERROR_INJECTION is not set
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_LATENCYTOP is not set
 CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y
 # CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
 CONFIG_USER_STACKTRACE_SUPPORT=y
 CONFIG_NOP_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
@@ -5818,30 +5903,36 @@ CONFIG_MMIOTRACE=y
 # CONFIG_MMIOTRACE_TEST is not set
 CONFIG_RING_BUFFER_BENCHMARK=m
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
+
+#
+# Runtime Testing
+#
+CONFIG_LKDTM=m
+# CONFIG_TEST_LIST_SORT is not set
+# CONFIG_KPROBES_SANITY_TEST is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_RBTREE_TEST is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
+# CONFIG_ATOMIC64_SELFTEST is not set
+CONFIG_ASYNC_RAID6_TEST=m
+# CONFIG_TEST_STRING_HELPERS is not set
+CONFIG_TEST_KSTRTOX=m
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
 # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
-CONFIG_DYNAMIC_DEBUG=y
 # CONFIG_DMA_API_DEBUG is not set
-# CONFIG_ATOMIC64_SELFTEST is not set
-CONFIG_ASYNC_RAID6_TEST=m
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
-CONFIG_HAVE_ARCH_KMEMCHECK=y
-# CONFIG_TEST_STRING_HELPERS is not set
-CONFIG_TEST_KSTRTOX=m
 CONFIG_STRICT_DEVMEM=y
 CONFIG_X86_VERBOSE_BOOTUP=y
 CONFIG_EARLY_PRINTK=y
 # CONFIG_EARLY_PRINTK_DBGP is not set
-# CONFIG_DEBUG_STACKOVERFLOW is not set
 # CONFIG_X86_PTDUMP is not set
 CONFIG_DEBUG_RODATA=y
 # CONFIG_DEBUG_RODATA_TEST is not set
 # CONFIG_DEBUG_SET_MODULE_RONX is not set
 # CONFIG_DEBUG_NX_TEST is not set
+CONFIG_DOUBLEFAULT=y
 # CONFIG_DEBUG_TLBFLUSH is not set
 # CONFIG_IOMMU_DEBUG is not set
 # CONFIG_IOMMU_STRESS is not set
@@ -5860,6 +5951,7 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
 # CONFIG_CPA_DEBUG is not set
 # CONFIG_OPTIMIZE_INLINING is not set
 # CONFIG_DEBUG_NMI_SELFTEST is not set
+# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set
 
 #
 # Security options
@@ -5885,10 +5977,12 @@ CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/usr/bin/tomoyo-init"
 CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd"
 CONFIG_SECURITY_APPARMOR=y
 CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0
-# CONFIG_SECURITY_YAMA is not set
+CONFIG_SECURITY_YAMA=y
+CONFIG_SECURITY_YAMA_STACKED=y
 # CONFIG_IMA is not set
 # CONFIG_DEFAULT_SECURITY_TOMOYO is not set
 # CONFIG_DEFAULT_SECURITY_APPARMOR is not set
+# CONFIG_DEFAULT_SECURITY_YAMA is not set
 CONFIG_DEFAULT_SECURITY_DAC=y
 CONFIG_DEFAULT_SECURITY=""
 CONFIG_XOR_BLOCKS=m
@@ -6022,6 +6116,8 @@ CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_ZLIB=m
 CONFIG_CRYPTO_LZO=y
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
 
 #
 # Random Number Generation
@@ -6062,6 +6158,7 @@ CONFIG_RAID6_PQ=m
 CONFIG_BITREVERSE=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GENERIC_NET_UTILS=y
 CONFIG_GENERIC_FIND_FIRST_BIT=y
 CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_IOMAP=y
@@ -6084,6 +6181,9 @@ CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 CONFIG_LZO_COMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
+CONFIG_LZ4_COMPRESS=m
+CONFIG_LZ4HC_COMPRESS=m
+CONFIG_LZ4_DECOMPRESS=y
 CONFIG_XZ_DEC=y
 CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC_POWERPC=y
@@ -6098,6 +6198,7 @@ CONFIG_DECOMPRESS_BZIP2=y
 CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DECOMPRESS_XZ=y
 CONFIG_DECOMPRESS_LZO=y
+CONFIG_DECOMPRESS_LZ4=y
 CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_REED_SOLOMON=m
 CONFIG_REED_SOLOMON_ENC8=y
@@ -6126,3 +6227,16 @@ CONFIG_DDR=y
 CONFIG_MPILIB=m
 CONFIG_OID_REGISTRY=m
 CONFIG_UCS2_STRING=y
+CONFIG_FONT_SUPPORT=y
+CONFIG_FONTS=y
+# CONFIG_FONT_8x8 is not set
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
+CONFIG_FONT_AUTOSELECT=y
diff --git a/libre/linux-libre/config.x86_64.3.11 b/libre/linux-libre/config.x86_64.3.11
deleted file mode 100644
index f64f29253..000000000
--- a/libre/linux-libre/config.x86_64.3.11
+++ /dev/null
@@ -1,6242 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.11.0-rc7 Kernel Configuration
-#
-CONFIG_64BIT=y
-CONFIG_X86_64=y
-CONFIG_X86=y
-CONFIG_INSTRUCTION_DECODER=y
-CONFIG_OUTPUT_FORMAT="elf64-x86-64"
-CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_MMU=y
-CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_NEED_SG_DMA_LENGTH=y
-CONFIG_GENERIC_ISA_DMA=y
-CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_ARCH_HAS_CPU_RELAX=y
-CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
-CONFIG_ARCH_HAS_CPU_AUTOPROBE=y
-CONFIG_HAVE_SETUP_PER_CPU_AREA=y
-CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
-CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
-CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
-CONFIG_ZONE_DMA32=y
-CONFIG_AUDIT_ARCH=y
-CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
-CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
-CONFIG_HAVE_INTEL_TXT=y
-CONFIG_X86_64_SMP=y
-CONFIG_X86_HT=y
-CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
-CONFIG_ARCH_CPU_PROBE_RELEASE=y
-CONFIG_ARCH_SUPPORTS_UPROBES=y
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-CONFIG_IRQ_WORK=y
-CONFIG_BUILDTIME_EXTABLE_SORT=y
-
-#
-# General setup
-#
-CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_CROSS_COMPILE=""
-# CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="-LIBRE"
-CONFIG_LOCALVERSION_AUTO=y
-CONFIG_HAVE_KERNEL_GZIP=y
-CONFIG_HAVE_KERNEL_BZIP2=y
-CONFIG_HAVE_KERNEL_LZMA=y
-CONFIG_HAVE_KERNEL_XZ=y
-CONFIG_HAVE_KERNEL_LZO=y
-CONFIG_HAVE_KERNEL_LZ4=y
-CONFIG_KERNEL_GZIP=y
-# CONFIG_KERNEL_BZIP2 is not set
-# CONFIG_KERNEL_LZMA is not set
-# CONFIG_KERNEL_XZ is not set
-# CONFIG_KERNEL_LZO is not set
-# CONFIG_KERNEL_LZ4 is not set
-CONFIG_DEFAULT_HOSTNAME="(none)"
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_POSIX_MQUEUE_SYSCTL=y
-CONFIG_FHANDLE=y
-CONFIG_AUDIT=y
-CONFIG_AUDITSYSCALL=y
-CONFIG_AUDIT_WATCH=y
-CONFIG_AUDIT_TREE=y
-CONFIG_AUDIT_LOGINUID_IMMUTABLE=y
-CONFIG_HAVE_GENERIC_HARDIRQS=y
-
-#
-# IRQ subsystem
-#
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_GENERIC_PENDING_IRQ=y
-CONFIG_IRQ_DOMAIN=y
-# CONFIG_IRQ_DOMAIN_DEBUG is not set
-CONFIG_IRQ_FORCED_THREADING=y
-CONFIG_SPARSE_IRQ=y
-CONFIG_CLOCKSOURCE_WATCHDOG=y
-CONFIG_ARCH_CLOCKSOURCE_DATA=y
-CONFIG_GENERIC_TIME_VSYSCALL=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
-CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-
-#
-# Timers subsystem
-#
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ_COMMON=y
-# CONFIG_HZ_PERIODIC is not set
-CONFIG_NO_HZ_IDLE=y
-# CONFIG_NO_HZ_FULL is not set
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-
-#
-# CPU/Task time and stats accounting
-#
-CONFIG_TICK_CPU_ACCOUNTING=y
-# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
-# CONFIG_IRQ_TIME_ACCOUNTING is not set
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
-CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TASK_XACCT=y
-CONFIG_TASK_IO_ACCOUNTING=y
-
-#
-# RCU Subsystem
-#
-CONFIG_TREE_PREEMPT_RCU=y
-CONFIG_PREEMPT_RCU=y
-CONFIG_RCU_STALL_COMMON=y
-# CONFIG_RCU_USER_QS is not set
-CONFIG_RCU_FANOUT=64
-CONFIG_RCU_FANOUT_LEAF=16
-# CONFIG_RCU_FANOUT_EXACT is not set
-CONFIG_RCU_FAST_NO_HZ=y
-# CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_RCU_BOOST is not set
-CONFIG_RCU_NOCB_CPU=y
-CONFIG_RCU_NOCB_CPU_NONE=y
-# CONFIG_RCU_NOCB_CPU_ZERO is not set
-# CONFIG_RCU_NOCB_CPU_ALL is not set
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=19
-CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
-CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
-CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=y
-CONFIG_ARCH_USES_NUMA_PROT_NONE=y
-CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
-CONFIG_NUMA_BALANCING=y
-CONFIG_CGROUPS=y
-# CONFIG_CGROUP_DEBUG is not set
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CPUSETS=y
-CONFIG_PROC_PID_CPUSET=y
-CONFIG_CGROUP_CPUACCT=y
-CONFIG_RESOURCE_COUNTERS=y
-CONFIG_MEMCG=y
-CONFIG_MEMCG_SWAP=y
-# CONFIG_MEMCG_SWAP_ENABLED is not set
-CONFIG_MEMCG_KMEM=y
-# CONFIG_CGROUP_HUGETLB is not set
-# CONFIG_CGROUP_PERF is not set
-CONFIG_CGROUP_SCHED=y
-CONFIG_FAIR_GROUP_SCHED=y
-CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=y
-CONFIG_BLK_CGROUP=y
-# CONFIG_DEBUG_BLK_CGROUP is not set
-CONFIG_CHECKPOINT_RESTORE=y
-CONFIG_NAMESPACES=y
-CONFIG_UTS_NS=y
-CONFIG_IPC_NS=y
-CONFIG_PID_NS=y
-CONFIG_NET_NS=y
-CONFIG_SCHED_AUTOGROUP=y
-CONFIG_MM_OWNER=y
-# CONFIG_SYSFS_DEPRECATED is not set
-CONFIG_RELAY=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_RD_GZIP=y
-CONFIG_RD_BZIP2=y
-CONFIG_RD_LZMA=y
-CONFIG_RD_XZ=y
-CONFIG_RD_LZO=y
-CONFIG_RD_LZ4=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_SYSCTL=y
-CONFIG_ANON_INODES=y
-CONFIG_HAVE_UID16=y
-CONFIG_SYSCTL_EXCEPTION_TRACE=y
-CONFIG_HAVE_PCSPKR_PLATFORM=y
-# CONFIG_EXPERT is not set
-CONFIG_UID16=y
-# CONFIG_SYSCTL_SYSCALL is not set
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_ALL is not set
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_PCSPKR_PLATFORM=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
-CONFIG_EVENTFD=y
-CONFIG_SHMEM=y
-CONFIG_AIO=y
-CONFIG_PCI_QUIRKS=y
-# CONFIG_EMBEDDED is not set
-CONFIG_HAVE_PERF_EVENTS=y
-
-#
-# Kernel Performance Events And Counters
-#
-CONFIG_PERF_EVENTS=y
-# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLUB_DEBUG=y
-# CONFIG_COMPAT_BRK is not set
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-CONFIG_SLUB_CPU_PARTIAL=y
-CONFIG_PROFILING=y
-CONFIG_TRACEPOINTS=y
-CONFIG_OPROFILE=m
-# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
-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_USE_GENERIC_SMP_HELPERS=y
-CONFIG_GENERIC_SMP_IDLE_THREAD=y
-CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
-CONFIG_HAVE_DMA_API_DEBUG=y
-CONFIG_HAVE_HW_BREAKPOINT=y
-CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
-CONFIG_HAVE_USER_RETURN_NOTIFIER=y
-CONFIG_HAVE_PERF_EVENTS_NMI=y
-CONFIG_HAVE_PERF_REGS=y
-CONFIG_HAVE_PERF_USER_STACK_DUMP=y
-CONFIG_HAVE_ARCH_JUMP_LABEL=y
-CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
-CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
-CONFIG_HAVE_CMPXCHG_LOCAL=y
-CONFIG_HAVE_CMPXCHG_DOUBLE=y
-CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
-CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
-CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
-CONFIG_SECCOMP_FILTER=y
-CONFIG_HAVE_CONTEXT_TRACKING=y
-CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
-CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
-CONFIG_HAVE_ARCH_SOFT_DIRTY=y
-CONFIG_MODULES_USE_ELF_RELA=y
-CONFIG_OLD_SIGSUSPEND3=y
-CONFIG_COMPAT_OLD_SIGACTION=y
-
-#
-# GCOV-based kernel profiling
-#
-# CONFIG_GCOV_KERNEL is not set
-# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
-CONFIG_SLABINFO=y
-CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
-CONFIG_MODULES=y
-CONFIG_MODULE_FORCE_LOAD=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-CONFIG_MODVERSIONS=y
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-# CONFIG_MODULE_SIG is not set
-CONFIG_STOP_MACHINE=y
-CONFIG_BLOCK=y
-CONFIG_BLK_DEV_BSG=y
-CONFIG_BLK_DEV_BSGLIB=y
-# CONFIG_BLK_DEV_INTEGRITY is not set
-CONFIG_BLK_DEV_THROTTLING=y
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-CONFIG_AIX_PARTITION=y
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_MAC_PARTITION=y
-CONFIG_MSDOS_PARTITION=y
-CONFIG_BSD_DISKLABEL=y
-CONFIG_MINIX_SUBPARTITION=y
-CONFIG_SOLARIS_X86_PARTITION=y
-# CONFIG_UNIXWARE_DISKLABEL is not set
-CONFIG_LDM_PARTITION=y
-# CONFIG_LDM_DEBUG is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-CONFIG_KARMA_PARTITION=y
-CONFIG_EFI_PARTITION=y
-# CONFIG_SYSV68_PARTITION is not set
-CONFIG_BLOCK_COMPAT=y
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-CONFIG_CFQ_GROUP_IOSCHED=y
-# CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_CFQ=y
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="cfq"
-CONFIG_PREEMPT_NOTIFIERS=y
-CONFIG_PADATA=y
-CONFIG_ASN1=m
-CONFIG_UNINLINE_SPIN_UNLOCK=y
-CONFIG_FREEZER=y
-
-#
-# Processor type and features
-#
-CONFIG_ZONE_DMA=y
-CONFIG_SMP=y
-CONFIG_X86_X2APIC=y
-CONFIG_X86_MPPARSE=y
-# CONFIG_X86_EXTENDED_PLATFORM is not set
-# CONFIG_X86_INTEL_LPSS is not set
-CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-CONFIG_HYPERVISOR_GUEST=y
-CONFIG_PARAVIRT=y
-# CONFIG_PARAVIRT_DEBUG is not set
-# CONFIG_PARAVIRT_SPINLOCKS is not set
-CONFIG_XEN=y
-CONFIG_XEN_DOM0=y
-CONFIG_XEN_PRIVILEGED_GUEST=y
-CONFIG_XEN_PVHVM=y
-CONFIG_XEN_MAX_DOMAIN_MEMORY=500
-CONFIG_XEN_SAVE_RESTORE=y
-# CONFIG_XEN_DEBUG_FS is not set
-CONFIG_KVM_GUEST=y
-CONFIG_PARAVIRT_TIME_ACCOUNTING=y
-CONFIG_PARAVIRT_CLOCK=y
-CONFIG_NO_BOOTMEM=y
-# CONFIG_MEMTEST is not set
-# CONFIG_MK8 is not set
-# CONFIG_MPSC is not set
-# CONFIG_MCORE2 is not set
-# CONFIG_MATOM is not set
-CONFIG_GENERIC_CPU=y
-CONFIG_X86_INTERNODE_CACHE_SHIFT=6
-CONFIG_X86_L1_CACHE_SHIFT=6
-CONFIG_X86_TSC=y
-CONFIG_X86_CMPXCHG64=y
-CONFIG_X86_CMOV=y
-CONFIG_X86_MINIMUM_CPU_FAMILY=64
-CONFIG_X86_DEBUGCTLMSR=y
-CONFIG_CPU_SUP_INTEL=y
-CONFIG_CPU_SUP_AMD=y
-CONFIG_CPU_SUP_CENTAUR=y
-CONFIG_HPET_TIMER=y
-CONFIG_HPET_EMULATE_RTC=y
-CONFIG_DMI=y
-CONFIG_GART_IOMMU=y
-CONFIG_CALGARY_IOMMU=y
-CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
-CONFIG_SWIOTLB=y
-CONFIG_IOMMU_HELPER=y
-# CONFIG_MAXSMP is not set
-CONFIG_NR_CPUS=64
-CONFIG_SCHED_SMT=y
-CONFIG_SCHED_MC=y
-# CONFIG_PREEMPT_NONE is not set
-# CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_PREEMPT=y
-CONFIG_PREEMPT_COUNT=y
-CONFIG_X86_LOCAL_APIC=y
-CONFIG_X86_IO_APIC=y
-CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
-CONFIG_X86_MCE=y
-CONFIG_X86_MCE_INTEL=y
-CONFIG_X86_MCE_AMD=y
-CONFIG_X86_MCE_THRESHOLD=y
-# CONFIG_X86_MCE_INJECT is not set
-CONFIG_X86_THERMAL_VECTOR=y
-CONFIG_I8K=m
-CONFIG_MICROCODE=m
-# CONFIG_MICROCODE_INTEL is not set
-# CONFIG_MICROCODE_AMD is not set
-CONFIG_MICROCODE_OLD_INTERFACE=y
-CONFIG_X86_MSR=m
-CONFIG_X86_CPUID=m
-CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
-CONFIG_ARCH_DMA_ADDR_T_64BIT=y
-CONFIG_DIRECT_GBPAGES=y
-CONFIG_NUMA=y
-CONFIG_AMD_NUMA=y
-CONFIG_X86_64_ACPI_NUMA=y
-CONFIG_NODES_SPAN_OTHER_NODES=y
-# CONFIG_NUMA_EMU is not set
-CONFIG_NODES_SHIFT=6
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SPARSEMEM_DEFAULT=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_ARCH_MEMORY_PROBE=y
-CONFIG_ARCH_PROC_KCORE_TEXT=y
-CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_SPARSEMEM_MANUAL=y
-CONFIG_SPARSEMEM=y
-CONFIG_NEED_MULTIPLE_NODES=y
-CONFIG_HAVE_MEMORY_PRESENT=y
-CONFIG_SPARSEMEM_EXTREME=y
-CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
-CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y
-CONFIG_SPARSEMEM_VMEMMAP=y
-CONFIG_HAVE_MEMBLOCK=y
-CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
-CONFIG_ARCH_DISCARD_MEMBLOCK=y
-CONFIG_MEMORY_ISOLATION=y
-# CONFIG_MOVABLE_NODE is not set
-CONFIG_HAVE_BOOTMEM_INFO_NODE=y
-CONFIG_MEMORY_HOTPLUG=y
-CONFIG_MEMORY_HOTPLUG_SPARSE=y
-CONFIG_MEMORY_HOTREMOVE=y
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_BALLOON_COMPACTION=y
-CONFIG_COMPACTION=y
-CONFIG_MIGRATION=y
-CONFIG_PHYS_ADDR_T_64BIT=y
-CONFIG_ZONE_DMA_FLAG=1
-CONFIG_BOUNCE=y
-CONFIG_VIRT_TO_BUS=y
-CONFIG_MMU_NOTIFIER=y
-CONFIG_KSM=y
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
-CONFIG_MEMORY_FAILURE=y
-CONFIG_HWPOISON_INJECT=m
-CONFIG_TRANSPARENT_HUGEPAGE=y
-CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
-# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
-CONFIG_CROSS_MEMORY_ATTACH=y
-CONFIG_CLEANCACHE=y
-CONFIG_FRONTSWAP=y
-CONFIG_ZBUD=y
-CONFIG_ZSWAP=y
-CONFIG_MEM_SOFT_DIRTY=y
-CONFIG_X86_CHECK_BIOS_CORRUPTION=y
-CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
-CONFIG_X86_RESERVE_LOW=64
-CONFIG_MTRR=y
-CONFIG_MTRR_SANITIZER=y
-CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
-CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
-CONFIG_X86_PAT=y
-CONFIG_ARCH_USES_PG_UNCACHED=y
-CONFIG_ARCH_RANDOM=y
-CONFIG_X86_SMAP=y
-CONFIG_EFI=y
-CONFIG_EFI_STUB=y
-CONFIG_SECCOMP=y
-CONFIG_CC_STACKPROTECTOR=y
-# CONFIG_HZ_100 is not set
-# CONFIG_HZ_250 is not set
-CONFIG_HZ_300=y
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ=300
-CONFIG_SCHED_HRTICK=y
-CONFIG_KEXEC=y
-# CONFIG_CRASH_DUMP is not set
-CONFIG_KEXEC_JUMP=y
-CONFIG_PHYSICAL_START=0x1000000
-CONFIG_RELOCATABLE=y
-CONFIG_PHYSICAL_ALIGN=0x1000000
-CONFIG_HOTPLUG_CPU=y
-# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
-# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
-# CONFIG_COMPAT_VDSO is not set
-# CONFIG_CMDLINE_BOOL is not set
-CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-CONFIG_USE_PERCPU_NUMA_NODE_ID=y
-
-#
-# Power management and ACPI options
-#
-CONFIG_ARCH_HIBERNATION_HEADER=y
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-CONFIG_HIBERNATE_CALLBACKS=y
-CONFIG_HIBERNATION=y
-CONFIG_PM_STD_PARTITION=""
-CONFIG_PM_SLEEP=y
-CONFIG_PM_SLEEP_SMP=y
-CONFIG_PM_AUTOSLEEP=y
-CONFIG_PM_WAKELOCKS=y
-CONFIG_PM_WAKELOCKS_LIMIT=100
-CONFIG_PM_WAKELOCKS_GC=y
-CONFIG_PM_RUNTIME=y
-CONFIG_PM=y
-CONFIG_PM_DEBUG=y
-CONFIG_PM_ADVANCED_DEBUG=y
-# CONFIG_PM_TEST_SUSPEND is not set
-CONFIG_PM_SLEEP_DEBUG=y
-CONFIG_PM_TRACE=y
-CONFIG_PM_TRACE_RTC=y
-# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
-CONFIG_ACPI=y
-CONFIG_ACPI_SLEEP=y
-# CONFIG_ACPI_PROCFS is not set
-# CONFIG_ACPI_PROCFS_POWER is not set
-CONFIG_ACPI_EC_DEBUGFS=m
-# CONFIG_ACPI_PROC_EVENT is not set
-CONFIG_ACPI_AC=m
-CONFIG_ACPI_BATTERY=m
-CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_VIDEO=m
-CONFIG_ACPI_FAN=m
-CONFIG_ACPI_DOCK=y
-CONFIG_ACPI_I2C=m
-CONFIG_ACPI_PROCESSOR=m
-CONFIG_ACPI_IPMI=m
-CONFIG_ACPI_HOTPLUG_CPU=y
-CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
-CONFIG_ACPI_THERMAL=m
-CONFIG_ACPI_NUMA=y
-# CONFIG_ACPI_CUSTOM_DSDT is not set
-CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y
-CONFIG_ACPI_BLACKLIST_YEAR=0
-# CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_PCI_SLOT=y
-CONFIG_X86_PM_TIMER=y
-CONFIG_ACPI_CONTAINER=y
-CONFIG_ACPI_HOTPLUG_MEMORY=y
-CONFIG_ACPI_SBS=m
-CONFIG_ACPI_HED=y
-CONFIG_ACPI_CUSTOM_METHOD=m
-CONFIG_ACPI_BGRT=y
-CONFIG_ACPI_APEI=y
-CONFIG_ACPI_APEI_GHES=y
-CONFIG_ACPI_APEI_PCIEAER=y
-CONFIG_ACPI_APEI_MEMORY_FAILURE=y
-CONFIG_ACPI_APEI_EINJ=m
-CONFIG_ACPI_APEI_ERST_DEBUG=m
-CONFIG_SFI=y
-
-#
-# CPU Frequency scaling
-#
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_TABLE=y
-CONFIG_CPU_FREQ_GOV_COMMON=y
-CONFIG_CPU_FREQ_STAT=m
-CONFIG_CPU_FREQ_STAT_DETAILS=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_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
-CONFIG_X86_POWERNOW_K8=m
-CONFIG_X86_AMD_FREQ_SENSITIVITY=m
-# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
-CONFIG_X86_P4_CLOCKMOD=m
-
-#
-# shared options
-#
-CONFIG_X86_SPEEDSTEP_LIB=m
-CONFIG_CPU_IDLE=y
-# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
-CONFIG_CPU_IDLE_GOV_LADDER=y
-CONFIG_CPU_IDLE_GOV_MENU=y
-# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
-CONFIG_INTEL_IDLE=y
-
-#
-# Memory power savings
-#
-CONFIG_I7300_IDLE_IOAT_CHANNEL=y
-CONFIG_I7300_IDLE=m
-
-#
-# Bus options (PCI etc.)
-#
-CONFIG_PCI=y
-CONFIG_PCI_DIRECT=y
-CONFIG_PCI_MMCONFIG=y
-CONFIG_PCI_XEN=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=y
-CONFIG_PCIEAER=y
-# CONFIG_PCIE_ECRC is not set
-# CONFIG_PCIEAER_INJECT is not set
-CONFIG_PCIEASPM=y
-# CONFIG_PCIEASPM_DEBUG is not set
-CONFIG_PCIEASPM_DEFAULT=y
-# CONFIG_PCIEASPM_POWERSAVE is not set
-# CONFIG_PCIEASPM_PERFORMANCE is not set
-CONFIG_PCIE_PME=y
-CONFIG_ARCH_SUPPORTS_MSI=y
-CONFIG_PCI_MSI=y
-# CONFIG_PCI_DEBUG is not set
-CONFIG_PCI_REALLOC_ENABLE_AUTO=y
-CONFIG_PCI_STUB=m
-CONFIG_XEN_PCIDEV_FRONTEND=m
-CONFIG_HT_IRQ=y
-CONFIG_PCI_ATS=y
-CONFIG_PCI_IOV=y
-CONFIG_PCI_PRI=y
-CONFIG_PCI_PASID=y
-CONFIG_PCI_IOAPIC=y
-CONFIG_PCI_LABEL=y
-
-#
-# PCI host controller drivers
-#
-CONFIG_ISA_DMA_API=y
-CONFIG_AMD_NB=y
-CONFIG_PCCARD=m
-CONFIG_PCMCIA=m
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_CARDBUS=y
-
-#
-# PC-card bridges
-#
-CONFIG_YENTA=m
-CONFIG_YENTA_O2=y
-CONFIG_YENTA_RICOH=y
-CONFIG_YENTA_TI=y
-CONFIG_YENTA_ENE_TUNE=y
-CONFIG_YENTA_TOSHIBA=y
-CONFIG_PD6729=m
-CONFIG_I82092=m
-CONFIG_PCCARD_NONSTATIC=y
-CONFIG_HOTPLUG_PCI=y
-CONFIG_HOTPLUG_PCI_ACPI=y
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m
-CONFIG_HOTPLUG_PCI_CPCI=y
-CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
-CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
-CONFIG_HOTPLUG_PCI_SHPC=m
-CONFIG_RAPIDIO=y
-CONFIG_RAPIDIO_TSI721=y
-CONFIG_RAPIDIO_DISC_TIMEOUT=30
-# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set
-CONFIG_RAPIDIO_DMA_ENGINE=y
-CONFIG_RAPIDIO_DEBUG=y
-CONFIG_RAPIDIO_ENUM_BASIC=m
-
-#
-# RapidIO Switch drivers
-#
-CONFIG_RAPIDIO_TSI57X=y
-CONFIG_RAPIDIO_CPS_XX=y
-CONFIG_RAPIDIO_TSI568=y
-CONFIG_RAPIDIO_CPS_GEN2=y
-
-#
-# Executable file formats / Emulations
-#
-CONFIG_BINFMT_ELF=y
-CONFIG_COMPAT_BINFMT_ELF=y
-CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_BINFMT_SCRIPT=y
-# CONFIG_HAVE_AOUT is not set
-CONFIG_BINFMT_MISC=y
-CONFIG_COREDUMP=y
-CONFIG_IA32_EMULATION=y
-CONFIG_IA32_AOUT=m
-CONFIG_X86_X32=y
-CONFIG_COMPAT=y
-CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
-CONFIG_SYSVIPC_COMPAT=y
-CONFIG_KEYS_COMPAT=y
-CONFIG_HAVE_TEXT_POKE_SMP=y
-CONFIG_X86_DEV_DMA_OPS=y
-CONFIG_NET=y
-CONFIG_COMPAT_NETLINK_MESSAGES=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-CONFIG_PACKET_DIAG=m
-CONFIG_UNIX=y
-CONFIG_UNIX_DIAG=m
-CONFIG_XFRM=y
-CONFIG_XFRM_ALGO=m
-CONFIG_XFRM_USER=m
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_MIGRATE is not set
-# CONFIG_XFRM_STATISTICS is not set
-CONFIG_XFRM_IPCOMP=m
-CONFIG_NET_KEY=m
-# CONFIG_NET_KEY_MIGRATE is not set
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_FIB_TRIE_STATS=y
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-CONFIG_IP_ROUTE_CLASSID=y
-# CONFIG_IP_PNP is not set
-CONFIG_NET_IPIP=m
-CONFIG_NET_IPGRE_DEMUX=m
-CONFIG_NET_IP_TUNNEL=m
-CONFIG_NET_IPGRE=m
-# CONFIG_NET_IPGRE_BROADCAST is not set
-CONFIG_IP_MROUTE=y
-# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-CONFIG_ARPD=y
-CONFIG_SYN_COOKIES=y
-CONFIG_NET_IPVTI=m
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_XFRM_TUNNEL=m
-CONFIG_INET_TUNNEL=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=m
-CONFIG_INET_LRO=y
-CONFIG_INET_DIAG=m
-CONFIG_INET_TCP_DIAG=m
-CONFIG_INET_UDP_DIAG=m
-CONFIG_TCP_CONG_ADVANCED=y
-CONFIG_TCP_CONG_BIC=m
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_TCP_CONG_WESTWOOD=m
-CONFIG_TCP_CONG_HTCP=m
-CONFIG_TCP_CONG_HSTCP=m
-CONFIG_TCP_CONG_HYBLA=m
-CONFIG_TCP_CONG_VEGAS=m
-CONFIG_TCP_CONG_SCALABLE=m
-CONFIG_TCP_CONG_LP=m
-CONFIG_TCP_CONG_VENO=m
-CONFIG_TCP_CONG_YEAH=m
-CONFIG_TCP_CONG_ILLINOIS=m
-CONFIG_DEFAULT_CUBIC=y
-# CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="cubic"
-# CONFIG_TCP_MD5SIG is not set
-CONFIG_IPV6=y
-CONFIG_IPV6_PRIVACY=y
-CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_ROUTE_INFO=y
-CONFIG_IPV6_OPTIMISTIC_DAD=y
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-CONFIG_INET6_IPCOMP=m
-CONFIG_IPV6_MIP6=m
-CONFIG_INET6_XFRM_TUNNEL=m
-CONFIG_INET6_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
-CONFIG_IPV6_SIT=m
-CONFIG_IPV6_SIT_6RD=y
-CONFIG_IPV6_NDISC_NODETYPE=y
-CONFIG_IPV6_TUNNEL=m
-CONFIG_IPV6_GRE=m
-CONFIG_IPV6_MULTIPLE_TABLES=y
-CONFIG_IPV6_SUBTREES=y
-# CONFIG_IPV6_MROUTE is not set
-CONFIG_NETLABEL=y
-CONFIG_NETWORK_SECMARK=y
-CONFIG_NETWORK_PHY_TIMESTAMPING=y
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-CONFIG_NETFILTER_ADVANCED=y
-CONFIG_BRIDGE_NETFILTER=y
-
-#
-# Core Netfilter Configuration
-#
-CONFIG_NETFILTER_NETLINK=m
-CONFIG_NETFILTER_NETLINK_ACCT=m
-CONFIG_NETFILTER_NETLINK_QUEUE=m
-CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NF_CONNTRACK=m
-CONFIG_NF_CONNTRACK_MARK=y
-CONFIG_NF_CONNTRACK_SECMARK=y
-CONFIG_NF_CONNTRACK_ZONES=y
-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
-CONFIG_NF_CT_PROTO_UDPLITE=m
-CONFIG_NF_CONNTRACK_AMANDA=m
-CONFIG_NF_CONNTRACK_FTP=m
-CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IRC=m
-CONFIG_NF_CONNTRACK_BROADCAST=m
-CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-CONFIG_NF_CONNTRACK_SNMP=m
-CONFIG_NF_CONNTRACK_PPTP=m
-CONFIG_NF_CONNTRACK_SANE=m
-CONFIG_NF_CONNTRACK_SIP=m
-CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_CT_NETLINK=m
-CONFIG_NF_CT_NETLINK_TIMEOUT=m
-CONFIG_NF_CT_NETLINK_HELPER=m
-CONFIG_NETFILTER_NETLINK_QUEUE_CT=y
-CONFIG_NF_NAT=m
-CONFIG_NF_NAT_NEEDED=y
-CONFIG_NF_NAT_PROTO_DCCP=m
-CONFIG_NF_NAT_PROTO_UDPLITE=m
-CONFIG_NF_NAT_PROTO_SCTP=m
-CONFIG_NF_NAT_AMANDA=m
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_IRC=m
-CONFIG_NF_NAT_SIP=m
-CONFIG_NF_NAT_TFTP=m
-CONFIG_NETFILTER_TPROXY=m
-CONFIG_NETFILTER_XTABLES=m
-
-#
-# Xtables combined modules
-#
-CONFIG_NETFILTER_XT_MARK=m
-CONFIG_NETFILTER_XT_CONNMARK=m
-CONFIG_NETFILTER_XT_SET=m
-
-#
-# Xtables targets
-#
-CONFIG_NETFILTER_XT_TARGET_AUDIT=m
-CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
-CONFIG_NETFILTER_XT_TARGET_CT=m
-CONFIG_NETFILTER_XT_TARGET_DSCP=m
-CONFIG_NETFILTER_XT_TARGET_HL=m
-CONFIG_NETFILTER_XT_TARGET_HMARK=m
-CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
-CONFIG_NETFILTER_XT_TARGET_LED=m
-CONFIG_NETFILTER_XT_TARGET_LOG=m
-CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_TARGET_NETMAP=m
-CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-CONFIG_NETFILTER_XT_TARGET_RATEEST=m
-CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
-CONFIG_NETFILTER_XT_TARGET_TEE=m
-CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-CONFIG_NETFILTER_XT_TARGET_TRACE=m
-CONFIG_NETFILTER_XT_TARGET_SECMARK=m
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-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
-CONFIG_NETFILTER_XT_MATCH_CPU=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
-CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
-CONFIG_NETFILTER_XT_MATCH_DSCP=m
-CONFIG_NETFILTER_XT_MATCH_ECN=m
-CONFIG_NETFILTER_XT_MATCH_ESP=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_HELPER=m
-CONFIG_NETFILTER_XT_MATCH_HL=m
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-CONFIG_NETFILTER_XT_MATCH_IPVS=m
-CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-CONFIG_NETFILTER_XT_MATCH_MAC=m
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-CONFIG_NETFILTER_XT_MATCH_NFACCT=m
-CONFIG_NETFILTER_XT_MATCH_OSF=m
-CONFIG_NETFILTER_XT_MATCH_OWNER=m
-CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-CONFIG_NETFILTER_XT_MATCH_RATEEST=m
-CONFIG_NETFILTER_XT_MATCH_REALM=m
-CONFIG_NETFILTER_XT_MATCH_RECENT=m
-CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_SOCKET=m
-CONFIG_NETFILTER_XT_MATCH_STATE=m
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-CONFIG_NETFILTER_XT_MATCH_STRING=m
-CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-CONFIG_NETFILTER_XT_MATCH_TIME=m
-CONFIG_NETFILTER_XT_MATCH_U32=m
-CONFIG_IP_SET=m
-CONFIG_IP_SET_MAX=256
-CONFIG_IP_SET_BITMAP_IP=m
-CONFIG_IP_SET_BITMAP_IPMAC=m
-CONFIG_IP_SET_BITMAP_PORT=m
-CONFIG_IP_SET_HASH_IP=m
-CONFIG_IP_SET_HASH_IPPORT=m
-CONFIG_IP_SET_HASH_IPPORTIP=m
-CONFIG_IP_SET_HASH_IPPORTNET=m
-CONFIG_IP_SET_HASH_NET=m
-CONFIG_IP_SET_HASH_NETPORT=m
-CONFIG_IP_SET_HASH_NETIFACE=m
-CONFIG_IP_SET_LIST_SET=m
-CONFIG_IP_VS=m
-# CONFIG_IP_VS_IPV6 is not set
-# CONFIG_IP_VS_DEBUG is not set
-CONFIG_IP_VS_TAB_BITS=12
-
-#
-# IPVS transport protocol load balancing support
-#
-CONFIG_IP_VS_PROTO_TCP=y
-CONFIG_IP_VS_PROTO_UDP=y
-CONFIG_IP_VS_PROTO_AH_ESP=y
-CONFIG_IP_VS_PROTO_ESP=y
-CONFIG_IP_VS_PROTO_AH=y
-CONFIG_IP_VS_PROTO_SCTP=y
-
-#
-# IPVS scheduler
-#
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_WRR=m
-CONFIG_IP_VS_LC=m
-CONFIG_IP_VS_WLC=m
-CONFIG_IP_VS_LBLC=m
-CONFIG_IP_VS_LBLCR=m
-CONFIG_IP_VS_DH=m
-CONFIG_IP_VS_SH=m
-CONFIG_IP_VS_SED=m
-CONFIG_IP_VS_NQ=m
-
-#
-# IPVS SH scheduler
-#
-CONFIG_IP_VS_SH_TAB_BITS=8
-
-#
-# IPVS application helper
-#
-CONFIG_IP_VS_FTP=m
-CONFIG_IP_VS_NFCT=y
-CONFIG_IP_VS_PE_SIP=m
-
-#
-# IP: Netfilter Configuration
-#
-CONFIG_NF_DEFRAG_IPV4=m
-CONFIG_NF_CONNTRACK_IPV4=m
-# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_RPFILTER=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_NF_NAT_IPV4=m
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_PROTO_GRE=m
-CONFIG_NF_NAT_PPTP=m
-CONFIG_NF_NAT_H323=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_RAW=m
-CONFIG_IP_NF_SECURITY=m
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-
-#
-# IPv6: Netfilter Configuration
-#
-CONFIG_NF_DEFRAG_IPV6=m
-CONFIG_NF_CONNTRACK_IPV6=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_RPFILTER=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_RAW=m
-CONFIG_IP6_NF_SECURITY=m
-CONFIG_NF_NAT_IPV6=m
-CONFIG_IP6_NF_TARGET_MASQUERADE=m
-CONFIG_IP6_NF_TARGET_NPT=m
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_IP6=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_ULOG=m
-CONFIG_BRIDGE_EBT_NFLOG=m
-CONFIG_IP_DCCP=m
-CONFIG_INET_DCCP_DIAG=m
-
-#
-# DCCP CCIDs Configuration
-#
-# CONFIG_IP_DCCP_CCID2_DEBUG is not set
-CONFIG_IP_DCCP_CCID3=y
-# CONFIG_IP_DCCP_CCID3_DEBUG is not set
-CONFIG_IP_DCCP_TFRC_LIB=y
-
-#
-# DCCP Kernel Hacking
-#
-# CONFIG_IP_DCCP_DEBUG is not set
-CONFIG_NET_DCCPPROBE=m
-CONFIG_IP_SCTP=m
-CONFIG_NET_SCTPPROBE=m
-# CONFIG_SCTP_DBG_OBJCNT is not set
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
-CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
-CONFIG_SCTP_COOKIE_HMAC_MD5=y
-CONFIG_SCTP_COOKIE_HMAC_SHA1=y
-# CONFIG_RDS is not set
-# CONFIG_TIPC is not set
-CONFIG_ATM=m
-CONFIG_ATM_CLIP=m
-# CONFIG_ATM_CLIP_NO_ICMP is not set
-CONFIG_ATM_LANE=m
-CONFIG_ATM_MPOA=m
-CONFIG_ATM_BR2684=m
-# CONFIG_ATM_BR2684_IPFILTER is not set
-CONFIG_L2TP=m
-# CONFIG_L2TP_DEBUGFS is not set
-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
-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
-CONFIG_IPX=m
-# CONFIG_IPX_INTERN is not set
-CONFIG_ATALK=m
-CONFIG_DEV_APPLETALK=m
-CONFIG_IPDDP=m
-CONFIG_IPDDP_ENCAP=y
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-CONFIG_PHONET=m
-CONFIG_IEEE802154=m
-CONFIG_IEEE802154_6LOWPAN=m
-CONFIG_MAC802154=m
-CONFIG_NET_SCHED=y
-
-#
-# Queueing/Scheduling
-#
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_ATM=m
-CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_MULTIQ=m
-CONFIG_NET_SCH_RED=m
-CONFIG_NET_SCH_SFB=m
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SCH_TBF=m
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCH_NETEM=m
-CONFIG_NET_SCH_DRR=m
-CONFIG_NET_SCH_MQPRIO=m
-CONFIG_NET_SCH_CHOKE=m
-CONFIG_NET_SCH_QFQ=m
-CONFIG_NET_SCH_CODEL=m
-CONFIG_NET_SCH_FQ_CODEL=m
-CONFIG_NET_SCH_INGRESS=m
-CONFIG_NET_SCH_PLUG=m
-
-#
-# Classification
-#
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-# CONFIG_CLS_U32_PERF is not set
-# CONFIG_CLS_U32_MARK is not set
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_FLOW=m
-CONFIG_NET_CLS_CGROUP=y
-# CONFIG_NET_EMATCH is not set
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_ACT_POLICE=m
-CONFIG_NET_ACT_GACT=m
-CONFIG_GACT_PROB=y
-CONFIG_NET_ACT_MIRRED=m
-CONFIG_NET_ACT_IPT=m
-CONFIG_NET_ACT_NAT=m
-CONFIG_NET_ACT_PEDIT=m
-CONFIG_NET_ACT_SIMP=m
-CONFIG_NET_ACT_SKBEDIT=m
-CONFIG_NET_ACT_CSUM=m
-CONFIG_NET_CLS_IND=y
-CONFIG_NET_SCH_FIFO=y
-# CONFIG_DCB is not set
-CONFIG_DNS_RESOLVER=y
-CONFIG_BATMAN_ADV=m
-CONFIG_BATMAN_ADV_BLA=y
-CONFIG_BATMAN_ADV_DAT=y
-CONFIG_BATMAN_ADV_NC=y
-# CONFIG_BATMAN_ADV_DEBUG is not set
-CONFIG_OPENVSWITCH=m
-CONFIG_OPENVSWITCH_GRE=y
-CONFIG_VSOCKETS=m
-CONFIG_VMWARE_VMCI_VSOCKETS=m
-CONFIG_NETLINK_MMAP=y
-CONFIG_NETLINK_DIAG=m
-CONFIG_NET_MPLS_GSO=m
-CONFIG_RPS=y
-CONFIG_RFS_ACCEL=y
-CONFIG_XPS=y
-CONFIG_NETPRIO_CGROUP=m
-CONFIG_NET_RX_BUSY_POLL=y
-CONFIG_BQL=y
-CONFIG_BPF_JIT=y
-CONFIG_NET_FLOW_LIMIT=y
-
-#
-# Network testing
-#
-CONFIG_NET_PKTGEN=m
-CONFIG_NET_TCPPROBE=m
-CONFIG_NET_DROP_MONITOR=y
-CONFIG_HAMRADIO=y
-
-#
-# Packet Radio protocols
-#
-CONFIG_AX25=m
-CONFIG_AX25_DAMA_SLAVE=y
-CONFIG_NETROM=m
-CONFIG_ROSE=m
-
-#
-# AX.25 network device drivers
-#
-CONFIG_MKISS=m
-CONFIG_6PACK=m
-CONFIG_BPQETHER=m
-CONFIG_BAYCOM_SER_FDX=m
-CONFIG_BAYCOM_SER_HDX=m
-CONFIG_BAYCOM_PAR=m
-CONFIG_YAM=m
-# CONFIG_CAN is not set
-CONFIG_IRDA=m
-
-#
-# IrDA protocols
-#
-CONFIG_IRLAN=m
-CONFIG_IRNET=m
-CONFIG_IRCOMM=m
-CONFIG_IRDA_ULTRA=y
-
-#
-# IrDA options
-#
-CONFIG_IRDA_CACHE_LAST_LSAP=y
-CONFIG_IRDA_FAST_RR=y
-# CONFIG_IRDA_DEBUG is not set
-
-#
-# Infrared-port device drivers
-#
-
-#
-# SIR device drivers
-#
-CONFIG_IRTTY_SIR=m
-
-#
-# Dongle support
-#
-CONFIG_DONGLE=y
-CONFIG_ESI_DONGLE=m
-CONFIG_ACTISYS_DONGLE=m
-CONFIG_TEKRAM_DONGLE=m
-CONFIG_TOIM3232_DONGLE=m
-CONFIG_LITELINK_DONGLE=m
-CONFIG_MA600_DONGLE=m
-CONFIG_GIRBIL_DONGLE=m
-CONFIG_MCP2120_DONGLE=m
-CONFIG_OLD_BELKIN_DONGLE=m
-CONFIG_ACT200L_DONGLE=m
-CONFIG_KINGSUN_DONGLE=m
-CONFIG_KSDAZZLE_DONGLE=m
-CONFIG_KS959_DONGLE=m
-
-#
-# FIR device drivers
-#
-CONFIG_USB_IRDA=m
-CONFIG_SIGMATEL_FIR=m
-CONFIG_NSC_FIR=m
-CONFIG_WINBOND_FIR=m
-CONFIG_SMC_IRCC_FIR=m
-CONFIG_ALI_FIR=m
-CONFIG_VLSI_FIR=m
-CONFIG_VIA_FIR=m
-CONFIG_MCS_FIR=m
-CONFIG_BT=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-# CONFIG_BT_BNEP_MC_FILTER is not set
-# CONFIG_BT_BNEP_PROTO_FILTER is not set
-# CONFIG_BT_CMTP is not set
-CONFIG_BT_HIDP=m
-
-#
-# Bluetooth device drivers
-#
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBTSDIO=m
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_ATH3K=y
-CONFIG_BT_HCIUART_LL=y
-CONFIG_BT_HCIUART_3WIRE=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIDTL1=m
-CONFIG_BT_HCIBT3C=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIBTUART=m
-CONFIG_BT_HCIVHCI=m
-CONFIG_BT_MRVL=m
-CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_ATH3K=m
-CONFIG_BT_WILINK=m
-CONFIG_AF_RXRPC=m
-# CONFIG_AF_RXRPC_DEBUG is not set
-CONFIG_RXKAD=m
-CONFIG_FIB_RULES=y
-CONFIG_WIRELESS=y
-CONFIG_WIRELESS_EXT=y
-CONFIG_WEXT_CORE=y
-CONFIG_WEXT_PROC=y
-CONFIG_WEXT_SPY=y
-CONFIG_WEXT_PRIV=y
-CONFIG_CFG80211=m
-# CONFIG_NL80211_TESTMODE is not set
-# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
-# CONFIG_CFG80211_REG_DEBUG is not set
-CONFIG_CFG80211_DEFAULT_PS=y
-# CONFIG_CFG80211_DEBUGFS is not set
-# CONFIG_CFG80211_INTERNAL_REGDB is not set
-CONFIG_CFG80211_WEXT=y
-CONFIG_LIB80211=m
-CONFIG_LIB80211_CRYPT_WEP=m
-CONFIG_LIB80211_CRYPT_CCMP=m
-CONFIG_LIB80211_CRYPT_TKIP=m
-# CONFIG_LIB80211_DEBUG is not set
-CONFIG_MAC80211=m
-CONFIG_MAC80211_HAS_RC=y
-CONFIG_MAC80211_RC_MINSTREL=y
-CONFIG_MAC80211_RC_MINSTREL_HT=y
-CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
-CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
-CONFIG_MAC80211_MESH=y
-CONFIG_MAC80211_LEDS=y
-# CONFIG_MAC80211_DEBUGFS is not set
-# CONFIG_MAC80211_MESSAGE_TRACING is not set
-# CONFIG_MAC80211_DEBUG_MENU is not set
-CONFIG_WIMAX=m
-CONFIG_WIMAX_DEBUG_LEVEL=8
-CONFIG_RFKILL=m
-CONFIG_RFKILL_LEDS=y
-CONFIG_RFKILL_INPUT=y
-CONFIG_NET_9P=m
-CONFIG_NET_9P_VIRTIO=m
-# CONFIG_NET_9P_DEBUG is not set
-CONFIG_CAIF=m
-# CONFIG_CAIF_DEBUG is not set
-CONFIG_CAIF_NETDEV=m
-CONFIG_CAIF_USB=m
-CONFIG_CEPH_LIB=m
-# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
-# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
-CONFIG_NFC=m
-CONFIG_NFC_NCI=m
-# CONFIG_NFC_NCI_SPI is not set
-CONFIG_NFC_HCI=m
-# CONFIG_NFC_SHDLC is not set
-
-#
-# Near Field Communication (NFC) devices
-#
-CONFIG_NFC_PN533=m
-CONFIG_NFC_WILINK=m
-CONFIG_NFC_MEI_PHY=m
-CONFIG_NFC_SIM=m
-CONFIG_NFC_PN544=m
-CONFIG_NFC_PN544_MEI=m
-CONFIG_NFC_MICROREAD=m
-CONFIG_NFC_MICROREAD_MEI=m
-CONFIG_HAVE_BPF_JIT=y
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_UEVENT_HELPER_PATH=""
-CONFIG_DEVTMPFS=y
-# CONFIG_DEVTMPFS_MOUNT is not set
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_FW_LOADER=y
-CONFIG_FIRMWARE_IN_KERNEL=y
-CONFIG_EXTRA_FIRMWARE=""
-CONFIG_FW_LOADER_USER_HELPER=y
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_DEVRES is not set
-CONFIG_SYS_HYPERVISOR=y
-# CONFIG_GENERIC_CPU_DEVICES is not set
-CONFIG_REGMAP=y
-CONFIG_REGMAP_I2C=m
-CONFIG_REGMAP_MMIO=m
-CONFIG_REGMAP_IRQ=y
-CONFIG_DMA_SHARED_BUFFER=y
-
-#
-# Bus devices
-#
-CONFIG_CONNECTOR=y
-CONFIG_PROC_EVENTS=y
-CONFIG_MTD=m
-CONFIG_MTD_TESTS=m
-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_AR7_PARTS=m
-
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_BLKDEVS=m
-CONFIG_MTD_BLOCK=m
-CONFIG_MTD_BLOCK_RO=m
-CONFIG_FTL=m
-CONFIG_NFTL=m
-CONFIG_NFTL_RW=y
-CONFIG_INFTL=m
-CONFIG_RFD_FTL=m
-CONFIG_SSFDC=m
-# CONFIG_SM_FTL is not set
-CONFIG_MTD_OOPS=m
-CONFIG_MTD_SWAP=m
-
-#
-# RAM/ROM/Flash chip drivers
-#
-CONFIG_MTD_CFI=m
-CONFIG_MTD_JEDECPROBE=m
-CONFIG_MTD_GEN_PROBE=m
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-CONFIG_MTD_CFI_INTELEXT=m
-CONFIG_MTD_CFI_AMDSTD=m
-CONFIG_MTD_CFI_STAA=m
-CONFIG_MTD_CFI_UTIL=m
-CONFIG_MTD_RAM=m
-CONFIG_MTD_ROM=m
-CONFIG_MTD_ABSENT=m
-
-#
-# Mapping drivers for chip access
-#
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-# CONFIG_MTD_PHYSMAP is not set
-CONFIG_MTD_SC520CDP=m
-CONFIG_MTD_NETSC520=m
-CONFIG_MTD_TS5500=m
-# CONFIG_MTD_SBC_GXX is not set
-# CONFIG_MTD_AMD76XROM is not set
-# CONFIG_MTD_ICHXROM is not set
-# CONFIG_MTD_ESB2ROM is not set
-# CONFIG_MTD_CK804XROM is not set
-CONFIG_MTD_SCB2_FLASH=m
-# CONFIG_MTD_NETtel is not set
-# CONFIG_MTD_L440GX is not set
-CONFIG_MTD_PCI=m
-# CONFIG_MTD_PCMCIA is not set
-# CONFIG_MTD_GPIO_ADDR is not set
-# CONFIG_MTD_INTEL_VR_NOR is not set
-CONFIG_MTD_PLATRAM=m
-# CONFIG_MTD_LATCH_ADDR is not set
-
-#
-# Self-contained MTD device drivers
-#
-CONFIG_MTD_PMC551=m
-# CONFIG_MTD_PMC551_BUGFIX is not set
-# CONFIG_MTD_PMC551_DEBUG is not set
-# CONFIG_MTD_DATAFLASH is not set
-# CONFIG_MTD_M25P80 is not set
-# CONFIG_MTD_SST25L is not set
-# CONFIG_MTD_SLRAM is not set
-CONFIG_MTD_PHRAM=m
-CONFIG_MTD_MTDRAM=m
-CONFIG_MTDRAM_TOTAL_SIZE=4096
-CONFIG_MTDRAM_ERASE_SIZE=128
-CONFIG_MTD_BLOCK2MTD=m
-
-#
-# Disk-On-Chip Device Drivers
-#
-CONFIG_MTD_DOCG3=m
-CONFIG_BCH_CONST_M=14
-CONFIG_BCH_CONST_T=4
-CONFIG_MTD_NAND_ECC=m
-CONFIG_MTD_NAND_ECC_SMC=y
-CONFIG_MTD_NAND=m
-# CONFIG_MTD_NAND_ECC_BCH is not set
-CONFIG_MTD_SM_COMMON=m
-# CONFIG_MTD_NAND_DENALI is not set
-CONFIG_MTD_NAND_IDS=m
-CONFIG_MTD_NAND_RICOH=m
-CONFIG_MTD_NAND_DISKONCHIP=m
-# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
-CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
-# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
-CONFIG_MTD_NAND_DOCG4=m
-# CONFIG_MTD_NAND_CAFE is not set
-CONFIG_MTD_NAND_NANDSIM=m
-# CONFIG_MTD_NAND_PLATFORM is not set
-CONFIG_MTD_ALAUDA=m
-# CONFIG_MTD_ONENAND is not set
-
-#
-# LPDDR flash memory drivers
-#
-CONFIG_MTD_LPDDR=m
-CONFIG_MTD_QINFO_PROBE=m
-CONFIG_MTD_UBI=m
-CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MTD_UBI_BEB_LIMIT=20
-# CONFIG_MTD_UBI_FASTMAP is not set
-# CONFIG_MTD_UBI_GLUEBI is not set
-CONFIG_PARPORT=m
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_SERIAL=m
-# CONFIG_PARPORT_PC_FIFO is not set
-# CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_PC_PCMCIA=m
-# CONFIG_PARPORT_GSC is not set
-CONFIG_PARPORT_AX88796=m
-CONFIG_PARPORT_1284=y
-CONFIG_PARPORT_NOT_PC=y
-CONFIG_PNP=y
-# CONFIG_PNP_DEBUG_MESSAGES is not set
-
-#
-# Protocols
-#
-CONFIG_PNPACPI=y
-CONFIG_BLK_DEV=y
-CONFIG_BLK_DEV_FD=m
-# CONFIG_PARIDE is not set
-CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
-CONFIG_BLK_CPQ_DA=m
-CONFIG_BLK_CPQ_CISS_DA=m
-# CONFIG_CISS_SCSI_TAPE is not set
-CONFIG_BLK_DEV_DAC960=m
-# CONFIG_BLK_DEV_UMEM is not set
-# CONFIG_BLK_DEV_COW_COMMON is not set
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
-CONFIG_BLK_DEV_CRYPTOLOOP=m
-CONFIG_BLK_DEV_DRBD=m
-# CONFIG_DRBD_FAULT_INJECTION is not set
-CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_NVME=m
-CONFIG_BLK_DEV_OSD=m
-CONFIG_BLK_DEV_SX8=m
-CONFIG_BLK_DEV_RAM=m
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=16384
-# CONFIG_BLK_DEV_XIP is not set
-CONFIG_CDROM_PKTCDVD=m
-CONFIG_CDROM_PKTCDVD_BUFFERS=8
-# CONFIG_CDROM_PKTCDVD_WCACHE is not set
-CONFIG_ATA_OVER_ETH=m
-CONFIG_XEN_BLKDEV_FRONTEND=m
-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
-#
-CONFIG_SENSORS_LIS3LV02D=m
-CONFIG_AD525X_DPOT=m
-CONFIG_AD525X_DPOT_I2C=m
-# CONFIG_AD525X_DPOT_SPI is not set
-# CONFIG_DUMMY_IRQ is not set
-# CONFIG_IBM_ASM is not set
-CONFIG_PHANTOM=m
-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
-CONFIG_CS5535_CLOCK_EVENT_SRC=m
-CONFIG_HP_ILO=m
-CONFIG_APDS9802ALS=m
-CONFIG_ISL29003=m
-CONFIG_ISL29020=m
-CONFIG_SENSORS_TSL2550=m
-CONFIG_SENSORS_BH1780=m
-CONFIG_SENSORS_BH1770=m
-CONFIG_SENSORS_APDS990X=m
-CONFIG_HMC6352=m
-CONFIG_DS1682=m
-# CONFIG_TI_DAC7512 is not set
-CONFIG_VMWARE_BALLOON=m
-CONFIG_BMP085=y
-CONFIG_BMP085_I2C=m
-# CONFIG_BMP085_SPI is not set
-CONFIG_PCH_PHUB=m
-CONFIG_USB_SWITCH_FSA9480=m
-# CONFIG_LATTICE_ECP3_CONFIG is not set
-# CONFIG_SRAM is not set
-CONFIG_C2PORT=m
-CONFIG_C2PORT_DURAMAR_2150=m
-
-#
-# EEPROM support
-#
-CONFIG_EEPROM_AT24=m
-# CONFIG_EEPROM_AT25 is not set
-CONFIG_EEPROM_LEGACY=m
-CONFIG_EEPROM_MAX6875=m
-CONFIG_EEPROM_93CX6=m
-# CONFIG_EEPROM_93XX46 is not set
-CONFIG_CB710_CORE=m
-# CONFIG_CB710_DEBUG is not set
-CONFIG_CB710_DEBUG_ASSUMPTIONS=y
-
-#
-# Texas Instruments shared transport line discipline
-#
-CONFIG_TI_ST=m
-CONFIG_SENSORS_LIS3_I2C=m
-
-#
-# Altera FPGA firmware download module
-#
-CONFIG_ALTERA_STAPL=m
-CONFIG_INTEL_MEI=m
-CONFIG_INTEL_MEI_ME=m
-CONFIG_VMWARE_VMCI=m
-CONFIG_HAVE_IDE=y
-# CONFIG_IDE is not set
-
-#
-# SCSI device support
-#
-CONFIG_SCSI_MOD=m
-CONFIG_RAID_ATTRS=m
-CONFIG_SCSI=m
-CONFIG_SCSI_DMA=y
-CONFIG_SCSI_TGT=m
-CONFIG_SCSI_NETLINK=y
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=m
-CONFIG_CHR_DEV_ST=m
-CONFIG_CHR_DEV_OSST=m
-CONFIG_BLK_DEV_SR=m
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SG=m
-CONFIG_CHR_DEV_SCH=m
-CONFIG_SCSI_ENCLOSURE=m
-CONFIG_SCSI_MULTI_LUN=y
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
-
-#
-# SCSI Transports
-#
-CONFIG_SCSI_SPI_ATTRS=m
-CONFIG_SCSI_FC_ATTRS=m
-# CONFIG_SCSI_FC_TGT_ATTRS is not set
-CONFIG_SCSI_ISCSI_ATTRS=m
-CONFIG_SCSI_SAS_ATTRS=m
-CONFIG_SCSI_SAS_LIBSAS=m
-CONFIG_SCSI_SAS_ATA=y
-CONFIG_SCSI_SAS_HOST_SMP=y
-CONFIG_SCSI_SRP_ATTRS=m
-CONFIG_SCSI_SRP_TGT_ATTRS=y
-CONFIG_SCSI_LOWLEVEL=y
-CONFIG_ISCSI_TCP=m
-CONFIG_ISCSI_BOOT_SYSFS=m
-CONFIG_SCSI_CXGB3_ISCSI=m
-CONFIG_SCSI_CXGB4_ISCSI=m
-CONFIG_SCSI_BNX2_ISCSI=m
-CONFIG_SCSI_BNX2X_FCOE=m
-CONFIG_BE2ISCSI=m
-CONFIG_BLK_DEV_3W_XXXX_RAID=m
-CONFIG_SCSI_HPSA=m
-CONFIG_SCSI_3W_9XXX=m
-CONFIG_SCSI_3W_SAS=m
-CONFIG_SCSI_ACARD=m
-CONFIG_SCSI_AACRAID=m
-CONFIG_SCSI_AIC7XXX=m
-CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
-CONFIG_AIC7XXX_RESET_DELAY_MS=15000
-# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
-CONFIG_AIC7XXX_DEBUG_MASK=0
-CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
-# CONFIG_SCSI_AIC7XXX_OLD is not set
-CONFIG_SCSI_AIC79XX=m
-CONFIG_AIC79XX_CMDS_PER_DEVICE=32
-CONFIG_AIC79XX_RESET_DELAY_MS=15000
-# CONFIG_AIC79XX_DEBUG_ENABLE is not set
-CONFIG_AIC79XX_DEBUG_MASK=0
-CONFIG_AIC79XX_REG_PRETTY_PRINT=y
-CONFIG_SCSI_AIC94XX=m
-# CONFIG_AIC94XX_DEBUG is not set
-CONFIG_SCSI_MVSAS=m
-# CONFIG_SCSI_MVSAS_DEBUG is not set
-CONFIG_SCSI_MVSAS_TASKLET=y
-CONFIG_SCSI_MVUMI=m
-CONFIG_SCSI_DPT_I2O=m
-CONFIG_SCSI_ADVANSYS=m
-CONFIG_SCSI_ARCMSR=m
-CONFIG_MEGARAID_NEWGEN=y
-CONFIG_MEGARAID_MM=m
-CONFIG_MEGARAID_MAILBOX=m
-CONFIG_MEGARAID_LEGACY=m
-CONFIG_MEGARAID_SAS=m
-CONFIG_SCSI_MPT2SAS=m
-CONFIG_SCSI_MPT2SAS_MAX_SGE=128
-# CONFIG_SCSI_MPT2SAS_LOGGING is not set
-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_UFSHCD_PLATFORM=m
-CONFIG_SCSI_HPTIOP=m
-CONFIG_SCSI_BUSLOGIC=m
-CONFIG_SCSI_FLASHPOINT=y
-CONFIG_VMWARE_PVSCSI=m
-CONFIG_HYPERV_STORAGE=m
-CONFIG_LIBFC=m
-CONFIG_LIBFCOE=m
-CONFIG_FCOE=m
-CONFIG_FCOE_FNIC=m
-CONFIG_SCSI_DMX3191D=m
-CONFIG_SCSI_EATA=m
-# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set
-# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set
-CONFIG_SCSI_EATA_MAX_TAGS=16
-CONFIG_SCSI_FUTURE_DOMAIN=m
-CONFIG_SCSI_GDTH=m
-CONFIG_SCSI_ISCI=m
-CONFIG_SCSI_IPS=m
-CONFIG_SCSI_INITIO=m
-CONFIG_SCSI_INIA100=m
-CONFIG_SCSI_PPA=m
-CONFIG_SCSI_IMM=m
-# CONFIG_SCSI_IZIP_EPP16 is not set
-# CONFIG_SCSI_IZIP_SLOW_CTR is not set
-CONFIG_SCSI_STEX=m
-CONFIG_SCSI_SYM53C8XX_2=m
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
-CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-CONFIG_SCSI_SYM53C8XX_MMIO=y
-CONFIG_SCSI_IPR=m
-# CONFIG_SCSI_IPR_TRACE is not set
-# CONFIG_SCSI_IPR_DUMP is not set
-CONFIG_SCSI_QLOGIC_1280=m
-CONFIG_SCSI_QLA_FC=m
-CONFIG_TCM_QLA2XXX=m
-CONFIG_SCSI_QLA_ISCSI=m
-CONFIG_SCSI_LPFC=m
-# CONFIG_SCSI_LPFC_DEBUG_FS is not set
-CONFIG_SCSI_DC395x=m
-CONFIG_SCSI_DC390T=m
-# CONFIG_SCSI_DEBUG is not set
-CONFIG_SCSI_PMCRAID=m
-CONFIG_SCSI_PM8001=m
-CONFIG_SCSI_SRP=m
-CONFIG_SCSI_BFA_FC=m
-CONFIG_SCSI_VIRTIO=m
-CONFIG_SCSI_CHELSIO_FCOE=m
-CONFIG_SCSI_LOWLEVEL_PCMCIA=y
-CONFIG_PCMCIA_AHA152X=m
-CONFIG_PCMCIA_FDOMAIN=m
-CONFIG_PCMCIA_QLOGIC=m
-CONFIG_PCMCIA_SYM53C500=m
-CONFIG_SCSI_DH=m
-CONFIG_SCSI_DH_RDAC=m
-CONFIG_SCSI_DH_HP_SW=m
-CONFIG_SCSI_DH_EMC=m
-CONFIG_SCSI_DH_ALUA=m
-CONFIG_SCSI_OSD_INITIATOR=m
-CONFIG_SCSI_OSD_ULD=m
-CONFIG_SCSI_OSD_DPRINT_SENSE=0
-# CONFIG_SCSI_OSD_DEBUG is not set
-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
-
-#
-# Controllers with non-SFF native interface
-#
-CONFIG_SATA_AHCI=m
-CONFIG_SATA_AHCI_PLATFORM=m
-CONFIG_SATA_INIC162X=m
-CONFIG_SATA_ACARD_AHCI=m
-CONFIG_SATA_SIL24=m
-CONFIG_ATA_SFF=y
-
-#
-# SFF controllers with custom DMA interface
-#
-CONFIG_PDC_ADMA=m
-CONFIG_SATA_QSTOR=m
-CONFIG_SATA_SX4=m
-CONFIG_ATA_BMDMA=y
-
-#
-# SATA SFF controllers with BMDMA
-#
-CONFIG_ATA_PIIX=m
-CONFIG_SATA_HIGHBANK=m
-CONFIG_SATA_MV=m
-CONFIG_SATA_NV=m
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_RCAR=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SVW=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_VIA=m
-CONFIG_SATA_VITESSE=m
-
-#
-# PATA SFF controllers with BMDMA
-#
-CONFIG_PATA_ALI=m
-CONFIG_PATA_AMD=m
-CONFIG_PATA_ARASAN_CF=m
-CONFIG_PATA_ARTOP=m
-CONFIG_PATA_ATIIXP=m
-CONFIG_PATA_ATP867X=m
-CONFIG_PATA_CMD64X=m
-CONFIG_PATA_CS5520=m
-CONFIG_PATA_CS5530=m
-CONFIG_PATA_CS5536=m
-CONFIG_PATA_CYPRESS=m
-CONFIG_PATA_EFAR=m
-CONFIG_PATA_HPT366=m
-CONFIG_PATA_HPT37X=m
-CONFIG_PATA_HPT3X2N=m
-CONFIG_PATA_HPT3X3=m
-# CONFIG_PATA_HPT3X3_DMA is not set
-CONFIG_PATA_IT8213=m
-CONFIG_PATA_IT821X=m
-CONFIG_PATA_JMICRON=m
-CONFIG_PATA_MARVELL=m
-CONFIG_PATA_NETCELL=m
-CONFIG_PATA_NINJA32=m
-CONFIG_PATA_NS87415=m
-CONFIG_PATA_OLDPIIX=m
-CONFIG_PATA_OPTIDMA=m
-CONFIG_PATA_PDC2027X=m
-CONFIG_PATA_PDC_OLD=m
-CONFIG_PATA_RADISYS=m
-CONFIG_PATA_RDC=m
-CONFIG_PATA_SC1200=m
-CONFIG_PATA_SCH=m
-CONFIG_PATA_SERVERWORKS=m
-CONFIG_PATA_SIL680=m
-CONFIG_PATA_SIS=m
-CONFIG_PATA_TOSHIBA=m
-CONFIG_PATA_TRIFLEX=m
-CONFIG_PATA_VIA=m
-CONFIG_PATA_WINBOND=m
-
-#
-# PIO-only SFF controllers
-#
-CONFIG_PATA_CMD640_PCI=m
-CONFIG_PATA_MPIIX=m
-CONFIG_PATA_NS87410=m
-CONFIG_PATA_OPTI=m
-CONFIG_PATA_PCMCIA=m
-CONFIG_PATA_RZ1000=m
-
-#
-# Generic fallback / legacy drivers
-#
-CONFIG_PATA_ACPI=m
-CONFIG_ATA_GENERIC=m
-CONFIG_PATA_LEGACY=m
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=m
-CONFIG_MD_LINEAR=m
-CONFIG_MD_RAID0=m
-CONFIG_MD_RAID1=m
-CONFIG_MD_RAID10=m
-CONFIG_MD_RAID456=m
-CONFIG_MD_MULTIPATH=m
-CONFIG_MD_FAULTY=m
-CONFIG_BCACHE=m
-# CONFIG_BCACHE_DEBUG is not set
-# CONFIG_BCACHE_EDEBUG is not set
-# CONFIG_BCACHE_CLOSURES_DEBUG is not set
-CONFIG_BLK_DEV_DM=m
-# CONFIG_DM_DEBUG is not set
-CONFIG_DM_BUFIO=m
-CONFIG_DM_BIO_PRISON=m
-CONFIG_DM_PERSISTENT_DATA=m
-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
-CONFIG_DM_ZERO=m
-CONFIG_DM_MULTIPATH=m
-CONFIG_DM_MULTIPATH_QL=m
-CONFIG_DM_MULTIPATH_ST=m
-CONFIG_DM_DELAY=m
-CONFIG_DM_UEVENT=y
-CONFIG_DM_FLAKEY=m
-CONFIG_DM_VERITY=m
-CONFIG_DM_SWITCH=m
-CONFIG_TARGET_CORE=m
-CONFIG_TCM_IBLOCK=m
-CONFIG_TCM_FILEIO=m
-CONFIG_TCM_PSCSI=m
-CONFIG_LOOPBACK_TARGET=m
-CONFIG_TCM_FC=m
-CONFIG_ISCSI_TARGET=m
-CONFIG_SBP_TARGET=m
-CONFIG_FUSION=y
-CONFIG_FUSION_SPI=m
-CONFIG_FUSION_FC=m
-CONFIG_FUSION_SAS=m
-CONFIG_FUSION_MAX_SGE=128
-CONFIG_FUSION_CTL=m
-# CONFIG_FUSION_LOGGING is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-CONFIG_FIREWIRE=m
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-CONFIG_FIREWIRE_NET=m
-CONFIG_FIREWIRE_NOSY=m
-CONFIG_I2O=m
-CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
-CONFIG_I2O_EXT_ADAPTEC=y
-CONFIG_I2O_EXT_ADAPTEC_DMA64=y
-CONFIG_I2O_CONFIG=m
-CONFIG_I2O_CONFIG_OLD_IOCTL=y
-CONFIG_I2O_BUS=m
-CONFIG_I2O_BLOCK=m
-CONFIG_I2O_SCSI=m
-CONFIG_I2O_PROC=m
-CONFIG_MACINTOSH_DRIVERS=y
-CONFIG_MAC_EMUMOUSEBTN=y
-CONFIG_NETDEVICES=y
-CONFIG_MII=m
-CONFIG_NET_CORE=y
-CONFIG_BONDING=m
-CONFIG_DUMMY=m
-CONFIG_EQUALIZER=m
-# CONFIG_NET_FC is not set
-CONFIG_IFB=m
-CONFIG_NET_TEAM=m
-CONFIG_NET_TEAM_MODE_BROADCAST=m
-CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
-CONFIG_NET_TEAM_MODE_RANDOM=m
-CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
-CONFIG_NET_TEAM_MODE_LOADBALANCE=m
-CONFIG_MACVLAN=m
-CONFIG_MACVTAP=m
-CONFIG_VXLAN=m
-CONFIG_NETCONSOLE=m
-CONFIG_NETCONSOLE_DYNAMIC=y
-CONFIG_NETPOLL=y
-# CONFIG_NETPOLL_TRAP is not set
-CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_RIONET=m
-CONFIG_RIONET_TX_SIZE=128
-CONFIG_RIONET_RX_SIZE=128
-CONFIG_TUN=m
-CONFIG_VETH=m
-CONFIG_VIRTIO_NET=m
-CONFIG_NLMON=m
-CONFIG_SUNGEM_PHY=m
-# CONFIG_ARCNET is not set
-CONFIG_ATM_DRIVERS=y
-# CONFIG_ATM_DUMMY is not set
-CONFIG_ATM_TCP=m
-CONFIG_ATM_LANAI=m
-CONFIG_ATM_ENI=m
-# CONFIG_ATM_ENI_DEBUG is not set
-# CONFIG_ATM_ENI_TUNE_BURST is not set
-CONFIG_ATM_FIRESTREAM=m
-CONFIG_ATM_ZATM=m
-# CONFIG_ATM_ZATM_DEBUG is not set
-CONFIG_ATM_NICSTAR=m
-# CONFIG_ATM_NICSTAR_USE_SUNI is not set
-# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
-CONFIG_ATM_IDT77252=m
-# CONFIG_ATM_IDT77252_DEBUG is not set
-# CONFIG_ATM_IDT77252_RCV_ALL is not set
-CONFIG_ATM_IDT77252_USE_SUNI=y
-CONFIG_ATM_AMBASSADOR=m
-# CONFIG_ATM_AMBASSADOR_DEBUG is not set
-CONFIG_ATM_HORIZON=m
-# CONFIG_ATM_HORIZON_DEBUG is not set
-CONFIG_ATM_IA=m
-# CONFIG_ATM_IA_DEBUG is not set
-CONFIG_ATM_FORE200E=m
-# CONFIG_ATM_FORE200E_USE_TASKLET is not set
-CONFIG_ATM_FORE200E_TX_RETRY=16
-CONFIG_ATM_FORE200E_DEBUG=0
-CONFIG_ATM_HE=m
-# CONFIG_ATM_HE_USE_SUNI is not set
-CONFIG_ATM_SOLOS=m
-
-#
-# CAIF transport drivers
-#
-CONFIG_CAIF_TTY=m
-CONFIG_CAIF_SPI_SLAVE=m
-CONFIG_CAIF_SPI_SYNC=y
-CONFIG_CAIF_HSI=m
-CONFIG_CAIF_VIRTIO=m
-CONFIG_VHOST_NET=m
-CONFIG_VHOST_SCSI=m
-CONFIG_VHOST_RING=m
-CONFIG_VHOST=m
-
-#
-# Distributed Switch Architecture drivers
-#
-CONFIG_NET_DSA_MV88E6XXX=m
-CONFIG_NET_DSA_MV88E6060=m
-CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y
-CONFIG_NET_DSA_MV88E6131=m
-CONFIG_NET_DSA_MV88E6123_61_65=m
-CONFIG_ETHERNET=y
-CONFIG_MDIO=m
-CONFIG_NET_VENDOR_3COM=y
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_3C589=m
-CONFIG_VORTEX=m
-CONFIG_TYPHOON=m
-CONFIG_NET_VENDOR_ADAPTEC=y
-CONFIG_ADAPTEC_STARFIRE=m
-CONFIG_NET_VENDOR_ALTEON=y
-CONFIG_ACENIC=m
-# CONFIG_ACENIC_OMIT_TIGON_I is not set
-CONFIG_NET_VENDOR_AMD=y
-CONFIG_AMD8111_ETH=m
-CONFIG_PCNET32=m
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_NET_VENDOR_ARC=y
-CONFIG_NET_VENDOR_ATHEROS=y
-CONFIG_ATL2=m
-CONFIG_ATL1=m
-CONFIG_ATL1E=m
-CONFIG_ATL1C=m
-CONFIG_ALX=m
-CONFIG_NET_CADENCE=y
-CONFIG_ARM_AT91_ETHER=m
-CONFIG_MACB=m
-CONFIG_NET_VENDOR_BROADCOM=y
-CONFIG_B44=m
-CONFIG_B44_PCI_AUTOSELECT=y
-CONFIG_B44_PCICORE_AUTOSELECT=y
-CONFIG_B44_PCI=y
-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
-CONFIG_NET_VENDOR_CHELSIO=y
-CONFIG_CHELSIO_T1=m
-CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T3=m
-CONFIG_CHELSIO_T4=m
-CONFIG_CHELSIO_T4VF=m
-CONFIG_NET_VENDOR_CISCO=y
-CONFIG_ENIC=m
-CONFIG_DNET=m
-CONFIG_NET_VENDOR_DEC=y
-CONFIG_NET_TULIP=y
-CONFIG_DE2104X=m
-CONFIG_DE2104X_DSL=0
-CONFIG_TULIP=m
-# CONFIG_TULIP_MWI is not set
-# CONFIG_TULIP_MMIO is not set
-# CONFIG_TULIP_NAPI is not set
-CONFIG_DE4X5=m
-CONFIG_WINBOND_840=m
-CONFIG_DM9102=m
-CONFIG_ULI526X=m
-CONFIG_PCMCIA_XIRCOM=m
-CONFIG_NET_VENDOR_DLINK=y
-CONFIG_DL2K=m
-CONFIG_SUNDANCE=m
-# CONFIG_SUNDANCE_MMIO is not set
-CONFIG_NET_VENDOR_EMULEX=y
-CONFIG_BE2NET=m
-CONFIG_NET_VENDOR_EXAR=y
-CONFIG_S2IO=m
-CONFIG_VXGE=m
-# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
-CONFIG_NET_VENDOR_FUJITSU=y
-CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_NET_VENDOR_HP=y
-CONFIG_HP100=m
-CONFIG_NET_VENDOR_INTEL=y
-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
-CONFIG_IXGBE=m
-CONFIG_IXGBE_HWMON=y
-CONFIG_IXGBE_DCA=y
-CONFIG_IXGBEVF=m
-CONFIG_NET_VENDOR_I825XX=y
-CONFIG_IP1000=m
-CONFIG_JME=m
-CONFIG_NET_VENDOR_MARVELL=y
-CONFIG_MVMDIO=m
-CONFIG_SKGE=m
-# CONFIG_SKGE_DEBUG is not set
-CONFIG_SKGE_GENESIS=y
-CONFIG_SKY2=m
-# CONFIG_SKY2_DEBUG is not set
-CONFIG_NET_VENDOR_MELLANOX=y
-CONFIG_MLX4_EN=m
-CONFIG_MLX4_CORE=m
-CONFIG_MLX4_DEBUG=y
-# CONFIG_MLX5_CORE is not set
-CONFIG_NET_VENDOR_MICREL=y
-CONFIG_KS8842=m
-# CONFIG_KS8851 is not set
-CONFIG_KS8851_MLL=m
-CONFIG_KSZ884X_PCI=m
-CONFIG_NET_VENDOR_MICROCHIP=y
-# CONFIG_ENC28J60 is not set
-CONFIG_NET_VENDOR_MYRI=y
-CONFIG_MYRI10GE=m
-CONFIG_MYRI10GE_DCA=y
-CONFIG_FEALNX=m
-CONFIG_NET_VENDOR_NATSEMI=y
-CONFIG_NATSEMI=m
-CONFIG_NS83820=m
-CONFIG_NET_VENDOR_8390=y
-CONFIG_PCMCIA_AXNET=m
-CONFIG_NE2K_PCI=m
-CONFIG_PCMCIA_PCNET=m
-CONFIG_NET_VENDOR_NVIDIA=y
-CONFIG_FORCEDETH=m
-CONFIG_NET_VENDOR_OKI=y
-CONFIG_PCH_GBE=m
-CONFIG_ETHOC=m
-CONFIG_NET_PACKET_ENGINE=y
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_NET_VENDOR_QLOGIC=y
-CONFIG_QLA3XXX=m
-CONFIG_QLCNIC=m
-CONFIG_QLCNIC_SRIOV=y
-CONFIG_QLGE=m
-CONFIG_NETXEN_NIC=m
-CONFIG_NET_VENDOR_REALTEK=y
-CONFIG_ATP=m
-CONFIG_8139CP=m
-CONFIG_8139TOO=m
-# CONFIG_8139TOO_PIO is not set
-CONFIG_8139TOO_TUNE_TWISTER=y
-CONFIG_8139TOO_8129=y
-# CONFIG_8139_OLD_RX_RESET is not set
-CONFIG_R8169=m
-CONFIG_SH_ETH=m
-CONFIG_NET_VENDOR_RDC=y
-CONFIG_R6040=m
-CONFIG_NET_VENDOR_SEEQ=y
-CONFIG_NET_VENDOR_SILAN=y
-CONFIG_SC92031=m
-CONFIG_NET_VENDOR_SIS=y
-CONFIG_SIS900=m
-CONFIG_SIS190=m
-CONFIG_SFC=m
-CONFIG_SFC_MTD=y
-CONFIG_SFC_MCDI_MON=y
-CONFIG_SFC_SRIOV=y
-CONFIG_NET_VENDOR_SMSC=y
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_EPIC100=m
-CONFIG_SMSC911X=m
-# CONFIG_SMSC911X_ARCH_HOOKS is not set
-CONFIG_SMSC9420=m
-CONFIG_NET_VENDOR_STMICRO=y
-CONFIG_STMMAC_ETH=m
-# CONFIG_STMMAC_PLATFORM is not set
-CONFIG_STMMAC_PCI=y
-# CONFIG_STMMAC_DEBUG_FS is not set
-# CONFIG_STMMAC_DA is not set
-CONFIG_NET_VENDOR_SUN=y
-CONFIG_HAPPYMEAL=m
-CONFIG_SUNGEM=m
-CONFIG_CASSINI=m
-CONFIG_NIU=m
-CONFIG_NET_VENDOR_TEHUTI=y
-CONFIG_TEHUTI=m
-CONFIG_NET_VENDOR_TI=y
-CONFIG_TLAN=m
-CONFIG_NET_VENDOR_VIA=y
-CONFIG_VIA_RHINE=m
-# CONFIG_VIA_RHINE_MMIO is not set
-CONFIG_VIA_VELOCITY=m
-CONFIG_NET_VENDOR_WIZNET=y
-CONFIG_WIZNET_W5100=m
-CONFIG_WIZNET_W5300=m
-# CONFIG_WIZNET_BUS_DIRECT is not set
-# CONFIG_WIZNET_BUS_INDIRECT is not set
-CONFIG_WIZNET_BUS_ANY=y
-CONFIG_NET_VENDOR_XIRCOM=y
-CONFIG_PCMCIA_XIRC2PS=m
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-CONFIG_NET_SB1000=m
-CONFIG_PHYLIB=m
-
-#
-# MII PHY device drivers
-#
-CONFIG_AT803X_PHY=m
-CONFIG_AMD_PHY=m
-CONFIG_MARVELL_PHY=m
-CONFIG_DAVICOM_PHY=m
-CONFIG_QSEMI_PHY=m
-CONFIG_LXT_PHY=m
-CONFIG_CICADA_PHY=m
-CONFIG_VITESSE_PHY=m
-CONFIG_SMSC_PHY=m
-CONFIG_BROADCOM_PHY=m
-CONFIG_BCM87XX_PHY=m
-CONFIG_ICPLUS_PHY=m
-CONFIG_REALTEK_PHY=m
-CONFIG_NATIONAL_PHY=m
-CONFIG_STE10XP=m
-CONFIG_LSI_ET1011C_PHY=m
-CONFIG_MICREL_PHY=m
-CONFIG_MDIO_BITBANG=m
-# CONFIG_MDIO_GPIO is not set
-# CONFIG_MICREL_KS8995MA is not set
-CONFIG_PLIP=m
-CONFIG_PPP=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_MPPE=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPPOATM=m
-CONFIG_PPPOE=m
-CONFIG_PPTP=m
-CONFIG_PPPOL2TP=m
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_SLIP=m
-CONFIG_SLHC=m
-# CONFIG_SLIP_COMPRESSED is not set
-# CONFIG_SLIP_SMART is not set
-# CONFIG_SLIP_MODE_SLIP6 is not set
-
-#
-# USB Network Adapters
-#
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_RTL8152=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
-CONFIG_USB_NET_CDC_MBIM=m
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_SMSC75XX=m
-CONFIG_USB_NET_SMSC95XX=m
-CONFIG_USB_NET_GL620A=m
-CONFIG_USB_NET_NET1080=m
-CONFIG_USB_NET_PLUSB=m
-CONFIG_USB_NET_MCS7830=m
-CONFIG_USB_NET_RNDIS_HOST=m
-CONFIG_USB_NET_CDC_SUBSET=m
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-CONFIG_USB_BELKIN=y
-CONFIG_USB_ARMLINUX=y
-CONFIG_USB_EPSON2888=y
-CONFIG_USB_KC2190=y
-CONFIG_USB_NET_ZAURUS=m
-CONFIG_USB_NET_CX82310_ETH=m
-CONFIG_USB_NET_KALMIA=m
-CONFIG_USB_NET_QMI_WWAN=m
-CONFIG_USB_HSO=m
-CONFIG_USB_NET_INT51X1=m
-CONFIG_USB_CDC_PHONET=m
-CONFIG_USB_IPHETH=m
-CONFIG_USB_SIERRA_NET=m
-CONFIG_USB_VL600=m
-CONFIG_WLAN=y
-CONFIG_PCMCIA_RAYCS=m
-CONFIG_LIBERTAS_THINFIRM=m
-# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
-CONFIG_LIBERTAS_THINFIRM_USB=m
-CONFIG_AIRO=m
-CONFIG_ATMEL=m
-CONFIG_PCI_ATMEL=m
-CONFIG_PCMCIA_ATMEL=m
-CONFIG_AT76C50X_USB=m
-CONFIG_AIRO_CS=m
-CONFIG_PCMCIA_WL3501=m
-CONFIG_PRISM54=m
-CONFIG_USB_ZD1201=m
-CONFIG_USB_NET_RNDIS_WLAN=m
-CONFIG_RTL8180=m
-CONFIG_RTL8187=m
-CONFIG_RTL8187_LEDS=y
-CONFIG_ADM8211=m
-# CONFIG_MAC80211_HWSIM is not set
-CONFIG_MWL8K=m
-CONFIG_ATH_COMMON=m
-CONFIG_ATH_CARDS=m
-# CONFIG_ATH_DEBUG is not set
-CONFIG_ATH5K=m
-# CONFIG_ATH5K_DEBUG is not set
-# CONFIG_ATH5K_TRACER is not set
-CONFIG_ATH5K_PCI=y
-CONFIG_ATH9K_HW=m
-CONFIG_ATH9K_COMMON=m
-CONFIG_ATH9K_BTCOEX_SUPPORT=y
-CONFIG_ATH9K=m
-CONFIG_ATH9K_PCI=y
-CONFIG_ATH9K_AHB=y
-# CONFIG_ATH9K_DEBUGFS is not set
-# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set
-CONFIG_ATH9K_HTC=m
-# CONFIG_ATH9K_HTC_DEBUGFS is not set
-CONFIG_CARL9170=m
-CONFIG_CARL9170_LEDS=y
-CONFIG_CARL9170_WPC=y
-# CONFIG_CARL9170_HWRNG is not set
-CONFIG_ATH6KL=m
-CONFIG_ATH6KL_SDIO=m
-CONFIG_ATH6KL_USB=m
-# CONFIG_ATH6KL_DEBUG is not set
-# CONFIG_ATH6KL_TRACING is not set
-CONFIG_AR5523=m
-CONFIG_WIL6210=m
-CONFIG_WIL6210_ISR_COR=y
-# CONFIG_WIL6210_TRACING is not set
-CONFIG_ATH10K=m
-CONFIG_ATH10K_PCI=m
-# CONFIG_ATH10K_DEBUG is not set
-CONFIG_ATH10K_DEBUGFS=y
-# CONFIG_ATH10K_TRACING is not set
-CONFIG_B43=m
-CONFIG_B43_BCMA=y
-CONFIG_B43_SSB=y
-CONFIG_B43_PCI_AUTOSELECT=y
-CONFIG_B43_PCICORE_AUTOSELECT=y
-CONFIG_B43_PCMCIA=y
-CONFIG_B43_SDIO=y
-CONFIG_B43_BCMA_PIO=y
-CONFIG_B43_PIO=y
-CONFIG_B43_PHY_N=y
-CONFIG_B43_PHY_LP=y
-CONFIG_B43_PHY_HT=y
-CONFIG_B43_LEDS=y
-CONFIG_B43_HWRNG=y
-# CONFIG_B43_DEBUG is not set
-CONFIG_B43LEGACY=m
-CONFIG_B43LEGACY_PCI_AUTOSELECT=y
-CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
-CONFIG_B43LEGACY_LEDS=y
-CONFIG_B43LEGACY_HWRNG=y
-# CONFIG_B43LEGACY_DEBUG is not set
-CONFIG_B43LEGACY_DMA=y
-CONFIG_B43LEGACY_PIO=y
-CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
-# CONFIG_B43LEGACY_DMA_MODE is not set
-# CONFIG_B43LEGACY_PIO_MODE is not set
-CONFIG_BRCMUTIL=m
-CONFIG_BRCMSMAC=m
-CONFIG_BRCMFMAC=m
-CONFIG_BRCMFMAC_SDIO=y
-CONFIG_BRCMFMAC_USB=y
-# CONFIG_BRCM_TRACING is not set
-# CONFIG_BRCMDBG is not set
-CONFIG_HOSTAP=m
-CONFIG_HOSTAP_FIRMWARE=y
-# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
-CONFIG_HOSTAP_PLX=m
-CONFIG_HOSTAP_PCI=m
-CONFIG_HOSTAP_CS=m
-# CONFIG_IPW2100 is not set
-# CONFIG_IPW2200 is not set
-CONFIG_IWLWIFI=m
-CONFIG_IWLDVM=m
-CONFIG_IWLMVM=m
-CONFIG_IWLWIFI_OPMODE_MODULAR=y
-
-#
-# Debugging Options
-#
-# CONFIG_IWLWIFI_DEBUG is not set
-CONFIG_IWLWIFI_DEVICE_TRACING=y
-# CONFIG_IWLWIFI_P2P is not set
-CONFIG_IWLEGACY=m
-CONFIG_IWL4965=m
-CONFIG_IWL3945=m
-
-#
-# iwl3945 / iwl4965 Debugging Options
-#
-# CONFIG_IWLEGACY_DEBUG is not set
-CONFIG_LIBERTAS=m
-CONFIG_LIBERTAS_USB=m
-CONFIG_LIBERTAS_CS=m
-CONFIG_LIBERTAS_SDIO=m
-# CONFIG_LIBERTAS_SPI is not set
-# CONFIG_LIBERTAS_DEBUG is not set
-CONFIG_LIBERTAS_MESH=y
-CONFIG_HERMES=m
-CONFIG_HERMES_PRISM=y
-CONFIG_HERMES_CACHE_FW_ON_INIT=y
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_NORTEL_HERMES=m
-CONFIG_PCI_HERMES=m
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA_SPECTRUM=m
-CONFIG_ORINOCO_USB=m
-CONFIG_P54_COMMON=m
-CONFIG_P54_USB=m
-CONFIG_P54_PCI=m
-# CONFIG_P54_SPI is not set
-CONFIG_P54_LEDS=y
-CONFIG_RT2X00=m
-CONFIG_RT2400PCI=m
-CONFIG_RT2500PCI=m
-CONFIG_RT61PCI=m
-CONFIG_RT2800PCI=m
-CONFIG_RT2800PCI_RT33XX=y
-CONFIG_RT2800PCI_RT35XX=y
-CONFIG_RT2800PCI_RT53XX=y
-CONFIG_RT2800PCI_RT3290=y
-CONFIG_RT2500USB=m
-CONFIG_RT73USB=m
-CONFIG_RT2800USB=m
-CONFIG_RT2800USB_RT33XX=y
-CONFIG_RT2800USB_RT35XX=y
-CONFIG_RT2800USB_RT53XX=y
-CONFIG_RT2800USB_RT55XX=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
-CONFIG_RT2X00_LIB_FIRMWARE=y
-CONFIG_RT2X00_LIB_CRYPTO=y
-CONFIG_RT2X00_LIB_LEDS=y
-# CONFIG_RT2X00_DEBUG is not set
-CONFIG_RTL_CARDS=m
-CONFIG_RTL8192CE=m
-CONFIG_RTL8192SE=m
-CONFIG_RTL8192DE=m
-CONFIG_RTL8723AE=m
-CONFIG_RTL8188EE=m
-CONFIG_RTL8192CU=m
-CONFIG_RTLWIFI=m
-CONFIG_RTLWIFI_PCI=m
-CONFIG_RTLWIFI_USB=m
-# CONFIG_RTLWIFI_DEBUG is not set
-CONFIG_RTL8192C_COMMON=m
-CONFIG_WL_TI=y
-CONFIG_WL1251=m
-# CONFIG_WL1251_SPI is not set
-CONFIG_WL1251_SDIO=m
-CONFIG_WL12XX=m
-CONFIG_WL18XX=m
-CONFIG_WLCORE=m
-# CONFIG_WLCORE_SPI is not set
-CONFIG_WLCORE_SDIO=m
-CONFIG_WILINK_PLATFORM_DATA=y
-CONFIG_ZD1211RW=m
-# CONFIG_ZD1211RW_DEBUG is not set
-CONFIG_MWIFIEX=m
-CONFIG_MWIFIEX_SDIO=m
-CONFIG_MWIFIEX_PCIE=m
-CONFIG_MWIFIEX_USB=m
-CONFIG_CW1200=m
-CONFIG_CW1200_WLAN_SDIO=m
-CONFIG_CW1200_WLAN_SPI=m
-
-#
-# WiMAX Wireless Broadband devices
-#
-CONFIG_WIMAX_I2400M=m
-CONFIG_WIMAX_I2400M_USB=m
-CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
-# CONFIG_WAN is not set
-CONFIG_IEEE802154_DRIVERS=m
-CONFIG_IEEE802154_FAKEHARD=m
-CONFIG_IEEE802154_FAKELB=m
-CONFIG_IEEE802154_AT86RF230=m
-# CONFIG_IEEE802154_MRF24J40 is not set
-CONFIG_XEN_NETDEV_FRONTEND=m
-CONFIG_XEN_NETDEV_BACKEND=m
-CONFIG_VMXNET3=m
-CONFIG_HYPERV_NET=m
-CONFIG_ISDN=y
-CONFIG_ISDN_I4L=m
-CONFIG_ISDN_PPP=y
-CONFIG_ISDN_PPP_VJ=y
-CONFIG_ISDN_MPP=y
-CONFIG_IPPP_FILTER=y
-CONFIG_ISDN_PPP_BSDCOMP=m
-CONFIG_ISDN_AUDIO=y
-CONFIG_ISDN_TTY_FAX=y
-
-#
-# ISDN feature submodules
-#
-CONFIG_ISDN_DIVERSION=m
-
-#
-# ISDN4Linux hardware drivers
-#
-
-#
-# Passive cards
-#
-CONFIG_ISDN_DRV_HISAX=m
-
-#
-# D-channel protocol features
-#
-CONFIG_HISAX_EURO=y
-CONFIG_DE_AOC=y
-# CONFIG_HISAX_NO_SENDCOMPLETE is not set
-# CONFIG_HISAX_NO_LLC is not set
-# CONFIG_HISAX_NO_KEYPAD is not set
-CONFIG_HISAX_1TR6=y
-CONFIG_HISAX_NI1=y
-CONFIG_HISAX_MAX_CARDS=8
-
-#
-# HiSax supported cards
-#
-CONFIG_HISAX_16_3=y
-CONFIG_HISAX_TELESPCI=y
-CONFIG_HISAX_S0BOX=y
-CONFIG_HISAX_FRITZPCI=y
-CONFIG_HISAX_AVM_A1_PCMCIA=y
-CONFIG_HISAX_ELSA=y
-CONFIG_HISAX_DIEHLDIVA=y
-CONFIG_HISAX_SEDLBAUER=y
-CONFIG_HISAX_NETJET=y
-CONFIG_HISAX_NETJET_U=y
-CONFIG_HISAX_NICCY=y
-CONFIG_HISAX_BKM_A4T=y
-CONFIG_HISAX_SCT_QUADRO=y
-CONFIG_HISAX_GAZEL=y
-CONFIG_HISAX_HFC_PCI=y
-CONFIG_HISAX_W6692=y
-CONFIG_HISAX_HFC_SX=y
-CONFIG_HISAX_ENTERNOW_PCI=y
-# CONFIG_HISAX_DEBUG is not set
-
-#
-# HiSax PCMCIA card service modules
-#
-CONFIG_HISAX_SEDLBAUER_CS=m
-CONFIG_HISAX_ELSA_CS=m
-CONFIG_HISAX_AVM_A1_CS=m
-CONFIG_HISAX_TELES_CS=m
-
-#
-# HiSax sub driver modules
-#
-CONFIG_HISAX_ST5481=m
-CONFIG_HISAX_HFCUSB=m
-CONFIG_HISAX_HFC4S8S=m
-CONFIG_HISAX_FRITZ_PCIPNP=m
-
-#
-# Active cards
-#
-CONFIG_ISDN_CAPI=m
-CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
-CONFIG_CAPI_TRACE=y
-CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_ISDN_CAPI_CAPI20=m
-CONFIG_ISDN_CAPI_CAPIDRV=m
-
-#
-# CAPI hardware drivers
-#
-CONFIG_CAPI_AVM=y
-CONFIG_ISDN_DRV_AVMB1_B1PCI=m
-CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
-CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
-CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
-CONFIG_ISDN_DRV_AVMB1_T1PCI=m
-CONFIG_ISDN_DRV_AVMB1_C4=m
-CONFIG_CAPI_EICON=y
-CONFIG_ISDN_DIVAS=m
-CONFIG_ISDN_DIVAS_BRIPCI=y
-CONFIG_ISDN_DIVAS_PRIPCI=y
-CONFIG_ISDN_DIVAS_DIVACAPI=m
-CONFIG_ISDN_DIVAS_USERIDI=m
-CONFIG_ISDN_DIVAS_MAINT=m
-CONFIG_ISDN_DRV_GIGASET=m
-CONFIG_GIGASET_CAPI=y
-# CONFIG_GIGASET_I4L is not set
-# CONFIG_GIGASET_DUMMYLL is not set
-CONFIG_GIGASET_BASE=m
-CONFIG_GIGASET_M105=m
-CONFIG_GIGASET_M101=m
-# CONFIG_GIGASET_DEBUG is not set
-CONFIG_HYSDN=m
-CONFIG_HYSDN_CAPI=y
-CONFIG_MISDN=m
-CONFIG_MISDN_DSP=m
-CONFIG_MISDN_L1OIP=m
-
-#
-# mISDN hardware drivers
-#
-CONFIG_MISDN_HFCPCI=m
-CONFIG_MISDN_HFCMULTI=m
-CONFIG_MISDN_HFCUSB=m
-CONFIG_MISDN_AVMFRITZ=m
-CONFIG_MISDN_SPEEDFAX=m
-CONFIG_MISDN_INFINEON=m
-CONFIG_MISDN_W6692=m
-CONFIG_MISDN_NETJET=m
-CONFIG_MISDN_IPAC=m
-CONFIG_MISDN_ISAR=m
-CONFIG_ISDN_HDLC=m
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-CONFIG_INPUT_FF_MEMLESS=m
-CONFIG_INPUT_POLLDEV=m
-CONFIG_INPUT_SPARSEKMAP=m
-CONFIG_INPUT_MATRIXKMAP=m
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_JOYDEV=m
-CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_KEYBOARD_ADP5588=m
-CONFIG_KEYBOARD_ADP5589=m
-CONFIG_KEYBOARD_ATKBD=y
-CONFIG_KEYBOARD_QT1070=m
-CONFIG_KEYBOARD_QT2160=m
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_GPIO is not set
-# CONFIG_KEYBOARD_GPIO_POLLED is not set
-CONFIG_KEYBOARD_TCA6416=m
-CONFIG_KEYBOARD_TCA8418=m
-CONFIG_KEYBOARD_MATRIX=m
-# CONFIG_KEYBOARD_LM8323 is not set
-CONFIG_KEYBOARD_LM8333=m
-# CONFIG_KEYBOARD_MAX7359 is not set
-CONFIG_KEYBOARD_MCS=m
-CONFIG_KEYBOARD_MPR121=m
-# CONFIG_KEYBOARD_NEWTON is not set
-# CONFIG_KEYBOARD_OPENCORES is not set
-# CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-CONFIG_INPUT_MOUSE=y
-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
-CONFIG_MOUSE_PS2_SENTELIC=y
-# CONFIG_MOUSE_PS2_TOUCHKIT is not set
-CONFIG_MOUSE_SERIAL=y
-CONFIG_MOUSE_APPLETOUCH=m
-CONFIG_MOUSE_BCM5974=m
-CONFIG_MOUSE_CYAPA=m
-CONFIG_MOUSE_VSXXXAA=m
-# CONFIG_MOUSE_GPIO is not set
-CONFIG_MOUSE_SYNAPTICS_I2C=m
-CONFIG_MOUSE_SYNAPTICS_USB=m
-CONFIG_INPUT_JOYSTICK=y
-CONFIG_JOYSTICK_ANALOG=m
-CONFIG_JOYSTICK_A3D=m
-CONFIG_JOYSTICK_ADI=m
-CONFIG_JOYSTICK_COBRA=m
-CONFIG_JOYSTICK_GF2K=m
-CONFIG_JOYSTICK_GRIP=m
-CONFIG_JOYSTICK_GRIP_MP=m
-CONFIG_JOYSTICK_GUILLEMOT=m
-CONFIG_JOYSTICK_INTERACT=m
-CONFIG_JOYSTICK_SIDEWINDER=m
-CONFIG_JOYSTICK_TMDC=m
-CONFIG_JOYSTICK_IFORCE=m
-CONFIG_JOYSTICK_IFORCE_USB=y
-CONFIG_JOYSTICK_IFORCE_232=y
-CONFIG_JOYSTICK_WARRIOR=m
-CONFIG_JOYSTICK_MAGELLAN=m
-CONFIG_JOYSTICK_SPACEORB=m
-CONFIG_JOYSTICK_SPACEBALL=m
-CONFIG_JOYSTICK_STINGER=m
-CONFIG_JOYSTICK_TWIDJOY=m
-CONFIG_JOYSTICK_ZHENHUA=m
-CONFIG_JOYSTICK_DB9=m
-CONFIG_JOYSTICK_GAMECON=m
-CONFIG_JOYSTICK_TURBOGRAFX=m
-CONFIG_JOYSTICK_AS5011=m
-CONFIG_JOYSTICK_JOYDUMP=m
-CONFIG_JOYSTICK_XPAD=m
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-CONFIG_JOYSTICK_WALKERA0701=m
-CONFIG_INPUT_TABLET=y
-CONFIG_TABLET_USB_ACECAD=m
-CONFIG_TABLET_USB_AIPTEK=m
-CONFIG_TABLET_USB_GTCO=m
-CONFIG_TABLET_USB_HANWANG=m
-CONFIG_TABLET_USB_KBTAB=m
-CONFIG_TABLET_USB_WACOM=m
-CONFIG_INPUT_TOUCHSCREEN=y
-# CONFIG_TOUCHSCREEN_ADS7846 is not set
-# CONFIG_TOUCHSCREEN_AD7877 is not set
-CONFIG_TOUCHSCREEN_AD7879=m
-CONFIG_TOUCHSCREEN_AD7879_I2C=m
-# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
-CONFIG_TOUCHSCREEN_ATMEL_MXT=m
-CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
-CONFIG_TOUCHSCREEN_BU21013=m
-CONFIG_TOUCHSCREEN_CY8CTMG110=m
-CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
-CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
-# CONFIG_TOUCHSCREEN_CYTTSP_SPI is not set
-CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m
-CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m
-CONFIG_TOUCHSCREEN_CYTTSP4_SPI=m
-CONFIG_TOUCHSCREEN_DYNAPRO=m
-CONFIG_TOUCHSCREEN_HAMPSHIRE=m
-CONFIG_TOUCHSCREEN_EETI=m
-CONFIG_TOUCHSCREEN_FUJITSU=m
-CONFIG_TOUCHSCREEN_ILI210X=m
-CONFIG_TOUCHSCREEN_GUNZE=m
-CONFIG_TOUCHSCREEN_ELO=m
-CONFIG_TOUCHSCREEN_WACOM_W8001=m
-CONFIG_TOUCHSCREEN_WACOM_I2C=m
-CONFIG_TOUCHSCREEN_MAX11801=m
-CONFIG_TOUCHSCREEN_MCS5000=m
-CONFIG_TOUCHSCREEN_MMS114=m
-CONFIG_TOUCHSCREEN_MTOUCH=m
-CONFIG_TOUCHSCREEN_INEXIO=m
-CONFIG_TOUCHSCREEN_MK712=m
-CONFIG_TOUCHSCREEN_PENMOUNT=m
-CONFIG_TOUCHSCREEN_EDT_FT5X06=m
-CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
-CONFIG_TOUCHSCREEN_TOUCHWIN=m
-CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m
-CONFIG_TOUCHSCREEN_UCB1400=m
-CONFIG_TOUCHSCREEN_PIXCIR=m
-CONFIG_TOUCHSCREEN_WM97XX=m
-CONFIG_TOUCHSCREEN_WM9705=y
-CONFIG_TOUCHSCREEN_WM9712=y
-CONFIG_TOUCHSCREEN_WM9713=y
-CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
-CONFIG_TOUCHSCREEN_MC13783=m
-CONFIG_TOUCHSCREEN_USB_EGALAX=y
-CONFIG_TOUCHSCREEN_USB_PANJIT=y
-CONFIG_TOUCHSCREEN_USB_3M=y
-CONFIG_TOUCHSCREEN_USB_ITM=y
-CONFIG_TOUCHSCREEN_USB_ETURBO=y
-CONFIG_TOUCHSCREEN_USB_GUNZE=y
-CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
-CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
-CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
-CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
-CONFIG_TOUCHSCREEN_USB_GOTOP=y
-CONFIG_TOUCHSCREEN_USB_JASTEC=y
-CONFIG_TOUCHSCREEN_USB_ELO=y
-CONFIG_TOUCHSCREEN_USB_E2I=y
-CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
-CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
-CONFIG_TOUCHSCREEN_USB_NEXIO=y
-CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
-CONFIG_TOUCHSCREEN_TOUCHIT213=m
-CONFIG_TOUCHSCREEN_TSC_SERIO=m
-# CONFIG_TOUCHSCREEN_TSC2005 is not set
-CONFIG_TOUCHSCREEN_TSC2007=m
-CONFIG_TOUCHSCREEN_ST1232=m
-CONFIG_TOUCHSCREEN_TPS6507X=m
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_AD714X=m
-CONFIG_INPUT_AD714X_I2C=m
-CONFIG_INPUT_AD714X_SPI=m
-CONFIG_INPUT_BMA150=m
-CONFIG_INPUT_PCSPKR=m
-CONFIG_INPUT_MC13783_PWRBUTTON=m
-CONFIG_INPUT_MMA8450=m
-CONFIG_INPUT_MPU3050=m
-CONFIG_INPUT_APANEL=m
-CONFIG_INPUT_GP2A=m
-# CONFIG_INPUT_GPIO_TILT_POLLED is not set
-CONFIG_INPUT_ATLAS_BTNS=m
-CONFIG_INPUT_ATI_REMOTE2=m
-CONFIG_INPUT_KEYSPAN_REMOTE=m
-CONFIG_INPUT_KXTJ9=m
-# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set
-CONFIG_INPUT_POWERMATE=m
-CONFIG_INPUT_YEALINK=m
-CONFIG_INPUT_CM109=m
-CONFIG_INPUT_RETU_PWRBUTTON=m
-CONFIG_INPUT_UINPUT=m
-CONFIG_INPUT_PCF50633_PMU=m
-CONFIG_INPUT_PCF8574=m
-CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
-CONFIG_INPUT_ADXL34X=m
-CONFIG_INPUT_ADXL34X_I2C=m
-CONFIG_INPUT_ADXL34X_SPI=m
-# CONFIG_INPUT_IMS_PCU is not set
-CONFIG_INPUT_CMA3000=m
-CONFIG_INPUT_CMA3000_I2C=m
-CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m
-
-#
-# Hardware I/O ports
-#
-CONFIG_SERIO=y
-CONFIG_SERIO_I8042=y
-CONFIG_SERIO_SERPORT=m
-CONFIG_SERIO_CT82C710=m
-CONFIG_SERIO_PARKBD=m
-CONFIG_SERIO_PCIPS2=m
-CONFIG_SERIO_LIBPS2=y
-CONFIG_SERIO_RAW=m
-CONFIG_SERIO_ALTERA_PS2=m
-CONFIG_SERIO_PS2MULT=m
-CONFIG_SERIO_ARC_PS2=m
-CONFIG_GAMEPORT=m
-CONFIG_GAMEPORT_NS558=m
-CONFIG_GAMEPORT_L4=m
-CONFIG_GAMEPORT_EMU10K1=m
-CONFIG_GAMEPORT_FM801=m
-
-#
-# Character devices
-#
-CONFIG_TTY=y
-CONFIG_VT=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_VT_CONSOLE=y
-CONFIG_VT_CONSOLE_SLEEP=y
-CONFIG_HW_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_UNIX98_PTYS=y
-CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_SERIAL_NONSTANDARD=y
-CONFIG_ROCKETPORT=m
-CONFIG_CYCLADES=m
-# CONFIG_CYZ_INTR is not set
-# CONFIG_MOXA_INTELLIO is not set
-# CONFIG_MOXA_SMARTIO is not set
-CONFIG_SYNCLINK=m
-CONFIG_SYNCLINKMP=m
-# CONFIG_SYNCLINK_GT is not set
-CONFIG_NOZOMI=m
-# CONFIG_ISI is not set
-CONFIG_N_HDLC=m
-CONFIG_N_GSM=m
-CONFIG_TRACE_ROUTER=m
-CONFIG_TRACE_SINK=m
-# CONFIG_DEVKMEM is not set
-
-#
-# 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
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-# CONFIG_SERIAL_8250_EXTENDED is not set
-CONFIG_SERIAL_8250_DW=m
-
-#
-# Non-8250 serial port support
-#
-# CONFIG_SERIAL_MAX3100 is not set
-# CONFIG_SERIAL_MAX310X is not set
-CONFIG_SERIAL_MFD_HSU=m
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_JSM=m
-CONFIG_SERIAL_SCCNXP=m
-# CONFIG_SERIAL_TIMBERDALE is not set
-CONFIG_SERIAL_ALTERA_JTAGUART=m
-CONFIG_SERIAL_ALTERA_UART=m
-CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
-CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
-# CONFIG_SERIAL_IFX6X60 is not set
-CONFIG_SERIAL_PCH_UART=m
-CONFIG_SERIAL_ARC=m
-CONFIG_SERIAL_ARC_NR_PORTS=1
-CONFIG_SERIAL_RP2=m
-CONFIG_SERIAL_RP2_NR_UARTS=32
-CONFIG_SERIAL_FSL_LPUART=m
-CONFIG_PRINTER=m
-# CONFIG_LP_CONSOLE is not set
-CONFIG_PPDEV=m
-CONFIG_HVC_DRIVER=y
-CONFIG_HVC_IRQ=y
-CONFIG_HVC_XEN=y
-CONFIG_HVC_XEN_FRONTEND=y
-CONFIG_VIRTIO_CONSOLE=m
-CONFIG_IPMI_HANDLER=m
-# CONFIG_IPMI_PANIC_EVENT is not set
-CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_SI=m
-CONFIG_IPMI_WATCHDOG=m
-CONFIG_IPMI_POWEROFF=m
-CONFIG_HW_RANDOM=y
-CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_INTEL=m
-CONFIG_HW_RANDOM_AMD=m
-CONFIG_HW_RANDOM_VIA=m
-CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_HW_RANDOM_TPM=m
-CONFIG_NVRAM=m
-CONFIG_R3964=m
-CONFIG_APPLICOM=m
-
-#
-# PCMCIA character devices
-#
-CONFIG_SYNCLINK_CS=m
-CONFIG_CARDMAN_4000=m
-CONFIG_CARDMAN_4040=m
-CONFIG_IPWIRELESS=m
-CONFIG_MWAVE=m
-# CONFIG_RAW_DRIVER is not set
-CONFIG_HPET=y
-CONFIG_HPET_MMAP=y
-CONFIG_HANGCHECK_TIMER=m
-CONFIG_TCG_TPM=m
-CONFIG_TCG_TIS=m
-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
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
-CONFIG_I2C_CHARDEV=m
-# CONFIG_I2C_MUX is not set
-CONFIG_I2C_HELPER_AUTO=y
-CONFIG_I2C_SMBUS=m
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_ALGOPCA=m
-
-#
-# I2C Hardware Bus support
-#
-
-#
-# PC SMBus host controller drivers
-#
-CONFIG_I2C_ALI1535=m
-CONFIG_I2C_ALI1563=m
-CONFIG_I2C_ALI15X3=m
-CONFIG_I2C_AMD756=m
-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
-CONFIG_I2C_SIS5595=m
-CONFIG_I2C_SIS630=m
-CONFIG_I2C_SIS96X=m
-CONFIG_I2C_VIA=m
-CONFIG_I2C_VIAPRO=m
-
-#
-# ACPI drivers
-#
-CONFIG_I2C_SCMI=m
-
-#
-# I2C system bus drivers (mostly embedded / system-on-chip)
-#
-# CONFIG_I2C_CBUS_GPIO is not set
-CONFIG_I2C_DESIGNWARE_CORE=m
-CONFIG_I2C_DESIGNWARE_PCI=m
-CONFIG_I2C_EG20T=m
-# CONFIG_I2C_GPIO is not set
-CONFIG_I2C_OCORES=m
-CONFIG_I2C_PCA_PLATFORM=m
-# CONFIG_I2C_PXA_PCI is not set
-CONFIG_I2C_SIMTEC=m
-CONFIG_I2C_XILINX=m
-
-#
-# External I2C/SMBus adapter drivers
-#
-CONFIG_I2C_DIOLAN_U2C=m
-CONFIG_I2C_PARPORT=m
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_TAOS_EVM=m
-CONFIG_I2C_TINY_USB=m
-CONFIG_I2C_VIPERBOARD=m
-
-#
-# Other I2C/SMBus bus drivers
-#
-# CONFIG_I2C_STUB is not set
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-CONFIG_SPI=y
-# CONFIG_SPI_DEBUG is not set
-CONFIG_SPI_MASTER=y
-
-#
-# SPI Master Controller Drivers
-#
-# CONFIG_SPI_ALTERA is not set
-# CONFIG_SPI_BITBANG is not set
-# CONFIG_SPI_BUTTERFLY is not set
-# CONFIG_SPI_GPIO is not set
-# CONFIG_SPI_LM70_LLP is not set
-# CONFIG_SPI_OC_TINY is not set
-CONFIG_SPI_PXA2XX_DMA=y
-CONFIG_SPI_PXA2XX=m
-CONFIG_SPI_PXA2XX_PCI=m
-# CONFIG_SPI_SC18IS602 is not set
-# CONFIG_SPI_TOPCLIFF_PCH is not set
-# CONFIG_SPI_XCOMM is not set
-# CONFIG_SPI_XILINX is not set
-# CONFIG_SPI_DESIGNWARE is not set
-
-#
-# SPI Protocol Masters
-#
-# CONFIG_SPI_SPIDEV is not set
-# CONFIG_SPI_TLE62X0 is not set
-# CONFIG_HSI is not set
-
-#
-# PPS support
-#
-CONFIG_PPS=m
-# CONFIG_PPS_DEBUG is not set
-
-#
-# PPS clients support
-#
-CONFIG_PPS_CLIENT_KTIMER=m
-CONFIG_PPS_CLIENT_LDISC=m
-CONFIG_PPS_CLIENT_PARPORT=m
-CONFIG_PPS_CLIENT_GPIO=m
-
-#
-# PPS generators support
-#
-
-#
-# PTP clock support
-#
-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_GPIO_ACPI=y
-# CONFIG_DEBUG_GPIO is not set
-CONFIG_GPIO_SYSFS=y
-
-#
-# Memory mapped GPIO drivers:
-#
-# CONFIG_GPIO_GENERIC_PLATFORM is not set
-# CONFIG_GPIO_IT8761E is not set
-# CONFIG_GPIO_TS5500 is not set
-CONFIG_GPIO_SCH=m
-CONFIG_GPIO_ICH=m
-# CONFIG_GPIO_VX855 is not set
-# CONFIG_GPIO_LYNXPOINT is not set
-
-#
-# I2C GPIO expanders:
-#
-CONFIG_GPIO_ARIZONA=m
-# CONFIG_GPIO_MAX7300 is not set
-# CONFIG_GPIO_MAX732X is not set
-# CONFIG_GPIO_PCA953X is not set
-# CONFIG_GPIO_PCF857X is not set
-# CONFIG_GPIO_ADP5588 is not set
-
-#
-# PCI GPIO expanders:
-#
-CONFIG_GPIO_CS5535=m
-CONFIG_GPIO_AMD8111=m
-CONFIG_GPIO_LANGWELL=y
-# CONFIG_GPIO_PCH is not set
-# CONFIG_GPIO_ML_IOH is not set
-# CONFIG_GPIO_RDC321X is not set
-
-#
-# SPI GPIO expanders:
-#
-# CONFIG_GPIO_MAX7301 is not set
-# CONFIG_GPIO_MCP23S08 is not set
-# CONFIG_GPIO_MC33880 is not set
-# CONFIG_GPIO_74X164 is not set
-
-#
-# AC97 GPIO expanders:
-#
-CONFIG_GPIO_UCB1400=y
-
-#
-# MODULbus GPIO expanders:
-#
-
-#
-# USB GPIO expanders:
-#
-CONFIG_GPIO_VIPERBOARD=m
-# CONFIG_W1 is not set
-CONFIG_POWER_SUPPLY=y
-# CONFIG_POWER_SUPPLY_DEBUG is not set
-CONFIG_PDA_POWER=m
-CONFIG_TEST_POWER=m
-# CONFIG_BATTERY_DS2780 is not set
-# CONFIG_BATTERY_DS2781 is not set
-# CONFIG_BATTERY_DS2782 is not set
-# CONFIG_BATTERY_SBS is not set
-# CONFIG_BATTERY_BQ27x00 is not set
-# CONFIG_BATTERY_MAX17040 is not set
-# CONFIG_BATTERY_MAX17042 is not set
-# CONFIG_CHARGER_PCF50633 is not set
-# CONFIG_CHARGER_ISP1704 is not set
-# CONFIG_CHARGER_MAX8903 is not set
-# CONFIG_CHARGER_LP8727 is not set
-# 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_AVS=y
-CONFIG_HWMON=y
-CONFIG_HWMON_VID=m
-# CONFIG_HWMON_DEBUG_CHIP is not set
-
-#
-# Native drivers
-#
-CONFIG_SENSORS_ABITUGURU=m
-CONFIG_SENSORS_ABITUGURU3=m
-# CONFIG_SENSORS_AD7314 is not set
-CONFIG_SENSORS_AD7414=m
-CONFIG_SENSORS_AD7418=m
-# CONFIG_SENSORS_ADCXX is not set
-CONFIG_SENSORS_ADM1021=m
-CONFIG_SENSORS_ADM1025=m
-CONFIG_SENSORS_ADM1026=m
-CONFIG_SENSORS_ADM1029=m
-CONFIG_SENSORS_ADM1031=m
-CONFIG_SENSORS_ADM9240=m
-CONFIG_SENSORS_ADT7X10=m
-CONFIG_SENSORS_ADT7310=m
-CONFIG_SENSORS_ADT7410=m
-CONFIG_SENSORS_ADT7411=m
-CONFIG_SENSORS_ADT7462=m
-CONFIG_SENSORS_ADT7470=m
-CONFIG_SENSORS_ADT7475=m
-CONFIG_SENSORS_ASC7621=m
-CONFIG_SENSORS_K8TEMP=m
-CONFIG_SENSORS_K10TEMP=m
-CONFIG_SENSORS_FAM15H_POWER=m
-CONFIG_SENSORS_ASB100=m
-CONFIG_SENSORS_ATXP1=m
-CONFIG_SENSORS_DS620=m
-CONFIG_SENSORS_DS1621=m
-CONFIG_SENSORS_I5K_AMB=m
-CONFIG_SENSORS_F71805F=m
-CONFIG_SENSORS_F71882FG=m
-CONFIG_SENSORS_F75375S=m
-CONFIG_SENSORS_FSCHMD=m
-CONFIG_SENSORS_G760A=m
-CONFIG_SENSORS_G762=m
-CONFIG_SENSORS_GL518SM=m
-CONFIG_SENSORS_GL520SM=m
-# CONFIG_SENSORS_GPIO_FAN is not set
-CONFIG_SENSORS_HIH6130=m
-CONFIG_SENSORS_CORETEMP=m
-CONFIG_SENSORS_IBMAEM=m
-CONFIG_SENSORS_IBMPEX=m
-CONFIG_SENSORS_IT87=m
-CONFIG_SENSORS_JC42=m
-CONFIG_SENSORS_LINEAGE=m
-CONFIG_SENSORS_LM63=m
-# CONFIG_SENSORS_LM70 is not set
-CONFIG_SENSORS_LM73=m
-CONFIG_SENSORS_LM75=m
-CONFIG_SENSORS_LM77=m
-CONFIG_SENSORS_LM78=m
-CONFIG_SENSORS_LM80=m
-CONFIG_SENSORS_LM83=m
-CONFIG_SENSORS_LM85=m
-CONFIG_SENSORS_LM87=m
-CONFIG_SENSORS_LM90=m
-CONFIG_SENSORS_LM92=m
-CONFIG_SENSORS_LM93=m
-CONFIG_SENSORS_LTC4151=m
-CONFIG_SENSORS_LTC4215=m
-CONFIG_SENSORS_LTC4245=m
-CONFIG_SENSORS_LTC4261=m
-CONFIG_SENSORS_LM95234=m
-CONFIG_SENSORS_LM95241=m
-CONFIG_SENSORS_LM95245=m
-# CONFIG_SENSORS_MAX1111 is not set
-CONFIG_SENSORS_MAX16065=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_MAX1668=m
-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_NCT6775=m
-CONFIG_SENSORS_NTC_THERMISTOR=m
-CONFIG_SENSORS_PC87360=m
-CONFIG_SENSORS_PC87427=m
-CONFIG_SENSORS_PCF8591=m
-CONFIG_PMBUS=m
-CONFIG_SENSORS_PMBUS=m
-CONFIG_SENSORS_ADM1275=m
-CONFIG_SENSORS_LM25066=m
-CONFIG_SENSORS_LTC2978=m
-CONFIG_SENSORS_MAX16064=m
-CONFIG_SENSORS_MAX34440=m
-CONFIG_SENSORS_MAX8688=m
-CONFIG_SENSORS_UCD9000=m
-CONFIG_SENSORS_UCD9200=m
-CONFIG_SENSORS_ZL6100=m
-CONFIG_SENSORS_SHT15=m
-CONFIG_SENSORS_SHT21=m
-CONFIG_SENSORS_SIS5595=m
-CONFIG_SENSORS_SMM665=m
-CONFIG_SENSORS_DME1737=m
-CONFIG_SENSORS_EMC1403=m
-CONFIG_SENSORS_EMC2103=m
-CONFIG_SENSORS_EMC6W201=m
-CONFIG_SENSORS_SMSC47M1=m
-CONFIG_SENSORS_SMSC47M192=m
-CONFIG_SENSORS_SMSC47B397=m
-CONFIG_SENSORS_SCH56XX_COMMON=m
-CONFIG_SENSORS_SCH5627=m
-CONFIG_SENSORS_SCH5636=m
-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
-CONFIG_SENSORS_TMP401=m
-CONFIG_SENSORS_TMP421=m
-CONFIG_SENSORS_VIA_CPUTEMP=m
-CONFIG_SENSORS_VIA686A=m
-CONFIG_SENSORS_VT1211=m
-CONFIG_SENSORS_VT8231=m
-CONFIG_SENSORS_W83781D=m
-CONFIG_SENSORS_W83791D=m
-CONFIG_SENSORS_W83792D=m
-CONFIG_SENSORS_W83793=m
-CONFIG_SENSORS_W83795=m
-# CONFIG_SENSORS_W83795_FANCTRL is not set
-CONFIG_SENSORS_W83L785TS=m
-CONFIG_SENSORS_W83L786NG=m
-CONFIG_SENSORS_W83627HF=m
-CONFIG_SENSORS_W83627EHF=m
-CONFIG_SENSORS_APPLESMC=m
-CONFIG_SENSORS_MC13783_ADC=m
-
-#
-# ACPI drivers
-#
-CONFIG_SENSORS_ACPI_POWER=m
-CONFIG_SENSORS_ATK0110=m
-CONFIG_THERMAL=y
-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_THERMAL_GOV_FAIR_SHARE=y
-CONFIG_THERMAL_GOV_STEP_WISE=y
-CONFIG_THERMAL_GOV_USER_SPACE=y
-# CONFIG_CPU_THERMAL is not set
-# CONFIG_THERMAL_EMULATION is not set
-CONFIG_INTEL_POWERCLAMP=m
-CONFIG_X86_PKG_TEMP_THERMAL=m
-
-#
-# Texas Instruments thermal drivers
-#
-CONFIG_WATCHDOG=y
-CONFIG_WATCHDOG_CORE=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-
-#
-# Watchdog Device Drivers
-#
-CONFIG_SOFT_WATCHDOG=m
-CONFIG_RETU_WATCHDOG=m
-CONFIG_ACQUIRE_WDT=m
-CONFIG_ADVANTECH_WDT=m
-CONFIG_ALIM1535_WDT=m
-CONFIG_ALIM7101_WDT=m
-CONFIG_F71808E_WDT=m
-CONFIG_SP5100_TCO=m
-CONFIG_GEODE_WDT=m
-CONFIG_SC520_WDT=m
-CONFIG_SBC_FITPC2_WATCHDOG=m
-CONFIG_EUROTECH_WDT=m
-CONFIG_IB700_WDT=m
-CONFIG_IBMASR=m
-CONFIG_WAFER_WDT=m
-CONFIG_I6300ESB_WDT=m
-CONFIG_IE6XX_WDT=m
-CONFIG_ITCO_WDT=m
-CONFIG_ITCO_VENDOR_SUPPORT=y
-CONFIG_IT8712F_WDT=m
-CONFIG_IT87_WDT=m
-CONFIG_HP_WATCHDOG=m
-CONFIG_HPWDT_NMI_DECODING=y
-CONFIG_SC1200_WDT=m
-CONFIG_PC87413_WDT=m
-CONFIG_NV_TCO=m
-CONFIG_60XX_WDT=m
-CONFIG_SBC8360_WDT=m
-CONFIG_CPU5_WDT=m
-CONFIG_SMSC_SCH311X_WDT=m
-CONFIG_SMSC37B787_WDT=m
-CONFIG_VIA_WDT=m
-CONFIG_W83627HF_WDT=m
-CONFIG_W83697HF_WDT=m
-CONFIG_W83697UG_WDT=m
-CONFIG_W83877F_WDT=m
-CONFIG_W83977F_WDT=m
-CONFIG_MACHZ_WDT=m
-CONFIG_SBC_EPX_C3_WATCHDOG=m
-CONFIG_MEN_A21_WDT=m
-CONFIG_XEN_WDT=m
-
-#
-# PCI-based Watchdog Cards
-#
-CONFIG_PCIPCWATCHDOG=m
-CONFIG_WDTPCI=m
-
-#
-# USB-based Watchdog Cards
-#
-CONFIG_USBPCWATCHDOG=m
-CONFIG_SSB_POSSIBLE=y
-
-#
-# Sonics Silicon Backplane
-#
-CONFIG_SSB=m
-CONFIG_SSB_SPROM=y
-CONFIG_SSB_BLOCKIO=y
-CONFIG_SSB_PCIHOST_POSSIBLE=y
-CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_B43_PCI_BRIDGE=y
-CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
-CONFIG_SSB_PCMCIAHOST=y
-CONFIG_SSB_SDIOHOST_POSSIBLE=y
-CONFIG_SSB_SDIOHOST=y
-# CONFIG_SSB_DEBUG is not set
-CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
-CONFIG_SSB_DRIVER_PCICORE=y
-CONFIG_SSB_DRIVER_GPIO=y
-CONFIG_BCMA_POSSIBLE=y
-
-#
-# Broadcom specific AMBA
-#
-CONFIG_BCMA=m
-CONFIG_BCMA_BLOCKIO=y
-CONFIG_BCMA_HOST_PCI_POSSIBLE=y
-CONFIG_BCMA_HOST_PCI=y
-CONFIG_BCMA_DRIVER_GMAC_CMN=y
-CONFIG_BCMA_DRIVER_GPIO=y
-# CONFIG_BCMA_DEBUG is not set
-
-#
-# Multifunction device drivers
-#
-CONFIG_MFD_CORE=y
-CONFIG_MFD_CS5535=m
-# CONFIG_MFD_CROS_EC is not set
-# CONFIG_MFD_DA9052_SPI is not set
-CONFIG_MFD_MC13783=m
-CONFIG_MFD_MC13XXX=m
-# CONFIG_MFD_MC13XXX_SPI is not set
-CONFIG_MFD_MC13XXX_I2C=m
-CONFIG_HTC_PASIC3=m
-CONFIG_LPC_ICH=m
-CONFIG_LPC_SCH=m
-# CONFIG_MFD_JANZ_CMODIO is not set
-# CONFIG_MFD_KEMPLD is not set
-# CONFIG_EZX_PCAP is not set
-CONFIG_MFD_VIPERBOARD=m
-CONFIG_MFD_RETU=m
-CONFIG_MFD_PCF50633=m
-CONFIG_PCF50633_ADC=m
-CONFIG_PCF50633_GPIO=m
-CONFIG_UCB1400_CORE=m
-CONFIG_MFD_RDC321X=m
-CONFIG_MFD_RTSX_PCI=m
-CONFIG_MFD_SI476X_CORE=m
-CONFIG_MFD_SM501=m
-CONFIG_MFD_SM501_GPIO=y
-CONFIG_ABX500_CORE=y
-# CONFIG_MFD_STMPE is not set
-# CONFIG_MFD_SYSCON is not set
-CONFIG_MFD_TI_AM335X_TSCADC=m
-# CONFIG_TPS6105X is not set
-CONFIG_TPS65010=m
-CONFIG_TPS6507X=m
-CONFIG_MFD_TPS65217=m
-# CONFIG_MFD_TPS65912 is not set
-# CONFIG_MFD_TPS65912_SPI is not set
-CONFIG_MFD_WL1273_CORE=m
-CONFIG_MFD_LM3533=m
-# CONFIG_MFD_TIMBERDALE is not set
-# CONFIG_MFD_TMIO is not set
-CONFIG_MFD_VX855=m
-CONFIG_MFD_ARIZONA=y
-CONFIG_MFD_ARIZONA_I2C=m
-# CONFIG_MFD_ARIZONA_SPI is not set
-CONFIG_MFD_WM5102=y
-CONFIG_MFD_WM5110=y
-# CONFIG_MFD_WM8997 is not set
-# CONFIG_MFD_WM831X_SPI is not set
-# CONFIG_REGULATOR is not set
-CONFIG_MEDIA_SUPPORT=m
-
-#
-# Multimedia core support
-#
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
-CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
-CONFIG_MEDIA_RADIO_SUPPORT=y
-CONFIG_MEDIA_RC_SUPPORT=y
-CONFIG_MEDIA_CONTROLLER=y
-CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L2_SUBDEV_API=y
-CONFIG_VIDEO_V4L2=m
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-CONFIG_VIDEO_TUNER=m
-CONFIG_V4L2_MEM2MEM_DEV=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEOBUF_DVB=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_DMA_CONTIG=m
-CONFIG_VIDEOBUF2_VMALLOC=m
-CONFIG_VIDEOBUF2_DMA_SG=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
-
-#
-# Media drivers
-#
-CONFIG_RC_CORE=m
-CONFIG_RC_MAP=m
-CONFIG_RC_DECODERS=y
-CONFIG_LIRC=m
-CONFIG_IR_LIRC_CODEC=m
-CONFIG_IR_NEC_DECODER=m
-CONFIG_IR_RC5_DECODER=m
-CONFIG_IR_RC6_DECODER=m
-CONFIG_IR_JVC_DECODER=m
-CONFIG_IR_SONY_DECODER=m
-CONFIG_IR_RC5_SZ_DECODER=m
-CONFIG_IR_SANYO_DECODER=m
-CONFIG_IR_MCE_KBD_DECODER=m
-CONFIG_RC_DEVICES=y
-CONFIG_RC_ATI_REMOTE=m
-CONFIG_IR_ENE=m
-CONFIG_IR_IMON=m
-CONFIG_IR_MCEUSB=m
-CONFIG_IR_ITE_CIR=m
-CONFIG_IR_FINTEK=m
-CONFIG_IR_NUVOTON=m
-CONFIG_IR_REDRAT3=m
-CONFIG_IR_STREAMZAP=m
-CONFIG_IR_WINBOND_CIR=m
-CONFIG_IR_IGUANA=m
-CONFIG_IR_TTUSBIR=m
-CONFIG_RC_LOOPBACK=m
-CONFIG_IR_GPIO_CIR=m
-CONFIG_MEDIA_USB_SUPPORT=y
-
-#
-# Webcam devices
-#
-CONFIG_USB_VIDEO_CLASS=m
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-CONFIG_USB_GSPCA=m
-CONFIG_USB_M5602=m
-CONFIG_USB_STV06XX=m
-CONFIG_USB_GL860=m
-CONFIG_USB_GSPCA_BENQ=m
-CONFIG_USB_GSPCA_CONEX=m
-CONFIG_USB_GSPCA_CPIA1=m
-CONFIG_USB_GSPCA_ETOMS=m
-CONFIG_USB_GSPCA_FINEPIX=m
-CONFIG_USB_GSPCA_JEILINJ=m
-CONFIG_USB_GSPCA_JL2005BCD=m
-CONFIG_USB_GSPCA_KINECT=m
-CONFIG_USB_GSPCA_KONICA=m
-CONFIG_USB_GSPCA_MARS=m
-CONFIG_USB_GSPCA_MR97310A=m
-CONFIG_USB_GSPCA_NW80X=m
-CONFIG_USB_GSPCA_OV519=m
-CONFIG_USB_GSPCA_OV534=m
-CONFIG_USB_GSPCA_OV534_9=m
-CONFIG_USB_GSPCA_PAC207=m
-CONFIG_USB_GSPCA_PAC7302=m
-CONFIG_USB_GSPCA_PAC7311=m
-CONFIG_USB_GSPCA_SE401=m
-CONFIG_USB_GSPCA_SN9C2028=m
-CONFIG_USB_GSPCA_SN9C20X=m
-CONFIG_USB_GSPCA_SONIXB=m
-CONFIG_USB_GSPCA_SONIXJ=m
-CONFIG_USB_GSPCA_SPCA500=m
-CONFIG_USB_GSPCA_SPCA501=m
-CONFIG_USB_GSPCA_SPCA505=m
-CONFIG_USB_GSPCA_SPCA506=m
-CONFIG_USB_GSPCA_SPCA508=m
-CONFIG_USB_GSPCA_SPCA561=m
-CONFIG_USB_GSPCA_SPCA1528=m
-CONFIG_USB_GSPCA_SQ905=m
-CONFIG_USB_GSPCA_SQ905C=m
-CONFIG_USB_GSPCA_SQ930X=m
-CONFIG_USB_GSPCA_STK014=m
-CONFIG_USB_GSPCA_STV0680=m
-CONFIG_USB_GSPCA_SUNPLUS=m
-CONFIG_USB_GSPCA_T613=m
-CONFIG_USB_GSPCA_TOPRO=m
-CONFIG_USB_GSPCA_TV8532=m
-CONFIG_USB_GSPCA_VC032X=m
-CONFIG_USB_GSPCA_VICAM=m
-CONFIG_USB_GSPCA_XIRLINK_CIT=m
-CONFIG_USB_GSPCA_ZC3XX=m
-CONFIG_USB_PWC=m
-# CONFIG_USB_PWC_DEBUG is not set
-CONFIG_USB_PWC_INPUT_EVDEV=y
-CONFIG_VIDEO_CPIA2=m
-CONFIG_USB_ZR364XX=m
-CONFIG_USB_STKWEBCAM=m
-CONFIG_USB_S2255=m
-CONFIG_USB_SN9C102=m
-CONFIG_VIDEO_USBTV=m
-
-#
-# Analog TV USB devices
-#
-CONFIG_VIDEO_PVRUSB2=m
-CONFIG_VIDEO_PVRUSB2_SYSFS=y
-CONFIG_VIDEO_PVRUSB2_DVB=y
-# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
-CONFIG_VIDEO_HDPVR=m
-CONFIG_VIDEO_TLG2300=m
-CONFIG_VIDEO_USBVISION=m
-CONFIG_VIDEO_STK1160=m
-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
-CONFIG_VIDEO_CX231XX_DVB=m
-CONFIG_VIDEO_TM6000=m
-CONFIG_VIDEO_TM6000_ALSA=m
-CONFIG_VIDEO_TM6000_DVB=m
-
-#
-# Digital TV USB devices
-#
-CONFIG_DVB_USB=m
-# CONFIG_DVB_USB_DEBUG is not set
-CONFIG_DVB_USB_A800=m
-CONFIG_DVB_USB_DIBUSB_MB=m
-CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
-CONFIG_DVB_USB_DIBUSB_MC=m
-CONFIG_DVB_USB_DIB0700=m
-CONFIG_DVB_USB_UMT_010=m
-CONFIG_DVB_USB_CXUSB=m
-CONFIG_DVB_USB_M920X=m
-CONFIG_DVB_USB_DIGITV=m
-CONFIG_DVB_USB_VP7045=m
-CONFIG_DVB_USB_VP702X=m
-CONFIG_DVB_USB_GP8PSK=m
-CONFIG_DVB_USB_NOVA_T_USB2=m
-CONFIG_DVB_USB_TTUSB2=m
-CONFIG_DVB_USB_DTT200U=m
-CONFIG_DVB_USB_OPERA1=m
-CONFIG_DVB_USB_AF9005=m
-CONFIG_DVB_USB_AF9005_REMOTE=m
-CONFIG_DVB_USB_PCTV452E=m
-CONFIG_DVB_USB_DW2102=m
-CONFIG_DVB_USB_CINERGY_T2=m
-CONFIG_DVB_USB_DTV5100=m
-CONFIG_DVB_USB_FRIIO=m
-CONFIG_DVB_USB_AZ6027=m
-CONFIG_DVB_USB_TECHNISAT_USB2=m
-CONFIG_DVB_USB_V2=m
-CONFIG_DVB_USB_AF9015=m
-CONFIG_DVB_USB_AF9035=m
-CONFIG_DVB_USB_ANYSEE=m
-CONFIG_DVB_USB_AU6610=m
-CONFIG_DVB_USB_AZ6007=m
-CONFIG_DVB_USB_CE6230=m
-CONFIG_DVB_USB_EC168=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_IT913X=m
-CONFIG_DVB_USB_LME2510=m
-CONFIG_DVB_USB_MXL111SF=m
-CONFIG_DVB_USB_RTL28XXU=m
-CONFIG_DVB_TTUSB_BUDGET=m
-CONFIG_DVB_TTUSB_DEC=m
-CONFIG_SMS_USB_DRV=m
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
-
-#
-# Webcam, TV (analog/digital) USB devices
-#
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_EM28XX_RC=m
-CONFIG_MEDIA_PCI_SUPPORT=y
-
-#
-# Media capture support
-#
-CONFIG_VIDEO_MEYE=m
-
-#
-# Media capture/analog TV support
-#
-CONFIG_VIDEO_IVTV=m
-CONFIG_VIDEO_IVTV_ALSA=m
-CONFIG_VIDEO_FB_IVTV=m
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_ZR36060=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN_AVS6EYES=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_MXB=m
-
-#
-# Media capture/analog/hybrid TV support
-#
-CONFIG_VIDEO_CX18=m
-CONFIG_VIDEO_CX18_ALSA=m
-CONFIG_VIDEO_CX23885=m
-CONFIG_MEDIA_ALTERA_CI=m
-CONFIG_VIDEO_CX25821=m
-CONFIG_VIDEO_CX25821_ALSA=m
-CONFIG_VIDEO_CX88=m
-CONFIG_VIDEO_CX88_ALSA=m
-CONFIG_VIDEO_CX88_BLACKBIRD=m
-CONFIG_VIDEO_CX88_DVB=m
-CONFIG_VIDEO_CX88_VP3054=m
-CONFIG_VIDEO_CX88_MPEG=m
-CONFIG_VIDEO_BT848=m
-CONFIG_DVB_BT8XX=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7134_ALSA=m
-CONFIG_VIDEO_SAA7134_RC=y
-CONFIG_VIDEO_SAA7134_DVB=m
-CONFIG_VIDEO_SAA7164=m
-
-#
-# Media digital TV PCI Adapters
-#
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
-CONFIG_DVB_BUDGET_CORE=m
-CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_CI=m
-CONFIG_DVB_BUDGET_AV=m
-CONFIG_DVB_BUDGET_PATCH=m
-CONFIG_DVB_B2C2_FLEXCOP_PCI=m
-# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
-CONFIG_DVB_PLUTO2=m
-CONFIG_DVB_DM1105=m
-CONFIG_DVB_PT1=m
-CONFIG_MANTIS_CORE=m
-CONFIG_DVB_MANTIS=m
-CONFIG_DVB_HOPPER=m
-CONFIG_DVB_NGENE=m
-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
-
-#
-# Supported MMC/SDIO adapters
-#
-CONFIG_SMS_SDIO_DRV=m
-CONFIG_MEDIA_PARPORT_SUPPORT=y
-CONFIG_VIDEO_BWQCAM=m
-CONFIG_VIDEO_CQCAM=m
-CONFIG_VIDEO_W9966=m
-CONFIG_RADIO_ADAPTERS=y
-CONFIG_RADIO_SI470X=y
-CONFIG_USB_SI470X=m
-CONFIG_I2C_SI470X=m
-CONFIG_USB_MR800=m
-CONFIG_USB_DSBR=m
-CONFIG_RADIO_MAXIRADIO=m
-CONFIG_RADIO_SHARK=m
-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
-CONFIG_RADIO_WL1273=m
-
-#
-# Texas Instruments WL128x FM driver (ST based)
-#
-CONFIG_RADIO_WL128X=m
-
-#
-# Supported FireWire (IEEE 1394) Adapters
-#
-CONFIG_DVB_FIREDTV=m
-CONFIG_DVB_FIREDTV_INPUT=y
-CONFIG_MEDIA_COMMON_OPTIONS=y
-
-#
-# common driver options
-#
-CONFIG_VIDEO_CX2341X=m
-CONFIG_VIDEO_BTCX=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_CYPRESS_FIRMWARE=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_SMS_SIANO_DEBUGFS is not set
-
-#
-# Media ancillary drivers (tuners, sensors, i2c, frontends)
-#
-CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
-CONFIG_MEDIA_ATTACH=y
-CONFIG_VIDEO_IR_I2C=m
-
-#
-# Audio decoders, processors and mixers
-#
-CONFIG_VIDEO_TVAUDIO=m
-CONFIG_VIDEO_TDA7432=m
-CONFIG_VIDEO_TDA9840=m
-CONFIG_VIDEO_TEA6415C=m
-CONFIG_VIDEO_TEA6420=m
-CONFIG_VIDEO_MSP3400=m
-CONFIG_VIDEO_CS5345=m
-CONFIG_VIDEO_CS53L32A=m
-CONFIG_VIDEO_UDA1342=m
-CONFIG_VIDEO_WM8775=m
-CONFIG_VIDEO_WM8739=m
-CONFIG_VIDEO_VP27SMPX=m
-CONFIG_VIDEO_SONY_BTF_MPX=m
-
-#
-# RDS decoders
-#
-CONFIG_VIDEO_SAA6588=m
-
-#
-# Video decoders
-#
-CONFIG_VIDEO_BT819=m
-CONFIG_VIDEO_BT856=m
-CONFIG_VIDEO_BT866=m
-CONFIG_VIDEO_KS0127=m
-CONFIG_VIDEO_SAA7110=m
-CONFIG_VIDEO_SAA711X=m
-CONFIG_VIDEO_TVP5150=m
-CONFIG_VIDEO_TW2804=m
-CONFIG_VIDEO_TW9903=m
-CONFIG_VIDEO_TW9906=m
-CONFIG_VIDEO_VPX3220=m
-
-#
-# Video and audio decoders
-#
-CONFIG_VIDEO_SAA717X=m
-CONFIG_VIDEO_CX25840=m
-
-#
-# Video encoders
-#
-CONFIG_VIDEO_SAA7127=m
-CONFIG_VIDEO_SAA7185=m
-CONFIG_VIDEO_ADV7170=m
-CONFIG_VIDEO_ADV7175=m
-
-#
-# Camera sensor devices
-#
-CONFIG_VIDEO_OV7640=m
-CONFIG_VIDEO_MT9V011=m
-
-#
-# Flash devices
-#
-
-#
-# Video improvement chips
-#
-CONFIG_VIDEO_UPD64031A=m
-CONFIG_VIDEO_UPD64083=m
-
-#
-# Miscelaneous helper chips
-#
-CONFIG_VIDEO_M52790=m
-
-#
-# Sensors used on soc_camera driver
-#
-CONFIG_MEDIA_TUNER=m
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_TEA5761=m
-CONFIG_MEDIA_TUNER_TEA5767=m
-CONFIG_MEDIA_TUNER_MT20XX=m
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2063=m
-CONFIG_MEDIA_TUNER_MT2266=m
-CONFIG_MEDIA_TUNER_MT2131=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC5000=m
-CONFIG_MEDIA_TUNER_XC4000=m
-CONFIG_MEDIA_TUNER_MXL5005S=m
-CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=m
-CONFIG_MEDIA_TUNER_MAX2165=m
-CONFIG_MEDIA_TUNER_TDA18218=m
-CONFIG_MEDIA_TUNER_FC0011=m
-CONFIG_MEDIA_TUNER_FC0012=m
-CONFIG_MEDIA_TUNER_FC0013=m
-CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_MEDIA_TUNER_E4000=m
-CONFIG_MEDIA_TUNER_FC2580=m
-CONFIG_MEDIA_TUNER_TUA9001=m
-CONFIG_MEDIA_TUNER_IT913X=m
-CONFIG_MEDIA_TUNER_R820T=m
-
-#
-# Multistandard (satellite) frontends
-#
-CONFIG_DVB_STB0899=m
-CONFIG_DVB_STB6100=m
-CONFIG_DVB_STV090x=m
-CONFIG_DVB_STV6110x=m
-
-#
-# Multistandard (cable + terrestrial) frontends
-#
-CONFIG_DVB_DRXK=m
-CONFIG_DVB_TDA18271C2DD=m
-
-#
-# DVB-S (satellite) frontends
-#
-CONFIG_DVB_CX24110=m
-CONFIG_DVB_CX24123=m
-CONFIG_DVB_MT312=m
-CONFIG_DVB_ZL10036=m
-CONFIG_DVB_ZL10039=m
-CONFIG_DVB_S5H1420=m
-CONFIG_DVB_STV0288=m
-CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=m
-CONFIG_DVB_STV6110=m
-CONFIG_DVB_STV0900=m
-CONFIG_DVB_TDA8083=m
-CONFIG_DVB_TDA10086=m
-CONFIG_DVB_TDA8261=m
-CONFIG_DVB_VES1X93=m
-CONFIG_DVB_TUNER_ITD1000=m
-CONFIG_DVB_TUNER_CX24113=m
-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
-
-#
-# DVB-T (terrestrial) frontends
-#
-CONFIG_DVB_SP8870=m
-CONFIG_DVB_SP887X=m
-CONFIG_DVB_CX22700=m
-CONFIG_DVB_CX22702=m
-CONFIG_DVB_DRXD=m
-CONFIG_DVB_L64781=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_NXT6000=m
-CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=m
-CONFIG_DVB_DIB3000MB=m
-CONFIG_DVB_DIB3000MC=m
-CONFIG_DVB_DIB7000M=m
-CONFIG_DVB_DIB7000P=m
-CONFIG_DVB_TDA10048=m
-CONFIG_DVB_AF9013=m
-CONFIG_DVB_EC100=m
-CONFIG_DVB_STV0367=m
-CONFIG_DVB_CXD2820R=m
-CONFIG_DVB_RTL2830=m
-CONFIG_DVB_RTL2832=m
-
-#
-# DVB-C (cable) frontends
-#
-CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=m
-CONFIG_DVB_TDA10023=m
-CONFIG_DVB_STV0297=m
-
-#
-# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
-#
-CONFIG_DVB_NXT200X=m
-CONFIG_DVB_OR51211=m
-CONFIG_DVB_OR51132=m
-CONFIG_DVB_BCM3510=m
-CONFIG_DVB_LGDT330X=m
-CONFIG_DVB_LGDT3305=m
-CONFIG_DVB_LG2160=m
-CONFIG_DVB_S5H1409=m
-CONFIG_DVB_AU8522=m
-CONFIG_DVB_AU8522_DTV=m
-CONFIG_DVB_AU8522_V4L=m
-CONFIG_DVB_S5H1411=m
-
-#
-# ISDB-T (terrestrial) frontends
-#
-CONFIG_DVB_S921=m
-CONFIG_DVB_DIB8000=m
-CONFIG_DVB_MB86A20S=m
-
-#
-# Digital terrestrial only tuners/PLL
-#
-CONFIG_DVB_PLL=m
-CONFIG_DVB_TUNER_DIB0070=m
-CONFIG_DVB_TUNER_DIB0090=m
-
-#
-# SEC control devices for DVB-S
-#
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_LNBP22=m
-CONFIG_DVB_ISL6405=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_ISL6423=m
-CONFIG_DVB_A8293=m
-CONFIG_DVB_LGS8GXX=m
-CONFIG_DVB_ATBM8830=m
-CONFIG_DVB_TDA665x=m
-CONFIG_DVB_IX2505V=m
-CONFIG_DVB_IT913X_FE=m
-CONFIG_DVB_M88RS2000=m
-CONFIG_DVB_AF9033=m
-
-#
-# Tools to develop new frontends
-#
-# CONFIG_DVB_DUMMY_FE is not set
-
-#
-# Graphics support
-#
-CONFIG_AGP=y
-CONFIG_AGP_AMD64=y
-CONFIG_AGP_INTEL=m
-CONFIG_AGP_SIS=m
-CONFIG_AGP_VIA=m
-CONFIG_VGA_ARB=y
-CONFIG_VGA_ARB_MAX_GPUS=16
-CONFIG_VGA_SWITCHEROO=y
-CONFIG_DRM=m
-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_UMS is not set
-CONFIG_DRM_NOUVEAU=m
-CONFIG_NOUVEAU_DEBUG=5
-CONFIG_NOUVEAU_DEBUG_DEFAULT=3
-CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-CONFIG_DRM_I915=m
-CONFIG_DRM_I915_KMS=y
-CONFIG_DRM_MGA=m
-CONFIG_DRM_SIS=m
-CONFIG_DRM_VIA=m
-CONFIG_DRM_SAVAGE=m
-CONFIG_DRM_VMWGFX=m
-CONFIG_DRM_VMWGFX_FBCON=y
-CONFIG_DRM_GMA500=m
-CONFIG_DRM_GMA600=y
-CONFIG_DRM_GMA3600=y
-CONFIG_DRM_UDL=m
-CONFIG_DRM_AST=m
-CONFIG_DRM_MGAG200=m
-CONFIG_DRM_CIRRUS_QEMU=m
-CONFIG_DRM_QXL=m
-CONFIG_VGASTATE=m
-CONFIG_VIDEO_OUTPUT_CONTROL=m
-CONFIG_HDMI=y
-CONFIG_FB=y
-CONFIG_FIRMWARE_EDID=y
-# CONFIG_FB_DDC is not set
-CONFIG_FB_BOOT_VESA_SUPPORT=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_IMAGEBLIT=m
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-CONFIG_FB_SYS_FOPS=m
-CONFIG_FB_DEFERRED_IO=y
-# CONFIG_FB_SVGALIB is not set
-# CONFIG_FB_MACMODES is not set
-CONFIG_FB_BACKLIGHT=y
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_TILEBLITTING=y
-
-#
-# Frame buffer hardware drivers
-#
-# CONFIG_FB_CIRRUS is not set
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_ARC is not set
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_IMSTT is not set
-CONFIG_FB_VGA16=m
-CONFIG_FB_UVESA=m
-CONFIG_FB_VESA=y
-CONFIG_FB_EFI=y
-# CONFIG_FB_N411 is not set
-# CONFIG_FB_HGA is not set
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_NVIDIA is not set
-# CONFIG_FB_RIVA is not set
-# CONFIG_FB_I740 is not set
-# CONFIG_FB_LE80578 is not set
-# CONFIG_FB_MATROX is not set
-# CONFIG_FB_RADEON is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_ATY is not set
-# CONFIG_FB_S3 is not set
-# CONFIG_FB_SAVAGE is not set
-# CONFIG_FB_SIS is not set
-CONFIG_FB_VIA=m
-CONFIG_FB_VIA_DIRECT_PROCFS=y
-CONFIG_FB_VIA_X_COMPATIBILITY=y
-# CONFIG_FB_NEOMAGIC is not set
-# CONFIG_FB_KYRO is not set
-# CONFIG_FB_3DFX is not set
-CONFIG_FB_VOODOO1=m
-CONFIG_FB_VT8623=m
-# CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_ARK is not set
-# CONFIG_FB_PM3 is not set
-# CONFIG_FB_CARMINE is not set
-# CONFIG_FB_TMIO is not set
-# 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
-# CONFIG_FB_MB862XX is not set
-# CONFIG_FB_BROADSHEET is not set
-# CONFIG_FB_AUO_K190X is not set
-CONFIG_FB_HYPERV=m
-# CONFIG_EXYNOS_VIDEO is not set
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=m
-# CONFIG_LCD_L4F00242T03 is not set
-# CONFIG_LCD_LMS283GF05 is not set
-# CONFIG_LCD_LTV350QV is not set
-# CONFIG_LCD_ILI922X is not set
-# CONFIG_LCD_ILI9320 is not set
-# CONFIG_LCD_TDO24M is not set
-# CONFIG_LCD_VGG2432A4 is not set
-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
-CONFIG_BACKLIGHT_APPLE=m
-# CONFIG_BACKLIGHT_SAHARA is not set
-# CONFIG_BACKLIGHT_ADP8860 is not set
-# CONFIG_BACKLIGHT_ADP8870 is not set
-CONFIG_BACKLIGHT_PCF50633=m
-# CONFIG_BACKLIGHT_LM3630 is not set
-# CONFIG_BACKLIGHT_LM3639 is not set
-# CONFIG_BACKLIGHT_LP855X is not set
-# CONFIG_BACKLIGHT_OT200 is not set
-# CONFIG_BACKLIGHT_TPS65217 is not set
-
-#
-# Console display driver support
-#
-CONFIG_VGA_CONSOLE=y
-# CONFIG_VGACON_SOFT_SCROLLBACK is not set
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-# CONFIG_LOGO is not set
-CONFIG_SOUND=m
-CONFIG_SOUND_OSS_CORE=y
-# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
-CONFIG_SND=m
-CONFIG_SND_TIMER=m
-CONFIG_SND_PCM=m
-CONFIG_SND_HWDEP=m
-CONFIG_SND_RAWMIDI=m
-CONFIG_SND_JACK=y
-CONFIG_SND_SEQUENCER=m
-CONFIG_SND_SEQ_DUMMY=m
-CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_PCM_OSS_PLUGINS=y
-CONFIG_SND_SEQUENCER_OSS=y
-CONFIG_SND_HRTIMER=m
-CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
-CONFIG_SND_DYNAMIC_MINORS=y
-CONFIG_SND_MAX_CARDS=32
-CONFIG_SND_SUPPORT_OLD_API=y
-CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
-# CONFIG_SND_DEBUG is not set
-CONFIG_SND_VMASTER=y
-CONFIG_SND_KCTL_JACK=y
-CONFIG_SND_DMA_SGBUF=y
-CONFIG_SND_RAWMIDI_SEQ=m
-CONFIG_SND_OPL3_LIB_SEQ=m
-# CONFIG_SND_OPL4_LIB_SEQ is not set
-# CONFIG_SND_SBAWE_SEQ is not set
-CONFIG_SND_EMU10K1_SEQ=m
-CONFIG_SND_MPU401_UART=m
-CONFIG_SND_OPL3_LIB=m
-CONFIG_SND_VX_LIB=m
-CONFIG_SND_AC97_CODEC=m
-CONFIG_SND_DRIVERS=y
-# CONFIG_SND_PCSP is not set
-CONFIG_SND_DUMMY=m
-CONFIG_SND_ALOOP=m
-CONFIG_SND_VIRMIDI=m
-CONFIG_SND_MTPAV=m
-CONFIG_SND_MTS64=m
-CONFIG_SND_SERIAL_U16550=m
-CONFIG_SND_MPU401=m
-CONFIG_SND_PORTMAN2X4=m
-CONFIG_SND_AC97_POWER_SAVE=y
-CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
-CONFIG_SND_SB_COMMON=m
-CONFIG_SND_SB16_DSP=m
-CONFIG_SND_TEA575X=m
-CONFIG_SND_PCI=y
-CONFIG_SND_AD1889=m
-CONFIG_SND_ALS300=m
-CONFIG_SND_ALS4000=m
-CONFIG_SND_ALI5451=m
-CONFIG_SND_ASIHPI=m
-CONFIG_SND_ATIIXP=m
-CONFIG_SND_ATIIXP_MODEM=m
-CONFIG_SND_AU8810=m
-CONFIG_SND_AU8820=m
-CONFIG_SND_AU8830=m
-CONFIG_SND_AW2=m
-CONFIG_SND_AZT3328=m
-CONFIG_SND_BT87X=m
-# CONFIG_SND_BT87X_OVERCLOCK is not set
-CONFIG_SND_CA0106=m
-CONFIG_SND_CMIPCI=m
-CONFIG_SND_OXYGEN_LIB=m
-CONFIG_SND_OXYGEN=m
-CONFIG_SND_CS4281=m
-CONFIG_SND_CS46XX=m
-CONFIG_SND_CS46XX_NEW_DSP=y
-CONFIG_SND_CS5530=m
-CONFIG_SND_CS5535AUDIO=m
-CONFIG_SND_CTXFI=m
-CONFIG_SND_DARLA20=m
-CONFIG_SND_GINA20=m
-CONFIG_SND_LAYLA20=m
-CONFIG_SND_DARLA24=m
-CONFIG_SND_GINA24=m
-CONFIG_SND_LAYLA24=m
-CONFIG_SND_MONA=m
-CONFIG_SND_MIA=m
-CONFIG_SND_ECHO3G=m
-CONFIG_SND_INDIGO=m
-CONFIG_SND_INDIGOIO=m
-CONFIG_SND_INDIGODJ=m
-CONFIG_SND_INDIGOIOX=m
-CONFIG_SND_INDIGODJX=m
-CONFIG_SND_EMU10K1=m
-CONFIG_SND_EMU10K1X=m
-CONFIG_SND_ENS1370=m
-CONFIG_SND_ENS1371=m
-CONFIG_SND_ES1938=m
-CONFIG_SND_ES1968=m
-CONFIG_SND_ES1968_INPUT=y
-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
-CONFIG_SND_HDA_INPUT_BEEP=y
-CONFIG_SND_HDA_INPUT_BEEP_MODE=1
-CONFIG_SND_HDA_INPUT_JACK=y
-CONFIG_SND_HDA_PATCH_LOADER=y
-CONFIG_SND_HDA_CODEC_REALTEK=y
-CONFIG_SND_HDA_CODEC_ANALOG=y
-CONFIG_SND_HDA_CODEC_SIGMATEL=y
-CONFIG_SND_HDA_CODEC_VIA=y
-CONFIG_SND_HDA_CODEC_HDMI=y
-CONFIG_SND_HDA_I915=y
-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
-CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
-CONFIG_SND_HDSP=m
-CONFIG_SND_HDSPM=m
-CONFIG_SND_ICE1712=m
-CONFIG_SND_ICE1724=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
-CONFIG_SND_KORG1212=m
-CONFIG_SND_LOLA=m
-CONFIG_SND_LX6464ES=m
-CONFIG_SND_MAESTRO3=m
-CONFIG_SND_MAESTRO3_INPUT=y
-CONFIG_SND_MIXART=m
-CONFIG_SND_NM256=m
-CONFIG_SND_PCXHR=m
-CONFIG_SND_RIPTIDE=m
-CONFIG_SND_RME32=m
-CONFIG_SND_RME96=m
-CONFIG_SND_RME9652=m
-CONFIG_SND_SONICVIBES=m
-CONFIG_SND_TRIDENT=m
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
-CONFIG_SND_VIRTUOSO=m
-CONFIG_SND_VX222=m
-CONFIG_SND_YMFPCI=m
-CONFIG_SND_SPI=y
-CONFIG_SND_USB=y
-CONFIG_SND_USB_AUDIO=m
-CONFIG_SND_USB_UA101=m
-CONFIG_SND_USB_USX2Y=m
-CONFIG_SND_USB_CAIAQ=m
-CONFIG_SND_USB_CAIAQ_INPUT=y
-CONFIG_SND_USB_US122L=m
-CONFIG_SND_USB_6FIRE=m
-CONFIG_SND_USB_HIFACE=m
-CONFIG_SND_FIREWIRE=y
-CONFIG_SND_FIREWIRE_LIB=m
-CONFIG_SND_FIREWIRE_SPEAKERS=m
-CONFIG_SND_ISIGHT=m
-CONFIG_SND_SCS1X=m
-CONFIG_SND_PCMCIA=y
-CONFIG_SND_VXPOCKET=m
-CONFIG_SND_PDAUDIOCF=m
-# CONFIG_SND_SOC is not set
-# CONFIG_SOUND_PRIME is not set
-CONFIG_AC97_BUS=m
-
-#
-# HID support
-#
-CONFIG_HID=m
-CONFIG_HIDRAW=y
-CONFIG_UHID=m
-CONFIG_HID_GENERIC=m
-
-#
-# Special HID drivers
-#
-CONFIG_HID_A4TECH=m
-CONFIG_HID_ACRUX=m
-CONFIG_HID_ACRUX_FF=y
-CONFIG_HID_APPLE=m
-CONFIG_HID_APPLEIR=m
-CONFIG_HID_AUREAL=m
-CONFIG_HID_BELKIN=m
-CONFIG_HID_CHERRY=m
-CONFIG_HID_CHICONY=m
-CONFIG_HID_PRODIKEYS=m
-CONFIG_HID_CYPRESS=m
-CONFIG_HID_DRAGONRISE=m
-CONFIG_DRAGONRISE_FF=y
-CONFIG_HID_EMS_FF=m
-CONFIG_HID_ELECOM=m
-CONFIG_HID_ELO=m
-CONFIG_HID_EZKEY=m
-CONFIG_HID_HOLTEK=m
-CONFIG_HOLTEK_FF=y
-CONFIG_HID_HUION=m
-CONFIG_HID_KEYTOUCH=m
-CONFIG_HID_KYE=m
-CONFIG_HID_UCLOGIC=m
-CONFIG_HID_WALTOP=m
-CONFIG_HID_GYRATION=m
-CONFIG_HID_ICADE=m
-CONFIG_HID_TWINHAN=m
-CONFIG_HID_KENSINGTON=m
-CONFIG_HID_LCPOWER=m
-CONFIG_HID_LENOVO_TPKBD=m
-CONFIG_HID_LOGITECH=m
-CONFIG_HID_LOGITECH_DJ=m
-CONFIG_LOGITECH_FF=y
-CONFIG_LOGIRUMBLEPAD2_FF=y
-CONFIG_LOGIG940_FF=y
-CONFIG_LOGIWHEELS_FF=y
-CONFIG_HID_MAGICMOUSE=m
-CONFIG_HID_MICROSOFT=m
-CONFIG_HID_MONTEREY=m
-CONFIG_HID_MULTITOUCH=m
-CONFIG_HID_NTRIG=m
-CONFIG_HID_ORTEK=m
-CONFIG_HID_PANTHERLORD=m
-CONFIG_PANTHERLORD_FF=y
-CONFIG_HID_PETALYNX=m
-CONFIG_HID_PICOLCD=m
-CONFIG_HID_PICOLCD_FB=y
-CONFIG_HID_PICOLCD_BACKLIGHT=y
-CONFIG_HID_PICOLCD_LCD=y
-CONFIG_HID_PICOLCD_LEDS=y
-CONFIG_HID_PICOLCD_CIR=y
-CONFIG_HID_PRIMAX=m
-CONFIG_HID_ROCCAT=m
-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
-CONFIG_HID_HYPERV_MOUSE=m
-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
-CONFIG_HID_WIIMOTE=m
-CONFIG_HID_ZEROPLUS=m
-CONFIG_ZEROPLUS_FF=y
-CONFIG_HID_ZYDACRON=m
-CONFIG_HID_SENSOR_HUB=m
-
-#
-# USB HID support
-#
-CONFIG_USB_HID=m
-CONFIG_HID_PID=y
-CONFIG_USB_HIDDEV=y
-
-#
-# I2C HID support
-#
-CONFIG_I2C_HID=m
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_COMMON=m
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB=m
-# CONFIG_USB_DEBUG is not set
-# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-
-#
-# Miscellaneous USB options
-#
-CONFIG_USB_DEFAULT_PERSIST=y
-CONFIG_USB_DYNAMIC_MINORS=y
-# CONFIG_USB_OTG is not set
-CONFIG_USB_MON=m
-CONFIG_USB_WUSB=m
-CONFIG_USB_WUSB_CBAF=m
-# CONFIG_USB_WUSB_CBAF_DEBUG is not set
-
-#
-# USB Host Controller Drivers
-#
-CONFIG_USB_C67X00_HCD=m
-CONFIG_USB_XHCI_HCD=m
-# CONFIG_USB_XHCI_HCD_DEBUGGING is not set
-CONFIG_USB_EHCI_HCD=m
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_EHCI_TT_NEWSCHED=y
-CONFIG_USB_EHCI_PCI=m
-# CONFIG_USB_EHCI_HCD_PLATFORM is not set
-CONFIG_USB_OXU210HP_HCD=m
-CONFIG_USB_ISP116X_HCD=m
-CONFIG_USB_ISP1760_HCD=m
-CONFIG_USB_ISP1362_HCD=m
-CONFIG_USB_FUSBH200_HCD=m
-CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_OHCI_HCD_PCI=m
-# CONFIG_USB_OHCI_HCD_SSB is not set
-# CONFIG_USB_OHCI_HCD_PLATFORM is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-CONFIG_USB_UHCI_HCD=m
-CONFIG_USB_U132_HCD=m
-CONFIG_USB_SL811_HCD=m
-# CONFIG_USB_SL811_HCD_ISO is not set
-CONFIG_USB_SL811_CS=m
-CONFIG_USB_R8A66597_HCD=m
-CONFIG_USB_RENESAS_USBHS_HCD=m
-CONFIG_USB_WHCI_HCD=m
-CONFIG_USB_HWA_HCD=m
-# CONFIG_USB_HCD_BCMA is not set
-# CONFIG_USB_HCD_SSB is not set
-CONFIG_USB_MUSB_HDRC=m
-# CONFIG_USB_MUSB_HOST is not set
-# CONFIG_USB_MUSB_GADGET is not set
-CONFIG_USB_MUSB_DUAL_ROLE=y
-CONFIG_USB_MUSB_TUSB6010=m
-CONFIG_USB_MUSB_DSPS=m
-CONFIG_USB_MUSB_UX500=m
-# CONFIG_USB_UX500_DMA is not set
-CONFIG_MUSB_PIO_ONLY=y
-CONFIG_USB_RENESAS_USBHS=m
-
-#
-# USB Device Class drivers
-#
-CONFIG_USB_ACM=m
-CONFIG_USB_PRINTER=m
-CONFIG_USB_WDM=m
-CONFIG_USB_TMC=m
-
-#
-# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
-#
-
-#
-# also be needed; see USB_STORAGE Help for more info
-#
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_REALTEK=m
-CONFIG_REALTEK_AUTOPM=y
-CONFIG_USB_STORAGE_DATAFAB=m
-CONFIG_USB_STORAGE_FREECOM=m
-CONFIG_USB_STORAGE_ISD200=m
-CONFIG_USB_STORAGE_USBAT=m
-CONFIG_USB_STORAGE_SDDR09=m
-CONFIG_USB_STORAGE_SDDR55=m
-CONFIG_USB_STORAGE_JUMPSHOT=m
-CONFIG_USB_STORAGE_ALAUDA=m
-CONFIG_USB_STORAGE_ONETOUCH=m
-CONFIG_USB_STORAGE_KARMA=m
-CONFIG_USB_STORAGE_CYPRESS_ATACB=m
-CONFIG_USB_STORAGE_ENE_UB6250=m
-
-#
-# USB Imaging devices
-#
-CONFIG_USB_MDC800=m
-CONFIG_USB_MICROTEK=m
-# CONFIG_USB_DWC3 is not set
-CONFIG_USB_CHIPIDEA=m
-CONFIG_USB_CHIPIDEA_UDC=y
-# CONFIG_USB_CHIPIDEA_DEBUG is not set
-
-#
-# USB port drivers
-#
-CONFIG_USB_USS720=m
-CONFIG_USB_SERIAL=m
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_AIRCABLE=m
-CONFIG_USB_SERIAL_ARK3116=m
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_CH341=m
-CONFIG_USB_SERIAL_WHITEHEAT=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-CONFIG_USB_SERIAL_CP210X=m
-CONFIG_USB_SERIAL_CYPRESS_M8=m
-CONFIG_USB_SERIAL_EMPEG=m
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_FUNSOFT=m
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_IPAQ=m
-CONFIG_USB_SERIAL_IR=m
-CONFIG_USB_SERIAL_EDGEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT_TI=m
-CONFIG_USB_SERIAL_F81232=m
-CONFIG_USB_SERIAL_GARMIN=m
-CONFIG_USB_SERIAL_IPW=m
-CONFIG_USB_SERIAL_IUU=m
-CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KEYSPAN_MPR=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19=y
-CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
-CONFIG_USB_SERIAL_KLSI=m
-CONFIG_USB_SERIAL_KOBIL_SCT=m
-CONFIG_USB_SERIAL_MCT_U232=m
-CONFIG_USB_SERIAL_METRO=m
-CONFIG_USB_SERIAL_MOS7720=m
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
-CONFIG_USB_SERIAL_MOS7840=m
-CONFIG_USB_SERIAL_MOTOROLA=m
-CONFIG_USB_SERIAL_NAVMAN=m
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_SERIAL_OTI6858=m
-CONFIG_USB_SERIAL_QCAUX=m
-CONFIG_USB_SERIAL_QUALCOMM=m
-CONFIG_USB_SERIAL_SPCP8X5=m
-CONFIG_USB_SERIAL_HP4X=m
-CONFIG_USB_SERIAL_SAFE=m
-# CONFIG_USB_SERIAL_SAFE_PADDED is not set
-CONFIG_USB_SERIAL_SIEMENS_MPI=m
-CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-CONFIG_USB_SERIAL_SYMBOL=m
-CONFIG_USB_SERIAL_TI=m
-CONFIG_USB_SERIAL_CYBERJACK=m
-CONFIG_USB_SERIAL_XIRCOM=m
-CONFIG_USB_SERIAL_WWAN=m
-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_WISHBONE=m
-CONFIG_USB_SERIAL_ZTE=m
-CONFIG_USB_SERIAL_SSU100=m
-CONFIG_USB_SERIAL_QT2=m
-CONFIG_USB_SERIAL_FLASHLOADER=m
-CONFIG_USB_SERIAL_SUUNTO=m
-# CONFIG_USB_SERIAL_DEBUG is not set
-
-#
-# USB Miscellaneous drivers
-#
-CONFIG_USB_EMI62=m
-CONFIG_USB_EMI26=m
-CONFIG_USB_ADUTUX=m
-CONFIG_USB_SEVSEG=m
-CONFIG_USB_RIO500=m
-CONFIG_USB_LEGOTOWER=m
-CONFIG_USB_LCD=m
-CONFIG_USB_LED=m
-CONFIG_USB_CYPRESS_CY7C63=m
-CONFIG_USB_CYTHERM=m
-CONFIG_USB_IDMOUSE=m
-CONFIG_USB_FTDI_ELAN=m
-CONFIG_USB_APPLEDISPLAY=m
-CONFIG_USB_SISUSBVGA=m
-# CONFIG_USB_SISUSBVGA_CON is not set
-CONFIG_USB_LD=m
-CONFIG_USB_TRANCEVIBRATOR=m
-CONFIG_USB_IOWARRIOR=m
-CONFIG_USB_TEST=m
-CONFIG_USB_ISIGHTFW=m
-CONFIG_USB_YUREX=m
-CONFIG_USB_EZUSB_FX2=m
-CONFIG_USB_HSIC_USB3503=m
-CONFIG_USB_ATM=m
-CONFIG_USB_SPEEDTOUCH=m
-CONFIG_USB_CXACRU=m
-CONFIG_USB_UEAGLEATM=m
-CONFIG_USB_XUSBATM=m
-CONFIG_USB_PHY=y
-CONFIG_NOP_USB_XCEIV=m
-# CONFIG_OMAP_CONTROL_USB is not set
-# CONFIG_OMAP_USB3 is not set
-CONFIG_SAMSUNG_USBPHY=m
-CONFIG_SAMSUNG_USB2PHY=m
-CONFIG_SAMSUNG_USB3PHY=m
-# CONFIG_USB_GPIO_VBUS is not set
-CONFIG_USB_ISP1301=m
-CONFIG_USB_RCAR_PHY=m
-CONFIG_USB_GADGET=m
-# CONFIG_USB_GADGET_DEBUG is not set
-# CONFIG_USB_GADGET_DEBUG_FILES is not set
-# CONFIG_USB_GADGET_DEBUG_FS is not set
-CONFIG_USB_GADGET_VBUS_DRAW=2
-CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
-
-#
-# USB Peripheral Controller
-#
-CONFIG_USB_FOTG210_UDC=m
-CONFIG_USB_R8A66597=m
-CONFIG_USB_RENESAS_USBHS_UDC=m
-CONFIG_USB_PXA27X=m
-CONFIG_USB_MV_UDC=m
-CONFIG_USB_MV_U3D=m
-CONFIG_USB_M66592=m
-CONFIG_USB_AMD5536UDC=m
-CONFIG_USB_NET2272=m
-CONFIG_USB_NET2272_DMA=y
-CONFIG_USB_NET2280=m
-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_U_ETHER=m
-CONFIG_USB_U_RNDIS=m
-CONFIG_USB_F_SERIAL=m
-CONFIG_USB_F_OBEX=m
-CONFIG_USB_F_NCM=m
-CONFIG_USB_F_ECM=m
-CONFIG_USB_F_SUBSET=m
-CONFIG_USB_F_RNDIS=m
-# CONFIG_USB_CONFIGFS is not set
-# CONFIG_USB_ZERO is not set
-CONFIG_USB_AUDIO=m
-# CONFIG_GADGET_UAC1 is not set
-CONFIG_USB_ETH=m
-CONFIG_USB_ETH_RNDIS=y
-# CONFIG_USB_ETH_EEM is not set
-CONFIG_USB_G_NCM=m
-CONFIG_USB_GADGETFS=m
-CONFIG_USB_FUNCTIONFS=m
-CONFIG_USB_FUNCTIONFS_ETH=y
-CONFIG_USB_FUNCTIONFS_RNDIS=y
-CONFIG_USB_FUNCTIONFS_GENERIC=y
-CONFIG_USB_MASS_STORAGE=m
-CONFIG_USB_GADGET_TARGET=m
-CONFIG_USB_G_SERIAL=m
-CONFIG_USB_MIDI_GADGET=m
-CONFIG_USB_G_PRINTER=m
-# CONFIG_USB_CDC_COMPOSITE is not set
-# CONFIG_USB_G_NOKIA is not set
-# CONFIG_USB_G_ACM_MS is not set
-# CONFIG_USB_G_MULTI is not set
-CONFIG_USB_G_HID=m
-CONFIG_USB_G_DBGP=m
-# CONFIG_USB_G_DBGP_PRINTK is not set
-CONFIG_USB_G_DBGP_SERIAL=y
-CONFIG_USB_G_WEBCAM=m
-CONFIG_UWB=m
-CONFIG_UWB_HWA=m
-CONFIG_UWB_WHCI=m
-CONFIG_UWB_I1480U=m
-CONFIG_MMC=m
-# CONFIG_MMC_DEBUG is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
-# CONFIG_MMC_CLKGATE is not set
-
-#
-# MMC/SD/SDIO Card Drivers
-#
-CONFIG_MMC_BLOCK=m
-CONFIG_MMC_BLOCK_MINORS=8
-CONFIG_MMC_BLOCK_BOUNCE=y
-CONFIG_SDIO_UART=m
-# CONFIG_MMC_TEST is not set
-
-#
-# MMC/SD/SDIO Host Controller Drivers
-#
-CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_PCI=m
-CONFIG_MMC_RICOH_MMC=y
-CONFIG_MMC_SDHCI_ACPI=m
-CONFIG_MMC_SDHCI_PLTFM=m
-CONFIG_MMC_WBSD=m
-CONFIG_MMC_TIFM_SD=m
-# CONFIG_MMC_SPI is not set
-CONFIG_MMC_SDRICOH_CS=m
-CONFIG_MMC_CB710=m
-CONFIG_MMC_VIA_SDMMC=m
-CONFIG_MMC_VUB300=m
-CONFIG_MMC_USHC=m
-CONFIG_MMC_REALTEK_PCI=m
-CONFIG_MEMSTICK=m
-# CONFIG_MEMSTICK_DEBUG is not set
-
-#
-# MemoryStick drivers
-#
-# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
-CONFIG_MSPRO_BLOCK=m
-
-#
-# MemoryStick Host Controller Drivers
-#
-CONFIG_MEMSTICK_TIFM_MS=m
-CONFIG_MEMSTICK_JMICRON_38X=m
-CONFIG_MEMSTICK_R592=m
-CONFIG_MEMSTICK_REALTEK_PCI=m
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-
-#
-# LED drivers
-#
-CONFIG_LEDS_LM3530=m
-CONFIG_LEDS_LM3533=m
-CONFIG_LEDS_LM3642=m
-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_LP5562=m
-CONFIG_LEDS_CLEVO_MAIL=m
-CONFIG_LEDS_PCA955X=m
-CONFIG_LEDS_PCA9633=m
-# CONFIG_LEDS_DAC124S085 is not set
-CONFIG_LEDS_BD2802=m
-CONFIG_LEDS_INTEL_SS4200=m
-CONFIG_LEDS_LT3593=m
-CONFIG_LEDS_DELL_NETBOOKS=m
-CONFIG_LEDS_MC13783=m
-CONFIG_LEDS_TCA6507=m
-CONFIG_LEDS_LM355x=m
-CONFIG_LEDS_OT200=m
-CONFIG_LEDS_BLINKM=m
-
-#
-# LED Triggers
-#
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_ONESHOT=m
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
-CONFIG_LEDS_TRIGGER_BACKLIGHT=m
-# CONFIG_LEDS_TRIGGER_CPU is not set
-CONFIG_LEDS_TRIGGER_GPIO=m
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
-
-#
-# iptables trigger is under Netfilter config (LED target)
-#
-CONFIG_LEDS_TRIGGER_TRANSIENT=m
-CONFIG_LEDS_TRIGGER_CAMERA=m
-CONFIG_ACCESSIBILITY=y
-CONFIG_A11Y_BRAILLE_CONSOLE=y
-# CONFIG_INFINIBAND is not set
-CONFIG_EDAC=y
-CONFIG_EDAC_LEGACY_SYSFS=y
-# CONFIG_EDAC_DEBUG is not set
-CONFIG_EDAC_DECODE_MCE=m
-CONFIG_EDAC_MCE_INJ=m
-CONFIG_EDAC_MM_EDAC=m
-CONFIG_EDAC_AMD64=m
-# CONFIG_EDAC_AMD64_ERROR_INJECTION is not set
-CONFIG_EDAC_E752X=m
-CONFIG_EDAC_I82975X=m
-CONFIG_EDAC_I3000=m
-CONFIG_EDAC_I3200=m
-CONFIG_EDAC_X38=m
-CONFIG_EDAC_I5400=m
-CONFIG_EDAC_I7CORE=m
-CONFIG_EDAC_I5000=m
-CONFIG_EDAC_I5100=m
-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
-
-#
-# RTC interfaces
-#
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
-CONFIG_RTC_INTF_DEV_UIE_EMUL=y
-CONFIG_RTC_DRV_TEST=m
-
-#
-# I2C RTC drivers
-#
-CONFIG_RTC_DRV_DS1307=m
-CONFIG_RTC_DRV_DS1374=m
-CONFIG_RTC_DRV_DS1672=m
-CONFIG_RTC_DRV_DS3232=m
-CONFIG_RTC_DRV_MAX6900=m
-CONFIG_RTC_DRV_RS5C372=m
-CONFIG_RTC_DRV_ISL1208=m
-CONFIG_RTC_DRV_ISL12022=m
-CONFIG_RTC_DRV_X1205=m
-CONFIG_RTC_DRV_PCF2127=m
-CONFIG_RTC_DRV_PCF8523=m
-CONFIG_RTC_DRV_PCF8563=m
-CONFIG_RTC_DRV_PCF8583=m
-CONFIG_RTC_DRV_M41T80=m
-CONFIG_RTC_DRV_M41T80_WDT=y
-CONFIG_RTC_DRV_BQ32K=m
-CONFIG_RTC_DRV_S35390A=m
-CONFIG_RTC_DRV_FM3130=m
-CONFIG_RTC_DRV_RX8581=m
-CONFIG_RTC_DRV_RX8025=m
-CONFIG_RTC_DRV_EM3027=m
-CONFIG_RTC_DRV_RV3029C2=m
-
-#
-# SPI RTC drivers
-#
-# CONFIG_RTC_DRV_M41T93 is not set
-# CONFIG_RTC_DRV_M41T94 is not set
-# CONFIG_RTC_DRV_DS1305 is not set
-# CONFIG_RTC_DRV_DS1390 is not set
-# CONFIG_RTC_DRV_MAX6902 is not set
-# CONFIG_RTC_DRV_R9701 is not set
-# 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
-#
-CONFIG_RTC_DRV_CMOS=y
-CONFIG_RTC_DRV_DS1286=m
-CONFIG_RTC_DRV_DS1511=m
-CONFIG_RTC_DRV_DS1553=m
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_STK17TA8=m
-CONFIG_RTC_DRV_M48T86=m
-CONFIG_RTC_DRV_M48T35=m
-CONFIG_RTC_DRV_M48T59=m
-CONFIG_RTC_DRV_MSM6242=m
-CONFIG_RTC_DRV_BQ4802=m
-CONFIG_RTC_DRV_RP5C01=m
-CONFIG_RTC_DRV_V3020=m
-CONFIG_RTC_DRV_DS2404=m
-CONFIG_RTC_DRV_PCF50633=m
-
-#
-# on-CPU RTC drivers
-#
-CONFIG_RTC_DRV_MC13XXX=m
-
-#
-# HID Sensor RTC drivers
-#
-# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
-CONFIG_DMADEVICES=y
-# CONFIG_DMADEVICES_DEBUG is not set
-
-#
-# DMA Devices
-#
-CONFIG_INTEL_MID_DMAC=m
-CONFIG_INTEL_IOATDMA=m
-CONFIG_DW_DMAC_CORE=m
-CONFIG_DW_DMAC=m
-CONFIG_DW_DMAC_PCI=m
-CONFIG_TIMB_DMA=m
-CONFIG_PCH_DMA=m
-CONFIG_DMA_ENGINE=y
-CONFIG_DMA_ACPI=y
-
-#
-# DMA Clients
-#
-CONFIG_NET_DMA=y
-CONFIG_ASYNC_TX_DMA=y
-# CONFIG_DMATEST is not set
-CONFIG_DCA=m
-CONFIG_AUXDISPLAY=y
-CONFIG_KS0108=m
-CONFIG_KS0108_PORT=0x378
-CONFIG_KS0108_DELAY=2
-CONFIG_CFAG12864B=m
-CONFIG_CFAG12864B_RATE=20
-CONFIG_UIO=m
-CONFIG_UIO_CIF=m
-CONFIG_UIO_PDRV=m
-CONFIG_UIO_PDRV_GENIRQ=m
-# CONFIG_UIO_DMEM_GENIRQ is not set
-CONFIG_UIO_AEC=m
-CONFIG_UIO_SERCOS3=m
-CONFIG_UIO_PCI_GENERIC=m
-CONFIG_UIO_NETX=m
-CONFIG_VFIO_IOMMU_TYPE1=m
-CONFIG_VFIO=m
-CONFIG_VFIO_PCI=m
-CONFIG_VFIO_PCI_VGA=y
-CONFIG_VIRT_DRIVERS=y
-CONFIG_VIRTIO=m
-
-#
-# Virtio drivers
-#
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_BALLOON=m
-CONFIG_VIRTIO_MMIO=m
-CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
-
-#
-# Microsoft Hyper-V guest support
-#
-CONFIG_HYPERV=m
-CONFIG_HYPERV_UTILS=m
-CONFIG_HYPERV_BALLOON=m
-
-#
-# Xen driver support
-#
-CONFIG_XEN_BALLOON=y
-# CONFIG_XEN_SELFBALLOONING is not set
-CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y
-CONFIG_XEN_SCRUB_PAGES=y
-CONFIG_XEN_DEV_EVTCHN=m
-CONFIG_XEN_BACKEND=y
-CONFIG_XENFS=m
-CONFIG_XEN_COMPAT_XENFS=y
-CONFIG_XEN_SYS_HYPERVISOR=y
-CONFIG_XEN_XENBUS_FRONTEND=y
-CONFIG_XEN_GNTDEV=m
-CONFIG_XEN_GRANT_DEV_ALLOC=m
-CONFIG_SWIOTLB_XEN=y
-CONFIG_XEN_TMEM=m
-CONFIG_XEN_PCIDEV_BACKEND=m
-CONFIG_XEN_PRIVCMD=m
-CONFIG_XEN_ACPI_PROCESSOR=m
-# CONFIG_XEN_MCE_LOG is not set
-CONFIG_XEN_HAVE_PVMMU=y
-CONFIG_STAGING=y
-CONFIG_ET131X=m
-CONFIG_SLICOSS=m
-CONFIG_USBIP_CORE=m
-CONFIG_USBIP_VHCI_HCD=m
-CONFIG_USBIP_HOST=m
-# CONFIG_USBIP_DEBUG is not set
-CONFIG_W35UND=m
-CONFIG_PRISM2_USB=m
-CONFIG_ECHO=m
-CONFIG_COMEDI=m
-# CONFIG_COMEDI_DEBUG is not set
-CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048
-CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480
-CONFIG_COMEDI_MISC_DRIVERS=y
-CONFIG_COMEDI_KCOMEDILIB=m
-CONFIG_COMEDI_BOND=m
-CONFIG_COMEDI_TEST=m
-CONFIG_COMEDI_PARPORT=m
-CONFIG_COMEDI_SERIAL2002=m
-CONFIG_COMEDI_SKEL=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
-CONFIG_COMEDI_ADDI_APCI_1516=m
-CONFIG_COMEDI_ADDI_APCI_1564=m
-CONFIG_COMEDI_ADDI_APCI_16XX=m
-CONFIG_COMEDI_ADDI_APCI_2032=m
-CONFIG_COMEDI_ADDI_APCI_2200=m
-CONFIG_COMEDI_ADDI_APCI_3120=m
-CONFIG_COMEDI_ADDI_APCI_3501=m
-CONFIG_COMEDI_ADDI_APCI_3XXX=m
-CONFIG_COMEDI_ADL_PCI6208=m
-CONFIG_COMEDI_ADL_PCI7X3X=m
-CONFIG_COMEDI_ADL_PCI8164=m
-CONFIG_COMEDI_ADL_PCI9111=m
-CONFIG_COMEDI_ADL_PCI9118=m
-CONFIG_COMEDI_ADV_PCI1710=m
-CONFIG_COMEDI_ADV_PCI1723=m
-CONFIG_COMEDI_ADV_PCI1724=m
-CONFIG_COMEDI_ADV_PCI_DIO=m
-CONFIG_COMEDI_AMPLC_DIO200_PCI=m
-CONFIG_COMEDI_AMPLC_PC236_PCI=m
-CONFIG_COMEDI_AMPLC_PC263_PCI=m
-CONFIG_COMEDI_AMPLC_PCI224=m
-CONFIG_COMEDI_AMPLC_PCI230=m
-CONFIG_COMEDI_CONTEC_PCI_DIO=m
-CONFIG_COMEDI_DAS08_PCI=m
-CONFIG_COMEDI_DT3000=m
-CONFIG_COMEDI_DYNA_PCI10XX=m
-CONFIG_COMEDI_UNIOXX5=m
-CONFIG_COMEDI_GSC_HPDI=m
-CONFIG_COMEDI_ICP_MULTI=m
-CONFIG_COMEDI_II_PCI20KC=m
-CONFIG_COMEDI_DAQBOARD2000=m
-CONFIG_COMEDI_JR3_PCI=m
-CONFIG_COMEDI_KE_COUNTER=m
-CONFIG_COMEDI_CB_PCIDAS64=m
-CONFIG_COMEDI_CB_PCIDAS=m
-CONFIG_COMEDI_CB_PCIDDA=m
-CONFIG_COMEDI_CB_PCIMDAS=m
-CONFIG_COMEDI_CB_PCIMDDA=m
-CONFIG_COMEDI_ME4000=m
-CONFIG_COMEDI_ME_DAQ=m
-CONFIG_COMEDI_NI_6527=m
-CONFIG_COMEDI_NI_65XX=m
-CONFIG_COMEDI_NI_660X=m
-CONFIG_COMEDI_NI_670X=m
-CONFIG_COMEDI_NI_LABPC_PCI=m
-CONFIG_COMEDI_NI_PCIDIO=m
-CONFIG_COMEDI_NI_PCIMIO=m
-CONFIG_COMEDI_RTD520=m
-CONFIG_COMEDI_S626=m
-CONFIG_COMEDI_SSV_DNP=m
-CONFIG_COMEDI_MITE=m
-CONFIG_COMEDI_NI_TIOCMD=m
-CONFIG_COMEDI_PCMCIA_DRIVERS=y
-CONFIG_COMEDI_CB_DAS16_CS=m
-CONFIG_COMEDI_DAS08_CS=m
-CONFIG_COMEDI_NI_DAQ_700_CS=m
-CONFIG_COMEDI_NI_DAQ_DIO24_CS=m
-CONFIG_COMEDI_NI_LABPC_CS=m
-CONFIG_COMEDI_NI_MIO_CS=m
-CONFIG_COMEDI_QUATECH_DAQP_CS=m
-CONFIG_COMEDI_USB_DRIVERS=y
-CONFIG_COMEDI_DT9812=m
-CONFIG_COMEDI_USBDUX=m
-CONFIG_COMEDI_USBDUXFAST=m
-CONFIG_COMEDI_USBDUXSIGMA=m
-CONFIG_COMEDI_VMK80XX=m
-CONFIG_COMEDI_8255=m
-CONFIG_COMEDI_FC=m
-CONFIG_COMEDI_AMPLC_DIO200=m
-CONFIG_COMEDI_AMPLC_PC236=m
-CONFIG_COMEDI_DAS08=m
-CONFIG_COMEDI_NI_LABPC=m
-CONFIG_COMEDI_NI_TIO=m
-CONFIG_ASUS_OLED=m
-# CONFIG_PANEL is not set
-CONFIG_R8187SE=m
-CONFIG_RTL8192U=m
-CONFIG_RTLLIB=m
-CONFIG_RTLLIB_CRYPTO_CCMP=m
-CONFIG_RTLLIB_CRYPTO_TKIP=m
-CONFIG_RTLLIB_CRYPTO_WEP=m
-CONFIG_RTL8192E=m
-CONFIG_R8712U=m
-CONFIG_RTS5139=m
-# CONFIG_RTS5139_DEBUG is not set
-# CONFIG_TRANZPORT is not set
-CONFIG_IDE_PHISON=m
-CONFIG_LINE6_USB=m
-# CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set
-CONFIG_USB_SERIAL_QUATECH2=m
-CONFIG_VT6655=m
-CONFIG_VT6656=m
-CONFIG_DX_SEP=m
-CONFIG_ZSMALLOC=y
-CONFIG_ZRAM=m
-# CONFIG_ZRAM_DEBUG is not set
-CONFIG_WLAGS49_H2=m
-CONFIG_WLAGS49_H25=m
-CONFIG_FB_SM7XX=m
-CONFIG_CRYSTALHD=m
-CONFIG_FB_XGI=m
-CONFIG_ACPI_QUICKSTART=m
-CONFIG_USB_ENESTORAGE=m
-CONFIG_BCM_WIMAX=m
-CONFIG_FT1000=m
-CONFIG_FT1000_USB=m
-CONFIG_FT1000_PCMCIA=m
-
-#
-# Speakup console speech
-#
-CONFIG_SPEAKUP=m
-CONFIG_SPEAKUP_SYNTH_ACNTSA=m
-CONFIG_SPEAKUP_SYNTH_ACNTPC=m
-CONFIG_SPEAKUP_SYNTH_APOLLO=m
-CONFIG_SPEAKUP_SYNTH_AUDPTR=m
-CONFIG_SPEAKUP_SYNTH_BNS=m
-CONFIG_SPEAKUP_SYNTH_DECTLK=m
-CONFIG_SPEAKUP_SYNTH_DECEXT=m
-CONFIG_SPEAKUP_SYNTH_DECPC=m
-CONFIG_SPEAKUP_SYNTH_DTLK=m
-CONFIG_SPEAKUP_SYNTH_KEYPC=m
-CONFIG_SPEAKUP_SYNTH_LTLK=m
-CONFIG_SPEAKUP_SYNTH_SOFT=m
-CONFIG_SPEAKUP_SYNTH_SPKOUT=m
-CONFIG_SPEAKUP_SYNTH_TXPRT=m
-CONFIG_SPEAKUP_SYNTH_DUMMY=m
-CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
-CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
-CONFIG_STAGING_MEDIA=y
-CONFIG_DVB_AS102=m
-CONFIG_DVB_CXD2099=m
-CONFIG_VIDEO_DT3155=m
-CONFIG_DT3155_CCIR=y
-CONFIG_DT3155_STREAMING=y
-CONFIG_VIDEO_GO7007=m
-CONFIG_VIDEO_GO7007_USB=m
-CONFIG_VIDEO_GO7007_LOADER=m
-# CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set
-CONFIG_SOLO6X10=m
-CONFIG_LIRC_STAGING=y
-CONFIG_LIRC_BT829=m
-CONFIG_LIRC_IGORPLUGUSB=m
-CONFIG_LIRC_IMON=m
-CONFIG_LIRC_PARALLEL=m
-CONFIG_LIRC_SASEM=m
-CONFIG_LIRC_SERIAL=m
-CONFIG_LIRC_SERIAL_TRANSMITTER=y
-CONFIG_LIRC_SIR=m
-CONFIG_LIRC_ZILOG=m
-
-#
-# Android
-#
-# CONFIG_ANDROID is not set
-CONFIG_USB_WPAN_HCD=m
-CONFIG_WIMAX_GDM72XX=m
-CONFIG_WIMAX_GDM72XX_QOS=y
-CONFIG_WIMAX_GDM72XX_K_MODE=y
-CONFIG_WIMAX_GDM72XX_WIMAX2=y
-CONFIG_WIMAX_GDM72XX_USB=y
-# CONFIG_WIMAX_GDM72XX_SDIO is not set
-CONFIG_WIMAX_GDM72XX_USB_PM=y
-CONFIG_NET_VENDOR_SILICOM=y
-CONFIG_SBYPASS=m
-CONFIG_BPCTL=m
-CONFIG_CED1401=m
-CONFIG_DGRP=m
-CONFIG_FIREWIRE_SERIAL=m
-CONFIG_ZCACHE=m
-# CONFIG_ZCACHE_DEBUG is not set
-CONFIG_RAMSTER=m
-# CONFIG_RAMSTER_DEBUG is not set
-# CONFIG_USB_DWC2 is not set
-CONFIG_USB_BTMTK=m
-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
-CONFIG_FUJITSU_LAPTOP=m
-# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
-CONFIG_FUJITSU_TABLET=m
-CONFIG_AMILO_RFKILL=m
-CONFIG_HP_ACCEL=m
-CONFIG_HP_WMI=m
-CONFIG_MSI_LAPTOP=m
-CONFIG_PANASONIC_LAPTOP=m
-CONFIG_COMPAL_LAPTOP=m
-CONFIG_SONY_LAPTOP=m
-# CONFIG_SONYPI_COMPAT is not set
-CONFIG_IDEAPAD_LAPTOP=m
-CONFIG_THINKPAD_ACPI=m
-CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
-# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
-# CONFIG_THINKPAD_ACPI_DEBUG is not set
-# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
-CONFIG_THINKPAD_ACPI_VIDEO=y
-CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
-CONFIG_SENSORS_HDAPS=m
-CONFIG_INTEL_MENLOW=m
-CONFIG_EEEPC_LAPTOP=m
-CONFIG_ASUS_WMI=m
-CONFIG_ASUS_NB_WMI=m
-CONFIG_EEEPC_WMI=m
-CONFIG_ACPI_WMI=m
-CONFIG_MSI_WMI=m
-CONFIG_TOPSTAR_LAPTOP=m
-CONFIG_ACPI_TOSHIBA=m
-CONFIG_TOSHIBA_BT_RFKILL=m
-CONFIG_ACPI_CMPC=m
-CONFIG_INTEL_IPS=m
-CONFIG_IBM_RTL=m
-CONFIG_XO15_EBOOK=m
-CONFIG_SAMSUNG_LAPTOP=m
-CONFIG_MXM_WMI=m
-CONFIG_INTEL_OAKTRAIL=m
-CONFIG_SAMSUNG_Q10=m
-CONFIG_APPLE_GMUX=m
-CONFIG_INTEL_RST=m
-CONFIG_INTEL_SMARTCONNECT=y
-CONFIG_PVPANIC=m
-
-#
-# Hardware Spinlock drivers
-#
-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_AMD_IOMMU=y
-# CONFIG_AMD_IOMMU_STATS is not set
-CONFIG_AMD_IOMMU_V2=m
-CONFIG_DMAR_TABLE=y
-CONFIG_INTEL_IOMMU=y
-# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
-CONFIG_INTEL_IOMMU_FLOPPY_WA=y
-CONFIG_IRQ_REMAP=y
-
-#
-# Remoteproc drivers
-#
-CONFIG_REMOTEPROC=m
-CONFIG_STE_MODEM_RPROC=m
-
-#
-# Rpmsg drivers
-#
-# CONFIG_PM_DEVFREQ is not set
-CONFIG_EXTCON=m
-
-#
-# Extcon Device Drivers
-#
-CONFIG_EXTCON_GPIO=m
-CONFIG_MEMORY=y
-# CONFIG_IIO is not set
-# CONFIG_NTB is not set
-# CONFIG_VME_BUS is not set
-# CONFIG_PWM is not set
-CONFIG_IPACK_BUS=m
-CONFIG_BOARD_TPCI200=m
-CONFIG_SERIAL_IPOCTAL=m
-# CONFIG_RESET_CONTROLLER is not set
-CONFIG_FMC=m
-CONFIG_FMC_FAKEDEV=m
-CONFIG_FMC_TRIVIAL=m
-CONFIG_FMC_WRITE_EEPROM=m
-CONFIG_FMC_CHARDEV=m
-
-#
-# Firmware Drivers
-#
-CONFIG_EDD=m
-# CONFIG_EDD_OFF is not set
-CONFIG_FIRMWARE_MEMMAP=y
-CONFIG_DELL_RBU=m
-CONFIG_DCDBAS=m
-CONFIG_DMIID=y
-CONFIG_DMI_SYSFS=m
-CONFIG_ISCSI_IBFT_FIND=y
-CONFIG_ISCSI_IBFT=m
-# CONFIG_GOOGLE_FIRMWARE is not set
-
-#
-# EFI (Extensible Firmware Interface) Support
-#
-CONFIG_EFI_VARS=m
-CONFIG_EFI_VARS_PSTORE=m
-CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
-
-#
-# File systems
-#
-CONFIG_DCACHE_WORD_ACCESS=y
-# CONFIG_EXT2_FS is not set
-# CONFIG_EXT3_FS is not set
-CONFIG_EXT4_FS=m
-CONFIG_EXT4_USE_FOR_EXT23=y
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-# CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD2=m
-# CONFIG_JBD2_DEBUG is not set
-CONFIG_FS_MBCACHE=m
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
-CONFIG_REISERFS_PROC_INFO=y
-CONFIG_REISERFS_FS_XATTR=y
-CONFIG_REISERFS_FS_POSIX_ACL=y
-CONFIG_REISERFS_FS_SECURITY=y
-CONFIG_JFS_FS=m
-CONFIG_JFS_POSIX_ACL=y
-CONFIG_JFS_SECURITY=y
-# CONFIG_JFS_DEBUG is not set
-CONFIG_JFS_STATISTICS=y
-CONFIG_XFS_FS=m
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_POSIX_ACL=y
-CONFIG_XFS_RT=y
-# CONFIG_XFS_WARN is not set
-# CONFIG_XFS_DEBUG is not set
-CONFIG_GFS2_FS=m
-CONFIG_GFS2_FS_LOCKING_DLM=y
-CONFIG_OCFS2_FS=m
-CONFIG_OCFS2_FS_O2CB=m
-CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
-CONFIG_OCFS2_FS_STATS=y
-# CONFIG_OCFS2_DEBUG_MASKLOG is not set
-# CONFIG_OCFS2_DEBUG_FS is not set
-CONFIG_BTRFS_FS=m
-CONFIG_BTRFS_FS_POSIX_ACL=y
-# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
-# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-# CONFIG_BTRFS_DEBUG is not set
-CONFIG_NILFS2_FS=m
-CONFIG_FS_POSIX_ACL=y
-CONFIG_EXPORTFS=y
-CONFIG_FILE_LOCKING=y
-CONFIG_FSNOTIFY=y
-CONFIG_DNOTIFY=y
-CONFIG_INOTIFY_USER=y
-CONFIG_FANOTIFY=y
-CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
-CONFIG_QUOTA=y
-CONFIG_QUOTA_NETLINK_INTERFACE=y
-# CONFIG_PRINT_QUOTA_WARNING is not set
-# CONFIG_QUOTA_DEBUG is not set
-CONFIG_QUOTA_TREE=m
-CONFIG_QFMT_V1=m
-CONFIG_QFMT_V2=m
-CONFIG_QUOTACTL=y
-CONFIG_QUOTACTL_COMPAT=y
-CONFIG_AUTOFS4_FS=y
-CONFIG_FUSE_FS=m
-CONFIG_CUSE=m
-CONFIG_GENERIC_ACL=y
-
-#
-# Caches
-#
-CONFIG_FSCACHE=m
-CONFIG_FSCACHE_STATS=y
-CONFIG_FSCACHE_HISTOGRAM=y
-# CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_OBJECT_LIST is not set
-CONFIG_CACHEFILES=m
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
-
-#
-# CD-ROM/DVD Filesystems
-#
-CONFIG_ISO9660_FS=m
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_UDF_FS=m
-CONFIG_UDF_NLS=y
-
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-CONFIG_NTFS_FS=m
-# CONFIG_NTFS_DEBUG is not set
-CONFIG_NTFS_RW=y
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_PROC_SYSCTL=y
-CONFIG_PROC_PAGE_MONITOR=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_TMPFS_XATTR=y
-CONFIG_HUGETLBFS=y
-CONFIG_HUGETLB_PAGE=y
-CONFIG_CONFIGFS_FS=y
-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
-# CONFIG_BEFS_DEBUG is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-CONFIG_JFFS2_FS=m
-CONFIG_JFFS2_FS_DEBUG=0
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-# CONFIG_JFFS2_SUMMARY is not set
-# CONFIG_JFFS2_FS_XATTR is not set
-# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-CONFIG_JFFS2_ZLIB=y
-# CONFIG_JFFS2_LZO is not set
-CONFIG_JFFS2_RTIME=y
-# CONFIG_JFFS2_RUBIN is not set
-CONFIG_UBIFS_FS=m
-# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
-CONFIG_LOGFS=m
-CONFIG_CRAMFS=m
-CONFIG_SQUASHFS=m
-CONFIG_SQUASHFS_XATTR=y
-CONFIG_SQUASHFS_ZLIB=y
-CONFIG_SQUASHFS_LZO=y
-CONFIG_SQUASHFS_XZ=y
-# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
-# CONFIG_SQUASHFS_EMBEDDED is not set
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-# CONFIG_VXFS_FS is not set
-CONFIG_MINIX_FS=m
-CONFIG_OMFS_FS=m
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_QNX6FS_FS is not set
-# CONFIG_ROMFS_FS is not set
-CONFIG_PSTORE=y
-# CONFIG_PSTORE_CONSOLE is not set
-# CONFIG_PSTORE_FTRACE is not set
-CONFIG_PSTORE_RAM=m
-# CONFIG_SYSV_FS is not set
-CONFIG_UFS_FS=m
-# CONFIG_UFS_FS_WRITE is not set
-# CONFIG_UFS_DEBUG is not set
-CONFIG_EXOFS_FS=m
-# CONFIG_EXOFS_DEBUG is not set
-CONFIG_F2FS_FS=m
-CONFIG_F2FS_STAT_FS=y
-CONFIG_F2FS_FS_XATTR=y
-CONFIG_F2FS_FS_POSIX_ACL=y
-CONFIG_F2FS_FS_SECURITY=y
-CONFIG_EFIVAR_FS=y
-CONFIG_ORE=m
-CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_NFS_FS=m
-CONFIG_NFS_V2=m
-CONFIG_NFS_V3=m
-CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=m
-CONFIG_NFS_SWAP=y
-CONFIG_NFS_V4_1=y
-CONFIG_NFS_V4_2=y
-CONFIG_PNFS_FILE_LAYOUT=m
-CONFIG_PNFS_BLOCK=m
-CONFIG_PNFS_OBJLAYOUT=m
-CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org"
-CONFIG_NFS_V4_SECURITY_LABEL=y
-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
-CONFIG_NFSD_V3_ACL=y
-CONFIG_NFSD_V4=y
-CONFIG_NFSD_V4_SECURITY_LABEL=y
-# CONFIG_NFSD_FAULT_INJECTION is not set
-CONFIG_LOCKD=m
-CONFIG_LOCKD_V4=y
-CONFIG_NFS_ACL_SUPPORT=m
-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
-CONFIG_CIFS=m
-CONFIG_CIFS_STATS=y
-# CONFIG_CIFS_STATS2 is not set
-CONFIG_CIFS_WEAK_PW_HASH=y
-CONFIG_CIFS_UPCALL=y
-CONFIG_CIFS_XATTR=y
-CONFIG_CIFS_POSIX=y
-CONFIG_CIFS_ACL=y
-# CONFIG_CIFS_DEBUG is not set
-CONFIG_CIFS_DFS_UPCALL=y
-CONFIG_CIFS_SMB2=y
-CONFIG_CIFS_FSCACHE=y
-CONFIG_NCP_FS=m
-# CONFIG_NCPFS_PACKET_SIGNING is not set
-# CONFIG_NCPFS_IOCTL_LOCKING is not set
-# CONFIG_NCPFS_STRONG is not set
-CONFIG_NCPFS_NFS_NS=y
-CONFIG_NCPFS_OS2_NS=y
-CONFIG_NCPFS_SMALLDOS=y
-CONFIG_NCPFS_NLS=y
-# CONFIG_NCPFS_EXTRAS is not set
-CONFIG_CODA_FS=m
-CONFIG_AFS_FS=m
-# CONFIG_AFS_DEBUG is not set
-CONFIG_AFS_FSCACHE=y
-CONFIG_9P_FS=m
-CONFIG_9P_FSCACHE=y
-CONFIG_9P_FS_POSIX_ACL=y
-CONFIG_9P_FS_SECURITY=y
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_737=m
-CONFIG_NLS_CODEPAGE_775=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_852=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_857=m
-CONFIG_NLS_CODEPAGE_860=m
-CONFIG_NLS_CODEPAGE_861=m
-CONFIG_NLS_CODEPAGE_862=m
-CONFIG_NLS_CODEPAGE_863=m
-CONFIG_NLS_CODEPAGE_864=m
-CONFIG_NLS_CODEPAGE_865=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_CODEPAGE_869=m
-CONFIG_NLS_CODEPAGE_936=m
-CONFIG_NLS_CODEPAGE_950=m
-CONFIG_NLS_CODEPAGE_932=m
-CONFIG_NLS_CODEPAGE_949=m
-CONFIG_NLS_CODEPAGE_874=m
-CONFIG_NLS_ISO8859_8=m
-CONFIG_NLS_CODEPAGE_1250=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_ASCII=m
-CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_ISO8859_2=m
-CONFIG_NLS_ISO8859_3=m
-CONFIG_NLS_ISO8859_4=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_ISO8859_6=m
-CONFIG_NLS_ISO8859_7=m
-CONFIG_NLS_ISO8859_9=m
-CONFIG_NLS_ISO8859_13=m
-CONFIG_NLS_ISO8859_14=m
-CONFIG_NLS_ISO8859_15=m
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_MAC_ROMAN=m
-CONFIG_NLS_MAC_CELTIC=m
-CONFIG_NLS_MAC_CENTEURO=m
-CONFIG_NLS_MAC_CROATIAN=m
-CONFIG_NLS_MAC_CYRILLIC=m
-CONFIG_NLS_MAC_GAELIC=m
-CONFIG_NLS_MAC_GREEK=m
-CONFIG_NLS_MAC_ICELAND=m
-CONFIG_NLS_MAC_INUIT=m
-CONFIG_NLS_MAC_ROMANIAN=m
-CONFIG_NLS_MAC_TURKISH=m
-CONFIG_NLS_UTF8=m
-CONFIG_DLM=m
-# CONFIG_DLM_DEBUG is not set
-
-#
-# Kernel hacking
-#
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-
-#
-# printk and dmesg options
-#
-CONFIG_PRINTK_TIME=y
-CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
-# CONFIG_BOOT_PRINTK_DELAY is not set
-CONFIG_DYNAMIC_DEBUG=y
-
-#
-# Compile-time checks and compiler options
-#
-# CONFIG_DEBUG_INFO is not set
-CONFIG_ENABLE_WARN_DEPRECATED=y
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_FRAME_WARN=2048
-CONFIG_STRIP_ASM_SYMS=y
-# CONFIG_READABLE_ASM is not set
-CONFIG_UNUSED_SYMBOLS=y
-CONFIG_DEBUG_FS=y
-# CONFIG_HEADERS_CHECK is not set
-# CONFIG_DEBUG_SECTION_MISMATCH is not set
-CONFIG_ARCH_WANT_FRAME_POINTERS=y
-CONFIG_FRAME_POINTER=y
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_DEBUG_KERNEL=y
-
-#
-# Memory Debugging
-#
-# CONFIG_DEBUG_PAGEALLOC is not set
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_SLUB_DEBUG_ON is not set
-# CONFIG_SLUB_STATS is not set
-CONFIG_HAVE_DEBUG_KMEMLEAK=y
-# CONFIG_DEBUG_KMEMLEAK is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_VIRTUAL is not set
-CONFIG_DEBUG_MEMORY_INIT=y
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
-# CONFIG_DEBUG_STACKOVERFLOW is not set
-CONFIG_HAVE_ARCH_KMEMCHECK=y
-# CONFIG_DEBUG_SHIRQ is not set
-
-#
-# Debug Lockups and Hangs
-#
-CONFIG_LOCKUP_DETECTOR=y
-CONFIG_HARDLOCKUP_DETECTOR=y
-# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
-CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
-# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
-CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
-CONFIG_DETECT_HUNG_TASK=y
-CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
-# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
-CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
-# CONFIG_PANIC_ON_OOPS is not set
-CONFIG_PANIC_ON_OOPS_VALUE=0
-CONFIG_SCHED_DEBUG=y
-CONFIG_SCHEDSTATS=y
-CONFIG_TIMER_STATS=y
-# CONFIG_DEBUG_PREEMPT is not set
-
-#
-# Lock Debugging (spinlocks, mutexes, etc...)
-#
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_RT_MUTEX_TESTER is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-CONFIG_DEBUG_MUTEXES=y
-# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_ATOMIC_SLEEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-CONFIG_STACKTRACE=y
-# CONFIG_DEBUG_KOBJECT is not set
-CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_DEBUG_WRITECOUNT is not set
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-# CONFIG_DEBUG_CREDENTIALS 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
-# CONFIG_RCU_CPU_STALL_INFO is not set
-# CONFIG_RCU_TRACE is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_NOTIFIER_ERROR_INJECTION is not set
-# CONFIG_FAULT_INJECTION is not set
-# CONFIG_LATENCYTOP is not set
-CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y
-# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
-CONFIG_USER_STACKTRACE_SUPPORT=y
-CONFIG_NOP_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-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_FENTRY=y
-CONFIG_HAVE_C_RECORDMCOUNT=y
-CONFIG_TRACER_MAX_TRACE=y
-CONFIG_TRACE_CLOCK=y
-CONFIG_RING_BUFFER=y
-CONFIG_EVENT_TRACING=y
-CONFIG_CONTEXT_SWITCH_TRACER=y
-CONFIG_RING_BUFFER_ALLOW_SWAP=y
-CONFIG_TRACING=y
-CONFIG_GENERIC_TRACER=y
-CONFIG_TRACING_SUPPORT=y
-CONFIG_FTRACE=y
-CONFIG_FUNCTION_TRACER=y
-CONFIG_FUNCTION_GRAPH_TRACER=y
-# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_PREEMPT_TRACER is not set
-CONFIG_SCHED_TRACER=y
-CONFIG_FTRACE_SYSCALLS=y
-CONFIG_TRACER_SNAPSHOT=y
-# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
-CONFIG_BRANCH_PROFILE_NONE=y
-# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
-# CONFIG_PROFILE_ALL_BRANCHES is not set
-CONFIG_STACK_TRACER=y
-CONFIG_BLK_DEV_IO_TRACE=y
-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
-CONFIG_MMIOTRACE=y
-# CONFIG_MMIOTRACE_TEST is not set
-CONFIG_RING_BUFFER_BENCHMARK=m
-# CONFIG_RING_BUFFER_STARTUP_TEST is not set
-
-#
-# Runtime Testing
-#
-CONFIG_LKDTM=m
-# CONFIG_TEST_LIST_SORT is not set
-# CONFIG_KPROBES_SANITY_TEST is not set
-# CONFIG_BACKTRACE_SELF_TEST is not set
-# CONFIG_RBTREE_TEST is not set
-# CONFIG_INTERVAL_TREE_TEST is not set
-# CONFIG_ATOMIC64_SELFTEST is not set
-CONFIG_ASYNC_RAID6_TEST=m
-# CONFIG_TEST_STRING_HELPERS is not set
-CONFIG_TEST_KSTRTOX=m
-# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
-# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
-# CONFIG_DMA_API_DEBUG is not set
-# CONFIG_SAMPLES is not set
-CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_KGDB is not set
-CONFIG_STRICT_DEVMEM=y
-CONFIG_X86_VERBOSE_BOOTUP=y
-CONFIG_EARLY_PRINTK=y
-# CONFIG_EARLY_PRINTK_DBGP is not set
-# CONFIG_X86_PTDUMP is not set
-CONFIG_DEBUG_RODATA=y
-# CONFIG_DEBUG_RODATA_TEST is not set
-# CONFIG_DEBUG_SET_MODULE_RONX is not set
-# CONFIG_DEBUG_NX_TEST is not set
-CONFIG_DOUBLEFAULT=y
-# CONFIG_DEBUG_TLBFLUSH is not set
-# CONFIG_IOMMU_DEBUG is not set
-# CONFIG_IOMMU_STRESS is not set
-CONFIG_HAVE_MMIOTRACE_SUPPORT=y
-# CONFIG_X86_DECODER_SELFTEST is not set
-CONFIG_IO_DELAY_TYPE_0X80=0
-CONFIG_IO_DELAY_TYPE_0XED=1
-CONFIG_IO_DELAY_TYPE_UDELAY=2
-CONFIG_IO_DELAY_TYPE_NONE=3
-CONFIG_IO_DELAY_0X80=y
-# CONFIG_IO_DELAY_0XED is not set
-# CONFIG_IO_DELAY_UDELAY is not set
-# CONFIG_IO_DELAY_NONE is not set
-CONFIG_DEFAULT_IO_DELAY_TYPE=0
-# CONFIG_DEBUG_BOOT_PARAMS is not set
-# CONFIG_CPA_DEBUG is not set
-# CONFIG_OPTIMIZE_INLINING is not set
-# CONFIG_DEBUG_NMI_SELFTEST is not set
-# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set
-
-#
-# Security options
-#
-CONFIG_KEYS=y
-CONFIG_TRUSTED_KEYS=m
-CONFIG_ENCRYPTED_KEYS=m
-# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
-# CONFIG_SECURITY_DMESG_RESTRICT is not set
-CONFIG_SECURITY=y
-CONFIG_SECURITYFS=y
-CONFIG_SECURITY_NETWORK=y
-# CONFIG_SECURITY_NETWORK_XFRM is not set
-CONFIG_SECURITY_PATH=y
-# CONFIG_INTEL_TXT is not set
-# CONFIG_SECURITY_SELINUX is not set
-# CONFIG_SECURITY_SMACK is not set
-CONFIG_SECURITY_TOMOYO=y
-CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
-CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
-# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
-CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/usr/bin/tomoyo-init"
-CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd"
-CONFIG_SECURITY_APPARMOR=y
-CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0
-# CONFIG_SECURITY_YAMA is not set
-# CONFIG_IMA is not set
-# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
-# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_DEFAULT_SECURITY=""
-CONFIG_XOR_BLOCKS=m
-CONFIG_ASYNC_CORE=m
-CONFIG_ASYNC_MEMCPY=m
-CONFIG_ASYNC_XOR=m
-CONFIG_ASYNC_PQ=m
-CONFIG_ASYNC_RAID6_RECOV=m
-CONFIG_CRYPTO=y
-
-#
-# Crypto core or helper
-#
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_AEAD=m
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_BLKCIPHER=m
-CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_HASH=m
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_RNG=m
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_PCOMP=m
-CONFIG_CRYPTO_PCOMP2=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_USER=m
-CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
-CONFIG_CRYPTO_GF128MUL=m
-CONFIG_CRYPTO_NULL=m
-CONFIG_CRYPTO_PCRYPT=m
-CONFIG_CRYPTO_WORKQUEUE=y
-CONFIG_CRYPTO_CRYPTD=m
-CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_ABLK_HELPER_X86=m
-CONFIG_CRYPTO_GLUE_HELPER_X86=m
-
-#
-# Authenticated Encryption with Associated Data
-#
-CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_GCM=m
-CONFIG_CRYPTO_SEQIV=m
-
-#
-# Block modes
-#
-CONFIG_CRYPTO_CBC=m
-CONFIG_CRYPTO_CTR=m
-CONFIG_CRYPTO_CTS=m
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_LRW=m
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_XTS=m
-
-#
-# Hash modes
-#
-CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_HMAC=m
-CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_VMAC=m
-
-#
-# Digest
-#
-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
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_RMD128=m
-CONFIG_CRYPTO_RMD160=m
-CONFIG_CRYPTO_RMD256=m
-CONFIG_CRYPTO_RMD320=m
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_SHA1_SSSE3=m
-CONFIG_CRYPTO_SHA256_SSSE3=m
-CONFIG_CRYPTO_SHA512_SSSE3=m
-CONFIG_CRYPTO_SHA256=m
-CONFIG_CRYPTO_SHA512=m
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_WP512=m
-CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
-
-#
-# Ciphers
-#
-CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_AES_X86_64=m
-CONFIG_CRYPTO_AES_NI_INTEL=m
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_BLOWFISH_COMMON=m
-CONFIG_CRYPTO_BLOWFISH_X86_64=m
-CONFIG_CRYPTO_CAMELLIA=m
-CONFIG_CRYPTO_CAMELLIA_X86_64=m
-CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m
-CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m
-CONFIG_CRYPTO_CAST_COMMON=m
-CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST5_AVX_X86_64=m
-CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_CAST6_AVX_X86_64=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_FCRYPT=m
-CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_SALSA20=m
-CONFIG_CRYPTO_SALSA20_X86_64=m
-CONFIG_CRYPTO_SEED=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
-CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
-CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-CONFIG_CRYPTO_TWOFISH_X86_64=m
-CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
-CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
-
-#
-# Compression
-#
-CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_ZLIB=m
-CONFIG_CRYPTO_LZO=y
-CONFIG_CRYPTO_LZ4=m
-CONFIG_CRYPTO_LZ4HC=m
-
-#
-# Random Number Generation
-#
-CONFIG_CRYPTO_ANSI_CPRNG=m
-CONFIG_CRYPTO_USER_API=m
-CONFIG_CRYPTO_USER_API_HASH=m
-CONFIG_CRYPTO_USER_API_SKCIPHER=m
-CONFIG_CRYPTO_HW=y
-CONFIG_CRYPTO_DEV_PADLOCK=m
-CONFIG_CRYPTO_DEV_PADLOCK_AES=m
-CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
-CONFIG_ASYMMETRIC_KEY_TYPE=m
-CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m
-CONFIG_PUBLIC_KEY_ALGO_RSA=m
-CONFIG_X509_CERTIFICATE_PARSER=m
-CONFIG_HAVE_KVM=y
-CONFIG_HAVE_KVM_IRQCHIP=y
-CONFIG_HAVE_KVM_IRQ_ROUTING=y
-CONFIG_HAVE_KVM_EVENTFD=y
-CONFIG_KVM_APIC_ARCHITECTURE=y
-CONFIG_KVM_MMIO=y
-CONFIG_KVM_ASYNC_PF=y
-CONFIG_HAVE_KVM_MSI=y
-CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
-CONFIG_VIRTUALIZATION=y
-CONFIG_KVM=m
-CONFIG_KVM_INTEL=m
-CONFIG_KVM_AMD=m
-CONFIG_KVM_MMU_AUDIT=y
-CONFIG_KVM_DEVICE_ASSIGNMENT=y
-CONFIG_BINARY_PRINTF=y
-
-#
-# Library routines
-#
-CONFIG_RAID6_PQ=m
-CONFIG_BITREVERSE=y
-CONFIG_GENERIC_STRNCPY_FROM_USER=y
-CONFIG_GENERIC_STRNLEN_USER=y
-CONFIG_GENERIC_NET_UTILS=y
-CONFIG_GENERIC_FIND_FIRST_BIT=y
-CONFIG_GENERIC_PCI_IOMAP=y
-CONFIG_GENERIC_IOMAP=y
-CONFIG_GENERIC_IO=y
-CONFIG_PERCPU_RWSEM=y
-CONFIG_CRC_CCITT=m
-CONFIG_CRC16=m
-CONFIG_CRC_T10DIF=m
-CONFIG_CRC_ITU_T=m
-CONFIG_CRC32=y
-# CONFIG_CRC32_SELFTEST is not set
-CONFIG_CRC32_SLICEBY8=y
-# CONFIG_CRC32_SLICEBY4 is not set
-# CONFIG_CRC32_SARWATE is not set
-# CONFIG_CRC32_BIT is not set
-CONFIG_CRC7=m
-CONFIG_LIBCRC32C=m
-CONFIG_CRC8=m
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=m
-CONFIG_LZO_COMPRESS=y
-CONFIG_LZO_DECOMPRESS=y
-CONFIG_LZ4_COMPRESS=m
-CONFIG_LZ4HC_COMPRESS=m
-CONFIG_LZ4_DECOMPRESS=y
-CONFIG_XZ_DEC=y
-CONFIG_XZ_DEC_X86=y
-CONFIG_XZ_DEC_POWERPC=y
-CONFIG_XZ_DEC_IA64=y
-CONFIG_XZ_DEC_ARM=y
-CONFIG_XZ_DEC_ARMTHUMB=y
-CONFIG_XZ_DEC_SPARC=y
-CONFIG_XZ_DEC_BCJ=y
-# CONFIG_XZ_DEC_TEST is not set
-CONFIG_DECOMPRESS_GZIP=y
-CONFIG_DECOMPRESS_BZIP2=y
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DECOMPRESS_XZ=y
-CONFIG_DECOMPRESS_LZO=y
-CONFIG_DECOMPRESS_LZ4=y
-CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_REED_SOLOMON=m
-CONFIG_REED_SOLOMON_ENC8=y
-CONFIG_REED_SOLOMON_DEC8=y
-CONFIG_REED_SOLOMON_DEC16=y
-CONFIG_BCH=m
-CONFIG_BCH_CONST_PARAMS=y
-CONFIG_TEXTSEARCH=y
-CONFIG_TEXTSEARCH_KMP=m
-CONFIG_TEXTSEARCH_BM=m
-CONFIG_TEXTSEARCH_FSM=m
-CONFIG_BTREE=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAS_DMA=y
-CONFIG_CHECK_SIGNATURE=y
-CONFIG_CPU_RMAP=y
-CONFIG_DQL=y
-CONFIG_NLATTR=y
-CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
-CONFIG_LRU_CACHE=m
-CONFIG_AVERAGE=y
-CONFIG_CLZ_TAB=y
-CONFIG_CORDIC=m
-CONFIG_DDR=y
-CONFIG_MPILIB=m
-CONFIG_OID_REGISTRY=m
-CONFIG_UCS2_STRING=y
-CONFIG_FONT_SUPPORT=y
-CONFIG_FONTS=y
-# CONFIG_FONT_8x8 is not set
-CONFIG_FONT_8x16=y
-# CONFIG_FONT_6x11 is not set
-# CONFIG_FONT_7x14 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_ACORN_8x8 is not set
-# CONFIG_FONT_MINI_4x6 is not set
-# CONFIG_FONT_SUN8x16 is not set
-# CONFIG_FONT_SUN12x22 is not set
-# CONFIG_FONT_10x18 is not set
-CONFIG_FONT_AUTOSELECT=y
diff --git a/libre-testing/linux-libre/logo_linux_clut224.ppm b/libre/linux-libre/logo_linux_clut224.ppm
index c9d837347..c9d837347 100644
--- a/libre-testing/linux-libre/logo_linux_clut224.ppm
+++ b/libre/linux-libre/logo_linux_clut224.ppm
diff --git a/libre-testing/linux-libre/logo_linux_mono.pbm b/libre/linux-libre/logo_linux_mono.pbm
index 3d3c35807..3d3c35807 100644
--- a/libre-testing/linux-libre/logo_linux_mono.pbm
+++ b/libre/linux-libre/logo_linux_mono.pbm
diff --git a/libre-testing/linux-libre/logo_linux_vga16.ppm b/libre/linux-libre/logo_linux_vga16.ppm
index f279f972c..f279f972c 100644
--- a/libre-testing/linux-libre/logo_linux_vga16.ppm
+++ b/libre/linux-libre/logo_linux_vga16.ppm
diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD
index 674e9440c..374a7662b 100644
--- a/libre/lirc-libre/PKGBUILD
+++ b/libre/lirc-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193774 2013-08-30 20:49:03Z foutrelis $
+# $Id: PKGBUILD 195936 2013-10-05 19:51:37Z tpowa $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
@@ -6,14 +6,14 @@ _pkgbase=lirc
 pkgbase=lirc-libre
 pkgname=('lirc-libre' 'lirc-utils-libre')
 pkgver=0.9.0
-pkgrel=58
+pkgrel=62
 epoch=1
-_extramodules=extramodules-3.10-LIBRE
+_extramodules=extramodules-3.11-LIBRE
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lirc.org/"
 license=('GPL')
 ### NOTICE don't forget to bump version in depends in package_lirc
-makedepends=('help2man' 'linux-libre>=3.10' 'linux-libre<3.11' 'linux-libre-headers>=3.10' 'linux-libre-headers<3.11' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2')
+makedepends=('help2man' 'linux-libre>=3.11' 'linux-libre<3.12' 'linux-libre-headers>=3.11' 'linux-libre-headers<3.12' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2')
 options=('!makeflags' '!strip')
 source=(http://prdownloads.sourceforge.net/${_pkgbase}/${_pkgbase}-${pkgver}.tar.bz2
         lirc_wpc8769l.patch
@@ -59,7 +59,7 @@ build() {
 
 package_lirc-libre() {
   pkgdesc="Linux Infrared Remote Control kernel modules for stock kernel (built for the linux-libre kernel package)"
-  depends=('lirc-utils-libre' 'linux-libre>=3.10' 'linux-libre<3.11')
+  depends=('lirc-utils-libre' 'linux-libre>=3.11' 'linux-libre<3.12')
   replaces=('lirc' 'lirc+pctv')
   conflicts=('lirc')
   provides=("lirc=$pkgver")
diff --git a/libre/lirc-libre/lirc.install b/libre/lirc-libre/lirc.install
index 09c6c1750..2f46d837b 100644
--- a/libre/lirc-libre/lirc.install
+++ b/libre/lirc-libre/lirc.install
@@ -1,4 +1,4 @@
-EXTRAMODULES=extramodules-3.10-LIBRE
+EXTRAMODULES=extramodules-3.11-LIBRE
 
 post_install() {
   # updating module dependencies
diff --git a/libre/mc-libre/PKGBUILD b/libre/mc-libre/PKGBUILD
index 1fb9fe810..70ccf5b93 100644
--- a/libre/mc-libre/PKGBUILD
+++ b/libre/mc-libre/PKGBUILD
@@ -1,12 +1,14 @@
-# $Id: PKGBUILD 95010 2013-08-03 09:40:52Z schuay $
+# $Id: PKGBUILD 97329 2013-09-18 07:33:03Z schuay $
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Maintainer: schuay <jakob.gruber@gmail.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Contributor (Parabola): Márcio Silva <coadde@parabola.nu>
 
 _pkgname=mc
 pkgname=mc-libre
 pkgver=4.8.10
-pkgrel=1
-pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander, with unar and arj recommendation included and nonfree unace recommendation removed"
+pkgrel=2.1
+pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander, with unar support and arj recommendation included and nonfree unace recommendation removed"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.ibiblio.org/mc/"
 license=('GPL')
@@ -15,7 +17,6 @@ depends=(
     'glib2'
     'gpm'
     'libssh2'
-    'pcre'
     'slang')
 makedepends=('libxt' 'libx11')
 optdepends=(
@@ -45,11 +46,30 @@ backup=('etc/mc/edit.indent.rc'
         'etc/mc/mc.keymap'
         'etc/mc/mc.menu'
         'etc/mc/sfs.ini')
-source=("http://www.midnight-commander.org/downloads/${_pkgname}-${pkgver}.tar.bz2")
+source=("http://www.midnight-commander.org/downloads/${_pkgname}-${pkgver}.tar.bz2"
+        "fs36962.diff"
+        "unar.in")
+
+prepare() {
+    cd "${srcdir}/${_pkgname}-${pkgver}"
+
+    ## add unar support removing nonfree urar on the source
+    rm -v src/vfs/extfs/helpers/urar.in
+    install -m644 $srcdir/unar.in src/vfs/extfs/helpers
+    sed -i '\|rar v -c- "${MC_EXT_FILENAME}" 2>/dev/null|d
+            s|    unrar v -c-|unar|
+           ' misc/ext.d/archive.sh
+    sed -i 's|urar.in|unar.in|g' $(grep -rlI 'urar.in')
+    sed -i '\|src/vfs/extfs/helpers/urar| s|urar|unar|g
+           ' configure{,.ac}
+    sed -i 's|urar|unar|g' src/vfs/extfs/helpers/Makefile.{am,in}
+}
 
 build() {
     cd "${srcdir}/${_pkgname}-${pkgver}"
 
+    patch -Np1 < "${srcdir}/fs36962.diff"
+
     ./configure --prefix=/usr --sysconfdir=/etc --enable-vfs-smb \
         --with-x --libexecdir=/usr/lib
 
@@ -69,4 +89,6 @@ package() {
         -i "${pkgdir}/usr/lib/mc/extfs.d/s3+"
 }
 
-md5sums=('eb4bdc23abd4fdfa14911d53d65c8186')
+md5sums=('eb4bdc23abd4fdfa14911d53d65c8186'
+         '7f7cf5388a5390c2ed49965492f490aa'
+         'f549a6c13ac0c3052986fcdc945648a9')
diff --git a/libre/mc-libre/fs36962.diff b/libre/mc-libre/fs36962.diff
new file mode 100644
index 000000000..0db5ed42b
--- /dev/null
+++ b/libre/mc-libre/fs36962.diff
@@ -0,0 +1,77 @@
+diff -ur mc-4.8.10-orig/src/filemanager/file.c mc-4.8.10/src/filemanager/file.c
+--- mc-4.8.10-orig/src/filemanager/file.c	2013-08-02 22:02:40.000000000 +0400
++++ mc-4.8.10/src/filemanager/file.c	2013-09-17 09:59:30.699635407 +0400
+@@ -1272,8 +1272,8 @@
+ 
+ /** Initialize variables for progress bars */
+ static FileProgressStatus
+-panel_operate_init_totals (FileOperation operation, const WPanel * panel, const char *source,
+-                           FileOpContext * ctx, filegui_dialog_type_t dialog_type)
++panel_operate_init_totals (const WPanel * panel, const char *source, FileOpContext * ctx,
++                           filegui_dialog_type_t dialog_type)
+ {
+     FileProgressStatus status;
+ 
+@@ -1282,7 +1282,7 @@
+         return FILE_CONT;
+ #endif
+ 
+-    if (operation != OP_MOVE && verbose && file_op_compute_totals)
++    if (verbose && file_op_compute_totals)
+     {
+         ComputeDirSizeUI *ui;
+ 
+@@ -2378,13 +2378,6 @@
+     mc_refresh ();
+     if (ctx->erase_at_end)
+     {
+-        /* remove files after move */
+-        if (erase_list != NULL)
+-        {
+-            file_op_context_destroy_ui (ctx);
+-            file_op_context_create_ui (ctx, FALSE, FILEGUI_DIALOG_DELETE_ITEM);
+-        }
+-
+         while (erase_list != NULL && return_status != FILE_ABORT)
+         {
+             struct link *lp = (struct link *) erase_list->data;
+@@ -2792,14 +2785,12 @@
+     {
+         if (operation == OP_DELETE)
+             dialog_type = FILEGUI_DIALOG_DELETE_ITEM;
++        else if (single_entry && S_ISDIR (selection (panel)->st.st_mode))
++            dialog_type = FILEGUI_DIALOG_MULTI_ITEM;
++        else if (single_entry || force_single)
++            dialog_type = FILEGUI_DIALOG_ONE_ITEM;
+         else
+-        {
+-            dialog_type = ((operation != OP_COPY) || single_entry || force_single)
+-                ? FILEGUI_DIALOG_ONE_ITEM : FILEGUI_DIALOG_MULTI_ITEM;
+-
+-            if (single_entry && (operation == OP_COPY) && S_ISDIR (selection (panel)->st.st_mode))
+-                dialog_type = FILEGUI_DIALOG_MULTI_ITEM;
+-        }
++            dialog_type = FILEGUI_DIALOG_MULTI_ITEM;
+     }
+ 
+     /* Initialize things */
+@@ -2844,8 +2835,8 @@
+         else
+             source_with_vpath = vfs_path_append_new (panel->cwd_vpath, source, (char *) NULL);
+ #endif /* WITH_FULL_PATHS */
+-        if (panel_operate_init_totals
+-            (operation, panel, vfs_path_as_str (source_with_vpath), ctx, dialog_type) == FILE_CONT)
++        if (panel_operate_init_totals (panel, vfs_path_as_str (source_with_vpath), ctx, dialog_type)
++            == FILE_CONT)
+         {
+             if (operation == OP_DELETE)
+             {
+@@ -2936,7 +2927,7 @@
+                 goto clean_up;
+         }
+ 
+-        if (panel_operate_init_totals (operation, panel, NULL, ctx, dialog_type) == FILE_CONT)
++        if (panel_operate_init_totals (panel, NULL, ctx, dialog_type) == FILE_CONT)
+         {
+             /* Loop for every file, perform the actual copy operation */
+             for (i = 0; i < panel->count; i++)
diff --git a/libre/mc-libre/unar.in b/libre/mc-libre/unar.in
new file mode 100644
index 000000000..3ba37b019
--- /dev/null
+++ b/libre/mc-libre/unar.in
@@ -0,0 +1,64 @@
+#! /bin/sh
+
+UNAR=`which unar 2>/dev/null`
+
+# Define $UNAR version
+UNAR_VERSION=`$UNAR -v`
+
+mcunar4fs_list ()
+{
+     $UNAR -q "$1" | @AWK@ -v uid=`id -u` -v gid=`id -g` '
+BEGIN { flag=0 }
+/^-------/ { flag++; if (flag > 1) exit 0; next }
+flag==1 {
+    str = substr($0, 2)
+    getline
+    split($4, a, "-")
+    if (index($6, "D") != 0)
+	$6="drwxr-xr-x"
+    else
+	if (index($6, ".") != 0)
+	    $6="-rw-r--r--"
+    printf "%s 1 %s %s %d %02d/%02d/%02d %s ./%s\n", $6, uid, gid, $1, a[2], a[1], a[3], $5, str
+}'
+}
+
+mcunarfs_list ()
+{
+     $UNAR -q "$1" | @AWK@ -v uid=`id -u` -v gid=`id -g` '
+BEGIN { flag=0 }
+/^-----------/ { flag++; if (flag > 1) exit 0; next }
+flag==1 {
+    split($5, a, "-")
+    if (index($1, "D") != 0)
+	$1="drwxr-xr-x"
+    else
+	if (index($1, ".") != 0)
+	    $1="-rw-r--r--"
+    printf "%s 1 %s %s %d %02d/%02d/%02d %s ./%s\n", $1, uid, gid, $2, a[2], a[1], a[3], $6, $8
+}'
+}
+
+mcunarfs_list ()
+{
+    mcunarfs_list "$@"
+}
+
+mcunarfs_copyout ()
+{
+    $UNAR -q "$1" "$2" > "$3"
+}
+
+umask 077
+
+cmd="$1"
+shift
+
+case "$cmd" in
+  # Workaround for a bug in mc - directories must precede files to
+  # avoid duplicate entries, so we sort output by filenames
+  list)    mcunarfs_list    "$@" | sort -k 8 ;;
+  copyout) mcunarfs_copyout "$@" ;;
+  *) exit 1 ;;
+esac
+exit 0
diff --git a/libre/mcomix-libre/PKGBUILD b/libre/mcomix-libre/PKGBUILD
index 97e796231..77baf60bc 100644
--- a/libre/mcomix-libre/PKGBUILD
+++ b/libre/mcomix-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 95818 2013-08-17 10:12:09Z schuay $
+# $Id: PKGBUILD 97188 2013-09-15 08:42:21Z schuay $
 # Maintainer: schuay <jakob.gruber@gmail.com>
 # Contributor: Ray Powell <ray_al@xphoniexx.net>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,12 +6,12 @@
 _pkgname=mcomix
 pkgname=mcomix-libre
 pkgver=1.00
-pkgrel=4
+pkgrel=5
 pkgdesc="A user-friendly, customizable image viewer specifically designed to handle comic books, with unar recommendation"
 arch=('any')
 url="http://sourceforge.net/projects/mcomix/"
 license=('GPL')
-depends=('pygtk' 'python-imaging' 'xdg-utils' 'python2' \
+depends=('pygtk' 'python2-pillow' 'xdg-utils' 'python2' \
          'desktop-file-utils' 'hicolor-icon-theme' 'python2-setuptools')
 makedepends=('gettext' 'intltool')
 optdepends=('unar: for rar compressed comics')
@@ -24,6 +24,9 @@ source=("http://downloads.sourceforge.net/project/mcomix/MComix-${pkgver}/mcomix
 build() {
   cd ${srcdir}/${_pkgname}-${pkgver}
 
+  # https://www.archlinux.org/todo/replace-pil-with-pillow/
+  sed -i 's/import Image/from PIL import Image/' mime/comicthumb
+
   # python2 fix
   for file in $(grep -Rl "/usr/bin/env python" .);
   do
diff --git a/libre/openshot-libre/PKGBUILD b/libre/openshot-libre/PKGBUILD
index 4c5c97a12..f5762f3e7 100644
--- a/libre/openshot-libre/PKGBUILD
+++ b/libre/openshot-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 92333 2013-06-04 05:05:15Z svenstaro $
+# $Id: PKGBUILD 97284 2013-09-16 08:04:43Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Asa Marco <marcoasa90[at]gmail[.]com>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,13 +6,13 @@
 _pkgname=openshot
 pkgname=openshot-libre
 pkgver=1.4.3
-pkgrel=2
+pkgrel=3
 pkgdesc="a free, non-linear video editor for GNU/Linux based on MLT framework, without nonfree faac recommendation"
 arch=('any')
 url="http://www.openshotvideo.com/"
 license=('GPL')
 depends=('mlt-python-bindings' 'pygoocanvas' 'sdl' 'librsvg' 'mplayer'
-	 'pyxdg' 'pygtk' 'python2-httplib2' 'python-imaging')
+	 'pyxdg' 'pygtk' 'python2-httplib2' 'python2-pillow')
 optdepends=('dvgrab: for IEEE digital sources'
 	    'libquicktime' 'libavc1394' 'jack' 'jack-rack' 'ladspa')
 replaces=$_pkgname
diff --git a/libre/openshot-libre/openshot.install b/libre/openshot-libre/openshot.install
index aab69abed..046df0051 100644
--- a/libre/openshot-libre/openshot.install
+++ b/libre/openshot-libre/openshot.install
@@ -1,5 +1,6 @@
 post_install() {
     update-mime-database usr/share/mime &>/dev/null
+	update-desktop-database -q
 }
 
 post_upgrade() {
diff --git a/libre/p7zip-libre/PKGBUILD b/libre/p7zip-libre/PKGBUILD
index a519499f7..0d9b79d4e 100644
--- a/libre/p7zip-libre/PKGBUILD
+++ b/libre/p7zip-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188504 2013-06-15 04:51:48Z bisson $
+# $Id: PKGBUILD 195474 2013-09-30 18:46:35Z bisson $
 # Contributor: Thayer Williams <thayer@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 # Contributor: TuxSpirit<tuxspirit@archlinux.fr>  2007/11/17 21:22:36 UTC
@@ -8,7 +8,7 @@
 pkgname=p7zip-libre
 _pkgname=${pkgname%-libre}
 pkgver=9.20.1
-pkgrel=7
+pkgrel=8
 pkgdesc='Command-line version of the 7zip compressed file archiver without Rar'
 url='http://p7zip.sourceforge.net/'
 license=('GPL')
@@ -30,13 +30,16 @@ sha1sums=('1cd567e043ee054bf08244ce15f32cb3258306b7'
 options=('!makeflags')
 install=install
 
-build() {
+prepare() {
 	cd "${srcdir}/${_pkgname}_${pkgver}"
-
+	rm GUI/kde4/p7zip_compress.desktop
 	[[ $CARCH = x86_64 ]] \
 	&& cp makefile.linux_amd64_asm makefile.machine \
 	|| cp makefile.linux_x86_asm_gcc_4.X makefile.machine
+}
 
+build() {
+	cd "${srcdir}/${_pkgname}_${pkgver}"
     msg "Removing unRar"
 # Generate patch
 #	sed -e '/Rar/d' -i makefile*
@@ -53,12 +56,16 @@ build() {
 
 package() {
 	cd "${srcdir}/${_pkgname}_${pkgver}"
-
 	make install \
 		DEST_DIR="${pkgdir}" \
 		DEST_HOME="/usr" \
 		DEST_MAN="/usr/share/man"
 
+	# Licenses
+	install -d "${pkgdir}"/usr/share/licenses/p7zip
+	ln -s -t "${pkgdir}"/usr/share/licenses/p7zip \
+		/usr/share/doc/p7zip/DOCS/License.txt
+
 	# Integration with stuff...
 	install -Dm644 GUI/p7zip_32.png "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/p7zip.png
 	install -d "${pkgdir}"/usr/share/{applications,kde4/services/ServiceMenus}
diff --git a/libre/parabolaiso-data/PKGBUILD b/libre/parabolaiso-data/PKGBUILD
new file mode 100644
index 000000000..22c1b98f6
--- /dev/null
+++ b/libre/parabolaiso-data/PKGBUILD
@@ -0,0 +1,29 @@
+# Maintainer: Esteban Carnevale <alfplayer@mailoo.org>
+
+pkgname=parabolaiso-data
+pkgver=1
+pkgrel=1
+pkgdesc="Data files of parabolaiso, the tool to create ISO images"
+arch=('any')
+url="https://projects.parabolagnulinux.org/parabolaiso.git"
+license=('GPL')
+_basesource1='https://projects.parabolagnulinux.org/~old/parabolaiso.git/plain'
+_basesource2='https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2'
+source=("${_basesource1}/configs/releng/syslinux/splash.png"
+        "${_basesource2}/ShellBinPkg/UefiShell/X64/Shell.efi"
+	"${_basesource2}/EdkShellBinPkg/FullShell/X64/Shell_Full.efi")
+md5sums=('befd0e7c38a03442b791f2a530b4dd2d'
+         '01a8ee2759fa2170c065414489d9b823'
+         '92d78841d0c44118064b59e95164b2ee')
+
+package() {
+  cd $srcdir
+
+  datadir="usr/share/parabolaiso/data"
+
+  install -d $pkgdir/$datadir
+
+  install -D -m644 splash.png $pkgdir/$datadir/splash.png
+  install -D -m644 Shell.efi $pkgdir/$datadir/Shell.efi
+  install -D -m644 Shell_Full.efi $pkgdir/$datadir/Shell_Full.efi
+}
diff --git a/libre/parabola-archiso/PKGBUILD b/libre/parabolaiso/PKGBUILD
index 336892373..833a6f56b 100755..100644
--- a/libre/parabola-archiso/PKGBUILD
+++ b/libre/parabolaiso/PKGBUILD
@@ -1,20 +1,21 @@
+# Maintainer: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): Esteban Carnevale <alfplayer@mailoo.org>
 
-pkgname=parabola-archiso
-pkgver=2012.10.17
-pkgrel=1
+pkgname=parabolaiso
+pkgver=2013.09.01
+pkgrel=2
 pkgdesc='Tools for creating Parabola GNU/Linux-libre live and install iso images'
 arch=('any')
-url='https://parabolagnulinux.org'
+url='https://projects.parabolagnulinux.org/parabolaiso.git/'
 license=('GPL')
-depends=('make' 'squashfs-tools' 'libisoburn' 'dosfstools' 'patch' 'lynx' 'wget')
+depends=('make' 'squashfs-tools' 'libisoburn' 'dosfstools' 'parabolaiso-data')
 provides=('archiso')
 conflicts=('archiso')
 source=("https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz"
         "https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz.sig")
-md5sums=('b8a5d4a6ee2547a502cbecea0e238e61'
-         '9425cc4353b5654d7478e9e2b0bf848d')
+md5sums=('e94c1f49f32e02480c14ee3162e8ee1b'
+         'SKIP')
 
 package() {
 	cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/libre/python2-reportlab-libre/PKGBUILD b/libre/python2-reportlab-libre/PKGBUILD
index de40ba89e..85f367409 100755
--- a/libre/python2-reportlab-libre/PKGBUILD
+++ b/libre/python2-reportlab-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 67753 2012-03-14 10:35:58Z giovanni $
+# $Id: PKGBUILD 97428 2013-09-19 18:56:42Z jelle $
 # Maintainer:
 # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
 # Contributor: William Rea <sillywilly@gmail.com>
@@ -9,26 +9,25 @@
 pkgbase=python-reportlab-libre
 pkgname=python2-reportlab-libre
 _origname=reportlab
-pkgver=2.6
+pkgver=2.7
 pkgrel=1
-pkgdesc="A proven industry-strength PDF generating solution (without non-free Adobe T1 fonts)"
+pkgdesc="A proven industry-strength PDF generating solution, without nonfree Adobe T1 fonts"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.reportlab.org/rl_toolkit.html"
-depends=('python2' 'freetype2' 'ttf-bitstream-vera' 'gsfonts' 'python-imaging')
-conflicts=('python2-reportlab' 'python-reportlab<=2.5-2')
-replaces=('python2-reportlab' 'python-reportlab<=2.5-2')
+depends=('python2' 'freetype2')
+conflicts=('python-reportlab<=2.5-2' 'python2-reportlab')
+replaces=('python-reportlab<=2.5-2' 'python2-reportlab')
 provides=("python2-reportlab=$pkgver")
 license=('custom')
-source=(http://www.reportlab.com/ftp/${_origname}-$pkgver.tar.gz
+source=(http://www.reportlab.com/ftp/reportlab-$pkgver.tar.gz
         free-fonts.patch)
-md5sums=('e5d27a24a2c8456b168913242aa1940f'
+md5sums=('78300e6fe8a0d020fc16734a3de80cc4'
          '1588b88851711cc6c868db4c7d4f4dea')
-optdepends=('ghostscript')
 
 build() {
     cd $srcdir/${_origname}-$pkgver
 
-    # remove non-free Adobe T1 fonts
+    # remove nonfree Adobe T1 fonts
     patch -p1 -i $srcdir/free-fonts.patch
 
     # Parabola contains those fonts from the ttf-bitstream-vera package
@@ -43,7 +42,11 @@ build() {
 
 package_python2-reportlab-libre() {
     cd $srcdir/${_origname}-$pkgver
-
     python2 setup.py install --root=$pkgdir --optimize=1
     install -D -m644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/license.txt
 }
+
+check() {
+    cd ${srcdir}/${_origname}-${pkgver}
+#    python2 setup.py tests
+}
diff --git a/libre/texlive-bin/09-texlive-fonts.conf b/libre/texlive-bin-libre/09-texlive-fonts.conf
index f870fbd7a..f870fbd7a 100644
--- a/libre/texlive-bin/09-texlive-fonts.conf
+++ b/libre/texlive-bin-libre/09-texlive-fonts.conf
diff --git a/libre/texlive-bin/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD
index 8ff03dacd..b35911f2c 100644
--- a/libre/texlive-bin/PKGBUILD
+++ b/libre/texlive-bin-libre/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 192005 2013-08-03 20:33:12Z remy $
+# $Id: PKGBUILD 193968 2013-09-09 10:10:47Z remy $
 # Maintainer: Rémy Oudompheng <remy@archlinux.org>
 # Contributor: francois <francois.archlinux.org>
 # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
 # Contributor (Parabola): André Silva <emulatorman@lavabit.com>
 
-pkgname=texlive-bin
+pkgname=texlive-bin-libre
 pkgver=2013.30973
-pkgrel=3
-pkgdesc="TeX Live binaries (Parabola rebranded)"
+pkgrel=4
+pkgdesc="TeX Live binaries, without biber binaries (Parabola rebranded)"
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('cairo' 'pixman' 'graphite' 't1lib' 'gd' 'poppler>=0.24.0'
@@ -15,9 +15,9 @@ depends=('cairo' 'pixman' 'graphite' 't1lib' 'gd' 'poppler>=0.24.0'
          'icu' 'harfbuzz' 'harfbuzz-icu')
 makedepends=('perl' 'clisp' 'ffcall')
 optdepends=('ed: for texconfig')
-provides=('lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam' 'texlive-bin-libre')
-conflicts=('pdfjam' 'texlive-bin-libre')
-replaces=('texlive-bin-libre')
+provides=('lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam' 'texlive-bin')
+conflicts=('pdfjam' 'texlive-bin')
+replaces=('texlive-bin')
 options=('!libtool' '!strip')
 url='http://tug.org/texlive/'
 install="texlive.install"
@@ -120,7 +120,6 @@ package() {
    ln -s luatex ${pkgdir}/usr/bin/dvilualatex
    ln -s luatex ${pkgdir}/usr/bin/dviluatex
    ln -s luatex ${pkgdir}/usr/bin/lualatex
-   ln -s luatex ${pkgdir}/usr/bin/pdfcsplain
    ln -s pdftex ${pkgdir}/usr/bin/amstex
    ln -s pdftex ${pkgdir}/usr/bin/cslatex
    ln -s pdftex ${pkgdir}/usr/bin/csplain
@@ -132,6 +131,8 @@ package() {
    ln -s pdftex ${pkgdir}/usr/bin/mllatex
    ln -s pdftex ${pkgdir}/usr/bin/mltex
    ln -s pdftex ${pkgdir}/usr/bin/pdfetex
+   ln -s pdftex ${pkgdir}/usr/bin/pdfcslatex
+   ln -s pdftex ${pkgdir}/usr/bin/pdfcsplain
    ln -s pdftex ${pkgdir}/usr/bin/pdfjadetex
    ln -s pdftex ${pkgdir}/usr/bin/pdflatex
    ln -s pdftex ${pkgdir}/usr/bin/pdfmex
diff --git a/libre/texlive-bin/fix-fontforge-encoding.patch b/libre/texlive-bin-libre/fix-fontforge-encoding.patch
index 8104b3289..8104b3289 100644
--- a/libre/texlive-bin/fix-fontforge-encoding.patch
+++ b/libre/texlive-bin-libre/fix-fontforge-encoding.patch
diff --git a/libre/texlive-bin/luatex-poppler-0.20.patch b/libre/texlive-bin-libre/luatex-poppler-0.20.patch
index 175824f3e..175824f3e 100644
--- a/libre/texlive-bin/luatex-poppler-0.20.patch
+++ b/libre/texlive-bin-libre/luatex-poppler-0.20.patch
diff --git a/libre/texlive-bin/luatex-r4449-radical-rule-thickness.patch b/libre/texlive-bin-libre/luatex-r4449-radical-rule-thickness.patch
index f925a1a93..f925a1a93 100644
--- a/libre/texlive-bin/luatex-r4449-radical-rule-thickness.patch
+++ b/libre/texlive-bin-libre/luatex-r4449-radical-rule-thickness.patch
diff --git a/libre/texlive-bin/poppler-0.20.patch b/libre/texlive-bin-libre/poppler-0.20.patch
index 3bd8183ab..3bd8183ab 100644
--- a/libre/texlive-bin/poppler-0.20.patch
+++ b/libre/texlive-bin-libre/poppler-0.20.patch
diff --git a/libre/texlive-bin/texlive.install b/libre/texlive-bin-libre/texlive.install
index 96a41bcfc..96a41bcfc 100644
--- a/libre/texlive-bin/texlive.install
+++ b/libre/texlive-bin-libre/texlive.install
diff --git a/libre/texlive-bin/texmf.cnf b/libre/texlive-bin-libre/texmf.cnf
index 76975ee5c..76975ee5c 100644
--- a/libre/texlive-bin/texmf.cnf
+++ b/libre/texlive-bin-libre/texmf.cnf
diff --git a/libre/texlive-core-libre/PKGBUILD b/libre/texlive-core-libre/PKGBUILD
index dfd68b3db..3c51d57cd 100644
--- a/libre/texlive-core-libre/PKGBUILD
+++ b/libre/texlive-core-libre/PKGBUILD
@@ -4,13 +4,13 @@
 
 pkgname=texlive-core-libre
 _pkgname=texlive-core
-pkgver=2013.30962
+pkgver=2013.31589
 _revnr=${pkgver#2013.}
-pkgrel=2
+pkgrel=1.1
 pkgdesc="TeX Live core distribution, without nonfree add-on packages (Parabola rebranded)"
 license=('GPL')
 arch=(any)
-depends=('texlive-bin-libre')
+depends=('texlive-bin-libre' 'perl')
 optdepends=(
   'ruby:        for old ConTeXT MkII and epspdf'
   'tk:          for texdoctk'
@@ -43,7 +43,7 @@ backup=(etc/texmf/web2c/texmf.cnf \
 	etc/texmf/web2c/mktex.cnf \
 	etc/texmf/xdvi/XDvi)
 
-md5sums=('cc2e2edd31b530d792460976c3ce940b'
+md5sums=('80c7fa3db1b468f9043c6acdd941a526'
          '306ab28bb9b070fc3e40d86d28ea7e8e'
          'd5a3f442ec3b7aa1518170f64f9d006b'
          '393a4bf67adc7ca5df2b386759d1a637')
@@ -67,6 +67,26 @@ build() {
    done
    echo "done"
    rm -rf {tlpkg,doc,source,omega} || true
+
+   # remove nonfree packages from updmap.cfg
+   sed -i '/ccpl.map/d'       texmf-dist/web2c/updmap.cfg
+   sed -i '/cs-charter.map/d' texmf-dist/web2c/updmap.cfg
+   sed -i '/csfonts.map/d'    texmf-dist/web2c/updmap.cfg
+   sed -i '/plother.map/d'    texmf-dist/web2c/updmap.cfg
+   sed -i '/pltext.map/d'     texmf-dist/web2c/updmap.cfg 
+
+   # remove nonfree packages from texlive-core.maps
+   sed -i '/ccpl.map/d'       texlive-core.maps
+   sed -i '/cs-charter.map/d' texlive-core.maps
+   sed -i '/csfonts.map/d'    texlive-core.maps
+   sed -i '/plother.map/d'    texlive-core.maps
+   sed -i '/pltext.map/d'     texlive-core.maps
+
+   # remove nonfree packages from fmtutil.cnf
+   sed -i '/cslatex/d'     texmf-dist/web2c/fmtutil.cnf
+   sed -i '/csplain/d'     texmf-dist/web2c/fmtutil.cnf
+   sed -i '/from mex/d'    texmf-dist/web2c/fmtutil.cnf
+   sed -i '/mexconf.tex/d' texmf-dist/web2c/fmtutil.cnf
 }
 
 package() {
diff --git a/libre/texlive-fontsextra-libre/PKGBUILD b/libre/texlive-fontsextra-libre/PKGBUILD
index 024cf8e65..816556575 100644
--- a/libre/texlive-fontsextra-libre/PKGBUILD
+++ b/libre/texlive-fontsextra-libre/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=texlive-fontsextra-libre
 _pkgname=texlive-fontsextra
-pkgver=2013.30955
+pkgver=2013.31570
 _revnr=${pkgver#2013.}
 pkgrel=1
 pkgdesc="TeX Live - all sorts of extra fonts, without nonfree add-on packages"
@@ -20,8 +20,8 @@ source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip" "$_pkg
 options=('!emptydirs')
 options=(!strip)
 install=texlive.install
-md5sums=('9e10d4fb01d87179bfd8e184e1be9dd7'
-         '2135455716c1e7356ce6a9c213827904')
+md5sums=('3f519371dd2e22e5b32daa461b89aea2'
+         'f489cc5f762dcdbe6acb11624de7e138')
 
 build() {
    cd "$srcdir"
diff --git a/libre/texlive-fontsextra-libre/texlive-fontsextra.maps b/libre/texlive-fontsextra-libre/texlive-fontsextra.maps
index 067ebb982..852afce52 100644
--- a/libre/texlive-fontsextra-libre/texlive-fontsextra.maps
+++ b/libre/texlive-fontsextra-libre/texlive-fontsextra.maps
@@ -62,14 +62,15 @@ Map dstroke.map
 Map dutchcal.map
 Map epigrafica.map
 Map esvect.map
+Map fbb.map
 Map fdsymbol.map
 Map fge.map
-Map fi4.map
 Map foekfont.map
 Map fonetika.map
 Map fourier-utopia-expert.map
 Map fourier.map
 Map frcursive.map
+Map gentium-type1.map
 Map gfsartemisia.map
 Map gfsbodoni.map
 Map gfscomplutum.map
@@ -88,9 +89,9 @@ Map libertine.map
 Map linearA.map
 Map mathabx.map
 Map mdbch.map
+Map mdgreek.map
 Map mdput.map
 Map mdsymbol.map
-Map mdugm.map
 Map newpx.map
 Map newtx.map
 Map ocrb.map
@@ -122,6 +123,7 @@ Map yv2.map
 Map yv3.map
 Map yvo.map
 Map yvt.map
+Map zi4.map
 MixedMap allrunes.map
 MixedMap bbold.map
 MixedMap cmll.map
diff --git a/libre/texlive-latexextra-libre/PKGBUILD b/libre/texlive-latexextra-libre/PKGBUILD
index 4d26a0884..8e1f0998f 100644
--- a/libre/texlive-latexextra-libre/PKGBUILD
+++ b/libre/texlive-latexextra-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 189264 2013-07-01 21:36:52Z remy $
+# $Id: PKGBUILD 193983 2013-09-09 12:57:56Z remy $
 # Maintainer: Firmicus <firmicus āt gmx dōt net>
 # Maintainer: Rémy Oudompheng <remy@archlinux.org>
 # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
@@ -6,16 +6,19 @@
 
 pkgname=texlive-latexextra-libre
 _pkgname=texlive-latexextra
-pkgver=2013.30964
+pkgver=2013.31588
 _revnr=${pkgver#2013.}
 pkgrel=1
 pkgdesc="TeX Live - Large collection of add-on packages for LaTeX, without nonfree add-on packages"
 license=('GPL')
 arch=(any)
-depends=('texlive-core')
+depends=('texlive-core'
+         'perl-file-which' # for pdfannotextractor
+        )
 optdepends=(
+  'texlive-genericextra: to use the calctab package'
   'texlive-pictures: to use the package overpic'
-  'jdk7-openjdk: for use by ppower4'
+  'jdk7-openjdk: to use pdfannotextractor'
 )
 provides=('texlive-latexextra')
 replaces=('texlive-latexextra')
@@ -26,7 +29,7 @@ source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip" "$_pkg
 options=('!emptydirs')
 options=(!strip)
 install=texlive.install
-md5sums=('64386dfe9fc40f2d4edc7c653d716bdf'
+md5sums=('7c9755ca4e104089fab816d805990f6f'
          '9e4825f47dac663dd62c4bfa67899e84')
 
 build() {
diff --git a/libre/tp_smapi-libre-lts/PKGBUILD b/libre/tp_smapi-libre-lts/PKGBUILD
index f726d9a8c..8283b6b66 100644
--- a/libre/tp_smapi-libre-lts/PKGBUILD
+++ b/libre/tp_smapi-libre-lts/PKGBUILD
@@ -10,15 +10,15 @@
 
 pkgname=tp_smapi-libre-lts
 _pkgname=tp_smapi
-_extramodules=/usr/lib/modules/extramodules-3.0-LIBRE-LTS
+_extramodules=/usr/lib/modules/extramodules-3.10-LIBRE-LTS
 pkgver=0.41
-pkgrel=12
+pkgrel=16
 pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre-lts kernel package)"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://github.com/evgeni/tp_smapi'
 license=('GPL')
-depends=('linux-libre-lts>=3.0' 'linux-libre-lts<3.1')
-makedepends=('linux-libre-lts-headers>=3.0' 'linux-libre-lts-headers<3.1')
+depends=('linux-libre-lts>=3.10' 'linux-libre-lts<3.11')
+makedepends=('linux-libre-lts-headers>=3.10' 'linux-libre-lts-headers<3.11')
 replaces=('tp_smapi-lts')
 conflicts=('tp_smapi-lts')
 provides=("tp_smapi-lts=${pkgver}")
diff --git a/libre/tp_smapi-libre-lts/tp_smapi-lts.install b/libre/tp_smapi-libre-lts/tp_smapi-lts.install
index 2723fead7..58c23092e 100644
--- a/libre/tp_smapi-libre-lts/tp_smapi-lts.install
+++ b/libre/tp_smapi-libre-lts/tp_smapi-lts.install
@@ -1,4 +1,4 @@
-extramodules=/usr/lib/modules/extramodules-3.0-LIBRE-LTS
+extramodules=/usr/lib/modules/extramodules-3.10-LIBRE-LTS
 
 post_install() {
   depmod -v $(< "$extramodules/version") &>/dev/null
diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD
index 68eb042d1..9d226780d 100644
--- a/libre/tp_smapi-libre/PKGBUILD
+++ b/libre/tp_smapi-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96510 2013-08-30 20:31:38Z foutrelis $
+# $Id: PKGBUILD 98084 2013-10-05 19:51:13Z tpowa $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: xduugu
 # Contributor: nh2
@@ -12,13 +12,13 @@
 _pkgname=tp_smapi
 pkgname=tp_smapi-libre
 pkgver=0.41
-pkgrel=33
+pkgrel=37
 pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre kernel package)"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://github.com/evgeni/tp_smapi'
 license=('GPL')
-depends=('linux-libre>=3.10' 'linux-libre<3.11')
-makedepends=('linux-libre-headers>=3.10' 'linux-libre-headers<3.11')
+depends=('linux-libre>=3.11' 'linux-libre<3.12')
+makedepends=('linux-libre-headers>=3.11' 'linux-libre-headers<3.12')
 replaces=("${_pkgname}")
 conflicts=("${_pkgname}")
 provides=("${_pkgname}=${pkgver}")
diff --git a/libre/tp_smapi-libre/tp_smapi.install b/libre/tp_smapi-libre/tp_smapi.install
index 0ce579ffb..e145576ad 100644
--- a/libre/tp_smapi-libre/tp_smapi.install
+++ b/libre/tp_smapi-libre/tp_smapi.install
@@ -1,4 +1,4 @@
-extramodules=/usr/lib/modules/extramodules-3.10-LIBRE
+extramodules=/usr/lib/modules/extramodules-3.11-LIBRE
 
 post_install() {
   depmod -v $(< "$extramodules/version") &>/dev/null
diff --git a/libre/unar/PKGBUILD b/libre/unar/PKGBUILD
index 1ca533b9b..3479ffefe 100755
--- a/libre/unar/PKGBUILD
+++ b/libre/unar/PKGBUILD
@@ -3,7 +3,7 @@
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname=unar
-pkgver=1.7
+pkgver=1.8
 pkgrel=1
 pkgdesc="An Objective-C application for uncompressing archive files"
 arch=('x86_64' 'i686' 'mips64el')
@@ -39,5 +39,5 @@ package() {
 }
 
 # vim:set ts=2 sw=2 et:
-md5sums=('c714bbd0b51f5c1d27044c229528c286'
+md5sums=('1b1d769855605a1687f13d0241e02821'
          '4fa4ecc6e4ba14d3b6952d064e728511')
diff --git a/libre/usermin/PKGBUILD b/libre/usermin/PKGBUILD
index 6f7eab297..5344a65c2 100644
--- a/libre/usermin/PKGBUILD
+++ b/libre/usermin/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 193449 2013-08-20 10:13:15Z tpowa $
+# $Id: PKGBUILD 195999 2013-10-07 10:42:06Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=usermin
-pkgver=1.560
+pkgver=1.570
 pkgrel=1
 pkgdesc="a web interface that can be used to easily perform tasks like reading mail, setting up SSH or configuring mail forwarding (Parabola rebranded)"
 arch=(i686 x86_64 mips64el)
@@ -124,6 +124,6 @@ package() {
   #install license
   install -m 644 -D "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/usermin/LICENCE
 }
-md5sums=('155af20dc957aca8a05bfd69d7ccf23a'
+md5sums=('4cfb713bb2fa2582cfe9a62802d588ab'
          'a5bd5e5ee779f8a3cf3d776ca77ee36e'
          'ec37a79f948f778224550930d2a7ca07')
diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD
index 83e133736..209b5e773 100644
--- a/libre/vhba-module-libre/PKGBUILD
+++ b/libre/vhba-module-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96512 2013-08-30 20:31:50Z foutrelis $
+# $Id: PKGBUILD 98086 2013-10-05 19:51:42Z tpowa $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Charles Lindsay <charles@chaoslizard.org>
@@ -7,13 +7,13 @@
 _pkgname=vhba-module
 pkgname=vhba-module-libre
 pkgver=20130607
-_extramodules=extramodules-3.10-LIBRE
-pkgrel=12
+_extramodules=extramodules-3.11-LIBRE
+pkgrel=16
 pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cdemu.sourceforge.net/"
 license=('GPL')
-depends=('linux-libre>=3.10' 'linux-libre<3.11')
+depends=('linux-libre>=3.11' 'linux-libre<3.12')
 makedepends=('linux-libre-headers')
 options=(!makeflags)
 install=$_pkgname.install
diff --git a/libre/webmin/PKGBUILD b/libre/webmin/PKGBUILD
index cd16179bc..17d02e437 100644
--- a/libre/webmin/PKGBUILD
+++ b/libre/webmin/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 193451 2013-08-20 10:13:52Z tpowa $
+# $Id: PKGBUILD 195997 2013-10-07 10:38:56Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=webmin
-pkgver=1.650
+pkgver=1.660
 pkgrel=1
 pkgdesc="a web-based interface for system administration (Parabola rebranded)"
 arch=(i686 x86_64 mips64el)
@@ -210,7 +210,7 @@ package() {
   # install license
   install -m 644 -D "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/webmin/LICENCE
 }
-md5sums=('b4d6370698fdd5e9ba930583ba0d10a3'
+md5sums=('56a685a665b864470eeb7ce6b97961d8'
          'b0b3e3fb231a12e60165b6b4d604dcfa'
          'c86518037449e0fc0c60fc24537ea038'
          'fc29ecb6a5cd8c278abe054e60381095')
diff --git a/nonprism/choqok-nonprism/PKGBUILD b/nonprism/choqok-nonprism/PKGBUILD
index abbb4073a..cf5c374b0 100644
--- a/nonprism/choqok-nonprism/PKGBUILD
+++ b/nonprism/choqok-nonprism/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: PKGBUILD 96779 2013-09-04 22:09:55Z andrea $
 # Maintainer: Peter Richard Lewis <plewis@aur.archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Emanuele Rossi <newdna1510@yahoo.it>
@@ -7,23 +7,25 @@
 
 _pkgname=choqok
 pkgname=choqok-nonprism
-pkgver=1.3
-pkgrel=4.2
+pkgver=1.4
+pkgrel=1
 pkgdesc="A status.net client for KDE, without Twitter support"
 url='http://choqok.gnufolks.org/'
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('kdebase-runtime' 'qjson' 'qoauth' 'qca-ossl')
-makedepends=('cmake' 'automoc4')
 optdepends=('kdebase-konqueror-libre: proxy support')
 provides=("$_pkgname=$pkgver")
 conflicts=$_pkgname
-replaces=$_pkgname
+depends=('kdebase-runtime' 'qjson' 'qoauth' 'qca-ossl')
+makedepends=('cmake' 'automoc4')
+optdepends=('kdebase-konqueror-libre: proxy support')
 install="${_pkgname}.install"
-source=("http://downloads.sourceforge.net/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2")
-md5sums=('87eea4f2c23467fb021e3e6b794eb37d')
+source=("http://downloads.sourceforge.net/${_pkgname}/${_pkgname}-${pkgver}.tar.xz")
+md5sums=('2efe34ed903b448a21d9233d8033dbdb')
 
 prepare() {
+  mkdir build
+
   cd "${srcdir}/${_pkgname}-${pkgver}"
 
   # remove twitter service and keep only twitterapi (choqok software) for status.net and open collaboration services
@@ -43,8 +45,6 @@ prepare() {
 }
 
 build() {
-  cd "${srcdir}"
-  mkdir build
   cd build
   cmake ../${_pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
@@ -53,9 +53,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build
+  cd build
   make DESTDIR="${pkgdir}" install
-
-  # This is already installed by kdepimlibs >= 4.9.80
-  rm "${pkgdir}"/usr/share/apps/cmake/modules/FindQtOAuth.cmake
 }
diff --git a/nonprism/empathy-nonprism/PKGBUILD b/nonprism/empathy-nonprism/PKGBUILD
index 602adb465..50c3fa399 100644
--- a/nonprism/empathy-nonprism/PKGBUILD
+++ b/nonprism/empathy-nonprism/PKGBUILD
@@ -1,9 +1,11 @@
+# $Id: PKGBUILD 194415 2013-09-16 09:02:51Z jgc $
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 _pkgname=empathy
 pkgname=empathy-nonprism
-pkgver=3.8.3
+pkgver=3.8.4
 pkgrel=1
-pkgdesc="A GNOME instant messaging client using the Telepathy framework, without support for unsafe and dangerous for privacy protocols"
+pkgdesc="A GNOME instant messaging client using the Telepathy framework, without telepathy-haze recommendation"
 arch=(i686 x86_64)
 url="http://live.gnome.org/Empathy"
 license=(GPL2)
@@ -20,7 +22,7 @@ replaces=("$_pkgname" 'empathy-coherence')
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
 source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz)
-sha256sums=('61e547c6f0929b3111219349482e2395a32f41bbd0852046405d835acba965c0')
+sha256sums=('cbc4934ce838e3d697616b5c36b070d2fc4fc57f84fd654c2f2cb2b8b650f5c9')
 
 build() {
   cd $_pkgname-$pkgver
@@ -36,4 +38,3 @@ package() {
   cd $_pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }
-
diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
index 86c23797a..f54f3b92c 100644
--- a/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
+++ b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 192541 2013-08-13 18:47:05Z andrea $
+# $Id: PKGBUILD 195745 2013-10-01 15:33:32Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=kdenetwork-kopete
 pkgname=kdenetwork-kopete-libre-nonprism
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc='Instant Messenger, without skype and support for unsafe and dangerous for privacy protocols'
 url='http://kde.org/applications/internet/kopete/'
@@ -22,7 +22,7 @@ source=("http://download.kde.org/stable/${pkgver}/src/kopete-${pkgver}.tar.xz"
         'libotr3.patch'
         'mediastreamer29.patch'
         'libre-nonprism.patch')
-sha1sums=('a67716f14a07cdbacf3df40983db17f594eb768b'
+sha1sums=('d7616376d7488050ce2c6ec6b7a1f4010fe91084'
           '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384'
           '317683a5c2acd0a0058c5ab42f6006e9db511ef3'
           '3c46e5c80ef0cd3f6fe9fb6d5cb8c252c6792208')
diff --git a/nonprism/kdepim-runtime-nonprism/PKGBUILD b/nonprism/kdepim-runtime-nonprism/PKGBUILD
index 204a69809..9e42ee3ca 100644
--- a/nonprism/kdepim-runtime-nonprism/PKGBUILD
+++ b/nonprism/kdepim-runtime-nonprism/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 192541 2013-08-13 18:47:05Z andrea $
+# $Id: PKGBUILD 195505 2013-10-01 15:14:14Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=kdepim-runtime
 pkgname=kdepim-runtime-nonprism
-pkgver=4.11.0
+pkgver=4.11.2
 pkgrel=1
 pkgdesc='Extends the functionality of kdepim, without libkgapi and libkfbapi support'
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@ replaces=('kdepim-runtime' 'kdepim-runtime-coherence')
 conflicts=kdepim-runtime
 provides=kdepim-runtime=$pkgver
 source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz")
-sha1sums=('ec2a45baf0c2c2ccea633b599a453db52b38dc75')
+sha1sums=('acc133c3c9d5cff0cdc9901b5ff7bd8b31a15825')
 
 prepare() {
   mkdir build
diff --git a/pcr/android-udev/PKGBUILD b/pcr/android-udev/PKGBUILD
new file mode 100644
index 000000000..10fe60934
--- /dev/null
+++ b/pcr/android-udev/PKGBUILD
@@ -0,0 +1,26 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (AUR): M0Rf30 
+# Contributor: marlock
+
+pkgname=android-udev
+pkgver=20130911
+_gitver=8dfd1cd0002d7067d24a2ef89360212f164f3856
+url="https://github.com/M0Rf30/android-udev-rules"
+pkgdesc='Udev rules to for Android devices.'
+
+# The author is the maintainer of the AUR package, where it is listed as GPL;
+# this is the best hint to the license that we have.
+license=('GPL')
+
+pkgrel=1
+arch=('any')
+source=("51-android-$pkgver.rules::https://raw.github.com/M0Rf30/android-udev-rules/$_gitver/51-android.rules")
+depends=('systemd' 'libmtp')
+install='android-udev.install'
+
+package() {
+  cd "$srcdir"
+  install -Dm755 "$srcdir"/51-android-$pkgver.rules "$pkgdir"/usr/lib/udev/rules.d/51-android.rules
+}
+
+md5sums=('1b2033fcf52b1b0ffa807ba90b11fd14')
diff --git a/pcr/android-udev/android-udev.install b/pcr/android-udev/android-udev.install
new file mode 100644
index 000000000..dcb1ebc20
--- /dev/null
+++ b/pcr/android-udev/android-udev.install
@@ -0,0 +1,12 @@
+post_install() {
+    post_upgrade
+    echo "NOTE: To use adb as a normal user you have to add yourself to the adbusers group"
+}
+
+post_upgrade() {
+    { getent group adbusers || /usr/sbin/groupadd adbusers; } &>/dev/null
+}
+
+post_remove() {
+    getent group adbusers &>/dev/null && /usr/sbin/groupdel adbusers
+}
diff --git a/pcr/audio-entropyd/PKGBUILD b/pcr/audio-entropyd/PKGBUILD
new file mode 100644
index 000000000..c691c0128
--- /dev/null
+++ b/pcr/audio-entropyd/PKGBUILD
@@ -0,0 +1,29 @@
+# Maintainer: fauno <fauno@parabola.nu>
+pkgname=audio-entropyd
+pkgver=2.0.3
+pkgrel=1
+pkgdesc="Feeds the /dev/random device with entropy-data read from an audio device"
+arch=('i686')
+url="http://vanheusden.com/aed/"
+license=('GPL2')
+groups=('entropy')
+depends=('alsa-lib')
+source=(http://www.vanheusden.com/aed/${pkgname}-${pkgver}.tgz
+        ${pkgname}.service)
+
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+	make
+}
+
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
+
+  install -D -m 755 ${pkgname} ${pkgdir}/usr/bin/${pkgname}
+  install -D -m 644 ${srcdir}/${pkgname}.service \
+                    ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
+}
+sha1sums=('b788559c6c01e17bb9d314ac2a7411bc30fbb8a2'
+          '6d3ad093176efaa0e5a4fe80113048aa9c4810ce')
+sha256sums=('6fbaf1c4f77e988f4656cd079309d5eb6bd36cbae89c2ee01324c5690adaf3ff'
+            '41704fac32b2c180c1fb6155b902445e2c5bc493da0191180cb3720cd72bd42c')
diff --git a/pcr/audio-entropyd/audio-entropyd.service b/pcr/audio-entropyd/audio-entropyd.service
new file mode 100644
index 000000000..feff7cae4
--- /dev/null
+++ b/pcr/audio-entropyd/audio-entropyd.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Gathering entropy from audio
+After=sound.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/audio-entropyd
+
+[Install]
+WantedBy=multi-user.target
diff --git a/pcr/chiliproject/PKGBUILD b/pcr/chiliproject/PKGBUILD
deleted file mode 100644
index 976316dc4..000000000
--- a/pcr/chiliproject/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-
-pkgname=chiliproject
-pkgver=3.3.0
-pkgrel=1
-pkgdesc="Chiliproject is a fork of Redmine, a flexible project management web application written using Ruby on Rails."
-arch=('any')
-url="https://www.chiliproject.org"
-license=('GPL2')
-depends=('ruby' 'ruby-bundler' 'mysql' 'libxml2' 'libxslt' 'imagemagick' 'pkg-config')
-provides=('chiliproject')
-backup=('var/lib/chiliproject/config/database.yml'
-       'var/lib/chiliproject/config/configuration.yml')
-makedepends=('glibc')
-optdepends=('git: Git repository browsing'
-            'subversion>=1.3.0: Subversion repository browsing'
-            'darcs: Darcs repository browsing'
-            'bzr: Bazaar repository browsing'
-            'mercurial: Mercurial repository browsing')
-options=()
-install=chiliproject.install
-source=("https://www.chiliproject.org/attachments/download/360/chiliproject-$pkgver.tar.gz")
-md5sums=('4fa4a825cf0cd91d7495180a19bc4c11')
-
-build() {
-	return 0
-}
-
-package() {
-	cd "$srcdir/chiliproject-$pkgver"
-
-	# install in /var/lib
-	_instdir="$pkgdir/var/lib/chiliproject"
-	mkdir -p ${_instdir}
-	cp -ra . ${_instdir}
-
-	# create required directories
-	mkdir -p "${_instdir}/public/plugin_assets"
-}
-
-# vim:set ts=4 sw=4 et:
diff --git a/pcr/chiliproject/chiliproject.install b/pcr/chiliproject/chiliproject.install
deleted file mode 100644
index cb4622f09..000000000
--- a/pcr/chiliproject/chiliproject.install
+++ /dev/null
@@ -1,17 +0,0 @@
-adjust_perms(){
-  chown -R http:http "/var/lib/chiliproject" 1>/dev/null
-  for dir in /var/lib/chiliproject/{files,log,tmp,public/plugin_assets}; do
-    chown -R http:http "$dir" 1>/dev/null
-    chmod -R 755 "$dir" 1>/dev/null
-  done
-}
-
-post_install() {
-  adjust_perms
-  echo 'take a look at https://wiki.archlinux.org/index.php?title=Chiliproject for further setup instructions.'
-}
-
-post_upgrade() {
-  adjust_perms
-  echo 'take a look at https://wiki.archlinux.org/index.php?title=Chiliproject for further setup instructions.'
-}
diff --git a/pcr/darcsver/PKGBUILD b/pcr/darcsver/PKGBUILD
new file mode 100644
index 000000000..e93250680
--- /dev/null
+++ b/pcr/darcsver/PKGBUILD
@@ -0,0 +1,26 @@
+# Maintainer: Andreas B. Wagner <AndreasBWagner@pointfree.net>
+# Maintainer: Nicolas Pouillard <nicolas.pouillard@gmail.com>
+# Contributor: Peter Simons <simons@cryp.to>
+pkgname=darcsver
+pkgver=1.7.4
+pkgrel=2
+pkgdesc="generate a version number from darcs history"
+arch=('any')
+url='http://allmydata.org/trac/darcsver'
+license=('BSD')
+depends=('python2')
+makedepends=('python2-mock' 'python2-distribute')
+source=( http://pypi.python.org/packages/source/d/$pkgname/$pkgname-$pkgver.tar.gz )
+md5sums=('e38aecd1343ab8447888a479ab12cb59')
+
+build(){
+  cd "$srcdir/$pkgname-$pkgver"
+  python2 setup.py build
+}
+
+package(){
+  cd "$srcdir/$pkgname-$pkgver"
+  python2 setup.py install --root="$pkgdir"
+
+  install -Dm644 darcsver.egg-info/PKG-INFO $pkgdir/usr/share/licenses/$pkgname/LICENSE
+}
diff --git a/pcr/debootstrap-libre/PKGBUILD b/pcr/debootstrap-libre/PKGBUILD
index e4f4ef65e..b4ea8c09f 100644
--- a/pcr/debootstrap-libre/PKGBUILD
+++ b/pcr/debootstrap-libre/PKGBUILD
@@ -3,12 +3,12 @@
 _pkgname=debootstrap
 pkgname=debootstrap-libre
 pkgver=1.0.53
-pkgrel=3
+pkgrel=3.1
 pkgdesc="A tool used to create a gNewSense or Trisquel base system from scratch, without requiring the availability of dpkg or apt (Debian support removed)"
 arch=('any')
 license=('GPL')
 url="http://packages.debian.org/sid/debootstrap"
-depends=('wget')
+depends=('binutils' 'wget')
 replaces=$_pkgname
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
diff --git a/pcr/dirt/PKGBUILD b/pcr/dirt/PKGBUILD
new file mode 100644
index 000000000..d269b41f8
--- /dev/null
+++ b/pcr/dirt/PKGBUILD
@@ -0,0 +1,23 @@
+# Maintainer: fauno <fauno@parabola.nu>
+pkgname=dirt
+pkgver=1.0.0a28
+pkgrel=1
+pkgdesc="Multi-platform IRC proxy that adds FiSH-compatible chat encryption (including DH1080 key exchanges) to any IRC client"
+arch=('i686')
+url="http://dirtirc.sourceforge.net/"
+license=('GPL2')
+depends=('openssl')
+source=(http://ufpr.dl.sourceforge.net/project/dirtirc/Dirt/1.0.0%20alpha%2028/${pkgname}-${pkgver}-source.tar.gz)
+
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+	make unix
+}
+
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
+
+  install -D -m 755 dirtirc ${pkgdir}/usr/bin/dirtirc
+}
+sha1sums=('0f7f407f5a3cb0f083b95d81849efde90177e7d2')
+sha256sums=('c1e8bc212a54739ba45f10a6f157f1a80052c913863e6624c434d7335fc2721b')
diff --git a/pcr/dratmenu/PKGBUILD b/pcr/dratmenu/PKGBUILD
new file mode 100644
index 000000000..8d6a2b357
--- /dev/null
+++ b/pcr/dratmenu/PKGBUILD
@@ -0,0 +1,36 @@
+# Contributor: ivoarch <ivkuzev@gmail.com>
+# Maintainer : Parabola Aurélien DESBRIÈRES <aurelien@replicant.io>
+
+pkgname=dratmenu
+pkgver=20121218
+pkgrel=1
+pkgdesc="ratpoison window dmenu"
+arch=('any')
+url="https://github.com/dimatura/dratmenu.git"
+license=('GPL')
+depends=('dmenu' 'python2')
+makedepends=('git')
+
+_gitroot="https://github.com/dimatura/dratmenu.git"
+_gitname="master"
+
+build() {
+        cd $srcdir
+
+        if [ -d $srcdir/$pkgname ] ; then
+                  msg "update git"
+               cd $pkgname && git pull origin
+               else
+                  msg "clone git"
+                    git clone $_gitroot
+                    fi
+}
+
+package() {
+          mkdir -p $pkgdir/usr/lib/python2.7/site-packages
+          cp -r $srcdir/$pkgname $pkgdir/usr/lib/python2.7/site-packages
+          mkdir -p $pkgdir/usr/bin
+          echo "#!/bin/bash
+          python2 /usr/lib/python2.7/site-packages/$pkgname/dratmenu.py" > $pkgdir/usr/bin/dratmenu
+          chmod +x $pkgdir/usr/bin/dratmenu
+}
diff --git a/~lukeshu/emacs-lucid/PKGBUILD b/pcr/emacs-lucid/PKGBUILD
index ebc49645d..f88607e0a 100644
--- a/~lukeshu/emacs-lucid/PKGBUILD
+++ b/pcr/emacs-lucid/PKGBUILD
@@ -1,29 +1,36 @@
-# $Id: PKGBUILD 169743 2012-10-27 23:41:39Z eric $
+# $Id: PKGBUILD 192474 2013-08-12 20:25:41Z eric $
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
 # Maintainer (Arch): Juergen Hoetzel <juergen@archlinux.org>
-# Contributor (Arch): Renchi Raju <renchi@green.tam.uiuc.edu>
+# Contributor: Renchi Raju <renchi@green.tam.uiuc.edu>
 
 _pkgname=emacs
 pkgname=emacs-lucid
-pkgver=24.2
-pkgrel=2
-pkgdesc="The extensible, customizable, self-documenting real-time display editor (lucid tooklit instead of GTK3)"
-
-provides=("$_pkgname=$pkgver")
-conflicts=("$_pkgname")
-
+pkgver=24.3
+pkgrel=4
+pkgdesc="The extensible, customizable, self-documenting real-time display editor"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/emacs/emacs.html"
 license=('GPL3')
-depends=('librsvg' 'gpm' 'giflib' 'm17n-lib' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick')
+depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick')
 install=emacs.install
-source=(ftp://ftp.gnu.org/gnu/emacs/$_pkgname-$pkgver.tar.bz2{,.sig})
-md5sums=('1676803a50e8adc817fdaaebb9234f14' 'ca1766337f419ef827dd96d1ff78f158')
+source=(ftp://ftp.gnu.org/gnu/emacs/$_pkgname-$pkgver.tar.xz{,.sig}
+        emacs-24.3-giflib5.patch)
+md5sums=('ea9ed000ca165280265aabb55b9afbd7'
+         'SKIP'
+         '560cdf463299e059c5fadf474bcba218')
 
+pkgdesc+=", with the Lucid X11 toolkit"
+provides=("$_pkgname=$pkgver")
+conflicts=("$_pkgname")
+
+prepare() {
+  cd $_pkgname-$pkgver
+  patch -Np0 -i ../emacs-24.3-giflib5.patch
+}
 
 build() {
   cd "$srcdir"/$_pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
+  ac_cv_lib_gif_EGifPutExtensionLast=yes ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
     --localstatedir=/var --with-x-toolkit=lucid --with-xft
   make
 }
@@ -35,10 +42,10 @@ package() {
   # remove conflict with ctags package
   mv "$pkgdir"/usr/bin/{ctags,ctags.emacs}
   mv "$pkgdir"/usr/share/man/man1/{ctags.1.gz,ctags.emacs.1}
-  # fix all the 777 perms on directories
-  find "$pkgdir"/usr/share/emacs -type d -exec chmod 755 {} \;
+  # remove conflict with texinfo
+  rm "$pkgdir"/usr/share/info/info.info.gz
   # fix user/root permissions on usr/share files
-  find "$pkgdir"/usr/share/emacs -exec chown root:root {} \;
+  find "$pkgdir"/usr/share/emacs/$pkgver -exec chown root:root {} \;
   # fix perms on /var/games
   chmod 775 "$pkgdir"/var/games
   chmod 775 "$pkgdir"/var/games/emacs
diff --git a/pcr/emacs-lucid/emacs-24.3-giflib5.patch b/pcr/emacs-lucid/emacs-24.3-giflib5.patch
new file mode 100644
index 000000000..b8571abb2
--- /dev/null
+++ b/pcr/emacs-lucid/emacs-24.3-giflib5.patch
@@ -0,0 +1,26 @@
+--- src/image.c
++++ src/image.c	2013-05-21 15:49:41.945819346 +0000
+@@ -7192,7 +7192,11 @@ gif_load (struct frame *f, struct image
+ 	}
+ 
+       /* Open the GIF file.  */
++#if GIFLIB_MAJOR < 5
+       gif = fn_DGifOpenFileName (SSDATA (file));
++#else
++      gif = fn_DGifOpenFileName (SSDATA (file), NULL);
++#endif
+       if (gif == NULL)
+ 	{
+ 	  image_error ("Cannot open `%s'", file, Qnil);
+@@ -7213,7 +7217,11 @@ gif_load (struct frame *f, struct image
+       memsrc.len = SBYTES (specified_data);
+       memsrc.index = 0;
+ 
++#if GIFLIB_MAJOR < 5
+       gif = fn_DGifOpen (&memsrc, gif_read_from_memory);
++#else
++      gif = fn_DGifOpen (&memsrc, gif_read_from_memory, NULL);
++#endif
+       if (!gif)
+ 	{
+ 	  image_error ("Cannot open memory source `%s'", img->spec, Qnil);
diff --git a/~lukeshu/emacs-lucid/emacs.install b/pcr/emacs-lucid/emacs.install
index d84f1de14..6712f44ba 100644
--- a/~lukeshu/emacs-lucid/emacs.install
+++ b/pcr/emacs-lucid/emacs.install
@@ -1,11 +1,11 @@
 ICON_PATH=usr/share/icons/hicolor
 INFO_DIR=usr/share/info
 
-INFO_FILES=(ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse
-ede ediff edt efaq eieio eintr elisp emacs emacs-mime epa erc eshell eudc flymake
-forms gnus idlwave info mairix-el message mh-e newsticker nxml-mode
+INFO_FILES=(ada-mode auth autotype bovine calc ccmode cl dbus dired-x ebrowse
+ede ediff edt efaq eieio eintr elisp emacs emacs-gnutls emacs-mime epa erc ert eshell eudc flymake
+forms gnus htmlfontify idlwave mairix-el message mh-e newsticker nxml-mode
 org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail
-speedbar tramp url vip viper widget woman)
+speedbar srecode tramp url vip viper widget wisent woman)
 
 post_install() {
   gtk-update-icon-cache -q -t -f ${ICON_PATH}
@@ -13,7 +13,7 @@ post_install() {
 
   [[ -x usr/bin/install-info ]] || return 0
   for f in ${INFO_FILES[@]}; do
-    install-info ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null
+    install-info ${INFO_DIR}/$f.info.gz ${INFO_DIR}/dir 2> /dev/null
   done
 }
 
@@ -27,6 +27,6 @@ pre_remove() {
 
   [[ -x usr/bin/install-info ]] || return 0
   for f in ${INFO_FILES[@]}; do
-    install-info --delete ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null
+    install-info --delete ${INFO_DIR}/$f.info.gz ${INFO_DIR}/dir 2> /dev/null
   done
 }
diff --git a/pcr/gnomeradio/PKGBUILD b/pcr/gnomeradio/PKGBUILD
new file mode 100644
index 000000000..1fa76de08
--- /dev/null
+++ b/pcr/gnomeradio/PKGBUILD
@@ -0,0 +1,49 @@
+# Maintainer: none
+# Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (AUR): tritonas00 <tritonas00@gmail.com>
+# Contributor: Ivan Rojas <kirdux@gmail.com>
+
+# Because gnomeradio is written against ancient libraries, we must patch it to
+# compile and work on a modern system.  Let's just grab the patch series that
+# Debian uses.
+_debver=1.8-2 # which patches to grab from Debian
+_debrepo=http://ftp.debian.org/debian/pool/main
+_debfile() { echo "${_debrepo}/${1:0:1}/${1}/${1}_${2}"; }
+
+pkgname=gnomeradio
+pkgver=1.8
+pkgrel=6.1
+pkgdesc="An FM-radio tuner for the GNOME desktop"
+url="https://projects.gnome.org/gnomeradio/"
+license=('GPL')
+arch=('i686' 'x86_64')
+install=gnomeradio.install
+depends=(libgnome-media-profiles lirc-utils hicolor-icon-theme)
+makedepends=(gnome-doc-utils intltool gnome-vfs libgnomeui v4l-utils)
+source=(https://launchpad.net/$pkgname/stable/$pkgver/+download/$pkgname-$pkgver.tar.gz
+	$(_debfile "$pkgname" "$_debver").debian.tar.gz)
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+  while read -r patchfile; do
+    patch -p1 -i "$srcdir/debian/patches/$patchfile"
+  done <"$srcdir/debian/patches/series"
+  autoconf
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  LIBS=-lm ./configure --prefix=/usr --sysconfdir=/etc --disable-scrollkeeper \
+    --disable-install-schemas
+  make
+}
+
+package () {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+  mkdir "$pkgdir"/usr/share/pixmaps
+  install data/icons/scalable/gnomeradio.svg "$pkgdir"/usr/share/pixmaps/gnomeradio.svg
+}
+
+md5sums=('26f07c432dffeebec3cc904f99295427'
+         '019ce748f8463d3eaebbb3e88d18d3e0')
diff --git a/pcr/gnomeradio/gnomeradio.install b/pcr/gnomeradio/gnomeradio.install
new file mode 100644
index 000000000..1a05f573e
--- /dev/null
+++ b/pcr/gnomeradio/gnomeradio.install
@@ -0,0 +1,11 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/pcr/hiawatha/PKGBUILD b/pcr/hiawatha/PKGBUILD
new file mode 100644
index 000000000..1ea4d6435
--- /dev/null
+++ b/pcr/hiawatha/PKGBUILD
@@ -0,0 +1,117 @@
+# Maintainer: Kurt Marasco <celilo _at_ lavabit _dot_ com>
+# Contributor: Pascal Ernster <aur at hardfalcon dot net>
+
+pkgname=hiawatha
+pkgver=9.2
+pkgrel=1
+pkgdesc="Secure and advanced webserver"
+url="https://www.hiawatha-webserver.org/"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('libxslt' 'polarssl')
+optdepends=('php-fpm: Provides modern PHP fast cgi support (Recommended) ')
+makedepends=('cmake')
+install=$pkgname.install
+backup=(
+        usr/lib/systemd/system/hiawatha.service
+        etc/hiawatha/hiawatha.conf
+        etc/hiawatha/hiawatha.conf.sample
+        etc/hiawatha/cgi-wrapper.conf
+        etc/hiawatha/mimetype.conf
+        srv/http/hiawatha/cdcatalog.xml
+        srv/http/hiawatha/cdcatalog.xslt
+)
+
+source=(
+        "http://hiawatha-webserver.org/files/${pkgname}-${pkgver}.tar.gz" 
+        'hiawatha.conf.sample'
+        'cdcatalog.xml'
+        'cdcatalog.xslt'
+        'hiawatha.service'
+        'hiawatha.install'
+)
+sha256sums=(
+        '5d9cdec51c618bb3efab747030e593d9bd49dfaf3236254c8e0cb60715716dbf'
+        '4671d2586cbe3cd6497b16ff422c6143cdab40641ef3c9c4988c478351a8f5e7'
+        '7757d6e5fe363b917a2823ba8b5194509ed6914e7c088d04ae72f9bd73efcb58'
+        'f28aa336da6f0fb124a1092039e695d233569cb32632223f786603ffb6ed5471'
+        'fb789b12bb6246237b15a9244f58317abdd53e5ca4eb55880e40a498b2237155'
+        '3b60a884102a6212a4963c041dd2a5a32fb18833f758e9be5d021bbc630ed627'
+)
+
+build() {
+        cd "$srcdir/${pkgname}-${pkgver}"
+        
+        cmake . -DCMAKE_INSTALL_PREFIX="/" \
+                -DCMAKE_INSTALL_BINDIR="/usr/bin" \
+                -DCMAKE_INSTALL_SBINDIR="/usr/bin" \
+                -DCMAKE_INSTALL_SYSCONFDIR="/etc/hiawatha" \
+                -DCMAKE_INSTALL_LIBDIR="/usr/lib" \
+                -DCMAKE_INSTALL_MANDIR="/usr/share/man" \
+                -DCONFIG_DIR="/etc/hiawatha" \
+                -DLOG_DIR="/var/log/hiawatha" \
+                -DPID_DIR="/run" \
+                -DENABLE_SSL=ON \
+                -DUSE_SYSTEM_POLARSSL=on \
+                -DWEBROOT_DIR="/srv/http" \
+        -DWORK_DIR="/var/lib/hiawatha"
+        make
+	
+	# The default capabilities are installed by this PKGBUILD
+	# The following build options are available to customize your installation:
+	# modify the above cmake command to customize
+	#option						description					required libraries when feature enabled
+	# cmake options
+	# -DENABLE_CACHE=ON|off		Enable internal cache support.
+	# -DENABLE_DEBUG=on|OFF		Enable debug information (for development only).
+	# -DENABLE_IPV6=ON|off		Enable IPv6 support.
+	# -DENABLE_MONITOR=on|OFF	Enable support for the Hiawatha Monitor.
+	# -DENABLE_RPROXY=ON|off	Enable reverse proxy support.
+	# -DENABLE_SSL=ON|off		Enable SSL (PolarSSL) support.
+	# -DENABLE_TOMAHAWK=on|OFF	Enable Tomahawk, Hiawatha command shell.
+	# -DENABLE_TOOLKIT=ON|off	Enable the URL Toolkit.
+	# -DENABLE_XSLT=ON|off		Enable XSLT support. libxml2, libxslt1
+        # -DUSE_SYSTEM_POLARSSL=on|OFF  Compile Hiawatha against the system's PolarSSL library (>=1.2.0).
+
+	# The following path settings are available for CMake.
+	# -DCMAKE_INSTALL_PREFIX=<path>		The prefix for all other CMAKE_INSTALL directories.	
+	# -DCMAKE_INSTALL_BINDIR=<path>		Location of the ssi-cgi binary.	
+	# -DCMAKE_INSTALL_SBINDIR=<path>		Location of the other Hiawatha binaries.
+	# -DCMAKE_INSTALL_SYSCONFDIR=<path>	The configuration files will be installed in /hiawatha.	
+	# -DCMAKE_INSTALL_LIBDIR=<path>		The PolarSSL shared library will be installed in /hiawatha.	
+	# -DCMAKE_INSTALL_MANDIR=<path>		Manual pages will be installed in /man1.	
+	# -DCONFIG_DIR=<path>					Location of the Hiawatha configuration files.	
+	# -DLOG_DIR=<path>					Log directory used in the default hiawatha.conf.	
+	# -DPID_DIR=<path>					Location of the Hiawatha and php-fcgi PID files.	
+	# -DWEBROOT_DIR=<path>				Webroot directory used in the default hiawatha.conf.	
+	# -DWORK_DIR=<path>					Path of directory where Hiawatha can write temporary files.
+}
+
+package() {
+        cd "$srcdir/$pkgname-$pkgver"	
+        make DESTDIR="$pkgdir/" install
+	
+        # Fix hiawatha.conf (formerly httpd.conf)
+        sed -e 's|#ServerId = www-data|ServerId = http|' \
+                -e 's|/var/www/|/srv/http/|g' \
+		-e 's|//|/|g' \
+                -e 's|#CGIextension = cgi|&\n#TriggerOnCGIstatus = yes|g' \
+                -e 's|ConnectTo = 127.0.0.1:2005|ConnectTo = 127.0.0.1:9000|g' \
+                -e 's|#	Extension = php|&\n#       SessionTimeout = 30|g' \
+                -e 's|#ErrorHandler = 404:/error.cgi|&\n#UseGZfile = yes|g' \
+                -i "$pkgdir/etc/hiawatha/hiawatha.conf"
+	
+        # Fix hiawatha logrotate file (/etc/logrotate.d/hiawatha)
+        sed -e 's|www-data|http|g' -i "$srcdir/$pkgname-$pkgver/logrotate.d/hiawatha"
+        mkdir "$pkgdir/etc/logrotate.d"
+        install -m644 "$srcdir/$pkgname-$pkgver/logrotate.d/hiawatha" "$pkgdir/etc/logrotate.d/hiawatha"
+	
+        # Add startup scripts
+        install -D -m755 "$srcdir/hiawatha.service" "$pkgdir/usr/lib/systemd/system/hiawatha.service"
+	
+        # Install sample configuration implementing a virtual server for phpmyadmin, php-fpm, and a default website on localhost
+        install -m644 "$srcdir/hiawatha.conf.sample" "$pkgdir/etc/hiawatha/"
+        # Install sample XSLT transformation on default website on localhost
+        install -m644 "$srcdir/cdcatalog.xml" "$pkgdir/srv/http"
+        install -m644 "$srcdir/cdcatalog.xslt" "$pkgdir/srv/http"
+}
diff --git a/pcr/hiawatha/cdcatalog.xml b/pcr/hiawatha/cdcatalog.xml
new file mode 100644
index 000000000..efc35f9ff
--- /dev/null
+++ b/pcr/hiawatha/cdcatalog.xml
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>

+<!-- Edited with XML Spy v4.2 -->

+<catalog>

+	<cd>

+		<title>Empire Burlesque</title>

+		<artist>Bob Dylan</artist>

+		<country>USA</country>

+		<company>Columbia</company>

+		<price>10.90</price>

+		<year>1985</year>

+	</cd>

+	<cd>

+		<title>Hide your heart</title>

+		<artist>Bonnie Tyler</artist>

+		<country>UK</country>

+		<company>CBS Records</company>

+		<price>9.90</price>

+		<year>1988</year>

+	</cd>

+	<cd>

+		<title>Greatest Hits</title>

+		<artist>Dolly Parton</artist>

+		<country>USA</country>

+		<company>RCA</company>

+		<price>9.90</price>

+		<year>1982</year>

+	</cd>

+	<cd>

+		<title>Still got the blues</title>

+		<artist>Gary Moore</artist>

+		<country>UK</country>

+		<company>Virgin records</company>

+		<price>10.20</price>

+		<year>1990</year>

+	</cd>

+	<cd>

+		<title>Eros</title>

+		<artist>Eros Ramazzotti</artist>

+		<country>EU</country>

+		<company>BMG</company>

+		<price>9.90</price>

+		<year>1997</year>

+	</cd>

+	<cd>

+		<title>One night only</title>

+		<artist>Bee Gees</artist>

+		<country>UK</country>

+		<company>Polydor</company>

+		<price>10.90</price>

+		<year>1998</year>

+	</cd>

+	<cd>

+		<title>Sylvias Mother</title>

+		<artist>Dr.Hook</artist>

+		<country>UK</country>

+		<company>CBS</company>

+		<price>8.10</price>

+		<year>1973</year>

+	</cd>

+	<cd>

+		<title>Maggie May</title>

+		<artist>Rod Stewart</artist>

+		<country>UK</country>

+		<company>Pickwick</company>

+		<price>8.50</price>

+		<year>1990</year>

+	</cd>

+	<cd>

+		<title>Romanza</title>

+		<artist>Andrea Bocelli</artist>

+		<country>EU</country>

+		<company>Polydor</company>

+		<price>10.80</price>

+		<year>1996</year>

+	</cd>

+	<cd>

+		<title>When a man loves a woman</title>

+		<artist>Percy Sledge</artist>

+		<country>USA</country>

+		<company>Atlantic</company>

+		<price>8.70</price>

+		<year>1987</year>

+	</cd>

+	<cd>

+		<title>Black angel</title>

+		<artist>Savage Rose</artist>

+		<country>EU</country>

+		<company>Mega</company>

+		<price>10.90</price>

+		<year>1995</year>

+	</cd>

+	<cd>

+		<title>1999 Grammy Nominees</title>

+		<artist>Many</artist>

+		<country>USA</country>

+		<company>Grammy</company>

+		<price>10.20</price>

+		<year>1999</year>

+	</cd>

+	<cd>

+		<title>For the good times</title>

+		<artist>Kenny Rogers</artist>

+		<country>UK</country>

+		<company>Mucik Master</company>

+		<price>8.70</price>

+		<year>1995</year>

+	</cd>

+	<cd>

+		<title>Big Willie style</title>

+		<artist>Will Smith</artist>

+		<country>USA</country>

+		<company>Columbia</company>

+		<price>9.90</price>

+		<year>1997</year>

+	</cd>

+	<cd>

+		<title>Tupelo Honey</title>

+		<artist>Van Morrison</artist>

+		<country>UK</country>

+		<company>Polydor</company>

+		<price>8.20</price>

+		<year>1971</year>

+	</cd>

+	<cd>

+		<title>Soulsville</title>

+		<artist>Jorn Hoel</artist>

+		<country>Norway</country>

+		<company>WEA</company>

+		<price>7.90</price>

+		<year>1996</year>

+	</cd>

+	<cd>

+		<title>The very best of</title>

+		<artist>Cat Stevens</artist>

+		<country>UK</country>

+		<company>Island</company>

+		<price>8.90</price>

+		<year>1990</year>

+	</cd>

+	<cd>

+		<title>Stop</title>

+		<artist>Sam Brown</artist>

+		<country>UK</country>

+		<company>A and M</company>

+		<price>8.90</price>

+		<year>1988</year>

+	</cd>

+	<cd>

+		<title>Bridge of Spies</title>

+		<artist>T`Pau</artist>

+		<country>UK</country>

+		<company>Siren</company>

+		<price>7.90</price>

+		<year>1987</year>

+	</cd>

+	<cd>

+		<title>Private Dancer</title>

+		<artist>Tina Turner</artist>

+		<country>UK</country>

+		<company>Capitol</company>

+		<price>8.90</price>

+		<year>1983</year>

+	</cd>

+	<cd>

+		<title>Midt om natten</title>

+		<artist>Kim Larsen</artist>

+		<country>EU</country>

+		<company>Medley</company>

+		<price>7.80</price>

+		<year>1983</year>

+	</cd>

+	<cd>

+		<title>Pavarotti Gala Concert</title>

+		<artist>Luciano Pavarotti</artist>

+		<country>UK</country>

+		<company>DECCA</company>

+		<price>9.90</price>

+		<year>1991</year>

+	</cd>

+	<cd>

+		<title>The dock of the bay</title>

+		<artist>Otis Redding</artist>

+		<country>USA</country>

+		<company>Atlantic</company>

+		<price>7.90</price>

+		<year>1987</year>

+	</cd>

+	<cd>

+		<title>Picture book</title>

+		<artist>Simply Red</artist>

+		<country>EU</country>

+		<company>Elektra</company>

+		<price>7.20</price>

+		<year>1985</year>

+	</cd>

+	<cd>

+		<title>Red</title>

+		<artist>The Communards</artist>

+		<country>UK</country>

+		<company>London</company>

+		<price>7.80</price>

+		<year>1987</year>

+	</cd>

+	<cd>

+		<title>Unchain my heart</title>

+		<artist>Joe Cocker</artist>

+		<country>USA</country>

+		<company>EMI</company>

+		<price>8.20</price>

+		<year>1987</year>

+	</cd>

+</catalog>

diff --git a/pcr/hiawatha/cdcatalog.xslt b/pcr/hiawatha/cdcatalog.xslt
new file mode 100644
index 000000000..db9cc35bc
--- /dev/null
+++ b/pcr/hiawatha/cdcatalog.xslt
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>

+<!-- Edited with XML Spy v4.2 -->

+<xsl:stylesheet version="1.0"

+xmlns:xsl="http://www.w3.org/1999/XSL/Transform">

+<xsl:template match="/">

+  <html>

+  <body>

+  <h2>My CD Collection</h2>

+    <table border="1">

+      <tr bgcolor="#9acd32">

+        <th align="left">Title</th>

+        <th align="left">Artist</th>

+      </tr>

+      <xsl:for-each select="catalog/cd">

+      <tr>

+        <td><xsl:value-of select="title"/></td>

+        <td><xsl:value-of select="artist"/></td>

+      </tr>

+      </xsl:for-each>

+    </table>

+  </body>

+  </html>

+</xsl:template>

+</xsl:stylesheet>
\ No newline at end of file
diff --git a/pcr/hiawatha/hiawatha.conf.sample b/pcr/hiawatha/hiawatha.conf.sample
new file mode 100644
index 000000000..1c1d62450
--- /dev/null
+++ b/pcr/hiawatha/hiawatha.conf.sample
@@ -0,0 +1,114 @@
+# Hiawatha main configuration file
+# This is a basic sample configuration file that sets up a:
+#   1) Default web site at /srv/http/hiawatha (Note: fast CGI is not active on default site)
+#   2) Virtual host for phpmyadmin at /srv/http/phpMyAdmin
+#      note: you must install phpmyadmin, mysql, php-mcrypt, and php-cgi separately. Be sure that extensions 
+#      mcrypt.so and mysql.so are enabled in your php.ini.
+#      Also add phpmyadmin to your hosts file  
+#   3) FastCGI server
+
+
+# GENERAL SETTINGS
+ServerId = http
+ConnectionsTotal = 150
+ConnectionsPerIP = 10
+SystemLogfile = /var/log/hiawatha/system.log
+GarbageLogfile = /var/log/hiawatha/garbage.log
+
+
+# BINDING SETTINGS
+# A binding is where a client can connect to.
+#
+Binding {
+	Port = 80
+}
+
+
+
+### The following fast CGI daemons require php-fpm using a UNIX socket and TCP port, respectively.
+# ACTIVATE a FastCGI server for php  (using UNIX socket)
+FastCGIserver {
+    FastCGIid = PHP5
+    ConnectTo = /run/php-fpm/php-fpm.sock
+    Extension = php
+    SessionTimeout = 30
+}  
+
+# ACTIVATE a FastCGI server for php (using IP-address and TCP port)
+#FastCGIserver {
+#    FastCGIid = PHP5
+#    ConnectTo = 127.0.0.1:9000
+#    Extension = php
+#    SessionTimeout = 30
+#}  
+
+
+# DEFAULT WEBSITE
+# It is wise to use your IP address as the hostname of the default website
+# and give it a blank webpage. By doing so, automated webscanners won't find
+# your possible vulnerable website.
+#
+Hostname = 127.0.0.1
+WebsiteRoot =  /srv/http/hiawatha
+StartFile = index.html
+AccessLogfile = /var/log/hiawatha/access.log
+ErrorLogfile = /var/log/hiawatha/error.log
+#ErrorHandler = 404:/error.cgi
+UseXSLT = yes
+
+
+# VIRTUAL HOSTS
+VirtualHost {
+    
+    # If you set WebsiteRoot to /usr/share/webapps/phpMyAdmin you don't need followsymlinks
+    # I symlinked the phpMyAdmin folder to '/srv/http/phpMyAdmin' so that I can easily remember where it's located but
+    # still set 'WebsiteRoot' to the real source directory. You could point WebsiteRoot to the
+    # symlinked directory, but you will have to set 'FollowSymlinks = yes' for that to function properly
+    
+    #FollowSymlinks = yes
+    #WebsiteRoot = /srv/http/phpMyAdmin
+    WebsiteRoot = /usr/share/webapps/phpMyAdmin
+    Hostname = phpmyadmin
+    AccessLogfile = /var/log/hiawatha/phpmyadmin/access.log
+    ErrorLogfile = /var/log/hiawatha/phpmyadmin/error.log
+    StartFile = index.php
+    UseFastCGI = PHP5
+    
+}
+
+# Add some more
+
+#VirtualHost {
+#	Hostname = www.my-domain.com
+#	WebsiteRoot = /svr/http/my-domain/public
+#	StartFile = index.php
+#	AccessLogfile = /svr/http/my-domain/log/access.log
+#	ErrorLogfile = /svr/http/my-domain/log/error.log
+#	TimeForCGI = 5
+#	UseFastCGI = PHP5
+#	UseToolkit = banshee
+#}
+
+
+#Additional settings for monitoring
+
+UrlToolkit {
+	ToolkitID = banshee
+	RequestURI isfile Return
+	Match ^/(css|files|images|js)/ Return
+	Match ^/(favicon.ico|robots.txt|sitemap.xml)$ Return
+	Match .*\?(.*) Rewrite /index.php?$1
+	Match .* Rewrite /index.php
+}
+
+VirtualHost {
+	Hostname = monitor.domain.com
+	WebsiteRoot = /svr/http/monitor/public
+	AccessLogfile = /svr/http/monitor/logfiles/access.log
+	ErrorLogfile = /svr/http/monitor/logfiles/error.log
+	StartFile = index.php
+#	ExecuteCGI = yes
+	UseFastCGI = PHP5 # Use if you use PHP as a FastCGI daemon
+	TimeForCGI = 15
+	UseToolkit = banshee
+}
diff --git a/pcr/hiawatha/hiawatha.install b/pcr/hiawatha/hiawatha.install
new file mode 100644
index 000000000..0ea96ec65
--- /dev/null
+++ b/pcr/hiawatha/hiawatha.install
@@ -0,0 +1,37 @@
+pre_install() {
+  /bin/cat <<THEENDPOSTINSTALL
+NOTE
+----
+If you are new to Hiawatha, please refer to http://www.hiawatha-webserver.org/howto
+
+!!!!! This PKGBUILD compiles against the system's PolarSSL library. You will need to install PolarSSL from the AUR.!!!!
+
+THEENDPOSTINSTALL
+}
+
+pre_upgrade() {
+  /bin/cat <<THEENDPOSTINSTALL
+NOTE
+----
+If you are new to Hiawatha, please refer to http://www.hiawatha-webserver.org/howto
+
+!!!!! This PKGBUILD compiles against the system's PolarSSL library. You will need to install PolarSSL from the AUR.!!!!
+
+THEENDPOSTINSTALL
+}
+
+post_install() {
+  /bin/cat <<THEENDPOSTINSTALL
+NOTE
+----
+If you are new to Hiawatha, please refer to http://www.hiawatha-webserver.org/howto 
+
+PHP-FPM is the prefered fastcgi server. To install.
+   pacman -Sy php-fpm
+   systemctl enable php-fpm
+
+The file hiawatha.conf.sample demonstrates syntax appropriate for use with the php-fpm fast cgi daemon.
+THEENDPOSTINSTALL
+}
+
+
diff --git a/pcr/hiawatha/hiawatha.service b/pcr/hiawatha/hiawatha.service
new file mode 100644
index 000000000..f7daeb8c7
--- /dev/null
+++ b/pcr/hiawatha/hiawatha.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=Hiawatha Web Server
+After=network.target remote-fs.target nss-lookup.target
+
+[Service]
+Type=simple
+SyslogIdentifier=hiawatha
+ExecStartPre=/usr/bin/hiawatha -k ; /usr/bin/wigwam
+ExecStart= /usr/bin/hiawatha -d
+TimeoutSec=10
+#(doesn't like this setting. Can't find files) PrivateTmp=true
+LimitNOFILE=infinity
+CapabilityBoundingSet=CAP_NET_BIND_SERVICE CAP_CHOWN CAP_DAC_OVERRIDE CAP_FOWNER CAP_FSETID CAP_SETGID CAP_SETUID 
+
+[Install]
+WantedBy=multi-user.target
diff --git a/pcr/ii/PKGBUILD b/pcr/ii/PKGBUILD
new file mode 100644
index 000000000..b17cc2d18
--- /dev/null
+++ b/pcr/ii/PKGBUILD
@@ -0,0 +1,30 @@
+# Contributor: Evan Gates    <evan.gates@gmail.com>
+# Contributor: Dag  Odenhall <dag.odenhall@gmail.com>
+# Contributor: Chris Brannon <cmbrannon@cox.net>
+# Contributor: William Giokas <1007380@gmail.com>
+pkgname=ii
+pkgver=1.7
+pkgrel=2
+pkgdesc="A minimalist FIFO and filesystem-based IRC client"
+license=(MIT)
+arch=(i686 x86_64)
+url=http://tools.suckless.org/ii
+depends=(glibc)
+source=("http://dl.suckless.org/tools/${pkgname}-${pkgver}.tar.gz")
+
+md5sums=('6191008ca09770873d84f40270493d0e')
+
+prepare() {
+	cd "$srcdir/$pkgname-$pkgver"
+	sed -i "s/CFLAGS = /CFLAGS = ${CFLAGS} /" config.mk
+}
+
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+	make
+}
+
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
+	make PREFIX=/usr MANDIR=/usr/share/man DESTDIR="$pkgdir" install
+}
diff --git a/pcr/kompozer/PKGBUILD b/pcr/kompozer/PKGBUILD
index 7b556e166..a65fb3e3b 100644
--- a/pcr/kompozer/PKGBUILD
+++ b/pcr/kompozer/PKGBUILD
@@ -1,59 +1,69 @@
-# Contributor: peace4all <markspost at rocketmail dot com>
+# Maintainer: Muflone <webreg@vbsimple.net>
+# Contributor: ingamedeo <ingamedeo at gmail dot com>
 # Maintainer : Parabola GNU / Linux-libre <aurelien@cwb.io>
 
 # thanks to tadzio, and techlive for the investigation
 # work and fix included as the NS_IMETHOD_i686.patch
 
+# Sorry for not honouring makepkg.conf (!buildflags)
+# but the source doesn't compile with makepkg's default C/CXXFLAGS
+
 pkgname=kompozer
 pkgver=0.8b3
-pkgrel=10
+pkgrel=12
 pkgdesc="A Dreamweaver style WYSIWYG web editor; Nvu unofficial bug-fix release"
 arch=('x86_64' 'i686')
 license=('GPL')
 url="http://www.kompozer.net"
 depends=('gtk2' 'glib2' 'pango' 'pangox-compat' 'nss' 'libxt' 'libidl2' 'gnome-vfs')
 makedepends=('zip' 'pkgconfig')
-source=("http://downloads.sourceforge.net/kompozer/$pkgname-$pkgver-src.tar.bz2" 
-	'kompozer.desktop' 
-	'mozconfig.patch' 
-	'kompozer-libpng15.patch' 
-	'kompozer-libpng14.patch' 
-	'gcc46_default_ctors.patch' 
-	'kompozer_gcc_4.7.patch' 
-	'any_kernel_26_plus.patch'
-	'NS_IMETHOD_i686.patch')
+options=('!buildflags')
+source=("http://downloads.sourceforge.net/kompozer/${pkgname}-${pkgver}-src.tar.bz2" 
+        'kompozer.desktop' 
+        'mozconfig.patch' 
+        'kompozer-libpng15.patch' 
+        'kompozer-libpng14.patch' 
+        'gcc46_default_ctors.patch' 
+        'kompozer_gcc_4.7.patch' 
+        'any_kernel_26_plus.patch'
+        'NS_IMETHOD_i686.patch')
 md5sums=('cd4664ecda908666b19ef0607010c627'
          'ed8edf6817892a38b8b181fc9b2caaea'
-	 '4778f967307cf569089daca843de1df9'
+         '4778f967307cf569089daca843de1df9'
          '4852034f99e7943071946e7eedc6c2f5'
          'd5ba90f7fbaed76f77a6d9717e86f3a5'
          'ad3ec5cbc6677dd712b140148398f58f'
-	 '75b0e1cad65dbeb8feedac5d4f52be32'
+         '75b0e1cad65dbeb8feedac5d4f52be32'
          '58a294356b3e17ad070e4c93180bf0ad'
 	 '186c47586bebf83b9b76d339e3a38c95')
 
 build() {
-  cd "$srcdir/mozilla"
-  	
-	patch -Np0 -i "$srcdir/mozconfig.patch"
-	patch -Np0 -i "$srcdir/kompozer-libpng14.patch"
-	patch -Np0 -i "$srcdir/kompozer-libpng15.patch"
-	patch -Np0 -i "$srcdir/gcc46_default_ctors.patch"
-	patch -Np0 -i "$srcdir/kompozer_gcc_4.7.patch"
-	patch -Np0 -i "$srcdir/any_kernel_26_plus.patch"
-	patch -Np0 -i "$srcdir/NS_IMETHOD_i686.patch"
-
-  make -f client.mk build
+  cd "${srcdir}/mozilla"
+  patch -Np0 -i "${srcdir}/mozconfig.patch"
+  patch -Np0 -i "${srcdir}/kompozer-libpng14.patch"
+  patch -Np0 -i "${srcdir}/kompozer-libpng15.patch"
+  patch -Np0 -i "${srcdir}/gcc46_default_ctors.patch"
+  patch -Np0 -i "${srcdir}/kompozer_gcc_4.7.patch"
+  patch -Np0 -i "${srcdir}/any_kernel_26_plus.patch"
+  patch -Np0 -i "${srcdir}/NS_IMETHOD_i686.patch"
+
+  #make -f client.mk build #If is causing a lot of problem...try to build the package as normally
+  ./configure
+  make
 }
 
 package() {
-  cd "$srcdir/obj-kompozer"
+  cd "${srcdir}/mozilla"
+
+  make DESTDIR=${pkgdir} install
+  # Remove nspr.m4 because it's now provided by nspr package
+  rm "${pkgdir}/usr/share/aclocal/nspr.m4"
+  rmdir "${pkgdir}/usr/share/aclocal"
 
-  make DESTDIR=$pkgdir install
-  install -m755 -dD "$pkgdir/usr/share/applications/"
-  install -m644  "$srcdir/kompozer.desktop" "$pkgdir/usr/share/applications/"
+  install -m755 -dD "${pkgdir}/usr/share/applications/"
+  install -m644  "${srcdir}/kompozer.desktop" "${pkgdir}/usr/share/applications/"
 
-  mkdir -p "$pkgdir/usr/share/pixmaps/"
-  ln -s "/usr/lib/kompozer/icons/mozicon256.png" "$pkgdir/usr/share/pixmaps/kompozer.png"
-  ln -s "/usr/lib/kompozer/icons/mozicon50.xpm" "$pkgdir/usr/share/pixmaps/kompozer.xpm"
+  install -d -m755 "${pkgdir}/usr/share/pixmaps/"
+  ln -s "/usr/lib/kompozer/icons/mozicon256.png" "${pkgdir}/usr/share/pixmaps/kompozer.png"
+  ln -s "/usr/lib/kompozer/icons/mozicon50.xpm" "${pkgdir}/usr/share/pixmaps/kompozer.xpm"
 }
diff --git a/pcr/libcgroup/PKGBUILD b/pcr/libcgroup/PKGBUILD
new file mode 100644
index 000000000..849a5c128
--- /dev/null
+++ b/pcr/libcgroup/PKGBUILD
@@ -0,0 +1,57 @@
+# Maintainer: Christian Hesse <mail@eworm.de>
+# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
+
+pkgname=libcgroup
+pkgver=0.40rc1
+pkgrel=1
+pkgdesc="Library that abstracts the control group file system in Linux"
+arch=('i686' 'x86_64')
+url="http://libcg.sourceforge.net"
+license=(LGPL)
+backup=('etc/cgconfig.conf'
+        'etc/cgrules.conf'
+	'etc/cgsnapshot_blacklist.conf')
+options=('!emptydirs' '!libtool')
+install=libcgroup.install
+source=("http://downloads.sourceforge.net/libcg/${pkgname}-${pkgver/rc/.rc}.tar.bz2"
+	'cgconfig.service'
+	'cgrules.service')
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver/rc/.rc}"
+
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--sbindir=/usr/bin \
+		--enable-opaque-hierarchy=name=systemd
+
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver/rc/.rc}"
+
+	make DESTDIR="${pkgdir}" pkgconfigdir="/usr/lib/pkgconfig" install
+
+	install -D -m0644 samples/cgconfig.conf "${pkgdir}/etc/cgconfig.conf"
+	install -D -m0644 samples/cgrules.conf "${pkgdir}/etc/cgrules.conf"
+	install -D -m0644 samples/cgsnapshot_blacklist.conf "${pkgdir}/etc/cgsnapshot_blacklist.conf"
+
+	install -D -m0644 ${srcdir}/cgconfig.service "${pkgdir}/usr/lib/systemd/system/cgconfig.service"
+	install -D -m0644 ${srcdir}/cgrules.service "${pkgdir}/usr/lib/systemd/system/cgrules.service"
+
+	rm -f ${pkgdir}/usr/lib/security/pam_cgroup.{la,so,so.0}
+	mv ${pkgdir}/usr/lib/security/pam_cgroup.so.0.0.0 ${pkgdir}/usr/lib/security/pam_cgroup.so
+
+	rm -rf ${pkgdir}/etc/rc.d
+
+	# Make cgexec setgid cgred
+	chown root:160 ${pkgdir}/usr/bin/cgexec
+	chmod 2755 ${pkgdir}/usr/bin/cgexec
+}
+
+sha256sums=('c2fa2cfdfd1023093afb6de456fc3ac000f92a2f01b905bcdda1c3e36ad44072'
+            '808fc354abf36d7b6673dad790be275309ac57a2606d1be3732b9b3aeb5885eb'
+            '6b1340ff6717f55e5e57dacc72accc0bfaed7e50ef31439271b6ddc893cbf671')
diff --git a/pcr/libcgroup/cgconfig.service b/pcr/libcgroup/cgconfig.service
new file mode 100644
index 000000000..3e6689d77
--- /dev/null
+++ b/pcr/libcgroup/cgconfig.service
@@ -0,0 +1,17 @@
+[Unit]
+Description=Control Group configuration service
+
+# The service should be able to start as soon as possible,
+# before any 'normal' services:
+DefaultDependencies=no
+Conflicts=shutdown.target
+Before=basic.target shutdown.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/bin/cgconfigparser -l /etc/cgconfig.conf -s 1664
+ExecStop=/usr/bin/cgclear -l /etc/cgconfig.conf -e
+
+[Install]
+WantedBy=sysinit.target
diff --git a/pcr/libcgroup/cgrules.service b/pcr/libcgroup/cgrules.service
new file mode 100644
index 000000000..cd0bf34fb
--- /dev/null
+++ b/pcr/libcgroup/cgrules.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=Control Group rules service
+ 
+# The service should be able to start as soon as possible,
+# before any 'normal' services:
+DefaultDependencies=no
+Conflicts=shutdown.target
+Before=basic.target shutdown.target
+After=cgconfig.service
+ 
+[Service]
+Type=simple
+ExecStart=/usr/bin/cgrulesengd -n -f -
+ 
+[Install]
+WantedBy=sysinit.target
diff --git a/pcr/libcgroup/libcgroup.install b/pcr/libcgroup/libcgroup.install
new file mode 100644
index 000000000..a78216add
--- /dev/null
+++ b/pcr/libcgroup/libcgroup.install
@@ -0,0 +1,11 @@
+post_install() {
+  getent group cgred &>/dev/null || groupadd -r -g 160 cgred >/dev/null
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  getent group cgred &>/dev/null && groupdel cgred >/dev/null
+}
diff --git a/pcr/libqinfinity/PKGBUILD b/pcr/libqinfinity/PKGBUILD
new file mode 100644
index 000000000..fdd7ed0c4
--- /dev/null
+++ b/pcr/libqinfinity/PKGBUILD
@@ -0,0 +1,27 @@
+# Contributor: Antonio Rojas <nqn1976 @ gmail.com>
+# Maintainer: parabola Aurélien Desbrières <aurelien@replicant.io>
+
+pkgname=libqinfinity
+pkgver=0.5.1
+pkgrel=1
+pkgdesc="Qt wrapper around libinfinity, a library for collaborative editing"
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/playground/libs/libqinfinity'
+license=('LGPL')
+depends=('libinfinity' 'qt4')
+makedepends=('cmake')
+source=("http://download.kde.org/stable/$pkgname/$pkgver/src/$pkgname-v$pkgver.tar.xz")
+
+
+build() {
+	cd "$pkgname-v$pkgver"
+	mkdir build
+	cd build
+	cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt4
+	make
+}
+
+package() {
+	cd "$pkgname-v$pkgver/build"
+	make DESTDIR="$pkgdir" install
+}
diff --git a/pcr/libquvi-scripts-current/PKGBUILD b/pcr/libquvi-scripts-current/PKGBUILD
index bce42b0e4..6a466b314 100644
--- a/pcr/libquvi-scripts-current/PKGBUILD
+++ b/pcr/libquvi-scripts-current/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=libquvi-scripts-current
 _pkgname=libquvi-scripts
 provides=(libquvi-scripts)
-pkgver=0.4.18
+pkgver=0.4.19
 pkgrel=1
 pkgdesc='Library for parsing video download links.'
 arch=('any')
@@ -24,5 +24,6 @@ package() {
   cd "${_pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
-md5sums=('d36f966974c851d36136c75d462fb319'
+
+md5sums=('a37221697367a700cc1cb3b1f4b681ec'
          'SKIP')
diff --git a/~lukeshu/maildirproc/PKGBUILD b/pcr/maildirproc/PKGBUILD
index bb98fa112..0e3becf75 100644
--- a/~lukeshu/maildirproc/PKGBUILD
+++ b/pcr/maildirproc/PKGBUILD
@@ -1,17 +1,21 @@
-# Maintainer: Mick Koch <kchmck@gmail.com>
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (AUR): Mick Koch <kchmck@gmail.com>
 
 pkgname="maildirproc"
 pkgver="0.5.0"
-pkgrel="2"
+pkgrel="3"
 pkgdesc="Sorts mail based on a Python configuration file"
 arch=("any")
 url="http://joel.rosdahl.net/maildirproc/"
-license=("GPL")
+license=("GPL") # GPLv2+
 depends=("python")
 source=("http://joel.rosdahl.net/maildirproc/releases/$pkgname-$pkgver.tar.bz2")
 md5sums=("eaa001f6cd1befee99528ca55da979ca")
 
-build() {
+package() {
   cd "$srcdir/$pkgname-$pkgver"
-  python setup.py install --prefix=/usr --root="$pkgdir" || return 1
+  python setup.py install --root="$pkgdir" --optimize=1
+
+  mkdir -p "$pkgdir"/usr/share/doc/$pkgname/
+  cp -r doc/* "$pkgdir"/usr/share/doc/$pkgname/
 }
diff --git a/pcr/nevow/PKGBUILD b/pcr/nevow/PKGBUILD
new file mode 100644
index 000000000..956a0cd32
--- /dev/null
+++ b/pcr/nevow/PKGBUILD
@@ -0,0 +1,23 @@
+# Maintainer: Nicolas Pouillard <nicolas.pouillard@gmail.com>
+# Contributor: Peter Simons <simons@cryp.to>
+pkgname=nevow
+pkgver=0.10.0
+pkgrel=8
+pkgdesc="web application construction kit written in Python"
+arch=('any')
+url='http://pypi.python.org/pypi/Nevow'
+license=('custom')
+depends=('python2' 'twisted')
+source=( http://pypi.python.org/packages/source/N/Nevow/Nevow-$pkgver.tar.gz )
+md5sums=('66dda2ad88f42dea05911add15f4d1b2')
+
+build(){
+  cd "$srcdir/Nevow-$pkgver"
+  python2 setup.py build
+}
+
+package(){
+  cd "$srcdir/Nevow-$pkgver"
+  python2 setup.py install --prefix=/usr --root="$pkgdir" --install-data=/usr/share/"$pkgname"
+  install -D LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
diff --git a/pcr/ocsync/PKGBUILD b/pcr/ocsync/PKGBUILD
index 97bc26754..cde26af30 100644
--- a/pcr/ocsync/PKGBUILD
+++ b/pcr/ocsync/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Kuba Serafinowski <zizzfizzix(at)gmail(dot)com>
 # https://github.com/zizzfizzix/pkgbuilds
-# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
+# Maintainer: Jorge Araya Navarro <shackra@riseup.net>
 #
 ##############################################################
 #### The section below can be adjusted to suit your needs ####
@@ -15,8 +15,8 @@ _buildtype="Release"
 ##############################################################
 
 pkgname=ocsync
-pkgver=0.80.0
-pkgrel=3
+pkgver=0.90.0
+pkgrel=1
 pkgdesc="A file synchronizer especially designed for you, the normal user. Dependency of owncloud-client."
 arch=("i686" "x86_64")
 url="http://www.csync.org"
@@ -52,3 +52,4 @@ package() {
   cd ${srcdir}/${pkgname}-${pkgver}-build
   make DESTDIR=${pkgdir} install
 }
+md5sums=('6f1cfe47d6a7741c6e8df8642de52c0f')
diff --git a/pcr/owncloud-client/PKGBUILD b/pcr/owncloud-client/PKGBUILD
index a4e86099b..ea808c1ef 100644
--- a/pcr/owncloud-client/PKGBUILD
+++ b/pcr/owncloud-client/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Kuba Serafinowski <zizzfizzix(at)gmail(dot)com>
 # https://github.com/zizzfizzix/pkgbuilds
-# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
+# Maintainer: Jorge Araya Navarro <shackra@riseup.net>
 #
 ##############################################################
 #### The section below can be adjusted to suit your needs ####
@@ -16,13 +16,13 @@ _buildtype="Release"
 
 _name=mirall
 pkgname=owncloud-client
-pkgver=1.3.0
-pkgrel=2
+pkgver=1.4.0
+pkgrel=1
 pkgdesc="ownCloud client based on mirall"
 arch=('i686' 'x86_64')
 url="http://owncloud.org/"
 license=('GPL2')
-depends=('qt4' 'ocsync')
+depends=('qt4' 'ocsync' 'qtkeychain' 'qtwebkit')
 makedepends=('cmake')
 optdepends=('qtkeychain: safe password storage')
 provides=('mirall' 'owncloud-client')
@@ -30,7 +30,8 @@ conflicts=('mirall-git')
 install=owncloud-client.install
 backup=('etc/owncloud-client/sync-exclude.lst')
 source=("http://download.owncloud.com/download/${_name}-${pkgver}.tar.bz2")
-md5sums=('ee2e7bafc714399f2027fefed853f968')
+md5sums=('05a69082b4e940b4282c2b05344c143a')
+
 
 if [[ ! ${_buildtype} == "Release" ]] && [[ ! ${_buildtype} == "release" ]]; then
   options=(!strip)
diff --git a/pcr/pandoc/PKGBUILD b/pcr/pandoc/PKGBUILD
index 6fe28cc7c..0d2f2d8ea 100644
--- a/pcr/pandoc/PKGBUILD
+++ b/pcr/pandoc/PKGBUILD
@@ -5,13 +5,13 @@
 
 pkgname=pandoc-static
 _pkgname=pandoc
-pkgver=1.11.1
-pkgrel=2
+pkgver=1.12
+pkgrel=1
 pkgdesc='Conversion between markup formats (no Haskell libs)'
 url='http://johnmacfarlane.net/pandoc/'
 license=('GPL')
 arch=('i686' 'x86_64')
-makedepends=('ghc' 'sh' 'cabal-install')
+makedepends=('ghc' 'sh' 'cabal-install' 'alex' 'happy')
 options=(strip !makeflags !distcc !emptydirs)
 #source=(https://repo.parabolagnulinux.org/other/${_pkgname}-${pkgver}-$pkgrel-any.src.tar.xz{,.sig}
 source=(https://repo.parabolagnulinux.org/other/${_pkgname}-${pkgver}-1-any.src.tar.xz{,.sig}
@@ -20,9 +20,9 @@ source=(https://repo.parabolagnulinux.org/other/${_pkgname}-${pkgver}-1-any.src.
 replaces=('pandoc')
 provides=('pandoc')
 optdepends=('texlive-most: for pdf creation')
-md5sums=('74acd042fcd85bee9edb093cc3fe5c2e'
+md5sums=('3d5f23060cad2ff29ba2df5651e92f8a'
          'SKIP'
-         'ee9d5924632ac07b5049be834a1ed054')
+         'c2e9f9b880468455b6e6a7f9ba7308e8')
 
 # PKGBUILD functions
 build() {
@@ -47,7 +47,7 @@ build() {
        case $_hkpkg in
         $_pkgname-$pkgver)
          HOME=${srcdir}/${_pkgname}-${pkgver} \
-         cabal configure --flags='-library blaze_html_0_5' \
+         cabal configure --flags='-library' \
                          --prefix=/usr \
                          --libdir=${srcdir}/build/usr/lib -v
 
diff --git a/pcr/pandoc/SRCBUILD b/pcr/pandoc/SRCBUILD
index ec499f814..f822bb1a0 100644
--- a/pcr/pandoc/SRCBUILD
+++ b/pcr/pandoc/SRCBUILD
@@ -2,10 +2,7 @@
 # Based on haskell-pandoc
 
 pkgname=pandoc
-pkgver=1.11.1
-# 0.4 doesn't work with ghc 7.6 
-# Use blaze_html_0_5 flag in the future
-_blaze_html=0.6.1.1
+pkgver=1.12
 pkgrel=1
 pkgdesc='Conversion between markup formats (no Haskell libs)'
 url='http://johnmacfarlane.net/pandoc/'
@@ -24,12 +21,12 @@ build() {
     cabal --verbose=3 update
 
     HOME=${srcdir}/${pkgname}-${pkgver} \
-    cabal --verbose=3 fetch file-embed blaze-html-${_blaze_html} ${pkgname}-${pkgver}
+    cabal --verbose=3 fetch file-embed ${pkgname}-${pkgver}
 
     msg2 "Getting the dependency build order"
 # Ignore the cabal messages
     HOME=${srcdir}/${pkgname}-${pkgver} \
-    cabal install --dry-run file-embed blaze-html-${_blaze_html} ${pkgname}-${pkgver} | grep "\-[0-9]\+" >>BUILDORDER 
+    cabal install --dry-run file-embed ${pkgname}-${pkgver} | grep "\-[0-9]\+" >>BUILDORDER
 }
 
 package() {
diff --git a/pcr/polarssl/PKGBUILD b/pcr/polarssl/PKGBUILD
new file mode 100644
index 000000000..9d547d1d1
--- /dev/null
+++ b/pcr/polarssl/PKGBUILD
@@ -0,0 +1,28 @@
+# Maintainer: Mihai Militaru <mihai militaru at xmpp dot ro>
+
+pkgname=polarssl
+pkgver=1.2.8
+pkgrel=1
+pkgdesc="Portable cryptographic and SSL/TLS library"
+arch=('i686' 'x86_64')
+url="http://www.polarssl.org/"
+license=('GPL2')
+source=(http://www.polarssl.org/code/releases/polarssl-"$pkgver"-gpl.tgz)
+sha1sums=('a3e69d4e9302529c5006dcb7d8ecab9c99488036')
+depends=('glibc')
+
+build() {
+  cd "$pkgname"-"$pkgver"
+
+  sed -i 's^CFLAGS	+=^CFLAGS	+= -fPIC^g' library/Makefile
+  sed -i 's#all: static#all: static shared#g' library/Makefile
+
+  make
+}
+
+package() {
+	cd "$pkgname"-"$pkgver"
+	
+	make DESTDIR="$pkgdir/usr" install
+	echo "WARNING: in order to run the tests, execute in this directory, after you install the library: cd src/polarssl-$pkgver && make check"
+}
diff --git a/pcr/pycryptopp/PKGBUILD b/pcr/pycryptopp/PKGBUILD
new file mode 100644
index 000000000..f95654884
--- /dev/null
+++ b/pcr/pycryptopp/PKGBUILD
@@ -0,0 +1,31 @@
+# Maintainer: Nicolas Pouillard <nicolas.pouillard@gmail.com>
+# Contributor: Peter Simons <simons@cryp.to>
+pkgname=pycryptopp
+pkgver=0.6.0
+_pkgtag=1206569328141510525648634803928199668821045408958
+pkgrel=2
+pkgdesc="Python wrappers for the Crypto++ library"
+arch=('i686' 'x86_64')
+url='http://allmydata.org/trac/pycryptopp'
+license=('GPL2' 'custom')
+depends=('python2' 'crypto++')
+makedepends=('darcsver' 'setuptools_darcs')
+source=( http://pypi.python.org/packages/source/p/$pkgname/$pkgname-$pkgver.$_pkgtag.tar.gz
+         http://pypi.python.org/packages/source/p/$pkgname/$pkgname-$pkgver.$_pkgtag.tar.gz.asc )
+md5sums=('ce38fbe03705d27da408c78b56eb1947'
+         '76fe2da5b1fc964d9e1ee4596c36d5bf')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver.$_pkgtag"
+  export PYCRYPTOPP_DISABLE_EMBEDDED_CRYPTOPP=1
+  python2 setup.py build
+  python2 setup.py test
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver.$_pkgtag"
+  python2 setup.py install --root="$pkgdir"
+
+  install -d $pkgdir/usr/share/licenses/$pkgname/
+  install -m 644 COPYING* $pkgdir/usr/share/licenses/$pkgname/
+}
diff --git a/pcr/python-jedi/PKGBUILD b/pcr/python-jedi/PKGBUILD
new file mode 100644
index 000000000..d34823097
--- /dev/null
+++ b/pcr/python-jedi/PKGBUILD
@@ -0,0 +1,23 @@
+# Contributor: Jesus Alvarez
+# Contributor: Danilo Bargen <gezuru@gmail.com>
+# Maintainer : Parabola Aurélien DESBRIÈRES <aurelien@replicant.io>
+pkgname=python-jedi
+pkgver=0.7.0
+pkgrel=1
+pkgdesc="Awesome autocompletion for python. Official PKGBUILD."
+arch=('any')
+url="https://github.com/davidhalter/jedi"
+license=('LGPL3')
+depends=('python')
+makedepends=('python-distribute')
+conflicts=('jedi-git' 'python3-jedi-git')
+options=(!emptydirs)
+source=("https://pypi.python.org/packages/source/j/jedi/jedi-${pkgver}.tar.gz")
+
+
+package() {
+  cd "$srcdir/jedi-$pkgver"
+  python setup.py install --root="$pkgdir/" --optimize=1
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/python2-mock/PKGBUILD b/pcr/python2-mock/PKGBUILD
new file mode 100644
index 000000000..5647c15d2
--- /dev/null
+++ b/pcr/python2-mock/PKGBUILD
@@ -0,0 +1,24 @@
+# Contributor: Felix Kaiser <felix.kaiser@fxkr.net>
+
+pkgname=python2-mock
+pkgver=1.0.1
+pkgrel=1
+pkgdesc="A Python Mocking and Patching Library for Testing"
+url='http://www.voidspace.org.uk/python/mock/'
+license=('BSD')
+depends=('python2')
+arch=('i686' 'x86_64')
+source=("http://pypi.python.org/packages/source/m/mock/mock-$pkgver.tar.gz")
+md5sums=('c3971991738caa55ec7c356bbc154ee2')
+
+build() {
+  cd "$srcdir/mock-$pkgver"
+  python2 setup.py build
+}
+
+package() {
+  cd "$srcdir/mock-$pkgver"
+  python2 setup.py install --optimize=1 --root="$pkgdir"
+  install -Dm644 LICENSE* $pkgdir/usr/share/licenses/$pkgname/LICENSE
+}
+
diff --git a/pcr/pyutil/PKGBUILD b/pcr/pyutil/PKGBUILD
new file mode 100644
index 000000000..7c3ca9f60
--- /dev/null
+++ b/pcr/pyutil/PKGBUILD
@@ -0,0 +1,28 @@
+# Maintainer: Nicolas Pouillard <nicolas.pouillard@gmail.com>
+# Contributor: Peter Simons <simons@cryp.to>
+pkgname=pyutil
+pkgver=1.9.4
+pkgrel=2
+pkgdesc="general-purpose python library (used by tahoe-lafs)"
+arch=('any')
+url='http://pypi.python.org/pypi/pyutil'
+license=('GPL2' 'custom')
+depends=('python2')
+makedepends=('setuptools' 'darcsver' 'setuptools_darcs' 'python2-simplejson') # 'zbase32') # missing: setuptools_trial
+source=( http://pypi.python.org/packages/source/p/pyutil/pyutil-$pkgver.tar.gz )
+md5sums=('af51cf296b574112e115c9dfba51464d')
+
+build(){
+  cd "$srcdir/$pkgname-$pkgver"
+  python2 setup.py build
+  python2 setup.py trial
+}
+
+package(){
+  cd "$srcdir/$pkgname-$pkgver"
+  python2 setup.py install --root="$pkgdir"
+
+  install -d $pkgdir/usr/share/licenses/$pkgname/
+  install -m644 COPYING* $pkgdir/usr/share/licenses/$pkgname/
+
+}
diff --git a/pcr/pyzenity/PKGBUILD b/pcr/pyzenity/PKGBUILD
new file mode 100644
index 000000000..364cb56a1
--- /dev/null
+++ b/pcr/pyzenity/PKGBUILD
@@ -0,0 +1,20 @@
+# Contributor: lang2 <wenzhi.liang@gmail.com>
+# Contributor: sylvain alborini  <sylvain dot alborini at gmail dot com>
+# Maintainer : Parabola Aurélien DESBRIÈRES <aurelien@replicant.io>
+
+pkgname=pyzenity
+_pkg_name=PyZenity
+pkgver=0.1.7
+pkgrel=1
+pkgdesc="python bindings for zenity"
+url="http://www.brianramos.com/?page_id=38"
+depends=('python2' 'zenity')
+		  arch=('any')
+license=('GPL')
+source=(http://brianramos.com/software/${_pkg_name}/${_pkg_name}-${pkgver}.tar.gz)
+
+build() 
+{
+  cd "$srcdir/$_pkg_name-$pkgver"
+  python2 setup.py install --root="$pkgdir/" --optimize=1
+}
diff --git a/pcr/qtkeychain/PKGBUILD b/pcr/qtkeychain/PKGBUILD
new file mode 100644
index 000000000..152971751
--- /dev/null
+++ b/pcr/qtkeychain/PKGBUILD
@@ -0,0 +1,48 @@
+# Maintainer: Kuba Serafinowski <zizzfizzix(at)gmail(dot)com>
+# Maintainer: Jorge Araya Navarro <shackra@riseup.net>
+# Contributor: Teo Mrnjavac <teo@kde.org>
+# https://github.com/zizzfizzix/pkgbuilds
+
+_buildtype="Release"
+
+pkgname=qtkeychain
+pkgver=0.1
+pkgrel=3
+pkgdesc="Provides support for secure credentials storage."
+arch=('i686' 'x86_64')
+url="https://github.com/frankosterfeld/qtkeychain"
+license=('BSD2')
+depends=('qt4')
+makedepends=('cmake')
+source=("${pkgname}-${pkgver}.zip::https://github.com/frankosterfeld/qtkeychain/archive/${pkgver}.zip" 'prefer-qt4.patch')
+md5sums=('a1d11a611b27759a531896b57be15947'
+         'a2c46e61af02100a6f67487ffeb8a3d0')
+
+if [[ ! ${_buildtype} == "Release" ]] && [[ ! ${_buildtype} == "release" ]]; then
+  options=(!strip)
+fi
+
+prepare() {
+    cd ${srcdir}/${pkgname}-${pkgver}
+    patch -Np1 -i ${srcdir}/prefer-qt4.patch
+
+    if [[ -e ${srcdir}/${pkgname}-${pkgver}-build ]]; then rm -rf ${srcdir}/${pkgname}-${pkgver}-build; fi
+    mkdir ${srcdir}/${pkgname}-${pkgver}-build
+}
+
+build() {
+    cd ${srcdir}/${pkgname}-${pkgver}-build
+    cmake -DBUILD_WITH_QT4=on \
+          -DCMAKE_INSTALL_PREFIX=/usr \
+          -DCMAKE_INSTALL_LIBDIR=lib \
+          -DCMAKE_INSTALL_LIBEXECDIR=lib/${pkgname} \
+          -DCMAKE_BUILD_TYPE=${_buildtype} \
+          ../${pkgname}-${pkgver}
+    make
+}
+
+package() {
+    cd ${srcdir}/${pkgname}-${pkgver}-build
+    make DESTDIR=${pkgdir} install
+    install -D -m644 ${srcdir}/${pkgname}-${pkgver}/COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}
diff --git a/pcr/qtkeychain/prefer-qt4.patch b/pcr/qtkeychain/prefer-qt4.patch
new file mode 100644
index 000000000..0e264aad1
--- /dev/null
+++ b/pcr/qtkeychain/prefer-qt4.patch
@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index aba9032..4de64c8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,8 +11,10 @@ set(QTKEYCHAIN_SOVERSION 0)
+ set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${PROJECT_SOURCE_DIR}/cmake/Modules")
+ include(GNUInstallDirs)
+ 
+-# try Qt5 first, and prefer that if found
+-find_package(Qt5Core QUIET)
++# try Qt5 first, and prefer that if found, unless BUILD_WITH_QT4 is set
++if (NOT BUILD_WITH_QT4)
++  find_package(Qt5Core QUIET)
++endif()
+ if (Qt5Core_FOUND)
+   if(UNIX AND NOT APPLE)
+     find_package(Qt5DBus REQUIRED)
diff --git a/pcr/qtkeychain/qtkeychain-0.1.zip b/pcr/qtkeychain/qtkeychain-0.1.zip
new file mode 100644
index 000000000..400552c62
--- /dev/null
+++ b/pcr/qtkeychain/qtkeychain-0.1.zip
diff --git a/pcr/rfc5766-turn-server/PKGBUILD b/pcr/rfc5766-turn-server/PKGBUILD
index e85f98bb8..c070ad309 100644
--- a/pcr/rfc5766-turn-server/PKGBUILD
+++ b/pcr/rfc5766-turn-server/PKGBUILD
@@ -2,15 +2,13 @@
 
 pkgname=rfc5766-turn-server
 _portname=turnserver
-pkgver=1.8.6.0
-pkgrel=2
-epoch=
-pkgdesc="Free open source implementation of TURN and STUN Server"
+pkgver=2.6.2.1
+pkgrel=1
+pkgdesc="STUN and TURN Relay Server for VoIP and WebRTC"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/rfc5766-turn-server/"
 license=('custom:BSDNew')
-makedepends=('gcc>=3.4.4' 'make' 'hiredis' 'postgresql-libs' 'libmariadbclient')
-depends=('libevent')
+depends=('libevent' 'postgresql-libs' 'libmysqlclient' 'hiredis')
 optdepends=('postgresql-client: to use postgresql'
             'mariadb: mariadb backend'
             'redis: redis backend')
@@ -22,14 +20,9 @@ source=(https://${pkgname}.googlecode.com/files/${_portname}-$pkgver.tar.gz
 build() {
   cd "${srcdir}/$_portname-${pkgver}"
   
-  PREFIX=/usr \
-  MANPREFIX=/usr/share \
-  EXAMPLESDIR="/usr/share/$pkgname/examples" \
-  DOCSDIR="/usr/share/doc/$pkgname" \
-  LIBDIR=/usr/lib \
-  SCHEMADIR="/usr/share/$pkgname" \
-  TURNINCLUDEDIR="/usr/include/turn"
-  ./configure
+  ./configure --prefix=/usr \
+              --manprefix=/usr/share \
+              --examplesdir="/usr/share/$_portname/examples"
 
   make
 }
@@ -41,20 +34,12 @@ check() {
 
 package() {
   cd "${srcdir}/$_portname-${pkgver}"
-  make \
-    PREFIX="$pkgdir/usr" \
-    MANPREFIX="$pkgdir/usr/share" \
-    EXAMPLESDIR="$pkgdir/usr/share/$pkgname/examples" \
-    DOCSDIR="$pkgdir/usr/share/doc/$pkgname" \
-    LIBDIR="$pkgdir/usr/lib" \
-    SCHEMADIR="$pkgdir/usr/share/$pkgname" \
-    TURNINCLUDEDIR="$pkgdir/usr/include/turn" \
-    install
+  make DESTDIR="$pkgdir" install
   
   
-  install -D "$pkgdir/usr/share/$pkgname/examples/etc/turnserver.conf" \
+  install -D "$pkgdir/usr/share/$_portname/examples/etc/turnserver.conf" \
              "$pkgdir/etc/turnserver.conf"
-  install -D "$pkgdir/usr/share/$pkgname/examples/etc/turnuserdb.conf" \
+  install -D "$pkgdir/usr/share/$_portname/examples/etc/turnuserdb.conf" \
              "$pkgdir/etc/turnuserdb.conf"
   install -D "$srcdir/stun.service" \
              "$pkgdir/usr/lib/systemd/system/stun.service"
@@ -65,7 +50,15 @@ package() {
   chmod 644 "$pkgdir/usr/lib/libturnclient.a"
 
   install -Dm 644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+  install -dm 755 "$pkgdir/var/log/$_portname"
+
+  sed \
+          -e '/^#log-file=\/var\/tmp\/turn.log$/c log-file=\/var\/log\/turnserver\/turn.log' \
+          -i "${pkgdir}"/etc/turnserver.conf
 }
-md5sums=('def4cc2ea6239795edab12b5eee5f8ed'
-         '1da26c3a1fe29a8961e6b9d73f9048d3'
-         '83670d79026c67c7701481ee9d39f100')
+sha1sums=('d7f01e6fadbe56fe4535d67a7d178a9cfba110b8'
+          '0c5b348e793bd52ce0ee38d420b26c9b2a2e2ca5'
+          'b12805c049787cd1433181afaba4111f89740e63')
+sha256sums=('4d131f353aadb15901d175755075af65abf2a0e820d7281c9c164285642ff9c1'
+            '319030c1916d353bfc3375626cc7f60d6eeca762fe4fce354f010212902c49dc'
+            '63198e4f802c7b4b44e671e0fcaebca36589ebb11405e51ab9f36c80327ac4d9')
diff --git a/pcr/ruby-bundler/PKGBUILD b/pcr/ruby-bundler/PKGBUILD
index a1fb32449..44a1a883b 100644
--- a/pcr/ruby-bundler/PKGBUILD
+++ b/pcr/ruby-bundler/PKGBUILD
@@ -1,22 +1,24 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 # Contributor: Alexsandr Pavlov <kidoz at mail dot ru>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
-pkgname=ruby-bundler
-_gemname=${pkgname#ruby-}
-pkgver=1.1.5
+_pkgname=bundler
+pkgname=ruby-$_pkgname
+pkgver=1.3.5
 pkgrel=1
 pkgdesc="Is manages an application's dependencies through its entire life, across many machines, systematically and repeatably."
-arch=('any')
-url="http://gembundler.com"
-license=('MIT')
-depends=('ruby' 'rubygems')
-source=(http://rubygems.org/downloads/${_gemname}-${pkgver}.gem)
-noextract=(${_gemname}-${pkgver}.gem)
-md5sums=('ecced17bc29a761db4ea5ca57b0d8795')
+arch=any
+url=http://gem$_pkgname.com
+license=MIT
+depends=ruby
+source=http://rubygems.org/downloads/$_pkgname-$pkgver.gem
+noextract=$_pkgname-$pkgver.gem
+sha256sums=08b89047f7b829f3e197a28fb1bde74c3f5cfea1552f99dfba237fee30eaffe4
+
+package() {
+  cd $srcdir
 
-build() {
-  cd "${srcdir}"
-  export HOME=/tmp
-  local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
-  gem install --no-user-install --ignore-dependencies -i "${pkgdir}${_gemdir}" -n "${pkgdir}/usr/bin" ${_gemname}-${pkgver}.gem
+  local _gemdir=$(ruby -rubygems -e'puts Gem.default_dir')
+  HOME=/tmp gem install --no-user-install --ignore-dependencies\
+  -i $pkgdir$_gemdir -n $pkgdir/usr/bin\
+  $_pkgname-$pkgver.gem
 }
diff --git a/pcr/ruby1-bundler/PKGBUILD b/pcr/ruby1-bundler/PKGBUILD
new file mode 100644
index 000000000..d06f7af08
--- /dev/null
+++ b/pcr/ruby1-bundler/PKGBUILD
@@ -0,0 +1,27 @@
+# Contributor: Alexsandr Pavlov <kidoz at mail dot ru>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+
+_pkgname=bundler
+pkgname=ruby1-$_pkgname
+pkgver=1.3.5
+pkgrel=1
+pkgdesc="Is manages an application's dependencies through its entire life, across many machines, systematically and repeatably."
+arch=any
+url=http://gem$_pkgname.com
+license=MIT
+depends=ruby1
+source=http://rubygems.org/downloads/$_pkgname-$pkgver.gem
+noextract=$_pkgname-$pkgver.gem
+sha256sums=08b89047f7b829f3e197a28fb1bde74c3f5cfea1552f99dfba237fee30eaffe4
+
+package() {
+  cd $srcdir
+
+  local _gemdir=$(ruby1 -rubygems -e'puts Gem.default_dir')
+  HOME=/tmp gem1 install --no-user-install --ignore-dependencies\
+  -i $pkgdir$_gemdir -n $pkgdir/usr/bin\
+  $_pkgname-$pkgver.gem
+
+  msg "renaming $_pkgname to ${_pkgname}1"
+  mv -v $pkgdir/usr/bin/${_pkgname%r}{,1}
+}
diff --git a/pcr/ruby1/PKGBUILD b/pcr/ruby1/PKGBUILD
index c20b8720a..4a441bc1c 100644
--- a/pcr/ruby1/PKGBUILD
+++ b/pcr/ruby1/PKGBUILD
@@ -6,7 +6,7 @@
 _pkgname=ruby
 pkgname=("${_pkgname}1" "${_pkgname}1-docs")
 pkgver=1.9.3_p448
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.ruby-lang.org/en/'
 license=('BSD' 'custom')
@@ -52,7 +52,7 @@ package_ruby1() {
   pkgdesc='An object-oriented language for quick and easy programming (1.9 ver.)'
   depends=('gdbm' 'openssl' 'libffi' 'libyaml')
   optdepends=('tk: for Ruby/TK'
-              'ruby-docs: Ruby documentation')
+              'ruby1-docs: Ruby documentation')
   backup=('etc/gem1rc')
   install='ruby.install'
 
diff --git a/pcr/ruby1/ruby.install b/pcr/ruby1/ruby.install
index ce78e96ec..21e9b98a2 100644
--- a/pcr/ruby1/ruby.install
+++ b/pcr/ruby1/ruby.install
@@ -3,9 +3,9 @@
 print_gem_default_target() {
   echo 'The default location of gem installs is $HOME/.gem/ruby'
   echo 'Add the following line to your PATH if you plan to install using gem'
-  echo '$(ruby -rubygems -e "puts Gem.user_dir")/bin'
+  echo '$(ruby1 -rubygems -e "puts Gem.user_dir")/bin'
   echo 'If you want to install to the system wide location, you must either:'
-  echo 'edit /etc/gemrc or run gem with the --no-user-install flag.'
+  echo 'edit /etc/gem1rc or run gem with the --no-user-install flag.'
 }
 
 # arg 1:  the new package version
diff --git a/pcr/setuptools_darcs/PKGBUILD b/pcr/setuptools_darcs/PKGBUILD
new file mode 100644
index 000000000..285214db8
--- /dev/null
+++ b/pcr/setuptools_darcs/PKGBUILD
@@ -0,0 +1,29 @@
+# Contributor: Peter Simons <simons@cryp.to>
+# Contributor: Nicolas Pouillard <nicolas.pouillard@gmail.com>
+pkgname=setuptools_darcs
+pkgver=1.2.11
+pkgrel=3.1
+pkgdesc="Python setuptools plugin for darcs"
+arch=('any')
+url='http://pypi.python.org/pypi/setuptools_darcs'
+license=('BSD')
+depends=('python2' 'setuptools')
+makedepends=('darcsver')
+source=( http://pypi.python.org/packages/source/s/$pkgname/$pkgname-$pkgver.tar.gz )
+md5sums=('79451a8e77b9692861a655e53df094f0')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  python2 setup.py build
+}
+
+check() {
+  cd "$srcdir/$pkgname-$pkgver"
+  python2 setup.py test
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  python2 setup.py install --root="$pkgdir"
+  install -Dm644 PKG-INFO $pkgdir/usr/share/licenses/$pkgname/LICENSE
+}
diff --git a/pcr/sic/PKGBUILD b/pcr/sic/PKGBUILD
new file mode 100644
index 000000000..b006f95b5
--- /dev/null
+++ b/pcr/sic/PKGBUILD
@@ -0,0 +1,32 @@
+# Maintainer: Thomas Dziedzic < gostrc at gmail >
+# Contributor: Dag Odenhall <dag.odenhall@gmail.com>
+# Contributor: Giorgio Lando <patroclo7@gmail.com>
+
+pkgname=sic
+pkgver=1.2
+pkgrel=1
+pkgdesc='An extremely simple IRC client.'
+license=('MIT')
+arch=('i686' 'x86_64')
+url='http://tools.suckless.org/sic'
+depends=('glibc')
+source=("http://dl.suckless.org/tools/$pkgname-$pkgver.tar.gz")
+
+prepare() {
+  cd $pkgname-$pkgver
+  sed -i "s/CFLAGS = /CFLAGS = ${CFLAGS} /" config.mk
+}
+build() {
+  cd $pkgname-$pkgver
+
+  make PREFIX=/usr MANPREFIX=/usr/share/man
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make PREFIX=/usr MANPREFIX=/usr/share/man DESTDIR="$pkgdir" install
+
+  install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+}
+sha1sums=('a91a603d536ae9cff9a806d6b2737053d262e722')
+sha256sums=('ac07f905995e13ba2c43912d7a035fbbe78a628d7ba1c256f4ca1372fb565185')
diff --git a/pcr/sqlcipher/PKGBUILD b/pcr/sqlcipher/PKGBUILD
new file mode 100644
index 000000000..45a3efbe9
--- /dev/null
+++ b/pcr/sqlcipher/PKGBUILD
@@ -0,0 +1,31 @@
+pkgname=sqlcipher
+pkgver=2.2.1
+pkgrel=1
+pkgdesc="SQLite extension that provides transparent 256-bit AES encryption of database files"
+arch=('i686' 'x86_64')
+url="http://sqlcipher.net/"
+license=('BSD')
+makedepends=('tcl' 'openssl' 'sqlite3' 'git')
+source=($pkgname-$pkgver::git+https://github.com/sqlcipher/sqlcipher#tag=v${pkgver})
+sha1sums=('SKIP')
+sha256sums=('SKIP')
+
+pkgver() {
+  echo $pkgver
+}
+
+build() {
+	cd $srcdir/$pkgname-$pkgver
+  ./configure --prefix=/usr \
+              --disable-tcl \
+              --enable-tempstore=yes \
+              CFLAGS="$CFLAGS -DSQLITE_HAS_CODEC" LDFLAGS="-lcrypto"
+    make
+}
+
+package() {
+	cd $srcdir/$pkgname-$pkgver
+
+  make DESTDIR="$pkgdir/" install
+  install -D -m 0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+} 
diff --git a/pcr/tahoe-lafs/PKGBUILD b/pcr/tahoe-lafs/PKGBUILD
new file mode 100644
index 000000000..8ace70679
--- /dev/null
+++ b/pcr/tahoe-lafs/PKGBUILD
@@ -0,0 +1,30 @@
+# Contributor: Peter Simons <simons@cryp.to>
+# Contributor: Nicolas Pouillard <nicolas.pouillard@gmail.com>
+pkgname=tahoe-lafs
+pkgver=1.10.0
+pkgrel=1
+pkgdesc="a secure, decentralized, fault-tolerant filesystem"
+arch=('any')
+url='http://tahoe-lafs.org/'
+license=('GPL')
+# net-tools is needed because Tahoe-LAFS uses /sbin/ifconfig
+depends=('net-tools' 'python2' 'python2-zope-interface>=3.6.5'
+         'twisted' 'python2-pyasn1' 'python2-crypto' 'pycryptopp' 'nevow'
+         'python2-foolscap' 'python2-simplejson' 'zfec' 'python2-pyopenssl'
+         'pyutil' 'python2-argparse' 'zbase32' 'python2-mock>=0.8.0')
+source=(nodaemon.patch https://tahoe-lafs.org/source/tahoe-lafs/releases/allmydata-tahoe-$pkgver.tar.bz2)
+sha256sums=('7fb13a50bdca729b9c78f12369e56fccf55594b646bddb270d55c08c83ce3449'
+            '9c5516700fe95fdf8c57eca1e2a7b4aebf2de9a4d327d50afd684ebf833ccfe2')
+
+build(){
+  cd "$srcdir/allmydata-tahoe-$pkgver"
+  patch -p0 < ../nodaemon.patch
+  python2 setup.py build
+  # disabled due to the nodaemon patch and the test_filesystem* tests
+  #python2 setup.py test || return 1
+}
+
+package(){
+  cd "$srcdir/allmydata-tahoe-$pkgver"
+  python2 setup.py install --root="$pkgdir"
+}
diff --git a/pcr/tahoe-lafs/nodaemon.patch b/pcr/tahoe-lafs/nodaemon.patch
new file mode 100644
index 000000000..dfcc0b8ae
--- /dev/null
+++ b/pcr/tahoe-lafs/nodaemon.patch
@@ -0,0 +1,19 @@
+--- src/allmydata/scripts/startstop_node.py	2011-10-30 22:54:34.000000000 +0100
++++ src/allmydata/scripts/startstop_node.py	2011-11-10 15:22:21.432711365 +0100
+@@ -10,6 +10,7 @@
+     optFlags = [
+         ["profile", "p", "Run under the Python profiler, putting results in 'profiling_results.prof'."],
+         ["syslog", None, "Tell the node to log to syslog, not a file."],
++        ["nodaemon", "n", "Do not daemonize."],
+         ]
+ 
+     def getSynopsis(self):
+@@ -70,6 +71,8 @@
+         args.extend(["--logfile", os.path.join("logs", "twistd.log")])
+     if opts["profile"]:
+         args.extend(["--profile=profiling_results.prof", "--savestats",])
++    if opts["nodaemon"]:
++        args.extend(["--nodaemon", "--umask=0077"])
+     # now we're committed
+     os.chdir(basedir)
+     from twisted.scripts import twistd
diff --git a/pcr/timer_entropyd/PKGBUILD b/pcr/timer_entropyd/PKGBUILD
new file mode 100644
index 000000000..4d5f4437e
--- /dev/null
+++ b/pcr/timer_entropyd/PKGBUILD
@@ -0,0 +1,28 @@
+# Maintainer: fauno <fauno@parabola.nu>
+pkgname=timer_entropyd
+pkgver=0.2
+pkgrel=1
+pkgdesc="Feeds the /dev/random device with entropy-data (random values) read from timers."
+arch=('i686')
+url="http://www.vanheusden.com/te/"
+license=('GPL2')
+groups=('entropy')
+source=(http://www.vanheusden.com/te/${pkgname}-${pkgver}.tgz
+        ${pkgname}.service)
+sha1sums=('61b82128bf4df483271a475a0cc772a7fd80a804'
+          '96ff193aef61088759cf9d9c9d0e881fd1174824')
+sha256sums=('0cf2b976b78c1b1169a4bec5a6fc71d8b118de927bc05002686376a61f73989a'
+            'a22d33d99ab7c511902a37225e83476466840bd4c0ee3ffece1e4094511414de')
+
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+	make
+}
+
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
+
+  install -D -m 755 ${pkgname} ${pkgdir}/usr/bin/${pkgname}
+  install -D -m 644 ${srcdir}/${pkgname}.service \
+                    ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
+}
diff --git a/pcr/timer_entropyd/timer_entropyd.service b/pcr/timer_entropyd/timer_entropyd.service
new file mode 100644
index 000000000..0bea7398b
--- /dev/null
+++ b/pcr/timer_entropyd/timer_entropyd.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Gathering entropy from system timers
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/timer_entropyd
+
+[Install]
+WantedBy=multi-user.target
diff --git a/pcr/ttf-font-awesome/PKGBUILD b/pcr/ttf-font-awesome/PKGBUILD
new file mode 100644
index 000000000..abb63b8a6
--- /dev/null
+++ b/pcr/ttf-font-awesome/PKGBUILD
@@ -0,0 +1,19 @@
+#Contributer: UNKNOWN o_O
+#Maintainer : Parabola Aurélien DESBRIÈRES <aurelien@replicant.io>
+
+pkgname=ttf-font-awesome
+pkgver=3.2.1
+pkgrel=2
+pkgdesc="Iconic font designed for Bootstrap"
+url="http://fortawesome.github.io/Font-Awesome/"
+license=('CCPL')
+depends=('fontconfig' 'xorg-font-utils')
+options=("!strip")
+install=$pkgname.install
+arch=('any')
+source=('http://fortawesome.github.io/Font-Awesome/assets/font-awesome.zip')
+
+package() {
+  install -d "$pkgdir/usr/share/fonts/TTF"
+  cp -dpr --no-preserve=ownership "$srcdir/font-awesome/font/"*.ttf "$pkgdir/usr/share/fonts/TTF/"
+}
diff --git a/pcr/ttf-font-awesome/ttf-font-awesome.install b/pcr/ttf-font-awesome/ttf-font-awesome.install
new file mode 100644
index 000000000..56632d242
--- /dev/null
+++ b/pcr/ttf-font-awesome/ttf-font-awesome.install
@@ -0,0 +1,20 @@
+post_install() {
+  echo -n "Updating font cache..."
+  fc-cache -f > /dev/null
+  mkfontscale /usr/share/fonts/TTF
+  mkfontdir /usr/share/fonts/TTF
+  echo "done."
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
+
+op=$1
+shift
+
+$op $*
diff --git a/pcr/video_entropyd/PKGBUILD b/pcr/video_entropyd/PKGBUILD
new file mode 100644
index 000000000..e096aabdd
--- /dev/null
+++ b/pcr/video_entropyd/PKGBUILD
@@ -0,0 +1,28 @@
+# Maintainer: fauno <fauno@parabola.nu>
+pkgname=video_entropyd
+pkgver=2.0
+pkgrel=1
+pkgdesc="Feeds the /dev/random device with entropy-data read from a video device"
+arch=('i686')
+url="http://vanheusden.com/ved/"
+license=('GPL2')
+groups=('entropy')
+source=(http://www.vanheusden.com/ved/${pkgname}-${pkgver}.tgz
+        ${pkgname}.service)
+sha1sums=('9d566bce8d0f0fa4e8be24b481ffdba0d0c70406'
+          '30cfb694ee886e36ab97329d575a8b9437a30bb2')
+sha256sums=('aba6255ddb32cd376c785128a7e850fb51b6c1d7fe3f4ba765abc0c50ec67d7a'
+            'b6988df79823a29ab04bfa0fe6d8f2e14f3176398eb220fa1248c6728e8be27f')
+
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+	make
+}
+
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
+
+  install -D -m 755 ${pkgname} ${pkgdir}/usr/bin/${pkgname}
+  install -D -m 644 ${srcdir}/${pkgname}.service \
+                    ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
+}
diff --git a/pcr/video_entropyd/video_entropyd.service b/pcr/video_entropyd/video_entropyd.service
new file mode 100644
index 000000000..1dfef410a
--- /dev/null
+++ b/pcr/video_entropyd/video_entropyd.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Gathering entropy from video
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/video_entropyd
+
+[Install]
+WantedBy=multi-user.target
diff --git a/pcr/xfwm4-titleless/PKGBUILD b/pcr/xfwm4-titleless/PKGBUILD
new file mode 100644
index 000000000..dd80d287d
--- /dev/null
+++ b/pcr/xfwm4-titleless/PKGBUILD
@@ -0,0 +1,46 @@
+# Contributor: Christian Hesse <mail@eworm.de>
+# Contributor: Evangelos Foutras <evangelos@foutrelis.com>
+# Contributor: tobias <tobias funnychar archlinux.org>
+# Maintainer : Parabola Aurélien DESBRIÈRES <aurelien@replicant.io>
+
+pkgname=xfwm4-titleless
+pkgver=4.10.1
+pkgrel=1
+pkgdesc="Xfce window manager - patched with option to hide titlebar when maximized"
+arch=('i686' 'x86_64')
+url="https://bitbucket.org/thesame/xfwm4-titleless"
+license=('GPL2')
+depends=('libxfce4ui' 'libwnck' 'hicolor-icon-theme')
+makedepends=('intltool')
+options=('!libtool')
+conflicts=('xfwm4')
+provides=('xfwm4')
+install=${pkgname%%-*}.install
+source=("http://archive.xfce.org/src/xfce/${pkgname%%-*}/4.10/${pkgname%%-*}-${pkgver}.tar.bz2"
+	"xfwm4-hide-titlebar-when-maximized.patch")
+
+build() {
+	cd "${srcdir}/${pkgname%%-*}-${pkgver}"
+
+	patch -Np1 < ${srcdir}/xfwm4-hide-titlebar-when-maximized.patch
+
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--libexecdir=/usr/lib \
+		--localstatedir=/var \
+		--disable-static \
+		--enable-startup-notification \
+		--enable-randr \
+		--enable-compositor \
+		--enable-xsync \
+		--disable-debug
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname%%-*}-${pkgver}"
+
+	make DESTDIR="${pkgdir}" install
+}
+
diff --git a/pcr/xfwm4-titleless/xfwm4-hide-titlebar-when-maximized.patch b/pcr/xfwm4-titleless/xfwm4-hide-titlebar-when-maximized.patch
new file mode 100644
index 000000000..fa43b6b8e
--- /dev/null
+++ b/pcr/xfwm4-titleless/xfwm4-hide-titlebar-when-maximized.patch
@@ -0,0 +1,1456 @@
+From 999c375f5342947525813584fbdc92f3b63dced6 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <eworm@leda.eworm.de>
+Date: Wed, 25 Sep 2013 15:16:57 +0200
+Subject: [PATCH 1/1] xfwm4: hide titlebar when maximized
+
+---
+ defaults/defaults                          |   1 +
+ settings-dialogs/tweaks-settings.c         |   5 +
+ settings-dialogs/xfwm4-tweaks-dialog.glade |  25 +-
+ settings-dialogs/xfwm4-tweaks-dialog_ui.h  | 612 +++++++++++++++--------------
+ src/client.c                               |   6 +
+ src/client.h                               |   1 +
+ src/display.c                              |   3 +-
+ src/display.h                              |   1 +
+ src/events.c                               |   5 +
+ src/frame.c                                | 366 ++++++++++-------
+ src/netwm.c                                |  38 ++
+ src/placement.c                            |   4 +-
+ src/settings.c                             |   8 +
+ src/settings.h                             |   1 +
+ 14 files changed, 616 insertions(+), 460 deletions(-)
+
+diff --git a/defaults/defaults b/defaults/defaults
+index 6db210a..1582fc1 100644
+--- a/defaults/defaults
++++ b/defaults/defaults
+@@ -1,5 +1,6 @@
+ activate_action=bring
+ borderless_maximize=true
++titleless_maximize=false
+ box_move=false
+ box_resize=false
+ button_layout=O|SHMC
+diff --git a/settings-dialogs/tweaks-settings.c b/settings-dialogs/tweaks-settings.c
+index f60b606..2532733 100644
+--- a/settings-dialogs/tweaks-settings.c
++++ b/settings-dialogs/tweaks-settings.c
+@@ -180,6 +180,7 @@ wm_tweaks_dialog_configure_widgets (GtkBuilder *builder)
+     GtkWidget *easy_click_combo_box = GTK_WIDGET (gtk_builder_get_object (builder, "easy_click_combo_box"));
+     GtkWidget *raise_with_any_button_check = GTK_WIDGET (gtk_builder_get_object (builder, "raise_with_any_button_check"));
+     GtkWidget *borderless_maximize_check = GTK_WIDGET (gtk_builder_get_object (builder, "borderless_maximize_check"));
++    GtkWidget *titleless_maximize_check = GTK_WIDGET (gtk_builder_get_object (builder, "titleless_maximize_check"));
+     GtkWidget *restore_on_move_check = GTK_WIDGET (gtk_builder_get_object (builder, "restore_on_move_check"));
+     GtkWidget *tile_on_move_check = GTK_WIDGET (gtk_builder_get_object (builder, "tile_on_move_check"));
+     GtkWidget *snap_resist_check = GTK_WIDGET (gtk_builder_get_object (builder, "snap_resist_check"));
+@@ -336,6 +337,10 @@ wm_tweaks_dialog_configure_widgets (GtkBuilder *builder)
+                             G_TYPE_BOOLEAN,
+                             (GObject *)borderless_maximize_check, "active");
+     xfconf_g_property_bind (xfwm4_channel,
++                            "/general/titleless_maximize",
++                            G_TYPE_BOOLEAN,
++                            (GObject *)titleless_maximize_check, "active");
++    xfconf_g_property_bind (xfwm4_channel,
+                             "/general/restore_on_move",
+                             G_TYPE_BOOLEAN,
+                             (GObject *)restore_on_move_check, "active");
+diff --git a/settings-dialogs/xfwm4-tweaks-dialog.glade b/settings-dialogs/xfwm4-tweaks-dialog.glade
+index bd2a86f..7d604c6 100644
+--- a/settings-dialogs/xfwm4-tweaks-dialog.glade
++++ b/settings-dialogs/xfwm4-tweaks-dialog.glade
+@@ -343,6 +343,21 @@ or "skip taskbar" properties set</property>
+                   </packing>
+                 </child>
+                 <child>
++                  <object class="GtkCheckButton" id="titleless_maximize_check">
++                    <property name="label" translatable="yes">Hide _title of windows when maximized</property>
++                    <property name="visible">True</property>
++                    <property name="can_focus">True</property>
++                    <property name="receives_default">False</property>
++                    <property name="use_underline">True</property>
++                    <property name="draw_indicator">True</property>
++                  </object>
++                  <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">False</property>
++                    <property name="position">3</property>
++                  </packing>
++                </child>
++                <child>
+                   <object class="GtkCheckButton" id="restore_on_move_check">
+                     <property name="label" translatable="yes">Restore original _size of maximized windows when moving</property>
+                     <property name="visible">True</property>
+@@ -354,7 +369,7 @@ or "skip taskbar" properties set</property>
+                   <packing>
+                     <property name="expand">False</property>
+                     <property name="fill">False</property>
+-                    <property name="position">3</property>
++                    <property name="position">4</property>
+                   </packing>
+                 </child>
+                 <child>
+@@ -369,7 +384,7 @@ or "skip taskbar" properties set</property>
+                   <packing>
+                     <property name="expand">False</property>
+                     <property name="fill">False</property>
+-                    <property name="position">4</property>
++                    <property name="position">5</property>
+                   </packing>
+                 </child>
+                 <child>
+@@ -384,7 +399,7 @@ or "skip taskbar" properties set</property>
+                   <packing>
+                     <property name="expand">False</property>
+                     <property name="fill">False</property>
+-                    <property name="position">5</property>
++                    <property name="position">6</property>
+                   </packing>
+                 </child>
+                 <child>
+@@ -399,7 +414,7 @@ or "skip taskbar" properties set</property>
+                   <packing>
+                     <property name="expand">False</property>
+                     <property name="fill">False</property>
+-                    <property name="position">5</property>
++                    <property name="position">7</property>
+                   </packing>
+                 </child>
+                 <child>
+@@ -414,7 +429,7 @@ or "skip taskbar" properties set</property>
+                   <packing>
+                     <property name="expand">False</property>
+                     <property name="fill">False</property>
+-                    <property name="position">6</property>
++                    <property name="position">8</property>
+                   </packing>
+                 </child>
+               </object>
+diff --git a/settings-dialogs/xfwm4-tweaks-dialog_ui.h b/settings-dialogs/xfwm4-tweaks-dialog_ui.h
+index a6121dd..8ddbf30 100644
+--- a/settings-dialogs/xfwm4-tweaks-dialog_ui.h
++++ b/settings-dialogs/xfwm4-tweaks-dialog_ui.h
+@@ -177,332 +177,340 @@ static const char tweaks_dialog_ui[] =
+   "y><property name=\"draw_indicator\">True</property></object><packing><p"
+   "roperty name=\"expand\">False</property><property name=\"fill\">False</"
+   "property><property name=\"position\">2</property></packing></child><chi"
+-  "ld><object class=\"GtkCheckButton\" id=\"restore_on_move_check\"><prope"
+-  "rty name=\"label\" translatable=\"yes\">Restore original _size of maxim"
+-  "ized windows when moving</property><property name=\"visible\">True</pro"
+-  "perty><property name=\"can_focus\">True</property><property name=\"rece"
+-  "ives_default\">False</property><property name=\"use_underline\">True</p"
+-  "roperty><property name=\"draw_indicator\">True</property></object><pack"
+-  "ing><property name=\"expand\">False</property><property name=\"fill\">F"
+-  "alse</property><property name=\"position\">3</property></packing></chil"
+-  "d><child><object class=\"GtkCheckButton\" id=\"tile_on_move_check\"><pr"
+-  "operty name=\"label\" translatable=\"yes\">Automatically _tile windows "
+-  "when moving toward the screen edge</property><property name=\"visible\""
+-  ">True</property><property name=\"can_focus\">True</property><property n"
+-  "ame=\"receives_default\">False</property><property name=\"use_underline"
+-  "\">True</property><property name=\"draw_indicator\">True</property></ob"
+-  "ject><packing><property name=\"expand\">False</property><property name="
+-  "\"fill\">False</property><property name=\"position\">4</property></pack"
+-  "ing></child><child><object class=\"GtkCheckButton\" id=\"snap_resist_ch"
+-  "eck\"><property name=\"label\" translatable=\"yes\">Use _edge resistanc"
+-  "e instead of window snapping</property><property name=\"visible\">True<"
+-  "/property><property name=\"can_focus\">True</property><property name=\""
+-  "receives_default\">False</property><property name=\"use_underline\">Tru"
+-  "e</property><property name=\"draw_indicator\">True</property></object><"
+-  "packing><property name=\"expand\">False</property><property name=\"fill"
+-  "\">False</property><property name=\"position\">5</property></packing></"
+-  "child><child><object class=\"GtkCheckButton\" id=\"urgent_blink\"><prop"
+-  "erty name=\"label\" translatable=\"yes\">Notify of _urgency by making w"
+-  "indow\'s decoration blink</property><property name=\"visible\">True</pr"
++  "ld><object class=\"GtkCheckButton\" id=\"titleless_maximize_check\"><pr"
++  "operty name=\"label\" translatable=\"yes\">Hide _title of windows when "
++  "maximized</property><property name=\"visible\">True</property><property"
++  " name=\"can_focus\">True</property><property name=\"receives_default\">"
++  "False</property><property name=\"use_underline\">True</property><proper"
++  "ty name=\"draw_indicator\">True</property></object><packing><property n"
++  "ame=\"expand\">False</property><property name=\"fill\">False</property>"
++  "<property name=\"position\">3</property></packing></child><child><objec"
++  "t class=\"GtkCheckButton\" id=\"restore_on_move_check\"><property name="
++  "\"label\" translatable=\"yes\">Restore original _size of maximized wind"
++  "ows when moving</property><property name=\"visible\">True</property><pr"
++  "operty name=\"can_focus\">True</property><property name=\"receives_defa"
++  "ult\">False</property><property name=\"use_underline\">True</property><"
++  "property name=\"draw_indicator\">True</property></object><packing><prop"
++  "erty name=\"expand\">False</property><property name=\"fill\">False</pro"
++  "perty><property name=\"position\">4</property></packing></child><child>"
++  "<object class=\"GtkCheckButton\" id=\"tile_on_move_check\"><property na"
++  "me=\"label\" translatable=\"yes\">Automatically _tile windows when movi"
++  "ng toward the screen edge</property><property name=\"visible\">True</pr"
+   "operty><property name=\"can_focus\">True</property><property name=\"rec"
+   "eives_default\">False</property><property name=\"use_underline\">True</"
+   "property><property name=\"draw_indicator\">True</property></object><pac"
+   "king><property name=\"expand\">False</property><property name=\"fill\">"
+   "False</property><property name=\"position\">5</property></packing></chi"
+-  "ld><child><object class=\"GtkCheckButton\" id=\"repeat_urgent_blink\"><"
+-  "property name=\"label\" translatable=\"yes\">Keep urgent windows _blink"
+-  "ing repeatedly</property><property name=\"visible\">True</property><pro"
++  "ld><child><object class=\"GtkCheckButton\" id=\"snap_resist_check\"><pr"
++  "operty name=\"label\" translatable=\"yes\">Use _edge resistance instead"
++  " of window snapping</property><property name=\"visible\">True</property"
++  "><property name=\"can_focus\">True</property><property name=\"receives_"
++  "default\">False</property><property name=\"use_underline\">True</proper"
++  "ty><property name=\"draw_indicator\">True</property></object><packing><"
++  "property name=\"expand\">False</property><property name=\"fill\">False<"
++  "/property><property name=\"position\">6</property></packing></child><ch"
++  "ild><object class=\"GtkCheckButton\" id=\"urgent_blink\"><property name"
++  "=\"label\" translatable=\"yes\">Notify of _urgency by making window\'s "
++  "decoration blink</property><property name=\"visible\">True</property><p"
++  "roperty name=\"can_focus\">True</property><property name=\"receives_def"
++  "ault\">False</property><property name=\"use_underline\">True</property>"
++  "<property name=\"draw_indicator\">True</property></object><packing><pro"
++  "perty name=\"expand\">False</property><property name=\"fill\">False</pr"
++  "operty><property name=\"position\">7</property></packing></child><child"
++  "><object class=\"GtkCheckButton\" id=\"repeat_urgent_blink\"><property "
++  "name=\"label\" translatable=\"yes\">Keep urgent windows _blinking repea"
++  "tedly</property><property name=\"visible\">True</property><property nam"
++  "e=\"can_focus\">True</property><property name=\"receives_default\">Fals"
++  "e</property><property name=\"use_underline\">True</property><property n"
++  "ame=\"draw_indicator\">True</property></object><packing><property name="
++  "\"expand\">False</property><property name=\"fill\">False</property><pro"
++  "perty name=\"position\">8</property></packing></child></object><packing"
++  "><property name=\"position\">2</property></packing></child><child type="
++  "\"tab\"><object class=\"GtkLabel\" id=\"label3\"><property name=\"visib"
++  "le\">True</property><property name=\"label\" translatable=\"yes\">_Acce"
++  "ssibility</property><property name=\"use_underline\">True</property></o"
++  "bject><packing><property name=\"position\">2</property><property name=\""
++  "tab_fill\">False</property></packing></child><child><object class=\"Gtk"
++  "VBox\" id=\"vbox5\"><property name=\"visible\">True</property><property"
++  " name=\"border_width\">12</property><property name=\"orientation\">vert"
++  "ical</property><property name=\"spacing\">6</property><child><object cl"
++  "ass=\"GtkCheckButton\" id=\"scroll_workspaces_check\"><property name=\""
++  "label\" translatable=\"yes\">Use the _mouse wheel on the desktop to swi"
++  "tch workspaces</property><property name=\"visible\">True</property><pro"
+   "perty name=\"can_focus\">True</property><property name=\"receives_defau"
+   "lt\">False</property><property name=\"use_underline\">True</property><p"
+   "roperty name=\"draw_indicator\">True</property></object><packing><prope"
+   "rty name=\"expand\">False</property><property name=\"fill\">False</prop"
+-  "erty><property name=\"position\">6</property></packing></child></object"
+-  "><packing><property name=\"position\">2</property></packing></child><ch"
+-  "ild type=\"tab\"><object class=\"GtkLabel\" id=\"label3\"><property nam"
+-  "e=\"visible\">True</property><property name=\"label\" translatable=\"ye"
+-  "s\">_Accessibility</property><property name=\"use_underline\">True</pro"
+-  "perty></object><packing><property name=\"position\">2</property><proper"
+-  "ty name=\"tab_fill\">False</property></packing></child><child><object c"
+-  "lass=\"GtkVBox\" id=\"vbox5\"><property name=\"visible\">True</property"
+-  "><property name=\"border_width\">12</property><property name=\"orientat"
+-  "ion\">vertical</property><property name=\"spacing\">6</property><child>"
+-  "<object class=\"GtkCheckButton\" id=\"scroll_workspaces_check\"><proper"
+-  "ty name=\"label\" translatable=\"yes\">Use the _mouse wheel on the desk"
+-  "top to switch workspaces</property><property name=\"visible\">True</pro"
+-  "perty><property name=\"can_focus\">True</property><property name=\"rece"
+-  "ives_default\">False</property><property name=\"use_underline\">True</p"
+-  "roperty><property name=\"draw_indicator\">True</property></object><pack"
+-  "ing><property name=\"expand\">False</property><property name=\"fill\">F"
+-  "alse</property><property name=\"position\">0</property></packing></chil"
+-  "d><child><object class=\"GtkCheckButton\" id=\"toggle_workspaces_check\""
+-  "><property name=\"label\" translatable=\"yes\">_Remember and recall pre"
+-  "vious workspace\nwhen switching via keyboard shortcuts</property><prope"
+-  "rty name=\"visible\">True</property><property name=\"can_focus\">True</"
+-  "property><property name=\"receives_default\">False</property><property "
+-  "name=\"use_underline\">True</property><property name=\"draw_indicator\""
+-  ">True</property></object><packing><property name=\"expand\">False</prop"
+-  "erty><property name=\"fill\">False</property><property name=\"position\""
+-  ">1</property></packing></child><child><object class=\"GtkCheckButton\" "
+-  "id=\"wrap_layout_check\"><property name=\"label\" translatable=\"yes\">"
+-  "Wrap workspaces depending on the actual desktop _layout</property><prop"
+-  "erty name=\"visible\">True</property><property name=\"can_focus\">True<"
+-  "/property><property name=\"receives_default\">False</property><property"
+-  " name=\"use_underline\">True</property><property name=\"draw_indicator\""
+-  ">True</property></object><packing><property name=\"expand\">False</prop"
+-  "erty><property name=\"fill\">False</property><property name=\"position\""
+-  ">2</property></packing></child><child><object class=\"GtkCheckButton\" "
+-  "id=\"wrap_cycle_check\"><property name=\"label\" translatable=\"yes\">W"
+-  "rap workspaces when the _first or the last workspace is reached</proper"
+-  "ty><property name=\"visible\">True</property><property name=\"can_focus"
+-  "\">True</property><property name=\"receives_default\">False</property><"
+-  "property name=\"use_underline\">True</property><property name=\"draw_in"
+-  "dicator\">True</property></object><packing><property name=\"expand\">Fa"
+-  "lse</property><property name=\"fill\">False</property><property name=\""
+-  "position\">3</property></packing></child></object><packing><property na"
+-  "me=\"position\">3</property></packing></child><child type=\"tab\"><obje"
+-  "ct class=\"GtkLabel\" id=\"label4\"><property name=\"visible\">True</pr"
+-  "operty><property name=\"label\" translatable=\"yes\">_Workspaces</prope"
+-  "rty><property name=\"use_underline\">True</property></object><packing><"
+-  "property name=\"position\">3</property><property name=\"tab_fill\">Fals"
+-  "e</property></packing></child><child><object class=\"GtkVBox\" id=\"vbo"
+-  "x6\"><property name=\"visible\">True</property><property name=\"border_"
+-  "width\">12</property><property name=\"orientation\">vertical</property>"
+-  "<property name=\"spacing\">6</property><child><object class=\"GtkLabel\""
+-  " id=\"label8\"><property name=\"visible\">True</property><property name"
+-  "=\"xalign\">0</property><property name=\"label\" translatable=\"yes\">_"
+-  "Minimum size of windows to trigger smart placement:</property><property"
+-  " name=\"use_underline\">True</property><property name=\"mnemonic_widget"
+-  "\">placement_ratio_scale</property></object><packing><property name=\"e"
+-  "xpand\">False</property><property name=\"fill\">False</property><proper"
+-  "ty name=\"position\">0</property></packing></child><child><object class"
+-  "=\"GtkAlignment\" id=\"alignment4\"><property name=\"visible\">True</pr"
+-  "operty><property name=\"bottom_padding\">6</property><property name=\"l"
+-  "eft_padding\">12</property><child><object class=\"GtkHBox\" id=\"hbox2\""
+-  "><property name=\"visible\">True</property><property name=\"spacing\">1"
+-  "2</property><child><object class=\"GtkLabel\" id=\"label9\"><property n"
+-  "ame=\"visible\">True</property><property name=\"label\" translatable=\""
+-  "yes\" comments=\"Smart placement size\">&lt;i&gt;Small&lt;/i&gt;</prope"
+-  "rty><property name=\"use_markup\">True</property></object><packing><pro"
+-  "perty name=\"expand\">False</property><property name=\"fill\">False</pr"
+-  "operty><property name=\"position\">0</property></packing></child><child"
+-  "><object class=\"GtkHScale\" id=\"placement_ratio_scale\"><property nam"
+-  "e=\"visible\">True</property><property name=\"can_focus\">True</propert"
+-  "y><property name=\"adjustment\">adjustment1</property><property name=\""
+-  "restrict_to_fill_level\">False</property><property name=\"draw_value\">"
+-  "False</property></object><packing><property name=\"position\">1</proper"
+-  "ty></packing></child><child><object class=\"GtkLabel\" id=\"label10\"><"
+-  "property name=\"visible\">True</property><property name=\"label\" trans"
+-  "latable=\"yes\" comments=\"Smart placement size\">&lt;i&gt;Large&lt;/i&"
+-  "gt;</property><property name=\"use_markup\">True</property></object><pa"
+-  "cking><property name=\"expand\">False</property><property name=\"positi"
+-  "on\">2</property></packing></child></object></child></object><packing><"
+-  "property name=\"expand\">False</property><property name=\"fill\">False<"
+-  "/property><property name=\"position\">1</property></packing></child><ch"
+-  "ild><object class=\"GtkVBox\" id=\"default_placement_box\"><property na"
+-  "me=\"visible\">True</property><property name=\"orientation\">vertical</"
+-  "property><property name=\"spacing\">6</property><child><object class=\""
+-  "GtkLabel\" id=\"label27\"><property name=\"visible\">True</property><pr"
+-  "operty name=\"xalign\">0</property><property name=\"label\" translatabl"
+-  "e=\"yes\">By default, place windows:</property></object><packing><prope"
+-  "rty name=\"position\">0</property></packing></child><child><object clas"
+-  "s=\"GtkAlignment\" id=\"alignment10\"><property name=\"visible\">True</"
+-  "property><property name=\"bottom_padding\">6</property><property name=\""
+-  "left_padding\">12</property><child><object class=\"GtkVBox\" id=\"vbox1"
+-  "8\"><property name=\"visible\">True</property><property name=\"border_w"
+-  "idth\">6</property><property name=\"orientation\">vertical</property><p"
+-  "roperty name=\"spacing\">6</property><child><object class=\"GtkRadioBut"
+-  "ton\" id=\"placement_center_option\"><property name=\"label\" translata"
+-  "ble=\"yes\">At the _center of the screen</property><property name=\"vis"
+-  "ible\">True</property><property name=\"can_focus\">True</property><prop"
+-  "erty name=\"receives_default\">False</property><property name=\"use_und"
+-  "erline\">True</property><property name=\"draw_indicator\">True</propert"
+-  "y></object><packing><property name=\"position\">0</property></packing><"
+-  "/child><child><object class=\"GtkRadioButton\" id=\"placement_mouse_opt"
+-  "ion\"><property name=\"label\" translatable=\"yes\">Under the mouse _po"
+-  "inter</property><property name=\"visible\">True</property><property nam"
+-  "e=\"can_focus\">True</property><property name=\"receives_default\">Fals"
+-  "e</property><property name=\"use_underline\">True</property><property n"
+-  "ame=\"active\">True</property><property name=\"draw_indicator\">True</p"
+-  "roperty><property name=\"group\">placement_center_option</property></ob"
+-  "ject><packing><property name=\"position\">1</property></packing></child"
+-  "></object></child></object><packing><property name=\"position\">1</prop"
+-  "erty></packing></child></object><packing><property name=\"expand\">Fals"
+-  "e</property><property name=\"fill\">False</property><property name=\"po"
+-  "sition\">2</property></packing></child></object><packing><property name"
+-  "=\"position\">4</property></packing></child><child type=\"tab\"><object"
+-  " class=\"GtkLabel\" id=\"label5\"><property name=\"visible\">True</prop"
+-  "erty><property name=\"label\" translatable=\"yes\">_Placement</property"
+-  "><property name=\"use_underline\">True</property></object><packing><pro"
+-  "perty name=\"position\">4</property><property name=\"tab_fill\">False</"
+-  "property></packing></child><child><object class=\"GtkVBox\" id=\"vbox7\""
+-  "><property name=\"visible\">True</property><property name=\"border_widt"
+-  "h\">12</property><property name=\"orientation\">vertical</property><pro"
+-  "perty name=\"spacing\">6</property><child><object class=\"GtkCheckButto"
+-  "n\" id=\"use_compositing_check\"><property name=\"label\" translatable="
+-  "\"yes\">_Enable display compositing</property><property name=\"visible\""
+-  ">True</property><property name=\"can_focus\">True</property><property n"
+-  "ame=\"receives_default\">False</property><property name=\"use_underline"
+-  "\">True</property><property name=\"draw_indicator\">True</property></ob"
+-  "ject><packing><property name=\"expand\">False</property><property name="
+-  "\"fill\">False</property><property name=\"position\">0</property></pack"
+-  "ing></child><child><object class=\"GtkScrolledWindow\" id=\"use_composi"
+-  "ting_box\"><property name=\"visible\">True</property><property name=\"s"
+-  "ensitive\">False</property><property name=\"can_focus\">True</property>"
+-  "<property name=\"hscrollbar_policy\">never</property><property name=\"v"
+-  "scrollbar_policy\">automatic</property><child><object class=\"GtkViewpo"
+-  "rt\" id=\"viewport1\"><property name=\"visible\">True</property><proper"
+-  "ty name=\"resize_mode\">queue</property><property name=\"shadow_type\">"
+-  "none</property><child><object class=\"GtkAlignment\" id=\"alignment3\">"
+-  "<property name=\"visible\">True</property><property name=\"bottom_paddi"
+-  "ng\">6</property><property name=\"left_padding\">12</property><child><o"
+-  "bject class=\"GtkVBox\" id=\"vbox8\"><property name=\"visible\">True</p"
+-  "roperty><property name=\"orientation\">vertical</property><property nam"
+-  "e=\"spacing\">6</property><child><object class=\"GtkCheckButton\" id=\""
+-  "unredirect_overlays_check\"><property name=\"label\" translatable=\"yes"
+-  "\">Display _fullscreen overlay windows directly</property><property nam"
++  "erty><property name=\"position\">0</property></packing></child><child><"
++  "object class=\"GtkCheckButton\" id=\"toggle_workspaces_check\"><propert"
++  "y name=\"label\" translatable=\"yes\">_Remember and recall previous wor"
++  "kspace\nwhen switching via keyboard shortcuts</property><property name="
++  "\"visible\">True</property><property name=\"can_focus\">True</property>"
++  "<property name=\"receives_default\">False</property><property name=\"us"
++  "e_underline\">True</property><property name=\"draw_indicator\">True</pr"
++  "operty></object><packing><property name=\"expand\">False</property><pro"
++  "perty name=\"fill\">False</property><property name=\"position\">1</prop"
++  "erty></packing></child><child><object class=\"GtkCheckButton\" id=\"wra"
++  "p_layout_check\"><property name=\"label\" translatable=\"yes\">Wrap wor"
++  "kspaces depending on the actual desktop _layout</property><property nam"
+   "e=\"visible\">True</property><property name=\"can_focus\">True</propert"
+   "y><property name=\"receives_default\">False</property><property name=\""
+   "use_underline\">True</property><property name=\"draw_indicator\">True</"
+   "property></object><packing><property name=\"expand\">False</property><p"
+-  "roperty name=\"position\">0</property></packing></child><child><object "
+-  "class=\"GtkCheckButton\" id=\"show_frame_shadow_check\"><property name="
+-  "\"label\" translatable=\"yes\">Show shadows under _regular windows</pro"
+-  "perty><property name=\"visible\">True</property><property name=\"can_fo"
+-  "cus\">True</property><property name=\"receives_default\">False</propert"
+-  "y><property name=\"use_underline\">True</property><property name=\"draw"
+-  "_indicator\">True</property></object><packing><property name=\"expand\""
+-  ">False</property><property name=\"position\">1</property></packing></ch"
+-  "ild><child><object class=\"GtkCheckButton\" id=\"show_popup_shadow_chec"
+-  "k\"><property name=\"label\" translatable=\"yes\">Show shadows under po"
+-  "p_up windows</property><property name=\"visible\">True</property><prope"
+-  "rty name=\"can_focus\">True</property><property name=\"receives_default"
+-  "\">False</property><property name=\"use_underline\">True</property><pro"
+-  "perty name=\"draw_indicator\">True</property></object><packing><propert"
+-  "y name=\"expand\">False</property><property name=\"position\">2</proper"
+-  "ty></packing></child><child><object class=\"GtkCheckButton\" id=\"show_"
+-  "dock_shadow_check\"><property name=\"label\" translatable=\"yes\">Show "
+-  "shadows under _dock windows</property><property name=\"visible\">True</"
+-  "property><property name=\"can_focus\">True</property><property name=\"r"
+-  "eceives_default\">False</property><property name=\"use_underline\">True"
+-  "</property><property name=\"draw_indicator\">True</property></object><p"
+-  "acking><property name=\"expand\">False</property><property name=\"posit"
+-  "ion\">3</property></packing></child><child><object class=\"GtkLabel\" i"
+-  "d=\"label12\"><property name=\"visible\">True</property><property name="
+-  "\"xalign\">0</property><property name=\"label\" translatable=\"yes\">Op"
+-  "aci_ty of window decorations:</property><property name=\"use_underline\""
+-  ">True</property><property name=\"mnemonic_widget\">frame_opacity_scale<"
+-  "/property></object><packing><property name=\"expand\">False</property><"
+-  "property name=\"position\">4</property></packing></child><child><object"
+-  " class=\"GtkAlignment\" id=\"alignment5\"><property name=\"visible\">Tr"
+-  "ue</property><property name=\"top_padding\">2</property><property name="
+-  "\"left_padding\">12</property><child><object class=\"GtkHBox\" id=\"hbo"
+-  "x3\"><property name=\"visible\">True</property><child><object class=\"G"
+-  "tkLabel\" id=\"label17\"><property name=\"visible\">True</property><pro"
+-  "perty name=\"label\" translatable=\"yes\">&lt;i&gt;Transparent&lt;/i&gt"
+-  ";</property><property name=\"use_markup\">True</property></object><pack"
+-  "ing><property name=\"expand\">False</property><property name=\"fill\">F"
+-  "alse</property><property name=\"position\">0</property></packing></chil"
+-  "d><child><object class=\"GtkHScale\" id=\"frame_opacity_scale\"><proper"
++  "roperty name=\"fill\">False</property><property name=\"position\">2</pr"
++  "operty></packing></child><child><object class=\"GtkCheckButton\" id=\"w"
++  "rap_cycle_check\"><property name=\"label\" translatable=\"yes\">Wrap wo"
++  "rkspaces when the _first or the last workspace is reached</property><pr"
++  "operty name=\"visible\">True</property><property name=\"can_focus\">Tru"
++  "e</property><property name=\"receives_default\">False</property><proper"
++  "ty name=\"use_underline\">True</property><property name=\"draw_indicato"
++  "r\">True</property></object><packing><property name=\"expand\">False</p"
++  "roperty><property name=\"fill\">False</property><property name=\"positi"
++  "on\">3</property></packing></child></object><packing><property name=\"p"
++  "osition\">3</property></packing></child><child type=\"tab\"><object cla"
++  "ss=\"GtkLabel\" id=\"label4\"><property name=\"visible\">True</property"
++  "><property name=\"label\" translatable=\"yes\">_Workspaces</property><p"
++  "roperty name=\"use_underline\">True</property></object><packing><proper"
++  "ty name=\"position\">3</property><property name=\"tab_fill\">False</pro"
++  "perty></packing></child><child><object class=\"GtkVBox\" id=\"vbox6\"><"
++  "property name=\"visible\">True</property><property name=\"border_width\""
++  ">12</property><property name=\"orientation\">vertical</property><proper"
++  "ty name=\"spacing\">6</property><child><object class=\"GtkLabel\" id=\""
++  "label8\"><property name=\"visible\">True</property><property name=\"xal"
++  "ign\">0</property><property name=\"label\" translatable=\"yes\">_Minimu"
++  "m size of windows to trigger smart placement:</property><property name="
++  "\"use_underline\">True</property><property name=\"mnemonic_widget\">pla"
++  "cement_ratio_scale</property></object><packing><property name=\"expand\""
++  ">False</property><property name=\"fill\">False</property><property name"
++  "=\"position\">0</property></packing></child><child><object class=\"GtkA"
++  "lignment\" id=\"alignment4\"><property name=\"visible\">True</property>"
++  "<property name=\"bottom_padding\">6</property><property name=\"left_pad"
++  "ding\">12</property><child><object class=\"GtkHBox\" id=\"hbox2\"><prop"
++  "erty name=\"visible\">True</property><property name=\"spacing\">12</pro"
++  "perty><child><object class=\"GtkLabel\" id=\"label9\"><property name=\""
++  "visible\">True</property><property name=\"label\" translatable=\"yes\" "
++  "comments=\"Smart placement size\">&lt;i&gt;Small&lt;/i&gt;</property><p"
++  "roperty name=\"use_markup\">True</property></object><packing><property "
++  "name=\"expand\">False</property><property name=\"fill\">False</property"
++  "><property name=\"position\">0</property></packing></child><child><obje"
++  "ct class=\"GtkHScale\" id=\"placement_ratio_scale\"><property name=\"vi"
++  "sible\">True</property><property name=\"can_focus\">True</property><pro"
++  "perty name=\"adjustment\">adjustment1</property><property name=\"restri"
++  "ct_to_fill_level\">False</property><property name=\"draw_value\">False<"
++  "/property></object><packing><property name=\"position\">1</property></p"
++  "acking></child><child><object class=\"GtkLabel\" id=\"label10\"><proper"
++  "ty name=\"visible\">True</property><property name=\"label\" translatabl"
++  "e=\"yes\" comments=\"Smart placement size\">&lt;i&gt;Large&lt;/i&gt;</p"
++  "roperty><property name=\"use_markup\">True</property></object><packing>"
++  "<property name=\"expand\">False</property><property name=\"position\">2"
++  "</property></packing></child></object></child></object><packing><proper"
++  "ty name=\"expand\">False</property><property name=\"fill\">False</prope"
++  "rty><property name=\"position\">1</property></packing></child><child><o"
++  "bject class=\"GtkVBox\" id=\"default_placement_box\"><property name=\"v"
++  "isible\">True</property><property name=\"orientation\">vertical</proper"
++  "ty><property name=\"spacing\">6</property><child><object class=\"GtkLab"
++  "el\" id=\"label27\"><property name=\"visible\">True</property><property"
++  " name=\"xalign\">0</property><property name=\"label\" translatable=\"ye"
++  "s\">By default, place windows:</property></object><packing><property na"
++  "me=\"position\">0</property></packing></child><child><object class=\"Gt"
++  "kAlignment\" id=\"alignment10\"><property name=\"visible\">True</proper"
++  "ty><property name=\"bottom_padding\">6</property><property name=\"left_"
++  "padding\">12</property><child><object class=\"GtkVBox\" id=\"vbox18\"><"
++  "property name=\"visible\">True</property><property name=\"border_width\""
++  ">6</property><property name=\"orientation\">vertical</property><propert"
++  "y name=\"spacing\">6</property><child><object class=\"GtkRadioButton\" "
++  "id=\"placement_center_option\"><property name=\"label\" translatable=\""
++  "yes\">At the _center of the screen</property><property name=\"visible\""
++  ">True</property><property name=\"can_focus\">True</property><property n"
++  "ame=\"receives_default\">False</property><property name=\"use_underline"
++  "\">True</property><property name=\"draw_indicator\">True</property></ob"
++  "ject><packing><property name=\"position\">0</property></packing></child"
++  "><child><object class=\"GtkRadioButton\" id=\"placement_mouse_option\">"
++  "<property name=\"label\" translatable=\"yes\">Under the mouse _pointer<"
++  "/property><property name=\"visible\">True</property><property name=\"ca"
++  "n_focus\">True</property><property name=\"receives_default\">False</pro"
++  "perty><property name=\"use_underline\">True</property><property name=\""
++  "active\">True</property><property name=\"draw_indicator\">True</propert"
++  "y><property name=\"group\">placement_center_option</property></object><"
++  "packing><property name=\"position\">1</property></packing></child></obj"
++  "ect></child></object><packing><property name=\"position\">1</property><"
++  "/packing></child></object><packing><property name=\"expand\">False</pro"
++  "perty><property name=\"fill\">False</property><property name=\"position"
++  "\">2</property></packing></child></object><packing><property name=\"pos"
++  "ition\">4</property></packing></child><child type=\"tab\"><object class"
++  "=\"GtkLabel\" id=\"label5\"><property name=\"visible\">True</property><"
++  "property name=\"label\" translatable=\"yes\">_Placement</property><prop"
++  "erty name=\"use_underline\">True</property></object><packing><property "
++  "name=\"position\">4</property><property name=\"tab_fill\">False</proper"
++  "ty></packing></child><child><object class=\"GtkVBox\" id=\"vbox7\"><pro"
++  "perty name=\"visible\">True</property><property name=\"border_width\">1"
++  "2</property><property name=\"orientation\">vertical</property><property"
++  " name=\"spacing\">6</property><child><object class=\"GtkCheckButton\" i"
++  "d=\"use_compositing_check\"><property name=\"label\" translatable=\"yes"
++  "\">_Enable display compositing</property><property name=\"visible\">Tru"
++  "e</property><property name=\"can_focus\">True</property><property name="
++  "\"receives_default\">False</property><property name=\"use_underline\">T"
++  "rue</property><property name=\"draw_indicator\">True</property></object"
++  "><packing><property name=\"expand\">False</property><property name=\"fi"
++  "ll\">False</property><property name=\"position\">0</property></packing>"
++  "</child><child><object class=\"GtkScrolledWindow\" id=\"use_compositing"
++  "_box\"><property name=\"visible\">True</property><property name=\"sensi"
++  "tive\">False</property><property name=\"can_focus\">True</property><pro"
++  "perty name=\"hscrollbar_policy\">never</property><property name=\"vscro"
++  "llbar_policy\">automatic</property><child><object class=\"GtkViewport\""
++  " id=\"viewport1\"><property name=\"visible\">True</property><property n"
++  "ame=\"resize_mode\">queue</property><property name=\"shadow_type\">none"
++  "</property><child><object class=\"GtkAlignment\" id=\"alignment3\"><pro"
++  "perty name=\"visible\">True</property><property name=\"bottom_padding\""
++  ">6</property><property name=\"left_padding\">12</property><child><objec"
++  "t class=\"GtkVBox\" id=\"vbox8\"><property name=\"visible\">True</prope"
++  "rty><property name=\"orientation\">vertical</property><property name=\""
++  "spacing\">6</property><child><object class=\"GtkCheckButton\" id=\"unre"
++  "direct_overlays_check\"><property name=\"label\" translatable=\"yes\">D"
++  "isplay _fullscreen overlay windows directly</property><property name=\""
++  "visible\">True</property><property name=\"can_focus\">True</property><p"
++  "roperty name=\"receives_default\">False</property><property name=\"use_"
++  "underline\">True</property><property name=\"draw_indicator\">True</prop"
++  "erty></object><packing><property name=\"expand\">False</property><prope"
++  "rty name=\"position\">0</property></packing></child><child><object clas"
++  "s=\"GtkCheckButton\" id=\"show_frame_shadow_check\"><property name=\"la"
++  "bel\" translatable=\"yes\">Show shadows under _regular windows</propert"
++  "y><property name=\"visible\">True</property><property name=\"can_focus\""
++  ">True</property><property name=\"receives_default\">False</property><pr"
++  "operty name=\"use_underline\">True</property><property name=\"draw_indi"
++  "cator\">True</property></object><packing><property name=\"expand\">Fals"
++  "e</property><property name=\"position\">1</property></packing></child><"
++  "child><object class=\"GtkCheckButton\" id=\"show_popup_shadow_check\"><"
++  "property name=\"label\" translatable=\"yes\">Show shadows under pop_up "
++  "windows</property><property name=\"visible\">True</property><property n"
++  "ame=\"can_focus\">True</property><property name=\"receives_default\">Fa"
++  "lse</property><property name=\"use_underline\">True</property><property"
++  " name=\"draw_indicator\">True</property></object><packing><property nam"
++  "e=\"expand\">False</property><property name=\"position\">2</property></"
++  "packing></child><child><object class=\"GtkCheckButton\" id=\"show_dock_"
++  "shadow_check\"><property name=\"label\" translatable=\"yes\">Show shado"
++  "ws under _dock windows</property><property name=\"visible\">True</prope"
++  "rty><property name=\"can_focus\">True</property><property name=\"receiv"
++  "es_default\">False</property><property name=\"use_underline\">True</pro"
++  "perty><property name=\"draw_indicator\">True</property></object><packin"
++  "g><property name=\"expand\">False</property><property name=\"position\""
++  ">3</property></packing></child><child><object class=\"GtkLabel\" id=\"l"
++  "abel12\"><property name=\"visible\">True</property><property name=\"xal"
++  "ign\">0</property><property name=\"label\" translatable=\"yes\">Opaci_t"
++  "y of window decorations:</property><property name=\"use_underline\">Tru"
++  "e</property><property name=\"mnemonic_widget\">frame_opacity_scale</pro"
++  "perty></object><packing><property name=\"expand\">False</property><prop"
++  "erty name=\"position\">4</property></packing></child><child><object cla"
++  "ss=\"GtkAlignment\" id=\"alignment5\"><property name=\"visible\">True</"
++  "property><property name=\"top_padding\">2</property><property name=\"le"
++  "ft_padding\">12</property><child><object class=\"GtkHBox\" id=\"hbox3\""
++  "><property name=\"visible\">True</property><child><object class=\"GtkLa"
++  "bel\" id=\"label17\"><property name=\"visible\">True</property><propert"
++  "y name=\"label\" translatable=\"yes\">&lt;i&gt;Transparent&lt;/i&gt;</p"
++  "roperty><property name=\"use_markup\">True</property></object><packing>"
++  "<property name=\"expand\">False</property><property name=\"fill\">False"
++  "</property><property name=\"position\">0</property></packing></child><c"
++  "hild><object class=\"GtkHScale\" id=\"frame_opacity_scale\"><property n"
++  "ame=\"visible\">True</property><property name=\"can_focus\">True</prope"
++  "rty><property name=\"update_policy\">discontinuous</property><property "
++  "name=\"adjustment\">adjustment2</property><property name=\"restrict_to_"
++  "fill_level\">False</property><property name=\"draw_value\">False</prope"
++  "rty></object><packing><property name=\"position\">1</property></packing"
++  "></child><child><object class=\"GtkLabel\" id=\"label18\"><property nam"
++  "e=\"visible\">True</property><property name=\"label\" translatable=\"ye"
++  "s\">&lt;i&gt;Opaque&lt;/i&gt;</property><property name=\"use_markup\">T"
++  "rue</property></object><packing><property name=\"expand\">False</proper"
++  "ty><property name=\"fill\">False</property><property name=\"position\">"
++  "2</property></packing></child></object></child></object><packing><prope"
++  "rty name=\"expand\">False</property><property name=\"fill\">False</prop"
++  "erty><property name=\"position\">5</property></packing></child><child><"
++  "object class=\"GtkLabel\" id=\"label13\"><property name=\"visible\">Tru"
++  "e</property><property name=\"xalign\">0</property><property name=\"labe"
++  "l\" translatable=\"yes\">Opacity of _inactive windows:</property><prope"
++  "rty name=\"use_underline\">True</property><property name=\"mnemonic_wid"
++  "get\">inactive_opacity_scale</property></object><packing><property name"
++  "=\"expand\">False</property><property name=\"fill\">False</property><pr"
++  "operty name=\"position\">6</property></packing></child><child><object c"
++  "lass=\"GtkAlignment\" id=\"alignment6\"><property name=\"visible\">True"
++  "</property><property name=\"top_padding\">2</property><property name=\""
++  "left_padding\">12</property><child><object class=\"GtkHBox\" id=\"hbox4"
++  "\"><property name=\"visible\">True</property><child><object class=\"Gtk"
++  "Label\" id=\"label19\"><property name=\"visible\">True</property><prope"
++  "rty name=\"label\" translatable=\"yes\">&lt;i&gt;Transparent&lt;/i&gt;<"
++  "/property><property name=\"use_markup\">True</property></object><packin"
++  "g><property name=\"expand\">False</property><property name=\"fill\">Fal"
++  "se</property><property name=\"position\">0</property></packing></child>"
++  "<child><object class=\"GtkHScale\" id=\"inactive_opacity_scale\"><prope"
++  "rty name=\"visible\">True</property><property name=\"can_focus\">True</"
++  "property><property name=\"update_policy\">discontinuous</property><prop"
++  "erty name=\"adjustment\">adjustment3</property><property name=\"restric"
++  "t_to_fill_level\">False</property><property name=\"draw_value\">False</"
++  "property></object><packing><property name=\"position\">1</property></pa"
++  "cking></child><child><object class=\"GtkLabel\" id=\"label20\"><propert"
++  "y name=\"visible\">True</property><property name=\"label\" translatable"
++  "=\"yes\">&lt;i&gt;Opaque&lt;/i&gt;</property><property name=\"use_marku"
++  "p\">True</property></object><packing><property name=\"expand\">False</p"
++  "roperty><property name=\"fill\">False</property><property name=\"positi"
++  "on\">2</property></packing></child></object></child></object><packing><"
++  "property name=\"expand\">False</property><property name=\"fill\">False<"
++  "/property><property name=\"position\">7</property></packing></child><ch"
++  "ild><object class=\"GtkLabel\" id=\"label14\"><property name=\"visible\""
++  ">True</property><property name=\"xalign\">0</property><property name=\""
++  "label\" translatable=\"yes\">Opacity of windows during _move:</property"
++  "><property name=\"use_underline\">True</property><property name=\"mnemo"
++  "nic_widget\">move_opacity_scale</property></object><packing><property n"
++  "ame=\"expand\">False</property><property name=\"fill\">False</property>"
++  "<property name=\"position\">8</property></packing></child><child><objec"
++  "t class=\"GtkAlignment\" id=\"alignment7\"><property name=\"visible\">T"
++  "rue</property><property name=\"top_padding\">2</property><property name"
++  "=\"left_padding\">12</property><child><object class=\"GtkHBox\" id=\"hb"
++  "ox5\"><property name=\"visible\">True</property><child><object class=\""
++  "GtkLabel\" id=\"label21\"><property name=\"visible\">True</property><pr"
++  "operty name=\"label\" translatable=\"yes\">&lt;i&gt;Transparent&lt;/i&g"
++  "t;</property><property name=\"use_markup\">True</property></object><pac"
++  "king><property name=\"expand\">False</property><property name=\"fill\">"
++  "False</property><property name=\"position\">0</property></packing></chi"
++  "ld><child><object class=\"GtkHScale\" id=\"move_opacity_scale\"><proper"
+   "ty name=\"visible\">True</property><property name=\"can_focus\">True</p"
+   "roperty><property name=\"update_policy\">discontinuous</property><prope"
+-  "rty name=\"adjustment\">adjustment2</property><property name=\"restrict"
++  "rty name=\"adjustment\">adjustment4</property><property name=\"restrict"
+   "_to_fill_level\">False</property><property name=\"draw_value\">False</p"
+   "roperty></object><packing><property name=\"position\">1</property></pac"
+-  "king></child><child><object class=\"GtkLabel\" id=\"label18\"><property"
++  "king></child><child><object class=\"GtkLabel\" id=\"label22\"><property"
+   " name=\"visible\">True</property><property name=\"label\" translatable="
+   "\"yes\">&lt;i&gt;Opaque&lt;/i&gt;</property><property name=\"use_markup"
+   "\">True</property></object><packing><property name=\"expand\">False</pr"
+   "operty><property name=\"fill\">False</property><property name=\"positio"
+   "n\">2</property></packing></child></object></child></object><packing><p"
+   "roperty name=\"expand\">False</property><property name=\"fill\">False</"
+-  "property><property name=\"position\">5</property></packing></child><chi"
+-  "ld><object class=\"GtkLabel\" id=\"label13\"><property name=\"visible\""
++  "property><property name=\"position\">9</property></packing></child><chi"
++  "ld><object class=\"GtkLabel\" id=\"label15\"><property name=\"visible\""
+   ">True</property><property name=\"xalign\">0</property><property name=\""
+-  "label\" translatable=\"yes\">Opacity of _inactive windows:</property><p"
+-  "roperty name=\"use_underline\">True</property><property name=\"mnemonic"
+-  "_widget\">inactive_opacity_scale</property></object><packing><property "
+-  "name=\"expand\">False</property><property name=\"fill\">False</property"
+-  "><property name=\"position\">6</property></packing></child><child><obje"
+-  "ct class=\"GtkAlignment\" id=\"alignment6\"><property name=\"visible\">"
+-  "True</property><property name=\"top_padding\">2</property><property nam"
+-  "e=\"left_padding\">12</property><child><object class=\"GtkHBox\" id=\"h"
+-  "box4\"><property name=\"visible\">True</property><child><object class=\""
+-  "GtkLabel\" id=\"label19\"><property name=\"visible\">True</property><pr"
+-  "operty name=\"label\" translatable=\"yes\">&lt;i&gt;Transparent&lt;/i&g"
+-  "t;</property><property name=\"use_markup\">True</property></object><pac"
+-  "king><property name=\"expand\">False</property><property name=\"fill\">"
+-  "False</property><property name=\"position\">0</property></packing></chi"
+-  "ld><child><object class=\"GtkHScale\" id=\"inactive_opacity_scale\"><pr"
+-  "operty name=\"visible\">True</property><property name=\"can_focus\">Tru"
+-  "e</property><property name=\"update_policy\">discontinuous</property><p"
+-  "roperty name=\"adjustment\">adjustment3</property><property name=\"rest"
+-  "rict_to_fill_level\">False</property><property name=\"draw_value\">Fals"
+-  "e</property></object><packing><property name=\"position\">1</property><"
+-  "/packing></child><child><object class=\"GtkLabel\" id=\"label20\"><prop"
+-  "erty name=\"visible\">True</property><property name=\"label\" translata"
+-  "ble=\"yes\">&lt;i&gt;Opaque&lt;/i&gt;</property><property name=\"use_ma"
+-  "rkup\">True</property></object><packing><property name=\"expand\">False"
+-  "</property><property name=\"fill\">False</property><property name=\"pos"
+-  "ition\">2</property></packing></child></object></child></object><packin"
+-  "g><property name=\"expand\">False</property><property name=\"fill\">Fal"
+-  "se</property><property name=\"position\">7</property></packing></child>"
+-  "<child><object class=\"GtkLabel\" id=\"label14\"><property name=\"visib"
+-  "le\">True</property><property name=\"xalign\">0</property><property nam"
+-  "e=\"label\" translatable=\"yes\">Opacity of windows during _move:</prop"
+-  "erty><property name=\"use_underline\">True</property><property name=\"m"
+-  "nemonic_widget\">move_opacity_scale</property></object><packing><proper"
++  "label\" translatable=\"yes\">Opacity of windows during resi_ze:</proper"
++  "ty><property name=\"use_underline\">True</property><property name=\"mne"
++  "monic_widget\">resize_opacity_scale</property></object><packing><proper"
+   "ty name=\"expand\">False</property><property name=\"fill\">False</prope"
+-  "rty><property name=\"position\">8</property></packing></child><child><o"
+-  "bject class=\"GtkAlignment\" id=\"alignment7\"><property name=\"visible"
+-  "\">True</property><property name=\"top_padding\">2</property><property "
+-  "name=\"left_padding\">12</property><child><object class=\"GtkHBox\" id="
+-  "\"hbox5\"><property name=\"visible\">True</property><child><object clas"
+-  "s=\"GtkLabel\" id=\"label21\"><property name=\"visible\">True</property"
+-  "><property name=\"label\" translatable=\"yes\">&lt;i&gt;Transparent&lt;"
+-  "/i&gt;</property><property name=\"use_markup\">True</property></object>"
+-  "<packing><property name=\"expand\">False</property><property name=\"fil"
+-  "l\">False</property><property name=\"position\">0</property></packing><"
+-  "/child><child><object class=\"GtkHScale\" id=\"move_opacity_scale\"><pr"
+-  "operty name=\"visible\">True</property><property name=\"can_focus\">Tru"
+-  "e</property><property name=\"update_policy\">discontinuous</property><p"
+-  "roperty name=\"adjustment\">adjustment4</property><property name=\"rest"
+-  "rict_to_fill_level\">False</property><property name=\"draw_value\">Fals"
+-  "e</property></object><packing><property name=\"position\">1</property><"
+-  "/packing></child><child><object class=\"GtkLabel\" id=\"label22\"><prop"
+-  "erty name=\"visible\">True</property><property name=\"label\" translata"
+-  "ble=\"yes\">&lt;i&gt;Opaque&lt;/i&gt;</property><property name=\"use_ma"
+-  "rkup\">True</property></object><packing><property name=\"expand\">False"
+-  "</property><property name=\"fill\">False</property><property name=\"pos"
+-  "ition\">2</property></packing></child></object></child></object><packin"
+-  "g><property name=\"expand\">False</property><property name=\"fill\">Fal"
+-  "se</property><property name=\"position\">9</property></packing></child>"
+-  "<child><object class=\"GtkLabel\" id=\"label15\"><property name=\"visib"
+-  "le\">True</property><property name=\"xalign\">0</property><property nam"
+-  "e=\"label\" translatable=\"yes\">Opacity of windows during resi_ze:</pr"
+-  "operty><property name=\"use_underline\">True</property><property name=\""
+-  "mnemonic_widget\">resize_opacity_scale</property></object><packing><pro"
+-  "perty name=\"expand\">False</property><property name=\"fill\">False</pr"
+-  "operty><property name=\"position\">10</property></packing></child><chil"
+-  "d><object class=\"GtkAlignment\" id=\"alignment8\"><property name=\"vis"
+-  "ible\">True</property><property name=\"top_padding\">2</property><prope"
+-  "rty name=\"left_padding\">12</property><child><object class=\"GtkHBox\""
+-  " id=\"hbox6\"><property name=\"visible\">True</property><child><object "
+-  "class=\"GtkLabel\" id=\"label23\"><property name=\"visible\">True</prop"
+-  "erty><property name=\"label\" translatable=\"yes\">&lt;i&gt;Transparent"
+-  "&lt;/i&gt;</property><property name=\"use_markup\">True</property></obj"
+-  "ect><packing><property name=\"expand\">False</property><property name=\""
+-  "fill\">False</property><property name=\"position\">0</property></packin"
+-  "g></child><child><object class=\"GtkHScale\" id=\"resize_opacity_scale\""
+-  "><property name=\"visible\">True</property><property name=\"can_focus\""
+-  ">True</property><property name=\"update_policy\">discontinuous</propert"
+-  "y><property name=\"adjustment\">adjustment5</property><property name=\""
+-  "restrict_to_fill_level\">False</property><property name=\"draw_value\">"
+-  "False</property></object><packing><property name=\"position\">1</proper"
+-  "ty></packing></child><child><object class=\"GtkLabel\" id=\"label24\"><"
+-  "property name=\"visible\">True</property><property name=\"label\" trans"
+-  "latable=\"yes\">&lt;i&gt;Opaque&lt;/i&gt;</property><property name=\"us"
+-  "e_markup\">True</property></object><packing><property name=\"expand\">F"
+-  "alse</property><property name=\"fill\">False</property><property name=\""
++  "rty><property name=\"position\">10</property></packing></child><child><"
++  "object class=\"GtkAlignment\" id=\"alignment8\"><property name=\"visibl"
++  "e\">True</property><property name=\"top_padding\">2</property><property"
++  " name=\"left_padding\">12</property><child><object class=\"GtkHBox\" id"
++  "=\"hbox6\"><property name=\"visible\">True</property><child><object cla"
++  "ss=\"GtkLabel\" id=\"label23\"><property name=\"visible\">True</propert"
++  "y><property name=\"label\" translatable=\"yes\">&lt;i&gt;Transparent&lt"
++  ";/i&gt;</property><property name=\"use_markup\">True</property></object"
++  "><packing><property name=\"expand\">False</property><property name=\"fi"
++  "ll\">False</property><property name=\"position\">0</property></packing>"
++  "</child><child><object class=\"GtkHScale\" id=\"resize_opacity_scale\">"
++  "<property name=\"visible\">True</property><property name=\"can_focus\">"
++  "True</property><property name=\"update_policy\">discontinuous</property"
++  "><property name=\"adjustment\">adjustment5</property><property name=\"r"
++  "estrict_to_fill_level\">False</property><property name=\"draw_value\">F"
++  "alse</property></object><packing><property name=\"position\">1</propert"
++  "y></packing></child><child><object class=\"GtkLabel\" id=\"label24\"><p"
++  "roperty name=\"visible\">True</property><property name=\"label\" transl"
++  "atable=\"yes\">&lt;i&gt;Opaque&lt;/i&gt;</property><property name=\"use"
++  "_markup\">True</property></object><packing><property name=\"expand\">Fa"
++  "lse</property><property name=\"fill\">False</property><property name=\""
+   "position\">2</property></packing></child></object></child></object><pac"
+   "king><property name=\"expand\">False</property><property name=\"fill\">"
+   "False</property><property name=\"position\">11</property></packing></ch"
+@@ -568,5 +576,5 @@ static const char tweaks_dialog_ui[] =
+   "et></action-widgets></object></interface>"
+ };
+ 
+-static const unsigned tweaks_dialog_ui_length = 37803u;
++static const unsigned tweaks_dialog_ui_length = 38338u;
+ 
+diff --git a/src/client.c b/src/client.c
+index 4e86808..b92c264 100644
+--- a/src/client.c
++++ b/src/client.c
+@@ -64,6 +64,8 @@
+ #include "xsync.h"
+ #include "event_filter.h"
+ 
++//#define TRACE(fmt, ...) printf(fmt"\n", ##__VA_ARGS__); fflush(stdout);
++
+ /* Event mask definition */
+ 
+ #define POINTER_EVENT_MASK \
+@@ -173,6 +175,7 @@ clientCreateTitleName (Client *c, gchar *name, gchar *hostname)
+     gchar *title;
+ 
+     g_return_val_if_fail (c != NULL, NULL);
++
+     TRACE ("entering clientCreateTitleName");
+ 
+     screen_info = c->screen_info;
+@@ -1729,6 +1732,7 @@ clientFrame (DisplayInfo *display_info, Window w, gboolean recapture)
+     clientGetInitialNetWmDesktop (c);
+     /* workarea will be updated when shown, no need to worry here */
+     clientGetNetStruts (c);
++    clientGetExtra (c);
+ 
+     /* Once we know the type of window, we can initialize window position */
+     if (!FLAG_TEST (c->xfwm_flags, XFWM_FLAG_SESSION_MANAGED))
+@@ -3137,6 +3141,8 @@ clientNewMaxSize (Client *c, XWindowChanges *wc, GdkRectangle *rect, tilePositio
+         wc->width = full_w - frameLeft (c) - frameRight (c);
+         wc->height = full_h - frameTop (c) - frameBottom (c);
+ 
++        TRACE ("clientNewMaxSize %d %d %d %d", wc->x, wc->y, wc->width, wc->height);
++
+         return ((wc->width <= c->size->max_width) && (wc->height <= c->size->max_height));
+     }
+ 
+diff --git a/src/client.h b/src/client.h
+index e8bc4e3..b5e54df 100644
+--- a/src/client.h
++++ b/src/client.h
+@@ -161,6 +161,7 @@
+ #define CLIENT_FLAG_DEMANDS_ATTENTION   (1L<<17)
+ #define CLIENT_FLAG_HAS_SHAPE           (1L<<18)
+ #define CLIENT_FLAG_FULLSCREN_MONITORS  (1L<<19)
++#define CLIENT_FLAG_TITLELESS_MAXIMIZE  (1L<<20)
+ 
+ #define WM_FLAG_DELETE                  (1L<<0)
+ #define WM_FLAG_INPUT                   (1L<<1)
+diff --git a/src/display.c b/src/display.c
+index 00318d5..4f847f4 100644
+--- a/src/display.c
++++ b/src/display.c
+@@ -169,7 +169,8 @@ myDisplayInitAtoms (DisplayInfo *display_info)
+         "XFWM4_COMPOSITING_MANAGER",
+         "XFWM4_TIMESTAMP_PROP",
+         "_XROOTPMAP_ID",
+-        "_XSETROOT_ID"
++        "_XSETROOT_ID",
++        "_GTK_HIDE_TITLEBAR_WHEN_MAXIMIZED"
+     };
+ 
+     g_assert (ATOM_COUNT == G_N_ELEMENTS (atom_names));
+diff --git a/src/display.h b/src/display.h
+index 8797237..a297cf2 100644
+--- a/src/display.h
++++ b/src/display.h
+@@ -265,6 +265,7 @@ enum
+     XFWM4_TIMESTAMP_PROP,
+     XROOTPMAP,
+     XSETROOT,
++    _GTK_HIDE_TITLEBAR_WHEN_MAXIMIZED,
+     ATOM_COUNT
+ };
+ 
+diff --git a/src/events.c b/src/events.c
+index 4b49171..044cd11 100644
+--- a/src/events.c
++++ b/src/events.c
+@@ -1921,6 +1921,11 @@ handlePropertyNotify (DisplayInfo *display_info, XPropertyEvent * ev)
+             TRACE ("Window 0x%lx has NET_WM_SYNC_REQUEST_COUNTER set to 0x%lx", c->window, c->xsync_counter);
+         }
+ #endif /* HAVE_XSYNC */
++        else if (ev->atom == display_info->atoms[_GTK_HIDE_TITLEBAR_WHEN_MAXIMIZED])
++        {
++            TRACE ("Client \"%s\" Window 0x%lx has received GTK CRAP\n", c->name, c->window);
++            clientUpdateExtra (c);
++        }
+ 
+         return status;
+     }
+diff --git a/src/frame.c b/src/frame.c
+index 7f4cbd3..23c01cd 100644
+--- a/src/frame.c
++++ b/src/frame.c
+@@ -39,6 +39,8 @@
+ #include "frame.h"
+ #include "compositor.h"
+ 
++//#define TRACE(fmt, ...) printf(fmt"\n", ##__VA_ARGS__); fflush(stdout);
++
+ typedef struct
+ {
+     xfwmPixmap pm_title;
+@@ -121,7 +123,14 @@ frameTop (Client * c)
+ 
+     g_return_val_if_fail (c != NULL, 0);
+     if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_HAS_BORDER)
+-        && !FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN))
++        && !(FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN)
++            || (FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED_VERT)
++                && (c->screen_info->params->titleless_maximize
++                    || FLAG_TEST (c->flags, CLIENT_FLAG_TITLELESS_MAXIMIZE))
++                && c->screen_info->params->borderless_maximize
++                )
++            )
++        )
+     {
+         return c->screen_info->title[TITLE_3][ACTIVE].height;
+     }
+@@ -136,8 +145,13 @@ frameBottom (Client * c)
+     g_return_val_if_fail (c != NULL, 0);
+     if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_HAS_BORDER)
+         && !FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN)
+-        && (!FLAG_TEST_ALL (c->flags, CLIENT_FLAG_MAXIMIZED)
+-            || !(c->screen_info->params->borderless_maximize)))
++        && !(FLAG_TEST_ALL (c->flags, CLIENT_FLAG_MAXIMIZED)
++            && (c->screen_info->params->borderless_maximize))
++        && !(FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED_VERT)
++            && (c->screen_info->params->borderless_maximize)
++            && (c->screen_info->params->titleless_maximize
++                || FLAG_TEST (c->flags, CLIENT_FLAG_TITLELESS_MAXIMIZE)))
++        )
+     {
+         return c->screen_info->sides[SIDE_BOTTOM][ACTIVE].height;
+     }
+@@ -203,7 +217,14 @@ frameHeight (Client * c)
+         return frameTop (c) + frameBottom (c);
+     }
+     else if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_HAS_BORDER)
+-             && !FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN))
++             && !FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN)
++             && !(
++                FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED_VERT)
++                && (c->screen_info->params->borderless_maximize)
++                && (c->screen_info->params->titleless_maximize
++                    || FLAG_TEST (c->flags, CLIENT_FLAG_TITLELESS_MAXIMIZE))
++             ))
++
+     {
+         return c->height + frameTop (c) + frameBottom (c);
+     }
+@@ -882,6 +903,7 @@ frameDrawWin (Client * c)
+     gboolean requires_clearing;
+     gboolean width_changed;
+     gboolean height_changed;
++    gboolean vert_only;
+ 
+     TRACE ("entering frameDraw");
+     TRACE ("drawing frame for \"%s\" (0x%lx)", c->name, c->window);
+@@ -955,128 +977,152 @@ frameDrawWin (Client * c)
+     }
+ 
+     if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_HAS_BORDER)
+-        && !FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN))
++        && !FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN)
++        && !(FLAG_TEST_ALL (c->flags, CLIENT_FLAG_MAXIMIZED)
++            && (c->screen_info->params->borderless_maximize)
++            && (c->screen_info->params->titleless_maximize
++                || FLAG_TEST (c->flags, CLIENT_FLAG_TITLELESS_MAXIMIZE))
++            ))
+     {
+-        /* First, hide the buttons that we don't have... */
+-        for (i = 0; i < BUTTON_COUNT; i++)
++        vert_only = FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED_VERT)
++                    && (c->screen_info->params->borderless_maximize) //only vertical decorations shown (titleless vertical maximize)
++                    && (c->screen_info->params->titleless_maximize
++                        || FLAG_TEST (c->flags, CLIENT_FLAG_TITLELESS_MAXIMIZE));
++
++        if (vert_only)
+         {
+-            char b = getLetterFromButton (i, c);
+-            if ((!b) || !strchr (screen_info->params->button_layout, b))
++            //hide all buttons
++            for (i = 0; i < BUTTON_COUNT; i++)
+             {
+                 xfwmWindowHide (&c->buttons[i]);
+             }
++            xfwmWindowHide (&c->title);
++            xfwmWindowHide (&c->sides[SIDE_BOTTOM]);
++            xfwmWindowHide (&c->sides[SIDE_TOP]);
++            xfwmWindowHide (&c->corners[CORNER_TOP_LEFT]);
++            xfwmWindowHide (&c->corners[CORNER_TOP_RIGHT]);
++            xfwmWindowHide (&c->corners[CORNER_BOTTOM_LEFT]);
++            xfwmWindowHide (&c->corners[CORNER_BOTTOM_RIGHT]);
+         }
+-
+-        /* Then, show the ones that we do have on left... */
+-        x = frameLeft (c) + frameButtonOffset (c);
+-        if (x < 0)
+-        {
+-            x = 0;
+-        }
+-        right = frameWidth (c) - frameRight (c) - frameButtonOffset (c);
+-        for (i = 0; i < strlen (screen_info->params->button_layout); i++)
++        else
+         {
+-            button = getButtonFromLetter (screen_info->params->button_layout[i], c);
+-            if (button == TITLE_SEPARATOR)
++            /* First, hide the buttons that we don't have... */
++            for (i = 0; i < BUTTON_COUNT; i++)
+             {
+-                break;
+-            }
+-            else if (button >= 0)
+-            {
+-                if (x + screen_info->buttons[button][state].width + screen_info->params->button_spacing < right)
+-                {
+-                    my_pixmap = clientGetButtonPixmap (c, button, clientGetButtonState (c, button, state));
+-                    if (!xfwmPixmapNone(my_pixmap))
+-                    {
+-                        xfwmWindowSetBG (&c->buttons[button], my_pixmap);
+-                    }
+-                    xfwmWindowShow (&c->buttons[button], x,
+-                        (frameTop (c) - screen_info->buttons[button][state].height + 1) / 2,
+-                        screen_info->buttons[button][state].width,
+-                        screen_info->buttons[button][state].height, TRUE);
+-                    button_x[button] = x;
+-                    x = x + screen_info->buttons[button][state].width +
+-                        screen_info->params->button_spacing;
+-                }
+-                else
++                char b = getLetterFromButton (i, c);
++                if ((!b) || !strchr (screen_info->params->button_layout, b))
+                 {
+-                    xfwmWindowHide (&c->buttons[button]);
++                    xfwmWindowHide (&c->buttons[i]);
+                 }
+             }
+-        }
+-        left = x + screen_info->params->button_spacing;
+ 
+-        /* and those that we do have on right... */
+-        x = frameWidth (c) - frameRight (c) + screen_info->params->button_spacing -
+-            frameButtonOffset (c);
+-        for (j = strlen (screen_info->params->button_layout) - 1; j >= i; j--)
+-        {
+-            button = getButtonFromLetter (screen_info->params->button_layout[j], c);
+-            if (button == TITLE_SEPARATOR)
++            /* Then, show the ones that we do have on left... */
++            x = frameLeft (c) + frameButtonOffset (c);
++            if (x < 0)
+             {
+-                break;
++                x = 0;
+             }
+-            else if (button >= 0)
++            right = frameWidth (c) - frameRight (c) - frameButtonOffset (c);
++            for (i = 0; i < strlen (screen_info->params->button_layout); i++)
+             {
+-                if (x - screen_info->buttons[button][state].width - screen_info->params->button_spacing > left)
++                button = getButtonFromLetter (screen_info->params->button_layout[i], c);
++                if (button == TITLE_SEPARATOR)
+                 {
+-                    my_pixmap = clientGetButtonPixmap (c, button, clientGetButtonState (c, button, state));
+-                    if (!xfwmPixmapNone(my_pixmap))
++                    break;
++                }
++                else if (button >= 0)
++                {
++                    if (x + screen_info->buttons[button][state].width + screen_info->params->button_spacing < right)
++                    {
++                        my_pixmap = clientGetButtonPixmap (c, button, clientGetButtonState (c, button, state));
++                        if (!xfwmPixmapNone(my_pixmap))
++                        {
++                            xfwmWindowSetBG (&c->buttons[button], my_pixmap);
++                        }
++                        xfwmWindowShow (&c->buttons[button], x,
++                            (frameTop (c) - screen_info->buttons[button][state].height + 1) / 2,
++                            screen_info->buttons[button][state].width,
++                            screen_info->buttons[button][state].height, TRUE);
++                        button_x[button] = x;
++                        x = x + screen_info->buttons[button][state].width +
++                            screen_info->params->button_spacing;
++                    }
++                    else
+                     {
+-                        xfwmWindowSetBG (&c->buttons[button], my_pixmap);
++                        xfwmWindowHide (&c->buttons[button]);
+                     }
+-                    x = x - screen_info->buttons[button][state].width -
+-                        screen_info->params->button_spacing;
+-                    xfwmWindowShow (&c->buttons[button], x,
+-                        (frameTop (c) - screen_info->buttons[button][state].height + 1) / 2,
+-                        screen_info->buttons[button][state].width,
+-                        screen_info->buttons[button][state].height, TRUE);
+-                    button_x[button] = x;
+                 }
+-                else
++            }
++            left = x + screen_info->params->button_spacing;
++
++            /* and those that we do have on right... */
++            x = frameWidth (c) - frameRight (c) + screen_info->params->button_spacing -
++                frameButtonOffset (c);
++            for (j = strlen (screen_info->params->button_layout) - 1; j >= i; j--)
++            {
++                button = getButtonFromLetter (screen_info->params->button_layout[j], c);
++                if (button == TITLE_SEPARATOR)
+                 {
+-                    xfwmWindowHide (&c->buttons[button]);
++                    break;
++                }
++                else if (button >= 0)
++                {
++                    if (x - screen_info->buttons[button][state].width - screen_info->params->button_spacing > left)
++                    {
++                        my_pixmap = clientGetButtonPixmap (c, button, clientGetButtonState (c, button, state));
++                        if (!xfwmPixmapNone(my_pixmap))
++                        {
++                            xfwmWindowSetBG (&c->buttons[button], my_pixmap);
++                        }
++                        x = x - screen_info->buttons[button][state].width -
++                            screen_info->params->button_spacing;
++                        xfwmWindowShow (&c->buttons[button], x,
++                            (frameTop (c) - screen_info->buttons[button][state].height + 1) / 2,
++                            screen_info->buttons[button][state].width,
++                            screen_info->buttons[button][state].height, TRUE);
++                        button_x[button] = x;
++                    }
++                    else
++                    {
++                        xfwmWindowHide (&c->buttons[button]);
++                    }
+                 }
+             }
++            left = left - 2 * screen_info->params->button_spacing;
++            right = x;
++            xfwmPixmapInit (screen_info, &frame_pix.pm_title);
++            xfwmPixmapInit (screen_info, &frame_pix.pm_sides[SIDE_TOP]);
++            xfwmPixmapInit (screen_info, &frame_pix.pm_sides[SIDE_BOTTOM]);
++
++            top_width = frameWidth (c) - frameTopLeftWidth (c, state) - frameTopRightWidth (c, state);
++            bottom_width = frameWidth (c) -
++                screen_info->corners[CORNER_BOTTOM_LEFT][state].width -
++                screen_info->corners[CORNER_BOTTOM_RIGHT][state].width;
++
++            /* The title is almost always visible */
++            frameCreateTitlePixmap (c, state, left, right, &frame_pix.pm_title, &frame_pix.pm_sides[SIDE_TOP]);
++            xfwmWindowSetBG (&c->title, &frame_pix.pm_title);
++            xfwmWindowShow (&c->title,
++                frameTopLeftWidth (c, state), 0, top_width,
++                frameTop (c), (requires_clearing | width_changed));
++
++            /* Corners are never resized, we need to update them separately */
++            if (requires_clearing)
++            {
++                xfwmWindowSetBG (&c->corners[CORNER_TOP_LEFT],
++                    &screen_info->corners[CORNER_TOP_LEFT][state]);
++                xfwmWindowSetBG (&c->corners[CORNER_TOP_RIGHT],
++                    &screen_info->corners[CORNER_TOP_RIGHT][state]);
++                xfwmWindowSetBG (&c->corners[CORNER_BOTTOM_LEFT],
++                    &screen_info->corners[CORNER_BOTTOM_LEFT][state]);
++                xfwmWindowSetBG (&c->corners[CORNER_BOTTOM_RIGHT],
++                    &screen_info->corners[CORNER_BOTTOM_RIGHT][state]);
++            }
+         }
+-        left = left - 2 * screen_info->params->button_spacing;
+-        right = x;
+-
+-        top_width = frameWidth (c) - frameTopLeftWidth (c, state) - frameTopRightWidth (c, state);
+-        bottom_width = frameWidth (c) -
+-            screen_info->corners[CORNER_BOTTOM_LEFT][state].width -
+-            screen_info->corners[CORNER_BOTTOM_RIGHT][state].width;
+-        left_height = frameHeight (c) - frameTop (c) -
+-            screen_info->corners[CORNER_BOTTOM_LEFT][state].height;
+-        right_height = frameHeight (c) - frameTop (c) -
+-            screen_info->corners[CORNER_BOTTOM_RIGHT][state].height;
+-
+-        xfwmPixmapInit (screen_info, &frame_pix.pm_title);
+-        xfwmPixmapInit (screen_info, &frame_pix.pm_sides[SIDE_TOP]);
+-        xfwmPixmapInit (screen_info, &frame_pix.pm_sides[SIDE_BOTTOM]);
++
+         xfwmPixmapInit (screen_info, &frame_pix.pm_sides[SIDE_LEFT]);
+         xfwmPixmapInit (screen_info, &frame_pix.pm_sides[SIDE_RIGHT]);
+ 
+-        /* The title is always visible */
+-        frameCreateTitlePixmap (c, state, left, right, &frame_pix.pm_title, &frame_pix.pm_sides[SIDE_TOP]);
+-        xfwmWindowSetBG (&c->title, &frame_pix.pm_title);
+-        xfwmWindowShow (&c->title,
+-            frameTopLeftWidth (c, state), 0, top_width,
+-            frameTop (c), (requires_clearing | width_changed));
+-
+-        /* Corners are never resized, we need to update them separately */
+-        if (requires_clearing)
+-        {
+-            xfwmWindowSetBG (&c->corners[CORNER_TOP_LEFT],
+-                &screen_info->corners[CORNER_TOP_LEFT][state]);
+-            xfwmWindowSetBG (&c->corners[CORNER_TOP_RIGHT],
+-                &screen_info->corners[CORNER_TOP_RIGHT][state]);
+-            xfwmWindowSetBG (&c->corners[CORNER_BOTTOM_LEFT],
+-                &screen_info->corners[CORNER_BOTTOM_LEFT][state]);
+-            xfwmWindowSetBG (&c->corners[CORNER_BOTTOM_RIGHT],
+-                &screen_info->corners[CORNER_BOTTOM_RIGHT][state]);
+-        }
+-
+         if (FLAG_TEST_ALL (c->flags, CLIENT_FLAG_MAXIMIZED)
+             && (c->screen_info->params->borderless_maximize))
+         {
+@@ -1091,6 +1137,18 @@ frameDrawWin (Client * c)
+         }
+         else
+         {
++            if (vert_only)
++            {
++                left_height = right_height = c->height;
++            }
++            else
++            {
++                left_height = frameHeight (c) - frameTop (c)
++                    - screen_info->corners[CORNER_BOTTOM_LEFT][state].height;
++                right_height = frameHeight (c) - frameTop (c)
++                    - screen_info->corners[CORNER_BOTTOM_RIGHT][state].height;
++            }
++
+             if (FLAG_TEST (c->flags, CLIENT_FLAG_SHADED))
+             {
+                 xfwmWindowHide (&c->sides[SIDE_LEFT]);
+@@ -1120,63 +1178,69 @@ frameDrawWin (Client * c)
+                     right_height, (requires_clearing | height_changed));
+             }
+ 
+-            xfwmPixmapCreate (screen_info, &frame_pix.pm_sides[SIDE_BOTTOM],
+-                bottom_width, frameBottom (c));
+-            xfwmPixmapFill (&screen_info->sides[SIDE_BOTTOM][state],
+-                &frame_pix.pm_sides[SIDE_BOTTOM],
+-                0, 0, bottom_width, frameBottom (c));
+-            xfwmWindowSetBG (&c->sides[SIDE_BOTTOM],
+-                &frame_pix.pm_sides[SIDE_BOTTOM]);
+-            xfwmWindowShow (&c->sides[SIDE_BOTTOM],
+-                screen_info->corners[CORNER_BOTTOM_LEFT][state].width,
+-                frameHeight (c) - frameBottom (c), bottom_width, frameBottom (c),
+-                (requires_clearing | width_changed));
+-
+-            if (!xfwmPixmapNone(&frame_pix.pm_sides[SIDE_TOP]))
++            if (!vert_only)
+             {
+-                xfwmWindowSetBG (&c->sides[SIDE_TOP], &frame_pix.pm_sides[SIDE_TOP]);
+-                xfwmWindowShow (&c->sides[SIDE_TOP],
+-                    screen_info->corners[CORNER_TOP_LEFT][state].width,
+-                    0, top_width, frame_pix.pm_sides[SIDE_TOP].height,
++                xfwmPixmapCreate (screen_info, &frame_pix.pm_sides[SIDE_BOTTOM],
++                    bottom_width, frameBottom (c));
++                xfwmPixmapFill (&screen_info->sides[SIDE_BOTTOM][state],
++                    &frame_pix.pm_sides[SIDE_BOTTOM],
++                    0, 0, bottom_width, frameBottom (c));
++                xfwmWindowSetBG (&c->sides[SIDE_BOTTOM],
++                    &frame_pix.pm_sides[SIDE_BOTTOM]);
++                xfwmWindowShow (&c->sides[SIDE_BOTTOM],
++                    screen_info->corners[CORNER_BOTTOM_LEFT][state].width,
++                    frameHeight (c) - frameBottom (c), bottom_width, frameBottom (c),
+                     (requires_clearing | width_changed));
+-            }
+-            else
+-            {
+-                xfwmWindowHide (&c->sides[SIDE_TOP]);
+-            }
+ 
+-            xfwmWindowShow (&c->corners[CORNER_TOP_LEFT], 0, 0,
+-                frameTopLeftWidth (c, state),
+-                screen_info->corners[CORNER_TOP_LEFT][state].height,
+-                requires_clearing);
+-
+-            xfwmWindowShow (&c->corners[CORNER_TOP_RIGHT],
+-                frameWidth (c) - frameTopRightWidth (c, state),
+-                0, frameTopRightWidth (c, state),
+-                screen_info->corners[CORNER_TOP_RIGHT][state].height,
+-                requires_clearing);
+-
+-            xfwmWindowShow (&c->corners[CORNER_BOTTOM_LEFT], 0,
+-                frameHeight (c) -
+-                screen_info->corners[CORNER_BOTTOM_LEFT][state].height,
+-                screen_info->corners[CORNER_BOTTOM_LEFT][state].width,
+-                screen_info->corners[CORNER_BOTTOM_LEFT][state].height,
+-                requires_clearing);
+-
+-            xfwmWindowShow (&c->corners[CORNER_BOTTOM_RIGHT],
+-                frameWidth (c) -
+-                screen_info->corners[CORNER_BOTTOM_RIGHT][state].width,
+-                frameHeight (c) -
+-                screen_info->corners[CORNER_BOTTOM_RIGHT][state].height,
+-                screen_info->corners[CORNER_BOTTOM_RIGHT][state].width,
+-                screen_info->corners[CORNER_BOTTOM_RIGHT][state].height,
+-                requires_clearing);
++                if (!xfwmPixmapNone(&frame_pix.pm_sides[SIDE_TOP]))
++                {
++                    xfwmWindowSetBG (&c->sides[SIDE_TOP], &frame_pix.pm_sides[SIDE_TOP]);
++                    xfwmWindowShow (&c->sides[SIDE_TOP],
++                        screen_info->corners[CORNER_TOP_LEFT][state].width,
++                        0, top_width, frame_pix.pm_sides[SIDE_TOP].height,
++                        (requires_clearing | width_changed));
++                }
++                else
++                {
++                    xfwmWindowHide (&c->sides[SIDE_TOP]);
++                }
++
++                xfwmWindowShow (&c->corners[CORNER_TOP_LEFT], 0, 0,
++                    frameTopLeftWidth (c, state),
++                    screen_info->corners[CORNER_TOP_LEFT][state].height,
++                    requires_clearing);
++
++                xfwmWindowShow (&c->corners[CORNER_TOP_RIGHT],
++                    frameWidth (c) - frameTopRightWidth (c, state),
++                    0, frameTopRightWidth (c, state),
++                    screen_info->corners[CORNER_TOP_RIGHT][state].height,
++                    requires_clearing);
++
++                xfwmWindowShow (&c->corners[CORNER_BOTTOM_LEFT], 0,
++                    frameHeight (c) -
++                    screen_info->corners[CORNER_BOTTOM_LEFT][state].height,
++                    screen_info->corners[CORNER_BOTTOM_LEFT][state].width,
++                    screen_info->corners[CORNER_BOTTOM_LEFT][state].height,
++                    requires_clearing);
++
++                xfwmWindowShow (&c->corners[CORNER_BOTTOM_RIGHT],
++                    frameWidth (c) -
++                    screen_info->corners[CORNER_BOTTOM_RIGHT][state].width,
++                    frameHeight (c) -
++                    screen_info->corners[CORNER_BOTTOM_RIGHT][state].height,
++                    screen_info->corners[CORNER_BOTTOM_RIGHT][state].width,
++                    screen_info->corners[CORNER_BOTTOM_RIGHT][state].height,
++                    requires_clearing);
++            }
+         }
+         frameSetShape (c, state, &frame_pix, button_x);
+ 
+-        xfwmPixmapFree (&frame_pix.pm_title);
+-        xfwmPixmapFree (&frame_pix.pm_sides[SIDE_TOP]);
+-        xfwmPixmapFree (&frame_pix.pm_sides[SIDE_BOTTOM]);
++        if (!vert_only)
++        {
++            xfwmPixmapFree (&frame_pix.pm_title);
++            xfwmPixmapFree (&frame_pix.pm_sides[SIDE_TOP]);
++            xfwmPixmapFree (&frame_pix.pm_sides[SIDE_BOTTOM]);
++        }
+         xfwmPixmapFree (&frame_pix.pm_sides[SIDE_LEFT]);
+         xfwmPixmapFree (&frame_pix.pm_sides[SIDE_RIGHT]);
+     }
+diff --git a/src/netwm.c b/src/netwm.c
+index 1352f08..9e3647c 100644
+--- a/src/netwm.c
++++ b/src/netwm.c
+@@ -136,6 +136,44 @@ clientSetNetState (Client * c)
+ }
+ 
+ void
++clientGetExtra (Client *c)
++{
++    long val;
++    DisplayInfo *display_info;
++
++    display_info = c->screen_info->display_info;
++
++    getHint (display_info, c->window, _GTK_HIDE_TITLEBAR_WHEN_MAXIMIZED, &val);
++    if (val)
++        FLAG_SET (c->flags, CLIENT_FLAG_TITLELESS_MAXIMIZE);
++}
++
++void
++clientUpdateExtra (Client *c)
++{
++    long val;
++    unsigned long maximization_flags = 0L;
++    DisplayInfo *display_info;
++
++    display_info = c->screen_info->display_info;
++
++    getHint (display_info, c->window, _GTK_HIDE_TITLEBAR_WHEN_MAXIMIZED, &val);
++    if (val)
++        FLAG_SET (c->flags, CLIENT_FLAG_TITLELESS_MAXIMIZE);
++    else
++        FLAG_UNSET (c->flags, CLIENT_FLAG_TITLELESS_MAXIMIZE);
++
++    if (FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED))
++    {
++        maximization_flags = c->flags & CLIENT_FLAG_MAXIMIZED;
++
++        /* Force an update by clearing the internal flags */
++        FLAG_UNSET (c->flags, CLIENT_FLAG_MAXIMIZED_HORIZ | CLIENT_FLAG_MAXIMIZED_VERT);
++        clientToggleMaximized (c, maximization_flags, TRUE);
++    }
++}
++
++void
+ clientGetNetState (Client * c)
+ {
+     ScreenInfo *screen_info;
+diff --git a/src/placement.c b/src/placement.c
+index 01f2590..64719a7 100644
+--- a/src/placement.c
++++ b/src/placement.c
+@@ -38,7 +38,6 @@
+ #include "frame.h"
+ #include "netwm.h"
+ 
+-
+ /* Compute rectangle overlap area */
+ 
+ static inline unsigned long
+@@ -108,6 +107,8 @@ clientMaxSpace (ScreenInfo *screen_info, int *x, int *y, int *w, int *h)
+     g_return_if_fail (w != NULL);
+     g_return_if_fail (h != NULL);
+ 
++    TRACE ("entering clientMaxSpace");
++
+     screen_width = 0;
+     screen_height = 0;
+     delta = 0;
+@@ -157,6 +158,7 @@ clientMaxSpace (ScreenInfo *screen_info, int *x, int *y, int *w, int *h)
+             }
+         }
+     }
++    TRACE ("clientMaxSpace result %d %d %d %d", *x, *y, *w, *h);
+ }
+ 
+ gboolean
+diff --git a/src/settings.c b/src/settings.c
+index 607bb7b..37b6c2a 100644
+--- a/src/settings.c
++++ b/src/settings.c
+@@ -667,6 +667,7 @@ loadSettings (ScreenInfo *screen_info)
+         /* You can change the order of the following parameters */
+         {"activate_action", NULL, G_TYPE_STRING, TRUE},
+         {"borderless_maximize", NULL, G_TYPE_BOOLEAN, TRUE},
++        {"titleless_maximize", NULL, G_TYPE_BOOLEAN, TRUE},
+         {"box_move", NULL, G_TYPE_BOOLEAN, TRUE},
+         {"box_resize", NULL, G_TYPE_BOOLEAN, TRUE},
+         {"button_layout", NULL, G_TYPE_STRING, TRUE},
+@@ -753,6 +754,8 @@ loadSettings (ScreenInfo *screen_info)
+ 
+     screen_info->params->borderless_maximize =
+         getBoolValue ("borderless_maximize", rc);
++    screen_info->params->titleless_maximize =
++        getBoolValue ("titleless_maximize", rc);
+     screen_info->params->box_resize =
+         getBoolValue ("box_resize", rc);
+     screen_info->params->box_move =
+@@ -1261,6 +1264,11 @@ cb_xfwm4_channel_property_changed(XfconfChannel *channel, const gchar *property_
+                     screen_info->params->borderless_maximize = g_value_get_boolean (value);
+                     reloadScreenSettings (screen_info, UPDATE_MAXIMIZE);
+                 }
++                else if (!strcmp (name, "titleless_maximize"))
++                {
++                    screen_info->params->titleless_maximize = g_value_get_boolean (value);
++                    reloadScreenSettings (screen_info, UPDATE_MAXIMIZE);
++                }
+                 else if (!strcmp (name, "cycle_minimum"))
+                 {
+                     screen_info->params->cycle_minimum = g_value_get_boolean (value);
+diff --git a/src/settings.h b/src/settings.h
+index be01b6b..ea8b79b 100644
+--- a/src/settings.h
++++ b/src/settings.h
+@@ -197,6 +197,7 @@ struct _XfwmParams
+     int title_shadow[2];
+     int wrap_resistance;
+     gboolean borderless_maximize;
++    gboolean titleless_maximize;
+     gboolean box_move;
+     gboolean box_resize;
+     gboolean click_to_focus;
+-- 
+1.8.4
+
diff --git a/pcr/xfwm4-titleless/xfwm4.install b/pcr/xfwm4-titleless/xfwm4.install
new file mode 100644
index 000000000..e4f8fd06c
--- /dev/null
+++ b/pcr/xfwm4-titleless/xfwm4.install
@@ -0,0 +1,13 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD
index 1aab4522e..3d2d5c90f 100644
--- a/pcr/youtube-dl-current/PKGBUILD
+++ b/pcr/youtube-dl-current/PKGBUILD
@@ -1,11 +1,11 @@
-# Maintainer (Arch): Eric Bélanger <eric@archlinux.org>
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 # Maintainer (Parabola): Alon Ivtsan <alonivtsan@lavabit.com>
 # Based on https://www.archlinux.org/packages/community/any/youtube-dl/ 
 
 pkgname=youtube-dl-current
 _pkgname=youtube-dl
 provides=(youtube-dl)
-pkgver=2013.09.04
+pkgver=2013.10.07
 pkgrel=1
 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites"
 arch=('any')
@@ -27,5 +27,5 @@ package() {
     "${pkgdir}/usr/share/bash-completion/completions/youtube-dl"
   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
 }
-md5sums=('252f503736cef7049d3a1ed20a2ffc5f'
+md5sums=('8fcf8c27dc2444f78c0413f9ddee383a'
          'SKIP')
diff --git a/pcr/zbase32/PKGBUILD b/pcr/zbase32/PKGBUILD
new file mode 100644
index 000000000..b4373abb8
--- /dev/null
+++ b/pcr/zbase32/PKGBUILD
@@ -0,0 +1,25 @@
+# Contributor: Peter Simons <simons@cryp.to>
+# Contributor: Nicolas Pouillard <nicolas.pouillard@gmail.com>
+pkgname=zbase32
+pkgver=1.1.5
+pkgrel=1
+pkgdesc="alternate base32 encoder (not RFC 3548 compliant)"
+arch=('i686' 'x86_64')
+url='http://pypi.python.org/pypi/zbase32'
+license=('BSD')
+depends=('python2')
+makedepends=('setuptools' 'darcsver' 'setuptools_darcs' 'pyutil')
+source=( http://pypi.python.org/packages/source/z/zbase32/zbase32-$pkgver.tar.gz )
+md5sums=('4dba0be4ac6d66968de8e5173f51d65d')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  python2 setup.py build
+  python2 setup.py test
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  python2 setup.py install --root="$pkgdir"
+  install -Dm644 PKG-INFO* $pkgdir/usr/share/licenses/$pkgname/LICENSE
+}
diff --git a/pcr/zfec/PKGBUILD b/pcr/zfec/PKGBUILD
new file mode 100644
index 000000000..0c2487c6b
--- /dev/null
+++ b/pcr/zfec/PKGBUILD
@@ -0,0 +1,26 @@
+# Maintainer: Nicolas Pouillard <nicolas.pouillard@gmail.com>
+# Contributor: Peter Simons <simons@cryp.to>
+pkgname=zfec
+pkgver=1.4.24
+pkgrel=2
+pkgdesc="a fast erasure codec which can be used with the command-line, C, Python, or Haskell"
+arch=('i686' 'x86_64')
+url='http://pypi.python.org/pypi/zfec'
+license=('GPL' 'custom')
+depends=('python2' 'pyutil' 'zbase32')
+makedepends=('darcsver' 'setuptools_darcs')
+source=( http://pypi.python.org/packages/source/z/zfec/zfec-$pkgver.tar.gz )
+md5sums=('e1bca3a1f18374f72bdf8cd42ea9c919')
+
+build(){
+  cd "$srcdir/$pkgname-$pkgver"
+  python2 setup.py build
+  python2 setup.py test
+}
+
+package(){
+  cd "$srcdir/$pkgname-$pkgver"
+  python2 setup.py install --root="$pkgdir"
+  install -d $pkgdir/usr/share/licenses/$pkgname/
+  install -m644 COPYING* $pkgdir/usr/share/licenses/$pkgname/
+}
diff --git a/~lukeshu/android-udev/51-android.rules b/~lukeshu/android-udev/51-android.rules
deleted file mode 100644
index 51f80cf54..000000000
--- a/~lukeshu/android-udev/51-android.rules
+++ /dev/null
@@ -1,232 +0,0 @@
-#      Acer
-SUBSYSTEM=="usb", ATTR{idVendor}=="0502", MODE="0666", GROUP="adbusers"
-#      Iconia Tab A500
-SUBSYSTEM=="usb", ATTR{idVendor}=="0502", ATTR{idProduct}=="3325", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0502", ATTR{idProduct}=="3325", SYMLINK+="android_fastboot"
-#      Liquid
-SUBSYSTEM=="usb", ATTR{idVendor}=="0502", ATTR{idProduct}=="3202"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0502", ATTR{idProduct}=="3203", SYMLINK+="android_adb"
-
-#      Archos
-SUBSYSTEM=="usb", ATTR{idVendor}=="0e79", MODE="0666", GROUP="adbusers"
-#      43
-SUBSYSTEM=="usb", ATTR{idVendor}=="0e79", ATTR{idProduct}=="1417", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0e79", ATTR{idProduct}=="1417", SYMLINK+="android_fastboot"
-#      101
-SUBSYSTEM=="usb", ATTR{idVendor}=="0e79", ATTR{idProduct}=="1411", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0e79", ATTR{idProduct}=="1411", SYMLINK+="android_fastboot"
-
-#      Asus
-SUBSYSTEM=="usb", ATTR{idVendor}=="0b05", MODE="0666", GROUP="adbusers"
-
-#      Dell
-SUBSYSTEM=="usb", ATTR{idVendor}=="413c", MODE="0666", GROUP="adbusers"
-
-#      Foxconn
-SUBSYSTEM=="usb", ATTR{idVendor}=="0489", MODE="0666", GROUP="adbusers"
-
-#      Garmin-Asus
-SUBSYSTEM=="usb", ATTR{idVendor}=="091e", MODE="0666", GROUP="adbusers"
-
-#      Google
-SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", MODE="0666", GROUP="adbusers"
-#      NEXUS S
-SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="4e21",
-SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="4e22", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="4e20", SYMLINK+="android_fastboot"
-#      Nexus One
-SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="4e11",
-SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="4e12", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot"
-#      Generic and unspecified debug interface
-SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="d00d", SYMLINK+="android_fastboot"
-
-#      HTC
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", MODE="0666", GROUP="adbusers"
-#      ChaCha
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0cb2", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0cb2", SYMLINK+="android_fastboot"
-#      Desire (Bravo)
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9",
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c87", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot"
-#      Desire HD
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ca2", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot"
-#      Desire Z
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c91", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c91", SYMLINK+="android_fastboot"
-#      Evo Shift
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9",
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ca5", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot"
-#      HD2
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c02", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c02", SYMLINK+="android_fastboot"
-#      Hero H2000
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0001", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0001", SYMLINK+="android_fastboot"
-#      Hero (GSM), Desire
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9",
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c99", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot"
-#      Hero (CDMA)
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9",
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c9a", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot"
-#      Incredible
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9",
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c9e", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot"
-#      Evo 4G, Incredible rev 0002
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9",
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c8d", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot"
-#      MyTouch 4G
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9",
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c96", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot"
-#      Slide
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9",
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0e03", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot"
-#      Tatoo, Dream, ADP1 , G1, Magic
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c01"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c02", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c02", SYMLINK+="android_fastboot"
-#      Vision
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9",
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c91", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot"
-#      Wildfire
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c8b", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c8b", SYMLINK+="android_fastboot"
-
-#      Huawei
-SUBSYSTEM=="usb", ATTR{idVendor}=="12d1", MODE="0666", GROUP="adbusers"
-SUBSYSTEM=="usb", ATTR{idVendor}=="12d1", ATTR{idProduct}=="1038", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="12d1", ATTR{idProduct}=="1038", SYMLINK+="android_fastboot"
-
-#      K-Touch
-SUBSYSTEM=="usb", ATTR{idVendor}=="24e3", MODE="0666", GROUP="adbusers"
-
-#      KT Tech
-SUBSYSTEM=="usb", ATTR{idVendor}=="2116", MODE="0666", GROUP="adbusers"
-
-#      Kyocera
-SUBSYSTEM=="usb", ATTR{idVendor}=="0482", MODE="0666", GROUP="adbusers"
-
-#      Lab126
-SUBSYSTEM=="usb", ATTR{idVendor}=="1949", MODE="0666", GROUP="adbusers"
-#      Amazon Kindle Fire
-SUBSYSTEM=="usb", ATTR{idVendor}=="1949", ATTR{idProduct}=="0006", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="1949", ATTR{idProduct}=="0006", SYMLINK+="android_fastboot"
-
-#      Lenevo
-SUBSYSTEM=="usb", ATTR{idVendor}=="17ef", MODE="0666", GROUP="adbusers"
-
-#      LG
-SUBSYSTEM=="usb", ATTR{idVendor}=="1004", MODE="0666", GROUP="adbusers"
-#      Ally, Vortex, P500
-SUBSYSTEM=="usb", ATTR{idVendor}=="1004", ATTR{idProduct}=="618f"
-SUBSYSTEM=="usb", ATTR{idVendor}=="1004", ATTR{idProduct}=="618e", SYMLINK+="android_adb"
-#      Optimus One
-SUBSYSTEM=="usb", ATTR{idVendor}=="1004", ATTR{idProduct}=="61c5", SYMLINK+="android_adb"
-#      Swift GT540
-SUBSYSTEM=="usb", ATTR{idVendor}=="1004", ATTR{idProduct}=="61b4", SYMLINK+="android_adb"
-
-
-#      Motorola
-SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", MODE="0666", GROUP="adbusers"
-#      CLIQ XT/Quench
-SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="2d66"
-#      Defy/MB525
-SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="428c"
-#      Droid
-SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="41db"
-#      -- Xoom ID 1
-SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="70a8", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="70a8", SYMLINK+="android_fastboot"
-#      -- Xoom ID 2
-SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="70a9", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="70a9", SYMLINK+="android_fastboot"
-
-#      NEC
-SUBSYSTEM=="usb", ATTR{idVendor}=="0409", MODE="0666", GROUP="adbusers"
-
-#      Nook
-SUBSYSTEM=="usb", ATTR{idVendor}=="2080", MODE="0666", GROUP="adbusers"
-
-#      Nvidia
-SUBSYSTEM=="usb", ATTR{idVendor}=="0955", MODE="0666", GROUP="adbusers"
-
-#      OTGV
-SUBSYSTEM=="usb", ATTR{idVendor}=="2257", MODE="0666", GROUP="adbusers"
-
-#      Pantech
-SUBSYSTEM=="usb", ATTR{idVendor}=="10A9", MODE="0666", GROUP="adbusers"
-
-#      Philips
-SUBSYSTEM=="usb", ATTR{idVendor}=="0471", MODE="0666", GROUP="adbusers"
-
-#      PMC-Sierra
-SUBSYSTEM=="usb", ATTR{idVendor}=="04da", MODE="0666", GROUP="adbusers"
-
-#      Qualcomm
-SUBSYSTEM=="usb", ATTR{idVendor}=="05c6", MODE="0666", GROUP="adbusers"
-
-#      SK Telesys
-SUBSYSTEM=="usb", ATTR{idVendor}=="1f53", MODE="0666", GROUP="adbusers"
-
-#      Samsung
-SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", MODE="0666", GROUP="adbusers"
-#      Galaxy i5700
-SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="681c", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="681c", SYMLINK+="android_fastboot"
-#      Galaxy i5800
-SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="681c", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6601", SYMLINK+="android_fastboot"
-SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="68a9", SYMLINK+="libmtp-%k", ENV{ID_MTP_DEVICE}="1", ENV{ID_MEDIA_PLAYER}="1"
-#      Galaxy i7500
-SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6640", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6640", SYMLINK+="android_fastboot"
-#      Galaxy S
-SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6601", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="685d", MODE="0666"
-SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="68c3", MODE="0666"
-#      Galaxy Tab
-SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6877", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6877", SYMLINK+="android_fastboot"
-#      Galaxy Tab 10.1, i9100 S2
-SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6860"
-SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="685e", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="685e", SYMLINK+="android_fastboot"
-SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6860", SYMLINK+="libmtp-%k", ENV{ID_MTP_DEVICE}="1", ENV{ID_MEDIA_PLAYER}="1"
-
-#      Sharp
-SUBSYSTEM=="usb", ATTR{idVendor}=="04dd", MODE="0666", GROUP="adbusers"
-
-#      Sony Ericsson
-SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", MODE="0666", GROUP="adbusers"
-#      Xperia X10 mini
-SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", ATTR{idProduct}=="3137"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", ATTR{idProduct}=="2137", SYMLINK+="android_adb"
-#      Xperia X10 mini pro
-SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", ATTR{idProduct}=="3138"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", ATTR{idProduct}=="2138", SYMLINK+="android_adb"
-#      Xperia X8
-SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", ATTR{idProduct}=="3149"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", ATTR{idProduct}=="2149", SYMLINK+="android_adb"
-#      Xperia X12
-SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", ATTR{idProduct}=="e14f"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", ATTR{idProduct}=="614f", SYMLINK+="android_adb"
-
-#      Toshiba
-SUBSYSTEM=="usb", ATTR{idVendor}=="0930", MODE="0666", GROUP="adbusers"
-
-#      ZTE
-SUBSYSTEM=="usb", ATTR{idVendor}=="19d2", MODE="0666", GROUP="adbusers"
-#      Blade
-SUBSYSTEM=="usb", ATTR{idVendor}=="19d2", ATTR{idProduct}=="1353",
-SUBSYSTEM=="usb", ATTR{idVendor}=="19d2", ATTR{idProduct}=="1351", SYMLINK+="android_adb"
-
diff --git a/~lukeshu/android-udev/Makefile b/~lukeshu/android-udev/Makefile
deleted file mode 100644
index f20930c66..000000000
--- a/~lukeshu/android-udev/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/make -f
-# Use this script to update the package from AUR.
-# This script depends on:
-#  - coreutils
-#  - pacman
-#  - sed
-#  - wget
-
-default: PHONY all
-all: PHONY 51-android.rules PKGBUILD 
-
-name=android-udev
-
-aur:
-	mkdir $@
-aur/%.tar.gz: | aur
-	cd aur && wget http://aur.archlinux.org/packages/$*/$*.tar.gz
-aur/%: aur/%.tar.gz
-	cd aur && tar xzf $(notdir $<)
-aur/$(name)/%: aur/$(name).tar.gz | aur/$(name)
-	test -f $@ && touch $@
-
-51-android.rules: aur/$(name)/51-android.rules
-	sed -r 's/\s+$$//' < $< > $@
-
-PKGBUILD: aur/$(name)/PKGBUILD 51-android.rules
-	# Update pkg{ver,rel}
-	ver=`grep -m1 pkgver= $<`  ; sed -i "s/pkgver=.*/$$ver/" $@
-	rel=`grep -m1 pkgrel= $<`.1; sed -i "s/pkgrel=.*/$$rel/" $@
-	# Update md5sums
-	sed -i '/md5sums/,$$d' $@
-	makepkg -g >> $@
-
-clean: PHONY
-	rm -rf aur
-maintainerclean: PHONY clean
-	rm -f 51-android.rules
-
-.PHONY: PHONY FORCE
diff --git a/~lukeshu/android-udev/PKGBUILD b/~lukeshu/android-udev/PKGBUILD
deleted file mode 100644
index 6900b46da..000000000
--- a/~lukeshu/android-udev/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Maintainer: M0Rf30 (AUR)
-# Contributor: marlock
-
-pkgname=android-udev
-pkgver=0.8
-pkgrel=1.1
-pkgdesc='Udev rules to for Android devices.'
-arch=('any')
-url="http://developer.android.com/guide/developing/device.html"
-license=('unknown')
-source=('51-android.rules')
-depends=('udev' 'libmtp')
-conflicts=('udev-android-rules')
-install='android-udev.install'
-
-package() {
-  install -d "$pkgdir/etc/udev/rules.d"
-  install -m644 "$srcdir/51-android.rules" "$pkgdir/etc/udev/rules.d/51-android.rules"
-}
-
-md5sums=('909eb7629683efae838c6e9d65966b3b')
diff --git a/~lukeshu/android-udev/android-udev.install b/~lukeshu/android-udev/android-udev.install
deleted file mode 100644
index c861f2b70..000000000
--- a/~lukeshu/android-udev/android-udev.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-getent group adbusers >> /dev/null || /usr/sbin/groupadd adbusers || return 1
-/bin/cat << EOF
-===> In order to use adb, you have to be in the 'adbusers' group
-===> For that, use: gpasswd -a USERNAME adbusers
-EOF
-}
-
-post_upgrade() {
-post_install
-}
-
-post_remove() {
-getent group adbusers &>/dev/null && /usr/sbin/groupdel adbusers
-}
diff --git a/~lukeshu/emacs-lucid/librenamcap b/~lukeshu/emacs-lucid/librenamcap
deleted file mode 100644
index a42ac9e22..000000000
--- a/~lukeshu/emacs-lucid/librenamcap
+++ /dev/null
@@ -1,8 +0,0 @@
-emacs-lucid E: incorrect-owner var/games (root:games)
-emacs-lucid E: incorrect-owner var/games/emacs (root:games)
-emacs-lucid E: incorrect-owner var/games/emacs/snake-scores (root:games)
-emacs-lucid E: incorrect-owner var/games/emacs/tetris-scores (root:games)
-emacs-lucid W: file-in-non-standard-dir var/games/
-emacs-lucid W: file-in-non-standard-dir var/games/emacs/
-emacs-lucid W: file-in-non-standard-dir var/games/emacs/snake-scores
-emacs-lucid W: file-in-non-standard-dir var/games/emacs/tetris-scores