Fri Oct 28 23:14:50 UTC 2011

50 files changed, 1273 insertions, 411 deletions

diff --git a/community/atop/PKGBUILD b/community/atop/PKGBUILD
index 77de470b9..b265f2361 100644
--- a/community/atop/PKGBUILD
+++ b/community/atop/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 38572 2011-01-28 12:11:54Z spupykin $
+# $Id: PKGBUILD 57413 2011-10-27 08:43:14Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: John Gerritse <john.gerritse@gmail.com>
 
 pkgname=atop
 pkgver=1.26
-pkgrel=1
+pkgrel=2
 pkgdesc="A system and process level monitor."
 arch=(i686 x86_64)
 url="http://www.atoptool.nl/"
@@ -15,6 +15,11 @@ md5sums=('9a72baf4c8f330973f1e2703f5a6c041')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
+  sed -i 's#root ##' atop.cron
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir INIPATH=/etc/rc.d install
 }
diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD
index 43a7d2d8b..f11df96d8 100644
--- a/community/calibre/PKGBUILD
+++ b/community/calibre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 57135 2011-10-22 11:01:48Z giovanni $
+# $Id: PKGBUILD 57448 2011-10-27 21:24:16Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Petrov Roman <nwhisper@gmail.com>
 # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com>
 
 pkgname=calibre
-pkgver=0.8.23
+pkgver=0.8.24
 pkgrel=1
 pkgdesc="Ebook management application"
 arch=('i686' 'x86_64') 
@@ -20,7 +20,7 @@ optdepends=('ipython: to use calibre-debug')
 install=calibre.install
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'desktop_integration.patch')
-md5sums=('a8841578d16786af3c797fa2422905e9'
+md5sums=('9ab82f7d4d072cc6858ef92f29d6029a'
          '253ce4fe5d01f8ff76b63cd3825755ea')
 
 build() {
diff --git a/community/emesene/PKGBUILD b/community/emesene/PKGBUILD
index 292183a79..fca66e6b2 100755
--- a/community/emesene/PKGBUILD
+++ b/community/emesene/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 55723 2011-09-18 07:15:35Z rvanharen $
+# $Id: PKGBUILD 57431 2011-10-27 18:18:52Z rvanharen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Claudio Riva <firetux83@gmail.com>
 
 pkgname=emesene
-pkgver=2.11.7
-pkgrel=2
+pkgver=2.11.9
+pkgrel=1
 pkgdesc="A pygtk MSN Messenger client"
 url="http://www.emesene.org/"
 license=('custom:PSF' 'GPL' 'LGPL2.1')
@@ -23,7 +23,7 @@ source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}
         'emesene.run')
 install=emesene.install
 options=('!libtool')
