Tue Feb 21 23:15:10 UTC 2012

155 files changed, 7438 insertions, 1522 deletions

diff --git a/community-staging/gmerlin-avdecoder/PKGBUILD b/community-staging/gmerlin-avdecoder/PKGBUILD
new file mode 100644
index 000000000..937c26b95
--- /dev/null
+++ b/community-staging/gmerlin-avdecoder/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 65331 2012-02-21 01:43:40Z stephane $
+# Maintainer: Mateusz Herych <heniekk@gmail.com>
+
+pkgname=gmerlin-avdecoder
+pkgver=1.1.0
+pkgrel=5
+pkgdesc="Media decoding library"
+arch=('i686' 'x86_64')
+url="http://gmerlin.sourceforge.net/avdec_frame.html"
+license=('GPL')
+depends=('gmerlin' 'openjpeg' 'flac' 'smbclient' 'libmad' 'libmpcdec' 'speex'
+         'libdca' 'libmpeg2' 'a52dec')
+source=(http://downloads.sourceforge.net/sourceforge/gmerlin/gmerlin-avdecoder-$pkgver.tar.gz)
+md5sums=('c1ea663e9da631453eec4ac79138b6c5')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  rm -f cpuinfo.sh
+  ./configure --prefix=/usr --without-doxygen
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community-staging/pragha/PKGBUILD b/community-staging/pragha/PKGBUILD
new file mode 100644
index 000000000..ae31a38d3
--- /dev/null
+++ b/community-staging/pragha/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id: PKGBUILD 65302 2012-02-20 20:09:04Z ttopper $
+# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
+# Contributor: Alois Nespor <alois.nespor@gmail.com>
+# Contributor:  JerichoKru   <jerichokru(AT)htomail.com>
+
+pkgname=pragha
+pkgver=1.0
+pkgrel=2
+pkgdesc="A lightweight GTK+ music manager - fork of Consonance Music Manager."
+arch=('i686' 'x86_64')
+url="http://pragha.wikispaces.com/"
+license=('GPL3')
+depends=('libnotify' 'libcdio' 'gstreamer0.10-base'
+         'taglib' 'hicolor-icon-theme'  'gtk2'
+         'dbus-glib' 'sqlite3' 'desktop-file-utils')
+optdepends=('notification-daemon: OSD notification')
+replaces=('dissonance')
+install=pragha.install
+source=(http://dissonance.googlecode.com/files/$pkgname-$pkgver.tar.bz2)
+sha1sums=('b4d2780b065e3141489dcc27c121f01b1d47227c')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  LIBS+="-ldbus-glib-1"  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir/" install
+	
+  install -m 644 "data/$pkgname.desktop" "$pkgdir/usr/share/applications"
+  install -d "$pkgdir/usr/share/pixmaps"
+  install -m 644 "data/$pkgname.png" "$pkgdir/usr/share/pixmaps/"
+  install -m 644 "data/$pkgname.1" "$pkgdir/usr/share/man/man1/"
+
+}
+
+# vim:ts=2:sw=2:expandtab
+
diff --git a/community-staging/pragha/pragha.install b/community-staging/pragha/pragha.install
new file mode 100644
index 000000000..ff5a644bd
--- /dev/null
+++ b/community-staging/pragha/pragha.install
@@ -0,0 +1,10 @@
+post_install() {
+ gtk-update-icon-cache -q -f -t usr/share/icons/hicolor
+ update-desktop-database -q
+}
+
+post_remove() {
+ gtk-update-icon-cache -q -f -t usr/share/icons/hicolor
+ update-desktop-database -q
+}
+ 
diff --git a/community-testing/hostapd/PKGBUILD b/community-testing/hostapd/PKGBUILD
index 8d42df603..651e39976 100644
--- a/community-testing/hostapd/PKGBUILD
+++ b/community-testing/hostapd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 64577 2012-02-16 20:40:45Z heftig $
+# $Id: PKGBUILD 65319 2012-02-21 00:00:16Z heftig $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 _madwifiver=0.9.4.4133
 pkgname=hostapd
 pkgver=0.7.3
-pkgrel=6
+pkgrel=7
 pkgdesc="daemon for wireless software access points"
 arch=('i686' 'x86_64')
 url="http://hostap.epitest.fi/hostapd/"
@@ -28,54 +28,45 @@ install=hostapd.install
 source=(http://hostap.epitest.fi/releases/$pkgname-$pkgver.tar.gz
 	ftp://ftp.archlinux.org/other/madwifi/madwifi-${_madwifiver}.tar.bz2
 	hostap_allow-linking-with-libnl-3.2.patch
-	config.bz2
+	config
 	hostapd
 	hostapd.conf.d)
 md5sums=('91a7c8d0f090b7104152d3455a84c112'
          'ca3c3504d000e7b3d7063af46271c932'
          'e904e62b12c5d64132dd9441e8b45dce'
-         'aa86f89f51b39cea75a8c15f7b376a67'
+         'bfe5701bc93d5d091e6f1a93f1a32dd6'
          'd570327c385f34a4af24d3a0d61cea19'
          'f169534b0f59b341f6df1a21e0344511')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "$srcdir/$pkgname-$pkgver"
   patch -Np1 -i "$srcdir/hostap_allow-linking-with-libnl-3.2.patch"
 
   cd hostapd
-  cp ../../config ./.config
+  cp "$srcdir/config" ./.config
 
-  sed -i "s|/usr|$srcdir/madwifi|" .config
-  sed -i "s|/usr/local/bin|$pkgdir/usr/bin|" Makefile
-
-  mkdir -p $pkgdir/usr/bin $pkgdir/etc/hostapd \
-      $pkgdir/usr/man/man1 $pkgdir/usr/man/man8 \
-      $pkgdir/usr/share/licenses/$pkgname $pkgdir/etc/rc.d
+  sed -i "s|@@madwifi@@|$srcdir/madwifi|" .config
+  sed -i 's#/etc/hostapd#/etc/hostapd/hostapd#' hostapd.conf
 
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver/hostapd
-  make DESTDIR=$pkg install
+  cd "$srcdir/$pkgname-$pkgver/hostapd"
+  
+  install -D hostapd "$pkgdir/usr/bin/hostapd"
+  install hostapd_cli "$pkgdir/usr/bin/hostapd_cli"
+
+  install -Dm644 hlr_auc_gw.milenage_db "$pkgdir/etc/hostapd/hlr_auc_gw.milenage_db"
+  install -m644 -t "$pkgdir/etc/hostapd" \
+    hostapd.{accept,conf,deny,eap_user,radius_clients,sim_db,vlan,wpa_psk} \
+    wired.conf
+  
+  install -Dm644 hostapd.8 "$pkgdir/usr/share/man/man8/hostapd.8"
+  install -Dm644 hostapd_cli.1 "$pkgdir/usr/share/man/man1/hostapd_cli.1"
 
-  cp hlr_auc_gw.milenage_db $pkgdir/etc/hostapd
-  cp hostapd.accept $pkgdir/etc/hostapd
-  cp hostapd.conf $pkgdir/etc/hostapd
-  cp hostapd.deny $pkgdir/etc/hostapd
-  cp hostapd.eap_user $pkgdir/etc/hostapd
-  cp hostapd.radius_clients $pkgdir/etc/hostapd
-  cp hostapd.sim_db $pkgdir/etc/hostapd
-  cp hostapd.vlan $pkgdir/etc/hostapd
-  cp hostapd.wpa_psk $pkgdir/etc/hostapd
-  cp wired.conf $pkgdir/etc/hostapd
-  cp hostapd.8 $pkgdir/usr/man/man8
-  cp hostapd_cli.1 $pkgdir/usr/man/man1
-  cp ../COPYING $pkgdir/usr/share/licenses/hostapd
-  cp ../../hostapd $pkgdir/etc/rc.d
-  mkdir -p $pkgdir/etc/conf.d
-  cp ../../hostapd.conf.d $pkgdir/etc/conf.d/hostapd
+  install -D "$srcdir/hostapd" "$pkgdir/etc/rc.d/hostapd"
+  install -Dm644 "$srcdir/hostapd.conf.d" "$pkgdir/etc/conf.d/hostapd"
 
-  mv $pkgdir/usr/man $pkgdir/usr/share/
-  sed -i 's#/etc/hostapd#/etc/hostapd/hostapd#' $pkgdir/etc/hostapd/hostapd.conf
+  install -Dm644 ../COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
diff --git a/community-testing/hostapd/config b/community-testing/hostapd/config
new file mode 100644
index 000000000..d77e77461
--- /dev/null
+++ b/community-testing/hostapd/config
@@ -0,0 +1,96 @@
+# Example hostapd build time configuration
+#
+# This file lists the configuration options that are used when building the
+# hostapd binary. All lines starting with # are ignored. Configuration option
+# lines must be commented out complete, if they are not to be included, i.e.,
+# just setting VARIABLE=n is not disabling that variable.
+#
+# This file is included in Makefile, so variables like CFLAGS and LIBS can also
+# be modified from here. In most cass, these lines should use += in order not
+# to override previous values of the variables.
+
+# Driver interface for Host AP driver
+CONFIG_DRIVER_HOSTAP=y
+
+# Driver interface for wired authenticator
+CONFIG_DRIVER_WIRED=y
+
+# Driver interface for madwifi driver
+CONFIG_DRIVER_MADWIFI=y
+CFLAGS += -I@@madwifi@@  # change to reflect local setup; directory for madwifi src
+
+# Driver interface for Prism54 driver
+CONFIG_DRIVER_PRISM54=y
+
+# IEEE 802.11F/IAPP
+CONFIG_IAPP=y
+
+# WPA2/IEEE 802.11i RSN pre-authentication
+CONFIG_RSN_PREAUTH=y
+
+# PeerKey handshake for Station to Station Link (IEEE 802.11e DLS)
+CONFIG_PEERKEY=y
+
+# IEEE 802.11w (management frame protection)
+# This version is an experimental implementation based on IEEE 802.11w/D1.0
+# draft and is subject to change since the standard has not yet been finalized.
+# Driver support is also needed for IEEE 802.11w.
+CONFIG_IEEE80211W=y
+
+# Integrated EAP server
+CONFIG_EAP=y
+
+# EAP-MD5 for the integrated EAP server
+CONFIG_EAP_MD5=y
+
+# EAP-TLS for the integrated EAP server
+CONFIG_EAP_TLS=y
+
+# EAP-MSCHAPv2 for the integrated EAP server
+CONFIG_EAP_MSCHAPV2=y
+
+# EAP-PEAP for the integrated EAP server
+CONFIG_EAP_PEAP=y
+
+# EAP-GTC for the integrated EAP server
+CONFIG_EAP_GTC=y
+
+# EAP-TTLS for the integrated EAP server
+CONFIG_EAP_TTLS=y
+
+# EAP-SIM for the integrated EAP server
+CONFIG_EAP_SIM=y
+
+# EAP-AKA for the integrated EAP server
+CONFIG_EAP_AKA=y
+
+# EAP-PAX for the integrated EAP server
+CONFIG_EAP_PAX=y
+
+# EAP-PSK for the integrated EAP server (this is _not_ needed for WPA-PSK)
+CONFIG_EAP_PSK=y
+
+# EAP-SAKE for the integrated EAP server
+CONFIG_EAP_SAKE=y
+
+# EAP-GPSK for the integrated EAP server
+CONFIG_EAP_GPSK=y
+# Include support for optional SHA256 cipher suite in EAP-GPSK
+CONFIG_EAP_GPSK_SHA256=y
+
+# PKCS#12 (PFX) support (used to read private key and certificate file from
+# a file that usually has extension .p12 or .pfx)
+CONFIG_PKCS12=y
+
+# RADIUS authentication server. This provides access to the integrated EAP
+# server from external hosts using RADIUS.
+CONFIG_RADIUS_SERVER=y
+
+# Build IPv6 support for RADIUS operations
+CONFIG_IPV6=y
+
+CONFIG_DRIVER_NL80211=y
+
+CONFIG_IEEE80211N=y
+
+CONFIG_LIBNL32=y
diff --git a/community/alltray/PKGBUILD b/community/alltray/PKGBUILD
index 1b1e8c6a9..9ff9a652a 100644
--- a/community/alltray/PKGBUILD
+++ b/community/alltray/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 65035 2012-02-20 02:11:14Z spupykin $
+# $Id: PKGBUILD 65283 2012-02-20 15:18:04Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer : James Rayner <iphitus@gmail.com>
 # Contributor: Roberto Salas <ro0xito@gmail.com>
 
 pkgname=alltray
-pkgver=0.7.5dev
-pkgrel=2
+pkgver=0.7.5.1dev
+pkgrel=1
 pkgdesc="Drops any app in the tray."
 license=('GPL')
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ url="http://alltray.trausch.us/"
 depends=('libxpm' 'libgtop' 'libwnck')
 options=('!libtool')
 source=(https://code.launchpad.net/alltray/trunk/${pkgver}/+download/alltray-${pkgver}.tar.gz)
-md5sums=('faef46b14a3f9c14d4e5efd65245796e')
+md5sums=('5842253b89a5943031b5a02bbd8fd4fb')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/community/chmsee/PKGBUILD b/community/chmsee/PKGBUILD
index fc02fc811..5561ea17d 100644
--- a/community/chmsee/PKGBUILD
+++ b/community/chmsee/PKGBUILD
@@ -1,35 +1,35 @@
-# $Id: PKGBUILD 61658 2012-01-05 20:32:51Z lcarlier $
+# $Id: PKGBUILD 65174 2012-02-20 08:15:56Z lcarlier $
 # Maintainer : Laurent Carlier <lordheavym@gmail.com>
 # Contributor: dionydonny <dionydonny@gmail.com>
 # Contributor: Ermanno <erm67@yahoo.it>
 
 pkgname=chmsee
-pkgver=1.99.07
+pkgver=1.99.08
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="A chm (MS HTML help file format) viewer based on xulrunner."
 url="http://chmsee.googlecode.com/"
 license=('GPL')
-depends=('xulrunner>=9.0' 'chmlib' 'desktop-file-utils')
+depends=('xulrunner>=10.0' 'chmlib' 'desktop-file-utils')
 makedepends=('python2')
 source=(chmsee-$pkgver.tar.gz::https://github.com/jungleji/chmsee/tarball/v$pkgver
         chmsee)
 install=chmsee.install
-md5sums=('46dc393ffde8e614b4e6e7b5926b02b1'
+md5sums=('9e54b72761f8e97e683c03e52ac1ac6c'
          '4999362b0c89c24764cbd25173610a38')
 
 build() {
-  cd ${srcdir}/jungleji-chmsee-ccdf6d2/src
+  cd ${srcdir}/jungleji-chmsee-*/src
 
   cp Makefile.arch Makefile
-  sed -i -e 's/python/python2/g' common.mk
-#  sed -i -e 's/5.0/9.0/g' Makefile
+  #sed -i -e 's/python/python2/g' common.mk
+  #sed -i -e 's/5.0/10.0/g' Makefile
 
   make
 }
 
 package() {
-  cd ${srcdir}/jungleji-chmsee-ccdf6d2
+  cd ${srcdir}/jungleji-chmsee-*
 
   install -d ${pkgdir}/usr/share/chmsee
   cp -a * ${pkgdir}/usr/share/chmsee 
diff --git a/community/cppcheck/PKGBUILD b/community/cppcheck/PKGBUILD
index 6019768a5..4d17051c1 100644
--- a/community/cppcheck/PKGBUILD
+++ b/community/cppcheck/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 60664 2011-12-16 16:51:24Z stephane $
+# $Id: PKGBUILD 65291 2012-02-20 15:31:22Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 
 pkgname=cppcheck
-pkgver=1.52
-pkgrel=2
+pkgver=1.53
+pkgrel=1
 pkgdesc="A tool for static C/C++ code analysis"
 arch=('i686' 'x86_64')
 url="http://cppcheck.wiki.sourceforge.net/"
@@ -11,7 +11,7 @@ license=('GPL')
 depends=('pcre')
 makedepends=('docbook-xsl')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('56cc54f9d0af41dcfee5560e897fd3e1357712bc')
+sha1sums=('e1c8431cab1ef07c725f1556bdb0fc5d3e912c9f')
 
 build() {
    cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/dictd/PKGBUILD b/community/dictd/PKGBUILD
index 7ba6a1d1d..041e99d5f 100644
--- a/community/dictd/PKGBUILD
+++ b/community/dictd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 57578 2011-10-31 03:14:04Z andrea $
+# $Id: PKGBUILD 65118 2012-02-20 04:52:24Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: SmackleFunky <smacklefunky@optusnet.com.au>
 # Contributor: Enrico Morelli <morelli@cerm.unifi.it>
 
 pkgname=dictd
 pkgver=1.12.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Online dictionary client and server"
 url="http://sourceforge.net/projects/dict/"
 license=('GPL')
diff --git a/community/dietlibc/PKGBUILD b/community/dietlibc/PKGBUILD
index 7ea29eab2..b944ce259 100644
--- a/community/dietlibc/PKGBUILD
+++ b/community/dietlibc/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 59221 2011-11-21 15:22:09Z spupykin $
+# $Id: PKGBUILD 65120 2012-02-20 04:53:08Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Tino Reichardt <milky-archlinux@mcmilk.de>
 
 pkgname=dietlibc
 pkgver=0.32
-pkgrel=2
+pkgrel=3
 pkgdesc="a libc optimized for small size"
 arch=('i686' 'x86_64')
 url="http://www.fefe.de/dietlibc/"
diff --git a/community/discid/PKGBUILD b/community/discid/PKGBUILD
index d77a3a02c..a40ba2e98 100644
--- a/community/discid/PKGBUILD
+++ b/community/discid/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 18097 2010-05-31 09:25:34Z spupykin $
+# $Id: PKGBUILD 65124 2012-02-20 04:54:23Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Roland Schaeuble <rschaeuble@gmx.ch>
 
 pkgname=discid
 pkgver=0.1.3
-pkgrel=4
+pkgrel=5
 pkgdesc="A program to calculate the disc-ID for audio compact discs"
 arch=('i686' 'x86_64')
 url="http://discid.sourceforge.net"
@@ -15,6 +15,6 @@ md5sums=('4f1c06efa40995576e6436246e5bd674')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  make || return 1
+  make
   make DESTDIR=$pkgdir/usr install
 }
diff --git a/community/docbook2x/PKGBUILD b/community/docbook2x/PKGBUILD
index 42dab69b1..33f3ceaa3 100644
--- a/community/docbook2x/PKGBUILD
+++ b/community/docbook2x/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 19671 2010-06-26 17:37:44Z spupykin $
+# $Id: PKGBUILD 65128 2012-02-20 04:55:47Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
 
 pkgname=docbook2x
 pkgver=0.8.8
-pkgrel=9
+pkgrel=10
 pkgdesc="A software package that converts DocBook documents into the traditional Unix man page format and the GNU Texinfo format."
 arch=('i686' 'x86_64')
 url="http://docbook2x.sourceforge.net"
diff --git a/community/drivel/PKGBUILD b/community/drivel/PKGBUILD
index 82ae3dda9..bbbf73516 100644
--- a/community/drivel/PKGBUILD
+++ b/community/drivel/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 46527 2011-05-08 20:38:52Z spupykin $
+# $Id: PKGBUILD 65140 2012-02-20 05:01:22Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # old Maintainer: Andrei "Garoth" Thorp <my-username at gmail dot com>
 # Contributor: Alexandr Nevskiy <kepkin@gmail.com>
 
 pkgname=drivel
 pkgver=3.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc="GTK client for working with online journals (blogs)."
 url="http://www.dropline.net/drivel/index.php"
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@ md5sums=('295a583d6ed652ab591070245283fb5b')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc
+  LDFLAGS=-lm ./configure --prefix=/usr --sysconfdir=/etc
   make
 }
 
diff --git a/community/dumb/CVE-2006-3668.patch b/community/dumb/CVE-2006-3668.patch
new file mode 100644
index 000000000..09d2fb68f
--- /dev/null
+++ b/community/dumb/CVE-2006-3668.patch
@@ -0,0 +1,16 @@
+Index: libdumb-0.9.3/src/it/itread.c
+===================================================================
+--- libdumb-0.9.3.orig/src/it/itread.c	2006-07-21 11:05:48.000000000 +0200
++++ libdumb-0.9.3/src/it/itread.c	2006-07-21 11:07:22.000000000 +0200
+@@ -292,6 +292,11 @@
+ 
+ 	envelope->flags = dumbfile_getc(f);
+ 	envelope->n_nodes = dumbfile_getc(f);
++	if(envelope->n_nodes > 25) {
++		TRACE("IT error: wrong number of envelope nodes (%d)\n", envelope->n_nodes);
++		envelope->n_nodes = 0;
++		return -1;
++	}
+ 	envelope->loop_start = dumbfile_getc(f);
+ 	envelope->loop_end = dumbfile_getc(f);
+ 	envelope->sus_loop_start = dumbfile_getc(f);
diff --git a/community/dumb/PKGBUILD b/community/dumb/PKGBUILD
index c8701a37b..2ddfc6153 100644
--- a/community/dumb/PKGBUILD
+++ b/community/dumb/PKGBUILD
@@ -4,20 +4,31 @@
 
 pkgname=dumb
 pkgver=0.9.3
-pkgrel=5
+pkgrel=6
 pkgdesc="An IT, XM, S3M and MOD player library"
 arch=('i686' 'x86_64')
 license=('custom:dumb' 'GPL')
 url="http://dumb.sourceforge.net/"
 depends=('glibc' 'allegro4')
-source=(http://downloads.sourceforge.net/sourceforge/dumb/$pkgname-$pkgver.tar.gz)
-md5sums=('f48da5b990aa8aa822d3b6a951baf5c2')
+source=(http://downloads.sourceforge.net/sourceforge/dumb/$pkgname-$pkgver.tar.gz
+        as-needed.patch
+        CVE-2006-3668.patch)
+md5sums=('f48da5b990aa8aa822d3b6a951baf5c2'
+         '580676387b07d3b5998bbd525df2df52'
+         'e1378e2eb30346073ee188608ac2c9e7')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   [ "${CARCH}" = "x86_64" ] && export CFLAGS="${CFLAGS} -fPIC"
-  # Create the directories which the Makefile somehow fails to create
-  install -d lib/unix/{debug,release}
+
+  # Fix CVE-2006-3668 (Patch found in Gentoo and other distros).
+  patch -p1 < "$srcdir/CVE-2006-3668.patch"
+
+  # Apply a patch from Gentoo, so that we can build against binutils
+  # 2.22 and above.
+  patch -p1 < "$srcdir/as-needed.patch"
+  sed -i '/LDFLAGS :=/d' Makefile
+  cp Makefile Makefile.rdy
 
   # Make with Allegro support
   # Upstream's make process is interactive, and we can't simply pass
diff --git a/community/dumb/as-needed.patch b/community/dumb/as-needed.patch
new file mode 100644
index 000000000..6d482d196
--- /dev/null
+++ b/community/dumb/as-needed.patch
@@ -0,0 +1,72 @@
+diff -Naur dumb.orig/Makefile dumb/Makefile
+--- dumb.orig/Makefile	2003-04-03 16:34:18.000000000 -0800
++++ dumb/Makefile	2004-07-06 14:43:38.158063165 -0700
+@@ -199,11 +199,11 @@
+ ALLEGRO_EXAMPLES_EXE := $(addprefix examples/, $(notdir $(patsubst %.c, %$(EXE_SUFFIX), $(ALLEGRO_EXAMPLES))))
+ 
+ 
+-CORE_LIB_FILE_RELEASE := $(LIBDIR)/libdumb.a
+-ALLEGRO_LIB_FILE_RELEASE := $(LIBDIR)/libaldmb.a
++CORE_LIB_FILE_RELEASE := $(LIBDIR)/libdumb.so
++ALLEGRO_LIB_FILE_RELEASE := $(LIBDIR)/libaldmb.so
+ 
+-CORE_LIB_FILE_DEBUG := $(LIBDIR)/libdumbd.a
+-ALLEGRO_LIB_FILE_DEBUG := $(LIBDIR)/libaldmd.a
++CORE_LIB_FILE_DEBUG := $(LIBDIR)/libdumbd.so
++ALLEGRO_LIB_FILE_DEBUG := $(LIBDIR)/libaldmd.so
+ 
+ 
+ core: $(CORE_LIB_FILE_RELEASE) $(CORE_LIB_FILE_DEBUG)
+@@ -272,22 +272,22 @@
+ 
+ OBJDIR := $(OBJDIR_BASE)/release
+ CFLAGS := $(CFLAGS_RELEASE)
+-CORE_LIB_FILE := $(LIBDIR)/libdumb.a
+-ALLEGRO_LIB_FILE := $(LIBDIR)/libaldmb.a
++CORE_LIB_FILE := $(LIBDIR)/libdumb.so
++ALLEGRO_LIB_FILE := $(LIBDIR)/libaldmb.so
+ include make/Makefile.inc
+ 
+ OBJDIR := $(OBJDIR_BASE)/debug
+ CFLAGS := $(CFLAGS_DEBUG)
+-CORE_LIB_FILE := $(LIBDIR)/libdumbd.a
+-ALLEGRO_LIB_FILE := $(LIBDIR)/libaldmd.a
++CORE_LIB_FILE := $(LIBDIR)/libdumbd.so
++ALLEGRO_LIB_FILE := $(LIBDIR)/libaldmd.so
+ include make/Makefile.inc
+ 
+ 
+ $(CORE_EXAMPLES_EXE): examples/%$(EXE_SUFFIX): examples/%.o $(CORE_LIB_FILE_RELEASE)
+-	$(CC) $^ -o $@ $(LDFLAGS) $(LINK_MATH)
++	$(CC) $^ -o $@ $(LDFLAGS) $(LINK_MATH)
+ 
+ $(ALLEGRO_EXAMPLES_EXE): examples/%$(EXE_SUFFIX): examples/%.o $(ALLEGRO_LIB_FILE_RELEASE) $(CORE_LIB_FILE_RELEASE)
+-	$(CC) $^ -o $@ $(LDFLAGS) $(LINK_ALLEGRO)
++	$(CC) $^ -o $@ $(LDFLAGS) $(LINK_ALLEGRO)
+ 
+ $(CORE_EXAMPLES_OBJ): examples/%.o: examples/%.c include/dumb.h
+ 	$(CC) -c $< -o $@ $(CFLAGS_RELEASE)
+diff -Naur dumb.orig/make/Makefile.inc dumb/make/Makefile.inc
+--- dumb.orig/make/Makefile.inc	2003-04-03 16:34:18.000000000 -0800
++++ dumb/make/Makefile.inc	2004-07-06 14:37:13.082037585 -0700
+@@ -10,8 +10,8 @@
+ # accurately, create a local copy of the current CFLAGS variable. This is
+ # necessary because Make doesn't expand variables in commands until they are
+ # executed.
+-$(CORE_LIB_FILE): CFLAGS := $(CFLAGS)
+-$(ALLEGRO_LIB_FILE): CFLAGS := $(CFLAGS)
++$(CORE_LIB_FILE): CFLAGS := $(CFLAGS) -fPIC -DPIC
++$(ALLEGRO_LIB_FILE): CFLAGS := $(CFLAGS) -fPIC -DPIC
+ 
+ 
+ $(OBJDIR)/%.o: src/core/%.c include/dumb.h include/internal/dumb.h
+@@ -28,7 +28,7 @@
+ 	$(CC) -c -o $@ $< $(CFLAGS) $(WFLAGS_ALLEGRO)
+ 
+ $(CORE_LIB_FILE): $(CORE_OBJECTS)
+-	$(AR) rs $@ $^
++	$(CC) -shared -o $@ $(LDFLAGS) -Wl,-shared,-soname,$(shell basename $@) $^ -lm
+ 
+ $(ALLEGRO_LIB_FILE): $(ALLEGRO_OBJECTS)
+-	$(AR) rs $@ $^
++	$(CC) -shared -o $@ -Llib/unix $(LDFLAGS) -Wl,-shared,-soname,$(shell basename $@) $^ -ldumb
diff --git a/community/dxpc/PKGBUILD b/community/dxpc/PKGBUILD
index 298989028..692b1ceba 100644
--- a/community/dxpc/PKGBUILD
+++ b/community/dxpc/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 58798 2011-11-18 14:38:36Z spupykin $
+# $Id: PKGBUILD 65134 2012-02-20 04:57:47Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=dxpc
 pkgver=3.9.2
-pkgrel=3
+pkgrel=4
 pkgdesc="Differential X Protocol Compressor"
 arch=('i686' 'x86_64')
 url="http://www.vigor.nu/dxpc/"
diff --git a/community/dynamite/PKGBUILD b/community/dynamite/PKGBUILD
index 9f8828426..f230ef92f 100644
--- a/community/dynamite/PKGBUILD
+++ b/community/dynamite/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 18120 2010-05-31 11:15:00Z spupykin $
+# $Id: PKGBUILD 65136 2012-02-20 04:58:34Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Zhukov Pavel <gelios@gmail.com>
 
 pkgname=dynamite
 pkgver=0.1.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Dynamite is a tool and library for decompressing data compressed with PKWARE Data Compression Library"
 arch=('i686' 'x86_64')
 url="http://synce.sourceforge.net/"
@@ -15,6 +15,6 @@ md5sums=('238bf243dba2166a2e0e141b18065235')
 build() {
   cd $srcdir/libdynamite-$pkgver
   ./configure --prefix=/usr
-  make || return 1
+  make
   make DESTDIR=$pkgdir install
 }
diff --git a/community/echat/PKGBUILD b/community/echat/PKGBUILD
index ff17db8f2..f78e322b4 100644
--- a/community/echat/PKGBUILD
+++ b/community/echat/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 7575 2010-01-08 02:33:57Z dgriffiths $
+# $Id: PKGBUILD 65144 2012-02-20 05:23:08Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=echat
 pkgver=0.04beta1
-pkgrel=2
+pkgrel=3
 pkgdesc="vypress compatible ncurses chat (can work without server)"
 arch=('i686' 'x86_64')
 url="http://echat.deep.perm.ru/"
@@ -22,8 +22,8 @@ md5sums=('dda3891d08f04dd266858380d404af15')
 
 build() {
   cd ${startdir}/src/$pkgname-${pkgver}
-  make || return 1
-  install -D -m 0755 echat $startdir/pkg/usr/bin/echat && \
-  install -D -m 0644 doc/echat.1 $startdir/pkg/usr/share/man/man1/echat.1 && \
+  make
+  install -D -m 0755 echat $startdir/pkg/usr/bin/echat
+  install -D -m 0644 doc/echat.1 $startdir/pkg/usr/share/man/man1/echat.1
   install -D -m 0644 doc/.echatrc.sample $startdir/pkg/usr/share/echat/dot.echatrc.sample
 }
diff --git a/community/etl/PKGBUILD b/community/etl/PKGBUILD
index 844fd7b56..a17e33636 100644
--- a/community/etl/PKGBUILD
+++ b/community/etl/PKGBUILD
@@ -1,8 +1,10 @@
+# $Id: PKGBUILD 65164 2012-02-20 05:28:07Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Franco Iacomella <yaco@gnu.org>
 
 pkgname=etl
 pkgver=0.04.14
-pkgrel=1
+pkgrel=2
 pkgdesc="VoriaETL: C++ STL complementory multiplatform template library"
 arch=(i686 x86_64)
 url="http://synfig.org"
@@ -10,17 +12,17 @@ license=('GPL2')
 depends=()
 conflicts=('synfig-etl')
 replaces=('synfig-etl')
-source=(http://arch.p5n.pp.ru/~sergej/dl/synfig-0.63.00.tar.gz)
-md5sums=('ea3633e9522ae89489519af351ba2443')
+#source=(http://arch.p5n.pp.ru/~sergej/dl/synfig-0.63.04.tar.gz)
+source=(http://downloads.sourceforge.net/project/synfig/ETL/$pkgver/ETL-$pkgver.tar.gz)
+md5sums=('7cb91905cbe07af327340aeba2226c06')
 
 build() {
-  cd $srcdir/synfig-fb5ba9c/ETL
-  [ -f configure ] || { libtoolize --ltdl --copy --force && autoreconf --install --force; }
+  cd $srcdir/ETL-$pkgver
   [ -f Makefile ] || ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd $srcdir/synfig-fb5ba9c/ETL
+  cd $srcdir/ETL-$pkgver
   make DESTDIR=$pkgdir install
 }
diff --git a/community/fbdump/PKGBUILD b/community/fbdump/PKGBUILD
index 1d26f0436..631bdd188 100644
--- a/community/fbdump/PKGBUILD
+++ b/community/fbdump/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 17537 2010-05-24 14:23:29Z spupykin $
+# $Id: PKGBUILD 65232 2012-02-20 12:22:39Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=fbdump
 pkgver=0.4.2
-pkgrel=2
+pkgrel=3
 pkgdesc="captures the contents of the visible portion of the Linux framebuffer to stdout"
 arch=('i686' 'x86_64')
 url="http://www.rcdrummond.net/fbdump/"
 license=("GPL")
-depends=(glibc)
+depends=()
 source=(http://www.rcdrummond.net/$pkgname/$pkgname-$pkgver.tar.gz)
 md5sums=('85ae97c0800a2caf2b04ad7764e3915b')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
   ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=$startdir/pkg install
+  make
+  make DESTDIR=$pkgdir install
 }
diff --git a/community/fbgetty/PKGBUILD b/community/fbgetty/PKGBUILD
index 67d344aa9..ee251e138 100644
--- a/community/fbgetty/PKGBUILD
+++ b/community/fbgetty/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 6846 2009-12-24 11:41:28Z spupykin $
+# $Id: PKGBUILD 65233 2012-02-20 12:23:20Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=fbgetty
 pkgver=0.1.698
-pkgrel=3
+pkgrel=4
 license=("GPL")
 pkgdesc="fbgetty is a console getty like mingetty, which supports framebuffers"
 arch=('i686' 'x86_64')
@@ -11,9 +11,9 @@ url="http://projects.meuh.org/fbgetty"
 source=('http://projects.meuh.org/fbgetty/downloads/fbgetty-'$pkgver'.tar.gz')
 md5sums=('1705bc0f8f1e03fe50d324ba84ac4e56')
 
-build ()
+build()
 {
-  cd $startdir/src/$pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
 
   ./configure --prefix=/usr --mandir=/usr/share/man
 
@@ -22,8 +22,7 @@ build ()
 > #include <stddef.h>
 EOF
 
-  make || return 1
-  make DESTDIR=$startdir/pkg install
-
+  make
+  make DESTDIR=$pkgdir install
   mv ${pkgdir}/usr/info ${pkgdir}/usr/share/
 }
diff --git a/community/fbpanel/PKGBUILD b/community/fbpanel/PKGBUILD
index 0a33d0f38..5edf5f2a1 100644
--- a/community/fbpanel/PKGBUILD
+++ b/community/fbpanel/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 21121 2010-07-14 15:52:45Z spupykin $
+# $Id: PKGBUILD 65166 2012-02-20 06:59:42Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jeff Mickey <jeff@archlinux.org>
 # Contributor: Torin Daniel <torindan@gmail.com>
 
 pkgname=fbpanel
 pkgver=6.1
-pkgrel=2
+pkgrel=3
 pkgdesc="NetWM compliant desktop panel"
 arch=('i686' 'x86_64')
 url="http://fbpanel.sourceforge.net/"
@@ -17,6 +17,7 @@ md5sums=('80ca0c64195b30587cfcb8c2cd9887a0')
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   ./configure --prefix=/usr
-  make || return 1
+  echo "LDFLAGSX += -lX11 -lm" >>config.mk
+  make
   make DESTDIR="$pkgdir/" install
 }
diff --git a/community/fillets-ng/PKGBUILD b/community/fillets-ng/PKGBUILD
index 07a38da89..9e4741e72 100644
--- a/community/fillets-ng/PKGBUILD
+++ b/community/fillets-ng/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 36474 2011-01-02 19:39:06Z jlichtblau $
+# $Id: PKGBUILD 65307 2012-02-20 20:47:47Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 
 pkgname=fillets-ng
-pkgver=1.0.0
+pkgver=1.0.1
 pkgrel=1
 pkgdesc="A port of the wonderful puzzle game Fish Fillets"
 url="http://fillets.sf.net/"
@@ -14,9 +14,9 @@ changelog=$pkgname.changelog
 source=(http://downloads.sourceforge.net/fillets/$pkgname-$pkgver.tar.gz \
         http://fillets.sourceforge.net/img/icon.png \
         $pkgname.desktop)
-md5sums=('276bb416d7f8bf9ef0969fd7a3c42d52'
-         '746a6f71ba1a6b5a918f04448b3db7eb'
-         '803617e630043e49807b380cd28803dc')
+sha256sums=('329a4d9515d60bebdb657d070824933b993b85864b9d3e302e6361accab992da'
+            'dec9d93c33b8e0f039e14228aad6be142109b0689bd216bcda2d91265500e2a0'
+            '6283237a582c90cb9734ee420e79cfccaa5c8c35aae9a19000202ceb96ad3254')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
diff --git a/community/fillets-ng/fillets-ng.changelog b/community/fillets-ng/fillets-ng.changelog
index 12807915a..385d01833 100644
--- a/community/fillets-ng/fillets-ng.changelog
+++ b/community/fillets-ng/fillets-ng.changelog
@@ -1,3 +1,6 @@
+2012-02-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* Update to major release 1.0.1
+
 2011-01-02 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* Update to major release 1.0.0
 
diff --git a/community/fldiff/PKGBUILD b/community/fldiff/PKGBUILD
index ab25a3240..0b973410a 100644
--- a/community/fldiff/PKGBUILD
+++ b/community/fldiff/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 51104 2011-07-05 09:00:11Z spupykin $
+# $Id: PKGBUILD 65186 2012-02-20 10:08:06Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: kevin <kevin@archlinux.org>
 # Contributor: iztok pizorn <pizorn@gmail.com>
 
 pkgname=fldiff
 pkgver=1.1
-pkgrel=6
+pkgrel=7
 pkgdesc="graphical diff program"
 arch=(i686 x86_64)
 url="http://www.easysw.com/~mike/fldiff/"
diff --git a/community/flightgear/PKGBUILD b/community/flightgear/PKGBUILD
index 439e47c9c..b1fb51b41 100644
--- a/community/flightgear/PKGBUILD
+++ b/community/flightgear/PKGBUILD
@@ -1,32 +1,35 @@
-# $Id: PKGBUILD 54030 2011-08-11 23:28:19Z spupykin $
+# $Id: PKGBUILD 65321 2012-02-21 01:33:57Z 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.4.0
-pkgrel=1
+pkgver=2.6.0
+pkgrel=3
 pkgdesc="An open-source, multi-platform flight simulator"
 arch=(i686 x86_64)
-depends=('simgear' 'libxmu' 'libxi' 'zlib' 'openscenegraph' 'subversion') # 'flightgear-data')
-makedepends=('boost')
+depends=('simgear' 'libxmu' 'libxi' 'zlib' 'openscenegraph' 'subversion')
+makedepends=('boost' 'cmake')
 license=("GPL")
 url="http://www.flightgear.org"
 options=('!makeflags')
-source=("$pkgname-$pkgver.tar.gz::https://gitorious.org/fg/flightgear/archive-tarball/release/$pkgver")
-md5sums=('eb8d1ed8b1de5f1ac7926c9d0c2f37f8')
+#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=('943f784f55c7e11ddce6082d2d1dbba4')
 
 build() {
-  cd $srcdir/fg-flightgear
-#  [ $NOEXTRACT -eq 1 ] || find -name \*.c\* -exec sed -i '1,2i#include <stdio.h>' {} \;
-#  [ $NOEXTRACT -eq 1 ] || find -name \*.c\* -exec sed -i '1,2i#include <GL/glu.h>' {} \;
-  [ -x configure ] || ./autogen.sh
-  [ -f Makefile ] || ./configure --prefix=/usr
+  cd $srcdir/flightgear-$pkgver
+  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib .
   make
+  sed -i 's|Exec=.*|Exec=fgfs --fg-root=/usr/share/flightgear/data|' package/flightgear.desktop
 }
 
 package() {
   depends=('simgear' 'libxmu' 'libxi' 'zlib' 'openscenegraph' 'subversion' 'flightgear-data')
-  cd $srcdir/fg-flightgear
+  cd $srcdir/flightgear-$pkgver
   make DESTDIR=$pkgdir install
+  install -Dm0644 package/flightgear.desktop $pkgdir//usr/share/applications/flightgear.desktop
+  install -Dm0644 package/RedHat/flightgear.48.png $pkgdir/usr/share/icons/flightgear.png
+  ln -sf flightgear $pkgdir/usr/share/FlightGear
 }
diff --git a/community/fonteditfs/PKGBUILD b/community/fonteditfs/PKGBUILD
index 53ab8d486..3e4cb610c 100644
--- a/community/fonteditfs/PKGBUILD
+++ b/community/fonteditfs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 58688 2011-11-17 15:43:36Z spupykin $
+# $Id: PKGBUILD 65192 2012-02-20 10:09:54Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=fonteditfs
 pkgver=1.2
-pkgrel=2
+pkgrel=3
 pkgdesc="console font editor"
 arch=('i686' 'x86_64')
 url="http://fonteditfs.sourceforge.net/"
diff --git a/community/freedroid/PKGBUILD b/community/freedroid/PKGBUILD
index 39c239357..ee93c4c3c 100644
--- a/community/freedroid/PKGBUILD
+++ b/community/freedroid/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 65021 2012-02-20 01:59:37Z spupykin $
+# $Id: PKGBUILD 65289 2012-02-20 15:20:33Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=freedroid
 pkgver=1.0.2
-pkgrel=6
+pkgrel=8
 pkgdesc="a clone of the classic game 'Paradroid' on Commodore 64"
 arch=('i686' 'x86_64')
 url="http://freedroid.sourceforge.net/"
@@ -18,13 +18,14 @@ md5sums=('585a65f61c2cd308ab45d5c514f695dc'
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --mandir=/usr/share
+  ./configure --prefix=/usr --mandir=/usr/share/man
   make
   make DESTDIR=$pkgdir install
   install -Dm0644 $srcdir/paraicon.png $pkgdir/usr/share/icons/paraicon.png
   install -Dm0644 $srcdir/freedroid.desktop $pkgdir/usr/share/applications/freedroid.desktop
 
   rm -rf $pkgdir/usr/share/freedroid/mac-osx
+  rm -rf $pkgdir/usr/share/freedroid/freedroid.6
   find $pkgdir/usr/share/freedroid -type f -name Makefile -exec rm -f {} \;
   find $pkgdir/usr/share/freedroid -type f -name Makefile.in -exec rm -f {} \;
   find $pkgdir/usr/share/freedroid -type f -name Makefile.am -exec rm -f {} \;
diff --git a/community/freehdl/PKGBUILD b/community/freehdl/PKGBUILD
index d0ca0d067..b96294284 100644
--- a/community/freehdl/PKGBUILD
+++ b/community/freehdl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 43045 2011-03-23 21:44:42Z spupykin $
+# $Id: PKGBUILD 65198 2012-02-20 10:11:43Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Neil Darlow <neil@darlow.co.uk>
 # Contributor: Jens Maucher <defcon@archlinux.us>
@@ -6,7 +6,7 @@
 pkgname=freehdl
 pkgver=0.0.8
 _qucsver=0.0.16
-pkgrel=1
+pkgrel=2
 pkgdesc='An open-source (C++ generating) VHDL simulator'
 arch=('i686' 'x86_64')
 url='http://freehdl.seul.org'
diff --git a/community/freeradius-client/PKGBUILD b/community/freeradius-client/PKGBUILD
index fb5feaa16..b7f90a711 100644
--- a/community/freeradius-client/PKGBUILD
+++ b/community/freeradius-client/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 18123 2010-05-31 11:15:35Z spupykin $
+# $Id: PKGBUILD 65200 2012-02-20 10:12:30Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Kalidarn
 
 pkgname=freeradius-client
 pkgver=1.1.6
-pkgrel=3
+pkgrel=4
 pkgdesc="FreeRADIUS Client Software"
 arch=('i686' 'x86_64')
 url="http://wiki.freeradius.org/Radiusclient"
@@ -16,12 +16,9 @@ md5sums=('2e46564e450ae13aedb70dc133b158ac')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-
-  install -D -m0644 COPYRIGHT $pkgdir/usr/share/licenses/$pkgname/license || return 1
-
   ./configure --prefix=/usr --sysconfdir=/etc
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
-
-  mv $pkgdir/etc/radiusclient $startdir/pkg/etc/radiusclient.default
+  make
+  make DESTDIR=$pkgdir install
+  install -D -m0644 COPYRIGHT $pkgdir/usr/share/licenses/$pkgname/license
+  mv $pkgdir/etc/radiusclient $pkgdir/etc/radiusclient.default
 }
diff --git a/community/freetalk/PKGBUILD b/community/freetalk/PKGBUILD
index ce4fb138d..1f0a93f26 100644
--- a/community/freetalk/PKGBUILD
+++ b/community/freetalk/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 13426 2010-03-23 12:00:40Z allan $
+# $Id: PKGBUILD 65202 2012-02-20 10:13:19Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=freetalk
 pkgver=3.2
-pkgrel=4
+pkgrel=5
 pkgdesc="A console based Jabber client"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/freetalk"
@@ -15,7 +15,7 @@ source=(http://savannah.gnu.org/download/freetalk/freetalk-$pkgver.tar.gz)
 md5sums=('ab09bd07dde158551f151d281b14642c')
 
 build() {
-  cd $startdir/src/freetalk-$pkgver
+  cd $srcdir/freetalk-$pkgver
 
   ./configure --prefix=/usr
 
@@ -29,8 +29,7 @@ build() {
 > 	}
 EOF
 
-  make || return 1
-  make DESTDIR=$startdir/pkg install || return 1
-
+  make
+  make DESTDIR=$pkgdir install
   rm $pkgdir/usr/share/info/dir
 }
diff --git a/community/frei0r-plugins/PKGBUILD b/community/frei0r-plugins/PKGBUILD
index 3dec10ae0..93a8d19f6 100644
--- a/community/frei0r-plugins/PKGBUILD
+++ b/community/frei0r-plugins/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 51938 2011-07-18 09:49:20Z spupykin $
+# $Id: PKGBUILD 65204 2012-02-20 10:14:02Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=frei0r-plugins
 pkgver=1.3
-pkgrel=2
+pkgrel=3
 pkgdesc="frei0r is a minimalistic plugin API for video sources and filters."
 arch=(i686 x86_64)
 url="http://www.piksel.org/frei0r"
diff --git a/community/kdenlive/PKGBUILD b/community/kdenlive/PKGBUILD
index c91e32c6b..4d7b4b3a0 100644
--- a/community/kdenlive/PKGBUILD
+++ b/community/kdenlive/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 60345 2011-12-11 20:16:27Z spupykin $
+# $Id: PKGBUILD 65323 2012-02-21 01:34:56Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Zuf <kontakt.zuf@gmail.com>
 # Contributor: Darwin Bautista <djclue917@gmail.com>
 
 pkgname=kdenlive
 pkgver=0.8.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A non-linear video editor for Linux"
 arch=('i686' 'x86_64')
 url="http://www.kdenlive.org/"
diff --git a/community/libwebp/PKGBUILD b/community/libwebp/PKGBUILD
new file mode 100644
index 000000000..eb5dbca25
--- /dev/null
+++ b/community/libwebp/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 61589 2012-01-03 23:37:49Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Jon Nordby <jononor@gmail.com>
+
+pkgname=libwebp
+pkgver=0.1.3
+pkgrel=2
+pkgdesc="WebP library and conversion tools"
+arch=('x86_64' 'i686')
+url="http://code.google.com/intl/en/speed/webp/"
+license=('BSD')
+depends=('libpng' 'libjpeg')
+options=('!libtool')
+source=("http://webp.googlecode.com/files/$pkgname-$pkgver.tar.gz")
+sha256sums=('40b18456e39b2822311b0ea161d6f09507cf5e8e937b02b9be3ee994ded67aba')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir/" install
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/mathomatic/PKGBUILD b/community/mathomatic/PKGBUILD
index 915feb40a..dfb6a645f 100755
--- a/community/mathomatic/PKGBUILD
+++ b/community/mathomatic/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 63855 2012-02-06 09:07:08Z ttopper $
+# $Id: PKGBUILD 65305 2012-02-20 20:13:42Z ttopper $
 # Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Maintainer:  Thorsten Töpper <atsutane-tu@freethoughts.de>
 
 pkgname=mathomatic
-pkgver=15.7.3
+pkgver=15.8.0
 pkgrel=1
 pkgdesc="General purpose Computer Algebra System written in C"
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ optdepends=('python2: for running /usr/share/doc/mathomatic/factorial/factorial'
             'm4: for complex operations using the matho script' 
             'gnuplot: for plotting')
 source=(http://mathomatic.org/$pkgname-$pkgver.tar.bz2)
-md5sums=('1d90afc833a8d11339aa2a51794a4871')
+md5sums=('8a9b136e2b38e9712b76b5ffeb6e209f')
 
 build() {
   cd "$srcdir"/$pkgname-$pkgver
diff --git a/community/minidlna/PKGBUILD b/community/minidlna/PKGBUILD
index 77d8b7f48..c78a820a1 100644
--- a/community/minidlna/PKGBUILD
+++ b/community/minidlna/PKGBUILD
@@ -1,12 +1,13 @@
-# $Id: PKGBUILD 62999 2012-01-30 10:47:05Z spupykin $
+# $Id: PKGBUILD 65325 2012-02-21 01:35:56Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:Biginoz < biginoz AT free point fr>
 # Contributor: Ignacio Galmarino <igalmarino@gmail.com>
 # Contributor: Matthias Sobczyk <matthias.sobczyk@googlemail.com>
+# Contributor: Kamil Kaminski <kyle@kkaminsk.com>
 
 pkgname=minidlna
-pkgver=1.0.23
-pkgrel=2
+pkgver=1.0.24
+pkgrel=1
 pkgdesc="A DLNA/UPnP-AV Media server (aka ReadyDLNA)"
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/minidlna/"
@@ -18,8 +19,8 @@ backup=('etc/minidlna.conf'
 changelog=changelog
 source=(http://downloads.sourceforge.net/minidlna/minidlna_${pkgver}_src.tar.gz
         minidlna.rc)
-md5sums=('409a36830a9ac2aaddfaff4c8b90a40f'
-         'b64b8b749f1c23b3f1a2ee6d6ded07fd')
+md5sums=('be9b4c91e3fcde592dc3f9828098ca0f'
+         '246bdfb401f26d2374ba64034adb1091')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -34,4 +35,5 @@ package() {
   install -Dm755 ${srcdir}/minidlna.rc ${pkgdir}/etc/rc.d/minidlna
   mkdir -p $pkgdir/etc/conf.d
   echo 'MINIDLNA_USER=nobody' >$pkgdir/etc/conf.d/minidlna
+  echo 'MINIDLNA_OPTS=""' >>$pkgdir/etc/conf.d/minidlna
 }
diff --git a/community/minidlna/minidlna.rc b/community/minidlna/minidlna.rc
index 6e6f88f35..5a9d7b51c 100755
--- a/community/minidlna/minidlna.rc
+++ b/community/minidlna/minidlna.rc
@@ -17,7 +17,7 @@ case "$1" in
     if [[ -z "$PID" ]]; then
       rm -f /var/run/$daemon_name.pid
       touch /var/run/$daemon_name.pid && chown $MINIDLNA_USER:$MINIDLNA_USER /var/run/$daemon_name.pid
-      su -s /bin/sh -l -c /usr/sbin/minidlna - $MINIDLNA_USER
+      su -s /bin/sh -l -c "/usr/sbin/minidlna ${MINIDLNA_OPTS} $2" - $MINIDLNA_USER
       if [[ $? -gt 0 ]]; then
         stat_fail
         exit 1
@@ -61,6 +61,12 @@ case "$1" in
     $0 start
     ;;
 
+  rescan)
+    $0 stop
+    sleep 1
+    $0 start -R
+    ;;
+
   *)
     echo "usage: $0 {start|stop|restart|clean}"
 esac
diff --git a/community/mlt/PKGBUILD b/community/mlt/PKGBUILD
index e9b0613d3..bb3e9d023 100644
--- a/community/mlt/PKGBUILD
+++ b/community/mlt/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 58409 2011-11-12 17:17:58Z ibiru $
+# $Id: PKGBUILD 65327 2012-02-21 01:36:41Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Fabian Schoelzel <myfirstname.mylastname@googlemail.com>
 # Contributor: funkyou <spamopfer@nickname.berlin.de>
@@ -7,7 +7,7 @@
 
 pkgbase=mlt
 pkgname=('mlt' 'mlt-python-bindings')
-pkgver=0.7.6
+pkgver=0.7.8
 pkgrel=1
 pkgdesc="An open source multimedia framework"
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ license=('GPL')
 makedepends=('sdl_image' 'libsamplerate' 'libdv' 'qt' 'sox' 'libxml2' 'gtk2' 'ffmpeg'
 	     'frei0r-plugins' 'swig' 'python2' "jack" "ladspa")
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('105969a63339da2f8ce4ddce1652c9e7')
+md5sums=('4bdce45d832e065ac4c8c8ca56765e1d')
 
 build() {
   # mlt
diff --git a/community/netsurf/PKGBUILD b/community/netsurf/PKGBUILD
index 618c5a76b..40defac69 100644
--- a/community/netsurf/PKGBUILD
+++ b/community/netsurf/PKGBUILD
@@ -1,16 +1,17 @@
-# $Id: PKGBUILD 63678 2012-02-05 12:05:59Z ibiru $
+# $Id: PKGBUILD 65206 2012-02-20 11:09:55Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Paulo Matias <matiasΘarchlinux-br·org>
 # Contributor: Georgij Kondratjev <smpuj@bk.ru>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+
 pkgname=netsurf
 pkgver=2.8
-pkgrel=3
+pkgrel=4
 pkgdesc="Lightweight and fast web browser"
 arch=('x86_64' 'i686')
 url="http://www.netsurf-browser.org/"
 license=('GPL')
-depends=('libmng' 'curl' 'libglade' 'librsvg' 'desktop-file-utils' 'libnsbmp' 'libnsgif' 'hubbub' 'libcss' 'hubbub')
+depends=('libmng' 'curl' 'libglade' 'librsvg' 'desktop-file-utils' 'libnsbmp' 'libnsgif' 'hubbub' 'libcss' 'hubbub' 'libwebp')
 makedepends=('re2c' 'lcms')
 provides=('netsurf')
 conflicts=('netsurf')
@@ -18,16 +19,16 @@ install=netsurf.install
 source=("netsurf.png::http://ubuntu.allmyapps.com/data/n/e/netsurf-netsurf-web-browser/icon_48x48_netsurf.png"
         "http://www.netsurf-browser.org/downloads/releases/$pkgname-$pkgver-src.tar.gz"
         "$pkgname.desktop")
-md5sums=('4f28912e5df4b826b819e175265bcc9c'
-         '49c41f281f3e9ca28a24da505fad2e3a'
-         '85e0af265e77607596fd90db9ac707ad')
+sha256sums=('f0dbcc5d80bf03d706aa8b28a322aa7f169a40813848c2d1505691f6e2c7ef00'
+            '09f3aa38f26248a410481aaf125811d6af4c8535725bec950e75af37ccd0aad2'
+            '5adf656bcd8d247ceb2808d8079cdc59155b8e4cf8569e050bb2730ad9783347')
 
 build() {
   cd "$srcdir/$pkgname"
 
   sed 's:libpng:libpng15:' -i gtk/Makefile.target
   sed 's:libpng:libpng15:' -i monkey/Makefile.target
-  make PREFIX=/usr TARGET=gtk
+  make PREFIX=/usr TARGET=gtk NETSURF_USE_WEBP=YES
 }
 
 package() {
diff --git a/community/netsurf/netsurf.install b/community/netsurf/netsurf.install
index 966f361ea..ef816a666 100644
--- a/community/netsurf/netsurf.install
+++ b/community/netsurf/netsurf.install
@@ -1,9 +1,8 @@
 post_upgrade() {
-  echo "Updating icon cache"
   gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor
-  echo "Updating mime entries"
   update-desktop-database -q
 }
+
 post_install() {
   post_upgrade
 }
diff --git a/community/pygoocanvas/PKGBUILD b/community/pygoocanvas/PKGBUILD
index 3f5affbc8..bfd198b85 100644
--- a/community/pygoocanvas/PKGBUILD
+++ b/community/pygoocanvas/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 56152 2011-10-02 11:46:05Z ibiru $
+# $Id: PKGBUILD 65296 2012-02-20 19:48:25Z jelle $
 # Maintainer: Douglas Soares de Andrade <dsandrade@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=pygoocanvas
 pkgver=0.14.1
-pkgrel=4
+pkgrel=5
 pkgdesc="GooCanvas python bindings"
 arch=('i686' 'x86_64')
 url="http://developer.berlios.de/projects/pygoocanvas"
diff --git a/community/python2-pyopencl/PKGBUILD b/community/python2-pyopencl/PKGBUILD
index 0e5477a4a..6dbdfcbee 100644
--- a/community/python2-pyopencl/PKGBUILD
+++ b/community/python2-pyopencl/PKGBUILD
@@ -1,21 +1,18 @@
-# $Id: PKGBUILD 61157 2011-12-22 18:02:54Z ibiru $
+# $Id: PKGBUILD 65311 2012-02-20 22:07:36Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 
 pkgname=python2-pyopencl
-pkgver=2011.1.2
-pkgrel=4
+pkgver=2011.2
+pkgrel=1
 pkgdesc="A complete, object-oriented language binding of OpenCL to Python"
 arch=('i686' 'x86_64')
 url="http://mathema.tician.de/software/pyopencl"
 license=('custom')
 depends=('python2' 'python2-numpy' 'python2-mako' 'python2-pytools' 'libcl' 'opencl-headers' 'mesa')
 makedepends=('ctags' 'python2-distribute')
-provides=('pyopencl=${pkgver}')
-replaces=('pyopencl')
-conflicts=('pyopencl')
 source=("http://pypi.python.org/packages/source/p/pyopencl/pyopencl-${pkgver}.tar.gz"
         'LICENSE.txt')
-sha1sums=('5ecc476b86317ed065c75c1d8efb2a53d1d8f075'
+sha1sums=('6db28dcb896c9fef7c1c361f69ebfb96050d2977'
           '2e6966b3d9b15603ce2c3ff79eeadd63c5d066b7')
 
 build() {
diff --git a/community/simgear/PKGBUILD b/community/simgear/PKGBUILD
index 4db428d90..c9f376a5a 100644
--- a/community/simgear/PKGBUILD
+++ b/community/simgear/PKGBUILD
@@ -1,27 +1,26 @@
-# $Id: PKGBUILD 59088 2011-11-21 09:41:13Z spupykin $
+# $Id: PKGBUILD 65170 2012-02-20 07:11:09Z 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.4.0
+pkgver=2.6.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')
-makedepends=('boost')
+makedepends=('boost' 'cmake')
 license=("GPL")
 #url="http://www.simgear.org"
 url="https://gitorious.org/fg"
 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")
-md5sums=('31f4ce7254a43229f050a8f86d6966ef')
+md5sums=('24a368754d10e50d7f3ec00f93891a89')
 
 build() {
   cd $srcdir/simgear-$pkgver
-  [ -x configure ] || ./autogen.sh
-  [ -f Makefile ] || ./configure --prefix=/usr
+  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib .
   make
 }
 
diff --git a/community/subtle/PKGBUILD b/community/subtle/PKGBUILD
index 0173189be..533de4e94 100644
--- a/community/subtle/PKGBUILD
+++ b/community/subtle/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 58177 2011-11-08 07:15:39Z angvp $
+# $Id: PKGBUILD 65317 2012-02-20 23:41:01Z angvp $
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: unexist <unexist@dorfelite.net>
 # Past Contributors: Abakus <java5@arcor.de>, TDY <tdy@gmx.com>, Xilon <xilonmu@gmail.com>
 pkgname=subtle
 pkgver=0.10.3008
-pkgrel=2
+pkgrel=3
 pkgdesc="A grid-based manual tiling window manager with a strong focus on easy but customizable look and feel"
 arch=("i686" "x86_64")
 url="http://subtle.subforge.org"
 license=("GPL")
-depends=("libx11" "ruby")
+depends=("libx11" "ruby" "libxft" "libxpm" "libxrandr" "libxft" "libxpm" "libxinerama")
 makedepends=("ruby" "pkg-config" "libxinerama" "libxrandr" "libxft" "libxpm")
 provides=("subtle")
 conflicts=("subtle-hg")
diff --git a/community/supertuxkart/PKGBUILD b/community/supertuxkart/PKGBUILD
index db0f5a677..19fb3bf3c 100644
--- a/community/supertuxkart/PKGBUILD
+++ b/community/supertuxkart/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 64571 2012-02-16 20:13:20Z svenstaro $
+# $Id: PKGBUILD 65315 2012-02-20 23:23:12Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Daenyth <Daenyth+Arch [AT] gmail [DOT] com>
 # Contributor: Allan McRae <allan@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=supertuxkart
 pkgver=0.7.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A kart racing game featuring Tux and his friends"
 arch=('i686' 'x86_64')
 url="http://supertuxkart.sourceforge.net/"
@@ -50,8 +50,7 @@ package() {
   install -Dm755 ${pkgdir}/usr/games/supertuxkart ${pkgdir}/usr/bin/supertuxkart
   rm -r ${pkgdir}/usr/games
 
-  sed -i "s#usr/supertuxkart#usr/bin/supertuxkart#" \
-    ${pkgdir}/usr/share/applications/supertuxkart.desktop
+  sed -i "s#usr/games/supertuxkart#usr/bin/supertuxkart#" ${pkgdir}/usr/share/applications/supertuxkart.desktop
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/t1utils/PKGBUILD b/community/t1utils/PKGBUILD
index 73d8e0204..9c3141bb7 100644
--- a/community/t1utils/PKGBUILD
+++ b/community/t1utils/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 43579 2011-03-27 20:40:19Z spupykin $
+# $Id: PKGBUILD 65395 2012-02-21 03:23:56Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Simo Leone <neotuli@gmail.com>
 
 pkgname=t1utils
 pkgver=1.36
-pkgrel=1
+pkgrel=2
 pkgdesc="A collection of simple Type 1 font manipulation programs"
 arch=('i686' 'x86_64')
 url="http://www.lcdf.org/~eddietwo/type/#t1utils"
@@ -18,7 +18,6 @@ md5sums=('f580e78a38807bce0242b63b5da3a572'
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   ./configure --prefix=/usr
-#  sed -i 's|getline|xgetline|' t1asm.c
   make
   make DESTDIR="$pkgdir" install
   install -D -m644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
diff --git a/community/tinycdb/PKGBUILD b/community/tinycdb/PKGBUILD
index a56b8dc9d..a405c0b48 100644
--- a/community/tinycdb/PKGBUILD
+++ b/community/tinycdb/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 35507 2010-12-21 10:14:46Z spupykin $
+# $Id: PKGBUILD 65399 2012-02-21 03:25:20Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=tinycdb
 pkgver=0.77
-pkgrel=3
+pkgrel=4
 pkgdesc="very fast and simple package for creating and reading constant data bases"
 arch=(i686 x86_64)
 url="http://www.corpit.ru/mjt/tinycdb.html"
diff --git a/community/tix/PKGBUILD b/community/tix/PKGBUILD
index e84b40f36..f48e1233c 100644
--- a/community/tix/PKGBUILD
+++ b/community/tix/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 62313 2012-01-19 07:59:07Z arodseth $
+# $Id: PKGBUILD 65401 2012-02-21 03:26:02Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Brice Méalier <mealier_brice@yahoo.fr>
 
 pkgname=tix
 pkgver=8.4.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Tk Interface eXtension, a powerful set of user interface components"
 arch=(i686 'x86_64')
 url="http://tix.sourceforge.net/"
@@ -23,24 +23,24 @@ build() {
   export CFLAGS="$CFLAGS -DERR_IN_PROGRESS=2"
 
   ./configure --prefix=/usr
-  make 
-  make DESTDIR=$pkgdir install 
+  make
+  make DESTDIR=$pkgdir install
   # move things around
 
-  install -m755 tools/tixindex $pkgdir/usr/bin/tixindex && \
-  rm -rf $pkgdir/usr/lib/Tix8.4/html && \
-  rm -f $pkgdir/usr/lib/Tix8.4/{README.txt,license.terms} && \
-  ln -s Tix$pkgver/libTix$pkgver.so $pkgdir/usr/lib/libTix$pkgver.so 
+  install -m755 tools/tixindex $pkgdir/usr/bin/tixindex
+  rm -rf $pkgdir/usr/lib/Tix8.4/html
+  rm -f $pkgdir/usr/lib/Tix8.4/{README.txt,license.terms}
+  ln -s Tix$pkgver/libTix$pkgver.so $pkgdir/usr/lib/libTix$pkgver.so
 
-  mkdir -p $pkgdir/usr/share/man/man1 && \
-  mkdir -p $pkgdir/usr/share/man/man3 && \
-  cp -p man/tixwish.1 $pkgdir/usr/share/man/man1 
+  mkdir -p $pkgdir/usr/share/man/man1
+  mkdir -p $pkgdir/usr/share/man/man3
+  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 
+  for i in *.n; do
+	  cp -p $i $pkgdir/usr/share/man/man3/${i%n}3
   done
 
-  mkdir -p $pkgdir/usr/share/licenses/tix && \
+  mkdir -p $pkgdir/usr/share/licenses/tix
   cp $srcdir/Tix$pkgver/license.terms  $pkgdir/usr/share/licenses/tix/
 }
 
diff --git a/community/tksystray/PKGBUILD b/community/tksystray/PKGBUILD
index a5ee12746..b55b0a68d 100644
--- a/community/tksystray/PKGBUILD
+++ b/community/tksystray/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 59200 2011-11-21 14:59:42Z spupykin $
+# $Id: PKGBUILD 65405 2012-02-21 03:27:16Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Pavel Borzenkov <pavel.borzenkov@gmail.com>
 
 pkgname=tksystray
 pkgver=0.1
-pkgrel=4
+pkgrel=5
 pkgdesc="tksystray is compatible with freedesktop.org standarts systray for Tk"
 arch=('i686' 'x86_64')
 url="http://tkabber.jabber.ru/tksystray"
diff --git a/community/tktheme/PKGBUILD b/community/tktheme/PKGBUILD
index 910ce9557..b9eb32549 100644
--- a/community/tktheme/PKGBUILD
+++ b/community/tktheme/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 20038 2010-07-02 09:20:20Z spupykin $
+# $Id: PKGBUILD 65407 2012-02-21 03:28:00Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: slubman <slubman@slubman.net>
 
 pkgname=tktheme
 pkgver=0.23
-pkgrel=6
+pkgrel=7
 pkgdesc="A library to allow Tkabber docking in the system tray."
 arch=('i686' 'x86_64')
 depends=('tk' 'libxpm' 'libxmu')
@@ -16,9 +16,9 @@ md5sums=('121c335e3b3764cbd04eea68b6a66dd3')
 build() {
   cd $srcdir/Tk_Theme-23
   tclsh configure
-  make || return 1
-  mkdir -p $pkgdir/usr/lib/tktheme && \
-  cp theme.so $pkgdir/usr/lib/tktheme/ && \
-  cp pkgIndex.tcl $pkgdir/usr/lib/tktheme/ && \
+  make
+  mkdir -p $pkgdir/usr/lib/tktheme
+  cp theme.so $pkgdir/usr/lib/tktheme/
+  cp pkgIndex.tcl $pkgdir/usr/lib/tktheme/
   sed -i 's|ifneeded Tk_Theme 20|ifneeded Tk_Theme 23|' $pkgdir/usr/lib/tktheme/pkgIndex.tcl
 }
diff --git a/community/toolame/PKGBUILD b/community/toolame/PKGBUILD
index 0f9fd76e3..48e2f25fc 100644
--- a/community/toolame/PKGBUILD
+++ b/community/toolame/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 21306 2010-07-15 21:41:30Z tdziedzic $
+# $Id: PKGBUILD 65411 2012-02-21 03:29:11Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Victor Martinez Romanos <vmromanos@gmail.com>
 
 pkgname=toolame
 pkgver=02l
-pkgrel=8
+pkgrel=9
 pkgdesc="An optimized mpeg 1/2 layer 2 audio encoder"
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/toolame"
@@ -20,6 +20,6 @@ build() {
   cd $srcdir/$pkgname-$pkgver
   patch -p0 < ../toolame-02l.patch
   [ "$CARCH" = "x86_64" ] && sed -i "s|-march=i686|-march=x86-64|g" Makefile
-  make || return 1
+  make
   install -D -m755 toolame $pkgdir/usr/bin/toolame
 }
diff --git a/community/torch/PKGBUILD b/community/torch/PKGBUILD
index c9691a6f6..6ac1ae427 100644
--- a/community/torch/PKGBUILD
+++ b/community/torch/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 21793 2010-07-17 10:25:22Z spupykin $
+# $Id: PKGBUILD 65413 2012-02-21 03:29:54Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=torch
 pkgver=3.1
-pkgrel=2
+pkgrel=3
 pkgdesc="State of the art machine learning library"
 arch=(i686 x86_64)
 url="http://packages.debian.org/source/lenny/torch3"
@@ -20,14 +20,14 @@ build() {
   [ $NOEXTRACT -eq 1 ] || cat $srcdir/torch3_$pkgver-2.diff | patch -p1
   [ $NOEXTRACT -eq 1 ] || make depend
 
-  make || return 1
+  make
 
   mkdir -p $pkgdir/usr/{include/torch,lib}
 
   for i in core convolutions datasets decoder distributions gradients kernels matrix nonparametrics speech; do
-    install -D -m0644 $i/*.h $pkgdir/usr/include/torch/ || return 1
+    install -D -m0644 $i/*.h $pkgdir/usr/include/torch/
   done
 
-  install -D -m0755 lib/*.so* $pkgdir/usr/lib/ && \
+  install -D -m0755 lib/*.so* $pkgdir/usr/lib/
   install -D -m0644 lib/*.a $pkgdir/usr/lib/
 }
diff --git a/community/trayion/PKGBUILD b/community/trayion/PKGBUILD
index 693b2095c..f09722bfc 100644
--- a/community/trayion/PKGBUILD
+++ b/community/trayion/PKGBUILD
@@ -1,6 +1,9 @@
+# $Id: PKGBUILD 65415 2012-02-21 03:30:41Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+
 pkgname="trayion"
 pkgver="0.1.2"
-pkgrel=1
+pkgrel=2
 pkgdesc="FreeDesktop trayicon area for Ion3"
 url="http://code.google.com/p/trayion"
 arch=('i686' 'x86_64')
@@ -13,6 +16,6 @@ md5sums=('6e1123121ed83bd7f9759a71d4ef9307')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  make || return 1
+  make
   make prefix="$pkgdir/usr" install
 }
diff --git a/community/tuxguitar/PKGBUILD b/community/tuxguitar/PKGBUILD
index c5f297b2c..3da24b09c 100644
--- a/community/tuxguitar/PKGBUILD
+++ b/community/tuxguitar/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 59148 2011-11-21 12:35:13Z spupykin $
+# $Id: PKGBUILD 65417 2012-02-21 03:31:38Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: |AhIoRoS| < ahioros@gmail.com >
 
 pkgname=tuxguitar
 pkgver=1.2
-pkgrel=4
+pkgrel=5
 _jdk=java-7-openjdk
 pkgdesc="multitrack guitar tablature editor and player"
 arch=('i686' 'x86_64')
diff --git a/community/tuxguitar/tuxguitar.install b/community/tuxguitar/tuxguitar.install
index 50cd956c2..9069058c8 100644
--- a/community/tuxguitar/tuxguitar.install
+++ b/community/tuxguitar/tuxguitar.install
@@ -9,4 +9,3 @@ post_upgrade() {
   [ -x `which update-desktop-database` ] && update-desktop-database
   /bin/true
 }
-
diff --git a/community/twin/PKGBUILD b/community/twin/PKGBUILD
index 9ec06bf34..24933e71a 100644
--- a/community/twin/PKGBUILD
+++ b/community/twin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 59233 2011-11-21 15:28:15Z spupykin $
+# $Id: PKGBUILD 65419 2012-02-21 03:32:30Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de>
 
 pkgname=twin
 pkgver=0.6.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A text-mode window environment"
 arch=('i686' 'x86_64')
 url="http://linuz.sns.it/~max/twin/"
diff --git a/community/ude/PKGBUILD b/community/ude/PKGBUILD
index 914052e4b..c878df59e 100644
--- a/community/ude/PKGBUILD
+++ b/community/ude/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 50701 2011-06-29 17:35:55Z spupykin $
+# $Id: PKGBUILD 65333 2012-02-21 02:10:03Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: eric <eric@archlinux.org>
 # Contributor: dorphell <dorphell@gmx.net>
 
 pkgname=ude
 pkgver=0.2.10a
-pkgrel=2
+pkgrel=4
 pkgdesc="Unix Desktop Environment is a GUI desktop environment"
 arch=('i686' 'x86_64')
 license=('GPL')
diff --git a/community/ultimate-ircd/PKGBUILD b/community/ultimate-ircd/PKGBUILD
index 98c88e7a7..f65652a7f 100644
--- a/community/ultimate-ircd/PKGBUILD
+++ b/community/ultimate-ircd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 44022 2011-04-01 16:49:24Z spupykin $
+# $Id: PKGBUILD 65335 2012-02-21 02:11:06Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=ultimate-ircd
 pkgver=3.0.2
-pkgrel=3
+pkgrel=5
 pkgdesc="ultimate irc server"
 arch=(i686 x86_64)
 url="http://www.shadow-realm.org/"
@@ -15,8 +15,8 @@ conflicts=(ircd)
 provides=(ircd)
 backup=()
 install=ircd.install
-source=(http://downloads.sourceforge.net/sourceforge/ultimate/Ultimate$pkgver.tar.bz2 \
-    ultimate-ircd \
+source=(http://downloads.sourceforge.net/sourceforge/ultimate/Ultimate$pkgver.tar.bz2
+    ultimate-ircd
     conf-fix.patch)
 md5sums=('8bc14b97d22a3ce3415cc0540ae459f6'
          'cf6ab14d8dd8805342b70a9beb01c9af'
diff --git a/community/unclutter/PKGBUILD b/community/unclutter/PKGBUILD
index fc8f40d7b..263708422 100644
--- a/community/unclutter/PKGBUILD
+++ b/community/unclutter/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 20014 2010-07-01 16:52:19Z spupykin $
+# $Id: PKGBUILD 65341 2012-02-21 02:13:14Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Callan Barrett <wizzomafizzo@gmail.com>
@@ -6,7 +6,7 @@
 
 pkgname=unclutter
 pkgver=8
-pkgrel=6
+pkgrel=8
 pkgdesc="A small program for hiding the mouse cursor"
 url="http://ftp.x.org/contrib/utilities/unclutter-8.README"
 arch=('i686' 'x86_64')
@@ -19,7 +19,7 @@ md5sums=('83d7a6498b69078f869378f801b6a84b')
 build() {
   cd ${srcdir}/$pkgname
   xmkmf -a
-  make || return 1
+  make
   make DESTDIR=${pkgdir} install
   install -D -m 644 unclutter.man ${pkgdir}/usr/share/man/man1/unclutter.1
 }
diff --git a/community/uniconvertor/PKGBUILD b/community/uniconvertor/PKGBUILD
index 2196cd9aa..89351743f 100644
--- a/community/uniconvertor/PKGBUILD
+++ b/community/uniconvertor/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 26525 2010-09-15 22:29:59Z schuay $
+# $Id: PKGBUILD 65343 2012-02-21 02:13:57Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Roberto Alsina <ralsina@kde.org>
 
 pkgname=uniconvertor
 pkgver=1.1.5
-pkgrel=3
+pkgrel=5
 pkgdesc="A universal vector graphics translator using sK1 engine."
 arch=('i686' 'x86_64')
 url="http://sk1project.org/modules.php?name=Products&product=uniconvertor"
diff --git a/community/unifdef/PKGBUILD b/community/unifdef/PKGBUILD
index b25062afc..6306f4c92 100644
--- a/community/unifdef/PKGBUILD
+++ b/community/unifdef/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 53255 2011-08-02 14:56:26Z spupykin $
+# $Id: PKGBUILD 65345 2012-02-21 02:14:45Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=unifdef
 pkgver=2.6
-pkgrel=1
+pkgrel=3
 pkgdesc="Remove #ifdef'ed lines"
 arch=(i686 x86_64)
 url="http://dotat.at/prog/unifdef/"
diff --git a/community/units/PKGBUILD b/community/units/PKGBUILD
index 7cfab5582..400bfd524 100644
--- a/community/units/PKGBUILD
+++ b/community/units/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 40288 2011-02-22 18:18:55Z spupykin $
+# $Id: PKGBUILD 65347 2012-02-21 02:15:35Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jeff Mickey <jeff@archlinux.org>
 # Contributor: Steve Sansom <snsansom@gmail.com>
 
 pkgname=units
 pkgver=1.88
-pkgrel=2
+pkgrel=4
 pkgdesc="converts between different units"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/units/units.html"
diff --git a/community/unpaper/PKGBUILD b/community/unpaper/PKGBUILD
index 0a854130e..e9463d7e9 100644
--- a/community/unpaper/PKGBUILD
+++ b/community/unpaper/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 44854 2011-04-12 08:56:17Z spupykin $
+# $Id: PKGBUILD 65349 2012-02-21 02:16:20Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Andreas Hauser <andy-aur@splashground.de>
 
 pkgname=unpaper
 pkgver=0.3
-pkgrel=2
+pkgrel=3
 pkgdesc="post-processing tool for scanned sheets of paper"
 arch=('i686' 'x86_64')
 url="http://$pkgname.berlios.de/"
diff --git a/community/unshield/PKGBUILD b/community/unshield/PKGBUILD
index 99cb13787..b549269c0 100644
--- a/community/unshield/PKGBUILD
+++ b/community/unshield/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 23623 2010-08-13 18:58:07Z giovanni $
+# $Id: PKGBUILD 65351 2012-02-21 02:17:14Z spupykin $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=unshield
 pkgver=0.6
-pkgrel=2
+pkgrel=3
 pkgdesc="Extracts CAB files from InstallShield installers"
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/synce/files/"
@@ -18,9 +18,9 @@ md5sums=('31a829192a255160d1f71cda4c865c9c'
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   # See http://www.mail-archive.com/synce-devel@lists.sourceforge.net/msg01796.html
-  patch -Np0 -i "${srcdir}/libunshield.c.patch" || return 1
+  patch -Np0 -i "${srcdir}/libunshield.c.patch"
   ./configure --prefix=/usr
-  make || return 1
+  make
   make DESTDIR=${pkgdir} install
   install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/unshield/LICENSE
 }
diff --git a/community/uptimed/PKGBUILD b/community/uptimed/PKGBUILD
index c157e645c..e8ae9f9c0 100644
--- a/community/uptimed/PKGBUILD
+++ b/community/uptimed/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 58644 2011-11-16 23:03:01Z andrea $
+# $Id: PKGBUILD 65353 2012-02-21 02:18:04Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Tom Killian <tomk@runbox.com>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=uptimed
 pkgver=0.3.16
-pkgrel=3
+pkgrel=4
 pkgdesc="A system uptime record daemon"
 arch=(i686 x86_64)
 url="http://podgorny.cz/uptimed/"
diff --git a/community/uriparser/PKGBUILD b/community/uriparser/PKGBUILD
index 73bef5e46..8f78d72e2 100644
--- a/community/uriparser/PKGBUILD
+++ b/community/uriparser/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 59139 2011-11-21 12:26:27Z spupykin $
+# $Id: PKGBUILD 65355 2012-02-21 02:18:49Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Juan Pablo Gonzalez Tognarelli <lord_jotape@yahoo.com.ar>
 
 pkgname=uriparser
 pkgver=0.7.5
-pkgrel=1
+pkgrel=2
 pkgdesc="uriparser is a strictly RFC 3986 compliant URI parsing library. uriparser is cross-platform, fast, supports Unicode"
 url="http://sourceforge.net/projects/uriparser/"
 depends=(glibc)
diff --git a/community/ushare/PKGBUILD b/community/ushare/PKGBUILD
index 775ee1112..579860965 100644
--- a/community/ushare/PKGBUILD
+++ b/community/ushare/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 58584 2011-11-15 20:14:24Z spupykin $
+# $Id: PKGBUILD 65329 2012-02-21 01:38:24Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com>
 # Contributor: kastor <kastor@fobos.org.ar>
 
 pkgname=ushare
 pkgver=1.1a
-pkgrel=16
+pkgrel=17
 pkgdesc="A free UPnP A/V Media Server for Linux"
 url="http://ushare.geexbox.org"
 license=('GPL2')
@@ -17,11 +17,13 @@ install=ushare.install
 source=("http://ushare.geexbox.org/releases/${pkgname}-${pkgver}.tar.bz2"
 	"ushare"
 	"upnp-build-fix.patch"
-	"ushare-config.patch")
+	"ushare-config.patch"
+	"segfault.patch")
 md5sums=('5bbcdbf1ff85a9710fa3d4e82ccaa251'
          'e3cf0a44b0280da4966177c21e49361c'
          '32c29f9f673e8b3a3d9e7bf5e60febbc'
-         '5243475c0cebc5db49296b2f3691085b')
+         '5243475c0cebc5db49296b2f3691085b'
+         '0b0fbf5d103f0ebb72716cbad0b28ffa')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -30,6 +32,7 @@ build() {
     configure
   patch -p1 <$srcdir/upnp-build-fix.patch
   patch -p1 <$srcdir/ushare-config.patch
+  patch -p1 <$srcdir/segfault.patch
   ./configure --prefix=/usr --sysconfdir=/etc/ushare \
     --enable-dlna --with-libdlna-dir=/usr/include/libavformat
   make
diff --git a/community/ushare/segfault.patch b/community/ushare/segfault.patch
new file mode 100644
index 000000000..f46f9f1f4
--- /dev/null
+++ b/community/ushare/segfault.patch
@@ -0,0 +1,61 @@
+--- ushare-1.1a/src/cds.c	2007-12-09 16:03:36.000000000 +0300
++++ ushare-1.1a.my/src/cds.c	2012-01-26 05:14:03.317360310 +0400
+@@ -20,6 +20,8 @@
+  */
+ 
+ #include <stdlib.h>
++#include <string.h>
++#include <stdio.h>
+ #include <upnp/upnp.h>
+ #include <upnp/upnptools.h>
+ 
+--- ushare-1.1a/src/cms.c	2007-12-09 16:03:36.000000000 +0300
++++ ushare-1.1a.my/src/cms.c	2012-01-26 05:15:33.236991387 +0400
+@@ -20,6 +20,7 @@
+  */
+ 
+ #include <stdlib.h>
++#include <string.h>
+ #include <upnp/upnp.h>
+ #include <upnp/upnptools.h>
+ 
+--- ushare-1.1a/src/http.c	2012-01-26 05:27:44.073992912 +0400
++++ ushare-1.1a.my/src/http.c	2012-01-26 05:17:31.756505126 +0400
+@@ -25,6 +25,7 @@
+ #include <errno.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <unistd.h>
+ #include <errno.h>
+ 
+--- ushare-1.1a/src/presentation.c	2007-12-09 16:03:36.000000000 +0300
++++ ushare-1.1a.my/src/presentation.c	2012-01-26 05:19:41.635972259 +0400
+@@ -19,6 +19,8 @@
+  */
+ 
+ #include <stdlib.h>
++#include <string.h>
++#include <stdio.h>
+ 
+ #if HAVE_LANGINFO_CODESET
+ # include <langinfo.h>
+--- ushare-1.1a/src/mime.c	2007-12-09 16:03:36.000000000 +0300
++++ ushare-1.1a.my/src/mime.c	2012-01-26 05:23:54.251602492 +0400
+@@ -21,6 +21,7 @@
+ 
+ #include <stdlib.h>
+ #include <string.h>
++#include <stdio.h>
+ 
+ #include "mime.h"
+ #include "ushare.h"
+--- ushare-1.1a/src/services.c	2007-12-09 16:03:36.000000000 +0300
++++ ushare-1.1a.my/src/services.c	2012-01-26 05:21:28.572200186 +0400
+@@ -20,6 +20,7 @@
+  */
+ 
+ #include <stdlib.h>
++#include <string.h>
+ #include <upnp/upnp.h>
+ #include <upnp/upnptools.h>
diff --git a/community/ussp-push/PKGBUILD b/community/ussp-push/PKGBUILD
index 673cb4718..5a8f1e3a7 100644
--- a/community/ussp-push/PKGBUILD
+++ b/community/ussp-push/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 21981 2010-07-19 13:46:02Z spupykin $
+# $Id: PKGBUILD 65357 2012-02-21 02:19:32Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Giovanni Scafora <linuxmania@gmail.com>
 # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
 
 pkgname=ussp-push
 pkgver=0.11
-pkgrel=3
+pkgrel=4
 pkgdesc="OBEX object pusher for Linux"
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -18,10 +18,8 @@ md5sums=('5c44983ee27809867041feff6bb4423a'
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-
   patch -p1 <$srcdir/ussp-push-remote-name.patch
-
   ./configure --prefix=/usr
-  make || return 1
+  make
   make DESTDIR=$pkgdir install
 }
diff --git a/community/ustr/PKGBUILD b/community/ustr/PKGBUILD
index 9525962a1..932534f52 100644
--- a/community/ustr/PKGBUILD
+++ b/community/ustr/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 17701 2010-05-24 20:44:23Z spupykin $
+# $Id: PKGBUILD 65359 2012-02-21 02:20:19Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=ustr
 pkgver=1.0.4
-pkgrel=2
+pkgrel=3
 pkgdesc="micro string API for C"
 arch=(i686 x86_64)
 url="http://www.and.org/ustr/"
@@ -14,9 +14,7 @@ md5sums=('93147d9f0c9765d4cd0f04f7e44bdfce')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-
-  make || return 1
-  make DESTDIR="$pkgdir" install || return 1
-
+  make
+  make DESTDIR="$pkgdir" install
   mv $pkgdir/usr/share/doc/man $pkgdir/usr/share/
 }
diff --git a/community/uudeview/PKGBUILD b/community/uudeview/PKGBUILD
index 3a81c0c45..8626aa347 100644
--- a/community/uudeview/PKGBUILD
+++ b/community/uudeview/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 54630 2011-08-22 09:13:06Z spupykin $
+# $Id: PKGBUILD 65361 2012-02-21 02:21:19Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: kmaster <kmaster12@sasktel.net>
 
 pkgname=uudeview
 pkgver=0.5.20
-pkgrel=9
+pkgrel=10
 pkgdesc="UUDeview helps transmitting & recieving binary files using mail or newsgroups. Includes library files."
 arch=('i686' 'x86_64')
 url="http://www.fpx.de/fp/Software/UUDeview/"
diff --git a/community/vbindiff/PKGBUILD b/community/vbindiff/PKGBUILD
index 12a64d771..e352faf92 100644
--- a/community/vbindiff/PKGBUILD
+++ b/community/vbindiff/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 45041 2011-04-14 10:57:46Z spupykin $
+# $Id: PKGBUILD 65363 2012-02-21 02:22:10Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: tyr0 <thomas.hoernes@gmx.at>
 
 pkgname=vbindiff
 pkgver=3.0_beta4
-pkgrel=2
+pkgrel=3
 pkgdesc="displays files in hexadecimal and ASCII (or EBCDIC) and highlight the differences between them"
 arch=('i686' 'x86_64')
 url="http://www.cjmweb.net/vbindiff/"
diff --git a/community/viewnior/PKGBUILD b/community/viewnior/PKGBUILD
index d53a3a382..2c2c78215 100644
--- a/community/viewnior/PKGBUILD
+++ b/community/viewnior/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 35130 2010-12-16 14:14:18Z spupykin $
+# $Id: PKGBUILD 65365 2012-02-21 02:22:51Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
 # Maintainer: M Rawash <mrawash@gmail.com>
 
 pkgname=viewnior
 pkgver=1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A simple, fast and elegant image viewer program"
 arch=('i686' 'x86_64')
 url="http://xsisqox.github.com/Viewnior/"
@@ -18,7 +18,7 @@ md5sums=('5b14c6edaf78fdd3259f148ae9d7f062')
 
 build() {
   cd $pkgname-$pkgver
-  ./configure --prefix=/usr
+  LDFLAGS=-lm ./configure --prefix=/usr
   make
   make DESTDIR="$pkgdir" install
 }
diff --git a/community/vile/PKGBUILD b/community/vile/PKGBUILD
index 3d0b1e83a..ff6273f1d 100644
--- a/community/vile/PKGBUILD
+++ b/community/vile/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 23288 2010-08-09 15:32:32Z spupykin $
+# $Id: PKGBUILD 65367 2012-02-21 02:23:34Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=vile
 pkgver=9.8
-pkgrel=1
+pkgrel=2
 pkgdesc="vi like emacs"
 arch=('i686' 'x86_64')
 url="http://invisible-island.net/vile/vile.html"
@@ -16,8 +16,8 @@ md5sums=('b5a0d89165f633a662cdb4b5c57f2e2f')
 build() {
   cd $srcdir/$pkgname-$pkgver
   ./configure --prefix=/usr
-  make || return 1
-  make install DESTDIR=$pkgdir || return 1
+  make
+  make install DESTDIR=$pkgdir
   mv $pkgdir/usr/man $pkgdir/usr/share/
 
   mkdir -p $pkgdir/usr/share/licenses/$pkgname
diff --git a/community/visitors/PKGBUILD b/community/visitors/PKGBUILD
index 797fddbbe..b9ad7302f 100644
--- a/community/visitors/PKGBUILD
+++ b/community/visitors/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 7471 2010-01-07 02:49:37Z dgriffiths $
+# $Id: PKGBUILD 65369 2012-02-21 02:24:21Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Roman Kyrylych <roman@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 
 pkgname=visitors
 pkgver=0.7
-pkgrel=2
+pkgrel=3
 pkgdesc='A very fast web log analyzer'
 arch=('i686' 'x86_64')
 url="http://www.hping.org/visitors/"
@@ -14,11 +15,11 @@ source=(http://www.hping.org/visitors/$pkgname-$pkgver.tar.gz)
 md5sums=('32ede76af83c6b1b7d2cdc5fe5178f6d')
 
 build() {
-  cd $startdir/src/${pkgname}_${pkgver}
-  make || return 1
-  install -D visitors $startdir/pkg/usr/bin/visitors
-  install -D iis2apache.pl $startdir/pkg/usr/bin/iis2apache.pl
+  cd $srcdir/${pkgname}_${pkgver}
+  make
+  install -D visitors $pkgdir/usr/bin/visitors
+  install -D iis2apache.pl $pkgdir/usr/bin/iis2apache.pl
   gzip visitors.1
-  install -Dm644 visitors.1.gz $startdir/pkg/usr/share/man/man1/visitors.1.gz
-  install -Dm644 COPYING $startdir/pkg/usr/share/licenses/visitors/COPYING
+  install -Dm644 visitors.1.gz $pkgdir/usr/share/man/man1/visitors.1.gz
+  install -Dm644 COPYING $pkgdir/usr/share/licenses/visitors/COPYING
 }
diff --git a/community/vmoviedb/PKGBUILD b/community/vmoviedb/PKGBUILD
index 59466e33a..7b6219b26 100644
--- a/community/vmoviedb/PKGBUILD
+++ b/community/vmoviedb/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 59169 2011-11-21 13:06:56Z spupykin $
+# $Id: PKGBUILD 65371 2012-02-21 02:25:52Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Roman Kyrylych <Roman.Kyrylych@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=vmoviedb
 pkgver=0.1.5
-pkgrel=4
+pkgrel=5
 pkgdesc="A movie collection manager for the Gnome desktop"
 arch=('i686' 'x86_64')
 url="http://vmoviedb.sourceforge.net"
diff --git a/community/vorbissimple/PKGBUILD b/community/vorbissimple/PKGBUILD
index 8b9284370..53976371d 100644
--- a/community/vorbissimple/PKGBUILD
+++ b/community/vorbissimple/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 20047 2010-07-02 09:22:06Z spupykin $
+# $Id: PKGBUILD 65375 2012-02-21 02:27:15Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=vorbissimple
 pkgver=0.0.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A Vorbis decoder"
 arch=('i686' 'x86_64')
 url="http://kamaelia.sourceforge.net"
@@ -17,6 +17,6 @@ md5sums=('332077b25a4c9547947ab0922361ffda')
 build() {
   cd $srcdir/$pkgname-$pkgver/libvorbissimple
   ./configure --prefix=/usr
-  make || return 1
+  make
   make DESTDIR=$pkgdir install
 }
diff --git a/community/vyqchat/PKGBUILD b/community/vyqchat/PKGBUILD
index 8bffed66f..9e8a0dc5a 100644
--- a/community/vyqchat/PKGBUILD
+++ b/community/vyqchat/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 14449 2010-04-03 16:01:29Z foutrelis $
+# $Id: PKGBUILD 65377 2012-02-21 02:28:00Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=vyqchat
 pkgver=0.2.8
-pkgrel=3
+pkgrel=4
 pkgdesc="vypress compatible qt chat (can work without server)"
 arch=('i686' 'x86_64')
 url="http://linux.bydg.org/~yogin/"
@@ -16,14 +16,14 @@ md5sums=('67974bc5df1ed0d63785d04325444d4f' 'de3af70da3743c27929f04f72c837412')
 
 build() {
   . /etc/profile.d/qt3.sh
-  cd ${startdir}/src/$pkgname-${pkgver}
+  cd $srcdir/$pkgname-${pkgver}
   patch -Np1 <../build-fix.patch
   # Use _LDADD to properly compile with --as-needed
-  sed -i 's/vyqchat_LDFLAGS/vyqchat_LDADD/' src/Makefile.am || return 1
+  sed -i 's/vyqchat_LDFLAGS/vyqchat_LDADD/' src/Makefile.am
   # Correct acinclude.m4 to avoid empty else block
-  sed -i 's:# Leave bnv_qt_lib_dir defined:/bin/true:' acinclude.m4 || return 1
-  autoreconf -v || return 1
+  sed -i 's:# Leave bnv_qt_lib_dir defined:/bin/true:' acinclude.m4
+  autoreconf -v
   ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=$startdir/pkg install || return 1
+  make
+  make DESTDIR=$pkgdir install
 }
diff --git a/community/wdm/PKGBUILD b/community/wdm/PKGBUILD
index 26775681b..e5391a139 100644
--- a/community/wdm/PKGBUILD
+++ b/community/wdm/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 44025 2011-04-01 16:50:02Z spupykin $
+# $Id: PKGBUILD 65381 2012-02-21 02:29:21Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: eric <eric@archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
 
 pkgname=wdm
 pkgver=1.28
-pkgrel=5
+pkgrel=6
 pkgdesc="An replacement X window display manager similar to, and based on XDM"
 arch=(i686 x86_64)
 depends=('windowmaker' 'pam' 'bash' 'libxmu')
diff --git a/community/wmii/PKGBUILD b/community/wmii/PKGBUILD
index a411b5048..84407f57c 100644
--- a/community/wmii/PKGBUILD
+++ b/community/wmii/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 89676 2010-09-03 07:28:11Z remy $
-# Maintainer:
+# $Id: PKGBUILD 65389 2012-02-21 02:31:44Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jeffrey 'jf' Lim <jfs.world@gmail.com>
 
 pkgname=wmii
 pkgver=3.9.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A small, dynamic window manager for X11"
-arch=('i686' 'x86_64') 
+arch=('i686' 'x86_64')
 license=('MIT')
 url="http://wmii.suckless.org/"
 depends=('libxft' 'libxrandr' 'libxinerama' 'dash')
@@ -14,7 +14,7 @@ options=('!makeflags')
 source=(http://dl.suckless.org/${pkgname}/${pkgname}+ixp-${pkgver}.tbz
 	'fix-freetype-include.patch')
 md5sums=('3d480502b7b1e2a405d941df67f16bcf'
-	'97febd4a1df80aa4afbd126de1f36496')
+         '97febd4a1df80aa4afbd126de1f36496')
 
 build() {
   cd ${srcdir}/${pkgname}+ixp-${pkgver}
@@ -25,6 +25,7 @@ build() {
   sed -i 's|ETC = $(PREFIX)/etc|ETC = /etc|' config.mk
   sed -i 's# !=#!=#' mk/hdr.mk
   sed -i 's#env python#env python2#' alternative_wmiircs/python/wmiirc
+  echo 'LIBS+=-lXrender -lX11' >>config.mk
 
   export MAKEFLAGS="-j1"
   make
@@ -33,8 +34,6 @@ build() {
 package() {
   cd ${srcdir}/${pkgname}+ixp-${pkgver}
   make DESTDIR=${pkgdir} install
-
   install -Dm644 debian/file/wmii.desktop ${pkgdir}/usr/share/xsessions/${pkgname}.desktop
-
   install -Dm644 LICENSE $pkgdir/usr/share/licenses/${pkgname}/LICENSE
 }
diff --git a/community/workrave/PKGBUILD b/community/workrave/PKGBUILD
index 916d2b25f..db5a9b19b 100644
--- a/community/workrave/PKGBUILD
+++ b/community/workrave/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 60818 2011-12-18 17:24:11Z spupykin $
+# $Id: PKGBUILD 65391 2012-02-21 02:32:34Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: William Rea <sillywilly@gmail.com>
 
 pkgname=workrave
 pkgver=1.9.4
-pkgrel=2
+pkgrel=3
 pkgdesc="a tool to help RSI"
 arch=('i686' 'x86_64')
 license=('GPL2')
diff --git a/community/wput/PKGBUILD b/community/wput/PKGBUILD
index e6fbbfd61..dfcfdba7d 100644
--- a/community/wput/PKGBUILD
+++ b/community/wput/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 43594 2011-03-27 20:43:25Z spupykin $
+# $Id: PKGBUILD 65393 2012-02-21 02:33:30Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: damir <damir@archlinux.org>
 # Contributor: Aurelien Gateau <aurelien.gateau@free.fr>
 
 pkgname=wput
 pkgver=0.6.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A command line tool to upload files to FTP site, the opposite to wget"
 arch=('i686' 'x86_64')
 url="http://wput.sourceforge.net/"
diff --git a/community/xboard/PKGBUILD b/community/xboard/PKGBUILD
index e44b8e29e..f2b79ed87 100644
--- a/community/xboard/PKGBUILD
+++ b/community/xboard/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 47322 2011-05-21 17:35:38Z jelle $
+# $Id: PKGBUILD 65236 2012-02-20 12:27:26Z 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.5.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A graphical user interfaces for chess"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/xboard/"
@@ -14,6 +14,8 @@ depends=('libxaw' 'gnuchess' 'texinfo' 'xdg-utils')
 install=${pkgname}.install
 source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz
         'xboard.desktop')
+md5sums=('2fa92fceeda344ef935bc97bef5f9fc5'
+         '1d9d4a7864465a703fe4a215e83f4806')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -25,9 +27,6 @@ build() {
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-
   install -Dm644 ${srcdir}/${pkgname}.desktop \
     ${pkgdir}/usr/share/applications/${pkgname}.desktop
 }
-md5sums=('2fa92fceeda344ef935bc97bef5f9fc5'
-         '1d9d4a7864465a703fe4a215e83f4806')
diff --git a/community/xcircuit/PKGBUILD b/community/xcircuit/PKGBUILD
index 14cb84c31..092bcbb53 100644
--- a/community/xcircuit/PKGBUILD
+++ b/community/xcircuit/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 53887 2011-08-09 08:33:11Z spupykin $
+# $Id: PKGBUILD 65237 2012-02-20 12:28:08Z 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.26
-pkgrel=1
+pkgrel=2
 pkgdesc="A program for drawing publishable-quality electrical circuit schematic diagrams"
 arch=('i686' 'x86_64')
 url="http://opencircuitdesign.com/xcircuit"
@@ -17,7 +17,6 @@ md5sums=('6026f65a4bc327e5769157ffd1387342')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-#  sed -i 's|am__api_version="1.9"|am__api_version="1.11"|' configure
   ./configure prefix=/usr --with-tcl=/usr/lib --with-tk=/usr/lib --mandir=/usr/share/man
   make
   make DESTDIR=$pkgdir install
diff --git a/community/xdialog/PKGBUILD b/community/xdialog/PKGBUILD
index 750a99ff1..ddc3a1601 100644
--- a/community/xdialog/PKGBUILD
+++ b/community/xdialog/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 38975 2011-02-04 14:16:55Z spupykin $
+# $Id: PKGBUILD 65245 2012-02-20 12:31:35Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=xdialog
 pkgver=2.3.1
-pkgrel=5
+pkgrel=6
 pkgdesc="A drop-in replacement for the 'dialog' or 'cdialog' programs"
 url="http://xdialog.dyns.net/"
 arch=('i686' 'x86_64')
@@ -18,16 +18,12 @@ md5sums=('0671f8353717513bf1f0ebc80e9710f6'
 
 build() {
   cd $srcdir/Xdialog-$pkgver
-
   patch -p1 <../xdialog-$pkgver-gtk2.patch
-
   ./configure --prefix=/usr \
     --mandir=${pkgdir}/usr/share/man --with-gtk2
-
   # Fix bugs in automake - see Xdialog.spec
-  /bin/sed -i -e "s:RANLIB = @RANLIB@:RANLIB = /usr/bin/ranlib:" lib/Makefile
-  /bin/sed -i -e "s;XGETTEXT = :;XGETTEXT = /usr/bin/xgettext;" po/Makefile
-
+  sed -i -e "s:RANLIB = @RANLIB@:RANLIB = /usr/bin/ranlib:" lib/Makefile
+  sed -i -e "s;XGETTEXT = :;XGETTEXT = /usr/bin/xgettext;" po/Makefile
   make
 }
 
diff --git a/community/xdiskusage/PKGBUILD b/community/xdiskusage/PKGBUILD
index 0ff97363c..71491ef78 100644
--- a/community/xdiskusage/PKGBUILD
+++ b/community/xdiskusage/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 51101 2011-07-05 08:55:16Z spupykin $
+# $Id: PKGBUILD 65246 2012-02-20 12:32:09Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=xdiskusage
 pkgver=1.48
-pkgrel=6
+pkgrel=7
 pkgdesc="xdiskusage is a user-friendly program to show you what is using up all your disk space"
 arch=('i686' 'x86_64')
 depends=('fltk')
@@ -16,7 +16,7 @@ options=(!emptydirs)
 source=(http://xdiskusage.sourceforge.net/$pkgname-$pkgver.tgz
 	'stdin-is-null.patch')
 md5sums=('a902aa9d73761ade98256c3cd5c1f533'
-	'0181b66b44e382e44c91602d8de9a7b6')
+         '0181b66b44e382e44c91602d8de9a7b6')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/xerces-c/PKGBUILD b/community/xerces-c/PKGBUILD
index dc42d09e5..9048826b4 100644
--- a/community/xerces-c/PKGBUILD
+++ b/community/xerces-c/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 29167 2010-10-11 08:11:26Z spupykin $
+# $Id: PKGBUILD 65252 2012-02-20 12:36:18Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Geoffroy Carrier <geoffroy@archlinux.org>
 # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
@@ -6,7 +6,7 @@
 
 pkgname=xerces-c
 pkgver=3.1.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A validating XML parser written in a portable subset of C++."
 arch=('i686' 'x86_64')
 url="http://xerces.apache.org/xerces-c"
@@ -18,7 +18,7 @@ md5sums=('6a8ec45d83c8cfb1584c5a5345cb51ae')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc || return 1
-  make || return 1
-  make DESTDIR=${pkgdir}/ install || return 1
+  ./configure --prefix=/usr --sysconfdir=/etc
+  make
+  make DESTDIR=${pkgdir}/ install
 }
diff --git a/community/xfe/PKGBUILD b/community/xfe/PKGBUILD
index 20ba88822..183f7cf15 100644
--- a/community/xfe/PKGBUILD
+++ b/community/xfe/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 48873 2011-06-06 21:48:23Z spupykin $
+# $Id: PKGBUILD 65255 2012-02-20 12:37:23Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Eric Belanger <belanger@astro.umontreal.ca>
 # Contributor: Ravi Desai <ravster3@hotmail.com>
 
 pkgname=xfe
 pkgver=1.32.4
-pkgrel=1
+pkgrel=2
 pkgdesc="X File Explorer (Xfe) is an MS-Explorer like file manager for X."
 arch=('i686' 'x86_64')
 url="http://roland65.free.fr/xfe"
@@ -17,7 +17,7 @@ md5sums=('ed9db4338b9191adb5267fd12f64e774')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr
+  LDFLAGS=-lX11 ./configure --prefix=/usr
   sed -i 's|inline||' src/xfeutils.cpp
   make
 }
diff --git a/community/xiphos/PKGBUILD b/community/xiphos/PKGBUILD
index 1e6e80c69..dc5c97637 100755
--- a/community/xiphos/PKGBUILD
+++ b/community/xiphos/PKGBUILD
@@ -1,11 +1,12 @@
-# $Id: PKGBUILD 60197 2011-12-07 12:42:03Z arodseth $
+# $Id: PKGBUILD 65313 2012-02-20 22:49:22Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Andrea Scarpino
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: TripleE <eric1548@yahoo.com>
+
 pkgname=xiphos
-pkgver=3.1.4
-pkgrel=9
+pkgver=3.1.5
+pkgrel=1
 pkgdesc="Bible study tool for GTK+"
 arch=('x86_64' 'i686')
 url="http://xiphos.org/"
@@ -16,15 +17,18 @@ conflicts=('gnomesword')
 provides=('gnomesword')
 replaces=('gnomesword')
 install=xiphos.install
-source=("http://downloads.sourceforge.net/gnomesword/$pkgname-$pkgver.tar.gz")
-md5sums=('4d6f7805c4c8185f5c4ac3bd95fc705a')
+source=("http://downloads.sourceforge.net/gnomesword/$pkgname-$pkgver.tar.gz"
+        "$pkgname.patch")
+sha256sums=('568474d9060979ad1140dbf0eae13e46890a268bfa06d600ded5917ba6674bc2'
+            'd9cdbb2de7108e2d4e49960c0c54470bc34176cb5035e14af53400c6a823ef60')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
   sed -i '0,/on/s//on2/' waf
-  ./waf configure --prefix=/usr --enable-gtkhtml
-  ./waf build --prefix=/usr 
+  patch -p0 -i "$srcdir/$pkgname.patch"
+  CXXFLAGS+=" -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1" ./waf configure --prefix=/usr --enable-gtkhtml
+  ./waf build --prefix=/usr
 }
 
 package() {
diff --git a/community/xiphos/xiphos.patch b/community/xiphos/xiphos.patch
new file mode 100644
index 000000000..f1940375e
--- /dev/null
+++ b/community/xiphos/xiphos.patch
@@ -0,0 +1,29 @@
+--- src/main/display.cc	2012/02/19 14:16:05	4372
++++ src/main/display.cc	2012/02/20 10:56:39	4374
+@@ -29,9 +29,12 @@
+ #include <thmlhtmlhref.h>
+ #include <gbfhtmlhref.h>
+ #include <teihtmlhref.h>
++#ifndef NO_SWORD_SET_RENDER_NOTE_NUMBERS
++/* these files are erroneously uninstalled as of previous release */
+ #include <osisxhtml.h>
+ #include <thmlxhtml.h>
+ #include <gbfxhtml.h>
++#endif
+ 
+ #include <osisvariants.h>
+ #include <thmlvariants.h>
+--- src/main/display.cc (revision 4374)
++++ src/main/display.cc (revision 4375)
+@@ -762,7 +762,10 @@
+       }
+ }
+
+-#ifndef NO_SWORD_SET_RENDER_NOTE_NUMBERS
++#ifdef NO_SWORD_SET_RENDER_NOTE_NUMBERS
++// placeholder for older Sword.
++#define        set_render_numbers(x,y) /* nothing */
++#else
+ void
+ set_render_numbers(SWModule& imodule, GLOBAL_OPS *ops)
+ { 
diff --git a/community/xkeycaps/PKGBUILD b/community/xkeycaps/PKGBUILD
index 1fade9a45..ef7c188bf 100644
--- a/community/xkeycaps/PKGBUILD
+++ b/community/xkeycaps/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 59110 2011-11-21 10:43:20Z spupykin $
+# $Id: PKGBUILD 65257 2012-02-20 12:38:07Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: Patrick Leslie Polzer <leslie.polzer@gmx.net>
 
 pkgname=xkeycaps
 pkgver=2.46
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64')
 pkgdesc="XKeyCaps is a graphical front-end to xmodmap."
 url="http://www.jwz.org/xkeycaps/"
diff --git a/community/xl2tpd/PKGBUILD b/community/xl2tpd/PKGBUILD
index c9a0ceed5..e6936d7ea 100644
--- a/community/xl2tpd/PKGBUILD
+++ b/community/xl2tpd/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 53519 2011-08-04 21:10:02Z spupykin $
+# $Id: PKGBUILD 65258 2012-02-20 12:39:15Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Hengfu <rhfcaesar@gmail.com>
 
 pkgname=xl2tpd
 pkgver=1.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc="an open source implementation of the L2TP maintained by Xelerance Corporation"
 arch=('i686' 'x86_64')
-url="http://www.xelerance.com"
+url="http://www.xelerance.com/services/software/xl2tpd/"
 license=('GPL')
 depends=('ppp')
 options=(emptydirs zipman docs)
 backup=(etc/ppp/options.l2tpd)
-source=(ftp://ftp.xelerance.com/$pkgname/$pkgname-$pkgver.tar.gz
+#source=(ftp://ftp.xelerance.com/$pkgname/$pkgname-$pkgver.tar.gz
+source=(http://arch.p5n.pp.ru/~sergej/dl/2012/xl2tpd-$pkgver.tar.gz
 	xl2tpd.rc
 	xl2tpd.conf.client-example
 	xl2tpd.conf.server-example
diff --git a/community/xmldiff/PKGBUILD b/community/xmldiff/PKGBUILD
index 167e91ec8..a041c92fa 100644
--- a/community/xmldiff/PKGBUILD
+++ b/community/xmldiff/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 50681 2011-06-29 12:57:42Z spupykin $
+# $Id: PKGBUILD 65259 2012-02-20 12:39:55Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Anton Bazhenov <anton.bazhenov at gmail>
 # Contributor: Sergej Pupykin <sergej@aur.archlinux.org>
 
 pkgname=xmldiff
 pkgver=0.6.10
-pkgrel=1
+pkgrel=2
 pkgdesc="A python tool that figures out the differences between two similar XML files, in the same way the diff utility does it"
 arch=('i686' 'x86_64')
 url="http://www.logilab.org/project/xmldiff/"
 license=('GPL2')
 depends=('python2' 'libxslt' 'jade')
 optdepends=('docbook-xsl: render revision info')
-source=(http://ftp.logilab.org/pub/$pkgname/$pkgname-$pkgver.tar.gz)
+#source=(http://ftp.logilab.org/pub/$pkgname/$pkgname-$pkgver.tar.gz)
+source=(http://arch.p5n.pp.ru/~sergej/dl/2012/xmldiff-$pkgver.tar.gz)
 md5sums=('a61e6e95a130e3bd53f5ea5616cc5314')
 
 build() {
diff --git a/community/xmmsctrl/PKGBUILD b/community/xmmsctrl/PKGBUILD
index beb2c90f7..10e4566d6 100644
--- a/community/xmmsctrl/PKGBUILD
+++ b/community/xmmsctrl/PKGBUILD
@@ -1,27 +1,24 @@
-# $Id: PKGBUILD 21568 2010-07-16 16:29:20Z lcarlier $
+# $Id: PKGBUILD 65261 2012-02-20 12:40:39Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: FJ <joostef@gmail.com>
 
-pkgname=xmmsctrl 
-pkgver=1.9 
-pkgrel=2
-pkgdesc="An XMMS console control application" 
+pkgname=xmmsctrl
+pkgver=1.9
+pkgrel=3
+pkgdesc="An XMMS console control application"
 arch=('i686' 'x86_64')
-url="http://www.cs.aau.dk/~adavid/utils/" 
+url="http://www.cs.aau.dk/~adavid/utils/"
 license=("GPL")
-depends=('xmms') 
+depends=('xmms')
 source=("http://www.cs.aau.dk/~adavid/utils/$pkgname-$pkgver.tar.gz")
-md5sums=('7da9cb73daeeec99bfdaa93dd2862ea6') 
- 
-build() { 
-  cd ${srcdir}/$pkgname-$pkgver 
+md5sums=('7da9cb73daeeec99bfdaa93dd2862ea6')
 
-  make 
+build() {
+  cd ${srcdir}/$pkgname-$pkgver
+  make
 }
 
 package() {
-  cd ${srcdir}/$pkgname-$pkgver 
-
+  cd ${srcdir}/$pkgname-$pkgver
   install -D -m 755  xmmsctrl ${pkgdir}/usr/bin/xmmsctrl
-} 
-
+}
diff --git a/community/xmove/PKGBUILD b/community/xmove/PKGBUILD
index cc7393078..e1ac2aba5 100644
--- a/community/xmove/PKGBUILD
+++ b/community/xmove/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 32120 2010-11-10 15:38:22Z spupykin $
+# $Id: PKGBUILD 65263 2012-02-20 12:41:25Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Benjamin Andresen <benny AT klapmuetz DOT org>
 
 pkgname=xmove
 pkgver=2.0beta2
-pkgrel=4
+pkgrel=5
 pkgdesc="A tool to move X windows to different X servers, something like a GNU screen for X."
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/archlinux-stuff/"
diff --git a/community/xpacman/PKGBUILD b/community/xpacman/PKGBUILD
index ccefd846b..532db840d 100644
--- a/community/xpacman/PKGBUILD
+++ b/community/xpacman/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 17716 2010-05-24 20:47:33Z spupykin $
+# $Id: PKGBUILD 65267 2012-02-20 12:42:37Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=xpacman
 pkgver=0.11
-pkgrel=5
+pkgrel=6
 pkgdesc="X pacman game (use z x / ' q keys)"
 arch=(i686 x86_64)
 url="http://www.ibiblio.org/pub/X11/contrib/games/"
 license=('custom')
 depends=(libx11)
-source=(http://www.ibiblio.org/pub/X11/contrib/games/xpacman.tar.gz \
+source=(http://www.ibiblio.org/pub/X11/contrib/games/xpacman.tar.gz
 	http://www.ibiblio.org/pub/X11/contrib/games/xpacman.README)
 md5sums=('b0ad824c4c0ea5c4d1f8f3e7b31f32f9'
          '620c226d6d91461ac0d91e88655c9cbf')
@@ -32,7 +32,7 @@ diff -wbBur xpacman-0.11.orig/xpacman.c xpacman-0.11.orig.my/xpacman.c
  void setup_pacmanu(void),setup_pacman(XImage *),plot_pacman(Window,GC);
 EOF
 
-  gcc -o xpacman xpacman.c -lX11 && \
-  install -D -m 0755 xpacman $pkgdir/usr/bin/xpacman && \
+  gcc -o xpacman xpacman.c -lX11
+  install -D -m 0755 xpacman $pkgdir/usr/bin/xpacman
   install -D -m 0755 $srcdir/xpacman.README $pkgdir/usr/share/licenses/xpacman/README
 }
diff --git a/community/xrestop/PKGBUILD b/community/xrestop/PKGBUILD
index 605520b7d..3ecb58312 100644
--- a/community/xrestop/PKGBUILD
+++ b/community/xrestop/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 58682 2011-11-17 15:15:17Z spupykin $
+# $Id: PKGBUILD 65269 2012-02-20 12:43:18Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=xrestop
 pkgver=0.4
-pkgrel=3
+pkgrel=4
 pkgdesc="Uses the X-Resource extension to provide 'top' like statistics"
 arch=('i686' 'x86_64')
 url="http://freedesktop.org/wiki/Software/xrestop"
diff --git a/community/xsel/PKGBUILD b/community/xsel/PKGBUILD
index d1de1aed8..4a4e361ee 100644
--- a/community/xsel/PKGBUILD
+++ b/community/xsel/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 59067 2011-11-21 08:59:54Z spupykin $
+# $Id: PKGBUILD 65271 2012-02-20 12:44:04Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=xsel
 pkgver=1.2.0
-pkgrel=4
+pkgrel=5
 pkgdesc="XSel is a command-line program for getting and setting the contents of the X selection"
 arch=(i686 x86_64)
 url="http://www.vergenet.net/~conrad/software/xsel/"
diff --git a/community/xsettings-client/PKGBUILD b/community/xsettings-client/PKGBUILD
index fd84e061c..afef330ad 100644
--- a/community/xsettings-client/PKGBUILD
+++ b/community/xsettings-client/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 59102 2011-11-21 10:29:36Z spupykin $
+# $Id: PKGBUILD 65273 2012-02-20 12:44:47Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Alois Belaska <lloyd@centrum.cz>
 
 pkgname=xsettings-client
 pkgver=0.10
-pkgrel=5
+pkgrel=6
 pkgdesc="Provides cross toolkit configuration settings such as theme parameters"
 arch=('i686' 'x86_64')
 license=('GPL')
diff --git a/community/yacpi/PKGBUILD b/community/yacpi/PKGBUILD
index 23f2c152a..81721db51 100644
--- a/community/yacpi/PKGBUILD
+++ b/community/yacpi/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 17725 2010-05-24 20:49:16Z spupykin $
+# $Id: PKGBUILD 65275 2012-02-20 12:45:31Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sebastian A. Liem <sebastian@liem.se>
 
 pkgname=yacpi
 pkgver=3.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc="ncurses-based acpi monitor."
 arch=('i686' 'x86_64')
 url="http://www.ngolde.de/yacpi.html"
@@ -15,7 +15,7 @@ md5sums=('1b03394ee3b916f686cdc3e2c05ddb7a')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  make || return 1
+  make
   install -d $pkgdir/usr/bin
   install -D -m 755 $pkgname $pkgdir/usr/bin/
 }
diff --git a/community/zynaddsubfx/PKGBUILD b/community/zynaddsubfx/PKGBUILD
index b0c7927f9..e0ba7a89b 100644
--- a/community/zynaddsubfx/PKGBUILD
+++ b/community/zynaddsubfx/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 54754 2011-08-24 10:43:05Z spupykin $
+# $Id: PKGBUILD 65279 2012-02-20 12:46:47Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: SpepS <dreamspepser at yahoo dot it>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=zynaddsubfx
 pkgver=2.4.1
-pkgrel=5
+pkgrel=6
 pkgdesc="An opensource software synthesizer capable of making a countless number of instruments."
 arch=('i686' 'x86_64')
 url="http://zynaddsubfx.sourceforge.net"
diff --git a/extra/aubio/PKGBUILD b/extra/aubio/PKGBUILD
index e172e1fe1..29f3848d0 100644
--- a/extra/aubio/PKGBUILD
+++ b/extra/aubio/PKGBUILD
@@ -1,22 +1,27 @@
-# $Id: PKGBUILD 122072 2011-05-02 05:51:30Z andrea $
+# $Id: PKGBUILD 150683 2012-02-20 06:58:41Z allan $
 # Maintainer: Tobias Kieslich tobias [funnychar] archlinux org
 # Contributor: Peter Baldwin <bald_pete@hotmail.com>
 # Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw>
 
 pkgname=aubio
 pkgver=0.3.2
-pkgrel=4
+pkgrel=5
 pkgdesc="A library for audio labelling"
 arch=('i686' 'x86_64')
 url="http://aubio.org/"
 license=('GPL')
 depends=('libsamplerate' 'fftw' 'jack')
 options=('!libtool')
-source=("http://aubio.org/pub/${pkgname}-${pkgver}.tar.gz")
-md5sums=('ffc3e5e4880fec67064f043252263a44')
+source=("http://aubio.org/pub/${pkgname}-${pkgver}.tar.gz"
+        aubio-linking.patch)
+md5sums=('ffc3e5e4880fec67064f043252263a44'
+         '674259ce137ca28ef24bd62482829cd5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
+  patch -Np1 -i $srcdir/aubio-linking.patch
+
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/aubio/aubio-linking.patch b/extra/aubio/aubio-linking.patch
new file mode 100644
index 000000000..ea68335a4
--- /dev/null
+++ b/extra/aubio/aubio-linking.patch
@@ -0,0 +1,33 @@
+diff -rupN aubio-0.3.2.old/examples/Makefile.am aubio-0.3.2/examples/Makefile.am
+--- aubio-0.3.2.old/examples/Makefile.am	2006-09-12 18:31:40.000000000 -0400
++++ aubio-0.3.2/examples/Makefile.am	2010-02-10 04:06:51.000000000 -0500
+@@ -23,7 +23,7 @@ aubionotes_SOURCES = aubionotes.c utils.
+ aubiotrack_SOURCES = aubiotrack.c utils.c
+ aubioquiet_SOURCES = aubioquiet.c utils.c
+ 
+-aubioonset_LDADD = @JACK_LIBS@
+-aubionotes_LDADD = @JACK_LIBS@
+-aubiotrack_LDADD = @JACK_LIBS@
+-aubioquiet_LDADD = @JACK_LIBS@
++aubioonset_LDADD = @JACK_LIBS@ -lm
++aubionotes_LDADD = @JACK_LIBS@ -lm
++aubiotrack_LDADD = @JACK_LIBS@ -lm
++aubioquiet_LDADD = @JACK_LIBS@ -lm
+diff -rupN aubio-0.3.2.old/examples/Makefile.in aubio-0.3.2/examples/Makefile.in
+--- aubio-0.3.2.old/examples/Makefile.in	2006-10-08 19:22:10.000000000 -0400
++++ aubio-0.3.2/examples/Makefile.in	2010-02-10 04:07:00.000000000 -0500
+@@ -247,10 +247,10 @@ aubioonset_SOURCES = aubioonset.c utils.
+ aubionotes_SOURCES = aubionotes.c utils.c
+ aubiotrack_SOURCES = aubiotrack.c utils.c
+ aubioquiet_SOURCES = aubioquiet.c utils.c
+-aubioonset_LDADD = @JACK_LIBS@
+-aubionotes_LDADD = @JACK_LIBS@
+-aubiotrack_LDADD = @JACK_LIBS@
+-aubioquiet_LDADD = @JACK_LIBS@
++aubioonset_LDADD = @JACK_LIBS@ -lm
++aubionotes_LDADD = @JACK_LIBS@ -lm
++aubiotrack_LDADD = @JACK_LIBS@ -lm
++aubioquiet_LDADD = @JACK_LIBS@ -lm
+ all: all-recursive
+ 
+ .SUFFIXES:
diff --git a/extra/bitlbee/PKGBUILD b/extra/bitlbee/PKGBUILD
index a6a7db581..8b2d98ebc 100644
--- a/extra/bitlbee/PKGBUILD
+++ b/extra/bitlbee/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 150650 2012-02-19 02:03:57Z bisson $
+# $Id: PKGBUILD 150687 2012-02-20 07:58:47Z bisson $
 
 # Contributor: FUBAR <mrfubar@gmail.com>
 # Contributor: simo <simo@archlinux.org>
@@ -8,7 +8,7 @@
 
 pkgname=bitlbee
 pkgver=3.0.5
-pkgrel=1
+pkgrel=2
 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC'
 url='http://www.bitlbee.org/'
 license=('GPL')
@@ -19,9 +19,11 @@ optdepends=('skype4py: to use skyped'
             'libotr: for OTR encryption support'
             'xinetd: to run bitlbee through xinetd')
 source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz"
-	'xinetd'
-	'rc.d')
+        'sbindir.patch'
+        'xinetd'
+        'rc.d')
 sha1sums=('74afdff87be49ce060771a6ae10d7643cd57b9b6'
+          '9b774e6d85471a4e43e25b8b941cd0e1032a7a6c'
           '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17'
           'be09d29af3853825778331df451f16ca9e452d03')
 
@@ -31,6 +33,8 @@ install=install
 build() { 
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
+	patch -p1 -i ../sbindir.patch
+
 	./configure \
 		--prefix=/usr \
 		--etcdir=/etc/bitlbee \
diff --git a/extra/bitlbee/sbindir.patch b/extra/bitlbee/sbindir.patch
new file mode 100644
index 000000000..7640508f7
--- /dev/null
+++ b/extra/bitlbee/sbindir.patch
@@ -0,0 +1,14 @@
+diff -aur old/Makefile new/Makefile
+--- old/Makefile	2012-02-18 21:55:09.000000000 +1100
++++ new/Makefile	2012-02-20 18:28:08.716130584 +1100
+@@ -135,8 +135,8 @@
+ 
+ systemd:
+ ifdef SYSTEMDSYSTEMUNITDIR
+-	sed 's|@sbindir@|$(BINDIR)|' init/bitlbee.service.in > init/bitlbee.service
+-	sed 's|@sbindir@|$(BINDIR)|' init/bitlbee@.service.in > init/bitlbee@.service
++	sed 's|@sbindir@|$(SBINDIR)|' init/bitlbee.service.in > init/bitlbee.service
++	sed 's|@sbindir@|$(SBINDIR)|' init/bitlbee@.service.in > init/bitlbee@.service
+ endif
+ 
+ install-systemd:
diff --git a/extra/ecl/PKGBUILD b/extra/ecl/PKGBUILD
index 8ab9c23ef..f7281d31f 100644
--- a/extra/ecl/PKGBUILD
+++ b/extra/ecl/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 127540 2011-06-16 08:47:04Z juergen $
+# $Id: PKGBUILD 150709 2012-02-20 22:31:08Z juergen $
 # Contributor: John Proctor <jproctor@prium.net>
 # Maintainer: juergen <juergen@archlinux.org>
 
 pkgname=ecl
-pkgver=11.1.1
+pkgver=12.2.1
 pkgrel=1
 pkgdesc="Embeddable Common Lisp"
 arch=('i686' 'x86_64')
@@ -13,23 +13,26 @@ depends=('bash' 'gmp')
 makedepends=('texinfo')
 provides=('common-lisp' 'cl-asdf')
 options=('!makeflags')
-source=(http://downloads.sourceforge.net/project/ecls/ecls/11.1/ecl-11.1.1.tar.gz)
-md5sums=('6963cfa00e1c6d4a2123fd62100b02e6')
+source=(http://downloads.sourceforge.net/project/ecls/ecls/12.2/ecl-12.2.1.tgz)
+md5sums=('1a54b733e7cd07af2b1cb6d7f8b716d2')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  sed -i 's|-Wl,--rpath,~A|-Wl,--rpath,/usr/lib/ecl|' src/configure || return 1
+  sed -i 's|-Wl,--rpath,~A|-Wl,--rpath,/usr/lib/ecl|' src/configure 
   ./configure --build=$CHOST \
               --prefix=/usr       \
               --with-tcp          \
               --with-clos-streams \
               --enable-shared \
-              --enable-boehm=local \
+              --enable-boehm=included \
               --with-system-gmp \
               --without-x \
               --without-clx \
               --disable-threads
 
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
+  make
 }
+
+package() {
+  make -C $srcdir/$pkgname-$pkgver DESTDIR=$pkgdir install
+}
\ No newline at end of file
diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD
index b06ef1e30..693639a4a 100644
--- a/extra/gnutls/PKGBUILD
+++ b/extra/gnutls/PKGBUILD
@@ -1,27 +1,32 @@
-# $Id: PKGBUILD 147016 2012-01-20 19:27:51Z andyrtr $
+# $Id: PKGBUILD 150689 2012-02-20 10:15:52Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnutls
-pkgver=3.0.12
-pkgrel=1
+pkgver=3.0.13
+pkgrel=2
 pkgdesc="A library which provides a secure layer over a reliable transport layer"
 arch=('i686' 'x86_64')
 license=('GPL3' 'LGPL')
 url="http://www.gnu.org/software/gnutls/"
 install=gnutls.install
-options=('!libtool' '!zipman' '!makeflags')
-depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit')
-makedepends=('valgrind')
-source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz)
-md5sums=('685fe5c00786c04b39e9aac362fa0cac')
+options=('!libtool' '!zipman')
+depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit>=0.11')
+makedepends=('valgrind' 'strace')
+source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz{,.sig}
+        buildfix.diff)
+md5sums=('ec549be557f31ea8c1738cb441ef23ec'
+         'a6a9a1d148abd6377e7634eb03bdaf7c'
+         '9b2a32b41391d95aeb8ddae3756fa191')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  # fix hanging make check - http://git.savannah.gnu.org/gitweb/?p=gnutls.git;a=commit;h=642e6b5ca996325dc0ca6401a3b87039408b2585
+  patch -Np1 -i ${srcdir}/buildfix.diff
   ./configure --prefix=/usr \
 	--with-zlib \
 	--disable-static \
 	--disable-guile \
-	--enable-valgrind-tests # x86_64 test are all passed. some fail in i686 chroot
+	--enable-valgrind-tests
   make
 }
 
diff --git a/extra/gnutls/buildfix.diff b/extra/gnutls/buildfix.diff
new file mode 100644
index 000000000..23c749e9d
--- /dev/null
+++ b/extra/gnutls/buildfix.diff
@@ -0,0 +1,28 @@
+index 17f6d3f..cc01dcd 100644 (file)
+
+
+--- a/tests/mini-loss-time.c
++++ b/tests/mini-loss-time.c
+@@ -267,6 +267,7 @@ static void start (int server_packet, int client_packet)
+     {
+       /* parent */
+       server (fd[0], server_packet);
++      kill(child, SIGTERM);
+     }
+   else 
+     {
+--- a/src/libopts/m4/libopts.m4
++++ b/src/libopts/m4/libopts.m4
+@@ -487,9 +487,9 @@ AC_DEFUN([LIBOPTS_CHECK_COMMON],[
+     fi])
+ 
+   AC_ARG_ENABLE([libopts-install],
+-    AC_HELP_STRING([--disable-libopts-install],
+-       [Do not install libopts with client installation]))
+-  AM_CONDITIONAL([INSTALL_LIBOPTS],[test "X${enable_libopts_install}" != Xno])
++    AC_HELP_STRING([--enable-libopts-install],
++       [Install libopts with client installation]))
++  AM_CONDITIONAL([INSTALL_LIBOPTS],[test "X${enable_libopts_install}" = Xyes])
+ 
+   [if test -z "${NEED_LIBOPTS_DIR}" ; then]
+      AC_MSG_CHECKING([whether autoopts-config can be found])
diff --git a/extra/htop/ChangeLog b/extra/htop/ChangeLog
index df71cf644..94fd62244 100644
--- a/extra/htop/ChangeLog
+++ b/extra/htop/ChangeLog
@@ -1,3 +1,6 @@
+2012-02-19  Angel Velasquez <angvp@archlinux.org>
+	* Version bump to 1.0.1
+
 2011-10-19  Andrea Scarpino <andrea@archlinux.org>
     * Enable cgroup support (FS#26155)
     * Add lsof and strace optional depends (FS#25778)
diff --git a/extra/htop/PKGBUILD b/extra/htop/PKGBUILD
index 33979e0c0..3f17df113 100644
--- a/extra/htop/PKGBUILD
+++ b/extra/htop/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 143218 2011-11-23 13:59:27Z angvp $
+# $Id: PKGBUILD 150717 2012-02-21 01:27:23Z angvp $
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=htop
-pkgver=1.0
+pkgver=1.0.1
 pkgrel=1
 pkgdesc="Interactive process viewer"
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ optdepends=('lsof' 'strace')
 options=('!emptydirs')
 changelog=ChangeLog
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('325112ca7947ea1f6d6441f631e00384')
+md5sums=('d3b80d905a6bff03f13896870787f901')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD
index be826fe97..eefafb29f 100644
--- a/extra/inkscape/PKGBUILD
+++ b/extra/inkscape/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 150261 2012-02-16 04:08:19Z bisson $
+# $Id: PKGBUILD 150685 2012-02-20 07:56:26Z bisson $
 # Contributor: tobias <tobias@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=inkscape
-pkgver=0.48.3
+pkgver=0.48.3.1
 pkgrel=1
 pkgdesc='Vector graphics editor using the SVG file format'
 url='http://inkscape.sourceforge.net/'
 license=('GPL' 'LGPL')
 arch=('i686' 'x86_64')
-makedepends=('boost' 'pkg-config' 'intltool')
-depends=('gc' 'gtkmm' 'poppler-glib' 'libxslt' 'gsl' 'popt' 'python2'
-         'gtkspell' 'imagemagick' 'desktop-file-utils' 'hicolor-icon-theme')
+makedepends=('boost' 'intltool')
+depends=('gc' 'gsl' 'gtkmm' 'gtkspell' 'imagemagick' 'libxslt' 'poppler-glib' 'popt'
+         'python2' 'desktop-file-utils' 'hicolor-icon-theme')
 optdepends=('pstoedit: latex formulas'
             'texlive-core: latex formulas'
             'python2-numpy: some extensions'
@@ -22,7 +22,7 @@ optdepends=('pstoedit: latex formulas'
 options=('!libtool')
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
         'libpng15.patch')
-sha1sums=('937c1376bb0d9c00b22b88525826257d67ce237b'
+sha1sums=('9a09a97d184e09c2ee7f9956bfe073b7313e919e'
           'd6512f3cb38ca8e2436dc485aa652490d17b3a52')
 
 install=install
@@ -42,8 +42,6 @@ build() {
 		--prefix=/usr \
 		--with-python \
 		--with-perl \
-		--without-gnome-vfs \
-		--with-xft \
 		--enable-lcms \
 		--enable-poppler-cairo \
 		--disable-dependency-tracking \
diff --git a/extra/libpng/PKGBUILD b/extra/libpng/PKGBUILD
index df660bafa..d9e496b3d 100644
--- a/extra/libpng/PKGBUILD
+++ b/extra/libpng/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 150423 2012-02-17 13:27:22Z ibiru $
+# $Id: PKGBUILD 150693 2012-02-20 11:05:39Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Travis Willard <travis@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=libpng
-pkgver=1.5.8
-_apngver=1.5.8
-pkgrel=2
+pkgver=1.5.9
+_apngver=1.5.9
+pkgrel=1
 pkgdesc="A collection of routines used to create PNG format graphics files"
 arch=('i686' 'x86_64')
 url="http://www.libpng.org/pub/png/libpng.html"
@@ -15,11 +15,9 @@ license=('custom')
 depends=('zlib' 'sh')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz"
-        "http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-$_apngver-apng.patch.gz"
-        CVE-2011-3026.patch)
-md5sums=('0f7ae352beadaff78073733905613041'
-         '158772fecdc6d8591bcd382c04da334c'
-         'e3f19c889e57135eed66d0a3a22e2912')
+        "http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-$_apngver-apng.patch.gz")
+md5sums=('05d9ab3705c34954c0032b71318b678a'
+         '268f7db97b292d5f14a24ea7940f6f1c')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -28,9 +26,6 @@ build() {
   # see http://sourceforge.net/projects/libpng-apng/
   patch -p1 -i "$srcdir/libpng-$_apngver-apng.patch"
 
-  #CVE-2011-3026
-  patch -Np1 -i "$srcdir/CVE-2011-3026.patch"
-
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/monodevelop-debugger-gdb/PKGBUILD b/extra/monodevelop-debugger-gdb/PKGBUILD
index fb6bb316e..a53c4565c 100644
--- a/extra/monodevelop-debugger-gdb/PKGBUILD
+++ b/extra/monodevelop-debugger-gdb/PKGBUILD
@@ -1,16 +1,16 @@
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 
 pkgname=monodevelop-debugger-gdb
-pkgver=2.8.6.3
+pkgver=2.8.6.5
 pkgrel=1
 pkgdesc="Mono Debugger support"
 arch=('i686' 'x86_64')
 url="http://monodevelop.com"
 license=('GPL')
-depends=('monodevelop>=2.8.6.3' 'gdb')
+depends=('monodevelop>=2.8.6.5' 'gdb')
 makedepends=('mono')
 source=(http://download.mono-project.com/sources/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('fe3ffc78fdac028aece6cd2cde0bccc3')
+md5sums=('352f387e0563dba2617f92efd71d0fb6')
 
 build() {
   export MONO_SHARED_DIR="${srcdir}/.wabi"
diff --git a/extra/monodevelop/PKGBUILD b/extra/monodevelop/PKGBUILD
index c0e3aedc0..9bed37472 100644
--- a/extra/monodevelop/PKGBUILD
+++ b/extra/monodevelop/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=monodevelop
-pkgver=2.8.6.3
+pkgver=2.8.6.5
 pkgrel=1
 pkgdesc="An IDE primarily designed for C# and other .NET languages"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('mono>=2.10.5' 'mono-addins>=0.6.2' 'gnome-sharp' 'gecko-sharp-2.0>=0.1
 options=(!makeflags)
 install=monodevelop.install
 source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('54f55372d856206244a1580a2ac70859')
+md5sums=('5b4b2d17bd400592e680ec1553449f69')
 
 build() {
   export MONO_SHARED_DIR=$srcdir/src/.wabi
diff --git a/extra/ncmpc/PKGBUILD b/extra/ncmpc/PKGBUILD
index 901e9f73f..63fdf1565 100644
--- a/extra/ncmpc/PKGBUILD
+++ b/extra/ncmpc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 132708 2011-07-25 01:06:16Z angvp $
+# $Id: PKGBUILD 150715 2012-02-21 01:22:44Z angvp $
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Daniel Bainton <dpb [at] backarrow.org>
 
 pkgname=ncmpc
-pkgver=0.19
+pkgver=0.20
 pkgrel=1
 pkgdesc="A ncurses (command line) interface for MPD"
 arch=("i686" "x86_64")
@@ -15,7 +15,7 @@ depends=('ncurses' 'glib2' 'libmpdclient')
 optdepends=('python2: to enable lyrics plugin'
 	'ruby: to enable lyrics plugin')
 source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('d298ad1313ef3a522ef03367f8a1ffc0')
+md5sums=('62b9df0263d9567babf7446c258acc5d')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/ntp/PKGBUILD b/extra/ntp/PKGBUILD
index 8da3f4178..d928156f3 100644
--- a/extra/ntp/PKGBUILD
+++ b/extra/ntp/PKGBUILD
@@ -1,28 +1,30 @@
-# $Id: PKGBUILD 145791 2012-01-01 01:38:19Z bisson $
+# $Id: PKGBUILD 150713 2012-02-21 01:06:35Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: kevin <kevin@archlinux.org>
 
 pkgname=ntp
 pkgver=4.2.6.p5
 _realver=4.2.6p5
-pkgrel=2
+pkgrel=3
 pkgdesc='Network Time Protocol reference implementation'
 url='http://www.ntp.org/'
 license=('custom')
 arch=('i686' 'x86_64')
-depends=('openssl' 'readline' 'libcap')
 makedepends=('perl-html-parser')
+depends=('openssl' 'readline' 'libcap')
 backup=('etc/ntp.conf' 'etc/conf.d/ntpd.conf')
 source=("http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${_realver}.tar.gz"
         'ntpd'
         'ntpdate'
         'ntp.conf'
-        'ntpd.conf')
+        'ntpd.conf'
+        'logrotate.d')
 sha1sums=('4a5353a4791b6f4315a66c28d504ec6c7926b192'
           '4e324e625c1f080b5c028be5092aa71adbf9bd99'
           '01394b8a952f5edc85d19df8335eeac3980320f4'
           'f6fa4838a33a3abcdd168a37b3f4a2dddd60472e'
-          '6cfcb7bbd34499b30e31dffca2f3e1a036010271')
+          '6cfcb7bbd34499b30e31dffca2f3e1a036010271'
+          '4f76f7f9ffc8315ff9924f793f272d4f6939b816')
 
 install=install
 
@@ -42,21 +44,18 @@ package() {
 
 	make DESTDIR="${pkgdir}" install
 
+	rmdir "${pkgdir}"/usr/{lib,sbin}
+	install -d "${pkgdir}"/var/lib/ntp
 	install -Dm755 ../ntpd "${pkgdir}"/etc/rc.d/ntpd
 	install -Dm755 ../ntpdate "${pkgdir}"/etc/rc.d/ntpdate
 	install -Dm644 ../ntp.conf "${pkgdir}"/etc/ntp.conf
 	install -Dm644 ../ntpd.conf "${pkgdir}"/etc/conf.d/ntpd.conf
-
+	install -Dm644 ../logrotate.d "${pkgdir}"/etc/logrotate.d/ntpd
+	install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+	
 	cd html
 	../scripts/html2man
 	install -d "${pkgdir}"/usr/share/man
 	mv man/man* "${pkgdir}"/usr/share/man
 	mv "${pkgdir}/usr/share/man/man8/ntpd.8" "${pkgdir}/usr/share/man/man8/ntp-ntpd.8" # we should ditch openntpd
-	cd ..
-
-	rmdir "${pkgdir}"/usr/{lib,sbin}
-	install -d "${pkgdir}/var/lib/ntp"
-	install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
-	touch "${pkgdir}"/var/lib/ntp/.placeholder
 }
diff --git a/extra/ntp/logrotate.d b/extra/ntp/logrotate.d
new file mode 100644
index 000000000..8a9f066c3
--- /dev/null
+++ b/extra/ntp/logrotate.d
@@ -0,0 +1,4 @@
+/var/log/ntp.log {
+	missingok
+	copytruncate
+}
diff --git a/extra/totem/PKGBUILD b/extra/totem/PKGBUILD
index 2ab70e259..c164aa418 100644
--- a/extra/totem/PKGBUILD
+++ b/extra/totem/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 140955 2011-10-20 05:44:18Z ibiru $
+# $Id: PKGBUILD 150691 2012-02-20 11:01:31Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=totem
 pkgname=('totem' 'totem-plugin')
-pkgver=3.2.1
+pkgver=3.2.2
 pkgrel=1
 pkgdesc="A GNOME3 integrated movie player based on Gstreamer."
 url="http://www.gnome.org"
@@ -13,14 +13,14 @@ depends=('gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'totem-plpars
          'libxtst' 'desktop-file-utils' 'iso-codes' 'python2' 'libpeas' 'hicolor-icon-theme'
          'gnome-icon-theme-symbolic' 'gsettings-desktop-schemas' 'dconf' 'clutter-gst'
          'clutter-gtk' 'mx')
-makedepends=('intltool' 'gtk-doc' 'python2-gobject' 'nautilus' 'libgdata' 'xulrunner' 'lirc-utils'
+makedepends=('intltool' 'gtk-doc' 'python2-gobject' 'nautilus' 'libgdata' 'lirc-utils'
              'libepc' 'bluez' 'vala' 'grilo')
 options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz)
-sha256sums=('e3af3281bde6666af4c7f9594b090087657b06c98e96212b11531269e2ee40a4')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
+sha256sums=('b065e486e6b70b27d3a589e70c5459ff16a7affeff0b219ead5942585d4d0c9a')
 
 build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd "$srcdir/$pkgbase-$pkgver"
   ./configure --prefix=/usr \
     --sysconfdir=/etc \
     --libexecdir=/usr/lib/totem \
@@ -44,27 +44,27 @@ package_totem() {
               'grilo-plugins: Browse sidebar (remote media)'
               'pyxdg: opensubtitles plugin')
 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd "$srcdir/$pkgbase-$pkgver"
   make DESTDIR="${pkgdir}" install
 
-  rm -r "${pkgdir}/usr/lib/mozilla"
+  rm -r "$pkgdir/usr/lib/mozilla"
   rm "${pkgdir}/usr/lib/totem/totem-plugin-viewer"
 
   sed -i "s|#!/usr/bin/python$|#!/usr/bin/python2|" \
     $pkgdir/usr/lib/totem/{totem/totem-bugreport.py,plugins/iplayer/iplayer2.py}
 
-  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/totem/COPYING"
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/totem/COPYING"
 }
 
 package_totem-plugin() {
   pkgdesc="Totem plugin for web browsers"
-  depends=("totem=${pkgver}")
+  depends=("totem=$pkgver")
 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd "$srcdir/$pkgbase-$pkgver"
   make -C browser-plugin \
     plugindir=/usr/lib/mozilla/plugins \
     xptdir=/usr/lib/mozilla/plugins \
-    DESTDIR="${pkgdir}" install
+    DESTDIR="$pkgdir" install
 
-  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/totem-plugin/COPYING"
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/totem-plugin/COPYING"
 }
diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD
index 2d43a286b..675c7f5b3 100644
--- a/extra/transmission/PKGBUILD
+++ b/extra/transmission/PKGBUILD
@@ -1,28 +1,25 @@
-# $Id: PKGBUILD 146293 2012-01-08 17:03:43Z ibiru $
+# $Id: PKGBUILD 150701 2012-02-20 20:48:33Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=transmission
 pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt')
-pkgver=2.42
-pkgrel=2
+pkgver=2.50
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.transmissionbt.com/"
 license=('MIT')
 makedepends=('gtk3' 'intltool' 'curl' 'qt' 'libevent')
 source=(http://mirrors.m0k.org/transmission/files/$pkgbase-$pkgver.tar.xz
         transmissiond transmissiond.conf
-        0001-gtk-conf-set-correct-download-dir-default.patch
-        fix_minimize.patch)
-md5sums=('50f6dd76c5c01f45d5ed20783c686815'
+	0001-gtk-conf-set-correct-download-dir-default.patch)
+md5sums=('07606789fab2f9730fa454cfc7a04b2d'
          '08875299e3fbb68fc546c1f350ac1f06'
          'be39806c35b7544856fa4070b00fc960'
-         'f9fae46f5aa9ed3a22af64091604c6d0'
-         'bd764dea56aaf69757762ea1a4c92be2')
+         'f9fae46f5aa9ed3a22af64091604c6d0')
 build() {
   cd "$srcdir/$pkgbase-$pkgver"
 
   patch -Np1 -i "$srcdir/0001-gtk-conf-set-correct-download-dir-default.patch"
-  patch -Np2 -i "$srcdir/fix_minimize.patch"
 
   ./configure --prefix=/usr
   make
diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD
index 94fd22800..90df2d6b5 100644
--- a/kernels/linux-libre-xen/PKGBUILD
+++ b/kernels/linux-libre-xen/PKGBUILD
@@ -3,13 +3,14 @@
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
 # Maintainer (Parabola): Sorin-Mihai Vârgolici <smv@yobicore.org>
+# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
 
 pkgbase=linux-libre-xen
 pkgname=('linux-libre-xen' 'linux-libre-xen-headers' 'linux-libre-xen-docs') # Build stock -LIBRE kernel
 # pkgname=linux-custom       # Build kernel with a different name
 _kernelname=${pkgname#linux-libre}
-_basekernel=3.1
-pkgver=${_basekernel}.5
+_basekernel=3.2
+pkgver=${_basekernel}.6
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://linux-libre.fsfla.org/"
@@ -25,8 +26,16 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-li
         'boot-logo.patch'
         'change-default-console-loglevel.patch'
         'i915-fix-ghost-tv-output.patch'
-        'i915-fix-incorrect-error-message.patch'
-        'usb-add-reset-resume-quirk-for-several-webcams.patch')
+	'i915-gpu-finish.patch')
+md5sums=('27c641c4f6785fc647cdd3e44963a55c'
+         'c4b411e90294fcb768d5242a6c21c0d7'
+         '79d5dd186fd129aad90a880317201619'
+         '4964d8e664925afe9a148db701cce725'
+         '67463f7a6e88305d7cd14a430e9efe92'
+         '04b21c79df0a952c22d681dd4f4562df'
+         '9d3c56a4b999c8bfbd4018089a62f662'
+         '263725f20c0b9eb9c353040792d644e5'
+	 '4cd79aa147825837dc8bc9f6b736c0a0')
 
 build() {
   cd "${srcdir}/linux-${_basekernel}"
@@ -36,6 +45,10 @@ build() {
   # Add freedo as boot logo
   patch -Np1 -i "${srcdir}/boot-logo.patch"
 
+  # fix FS#27883
+  # drm/i915: Only clear the GPU domains upon a successful finish
+  patch -Np1 -i "${srcdir}/i915-gpu-finish.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
@@ -45,15 +58,6 @@ build() {
   # needed.
   patch -Np1 -i "${srcdir}/i915-fix-ghost-tv-output.patch"
 
-  # In 3.1.1, a DRM_DEBUG message is falsely declared as DRM_ERROR. This
-  # worries users, as this message is displayed even at loglevel 4. Fix
-  # this.
-  patch -Np1 -i "${srcdir}/i915-fix-incorrect-error-message.patch"
-
-  # Add the USB_QUIRK_RESET_RESUME for several webcams
-  # FS#26528
-  patch -Np1 -i "${srcdir}/usb-add-reset-resume-quirk-for-several-webcams.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)
@@ -86,7 +90,7 @@ build() {
   #return 1
   ####################
 
-  yes "" | make config
+  yes "" | make
 
   # build!
   make ${MAKEFLAGS} bzImage modules
diff --git a/kernels/linux-libre-xen/config.i686 b/kernels/linux-libre-xen/config.i686
index 6762f896e..7973b2fe0 100644
--- a/kernels/linux-libre-xen/config.i686
+++ b/kernels/linux-libre-xen/config.i686
@@ -1,6 +1,6 @@
 #
-# Automatically generated make config: don't edit
-# Linux/i386 3.0.0 Kernel Configuration
+# Automatically generated file; DO NOT EDIT.
+# Linux/i386 3.2.6-libre Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -37,7 +37,6 @@ CONFIG_ARCH_HAS_CACHE_LINE_SIZE=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
@@ -100,20 +99,20 @@ CONFIG_HAVE_SPARSE_IRQ=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_IRQ_SHOW=y
 CONFIG_GENERIC_PENDING_IRQ=y
+CONFIG_GENERIC_IRQ_CHIP=y
 CONFIG_IRQ_FORCED_THREADING=y
-# CONFIG_SPARSE_IRQ is not set
+CONFIG_SPARSE_IRQ=y
 
 #
 # RCU Subsystem
 #
-CONFIG_TREE_RCU=y
-# CONFIG_TREE_PREEMPT_RCU is not set
-# CONFIG_PREEMPT_RCU is not set
+CONFIG_TREE_PREEMPT_RCU=y
+CONFIG_PREEMPT_RCU=y
 # CONFIG_RCU_TRACE is not set
 CONFIG_RCU_FANOUT=32
 # CONFIG_RCU_FANOUT_EXACT is not set
-# CONFIG_RCU_FAST_NO_HZ is not set
 # CONFIG_TREE_RCU_TRACE is not set
+# CONFIG_RCU_BOOST is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=19
@@ -132,6 +131,7 @@ CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
 # 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
@@ -157,7 +157,7 @@ CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=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
@@ -165,6 +165,7 @@ CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_PCSPKR_PLATFORM=y
+CONFIG_HAVE_PCSPKR_PLATFORM=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
@@ -211,6 +212,7 @@ CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
 CONFIG_HAVE_USER_RETURN_NOTIFIER=y
 CONFIG_HAVE_PERF_EVENTS_NMI=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
 
 #
 # GCOV-based kernel profiling
@@ -224,12 +226,13 @@ CONFIG_MODULES=y
 CONFIG_MODULE_FORCE_LOAD=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
-# CONFIG_MODVERSIONS is not set
+CONFIG_MODVERSIONS=y
 # CONFIG_MODULE_SRCVERSION_ALL 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
 
@@ -252,27 +255,27 @@ CONFIG_PADATA=y
 # 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 is not set
 # CONFIG_INLINE_SPIN_UNLOCK_BH is not set
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
 # 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 is not set
 # CONFIG_INLINE_READ_UNLOCK_BH is not set
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
+# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
 # 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 is not set
 # CONFIG_INLINE_WRITE_UNLOCK_BH is not set
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
 # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
 # CONFIG_MUTEX_SPIN_ON_OWNER is not set
 CONFIG_FREEZER=y
@@ -284,6 +287,7 @@ CONFIG_TICK_ONESHOT=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
 CONFIG_SMP=y
 CONFIG_X86_MPPARSE=y
 # CONFIG_X86_BIGSMP is not set
@@ -292,6 +296,7 @@ CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_X86_32_IRIS=m
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_PARAVIRT_GUEST=y
+# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
 CONFIG_XEN=y
 CONFIG_XEN_DOM0=y
 CONFIG_XEN_PRIVILEGED_GUEST=y
@@ -299,7 +304,6 @@ CONFIG_XEN_PVHVM=y
 CONFIG_XEN_MAX_DOMAIN_MEMORY=128
 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_LGUEST_GUEST=y
@@ -338,6 +342,7 @@ CONFIG_X86_GENERIC=y
 CONFIG_X86_INTERNODE_CACHE_SHIFT=6
 CONFIG_X86_CMPXCHG=y
 CONFIG_CMPXCHG_LOCAL=y
+CONFIG_CMPXCHG_DOUBLE=y
 CONFIG_X86_L1_CACHE_SHIFT=6
 CONFIG_X86_XADD=y
 # CONFIG_X86_PPRO_FENCE is not set
@@ -363,14 +368,14 @@ CONFIG_HPET_EMULATE_RTC=y
 CONFIG_DMI=y
 CONFIG_SWIOTLB=y
 CONFIG_IOMMU_HELPER=y
-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_NONE is not set
 # CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_PREEMPT 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
@@ -391,13 +396,14 @@ CONFIG_MICROCODE_AMD=y
 CONFIG_MICROCODE_OLD_INTERFACE=y
 CONFIG_X86_MSR=m
 CONFIG_X86_CPUID=m
-CONFIG_NOHIGHMEM=y
+# CONFIG_NOHIGHMEM is not set
 # CONFIG_HIGHMEM4G is not set
-# CONFIG_HIGHMEM64G is not set
+CONFIG_HIGHMEM64G=y
 CONFIG_PAGE_OFFSET=0xC0000000
+CONFIG_HIGHMEM=y
 CONFIG_X86_PAE=y
 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
-# CONFIG_ARCH_DMA_ADDR_T_64BIT is not set
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 CONFIG_ARCH_FLATMEM_ENABLE=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
@@ -427,6 +433,7 @@ CONFIG_TRANSPARENT_HUGEPAGE=y
 CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
 # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
 CONFIG_CLEANCACHE=y
+# CONFIG_HIGHPTE is not set
 CONFIG_X86_CHECK_BIOS_CORRUPTION=y
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
 CONFIG_X86_RESERVE_LOW=64
@@ -437,6 +444,7 @@ 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_EFI=y
 CONFIG_SECCOMP=y
 CONFIG_CC_STACKPROTECTOR=y
@@ -447,6 +455,7 @@ CONFIG_HZ_300=y
 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
@@ -455,6 +464,7 @@ CONFIG_PHYSICAL_ALIGN=0x100000
 CONFIG_HOTPLUG_CPU=y
 # CONFIG_COMPAT_VDSO is not set
 # CONFIG_CMDLINE_BOOL is not set
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 
 #
 # Power management and ACPI options
@@ -475,10 +485,10 @@ CONFIG_CAN_PM_TRACE=y
 # CONFIG_PM_TRACE_RTC is not set
 CONFIG_ACPI=y
 CONFIG_ACPI_SLEEP=y
-CONFIG_ACPI_PROCFS=y
-CONFIG_ACPI_PROCFS_POWER=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
@@ -497,11 +507,12 @@ CONFIG_ACPI_PCI_SLOT=m
 CONFIG_X86_PM_TIMER=y
 CONFIG_ACPI_CONTAINER=m
 CONFIG_ACPI_SBS=m
-CONFIG_ACPI_HED=m
+CONFIG_ACPI_HED=y
 CONFIG_ACPI_CUSTOM_METHOD=m
 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
@@ -566,7 +577,6 @@ 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
@@ -574,9 +584,6 @@ 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_PCIEPORTBUS=y
 CONFIG_HOTPLUG_PCI_PCIE=m
 CONFIG_PCIEAER=y
@@ -589,9 +596,12 @@ CONFIG_ARCH_SUPPORTS_MSI=y
 CONFIG_PCI_MSI=y
 # CONFIG_PCI_DEBUG is not set
 CONFIG_PCI_STUB=m
-CONFIG_XEN_PCIDEV_FRONTEND=y
+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
@@ -599,6 +609,7 @@ CONFIG_ISA=y
 # CONFIG_EISA is not set
 # CONFIG_MCA is not set
 # CONFIG_SCx200 is not set
+CONFIG_ALIX=y
 CONFIG_AMD_NB=y
 CONFIG_PCCARD=m
 CONFIG_PCMCIA=m
@@ -632,14 +643,15 @@ 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_DEBUG=y
 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
@@ -859,6 +871,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
@@ -1043,6 +1056,7 @@ CONFIG_IPDDP_DECAP=y
 # CONFIG_WAN_ROUTER is not set
 CONFIG_PHONET=m
 CONFIG_IEEE802154=m
+CONFIG_IEEE802154_6LOWPAN=m
 CONFIG_NET_SCHED=y
 
 #
@@ -1250,6 +1264,16 @@ CONFIG_CAIF=m
 CONFIG_CAIF_NETDEV=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
+
+#
+# Near Field Communication (NFC) devices
+#
+CONFIG_PN544_NFC=m
+CONFIG_NFC_PN533=m
+CONFIG_NFC_WILINK=m
 
 #
 # Device Drivers
@@ -1269,12 +1293,18 @@ CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 CONFIG_SYS_HYPERVISOR=y
-CONFIG_CONNECTOR=m
+CONFIG_REGMAP=y
+CONFIG_REGMAP_I2C=m
+CONFIG_REGMAP_SPI=y
+CONFIG_CONNECTOR=y
+CONFIG_PROC_EVENTS=y
 CONFIG_MTD=m
-# CONFIG_MTD_DEBUG is not set
 CONFIG_MTD_TESTS=m
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_AR7_PARTS is not set
+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_AR7_PARTS=m
 
 #
 # User Modules And Translation Layers
@@ -1282,21 +1312,24 @@ CONFIG_MTD_TESTS=m
 CONFIG_MTD_CHAR=m
 CONFIG_MTD_BLKDEVS=m
 CONFIG_MTD_BLOCK=m
-# CONFIG_MTD_BLOCK_RO is not set
-# CONFIG_FTL is not set
-# CONFIG_NFTL is not set
-# CONFIG_INFTL is not set
-# CONFIG_RFD_FTL is not set
-# CONFIG_SSFDC is not set
-CONFIG_SM_FTL=m
-# CONFIG_MTD_OOPS is not set
+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 is not set
-# CONFIG_MTD_JEDECPROBE is not set
+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
@@ -1307,29 +1340,52 @@ 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 is not set
-# CONFIG_MTD_ABSENT is not set
+CONFIG_MTD_ROM=m
+CONFIG_MTD_ABSENT=m
 
 #
 # Mapping drivers for chip access
 #
-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-# CONFIG_MTD_TS5500 is not set
+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 is not set
+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=m
-CONFIG_MTD_SLRAM=m
+# CONFIG_MTD_SST25L is not set
+# CONFIG_MTD_SLRAM is not set
 CONFIG_MTD_PHRAM=m
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_BLOCK2MTD is not set
+CONFIG_MTD_MTDRAM=m
+CONFIG_MTDRAM_TOTAL_SIZE=4096
+CONFIG_MTDRAM_ERASE_SIZE=128
+CONFIG_MTD_BLOCK2MTD=m
 
 #
 # Disk-On-Chip Device Drivers
@@ -1337,16 +1393,38 @@ CONFIG_MTD_PHRAM=m
 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
+CONFIG_MTD_DOCG3=m
 CONFIG_MTD_NAND_ECC=m
 CONFIG_MTD_NAND_ECC_SMC=y
-# CONFIG_MTD_NAND is not set
+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
+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_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 is not set
-# CONFIG_MTD_UBI is not set
+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_GLUEBI is not set
+# CONFIG_MTD_UBI_DEBUG is not set
 CONFIG_PARPORT=m
 CONFIG_PARPORT_PC=m
 CONFIG_PARPORT_SERIAL=m
@@ -1377,6 +1455,7 @@ 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
@@ -1392,8 +1471,8 @@ 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=y
-# CONFIG_XEN_BLKDEV_BACKEND is not set
+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
@@ -1427,6 +1506,7 @@ CONFIG_TI_DAC7512=m
 CONFIG_VMWARE_BALLOON=m
 CONFIG_BMP085=m
 # CONFIG_PCH_PHUB is not set
+CONFIG_USB_SWITCH_FSA9480=m
 CONFIG_C2PORT=m
 CONFIG_C2PORT_DURAMAR_2150=m
 
@@ -1438,6 +1518,7 @@ CONFIG_EEPROM_AT25=m
 CONFIG_EEPROM_LEGACY=m
 CONFIG_EEPROM_MAX6875=m
 CONFIG_EEPROM_93CX6=m
+CONFIG_EEPROM_93XX46=m
 CONFIG_CB710_CORE=m
 # CONFIG_CB710_DEBUG is not set
 CONFIG_CB710_DEBUG_ASSUMPTIONS=y
@@ -1450,90 +1531,13 @@ CONFIG_IWMC3200TOP=m
 #
 CONFIG_TI_ST=m
 CONFIG_SENSORS_LIS3_I2C=m
+
+#
+# Altera FPGA firmware download module
+#
+CONFIG_ALTERA_STAPL=m
 CONFIG_HAVE_IDE=y
-CONFIG_IDE=m
-
-#
-# Please see Documentation/ide/ide.txt for help/info on IDE drives
-#
-CONFIG_IDE_XFER_MODE=y
-CONFIG_IDE_TIMINGS=y
-CONFIG_IDE_ATAPI=y
-CONFIG_IDE_LEGACY=y
-# CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_IDE_GD=m
-CONFIG_IDE_GD_ATA=y
-CONFIG_IDE_GD_ATAPI=y
-CONFIG_BLK_DEV_IDECS=m
-CONFIG_BLK_DEV_DELKIN=m
-CONFIG_BLK_DEV_IDECD=m
-CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
-CONFIG_BLK_DEV_IDETAPE=m
-CONFIG_BLK_DEV_IDEACPI=y
-# CONFIG_IDE_TASK_IOCTL is not set
-CONFIG_IDE_PROC_FS=y
-
-#
-# IDE chipset support/bugfixes
-#
-CONFIG_IDE_GENERIC=m
-CONFIG_BLK_DEV_PLATFORM=m
-CONFIG_BLK_DEV_CMD640=m
-# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
-CONFIG_BLK_DEV_IDEPNP=m
-CONFIG_BLK_DEV_IDEDMA_SFF=y
-
-#
-# PCI IDE chipsets support
-#
-CONFIG_BLK_DEV_IDEPCI=y
-# CONFIG_BLK_DEV_OFFBOARD is not set
-CONFIG_BLK_DEV_GENERIC=m
-CONFIG_BLK_DEV_OPTI621=m
-CONFIG_BLK_DEV_RZ1000=m
-CONFIG_BLK_DEV_IDEDMA_PCI=y
-CONFIG_BLK_DEV_AEC62XX=m
-CONFIG_BLK_DEV_ALI15X3=m
-CONFIG_BLK_DEV_AMD74XX=m
-CONFIG_BLK_DEV_ATIIXP=m
-CONFIG_BLK_DEV_CMD64X=m
-CONFIG_BLK_DEV_TRIFLEX=m
-CONFIG_BLK_DEV_CS5520=m
-CONFIG_BLK_DEV_CS5530=m
-CONFIG_BLK_DEV_CS5535=m
-CONFIG_BLK_DEV_CS5536=m
-CONFIG_BLK_DEV_HPT366=m
-CONFIG_BLK_DEV_JMICRON=m
-CONFIG_BLK_DEV_SC1200=m
-CONFIG_BLK_DEV_PIIX=m
-CONFIG_BLK_DEV_IT8172=m
-CONFIG_BLK_DEV_IT8213=m
-CONFIG_BLK_DEV_IT821X=m
-CONFIG_BLK_DEV_NS87415=m
-CONFIG_BLK_DEV_PDC202XX_OLD=m
-CONFIG_BLK_DEV_PDC202XX_NEW=m
-CONFIG_BLK_DEV_SVWKS=m
-CONFIG_BLK_DEV_SIIMAGE=m
-CONFIG_BLK_DEV_SIS5513=m
-CONFIG_BLK_DEV_SLC90E66=m
-CONFIG_BLK_DEV_TRM290=m
-CONFIG_BLK_DEV_VIA82CXXX=m
-CONFIG_BLK_DEV_TC86C001=m
-
-#
-# Other IDE chipsets support
-#
-
-#
-# Note: most of these also require special kernel boot parameters
-#
-CONFIG_BLK_DEV_4DRIVES=m
-CONFIG_BLK_DEV_ALI14XX=m
-CONFIG_BLK_DEV_DTC2278=m
-CONFIG_BLK_DEV_HT6560B=m
-CONFIG_BLK_DEV_QD65XX=m
-CONFIG_BLK_DEV_UMC8672=m
-CONFIG_BLK_DEV_IDEDMA=y
+# CONFIG_IDE is not set
 
 #
 # SCSI device support
@@ -1610,11 +1614,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
@@ -1810,8 +1815,13 @@ CONFIG_MD_MULTIPATH=m
 CONFIG_MD_FAULTY=m
 CONFIG_BLK_DEV_DM=m
 # CONFIG_DM_DEBUG is not set
+CONFIG_DM_BUFIO=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_DEBUG_SPACE_MAPS is not set
 CONFIG_DM_MIRROR=m
 CONFIG_DM_RAID=m
 CONFIG_DM_LOG_USERSPACE=m
@@ -1827,8 +1837,8 @@ 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_FUSION=y
 CONFIG_FUSION_SPI=m
 CONFIG_FUSION_FC=m
@@ -1849,6 +1859,7 @@ 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
@@ -1858,62 +1869,119 @@ 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_IEEE802154_DRIVERS=m
+CONFIG_IEEE802154_FAKEHARD=m
+CONFIG_IFB=m
 CONFIG_MACVLAN=m
 CONFIG_MACVTAP=m
-CONFIG_EQUALIZER=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_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_ENC28J60=m
-# CONFIG_ENC28J60_WRITEVERIFY is not set
-CONFIG_ETHOC=m
-CONFIG_NET_VENDOR_RACAL=y
-CONFIG_NI52=m
+CONFIG_PCNET32=m
+CONFIG_DEPCA=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_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_NET_VENDOR_BROCADE=y
+CONFIG_BNA=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_NET_VENDOR_CISCO=y
+CONFIG_ENIC=m
 CONFIG_DNET=m
+CONFIG_NET_VENDOR_DEC=y
+CONFIG_EWRK3=m
 CONFIG_NET_TULIP=y
 CONFIG_DE2104X=m
 CONFIG_DE2104X_DSL=0
@@ -1926,132 +1994,222 @@ CONFIG_WINBOND_840=m
 CONFIG_DM9102=m
 CONFIG_ULI526X=m
 CONFIG_PCMCIA_XIRCOM=m
+CONFIG_NET_VENDOR_DLINK=y
+CONFIG_DE600=m
+CONFIG_DE620=m
+CONFIG_DL2K=m
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+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_AT1700=m
-CONFIG_DEPCA=m
+CONFIG_PCMCIA_FMVJ18X=m
+CONFIG_ETH16I=m
+CONFIG_NET_VENDOR_HP=y
 CONFIG_HP100=m
-CONFIG_NET_ISA=y
-CONFIG_E2100=m
-CONFIG_EWRK3=m
+CONFIG_NET_VENDOR_INTEL=y
+CONFIG_E100=m
+CONFIG_E1000=m
+CONFIG_E1000E=m
+CONFIG_IGB=m
+CONFIG_IGB_DCA=y
+CONFIG_IGBVF=m
+CONFIG_IXGB=m
+CONFIG_IXGBE=m
+CONFIG_IXGBE_DCA=y
+CONFIG_IXGBEVF=m
+CONFIG_NET_VENDOR_I825XX=y
+CONFIG_ELPLUS=m
+CONFIG_EL16=m
+CONFIG_APRICOT=m
 CONFIG_EEXPRESS=m
 CONFIG_EEXPRESS_PRO=m
-CONFIG_HPLAN_PLUS=m
-CONFIG_HPLAN=m
 CONFIG_LP486E=m
-CONFIG_ETH16I=m
-CONFIG_NE2000=m
+CONFIG_NI52=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_IP1000=m
+CONFIG_JME=m
+CONFIG_NET_VENDOR_MARVELL=y
+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=m
+CONFIG_KS8851_MLL=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_E100=m
+CONFIG_NET_VENDOR_MICROCHIP=y
+CONFIG_ENC28J60=m
+# CONFIG_ENC28J60_WRITEVERIFY 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_EL2=m
+CONFIG_AC3200=m
+CONFIG_PCMCIA_AXNET=m
+CONFIG_E2100=m
+CONFIG_HPLAN_PLUS=m
+CONFIG_HPLAN=m
+CONFIG_NE2000=m
 CONFIG_NE2K_PCI=m
+CONFIG_PCMCIA_PCNET=m
+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_QLGE=m
+CONFIG_NETXEN_NIC=m
+CONFIG_NET_VENDOR_RACAL=y
+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_SEEQ8005=m
+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_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=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_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_STMMAC_RING=y
+# CONFIG_STMMAC_CHAINED is not set
+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_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_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_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_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
 # CONFIG_TR is not set
+
+#
+# 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_WLAN=y
 CONFIG_PCMCIA_RAYCS=m
 CONFIG_LIBERTAS_THINFIRM=m
@@ -2091,7 +2249,11 @@ CONFIG_ATH9K_HTC=m
 CONFIG_CARL9170=m
 CONFIG_CARL9170_LEDS=y
 CONFIG_CARL9170_WPC=y
+# CONFIG_CARL9170_HWRNG is not set
+CONFIG_ATH6KL=m
+# CONFIG_ATH6KL_DEBUG is not set
 CONFIG_B43=m
+CONFIG_B43_SSB=y
 CONFIG_B43_PCI_AUTOSELECT=y
 CONFIG_B43_PCICORE_AUTOSELECT=y
 CONFIG_B43_PCMCIA=y
@@ -2099,6 +2261,7 @@ CONFIG_B43_SDIO=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
@@ -2113,6 +2276,10 @@ 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_BRCMDBG is not set
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
 # CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
@@ -2130,7 +2297,7 @@ CONFIG_IPW2200_QOS=y
 # CONFIG_IPW2200_DEBUG is not set
 CONFIG_LIBIPW=m
 # CONFIG_LIBIPW_DEBUG is not set
-CONFIG_IWLAGN=m
+CONFIG_IWLWIFI=m
 
 #
 # Debugging Options
@@ -2138,7 +2305,6 @@ CONFIG_IWLAGN=m
 # CONFIG_IWLWIFI_DEBUG is not set
 CONFIG_IWLWIFI_DEVICE_TRACING=y
 CONFIG_IWLWIFI_DEVICE_SVTOOL=y
-CONFIG_IWL_P2P=y
 CONFIG_IWLWIFI_LEGACY=m
 
 #
@@ -2199,6 +2365,7 @@ CONFIG_RT2X00_LIB_LEDS=y
 # CONFIG_RT2X00_DEBUG is not set
 CONFIG_RTL8192CE=m
 CONFIG_RTL8192SE=m
+CONFIG_RTL8192DE=m
 CONFIG_RTL8192CU=m
 CONFIG_RTLWIFI=m
 CONFIG_RTL8192C_COMMON=m
@@ -2207,7 +2374,6 @@ CONFIG_WL1251_SPI=m
 CONFIG_WL1251_SDIO=m
 CONFIG_WL12XX_MENU=m
 CONFIG_WL12XX=m
-CONFIG_WL12XX_HT=y
 CONFIG_WL12XX_SPI=m
 CONFIG_WL12XX_SDIO=m
 CONFIG_WL12XX_SDIO_TEST=m
@@ -2216,6 +2382,7 @@ CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
 CONFIG_MWIFIEX=m
 CONFIG_MWIFIEX_SDIO=m
+CONFIG_MWIFIEX_PCIE=m
 
 #
 # WiMAX Wireless Broadband devices
@@ -2225,124 +2392,9 @@ 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_XEN_NETDEV_FRONTEND=y
-# CONFIG_XEN_NETDEV_BACKEND is not set
-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_XEN_NETDEV_FRONTEND=m
+CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_VMXNET3=m
 CONFIG_ISDN=y
 CONFIG_ISDN_I4L=m
@@ -2642,6 +2694,7 @@ CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
 CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
 CONFIG_TOUCHSCREEN_USB_NEXIO=y
 CONFIG_TOUCHSCREEN_TOUCHIT213=m
+CONFIG_TOUCHSCREEN_TSC_SERIO=m
 CONFIG_TOUCHSCREEN_TSC2005=m
 CONFIG_TOUCHSCREEN_TSC2007=m
 CONFIG_TOUCHSCREEN_PCAP=m
@@ -2652,13 +2705,18 @@ 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_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
@@ -2673,7 +2731,7 @@ CONFIG_INPUT_ADXL34X_I2C=m
 CONFIG_INPUT_ADXL34X_SPI=m
 CONFIG_INPUT_CMA3000=m
 CONFIG_INPUT_CMA3000_I2C=m
-CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y
+CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m
 
 #
 # Hardware I/O ports
@@ -2700,6 +2758,7 @@ CONFIG_GAMEPORT_FM801=m
 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
@@ -2851,6 +2910,7 @@ CONFIG_I2C_SCMI=m
 #
 # I2C system bus drivers (mostly embedded / system-on-chip)
 #
+CONFIG_I2C_DESIGNWARE_PCI=m
 CONFIG_I2C_GPIO=m
 CONFIG_I2C_INTEL_MID=m
 CONFIG_I2C_OCORES=m
@@ -2915,6 +2975,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
@@ -2929,13 +2990,13 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 CONFIG_GPIOLIB=y
 # CONFIG_DEBUG_GPIO is not set
 CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_GENERIC=m
 CONFIG_GPIO_MAX730X=m
 
 #
 # Memory mapped GPIO drivers:
 #
-CONFIG_GPIO_BASIC_MMIO_CORE=m
-CONFIG_GPIO_BASIC_MMIO=m
+CONFIG_GPIO_GENERIC_PLATFORM=m
 CONFIG_GPIO_IT8761E=m
 CONFIG_GPIO_SCH=m
 CONFIG_GPIO_VX855=m
@@ -2947,6 +3008,7 @@ CONFIG_GPIO_MAX7300=m
 CONFIG_GPIO_MAX732X=m
 CONFIG_GPIO_PCA953X=m
 CONFIG_GPIO_PCF857X=m
+CONFIG_GPIO_TPS65912=m
 CONFIG_GPIO_WM831X=m
 CONFIG_GPIO_ADP5588=m
 
@@ -3030,6 +3092,7 @@ CONFIG_HWMON_VID=m
 #
 CONFIG_SENSORS_ABITUGURU=m
 CONFIG_SENSORS_ABITUGURU3=m
+CONFIG_SENSORS_AD7314=m
 CONFIG_SENSORS_AD7414=m
 CONFIG_SENSORS_AD7418=m
 CONFIG_SENSORS_ADCXX=m
@@ -3084,23 +3147,29 @@ CONFIG_SENSORS_LTC4215=m
 CONFIG_SENSORS_LTC4245=m
 CONFIG_SENSORS_LTC4261=m
 CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_LM95245=m
 CONFIG_SENSORS_MAX1111=m
 CONFIG_SENSORS_MAX16065=m
 CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX1668=m
 CONFIG_SENSORS_MAX6639=m
 CONFIG_SENSORS_MAX6642=m
 CONFIG_SENSORS_MAX6650=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
@@ -3112,7 +3181,9 @@ 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=m
@@ -3147,6 +3218,7 @@ CONFIG_SENSORS_ATK0110=m
 CONFIG_THERMAL=y
 CONFIG_THERMAL_HWMON=y
 CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 
 #
@@ -3190,7 +3262,7 @@ CONFIG_W83877F_WDT=m
 CONFIG_W83977F_WDT=m
 CONFIG_MACHZ_WDT=m
 CONFIG_SBC_EPX_C3_WATCHDOG=m
-# CONFIG_XEN_WDT is not set
+CONFIG_XEN_WDT=m
 
 #
 # ISA-based Watchdog Cards
@@ -3232,11 +3304,11 @@ CONFIG_BCMA_POSSIBLE=y
 #
 # Broadcom specific AMBA
 #
-CONFIG_BCMA=m
-CONFIG_BCMA_HOST_PCI_POSSIBLE=y
-CONFIG_BCMA_HOST_PCI=y
-# CONFIG_BCMA_DEBUG is not set
-CONFIG_MFD_SUPPORT=y
+# CONFIG_BCMA is not set
+
+#
+# Multifunction device drivers
+#
 CONFIG_MFD_CORE=y
 CONFIG_MFD_SM501=m
 CONFIG_MFD_SM501_GPIO=y
@@ -3245,6 +3317,8 @@ CONFIG_UCB1400_CORE=m
 CONFIG_TPS6105X=m
 CONFIG_TPS65010=m
 CONFIG_TPS6507X=m
+CONFIG_MFD_TPS65912=y
+CONFIG_MFD_TPS65912_SPI=y
 # CONFIG_MFD_TMIO is not set
 CONFIG_MFD_WM8400=m
 CONFIG_MFD_WM831X=y
@@ -3272,6 +3346,7 @@ CONFIG_REGULATOR_DUMMY=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=m
 CONFIG_REGULATOR_VIRTUAL_CONSUMER=m
 CONFIG_REGULATOR_USERSPACE_CONSUMER=m
+CONFIG_REGULATOR_GPIO=m
 CONFIG_REGULATOR_BQ24022=m
 CONFIG_REGULATOR_MAX1586=m
 CONFIG_REGULATOR_MAX8649=m
@@ -3289,6 +3364,7 @@ CONFIG_REGULATOR_MC13892=m
 CONFIG_REGULATOR_TPS6105X=m
 CONFIG_REGULATOR_TPS65023=m
 CONFIG_REGULATOR_TPS6507X=m
+CONFIG_REGULATOR_TPS65912=m
 CONFIG_REGULATOR_ISL6271A=m
 CONFIG_REGULATOR_AD5398=m
 CONFIG_REGULATOR_AB8500=y
@@ -3303,6 +3379,7 @@ CONFIG_VIDEO_DEV=m
 CONFIG_VIDEO_V4L2_COMMON=m
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
 CONFIG_DVB_CORE=m
+CONFIG_DVB_NET=y
 CONFIG_VIDEO_MEDIA=m
 
 #
@@ -3319,7 +3396,9 @@ CONFIG_IR_RC6_DECODER=m
 CONFIG_IR_JVC_DECODER=m
 CONFIG_IR_SONY_DECODER=m
 CONFIG_IR_RC5_SZ_DECODER=m
+CONFIG_IR_MCE_KBD_DECODER=m
 CONFIG_IR_LIRC_CODEC=m
+CONFIG_RC_ATI_REMOTE=m
 CONFIG_IR_ENE=m
 CONFIG_IR_IMON=m
 CONFIG_IR_MCEUSB=m
@@ -3347,6 +3426,7 @@ 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
@@ -3365,6 +3445,7 @@ CONFIG_VIDEO_TUNER=m
 CONFIG_V4L2_MEM2MEM_DEV=m
 CONFIG_VIDEOBUF2_CORE=m
 CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_DMA_CONTIG=m
 CONFIG_VIDEOBUF2_VMALLOC=m
 CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
@@ -3438,9 +3519,20 @@ CONFIG_VIDEO_AK881X=m
 # Camera sensor devices
 #
 CONFIG_VIDEO_OV7670=m
+CONFIG_VIDEO_MT9P031=m
+CONFIG_VIDEO_MT9T001=m
 CONFIG_VIDEO_MT9V011=m
 CONFIG_VIDEO_MT9V032=m
 CONFIG_VIDEO_TCM825X=m
+CONFIG_VIDEO_SR030PC30=m
+CONFIG_VIDEO_NOON010PC30=m
+CONFIG_VIDEO_M5MOLS=m
+CONFIG_VIDEO_S5K6AA=m
+
+#
+# Flash devices
+#
+CONFIG_VIDEO_ADP1653=m
 
 #
 # Video improvement chips
@@ -3486,6 +3578,8 @@ CONFIG_VIDEO_CX88_MPEG=m
 CONFIG_VIDEO_CX88_VP3054=m
 CONFIG_VIDEO_CX23885=m
 CONFIG_MEDIA_ALTERA_CI=m
+CONFIG_VIDEO_CX25821=m
+CONFIG_VIDEO_CX25821_ALSA=m
 CONFIG_VIDEO_AU0828=m
 CONFIG_VIDEO_IVTV=m
 CONFIG_VIDEO_FB_IVTV=m
@@ -3493,10 +3587,7 @@ 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
@@ -3508,6 +3599,7 @@ CONFIG_SOC_CAMERA_RJ54N1=m
 CONFIG_SOC_CAMERA_TW9910=m
 CONFIG_SOC_CAMERA_PLATFORM=m
 CONFIG_SOC_CAMERA_OV2640=m
+CONFIG_SOC_CAMERA_OV5642=m
 CONFIG_SOC_CAMERA_OV6650=m
 CONFIG_SOC_CAMERA_OV772X=m
 CONFIG_SOC_CAMERA_OV9640=m
@@ -3536,6 +3628,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
@@ -3554,6 +3647,7 @@ 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
@@ -3567,11 +3661,15 @@ CONFIG_VIDEO_HDPVR=m
 CONFIG_VIDEO_EM28XX=m
 CONFIG_VIDEO_EM28XX_ALSA=m
 CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_EM28XX_RC=y
 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_TM6000=m
+CONFIG_VIDEO_TM6000_ALSA=m
+CONFIG_VIDEO_TM6000_DVB=m
 CONFIG_VIDEO_USBVISION=m
 CONFIG_USB_ET61X251=m
 CONFIG_USB_SN9C102=m
@@ -3655,6 +3753,7 @@ 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
@@ -3666,6 +3765,8 @@ CONFIG_DVB_USB_EC168=m
 CONFIG_DVB_USB_AZ6027=m
 CONFIG_DVB_USB_LME2510=m
 CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_USB_IT913X=m
+CONFIG_DVB_USB_MXL111SF=m
 CONFIG_DVB_TTUSB_BUDGET=m
 CONFIG_DVB_TTUSB_DEC=m
 CONFIG_SMS_SIANO_MDTV=m
@@ -3723,6 +3824,11 @@ CONFIG_DVB_HOPPER=m
 CONFIG_DVB_NGENE=m
 
 #
+# Supported ddbridge ('Octopus') Adapters
+#
+CONFIG_DVB_DDBRIDGE=m
+
+#
 # Supported DVB Frontends
 #
 # CONFIG_DVB_FE_CUSTOMISE is not set
@@ -3736,6 +3842,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
@@ -3761,6 +3873,7 @@ CONFIG_DVB_CX24116=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_DS3000=m
 CONFIG_DVB_MB86A16=m
+CONFIG_DVB_TDA10071=m
 
 #
 # DVB-T (terrestrial) frontends
@@ -3824,13 +3937,16 @@ 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
 
 #
 # Tools to develop new frontends
@@ -3861,13 +3977,13 @@ CONFIG_DRM_TDFX=m
 CONFIG_DRM_R128=m
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_KMS=y
-# CONFIG_DRM_I810 is not set
 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_STUB_POULSBO=m
 CONFIG_VGASTATE=m
 CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -3879,11 +3995,11 @@ 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=y
-CONFIG_FB_SYS_COPYAREA=y
-CONFIG_FB_SYS_IMAGEBLIT=y
+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=y
+CONFIG_FB_SYS_FOPS=m
 # CONFIG_FB_WMT_GE_ROPS is not set
 CONFIG_FB_DEFERRED_IO=y
 CONFIG_FB_SVGALIB=m
@@ -3959,9 +4075,10 @@ CONFIG_FB_TRIDENT=m
 # CONFIG_FB_GEODE is not set
 # CONFIG_FB_TMIO is not set
 # CONFIG_FB_SM501 is not set
+CONFIG_FB_SMSCUFX=m
 CONFIG_FB_UDL=m
 # CONFIG_FB_VIRTUAL is not set
-CONFIG_XEN_FBDEV_FRONTEND=y
+CONFIG_XEN_FBDEV_FRONTEND=m
 # CONFIG_FB_METRONOME is not set
 # CONFIG_FB_MB862XX is not set
 # CONFIG_FB_BROADSHEET is not set
@@ -3976,6 +4093,7 @@ CONFIG_LCD_VGG2432A4=m
 CONFIG_LCD_PLATFORM=m
 CONFIG_LCD_S6E63M0=m
 CONFIG_LCD_LD9040=m
+CONFIG_LCD_AMS369FG06=m
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_GENERIC=m
 CONFIG_BACKLIGHT_PROGEAR=m
@@ -4102,6 +4220,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
@@ -4151,8 +4270,8 @@ 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_PREALLOC_SIZE=4096
 CONFIG_SND_HDA_HWDEP=y
 CONFIG_SND_HDA_RECONFIG=y
 CONFIG_SND_HDA_INPUT_BEEP=y
@@ -4160,6 +4279,7 @@ 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_ENABLE_REALTEK_QUIRKS=y
 CONFIG_SND_HDA_CODEC_ANALOG=y
 CONFIG_SND_HDA_CODEC_SIGMATEL=y
 CONFIG_SND_HDA_CODEC_VIA=y
@@ -4167,6 +4287,7 @@ 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_CMEDIA=y
 CONFIG_SND_HDA_CODEC_SI3054=y
 CONFIG_SND_HDA_GENERIC=y
@@ -4236,7 +4357,7 @@ CONFIG_USB_HIDDEV=y
 #
 CONFIG_HID_A4TECH=m
 CONFIG_HID_ACRUX=m
-CONFIG_HID_ACRUX_FF=m
+CONFIG_HID_ACRUX_FF=y
 CONFIG_HID_APPLE=m
 CONFIG_HID_BELKIN=m
 CONFIG_HID_CHERRY=m
@@ -4248,6 +4369,8 @@ 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
@@ -4257,10 +4380,11 @@ CONFIG_HID_TWINHAN=m
 CONFIG_HID_KENSINGTON=m
 CONFIG_HID_LCPOWER=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
@@ -4275,6 +4399,7 @@ CONFIG_HID_PICOLCD_FB=y
 CONFIG_HID_PICOLCD_BACKLIGHT=y
 CONFIG_HID_PICOLCD_LCD=y
 CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_PRIMAX=m
 CONFIG_HID_QUANTA=m
 CONFIG_HID_ROCCAT=m
 CONFIG_HID_ROCCAT_COMMON=m
@@ -4285,6 +4410,7 @@ CONFIG_HID_ROCCAT_KOVAPLUS=m
 CONFIG_HID_ROCCAT_PYRA=m
 CONFIG_HID_SAMSUNG=m
 CONFIG_HID_SONY=m
+CONFIG_HID_SPEEDLINK=m
 CONFIG_HID_SUNPLUS=m
 CONFIG_HID_GREENASIA=m
 CONFIG_GREENASIA_FF=y
@@ -4295,13 +4421,16 @@ CONFIG_HID_THRUSTMASTER=m
 CONFIG_THRUSTMASTER_FF=y
 CONFIG_HID_WACOM=m
 CONFIG_HID_WACOM_POWER_SUPPLY=y
+CONFIG_HID_WIIMOTE=m
 CONFIG_HID_ZEROPLUS=m
 CONFIG_ZEROPLUS_FF=y
 CONFIG_HID_ZYDACRON=m
 CONFIG_USB_SUPPORT=y
+CONFIG_USB_COMMON=m
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
+CONFIG_USB_ARCH_HAS_XHCI=y
 CONFIG_USB=m
 # CONFIG_USB_DEBUG is not set
 # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
@@ -4314,6 +4443,8 @@ CONFIG_USB_DEVICEFS=y
 CONFIG_USB_DYNAMIC_MINORS=y
 CONFIG_USB_SUSPEND=y
 # CONFIG_USB_OTG is not set
+CONFIG_USB_DWC3=m
+# CONFIG_USB_DWC3_DEBUG is not set
 CONFIG_USB_MON=m
 CONFIG_USB_WUSB=m
 CONFIG_USB_WUSB_CBAF=m
@@ -4343,8 +4474,10 @@ 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_RENESAS_USBHS=m
 
 #
 # USB Device Class drivers
@@ -4364,6 +4497,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
@@ -4490,20 +4624,20 @@ CONFIG_USB_GADGET=m
 # 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
+CONFIG_USB_R8A66597=m
+CONFIG_USB_GADGET_DWC3=m
+CONFIG_USB_M66592=m
+CONFIG_USB_AMD5536UDC=m
+CONFIG_USB_CI13XXX_PCI=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_GOKU=m
+CONFIG_USB_EG20T=m
+CONFIG_USB_DUMMY_HCD=m
 CONFIG_USB_GADGET_DUALSPEED=y
+CONFIG_USB_GADGET_SUPERSPEED=y
 # CONFIG_USB_ZERO is not set
 CONFIG_USB_AUDIO=m
 CONFIG_USB_ETH=m
@@ -4523,6 +4657,7 @@ 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
@@ -4564,7 +4699,6 @@ CONFIG_MMC_RICOH_MMC=y
 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
@@ -4593,11 +4727,9 @@ CONFIG_LEDS_CLASS=y
 #
 CONFIG_LEDS_LM3530=m
 CONFIG_LEDS_NET5501=m
-# CONFIG_LEDS_ALIX2 is not set
 CONFIG_LEDS_PCA9532=m
 CONFIG_LEDS_PCA9532_GPIO=y
 CONFIG_LEDS_GPIO=m
-CONFIG_LEDS_GPIO_PLATFORM=y
 CONFIG_LEDS_LP3944=m
 CONFIG_LEDS_LP5521=m
 CONFIG_LEDS_LP5523=m
@@ -4617,7 +4749,6 @@ CONFIG_LEDS_TRIGGERS=y
 # LED Triggers
 #
 CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_IDE_DISK=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_BACKLIGHT=m
 CONFIG_LEDS_TRIGGER_GPIO=m
@@ -4626,8 +4757,6 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
 #
 # iptables trigger is under Netfilter config (LED target)
 #
-CONFIG_NFC_DEVICES=y
-CONFIG_PN544_NFC=m
 CONFIG_ACCESSIBILITY=y
 CONFIG_A11Y_BRAILLE_CONSOLE=y
 # CONFIG_INFINIBAND is not set
@@ -4640,7 +4769,6 @@ CONFIG_EDAC=y
 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
@@ -4766,46 +4894,36 @@ CONFIG_UIO_AEC=m
 CONFIG_UIO_SERCOS3=m
 CONFIG_UIO_PCI_GENERIC=m
 CONFIG_UIO_NETX=m
+CONFIG_VIRTIO=y
+CONFIG_VIRTIO_RING=y
+
+#
+# Virtio drivers
+#
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_MMIO=m
 
 #
 # Xen driver support
 #
 CONFIG_XEN_BALLOON=y
+# CONFIG_XEN_SELFBALLOONING is not set
 CONFIG_XEN_SCRUB_PAGES=y
-CONFIG_XEN_DEV_EVTCHN=y
+CONFIG_XEN_DEV_EVTCHN=m
 CONFIG_XEN_BACKEND=y
-CONFIG_XENFS=y
+CONFIG_XENFS=m
 CONFIG_XEN_COMPAT_XENFS=y
 CONFIG_XEN_SYS_HYPERVISOR=y
-CONFIG_XEN_XENBUS_FRONTEND=y
+CONFIG_XEN_XENBUS_FRONTEND=m
 CONFIG_XEN_GNTDEV=m
 CONFIG_XEN_GRANT_DEV_ALLOC=m
-CONFIG_XEN_PLATFORM_PCI=m
 CONFIG_SWIOTLB_XEN=y
+CONFIG_XEN_TMEM=y
+CONFIG_XEN_PCIDEV_BACKEND=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
@@ -4813,10 +4931,6 @@ 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
@@ -4899,6 +5013,7 @@ CONFIG_COMEDI_AMPLC_PCI224=m
 CONFIG_COMEDI_AMPLC_PCI230=m
 CONFIG_COMEDI_CONTEC_PCI_DIO=m
 CONFIG_COMEDI_DT3000=m
+CONFIG_COMEDI_DYNA_PCI10XX=m
 CONFIG_COMEDI_UNIOXX5=m
 CONFIG_COMEDI_GSC_HPDI=m
 CONFIG_COMEDI_ICP_MULTI=m
@@ -4936,6 +5051,7 @@ CONFIG_COMEDI_USB_DRIVERS=m
 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
@@ -4953,10 +5069,11 @@ 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
@@ -4965,7 +5082,6 @@ CONFIG_LINE6_USB=m
 # 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
@@ -4979,16 +5095,12 @@ 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_ZRAM=m
 # CONFIG_ZRAM_DEBUG is not set
@@ -4996,46 +5108,9 @@ 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
@@ -5064,12 +5139,40 @@ CONFIG_SPEAKUP_SYNTH_DUMMY=m
 CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
 CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
 CONFIG_DRM_PSB=m
-
-#
-# Altera FPGA firmware download module
-#
-CONFIG_ALTERA_STAPL=m
+CONFIG_DRM_PSB_MRST=y
+CONFIG_DRM_PSB_MFLD=y
+CONFIG_DRM_PSB_CDV=y
 CONFIG_INTEL_MEI=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_EASYCAP=m
+# CONFIG_EASYCAP_DEBUG is not set
+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_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_TTUSBIR=m
+CONFIG_LIRC_ZILOG=m
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 CONFIG_ACERHDF=m
@@ -5114,7 +5217,25 @@ CONFIG_XO15_EBOOK=m
 CONFIG_SAMSUNG_LAPTOP=m
 CONFIG_MXM_WMI=m
 CONFIG_INTEL_OAKTRAIL=m
+CONFIG_SAMSUNG_Q10=m
+
+#
+# Hardware Spinlock drivers
+#
 CONFIG_CLKSRC_I8253=y
+CONFIG_CLKEVT_I8253=y
+CONFIG_I8253_LOCK=y
+CONFIG_CLKBLD_I8253=y
+CONFIG_IOMMU_API=y
+CONFIG_IOMMU_SUPPORT=y
+CONFIG_DMAR_TABLE=y
+CONFIG_INTEL_IOMMU=y
+# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
+CONFIG_INTEL_IOMMU_FLOPPY_WA=y
+CONFIG_VIRT_DRIVERS=y
+CONFIG_HYPERV=m
+CONFIG_HYPERV_UTILS=m
+# CONFIG_PM_DEVFREQ is not set
 
 #
 # Firmware Drivers
@@ -5270,16 +5391,24 @@ 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_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
-# CONFIG_MINIX_FS is not set
+CONFIG_MINIX_FS=m
 CONFIG_OMFS_FS=m
 # CONFIG_HPFS_FS is not set
 # CONFIG_QNX4FS_FS is not set
@@ -5291,6 +5420,7 @@ CONFIG_UFS_FS=m
 # CONFIG_UFS_DEBUG is not set
 CONFIG_EXOFS_FS=m
 # CONFIG_EXOFS_DEBUG is not set
+CONFIG_ORE=m
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y
@@ -5302,7 +5432,6 @@ CONFIG_NFS_FSCACHE=y
 CONFIG_NFS_USE_KERNEL_DNS=y
 # CONFIG_NFS_USE_NEW_IDMAPPER is not set
 CONFIG_NFSD=m
-# CONFIG_NFSD_DEPRECATED is not set
 CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3=y
 CONFIG_NFSD_V3_ACL=y
@@ -5354,7 +5483,7 @@ CONFIG_PARTITION_ADVANCED=y
 CONFIG_MAC_PARTITION=y
 CONFIG_MSDOS_PARTITION=y
 CONFIG_BSD_DISKLABEL=y
-# CONFIG_MINIX_SUBPARTITION is not set
+CONFIG_MINIX_SUBPARTITION=y
 CONFIG_SOLARIS_X86_PARTITION=y
 # CONFIG_UNIXWARE_DISKLABEL is not set
 CONFIG_LDM_PARTITION=y
@@ -5442,6 +5571,7 @@ CONFIG_TIMER_STATS=y
 # CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_SLUB_STATS is not set
 # CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_PREEMPT is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
@@ -5450,11 +5580,12 @@ CONFIG_DEBUG_MUTEXES=y
 # 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
 # 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
@@ -5471,6 +5602,7 @@ CONFIG_FRAME_POINTER=y
 # CONFIG_BOOT_PRINTK_DELAY 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_BACKTRACE_SELF_TEST is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
@@ -5506,6 +5638,7 @@ 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_BRANCH_PROFILE_NONE=y
@@ -5575,6 +5708,11 @@ 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="/sbin/tomoyo-init"
+CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init"
 CONFIG_SECURITY_APPARMOR=y
 CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0
 # CONFIG_IMA is not set
@@ -5609,6 +5747,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
@@ -5671,6 +5810,7 @@ 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_CAST5=m
 CONFIG_CRYPTO_CAST6=m
@@ -5705,8 +5845,6 @@ 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_HAVE_KVM=y
 CONFIG_HAVE_KVM_IRQCHIP=y
 CONFIG_HAVE_KVM_EVENTFD=y
@@ -5720,10 +5858,6 @@ CONFIG_KVM_AMD=m
 CONFIG_KVM_MMU_AUDIT=y
 CONFIG_VHOST_NET=m
 CONFIG_LGUEST=m
-CONFIG_VIRTIO=y
-CONFIG_VIRTIO_RING=y
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_BALLOON=m
 CONFIG_BINARY_PRINTF=y
 
 #
@@ -5739,6 +5873,7 @@ CONFIG_CRC_ITU_T=m
 CONFIG_CRC32=y
 CONFIG_CRC7=m
 CONFIG_LIBCRC32C=m
+CONFIG_CRC8=m
 CONFIG_AUDIT_GENERIC=y
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
@@ -5758,6 +5893,9 @@ 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_DEC16=y
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m
 CONFIG_TEXTSEARCH_BM=m
@@ -5771,3 +5909,4 @@ CONFIG_CPU_RMAP=y
 CONFIG_NLATTR=y
 CONFIG_LRU_CACHE=m
 CONFIG_AVERAGE=y
+CONFIG_CORDIC=m
diff --git a/kernels/linux-libre-xen/config.x86_64 b/kernels/linux-libre-xen/config.x86_64
index f377084cb..ef79ec35b 100644
--- a/kernels/linux-libre-xen/config.x86_64
+++ b/kernels/linux-libre-xen/config.x86_64
@@ -1,6 +1,6 @@
 #
-# Automatically generated make config: don't edit
-# Linux/x86_64 3.0.0 Kernel Configuration
+# Automatically generated file; DO NOT EDIT.
+# Linux/x86_64 3.2.6-libre Kernel Configuration
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -12,6 +12,7 @@ CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
 CONFIG_GENERIC_CMOS_UPDATE=y
 CONFIG_CLOCKSOURCE_WATCHDOG=y
 CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_ARCH_CLOCKSOURCE_DATA=y
 CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_STACKTRACE_SUPPORT=y
@@ -38,7 +39,6 @@ CONFIG_ARCH_HAS_CACHE_LINE_SIZE=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
@@ -101,12 +101,14 @@ CONFIG_HAVE_SPARSE_IRQ=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_IRQ_SHOW=y
 CONFIG_GENERIC_PENDING_IRQ=y
+CONFIG_GENERIC_IRQ_CHIP=y
 CONFIG_IRQ_FORCED_THREADING=y
-# CONFIG_SPARSE_IRQ is not set
+CONFIG_SPARSE_IRQ=y
 
 #
 # RCU Subsystem
 #
+# CONFIG_TREE_RCU is not set
 CONFIG_TREE_PREEMPT_RCU=y
 CONFIG_PREEMPT_RCU=y
 # CONFIG_RCU_TRACE is not set
@@ -132,6 +134,7 @@ CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
 # 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
@@ -157,7 +160,7 @@ CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=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
@@ -165,6 +168,7 @@ CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_PCSPKR_PLATFORM=y
+CONFIG_HAVE_PCSPKR_PLATFORM=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
@@ -211,6 +215,7 @@ CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
 CONFIG_HAVE_USER_RETURN_NOTIFIER=y
 CONFIG_HAVE_PERF_EVENTS_NMI=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
 
 #
 # GCOV-based kernel profiling
@@ -224,11 +229,12 @@ CONFIG_MODULES=y
 CONFIG_MODULE_FORCE_LOAD=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
-# CONFIG_MODVERSIONS is not set
+CONFIG_MODVERSIONS=y
 # CONFIG_MODULE_SRCVERSION_ALL 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
 CONFIG_BLOCK_COMPAT=y
@@ -284,12 +290,15 @@ CONFIG_TICK_ONESHOT=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
 CONFIG_SMP=y
+# CONFIG_X86_X2APIC is not set
 CONFIG_X86_MPPARSE=y
 # CONFIG_X86_EXTENDED_PLATFORM is not set
 CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_PARAVIRT_GUEST=y
+# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
 CONFIG_XEN=y
 CONFIG_XEN_DOM0=y
 CONFIG_XEN_PRIVILEGED_GUEST=y
@@ -297,7 +306,6 @@ CONFIG_XEN_PVHVM=y
 CONFIG_XEN_MAX_DOMAIN_MEMORY=128
 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
@@ -314,6 +322,7 @@ CONFIG_GENERIC_CPU=y
 CONFIG_X86_INTERNODE_CACHE_SHIFT=7
 CONFIG_X86_CMPXCHG=y
 CONFIG_CMPXCHG_LOCAL=y
+CONFIG_CMPXCHG_DOUBLE=y
 CONFIG_X86_L1_CACHE_SHIFT=6
 CONFIG_X86_XADD=y
 CONFIG_X86_WP_WORKS_OK=y
@@ -331,11 +340,8 @@ 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
@@ -344,6 +350,7 @@ 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
@@ -415,6 +422,7 @@ 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_EFI=y
 CONFIG_SECCOMP=y
 CONFIG_CC_STACKPROTECTOR=y
@@ -457,10 +465,10 @@ CONFIG_CAN_PM_TRACE=y
 # CONFIG_PM_TRACE_RTC is not set
 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
@@ -481,11 +489,12 @@ CONFIG_X86_PM_TIMER=y
 CONFIG_ACPI_CONTAINER=m
 CONFIG_ACPI_HOTPLUG_MEMORY=m
 CONFIG_ACPI_SBS=m
-CONFIG_ACPI_HED=m
+CONFIG_ACPI_HED=y
 CONFIG_ACPI_CUSTOM_METHOD=m
 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
@@ -540,10 +549,6 @@ 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
@@ -558,7 +563,10 @@ CONFIG_PCI_MSI=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
@@ -589,14 +597,15 @@ CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
 CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
 CONFIG_HOTPLUG_PCI_SHPC=m
 CONFIG_RAPIDIO=y
+# CONFIG_RAPIDIO_TSI721 is not set
 CONFIG_RAPIDIO_DISC_TIMEOUT=30
 # CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set
+CONFIG_RAPIDIO_DEBUG=y
 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
@@ -822,6 +831,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
@@ -1002,6 +1012,7 @@ CONFIG_IPDDP_DECAP=y
 # CONFIG_WAN_ROUTER is not set
 CONFIG_PHONET=m
 CONFIG_IEEE802154=m
+# CONFIG_IEEE802154_6LOWPAN is not set
 CONFIG_NET_SCHED=y
 
 #
@@ -1210,6 +1221,16 @@ CONFIG_CAIF=m
 CONFIG_CAIF_NETDEV=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
+
+#
+# Near Field Communication (NFC) devices
+#
+CONFIG_PN544_NFC=m
+CONFIG_NFC_PN533=m
+CONFIG_NFC_WILINK=m
 
 #
 # Device Drivers
@@ -1229,11 +1250,17 @@ CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 CONFIG_SYS_HYPERVISOR=y
-CONFIG_CONNECTOR=m
+CONFIG_REGMAP=y
+CONFIG_REGMAP_I2C=m
+CONFIG_REGMAP_SPI=y
+CONFIG_CONNECTOR=y
+CONFIG_PROC_EVENTS=y
 CONFIG_MTD=m
-# CONFIG_MTD_DEBUG is not set
 CONFIG_MTD_TESTS=m
-# CONFIG_MTD_REDBOOT_PARTS is not set
+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_AR7_PARTS is not set
 
 #
@@ -1242,21 +1269,24 @@ CONFIG_MTD_TESTS=m
 CONFIG_MTD_CHAR=m
 CONFIG_MTD_BLKDEVS=m
 CONFIG_MTD_BLOCK=m
-# CONFIG_MTD_BLOCK_RO is not set
-# CONFIG_FTL is not set
-# CONFIG_NFTL is not set
-# CONFIG_INFTL is not set
-# CONFIG_RFD_FTL is not set
-# CONFIG_SSFDC is not set
-CONFIG_SM_FTL=m
-# CONFIG_MTD_OOPS is not set
+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 is not set
-# CONFIG_MTD_JEDECPROBE is not set
+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
@@ -1267,29 +1297,52 @@ 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 is not set
-# CONFIG_MTD_ABSENT is not set
+CONFIG_MTD_ROM=m
+CONFIG_MTD_ABSENT=m
 
 #
 # Mapping drivers for chip access
 #
-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-# CONFIG_MTD_TS5500 is not set
+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 is not set
+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=m
-CONFIG_MTD_SLRAM=m
+# CONFIG_MTD_SST25L is not set
+# CONFIG_MTD_SLRAM is not set
 CONFIG_MTD_PHRAM=m
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_BLOCK2MTD is not set
+CONFIG_MTD_MTDRAM=m
+CONFIG_MTDRAM_TOTAL_SIZE=4096
+CONFIG_MTDRAM_ERASE_SIZE=128
+CONFIG_MTD_BLOCK2MTD=m
 
 #
 # Disk-On-Chip Device Drivers
@@ -1297,16 +1350,37 @@ CONFIG_MTD_PHRAM=m
 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
+CONFIG_MTD_DOCG3=m
 CONFIG_MTD_NAND_ECC=m
 CONFIG_MTD_NAND_ECC_SMC=y
-# CONFIG_MTD_NAND is not set
+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
+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_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 is not set
-# CONFIG_MTD_UBI is not set
+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_GLUEBI is not set
+# CONFIG_MTD_UBI_DEBUG is not set
 CONFIG_PARPORT=m
 CONFIG_PARPORT_PC=m
 CONFIG_PARPORT_SERIAL=m
@@ -1334,6 +1408,7 @@ 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
@@ -1384,6 +1459,7 @@ CONFIG_TI_DAC7512=m
 CONFIG_VMWARE_BALLOON=m
 CONFIG_BMP085=m
 CONFIG_PCH_PHUB=m
+CONFIG_USB_SWITCH_FSA9480=m
 CONFIG_C2PORT=m
 CONFIG_C2PORT_DURAMAR_2150=m
 
@@ -1395,6 +1471,7 @@ CONFIG_EEPROM_AT25=m
 CONFIG_EEPROM_LEGACY=m
 CONFIG_EEPROM_MAX6875=m
 CONFIG_EEPROM_93CX6=m
+CONFIG_EEPROM_93XX46=m
 CONFIG_CB710_CORE=m
 # CONFIG_CB710_DEBUG is not set
 CONFIG_CB710_DEBUG_ASSUMPTIONS=y
@@ -1407,73 +1484,13 @@ CONFIG_IWMC3200TOP=m
 #
 CONFIG_TI_ST=m
 CONFIG_SENSORS_LIS3_I2C=m
+
+#
+# Altera FPGA firmware download module
+#
+CONFIG_ALTERA_STAPL=m
 CONFIG_HAVE_IDE=y
-CONFIG_IDE=m
-
-#
-# Please see Documentation/ide/ide.txt for help/info on IDE drives
-#
-CONFIG_IDE_XFER_MODE=y
-CONFIG_IDE_TIMINGS=y
-CONFIG_IDE_ATAPI=y
-# CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_IDE_GD=m
-CONFIG_IDE_GD_ATA=y
-CONFIG_IDE_GD_ATAPI=y
-CONFIG_BLK_DEV_IDECS=m
-CONFIG_BLK_DEV_DELKIN=m
-CONFIG_BLK_DEV_IDECD=m
-CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
-CONFIG_BLK_DEV_IDETAPE=m
-CONFIG_BLK_DEV_IDEACPI=y
-# CONFIG_IDE_TASK_IOCTL is not set
-CONFIG_IDE_PROC_FS=y
-
-#
-# IDE chipset support/bugfixes
-#
-CONFIG_IDE_GENERIC=m
-CONFIG_BLK_DEV_PLATFORM=m
-CONFIG_BLK_DEV_CMD640=m
-# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
-CONFIG_BLK_DEV_IDEPNP=m
-CONFIG_BLK_DEV_IDEDMA_SFF=y
-
-#
-# PCI IDE chipsets support
-#
-CONFIG_BLK_DEV_IDEPCI=y
-# CONFIG_BLK_DEV_OFFBOARD is not set
-CONFIG_BLK_DEV_GENERIC=m
-CONFIG_BLK_DEV_OPTI621=m
-CONFIG_BLK_DEV_RZ1000=m
-CONFIG_BLK_DEV_IDEDMA_PCI=y
-CONFIG_BLK_DEV_AEC62XX=m
-CONFIG_BLK_DEV_ALI15X3=m
-CONFIG_BLK_DEV_AMD74XX=m
-CONFIG_BLK_DEV_ATIIXP=m
-CONFIG_BLK_DEV_CMD64X=m
-CONFIG_BLK_DEV_TRIFLEX=m
-CONFIG_BLK_DEV_CS5520=m
-CONFIG_BLK_DEV_CS5530=m
-CONFIG_BLK_DEV_HPT366=m
-CONFIG_BLK_DEV_JMICRON=m
-CONFIG_BLK_DEV_SC1200=m
-CONFIG_BLK_DEV_PIIX=m
-CONFIG_BLK_DEV_IT8172=m
-CONFIG_BLK_DEV_IT8213=m
-CONFIG_BLK_DEV_IT821X=m
-CONFIG_BLK_DEV_NS87415=m
-CONFIG_BLK_DEV_PDC202XX_OLD=m
-CONFIG_BLK_DEV_PDC202XX_NEW=m
-CONFIG_BLK_DEV_SVWKS=m
-CONFIG_BLK_DEV_SIIMAGE=m
-CONFIG_BLK_DEV_SIS5513=m
-CONFIG_BLK_DEV_SLC90E66=m
-CONFIG_BLK_DEV_TRM290=m
-CONFIG_BLK_DEV_VIA82CXXX=m
-CONFIG_BLK_DEV_TC86C001=m
-CONFIG_BLK_DEV_IDEDMA=y
+# CONFIG_IDE is not set
 
 #
 # SCSI device support
@@ -1547,10 +1564,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
@@ -1725,8 +1743,13 @@ CONFIG_MD_MULTIPATH=m
 CONFIG_MD_FAULTY=m
 CONFIG_BLK_DEV_DM=m
 # CONFIG_DM_DEBUG is not set
+CONFIG_DM_BUFIO=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_DEBUG_SPACE_MAPS is not set
 CONFIG_DM_MIRROR=m
 CONFIG_DM_RAID=m
 CONFIG_DM_LOG_USERSPACE=m
@@ -1742,8 +1765,8 @@ 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_FUSION=y
 CONFIG_FUSION_SPI=m
 CONFIG_FUSION_FC=m
@@ -1774,48 +1797,110 @@ 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_IEEE802154_DRIVERS=m
+CONFIG_IEEE802154_FAKEHARD=m
+CONFIG_IFB=m
 CONFIG_MACVLAN=m
 CONFIG_MACVTAP=m
-CONFIG_EQUALIZER=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 is not set
+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_ENC28J60=m
-# CONFIG_ENC28J60_WRITEVERIFY is not set
-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_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_NET_VENDOR_BROCADE=y
+CONFIG_BNA=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
@@ -1828,115 +1913,203 @@ CONFIG_WINBOND_840=m
 CONFIG_DM9102=m
 CONFIG_ULI526X=m
 CONFIG_PCMCIA_XIRCOM=m
-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_E100=m
-CONFIG_FEALNX=m
-CONFIG_NATSEMI=m
-CONFIG_NE2K_PCI=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_R6040=m
-CONFIG_SIS900=m
-CONFIG_EPIC100=m
-CONFIG_SMSC9420=m
-CONFIG_SUNDANCE=m
-# CONFIG_SUNDANCE_MMIO is not set
-CONFIG_TLAN=m
-CONFIG_KS8842=m
-CONFIG_KS8851=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_NET_VENDOR_DLINK=y
 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_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_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_IXGB=m
+CONFIG_IXGBE=m
+CONFIG_IXGBE_DCA=y
+CONFIG_IXGBEVF=m
+CONFIG_NET_VENDOR_I825XX=y
+# CONFIG_ZNET is not set
+CONFIG_IP1000=m
+CONFIG_JME=m
+CONFIG_NET_VENDOR_MARVELL=y
 CONFIG_SKGE=m
 # CONFIG_SKGE_DEBUG is not set
+CONFIG_SKGE_GENESIS=y
 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_STMMAC_ETH=m
-# 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_NIU=m
+CONFIG_NET_VENDOR_MELLANOX=y
 CONFIG_MLX4_EN=m
 CONFIG_MLX4_CORE=m
 CONFIG_MLX4_DEBUG=y
-CONFIG_TEHUTI=m
-CONFIG_BNX2X=m
+CONFIG_NET_VENDOR_MICREL=y
+CONFIG_KS8842=m
+CONFIG_KS8851=m
+CONFIG_KS8851_MLL=m
+CONFIG_KSZ884X_PCI=m
+CONFIG_NET_VENDOR_MICROCHIP=y
+CONFIG_ENC28J60=m
+# CONFIG_ENC28J60_WRITEVERIFY 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_QLGE=m
-CONFIG_BNA=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_SEEQ8005 is not set
+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_BE2NET=m
+CONFIG_NET_VENDOR_SMSC=y
+CONFIG_PCMCIA_SMC91C92=m
+CONFIG_EPIC100=m
+CONFIG_SMSC9420=m
+CONFIG_NET_VENDOR_STMICRO=y
+CONFIG_STMMAC_ETH=m
+# CONFIG_STMMAC_DEBUG_FS is not set
+# CONFIG_STMMAC_DA is not set
+CONFIG_STMMAC_RING=y
+# CONFIG_STMMAC_CHAINED 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_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_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_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
 # CONFIG_TR is not set
+
+#
+# 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_WLAN=y
 CONFIG_PCMCIA_RAYCS=m
 CONFIG_LIBERTAS_THINFIRM=m
@@ -1976,7 +2149,11 @@ CONFIG_ATH9K_HTC=m
 CONFIG_CARL9170=m
 CONFIG_CARL9170_LEDS=y
 CONFIG_CARL9170_WPC=y
+# CONFIG_CARL9170_HWRNG is not set
+CONFIG_ATH6KL=m
+# CONFIG_ATH6KL_DEBUG is not set
 CONFIG_B43=m
+CONFIG_B43_SSB=y
 CONFIG_B43_PCI_AUTOSELECT=y
 CONFIG_B43_PCICORE_AUTOSELECT=y
 CONFIG_B43_PCMCIA=y
@@ -1984,6 +2161,7 @@ CONFIG_B43_SDIO=y
 CONFIG_B43_PIO=y
 CONFIG_B43_PHY_N=y
 CONFIG_B43_PHY_LP=y
+# CONFIG_B43_PHY_HT is not set
 CONFIG_B43_LEDS=y
 CONFIG_B43_HWRNG=y
 # CONFIG_B43_DEBUG is not set
@@ -1998,6 +2176,10 @@ 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_BRCMDBG is not set
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
 # CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
@@ -2015,7 +2197,7 @@ CONFIG_IPW2200_QOS=y
 # CONFIG_IPW2200_DEBUG is not set
 CONFIG_LIBIPW=m
 # CONFIG_LIBIPW_DEBUG is not set
-CONFIG_IWLAGN=m
+CONFIG_IWLWIFI=m
 
 #
 # Debugging Options
@@ -2023,7 +2205,6 @@ CONFIG_IWLAGN=m
 # CONFIG_IWLWIFI_DEBUG is not set
 CONFIG_IWLWIFI_DEVICE_TRACING=y
 CONFIG_IWLWIFI_DEVICE_SVTOOL=y
-CONFIG_IWL_P2P=y
 CONFIG_IWLWIFI_LEGACY=m
 
 #
@@ -2084,6 +2265,7 @@ CONFIG_RT2X00_LIB_LEDS=y
 # CONFIG_RT2X00_DEBUG is not set
 CONFIG_RTL8192CE=m
 CONFIG_RTL8192SE=m
+CONFIG_RTL8192DE=m
 CONFIG_RTL8192CU=m
 CONFIG_RTLWIFI=m
 CONFIG_RTL8192C_COMMON=m
@@ -2092,7 +2274,6 @@ CONFIG_WL1251_SPI=m
 CONFIG_WL1251_SDIO=m
 CONFIG_WL12XX_MENU=m
 CONFIG_WL12XX=m
-CONFIG_WL12XX_HT=y
 CONFIG_WL12XX_SPI=m
 CONFIG_WL12XX_SDIO=m
 CONFIG_WL12XX_SDIO_TEST=m
@@ -2101,6 +2282,7 @@ CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
 CONFIG_MWIFIEX=m
 CONFIG_MWIFIEX_SDIO=m
+CONFIG_MWIFIEX_PCIE=m
 
 #
 # WiMAX Wireless Broadband devices
@@ -2110,124 +2292,9 @@ 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_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_ISDN=y
 CONFIG_ISDN_I4L=m
@@ -2506,6 +2573,7 @@ CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
 CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
 CONFIG_TOUCHSCREEN_USB_NEXIO=y
 CONFIG_TOUCHSCREEN_TOUCHIT213=m
+CONFIG_TOUCHSCREEN_TSC_SERIO=m
 CONFIG_TOUCHSCREEN_TSC2005=m
 CONFIG_TOUCHSCREEN_TSC2007=m
 CONFIG_TOUCHSCREEN_PCAP=m
@@ -2516,12 +2584,17 @@ 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_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
@@ -2530,7 +2603,7 @@ CONFIG_INPUT_PCF50633_PMU=m
 CONFIG_INPUT_PCF8574=m
 CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
 CONFIG_INPUT_WM831X_ON=m
-# CONFIG_INPUT_PCAP is not set
+CONFIG_INPUT_PCAP=m
 CONFIG_INPUT_ADXL34X=m
 CONFIG_INPUT_ADXL34X_I2C=m
 CONFIG_INPUT_ADXL34X_SPI=m
@@ -2563,6 +2636,7 @@ CONFIG_GAMEPORT_FM801=m
 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
@@ -2709,6 +2783,7 @@ CONFIG_I2C_SCMI=m
 #
 # I2C system bus drivers (mostly embedded / system-on-chip)
 #
+CONFIG_I2C_DESIGNWARE_PCI=m
 CONFIG_I2C_GPIO=m
 CONFIG_I2C_INTEL_MID=m
 CONFIG_I2C_OCORES=m
@@ -2770,6 +2845,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
@@ -2784,13 +2860,13 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 CONFIG_GPIOLIB=y
 # CONFIG_DEBUG_GPIO is not set
 CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_GENERIC=m
 CONFIG_GPIO_MAX730X=m
 
 #
 # Memory mapped GPIO drivers:
 #
-CONFIG_GPIO_BASIC_MMIO_CORE=m
-CONFIG_GPIO_BASIC_MMIO=m
+CONFIG_GPIO_GENERIC_PLATFORM=m
 CONFIG_GPIO_IT8761E=m
 CONFIG_GPIO_SCH=m
 CONFIG_GPIO_VX855=m
@@ -2885,6 +2961,7 @@ CONFIG_HWMON_VID=m
 #
 CONFIG_SENSORS_ABITUGURU=m
 CONFIG_SENSORS_ABITUGURU3=m
+CONFIG_SENSORS_AD7314=m
 CONFIG_SENSORS_AD7414=m
 CONFIG_SENSORS_AD7418=m
 CONFIG_SENSORS_ADCXX=m
@@ -2939,23 +3016,29 @@ CONFIG_SENSORS_LTC4215=m
 CONFIG_SENSORS_LTC4245=m
 CONFIG_SENSORS_LTC4261=m
 CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_LM95245=m
 CONFIG_SENSORS_MAX1111=m
 CONFIG_SENSORS_MAX16065=m
 CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX1668=m
 CONFIG_SENSORS_MAX6639=m
 CONFIG_SENSORS_MAX6642=m
 CONFIG_SENSORS_MAX6650=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
@@ -2967,7 +3050,9 @@ 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=m
@@ -3002,6 +3087,7 @@ CONFIG_SENSORS_ATK0110=m
 CONFIG_THERMAL=y
 CONFIG_THERMAL_HWMON=y
 CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 
 #
@@ -3079,11 +3165,11 @@ CONFIG_BCMA_POSSIBLE=y
 #
 # Broadcom specific AMBA
 #
-CONFIG_BCMA=m
-CONFIG_BCMA_HOST_PCI_POSSIBLE=y
-CONFIG_BCMA_HOST_PCI=y
-# CONFIG_BCMA_DEBUG is not set
-CONFIG_MFD_SUPPORT=y
+# CONFIG_BCMA is not set
+
+#
+# Multifunction device drivers
+#
 CONFIG_MFD_CORE=y
 CONFIG_MFD_SM501=m
 CONFIG_MFD_SM501_GPIO=y
@@ -3092,6 +3178,7 @@ CONFIG_UCB1400_CORE=m
 CONFIG_TPS6105X=m
 CONFIG_TPS65010=m
 CONFIG_TPS6507X=m
+# CONFIG_MFD_TPS65912_SPI is not set
 # CONFIG_MFD_TMIO is not set
 CONFIG_MFD_WM8400=m
 CONFIG_MFD_WM831X=y
@@ -3119,6 +3206,7 @@ CONFIG_REGULATOR_DUMMY=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=m
 CONFIG_REGULATOR_VIRTUAL_CONSUMER=m
 CONFIG_REGULATOR_USERSPACE_CONSUMER=m
+# CONFIG_REGULATOR_GPIO is not set
 CONFIG_REGULATOR_BQ24022=m
 CONFIG_REGULATOR_MAX1586=m
 CONFIG_REGULATOR_MAX8649=m
@@ -3150,6 +3238,7 @@ CONFIG_VIDEO_DEV=m
 CONFIG_VIDEO_V4L2_COMMON=m
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
 CONFIG_DVB_CORE=m
+CONFIG_DVB_NET=y
 CONFIG_VIDEO_MEDIA=m
 
 #
@@ -3166,7 +3255,9 @@ CONFIG_IR_RC6_DECODER=m
 CONFIG_IR_JVC_DECODER=m
 CONFIG_IR_SONY_DECODER=m
 CONFIG_IR_RC5_SZ_DECODER=m
+CONFIG_IR_MCE_KBD_DECODER=m
 CONFIG_IR_LIRC_CODEC=m
+CONFIG_RC_ATI_REMOTE=m
 CONFIG_IR_ENE=m
 CONFIG_IR_IMON=m
 CONFIG_IR_MCEUSB=m
@@ -3194,6 +3285,7 @@ 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
@@ -3212,6 +3304,7 @@ CONFIG_VIDEO_TUNER=m
 CONFIG_V4L2_MEM2MEM_DEV=m
 CONFIG_VIDEOBUF2_CORE=m
 CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_DMA_CONTIG=m
 CONFIG_VIDEOBUF2_VMALLOC=m
 CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
@@ -3285,9 +3378,20 @@ CONFIG_VIDEO_AK881X=m
 # Camera sensor devices
 #
 CONFIG_VIDEO_OV7670=m
+CONFIG_VIDEO_MT9P031=m
+CONFIG_VIDEO_MT9T001=m
 CONFIG_VIDEO_MT9V011=m
 CONFIG_VIDEO_MT9V032=m
 CONFIG_VIDEO_TCM825X=m
+CONFIG_VIDEO_SR030PC30=m
+CONFIG_VIDEO_NOON010PC30=m
+CONFIG_VIDEO_M5MOLS=m
+CONFIG_VIDEO_S5K6AA=m
+
+#
+# Flash devices
+#
+CONFIG_VIDEO_ADP1653=m
 
 #
 # Video improvement chips
@@ -3332,6 +3436,8 @@ CONFIG_VIDEO_CX88_MPEG=m
 CONFIG_VIDEO_CX88_VP3054=m
 CONFIG_VIDEO_CX23885=m
 CONFIG_MEDIA_ALTERA_CI=m
+CONFIG_VIDEO_CX25821=m
+CONFIG_VIDEO_CX25821_ALSA=m
 CONFIG_VIDEO_AU0828=m
 CONFIG_VIDEO_IVTV=m
 CONFIG_VIDEO_FB_IVTV=m
@@ -3339,10 +3445,7 @@ 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
@@ -3354,6 +3457,7 @@ CONFIG_SOC_CAMERA_RJ54N1=m
 CONFIG_SOC_CAMERA_TW9910=m
 CONFIG_SOC_CAMERA_PLATFORM=m
 CONFIG_SOC_CAMERA_OV2640=m
+CONFIG_SOC_CAMERA_OV5642=m
 CONFIG_SOC_CAMERA_OV6650=m
 CONFIG_SOC_CAMERA_OV772X=m
 CONFIG_SOC_CAMERA_OV9640=m
@@ -3382,6 +3486,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
@@ -3400,6 +3505,7 @@ 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
@@ -3413,11 +3519,15 @@ CONFIG_VIDEO_HDPVR=m
 CONFIG_VIDEO_EM28XX=m
 CONFIG_VIDEO_EM28XX_ALSA=m
 CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_EM28XX_RC=y
 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_TM6000=m
+CONFIG_VIDEO_TM6000_ALSA=m
+CONFIG_VIDEO_TM6000_DVB=m
 CONFIG_VIDEO_USBVISION=m
 CONFIG_USB_ET61X251=m
 CONFIG_USB_SN9C102=m
@@ -3489,6 +3599,7 @@ 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
@@ -3500,6 +3611,8 @@ CONFIG_DVB_USB_EC168=m
 CONFIG_DVB_USB_AZ6027=m
 CONFIG_DVB_USB_LME2510=m
 CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_USB_IT913X=m
+CONFIG_DVB_USB_MXL111SF=m
 CONFIG_DVB_TTUSB_BUDGET=m
 CONFIG_DVB_TTUSB_DEC=m
 CONFIG_SMS_SIANO_MDTV=m
@@ -3557,6 +3670,11 @@ CONFIG_DVB_HOPPER=m
 CONFIG_DVB_NGENE=m
 
 #
+# Supported ddbridge ('Octopus') Adapters
+#
+CONFIG_DVB_DDBRIDGE=m
+
+#
 # Supported DVB Frontends
 #
 # CONFIG_DVB_FE_CUSTOMISE is not set
@@ -3570,6 +3688,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
@@ -3595,6 +3719,7 @@ CONFIG_DVB_CX24116=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_DS3000=m
 CONFIG_DVB_MB86A16=m
+CONFIG_DVB_TDA10071=m
 
 #
 # DVB-T (terrestrial) frontends
@@ -3658,13 +3783,16 @@ 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
 
 #
 # Tools to develop new frontends
@@ -3695,6 +3823,7 @@ CONFIG_DRM_MGA=m
 CONFIG_DRM_SIS=m
 CONFIG_DRM_VIA=m
 CONFIG_DRM_SAVAGE=m
+CONFIG_DRM_VMWGFX=m
 CONFIG_STUB_POULSBO=m
 CONFIG_VGASTATE=m
 CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -3784,6 +3913,7 @@ CONFIG_FB_TRIDENT=m
 # CONFIG_FB_GEODE is not set
 # CONFIG_FB_TMIO is not set
 # CONFIG_FB_SM501 is not set
+CONFIG_FB_SMSCUFX=m
 CONFIG_FB_UDL=m
 # CONFIG_FB_VIRTUAL is not set
 CONFIG_XEN_FBDEV_FRONTEND=m
@@ -3801,6 +3931,7 @@ CONFIG_LCD_VGG2432A4=m
 CONFIG_LCD_PLATFORM=m
 CONFIG_LCD_S6E63M0=m
 CONFIG_LCD_LD9040=m
+CONFIG_LCD_AMS369FG06=m
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_GENERIC=m
 CONFIG_BACKLIGHT_PROGEAR=m
@@ -3890,6 +4021,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
@@ -3939,8 +4071,8 @@ 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_PREALLOC_SIZE=4096
 CONFIG_SND_HDA_HWDEP=y
 CONFIG_SND_HDA_RECONFIG=y
 CONFIG_SND_HDA_INPUT_BEEP=y
@@ -3948,6 +4080,7 @@ 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_ENABLE_REALTEK_QUIRKS=y
 CONFIG_SND_HDA_CODEC_ANALOG=y
 CONFIG_SND_HDA_CODEC_SIGMATEL=y
 CONFIG_SND_HDA_CODEC_VIA=y
@@ -3955,6 +4088,7 @@ 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_CMEDIA=y
 CONFIG_SND_HDA_CODEC_SI3054=y
 CONFIG_SND_HDA_GENERIC=y
@@ -4023,7 +4157,7 @@ CONFIG_USB_HIDDEV=y
 #
 CONFIG_HID_A4TECH=m
 CONFIG_HID_ACRUX=m
-CONFIG_HID_ACRUX_FF=m
+CONFIG_HID_ACRUX_FF=y
 CONFIG_HID_APPLE=m
 CONFIG_HID_BELKIN=m
 CONFIG_HID_CHERRY=m
@@ -4035,6 +4169,8 @@ 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
@@ -4044,10 +4180,11 @@ CONFIG_HID_TWINHAN=m
 CONFIG_HID_KENSINGTON=m
 CONFIG_HID_LCPOWER=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
@@ -4062,6 +4199,7 @@ CONFIG_HID_PICOLCD_FB=y
 CONFIG_HID_PICOLCD_BACKLIGHT=y
 CONFIG_HID_PICOLCD_LCD=y
 CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_PRIMAX=m
 CONFIG_HID_QUANTA=m
 CONFIG_HID_ROCCAT=m
 CONFIG_HID_ROCCAT_COMMON=m
@@ -4072,6 +4210,7 @@ CONFIG_HID_ROCCAT_KOVAPLUS=m
 CONFIG_HID_ROCCAT_PYRA=m
 CONFIG_HID_SAMSUNG=m
 CONFIG_HID_SONY=m
+CONFIG_HID_SPEEDLINK=m
 CONFIG_HID_SUNPLUS=m
 CONFIG_HID_GREENASIA=m
 CONFIG_GREENASIA_FF=y
@@ -4082,13 +4221,16 @@ CONFIG_HID_THRUSTMASTER=m
 CONFIG_THRUSTMASTER_FF=y
 CONFIG_HID_WACOM=m
 CONFIG_HID_WACOM_POWER_SUPPLY=y
+CONFIG_HID_WIIMOTE=m
 CONFIG_HID_ZEROPLUS=m
 CONFIG_ZEROPLUS_FF=y
 CONFIG_HID_ZYDACRON=m
 CONFIG_USB_SUPPORT=y
+CONFIG_USB_COMMON=m
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
+CONFIG_USB_ARCH_HAS_XHCI=y
 CONFIG_USB=m
 # CONFIG_USB_DEBUG is not set
 # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
@@ -4101,6 +4243,7 @@ CONFIG_USB_DEVICEFS=y
 CONFIG_USB_DYNAMIC_MINORS=y
 CONFIG_USB_SUSPEND=y
 # CONFIG_USB_OTG is not set
+# CONFIG_USB_DWC3 is not set
 CONFIG_USB_MON=m
 CONFIG_USB_WUSB=m
 CONFIG_USB_WUSB_CBAF=m
@@ -4130,8 +4273,10 @@ 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_RENESAS_USBHS=m
 
 #
 # USB Device Class drivers
@@ -4151,6 +4296,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
@@ -4277,20 +4423,19 @@ CONFIG_USB_GADGET=m
 # 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
+CONFIG_USB_R8A66597=m
+CONFIG_USB_M66592=m
+CONFIG_USB_AMD5536UDC=m
+CONFIG_USB_CI13XXX_PCI=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_GOKU=m
+CONFIG_USB_EG20T=m
+CONFIG_USB_DUMMY_HCD=m
 CONFIG_USB_GADGET_DUALSPEED=y
+CONFIG_USB_GADGET_SUPERSPEED=y
 # CONFIG_USB_ZERO is not set
 CONFIG_USB_AUDIO=m
 CONFIG_USB_ETH=m
@@ -4310,6 +4455,7 @@ 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
@@ -4380,11 +4526,9 @@ CONFIG_LEDS_CLASS=y
 #
 CONFIG_LEDS_LM3530=m
 CONFIG_LEDS_NET5501=m
-# CONFIG_LEDS_ALIX2 is not set
 CONFIG_LEDS_PCA9532=m
 CONFIG_LEDS_PCA9532_GPIO=y
 CONFIG_LEDS_GPIO=m
-CONFIG_LEDS_GPIO_PLATFORM=y
 CONFIG_LEDS_LP3944=m
 CONFIG_LEDS_LP5521=m
 CONFIG_LEDS_LP5523=m
@@ -4404,7 +4548,6 @@ CONFIG_LEDS_TRIGGERS=y
 # LED Triggers
 #
 CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_IDE_DISK=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_BACKLIGHT=m
 CONFIG_LEDS_TRIGGER_GPIO=m
@@ -4413,8 +4556,6 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
 #
 # iptables trigger is under Netfilter config (LED target)
 #
-CONFIG_NFC_DEVICES=y
-CONFIG_PN544_NFC=m
 CONFIG_ACCESSIBILITY=y
 CONFIG_A11Y_BRAILLE_CONSOLE=y
 # CONFIG_INFINIBAND is not set
@@ -4427,7 +4568,6 @@ CONFIG_EDAC=y
 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
@@ -4440,6 +4580,7 @@ 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
@@ -4550,11 +4691,22 @@ CONFIG_UIO_AEC=m
 CONFIG_UIO_SERCOS3=m
 CONFIG_UIO_PCI_GENERIC=m
 CONFIG_UIO_NETX=m
+CONFIG_VIRTIO=m
+CONFIG_VIRTIO_RING=m
+
+#
+# Virtio drivers
+#
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_MMIO=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
@@ -4564,32 +4716,12 @@ CONFIG_XEN_SYS_HYPERVISOR=y
 CONFIG_XEN_XENBUS_FRONTEND=m
 CONFIG_XEN_GNTDEV=m
 CONFIG_XEN_GRANT_DEV_ALLOC=m
-CONFIG_XEN_PLATFORM_PCI=m
 CONFIG_SWIOTLB_XEN=y
+CONFIG_XEN_TMEM=y
+CONFIG_XEN_PCIDEV_BACKEND=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
@@ -4597,10 +4729,6 @@ 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
@@ -4641,6 +4769,7 @@ CONFIG_COMEDI_AMPLC_PCI224=m
 CONFIG_COMEDI_AMPLC_PCI230=m
 CONFIG_COMEDI_CONTEC_PCI_DIO=m
 CONFIG_COMEDI_DT3000=m
+CONFIG_COMEDI_DYNA_PCI10XX=m
 CONFIG_COMEDI_UNIOXX5=m
 CONFIG_COMEDI_GSC_HPDI=m
 CONFIG_COMEDI_ICP_MULTI=m
@@ -4652,7 +4781,7 @@ 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_PCIMDAS is not set
 CONFIG_COMEDI_CB_PCIMDDA=m
 CONFIG_COMEDI_ME4000=m
 CONFIG_COMEDI_ME_DAQ=m
@@ -4678,6 +4807,7 @@ CONFIG_COMEDI_USB_DRIVERS=m
 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
@@ -4695,10 +4825,11 @@ 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
@@ -4707,7 +4838,6 @@ CONFIG_LINE6_USB=m
 # 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
@@ -4721,11 +4851,8 @@ 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
@@ -4737,46 +4864,9 @@ 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
@@ -4805,12 +4895,40 @@ CONFIG_SPEAKUP_SYNTH_DUMMY=m
 CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
 CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
 CONFIG_DRM_PSB=m
-
-#
-# Altera FPGA firmware download module
-#
-CONFIG_ALTERA_STAPL=m
+CONFIG_DRM_PSB_MRST=y
+CONFIG_DRM_PSB_MFLD=y
+CONFIG_DRM_PSB_CDV=y
 CONFIG_INTEL_MEI=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_EASYCAP=m
+# CONFIG_EASYCAP_DEBUG is not set
+CONFIG_VIDEO_GO7007=m
+CONFIG_VIDEO_GO7007_USB=m
+CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
+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_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_TTUSBIR=m
+CONFIG_LIRC_ZILOG=m
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 CONFIG_ACERHDF=m
@@ -4854,6 +4972,27 @@ CONFIG_XO15_EBOOK=m
 CONFIG_SAMSUNG_LAPTOP=m
 CONFIG_MXM_WMI=m
 CONFIG_INTEL_OAKTRAIL=m
+CONFIG_SAMSUNG_Q10=m
+
+#
+# Hardware Spinlock drivers
+#
+CONFIG_CLKEVT_I8253=y
+CONFIG_I8253_LOCK=y
+CONFIG_CLKBLD_I8253=y
+CONFIG_IOMMU_API=y
+CONFIG_IOMMU_SUPPORT=y
+CONFIG_AMD_IOMMU=y
+# CONFIG_AMD_IOMMU_STATS is not set
+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
+CONFIG_VIRT_DRIVERS=y
+CONFIG_HYPERV=m
+CONFIG_HYPERV_UTILS=m
+# CONFIG_PM_DEVFREQ is not set
 
 #
 # Firmware Drivers
@@ -5010,16 +5149,24 @@ 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_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
-# CONFIG_MINIX_FS is not set
+CONFIG_MINIX_FS=m
 CONFIG_OMFS_FS=m
 # CONFIG_HPFS_FS is not set
 # CONFIG_QNX4FS_FS is not set
@@ -5031,6 +5178,7 @@ CONFIG_UFS_FS=m
 # CONFIG_UFS_DEBUG is not set
 CONFIG_EXOFS_FS=m
 # CONFIG_EXOFS_DEBUG is not set
+CONFIG_ORE=m
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y
@@ -5042,7 +5190,6 @@ CONFIG_NFS_FSCACHE=y
 CONFIG_NFS_USE_KERNEL_DNS=y
 # CONFIG_NFS_USE_NEW_IDMAPPER is not set
 CONFIG_NFSD=m
-# CONFIG_NFSD_DEPRECATED is not set
 CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3=y
 CONFIG_NFSD_V3_ACL=y
@@ -5094,7 +5241,7 @@ CONFIG_PARTITION_ADVANCED=y
 CONFIG_MAC_PARTITION=y
 CONFIG_MSDOS_PARTITION=y
 CONFIG_BSD_DISKLABEL=y
-# CONFIG_MINIX_SUBPARTITION is not set
+CONFIG_MINIX_SUBPARTITION=y
 CONFIG_SOLARIS_X86_PARTITION=y
 # CONFIG_UNIXWARE_DISKLABEL is not set
 CONFIG_LDM_PARTITION=y
@@ -5190,7 +5337,7 @@ CONFIG_DEBUG_MUTEXES=y
 # 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
@@ -5317,9 +5464,15 @@ 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="/sbin/tomoyo-init"
+CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init"
 CONFIG_SECURITY_APPARMOR=y
 CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0
 # CONFIG_IMA is not set
+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
 # CONFIG_DEFAULT_SECURITY_TOMOYO is not set
 # CONFIG_DEFAULT_SECURITY_APPARMOR is not set
 CONFIG_DEFAULT_SECURITY_DAC=y
@@ -5351,6 +5504,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
@@ -5399,6 +5553,7 @@ CONFIG_CRYPTO_RMD160=m
 CONFIG_CRYPTO_RMD256=m
 CONFIG_CRYPTO_RMD320=m
 CONFIG_CRYPTO_SHA1=m
+CONFIG_CRYPTO_SHA1_SSSE3=m
 CONFIG_CRYPTO_SHA256=m
 CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_TGR192=m
@@ -5414,6 +5569,8 @@ 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_CAST5=m
 CONFIG_CRYPTO_CAST6=m
@@ -5428,6 +5585,7 @@ 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
 
 #
 # Compression
@@ -5447,8 +5605,6 @@ 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_HAVE_KVM=y
 CONFIG_HAVE_KVM_IRQCHIP=y
 CONFIG_HAVE_KVM_EVENTFD=y
@@ -5461,10 +5617,6 @@ 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_BINARY_PRINTF=y
 
 #
@@ -5480,6 +5632,7 @@ CONFIG_CRC_ITU_T=m
 CONFIG_CRC32=y
 CONFIG_CRC7=m
 CONFIG_LIBCRC32C=m
+CONFIG_CRC8=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 CONFIG_LZO_COMPRESS=y
@@ -5498,6 +5651,9 @@ 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_DEC16=y
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m
 CONFIG_TEXTSEARCH_BM=m
@@ -5511,3 +5667,4 @@ CONFIG_CPU_RMAP=y
 CONFIG_NLATTR=y
 CONFIG_LRU_CACHE=m
 CONFIG_AVERAGE=y
+CONFIG_CORDIC=m
diff --git a/kernels/linux-libre-xen/fix-i915.patch b/kernels/linux-libre-xen/fix-i915.patch
index 3b631361a..25d4bca87 100644
--- a/kernels/linux-libre-xen/fix-i915.patch
+++ b/kernels/linux-libre-xen/fix-i915.patch
@@ -1,26 +1,105 @@
-Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
-Tested-by: Santi <santi@agolina.net>
----
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
+<head>
+<title>abslibre.git - Libre PKGBUILDs repository</title>
+<meta name='generator' content='cgit v0.9.0.2'/>
+<meta name='robots' content='index, nofollow'/>
+<link rel='stylesheet' type='text/css' href='/cgit.css'/>
+<link rel='shortcut icon' href='/favicon.ico'/>
+<link rel='alternate' title='Atom feed' href='http://projects.parabolagnulinux.org/abslibre.git/atom/kernels/linux-libre-xen/fix-i915.patch?h=master' type='application/atom+xml'/>
+</head>
+<body>
+    <div id="archnavbar" class="">
+        <div id="archnavbarlogo"><h1><a href="/" title="Return to the main page">Parabola</a></h1></div>
+        <div id="archnavbarmenu">
+            <ul id="archnavbarlist">
+                <li id="anb-home"><a href="//parabolagnulinux.org" title="Parabola news, packages, projects and more">Home</a></li>
+                <li id="anb-packages"><a href="//parabolagnulinux.org/packages/" title="Parabola Package Database">Packages</a></li>
+                <li id="anb-wiki"><a href="//wiki.parabolagnulinux.org" title="Community documentation">Wiki</a></li>
+                <li id="anb-bugs"><a href="//bugs.parabolagnulinux.org" title="Issue Tracker">Bugs</a></li>
+                <li id="anb-projects"><a href="//projects.parabolagnulinux.org" title="Our Code">Projects</a></li>
+                <li id="anb-download"><a href="//parabolagnulinux.org/download" title="Get Parabola">Download</a></li>
+            </ul>
+        </div>
+    </div><!-- #archnavbar -->
+<div id='cgit'><table id='header'>
+<tr>
+<td class='main'><a href='/'>index</a> : <a title='abslibre.git' href='/abslibre.git/'>abslibre.git</a></td><td class='form'><form method='get' action=''>
+<select name='h' onchange='this.form.submit();'>
+<option value='master' selected='selected'>master</option>
+</select> <input type='submit' name='' value='switch'/></form></td></tr>
+<tr><td class='sub'>Libre PKGBUILDs repository</td><td class='sub right'>packages@list.parabolagnulinux.org</td></tr></table>
+<table class='tabs'><tr><td>
+<a href='/abslibre.git/'>summary</a><a href='/abslibre.git/refs/'>refs</a><a href='/abslibre.git/log/kernels/linux-libre-xen/fix-i915.patch'>log</a><a class='active' href='/abslibre.git/tree/kernels/linux-libre-xen/fix-i915.patch'>tree</a><a href='/abslibre.git/commit/kernels/linux-libre-xen/fix-i915.patch'>commit</a><a href='/abslibre.git/diff/kernels/linux-libre-xen/fix-i915.patch'>diff</a><a href='/abslibre.git/stats/kernels/linux-libre-xen/fix-i915.patch'>stats</a></td><td class='form'><form class='right' method='get' action='/abslibre.git/log/kernels/linux-libre-xen/fix-i915.patch'>
+<select name='qt'>
+<option value='grep'>log msg</option>
+<option value='author'>author</option>
+<option value='committer'>committer</option>
+<option value='range'>range</option>
+</select>
+<input class='txt' type='text' size='10' name='q' value=''/>
+<input type='submit' value='search'/>
+</form>
+</td></tr></table>
+<div class='path'>path: <a href='/abslibre.git/tree/'>root</a>/<a href='/abslibre.git/tree/kernels'>kernels</a>/<a href='/abslibre.git/tree/kernels/linux-libre-xen'>linux-libre-xen</a>/<a href='/abslibre.git/tree/kernels/linux-libre-xen/fix-i915.patch'>fix-i915.patch</a></div><div class='content'>blob: 3b631361a15ee4ba6491f0b8960f0e18044e2cf0 (<a href='/abslibre.git/plain/kernels/linux-libre-xen/fix-i915.patch'>plain</a>)
+<table summary='blob content' class='blob'>
+<tr><td class='linenumbers'><pre><a class='no' id='n1' name='n1' href='#n1'>1</a>
+<a class='no' id='n2' name='n2' href='#n2'>2</a>
+<a class='no' id='n3' name='n3' href='#n3'>3</a>
+<a class='no' id='n4' name='n4' href='#n4'>4</a>
+<a class='no' id='n5' name='n5' href='#n5'>5</a>
+<a class='no' id='n6' name='n6' href='#n6'>6</a>
+<a class='no' id='n7' name='n7' href='#n7'>7</a>
+<a class='no' id='n8' name='n8' href='#n8'>8</a>
+<a class='no' id='n9' name='n9' href='#n9'>9</a>
+<a class='no' id='n10' name='n10' href='#n10'>10</a>
+<a class='no' id='n11' name='n11' href='#n11'>11</a>
+<a class='no' id='n12' name='n12' href='#n12'>12</a>
+<a class='no' id='n13' name='n13' href='#n13'>13</a>
+<a class='no' id='n14' name='n14' href='#n14'>14</a>
+<a class='no' id='n15' name='n15' href='#n15'>15</a>
+<a class='no' id='n16' name='n16' href='#n16'>16</a>
+<a class='no' id='n17' name='n17' href='#n17'>17</a>
+<a class='no' id='n18' name='n18' href='#n18'>18</a>
+<a class='no' id='n19' name='n19' href='#n19'>19</a>
+<a class='no' id='n20' name='n20' href='#n20'>20</a>
+<a class='no' id='n21' name='n21' href='#n21'>21</a>
+<a class='no' id='n22' name='n22' href='#n22'>22</a>
+<a class='no' id='n23' name='n23' href='#n23'>23</a>
+<a class='no' id='n24' name='n24' href='#n24'>24</a>
+<a class='no' id='n25' name='n25' href='#n25'>25</a>
+<a class='no' id='n26' name='n26' href='#n26'>26</a>
+</pre></td>
+<td class='lines'><pre><code>Signed-off-by: Zhao Yakui &lt;yakui.zhao&#64;intel.com&gt;
+Tested-by: Santi &lt;santi&#64;agolina.net&gt;
+<span class="hl kwb">---</span>
  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 @@
+<span class="hl kwb">--- a/drivers/gpu/drm/i915/intel_tv.c</span>
+<span class="hl kwa">+++ b/drivers/gpu/drm/i915/intel_tv.c</span>
+<span class="hl kwd">&#64;&#64; -1267,6 +1267,15 &#64;&#64;</span>
  		   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);
-+
-+	
+<span class="hl kwa">+	/*</span>
+<span class="hl kwa">+	 * The TV sense state should be cleared to zero on cantiga platform. Otherwise</span>
+<span class="hl kwa">+	 * the TV is misdetected. This is hardware requirement.</span>
+<span class="hl kwa">+	 */</span>
+<span class="hl kwa">+	if (IS_GM45(dev))</span>
+<span class="hl kwa">+		tv_dac &amp;= ~(TVDAC_STATE_CHG_EN | TVDAC_A_SENSE_CTL |</span>
+<span class="hl kwa">+			    TVDAC_B_SENSE_CTL | TVDAC_C_SENSE_CTL);</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+	</span>
  	I915_WRITE(TV_CTL, tv_ctl);
  	I915_WRITE(TV_DAC, tv_dac);
  	POSTING_READ(TV_DAC);
+</code></pre></td></tr></table>
+</div> <!-- class=content -->
+<div class='footer'>generated  by cgit v0.9.0.2 at 2012-02-21 13:29:45 (GMT)</div>
+</div> <!-- id=cgit -->
+</body>
+</html>
diff --git a/kernels/linux-libre-xen/i915-fix-ghost-tv-output.patch b/kernels/linux-libre-xen/i915-fix-ghost-tv-output.patch
new file mode 100644
index 000000000..3b631361a
--- /dev/null
+++ b/kernels/linux-libre-xen/i915-fix-ghost-tv-output.patch
@@ -0,0 +1,26 @@
+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/kernels/linux-libre-xen/i915-gpu-finish.patch b/kernels/linux-libre-xen/i915-gpu-finish.patch
new file mode 100644
index 000000000..5840c9181
--- /dev/null
+++ b/kernels/linux-libre-xen/i915-gpu-finish.patch
@@ -0,0 +1,55 @@
+commit 389a55581e30607af0fcde6cdb4e54f189cf46cf
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date:   Tue Nov 29 15:12:16 2011 +0000
+
+    drm/i915: Only clear the GPU domains upon a successful finish
+    
+    By clearing the GPU read domains before waiting upon the buffer, we run
+    the risk of the wait being interrupted and the domains prematurely
+    cleared. The next time we attempt to wait upon the buffer (after
+    userspace handles the signal), we believe that the buffer is idle and so
+    skip the wait.
+    
+    There are a number of bugs across all generations which show signs of an
+    overly haste reuse of active buffers.
+    
+    Such as:
+    
+      https://bugs.freedesktop.org/show_bug.cgi?id=29046
+      https://bugs.freedesktop.org/show_bug.cgi?id=35863
+      https://bugs.freedesktop.org/show_bug.cgi?id=38952
+      https://bugs.freedesktop.org/show_bug.cgi?id=40282
+      https://bugs.freedesktop.org/show_bug.cgi?id=41098
+      https://bugs.freedesktop.org/show_bug.cgi?id=41102
+      https://bugs.freedesktop.org/show_bug.cgi?id=41284
+      https://bugs.freedesktop.org/show_bug.cgi?id=42141
+    
+    A couple of those pre-date i915_gem_object_finish_gpu(), so may be
+    unrelated (such as a wild write from a userspace command buffer), but
+    this does look like a convincing cause for most of those bugs.
+    
+    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+    Cc: stable@kernel.org
+    Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
+    Reviewed-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
+
+diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
+index d560175..036bc58 100644
+--- a/drivers/gpu/drm/i915/i915_gem.c
++++ b/drivers/gpu/drm/i915/i915_gem.c
+@@ -3087,10 +3087,13 @@ i915_gem_object_finish_gpu(struct drm_i915_gem_object *obj)
+ 			return ret;
+ 	}
+ 
++	ret = i915_gem_object_wait_rendering(obj);
++	if (ret)
++		return ret;
++
+ 	/* Ensure that we invalidate the GPU's caches and TLBs. */
+ 	obj->base.read_domains &= ~I915_GEM_GPU_DOMAINS;
+-
+-	return i915_gem_object_wait_rendering(obj);
++	return 0;
+ }
+ 
+ /**
diff --git a/kernels/xe-guest-utilities/PKGBUILD b/kernels/xe-guest-utilities/PKGBUILD
new file mode 100644
index 000000000..b866a6f58
--- /dev/null
+++ b/kernels/xe-guest-utilities/PKGBUILD
@@ -0,0 +1,45 @@
+# Contributor: Krzysztof Raczkowski <raczkow@gnu-tech.pl>
+# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+
+pkgname=xe-guest-utilities
+pkgver=6.0.0
+pkgrel=5
+pkgdesc="Citrix XenServer Tools"
+arch=('i686' 'x86_64')
+url="http://citrix.com/English/ps2/products/product.asp?contentID=683148&ntref=hp_nav_US"
+license=('GPL' 'LGPL')
+optdepends=('linux-libre: DomU kernel for x86_64'
+	    'linux-libre-xen: DomU kernel for i686'
+	    'kernel-libre-lts: DomU kernel for i686 (long time supported)')
+makedepends=('rpmextract')
+source=(ftp://ftp.prz.edu.pl/pub/archlinux/archrak/src/xe-guest-utilities-${pkgver}-743.i386.rpm
+	ftp://ftp.prz.edu.pl/pub/archlinux/archrak/src/xe-guest-utilities-xenstore-${pkgver}-743.i386.rpm
+	ftp://ftp.prz.edu.pl/pub/archlinux/archrak/src/xe-guest-utilities-${pkgver}-743.x86_64.rpm
+	ftp://ftp.prz.edu.pl/pub/archlinux/archrak/src/xe-guest-utilities-xenstore-${pkgver}-743.x86_64.rpm
+	xe-guest-utilities-parabola.patch
+	ip_address.patch)
+
+md5sums=('894d33028b2712650be324b7ba01c6c4'
+         'e100f97421ff522cb228aa749881a082'
+         'ffaf02afa2105d32e011a32c80921256'
+         '9b9570b5cc27832df303c8ef9cd11d36'
+         '0d8a8ebe124d585a2b101150df8f5ff7'
+         '86b4a69b412f874bf5b4db8ac8858644')
+
+build() {
+  cd $startdir/src
+  [ $CARCH == "i686" ] && ( 
+    rpmextract.sh xe-guest-utilities-*.i386.rpm && \
+    rpmextract.sh xe-guest-utilities-xenstore-*.i386.rpm || return 1
+  )
+  [ $CARCH == "x86_64" ] && ( 
+    rpmextract.sh xe-guest-utilities-*.x86_64.rpm && \
+    rpmextract.sh xe-guest-utilities-xenstore-*.x86_64.rpm || return 1
+  )
+
+  patch -Np1 -i ${srcdir}/xe-guest-utilities-parabola.patch || return 1
+  patch -Np1 -i ${srcdir}/ip_address.patch || return 1
+
+  cp -ra ${srcdir}/{etc,usr} ${pkgdir}/ || return 1
+  mv ${pkgdir}/etc/init.d ${pkgdir}/etc/rc.d
+}
diff --git a/kernels/xe-guest-utilities/ip_address.patch b/kernels/xe-guest-utilities/ip_address.patch
new file mode 100644
index 000000000..1e589ef37
--- /dev/null
+++ b/kernels/xe-guest-utilities/ip_address.patch
@@ -0,0 +1,30 @@
+--- src.orig/usr/sbin/xe-update-guest-attrs	2011-12-28 21:05:13.055346917 -0600
++++ src/usr/sbin/xe-update-guest-attrs	2011-12-28 21:04:02.545354603 -0600
+@@ -151,9 +151,9 @@
+ # 3: sit0: <NOARP> mtu 1480 qdisc noop 
+ #     link/sit 0.0.0.0 brd 0.0.0.0
+ 
+-#eval $(ip addr show | \
+-#       sed -n -e 's/^[[:digit:]]*: \([a-z0-9]*\): .*/ifs="\$ifs \1"; current="\1"; /gp;' \
+-#	      -e 's/^[[:space:]]\{4\}inet \('${IPADDR_RE}'\)\/.*/eval inet_\${current}="\1"; /gp;')
++eval $(ip addr show | \
++       sed -n -e 's/^[[:digit:]]*: \([a-z0-9]*\): .*/ifs="\$ifs \1"; current="\1"; /gp;' \
++	      -e 's/^[[:space:]]\{4\}inet \('${IPADDR_RE}'\)\/.*/eval inet_\${current}="\1"; /gp;')
+ 
+ # e.g.
+ # eth0      Link encap:Ethernet  HWaddr 00:13:20:95:E8:74  
+@@ -175,10 +175,10 @@
+ #           collisions:0 txqueuelen:0 
+ #           RX bytes:3604609 (3.4 MiB)  TX bytes:3604609 (3.4 MiB)
+ 
+-eval $(/sbin/ifconfig | \
+-        sed -n -e '/^[0-9a-z][0-9a-z]*\:/,/^$/d' \
+-               -e 's/^\([0-9a-z][0-9a-z]*\) .*/ifs="\$ifs \1"; current="\1"; /gp;' \
+-               -e 's/  *inet addr:\('$IPADDR_RE'\) .*/eval inet_\${current}="\1"; /gp;')
++#eval $(/sbin/ifconfig | \
++#        sed -n -e '/^[0-9a-z][0-9a-z]*\:/,/^$/d' \
++#               -e 's/^\([0-9a-z][0-9a-z]*\) .*/ifs="\$ifs \1"; current="\1"; /gp;' \
++#               -e 's/  *inet addr:\('$IPADDR_RE'\) .*/eval inet_\${current}="\1"; /gp;')
+ 
+ # network
+ for if in $ifs ; do
\ No newline at end of file
diff --git a/kernels/xe-guest-utilities/xe-guest-utilities-parabola.patch b/kernels/xe-guest-utilities/xe-guest-utilities-parabola.patch
new file mode 100644
index 000000000..a433f6887
--- /dev/null
+++ b/kernels/xe-guest-utilities/xe-guest-utilities-parabola.patch
@@ -0,0 +1,146 @@
+diff -uNr src.orig//etc/init.d/xe-linux-distribution src/etc/init.d/xe-linux-distribution
+--- src.orig//etc/init.d/xe-linux-distribution	2010-05-20 13:19:02.000000000 +0200
++++ src/etc/init.d/xe-linux-distribution	2010-10-04 14:45:11.000000000 +0200
+@@ -18,24 +18,8 @@
+ LANG="C"
+ export LANG
+ 
+-if [ -f /etc/init.d/functions ] ; then
+-. /etc/init.d/functions
+-else
+-action()
+-{
+-    descr=$1 ; shift
+-    cmd=$@
+-    echo -n "$descr "
+-    $cmd
+-    ret=$?
+-    if [ $ret -eq 0 ] ; then
+-	echo "OK"
+-    else
+-	echo "Failed"
+-    fi
+-    return $ret
+-}
+-fi
++. /etc/rc.conf
++. /etc/rc.d/functions
+ 
+ XE_LINUX_DISTRIBUTION=/usr/sbin/xe-linux-distribution
+ XE_LINUX_DISTRIBUTION_CACHE=/var/cache/xe-linux-distribution
+@@ -48,35 +32,59 @@
+ 
+ start()
+ {
++    if [ -e /proc/xen/capabilities ] && grep -q control_d /proc/xen/capabilities ; then
++	# Do not want daemon in domain 0
++	exit 0
++    fi
++
++    stat_busy "Detecting GNU/Linux distribution version"
++    ${XE_LINUX_DISTRIBUTION} ${XE_LINUX_DISTRIBUTION_CACHE}
++    if [ $? -gt 0 ]; then
++       stat_fail
++    else
++       stat_done
++    fi
++
+     if [ ! -e /proc/xen/xenbus ] ; then
+ 	if [ ! -d /proc/xen ] ; then
+-	    action $"Mounting xenfs on /proc/xen:" /bin/false
++	    stat_busy "Mounting xenfs on /proc/xen"
+ 	    echo "Could not find /proc/xen directory."
+ 	    echo "You need a post 2.6.29-rc1 kernel with CONFIG_XEN_COMPAT_XENFS=y and CONFIG_XENFS=y|m"
+-	    exit 1
++	    stat_die 1
+ 	else 
+ 	    # This is needed post 2.6.29-rc1 when /proc/xen support was pushed upstream as a xen filesystem
+-	    action $"Mounting xenfs on /proc/xen:" mount -t xenfs none /proc/xen
++	    stat_busy "Mounting xenfs on /proc/xen"
++	    mount -t xenfs none /proc/xen
++	    if [ $? -gt 0 ]; then
++		stat_fail
++	    else
++		stat_done
++	    fi 
+ 	fi
+     fi
+ 
+-    if [ -e /proc/xen/capabilities ] && grep -q control_d /proc/xen/capabilities ; then
+-	# Do not want daemon in domain 0
+-	exit 0
+-    fi
+-
+-    action $"Detecting Linux distribution version:" \
+-	${XE_LINUX_DISTRIBUTION} ${XE_LINUX_DISTRIBUTION_CACHE}
+-
+-    action $"Starting xe daemon: " /bin/true
++    stat_busy "Starting xe daemon"
+     mkdir -p $(dirname ${XE_DAEMON_PIDFILE})
+     # This is equivalent to daemon() in C
+     ( exec &>/dev/null ; ${XE_DAEMON} -p ${XE_DAEMON_PIDFILE} & )
++    if [ $? -gt 0 ]; then
++       stat_fail
++    else
++       add_daemon xe-linux-distribution
++       stat_done
++    fi 
+ }
+ 
+ stop()
+ {
+-    action $"Stopping xe daemon: "   kill -TERM $(cat ${XE_DAEMON_PIDFILE})
++    stat_busy "Stopping xe daemon"
++    killall $(basename ${XE_DAEMON}) -TERM
++    if [ $? -gt 0 ]; then
++       stat_fail
++    else
++       rm_daemon xe-linux-distribution
++       stat_done
++    fi
+ }
+ 
+ # fail silently if not running xen
+@@ -91,7 +99,7 @@
+   stop)
+ 	stop
+ 	;;
+-  force-reload|restart)
++  restart)
+ 	stop
+ 	start
+ 	;;
+diff -uNr src.orig//usr/sbin/xe-linux-distribution src/usr/sbin/xe-linux-distribution
+--- src.orig//usr/sbin/xe-linux-distribution	2010-05-20 13:19:02.000000000 +0200
++++ src/usr/sbin/xe-linux-distribution	2010-10-04 14:44:37.000000000 +0200
+@@ -51,6 +51,22 @@
+     return 0
+ }
+ 
++identify_parabola()
++{
++    local parabola_version="$1"
++    local major
++    local minor
++    
++    if [ ! -f "${parabola_version}" ] ; then
++	return 1
++    fi
++
++    eval $(LC_ALL=C pacman -Qi initscripts |grep Version |sed "s/^.*: //" | \
++	    awk -F. '{print "major="$1 ; print "minor="$2 ; exit 0 }' )
++    write_to_output "parabola" "${major}" "${minor}" "Parabola GNU/Linux-Libre ${major}.${minor}"
++    
++}
++
+ identify_debian()
+ {
+     local debian_version="$1"
+@@ -258,6 +274,7 @@
+     identify_sles   /etc/SuSE-release   && exit 0
+     identify_lsb    lsb_release         && exit 0
+     identify_debian /etc/debian_version && exit 0
++    identify_parabola /etc/arch-release && exit 0
+ 
+     if [ $# -eq 1 ] ; then
+ 	rm -f "$1"
diff --git a/kernels/xen/09_xen b/kernels/xen/09_xen
new file mode 100755
index 000000000..094b7f427
--- /dev/null
+++ b/kernels/xen/09_xen
@@ -0,0 +1,123 @@
+#! /bin/sh -e
+
+if [ -f /usr/lib/grub/grub-mkconfig_lib ]; then
+  . /usr/lib/grub/grub-mkconfig_lib
+else
+  # no grub file, so we notify and exit gracefully
+  echo "Cannot find grub config file, exiting." >&2
+  exit 0
+fi
+
+XEN_HYPERVISOR_CMDLINE=
+XEN_LINUX_CMDLINE="console=tty0"
+[ -r /etc/xen/grub.conf ] && . /etc/xen/grub.conf
+
+CLASS="--class gnu-linux --class gnu --class os"
+
+if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
+  OS=GNU/Linux
+else
+  OS="${GRUB_DISTRIBUTOR}"
+  CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]' | cut -d' ' -f1) ${CLASS}"
+fi
+
+# loop-AES arranges things so that /dev/loop/X can be our root device, but
+# the initrds that Linux uses don't like that.
+case ${GRUB_DEVICE} in
+  /dev/loop/*|/dev/loop[0-9])
+    GRUB_DEVICE=`losetup ${GRUB_DEVICE} | sed -e "s/^[^(]*(\([^)]\+\)).*/\1/"`
+  ;;
+esac
+
+if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \
+    || ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \
+    || [ "`grub-probe -t abstraction --device ${GRUB_DEVICE} | sed -e 's,.*\(lvm\).*,\1,'`" = "lvm"  ] ; then
+  LINUX_ROOT_DEVICE=${GRUB_DEVICE}
+else
+  LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID}
+fi
+
+xen_entry ()
+{
+  os="$1"
+  xen_version="$2"
+  version="$3"
+  xen_args="$4"
+  args="$5"
+  printf "menuentry 'Xen %s / %s, with Linux %s' --class xen ${CLASS} {\n" "${xen_version}" "${os}" "${version}"
+  save_default_entry | sed -e "s/^/\t/"
+
+  if [ -z "${prepare_boot_cache}" ]; then
+    prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"
+  fi
+  printf '%s\n' "${prepare_boot_cache}"
+  cat << EOF
+       echo    '$(printf "Loading Xen %s ..." ${xen_version})'
+       multiboot       ${rel_dirname}/${xen_basename} ${rel_dirname}/${xen_basename} ${xen_args}
+       echo    $(printf "$(gettext "Loading Linux %s ...")" ${version})
+       module  ${rel_dirname}/${basename} ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
+EOF
+  if test -n "${initrd}" ; then
+    cat << EOF
+       echo    "Loading initial ramdisk ..."
+       module  ${rel_dirname}/${initrd}
+EOF
+  fi
+  cat << EOF
+}
+EOF
+}
+
+xen_list=`for i in /boot/xen-*.gz /xen-*.gz ; do
+       if grub_file_is_not_garbage "$i" ; then echo -n "$i "; fi
+done`
+prepare_boot_cache=
+
+while [ "x$xen_list" != "x" ] ; do
+  xen=`version_find_latest $xen_list`
+  echo "Found Xen hypervisor image: $xen" >&2
+  xen_basename=`basename $xen`
+  xen_dirname=`dirname $xen`
+  rel_xen_dirname=`make_system_path_relative_to_its_root $xen_dirname`
+  xen_version=`echo $xen_basename | sed -e "s,^[^0-9]*-,,g" | sed -e "s,.gz,,g"`
+  alt_xen_version=`echo $xen_version | sed -e "s,\.old$,,g"`
+
+  xen_configfiles=`grep -l 'CONFIG_XEN_PRIVILEGED_GUEST=y' /boot/config-*`
+
+  list="/boot/vmlinuz-linux-libre";
+
+  while [ "x$list" != "x" ] ; do
+    linux=`version_find_latest $list`
+    echo -e "\tFound linux image: $linux" >&2
+    basename=`basename $linux`
+    dirname=`dirname $linux`
+    rel_dirname=`make_system_path_relative_to_its_root $dirname`
+    version=`echo $basename | sed -e "s,^[^0-9]*-,,g"`
+    base_init=`echo $basename | sed -e "s,vmlinuz,initramfs,g"`
+    alt_version="${base_init}-fallback"
+    linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
+    initrd=
+
+    for i in "${base_init}.img"; do
+       if test -e "${dirname}/${i}" ; then
+         initrd="$i"
+         break
+       fi
+    done
+    if test -n "${initrd}" ; then
+      echo -e "\tFound initrd image: ${dirname}/${initrd}" >&2
+    else
+      # "UUID=" magic is parsed by initrds.  Since there's no initrd, it can't work here.
+      linux_root_device_thisversion=${GRUB_DEVICE}
+    fi
+
+    xen_entry "${OS}" "${xen_version}" "${version}" \
+        "${XEN_HYPERVISOR_CMDLINE}" \
+       "${XEN_LINUX_CMDLINE}"
+
+    list=`echo $list | tr ' ' '\n' | grep -vx $linux | tr '\n' ' '`
+  done
+
+  xen_list=`echo $xen_list | tr ' ' '\n' | grep -vx $xen | tr '\n' ' '`
+done
+
diff --git a/kernels/xen/24341.patch b/kernels/xen/24341.patch
new file mode 100644
index 000000000..5554004d3
--- /dev/null
+++ b/kernels/xen/24341.patch
@@ -0,0 +1,11 @@
+--- a/xen/arch/x86/x86_64/mmconfig_64.c       2011-10-20 15:05:49.000000000 -0200
++++ b/xen/arch/x86/x86_64/mmconfig_64.c	      2012-02-14 23:45:47.481729733 -0200
+@@ -23,7 +23,7 @@
+     char __iomem *virt;
+ };
+ static struct mmcfg_virt *pci_mmcfg_virt;
+-static int __initdata mmcfg_pci_segment_shift;
++static unsigned int mmcfg_pci_segment_shift;
+ 
+ static char __iomem *get_virt(unsigned int seg, unsigned bus)
+ {
diff --git a/kernels/xen/24344.patch b/kernels/xen/24344.patch
new file mode 100644
index 000000000..642b90867
--- /dev/null
+++ b/kernels/xen/24344.patch
@@ -0,0 +1,33 @@
+--- a/tools/libxc/xc_cpuid_x86.c	      2011-10-20 15:05:42.000000000 -0200
++++ b/tools/libxc/xc_cpuid_x86.c	      2012-02-15 00:01:46.307514813 -0200
+@@ -42,23 +42,23 @@
+ static void cpuid(const unsigned int *input, unsigned int *regs)
+ {
+     unsigned int count = (input[1] == XEN_CPUID_INPUT_UNUSED) ? 0 : input[1];
+-    asm (
+ #ifdef __i386__
++/* Use the stack to avoid reg constraint failures with some gcc flags */
++    asm (
+         "push %%ebx; push %%edx\n\t"
+-#else
+-        "push %%rbx; push %%rdx\n\t"
+-#endif
+         "cpuid\n\t"
+         "mov %%ebx,4(%4)\n\t"
+         "mov %%edx,12(%4)\n\t"
+-#ifdef __i386__
+         "pop %%edx; pop %%ebx\n\t"
++       : "=a" (regs[0]), "=c" (regs[2])
++       : "0" (input[0]), "1" (count), "S" (regs)
++       : "memory" );
+ #else
+-        "pop %%rdx; pop %%rbx\n\t"
++    asm (
++       "cpuid"
++       : "=a" (regs[0]), "=b" (regs[1]), "=c" (regs[2]), "=d" (regs[3])
++       : "0" (input[0]), "2" (count) );
+ #endif
+-        : "=a" (regs[0]), "=c" (regs[2])
+-        : "0" (input[0]), "1" (count), "S" (regs)
+-        : "memory" );
+ }
diff --git a/kernels/xen/24345.patch b/kernels/xen/24345.patch
new file mode 100644
index 000000000..e75a1b38c
--- /dev/null
+++ b/kernels/xen/24345.patch
@@ -0,0 +1,31 @@
+--- a/tools/misc/xen-detect.c   		2011-10-20 15:05:43.000000000 -0200
++++ b/tools/misc/xen-detect.c			2012-02-15 00:05:55.524455578 -0200
+@@ -35,18 +35,21 @@
+ 
+ static void cpuid(uint32_t idx, uint32_t *regs, int pv_context)
+ {
+-    asm volatile (
+ #ifdef __i386__
+-#define R(x) "%%e"#x"x"
+-#else
+-#define R(x) "%%r"#x"x"
+-#endif
+-        "push "R(a)"; push "R(b)"; push "R(c)"; push "R(d)"\n\t"
++/* Use the stack to avoid reg constraint failures with some gcc flags */
++    asm volatile (
++        "push %%eax; push %%ebx; push %%ecx; push %%edx\n\t"
+         "test %1,%1 ; jz 1f ; ud2a ; .ascii \"xen\" ; 1: cpuid\n\t"
+         "mov %%eax,(%2); mov %%ebx,4(%2)\n\t"
+         "mov %%ecx,8(%2); mov %%edx,12(%2)\n\t"
+-        "pop "R(d)"; pop "R(c)"; pop "R(b)"; pop "R(a)"\n\t"
++        "pop %%edx; pop %%ecx; pop %%ebx; pop %%eax\n\t"
+         : : "a" (idx), "c" (pv_context), "S" (regs) : "memory" );
++#else
++    asm volatile (
++       "test %5,%5 ; jz 1f ; ud2a ; .ascii \"xen\" ; 1: cpuid\n\t"
++       : "=a" (regs[0]), "=b" (regs[1]), "=c" (regs[2]), "=d" (regs[3])
++       : "0" (idx), "1" (pv_context), "2" (0) );
++#endif
+ }
+ 
+ static int check_for_xen(int pv_context)
diff --git a/kernels/xen/PKGBUILD b/kernels/xen/PKGBUILD
new file mode 100644
index 000000000..e1796106a
--- /dev/null
+++ b/kernels/xen/PKGBUILD
@@ -0,0 +1,99 @@
+#Mantainer M0Rf30
+#Contributor WaxyMouthfeel 
+# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+pkgname=xen
+pkgver=4.1.2
+pkgrel=2
+pkgdesc="Xen 4 (hypervisor and tools)"
+arch=(i686 x86_64)
+url="http://xen.org/"
+license="GPL"
+depends=('xz-utils' 'bzip2' 'iproute' 'bridge-utils' 'python2' 'sdl' 'zlib' 'e2fsprogs' 'pkgconfig' 'gnutls' 'lzo2' 'glibc')
+[ "$CARCH" == "x86_64" ] && depends=(${depends} 'lib32-glibc')
+optdepends=('xen-docs: Xen Official Documentation')
+makedepends=('dev86' 'bin86' 'ocaml-findlib' 'iasl')
+conflicts=('xen4' 'xen3' 'xen-hv-tools' 'libxen4')
+provides=('xen')
+backup=('etc/xen/xend-config.sxp' 'etc/xen/xend-pci-permissive.sxp' 'etc/xen/xend-pci-quirks.sxp')
+options=(!strip)
+optional=(xen-docs)
+source=(http://bits.xensource.com/oss-xen/release/${pkgver}/xen-${pkgver}.tar.gz
+	09_xen
+	xen.patch
+	parabolainit.patch
+	dom0_xz_decompression.patch
+	24341.patch
+	24344.patch
+	24345.patch)
+
+build() {
+  
+
+  cd $srcdir/xen-${pkgver}
+        
+        patch -p1 -i ../xen.patch
+        patch -p1 -i ../parabolainit.patch
+	patch -p1 -i ../dom0_xz_decompression.patch
+	patch -p1 -i ../24341.patch
+	patch -p1 -i ../24344.patch
+	patch -p1 -i ../24345.patch 	
+
+unset CFLAGS LDFLAGS
+
+make PYTHON=python2 DESTDIR=$pkgdir  install-xen
+make PYTHON=python2 DESTDIR=$pkgdir  install-tools
+#make PYTHON=python2 DESTDIR=$pkgdir  install-stubdom
+  
+  sed -i 's#XENDOM_CONFIG=/etc/sysconfig/xendomains#XENDOM_CONFIG=/etc/conf.d/xendomains#' $pkgdir/etc/init.d/xendomains
+  sed -i "s#touch /var/lock/subsys/xend#mkdir -p /var/lock/subsys\n	touch /var/lock/subsys/xend#" $pkgdir/etc/init.d/xend
+
+  [ -d $pkgdir/usr/lib64 ] && ( cd $pkgdir/usr && cp -R lib64/* lib/ && rm -R lib64 )
+  ( cd $pkgdir/etc && mv init.d rc.d ) || return 1
+  rm -f $pkgdir/usr/share/man/man1/qemu-img.1* \
+       $pkgdir/usr/share/man/man1/qemu.1*
+  # First experiment to generate grub2.cfg entry
+  mkdir -p $pkgdir/etc/grub.d
+  chmod +x $srcdir/09_xen
+  cp $srcdir/09_xen  $pkgdir/etc/grub.d
+
+  ############ kill unwanted stuff ############
+
+# stubdom: newlib
+rm -rf $pkgdir/usr/*-xen-elf
+
+# hypervisor symlinks
+rm -rf $pkgdir/boot/xen-4.1.gz
+rm -rf $pkgdir/boot/xen-4.gz
+rm -rf $pkgdir/boot/xen.gz
+
+# silly doc dir fun
+rm -fr $pkgdir/usr/share/doc/xen
+rm -rf $pkgdir/usr/share/doc/qemu
+
+# Pointless helper
+rm -f $pkgdir/usr/sbin/xen-python-path
+
+# qemu stuff (unused or available from upstream)
+rm -rf $pkgdir/usr/share/xen/man
+rm -rf $pkgdir/usr/bin/qemu-*-xen
+for file in bios.bin openbios-sparc32 openbios-sparc64 ppc_rom.bin \
+         pxe-e1000.bin pxe-ne2k_pci.bin pxe-pcnet.bin pxe-rtl8139.bin \
+         vgabios.bin vgabios-cirrus.bin video.x openbios-ppc bamboo.dtb
+do
+	rm -f $pkgdir/usr/share/xen/qemu/$file
+done
+
+# adhere to Static Library Packaging Guidelines
+rm -rf $pkgdir/usr/lib/*.a
+
+  
+}
+
+md5sums=('73561faf3c1b5e36ec5c089b5db848ad'
+         '8d50beba46ffd89a3b959176245b676e'
+         'f149bae1a6b420e49c51b9f3a74338a4'
+         '7a1ed81ecc828037724bb3280058c9fc'
+         '4aebccf16b578ed97aa8bab945011f35'
+	 '1b0c05a555bc99fc8416dd52b6c6ae95'
+	 'b6225be5bec3fe462f9166f9fde9c347'
+	 'd282946a2873a78b2b2c3944571eb2fe')
diff --git a/kernels/xen/dom0_xz_decompression.patch b/kernels/xen/dom0_xz_decompression.patch
new file mode 100644
index 000000000..277ebcfd2
--- /dev/null
+++ b/kernels/xen/dom0_xz_decompression.patch
@@ -0,0 +1,3528 @@
+diff --git a/xen/common/Makefile b/xen/common/Makefile

+--- a/xen/common/Makefile

++++ b/xen/common/Makefile

+@@ -43,7 +43,7 @@

+ obj-y += rbtree.o

+ obj-y += lzo.o

+ 

+-obj-$(CONFIG_X86) += decompress.o bunzip2.o unlzma.o unlzo.o

++obj-$(CONFIG_X86) += decompress.o bunzip2.o unxz.o unlzma.o unlzo.o

+ 

+ obj-$(perfc)       += perfc.o

+ obj-$(crash_debug) += gdbstub.o

+diff --git a/xen/common/decompress.c b/xen/common/decompress.c

+--- a/xen/common/decompress.c

++++ b/xen/common/decompress.c

+@@ -20,6 +20,9 @@

+     if ( len >= 3 && !memcmp(inbuf, "\x42\x5a\x68", 3) )

+         return bunzip2(inbuf, len, NULL, NULL, outbuf, NULL, error);

+ 

++    if ( len >= 6 && !memcmp(inbuf, "\3757zXZ", 6) )

++        return unxz(inbuf, len, NULL, NULL, outbuf, NULL, error);

++

+     if ( len >= 2 && !memcmp(inbuf, "\135\000", 2) )

+         return unlzma(inbuf, len, NULL, NULL, outbuf, NULL, error);

+ 

+diff --git a/xen/common/decompress.h b/xen/common/decompress.h

+--- a/xen/common/decompress.h

++++ b/xen/common/decompress.h

+@@ -8,6 +8,7 @@

+ 

+ #define STATIC

+ #define INIT __init

++#define INITDATA __initdata

+ 

+ static void(*__initdata error)(const char *);

+ #define set_error_fn(x) error = x;

+diff --git a/xen/common/unxz.c b/xen/common/unxz.c

+new file mode 100644

+--- /dev/null

++++ b/xen/common/unxz.c

+@@ -0,0 +1,306 @@

++/*

++ * Wrapper for decompressing XZ-compressed kernel, initramfs, and initrd

++ *

++ * Author: Lasse Collin <lasse.collin@tukaani.org>

++ *

++ * This file has been put into the public domain.

++ * You can do whatever you want with this file.

++ */

++

++/*

++ * Important notes about in-place decompression

++ *

++ * At least on x86, the kernel is decompressed in place: the compressed data

++ * is placed to the end of the output buffer, and the decompressor overwrites

++ * most of the compressed data. There must be enough safety margin to

++ * guarantee that the write position is always behind the read position.

++ *

++ * The safety margin for XZ with LZMA2 or BCJ+LZMA2 is calculated below.

++ * Note that the margin with XZ is bigger than with Deflate (gzip)!

++ *

++ * The worst case for in-place decompression is that the beginning of

++ * the file is compressed extremely well, and the rest of the file is

++ * uncompressible. Thus, we must look for worst-case expansion when the

++ * compressor is encoding uncompressible data.

++ *

++ * The structure of the .xz file in case of a compresed kernel is as follows.

++ * Sizes (as bytes) of the fields are in parenthesis.

++ *

++ *    Stream Header (12)

++ *    Block Header:

++ *      Block Header (8-12)

++ *      Compressed Data (N)

++ *      Block Padding (0-3)

++ *      CRC32 (4)

++ *    Index (8-20)

++ *    Stream Footer (12)

++ *

++ * Normally there is exactly one Block, but let's assume that there are

++ * 2-4 Blocks just in case. Because Stream Header and also Block Header

++ * of the first Block don't make the decompressor produce any uncompressed

++ * data, we can ignore them from our calculations. Block Headers of possible

++ * additional Blocks have to be taken into account still. With these

++ * assumptions, it is safe to assume that the total header overhead is

++ * less than 128 bytes.

++ *

++ * Compressed Data contains LZMA2 or BCJ+LZMA2 encoded data. Since BCJ

++ * doesn't change the size of the data, it is enough to calculate the

++ * safety margin for LZMA2.

++ *

++ * LZMA2 stores the data in chunks. Each chunk has a header whose size is

++ * a maximum of 6 bytes, but to get round 2^n numbers, let's assume that

++ * the maximum chunk header size is 8 bytes. After the chunk header, there

++ * may be up to 64 KiB of actual payload in the chunk. Often the payload is

++ * quite a bit smaller though; to be safe, let's assume that an average

++ * chunk has only 32 KiB of payload.

++ *

++ * The maximum uncompressed size of the payload is 2 MiB. The minimum

++ * uncompressed size of the payload is in practice never less than the

++ * payload size itself. The LZMA2 format would allow uncompressed size

++ * to be less than the payload size, but no sane compressor creates such

++ * files. LZMA2 supports storing uncompressible data in uncompressed form,

++ * so there's never a need to create payloads whose uncompressed size is

++ * smaller than the compressed size.

++ *

++ * The assumption, that the uncompressed size of the payload is never

++ * smaller than the payload itself, is valid only when talking about

++ * the payload as a whole. It is possible that the payload has parts where

++ * the decompressor consumes more input than it produces output. Calculating

++ * the worst case for this would be tricky. Instead of trying to do that,

++ * let's simply make sure that the decompressor never overwrites any bytes

++ * of the payload which it is currently reading.

++ *

++ * Now we have enough information to calculate the safety margin. We need

++ *   - 128 bytes for the .xz file format headers;

++ *   - 8 bytes per every 32 KiB of uncompressed size (one LZMA2 chunk header

++ *     per chunk, each chunk having average payload size of 32 KiB); and

++ *   - 64 KiB (biggest possible LZMA2 chunk payload size) to make sure that

++ *     the decompressor never overwrites anything from the LZMA2 chunk

++ *     payload it is currently reading.

++ *

++ * We get the following formula:

++ *

++ *    safety_margin = 128 + uncompressed_size * 8 / 32768 + 65536

++ *                  = 128 + (uncompressed_size >> 12) + 65536

++ *

++ * For comparision, according to arch/x86/boot/compressed/misc.c, the

++ * equivalent formula for Deflate is this:

++ *

++ *    safety_margin = 18 + (uncompressed_size >> 12) + 32768

++ *

++ * Thus, when updating Deflate-only in-place kernel decompressor to

++ * support XZ, the fixed overhead has to be increased from 18+32768 bytes

++ * to 128+65536 bytes.

++ */

++

++#include "decompress.h"

++

++#define XZ_EXTERN STATIC

++

++/*

++ * For boot time use, we enable only the BCJ filter of the current

++ * architecture or none if no BCJ filter is available for the architecture.

++ */

++#ifdef CONFIG_X86

++#	define XZ_DEC_X86

++#endif

++#ifdef CONFIG_PPC

++#	define XZ_DEC_POWERPC

++#endif

++#ifdef CONFIG_ARM

++#	define XZ_DEC_ARM

++#endif

++#ifdef CONFIG_IA64

++#	define XZ_DEC_IA64

++#endif

++#ifdef CONFIG_SPARC

++#	define XZ_DEC_SPARC

++#endif

++

++/*

++ * This will get the basic headers so that memeq() and others

++ * can be defined.

++ */

++#include "xz/private.h"

++

++/*

++ * memeq and memzero are not used much and any remotely sane implementation

++ * is fast enough. memcpy/memmove speed matters in multi-call mode, but

++ * the kernel image is decompressed in single-call mode, in which only

++ * memcpy speed can matter and only if there is a lot of uncompressible data

++ * (LZMA2 stores uncompressible chunks in uncompressed form). Thus, the

++ * functions below should just be kept small; it's probably not worth

++ * optimizing for speed.

++ */

++

++#ifndef memeq

++#define memeq(p1, p2, sz) (memcmp(p1, p2, sz) == 0)

++#endif

++

++#ifndef memzero

++#define memzero(p, sz) memset(p, 0, sz)

++#endif

++

++#include "xz/crc32.c"

++#include "xz/dec_stream.c"

++#include "xz/dec_lzma2.c"

++#include "xz/dec_bcj.c"

++

++/* Size of the input and output buffers in multi-call mode */

++#define XZ_IOBUF_SIZE 4096

++

++/*

++ * This function implements the API defined in <linux/decompress/generic.h>.

++ *

++ * This wrapper will automatically choose single-call or multi-call mode

++ * of the native XZ decoder API. The single-call mode can be used only when

++ * both input and output buffers are available as a single chunk, i.e. when

++ * fill() and flush() won't be used.

++ */

++STATIC int INIT unxz(unsigned char *in, unsigned int in_size,

++		     int (*fill)(void *dest, unsigned int size),

++		     int (*flush)(void *src, unsigned int size),

++		     unsigned char *out, unsigned int *in_used,

++		     void (*error_fn)(const char *x))

++{

++	struct xz_buf b;

++	struct xz_dec *s;

++	enum xz_ret ret;

++	bool_t must_free_in = false;

++

++	set_error_fn(error_fn);

++

++	xz_crc32_init();

++

++	if (in_used != NULL)

++		*in_used = 0;

++

++	if (fill == NULL && flush == NULL)

++		s = xz_dec_init(XZ_SINGLE, 0);

++	else

++		s = xz_dec_init(XZ_DYNALLOC, (uint32_t)-1);

++

++	if (s == NULL)

++		goto error_alloc_state;

++

++	if (flush == NULL) {

++		b.out = out;

++		b.out_size = (size_t)-1;

++	} else {

++		b.out_size = XZ_IOBUF_SIZE;

++		b.out = malloc(XZ_IOBUF_SIZE);

++		if (b.out == NULL)

++			goto error_alloc_out;

++	}

++

++	if (in == NULL) {

++		must_free_in = true;

++		in = malloc(XZ_IOBUF_SIZE);

++		if (in == NULL)

++			goto error_alloc_in;

++	}

++

++	b.in = in;

++	b.in_pos = 0;

++	b.in_size = in_size;

++	b.out_pos = 0;

++

++	if (fill == NULL && flush == NULL) {

++		ret = xz_dec_run(s, &b);

++	} else {

++		do {

++			if (b.in_pos == b.in_size && fill != NULL) {

++				if (in_used != NULL)

++					*in_used += b.in_pos;

++

++				b.in_pos = 0;

++

++				in_size = fill(in, XZ_IOBUF_SIZE);

++				if (in_size < 0) {

++					/*

++					 * This isn't an optimal error code

++					 * but it probably isn't worth making

++					 * a new one either.

++					 */

++					ret = XZ_BUF_ERROR;

++					break;

++				}

++

++				b.in_size = in_size;

++			}

++

++			ret = xz_dec_run(s, &b);

++

++			if (flush != NULL && (b.out_pos == b.out_size

++					|| (ret != XZ_OK && b.out_pos > 0))) {

++				/*

++				 * Setting ret here may hide an error

++				 * returned by xz_dec_run(), but probably

++				 * it's not too bad.

++				 */

++				if (flush(b.out, b.out_pos) != (int)b.out_pos)

++					ret = XZ_BUF_ERROR;

++

++				b.out_pos = 0;

++			}

++		} while (ret == XZ_OK);

++

++		if (must_free_in)

++			free(in);

++

++		if (flush != NULL)

++			free(b.out);

++	}

++

++	if (in_used != NULL)

++		*in_used += b.in_pos;

++

++	xz_dec_end(s);

++

++	switch (ret) {

++	case XZ_STREAM_END:

++		return 0;

++

++	case XZ_MEM_ERROR:

++		/* This can occur only in multi-call mode. */

++		error("XZ decompressor ran out of memory");

++		break;

++

++	case XZ_FORMAT_ERROR:

++		error("Input is not in the XZ format (wrong magic bytes)");

++		break;

++

++	case XZ_OPTIONS_ERROR:

++		error("Input was encoded with settings that are not "

++				"supported by this XZ decoder");

++		break;

++

++	case XZ_DATA_ERROR:

++	case XZ_BUF_ERROR:

++		error("XZ-compressed data is corrupt");

++		break;

++

++	default:

++		error("Bug in the XZ decompressor");

++		break;

++	}

++

++	return -1;

++

++error_alloc_in:

++	if (flush != NULL)

++		free(b.out);

++

++error_alloc_out:

++	xz_dec_end(s);

++

++error_alloc_state:

++	error("XZ decompressor ran out of memory");

++	return -1;

++}

++

++/*

++ * This macro is used by architecture-specific files to decompress

++ * the kernel image.

++ */

++#define decompress unxz

+diff --git a/xen/common/xz/crc32.c b/xen/common/xz/crc32.c

+new file mode 100644

+--- /dev/null

++++ b/xen/common/xz/crc32.c

+@@ -0,0 +1,51 @@

++/*

++ * CRC32 using the polynomial from IEEE-802.3

++ *

++ * Authors: Lasse Collin <lasse.collin@tukaani.org>

++ *          Igor Pavlov <http://7-zip.org/>

++ *

++ * This file has been put into the public domain.

++ * You can do whatever you want with this file.

++ */

++

++/*

++ * This is not the fastest implementation, but it is pretty compact.

++ * The fastest versions of xz_crc32() on modern CPUs without hardware

++ * accelerated CRC instruction are 3-5 times as fast as this version,

++ * but they are bigger and use more memory for the lookup table.

++ */

++

++#include "private.h"

++

++XZ_EXTERN uint32_t INITDATA xz_crc32_table[256];

++

++XZ_EXTERN void INIT xz_crc32_init(void)

++{

++	const uint32_t poly = 0xEDB88320;

++

++	uint32_t i;

++	uint32_t j;

++	uint32_t r;

++

++	for (i = 0; i < 256; ++i) {

++		r = i;

++		for (j = 0; j < 8; ++j)

++			r = (r >> 1) ^ (poly & ~((r & 1) - 1));

++

++		xz_crc32_table[i] = r;

++	}

++

++	return;

++}

++

++XZ_EXTERN uint32_t INIT xz_crc32(const uint8_t *buf, size_t size, uint32_t crc)

++{

++	crc = ~crc;

++

++	while (size != 0) {

++		crc = xz_crc32_table[*buf++ ^ (crc & 0xFF)] ^ (crc >> 8);

++		--size;

++	}

++

++	return ~crc;

++}

+diff --git a/xen/common/xz/dec_bcj.c b/xen/common/xz/dec_bcj.c

+new file mode 100644

+--- /dev/null

++++ b/xen/common/xz/dec_bcj.c

+@@ -0,0 +1,562 @@

++/*

++ * Branch/Call/Jump (BCJ) filter decoders

++ *

++ * Authors: Lasse Collin <lasse.collin@tukaani.org>

++ *          Igor Pavlov <http://7-zip.org/>

++ *

++ * This file has been put into the public domain.

++ * You can do whatever you want with this file.

++ */

++

++#include "private.h"

++

++/*

++ * The rest of the file is inside this ifdef. It makes things a little more

++ * convenient when building without support for any BCJ filters.

++ */

++#ifdef XZ_DEC_BCJ

++

++struct xz_dec_bcj {

++	/* Type of the BCJ filter being used */

++	enum {

++		BCJ_X86 = 4,        /* x86 or x86-64 */

++		BCJ_POWERPC = 5,    /* Big endian only */

++		BCJ_IA64 = 6,       /* Big or little endian */

++		BCJ_ARM = 7,        /* Little endian only */

++		BCJ_ARMTHUMB = 8,   /* Little endian only */

++		BCJ_SPARC = 9       /* Big or little endian */

++	} type;

++

++	/*

++	 * Return value of the next filter in the chain. We need to preserve

++	 * this information across calls, because we must not call the next

++	 * filter anymore once it has returned XZ_STREAM_END.

++	 */

++	enum xz_ret ret;

++

++	/* True if we are operating in single-call mode. */

++	bool_t single_call;

++

++	/*

++	 * Absolute position relative to the beginning of the uncompressed

++	 * data (in a single .xz Block). We care only about the lowest 32

++	 * bits so this doesn't need to be uint64_t even with big files.

++	 */

++	uint32_t pos;

++

++	/* x86 filter state */

++	uint32_t x86_prev_mask;

++

++	/* Temporary space to hold the variables from struct xz_buf */

++	uint8_t *out;

++	size_t out_pos;

++	size_t out_size;

++

++	struct {

++		/* Amount of already filtered data in the beginning of buf */

++		size_t filtered;

++

++		/* Total amount of data currently stored in buf  */

++		size_t size;

++

++		/*

++		 * Buffer to hold a mix of filtered and unfiltered data. This

++		 * needs to be big enough to hold Alignment + 2 * Look-ahead:

++		 *

++		 * Type         Alignment   Look-ahead

++		 * x86              1           4

++		 * PowerPC          4           0

++		 * IA-64           16           0

++		 * ARM              4           0

++		 * ARM-Thumb        2           2

++		 * SPARC            4           0

++		 */

++		uint8_t buf[16];

++	} temp;

++};

++

++#ifdef XZ_DEC_X86

++/*

++ * This is used to test the most significant byte of a memory address

++ * in an x86 instruction.

++ */

++static inline int INIT bcj_x86_test_msbyte(uint8_t b)

++{

++	return b == 0x00 || b == 0xFF;

++}

++

++static size_t INIT bcj_x86(struct xz_dec_bcj *s, uint8_t *buf, size_t size)

++{

++	static /*const*/ bool_t INITDATA mask_to_allowed_status[8]

++		= { true, true, true, false, true, false, false, false };

++

++	static /*const*/ uint8_t INITDATA mask_to_bit_num[8]

++		= { 0, 1, 2, 2, 3, 3, 3, 3 };

++

++	size_t i;

++	size_t prev_pos = (size_t)-1;

++	uint32_t prev_mask = s->x86_prev_mask;

++	uint32_t src;

++	uint32_t dest;

++	uint32_t j;

++	uint8_t b;

++

++	if (size <= 4)

++		return 0;

++

++	size -= 4;

++	for (i = 0; i < size; ++i) {

++		if ((buf[i] & 0xFE) != 0xE8)

++			continue;

++

++		prev_pos = i - prev_pos;

++		if (prev_pos > 3) {

++			prev_mask = 0;

++		} else {

++			prev_mask = (prev_mask << (prev_pos - 1)) & 7;

++			if (prev_mask != 0) {

++				b = buf[i + 4 - mask_to_bit_num[prev_mask]];

++				if (!mask_to_allowed_status[prev_mask]

++						|| bcj_x86_test_msbyte(b)) {

++					prev_pos = i;

++					prev_mask = (prev_mask << 1) | 1;

++					continue;

++				}

++			}

++		}

++

++		prev_pos = i;

++

++		if (bcj_x86_test_msbyte(buf[i + 4])) {

++			src = get_unaligned_le32(buf + i + 1);

++			while (true) {

++				dest = src - (s->pos + (uint32_t)i + 5);

++				if (prev_mask == 0)

++					break;

++

++				j = mask_to_bit_num[prev_mask] * 8;

++				b = (uint8_t)(dest >> (24 - j));

++				if (!bcj_x86_test_msbyte(b))

++					break;

++

++				src = dest ^ (((uint32_t)1 << (32 - j)) - 1);

++			}

++

++			dest &= 0x01FFFFFF;

++			dest |= (uint32_t)0 - (dest & 0x01000000);

++			put_unaligned_le32(dest, buf + i + 1);

++			i += 4;

++		} else {

++			prev_mask = (prev_mask << 1) | 1;

++		}

++	}

++

++	prev_pos = i - prev_pos;

++	s->x86_prev_mask = prev_pos > 3 ? 0 : prev_mask << (prev_pos - 1);

++	return i;

++}

++#endif

++

++#ifdef XZ_DEC_POWERPC

++static size_t INIT bcj_powerpc(struct xz_dec_bcj *s, uint8_t *buf, size_t size)

++{

++	size_t i;

++	uint32_t instr;

++

++	for (i = 0; i + 4 <= size; i += 4) {

++		instr = get_unaligned_be32(buf + i);

++		if ((instr & 0xFC000003) == 0x48000001) {

++			instr &= 0x03FFFFFC;

++			instr -= s->pos + (uint32_t)i;

++			instr &= 0x03FFFFFC;

++			instr |= 0x48000001;

++			put_unaligned_be32(instr, buf + i);

++		}

++	}

++

++	return i;

++}

++#endif

++

++#ifdef XZ_DEC_IA64

++static size_t INIT bcj_ia64(struct xz_dec_bcj *s, uint8_t *buf, size_t size)

++{

++	static const uint8_t branch_table[32] = {

++		0, 0, 0, 0, 0, 0, 0, 0,

++		0, 0, 0, 0, 0, 0, 0, 0,

++		4, 4, 6, 6, 0, 0, 7, 7,

++		4, 4, 0, 0, 4, 4, 0, 0

++	};

++

++	/*

++	 * The local variables take a little bit stack space, but it's less

++	 * than what LZMA2 decoder takes, so it doesn't make sense to reduce

++	 * stack usage here without doing that for the LZMA2 decoder too.

++	 */

++

++	/* Loop counters */

++	size_t i;

++	size_t j;

++

++	/* Instruction slot (0, 1, or 2) in the 128-bit instruction word */

++	uint32_t slot;

++

++	/* Bitwise offset of the instruction indicated by slot */

++	uint32_t bit_pos;

++

++	/* bit_pos split into byte and bit parts */

++	uint32_t byte_pos;

++	uint32_t bit_res;

++

++	/* Address part of an instruction */

++	uint32_t addr;

++

++	/* Mask used to detect which instructions to convert */

++	uint32_t mask;

++

++	/* 41-bit instruction stored somewhere in the lowest 48 bits */

++	uint64_t instr;

++

++	/* Instruction normalized with bit_res for easier manipulation */

++	uint64_t norm;

++

++	for (i = 0; i + 16 <= size; i += 16) {

++		mask = branch_table[buf[i] & 0x1F];

++		for (slot = 0, bit_pos = 5; slot < 3; ++slot, bit_pos += 41) {

++			if (((mask >> slot) & 1) == 0)

++				continue;

++

++			byte_pos = bit_pos >> 3;

++			bit_res = bit_pos & 7;

++			instr = 0;

++			for (j = 0; j < 6; ++j)

++				instr |= (uint64_t)(buf[i + j + byte_pos])

++						<< (8 * j);

++

++			norm = instr >> bit_res;

++

++			if (((norm >> 37) & 0x0F) == 0x05

++					&& ((norm >> 9) & 0x07) == 0) {

++				addr = (norm >> 13) & 0x0FFFFF;

++				addr |= ((uint32_t)(norm >> 36) & 1) << 20;

++				addr <<= 4;

++				addr -= s->pos + (uint32_t)i;

++				addr >>= 4;

++

++				norm &= ~((uint64_t)0x8FFFFF << 13);

++				norm |= (uint64_t)(addr & 0x0FFFFF) << 13;

++				norm |= (uint64_t)(addr & 0x100000)

++						<< (36 - 20);

++

++				instr &= (1 << bit_res) - 1;

++				instr |= norm << bit_res;

++

++				for (j = 0; j < 6; j++)

++					buf[i + j + byte_pos]

++						= (uint8_t)(instr >> (8 * j));

++			}

++		}

++	}

++

++	return i;

++}

++#endif

++

++#ifdef XZ_DEC_ARM

++static size_t INIT bcj_arm(struct xz_dec_bcj *s, uint8_t *buf, size_t size)

++{

++	size_t i;

++	uint32_t addr;

++

++	for (i = 0; i + 4 <= size; i += 4) {

++		if (buf[i + 3] == 0xEB) {

++			addr = (uint32_t)buf[i] | ((uint32_t)buf[i + 1] << 8)

++					| ((uint32_t)buf[i + 2] << 16);

++			addr <<= 2;

++			addr -= s->pos + (uint32_t)i + 8;

++			addr >>= 2;

++			buf[i] = (uint8_t)addr;

++			buf[i + 1] = (uint8_t)(addr >> 8);

++			buf[i + 2] = (uint8_t)(addr >> 16);

++		}

++	}

++

++	return i;

++}

++#endif

++

++#ifdef XZ_DEC_ARMTHUMB

++static size_t INIT bcj_armthumb(struct xz_dec_bcj *s, uint8_t *buf, size_t size)

++{

++	size_t i;

++	uint32_t addr;

++

++	for (i = 0; i + 4 <= size; i += 2) {

++		if ((buf[i + 1] & 0xF8) == 0xF0

++				&& (buf[i + 3] & 0xF8) == 0xF8) {

++			addr = (((uint32_t)buf[i + 1] & 0x07) << 19)

++					| ((uint32_t)buf[i] << 11)

++					| (((uint32_t)buf[i + 3] & 0x07) << 8)

++					| (uint32_t)buf[i + 2];

++			addr <<= 1;

++			addr -= s->pos + (uint32_t)i + 4;

++			addr >>= 1;

++			buf[i + 1] = (uint8_t)(0xF0 | ((addr >> 19) & 0x07));

++			buf[i] = (uint8_t)(addr >> 11);

++			buf[i + 3] = (uint8_t)(0xF8 | ((addr >> 8) & 0x07));

++			buf[i + 2] = (uint8_t)addr;

++			i += 2;

++		}

++	}

++

++	return i;

++}

++#endif

++

++#ifdef XZ_DEC_SPARC

++static size_t INIT bcj_sparc(struct xz_dec_bcj *s, uint8_t *buf, size_t size)

++{

++	size_t i;

++	uint32_t instr;

++

++	for (i = 0; i + 4 <= size; i += 4) {

++		instr = get_unaligned_be32(buf + i);

++		if ((instr >> 22) == 0x100 || (instr >> 22) == 0x1FF) {

++			instr <<= 2;

++			instr -= s->pos + (uint32_t)i;

++			instr >>= 2;

++			instr = ((uint32_t)0x40000000 - (instr & 0x400000))

++					| 0x40000000 | (instr & 0x3FFFFF);

++			put_unaligned_be32(instr, buf + i);

++		}

++	}

++

++	return i;

++}

++#endif

++

++/*

++ * Apply the selected BCJ filter. Update *pos and s->pos to match the amount

++ * of data that got filtered.

++ *

++ * NOTE: This is implemented as a switch statement to avoid using function

++ * pointers, which could be problematic in the kernel boot code, which must

++ * avoid pointers to static data (at least on x86).

++ */

++static void INIT bcj_apply(struct xz_dec_bcj *s,

++			   uint8_t *buf, size_t *pos, size_t size)

++{

++	size_t filtered;

++

++	buf += *pos;

++	size -= *pos;

++

++	switch (s->type) {

++#ifdef XZ_DEC_X86

++	case BCJ_X86:

++		filtered = bcj_x86(s, buf, size);

++		break;

++#endif

++#ifdef XZ_DEC_POWERPC

++	case BCJ_POWERPC:

++		filtered = bcj_powerpc(s, buf, size);

++		break;

++#endif

++#ifdef XZ_DEC_IA64

++	case BCJ_IA64:

++		filtered = bcj_ia64(s, buf, size);

++		break;

++#endif

++#ifdef XZ_DEC_ARM

++	case BCJ_ARM:

++		filtered = bcj_arm(s, buf, size);

++		break;

++#endif

++#ifdef XZ_DEC_ARMTHUMB

++	case BCJ_ARMTHUMB:

++		filtered = bcj_armthumb(s, buf, size);

++		break;

++#endif

++#ifdef XZ_DEC_SPARC

++	case BCJ_SPARC:

++		filtered = bcj_sparc(s, buf, size);

++		break;

++#endif

++	default:

++		/* Never reached but silence compiler warnings. */

++		filtered = 0;

++		break;

++	}

++

++	*pos += filtered;

++	s->pos += filtered;

++}

++

++/*

++ * Flush pending filtered data from temp to the output buffer.

++ * Move the remaining mixture of possibly filtered and unfiltered

++ * data to the beginning of temp.

++ */

++static void INIT bcj_flush(struct xz_dec_bcj *s, struct xz_buf *b)

++{

++	size_t copy_size;

++

++	copy_size = min_t(size_t, s->temp.filtered, b->out_size - b->out_pos);

++	memcpy(b->out + b->out_pos, s->temp.buf, copy_size);

++	b->out_pos += copy_size;

++

++	s->temp.filtered -= copy_size;

++	s->temp.size -= copy_size;

++	memmove(s->temp.buf, s->temp.buf + copy_size, s->temp.size);

++}

++

++/*

++ * The BCJ filter functions are primitive in sense that they process the

++ * data in chunks of 1-16 bytes. To hide this issue, this function does

++ * some buffering.

++ */

++XZ_EXTERN enum xz_ret INIT xz_dec_bcj_run(struct xz_dec_bcj *s,

++					  struct xz_dec_lzma2 *lzma2,

++					  struct xz_buf *b)

++{

++	size_t out_start;

++

++	/*

++	 * Flush pending already filtered data to the output buffer. Return

++	 * immediatelly if we couldn't flush everything, or if the next

++	 * filter in the chain had already returned XZ_STREAM_END.

++	 */

++	if (s->temp.filtered > 0) {

++		bcj_flush(s, b);

++		if (s->temp.filtered > 0)

++			return XZ_OK;

++

++		if (s->ret == XZ_STREAM_END)

++			return XZ_STREAM_END;

++	}

++

++	/*

++	 * If we have more output space than what is currently pending in

++	 * temp, copy the unfiltered data from temp to the output buffer

++	 * and try to fill the output buffer by decoding more data from the

++	 * next filter in the chain. Apply the BCJ filter on the new data

++	 * in the output buffer. If everything cannot be filtered, copy it

++	 * to temp and rewind the output buffer position accordingly.

++	 */

++	if (s->temp.size < b->out_size - b->out_pos) {

++		out_start = b->out_pos;

++		memcpy(b->out + b->out_pos, s->temp.buf, s->temp.size);

++		b->out_pos += s->temp.size;

++

++		s->ret = xz_dec_lzma2_run(lzma2, b);

++		if (s->ret != XZ_STREAM_END

++				&& (s->ret != XZ_OK || s->single_call))

++			return s->ret;

++

++		bcj_apply(s, b->out, &out_start, b->out_pos);

++

++		/*

++		 * As an exception, if the next filter returned XZ_STREAM_END,

++		 * we can do that too, since the last few bytes that remain

++		 * unfiltered are meant to remain unfiltered.

++		 */

++		if (s->ret == XZ_STREAM_END)

++			return XZ_STREAM_END;

++

++		s->temp.size = b->out_pos - out_start;

++		b->out_pos -= s->temp.size;

++		memcpy(s->temp.buf, b->out + b->out_pos, s->temp.size);

++	}

++

++	/*

++	 * If we have unfiltered data in temp, try to fill by decoding more

++	 * data from the next filter. Apply the BCJ filter on temp. Then we

++	 * hopefully can fill the actual output buffer by copying filtered

++	 * data from temp. A mix of filtered and unfiltered data may be left

++	 * in temp; it will be taken care on the next call to this function.

++	 */

++	if (s->temp.size > 0) {

++		/* Make b->out{,_pos,_size} temporarily point to s->temp. */

++		s->out = b->out;

++		s->out_pos = b->out_pos;

++		s->out_size = b->out_size;

++		b->out = s->temp.buf;

++		b->out_pos = s->temp.size;

++		b->out_size = sizeof(s->temp.buf);

++

++		s->ret = xz_dec_lzma2_run(lzma2, b);

++

++		s->temp.size = b->out_pos;

++		b->out = s->out;

++		b->out_pos = s->out_pos;

++		b->out_size = s->out_size;

++

++		if (s->ret != XZ_OK && s->ret != XZ_STREAM_END)

++			return s->ret;

++

++		bcj_apply(s, s->temp.buf, &s->temp.filtered, s->temp.size);

++

++		/*

++		 * If the next filter returned XZ_STREAM_END, we mark that

++		 * everything is filtered, since the last unfiltered bytes

++		 * of the stream are meant to be left as is.

++		 */

++		if (s->ret == XZ_STREAM_END)

++			s->temp.filtered = s->temp.size;

++

++		bcj_flush(s, b);

++		if (s->temp.filtered > 0)

++			return XZ_OK;

++	}

++

++	return s->ret;

++}

++

++XZ_EXTERN struct xz_dec_bcj *INIT xz_dec_bcj_create(bool_t single_call)

++{

++	struct xz_dec_bcj *s = malloc(sizeof(*s));

++	if (s != NULL)

++		s->single_call = single_call;

++

++	return s;

++}

++

++XZ_EXTERN enum xz_ret INIT xz_dec_bcj_reset(struct xz_dec_bcj *s, uint8_t id)

++{

++	switch (id) {

++#ifdef XZ_DEC_X86

++	case BCJ_X86:

++#endif

++#ifdef XZ_DEC_POWERPC

++	case BCJ_POWERPC:

++#endif

++#ifdef XZ_DEC_IA64

++	case BCJ_IA64:

++#endif

++#ifdef XZ_DEC_ARM

++	case BCJ_ARM:

++#endif

++#ifdef XZ_DEC_ARMTHUMB

++	case BCJ_ARMTHUMB:

++#endif

++#ifdef XZ_DEC_SPARC

++	case BCJ_SPARC:

++#endif

++		break;

++

++	default:

++		/* Unsupported Filter ID */

++		return XZ_OPTIONS_ERROR;

++	}

++

++	s->type = id;

++	s->ret = XZ_OK;

++	s->pos = 0;

++	s->x86_prev_mask = 0;

++	s->temp.filtered = 0;

++	s->temp.size = 0;

++

++	return XZ_OK;

++}

++

++#endif

+diff --git a/xen/common/xz/dec_lzma2.c b/xen/common/xz/dec_lzma2.c

+new file mode 100644

+--- /dev/null

++++ b/xen/common/xz/dec_lzma2.c

+@@ -0,0 +1,1171 @@

++/*

++ * LZMA2 decoder

++ *

++ * Authors: Lasse Collin <lasse.collin@tukaani.org>

++ *          Igor Pavlov <http://7-zip.org/>

++ *

++ * This file has been put into the public domain.

++ * You can do whatever you want with this file.

++ */

++

++#include "private.h"

++#include "lzma2.h"

++

++/*

++ * Range decoder initialization eats the first five bytes of each LZMA chunk.

++ */

++#define RC_INIT_BYTES 5

++

++/*

++ * Minimum number of usable input buffer to safely decode one LZMA symbol.

++ * The worst case is that we decode 22 bits using probabilities and 26

++ * direct bits. This may decode at maximum of 20 bytes of input. However,

++ * lzma_main() does an extra normalization before returning, thus we

++ * need to put 21 here.

++ */

++#define LZMA_IN_REQUIRED 21

++

++/*

++ * Dictionary (history buffer)

++ *

++ * These are always true:

++ *    start <= pos <= full <= end

++ *    pos <= limit <= end

++ *

++ * In multi-call mode, also these are true:

++ *    end == size

++ *    size <= size_max

++ *    allocated <= size

++ *

++ * Most of these variables are size_t to support single-call mode,

++ * in which the dictionary variables address the actual output

++ * buffer directly.

++ */

++struct dictionary {

++	/* Beginning of the history buffer */

++	uint8_t *buf;

++

++	/* Old position in buf (before decoding more data) */

++	size_t start;

++

++	/* Position in buf */

++	size_t pos;

++

++	/*

++	 * How full dictionary is. This is used to detect corrupt input that

++	 * would read beyond the beginning of the uncompressed stream.

++	 */

++	size_t full;

++

++	/* Write limit; we don't write to buf[limit] or later bytes. */

++	size_t limit;

++

++	/*

++	 * End of the dictionary buffer. In multi-call mode, this is

++	 * the same as the dictionary size. In single-call mode, this

++	 * indicates the size of the output buffer.

++	 */

++	size_t end;

++

++	/*

++	 * Size of the dictionary as specified in Block Header. This is used

++	 * together with "full" to detect corrupt input that would make us

++	 * read beyond the beginning of the uncompressed stream.

++	 */

++	uint32_t size;

++

++	/*

++	 * Maximum allowed dictionary size in multi-call mode.

++	 * This is ignored in single-call mode.

++	 */

++	uint32_t size_max;

++

++	/*

++	 * Amount of memory currently allocated for the dictionary.

++	 * This is used only with XZ_DYNALLOC. (With XZ_PREALLOC,

++	 * size_max is always the same as the allocated size.)

++	 */

++	uint32_t allocated;

++

++	/* Operation mode */

++	enum xz_mode mode;

++};

++

++/* Range decoder */

++struct rc_dec {

++	uint32_t range;

++	uint32_t code;

++

++	/*

++	 * Number of initializing bytes remaining to be read

++	 * by rc_read_init().

++	 */

++	uint32_t init_bytes_left;

++

++	/*

++	 * Buffer from which we read our input. It can be either

++	 * temp.buf or the caller-provided input buffer.

++	 */

++	const uint8_t *in;

++	size_t in_pos;

++	size_t in_limit;

++};

++

++/* Probabilities for a length decoder. */

++struct lzma_len_dec {

++	/* Probability of match length being at least 10 */

++	uint16_t choice;

++

++	/* Probability of match length being at least 18 */

++	uint16_t choice2;

++

++	/* Probabilities for match lengths 2-9 */

++	uint16_t low[POS_STATES_MAX][LEN_LOW_SYMBOLS];

++

++	/* Probabilities for match lengths 10-17 */

++	uint16_t mid[POS_STATES_MAX][LEN_MID_SYMBOLS];

++

++	/* Probabilities for match lengths 18-273 */

++	uint16_t high[LEN_HIGH_SYMBOLS];

++};

++

++struct lzma_dec {

++	/* Distances of latest four matches */

++	uint32_t rep0;

++	uint32_t rep1;

++	uint32_t rep2;

++	uint32_t rep3;

++

++	/* Types of the most recently seen LZMA symbols */

++	enum lzma_state state;

++

++	/*

++	 * Length of a match. This is updated so that dict_repeat can

++	 * be called again to finish repeating the whole match.

++	 */

++	uint32_t len;

++

++	/*

++	 * LZMA properties or related bit masks (number of literal

++	 * context bits, a mask dervied from the number of literal

++	 * position bits, and a mask dervied from the number

++	 * position bits)

++	 */

++	uint32_t lc;

++	uint32_t literal_pos_mask; /* (1 << lp) - 1 */

++	uint32_t pos_mask;         /* (1 << pb) - 1 */

++

++	/* If 1, it's a match. Otherwise it's a single 8-bit literal. */

++	uint16_t is_match[STATES][POS_STATES_MAX];

++

++	/* If 1, it's a repeated match. The distance is one of rep0 .. rep3. */

++	uint16_t is_rep[STATES];

++

++	/*

++	 * If 0, distance of a repeated match is rep0.

++	 * Otherwise check is_rep1.

++	 */

++	uint16_t is_rep0[STATES];

++

++	/*

++	 * If 0, distance of a repeated match is rep1.

++	 * Otherwise check is_rep2.

++	 */

++	uint16_t is_rep1[STATES];

++

++	/* If 0, distance of a repeated match is rep2. Otherwise it is rep3. */

++	uint16_t is_rep2[STATES];

++

++	/*

++	 * If 1, the repeated match has length of one byte. Otherwise

++	 * the length is decoded from rep_len_decoder.

++	 */

++	uint16_t is_rep0_long[STATES][POS_STATES_MAX];

++

++	/*

++	 * Probability tree for the highest two bits of the match

++	 * distance. There is a separate probability tree for match

++	 * lengths of 2 (i.e. MATCH_LEN_MIN), 3, 4, and [5, 273].

++	 */

++	uint16_t dist_slot[DIST_STATES][DIST_SLOTS];

++

++	/*

++	 * Probility trees for additional bits for match distance

++	 * when the distance is in the range [4, 127].

++	 */

++	uint16_t dist_special[FULL_DISTANCES - DIST_MODEL_END];

++

++	/*

++	 * Probability tree for the lowest four bits of a match

++	 * distance that is equal to or greater than 128.

++	 */

++	uint16_t dist_align[ALIGN_SIZE];

++

++	/* Length of a normal match */

++	struct lzma_len_dec match_len_dec;

++

++	/* Length of a repeated match */

++	struct lzma_len_dec rep_len_dec;

++

++	/* Probabilities of literals */

++	uint16_t literal[LITERAL_CODERS_MAX][LITERAL_CODER_SIZE];

++};

++

++struct lzma2_dec {

++	/* Position in xz_dec_lzma2_run(). */

++	enum lzma2_seq {

++		SEQ_CONTROL,

++		SEQ_UNCOMPRESSED_1,

++		SEQ_UNCOMPRESSED_2,

++		SEQ_COMPRESSED_0,

++		SEQ_COMPRESSED_1,

++		SEQ_PROPERTIES,

++		SEQ_LZMA_PREPARE,

++		SEQ_LZMA_RUN,

++		SEQ_COPY

++	} sequence;

++

++	/* Next position after decoding the compressed size of the chunk. */

++	enum lzma2_seq next_sequence;

++

++	/* Uncompressed size of LZMA chunk (2 MiB at maximum) */

++	uint32_t uncompressed;

++

++	/*

++	 * Compressed size of LZMA chunk or compressed/uncompressed

++	 * size of uncompressed chunk (64 KiB at maximum)

++	 */

++	uint32_t compressed;

++

++	/*

++	 * True if dictionary reset is needed. This is false before

++	 * the first chunk (LZMA or uncompressed).

++	 */

++	bool_t need_dict_reset;

++

++	/*

++	 * True if new LZMA properties are needed. This is false

++	 * before the first LZMA chunk.

++	 */

++	bool_t need_props;

++};

++

++struct xz_dec_lzma2 {

++	/*

++	 * The order below is important on x86 to reduce code size and

++	 * it shouldn't hurt on other platforms. Everything up to and

++	 * including lzma.pos_mask are in the first 128 bytes on x86-32,

++	 * which allows using smaller instructions to access those

++	 * variables. On x86-64, fewer variables fit into the first 128

++	 * bytes, but this is still the best order without sacrificing

++	 * the readability by splitting the structures.

++	 */

++	struct rc_dec rc;

++	struct dictionary dict;

++	struct lzma2_dec lzma2;

++	struct lzma_dec lzma;

++

++	/*

++	 * Temporary buffer which holds small number of input bytes between

++	 * decoder calls. See lzma2_lzma() for details.

++	 */

++	struct {

++		uint32_t size;

++		uint8_t buf[3 * LZMA_IN_REQUIRED];

++	} temp;

++};

++

++/**************

++ * Dictionary *

++ **************/

++

++/*

++ * Reset the dictionary state. When in single-call mode, set up the beginning

++ * of the dictionary to point to the actual output buffer.

++ */

++static void INIT dict_reset(struct dictionary *dict, struct xz_buf *b)

++{

++	if (DEC_IS_SINGLE(dict->mode)) {

++		dict->buf = b->out + b->out_pos;

++		dict->end = b->out_size - b->out_pos;

++	}

++

++	dict->start = 0;

++	dict->pos = 0;

++	dict->limit = 0;

++	dict->full = 0;

++}

++

++/* Set dictionary write limit */

++static void INIT dict_limit(struct dictionary *dict, size_t out_max)

++{

++	if (dict->end - dict->pos <= out_max)

++		dict->limit = dict->end;

++	else

++		dict->limit = dict->pos + out_max;

++}

++

++/* Return true if at least one byte can be written into the dictionary. */

++static inline bool_t INIT dict_has_space(const struct dictionary *dict)

++{

++	return dict->pos < dict->limit;

++}

++

++/*

++ * Get a byte from the dictionary at the given distance. The distance is

++ * assumed to valid, or as a special case, zero when the dictionary is

++ * still empty. This special case is needed for single-call decoding to

++ * avoid writing a '\0' to the end of the destination buffer.

++ */

++static inline uint32_t INIT dict_get(const struct dictionary *dict, uint32_t dist)

++{

++	size_t offset = dict->pos - dist - 1;

++

++	if (dist >= dict->pos)

++		offset += dict->end;

++

++	return dict->full > 0 ? dict->buf[offset] : 0;

++}

++

++/*

++ * Put one byte into the dictionary. It is assumed that there is space for it.

++ */

++static inline void INIT dict_put(struct dictionary *dict, uint8_t byte)

++{

++	dict->buf[dict->pos++] = byte;

++

++	if (dict->full < dict->pos)

++		dict->full = dict->pos;

++}

++

++/*

++ * Repeat given number of bytes from the given distance. If the distance is

++ * invalid, false is returned. On success, true is returned and *len is

++ * updated to indicate how many bytes were left to be repeated.

++ */

++static bool_t INIT dict_repeat(struct dictionary *dict, uint32_t *len, uint32_t dist)

++{

++	size_t back;

++	uint32_t left;

++

++	if (dist >= dict->full || dist >= dict->size)

++		return false;

++

++	left = min_t(size_t, dict->limit - dict->pos, *len);

++	*len -= left;

++

++	back = dict->pos - dist - 1;

++	if (dist >= dict->pos)

++		back += dict->end;

++

++	do {

++		dict->buf[dict->pos++] = dict->buf[back++];

++		if (back == dict->end)

++			back = 0;

++	} while (--left > 0);

++

++	if (dict->full < dict->pos)

++		dict->full = dict->pos;

++

++	return true;

++}

++

++/* Copy uncompressed data as is from input to dictionary and output buffers. */

++static void INIT dict_uncompressed(struct dictionary *dict, struct xz_buf *b,

++				   uint32_t *left)

++{

++	size_t copy_size;

++

++	while (*left > 0 && b->in_pos < b->in_size

++			&& b->out_pos < b->out_size) {

++		copy_size = min(b->in_size - b->in_pos,

++				b->out_size - b->out_pos);

++		if (copy_size > dict->end - dict->pos)

++			copy_size = dict->end - dict->pos;

++		if (copy_size > *left)

++			copy_size = *left;

++

++		*left -= copy_size;

++

++		memcpy(dict->buf + dict->pos, b->in + b->in_pos, copy_size);

++		dict->pos += copy_size;

++

++		if (dict->full < dict->pos)

++			dict->full = dict->pos;

++

++		if (DEC_IS_MULTI(dict->mode)) {

++			if (dict->pos == dict->end)

++				dict->pos = 0;

++

++			memcpy(b->out + b->out_pos, b->in + b->in_pos,

++					copy_size);

++		}

++

++		dict->start = dict->pos;

++

++		b->out_pos += copy_size;

++		b->in_pos += copy_size;

++	}

++}

++

++/*

++ * Flush pending data from dictionary to b->out. It is assumed that there is

++ * enough space in b->out. This is guaranteed because caller uses dict_limit()

++ * before decoding data into the dictionary.

++ */

++static uint32_t INIT dict_flush(struct dictionary *dict, struct xz_buf *b)

++{

++	size_t copy_size = dict->pos - dict->start;

++

++	if (DEC_IS_MULTI(dict->mode)) {

++		if (dict->pos == dict->end)

++			dict->pos = 0;

++

++		memcpy(b->out + b->out_pos, dict->buf + dict->start,

++				copy_size);

++	}

++

++	dict->start = dict->pos;

++	b->out_pos += copy_size;

++	return copy_size;

++}

++

++/*****************

++ * Range decoder *

++ *****************/

++

++/* Reset the range decoder. */

++static void INIT rc_reset(struct rc_dec *rc)

++{

++	rc->range = (uint32_t)-1;

++	rc->code = 0;

++	rc->init_bytes_left = RC_INIT_BYTES;

++}

++

++/*

++ * Read the first five initial bytes into rc->code if they haven't been

++ * read already. (Yes, the first byte gets completely ignored.)

++ */

++static bool_t INIT rc_read_init(struct rc_dec *rc, struct xz_buf *b)

++{

++	while (rc->init_bytes_left > 0) {

++		if (b->in_pos == b->in_size)

++			return false;

++

++		rc->code = (rc->code << 8) + b->in[b->in_pos++];

++		--rc->init_bytes_left;

++	}

++

++	return true;

++}

++

++/* Return true if there may not be enough input for the next decoding loop. */

++static inline bool_t INIT rc_limit_exceeded(const struct rc_dec *rc)

++{

++	return rc->in_pos > rc->in_limit;

++}

++

++/*

++ * Return true if it is possible (from point of view of range decoder) that

++ * we have reached the end of the LZMA chunk.

++ */

++static inline bool_t INIT rc_is_finished(const struct rc_dec *rc)

++{

++	return rc->code == 0;

++}

++

++/* Read the next input byte if needed. */

++static always_inline void rc_normalize(struct rc_dec *rc)

++{

++	if (rc->range < RC_TOP_VALUE) {

++		rc->range <<= RC_SHIFT_BITS;

++		rc->code = (rc->code << RC_SHIFT_BITS) + rc->in[rc->in_pos++];

++	}

++}

++

++/*

++ * Decode one bit. In some versions, this function has been splitted in three

++ * functions so that the compiler is supposed to be able to more easily avoid

++ * an extra branch. In this particular version of the LZMA decoder, this

++ * doesn't seem to be a good idea (tested with GCC 3.3.6, 3.4.6, and 4.3.3

++ * on x86). Using a non-splitted version results in nicer looking code too.

++ *

++ * NOTE: This must return an int. Do not make it return a bool or the speed

++ * of the code generated by GCC 3.x decreases 10-15 %. (GCC 4.3 doesn't care,

++ * and it generates 10-20 % faster code than GCC 3.x from this file anyway.)

++ */

++static always_inline int rc_bit(struct rc_dec *rc, uint16_t *prob)

++{

++	uint32_t bound;

++	int bit;

++

++	rc_normalize(rc);

++	bound = (rc->range >> RC_BIT_MODEL_TOTAL_BITS) * *prob;

++	if (rc->code < bound) {

++		rc->range = bound;

++		*prob += (RC_BIT_MODEL_TOTAL - *prob) >> RC_MOVE_BITS;

++		bit = 0;

++	} else {

++		rc->range -= bound;

++		rc->code -= bound;

++		*prob -= *prob >> RC_MOVE_BITS;

++		bit = 1;

++	}

++

++	return bit;

++}

++

++/* Decode a bittree starting from the most significant bit. */

++static always_inline uint32_t rc_bittree(struct rc_dec *rc,

++					 uint16_t *probs, uint32_t limit)

++{

++	uint32_t symbol = 1;

++

++	do {

++		if (rc_bit(rc, &probs[symbol]))

++			symbol = (symbol << 1) + 1;

++		else

++			symbol <<= 1;

++	} while (symbol < limit);

++

++	return symbol;

++}

++

++/* Decode a bittree starting from the least significant bit. */

++static always_inline void rc_bittree_reverse(struct rc_dec *rc,

++					     uint16_t *probs,

++					     uint32_t *dest, uint32_t limit)

++{

++	uint32_t symbol = 1;

++	uint32_t i = 0;

++

++	do {

++		if (rc_bit(rc, &probs[symbol])) {

++			symbol = (symbol << 1) + 1;

++			*dest += 1 << i;

++		} else {

++			symbol <<= 1;

++		}

++	} while (++i < limit);

++}

++

++/* Decode direct bits (fixed fifty-fifty probability) */

++static inline void INIT rc_direct(struct rc_dec *rc, uint32_t *dest, uint32_t limit)

++{

++	uint32_t mask;

++

++	do {

++		rc_normalize(rc);

++		rc->range >>= 1;

++		rc->code -= rc->range;

++		mask = (uint32_t)0 - (rc->code >> 31);

++		rc->code += rc->range & mask;

++		*dest = (*dest << 1) + (mask + 1);

++	} while (--limit > 0);

++}

++

++/********

++ * LZMA *

++ ********/

++

++/* Get pointer to literal coder probability array. */

++static uint16_t *INIT lzma_literal_probs(struct xz_dec_lzma2 *s)

++{

++	uint32_t prev_byte = dict_get(&s->dict, 0);

++	uint32_t low = prev_byte >> (8 - s->lzma.lc);

++	uint32_t high = (s->dict.pos & s->lzma.literal_pos_mask) << s->lzma.lc;

++	return s->lzma.literal[low + high];

++}

++

++/* Decode a literal (one 8-bit byte) */

++static void INIT lzma_literal(struct xz_dec_lzma2 *s)

++{

++	uint16_t *probs;

++	uint32_t symbol;

++	uint32_t match_byte;

++	uint32_t match_bit;

++	uint32_t offset;

++	uint32_t i;

++

++	probs = lzma_literal_probs(s);

++

++	if (lzma_state_is_literal(s->lzma.state)) {

++		symbol = rc_bittree(&s->rc, probs, 0x100);

++	} else {

++		symbol = 1;

++		match_byte = dict_get(&s->dict, s->lzma.rep0) << 1;

++		offset = 0x100;

++

++		do {

++			match_bit = match_byte & offset;

++			match_byte <<= 1;

++			i = offset + match_bit + symbol;

++

++			if (rc_bit(&s->rc, &probs[i])) {

++				symbol = (symbol << 1) + 1;

++				offset &= match_bit;

++			} else {

++				symbol <<= 1;

++				offset &= ~match_bit;

++			}

++		} while (symbol < 0x100);

++	}

++

++	dict_put(&s->dict, (uint8_t)symbol);

++	lzma_state_literal(&s->lzma.state);

++}

++

++/* Decode the length of the match into s->lzma.len. */

++static void INIT lzma_len(struct xz_dec_lzma2 *s, struct lzma_len_dec *l,

++			  uint32_t pos_state)

++{

++	uint16_t *probs;

++	uint32_t limit;

++

++	if (!rc_bit(&s->rc, &l->choice)) {

++		probs = l->low[pos_state];

++		limit = LEN_LOW_SYMBOLS;

++		s->lzma.len = MATCH_LEN_MIN;

++	} else {

++		if (!rc_bit(&s->rc, &l->choice2)) {

++			probs = l->mid[pos_state];

++			limit = LEN_MID_SYMBOLS;

++			s->lzma.len = MATCH_LEN_MIN + LEN_LOW_SYMBOLS;

++		} else {

++			probs = l->high;

++			limit = LEN_HIGH_SYMBOLS;

++			s->lzma.len = MATCH_LEN_MIN + LEN_LOW_SYMBOLS

++					+ LEN_MID_SYMBOLS;

++		}

++	}

++

++	s->lzma.len += rc_bittree(&s->rc, probs, limit) - limit;

++}

++

++/* Decode a match. The distance will be stored in s->lzma.rep0. */

++static void INIT lzma_match(struct xz_dec_lzma2 *s, uint32_t pos_state)

++{

++	uint16_t *probs;

++	uint32_t dist_slot;

++	uint32_t limit;

++

++	lzma_state_match(&s->lzma.state);

++

++	s->lzma.rep3 = s->lzma.rep2;

++	s->lzma.rep2 = s->lzma.rep1;

++	s->lzma.rep1 = s->lzma.rep0;

++

++	lzma_len(s, &s->lzma.match_len_dec, pos_state);

++

++	probs = s->lzma.dist_slot[lzma_get_dist_state(s->lzma.len)];

++	dist_slot = rc_bittree(&s->rc, probs, DIST_SLOTS) - DIST_SLOTS;

++

++	if (dist_slot < DIST_MODEL_START) {

++		s->lzma.rep0 = dist_slot;

++	} else {

++		limit = (dist_slot >> 1) - 1;

++		s->lzma.rep0 = 2 + (dist_slot & 1);

++

++		if (dist_slot < DIST_MODEL_END) {

++			s->lzma.rep0 <<= limit;

++			probs = s->lzma.dist_special + s->lzma.rep0

++					- dist_slot - 1;

++			rc_bittree_reverse(&s->rc, probs,

++					&s->lzma.rep0, limit);

++		} else {

++			rc_direct(&s->rc, &s->lzma.rep0, limit - ALIGN_BITS);

++			s->lzma.rep0 <<= ALIGN_BITS;

++			rc_bittree_reverse(&s->rc, s->lzma.dist_align,

++					&s->lzma.rep0, ALIGN_BITS);

++		}

++	}

++}

++

++/*

++ * Decode a repeated match. The distance is one of the four most recently

++ * seen matches. The distance will be stored in s->lzma.rep0.

++ */

++static void INIT lzma_rep_match(struct xz_dec_lzma2 *s, uint32_t pos_state)

++{

++	uint32_t tmp;

++

++	if (!rc_bit(&s->rc, &s->lzma.is_rep0[s->lzma.state])) {

++		if (!rc_bit(&s->rc, &s->lzma.is_rep0_long[

++				s->lzma.state][pos_state])) {

++			lzma_state_short_rep(&s->lzma.state);

++			s->lzma.len = 1;

++			return;

++		}

++	} else {

++		if (!rc_bit(&s->rc, &s->lzma.is_rep1[s->lzma.state])) {

++			tmp = s->lzma.rep1;

++		} else {

++			if (!rc_bit(&s->rc, &s->lzma.is_rep2[s->lzma.state])) {

++				tmp = s->lzma.rep2;

++			} else {

++				tmp = s->lzma.rep3;

++				s->lzma.rep3 = s->lzma.rep2;

++			}

++

++			s->lzma.rep2 = s->lzma.rep1;

++		}

++

++		s->lzma.rep1 = s->lzma.rep0;

++		s->lzma.rep0 = tmp;

++	}

++

++	lzma_state_long_rep(&s->lzma.state);

++	lzma_len(s, &s->lzma.rep_len_dec, pos_state);

++}

++

++/* LZMA decoder core */

++static bool_t INIT lzma_main(struct xz_dec_lzma2 *s)

++{

++	uint32_t pos_state;

++

++	/*

++	 * If the dictionary was reached during the previous call, try to

++	 * finish the possibly pending repeat in the dictionary.

++	 */

++	if (dict_has_space(&s->dict) && s->lzma.len > 0)

++		dict_repeat(&s->dict, &s->lzma.len, s->lzma.rep0);

++

++	/*

++	 * Decode more LZMA symbols. One iteration may consume up to

++	 * LZMA_IN_REQUIRED - 1 bytes.

++	 */

++	while (dict_has_space(&s->dict) && !rc_limit_exceeded(&s->rc)) {

++		pos_state = s->dict.pos & s->lzma.pos_mask;

++

++		if (!rc_bit(&s->rc, &s->lzma.is_match[

++				s->lzma.state][pos_state])) {

++			lzma_literal(s);

++		} else {

++			if (rc_bit(&s->rc, &s->lzma.is_rep[s->lzma.state]))

++				lzma_rep_match(s, pos_state);

++			else

++				lzma_match(s, pos_state);

++

++			if (!dict_repeat(&s->dict, &s->lzma.len, s->lzma.rep0))

++				return false;

++		}

++	}

++

++	/*

++	 * Having the range decoder always normalized when we are outside

++	 * this function makes it easier to correctly handle end of the chunk.

++	 */

++	rc_normalize(&s->rc);

++

++	return true;

++}

++

++/*

++ * Reset the LZMA decoder and range decoder state. Dictionary is nore reset

++ * here, because LZMA state may be reset without resetting the dictionary.

++ */

++static void INIT lzma_reset(struct xz_dec_lzma2 *s)

++{

++	uint16_t *probs;

++	size_t i;

++

++	s->lzma.state = STATE_LIT_LIT;

++	s->lzma.rep0 = 0;

++	s->lzma.rep1 = 0;

++	s->lzma.rep2 = 0;

++	s->lzma.rep3 = 0;

++

++	/*

++	 * All probabilities are initialized to the same value. This hack

++	 * makes the code smaller by avoiding a separate loop for each

++	 * probability array.

++	 *

++	 * This could be optimized so that only that part of literal

++	 * probabilities that are actually required. In the common case

++	 * we would write 12 KiB less.

++	 */

++	probs = s->lzma.is_match[0];

++	for (i = 0; i < PROBS_TOTAL; ++i)

++		probs[i] = RC_BIT_MODEL_TOTAL / 2;

++

++	rc_reset(&s->rc);

++}

++

++/*

++ * Decode and validate LZMA properties (lc/lp/pb) and calculate the bit masks

++ * from the decoded lp and pb values. On success, the LZMA decoder state is

++ * reset and true is returned.

++ */

++static bool_t INIT lzma_props(struct xz_dec_lzma2 *s, uint8_t props)

++{

++	if (props > (4 * 5 + 4) * 9 + 8)

++		return false;

++

++	s->lzma.pos_mask = 0;

++	while (props >= 9 * 5) {

++		props -= 9 * 5;

++		++s->lzma.pos_mask;

++	}

++

++	s->lzma.pos_mask = (1 << s->lzma.pos_mask) - 1;

++

++	s->lzma.literal_pos_mask = 0;

++	while (props >= 9) {

++		props -= 9;

++		++s->lzma.literal_pos_mask;

++	}

++

++	s->lzma.lc = props;

++

++	if (s->lzma.lc + s->lzma.literal_pos_mask > 4)

++		return false;

++

++	s->lzma.literal_pos_mask = (1 << s->lzma.literal_pos_mask) - 1;

++

++	lzma_reset(s);

++

++	return true;

++}

++

++/*********

++ * LZMA2 *

++ *********/

++

++/*

++ * The LZMA decoder assumes that if the input limit (s->rc.in_limit) hasn't

++ * been exceeded, it is safe to read up to LZMA_IN_REQUIRED bytes. This

++ * wrapper function takes care of making the LZMA decoder's assumption safe.

++ *

++ * As long as there is plenty of input left to be decoded in the current LZMA

++ * chunk, we decode directly from the caller-supplied input buffer until

++ * there's LZMA_IN_REQUIRED bytes left. Those remaining bytes are copied into

++ * s->temp.buf, which (hopefully) gets filled on the next call to this

++ * function. We decode a few bytes from the temporary buffer so that we can

++ * continue decoding from the caller-supplied input buffer again.

++ */

++static bool_t INIT lzma2_lzma(struct xz_dec_lzma2 *s, struct xz_buf *b)

++{

++	size_t in_avail;

++	uint32_t tmp;

++

++	in_avail = b->in_size - b->in_pos;

++	if (s->temp.size > 0 || s->lzma2.compressed == 0) {

++		tmp = 2 * LZMA_IN_REQUIRED - s->temp.size;

++		if (tmp > s->lzma2.compressed - s->temp.size)

++			tmp = s->lzma2.compressed - s->temp.size;

++		if (tmp > in_avail)

++			tmp = in_avail;

++

++		memcpy(s->temp.buf + s->temp.size, b->in + b->in_pos, tmp);

++

++		if (s->temp.size + tmp == s->lzma2.compressed) {

++			memzero(s->temp.buf + s->temp.size + tmp,

++					sizeof(s->temp.buf)

++						- s->temp.size - tmp);

++			s->rc.in_limit = s->temp.size + tmp;

++		} else if (s->temp.size + tmp < LZMA_IN_REQUIRED) {

++			s->temp.size += tmp;

++			b->in_pos += tmp;

++			return true;

++		} else {

++			s->rc.in_limit = s->temp.size + tmp - LZMA_IN_REQUIRED;

++		}

++

++		s->rc.in = s->temp.buf;

++		s->rc.in_pos = 0;

++

++		if (!lzma_main(s) || s->rc.in_pos > s->temp.size + tmp)

++			return false;

++

++		s->lzma2.compressed -= s->rc.in_pos;

++

++		if (s->rc.in_pos < s->temp.size) {

++			s->temp.size -= s->rc.in_pos;

++			memmove(s->temp.buf, s->temp.buf + s->rc.in_pos,

++					s->temp.size);

++			return true;

++		}

++

++		b->in_pos += s->rc.in_pos - s->temp.size;

++		s->temp.size = 0;

++	}

++

++	in_avail = b->in_size - b->in_pos;

++	if (in_avail >= LZMA_IN_REQUIRED) {

++		s->rc.in = b->in;

++		s->rc.in_pos = b->in_pos;

++

++		if (in_avail >= s->lzma2.compressed + LZMA_IN_REQUIRED)

++			s->rc.in_limit = b->in_pos + s->lzma2.compressed;

++		else

++			s->rc.in_limit = b->in_size - LZMA_IN_REQUIRED;

++

++		if (!lzma_main(s))

++			return false;

++

++		in_avail = s->rc.in_pos - b->in_pos;

++		if (in_avail > s->lzma2.compressed)

++			return false;

++

++		s->lzma2.compressed -= in_avail;

++		b->in_pos = s->rc.in_pos;

++	}

++

++	in_avail = b->in_size - b->in_pos;

++	if (in_avail < LZMA_IN_REQUIRED) {

++		if (in_avail > s->lzma2.compressed)

++			in_avail = s->lzma2.compressed;

++

++		memcpy(s->temp.buf, b->in + b->in_pos, in_avail);

++		s->temp.size = in_avail;

++		b->in_pos += in_avail;

++	}

++

++	return true;

++}

++

++/*

++ * Take care of the LZMA2 control layer, and forward the job of actual LZMA

++ * decoding or copying of uncompressed chunks to other functions.

++ */

++XZ_EXTERN enum xz_ret INIT xz_dec_lzma2_run(struct xz_dec_lzma2 *s,

++					    struct xz_buf *b)

++{

++	uint32_t tmp;

++

++	while (b->in_pos < b->in_size || s->lzma2.sequence == SEQ_LZMA_RUN) {

++		switch (s->lzma2.sequence) {

++		case SEQ_CONTROL:

++			/*

++			 * LZMA2 control byte

++			 *

++			 * Exact values:

++			 *   0x00   End marker

++			 *   0x01   Dictionary reset followed by

++			 *          an uncompressed chunk

++			 *   0x02   Uncompressed chunk (no dictionary reset)

++			 *

++			 * Highest three bits (s->control & 0xE0):

++			 *   0xE0   Dictionary reset, new properties and state

++			 *          reset, followed by LZMA compressed chunk

++			 *   0xC0   New properties and state reset, followed

++			 *          by LZMA compressed chunk (no dictionary

++			 *          reset)

++			 *   0xA0   State reset using old properties,

++			 *          followed by LZMA compressed chunk (no

++			 *          dictionary reset)

++			 *   0x80   LZMA chunk (no dictionary or state reset)

++			 *

++			 * For LZMA compressed chunks, the lowest five bits

++			 * (s->control & 1F) are the highest bits of the

++			 * uncompressed size (bits 16-20).

++			 *

++			 * A new LZMA2 stream must begin with a dictionary

++			 * reset. The first LZMA chunk must set new

++			 * properties and reset the LZMA state.

++			 *

++			 * Values that don't match anything described above

++			 * are invalid and we return XZ_DATA_ERROR.

++			 */

++			tmp = b->in[b->in_pos++];

++

++			if (tmp >= 0xE0 || tmp == 0x01) {

++				s->lzma2.need_props = true;

++				s->lzma2.need_dict_reset = false;

++				dict_reset(&s->dict, b);

++			} else if (s->lzma2.need_dict_reset) {

++				return XZ_DATA_ERROR;

++			}

++

++			if (tmp >= 0x80) {

++				s->lzma2.uncompressed = (tmp & 0x1F) << 16;

++				s->lzma2.sequence = SEQ_UNCOMPRESSED_1;

++

++				if (tmp >= 0xC0) {

++					/*

++					 * When there are new properties,

++					 * state reset is done at

++					 * SEQ_PROPERTIES.

++					 */

++					s->lzma2.need_props = false;

++					s->lzma2.next_sequence

++							= SEQ_PROPERTIES;

++

++				} else if (s->lzma2.need_props) {

++					return XZ_DATA_ERROR;

++

++				} else {

++					s->lzma2.next_sequence

++							= SEQ_LZMA_PREPARE;

++					if (tmp >= 0xA0)

++						lzma_reset(s);

++				}

++			} else {

++				if (tmp == 0x00)

++					return XZ_STREAM_END;

++

++				if (tmp > 0x02)

++					return XZ_DATA_ERROR;

++

++				s->lzma2.sequence = SEQ_COMPRESSED_0;

++				s->lzma2.next_sequence = SEQ_COPY;

++			}

++

++			break;

++

++		case SEQ_UNCOMPRESSED_1:

++			s->lzma2.uncompressed

++					+= (uint32_t)b->in[b->in_pos++] << 8;

++			s->lzma2.sequence = SEQ_UNCOMPRESSED_2;

++			break;

++

++		case SEQ_UNCOMPRESSED_2:

++			s->lzma2.uncompressed

++					+= (uint32_t)b->in[b->in_pos++] + 1;

++			s->lzma2.sequence = SEQ_COMPRESSED_0;

++			break;

++

++		case SEQ_COMPRESSED_0:

++			s->lzma2.compressed

++					= (uint32_t)b->in[b->in_pos++] << 8;

++			s->lzma2.sequence = SEQ_COMPRESSED_1;

++			break;

++

++		case SEQ_COMPRESSED_1:

++			s->lzma2.compressed

++					+= (uint32_t)b->in[b->in_pos++] + 1;

++			s->lzma2.sequence = s->lzma2.next_sequence;

++			break;

++

++		case SEQ_PROPERTIES:

++			if (!lzma_props(s, b->in[b->in_pos++]))

++				return XZ_DATA_ERROR;

++

++			s->lzma2.sequence = SEQ_LZMA_PREPARE;

++

++		case SEQ_LZMA_PREPARE:

++			if (s->lzma2.compressed < RC_INIT_BYTES)

++				return XZ_DATA_ERROR;

++

++			if (!rc_read_init(&s->rc, b))

++				return XZ_OK;

++

++			s->lzma2.compressed -= RC_INIT_BYTES;

++			s->lzma2.sequence = SEQ_LZMA_RUN;

++

++		case SEQ_LZMA_RUN:

++			/*

++			 * Set dictionary limit to indicate how much we want

++			 * to be encoded at maximum. Decode new data into the

++			 * dictionary. Flush the new data from dictionary to

++			 * b->out. Check if we finished decoding this chunk.

++			 * In case the dictionary got full but we didn't fill

++			 * the output buffer yet, we may run this loop

++			 * multiple times without changing s->lzma2.sequence.

++			 */

++			dict_limit(&s->dict, min_t(size_t,

++					b->out_size - b->out_pos,

++					s->lzma2.uncompressed));

++			if (!lzma2_lzma(s, b))

++				return XZ_DATA_ERROR;

++

++			s->lzma2.uncompressed -= dict_flush(&s->dict, b);

++

++			if (s->lzma2.uncompressed == 0) {

++				if (s->lzma2.compressed > 0 || s->lzma.len > 0

++						|| !rc_is_finished(&s->rc))

++					return XZ_DATA_ERROR;

++

++				rc_reset(&s->rc);

++				s->lzma2.sequence = SEQ_CONTROL;

++

++			} else if (b->out_pos == b->out_size

++					|| (b->in_pos == b->in_size

++						&& s->temp.size

++						< s->lzma2.compressed)) {

++				return XZ_OK;

++			}

++

++			break;

++

++		case SEQ_COPY:

++			dict_uncompressed(&s->dict, b, &s->lzma2.compressed);

++			if (s->lzma2.compressed > 0)

++				return XZ_OK;

++

++			s->lzma2.sequence = SEQ_CONTROL;

++			break;

++		}

++	}

++

++	return XZ_OK;

++}

++

++XZ_EXTERN struct xz_dec_lzma2 *INIT xz_dec_lzma2_create(enum xz_mode mode,

++						   uint32_t dict_max)

++{

++	struct xz_dec_lzma2 *s = malloc(sizeof(*s));

++	if (s == NULL)

++		return NULL;

++

++	s->dict.mode = mode;

++	s->dict.size_max = dict_max;

++

++	if (DEC_IS_PREALLOC(mode)) {

++		s->dict.buf = large_malloc(dict_max);

++		if (s->dict.buf == NULL) {

++			free(s);

++			return NULL;

++		}

++	} else if (DEC_IS_DYNALLOC(mode)) {

++		s->dict.buf = NULL;

++		s->dict.allocated = 0;

++	}

++

++	return s;

++}

++

++XZ_EXTERN enum xz_ret INIT xz_dec_lzma2_reset(struct xz_dec_lzma2 *s, uint8_t props)

++{

++	/* This limits dictionary size to 3 GiB to keep parsing simpler. */

++	if (props > 39)

++		return XZ_OPTIONS_ERROR;

++

++	s->dict.size = 2 + (props & 1);

++	s->dict.size <<= (props >> 1) + 11;

++

++	if (DEC_IS_MULTI(s->dict.mode)) {

++		if (s->dict.size > s->dict.size_max)

++			return XZ_MEMLIMIT_ERROR;

++

++		s->dict.end = s->dict.size;

++

++		if (DEC_IS_DYNALLOC(s->dict.mode)) {

++			if (s->dict.allocated < s->dict.size) {

++				large_free(s->dict.buf);

++				s->dict.buf = large_malloc(s->dict.size);

++				if (s->dict.buf == NULL) {

++					s->dict.allocated = 0;

++					return XZ_MEM_ERROR;

++				}

++			}

++		}

++	}

++

++	s->lzma.len = 0;

++

++	s->lzma2.sequence = SEQ_CONTROL;

++	s->lzma2.need_dict_reset = true;

++

++	s->temp.size = 0;

++

++	return XZ_OK;

++}

++

++XZ_EXTERN void INIT xz_dec_lzma2_end(struct xz_dec_lzma2 *s)

++{

++	if (DEC_IS_MULTI(s->dict.mode))

++		large_free(s->dict.buf);

++

++	free(s);

++}

+diff --git a/xen/common/xz/dec_stream.c b/xen/common/xz/dec_stream.c

+new file mode 100644

+--- /dev/null

++++ b/xen/common/xz/dec_stream.c

+@@ -0,0 +1,821 @@

++/*

++ * .xz Stream decoder

++ *

++ * Author: Lasse Collin <lasse.collin@tukaani.org>

++ *

++ * This file has been put into the public domain.

++ * You can do whatever you want with this file.

++ */

++

++#include "private.h"

++#include "stream.h"

++

++/* Hash used to validate the Index field */

++struct xz_dec_hash {

++	vli_type unpadded;

++	vli_type uncompressed;

++	uint32_t crc32;

++};

++

++struct xz_dec {

++	/* Position in dec_main() */

++	enum {

++		SEQ_STREAM_HEADER,

++		SEQ_BLOCK_START,

++		SEQ_BLOCK_HEADER,

++		SEQ_BLOCK_UNCOMPRESS,

++		SEQ_BLOCK_PADDING,

++		SEQ_BLOCK_CHECK,

++		SEQ_INDEX,

++		SEQ_INDEX_PADDING,

++		SEQ_INDEX_CRC32,

++		SEQ_STREAM_FOOTER

++	} sequence;

++

++	/* Position in variable-length integers and Check fields */

++	uint32_t pos;

++

++	/* Variable-length integer decoded by dec_vli() */

++	vli_type vli;

++

++	/* Saved in_pos and out_pos */

++	size_t in_start;

++	size_t out_start;

++

++	/* CRC32 value in Block or Index */

++	uint32_t crc32;

++

++	/* Type of the integrity check calculated from uncompressed data */

++	enum xz_check check_type;

++

++	/* Operation mode */

++	enum xz_mode mode;

++

++	/*

++	 * True if the next call to xz_dec_run() is allowed to return

++	 * XZ_BUF_ERROR.

++	 */

++	bool_t allow_buf_error;

++

++	/* Information stored in Block Header */

++	struct {

++		/*

++		 * Value stored in the Compressed Size field, or

++		 * VLI_UNKNOWN if Compressed Size is not present.

++		 */

++		vli_type compressed;

++

++		/*

++		 * Value stored in the Uncompressed Size field, or

++		 * VLI_UNKNOWN if Uncompressed Size is not present.

++		 */

++		vli_type uncompressed;

++

++		/* Size of the Block Header field */

++		uint32_t size;

++	} block_header;

++

++	/* Information collected when decoding Blocks */

++	struct {

++		/* Observed compressed size of the current Block */

++		vli_type compressed;

++

++		/* Observed uncompressed size of the current Block */

++		vli_type uncompressed;

++

++		/* Number of Blocks decoded so far */

++		vli_type count;

++

++		/*

++		 * Hash calculated from the Block sizes. This is used to

++		 * validate the Index field.

++		 */

++		struct xz_dec_hash hash;

++	} block;

++

++	/* Variables needed when verifying the Index field */

++	struct {

++		/* Position in dec_index() */

++		enum {

++			SEQ_INDEX_COUNT,

++			SEQ_INDEX_UNPADDED,

++			SEQ_INDEX_UNCOMPRESSED

++		} sequence;

++

++		/* Size of the Index in bytes */

++		vli_type size;

++

++		/* Number of Records (matches block.count in valid files) */

++		vli_type count;

++

++		/*

++		 * Hash calculated from the Records (matches block.hash in

++		 * valid files).

++		 */

++		struct xz_dec_hash hash;

++	} index;

++

++	/*

++	 * Temporary buffer needed to hold Stream Header, Block Header,

++	 * and Stream Footer. The Block Header is the biggest (1 KiB)

++	 * so we reserve space according to that. buf[] has to be aligned

++	 * to a multiple of four bytes; the size_t variables before it

++	 * should guarantee this.

++	 */

++	struct {

++		size_t pos;

++		size_t size;

++		uint8_t buf[1024];

++	} temp;

++

++	struct xz_dec_lzma2 *lzma2;

++

++#ifdef XZ_DEC_BCJ

++	struct xz_dec_bcj *bcj;

++	bool_t bcj_active;

++#endif

++};

++

++#ifdef XZ_DEC_ANY_CHECK

++/* Sizes of the Check field with different Check IDs */

++static const uint8_t check_sizes[16] = {

++	0,

++	4, 4, 4,

++	8, 8, 8,

++	16, 16, 16,

++	32, 32, 32,

++	64, 64, 64

++};

++#endif

++

++/*

++ * Fill s->temp by copying data starting from b->in[b->in_pos]. Caller

++ * must have set s->temp.pos to indicate how much data we are supposed

++ * to copy into s->temp.buf. Return true once s->temp.pos has reached

++ * s->temp.size.

++ */

++static bool_t INIT fill_temp(struct xz_dec *s, struct xz_buf *b)

++{

++	size_t copy_size = min_t(size_t,

++			b->in_size - b->in_pos, s->temp.size - s->temp.pos);

++

++	memcpy(s->temp.buf + s->temp.pos, b->in + b->in_pos, copy_size);

++	b->in_pos += copy_size;

++	s->temp.pos += copy_size;

++

++	if (s->temp.pos == s->temp.size) {

++		s->temp.pos = 0;

++		return true;

++	}

++

++	return false;

++}

++

++/* Decode a variable-length integer (little-endian base-128 encoding) */

++static enum xz_ret INIT dec_vli(struct xz_dec *s, const uint8_t *in,

++				size_t *in_pos, size_t in_size)

++{

++	uint8_t byte;

++

++	if (s->pos == 0)

++		s->vli = 0;

++

++	while (*in_pos < in_size) {

++		byte = in[*in_pos];

++		++*in_pos;

++

++		s->vli |= (vli_type)(byte & 0x7F) << s->pos;

++

++		if ((byte & 0x80) == 0) {

++			/* Don't allow non-minimal encodings. */

++			if (byte == 0 && s->pos != 0)

++				return XZ_DATA_ERROR;

++

++			s->pos = 0;

++			return XZ_STREAM_END;

++		}

++

++		s->pos += 7;

++		if (s->pos == 7 * VLI_BYTES_MAX)

++			return XZ_DATA_ERROR;

++	}

++

++	return XZ_OK;

++}

++

++/*

++ * Decode the Compressed Data field from a Block. Update and validate

++ * the observed compressed and uncompressed sizes of the Block so that

++ * they don't exceed the values possibly stored in the Block Header

++ * (validation assumes that no integer overflow occurs, since vli_type

++ * is normally uint64_t). Update the CRC32 if presence of the CRC32

++ * field was indicated in Stream Header.

++ *

++ * Once the decoding is finished, validate that the observed sizes match

++ * the sizes possibly stored in the Block Header. Update the hash and

++ * Block count, which are later used to validate the Index field.

++ */

++static enum xz_ret INIT dec_block(struct xz_dec *s, struct xz_buf *b)

++{

++	enum xz_ret ret;

++

++	s->in_start = b->in_pos;

++	s->out_start = b->out_pos;

++

++#ifdef XZ_DEC_BCJ

++	if (s->bcj_active)

++		ret = xz_dec_bcj_run(s->bcj, s->lzma2, b);

++	else

++#endif

++		ret = xz_dec_lzma2_run(s->lzma2, b);

++

++	s->block.compressed += b->in_pos - s->in_start;

++	s->block.uncompressed += b->out_pos - s->out_start;

++

++	/*

++	 * There is no need to separately check for VLI_UNKNOWN, since

++	 * the observed sizes are always smaller than VLI_UNKNOWN.

++	 */

++	if (s->block.compressed > s->block_header.compressed

++			|| s->block.uncompressed

++				> s->block_header.uncompressed)

++		return XZ_DATA_ERROR;

++

++	if (s->check_type == XZ_CHECK_CRC32)

++		s->crc32 = xz_crc32(b->out + s->out_start,

++				b->out_pos - s->out_start, s->crc32);

++

++	if (ret == XZ_STREAM_END) {

++		if (s->block_header.compressed != VLI_UNKNOWN

++				&& s->block_header.compressed

++					!= s->block.compressed)

++			return XZ_DATA_ERROR;

++

++		if (s->block_header.uncompressed != VLI_UNKNOWN

++				&& s->block_header.uncompressed

++					!= s->block.uncompressed)

++			return XZ_DATA_ERROR;

++

++		s->block.hash.unpadded += s->block_header.size

++				+ s->block.compressed;

++

++#ifdef XZ_DEC_ANY_CHECK

++		s->block.hash.unpadded += check_sizes[s->check_type];

++#else

++		if (s->check_type == XZ_CHECK_CRC32)

++			s->block.hash.unpadded += 4;

++#endif

++

++		s->block.hash.uncompressed += s->block.uncompressed;

++		s->block.hash.crc32 = xz_crc32(

++				(const uint8_t *)&s->block.hash,

++				sizeof(s->block.hash), s->block.hash.crc32);

++

++		++s->block.count;

++	}

++

++	return ret;

++}

++

++/* Update the Index size and the CRC32 value. */

++static void INIT index_update(struct xz_dec *s, const struct xz_buf *b)

++{

++	size_t in_used = b->in_pos - s->in_start;

++	s->index.size += in_used;

++	s->crc32 = xz_crc32(b->in + s->in_start, in_used, s->crc32);

++}

++

++/*

++ * Decode the Number of Records, Unpadded Size, and Uncompressed Size

++ * fields from the Index field. That is, Index Padding and CRC32 are not

++ * decoded by this function.

++ *

++ * This can return XZ_OK (more input needed), XZ_STREAM_END (everything

++ * successfully decoded), or XZ_DATA_ERROR (input is corrupt).

++ */

++static enum xz_ret INIT dec_index(struct xz_dec *s, struct xz_buf *b)

++{

++	enum xz_ret ret;

++

++	do {

++		ret = dec_vli(s, b->in, &b->in_pos, b->in_size);

++		if (ret != XZ_STREAM_END) {

++			index_update(s, b);

++			return ret;

++		}

++

++		switch (s->index.sequence) {

++		case SEQ_INDEX_COUNT:

++			s->index.count = s->vli;

++

++			/*

++			 * Validate that the Number of Records field

++			 * indicates the same number of Records as

++			 * there were Blocks in the Stream.

++			 */

++			if (s->index.count != s->block.count)

++				return XZ_DATA_ERROR;

++

++			s->index.sequence = SEQ_INDEX_UNPADDED;

++			break;

++

++		case SEQ_INDEX_UNPADDED:

++			s->index.hash.unpadded += s->vli;

++			s->index.sequence = SEQ_INDEX_UNCOMPRESSED;

++			break;

++

++		case SEQ_INDEX_UNCOMPRESSED:

++			s->index.hash.uncompressed += s->vli;

++			s->index.hash.crc32 = xz_crc32(

++					(const uint8_t *)&s->index.hash,

++					sizeof(s->index.hash),

++					s->index.hash.crc32);

++			--s->index.count;

++			s->index.sequence = SEQ_INDEX_UNPADDED;

++			break;

++		}

++	} while (s->index.count > 0);

++

++	return XZ_STREAM_END;

++}

++

++/*

++ * Validate that the next four input bytes match the value of s->crc32.

++ * s->pos must be zero when starting to validate the first byte.

++ */

++static enum xz_ret INIT crc32_validate(struct xz_dec *s, struct xz_buf *b)

++{

++	do {

++		if (b->in_pos == b->in_size)

++			return XZ_OK;

++

++		if (((s->crc32 >> s->pos) & 0xFF) != b->in[b->in_pos++])

++			return XZ_DATA_ERROR;

++

++		s->pos += 8;

++

++	} while (s->pos < 32);

++

++	s->crc32 = 0;

++	s->pos = 0;

++

++	return XZ_STREAM_END;

++}

++

++#ifdef XZ_DEC_ANY_CHECK

++/*

++ * Skip over the Check field when the Check ID is not supported.

++ * Returns true once the whole Check field has been skipped over.

++ */

++static bool_t INIT check_skip(struct xz_dec *s, struct xz_buf *b)

++{

++	while (s->pos < check_sizes[s->check_type]) {

++		if (b->in_pos == b->in_size)

++			return false;

++

++		++b->in_pos;

++		++s->pos;

++	}

++

++	s->pos = 0;

++

++	return true;

++}

++#endif

++

++/* Decode the Stream Header field (the first 12 bytes of the .xz Stream). */

++static enum xz_ret INIT dec_stream_header(struct xz_dec *s)

++{

++	if (!memeq(s->temp.buf, HEADER_MAGIC, HEADER_MAGIC_SIZE))

++		return XZ_FORMAT_ERROR;

++

++	if (xz_crc32(s->temp.buf + HEADER_MAGIC_SIZE, 2, 0)

++			!= get_le32(s->temp.buf + HEADER_MAGIC_SIZE + 2))

++		return XZ_DATA_ERROR;

++

++	if (s->temp.buf[HEADER_MAGIC_SIZE] != 0)

++		return XZ_OPTIONS_ERROR;

++

++	/*

++	 * Of integrity checks, we support only none (Check ID = 0) and

++	 * CRC32 (Check ID = 1). However, if XZ_DEC_ANY_CHECK is defined,

++	 * we will accept other check types too, but then the check won't

++	 * be verified and a warning (XZ_UNSUPPORTED_CHECK) will be given.

++	 */

++	s->check_type = s->temp.buf[HEADER_MAGIC_SIZE + 1];

++

++#ifdef XZ_DEC_ANY_CHECK

++	if (s->check_type > XZ_CHECK_MAX)

++		return XZ_OPTIONS_ERROR;

++

++	if (s->check_type > XZ_CHECK_CRC32)

++		return XZ_UNSUPPORTED_CHECK;

++#else

++	if (s->check_type > XZ_CHECK_CRC32)

++		return XZ_OPTIONS_ERROR;

++#endif

++

++	return XZ_OK;

++}

++

++/* Decode the Stream Footer field (the last 12 bytes of the .xz Stream) */

++static enum xz_ret INIT dec_stream_footer(struct xz_dec *s)

++{

++	if (!memeq(s->temp.buf + 10, FOOTER_MAGIC, FOOTER_MAGIC_SIZE))

++		return XZ_DATA_ERROR;

++

++	if (xz_crc32(s->temp.buf + 4, 6, 0) != get_le32(s->temp.buf))

++		return XZ_DATA_ERROR;

++

++	/*

++	 * Validate Backward Size. Note that we never added the size of the

++	 * Index CRC32 field to s->index.size, thus we use s->index.size / 4

++	 * instead of s->index.size / 4 - 1.

++	 */

++	if ((s->index.size >> 2) != get_le32(s->temp.buf + 4))

++		return XZ_DATA_ERROR;

++

++	if (s->temp.buf[8] != 0 || s->temp.buf[9] != s->check_type)

++		return XZ_DATA_ERROR;

++

++	/*

++	 * Use XZ_STREAM_END instead of XZ_OK to be more convenient

++	 * for the caller.

++	 */

++	return XZ_STREAM_END;

++}

++

++/* Decode the Block Header and initialize the filter chain. */

++static enum xz_ret INIT dec_block_header(struct xz_dec *s)

++{

++	enum xz_ret ret;

++

++	/*

++	 * Validate the CRC32. We know that the temp buffer is at least

++	 * eight bytes so this is safe.

++	 */

++	s->temp.size -= 4;

++	if (xz_crc32(s->temp.buf, s->temp.size, 0)

++			!= get_le32(s->temp.buf + s->temp.size))

++		return XZ_DATA_ERROR;

++

++	s->temp.pos = 2;

++

++	/*

++	 * Catch unsupported Block Flags. We support only one or two filters

++	 * in the chain, so we catch that with the same test.

++	 */

++#ifdef XZ_DEC_BCJ

++	if (s->temp.buf[1] & 0x3E)

++#else

++	if (s->temp.buf[1] & 0x3F)

++#endif

++		return XZ_OPTIONS_ERROR;

++

++	/* Compressed Size */

++	if (s->temp.buf[1] & 0x40) {

++		if (dec_vli(s, s->temp.buf, &s->temp.pos, s->temp.size)

++					!= XZ_STREAM_END)

++			return XZ_DATA_ERROR;

++

++		s->block_header.compressed = s->vli;

++	} else {

++		s->block_header.compressed = VLI_UNKNOWN;

++	}

++

++	/* Uncompressed Size */

++	if (s->temp.buf[1] & 0x80) {

++		if (dec_vli(s, s->temp.buf, &s->temp.pos, s->temp.size)

++				!= XZ_STREAM_END)

++			return XZ_DATA_ERROR;

++

++		s->block_header.uncompressed = s->vli;

++	} else {

++		s->block_header.uncompressed = VLI_UNKNOWN;

++	}

++

++#ifdef XZ_DEC_BCJ

++	/* If there are two filters, the first one must be a BCJ filter. */

++	s->bcj_active = s->temp.buf[1] & 0x01;

++	if (s->bcj_active) {

++		if (s->temp.size - s->temp.pos < 2)

++			return XZ_OPTIONS_ERROR;

++

++		ret = xz_dec_bcj_reset(s->bcj, s->temp.buf[s->temp.pos++]);

++		if (ret != XZ_OK)

++			return ret;

++

++		/*

++		 * We don't support custom start offset,

++		 * so Size of Properties must be zero.

++		 */

++		if (s->temp.buf[s->temp.pos++] != 0x00)

++			return XZ_OPTIONS_ERROR;

++	}

++#endif

++

++	/* Valid Filter Flags always take at least two bytes. */

++	if (s->temp.size - s->temp.pos < 2)

++		return XZ_DATA_ERROR;

++

++	/* Filter ID = LZMA2 */

++	if (s->temp.buf[s->temp.pos++] != 0x21)

++		return XZ_OPTIONS_ERROR;

++

++	/* Size of Properties = 1-byte Filter Properties */

++	if (s->temp.buf[s->temp.pos++] != 0x01)

++		return XZ_OPTIONS_ERROR;

++

++	/* Filter Properties contains LZMA2 dictionary size. */

++	if (s->temp.size - s->temp.pos < 1)

++		return XZ_DATA_ERROR;

++

++	ret = xz_dec_lzma2_reset(s->lzma2, s->temp.buf[s->temp.pos++]);

++	if (ret != XZ_OK)

++		return ret;

++

++	/* The rest must be Header Padding. */

++	while (s->temp.pos < s->temp.size)

++		if (s->temp.buf[s->temp.pos++] != 0x00)

++			return XZ_OPTIONS_ERROR;

++

++	s->temp.pos = 0;

++	s->block.compressed = 0;

++	s->block.uncompressed = 0;

++

++	return XZ_OK;

++}

++

++static enum xz_ret INIT dec_main(struct xz_dec *s, struct xz_buf *b)

++{

++	enum xz_ret ret;

++

++	/*

++	 * Store the start position for the case when we are in the middle

++	 * of the Index field.

++	 */

++	s->in_start = b->in_pos;

++

++	while (true) {

++		switch (s->sequence) {

++		case SEQ_STREAM_HEADER:

++			/*

++			 * Stream Header is copied to s->temp, and then

++			 * decoded from there. This way if the caller

++			 * gives us only little input at a time, we can

++			 * still keep the Stream Header decoding code

++			 * simple. Similar approach is used in many places

++			 * in this file.

++			 */

++			if (!fill_temp(s, b))

++				return XZ_OK;

++

++			/*

++			 * If dec_stream_header() returns

++			 * XZ_UNSUPPORTED_CHECK, it is still possible

++			 * to continue decoding if working in multi-call

++			 * mode. Thus, update s->sequence before calling

++			 * dec_stream_header().

++			 */

++			s->sequence = SEQ_BLOCK_START;

++

++			ret = dec_stream_header(s);

++			if (ret != XZ_OK)

++				return ret;

++

++		case SEQ_BLOCK_START:

++			/* We need one byte of input to continue. */

++			if (b->in_pos == b->in_size)

++				return XZ_OK;

++

++			/* See if this is the beginning of the Index field. */

++			if (b->in[b->in_pos] == 0) {

++				s->in_start = b->in_pos++;

++				s->sequence = SEQ_INDEX;

++				break;

++			}

++

++			/*

++			 * Calculate the size of the Block Header and

++			 * prepare to decode it.

++			 */

++			s->block_header.size

++				= ((uint32_t)b->in[b->in_pos] + 1) * 4;

++

++			s->temp.size = s->block_header.size;

++			s->temp.pos = 0;

++			s->sequence = SEQ_BLOCK_HEADER;

++

++		case SEQ_BLOCK_HEADER:

++			if (!fill_temp(s, b))

++				return XZ_OK;

++

++			ret = dec_block_header(s);

++			if (ret != XZ_OK)

++				return ret;

++

++			s->sequence = SEQ_BLOCK_UNCOMPRESS;

++

++		case SEQ_BLOCK_UNCOMPRESS:

++			ret = dec_block(s, b);

++			if (ret != XZ_STREAM_END)

++				return ret;

++

++			s->sequence = SEQ_BLOCK_PADDING;

++

++		case SEQ_BLOCK_PADDING:

++			/*

++			 * Size of Compressed Data + Block Padding

++			 * must be a multiple of four. We don't need

++			 * s->block.compressed for anything else

++			 * anymore, so we use it here to test the size

++			 * of the Block Padding field.

++			 */

++			while (s->block.compressed & 3) {

++				if (b->in_pos == b->in_size)

++					return XZ_OK;

++

++				if (b->in[b->in_pos++] != 0)

++					return XZ_DATA_ERROR;

++

++				++s->block.compressed;

++			}

++

++			s->sequence = SEQ_BLOCK_CHECK;

++

++		case SEQ_BLOCK_CHECK:

++			if (s->check_type == XZ_CHECK_CRC32) {

++				ret = crc32_validate(s, b);

++				if (ret != XZ_STREAM_END)

++					return ret;

++			}

++#ifdef XZ_DEC_ANY_CHECK

++			else if (!check_skip(s, b)) {

++				return XZ_OK;

++			}

++#endif

++

++			s->sequence = SEQ_BLOCK_START;

++			break;

++

++		case SEQ_INDEX:

++			ret = dec_index(s, b);

++			if (ret != XZ_STREAM_END)

++				return ret;

++

++			s->sequence = SEQ_INDEX_PADDING;

++

++		case SEQ_INDEX_PADDING:

++			while ((s->index.size + (b->in_pos - s->in_start))

++					& 3) {

++				if (b->in_pos == b->in_size) {

++					index_update(s, b);

++					return XZ_OK;

++				}

++

++				if (b->in[b->in_pos++] != 0)

++					return XZ_DATA_ERROR;

++			}

++

++			/* Finish the CRC32 value and Index size. */

++			index_update(s, b);

++

++			/* Compare the hashes to validate the Index field. */

++			if (!memeq(&s->block.hash, &s->index.hash,

++					sizeof(s->block.hash)))

++				return XZ_DATA_ERROR;

++

++			s->sequence = SEQ_INDEX_CRC32;

++

++		case SEQ_INDEX_CRC32:

++			ret = crc32_validate(s, b);

++			if (ret != XZ_STREAM_END)

++				return ret;

++

++			s->temp.size = STREAM_HEADER_SIZE;

++			s->sequence = SEQ_STREAM_FOOTER;

++

++		case SEQ_STREAM_FOOTER:

++			if (!fill_temp(s, b))

++				return XZ_OK;

++

++			return dec_stream_footer(s);

++		}

++	}

++

++	/* Never reached */

++}

++

++XZ_EXTERN void INIT xz_dec_reset(struct xz_dec *s)

++{

++	s->sequence = SEQ_STREAM_HEADER;

++	s->allow_buf_error = false;

++	s->pos = 0;

++	s->crc32 = 0;

++	memzero(&s->block, sizeof(s->block));

++	memzero(&s->index, sizeof(s->index));

++	s->temp.pos = 0;

++	s->temp.size = STREAM_HEADER_SIZE;

++}

++

++/*

++ * xz_dec_run() is a wrapper for dec_main() to handle some special cases in

++ * multi-call and single-call decoding.

++ *

++ * In multi-call mode, we must return XZ_BUF_ERROR when it seems clear that we

++ * are not going to make any progress anymore. This is to prevent the caller

++ * from calling us infinitely when the input file is truncated or otherwise

++ * corrupt. Since zlib-style API allows that the caller fills the input buffer

++ * only when the decoder doesn't produce any new output, we have to be careful

++ * to avoid returning XZ_BUF_ERROR too easily: XZ_BUF_ERROR is returned only

++ * after the second consecutive call to xz_dec_run() that makes no progress.

++ *

++ * In single-call mode, if we couldn't decode everything and no error

++ * occurred, either the input is truncated or the output buffer is too small.

++ * Since we know that the last input byte never produces any output, we know

++ * that if all the input was consumed and decoding wasn't finished, the file

++ * must be corrupt. Otherwise the output buffer has to be too small or the

++ * file is corrupt in a way that decoding it produces too big output.

++ *

++ * If single-call decoding fails, we reset b->in_pos and b->out_pos back to

++ * their original values. This is because with some filter chains there won't

++ * be any valid uncompressed data in the output buffer unless the decoding

++ * actually succeeds (that's the price to pay of using the output buffer as

++ * the workspace).

++ */

++XZ_EXTERN enum xz_ret INIT xz_dec_run(struct xz_dec *s, struct xz_buf *b)

++{

++	size_t in_start;

++	size_t out_start;

++	enum xz_ret ret;

++

++	if (DEC_IS_SINGLE(s->mode))

++		xz_dec_reset(s);

++

++	in_start = b->in_pos;

++	out_start = b->out_pos;

++	ret = dec_main(s, b);

++

++	if (DEC_IS_SINGLE(s->mode)) {

++		if (ret == XZ_OK)

++			ret = b->in_pos == b->in_size

++					? XZ_DATA_ERROR : XZ_BUF_ERROR;

++

++		if (ret != XZ_STREAM_END) {

++			b->in_pos = in_start;

++			b->out_pos = out_start;

++		}

++

++	} else if (ret == XZ_OK && in_start == b->in_pos

++			&& out_start == b->out_pos) {

++		if (s->allow_buf_error)

++			ret = XZ_BUF_ERROR;

++

++		s->allow_buf_error = true;

++	} else {

++		s->allow_buf_error = false;

++	}

++

++	return ret;

++}

++

++XZ_EXTERN struct xz_dec *INIT xz_dec_init(enum xz_mode mode, uint32_t dict_max)

++{

++	struct xz_dec *s = malloc(sizeof(*s));

++	if (s == NULL)

++		return NULL;

++

++	s->mode = mode;

++

++#ifdef XZ_DEC_BCJ

++	s->bcj = xz_dec_bcj_create(DEC_IS_SINGLE(mode));

++	if (s->bcj == NULL)

++		goto error_bcj;

++#endif

++

++	s->lzma2 = xz_dec_lzma2_create(mode, dict_max);

++	if (s->lzma2 == NULL)

++		goto error_lzma2;

++

++	xz_dec_reset(s);

++	return s;

++

++error_lzma2:

++#ifdef XZ_DEC_BCJ

++	xz_dec_bcj_end(s->bcj);

++error_bcj:

++#endif

++	free(s);

++	return NULL;

++}

++

++XZ_EXTERN void INIT xz_dec_end(struct xz_dec *s)

++{

++	if (s != NULL) {

++		xz_dec_lzma2_end(s->lzma2);

++#ifdef XZ_DEC_BCJ

++		xz_dec_bcj_end(s->bcj);

++#endif

++		free(s);

++	}

++}

+diff --git a/xen/common/xz/lzma2.h b/xen/common/xz/lzma2.h

+new file mode 100644

+--- /dev/null

++++ b/xen/common/xz/lzma2.h

+@@ -0,0 +1,204 @@

++/*

++ * LZMA2 definitions

++ *

++ * Authors: Lasse Collin <lasse.collin@tukaani.org>

++ *          Igor Pavlov <http://7-zip.org/>

++ *

++ * This file has been put into the public domain.

++ * You can do whatever you want with this file.

++ */

++

++#ifndef XZ_LZMA2_H

++#define XZ_LZMA2_H

++

++/* Range coder constants */

++#define RC_SHIFT_BITS 8

++#define RC_TOP_BITS 24

++#define RC_TOP_VALUE (1 << RC_TOP_BITS)

++#define RC_BIT_MODEL_TOTAL_BITS 11

++#define RC_BIT_MODEL_TOTAL (1 << RC_BIT_MODEL_TOTAL_BITS)

++#define RC_MOVE_BITS 5

++

++/*

++ * Maximum number of position states. A position state is the lowest pb

++ * number of bits of the current uncompressed offset. In some places there

++ * are different sets of probabilities for different position states.

++ */

++#define POS_STATES_MAX (1 << 4)

++

++/*

++ * This enum is used to track which LZMA symbols have occurred most recently

++ * and in which order. This information is used to predict the next symbol.

++ *

++ * Symbols:

++ *  - Literal: One 8-bit byte

++ *  - Match: Repeat a chunk of data at some distance

++ *  - Long repeat: Multi-byte match at a recently seen distance

++ *  - Short repeat: One-byte repeat at a recently seen distance

++ *

++ * The symbol names are in from STATE_oldest_older_previous. REP means

++ * either short or long repeated match, and NONLIT means any non-literal.

++ */

++enum lzma_state {

++	STATE_LIT_LIT,

++	STATE_MATCH_LIT_LIT,

++	STATE_REP_LIT_LIT,

++	STATE_SHORTREP_LIT_LIT,

++	STATE_MATCH_LIT,

++	STATE_REP_LIT,

++	STATE_SHORTREP_LIT,

++	STATE_LIT_MATCH,

++	STATE_LIT_LONGREP,

++	STATE_LIT_SHORTREP,

++	STATE_NONLIT_MATCH,

++	STATE_NONLIT_REP

++};

++

++/* Total number of states */

++#define STATES 12

++

++/* The lowest 7 states indicate that the previous state was a literal. */

++#define LIT_STATES 7

++

++/* Indicate that the latest symbol was a literal. */

++static inline void INIT lzma_state_literal(enum lzma_state *state)

++{

++	if (*state <= STATE_SHORTREP_LIT_LIT)

++		*state = STATE_LIT_LIT;

++	else if (*state <= STATE_LIT_SHORTREP)

++		*state -= 3;

++	else

++		*state -= 6;

++}

++

++/* Indicate that the latest symbol was a match. */

++static inline void INIT lzma_state_match(enum lzma_state *state)

++{

++	*state = *state < LIT_STATES ? STATE_LIT_MATCH : STATE_NONLIT_MATCH;

++}

++

++/* Indicate that the latest state was a long repeated match. */

++static inline void INIT lzma_state_long_rep(enum lzma_state *state)

++{

++	*state = *state < LIT_STATES ? STATE_LIT_LONGREP : STATE_NONLIT_REP;

++}

++

++/* Indicate that the latest symbol was a short match. */

++static inline void INIT lzma_state_short_rep(enum lzma_state *state)

++{

++	*state = *state < LIT_STATES ? STATE_LIT_SHORTREP : STATE_NONLIT_REP;

++}

++

++/* Test if the previous symbol was a literal. */

++static inline bool_t INIT lzma_state_is_literal(enum lzma_state state)

++{

++	return state < LIT_STATES;

++}

++

++/* Each literal coder is divided in three sections:

++ *   - 0x001-0x0FF: Without match byte

++ *   - 0x101-0x1FF: With match byte; match bit is 0

++ *   - 0x201-0x2FF: With match byte; match bit is 1

++ *

++ * Match byte is used when the previous LZMA symbol was something else than

++ * a literal (that is, it was some kind of match).

++ */

++#define LITERAL_CODER_SIZE 0x300

++

++/* Maximum number of literal coders */

++#define LITERAL_CODERS_MAX (1 << 4)

++

++/* Minimum length of a match is two bytes. */

++#define MATCH_LEN_MIN 2

++

++/* Match length is encoded with 4, 5, or 10 bits.

++ *

++ * Length   Bits

++ *  2-9      4 = Choice=0 + 3 bits

++ * 10-17     5 = Choice=1 + Choice2=0 + 3 bits

++ * 18-273   10 = Choice=1 + Choice2=1 + 8 bits

++ */

++#define LEN_LOW_BITS 3

++#define LEN_LOW_SYMBOLS (1 << LEN_LOW_BITS)

++#define LEN_MID_BITS 3

++#define LEN_MID_SYMBOLS (1 << LEN_MID_BITS)

++#define LEN_HIGH_BITS 8

++#define LEN_HIGH_SYMBOLS (1 << LEN_HIGH_BITS)

++#define LEN_SYMBOLS (LEN_LOW_SYMBOLS + LEN_MID_SYMBOLS + LEN_HIGH_SYMBOLS)

++

++/*

++ * Maximum length of a match is 273 which is a result of the encoding

++ * described above.

++ */

++#define MATCH_LEN_MAX (MATCH_LEN_MIN + LEN_SYMBOLS - 1)

++

++/*

++ * Different sets of probabilities are used for match distances that have

++ * very short match length: Lengths of 2, 3, and 4 bytes have a separate

++ * set of probabilities for each length. The matches with longer length

++ * use a shared set of probabilities.

++ */

++#define DIST_STATES 4

++

++/*

++ * Get the index of the appropriate probability array for decoding

++ * the distance slot.

++ */

++static inline uint32_t INIT lzma_get_dist_state(uint32_t len)

++{

++	return len < DIST_STATES + MATCH_LEN_MIN

++			? len - MATCH_LEN_MIN : DIST_STATES - 1;

++}

++

++/*

++ * The highest two bits of a 32-bit match distance are encoded using six bits.

++ * This six-bit value is called a distance slot. This way encoding a 32-bit

++ * value takes 6-36 bits, larger values taking more bits.

++ */

++#define DIST_SLOT_BITS 6

++#define DIST_SLOTS (1 << DIST_SLOT_BITS)

++

++/* Match distances up to 127 are fully encoded using probabilities. Since

++ * the highest two bits (distance slot) are always encoded using six bits,

++ * the distances 0-3 don't need any additional bits to encode, since the

++ * distance slot itself is the same as the actual distance. DIST_MODEL_START

++ * indicates the first distance slot where at least one additional bit is

++ * needed.

++ */

++#define DIST_MODEL_START 4

++

++/*

++ * Match distances greater than 127 are encoded in three pieces:

++ *   - distance slot: the highest two bits

++ *   - direct bits: 2-26 bits below the highest two bits

++ *   - alignment bits: four lowest bits

++ *

++ * Direct bits don't use any probabilities.

++ *

++ * The distance slot value of 14 is for distances 128-191.

++ */

++#define DIST_MODEL_END 14

++

++/* Distance slots that indicate a distance <= 127. */

++#define FULL_DISTANCES_BITS (DIST_MODEL_END / 2)

++#define FULL_DISTANCES (1 << FULL_DISTANCES_BITS)

++

++/*

++ * For match distances greater than 127, only the highest two bits and the

++ * lowest four bits (alignment) is encoded using probabilities.

++ */

++#define ALIGN_BITS 4

++#define ALIGN_SIZE (1 << ALIGN_BITS)

++#define ALIGN_MASK (ALIGN_SIZE - 1)

++

++/* Total number of all probability variables */

++#define PROBS_TOTAL (1846 + LITERAL_CODERS_MAX * LITERAL_CODER_SIZE)

++

++/*

++ * LZMA remembers the four most recent match distances. Reusing these

++ * distances tends to take less space than re-encoding the actual

++ * distance value.

++ */

++#define REPS 4

++

++#endif

+diff --git a/xen/common/xz/private.h b/xen/common/xz/private.h

+new file mode 100644

+--- /dev/null

++++ b/xen/common/xz/private.h

+@@ -0,0 +1,271 @@

++/*

++ * Private includes and definitions

++ *

++ * Author: Lasse Collin <lasse.collin@tukaani.org>

++ *

++ * This file has been put into the public domain.

++ * You can do whatever you want with this file.

++ */

++

++#ifndef XZ_PRIVATE_H

++#define XZ_PRIVATE_H

++

++#include <xen/kernel.h>

++#include <asm/byteorder.h>

++#define get_le32(p) le32_to_cpup((const uint32_t *)(p))

++

++#if 1 /* ndef CONFIG_??? */

++static inline u32 INIT get_unaligned_le32(void *p)

++{

++	return le32_to_cpup(p);

++}

++

++static inline void INIT put_unaligned_le32(u32 val, void *p)

++{

++	*(__force __le32*)p = cpu_to_le32(val);

++}

++#else

++#include <asm/unaligned.h>

++

++static inline u32 INIT get_unaligned_le32(void *p)

++{

++	return le32_to_cpu(__get_unaligned(p, 4));

++}

++

++static inline void INIT put_unaligned_le32(u32 val, void *p)

++{

++	__put_unaligned(cpu_to_le32(val), p, 4);

++}

++#endif

++

++#define false 0

++#define true 1

++

++/**

++ * enum xz_mode - Operation mode

++ *

++ * @XZ_SINGLE:              Single-call mode. This uses less RAM than

++ *                          than multi-call modes, because the LZMA2

++ *                          dictionary doesn't need to be allocated as

++ *                          part of the decoder state. All required data

++ *                          structures are allocated at initialization,

++ *                          so xz_dec_run() cannot return XZ_MEM_ERROR.

++ * @XZ_PREALLOC:            Multi-call mode with preallocated LZMA2

++ *                          dictionary buffer. All data structures are

++ *                          allocated at initialization, so xz_dec_run()

++ *                          cannot return XZ_MEM_ERROR.

++ * @XZ_DYNALLOC:            Multi-call mode. The LZMA2 dictionary is

++ *                          allocated once the required size has been

++ *                          parsed from the stream headers. If the

++ *                          allocation fails, xz_dec_run() will return

++ *                          XZ_MEM_ERROR.

++ *

++ * It is possible to enable support only for a subset of the above

++ * modes at compile time by defining XZ_DEC_SINGLE, XZ_DEC_PREALLOC,

++ * or XZ_DEC_DYNALLOC. The xz_dec kernel module is always compiled

++ * with support for all operation modes, but the preboot code may

++ * be built with fewer features to minimize code size.

++ */

++enum xz_mode {

++	XZ_SINGLE,

++	XZ_PREALLOC,

++	XZ_DYNALLOC

++};

++

++/**

++ * enum xz_ret - Return codes

++ * @XZ_OK:                  Everything is OK so far. More input or more

++ *                          output space is required to continue. This

++ *                          return code is possible only in multi-call mode

++ *                          (XZ_PREALLOC or XZ_DYNALLOC).

++ * @XZ_STREAM_END:          Operation finished successfully.

++ * @XZ_UNSUPPORTED_CHECK:   Integrity check type is not supported. Decoding

++ *                          is still possible in multi-call mode by simply

++ *                          calling xz_dec_run() again.

++ *                          Note that this return value is used only if

++ *                          XZ_DEC_ANY_CHECK was defined at build time,

++ *                          which is not used in the kernel. Unsupported

++ *                          check types return XZ_OPTIONS_ERROR if

++ *                          XZ_DEC_ANY_CHECK was not defined at build time.

++ * @XZ_MEM_ERROR:           Allocating memory failed. This return code is

++ *                          possible only if the decoder was initialized

++ *                          with XZ_DYNALLOC. The amount of memory that was

++ *                          tried to be allocated was no more than the

++ *                          dict_max argument given to xz_dec_init().

++ * @XZ_MEMLIMIT_ERROR:      A bigger LZMA2 dictionary would be needed than

++ *                          allowed by the dict_max argument given to

++ *                          xz_dec_init(). This return value is possible

++ *                          only in multi-call mode (XZ_PREALLOC or

++ *                          XZ_DYNALLOC); the single-call mode (XZ_SINGLE)

++ *                          ignores the dict_max argument.

++ * @XZ_FORMAT_ERROR:        File format was not recognized (wrong magic

++ *                          bytes).

++ * @XZ_OPTIONS_ERROR:       This implementation doesn't support the requested

++ *                          compression options. In the decoder this means

++ *                          that the header CRC32 matches, but the header

++ *                          itself specifies something that we don't support.

++ * @XZ_DATA_ERROR:          Compressed data is corrupt.

++ * @XZ_BUF_ERROR:           Cannot make any progress. Details are slightly

++ *                          different between multi-call and single-call

++ *                          mode; more information below.

++ *

++ * In multi-call mode, XZ_BUF_ERROR is returned when two consecutive calls

++ * to XZ code cannot consume any input and cannot produce any new output.

++ * This happens when there is no new input available, or the output buffer

++ * is full while at least one output byte is still pending. Assuming your

++ * code is not buggy, you can get this error only when decoding a compressed

++ * stream that is truncated or otherwise corrupt.

++ *

++ * In single-call mode, XZ_BUF_ERROR is returned only when the output buffer

++ * is too small or the compressed input is corrupt in a way that makes the

++ * decoder produce more output than the caller expected. When it is

++ * (relatively) clear that the compressed input is truncated, XZ_DATA_ERROR

++ * is used instead of XZ_BUF_ERROR.

++ */

++enum xz_ret {

++	XZ_OK,

++	XZ_STREAM_END,

++	XZ_UNSUPPORTED_CHECK,

++	XZ_MEM_ERROR,

++	XZ_MEMLIMIT_ERROR,

++	XZ_FORMAT_ERROR,

++	XZ_OPTIONS_ERROR,

++	XZ_DATA_ERROR,

++	XZ_BUF_ERROR

++};

++

++/**

++ * struct xz_buf - Passing input and output buffers to XZ code

++ * @in:         Beginning of the input buffer. This may be NULL if and only

++ *              if in_pos is equal to in_size.

++ * @in_pos:     Current position in the input buffer. This must not exceed

++ *              in_size.

++ * @in_size:    Size of the input buffer

++ * @out:        Beginning of the output buffer. This may be NULL if and only

++ *              if out_pos is equal to out_size.

++ * @out_pos:    Current position in the output buffer. This must not exceed

++ *              out_size.

++ * @out_size:   Size of the output buffer

++ *

++ * Only the contents of the output buffer from out[out_pos] onward, and

++ * the variables in_pos and out_pos are modified by the XZ code.

++ */

++struct xz_buf {

++	const uint8_t *in;

++	size_t in_pos;

++	size_t in_size;

++

++	uint8_t *out;

++	size_t out_pos;

++	size_t out_size;

++};

++

++/**

++ * struct xz_dec - Opaque type to hold the XZ decoder state

++ */

++struct xz_dec;

++

++/* If no specific decoding mode is requested, enable support for all modes. */

++#if !defined(XZ_DEC_SINGLE) && !defined(XZ_DEC_PREALLOC) \

++		&& !defined(XZ_DEC_DYNALLOC)

++#	define XZ_DEC_SINGLE

++#	define XZ_DEC_PREALLOC

++#	define XZ_DEC_DYNALLOC

++#endif

++

++/*

++ * The DEC_IS_foo(mode) macros are used in "if" statements. If only some

++ * of the supported modes are enabled, these macros will evaluate to true or

++ * false at compile time and thus allow the compiler to omit unneeded code.

++ */

++#ifdef XZ_DEC_SINGLE

++#	define DEC_IS_SINGLE(mode) ((mode) == XZ_SINGLE)

++#else

++#	define DEC_IS_SINGLE(mode) (false)

++#endif

++

++#ifdef XZ_DEC_PREALLOC

++#	define DEC_IS_PREALLOC(mode) ((mode) == XZ_PREALLOC)

++#else

++#	define DEC_IS_PREALLOC(mode) (false)

++#endif

++

++#ifdef XZ_DEC_DYNALLOC

++#	define DEC_IS_DYNALLOC(mode) ((mode) == XZ_DYNALLOC)

++#else

++#	define DEC_IS_DYNALLOC(mode) (false)

++#endif

++

++#if !defined(XZ_DEC_SINGLE)

++#	define DEC_IS_MULTI(mode) (true)

++#elif defined(XZ_DEC_PREALLOC) || defined(XZ_DEC_DYNALLOC)

++#	define DEC_IS_MULTI(mode) ((mode) != XZ_SINGLE)

++#else

++#	define DEC_IS_MULTI(mode) (false)

++#endif

++

++/*

++ * If any of the BCJ filter decoders are wanted, define XZ_DEC_BCJ.

++ * XZ_DEC_BCJ is used to enable generic support for BCJ decoders.

++ */

++#ifndef XZ_DEC_BCJ

++#	if defined(XZ_DEC_X86) || defined(XZ_DEC_POWERPC) \

++			|| defined(XZ_DEC_IA64) || defined(XZ_DEC_ARM) \

++			|| defined(XZ_DEC_ARM) || defined(XZ_DEC_ARMTHUMB) \

++			|| defined(XZ_DEC_SPARC)

++#		define XZ_DEC_BCJ

++#	endif

++#endif

++

++/*

++ * Allocate memory for LZMA2 decoder. xz_dec_lzma2_reset() must be used

++ * before calling xz_dec_lzma2_run().

++ */

++XZ_EXTERN struct xz_dec_lzma2 *xz_dec_lzma2_create(enum xz_mode mode,

++						   uint32_t dict_max);

++

++/*

++ * Decode the LZMA2 properties (one byte) and reset the decoder. Return

++ * XZ_OK on success, XZ_MEMLIMIT_ERROR if the preallocated dictionary is not

++ * big enough, and XZ_OPTIONS_ERROR if props indicates something that this

++ * decoder doesn't support.

++ */

++XZ_EXTERN enum xz_ret xz_dec_lzma2_reset(struct xz_dec_lzma2 *s,

++					 uint8_t props);

++

++/* Decode raw LZMA2 stream from b->in to b->out. */

++XZ_EXTERN enum xz_ret xz_dec_lzma2_run(struct xz_dec_lzma2 *s,

++				       struct xz_buf *b);

++

++/* Free the memory allocated for the LZMA2 decoder. */

++XZ_EXTERN void xz_dec_lzma2_end(struct xz_dec_lzma2 *s);

++

++#ifdef XZ_DEC_BCJ

++/*

++ * Allocate memory for BCJ decoders. xz_dec_bcj_reset() must be used before

++ * calling xz_dec_bcj_run().

++ */

++XZ_EXTERN struct xz_dec_bcj *xz_dec_bcj_create(bool_t single_call);

++

++/*

++ * Decode the Filter ID of a BCJ filter. This implementation doesn't

++ * support custom start offsets, so no decoding of Filter Properties

++ * is needed. Returns XZ_OK if the given Filter ID is supported.

++ * Otherwise XZ_OPTIONS_ERROR is returned.

++ */

++XZ_EXTERN enum xz_ret xz_dec_bcj_reset(struct xz_dec_bcj *s, uint8_t id);

++

++/*

++ * Decode raw BCJ + LZMA2 stream. This must be used only if there actually is

++ * a BCJ filter in the chain. If the chain has only LZMA2, xz_dec_lzma2_run()

++ * must be called directly.

++ */

++XZ_EXTERN enum xz_ret xz_dec_bcj_run(struct xz_dec_bcj *s,

++				     struct xz_dec_lzma2 *lzma2,

++				     struct xz_buf *b);

++

++/* Free the memory allocated for the BCJ filters. */

++#define xz_dec_bcj_end(s) free(s)

++#endif

++

++#endif

+diff --git a/xen/common/xz/stream.h b/xen/common/xz/stream.h

+new file mode 100644

+--- /dev/null

++++ b/xen/common/xz/stream.h

+@@ -0,0 +1,55 @@

++/*

++ * Definitions for handling the .xz file format

++ *

++ * Author: Lasse Collin <lasse.collin@tukaani.org>

++ *

++ * This file has been put into the public domain.

++ * You can do whatever you want with this file.

++ */

++

++#ifndef XZ_STREAM_H

++#define XZ_STREAM_H

++

++/*

++ * See the .xz file format specification at

++ * http://tukaani.org/xz/xz-file-format.txt

++ * to understand the container format.

++ */

++

++#define STREAM_HEADER_SIZE 12

++

++#define HEADER_MAGIC "\3757zXZ"

++#define HEADER_MAGIC_SIZE 6

++

++#define FOOTER_MAGIC "YZ"

++#define FOOTER_MAGIC_SIZE 2

++

++/*

++ * Variable-length integer can hold a 63-bit unsigned integer or a special

++ * value indicating that the value is unknown.

++ *

++ * Experimental: vli_type can be defined to uint32_t to save a few bytes

++ * in code size (no effect on speed). Doing so limits the uncompressed and

++ * compressed size of the file to less than 256 MiB and may also weaken

++ * error detection slightly.

++ */

++typedef uint64_t vli_type;

++

++#define VLI_MAX ((vli_type)-1 / 2)

++#define VLI_UNKNOWN ((vli_type)-1)

++

++/* Maximum encoded size of a VLI */

++#define VLI_BYTES_MAX (sizeof(vli_type) * 8 / 7)

++

++/* Integrity Check types */

++enum xz_check {

++	XZ_CHECK_NONE = 0,

++	XZ_CHECK_CRC32 = 1,

++	XZ_CHECK_CRC64 = 4,

++	XZ_CHECK_SHA256 = 10

++};

++

++/* Maximum possible Check ID */

++#define XZ_CHECK_MAX 15

++

++#endif

+diff --git a/xen/include/xen/decompress.h b/xen/include/xen/decompress.h

+--- a/xen/include/xen/decompress.h

++++ b/xen/include/xen/decompress.h

+@@ -31,7 +31,7 @@

+  * dependent).

+  */

+ 

+-decompress_fn bunzip2, unlzma, unlzo;

++decompress_fn bunzip2, unxz, unlzma, unlzo;

+ 

+ int decompress(void *inbuf, unsigned int len, void *outbuf);
\ No newline at end of file
diff --git a/kernels/xen/parabolainit.patch b/kernels/xen/parabolainit.patch
new file mode 100644
index 000000000..645a66edd
--- /dev/null
+++ b/kernels/xen/parabolainit.patch
@@ -0,0 +1,423 @@
+diff -Naur orig.xen-4.1.1//tools/hotplug/Linux/init.d/xencommons xen-4.1.1//tools/hotplug/Linux/init.d/xencommons
+--- orig.xen-4.1.1//tools/hotplug/Linux/init.d/xencommons	2011-07-03 03:08:44.953747064 -0700
++++ xen-4.1.1//tools/hotplug/Linux/init.d/xencommons	2011-07-05 13:47:54.627029164 -0700
+@@ -18,6 +18,9 @@
+ # Description:       Starts and stops the daemons neeeded for xl/xend
+ ### END INIT INFO
+ 
++. /etc/rc.conf
++. /etc/rc.d/functions
++
+ if [ -d /etc/sysconfig ]; then
+ 	xencommons_config=/etc/sysconfig
+ else
+@@ -26,7 +29,7 @@
+ 
+ test -f $xencommons_config/xencommons && . $xencommons_config/xencommons
+ 
+-XENCONSOLED_PIDFILE=/var/run/xenconsoled.pid
++XENCONSOLED_PIDFILE=/run/daemons/xenconsoled.pid
+ shopt -s extglob
+ 
+ if test "x$1" = xstart && \
+@@ -51,8 +54,9 @@
+ 		rm -f "$XENSTORED_ROOTDIR"/tdb* &>/dev/null
+ 		test -z "$XENSTORED_TRACE" || XENSTORED_ARGS=" -T /var/log/xen/xenstored-trace.log"
+ 
+-		echo -n Starting xenstored...
+-		xenstored --pid-file=/var/run/xenstored.pid $XENSTORED_ARGS
++		#echo -n Starting xenstored...
++		stat_busy "Starting xenstored"
++		xenstored --pid-file=/run/daemons/xenstored.pid $XENSTORED_ARGS
+ 
+ 		# Wait for xenstored to actually come up, timing out after 30 seconds
+                 while [ $time -lt $timeout ] && ! `xenstore-read -s / >/dev/null 2>&1` ; do
+@@ -60,33 +64,39 @@
+ 		    time=$(($time+1))
+                     sleep 1
+                 done
+-		echo
+-
+ 		# Exit if we timed out
+ 		if ! [ $time -lt $timeout ] ; then
+-		    echo Could not start xenstored
++		    #echo Could not start xenstored
++                    stat_fail
+ 		    exit 1
+ 		fi
++                stat_done
+ 
+-		echo Setting domain 0 name...
++		stat_busy "Setting domain 0 name..."
+ 		xenstore-write "/local/domain/0/name" "Domain-0"
++		stat_done
+ 	fi
+ 
+-	echo Starting xenconsoled...
++	#echo Starting xenconsoled...
++	stat_busy "Starting xenconsoled"
+ 	test -z "$XENCONSOLED_TRACE" || XENCONSOLED_ARGS=" --log=$XENCONSOLED_TRACE"
+ 	xenconsoled --pid-file=$XENCONSOLED_PIDFILE $XENCONSOLED_ARGS
+ 	test -z "$XENBACKENDD_DEBUG" || XENBACKENDD_ARGS="-d"
+ 	test "`uname`" != "NetBSD" || xenbackendd $XENBACKENDD_ARGS
++	stat_done
++	add_daemon xencommons
+ }
+ do_stop () {
+-        echo Stopping xenconsoled
++         stat_busy "Stopping xenconsoled"
+ 	if read 2>/dev/null <$XENCONSOLED_PIDFILE pid; then
+ 		kill $pid
+ 		while kill -9 $pid >/dev/null 2>&1; do sleep 0.1; done
+ 		rm -f $XENCONSOLED_PIDFILE
+ 	fi
++	stat_done
+ 
+-	echo WARNING: Not stopping xenstored, as it cannot be restarted.
++	printhl "WARNING: Not stopping xenstored, as it cannot be restarted."
++        rm_daemon xencommons
+ }
+ 
+ case "$1" in
+diff -Naur orig.xen-4.1.1//tools/hotplug/Linux/init.d/xend xen-4.1.1//tools/hotplug/Linux/init.d/xend
+--- orig.xen-4.1.1//tools/hotplug/Linux/init.d/xend	2011-07-03 03:08:44.953747064 -0700
++++ xen-4.1.1//tools/hotplug/Linux/init.d/xend	2011-07-05 01:47:40.981951191 -0700
+@@ -18,6 +18,10 @@
+ # Description:       Starts and stops the Xen control daemon.
+ ### END INIT INFO
+ 
++. /etc/rc.conf
++. /etc/rc.d/functions
++
++
+ shopt -s extglob
+ 
+ # Wait for Xend to be up
+@@ -37,23 +41,30 @@
+ case "$1" in
+   start)
+ 	if [ -z "`ps -C xenconsoled -o pid=`" ]; then
+-		echo "xencommons should be started first."
++	 printhl "xencommons should be started first."
+ 		exit 1
+ 	fi
+ 	# mkdir shouldn't be needed as most distros have this already created. Default to using subsys.
+ 	# See docs/misc/distro_mapping.txt
+-	mkdir -p /var/lock
+-	if [ -d /var/lock/subsys ] ; then
+-		touch /var/lock/subsys/xend
++	if [ -d /run/lock/subsys ] ; then
++		touch /run/lock/subsys/xend
+ 	else
+-		touch /var/lock/xend
++		touch /run/lock/xend
+ 	fi
++	stat_busy "Starting xend"
+ 	xend start
+ 	await_daemons_up
++	stat_done
++	add_daemon xend
+ 	;;
++
++
+   stop)
++   stat_busy "Stopping xend"
+ 	xend stop
+-	rm -f /var/lock/subsys/xend /var/lock/xend
++	rm -f /run/lock/xend /var/lock/xend
++	stat_done
++	rm_daemon xend
+ 	;;
+   status)
+ 	xend status
+@@ -62,8 +73,10 @@
+         xend reload
+         ;;
+   restart|force-reload)
++   stat_busy "Restarting xend"
+ 	xend restart
+ 	await_daemons_up
++	stat_done
+ 	;;
+   *)
+ 	# do not advertise unreasonable commands that there is no reason
+diff -Naur orig.xen-4.1.1//tools/hotplug/Linux/init.d/xendomains xen-4.1.1//tools/hotplug/Linux/init.d/xendomains
+--- orig.xen-4.1.1//tools/hotplug/Linux/init.d/xendomains	2011-07-03 03:08:44.953747064 -0700
++++ xen-4.1.1//tools/hotplug/Linux/init.d/xendomains	2011-07-05 13:46:36.208222760 -0700
+@@ -26,6 +26,9 @@
+ # Description:       Start / stop domains automatically when domain 0 
+ #                    boots / shuts down.
+ ### END INIT INFO
++. /etc/rc.conf
++. /etc/rc.d/functions
++
+ 
+ CMD=xm
+ $CMD list &> /dev/null
+@@ -46,93 +49,52 @@
+ 	exit 0
+ fi
+ 
+-# See docs/misc/distro_mapping.txt
+-if [ -d /var/lock/subsys ]; then
+-	LOCKFILE=/var/lock/subsys/xendomains
+-else
+-	LOCKFILE=/var/lock/xendomains
+-fi
+-
+-if [ -d /etc/sysconfig ]; then
+-	XENDOM_CONFIG=/etc/sysconfig/xendomains
+-else
+-	XENDOM_CONFIG=/etc/default/xendomains
+-fi
++LOCKFILE=/run/lock/xendomains
++XENDOM_CONFIG=/etc/default/xendomains
+ 
+-test -r $XENDOM_CONFIG || { echo "$XENDOM_CONFIG not existing";
++test -r $XENDOM_CONFIG || { 
++	printhl "$XENDOM_CONFIG not existing";
+ 	if [ "$1" = "stop" ]; then exit 0;
+ 	else exit 6; fi; }
+ 
+ . $XENDOM_CONFIG
+ 
+-# Use the SUSE rc_ init script functions;
+-# emulate them on LSB, RH and other systems
+-if test -e /etc/rc.status; then
+-    # SUSE rc script library
+-    . /etc/rc.status
+-else    
+-    _cmd=$1
+-    declare -a _SMSG
+-    if test "${_cmd}" = "status"; then
++_cmd=$1
++declare -a _SMSG
++if test "${_cmd}" = "status"; then
+ 	_SMSG=(running dead dead unused unknown)
+ 	_RC_UNUSED=3
+-    else
++else
+ 	_SMSG=(done failed failed missed failed skipped unused failed failed)
+ 	_RC_UNUSED=6
+-    fi
+-    if test -e /etc/init.d/functions; then
+-	# REDHAT
+-	. /etc/init.d/functions
+-	echo_rc()
+-	{
+-	    #echo -n "  [${_SMSG[${_RC_RV}]}] "
+-	    if test ${_RC_RV} = 0; then
+-		success "  [${_SMSG[${_RC_RV}]}] "
+-	    else
+-		failure "  [${_SMSG[${_RC_RV}]}] "
+-	    fi
+-	}
+-    elif test -e /lib/lsb/init-functions; then
+-	# LSB    
+-    	. /lib/lsb/init-functions
+-        if alias log_success_msg >/dev/null 2>/dev/null; then
+-	  echo_rc()
+-	  {
+-	       echo "  [${_SMSG[${_RC_RV}]}] "
+-	  }
+-        else
+-	  echo_rc()
+-	  {
+-	    if test ${_RC_RV} = 0; then
+-		log_success_msg "  [${_SMSG[${_RC_RV}]}] "
+-	    else
+-		log_failure_msg "  [${_SMSG[${_RC_RV}]}] "
+-	    fi
+-	  }
+-        fi
+-    else    
+-	# emulate it
+-	echo_rc()
+-	{
+-	    echo "  [${_SMSG[${_RC_RV}]}] "
+-	}
+-    fi
+-    rc_reset() { _RC_RV=0; }
+-    rc_failed()
+-    {
++fi
++
++
++
++echo_rc() {
++	echo
++	printhl "Return Status: ${_SMSG[${_RC_RV}]}"
++}
++
++
++rc_reset() { _RC_RV=0; }
++
++
++rc_failed() {
+ 	if test -z "$1"; then 
+-	    _RC_RV=1;
++		_RC_RV=1;
+ 	elif test "$1" != "0"; then 
+-	    _RC_RV=$1; 
+-    	fi
++		_RC_RV=$1; 
++	fi
+ 	return ${_RC_RV}
+-    }
+-    rc_check()
+-    {
++}
++
++rc_check() {
+ 	return rc_failed $?
+-    }	
+-    rc_status()
+-    {
++}	
++
++
++rc_status() {
+ 	rc_failed $?
+ 	if test "$1" = "-r"; then _RC_RV=0; shift; fi
+ 	if test "$1" = "-s"; then rc_failed 5; echo_rc; rc_failed 3; shift; fi
+@@ -140,26 +102,24 @@
+ 	if test "$1" = "-v"; then echo_rc; shift; fi
+ 	if test "$1" = "-r"; then _RC_RV=0; shift; fi
+ 	return ${_RC_RV}
+-    }
+-    rc_exit() { exit ${_RC_RV}; }
+-    rc_active() 
+-    {
++}
++
++
++rc_exit() { exit ${_RC_RV}; }
++
++
++rc_active() {
+ 	if test -z "$RUNLEVEL"; then read RUNLEVEL REST < <(/sbin/runlevel); fi
+ 	if test -e /etc/init.d/S[0-9][0-9]${1}; then return 0; fi
+ 	return 1
+-    }
+-fi
++}
+ 
+-if ! which usleep >&/dev/null
+-then
+-  usleep()
+-  {
+-    if [ -n "$1" ]
+-    then
+-      sleep $(( $1 / 1000000 ))
+-    fi
+-  }
+-fi
++usleep() {
++	if [ -n "$1" ]
++	then
++	  sleep $(( $1 / 1000000 ))
++	fi
++}
+ 
+ # Reset status of this service
+ rc_reset
+@@ -235,10 +195,12 @@
+ start() 
+ {
+     if [ -f $LOCKFILE ]; then 
+-	echo -e "xendomains already running (lockfile exists)"
++	stat_busy "xendomains already running (lockfile exists)"
++	stat_fail
+ 	return; 
+     fi
+ 
++    printhl "Starting Xen Domains"
+     saved_domains=" "
+     if [ "$XENDOMAINS_RESTORE" = "true" ] &&
+        contains_something "$XENDOMAINS_SAVE"
+@@ -299,6 +261,7 @@
+ 	    fi
+ 	done
+     fi
++    add_daemon xendomains
+ }
+ 
+ all_zombies()
+@@ -352,7 +315,7 @@
+     if test "$XENDOMAINS_AUTO_ONLY" = "true"; then
+ 	rdnames
+     fi
+-    echo -n "Shutting down Xen domains:"
++    printhl "Shutting down Xen domains"
+     name=;id=
+     while read LN; do
+ 	parseln "$LN" || continue
+@@ -465,6 +428,7 @@
+     rm -f $LOCKFILE
+     
+     exec 2>&3
++    rm_daemon xendomains
+ }
+ 
+ check_domain_up()
+diff -Naur orig.xen-4.1.1//tools/hotplug/Linux/init.d/xen-watchdog xen-4.1.1//tools/hotplug/Linux/init.d/xen-watchdog
+--- orig.xen-4.1.1//tools/hotplug/Linux/init.d/xen-watchdog	2011-07-03 03:08:44.957080397 -0700
++++ xen-4.1.1//tools/hotplug/Linux/init.d/xen-watchdog	2011-07-05 13:20:22.515289867 -0700
+@@ -17,49 +17,32 @@
+ ### END INIT INFO
+ #
+ 
++. /etc/rc.conf
++. /etc/rc.d/functions
++
+ DAEMON=/usr/sbin/xenwatchdogd
+ base=$(basename $DAEMON)
++initname="xen-watchdog"
+ 
+-# Source function library.
+-if [ -e  /etc/init.d/functions ] ; then
+-    . /etc/init.d/functions
+-elif [ -e /lib/lsb/init-functions ] ; then
+-    . /lib/lsb/init-functions
+-    success () {
+-        log_success_msg $*
+-    }
+-    failure () {
+-        log_failure_msg $*
+-    }
+-else
+-    success () {
+-        echo $*
+-    }
+-    failure () {
+-        echo $*
+-    }
+-fi
+ 
+ start() {
+ 	local r
+-	echo -n $"Starting domain watchdog daemon: "
++	stat_busy "Starting domain watchdog daemon"
+ 
+ 	$DAEMON 30 15
+ 	r=$?
+-	[ "$r" -eq 0 ] && success $"$base startup" || failure $"$base startup"
+-	echo
++	[ "$r" -eq 0 ] && stat_done ; add_daemon $initname || stat_fail
+ 
+ 	return $r
+ }
+ 
+ stop() {
+ 	local r
+-	echo -n $"Stopping domain watchdog daemon: "
++	stat_busy "Stopping domain watchdog daemon"
+ 
+ 	killall -USR1 $base 2>/dev/null
+ 	r=$?
+-	[ "$r" -eq 0 ] && success $"$base stop" || failure $"$base stop"
+-	echo
++	[ "$r" -eq 0 ] && stat_done ; rm_daemon $initname || stat_fail
+ 
+ 	return $r
+ }
diff --git a/kernels/xen/xen.patch b/kernels/xen/xen.patch
new file mode 100644
index 000000000..8b1b5585d
--- /dev/null
+++ b/kernels/xen/xen.patch
@@ -0,0 +1,21 @@
+--- xen-4.0.1.orig/Config.mk	2010-08-25 12:22:44.000000000 +0200
++++ xen-4.0.1/Config.mk	2010-11-02 23:38:11.575000000 +0100
+@@ -187,4 +187,4 @@
+ CONFIG_MINITERM    ?= n
+ CONFIG_LOMOUNT     ?= n
+ 
+--include $(XEN_ROOT)/.config
++#-include $(XEN_ROOT)/.config
+
+--- xen-4.0.1/Config.mk.orig	2010-08-25 11:22:44.000000000 +0100
++++ xen-4.0.1/Config.mk	2011-01-29 17:40:43.000000000 +0000
+@@ -135,6 +135,8 @@
+ 
+ LDFLAGS += $(foreach i, $(EXTRA_LIB), -L$(i)) 
+ CFLAGS += $(foreach i, $(EXTRA_INCLUDES), -I$(i))
++# temporary compile fix for rawhide
++CFLAGS += -Wunused-but-set-variable -Wno-error=unused-but-set-variable -Wuninitialized -Wno-error=uninitialized
+ 
+ EMBEDDED_EXTRA_CFLAGS := -nopie -fno-stack-protector -fno-stack-protector-all
+ EMBEDDED_EXTRA_CFLAGS += -fno-exceptions
+
diff --git a/multilib/lib32-libpng/PKGBUILD b/multilib/lib32-libpng/PKGBUILD
index afde907c6..0ec8a0231 100644
--- a/multilib/lib32-libpng/PKGBUILD
+++ b/multilib/lib32-libpng/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 63797 2012-02-05 12:43:41Z ibiru $
+# $Id: PKGBUILD 65208 2012-02-20 11:15:22Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Travis Willard <travis@archlinux.org>
@@ -6,8 +6,8 @@
 
 _pkgbasename=libpng
 pkgname=lib32-$_pkgbasename
-pkgver=1.5.8
-_apngver=1.5.7
+pkgver=1.5.9
+_apngver=1.5.9
 pkgrel=1
 pkgdesc="A collection of routines used to create PNG format graphics files (32-bit)"
 arch=('x86_64')
@@ -18,8 +18,8 @@ makedepends=(gcc-multilib)
 options=('!libtool')
 source=("http://downloads.sourceforge.net/sourceforge/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.xz"
         "http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-${_apngver}-apng.patch.gz")
-md5sums=('0f7ae352beadaff78073733905613041'
-         '6c6a674048cec94db1bc35decf0d142c')
+md5sums=('05d9ab3705c34954c0032b71318b678a'
+         '268f7db97b292d5f14a24ea7940f6f1c')
 
 build() {
   export CC="gcc -m32"
diff --git a/testing/libreoffice/PKGBUILD b/testing/libreoffice/PKGBUILD
index f64e078fb..3fe192500 100644
--- a/testing/libreoffice/PKGBUILD
+++ b/testing/libreoffice/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 149769 2012-02-10 16:07:48Z andyrtr $
+# $Id: PKGBUILD 150704 2012-02-20 21:01:49Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgbase="libreoffice"
@@ -14,18 +14,19 @@ pkgname=('libreoffice-common'
 	'libreoffice-sdk-doc'
 	'libreoffice-writer'
 	'libreoffice-en-US'
+	'libreoffice-postgresql-connector'
 	'libreoffice-extension-pdfimport'
 	'libreoffice-extension-presenter-screen'
 	'libreoffice-extension-presentation-minimizer'
 	'libreoffice-extension-report-builder')
 _LOver=3.5.0.3
 pkgver=3.5.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
 makedepends=( # makedepends
-             'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' #'boost'
+             'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' 'boost'
              'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit'
              'beanshell'  'vigra' 'lucene' 'junit' 'libmythes' 'libwpg' 'imagemagick'
              'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs'
@@ -45,7 +46,6 @@ _mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
 _additional_source_url="http://dev-www.libreoffice.org/src"
 source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz
 	${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-	${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 	${_additional_source_url}/776ad69a63ac1e99abed176e54ce25d9-libvisio-0.0.14.tar.bz2
 	${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
 	${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
@@ -77,7 +77,6 @@ source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz
 	smp_buildfix.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=cf23f57ae6bb7af689a45e0a850c3c2f67a8f810)
 noextract=(776ad69a63ac1e99abed176e54ce25d9-libvisio-0.0.14.tar.bz2
 	18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-	f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 	185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
 	ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
@@ -108,7 +107,6 @@ md5sums=('209bbbc369b36963d25334c3ef7933e8'
          '9df4051a689526888da0467c29186e8c'
          '8f7d2774f635f83cebc74e1d4f609d0f'
          '18f577b374d60b3c760a3a3350407632'
-         'f02578f5218f217a9f20e9c30e119c6a'
          '776ad69a63ac1e99abed176e54ce25d9'
          '1f24ab1d39f4a51faf22244c94a6203f'
          '35c94d2df8893241173de1d16b6034c0'
@@ -234,7 +232,7 @@ build() {
 		--without-system-mozilla \
 		--without-system-mozilla-headers \
 		--with-ant-home="/usr/share/java/apache-ant"\
-		--without-system-boost\
+		--with-system-boost\
 		--with-system-cairo\
 		--with-system-libs\
 		--with-system-mythes\
@@ -340,7 +338,7 @@ package_libreoffice-common() {
 package_libreoffice-base() {
  pkgdesc="GUI Spreadsheet Applicationdatabase front-end for LibreOffice. Allows creation and management of databases through a GUI."
  depends=('libreoffice-common')
- optdepends=()
+ optdepends=('libreoffice-postgresql-connector')
  backup=()
  groups=('libreoffice')
  replaces=('libreoffice')
@@ -359,6 +357,35 @@ package_libreoffice-base() {
  done
 }
 
+package_libreoffice-postgresql-connector() {
+ pkgdesc="A PostgreSQL connector for the database front-end for LibreOffice"
+ depends=('libreoffice-base' 'postgresql-libs')
+ groups=('libreoffice')
+ replaces=('libreoffice')
+
+ # no file-list so far
+ install -dm755 ${pkgdir}/usr/lib/libreoffice/program/services
+ install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc.uno.so ${pkgdir}/usr/lib/libreoffice/program
+ install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc-impl.uno.so ${pkgdir}/usr/lib/libreoffice/program
+ install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc.ini ${pkgdir}/usr/lib/libreoffice/program
+ install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/postgresql-sdbc.rdb ${pkgdir}/usr/lib/libreoffice/program/services
+ install -dm755 ${pkgdir}/usr/lib/libreoffice/share/registry
+ install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/postgresqlsdbc.xcd ${pkgdir}/usr/lib/libreoffice/share/registry
+ 
+# # create directories from *list.txt file
+# for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do
+#   install -dm755 ${pkgdir}/${directory/\%dir/}
+# done
+# # install files into the pkg from fakeinstall dir
+# for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do
+#   dirname=`dirname $file`
+#   # check if directory has been already been created - some are missing like manpages
+#   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+#   # mv file from fakeinstall to pkgdir
+#   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+# done
+}
+
 package_libreoffice-calc() {
  pkgdesc="Spreadsheet application for LibreOffice."
  depends=('libreoffice-common' 'lpsolve' )
diff --git a/testing/subversion/PKGBUILD b/testing/subversion/PKGBUILD
new file mode 100644
index 000000000..deff3cd94
--- /dev/null
+++ b/testing/subversion/PKGBUILD
@@ -0,0 +1,76 @@
+# $Id: PKGBUILD 150708 2012-02-20 22:09:00Z stephane $
+# Maintainer: Paul Mattal <paul@archlinux.org>
+# Contributor: Jason Chu <jason@archlinux.org>
+
+pkgname=subversion
+pkgver=1.7.3
+pkgrel=1
+pkgdesc="A Modern Concurrent Version Control System"
+arch=('i686' 'x86_64')
+license=('APACHE')
+depends=('neon' 'apr-util' 'sqlite3' 'file')
+optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion' \
+            'python2: for some hook scripts' 'ruby: for some hook scripts')
+makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'java-runtime' 'java-environment'
+             'autoconf' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs')
+backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve')
+url="http://subversion.apache.org/"
+provides=('svn')
+options=('!makeflags' '!libtool')
+source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2{,.asc}
+        svnserve svn svnserve.conf subversion.rpath.fix.patch)
+sha1sums=('624d4070361c0e8d7cf4f5c667629e72459b122d'
+          'cac344ec6e717bab3d97e2f3f1206289d83b8e05'
+          '64ba3e6ebafc08ac62f59d788f7a825fdce69573'
+          '73b36c046c09cec2093354911c89e3ba8056af6c'
+          'ad117bf3b2a838a9a678a93fd8db1a066ad46c41'
+          '3d1e28408a9abb42af2e531adc0d01ce21acfad6')
+
+build() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   export PYTHON=/usr/bin/python2
+
+   patch -p0 -i ../subversion.rpath.fix.patch
+   sed -i 's|/usr/bin/env python|/usr/bin/env python2|' tools/hook-scripts/{,mailer/{,tests/}}*.py
+
+   ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \
+               --with-zlib=/usr --with-neon=/usr --with-apxs \
+               --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.3 \
+               --enable-javahl --with-gnome-keyring --with-kwallet
+
+   make external-all
+   make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all
+   make swig_pydir=/usr/lib/python2.7/site-packages/libsvn \
+     swig_pydir_extra=/usr/lib/python2.7/site-packages/svn swig-py swig-pl javahl # swig-rb
+}
+
+#check() {
+#   cd "${srcdir}/${pkgname}-${pkgver}"
+#   export LANG=C LC_ALL=C
+#   make check check-swig-pl check-swig-py check-javahl CLEANUP=yes # check-swig-rb
+#}
+
+package() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+
+   export LD_LIBRARY_PATH="${pkgdir}"/usr/lib:$LD_LIBRARY_PATH
+   make DESTDIR="${pkgdir}" INSTALLDIRS=vendor \
+     swig_pydir=/usr/lib/python2.7/site-packages/libsvn \
+     swig_pydir_extra=/usr/lib/python2.7/site-packages/svn \
+     install install-swig-py install-swig-pl install-javahl # install-swig-rb
+
+   install -d "${pkgdir}"/usr/share/subversion
+   cp -a tools/hook-scripts "${pkgdir}"/usr/share/subversion/
+   rm -f "${pkgdir}"/usr/share/subversion/hook-scripts/*.in
+
+   rm -f "${pkgdir}"/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist
+   rm -rf "${pkgdir}"/usr/lib/perl5/core_perl
+
+   install -D -m 755 "${srcdir}"/svnserve "${pkgdir}"/etc/rc.d/svnserve
+   install -D -m 644 "${srcdir}"/svn "${pkgdir}"/etc/xinetd.d/svn
+   install -D -m 644 "${srcdir}"/svnserve.conf "${pkgdir}"/etc/conf.d/svnserve
+
+   # bash completion
+   install -Dm 644 tools/client-side/bash_completion \
+     "${pkgdir}"/etc/bash_completion.d/subversion
+}
diff --git a/testing/subversion/subversion.rpath.fix.patch b/testing/subversion/subversion.rpath.fix.patch
new file mode 100644
index 000000000..ba6ee9e4e
--- /dev/null
+++ b/testing/subversion/subversion.rpath.fix.patch
@@ -0,0 +1,10 @@
+--- Makefile.in.orig	2009-02-16 14:10:48.000000000 -0200
++++ Makefile.in	2009-06-04 00:56:29.000000000 -0300
+@@ -678,6 +678,7 @@
+ 
+ $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL
+ 	cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL
++	cd $(SWIG_PL_DIR)/native; sed -i 's|LD_RUN_PATH|DIE_RPATH_DIE|g' Makefile{,.{client,delta,fs,ra,repos,wc}}
+ 
+ swig-pl_DEPS = autogen-swig-pl libsvn_swig_perl \
+   $(SWIG_PL_DIR)/native/Makefile
diff --git a/testing/subversion/svn b/testing/subversion/svn
new file mode 100644
index 000000000..8988aaf63
--- /dev/null
+++ b/testing/subversion/svn
@@ -0,0 +1,11 @@
+service svn
+{
+	flags			= REUSE
+	socket_type		= stream
+	wait			= no
+	user			= root
+	server			= /usr/bin/svnserve
+	server_args		= -i
+	log_on_failure		+= USERID
+	disable			= yes
+}
diff --git a/testing/subversion/svnserve b/testing/subversion/svnserve
new file mode 100755
index 000000000..670fee742
--- /dev/null
+++ b/testing/subversion/svnserve
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/svnserve
+
+PID=`pidof -o %PPID /usr/bin/svnserve`
+case "$1" in
+  start)
+    stat_busy "Starting svnserve"
+    if [ -z "$PID" ]; then 
+      if [ -n "$SVNSERVE_USER" ]; then
+        su -s '/bin/sh' $SVNSERVE_USER -c "/usr/bin/svnserve -d $SVNSERVE_ARGS" &
+      else
+        /usr/bin/svnserve -d $SVNSERVE_ARGS &
+      fi
+    fi
+    if [ ! -z "$PID" -o $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon svnserve
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping svnserve"
+    [ ! -z "$PID" ]  && kill $PID &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon svnserve
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
diff --git a/testing/subversion/svnserve.conf b/testing/subversion/svnserve.conf
new file mode 100644
index 000000000..37fb7ea10
--- /dev/null
+++ b/testing/subversion/svnserve.conf
@@ -0,0 +1,7 @@
+#
+# Parameters to be passed to svnserve
+#
+#SVNSERVE_ARGS="-r /path/to/some/repos"
+SVNSERVE_ARGS=""
+
+#SVNSERVE_USER="svn"
diff --git a/~emulatorman/hunspell-gl/PKGBUILD b/~emulatorman/hunspell-gl/PKGBUILD
new file mode 100644
index 000000000..210fda175
--- /dev/null
+++ b/~emulatorman/hunspell-gl/PKGBUILD
@@ -0,0 +1,30 @@
+# Maintainer: Adrián Chaves Fernández (Gallaecio) <adriyetichaves@gmail.com>, 2009-2010.
+# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+
+pkgname=hunspell-gl
+pkgver=2.9b
+pkgrel=1
+pkgdesc="Galician spellchecker for Hunspell"
+arch=('any')
+url="http://trasno.net/"
+license=('GPL3')
+depends=('hunspell')
+source=("http://webs.uvigo.es/miguelsolla/gl_ES.zip")
+md5sums=('209fd16dd47e5cb334fa39563d23c79f')
+
+lang="gl"
+lang2="gl_ES"
+
+build() {
+
+  # Creation of necesary folders...
+  mkdir -p $pkgdir/usr/share/myspell
+  mkdir -p $pkgdir/usr/share/enchant
+    
+  # Fix so Enchant can use dictionaries for Hunspell too.  
+  ln -s /usr/share/myspell $pkgdir/usr/share/enchant/hunspell
+  
+  # Actual installation...
+  install -D -m644 "$srcdir/$lang2.aff"	"$pkgdir/usr/share/myspell/$lang.aff" || return 1
+  install -D -m644 "$srcdir/$lang2.dic"	"$pkgdir/usr/share/myspell/$lang.dic" || return 1
+}
diff --git a/~emulatorman/hunspell-pt-br/PKGBUILD b/~emulatorman/hunspell-pt-br/PKGBUILD
new file mode 100644
index 000000000..c7124503b
--- /dev/null
+++ b/~emulatorman/hunspell-pt-br/PKGBUILD
@@ -0,0 +1,27 @@
+# Maintainer: Daniel Felipe Reis Apolinario <dapolinario@gmail.com>
+# Contributor: Bernardo Barros <bernardobarros@NOSPAM.gmail.com>
+# Contributor: Robson R S Peixoto <robsonpeixoto@gmail.com>
+# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+
+pkgname=hunspell-pt-br
+pkgver=2.0.9
+pkgrel=1
+pkgdesc="Portuguese (Brazil) dictionary"
+arch=(any)
+url="http://www.broffice.org/verortografico/"
+license=('LGPL-2.1')
+optdepends=('hunspell:  the spell checking libraries and apps')
+source=(http://www.broffice.org/files/Vero_pt_BR_V209AOC.oxt)
+
+build() {
+  cd ${srcdir}
+  install -D -m644 pt_BR.dic      $pkgdir/usr/share/hunspell/pt_BR.dic
+  install -D -m644 pt_BR.aff      $pkgdir/usr/share/hunspell/pt_BR.aff
+  mkdir -p $pkgdir/usr/share/myspell/dicts
+  cd $pkgdir/usr/share/myspell/dicts
+
+  ln -s /usr/share/hunspell/pt_BR.dic pt_BR.dic
+  ln -s /usr/share/hunspell/pt_BR.aff pt_BR.aff
+}
+
+md5sums=('47313490f1a21c87b6d5fb5655042e22')
diff --git a/~emulatorman/jitsi-stable/PKGBUILD b/~emulatorman/jitsi-stable/PKGBUILD
new file mode 100644
index 000000000..9cb7018a9
--- /dev/null
+++ b/~emulatorman/jitsi-stable/PKGBUILD
@@ -0,0 +1,65 @@
+# Contributor: Ananda Samaddar ananda@samaddar.co.uk
+# Contributor: Xavion <Xavion (dot) 0 (at) Gmail (dot) com>
+# Contributor: atommix aka Aleks Lifey <Aleks.Lifey@gmail.com>
+# Contributor: Keshav P R <(skodabenz) (aatt) (rocketmail) (ddoott) (ccoomm)>
+# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+
+_pkgname=jitsi
+pkgname=$_pkgname-stable
+pkgver=1.0.beta1.3820
+pkgrel=1
+pkgdesc="An audio/video/chat communicator that supports protocols such as SIP and XMPP/Jabber"
+arch=('i686' 'x86_64')
+url="http://jitsi.org"
+license=('LGPL')
+depends=('openjdk6')
+makedepends=('apache-ant' 'openjdk6')
+provides=("$_pkgname=$pkver")
+conflicts=("$_pkgname")
+options=(!strip !emptydirs zipman !libtool docs)
+source=("http://download.jitsi.org/jitsi/src/jitsi-src-1.0-beta1-nightly.build.${pkgver##*.}.zip"
+        $_pkgname.{desktop,sh})
+md5sums=('a5675da30e2e5fd801d2457ddddba0f9'
+         '5923eeca35823f8ef1e416a9a6fc0fac'
+         '55fe144bbf19283e7ec5d7bd3228cf5b')
+sha256sums=('74d845b993cdd53856415a179ac72bbe9c6f5db37482874eab7be34490e7c0c2'
+            '770132b617d94ed468e9592b991ceac10eb3e03e7198b8f5f2f05918f7db4302'
+            '98027ddaa1ebfe948fa49f6e57ab0d2c866d5e7c37873e30638b86223a2a15e9')
+
+# uncomment to get the latest stable release; you have to adjust/skip checksums
+#source[0]=http://download.jitsi.org/jitsi/src/$(curl -Ss 'http://download.jitsi.org/jitsi/src/' | grep -om1 'jitsi-src[^"<]\+.zip' | head -1)
+#pkgver=$(sed -r 's/[^0-9]*([0-9.]+)(-(beta[0-9]+))?.*(.build.([0-9]+))\..*/\1.\3.\5/' <<<${source[0]})
+
+build() {
+	cd "$srcdir/$_pkgname"
+
+	# append the build revision to the jitsi version
+	sed -i "s/0\.build\.by\.SVN/build.${pkgver##*.}/" src/net/java/sip/communicator/impl/version/NightlyBuildID.java
+
+	. /etc/profile.d/apache-ant.sh
+	ant rebuild
+}
+
+package() {
+	cd "$srcdir/$_pkgname"
+
+	find lib/ lib/bundle/ -maxdepth 1 -type f \
+		-exec install -Dm644 {} "$pkgdir/usr/lib/$_pkgname/"{} \;
+	find lib/os-specific/linux/ -maxdepth 1 -type f \
+		-execdir install -Dm644 {} "$pkgdir/usr/lib/$_pkgname/lib/"{} \;
+
+	shopt -sq extglob
+	find lib/native/linux$(sed 's/_/-/g' <<<${CARCH/#*(i?86|x86)/})/ -maxdepth 1 -type f \
+		-execdir install -Dm644 {} "$pkgdir/usr/lib/$_pkgname/lib/native/"{} \;
+
+	find sc-bundles/{,os-specific/linux/} -maxdepth 1 -type f \
+		-execdir install -Dm644 {} "$pkgdir/usr/lib/$_pkgname/sc-bundles/"{} \;
+
+	install -Dm755 "$srcdir/$_pkgname.sh"      "$pkgdir/usr/bin/$_pkgname"
+	install -Dm644 "$srcdir/$_pkgname.desktop" "$pkgdir/usr/share/applications/$_pkgname.desktop"
+
+	local _file
+	for _file in resources/install/debian/*.{svg,xpm}; do
+		install -Dm644 "$_file" "$pkgdir/usr/share/pixmaps/$_pkgname${_file/*sip-communicator/}"
+	done
+}
diff --git a/~emulatorman/jitsi-stable/jitsi.desktop b/~emulatorman/jitsi-stable/jitsi.desktop
new file mode 100644
index 000000000..f0a7b5436
--- /dev/null
+++ b/~emulatorman/jitsi-stable/jitsi.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Jitsi
+GenericName=jitsi
+Comment=VoIP and Instant Messaging client
+Icon=/usr/share/pixmaps/jitsi.svg
+Type=Application
+Categories=Network;
+Exec=/usr/bin/jitsi
+Terminal=false
diff --git a/~emulatorman/jitsi-stable/jitsi.sh b/~emulatorman/jitsi-stable/jitsi.sh
new file mode 100644
index 000000000..6ebd6131f
--- /dev/null
+++ b/~emulatorman/jitsi-stable/jitsi.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# Additionnal JVM arguments
+CLIENTARGS=""
+[[ $(uname -m) =~ i?86 ]] && CLIENTARGS="-client -Xmx256m"
+
+SCDIR=/usr/lib/jitsi
+LIBPATH=$SCDIR/lib
+CLASSPATH=$LIBPATH/jdic_stub.jar:$LIBPATH/jdic-all.jar:$LIBPATH/felix.jar:$LIBPATH/bcprovider.jar:$SCDIR/sc-bundles/sc-launcher.jar:$SCDIR/sc-bundles/util.jar
+FELIX_CONFIG=$LIBPATH/felix.client.run.properties
+LOG_CONFIG=$LIBPATH/logging.properties
+COMMAND="$JAVA_HOME/bin/java $CLIENTARGS -classpath $CLASSPATH -Djna.library.path=$LIBPATH/native -Dfelix.config.properties=file:$FELIX_CONFIG -Djava.util.logging.config.file=$LOG_CONFIG net.java.sip.communicator.launcher.SIPCommunicator"
+
+# set add LIBPATH to LD_LIBRARY_PATH for any sc natives (e.g. jmf .so's)
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIBPATH/native
+
+cd $SCDIR
+
+exec $COMMAND $*
diff --git a/~emulatorman/mednafen-wip/PKGBUILD b/~emulatorman/mednafen-wip/PKGBUILD
new file mode 100755
index 000000000..93893684e
--- /dev/null
+++ b/~emulatorman/mednafen-wip/PKGBUILD
@@ -0,0 +1,34 @@
+# Maintainer: Hans-Kristian Arntzen <maister@archlinux.us>
+# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
+# Contributor: kagan <juanynie@mi.madritel.es>
+# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+
+pkgname=mednafen-wip
+pkgver=0.9.19
+pkgrel=1
+pkgdesc="A command-line multi-system gaming emulator, WIP version"
+url="http://mednafen.sourceforge.net/"
+license=(GPL)
+arch=('i686' 'x86_64')
+depends=('libcdio>=0.82' 'libsamplerate' 'libogg' 'libvorbis' 'sdl' 'sdl_net' 'libsndfile' 'zlib')
+makedepends=('pkgconfig' 'mesa')
+conflicts=('mednafen')
+provides=('mednafen')
+source=('http://forum.fobby.net/index.php?t=getfile&id=345&' 'build.patch')
+md5sums=('64be12196aa02828539af677b0e2a66c'
+         'aac8957fa5274f00feed6a462fa8b7ad')
+
+build() 
+{
+   cd $srcdir/mednafen
+   patch -p1 < $srcdir/build.patch
+   ./configure --prefix=/usr
+   make
+}
+
+package()
+{
+   cd $srcdir/mednafen
+   make DESTDIR=$pkgdir install
+}
+
diff --git a/~emulatorman/mednafen-wip/build.patch b/~emulatorman/mednafen-wip/build.patch
new file mode 100644
index 000000000..7985a19ed
--- /dev/null
+++ b/~emulatorman/mednafen-wip/build.patch
@@ -0,0 +1,31 @@
+diff --git a/src/file.cpp b/src/file.cpp
+index 57f4e13..ec1181c 100644
+--- a/src/file.cpp
++++ b/src/file.cpp
+@@ -293,7 +293,7 @@ bool MDFNFILE::MakeMemWrapAndClose(void *tz, int type)
+    goto doret;
+   }
+ 
+-  while((howmany = gzread(tz, f_data + cur_size, cur_alloced - cur_size)) > 0)
++  while((howmany = gzread((gzFile)tz, f_data + cur_size, cur_alloced - cur_size)) > 0)
+   {
+    cur_size += howmany;
+    cur_alloced <<= 1;
+@@ -320,7 +320,7 @@ bool MDFNFILE::MakeMemWrapAndClose(void *tz, int type)
+   {
+    int gzerrnum = 0;
+    const char *gzerrstring;
+-   if((gzerrstring = gzerror(tz, &gzerrnum)) && gzerrnum != Z_OK && gzerrnum != Z_STREAM_END)
++   if((gzerrstring = gzerror((gzFile)tz, &gzerrnum)) && gzerrnum != Z_OK && gzerrnum != Z_STREAM_END)
+    {
+     if(gzerrnum != Z_ERRNO)
+     {
+@@ -365,7 +365,7 @@ bool MDFNFILE::MakeMemWrapAndClose(void *tz, int type)
+  }
+  else if(type == MDFN_FILETYPE_GZIP)
+  {
+-  gzclose(tz);
++  gzclose((gzFile)tz);
+  }
+  else if(type == MDFN_FILETYPE_ZIP)
+  {
diff --git a/~emulatorman/xonotic-data/PKGBUILD b/~emulatorman/xonotic-data/PKGBUILD
new file mode 100644
index 000000000..114954fc3
--- /dev/null
+++ b/~emulatorman/xonotic-data/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 35989 2010-12-25 03:22:46Z svenstaro $
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Alexander Suhoverhov <cy at ngs dot ru>
+# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+
+pkgname=xonotic-data
+pkgver=0.5.0
+pkgrel=1
+pkgdesc="A free, fast-paced crossplatform first-person shooter (data files)"
+arch=('any')
+url="http://xonotic.org"
+license=('GPL')
+depends=()
+makedepends=('unzip')
+source=("http://dl.xonotic.org/xonotic-${pkgver}.zip")
+md5sums=('cdadb384ccf9cad926bb377312832c2f')
+
+build() {
+  cd $srcdir/Xonotic/source/darkplaces
+}
+
+package() {
+  cd $srcdir/Xonotic
+  
+  # data
+  mkdir -p $pkgdir/usr/share/xonotic/
+  mv $srcdir/Xonotic/data $pkgdir/usr/share/xonotic/
+}
+# vim: ts=2:sw=2 et:
diff --git a/~emulatorman/xonotic/PKGBUILD b/~emulatorman/xonotic/PKGBUILD
new file mode 100644
index 000000000..236474d3d
--- /dev/null
+++ b/~emulatorman/xonotic/PKGBUILD
@@ -0,0 +1,50 @@
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Alexander Suhoverhov <cy at ngs dot ru>
+# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+
+pkgname=xonotic
+pkgver=0.5.0
+pkgrel=1
+pkgdesc="A free, fast-paced crossplatform first-person shooter"
+arch=('i686' 'x86_64')
+url="http://xonotic.org"
+license=('GPL')
+depends=('alsa-lib' 'curl' 'libjpeg>=8' 'libmodplug' 'libvorbis' 'libxpm' 'libxxf86dga' 'libxxf86vm' 'sdl' 'libpng>=1.4.0' 'xonotic-data')
+makedepends=('unzip' 'mesa')
+source=("http://dl.xonotic.org/xonotic-${pkgver}-source.zip"
+        "xonotic-glx.desktop"
+        "xonotic-sdl.desktop")
+md5sums=('7382f195386b8e51df65e57e6be413e5'
+         '914c7b9163e92b35f0ab57fdb1653ac5'
+         'da7d812ff231c9332cd694b39757adda')
+
+build() {
+  # compile Xonotic-flavored fteqcc
+  #make -C Xonotic/source/fteqcc
+
+  # compile QuakeC game code
+  #( cd Xonotic/source/qcsrc/server && ../../fteqcc/fteqcc.bin -O3 -Ono-c -Ono-cs )
+  #( cd Xonotic/source/qcsrc/client && ../../fteqcc/fteqcc.bin -O3 -Ono-c -Ono-cs )
+  #( cd Xonotic/source/qcsrc/menu && ../../fteqcc/fteqcc.bin -O3 -Ono-c -Ono-cs )
+
+  # compile engine
+	make -C Xonotic/source/darkplaces CPUOPTIMIZATIONS="${CFLAGS}" DP_FS_BASEDIR=/usr/share/xonotic/ DP_LINK_TO_LIBJPEG=1 cl-release
+	make -C Xonotic/source/darkplaces CPUOPTIMIZATIONS="${CFLAGS}" DP_FS_BASEDIR=/usr/share/xonotic/ DP_LINK_TO_LIBJPEG=1 sdl-release
+	make -C Xonotic/source/darkplaces CPUOPTIMIZATIONS="${CFLAGS}" DP_FS_BASEDIR=/usr/share/xonotic/ DP_LINK_TO_LIBJPEG=1 sv-release
+}
+
+package() {
+	cd $srcdir/Xonotic
+
+	# binaries
+	install -Dm755 source/darkplaces/darkplaces-dedicated $pkgdir/usr/bin/xonotic-dedicated
+	install -Dm755 source/darkplaces/darkplaces-glx $pkgdir/usr/bin/xonotic-glx
+	install -Dm755 source/darkplaces/darkplaces-sdl $pkgdir/usr/bin/xonotic-sdl
+
+	# convenience files
+	mkdir -p $pkgdir/usr/share/applications
+	install -Dm644 $srcdir/*.desktop -t $pkgdir/usr/share/applications
+	install -Dm644 $srcdir/Xonotic/misc/logos/icons_png/xonotic_512.png $pkgdir/usr/share/pixmaps/xonotic.png
+}
+
+# vim: ts=2:sw=2 et:
diff --git a/~emulatorman/xonotic/xonotic-glx.desktop b/~emulatorman/xonotic/xonotic-glx.desktop
new file mode 100644
index 000000000..9f9e78cc1
--- /dev/null
+++ b/~emulatorman/xonotic/xonotic-glx.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Version=2.5
+Encoding=UTF-8
+Name=Xonotic (GLX)
+Comment=a free open-source first person shooter
+Icon=/usr/share/pixmaps/xonotic.png
+Exec=/usr/bin/xonotic-glx
+Terminal=false
+StartupNotify=false
+Categories=Game;
diff --git a/~emulatorman/xonotic/xonotic-sdl.desktop b/~emulatorman/xonotic/xonotic-sdl.desktop
new file mode 100644
index 000000000..32b37f2c5
--- /dev/null
+++ b/~emulatorman/xonotic/xonotic-sdl.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Version=2.5
+Encoding=UTF-8
+Name=Xonotic (SDL)
+Comment=a free open-source first person shooter
+Icon=/usr/share/pixmaps/xonotic.png
+Exec=/usr/bin/xonotic-sdl
+Terminal=false
+StartupNotify=false
+Categories=Game;