-sha1sums=('ba18b6a40003c1e0407dc1395a237db84ce4efa1'
+sha1sums=('b79ee47962db7927f2fcfdcb5fb5b042bced4b94'
           '2bd13ada86aa0af6307a41047f0d7caf2995660d')
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -53,3 +53,4 @@ package() {
   # create executable
   install -Dm755 ${srcdir}/emesene.run ${pkgdir}/usr/bin/emesene
 }
+
diff --git a/community/gromacs/PKGBUILD b/community/gromacs/PKGBUILD
index afc51016d..aa23037a5 100644
--- a/community/gromacs/PKGBUILD
+++ b/community/gromacs/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 43416 2011-03-25 21:35:12Z ebelanger $
+# $Id: PKGBUILD 57441 2011-10-27 20:16:45Z lcarlier $
 # Maintainer: Abhishek Dasgupta <abhidg@gmail.com>
 # Contributor: Ricardo <rikardo.horo@gmail.com>
 
 pkgname=gromacs
-pkgver=4.5.4
+pkgver=4.5.5
 pkgrel=1
 pkgdesc='A fast Molecular Dynamics program based on the GROMOS force field'
 url='http://www.gromacs.org/'
@@ -12,8 +12,8 @@ arch=('i686' 'x86_64')
 depends=('fftw' 'lesstif' 'perl' 'libxml2' 'libsm' 'libx11')
 options=('!libtool')
 source=(ftp://ftp.gromacs.org/pub/gromacs/${pkgname}-${pkgver}.tar.gz)
-md5sums=('5013de941017e014b92d41f82c7e86d6')
-sha1sums=('c7b3fbd2f3ddf915bc082e7effe76a8276563726')
+md5sums=('6a87e7cdfb25d81afa9fea073eb28468')
+sha1sums=('ce4b4f9a0453dd2ffea72f28ea0bc7bb7a72f479')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/iasl/PKGBUILD b/community/iasl/PKGBUILD
index f7bb70c64..620d34ca6 100644
--- a/community/iasl/PKGBUILD
+++ b/community/iasl/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 55855 2011-09-23 21:20:50Z lcarlier $
+# $Id: PKGBUILD 57443 2011-10-27 20:27:47Z lcarlier $
 # Maintainer : Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Alessio 'mOlOk' Bolognino <themolok@gmail.com>
 
 pkgname=iasl
-pkgver=20110623
+pkgver=20110922
 pkgrel=1
 pkgdesc="Intel ACPI Source Language compiler"
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ options=('!makeflags')
 install=iasl.install
 source=(http://acpica.org/download/acpica-unix-${pkgver}.tar.gz
 	LICENSE)
-md5sums=('93e827bf4b1f1971a1b3c2074c5f9ccb'
+md5sums=('b95af67bb277657ae01844db01f2f9c7'
          '8615526144f69ea4e870d9bc37df9b29')
 
 build() {
diff --git a/community/kmymoney/PKGBUILD b/community/kmymoney/PKGBUILD
index 64aed53d8..18c8221a8 100644
--- a/community/kmymoney/PKGBUILD
+++ b/community/kmymoney/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 40038 2011-02-19 15:18:41Z jlichtblau $
+# $Id: PKGBUILD 57452 2011-10-27 21:53:29Z lcarlier $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Vamp898 <vamp898@web.de>
 # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
@@ -6,30 +6,35 @@
 # Contributor: Todd Maynard <arch@toddmaynard.com>
 
 pkgname=kmymoney
-pkgver=4.5.3
+pkgver=4.6.0
 pkgrel=1
 pkgdesc="Personal finance manager for KDE which operates similarly to MS-Money or Quicken"
 arch=('i686' 'x86_64')
 url="http://kmymoney2.sourceforge.net/"
 license=('GPL')
-depends=('boost' 'kdebase-workspace' 'shared-mime-info' 'aqbanking' 'libofx')
-makedepends=('cmake' 'automoc4' 'docbook-xml' 'docbook-xsl' 'gwenhywfar')
+depends=('kdebase-workspace' 'shared-mime-info' 'aqbanking' 'libofx' 'libalkimia' 'boost-libs')
+makedepends=('cmake' 'automoc4' 'docbook-xml' 'docbook-xsl' 'boost')
 replaces=('kmymoney2')
 install=$pkgname.install
 changelog=$pkgname.changelog
 options=('!makeflags')
 source=(http://downloads.sourceforge.net/project/kmymoney2/KMyMoney-KDE4/$pkgver/$pkgname-$pkgver.tar.bz2)
-sha256sums=('a9b37275cf3cdcd5ce865d94391df44c7822639b830fccb9962a54b7fcf76ffb')
+sha256sums=('8f034a92682cc61dfa76c2593893524d00658c49360b17ddc67671e32ec7edf8')
 
 build() {
-  cd ${srcdir}/$pkgname-$pkgver
+  cd ${srcdir}
 
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RELEASE
+  mkdir build
+  cd build
+
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=RELEASE
   make
 }
 
 package() {
-  cd ${srcdir}/$pkgname-$pkgver
+  cd ${srcdir}/build
 
   make DESTDIR=${pkgdir} install
 }
diff --git a/community/leptonica/PKGBUILD b/community/leptonica/PKGBUILD
index b19320316..d5e3fec82 100644
--- a/community/leptonica/PKGBUILD
+++ b/community/leptonica/PKGBUILD
@@ -1,22 +1,24 @@
-# $Id: PKGBUILD 57293 2011-10-25 10:37:42Z spupykin $
+# $Id: PKGBUILD 57411 2011-10-27 08:39:19Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Christoph Drexler <chrdr at gmx dot at>
 
 pkgname=leptonica
 pkgver=1.68
-pkgrel=1
+pkgrel=2
 pkgdesc="Software that is broadly useful for image processing and image analysis applications"
 arch=('i686' 'x86_64')
 url="http://www.leptonica.com/"
 license=('custom')
 depends=('glibc')
+makedepends=('giflib' 'gnuplot' 'libjpeg' 'libpng' 'libtiff' 'zlib')
+# 'webp'
 optdepends=('giflib:  for supporting gif files'
 	    'gnuplot: gnuplot support'
 	    'libjpeg: for supporting jpeg files'
 	    'libpng:  for supporting png files'
 	    'libtiff: for supporting tiff files'
-	    'webp:    for supporting webp files'
 	    'zlib:    for supporting compressed files')
+#	    'webp:    for supporting webp files'
 source=(http://www.leptonica.com/source/leptonica-${pkgver}.tar.gz)
 md5sums=('5cd7092f9ff2ca7e3f3e73bfcd556403')
 
diff --git a/community/libalkimia/PKGBUILD b/community/libalkimia/PKGBUILD
new file mode 100644
index 000000000..18a86ae47
--- /dev/null
+++ b/community/libalkimia/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 57450 2011-10-27 21:27:30Z lcarlier $
+# Contributor: gumper <gumper1034@gmail.com>
+
+pkgname=libalkimia
+pkgver=4.3.1
+pkgrel=1
+pkgdesc="A library with common classes and functionality used by finance applications for the KDE SC."
+depends=('kdelibs')
+makedepends=('cmake' 'automoc4' 'doxygen')
+url=('http://kde-apps.org/content/show.php/libalkimia?content=137323')
+license=('LGPL')
+arch=('i686' 'x86_64')
+source=("http://kde-apps.org/CONTENT/content-files/137323-libalkimia-$pkgver.tar.bz2")
+md5sums=('73d7f1365118019030b2045d95c92456')
+
+build() {
+  cd "${srcdir}"
+
+  mkdir build
+  cd build
+
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=DebugFull \
+    -Wno-dev
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+ 
+  make DESTDIR="${pkgdir}" install  
+}
+
diff --git a/community/libmemcached/PKGBUILD b/community/libmemcached/PKGBUILD
index 238dddb01..81a8afa71 100644
--- a/community/libmemcached/PKGBUILD
+++ b/community/libmemcached/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 56051 2011-09-29 17:22:52Z foutrelis $
+# $Id: PKGBUILD 57420 2011-10-27 12:32:11Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 
 pkgname=libmemcached
-pkgver=0.53
+pkgver=1.0.2
 pkgrel=1
 pkgdesc="C and C++ client library to the memcached server"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ depends=('glibc')
 makedepends=('perl')
 options=('!libtool')
 source=(http://launchpad.net/$pkgname/1.0/$pkgver/+download/$pkgname-$pkgver.tar.gz)
-sha1sums=('52e0422a8916814b7c416d1671018e9aab50e9cc')
+sha1sums=('d992845fe71210e2e93147ba8f29df1fca14e716')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/libraw/PKGBUILD b/community/libraw/PKGBUILD
index 62a22ddf2..3a3874fa9 100644
--- a/community/libraw/PKGBUILD
+++ b/community/libraw/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 55740 2011-09-18 19:52:04Z bfanella $
+# $Id: PKGBUILD 57445 2011-10-27 20:33:46Z lcarlier $
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com>
 # Maintainer: Brad Fanella <bradfanella@archlinux.us>
 
 pkgname=libraw
 _pkgbasename=LibRaw
-pkgver=0.13.8
+pkgver=0.14.3
 pkgrel=1
 pkgdesc="A library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ license=('CDDL' 'LGPL' 'custom')
 depends=('lcms')
 options=('!makeflags')
 source=(http://www.libraw.org/data/${_pkgbasename}-${pkgver}.tar.gz)
-md5sums=('62cd5fee94915add0c43a97ec6909bbb')
+md5sums=('d8f81a52b0fada9d5bf7e659e21e3a57')
 
 build() {
   	cd ${srcdir}/${_pkgbasename}-${pkgver}
diff --git a/community/libwww/PKGBUILD b/community/libwww/PKGBUILD
index f9a798e45..c26669f7d 100644
--- a/community/libwww/PKGBUILD
+++ b/community/libwww/PKGBUILD
@@ -1,11 +1,14 @@
+# $Id: PKGBUILD 57429 2011-10-27 16:42:35Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Buharev Vasilij <buharev.v.p@gmail.com>
+
 pkgname=libwww
 pkgver=5.4.0
-pkgrel=4
+pkgrel=5
 pkgdesc="A general-purpose client side WEB API"
 arch=('i686' 'x86_64')
 url="http://www.w3.org/Library/"
-license=('custom')
+license=('W3C')
 depends=()
 makedepends=('gcc pkgconfig perl zlib openssl')
 options=('!libtool')
@@ -13,13 +16,10 @@ source=(http://www.w3.org/Library/Distribution/w3c-$pkgname-$pkgver.tgz)
 md5sums=('c3734ca6caa405707e134cc8c6d7e422')
 
 build() {
-  cd "$startdir/src/w3c-$pkgname-$pkgver"
-
-  #export ac_cv_header_appkit_appkit_h=no
-  [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --with-md5 --with-zlib --with-expat --with-regex --with-ssl
+  cd "$srcdir/w3c-$pkgname-$pkgver"
+  [ -f Makefile ] || ./configure --prefix=/usr \
+	--with-md5 --with-zlib --with-expat --with-regex --with-ssl
   sed -i 's#Examples##' Library/Makefile
-  make || return 1
-  make DESTDIR="$startdir/pkg" install || return 1
-
-  install -D -m 0644 COPYRIGHT.html $pkgdir/usr/share/licenses/$pkgname/COPYRIGHT.html
+  make
+  make DESTDIR="$pkgdir" install
 }
diff --git a/community/ndisc6/PKGBUILD b/community/ndisc6/PKGBUILD
new file mode 100644
index 000000000..206db2574
--- /dev/null
+++ b/community/ndisc6/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 57422 2011-10-27 13:12:24Z cbrannon $
+# Maintainer: Chris Brannon <chris@the-brannons.com>
+# Contributor: Mark Smith <markzzzsmith@yahoo.com.au>
+pkgname=ndisc6
+pkgver=1.0.2
+pkgrel=1
+pkgdesc="A collection of IPv6 networking utilities - ndisc6, rdisc6, tcptraceroute6, tracert6, rltraceroute6, tcpspray6"
+arch=('i686' 'x86_64')
+url="http://www.remlab.net/ndisc6/"
+license=("GPL")
+depends=('glibc')
+makedepends=('glibc' 'gcc')
+source=(http://www.remlab.net/files/ndisc6/$pkgname-$pkgver.tar.bz2
+        rdnssd.rc.d
+	rdnssd.confd)
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure --localstatedir=/var --sysconfdir=/etc --prefix=/usr
+  make
+
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+  install -Dm755 "$srcdir/rdnssd.rc.d" "$pkgdir/etc/rc.d/rdnssd"
+  install -Dm644 "$srcdir/rdnssd.confd" "$pkgdir/etc/conf.d/rdnssd"
+
+}
+
+md5sums=('50cb4c19606cf6ff2b7388e71832f579'
+         '3421fd731c4da4f9e07fc6b6ff4e5084'
+         'f1910902932e2622fc166960819db6c4')
diff --git a/community/ndisc6/rdnssd.confd b/community/ndisc6/rdnssd.confd
new file mode 100644
index 000000000..306c3d7f6
--- /dev/null
+++ b/community/ndisc6/rdnssd.confd
@@ -0,0 +1,8 @@
+
+# This default merge hook adds IPv6 DNS resolvers
+# before the existing IPv4 ones in /etc/resolv.conf.
+MERGEHOOK="/etc/rdnssd/merge-hook"
+
+# User who runs rdnssd.
+RUN_AS="nobody"
+
diff --git a/community/ndisc6/rdnssd.rc.d b/community/ndisc6/rdnssd.rc.d
new file mode 100644
index 000000000..3c0a6a53c
--- /dev/null
+++ b/community/ndisc6/rdnssd.rc.d
@@ -0,0 +1,51 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/rdnssd
+
+PIDFILE="/var/run/rdnssd.pid"
+PID=`cat "$PIDFILE" 2>/dev/null`
+case "$1" in
+  start)
+    stat_busy "Starting RDNSS Daemon"
+    if [ ! -z "$PID" -a -e "/proc/$PID" ]; then
+      stat_append "-- Already running"
+      stat_die
+    else
+      /usr/sbin/rdnssd -p "$PIDFILE"    \
+        ${MERGEHOOK/*/-H}  "$MERGEHOOK" \
+        ${RUN_AS/*/-u}     "$RUN_AS"
+
+      if [ $? -gt 0 ]; then
+        stat_fail
+      else
+        add_daemon rdnssd
+        stat_done
+      fi
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping RDNSS Daemon"
+    if [ -z "$PID" ]; then
+      stat_append "-- Not running"
+      stat_die
+    else
+      kill $PID &> /dev/null
+      if [ $? -gt 0 ]; then
+        stat_fail
+      else
+        rm_daemon sshd
+        stat_done
+      fi
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0
diff --git a/community/quassel/PKGBUILD b/community/quassel/PKGBUILD
index 5dc833b03..80a3d47f2 100644
--- a/community/quassel/PKGBUILD
+++ b/community/quassel/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 52032 2011-07-19 19:58:15Z jlichtblau $
+# $Id: PKGBUILD 57415 2011-10-27 10:22:06Z lcarlier $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 
 pkgname=quassel
-pkgver=0.7.2
+pkgver=0.7.3
 pkgrel=1
 pkgdesc="QT4 irc client with a separated core"
 arch=('i686' 'x86_64')
@@ -11,11 +11,11 @@ license=('GPL')
 depends=('kdelibs' 'oxygen-icons' 'hicolor-icon-theme')
 makedepends=('cmake' 'automoc4')
 install=$pkgname.install
-backup=(etc/conf.d/quassel.conf)
+backup=(etc/conf.d/quassel)
 source=(http://quassel-irc.org/pub/$pkgname-$pkgver.tar.bz2
         rc.$pkgname
         $pkgname.conf)
-sha256sums=('b9e4a094c46715dd68152cd98a4e0778e308a0ec653eb8b5476ec429d128d55c'
+sha256sums=('9e78dbc28bfeda2ed66fa3082392951cbd002f851ef1a7f1228988bb18c7c98d'
             '845e621448a51ec181554e9327bfcc3a3de1501ae8f70410f0b9b8991ac171b0'
             'f3031ea8217e01ba42cea14606169e3e27affa5918968ffd5a03c21ae92fe2b8')
 
diff --git a/community/solfege/PKGBUILD b/community/solfege/PKGBUILD
index 255ea0f87..4ae1a450f 100644
--- a/community/solfege/PKGBUILD
+++ b/community/solfege/PKGBUILD
@@ -1,13 +1,12 @@
-# $Id: PKGBUILD 55949 2011-09-26 18:58:53Z schiv $
+# $Id: PKGBUILD 57439 2011-10-27 19:55:33Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
 # Contributor: sickhate <sickhate@tux-linux.net>
 
 # TODO:
 #   bring in pyalsa, csound, mma
-options=('!makeflags')
 pkgname=solfege
-pkgver=3.20.3
+pkgver=3.20.4
 pkgrel=1
 pkgdesc="Music education and ear training software"
 arch=('i686' 'x86_64')
@@ -15,16 +14,15 @@ url="http://www.solfege.org/"
 license=('GPL3')
 depends=('pygtk' 'libgtkhtml')
 makedepends=('ghostscript' 'gnome-doc-utils' 'librsvg' 'libxslt'
-             'swig' 'texinfo' 'txt2man' 'pkg-config')
+             'swig' 'texinfo' 'txt2man')
 optdepends=('timidity++: or any MIDI player & MIDI-WAV converter'
             'mpg123: or any MP3 player'
             'lame: or any WAV-MP3 converter'
             'vorbis-tools: or any OGG player & WAV-OGG converter'
-            #'lilypond: for generating print-outs & score sheets'
+            'lilypond: for generating print-outs & score sheets'
             'texlive-bin: use LaTeX to replace HTML reports with DVI')
-changelog=$pkgname.changelog
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('b6546691d0e34595e3c87c0e38a8ae15')
+md5sums=('3a1914158ad218ad5b119ee4f719b567')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/xmoto/PKGBUILD b/community/xmoto/PKGBUILD
index 7c1e5da6d..64a776beb 100644
--- a/community/xmoto/PKGBUILD
+++ b/community/xmoto/PKGBUILD
@@ -4,17 +4,17 @@
 # Contributor: Denis (dtonator@gmail.com)
 
 pkgname=xmoto
-pkgver=0.5.7
+pkgver=0.5.8
 pkgrel=1
 pkgdesc="A challenging 2D motocross platform game, where physics play an important role."
 arch=('i686' 'x86_64')
 url="http://xmoto.tuxfamily.org"
 license=('GPL')
 depends=('bzip2' 'libjpeg' 'libpng' 'lua' 'sdl_mixer' 'ode=0.11.1' 'curl' 
-	 'mesa' 'sqlite3' 'sdl_ttf' 'desktop-file-utils' 'sdl_net' 'libxdg-basedir')
+	 'mesa' 'sqlite3' 'sdl_ttf' 'desktop-file-utils' 'sdl_net' 'libxdg-basedir' 'libxml++')
 install=xmoto.install
 source=("http://download.tuxfamily.org/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}-src.tar.gz")
-sha1sums=('e781b42480a96187b5aca4126d17ecf0610ca5ac')
+sha1sums=('a5197e10f0c37cfefbab55723c8d0760234fb4ce')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/accountsservice/PKGBUILD b/extra/accountsservice/PKGBUILD
index 61802e312..0222f00e5 100644
--- a/extra/accountsservice/PKGBUILD
+++ b/extra/accountsservice/PKGBUILD
@@ -1,7 +1,8 @@
-# $Id: PKGBUILD 139213 2011-10-01 18:55:35Z ibiru $
+# $Id: PKGBUILD 141268 2011-10-27 16:31:57Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
+
 pkgname=accountsservice
-pkgver=0.6.14
+pkgver=0.6.15
 pkgrel=1
 pkgdesc="D-Bus interface for user account query and manipulation"
 arch=(i686 x86_64)
@@ -11,7 +12,7 @@ depends=('dbus-glib' 'polkit')
 makedepends=('intltool' 'gobject-introspection')
 options=('!libtool')
 source=(http://cgit.freedesktop.org/accountsservice/snapshot/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('88f4d5d0d1f0ce0fa6a180cbff936041')
+md5sums=('939e58e57334801ca578b182a09141c4')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/blender/PKGBUILD b/extra/blender/PKGBUILD
index a6efe8dba..334fbd7fb 100644
--- a/extra/blender/PKGBUILD
+++ b/extra/blender/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 140830 2011-10-20 05:01:46Z eric $
+# $Id: PKGBUILD 141279 2011-10-28 02:04:28Z eric $
 # Contributor: John Sowiak <john@archlinux.org>
 # Maintainer: tobias <tobias@archlinux.org>
 
@@ -12,9 +12,9 @@
 _svn=false
 
 pkgname=blender
-pkgver=2.60
+pkgver=2.60a
 pkgrel=1
-epoch=2
+epoch=3
 pkgdesc="A fully integrated 3D graphics creation suite"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -26,7 +26,7 @@ makedepends=('cmake')
 install=blender.install
 if [ $_svn = false ]; then
   source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz)
-  md5sums=('2951df9d5f004c5e0375b53969205a38')
+  md5sums=('cc7e4a56c9f7941c33c958ff0338f9a6')
 else
   source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.xz)
   md5sums=('7579d1139d0d6025df8afcfca64a65c4')
diff --git a/extra/fuse/PKGBUILD b/extra/fuse/PKGBUILD
index f3863969e..1dfd3e069 100644
--- a/extra/fuse/PKGBUILD
+++ b/extra/fuse/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 94450 2010-10-07 10:30:45Z ronald $
+# $Id: PKGBUILD 141256 2011-10-27 14:45:14Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Mark Rosenstand <mark@archlinux.org>
 
 pkgname=fuse
-pkgver=2.8.5
+pkgver=2.8.6
 pkgrel=1
 pkgdesc="A library that makes it possible to implement a filesystem in a userspace program."
 arch=('i686' 'x86_64')
@@ -16,20 +16,23 @@ install=fuse.install
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
 	'fuse.conf')
 options=(!libtool)
-sha1sums=('862320b56d6bc4ad5e7be2b1e0b5029166aae09b'
+sha1sums=('c2c0f9fff8bfee217da200888123e5abb5b498f2'
           '3b42e37a741d4651099225987dc40e7f02a716ad')
-
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+
+  # fix building with glibc-2.14
+  sed -i '1i#define _GNU_SOURCE' util/fusermount.c
+
   ./configure --prefix=/usr --enable-lib \
               --enable-util --bindir=/bin
-  make || return 1
+  make
 }
 
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
-  make DESTDIR=${pkgdir} install || return 1
+  make DESTDIR=${pkgdir} install
 
   # static device nodes will cause collision.
   rm -rf ${pkgdir}/dev
@@ -40,16 +43,19 @@ package() {
   #install -D -m755 ${srcdir}/fuse.rc.d ${pkgdir}/etc/rc.d/fuse
 
   install -d ${pkgdir}/lib
-  mv ${pkgdir}/usr/lib/libfuse.so.${pkgver} ${pkgdir}/lib/ || return 1
-  ln -s ../../lib/libfuse.so.${pkgver} ${pkgdir}/usr/lib/libfuse.so.${pkgver} || return 1
-  ln -s libfuse.so.${pkgver} ${pkgdir}/lib/libfuse.so.2 || return 1
-  mv ${pkgdir}/usr/lib/libulockmgr.so.1.0.1 ${pkgdir}/lib/ || return 1
-  ln -s ../../lib/libulockmgr.so.1.0.1 ${pkgdir}/usr/lib/libulockmgr.so.1.0.1 || return 1
-  ln -s libulockmgr.so.1.0.1 ${pkgdir}/lib/libulockmgr.so.1 || return 1
+  mv ${pkgdir}/usr/lib/libfuse.so.${pkgver} ${pkgdir}/lib/
+  ln -s ../../lib/libfuse.so.${pkgver} ${pkgdir}/usr/lib/libfuse.so.${pkgver}
+  ln -s libfuse.so.${pkgver} ${pkgdir}/lib/libfuse.so.2
+  mv ${pkgdir}/usr/lib/libulockmgr.so.1.0.1 ${pkgdir}/lib/
+  ln -s ../../lib/libulockmgr.so.1.0.1 ${pkgdir}/usr/lib/libulockmgr.so.1.0.1
+  ln -s libulockmgr.so.1.0.1 ${pkgdir}/lib/libulockmgr.so.1
 
   # install sample config file
-  install -Dm644 ${srcdir}/fuse.conf ${pkgdir}/etc/fuse.conf || return 1
+  install -Dm644 ${srcdir}/fuse.conf ${pkgdir}/etc/fuse.conf
   # Fix udev rule location
   install -d -m755 "${pkgdir}/lib"
   mv "${pkgdir}/etc/udev" "${pkgdir}/lib/"
+
+  # remove udev rules (should already be in udev package}
+  rm -f ${pkgdir}/lib/udev/rules.d/99-fuse.rules
 }
diff --git a/extra/fuse/fuse.install b/extra/fuse/fuse.install
index 595ac7c12..f186d64c7 100644
--- a/extra/fuse/fuse.install
+++ b/extra/fuse/fuse.install
@@ -8,7 +8,3 @@ post_install() {
  -> For a static /dev, run: mknod /dev/fuse -m 0666 c 10 229
 EOM
 }
-
-op=$1
-shift
-$op $*
diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD
index 29df3c452..6277b3d20 100644
--- a/extra/maxima/PKGBUILD
+++ b/extra/maxima/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 137078 2011-09-05 23:07:50Z dreisner $
+# $Id: PKGBUILD 141252 2011-10-27 12:55:01Z juergen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Damir Perisa <damir@archlinux.org>
 
 pkgname=maxima
 pkgver=5.24.0
-pkgrel=6
+pkgrel=7
 pkgdesc="Maxima - a sophisticated computer algebra system"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://maxima.sourceforge.net"
-depends=('sbcl=1.0.51' 'texinfo' 'sh')
+depends=('sbcl=1.0.52' 'texinfo' 'sh')
 makedepends=('python2')
 optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/bin/rmaxima' 'tk: graphical xmaxima interface')
 # needs rebuild when bash changes version
diff --git a/extra/octave/PKGBUILD b/extra/octave/PKGBUILD
index b88a9edbc..992a398a6 100644
--- a/extra/octave/PKGBUILD
+++ b/extra/octave/PKGBUILD
@@ -1,37 +1,34 @@
-# $Id: PKGBUILD 131750 2011-07-14 12:35:49Z ronald $
+# $Id: PKGBUILD 141254 2011-10-27 14:28:28Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor : shining <shiningxc.at.gmail.com>
 # Contributor : cyberdune <cyberdune@gmail.com>
 
 pkgname=octave
-pkgver=3.4.2
-pkgrel=2
+pkgver=3.4.3
+pkgrel=1
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('i686' 'x86_64')
 url="http://www.octave.org"
 license=('GPL')
 depends=('fftw' 'pcre' 'curl' 'lapack' 'libx11' 'graphicsmagick' 'glpk' 'hdf5' 'gcc-libs' 'qhull')
-makedepends=('texinfo' 'graphicsmagick' 'gcc-fortran' 'umfpack' 'texlive-core')
+makedepends=('texinfo' 'graphicsmagick' 'gcc-fortran' 'umfpack' 'texlive-core' 'fltk')
 optdepends=('texinfo: for help-support in octave'
             'gnuplot: alternative plotting'
-	    'umfpack: LU decomposition of some large sparse matrices')
-source=("ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2" "curlfix.patch")
+	    'umfpack: LU decomposition of some large sparse matrices'
+	    'fltk: alternative plotting')
+source=("ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2")
 options=('!emptydirs')
 install=octave.install
-sha1sums=('12cac29ef7d1ab8374980e1e2fd14637b2f15ba5'
-          '3f856798f5f8aa15bce1200b8abd059154f3d909')
+sha1sums=('fe622c28a38f8730c59e46211bc7b18e7f51a679')
 	
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
-  # remove curl/types.h include
-  patch -Np0 -i ${srcdir}/curlfix.patch
-
   # http://www.nabble.com/Random-rounding-errors-td16010966.html
   FFLAGS="-O -ffloat-store" \
 
   ./configure --prefix=/usr --libexecdir=/usr/lib \
-  --enable-shared --disable-static
+  --enable-shared --disable-static --with-quantum-depth=16
 
   LANG=C make
 }
diff --git a/extra/polkit-gnome/PKGBUILD b/extra/polkit-gnome/PKGBUILD
index 52fb398c3..cbd405df2 100644
--- a/extra/polkit-gnome/PKGBUILD
+++ b/extra/polkit-gnome/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 140948 2011-10-20 05:44:11Z ibiru $
+# $Id: PKGBUILD 141266 2011-10-27 16:27:38Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: onestep_ua <onestep@ukr.net>
 
 pkgname=polkit-gnome
-pkgver=0.104
+pkgver=0.105
 pkgrel=1
 pkgdesc="PolicyKit integration for the GNOME desktop"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ makedepends=('intltool' 'gobject-introspection')
 options=(!libtool)
 source=(http://download.gnome.org/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz
         polkit-gnome-authentication-agent-1.desktop)
-sha256sums=('5a59d47cbc87e3e5ac24e5e28b4fa9fc07d6d0096e53fa53d8e6b3fd06854d94'
+sha256sums=('1784494963b8bf9a00eedc6cd3a2868fb123b8a5e516e66c5eda48df17ab9369'
             'ad19e73ae8eba00a8f66bd9afd3e0e1fd7ca22f716e29b97f097d9c01711e0de')
 
 build() {
diff --git a/extra/r/PKGBUILD b/extra/r/PKGBUILD
index e6b7af9dc..3bccb3bec 100644
--- a/extra/r/PKGBUILD
+++ b/extra/r/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 132100 2011-07-20 07:19:13Z ronald $
+# $Id: PKGBUILD 141249 2011-10-27 10:32:50Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 # Contributor: K. Piche <kpiche@rogers.com>
 
 pkgname=r
-pkgver=2.13.1
+pkgver=2.13.2
 pkgrel=1
 pkgdesc="Language and environment for statistical computing and graphics"
 arch=('i686' 'x86_64')
@@ -20,7 +20,7 @@ source=("http://cran.r-project.org/src/base/R-2/R-${pkgver}.tar.gz"
 	'r.desktop'
 	'r.png')
 install=r.install
-sha1sums=('8b9d48c7a654186064f369652ea34a085eff239b'
+sha1sums=('3c8e3055b2d76cf79627325af8846848ca9a7e90'
           '13aa29219bcaa102e575de8c1c8e0833d233e836'
           'a69a07ec363440efc18ce0a7f2af103375dea978')
 build() {
diff --git a/extra/rest/PKGBUILD b/extra/rest/PKGBUILD
index dd780e748..49c5e4a33 100644
--- a/extra/rest/PKGBUILD
+++ b/extra/rest/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 120404 2011-04-23 20:50:45Z ibiru $
+# $Id: PKGBUILD 141264 2011-10-27 16:23:45Z ibiru $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+
 pkgname=rest
-pkgver=0.7.10
+pkgver=0.7.11
 pkgrel=1
-pkgdesc="rest"
+pkgdesc="A helper library for RESTful services."
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
 license=('GPL2')
 depends=('glib2' 'libxml2' 'libsoup-gnome')
-makedepends=('gobject-introspection' 'gtk-doc')
+makedepends=('gobject-introspection')
 options=('!libtool')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.bz2)
-sha256sums=('2908f974ae6cc71af1152d419209f307bcce8ca2dfe0b4b55b3fad8ba4a646a5')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz)
+sha256sums=('3a57a56433761c87ccdbfe6d57119361dc004286356c12815dc7a22b7b315490')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/ristretto/PKGBUILD b/extra/ristretto/PKGBUILD
index c6c270f50..558a3ed1a 100644
--- a/extra/ristretto/PKGBUILD
+++ b/extra/ristretto/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 141037 2011-10-22 08:22:04Z andyrtr $
+# $Id: PKGBUILD 141238 2011-10-27 04:35:26Z eric $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=ristretto
-pkgver=0.2.0
+pkgver=0.2.1
 pkgrel=1
-pkgdesc="Ristretto is a image viewer for Xfce"
+pkgdesc="An image viewer for Xfce"
 arch=('i686' 'x86_64')
 url="http://goodies.xfce.org/projects/applications/ristretto"
-license=('GPL2')
+license=('GPL')
 depends=('libxfce4ui' 'libexif' 'desktop-file-utils' 'hicolor-icon-theme')
 makedepends=('intltool')
 options=('!libtool')
 groups=('xfce4-goodies')
-source=(http://archive.xfce.org/src/apps/$pkgname/0.2/$pkgname-$pkgver.tar.bz2)
 install=ristretto.install
-md5sums=('85e9b3d83309cdd84898f35b8d223121')
+source=(http://archive.xfce.org/src/apps/$pkgname/0.2/$pkgname-$pkgver.tar.bz2)
+md5sums=('df5c2082013f4ad2fc49cd7c25965741')
 
 build() {
-  cd ${srcdir}/$pkgname-$pkgver
+  cd "${srcdir}/$pkgname-$pkgver"
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--localstatedir=/var \
@@ -27,6 +27,6 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/$pkgname-$pkgver
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/$pkgname-$pkgver"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD
index 5829ea5b4..58b4d824c 100644
--- a/extra/sbcl/PKGBUILD
+++ b/extra/sbcl/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 137076 2011-09-05 23:05:51Z dreisner $
+# $Id: PKGBUILD 141251 2011-10-27 12:54:01Z juergen $
 # Contributor: John Proctor <jproctor@prium.net>
 # Contributor: Daniel White <daniel@whitehouse.id.au>
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Leslie Polzer (skypher)
 
 pkgname=sbcl
-pkgver=1.0.51
+pkgver=1.0.52
 pkgrel=1
 pkgdesc="Steel Bank Common Lisp"
 url="http://www.sbcl.org/"
@@ -17,7 +17,7 @@ makedepends=('sbcl' 'texinfo')
 install=sbcl.install
 source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2"
         "arch-fixes.lisp")
-md5sums=('08032cc777f1236953cb901e24775457'
+md5sums=('e9e186637155184ec662b5a37634b457'
          '7ac0c1936547f4278198b8bf7725204d')
 
 build() {
diff --git a/extra/texmacs/PKGBUILD b/extra/texmacs/PKGBUILD
index ce7c1fbf2..2f70efe32 100644
--- a/extra/texmacs/PKGBUILD
+++ b/extra/texmacs/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 137567 2011-09-09 18:36:00Z ronald $
+# $Id: PKGBUILD 141258 2011-10-27 15:06:09Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=texmacs
-pkgver=1.0.7.12
+pkgver=1.0.7.14
 pkgrel=1
 pkgdesc="Free scientific text editor, inspired by TeX and GNU Emacs. WYSIWYG editor TeX-fonts and CAS-interface (Giac, GTybalt, Macaulay 2, Maxima, Octave, Pari, Qcl, R and Yacas) in one."
 arch=('i686' 'x86_64')
@@ -13,8 +13,8 @@ depends=('perl' 'guile' 'texlive-core' 'python2' 'libxext' 'freetype2')
 # do not remove texlive-core dependency, as it is needed!
 optdepends=('transfig: convert images using fig2ps')
 #source=(ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-${pkgver}-src.tar.gz)
-source=(http://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-1.0.7.12-src.tar.gz)
-sha1sums=('9a6560dc2d8e685b97f4afe468b38d89bd29ca9d')
+source=(http://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${pkgver}-src.tar.gz)
+sha1sums=('5bbe0458d2ab73fa8cea8e12fee788b17b6f279a')
 
 build() {
   cd ${srcdir}/TeXmacs-${pkgver}-src
diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD
index f5dec119a..93565f739 100644
--- a/extra/tracker/PKGBUILD
+++ b/extra/tracker/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 141014 2011-10-21 15:49:31Z heftig $
+# $Id: PKGBUILD 141260 2011-10-27 15:31:43Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 
 pkgbase=tracker
 pkgname=(tracker libtracker-sparql)
-pkgver=0.12.6
+pkgver=0.12.7
 _tver=${pkgver%.*}
 pkgrel=1
 pkgdesc="All-in-one indexer, search tool and metadata database"
@@ -19,7 +19,7 @@ makedepends=('libgee' 'libgnome-keyring' 'upower' 'libexif' 'exempi'
 url="http://www.gnome.org"
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz)
-sha256sums=('4dc5fe0fe97d4095653935969b12c15888e620e5b6ef135331ce7f55af3654b8')
+sha256sums=('e7a4d016326bc0a1b6aea07e48c3de73ffc29119812149e2dee5eac35104f1b4')
 
 build() {
   cd "$srcdir/$pkgbase-$pkgver"
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 034d5abeb..062efe27e 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -8,35 +8,31 @@ pkgbase=linux-libre
 pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock -LIBRE kernel
 # pkgname=linux-custom       # Build kernel with a different name
 _kernelname=${pkgname#linux-libre}
-_basekernel=3.0
-pkgver=${_basekernel}.7
-pkgrel=1
+_basekernel=3.1
+pkgver=${_basekernel}
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl')
 options=('!strip')
 source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-libre/linux-${_basekernel}-libre.tar.xz"
-        "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/patch-${_basekernel}-libre-${pkgver}-libre.xz"
+        # "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/patch-${_basekernel}-libre-${pkgver}-libre.xz"
         # the main kernel config files
         'config.i686' 'config.x86_64'
         # standard config files for mkinitcpio ramdisk
         "${pkgname}.preset"
         'boot-logo.patch'
-        'fix-i915.patch'
         'change-default-console-loglevel.patch')
 
 build() {
   cd "${srcdir}/linux-${_basekernel}"
 
-  patch -Np1 -i "${srcdir}/patch-${_basekernel}-libre-${pkgver}-libre"
+#  patch -Np1 -i "${srcdir}/patch-${_basekernel}-libre-${pkgver}-libre"
 
   # Add freedo as boot logo
   patch -Np1 -i "${srcdir}/boot-logo.patch"
 
-  # fix #19234 i1915 display size
-  patch -Np1 -i "${srcdir}/fix-i915.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)
@@ -48,14 +44,8 @@ build() {
     sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config
   fi
 
-  # remove the "-libre" extraversion from Makefile
-  sed -i 's|^EXTRAVERSION =.*$|EXTRAVERSION =|g' Makefile
-
-  # remove the sublevel from Makefile
-  # this ensures our kernel version is always 3.X-LIBRE
-  # this way, minor kernel updates will not break external modules
-  # we need to change this soon, see FS#16702
-  sed -ri 's|^(SUBLEVEL =).*|\1|' Makefile
+  # set extraversion to pkgrel
+  sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile
 
   # get kernel version
   make prepare
@@ -124,8 +114,13 @@ package_linux-libre() {
   rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build}
   # remove the firmware
   rm -rf "${pkgdir}/lib/firmware"
-  # gzip -9 all modules to safe 100MB of space
+  # gzip -9 all modules to save 100MB of space
   find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
+  # make room for external modules
+  ln -s "../extramodules-${_basekernel}${_kernelname:--LIBRE}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
+  # add real version for building modules and running depmod from post_install/upgrade
+  mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE}"
+  echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE}/version"
 }
 
 package_linux-libre-headers() {
@@ -268,7 +263,7 @@ package_linux-libre-docs() {
   cd "${srcdir}/linux-${_basekernel}"
 
   mkdir -p "${pkgdir}/usr/src/linux-${_kernver}"
-  cp -r Documentation "${pkgdir}/usr/src/linux-${_kernver}"
+  cp -al Documentation "${pkgdir}/usr/src/linux-${_kernver}"
   find "${pkgdir}" -type f -exec chmod 444 {} \;
   find "${pkgdir}" -type d -exec chmod 755 {} \;
 
@@ -283,3 +278,10 @@ md5sums=('44e7bc20c235a193f9b6123a8d5e9509'
          '04b21c79df0a952c22d681dd4f4562df'
          '263725f20c0b9eb9c353040792d644e5'
          '9d3c56a4b999c8bfbd4018089a62f662')
+
+md5sums=('d73df15ab1d36fe3c102755d8f42117f'
+         'a7cbd8c216a1f4c6068625c4dc746164'
+         '616e05f7436572a7e83500b5daa7e958'
+         'a8a3843046926eb7ab81312cd438c5c5'
+         '04b21c79df0a952c22d681dd4f4562df'
+         '9d3c56a4b999c8bfbd4018089a62f662')
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index 4cc6d10cc..86fe20b40 100644
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -1,6 +1,6 @@
 #
-# Automatically generated make config: don't edit
-# Linux/i386 3.0 Kernel Configuration
+# Automatically generated file; DO NOT EDIT.
+# Linux/i386 3.1.0 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -164,6 +164,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
@@ -210,6 +211,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
@@ -223,12 +225,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 is not set
 # CONFIG_BLK_DEV_INTEGRITY is not set
 CONFIG_BLK_DEV_THROTTLING=y
 
@@ -291,6 +294,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_PRIVILEGED_GUEST is not set
 CONFIG_KVM_CLOCK=y
 CONFIG_KVM_GUEST=y
@@ -330,6 +334,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
@@ -354,7 +359,6 @@ CONFIG_HPET_TIMER=y
 CONFIG_HPET_EMULATE_RTC=y
 CONFIG_DMI=y
 # CONFIG_IOMMU_HELPER is not set
-CONFIG_IOMMU_API=y
 CONFIG_NR_CPUS=8
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
@@ -362,6 +366,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
@@ -469,10 +474,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
@@ -491,11 +496,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
@@ -511,7 +517,7 @@ CONFIG_APM_DO_ENABLE=y
 # CPU Frequency scaling
 #
 CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_TABLE=y
+CONFIG_CPU_FREQ_TABLE=m
 CONFIG_CPU_FREQ_STAT=m
 CONFIG_CPU_FREQ_STAT_DETAILS=y
 CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
@@ -568,9 +574,6 @@ CONFIG_PCI_MMCONFIG=y
 CONFIG_PCI_OLPC=y
 CONFIG_PCI_DOMAINS=y
 # CONFIG_PCI_CNB20LE_QUIRK is not set
-CONFIG_DMAR=y
-# CONFIG_DMAR_DEFAULT_ON is not set
-CONFIG_DMAR_FLOPPY_WA=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_HOTPLUG_PCI_PCIE=m
 CONFIG_PCIEAER=y
@@ -593,7 +596,10 @@ CONFIG_ISA=y
 # CONFIG_MCA is not set
 # CONFIG_SCx200 is not set
 CONFIG_OLPC=y
-CONFIG_OLPC_XO1=m
+CONFIG_OLPC_XO1_PM=y
+CONFIG_OLPC_XO1_RTC=y
+CONFIG_OLPC_XO1_SCI=y
+CONFIG_OLPC_XO15_SCI=y
 CONFIG_AMD_NB=y
 CONFIG_PCCARD=m
 CONFIG_PCMCIA=m
@@ -854,6 +860,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
@@ -1245,6 +1252,13 @@ CONFIG_CAIF=m
 CONFIG_CAIF_NETDEV=m
 CONFIG_CEPH_LIB=m
 # CONFIG_CEPH_LIB_PRETTYDEBUG is not set
+CONFIG_NFC=m
+
+#
+# Near Field Communication (NFC) devices
+#
+CONFIG_PN544_NFC=m
+CONFIG_NFC_PN533=m
 
 #
 # Device Drivers
@@ -1264,6 +1278,8 @@ CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
+CONFIG_REGMAP=y
+CONFIG_REGMAP_I2C=m
 CONFIG_CONNECTOR=m
 CONFIG_MTD=m
 # CONFIG_MTD_DEBUG is not set
@@ -1410,6 +1426,7 @@ CONFIG_OF_NET=y
 CONFIG_OF_SPI=y
 CONFIG_OF_MDIO=m
 CONFIG_OF_PCI=y
+CONFIG_OF_PCI_IRQ=y
 CONFIG_PARPORT=m
 CONFIG_PARPORT_PC=m
 CONFIG_PARPORT_SERIAL=m
@@ -1440,6 +1457,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
@@ -1488,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
 
@@ -1499,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
@@ -1512,89 +1532,7 @@ CONFIG_IWMC3200TOP=m
 CONFIG_TI_ST=m
 CONFIG_SENSORS_LIS3_I2C=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
@@ -1671,6 +1609,7 @@ 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_DPT_I2O=m
 CONFIG_SCSI_ADVANSYS=m
 CONFIG_SCSI_IN2000=m
@@ -1888,8 +1827,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
@@ -2067,6 +2006,7 @@ CONFIG_R8169=m
 CONFIG_SIS190=m
 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
@@ -2153,10 +2093,13 @@ CONFIG_CARL9170=m
 CONFIG_CARL9170_LEDS=y
 CONFIG_CARL9170_WPC=y
 CONFIG_B43=m
+CONFIG_B43_BCMA=y
+CONFIG_B43_SSB=y
 CONFIG_B43_PCI_AUTOSELECT=y
 CONFIG_B43_PCICORE_AUTOSELECT=y
 CONFIG_B43_PCMCIA=y
 CONFIG_B43_SDIO=y
+CONFIG_B43_BCMA_PIO=y
 CONFIG_B43_PIO=y
 CONFIG_B43_PHY_N=y
 CONFIG_B43_PHY_LP=y
@@ -2260,6 +2203,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
@@ -2372,6 +2316,7 @@ CONFIG_IEEE802154_FAKEHARD=m
 CONFIG_CAIF_TTY=m
 CONFIG_CAIF_SPI_SLAVE=m
 CONFIG_CAIF_SPI_SYNC=y
+CONFIG_CAIF_HSI=m
 CONFIG_RIONET=m
 CONFIG_RIONET_TX_SIZE=128
 CONFIG_RIONET_RX_SIZE=128
@@ -2713,12 +2658,16 @@ CONFIG_INPUT_AD714X=m
 CONFIG_INPUT_AD714X_I2C=m
 CONFIG_INPUT_AD714X_SPI=m
 CONFIG_INPUT_PCSPKR=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
@@ -2988,13 +2937,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
@@ -3006,13 +2955,14 @@ 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
 
 #
 # PCI GPIO expanders:
 #
-CONFIG_GPIO_CS5535=m
+CONFIG_GPIO_CS5535=y
 CONFIG_GPIO_LANGWELL=y
 CONFIG_GPIO_PCH=m
 CONFIG_GPIO_ML_IOH=m
@@ -3144,18 +3094,22 @@ 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_MAX16064=m
 CONFIG_SENSORS_MAX34440=m
 CONFIG_SENSORS_MAX8688=m
@@ -3172,7 +3126,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
@@ -3207,6 +3163,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
 
 #
@@ -3292,6 +3249,7 @@ CONFIG_BCMA_POSSIBLE=y
 # Broadcom specific AMBA
 #
 CONFIG_BCMA=m
+CONFIG_BCMA_BLOCKIO=y
 CONFIG_BCMA_HOST_PCI_POSSIBLE=y
 CONFIG_BCMA_HOST_PCI=y
 # CONFIG_BCMA_DEBUG is not set
@@ -3304,6 +3262,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
@@ -3348,6 +3308,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
@@ -3362,6 +3323,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
 
 #
@@ -3378,6 +3340,7 @@ 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_IR_ENE=m
 CONFIG_IR_IMON=m
@@ -3406,6 +3369,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
@@ -3424,6 +3388,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
@@ -3502,6 +3467,11 @@ CONFIG_VIDEO_MT9V032=m
 CONFIG_VIDEO_TCM825X=m
 
 #
+# Flash devices
+#
+CONFIG_VIDEO_ADP1653=m
+
+#
 # Video improvement chips
 #
 CONFIG_VIDEO_UPD64031A=m
@@ -3567,6 +3537,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
@@ -3595,6 +3566,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
@@ -3626,6 +3598,7 @@ 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
@@ -3782,6 +3755,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
@@ -3795,6 +3773,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
@@ -4033,6 +4017,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
@@ -4074,7 +4059,7 @@ CONFIG_FONT_8x16=y
 # CONFIG_FONT_SUN8x16 is not set
 # CONFIG_FONT_SUN12x22 is not set
 # CONFIG_FONT_10x18 is not set
-CONFIG_LOGO=y
+# CONFIG_LOGO is not set
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE=y
 # CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
@@ -4159,6 +4144,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
@@ -4208,8 +4194,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
@@ -4217,6 +4203,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
@@ -4224,6 +4211,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
@@ -4305,6 +4293,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
@@ -4342,6 +4332,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
@@ -4352,6 +4343,7 @@ 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
@@ -4547,20 +4539,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_FUSB300=m
+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_LANGWELL=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
@@ -4618,7 +4610,6 @@ CONFIG_SDIO_UART=m
 CONFIG_MMC_SDHCI=m
 CONFIG_MMC_SDHCI_PCI=m
 CONFIG_MMC_RICOH_MMC=y
-CONFIG_MMC_SDHCI_OF=m
 CONFIG_MMC_SDHCI_PLTFM=m
 CONFIG_MMC_WBSD=m
 CONFIG_MMC_TIFM_SD=m
@@ -4650,12 +4641,9 @@ CONFIG_LEDS_CLASS=y
 #
 CONFIG_LEDS_LM3530=m
 CONFIG_LEDS_NET5501=m
-CONFIG_LEDS_ALIX2=m
 CONFIG_LEDS_PCA9532=m
 CONFIG_LEDS_PCA9532_GPIO=y
 CONFIG_LEDS_GPIO=m
-CONFIG_LEDS_GPIO_PLATFORM=y
-CONFIG_LEDS_GPIO_OF=y
 CONFIG_LEDS_LP3944=m
 CONFIG_LEDS_LP5521=m
 CONFIG_LEDS_LP5523=m
@@ -4675,7 +4663,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
@@ -4684,8 +4671,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
@@ -4824,11 +4809,15 @@ 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_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
@@ -4941,6 +4930,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
@@ -5033,7 +5023,6 @@ 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
@@ -5043,6 +5032,7 @@ CONFIG_WLAGS49_H25=m
 CONFIG_FB_SM7XX=m
 CONFIG_VIDEO_DT3155=m
 CONFIG_DT3155_CCIR=y
+CONFIG_DT3155_STREAMING=y
 CONFIG_CRYSTALHD=m
 CONFIG_FB_XGI=m
 CONFIG_LIRC_STAGING=y
@@ -5057,12 +5047,9 @@ 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
@@ -5109,10 +5096,9 @@ 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_DRM_PSB_MRST=y
+CONFIG_DRM_PSB_MFLD=y
+CONFIG_DRM_PSB_CDV=y
 CONFIG_ALTERA_STAPL=m
 CONFIG_INTEL_MEI=m
 CONFIG_X86_PLATFORM_DEVICES=y
@@ -5160,7 +5146,17 @@ CONFIG_XO15_EBOOK=m
 CONFIG_SAMSUNG_LAPTOP=m
 CONFIG_MXM_WMI=m
 CONFIG_INTEL_OAKTRAIL=m
+CONFIG_SAMSUNG_Q10=m
 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=y
+# CONFIG_DMAR_DEFAULT_ON is not set
+CONFIG_DMAR_FLOPPY_WA=y
+CONFIG_VIRT_DRIVERS=y
 
 #
 # Firmware Drivers
@@ -5326,6 +5322,7 @@ 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_EMBEDDED is not set
@@ -5341,6 +5338,7 @@ CONFIG_PSTORE=y
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
 # CONFIG_UFS_DEBUG is not set
+CONFIG_ORE=m
 CONFIG_EXOFS_FS=m
 # CONFIG_EXOFS_DEBUG is not set
 CONFIG_NETWORK_FILESYSTEMS=y
@@ -5354,7 +5352,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
@@ -5503,7 +5500,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
@@ -5631,6 +5628,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
@@ -5776,10 +5778,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
 
 #
@@ -5795,6 +5793,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
@@ -5814,6 +5813,7 @@ 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
@@ -5829,3 +5829,5 @@ CONFIG_CPU_RMAP=y
 CONFIG_NLATTR=y
 CONFIG_LRU_CACHE=m
 CONFIG_AVERAGE=y
+CONFIG_CORDIC=m
+CONFIG_LLIST=y
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index de4d3a424..4ec38fd52 100644
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -1,6 +1,6 @@
 #
-# Automatically generated make config: don't edit
-# Linux/x86_64 3.0 Kernel Configuration
+# Automatically generated file; DO NOT EDIT.
+# Linux/x86_64 3.1.0 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
@@ -165,6 +166,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 +213,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 +227,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 is not set
 # CONFIG_BLK_DEV_INTEGRITY is not set
 CONFIG_BLK_DEV_THROTTLING=y
 CONFIG_BLOCK_COMPAT=y
@@ -290,6 +294,7 @@ CONFIG_X86_MPPARSE=y
 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
@@ -314,6 +319,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 +337,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 +347,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
@@ -457,10 +461,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 +485,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 +545,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
@@ -822,6 +823,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
@@ -1210,6 +1212,13 @@ CONFIG_CAIF=m
 CONFIG_CAIF_NETDEV=m
 CONFIG_CEPH_LIB=m
 # CONFIG_CEPH_LIB_PRETTYDEBUG is not set
+CONFIG_NFC=m
+
+#
+# Near Field Communication (NFC) devices
+#
+CONFIG_PN544_NFC=m
+CONFIG_NFC_PN533=m
 
 #
 # Device Drivers
@@ -1229,6 +1238,8 @@ CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 CONFIG_SYS_HYPERVISOR=y
+CONFIG_REGMAP=y
+CONFIG_REGMAP_I2C=m
 CONFIG_CONNECTOR=m
 CONFIG_MTD=m
 # CONFIG_MTD_DEBUG is not set
@@ -1383,6 +1394,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
@@ -1433,6 +1445,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
 
@@ -1444,6 +1457,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
@@ -1457,72 +1471,7 @@ CONFIG_IWMC3200TOP=m
 CONFIG_TI_ST=m
 CONFIG_SENSORS_LIS3_I2C=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
@@ -1596,6 +1545,7 @@ 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_DPT_I2O=m
 CONFIG_SCSI_ADVANSYS=m
 CONFIG_SCSI_ARCMSR=m
@@ -1791,8 +1741,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
@@ -1940,6 +1890,7 @@ CONFIG_R8169=m
 CONFIG_SIS190=m
 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
@@ -2026,10 +1977,13 @@ CONFIG_CARL9170=m
 CONFIG_CARL9170_LEDS=y
 CONFIG_CARL9170_WPC=y
 CONFIG_B43=m
+CONFIG_B43_BCMA=y
+CONFIG_B43_SSB=y
 CONFIG_B43_PCI_AUTOSELECT=y
 CONFIG_B43_PCICORE_AUTOSELECT=y
 CONFIG_B43_PCMCIA=y
 CONFIG_B43_SDIO=y
+CONFIG_B43_BCMA_PIO=y
 CONFIG_B43_PIO=y
 CONFIG_B43_PHY_N=y
 CONFIG_B43_PHY_LP=y
@@ -2133,6 +2087,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
@@ -2245,6 +2200,7 @@ CONFIG_IEEE802154_FAKEHARD=m
 CONFIG_CAIF_TTY=m
 CONFIG_CAIF_SPI_SLAVE=m
 CONFIG_CAIF_SPI_SYNC=y
+CONFIG_CAIF_HSI=m
 CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_RIONET=m
@@ -2566,11 +2522,15 @@ CONFIG_INPUT_AD714X=m
 CONFIG_INPUT_AD714X_I2C=m
 CONFIG_INPUT_AD714X_SPI=m
 CONFIG_INPUT_PCSPKR=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
@@ -2833,13 +2793,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
@@ -2851,6 +2811,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
 
@@ -2988,18 +2949,22 @@ 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_MAX16064=m
 CONFIG_SENSORS_MAX34440=m
 CONFIG_SENSORS_MAX8688=m
@@ -3016,7 +2981,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
@@ -3051,6 +3018,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
 
 #
@@ -3129,6 +3097,7 @@ CONFIG_BCMA_POSSIBLE=y
 # Broadcom specific AMBA
 #
 CONFIG_BCMA=m
+CONFIG_BCMA_BLOCKIO=y
 CONFIG_BCMA_HOST_PCI_POSSIBLE=y
 CONFIG_BCMA_HOST_PCI=y
 # CONFIG_BCMA_DEBUG is not set
@@ -3141,6 +3110,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
@@ -3185,6 +3156,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
@@ -3199,6 +3171,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
 
 #
@@ -3215,6 +3188,7 @@ 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_IR_ENE=m
 CONFIG_IR_IMON=m
@@ -3243,6 +3217,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
@@ -3261,6 +3236,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
@@ -3339,6 +3315,11 @@ CONFIG_VIDEO_MT9V032=m
 CONFIG_VIDEO_TCM825X=m
 
 #
+# Flash devices
+#
+CONFIG_VIDEO_ADP1653=m
+
+#
 # Video improvement chips
 #
 CONFIG_VIDEO_UPD64031A=m
@@ -3403,6 +3384,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
@@ -3431,6 +3413,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
@@ -3462,6 +3445,7 @@ 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
@@ -3606,6 +3590,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
@@ -3619,6 +3608,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
@@ -3850,6 +3845,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,7 +3886,7 @@ CONFIG_FONT_8x16=y
 # CONFIG_FONT_SUN8x16 is not set
 # CONFIG_FONT_SUN12x22 is not set
 # CONFIG_FONT_10x18 is not set
-CONFIG_LOGO=y
+# CONFIG_LOGO is not set
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE=y
 # CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
@@ -3939,6 +3935,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
@@ -3988,8 +3985,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
@@ -3997,6 +3994,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
@@ -4004,6 +4002,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
@@ -4084,6 +4083,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
@@ -4121,6 +4122,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
@@ -4131,6 +4133,7 @@ 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
@@ -4326,20 +4329,18 @@ 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_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
@@ -4433,7 +4434,6 @@ CONFIG_LEDS_ALIX2=m
 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
@@ -4453,7 +4453,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
@@ -4462,8 +4461,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
@@ -4599,11 +4596,21 @@ 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
 
 #
 # 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
@@ -4615,11 +4622,9 @@ 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
@@ -4690,6 +4695,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
@@ -4788,6 +4794,7 @@ CONFIG_WLAGS49_H25=m
 CONFIG_FB_SM7XX=m
 CONFIG_VIDEO_DT3155=m
 CONFIG_DT3155_CCIR=y
+CONFIG_DT3155_STREAMING=y
 CONFIG_CRYSTALHD=m
 CONFIG_FB_XGI=m
 CONFIG_LIRC_STAGING=y
@@ -4802,12 +4809,9 @@ 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
@@ -4854,10 +4858,9 @@ 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_DRM_PSB_MRST=y
+CONFIG_DRM_PSB_MFLD=y
+CONFIG_DRM_PSB_CDV=y
 CONFIG_ALTERA_STAPL=m
 CONFIG_INTEL_MEI=m
 CONFIG_X86_PLATFORM_DEVICES=y
@@ -4903,6 +4906,19 @@ CONFIG_XO15_EBOOK=m
 CONFIG_SAMSUNG_LAPTOP=m
 CONFIG_MXM_WMI=m
 CONFIG_INTEL_OAKTRAIL=m
+CONFIG_SAMSUNG_Q10=m
+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=y
+# CONFIG_DMAR_DEFAULT_ON is not set
+CONFIG_DMAR_FLOPPY_WA=y
+# CONFIG_INTR_REMAP is not set
+CONFIG_VIRT_DRIVERS=y
 
 #
 # Firmware Drivers
@@ -5069,6 +5085,7 @@ 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_EMBEDDED is not set
@@ -5084,6 +5101,7 @@ CONFIG_PSTORE=y
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
 # CONFIG_UFS_DEBUG is not set
+CONFIG_ORE=m
 CONFIG_EXOFS_FS=m
 # CONFIG_EXOFS_DEBUG is not set
 CONFIG_NETWORK_FILESYSTEMS=y
@@ -5097,7 +5115,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
@@ -5245,7 +5262,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
@@ -5372,6 +5389,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
@@ -5516,10 +5538,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
 
 #
@@ -5535,6 +5553,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
@@ -5553,6 +5572,7 @@ 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
@@ -5568,3 +5588,5 @@ CONFIG_CPU_RMAP=y
 CONFIG_NLATTR=y
 CONFIG_LRU_CACHE=m
 CONFIG_AVERAGE=y
+CONFIG_CORDIC=m
+CONFIG_LLIST=y
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 6f7ae815a..493a6e3a7 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=
-KERNEL_VERSION=3.0-LIBRE
+KERNEL_VERSION=3.1.0-2-LIBRE
 
 post_install () {
   # updating module dependencies
diff --git a/social/strongswan/PKGBUILD b/social/strongswan/PKGBUILD
new file mode 100644
index 000000000..8c5e42885
--- /dev/null
+++ b/social/strongswan/PKGBUILD
@@ -0,0 +1,50 @@
+# Contributor: Jason Begley <jayray at digitalgoat dot com>
+# Contributor: Ray Kohler <ataraxia937 at gmail dot com>
+# Maintainer: Daniel Riedemann <daniel.riedemann [at] googlemail [dot] com>
+# Maintainer: Dhruv Desai <svenskaparadox [at] gmail dot com>
+
+pkgname=strongswan
+pkgver=4.5.3
+pkgrel=1
+pkgdesc="open source IPsec implementation"
+url='http://www.strongswan.org'
+license=("GPL")
+arch=('i686' 'x86_64')
+depends=('curl' 'gmp' 'iproute2' 'openssl' 'sqlite3' 'networkmanager')
+conflicts=('openswan')
+options=(!libtool)
+backup=(etc/ipsec.conf etc/strongswan.conf)
+source=(http://download.strongswan.org/${pkgname}-${pkgver}.tar.bz2
+        strongswan.rc)
+md5sums=('ee7c50a90c91307b111e8085f2479890'
+         '667ea2367cbe07c57721696e6b7e39df')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver} 
+
+  ./configure  	--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
+        --with-ipsecdir=/usr/lib/strongswan \
+		--enable-sqlite --enable-smartcard --enable-cisco-quirks \
+		--enable-openssl --enable-nm --enable-curl \
+		--enable-sql --enable-attr-sql \
+		--enable-farp --enable-dhcp \
+		--enable-eap-sim --enable-eap-sim-file --enable-eap-simaka-pseudonym \
+		--enable-eap-simaka-reauth --enable-eap-identity --enable-eap-md5 \
+		--enable-eap-gtc --enable-eap-aka --enable-eap-aka-3gpp2 \
+		--enable-eap-mschapv2 --enable-eap-radius \
+		--enable-ha \
+		--disable-mysql --disable-ldap \
+		--disable-static --enable-shared 
+
+  make 
+}
+
+package(){
+  cd ${srcdir}/${pkgname}-${pkgver} 
+  make DESTDIR=${pkgdir} install 
+
+  install -d ${pkgdir}/etc/rc.d 
+  ln -s /usr/sbin/ipsec ${pkgdir}/etc/rc.d/ipsec 
+  install -Dm755 ${srcdir}/strongswan.rc ${pkgdir}/etc/rc.d/strongswan 
+}
+
diff --git a/social/strongswan/strongswan.rc b/social/strongswan/strongswan.rc
new file mode 100755
index 000000000..58c99c092
--- /dev/null
+++ b/social/strongswan/strongswan.rc
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+case "$1" in
+  start)
+    stat_busy "Starting strongSwan IPsec"
+    /usr/sbin/ipsec start
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      stat_done
+      add_daemon strongswan
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping strongSwan IPsec"
+    /usr/sbin/ipsec stop
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      stat_done
+      rm_daemon strongswan
+    fi
+    ;;
+  restart)
+    stat_busy "Restarting strongSwan IPsec"
+    /usr/sbin/ipsec restart
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      stat_done
+      add_daemon strongswan
+    fi
+    ;;
+  status)
+    /usr/sbin/ipsec status
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart|status}"  
+esac
+
diff --git a/testing/gcc/PKGBUILD b/testing/gcc/PKGBUILD
new file mode 100644
index 000000000..dfe8b0e92
--- /dev/null
+++ b/testing/gcc/PKGBUILD
@@ -0,0 +1,254 @@
+# $Id: PKGBUILD 141273 2011-10-28 00:55:51Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+
+# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
+# NOTE: libtool requires rebuilt with each new gcc version
+
+pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go')
+pkgver=4.6.2
+pkgrel=1
+#_snapshot=4.6-20110819
+_libstdcppmanver=20110814		# Note: check source directory name when updating this
+pkgdesc="The GNU Compiler Collection"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL' 'custom')
+url="http://gcc.gnu.org"
+makedepends=('binutils>=2.21-9' 'libmpc' 'cloog' 'ppl' 'gcc-ada')
+checkdepends=('dejagnu')
+options=('!libtool' '!emptydirs')
+source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
+	#ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
+	ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2
+	gcc_pure64.patch
+	gcc-hash-style-both.patch)
+md5sums=('028115c4fbfb6cfd75d6369f4a90d87e'
+         'ce920d2550ff7e042b9f091d27764d8f'
+         '4030ee1c08dd1e843c0225b772360e76'
+         '4df25b623799b148a0703eaeec8fdf3f')
+
+if [ -n "${_snapshot}" ]; then
+  _basedir="${srcdir}/gcc-${_snapshot}"
+else
+  _basedir="${srcdir}/gcc-${pkgver}"
+fi
+
+build() {
+  cd ${_basedir}
+
+  # Do not install libiberty
+  sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
+
+  # Do not run fixincludes
+  sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
+
+  if [ "${CARCH}" = "x86_64" ]; then
+    patch -Np1 -i ${srcdir}/gcc_pure64.patch
+  fi
+  patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch
+
+  echo ${pkgver} > gcc/BASE-VER
+
+  cd ${srcdir}
+  mkdir gcc-build && cd gcc-build
+
+  ${_basedir}/configure --prefix=/usr \
+      --libdir=/usr/lib --libexecdir=/usr/lib \
+      --mandir=/usr/share/man --infodir=/usr/share/info \
+      --with-bugurl=https://bugs.archlinux.org/ \
+      --enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ \
+      --enable-shared --enable-threads=posix \
+      --with-system-zlib --enable-__cxa_atexit \
+      --disable-libunwind-exceptions --enable-clocale=gnu \
+      --enable-gnu-unique-object --enable-linker-build-id \
+      --with-ppl --enable-cloog-backend=isl \
+      --enable-lto --enable-gold --enable-ld=default \
+      --enable-plugin --with-plugin-ld=ld.gold \
+      --disable-multilib --disable-libssp --disable-libstdcxx-pch \
+      --enable-checking=release
+  make
+}
+
+check() {
+  cd gcc-build
+
+  # increase stack size to prevent test failures
+  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827
+  ulimit -s 32768
+
+  # do not abort on error as some are "expected"
+  make -k check || true
+  ${_basedir}/contrib/test_summary
+}
+
+package_gcc-libs()
+{
+  pkgdesc="Runtime libraries shipped by GCC"
+  groups=('base')
+  depends=('glibc>=2.14')
+  install=gcc-libs.install
+
+  cd gcc-build
+  make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared
+  for lib in libmudflap libgomp libstdc++-v3/src; do
+    make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
+  done
+  make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install
+  make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info
+
+  make -j1 DESTDIR=${pkgdir} install-target-libquadmath  
+  make -j1 DESTDIR=${pkgdir} install-target-libgfortran
+  make -j1 DESTDIR=${pkgdir} install-target-libobjc
+
+  # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc}
+  rm -rf ${pkgdir}/usr/lib/{gcc/,libgfortran.spec}
+
+  # remove static libraries
+  find ${pkgdir} -name *.a -delete
+  
+  # Install Runtime Library Exception
+  install -Dm644 ${_basedir}/COPYING.RUNTIME \
+    ${pkgdir}/usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION
+}
+
+package_gcc()
+{
+  pkgdesc="The GNU Compiler Collection - C and C++ frontends"
+  depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.21.1' 'libmpc' 'cloog' 'ppl')
+  groups=('base-devel')
+  install=gcc.install
+
+  cd gcc-build
+  
+  # unfortunately it is much, much easier to install the lot and clean-up the mess...
+  make -j1 DESTDIR=${pkgdir} install
+  rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*}
+  rm $pkgdir/usr/lib/*.so*
+  rm $pkgdir/usr/lib/lib{ffi,gfortran,go{,begin},objc,quadmath}.a
+  rm $pkgdir/usr/lib/libgfortran.spec
+  rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc}
+  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h}
+  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1,libgfortranbegin.a}
+  rm -r $pkgdir/usr/lib/go
+  rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath}.info
+  rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo
+  rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1
+  rm $pkgdir/usr/share/man/man3/ffi*
+
+  # many packages require these symlinks
+  install -dm755 ${pkgdir}/lib
+  ln -sf /usr/bin/cpp ${pkgdir}/lib/cpp
+  ln -sf gcc ${pkgdir}/usr/bin/cc
+  ln -sf g++ ${pkgdir}/usr/bin/c++
+
+  # install gengtype for plugin support
+  install -m755 gcc/build/gengtype $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/
+  install -m644 gcc/gtype.state $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/
+
+  # POSIX conformance launcher scripts for c89 and c99
+  cat > $pkgdir/usr/bin/c89 <<"EOF"
+#!/bin/sh
+fl="-std=c89"
+for opt; do
+  case "$opt" in
+    -ansi|-std=c89|-std=iso9899:1990) fl="";;
+    -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2
+	    exit 1;;
+  esac
+done
+exec gcc $fl ${1+"$@"}
+EOF
+
+  cat > $pkgdir/usr/bin/c99 <<"EOF"
+#!/bin/sh
+fl="-std=c99"
+for opt; do
+  case "$opt" in
+    -std=c99|-std=iso9899:1999) fl="";;
+    -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2
+	    exit 1;;
+  esac
+done
+exec gcc $fl ${1+"$@"}
+EOF
+
+  chmod 755 $pkgdir/usr/bin/c{8,9}9
+
+  # install the libstdc++ man pages
+  install -dm755 ${pkgdir}/usr/share/man/man3
+  install -m644 ${srcdir}/man/man3/* ${pkgdir}/usr/share/man/man3/
+
+  # Install Runtime Library Exception
+  install -Dm644 ${_basedir}/COPYING.RUNTIME \
+    ${pkgdir}/usr/share/licenses/gcc/RUNTIME.LIBRARY.EXCEPTION
+}
+
+package_gcc-fortran()
+{
+  pkgdesc="Fortran front-end for GCC"
+  depends=("gcc=$pkgver-$pkgrel")
+  install=gcc-fortran.install
+
+  cd gcc-build
+  make -j1 DESTDIR=${pkgdir} install-target-libquadmath
+  make -j1 DESTDIR=$pkgdir install-target-libgfortran
+  make -j1 -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS
+  make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info}
+  install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951
+  
+  # remove libraries included in gcc-libs
+  rm ${pkgdir}/usr/lib/lib{gfortran,quadmath}.so*
+  rm ${pkgdir}/usr/share/info/libquadmath.info
+  
+  # Install Runtime Library Exception
+  install -Dm644 ${_basedir}/COPYING.RUNTIME \
+    ${pkgdir}/usr/share/licenses/gcc-fortran/RUNTIME.LIBRARY.EXCEPTION
+}
+
+package_gcc-objc()
+{
+  pkgdesc="Objective-C front-end for GCC"
+  depends=("gcc=$pkgver-$pkgrel")
+
+  cd gcc-build
+  make -j1 DESTDIR=$pkgdir install-target-libobjc
+  install -dm755 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
+  install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
+
+  # remove libraries included in gcc-libs
+  rm ${pkgdir}/usr/lib/libobjc.so*
+
+  # Install Runtime Library Exception
+  install -Dm644 ${_basedir}/COPYING.RUNTIME \
+    ${pkgdir}/usr/share/licenses/gcc-objc/RUNTIME.LIBRARY.EXCEPTION
+}
+
+package_gcc-ada()
+{
+  pkgdesc="Ada front-end for GCC (GNAT)"
+  depends=("gcc=$pkgver-$pkgrel")
+  install=gcc-ada.install
+
+  cd gcc-build/gcc
+  make -j1 DESTDIR=$pkgdir ada.install-{common,info}
+  install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver
+  
+  # Install Runtime Library Exception
+  install -Dm644 ${_basedir}/COPYING.RUNTIME \
+    ${pkgdir}/usr/share/licenses/gcc-ada/RUNTIME.LIBRARY.EXCEPTION
+}
+
+package_gcc-go()
+{
+  pkgdesc="Go front-end for GCC"
+  depends=("gcc=$pkgver-$pkgrel")
+  install=gcc-go.install
+
+  cd gcc-build
+  make -j1 DESTDIR=$pkgdir install-target-libgo
+  make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info}
+  install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1
+
+  # Install Runtime Library Exception
+  install -Dm644 ${_basedir}/COPYING.RUNTIME \
+    ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION
+}
diff --git a/testing/gcc/gcc-ada.install b/testing/gcc/gcc-ada.install
new file mode 100644
index 000000000..df0553a4f
--- /dev/null
+++ b/testing/gcc/gcc-ada.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(gnat-style.info gnat_rm.info gnat_ugn.info)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
diff --git a/testing/gcc/gcc-fortran.install b/testing/gcc/gcc-fortran.install
new file mode 100644
index 000000000..b15d89a97
--- /dev/null
+++ b/testing/gcc/gcc-fortran.install
@@ -0,0 +1,16 @@
+infodir=usr/share/info
+file="gfortran.info"
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+}
diff --git a/testing/gcc/gcc-go.install b/testing/gcc/gcc-go.install
new file mode 100644
index 000000000..7dc50dee5
--- /dev/null
+++ b/testing/gcc/gcc-go.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(gccgo.info)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
diff --git a/testing/gcc/gcc-hash-style-both.patch b/testing/gcc/gcc-hash-style-both.patch
new file mode 100644
index 000000000..8b59f4535
--- /dev/null
+++ b/testing/gcc/gcc-hash-style-both.patch
@@ -0,0 +1,122 @@
+--- gcc/config/alpha/linux-elf.h.orig	2010-12-09 23:27:07.000000000 +1000
++++ gcc/config/alpha/linux-elf.h	2011-03-11 10:01:47.770000457 +1000
+@@ -41,7 +41,7 @@
+ 
+ #define ELF_DYNAMIC_LINKER	LINUX_DYNAMIC_LINKER
+ 
+-#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax}		\
++#define LINK_SPEC "-m elf64alpha --hash-style=both %{G*} %{relax:-relax}	\
+   %{O*:-O3} %{!O*:-O1}						\
+   %{shared:-shared}						\
+   %{!shared:							\
+--- gcc/config/i386/linux64.h.orig	2011-03-03 08:35:36.000000000 +1000
++++ gcc/config/i386/linux64.h	2011-03-11 10:01:47.770000457 +1000
+@@ -78,7 +78,7 @@
+  %{!mno-sse2avx:%{mavx:-msse2avx}} %{msse2avx:%{!mavx:-msse2avx}}"
+ 
+ #undef	LINK_SPEC
+-#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} \
++#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} --hash-style=both \
+   %{shared:-shared} \
+   %{!shared: \
+     %{!static: \
+--- gcc/config/i386/linux.h.orig	2011-01-15 04:45:06.000000000 +1000
++++ gcc/config/i386/linux.h	2011-03-11 10:01:47.770000457 +1000
+@@ -104,7 +104,7 @@
+   { "dynamic_linker", LINUX_DYNAMIC_LINKER }
+ 
+ #undef	LINK_SPEC
+-#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \
++#define LINK_SPEC "-m %(link_emulation) --hash-style=both %{shared:-shared} \
+   %{!shared: \
+     %{!static: \
+       %{rdynamic:-export-dynamic} \
+--- gcc/config/ia64/linux.h.orig	2010-12-09 23:27:07.000000000 +1000
++++ gcc/config/ia64/linux.h	2011-03-11 10:01:47.770000457 +1000
+@@ -64,7 +64,7 @@
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
+ 
+ #undef LINK_SPEC
+-#define LINK_SPEC "\
++#define LINK_SPEC "--hash-style=both \
+   %{shared:-shared} \
+   %{!shared: \
+     %{!static: \
+--- gcc/config/rs6000/linux64.h.orig	2011-02-11 03:30:10.000000000 +1000
++++ gcc/config/rs6000/linux64.h	2011-03-11 10:03:34.280000457 +1000
+@@ -389,11 +389,11 @@
+   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
+ 
+ 
+-#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \
++#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
+   %{rdynamic:-export-dynamic} \
+   -dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}"
+ 
+-#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \
++#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=both %{!shared: %{!static: \
+   %{rdynamic:-export-dynamic} \
+   -dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}"
+ 
+--- gcc/config/rs6000/sysv4.h.orig	2011-01-28 04:36:03.000000000 +1000
++++ gcc/config/rs6000/sysv4.h	2011-03-11 10:01:47.773333792 +1000
+@@ -830,7 +830,7 @@
+ #define LINUX_DYNAMIC_LINKER \
+   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
+ 
+-#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
++#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
+   %{rdynamic:-export-dynamic} \
+   -dynamic-linker " LINUX_DYNAMIC_LINKER "}}"
+ 
+--- gcc/config/s390/linux.h.orig	2010-12-09 23:27:07.000000000 +1000
++++ gcc/config/s390/linux.h	2011-03-11 10:01:47.770000457 +1000
+@@ -77,7 +77,7 @@
+ 
+ #undef  LINK_SPEC
+ #define LINK_SPEC \
+-  "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
++  "%{m31:-m elf_s390}%{m64:-m elf64_s390} --hash-style=both \
+    %{shared:-shared} \
+    %{!shared: \
+       %{static:-static} \
+--- gcc/config/sparc/linux64.h.orig	2011-02-17 23:57:21.000000000 +1000
++++ gcc/config/sparc/linux64.h	2011-03-11 10:01:47.770000457 +1000
+@@ -113,7 +113,7 @@
+   { "link_arch_default", LINK_ARCH_DEFAULT_SPEC },	  \
+   { "link_arch",	 LINK_ARCH_SPEC },
+ 
+-#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \
++#define LINK_ARCH32_SPEC "-m elf32_sparc --hash-style=both -Y P,%R/usr/lib %{shared:-shared} \
+   %{!shared: \
+     %{!static: \
+       %{rdynamic:-export-dynamic} \
+@@ -121,7 +121,7 @@
+       %{static:-static}} \
+ "
+ 
+-#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
++#define LINK_ARCH64_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
+   %{!shared: \
+     %{!static: \
+       %{rdynamic:-export-dynamic} \
+@@ -193,7 +193,7 @@
+ #else /* !SPARC_BI_ARCH */
+ 
+ #undef LINK_SPEC
+-#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
++#define LINK_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
+   %{!shared: \
+     %{!static: \
+       %{rdynamic:-export-dynamic} \
+--- gcc/config/sparc/linux.h.orig	2011-01-27 06:30:12.000000000 +1000
++++ gcc/config/sparc/linux.h	2011-03-11 10:01:47.770000457 +1000
+@@ -74,7 +74,7 @@
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
+ 
+ #undef  LINK_SPEC
+-#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
++#define LINK_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \
+   %{!mno-relax:%{!r:-relax}} \
+   %{!shared: \
+     %{!static: \
diff --git a/testing/gcc/gcc-libs.install b/testing/gcc/gcc-libs.install
new file mode 100644
index 000000000..23553b8f0
--- /dev/null
+++ b/testing/gcc/gcc-libs.install
@@ -0,0 +1,16 @@
+infodir=usr/share/info
+filelist=(libgomp.info libquadmath.info)
+
+post_upgrade() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
diff --git a/testing/gcc/gcc.install b/testing/gcc/gcc.install
new file mode 100644
index 000000000..3407a5e1f
--- /dev/null
+++ b/testing/gcc/gcc.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.info)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
diff --git a/testing/gcc/gcc_pure64.patch b/testing/gcc/gcc_pure64.patch
new file mode 100644
index 000000000..8c0baf8e2
--- /dev/null
+++ b/testing/gcc/gcc_pure64.patch
@@ -0,0 +1,26 @@
+diff -Naur gcc-4.2.0.orig/gcc/config/i386/linux64.h gcc-4.2.0/gcc/config/i386/linux64.h
+--- gcc-4.2.0.orig/gcc/config/i386/linux64.h	2007-05-16 19:21:19.000000000 -0400
++++ gcc-4.2.0/gcc/config/i386/linux64.h	2007-05-18 17:04:05.000000000 -0400
+@@ -49,8 +49,8 @@
+    When the -shared link option is used a final link is not being
+    done.  */
+ 
+-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
+-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
++#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
+ 
+ #undef	LINK_SPEC
+ #define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \
+diff -Naur gcc-4.2.0.orig/gcc/config/i386/t-linux64 gcc-4.2.0/gcc/config/i386/t-linux64
+--- gcc-4.2.0.orig/gcc/config/i386/t-linux64	2007-05-16 19:21:19.000000000 -0400
++++ gcc-4.2.0/gcc/config/i386/t-linux64	2007-05-18 17:04:36.000000000 -0400
+@@ -6,7 +6,7 @@
+ 
+ MULTILIB_OPTIONS = m64/m32
+ MULTILIB_DIRNAMES = 64 32 
+-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
++MULTILIB_OSDIRNAMES = ../lib ../lib32
+ 
+ LIBGCC = stmp-multilib
+ INSTALL_LIBGCC = install-multilib
diff --git a/testing/libtool/PKGBUILD b/testing/libtool/PKGBUILD
index 05e15a9ea..5d21df0e2 100644
--- a/testing/libtool/PKGBUILD
+++ b/testing/libtool/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 140704 2011-10-18 13:20:12Z allan $
+# $Id: PKGBUILD 141275 2011-10-28 01:34:31Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
@@ -6,7 +6,7 @@
 
 pkgname=('libtool' 'libltdl')
 pkgver=2.4.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A generic library support script"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/libtool"
@@ -28,7 +28,7 @@ check() {
 }
 
 package_libtool() {
-  depends=('sh' "libltdl=$pkgver" 'tar' 'gcc=4.6.1')
+  depends=('sh' "libltdl=$pkgver" 'tar' 'gcc=4.6.2')
   groups=('base-devel')
   install=libtool.install
 
diff --git a/testing/pam/PKGBUILD b/testing/pam/PKGBUILD
new file mode 100644
index 000000000..ef5d172da
--- /dev/null
+++ b/testing/pam/PKGBUILD
@@ -0,0 +1,60 @@
+# $Id: PKGBUILD 141270 2011-10-27 19:34:15Z tpowa $
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+# Contributor: judd <jvinet@zeroflux.org>
+
+pkgname=pam
+pkgver=1.1.5
+pkgrel=1
+pkgdesc="PAM (Pluggable Authentication Modules) library"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://www.kernel.org/pub/linux/libs/pam/"
+depends=('glibc' 'db' 'cracklib' 'libtirpc')
+makedepends=('flex' 'w3m' 'docbook-xml>=4.4' 'docbook-xsl')
+backup=(etc/security/{access.conf,group.conf,limits.conf,namespace.conf,namespace.init,pam_env.conf,time.conf} etc/pam.d/other etc/default/passwd etc/environment)
+source=(https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-$pkgver.tar.bz2
+        #http://www.kernel.org/pub/linux/libs/pam/library/Linux-PAM-$pkgver.tar.bz2
+        ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2/pam_unix2-2.6.tar.bz2
+        other)
+options=('!libtool' '!emptydirs')
+md5sums=('927ee5585bdec5256c75117e9348aa47'
+         'e2788389a6c59224110a45fcff30e02b'
+         '6e6c8719e5989d976a14610f340bd33a')
+
+build() {
+  cd $srcdir/Linux-PAM-$pkgver
+  ./configure --sysconfdir=/etc DESTDIR=$pkgdir --libdir=/lib
+  make
+}
+
+package() {
+  cd $srcdir/Linux-PAM-$pkgver
+  make INSTALL=/bin/install DESTDIR=$pkgdir install
+  install -D -m644 ../other $pkgdir/etc/pam.d/other
+  # build pam_unix2 module
+  # source ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2
+  cd $srcdir/pam_unix2-2.6
+  ./configure
+  make
+  make DESTDIR=$pkgdir install
+  # add the realtime permissions for audio users
+  sed -i 's|# End of file||' $pkgdir/etc/security/limits.conf
+  cat >>$pkgdir/etc/security/limits.conf <<_EOT
+*               -       rtprio          0
+*               -       nice            0
+@audio          -       rtprio          65
+@audio          -       nice           -10
+@audio          -       memlock         40000
+_EOT
+  # fix some missing symlinks from old pam for compatibility
+  cd $pkgdir/lib/security
+  ln -s pam_unix.so pam_unix_acct.so
+  ln -s pam_unix.so pam_unix_auth.so
+  ln -s pam_unix.so pam_unix_passwd.so
+  ln -s pam_unix.so pam_unix_session.so
+  # set unix_chkpwd uid
+  chmod +s $pkgdir/sbin/unix_chkpwd
+}
+md5sums=('927ee5585bdec5256c75117e9348aa47'
+         'e2788389a6c59224110a45fcff30e02b'
+         '6e6c8719e5989d976a14610f340bd33a')
diff --git a/testing/pam/other b/testing/pam/other
new file mode 100644
index 000000000..08498b423
--- /dev/null
+++ b/testing/pam/other
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth		required	pam_unix.so
+account		required	pam_unix.so
+password	required	pam_unix.so
+session		required	pam_unix.so
diff --git a/testing/pam/pam.install b/testing/pam/pam.install
new file mode 100644
index 000000000..9d4588084
--- /dev/null
+++ b/testing/pam/pam.install
@@ -0,0 +1,12 @@
+# arg 1:  the new package version
+post_install() {
+  # need to run this immediately -- pacman only runs it at the end of
+  # all package installs
+  /sbin/ldconfig -r .
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+  post_install $1
+}
diff --git a/testing/pciutils/PKGBUILD b/testing/pciutils/PKGBUILD
new file mode 100644
index 000000000..8e5089ccd
--- /dev/null
+++ b/testing/pciutils/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 141272 2011-10-27 19:51:53Z tpowa $
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+pkgname=pciutils
+pkgver=3.1.8
+pkgrel=1
+pkgdesc="PCI bus configuration space access library and tools"
+arch=(i686 x86_64)
+license=('GPL2')
+groups=('base')
+url="http://mj.ucw.cz/pciutils.html"
+optdepends=('sh: required by update-pciids')
+makedepends=('wget')
+depends=('glibc')
+source=(#ftp://ftp.kernel.org/pub/software/utils/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+       ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${pkgname}-${pkgver}.tar.gz)
+md5sums=('79312f138311d29291c7d44d624cd37e')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./update-pciids.sh
+  make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all
+  cp lib/libpci.a "${srcdir}/"
+  make clean
+  make OPT="${CFLAGS}" ZLIB=no SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man DESTDIR="${pkgdir}" install install-lib
+  install -m644 "${srcdir}/libpci.a" "${pkgdir}/usr/lib/"
+}
diff --git a/testing/sudo/PKGBUILD b/testing/sudo/PKGBUILD
index bb7635aaa..c48c0cccb 100644
--- a/testing/sudo/PKGBUILD
+++ b/testing/sudo/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 141045 2011-10-22 13:25:45Z allan $
+# $Id: PKGBUILD 141277 2011-10-28 01:35:38Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=sudo
-_ver=1.8.3
+_ver=1.8.3p1
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 pkgrel=1
 pkgdesc="Give certain users the ability to run some commands as root"
@@ -15,8 +15,8 @@ backup=('etc/sudoers' 'etc/pam.d/sudo')
 options=('!libtool' '!makeflags')
 source=(ftp://ftp.sudo.ws/pub/sudo/$pkgname-$_ver.tar.gz{,.sig}
         sudo.pam)
-md5sums=('9e5517bbf3aee420b38c2d1d7a71bcad'
-         '9320510b4fde1c98a1846d9a21c5442a'
+md5sums=('7becc572fa97f94cf721a2ee8299c45b'
+         'b0726a25694fb2cdd5e1c146eb024e9c'
          '4e7ad4ec8f2fe6a40e12bcb2c0b256e3')
 
 build() {