Merge branch 'master' of ssh://gparabola/abslibre

Conflicts: libre/linux-libre/PKGBUILD
author: Nicolás Reynolds <fauno@kiwwwi.com.ar> 2012-03-23 19:47:42 -0300
committer: Nicolás Reynolds <fauno@kiwwwi.com.ar> 2012-03-23 19:47:42 -0300
commit: c4cc142235d7d77327c2a53d9efb2750b1ec80bf (patch)
tree: 41446fa0833a3783d24b6bd12c64336f845e6032 /libre
parent: 5ddafb1e55d18275d3f16e9faa3e9da788b54389 (diff)
parent: b1b9debcc7f6756d83dbac37806021de007cf083 (diff)
93 files changed, 2483 insertions, 1140 deletions
diff --git a/libre/apache-ant-libre/PKGBUILD b/libre/apache-ant-libre/PKGBUILD
new file mode 100644
index 000000000..9f5ef223b
--- /dev/null
+++ b/libre/apache-ant-libre/PKGBUILD
@@ -0,0 +1,72 @@
+# Maintainer (Arch): Paul Mattal <paul@archlinux.org>
+# Contributor: Andrew Wright <andreww@photism.org>
+
+_pkgname=apache-ant
+pkgname=apache-ant-libre
+pkgver=1.8.2
+
+provides=("$_pkgname=$pkgver")
+replaces=("$_pkgname")
+conflicts=("$_pkgname")
+
+pkgrel=3
+pkgdesc="A java-based build tool"
+arch=('any')
+license=('APACHE')
+url="http://ant.apache.org/"
+depends=('java-environment')
+makedepends=('junit')
+optdepends=('junit: to have JUnit on the classpath in javac tasks')
+source=(http://archive.apache.org/dist/ant/source/${_pkgname}-${pkgver}-src.tar.bz2
+        ${_pkgname}.sh ${_pkgname}.csh
+        ant_diagnostics.patch)
+
+build() {
+  # This directory is what becomes
+  # http://archive.apache.org/dist/ant/binaries/${pkgname}-${pkgver}-bin.tar.bz2
+  # which is what Arch uses
+  rm -rf "${srcdir}"/${_pkgname}-${pkgver}-bin
+  mkdir -p "${srcdir}"/${_pkgname}-${pkgver}-bin
+
+  cd "${srcdir}"/${_pkgname}-${pkgver}
+  ln -sf /usr/share/java/junit.jar lib/optional # JUnit isn't really optional
+  sh build.sh -Ddist.dir="${srcdir}"/${_pkgname}-${pkgver}-bin dist
+}
+
+package() {
+  # install profile.d script
+  install -dm755 "${pkgdir}"/etc/profile.d
+  install -m755 "${srcdir}"/${_pkgname}.{csh,sh} "${pkgdir}"/etc/profile.d/
+
+  # Get the ANT_HOME env var
+  source "${srcdir}"/${_pkgname}.sh
+
+  cd "${srcdir}"/${_pkgname}-${pkgver}-bin
+  install -dm755 "${pkgdir}"/${ANT_HOME}/{bin,lib}
+
+  install -m644 ./lib/*.jar "${pkgdir}"/${ANT_HOME}/lib
+  cp -Rp ./etc "${pkgdir}"/${ANT_HOME}
+
+  # Do not copy Windows .bat/.cmd files
+  find ./bin -type f -a ! -name \*.bat -a ! -name \*.cmd \
+    -exec install -m755 {} "${pkgdir}"/${ANT_HOME}/bin \;
+
+  # symlink to junit so it's on the javac build path for ant
+  # matches behavior on ubuntu 9 and makes sense for compatibility
+  # http://bugs.archlinux.org/task/15229
+  ln -sf /usr/share/java/junit.jar "${pkgdir}"/usr/share/java/apache-ant/lib/
+
+  # fix python2 path
+  sed -i 's|/usr/bin/python|/usr/bin/python2|' "${pkgdir}"/usr/share/java/apache-ant/bin/runant.py
+
+  # The license says the NOTICE file should be redistributed for derivative
+  # works, so lets supply it.
+  cd "${srcdir}"/${_pkgname}-${pkgver}
+  install -dm755 "${pkgdir}"/usr/share/licenses/${_pkgname}
+  install -m644 LICENSE NOTICE "${pkgdir}"/usr/share/licenses/${_pkgname}
+}
+
+md5sums=('0d9e108afcd15b820150b8085c96d2b1'
+         '593ee6ebd9b8ec321534a028e686880f'
+         '475b684eb8202c09cbb51496cd8ee1e0'
+         'cbaab423be40a6e63f0fde901b91eb50')
diff --git a/libre/apache-ant-libre/ant_diagnostics.patch b/libre/apache-ant-libre/ant_diagnostics.patch
new file mode 100644
index 000000000..38148b45c
--- /dev/null
+++ b/libre/apache-ant-libre/ant_diagnostics.patch
@@ -0,0 +1,23 @@
+--- a/src/main/org/apache/tools/ant/Diagnostics.java
++++ b/src/main/org/apache/tools/ant/Diagnostics.java
+@@ -179,7 +179,10 @@
+      * @param clazz the class to get the information from.
+      * @since Ant 1.8.0
+      */
+-    private static URL getClassLocation(Class clazz) {
++    private static URL getClassLocation(Class clazz) {
++		if (clazz.getProtectionDomain().getCodeSource() == null) {
++			return null;
++		}
+         return clazz.getProtectionDomain().getCodeSource().getLocation();
+     }
+ 
+@@ -241,7 +244,7 @@
+         }
+         Transformer transformer = null;
+         try {
+-            transformer = transformerFactory.newTransformer();
++            transformer = transformerFactory.newTransformer();
+         } catch (Exception e) {
+             // ignore
+             ignoreThrowable(e);
diff --git a/libre/apache-ant-libre/apache-ant.csh b/libre/apache-ant-libre/apache-ant.csh
new file mode 100644
index 000000000..b6a6d5840
--- /dev/null
+++ b/libre/apache-ant-libre/apache-ant.csh
@@ -0,0 +1,2 @@
+setenv ANT_HOME /usr/share/java/apache-ant
+setenv PATH ${PATH}:${ANT_HOME}/bin
diff --git a/libre/apache-ant-libre/apache-ant.sh b/libre/apache-ant-libre/apache-ant.sh
new file mode 100644
index 000000000..ab602fb28
--- /dev/null
+++ b/libre/apache-ant-libre/apache-ant.sh
@@ -0,0 +1,3 @@
+export ANT_HOME=/usr/share/java/apache-ant
+export PATH=$PATH:$ANT_HOME/bin
+
diff --git a/libre/aufs2-libre/PKGBUILD b/libre/aufs2-libre/PKGBUILD
deleted file mode 100644
index bd177ef9c..000000000
--- a/libre/aufs2-libre/PKGBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# $Id: PKGBUILD 110689 2011-02-21 15:30:22Z tpowa $
-# Maintainer: Paul Mattal <pjmattal@elys.com>
-
-pkgname=aufs2-libre
-pkgver=2.6.38_20110314
-pkgrel=4
-#_kernver=${pkgver%_*}-LIBRE
-_kernver=2.6.38-LIBRE
-pkgdesc="Another Unionfs Implementation for the Linux-Libre kernel"
-arch=('i686' 'x86_64')
-url="http://aufs.sourceforge.net/"
-license=('GPL2')
-depends=('kernel26-libre>=2.6.38' 'kernel26-libre<2.6.39')
-makedepends=('kernel26-libre-headers>=2.6.38' 'kernel26-libre-headers<2.6.39')
-replaces=('aufs' 'aufs2')
-conflicts=('aufs2')
-provides=("aufs2=$pkgver")
-install=${pkgname}.install
-source=("ftp://ftp.archlinux.org/other/aufs2/${pkgname%-libre}-${pkgver}.tar.gz")
-options=('!makeflags' '!strip')
-md5sums=('60649fa47d3f499dfbb4b68a2afde47c')
-
-build() {
-  cd ${srcdir}/${pkgname%-libre}-${pkgver}
-  #patch -Np1 -i ../aufs2-module-2.6.36.patch
-  sed -i 's|CONFIG_AUFS_HNOTIFY =.*|CONFIG_AUFS_HNOTIFY = y|' \
-     config.mk || return 1
-  sed -i 's|CONFIG_AUFS_HFSNOTIFY =.*|CONFIG_AUFS_HFSNOTIFY = y|' \
-     config.mk || return 1
-  sed -i 's|CONFIG_AUFS_EXPORT =.*|CONFIG_AUFS_EXPORT = y|' \
-     config.mk || return 1
-  sed -i 's|CONFIG_AUFS_SHWH =.*|CONFIG_AUFS_SHWH = y|' \
-     config.mk || return 1
-  sed -i 's|CONFIG_AUFS_BDEV_LOOP =.*|CONFIG_AUFS_BDEV_LOOP = y|' \
-     config.mk || return 1
-  sed -i 's|CONFIG_AUFS_BR_RAMFS =.*|CONFIG_AUFS_BR_RAMFS = y|' \
-     config.mk || return 1
-  sed -i 's|CONFIG_AUFS_DEBUG =.*|CONFIG_AUFS_DEBUG =|' \
-     config.mk || return 1
-  if [ "${CARCH}" = "x86_64" ]; then
-    inot64=" y"
-  else
-    inot64=""
-  fi
-  sed -i "s|CONFIG_AUFS_INO_T_64 =.*|CONFIG_AUFS_INO_T_64 =${inot64}|" \
-     config.mk 
-  # build, sed fixes are from gentoo portage build
-  sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile
-  sed -i "s:__user::g" include/linux/aufs_type.h
-  make KDIR=/usr/src/linux-${_kernver}
-}
-
-package() {
-  cd ${srcdir}/${pkgname%-libre}-${pkgver}
-  install -D -m644 fs/aufs/aufs.ko \
-    $pkgdir/lib/modules/${_kernver}/kernel/fs/aufs/aufs.ko 
-  # tweak the install script for the right kernel version
-  sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \
-    $startdir/$pkgname.install
-  # install include files
-  install -D -m 644 include/linux/aufs_type.h $pkgdir/usr/include/linux/aufs_type.h
-  # gzip -9 all modules to safe 100MB
-  find "$pkgdir" -name '*.ko' -exec gzip -9 {} \;
-}
diff --git a/libre/aufs2-libre/aufs2-libre.install b/libre/aufs2-libre/aufs2-libre.install
deleted file mode 100644
index 883882a54..000000000
--- a/libre/aufs2-libre/aufs2-libre.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  KERNEL_VERSION=2.6.38-LIBRE
-  depmod $KERNEL_VERSION
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/libre/aufs2-libre/aufs2-module-2.6.36.patch b/libre/aufs2-libre/aufs2-module-2.6.36.patch
deleted file mode 100644
index 3b43f7aed..000000000
--- a/libre/aufs2-libre/aufs2-module-2.6.36.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/ubuntu/aufs/branch.c b/ubuntu/aufs/branch.c
-index cd4463c..ff6b158 100644
---- a/fs/aufs/branch.c
-+++ b/fs/aufs/branch.c
-@@ -22,6 +22,8 @@
- 
- #include <linux/file.h>
- #include <linux/statfs.h>
-+#include <linux/lglock.h>
-+#include <linux/percpu.h>
- #include "aufs.h"
- 
- /*
-@@ -851,7 +853,8 @@ static int au_br_mod_files_ro(struct super_block *sb, aufs_bindex_t bindex)
- 		goto out;
- 
- 	/* no need file_list_lock() since sbinfo is locked? defered? */
--	list_for_each_entry(file, &sb->s_files, f_u.fu_list) {
-+        lg_global_lock(files_lglock);
-+	do_file_list_for_each_entry(sb, file) {
- 		if (special_file(file->f_dentry->d_inode->i_mode))
- 			continue;
- 
-@@ -861,6 +864,7 @@ static int au_br_mod_files_ro(struct super_block *sb, aufs_bindex_t bindex)
- 			err = -EBUSY;
- 			FiMustNoWaiters(file);
- 			fi_read_unlock(file);
-+			lg_global_unlock(files_lglock);
- 			goto out_free;
- 		}
- 
-@@ -889,10 +893,13 @@ static int au_br_mod_files_ro(struct super_block *sb, aufs_bindex_t bindex)
- 			if (p) {
- 				a = p;
- 				a[n++] = hf;
--			} else
-+			} else {
-+				lg_global_unlock(files_lglock);
- 				goto out_free;
-+			}
- 		}
--	}
-+	} while_file_list_for_each_entry;
-+	lg_global_unlock(files_lglock);
- 
- 	err = 0;
- 	if (n)
diff --git a/libre/aufs2-libre/create-tarball.sh b/libre/aufs2-libre/create-tarball.sh
deleted file mode 100644
index 6801f00bd..000000000
--- a/libre/aufs2-libre/create-tarball.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-AUFS2VERSION="-38"
-KERNELVERSION=2.6.38
-GITSNAPSHOT=20110314
-# aufs2 (no -xx) for the latest -rc version.
-git clone http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-standalone.git aufs2-standalone.git
-cd aufs2-standalone.git
-#git checkout origin/aufs2.1${AUFS2VERSION}
-git checkout origin/aufs2.1
-#*** apply "aufs2-base.patch" and "aufs2-standalone.patch" to your kernel source files.
-cd ..
-rm -rf aufs2-${KERNELVERSION}_${GITSNAPSHOT}
-cp -a aufs2-standalone.git aufs2-${KERNELVERSION}_${GITSNAPSHOT}
-tar -czf aufs2-${KERNELVERSION}_${GITSNAPSHOT}.tar.gz --exclude=.git aufs2-${KERNELVERSION}_${GITSNAPSHOT}
diff --git a/libre/ffmpeg-libre/PKGBUILD b/libre/ffmpeg-libre/PKGBUILD
deleted file mode 100644
index 41c332dca..000000000
--- a/libre/ffmpeg-libre/PKGBUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-# $Id: PKGBUILD 85265 2010-07-11 10:15:18Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Contributor: Paul Mattal <paul@archlinux.org>
-# Maintainer for Parabola GNU/Linux: Omar Botta <omarbotta@gnulinuxlibre.net>
-
-pkgname=ffmpeg-libre
-pkgver=20110330
-pkgrel=1
-pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix. Libre version without faac"
-arch=('i686' 'x86_64')
-url="http://ffmpeg.org/"
-license=('GPL')
-depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'xvidcore' 'zlib' 'x264' 'libtheora' 'opencore-amr' 'alsa-lib' 'libvdpau' 'libxfixes' 'schroedinger' 'libvpx' 'libva' 'openjpeg')
-makedepends=('yasm' 'git')
-#git clone git://git.videolan.org/ffmpeg.git
-source=(ftp://ftp.archlinux.org/other/ffmpeg/ffmpeg-${pkgver}.tar.xz)
-md5sums=('dd682a876a496b9f9ae8afb3b3b70389')
-#source=(http://ffmpeg.org/releases//releases/ffmpeg-${pkgver}.tar.bz2)
-provides=("ffmpeg=$pkgver")
-conflicts=('ffmpeg')
-replaces=('ffmpeg')
-
-build() {
-  cd "$srcdir/${pkgname%-libre}"
-
-  ./configure \
-    --prefix=/usr \
-    --enable-gpl \
-    --enable-libmp3lame \
-    --enable-libvorbis \
-    --disable-libfaac \
-    --enable-libxvid \
-    --enable-libx264 \
-    --enable-libvpx \
-    --enable-libtheora \
-    --enable-postproc \
-    --enable-shared \
-    --enable-x11grab \
-    --enable-libopencore_amrnb \
-    --enable-libopencore_amrwb \
-    --enable-libschroedinger \
-    --enable-libopenjpeg \
-    --enable-version3 \
-    --disable-nonfree \
-    --enable-runtime-cpudetect \
-    --disable-debug  # libfaac is nonfree
-
-  make
-  make tools/qt-faststart
-  make doc/ff{mpeg,play,server}.1
-
-  make DESTDIR="$pkgdir" install install-man
-  install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD
index 733d34aa3..e9282b5aa 100644
--- a/libre/filesystem/PKGBUILD
+++ b/libre/filesystem/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 147201 2012-01-24 06:36:12Z bisson $
+# $Id: PKGBUILD 150594 2012-02-18 18:25:33Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
+# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
 
 pkgname=filesystem
-pkgver=2011.12
+pkgver=2012.2
 pkgrel=2
 pkgdesc='Base filesystem for Parabola'
 arch=('any')
@@ -37,51 +38,53 @@ md5sums=('772fe869b921698cc3e6fde73c4ac85a'
          'a8a962370cd0128465d514e6a1f74130')
 
 package() {
-	cd ${srcdir}
+	cd ${pkgdir}
 
 	#
 	# setup root filesystem
 	#
 	for d in bin boot dev etc home lib/modules media mnt sbin usr var opt srv/http sys run; do
-		install -d -m755 ${pkgdir}/${d}
+		install -d -m755 ${d}
 	done
-	install -d -m555 ${pkgdir}/proc
-	install -d -m0750 ${pkgdir}/root
-	install -d -m1777 ${pkgdir}/tmp
+	install -d -m555 proc
+	install -d -m0750 root
+	install -d -m1777 tmp
 	# vsftpd won't run with write perms on /srv/ftp
-	install -d -m555 -g ftp ${pkgdir}/srv/ftp
+	install -d -m555 -g ftp srv/ftp
 
 	# setup /etc
-	install -d ${pkgdir}/etc/{ld.so.conf.d,skel,profile.d}
+	install -d etc/{ld.so.conf.d,skel,profile.d}
 	for f in fstab group host.conf hosts issue ld.so.conf motd nsswitch.conf passwd resolv.conf securetty shells profile; do
-		install -m644 ${srcdir}/${f} ${pkgdir}/etc/
+		install -m644 ${srcdir}/${f} etc/
 	done
-	ln -s /proc/self/mounts ${pkgdir}/etc/mtab
+	ln -s /proc/self/mounts etc/mtab
 	for f in gshadow shadow crypttab; do
-		install -m600 ${srcdir}/${f} ${pkgdir}/etc/
+		install -m600 ${srcdir}/${f} etc/
 	done
-	touch ${pkgdir}/etc/arch-release
-	install -D -m644 ${srcdir}/modprobe.d.usb-load-ehci-first ${pkgdir}/lib/modprobe.d/usb-load-ehci-first.conf
+	touch etc/arch-release
+	install -D -m644 ${srcdir}/modprobe.d.usb-load-ehci-first lib/modprobe.d/usb-load-ehci-first.conf
 
 	# setup /var
-	for d in cache/man local opt log/old lib/misc empty; do
-		install -d -m755 ${pkgdir}/var/${d}
+	for d in cache/man local opt log/old lib/misc empty run; do
+		install -d -m755 var/${d}
 	done
-	install -d -m1777 ${pkgdir}/var/{tmp,spool/mail}
+	install -d -m1777 var/{tmp,spool/mail,lock}
 	# allow setgid games to write scores
-	install -d -m775 -g games ${pkgdir}/var/games
-	ln -s /var/spool/mail ${pkgdir}/var/mail
-	ln -s /run ${pkgdir}/var/run
-	ln -s /run/lock ${pkgdir}/var/lock
+	install -d -m775 -g games var/games
+	ln -s spool/mail var/mail
+	# not ready yet, needs possible change in pacman or other magic
+	# is fixed by initscripts on next boot
+#	ln -s ../run var/run
+#	ln -s ../run/lock var/lock
 
 	#
 	# setup /usr hierarchy
 	#
 	for d in bin include lib sbin share/misc src; do
-		install -d -m755 ${pkgdir}/usr/${d}
+		install -d -m755 usr/${d}
 	done
 	for d in $(seq 8); do
-		install -d -m755 ${pkgdir}/usr/share/man/man${d}
+		install -d -m755 usr/share/man/man${d}
 	done
 
 
@@ -89,7 +92,7 @@ package() {
 	# setup /usr/local hierarchy
 	#
 	for d in bin etc games include lib man sbin share src; do
-		install -d -m755 ${pkgdir}/usr/local/${d}
+		install -d -m755 usr/local/${d}
 	done
-	ln -s ../man ${pkgdir}/usr/local/share/man
+	ln -s ../man usr/local/share/man
 }
diff --git a/libre/filesystem/filesystem.install b/libre/filesystem/filesystem.install
index 0ecc27e65..38d21a85b 100644
--- a/libre/filesystem/filesystem.install
+++ b/libre/filesystem/filesystem.install
@@ -1,24 +1,24 @@
 post_install() {
 	[ -f var/log/lastlog ] ||  : >var/log/lastlog
 	[ -f var/log/wtmp ]    ||  : >var/log/wtmp
-	[ -f var/log/btmp ]    || (: >var/log/btmp && bin/chmod 600 var/log/btmp)
+	[ -f var/log/btmp ]    || (: >var/log/btmp && chmod 600 var/log/btmp)
 	# workaround for bug #7194
 	# readded due to bug #9465
 	# please do not remove!
-	bin/chmod 1777 var/spool/mail tmp var/tmp var/lock
+	chmod 1777 var/spool/mail tmp var/tmp var/lock
 }
 
 # args: <group> [options]
 _addgroup() {
-	if ! bin/grep -q "^$1:" etc/group; then
-		usr/sbin/groupadd ${@} >/dev/null
+	if ! getent group "$1"; then
+		groupadd "$@" >/dev/null
 	fi
 }
 
 # args: <group> [options]
 _adduser() {
-	if ! bin/grep -q "^$1:" etc/passwd; then
-		usr/sbin/useradd ${@} >/dev/null
+	if ! getent passwd "$1"; then
+		useradd "$@" >/dev/null
 	fi
 }
 
@@ -37,23 +37,23 @@ post_upgrade() {
 	_addgroup games   -g 50
 	_addgroup uucp    -g 14
 	_addgroup http    -g 33
-	_adduser  http    -u 33 -d /srv/http -g http -s /bin/false http
+	_adduser  http    -u 33 -d /srv/http -g http -s /bin/false
 	_addgroup scanner -g 96
 	_addgroup rfkill  -g 24
 
 	# sync gshadow to group (fixes FS#19869
-	if ! bin/grep -q '^rfkill:' etc/gshadow; then
-		usr/sbin/grpconv >/dev/null
+	if ! grep -q '^rfkill:' etc/gshadow; then
+		grpconv >/dev/null
 	fi
 
-	if ! bin/grep -q '^include /etc/ld.so.conf.d/\*.conf$' etc/ld.so.conf; then
-		bin/echo 'include /etc/ld.so.conf.d/*.conf' >> etc/ld.so.conf
+	if ! grep -q '^include /etc/ld.so.conf.d/\*.conf$' etc/ld.so.conf; then
+		echo 'include /etc/ld.so.conf.d/*.conf' >> etc/ld.so.conf
 	fi
 
 	# set "Last password change" > 0; otherwise su $user wont work
 	for user in bin daemon mail ftp http nobody; do
-		if LANG=C usr/bin/chage -l ${user} | bin/grep -q 'password must be changed'; then
-			usr/bin/chage -d 14871 ${user}
+		if LANG=C chage -l ${user} | grep -q 'password must be changed'; then
+			chage -d 14871 ${user}
 		fi
 	done
 }
diff --git a/libre/h-client/PKGBUILD b/libre/h-client/PKGBUILD
new file mode 100644
index 000000000..e77a2437e
--- /dev/null
+++ b/libre/h-client/PKGBUILD
@@ -0,0 +1,34 @@
+# Maintainer: Michał Masłowski <mtjm@mtjm.eu>
+
+pkgname=h-client
+_pkgver=0.0a0.dev-r107
+pkgver=${_pkgver/-/.}
+pkgrel=1
+pkgdesc="A client for an h-source server (such as http://www.h-node.com)"
+arch=('any')
+url="https://savannah.nongnu.org/projects/h-client/"
+license=('GPL3')
+depends=('python2' 'python2-distribute' 'python-pycurl' 'pygtk')
+options=(!emptydirs)
+# Official source is in SVN, this is made by "python2 setup.py sdist"
+# on a machine having Subversion 1.6.x (e.g. on Trisquel 4.0).
+source=("https://mtjm.eu/releases/hclient-${_pkgver}.tar.gz")
+sha512sums=('d820871fcf3f92e6e31aa02273ae413bf066524eaf245f1d4cf7dc8b0ba5799eb07bf86dd28861c8878c73147bbcae563668cb3a6fa9c3382c751e6717d85f0c')
+
+build() {
+  cd "$srcdir/hclient-${_pkgver}"
+  make
+}
+
+check() {
+  cd "$srcdir/hclient-${_pkgver}"
+  python2 setup.py test
+}
+
+package() {
+  cd "$srcdir/hclient-${_pkgver}"
+  python2 setup.py install --root="$pkgdir/" --optimize=1
+  make DESTDIR="$pkgdir" prefix=/usr install-data
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD
index 058573d05..ff876dfe8 100644
--- a/libre/hplip-libre/PKGBUILD
+++ b/libre/hplip-libre/PKGBUILD
@@ -1,11 +1,12 @@
 # $Id: PKGBUILD 144357 2011-12-05 03:44:51Z eric $
 # Maintainer : Rémy Oudompheng <remy@archlinux.org>
 # Contributor: Morgan LEFIEUX <comete@archlinuxfr.org>
+# Contributor (Parabola): Jorge López <jorginho@adinet.com.uy>
 
 _pkgname=hplip
 pkgname=hplip-libre
-pkgver=3.11.10
-pkgrel=2
+pkgver=3.12.2
+pkgrel=1
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet"
 arch=('i686' 'x86_64')
 url="http://hplipopensource.com"
@@ -27,8 +28,8 @@ provides=("${_pkgname}=${pkgver}")
 options=('!libtool')
 install=hplip.install
 source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc})
-md5sums=('6143f30f3b6905ef22105176a3b80db0'
-         '396bbd8c5cc92aa8295e5bcb508692f3')
+sha1sums=('bdf3e37a344f5b57b62425f755c4293d6d4ae875'
+         'aa00cdf755fea38f39247a0a4a2e8241dc15112c')
 
 build() {
  cd "$srcdir/$_pkgname-$pkgver"
@@ -41,10 +42,8 @@ build() {
  sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py
  sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py
 
- # fix sysfs rules
- sed -i -e "s|SYSFS|ATTR|g" \
-        -e "s|sysfs|attr|g" \
-   data/rules/56-hpmud_support.rules
+ export AUTOMAKE='automake --foreign'
+ autoreconf --force --install
 
  ./configure --prefix=/usr \
              --enable-qt4 \
@@ -67,4 +66,6 @@ package() {
  make rulesdir=/lib/udev/rules.d DESTDIR="$pkgdir/" install
  # remove config provided by sane and autostart of hp-daemon
  rm -rf "$pkgdir"/etc/{sane.d,xdg}
+ # remove HAL .fdi file because HAL is no longer used
+ rm -rf "$pkgdir"/usr/share/hal
 }
diff --git a/libre/hplip-libre/hplip.install b/libre/hplip-libre/hplip.install
index a05cbdd50..cb0eaf8e8 100644
--- a/libre/hplip-libre/hplip.install
+++ b/libre/hplip-libre/hplip.install
@@ -8,4 +8,3 @@ NOTE
 
 EOF
 }
-
diff --git a/libre/icecat-i18n/.directory b/libre/icecat-i18n/.directory
new file mode 100644
index 000000000..98ec279ed
--- /dev/null
+++ b/libre/icecat-i18n/.directory
@@ -0,0 +1,2 @@
+[Dolphin]
+Timestamp=2012,3,2,21,19,19
diff --git a/libre/icecat-i18n/.gitignore b/libre/icecat-i18n/.gitignore
new file mode 100644
index 000000000..3987fdafb
--- /dev/null
+++ b/libre/icecat-i18n/.gitignore
@@ -0,0 +1,3 @@
+index.html
+langpacks.txt
+*.xpi
diff --git a/libre/icecat-i18n/Makefile b/libre/icecat-i18n/Makefile
new file mode 100644
index 000000000..d1aaf7bff
--- /dev/null
+++ b/libre/icecat-i18n/Makefile
@@ -0,0 +1,38 @@
+#!/usr/bin/make -f
+# Use this script to update the PKGBUILD's list of langpacks.
+# This script depends on:
+#  - coreutils
+#  - grep
+#  - pacman
+#  - sed
+#  - wget
+
+# Variables:
+_pkgver=10.0
+pkgver=10.0
+pkgrel=1
+
+# Guts: ##############################################################
+
+default: PHONY all
+all: PHONY PKGBUILD
+
+index.html: Makefile
+	rm -f $@
+	wget http://gnuzilla.gnu.org/download/langpacks/${pkgver}/
+langpacks.txt: index.html Makefile
+	egrep -o '[^>".]+\.xpi' $< | sort -u | sed 's/\.xpi//' > $@
+PKGBUILD: PKGBUILD.in langpacks.txt Makefile
+	sed \
+	  -e 's/@_PKGVER@/$(_pkgver)/' \
+	  -e 's/@PKGVER@/$(pkgver)/' \
+	  -e 's/@PKGREL@/$(pkgrel)/' \
+	  -e "s/@LANGPACKS@/(`xargs echo < langpacks.txt`)/" \
+	  -e '/md5sums/,$$d' \
+	  PKGBUILD.in > $@
+	makepkg -dg >> $@
+
+clean: PHONY
+	rm -f index.html langpacks.txt *.xpi
+
+.PHONY: PHONY FORCE
diff --git a/libre/icecat-i18n/PKGBUILD b/libre/icecat-i18n/PKGBUILD
index 36a55c0e6..f995939da 100644
--- a/libre/icecat-i18n/PKGBUILD
+++ b/libre/icecat-i18n/PKGBUILD
@@ -1,23 +1,24 @@
-# Maintainer: fauno <fauno@kiwwwi.com.ar>
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Contributor: fauno <fauno@kiwwwi.com.ar>
 # Contributor: Figue <ffigue@gmail.com>
+# Contributor: emulatorman <andre.paulista@adinet.com.uy>
 # Based on firefox-i18n package
 
 # When updating to a newer upstream release:
-# - run the two commands below to get list of language packs
-# - change version in pkgver and _path
-# - replace md5sums with output of makepkg -g
+# - Edit variables in in Makefile.
+# - (optionally) edit PKGBUILD.in
+# - Run 'make'. It will take care of everything else for you.
 
-# wget http://gnuzilla.gnu.org/download/langpacks/${pkgver}/
-# echo $(egrep -o '[^>".]+\.xpi' index.html | sort -u | sed 's/\.xpi//')
 _langpacks=(af ak ar ast be bg bn-BD bn-IN br bs ca cs cy da de el en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk kn ko ku lg lt lv mai mk ml mr nb-NO nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta-LK ta te th tr uk vi zh-CN zh-TW zu)
 
 pkgbase='icecat-i18n'
 pkgname=($(for lang in ${_langpacks[@]}
         do echo icecat-i18n-$lang | tr A-Z a-z
         done))
-pkgver=6.0
-pkgrel=2
-pkgdesc="Language packs for IceCat"
+_pkgver=10.0
+pkgver=10.0
+pkgrel=1
+pkgdesc="Language packs for GNUzilla IceCat."
 arch=('any')
 license=('MPL')
 url="http://www.gnu.org/software/gnuzilla/"
@@ -33,95 +34,97 @@ build() {
   cd "${srcdir}"
 }
 
-_path="/usr/lib/icecat-6.0/extensions/"
+_path="/usr/lib/icecat-$_pkgver/extensions/"
 
 for lang in ${_langpacks[@]}
 do
-    eval 'package_icecat-i18n-'$(echo $lang | tr A-Z a-z)'() {
-  install -Dm644 "'"$srcdir/$lang.xpi"'" "${pkgdir}'"${_path}langpack-$lang@firefox.mozilla.org.xpi"'"
-}'
+    eval "
+package_icecat-i18n-$(echo $lang | tr A-Z a-z) () {
+  install -Dm644 '$srcdir/$lang.xpi' \"\${pkgdir}\"'${_path}langpack-$lang@firefox.mozilla.org.xpi'
+}
+"
 done
 
-md5sums=('591c7337853eedb77b86dede0c5bdf54'
-         '2b0c067f8387fb582b419dfca57d422e'
-         'f3f6870d4b01bd64d80ac4de1db513f0'
-         'd4f56954f7ad955481bda5503ecbc512'
-         '765d3c03355029434bbb65d121f67089'
-         '9e079762110ad2fcedc993bb87c44963'
-         '66a95194e65db2153e594fab871f5cd3'
-         '6ee12336d42c9ff23ec2b7864f44e38f'
-         '945f3c38961572b12148bc4f1c8bd283'
-         '9325c0178bff267cf4bb0583cf1d6c36'
-         '72c776ab5cd92cbaf7e3bda8d6f0d0d5'
-         '3e2a8386e6c56808a38ea749fd06d796'
-         '8a44d5a3c358bc510feccf917879baea'
-         '73574a44a75d52cfab87c3e10b2ebbb1'
-         '7486a690a30f348f07a2fec8478f3d1d'
-         '4c41dc44ff3e3b64e5a15aa2c1184660'
-         '6fde110c1244662eaf31d517ae2c9690'
-         'b37ce2233807458f5b3835114f04c6df'
-         '8fa56995459873b5dcd03b06ee4a179c'
-         'bfe86fdf0111d7d7d02fb689e197bdd3'
-         'e97fe3f85ac1fc9c1c61edd56527ab25'
-         '5a51f4072f1c7f43832ac1c41a7135fd'
-         'b13e8d2e54bbe35f9da43239cb4a2a16'
-         '71dd0c6257b419f986127db2600851a7'
-         '80a081a31a991fa63af8c26aebbaf8b3'
-         'db7a91026ba03d4bfaadf23c4508ecf2'
-         'a839ad07724553aefb76aa48c988ca3f'
-         'b1e6859da4b078530fa00783c2fc8621'
-         '40abf8376133162a9f7c7ec44e5e06e6'
-         'c4f62ffabe72ae87a096025998887bf9'
-         '1f58d2fbbaf449b4e05a83feddaa7f4e'
-         '9a54443791d8aa7004d085d79e4db1ea'
-         '948138c58a07b5fcb5c254bca5399e22'
-         '8889732de77e9e51bb43c744300a8b10'
-         'fcc0c92d1c1aae27881cba21cd81d15c'
-         'df3946f758bed44d30068bda21aa1af5'
-         'e8b8fbc055f64c0b23a1c5c0ff21c603'
-         'b358b06641cdfff8c8c500679aa632d3'
-         'f7e67fa44a737f9b3a80abb9c3915ce5'
-         '2ee78734669c9e92a103db8c41614cca'
-         'c0605e37d16869969b37b5936e28ff5e'
-         '51371731e61bc1369f47fd9ef263c63e'
-         '37eeb62381928a226472a916fec56844'
-         'a22816fda39678927ca34437da1519b9'
-         'd5910852f9ff4e142b5ad124f2135e59'
-         '3cbe3eb40bb57e6ff11d6377d966a8fc'
-         '64ce138c00140e553689d4265f018898'
-         'c37d831b598ac6e5b0e3e49ec605ff7b'
-         '546deebbe1f27122ff21fbe85dd9ecfd'
-         '1bcacee0782d62298883426a41830531'
-         '69584792a5d7eba4ff80e85456d647c6'
-         '4515b31f20fd2f20bce55f4a1f6c0ec8'
-         '6357aeaf62d7867506c20b38bd2478a3'
-         '54da09a50365fea562b804b4cf2be2c4'
-         '0a8750cc238982882c7872edf2989341'
-         '136d2c2b747e7227207ed7dbb79b294e'
-         '43ae45dae8693c119a8cf703a0bb132a'
-         '3627b7ab8670a3741a48786df22ed2c0'
-         'e4d3db69c334d1021b1982ab87a10d42'
-         '31c7e16225a379dc1fdabc211cd99079'
-         '142e02f1ab3db4f97b37adbf4e3a9138'
-         '617e895568a02588a168c54347f372e6'
-         '093b71d87d5e04311dab30b7a566d708'
-         'e30278d7ac6ca5d09cb688420a221cc0'
-         '3ba61614b3ddbcf3dda18279e199afcd'
-         'eaa1f41fa0ed45a5a3a0ab5b7b9e49d5'
-         '62999792ecd62689855651082d19d167'
-         '05a46c2dd966fd666f13e8db06441cf3'
-         'fdf997b09ab54da41fccc590dba5201e'
-         'bac1fc01d3bede7b4bb14a2290c33040'
-         '08c12984597bbe198329378fc59bacfb'
-         '587cb4938f8eac86e7ad05e7be4b0f9a'
-         '84914182cdb315e1a3a2062993f5cc00'
-         '15abeab9563a56bb0a061714f94bb1c5'
-         '05b190869d198992fda1624feb216a09'
-         '5885e96955025acf86f4186aaba5b794'
-         '37bddedad6898bac58987effeccadfad'
-         '49c0fbe9e0cbf66e24919eb99a612a43'
-         '9333d449ddbc8a3463d5aabacef39956'
-         'ede65b0a4ba01afc53ba8035dc6a054c'
-         'fe40e393535cc3106041592b626995f7'
-         'a5941ca6a2271e0e1b4de3f9e7df5571'
-         '84da1f02c05066fe779e4813befc062e')
+md5sums=('6d4c69921bbdfe92c0fd31873983d426'
+         '4e994c70c93e4d266d273d2358f7acf3'
+         'd783c592edfa96d6abecd1efa1aa1b5e'
+         '70b8badcddb6d5cf6b226c0f0141b463'
+         'bcfe52114b1c0f5346594452117bec5d'
+         '7d8900839fcf5972a91c4ce1a1bdd7c6'
+         'd9720bf726a8f6fde0dc94e6e73863a9'
+         'ce61734ab226dc041b55e95c9b6f9d92'
+         '965c2ec576ac41e7351e159f516ec65f'
+         '4feb78e0dd79606f416b8ab46432ad41'
+         '61989146fe89320c847e4de6261a06ff'
+         '260f3abb8612248493060e2dec6f0a22'
+         '6b49d830c47717001250236c9cc933a5'
+         '338137d425c8e6ae98796f3cc9a0550f'
+         '4ddf33cc1af9d3ad483d8fc47609aee3'
+         'e04918865a21260b8eaf27b3dc84ade5'
+         '59961e347c4fe3816f809f456bc9a2b8'
+         '262ad46f6c6e8a89eb29b590cc092eb9'
+         'e9452d83d914605f06c055c00325bf6b'
+         'ae652d7db9b3cd3cba85306d16a7a599'
+         '04fec5cd927a57ac6c9780a9f42444e1'
+         '70ba3ec972f01e75b144e106afacd8ac'
+         'f1ee7deccf3c73083b51c5741722b120'
+         'ca5566a24ee4fd38a3a907bfb5d72975'
+         'd4717e5c3e44fbaebe4eaf99f0195120'
+         '907c42bdaa3af02c39bef5d83198f8a9'
+         '7afa1ac8645657722cdf3415244e4686'
+         'd3d780b6c8d179c68065d9bec19dce48'
+         '09fae6ea53f5435ccfdbf41f660378ee'
+         '043306182ec497280b3ea78dcbd7b7d3'
+         '8a481d0d41f22d5bc65ed7844a0d7c27'
+         '2a8648998f2aafd307511e043cd8564d'
+         'e7fbc4b7364d151edac9840b90949f56'
+         'e2ea49277375825f612bcfb225dcb0a0'
+         '9fb2a20a2222a0d814a3f48d7208d820'
+         '88976bac6b9e647f4d17ab1638f12601'
+         'a6a39406914459deaefb3403e94dfa39'
+         'd3acecff63909d946fb549520785ef99'
+         'a8327a1a525330ca9ef8e3f9d50ca5f8'
+         'ba3ad9e8843b0de408a72896183985d6'
+         '3dfb48ecea5eda9f0e3e05295eb3c82b'
+         '95a1e7e2ec604409b54f1ded4ee7accf'
+         '69ebeb59c7ff4e0452c9f0998db65ef0'
+         '7bdf97288cef0d14ff1521db063cd20c'
+         '8f50cfa1e8c788b7b839273848dc2834'
+         '3aa0631dc6a53581cf53d559b27a0ee3'
+         '45e7238e0d0e427df04d3ba91ca045cd'
+         'b992cfa2b0440486cd70fd6ab9e32deb'
+         '3a9fac821e039556f7d009080daec643'
+         '6872abed4f4d4b81cf5f0b7b656846c7'
+         'eb44e902c6a6186c85dca8aff1d5b95f'
+         '21f5aeacbb233167218ab7f1b34efdce'
+         'b97e29d866ae1ed422d0a1c4327cfd49'
+         '5cce41015e73c36944224f827ac5a8d1'
+         'a13ac7293acc75015f0034d77ddb0f30'
+         '38c84e214af65ed6f059ad524c923dc9'
+         '66c8d82875f55f67167048e3d6888d8f'
+         '4ec423b8e34a4de058b115fd5918e0b2'
+         '0026e20db1bad1eaf692bd0b2043c038'
+         '31f029a6665ccae9b4c8cac9eda06c6f'
+         'e72ffe020543ca0ad4f8be2aad9e90a9'
+         '7b75e8fb1cd8ae34023b312d2214029a'
+         '88b1a96268e08f65579b2fe6d7677b73'
+         '4418d687e4dcb313fd59247844eab93c'
+         'b200a045163b7c09cde85b82013fec98'
+         '263f6ff19491b68865bcab4309dff0a8'
+         '80d0fb352eb1f252c355d3b8388d3513'
+         'dd79b0c4d959f46852e1e23b0cc984af'
+         'db51a6767331bb3a8c0a1e0f5f35d968'
+         '3155d4cafe5f90ec83336ddd07183629'
+         'b9246693498e1ec3c5b4dffa8145d04e'
+         '770bf78f2a0c6522e641e61e44617b40'
+         'aadf3a6f9517c76e2b37867cb1a654c6'
+         '3530c75b3c2311d8127f20df7bd724da'
+         'ef3bfc5db8197edb095da10390d8e058'
+         '46b701b2db7415b30b82023bb707e1dc'
+         '24da3bee4042e31da5781b02dc089499'
+         'b3faadcabfd6d738a41ee4c12696adcd'
+         '9938f231ce13202d040c24783c95c35b'
+         '04894f460b81525d29367f1ed1504f5e'
+         'c6049613b48eaaa71c45df2e44db1087'
+         '7e7e81ca9c6d44913d37159b4627967c'
+         '1a80a20da9cc26e2edd942d77a35c824')
diff --git a/libre/icecat-i18n/PKGBUILD.in b/libre/icecat-i18n/PKGBUILD.in
new file mode 100644
index 000000000..90c901e31
--- /dev/null
+++ b/libre/icecat-i18n/PKGBUILD.in
@@ -0,0 +1,46 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Contributor: fauno <fauno@kiwwwi.com.ar>
+# Contributor: Figue <ffigue@gmail.com>
+# Based on firefox-i18n package
+
+# When updating to a newer upstream release:
+# - Edit variables in in Makefile.
+# - (optionally) edit PKGBUILD.in
+# - Run 'make'. It will take care of everything else for you.
+
+_langpacks=@LANGPACKS@
+
+pkgbase='icecat-i18n'
+pkgname=($(for lang in ${_langpacks[@]}
+        do echo icecat-i18n-$lang | tr A-Z a-z
+        done))
+_pkgver=@_PKGVER@
+pkgver=@PKGVER@
+pkgrel=@PKGREL@
+pkgdesc="Language packs for GNUzilla IceCat."
+arch=('any')
+license=('MPL')
+url="http://www.gnu.org/software/gnuzilla/"
+depends=("icecat=${pkgver}")
+source=($(for lang in ${_langpacks[@]}
+        do echo http://gnuzilla.gnu.org/download/langpacks/$pkgver/$lang.xpi
+        done))
+noextract=($(for lang in ${_langpacks[@]}
+        do echo $lang.xpi
+        done))
+
+build() {
+  cd "${srcdir}"
+}
+
+_path="/usr/lib/icecat-$_pkgver/extensions/"
+
+for lang in ${_langpacks[@]}
+do
+    eval "
+package_icecat-i18n-$(echo $lang | tr A-Z a-z) () {
+  install -Dm644 '$srcdir/$lang.xpi' \"\${pkgdir}\"'${_path}langpack-$lang@firefox.mozilla.org.xpi'
+}
+"
+done
+
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 718f03057..79274ce21 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -1,130 +1,150 @@
-# Maintainer: Figue <ffigue at gmail>
+# Contributor (ConnochaetOS): Henry Jensen <hjensen@connochaetos.org>
+# Contributor (Parabola): Luke Shumaker <lukeshu@sbcglobal.net>
 # Contributor: Figue <ffigue at gmail>
 # Contributor (Parabola): fauno <fauno@kiwwwi.com.ar>
 # Contributor (Parabola): vando <facundo@esdebian.org>
+# Contributor (Parabola): emulatorman <andre.paulista@adinet.com.uy>
+# Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com>
 # Thank you very much to the older contributors:
 # Contributor: evr <evanroman at gmail>
 # Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> 
 
-# Changelog
-# =6.0
-# * Build with PGO support
-# =3.6.13
-# * Installed Privacy Extension by default
-# * DDG is now the default search engine
-# =3.6.9
-# * Added libnotify as required by configure
-# =3.6.7
-# * Added duckduckgo.com secure search engine
-# =3.6.4
-# * Disabled SafeBrowsing until we find a non-google alternative (25/6/10)
-# * Disabled ContentHandlers and other Google/Yahoo! related services
-
-pkgname=icecat
-pkgver=7.0.1
+# If you are updating this package, don't forget to update the version number in
+# the value for 'browser.dictionaries.download.url' in 'libre.patch'
+
+_pgo=false
+
+_pkgname=icecat
+pkgver=10.0
 pkgrel=1
-pkgdesc="GNU version of the Firefox browser. SafeBrowsing and other Google services disabled!"
+
+if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi
+if $_pgo; then
+  pkgname+='-pgo'
+fi
+
+pkgdesc="The GNUzilla web browser, based on Mozilla Firefox. SafeBrowsing and other Google services disabled!"
 arch=('i686' 'x86_64' 'mips64el')
-license=('MPL' 'GPL' 'LGPL')
-depends=('gtk2' 'mozilla-common' 'nss' 'libxt' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'sqlite3' 'libnotify' 'desktop-file-utils' 'libvpx' 'libevent' 'hicolor-icon-theme')
-makedepends=('p7zip-libre' 'zip' 'pkg-config' 'diffutils' 'python2-libre' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'libidl2' 'xorg-server-xvfb')
-options=(!buildflags !distcc)
+license=('GPL2' 'MPL' 'LGPL')
+depends=(
+  'alsa-lib'
+  'dbus-glib'
+  'desktop-file-utils'
+  'gtk2'
+  'hicolor-icon-theme'
+  'hunspell'
+  'libevent'
+  'libnotify'
+  'libvpx'
+  'libxt'
+  'mime-types'
+  'mozilla-common'
+  'mozilla-searchplugins'
+  'nss>=3.13.1'
+  'sqlite3'
+  'startup-notification'
+)
+makedepends=(
+  'autoconf2.13'
+  'diffutils'
+  'libidl2'
+  'mesa'
+  'pkg-config'
+  'python2'
+  'unzip'
+  'wireless_tools'
+  'yasm'
+  'zip'
+)
+if $_pgo; then
+  makedepends+=('xorg-server-xvfb')
+  options=(!ccache)
+fi
+
 url="http://www.gnu.org/software/gnuzilla/"
 install=icecat.install
 source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz
         mozconfig
+        mozconfig.pgo
         icecat.desktop
         icecat-safe.desktop
-        mozilla-firefox-1.0-lang.patch
-        firefox-version.patch
-# Search engines
-		internet-archive.xml
-		jamendo-en.xml
-		logless-search.xml
-		scroogle-ssl-english.xml
-		yacy.xml
-        duck-duck-go-ssl.xml
-        duck-duck-go-lite.xml
-        Makefile.in
-# Default options
-        firefox.js
-        region.properties)
-md5sums=('eb20dad67baeb5e71c5cfe469dbba378'
-         '927c3ac9ad0ba682e0ec9b66ed8cc4d3'
-         'e81ad01dbc16ba28bf92ba4b7c309ca7'
-         'd93fe402b87cd000a869e1fd6badc6c9'
-         'bd5db57c23c72a02a489592644f18995'
-         'ff4654144499faf630271cddc2261b7c'
-         '462c68585461f8cdc23c93c46f6ee4cf'
-         '2d492295c4308f9bba9ece28d8b3af2d'
-         '937ac0e5392b060d93bd33e761fbfa51'
-         'cf97082e77e3ef5f1bd74b1db9329965'
-         '24528ca3f7f1e1a0ba735231aa3ac1de'
-         'c5f00b6b24222aacd5a749d1f59c4d24'
-         'e1bda0854de7d764f7401c81bb82b5ef'
-         'ff83f1796ee13d3aec494649491d93cc'
-         '9952048383966926eea6d67384102425'
-         'f1c76e7e244257856a386ca2de69bdf0')
+        libre.patch
+        firefox-install-dir.patch
+        vendor.js
+        libvpx.patch)
 
-build() {
-  ICECATDIR="/usr/lib/${pkgname}-${pkgver}" && export ICECATDIR
+if [ "$_pkgname" != "$pkgname" ]; then
+  provides+=("$_pkgname")
+  conflicts+=("$_pkgname")
+fi
 
-  cd "${srcdir}/${pkgname}-${pkgver}/"
-  patch -Np1 -i "${srcdir}/mozilla-firefox-1.0-lang.patch"
-
-# Solve missing reporter locales and preprocessor.pl
-  cp --remove-destination ${srcdir}/Makefile.in ./browser/locales/
+build() {
+  mv "$_pkgname-$pkgver" "$srcdir/mozilla-build"
+  cd "$srcdir/mozilla-build"
 
-# Default prefs, remove Google stuff 
-  cp --remove-destination ${srcdir}/region.properties ./browser/locales/en-US/chrome/browser-region/
-  cp --remove-destination ${srcdir}/firefox.js ./browser/app/profile/
+  cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch
+  patch -Np1 -i "$srcdir/firefox-install-dir.patch" # install to /usr/lib/$pkgname
+  patch -Np1 -i "$srcdir/libre.patch" # Remove Google+Mozilla stuff
+  patch -Np1 -i "$srcdir/libvpx.patch" # patch from Arch
 
-  cp "$srcdir/mozconfig" .mozconfig
-  patch -Np1 -i "$srcdir/mozilla-firefox-1.0-lang.patch"
-  patch -Np1 -i "$srcdir/firefox-version.patch"
+  if $_pgo; then
+    cat "$srcdir/mozconfig.pgo" >> .mozconfig
+  fi
 
   # Fix PRE_RELEASE_SUFFIX
   sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \
-      browser/base/Makefile.in
+    browser/base/Makefile.in
 
-  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/icecat-7.0"
+  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname"
   export PYTHON="/usr/bin/python2"
 
-  LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 &
-  LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS="$MAKEFLAGS"
-  kill $! || true
+  if $_pgo; then
+    LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 &
+    LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS="$MAKEFLAGS"
+    kill $! || true
+  else
+    LD_PRELOAD="" make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
+  fi
 }
 
 package() {
-  ICECATDIR="/usr/lib/${pkgname}-${pkgver}" && export ICECATDIR
-
-  cd "${srcdir}/${pkgname}-${pkgver}/"
+  cd "$srcdir/mozilla-build"
   make -j1 -f client.mk DESTDIR="$pkgdir" install
 
-  msg2 "Finishing..."
-  install -m755 -d ${pkgdir}/usr/share/applications
-  install -m755 -d ${pkgdir}/usr/share/pixmaps
-  install -m644 ${srcdir}/${pkgname}-${pkgver}/browser/branding/unofficial/default48.png ${pkgdir}/usr/share/pixmaps/icecat.png
-  install -m644 ${srcdir}/icecat.desktop ${pkgdir}/usr/share/applications/
-  install -m644 ${srcdir}/icecat-safe.desktop ${pkgdir}/usr/share/applications/
+  install -m644 "$srcdir"/vendor.js "$pkgdir/usr/lib/$_pkgname/defaults/pref"
+
+  brandingdir="browser/branding/unofficial"
+  icondir="$pkgdir/usr/share/icons/hicolor"
+  for i in 16x16 32x32 48x48; do
+    install -Dm644 "$brandingdir/default${i/x*/}.png" "$icondir/$i/apps/$_pkgname.png"
+  done
 
-  cd ${pkgdir}/usr/lib
-  ln -s ${ICECATDIR} icecat
+  install -d                                  "$pkgdir/usr/share/applications"
+  install -m644 "$srcdir/icecat.desktop"      "$pkgdir/usr/share/applications"
+  install -m644 "$srcdir/icecat-safe.desktop" "$pkgdir/usr/share/applications"
 
-  rm -rf "$pkgdir"/usr/lib/icecat-7.0/{dictionaries,hyphenation}
-  ln -sf /usr/share/hunspell "$pkgdir/usr/lib/icecat-7.0/dictionaries"
-  ln -sf /usr/share/hyphen "$pkgdir/usr/lib/icecat-7.0/hyphenation"
+  rm -rf "$pkgdir/usr/lib/$_pkgname/"{dictionaries,hyphenation,searchplugins,plugins}
+  ln -sf /usr/share/hunspell            "$pkgdir/usr/lib/$_pkgname/dictionaries"
+  ln -sf /usr/share/hyphen              "$pkgdir/usr/lib/$_pkgname/hyphenation"
+  ln -sf /usr/lib/mozilla/plugins       "$pkgdir/usr/lib/$_pkgname/plugins"
+  ln -sf /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$_pkgname/searchplugins"
 
   # We don't want the development stuff
-  rm -r "$pkgdir"/usr/{include,lib/icecat-devel-$pkgver,share/idl}
+  rm -rf "$pkgdir"/usr/{include,lib/$_pkgname-devel,share/idl}
 
-  #workaround for now
-  #https://bugzilla.mozilla.org/show_bug.cgi?id=658850
-  ln -sf /usr/lib/icecat-7.0/icecat-bin "$pkgdir/usr/lib/icecat-7.0/icecat"
+  # Fix a bug with https-everywhere (duplicate rules)
+  rm -f "$pkgdir/usr/lib/$pkgname/extensions/https-everywhere@eff.org/chrome/content/rules/GoogleMaps.xml~HEAD"
 
-  msg2 "Removing proprietary and anti-privacy search engines"
-  rm -f ${pkgdir}${ICECATDIR}/searchplugins/{google,answers,amazondotcom,eBay,yahoo,bing}.xml
-  msg2 "And provide better ones..."
-  install -m755 -d ${pkgdir}${ICECATDIR}/searchplugins/
-  install -m644 ${srcdir}/*.xml ${pkgdir}${ICECATDIR}/searchplugins/
+  # Workaround for now: https://bugzilla.mozilla.org/show_bug.cgi?id=658850
+  ln -sf $_pkgname "$pkgdir/usr/lib/$_pkgname/$_pkgname-bin"
 }
+
+md5sums=('5a30f5c5422fb7c9b1a2d253028df9d7'
+         '6f3a8fd65c416216a1b56b0c2d2d81aa'
+         'ac29b01c189f20abae2f3eef1618ffc0'
+         'e81ad01dbc16ba28bf92ba4b7c309ca7'
+         'd93fe402b87cd000a869e1fd6badc6c9'
+         '145f453ef82f643711c10d97ec57a805'
+         '1e4bcac59e93d21fffa6a1d1ad235247'
+         'c382e35315047e4ca368d09383b39b8d'
+         '5d418ecdbdb9f40597df6b978b0b5ee5')
diff --git a/libre/icecat/firefox-install-dir.patch b/libre/icecat/firefox-install-dir.patch
new file mode 100644
index 000000000..b6f9700b3
--- /dev/null
+++ b/libre/icecat/firefox-install-dir.patch
@@ -0,0 +1,28 @@
+diff -Nur mozilla-release.orig/config/autoconf.mk.in mozilla-release/config/autoconf.mk.in
+--- mozilla-release.orig/config/autoconf.mk.in	2011-11-06 14:06:44.462920048 +0000
++++ mozilla-release/config/autoconf.mk.in	2011-11-06 14:20:45.124169469 +0000
+@@ -68,8 +68,8 @@
+ mandir		= @mandir@
+ idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+
+-installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir	= $(libdir)/$(MOZ_APP_NAME)
++sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel
+
+ DIST		= $(DEPTH)/dist
+ LIBXUL_SDK      = @LIBXUL_SDK@
+diff -Nur mozilla-release.orig/js/src/config/autoconf.mk.in mozilla-release/js/src/config/autoconf.mk.in
+--- mozilla-release.orig/js/src/config/autoconf.mk.in	2011-11-06 14:06:45.586263727 +0000
++++ mozilla-release/js/src/config/autoconf.mk.in	2011-11-06 14:21:01.770993669 +0000
+@@ -61,8 +61,8 @@
+ datadir		= @datadir@
+ mandir		= @mandir@
+
+-installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir	= $(libdir)/$(MOZ_APP_NAME)
++sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel
+
+ TOP_DIST	= @TOP_DIST@
+ ifneq (,$(filter /%,$(TOP_DIST)))
diff --git a/libre/icecat/firefox-version.patch b/libre/icecat/firefox-version.patch
index ab5dda540..8b2d74896 100644
--- a/libre/icecat/firefox-version.patch
+++ b/libre/icecat/firefox-version.patch
@@ -5,7 +5,7 @@ diff -Nur mozilla-release.orig/browser/installer/Makefile.in mozilla-release/bro
  
  include $(DEPTH)/config/autoconf.mk
  
-+MOZ_APP_VERSION="7.0"
++MOZ_APP_VERSION="10.0"
 +
  include $(topsrcdir)/config/rules.mk
  
diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch
new file mode 100644
index 000000000..3dca93ee7
--- /dev/null
+++ b/libre/icecat/libre.patch
@@ -0,0 +1,66 @@
+--- icecat-9.0.1.orig/browser/app/profile/firefox.js	2011-12-26 23:11:39.000000000 -0500
++++ icecat-9.0.1/browser/app/profile/firefox.js	2011-12-26 23:12:15.000000000 -0500
+@@ -74,7 +76,7 @@
+ pref("extensions.update.autoUpdateDefault", true);
+ 
+ // Dictionary download preference
+-pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/");
++pref("browser.dictionaries.download.url", "http://gnuzilla.gnu.org/download/langpacks/10.0/");
+ 
+ // The minimum delay in seconds for the timer to fire.
+ // default=2 minutes
+@@ -876,7 +878,7 @@
+ pref("browser.bookmarks.editDialog.firstEditField", "namePicker");
+ 
+ // base url for the wifi geolocation network provider
+-pref("geo.wifi.uri", "https://www.google.com/loc/json");
++pref("geo.wifi.uri", "http://geomena.org");
+ pref("geo.wifi.protocol", 0);
+ 
+ // Whether to use a panel that looks like an OS X sheet for customization
+--- icecat-9.0.1.orig/browser/locales/en-US/chrome/browser-region/region.properties	2011-12-26 07:34:23.000000000 -0500
++++ icecat-9.0.1/browser/locales/en-US/chrome/browser-region/region.properties	2011-12-26 19:59:04.000000000 -0500
+@@ -1,27 +1,19 @@
+ # Default search engine
+-browser.search.defaultenginename=Google
++browser.search.defaultenginename=Duck Duck Go (SSL)
+ 
+ # Search engine order (order displayed in the search bar dropdown)s
+-browser.search.order.1=Google
+-browser.search.order.2=Yahoo
++browser.search.order.1=Duck Duck Go (SSL)
++browser.search.order.2=Duck Duck Go (Lite)
+ 
+-# This is the default set of web based feed handlers shown in the reader
+-# selection UI
+-browser.contentHandlers.types.0.title=Bloglines
+-browser.contentHandlers.types.0.uri=http://www.bloglines.com/login?r=/sub/%s
+-browser.contentHandlers.types.1.title=My Yahoo
+-browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s
+-browser.contentHandlers.types.2.title=Google
+-browser.contentHandlers.types.2.uri=http://fusion.google.com/add?feedurl=%s
+ 
+ # Keyword URL (for location bar searches)
+-keyword.URL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=
++keyword.URL=https://duckduckgo.com/?q=
+ 
+ # URL for site-specific search engines
+ # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
+ # to be searched and the user's search query. Place them in the appropriate location
+ # for your locale's URL but do not translate them.
+-browser.search.siteSearchURL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms}
++browser.search.siteSearchURL=https://duckduckgo.com/?q=site%3A{moz:domain}+{searchTerms}
+ 
+ # increment this number when anything gets changed in the list below.  This will
+ # cause Firefox to re-read these prefs and inject any new handlers into the 
+--- icecat-9.0.1.orig/browser/app/Makefile.in	2011-12-27 00:22:26.000000000 -0500
++++ icecat-9.0.1/browser/app/Makefile.in	2011-12-27 00:23:10.000000000 -0500
+@@ -269,7 +269,7 @@
+ else
+ ifdef LIBXUL_SDK
+ libs::
+-	cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/firefox$(BIN_SUFFIX)
++	cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/icecat$(BIN_SUFFIX)
+ endif
+ endif
+ 
diff --git a/libre/icecat/libvpx.patch b/libre/icecat/libvpx.patch
new file mode 100644
index 000000000..f883b8e08
--- /dev/null
+++ b/libre/icecat/libvpx.patch
@@ -0,0 +1,12 @@
+diff -Nur mozilla-release.orig/configure.in mozilla-release/configure.in
+--- mozilla-release.orig/configure.in	2012-02-05 16:01:35.722024142 +0000
++++ mozilla-release/configure.in	2012-02-05 16:03:34.871064547 +0000
+@@ -5629,7 +5629,7 @@
+             dnl v0.9.6 one to check for.
+             AC_TRY_COMPILE([
+                 #include <vpx/vpx_decoder.h>
+-                #if !defined(VPX_CODEC_USE_INPUT_PARTITION)
++                #if !defined(VPX_CODEC_USE_INPUT_FRAGMENTS)
+                     #error "test failed."
+                 #endif
+                 ],
diff --git a/libre/icecat/mozconfig b/libre/icecat/mozconfig
index a5810e33a..b769079d8 100644
--- a/libre/icecat/mozconfig
+++ b/libre/icecat/mozconfig
@@ -1,8 +1,9 @@
 . $topsrcdir/browser/config/mozconfig
 
-ac_add_options --disable-official-branding
 ac_add_options --prefix=/usr
 ac_add_options --libdir=/usr/lib
+
+# System libraries
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
 ac_add_options --with-system-jpeg
@@ -13,53 +14,41 @@ ac_add_options --with-system-libevent
 ac_add_options --with-system-libvpx
 ac_add_options --enable-system-hunspell
 ac_add_options --enable-system-sqlite
+ac_add_options --enable-system-ffi
 ac_add_options --enable-system-cairo
+ac_add_options --enable-system-pixman
 ac_add_options --with-pthreads
 
-ac_add_options --enable-default-toolkit=cairo-gtk2
-ac_add_options --disable-safe-browsing
-ac_add_options --enable-extensions=default
+# Features
 ac_add_options --enable-startup-notification
-ac_add_options --enable-pango
-ac_add_options --enable-svg
-ac_add_options --enable-canvas
-ac_add_options --enable-smil
-ac_add_options --enable-canvas3d
-ac_add_options --enable-places
-ac_add_options --enable-url-classifier
-
-ac_add_options --enable-optimize
-ac_add_options --enable-strip
-ac_add_options --enable-install-strip
-ac_add_options --enable-jemalloc
-ac_add_options --enable-xterm-updates
-ac_add_options --enable-printing
-ac_add_options --enable-xinerama
-ac_add_options --with-distribution-id=org.gnu.gnuzilla
-ac_add_options --with-user-appdir=.gnuzilla
-ac_add_options --with-branding=browser/branding/unofficial
+ac_add_options --enable-gio
 
-ac_add_options --disable-javaxpcom
+ac_add_options --disable-gnomevfs
 ac_add_options --disable-crashreporter
 ac_add_options --disable-updater
 ac_add_options --disable-tests
 ac_add_options --disable-mochitest
-ac_add_options --disable-debug
 ac_add_options --disable-installer
-ac_add_options --disable-pedantic
-ac_add_options --disable-static
 
-ac_add_options --enable-gio
-ac_add_options --disable-gnomevfs
-ac_add_options --enable-libnotify
+# Optimization
+ac_add_options --enable-optimize
 
-export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
-mk_add_options BUILD_OFFICIAL=1
 mk_add_options MOZILLA_OFFICIAL=1
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir
+
+# IceCat
+export MOZ_PHOENIX=1
+mk_add_options MOZ_PHOENIX=1
+
+ac_add_options --disable-official-branding
+ac_add_options --with-branding=browser/branding/unofficial
+ac_add_options --with-distribution-id=org.gnu.gnuzilla
+ac_add_options --with-user-appdir=.gnuzilla
+
+# Parabola
+ac_add_options --disable-safe-browsing
+export BUILD_OFFICIAL=1
+mk_add_options BUILD_OFFICIAL=1
 
-# PGO
-ac_add_options --enable-profile-guided-optimization
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/ff-pgo
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
-mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo'
+# Build-generated
diff --git a/libre/icecat/mozconfig.default b/libre/icecat/mozconfig.default
new file mode 100644
index 000000000..01e047fc3
--- /dev/null
+++ b/libre/icecat/mozconfig.default
@@ -0,0 +1,63 @@
+# This is a better commented version of the default .mozconfig from 9.0.1
+ac_add_options --enable-application=browser
+
+ac_add_options --prefix=/usr/local
+#ac_add_options --with-default-mozilla-five-home=/usr/local/lib
+
+# System libraries
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-zlib
+#ac_add_options --with-system-png
+ac_add_options --disable-system-cairo 
+#ac_add_options --with-pthreads
+
+ac_add_options --disable-toolkit-qt
+ac_add_options --enable-toolkit-cairo-gtk2
+ac_add_options --enable-default-toolkit=cairo-gtk2
+ac_add_options --enable-svg-renderer=cairo
+
+# Features
+ac_add_options --enable-extensions="default spellcheck"
+ac_add_options --enable-freetype2
+ac_add_options --enable-pango
+ac_add_options --enable-crypto
+#ac_add_options --enable-postscript
+ac_add_options --enable-svg
+ac_add_options --enable-xft
+
+ac_add_options --disable-chatzilla
+ac_add_options --disable-accessibility
+ac_add_options --disable-calendar
+ac_add_options --disable-composer
+
+#ac_add_options --disable-jsd
+#ac_add_options --disable-libxul
+ac_add_options --disable-ipc
+ac_add_options --disable-ldap
+ac_add_options --disable-mailnews
+ac_add_options --disable-negotiateauth
+ac_add_options --disable-profilesharing
+ac_add_options --disable-xinerama
+ac_add_options --disable-xprint
+
+ac_add_options --disable-crashreporter
+ac_add_options --disable-updater
+ac_add_options --disable-tests
+ac_add_options --disable-mochitest 
+ac_add_options --disable-installer
+
+ac_add_options --disable-debug
+
+# Optimization
+ac_add_options --disable-elf-dynstr-gc
+ac_add_options --enable-optimize="-pipe -O3"
+ac_add_options --enable-strip
+
+# IceCat
+export MOZ_PHOENIX=1
+mk_add_options MOZ_PHOENIX=1
+
+ac_add_options --disable-official-branding
+ac_add_options --with-branding=browser/branding/unofficial
+ac_add_options --with-distribution-id=org.gnu.gnuzilla
+ac_add_options --with-user-appdir=.gnuzilla
diff --git a/libre/icecat/mozconfig.firefox b/libre/icecat/mozconfig.firefox
new file mode 100644
index 000000000..428503642
--- /dev/null
+++ b/libre/icecat/mozconfig.firefox
@@ -0,0 +1,46 @@
+# This is the .mozconfig used by Arch for Firefox
+. $topsrcdir/browser/config/mozconfig
+
+ac_add_options --prefix=/usr
+ac_add_options --libdir=/usr/lib
+
+# System libraries
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-zlib
+ac_add_options --with-system-bz2
+ac_add_options --with-system-png
+ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
+ac_add_options --enable-system-hunspell
+ac_add_options --enable-system-sqlite
+ac_add_options --enable-system-ffi
+ac_add_options --enable-system-cairo
+ac_add_options --enable-system-pixman
+ac_add_options --with-pthreads
+
+# Features
+ac_add_options --enable-official-branding
+ac_add_options --enable-safe-browsing
+ac_add_options --enable-startup-notification
+ac_add_options --enable-gio
+
+ac_add_options --disable-gnomevfs
+ac_add_options --disable-crashreporter
+ac_add_options --disable-updater
+ac_add_options --disable-tests
+ac_add_options --disable-mochitest
+ac_add_options --disable-installer
+
+# Optimization
+ac_add_options --enable-optimize
+
+# PGO
+ac_add_options --enable-profile-guided-optimization
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/ff-pgo
+mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
+mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo'
+
+export MOZILLA_OFFICIAL=1
+mk_add_options MOZILLA_OFFICIAL=1
diff --git a/libre/icecat/mozconfig.old b/libre/icecat/mozconfig.old
new file mode 100644
index 000000000..a790aee48
--- /dev/null
+++ b/libre/icecat/mozconfig.old
@@ -0,0 +1,78 @@
+# This is a better commented version of the .mozconfig used by the Parabola
+# package < v9
+. $topsrcdir/browser/config/mozconfig
+
+ac_add_options --prefix=/usr
+ac_add_options --libdir=/usr/lib
+
+# System libraries
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-zlib
+ac_add_options --with-system-bz2
+ac_add_options --with-system-png
+ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
+ac_add_options --enable-system-hunspell
+ac_add_options --enable-system-sqlite
+ac_add_options --enable-system-cairo
+ac_add_options --with-pthreads
+
+ac_add_options --enable-default-toolkit=cairo-gtk2
+
+# Features
+ac_add_options --enable-extensions=default
+
+ac_add_options --enable-url-classifier
+ac_add_options --enable-startup-notification
+ac_add_options --enable-gio
+
+ac_add_options --enable-canvas
+ac_add_options --enable-canvas3d
+ac_add_options --enable-places
+ac_add_options --enable-smil
+ac_add_options --enable-svg
+
+ac_add_options --disable-javaxpcom
+ac_add_options --enable-libnotify
+ac_add_options --enable-printing
+ac_add_options --enable-xinerama
+ac_add_options --enable-xterm-updates
+
+ac_add_options --disable-gnomevfs
+ac_add_options --disable-crashreporter
+ac_add_options --disable-update
+ac_add_options --disable-tests
+ac_add_options --disable-mochitest
+ac_add_options --disable-installer
+
+ac_add_options --disable-debug
+
+# Optimization
+ac_add_options --disable-pedantic
+ac_add_options --disable-static
+ac_add_options --enable-install-strip
+ac_add_options --enable-jemalloc
+ac_add_options --enable-optimize
+ac_add_options --enable-strip
+
+# PGO
+ac_add_options --enable-profile-guided-optimization
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/ff-pgo
+mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
+mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo'
+
+export MOZILLA_OFFICIAL=1
+mk_add_options MOZILLA_OFFICIAL=1
+
+# IceCat
+ac_add_options --disable-official-branding
+ac_add_options --with-branding=browser/branding/unofficial
+ac_add_options --with-distribution-id=org.gnu.gnuzilla
+ac_add_options --with-user-appdir=.gnuzilla
+
+# Parabola
+ac_add_options --disable-safe-browsing
+export BUILD_OFFICIAL=1
+mk_add_options BUILD_OFFICIAL=1
diff --git a/libre/icecat/mozconfig.pgo b/libre/icecat/mozconfig.pgo
new file mode 100644
index 000000000..b0c249ebf
--- /dev/null
+++ b/libre/icecat/mozconfig.pgo
@@ -0,0 +1,4 @@
+# PGO
+ac_add_options --enable-profile-guided-optimization
+mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
+mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo'
diff --git a/libre/icecat/vendor.js b/libre/icecat/vendor.js
new file mode 100644
index 000000000..808d1b118
--- /dev/null
+++ b/libre/icecat/vendor.js
@@ -0,0 +1,5 @@
+// Use LANG environment variable to choose locale
+pref("intl.locale.matchOS", true);
+
+// Disable default browser checking.
+pref("browser.shell.checkDefaultBrowser", false);
diff --git a/libre/java-asm2/PKGBUILD b/libre/java-asm2/PKGBUILD
new file mode 100644
index 000000000..4853d79c0
--- /dev/null
+++ b/libre/java-asm2/PKGBUILD
@@ -0,0 +1,76 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+_pkgname=asm
+pkgname=java-asm2
+_pkgver=2
+pkgver=2.2.3
+pkgrel=4
+pkgdesc="An all purpose Java bytecode manipulation and analysis framework."
+arch=('any')
+url="http://asm.ow2.org/"
+license=('custom:BSD3')
+depends=('java-runtime')
+makedepends=(
+  apache-ant
+  java-ow-util-ant-tasks
+)
+source=("http://download.forge.objectweb.org/$_pkgname/$_pkgname-$pkgver.tar.gz")
+
+_M2_LOCALREPO='/usr/share/maven/repository'
+_ow_util_ant_tasks='/usr/share/java/ow_util_ant_tasks.jar'
+_m2_packages=(
+  asm
+  asm-analysis
+  asm-attrs
+  asm-commons
+  asm-tree
+  asm-util
+  asm-xml
+  asm-all)
+
+build() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  mkdir -p test/lib
+
+  echo "objectweb.ant.tasks.path $_ow_util_ant_tasks" >> build.properties
+  ant dist
+
+  # This will make package() easier:
+  cd output/dist/lib
+  ln -s all/* .
+}
+
+package() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  # Install license file
+  install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+  # Install documentation
+  cd output/dist
+  install -d "$pkgdir/usr/share/doc/$pkgname"
+  cp -r doc/javadoc/user "$pkgdir/usr/share/doc/$pkgname/javadoc"
+  cp -r examples         "$pkgdir/usr/share/doc/$pkgname/examples"
+  
+  # Install Apache Maven modules
+  cd lib
+  install -d "$pkgdir"/usr/share/java/asm
+  for pkg in "${_m2_packages[@]}"; do
+    dir="$_M2_LOCALREPO"/asm/$pkg/$pkgver
+    # Create the Maven directory
+    install -d "$pkgdir$dir"
+    # Install the files
+    cp $pkg-$pkgver.* "$pkgdir$dir"
+    # Symlink them to /usr/share/java
+    ln -s "$dir"/$pkg-$pkgver.jar "$pkgdir"/usr/share/java/asm/
+    ln -s asm/$pkg-$pkgver.jar "$pkgdir"/usr/share/java/$pkg-$_pkgver.jar
+  done
+  
+  # Install a README file about the -all files
+  cd "$srcdir/$_pkgname-$pkgver"
+  install -m644 output/dist/lib/all/README.txt \
+    "$pkgdir"/usr/share/java/asm/README-$pkgver.txt
+}
+
+md5sums=('7a92c87bf067925685cf68dcc0dd8998')
diff --git a/libre/java-asm3/PKGBUILD b/libre/java-asm3/PKGBUILD
new file mode 100644
index 000000000..7e66a5b5a
--- /dev/null
+++ b/libre/java-asm3/PKGBUILD
@@ -0,0 +1,78 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+_pkgname=asm
+pkgname=java-asm3
+_pkgver=3
+pkgver=3.3.1
+pkgrel=4.1
+pkgdesc="An all purpose Java bytecode manipulation and analysis framework."
+arch=('any')
+url="http://asm.ow2.org/"
+license=('custom:BSD3')
+depends=('java-runtime')
+makedepends=(
+  apache-ant
+  java-ow-util-ant-tasks
+)
+source=("http://download.forge.objectweb.org/$_pkgname/$_pkgname-$pkgver.tar.gz")
+
+_M2_LOCALREPO='/usr/share/maven/repository'
+_ow_util_ant_tasks='/usr/share/java/ow_util_ant_tasks.jar'
+_m2_packages=(
+  asm
+  asm-analysis
+  asm-commons
+  asm-parent
+  asm-tree
+  asm-util
+  asm-xml
+  asm-all
+  asm-debug-all)
+
+build() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  rm cobertura.ser # We regenerate this
+  rm examples/jasmin/test/jasmin.jar
+
+  echo "objectweb.ant.tasks.path $_ow_util_ant_tasks" >> build.properties
+  ant dist
+
+  # This will make package() easier:
+  cd output/dist/lib
+  ln -s all/* .
+}
+
+package() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  # Install license file
+  install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+  # Install documentation
+  cd output/dist
+  install -d "$pkgdir/usr/share/doc/$pkgname"
+  cp -r doc/javadoc/user "$pkgdir/usr/share/doc/$pkgname/javadoc"
+  cp -r examples         "$pkgdir/usr/share/doc/$pkgname/examples"
+  
+  # Install Apache Maven modules
+  cd lib
+  install -d "$pkgdir"/usr/share/java/asm
+  for pkg in "${_m2_packages[@]}"; do
+    dir="$_M2_LOCALREPO"/asm/$pkg/$pkgver
+    # Create the Maven directory
+    install -d "$pkgdir$dir"
+    # Install the files
+    cp $pkg-$pkgver.* "$pkgdir$dir"
+    # Symlink them to /usr/share/java
+    ln -s "$dir"/$pkg-$pkgver.jar "$pkgdir"/usr/share/java/asm/
+    ln -s asm/$pkg-$pkgver.jar "$pkgdir"/usr/share/java/$pkg-$_pkgver.jar
+  done
+  
+  # Install a README file about the -all files
+  cd "$srcdir/$_pkgname-$pkgver"
+  install -m644 output/dist/lib/all/README.txt \
+    "$pkgdir"/usr/share/java/asm/README-$pkgver.txt
+}
+
+md5sums=('433024df8176f09922646316e415631c')
diff --git a/libre/java-ow-util-ant-tasks/PKGBUILD b/libre/java-ow-util-ant-tasks/PKGBUILD
new file mode 100644
index 000000000..023048188
--- /dev/null
+++ b/libre/java-ow-util-ant-tasks/PKGBUILD
@@ -0,0 +1,27 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+pkgname=java-ow-util-ant-tasks
+pkgver=1.3.2
+pkgrel=1
+pkgdesc="ObjectWeb utility Ant tasks library"
+arch=('any')
+url="http://forge.ow2.org/projects/monolog"
+license=('LGPL')
+depends=('java-environment')
+makedepends=('apache-ant' 'xalan-java' 'java-asm2')
+source=("http://repo.parabolagnulinux.org/sources/${pkgname}-${pkgver}-1-any.src.tar.xz")
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ln -s /usr/share/java/asm-2.jar externals
+  ln -s /usr/share/java/xalan.jar externals
+  ant jar
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  install -d "$pkgdir"/usr/share/java
+  install -m644 "output/lib/ow_util_ant_tasks.jar" "$pkgdir"/usr/share/java
+}
+
+md5sums=('339b3eb4b2960473a42f5f781afbeca6')
diff --git a/libre/java-ow-util-ant-tasks/SRCBUILD b/libre/java-ow-util-ant-tasks/SRCBUILD
new file mode 100644
index 000000000..01241907d
--- /dev/null
+++ b/libre/java-ow-util-ant-tasks/SRCBUILD
@@ -0,0 +1,29 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+pkgname=java-ow-util-ant-tasks
+pkgver=1.3.2
+pkgrel=1
+pkgdesc="ObjectWeb utility Ant tasks library"
+arch=('any')
+url="http://forge.ow2.org/projects/monolog"
+license=('LGPL')
+source=("http://download.forge.objectweb.org/monolog/ow_util_ant_tasks_$pkgver.zip")
+noextract=("ow_util_ant_tasks_$pkgver.zip")
+
+build() {
+  cd "$srcdir"
+  mkdir $pkgname-$pkgver
+  cd $pkgname-$pkgver
+  bsdtar xf "$srcdir"/ow_util_ant_tasks_$pkgver.zip
+  rm -rf output
+  rm externals/*
+}
+
+
+package() {
+  PKGEXT=${SRCEXT}
+  PKGDEST=${SRCDEST}
+  cp -a "$srcdir/$pkgname-$pkgver" "$pkgdir/"
+}
+
+md5sums=('cd602bf75a0feab480fa97739955b84e')
diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD
index 48e36633f..f3f344e30 100644
--- a/libre/kdebase-konqueror-libre/PKGBUILD
+++ b/libre/kdebase-konqueror-libre/PKGBUILD
@@ -1,11 +1,12 @@
-# Parabola maintainer: Michał Masłowski <mtjm@mtjm.eu>
-# $Id: PKGBUILD 147790 2012-01-28 10:33:05Z andrea $
+# $Id$
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
+# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
+# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
 
 _pkgname='kdebase-konqueror'
 pkgname='kdebase-konqueror-libre'
-pkgver=4.8.0
+pkgver=4.8.1
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://kde.org/applications/internet/konqueror/"
@@ -14,7 +15,7 @@ groups=('kde' 'kdebase')
 makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml')
 source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.bz2"
     "konq-about-fsdg.diff")
-sha1sums=('25151b551793164c5eb1cb303d3031e63a6122e3'
+sha1sums=('7df527a537b5431ab551339338ea289c32ec43be'
           'f41541371414dcbe5e76687835e648112b3ff364')
 pkgdesc='KDE File Manager & Web Browser'
 depends=('kdebase-dolphin' 'kdebase-keditbookmarks')
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD
index 0ebd5b60e..e792acf9f 100644
--- a/libre/kdelibs-libre/PKGBUILD
+++ b/libre/kdelibs-libre/PKGBUILD
@@ -1,11 +1,12 @@
-# $Id: PKGBUILD 149297 2012-02-06 17:49:28Z andrea $
+# $Id: PKGBUILD 153517 2012-03-15 13:55:48Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
+# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
 
 _pkgname=kdelibs
 pkgname=kdelibs-libre
-pkgver=4.8.0
-pkgrel=3.1
+pkgver=4.8.1
+pkgrel=2
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
@@ -21,11 +22,13 @@ conflicts=('kdelibs')
 install=${_pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2"
         'kde-applications-menu.patch'
-        'fix-knotify-filepath.patch'
+        'fix-kmail-crash.patch'
+        'use-pythondontwritebytecode.patch'
         'khtml-fsdg.diff')
-sha1sums=('5e4744405734e6c3ce572ef7d16054390692b38a'
+sha1sums=('ec393b096003f1dd57c5e2987381b086ba1b363e'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
-          '3312f6005aa56a9b992c74008fe5b314f1c8ffba'
+          '081b0663480568359120b573d26abb91e1a348c0'
+          'a1e35760d5b4e29471ad357c963a343c67200f32'
           'a1502a964081ad583a00cf90c56e74bf60121830')
 
 build() {
@@ -34,8 +37,11 @@ build() {
        # avoid file conflict with gnome-menus
        patch -p1 -i "${srcdir}"/kde-applications-menu.patch
 
-       # https://bugs.kde.org/show_bug.cgi?id=285028
-       patch -p1 -i "${srcdir}"/fix-knotify-filepath.patch
+       # Upstream (FS#28907)
+       patch -p1 -i "${srcdir}"/fix-kmail-crash.patch
+
+       # Set PYTHONDONTWRITEBYTECODE (KDEBUG#276151)
+       patch -p0 -i "${srcdir}"/use-pythondontwritebytecode.patch
 
        # Don't ask the user to download a plugin, it's probably nonfree.
        patch -p1 -i "${srcdir}"/khtml-fsdg.diff
diff --git a/libre/kdelibs-libre/fix-kmail-crash.patch b/libre/kdelibs-libre/fix-kmail-crash.patch
new file mode 100644
index 000000000..27caa25f0
--- /dev/null
+++ b/libre/kdelibs-libre/fix-kmail-crash.patch
@@ -0,0 +1,71 @@
+commit 979b0436510e7807c054e79c40c3753834ac2863
+Author: Sebastian Trueg <trueg@kde.org>
+Date:   Thu Mar 15 09:14:35 2012 +0100
+
+    Thread-safe ResourceWatcher handling.
+    
+    We simply perform all RW operations in the manager thread.
+    
+    BUG: 295474
+    FIXED-IN: 4.8.2
+
+diff --git a/nepomuk/core/resourcedata.cpp b/nepomuk/core/resourcedata.cpp
+index abe55ea..9d45228 100644
+--- a/nepomuk/core/resourcedata.cpp
++++ b/nepomuk/core/resourcedata.cpp
+@@ -175,7 +175,8 @@ void Nepomuk::ResourceData::resetAll( bool isDelete )
+     if( !m_uri.isEmpty() ) {
+         m_rm->m_initializedData.remove( m_uri );
+         if( m_rm->m_watcher && m_addedToWatcher ) {
+-            m_rm->m_watcher->removeResource(Resource::fromResourceUri(m_uri));
++            // See load() for an explanation of the QMetaObject call
++            QMetaObject::invokeMethod(m_rm->m_watcher, "removeResource", Qt::AutoConnection, Q_ARG(Nepomuk::Resource, Resource::fromResourceUri(m_uri)));
+             m_addedToWatcher = false;
+         }
+     }
+@@ -393,16 +394,23 @@ bool Nepomuk::ResourceData::load()
+         m_cache.clear();
+ 
+         if(!m_rm->m_watcher) {
++            //
++            // The ResourceWatcher is not thread-safe. Thus, we need to ensure the safety ourselves.
++            // We do that by simply handling all RW related operations in the manager thread.
++            // This also means to invoke methods on the watcher through QMetaObject to make sure they
++            // get queued in case of calls between different threads.
++            //
+             m_rm->m_watcher = new ResourceWatcher(m_rm->m_manager);
++            m_rm->m_watcher->moveToThread(m_rm->m_manager->thread());
+             QObject::connect( m_rm->m_watcher, SIGNAL(propertyAdded(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)),
+                               m_rm->m_manager, SLOT(slotPropertyAdded(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)) );
+             QObject::connect( m_rm->m_watcher, SIGNAL(propertyRemoved(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)),
+                               m_rm->m_manager, SLOT(slotPropertyRemoved(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)) );
+             m_rm->m_watcher->addResource( Nepomuk::Resource::fromResourceUri(m_uri) );
+-            m_rm->m_watcher->start();
++            QMetaObject::invokeMethod(m_rm->m_watcher, "start", Qt::AutoConnection);
+         }
+         else {
+-            m_rm->m_watcher->addResource( Nepomuk::Resource::fromResourceUri(m_uri) );
++            QMetaObject::invokeMethod(m_rm->m_watcher, "addResource", Qt::AutoConnection, Q_ARG(Nepomuk::Resource, Nepomuk::Resource::fromResourceUri(m_uri)) );
+         }
+         m_addedToWatcher = true;
+ 
+diff --git a/nepomuk/core/resourcewatcher.h b/nepomuk/core/resourcewatcher.h
+index 06b9622..92b12f5 100644
+--- a/nepomuk/core/resourcewatcher.h
++++ b/nepomuk/core/resourcewatcher.h
+@@ -93,6 +93,7 @@ namespace Nepomuk {
+          */
+         virtual ~ResourceWatcher();
+ 
++    public Q_SLOTS:
+         /**
+          * \brief Add a type to be watched.
+          *
+@@ -204,7 +205,6 @@ namespace Nepomuk {
+          */
+         QList<Types::Property> properties() const;
+ 
+-    public Q_SLOTS:
+         /**
+          * \brief Start the signalling of changes.
+          *
diff --git a/libre/kdelibs-libre/fix-knotify-filepath.patch b/libre/kdelibs-libre/fix-knotify-filepath.patch
deleted file mode 100644
index 2cd995e97..000000000
--- a/libre/kdelibs-libre/fix-knotify-filepath.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/knotify/config/knotifyconfigactionswidget.cpp b/knotify/config/knotifyconfigactionswidget.cpp
-index 88d18b6..0e76658 100644
---- a/knotify/config/knotifyconfigactionswidget.cpp
-+++ b/knotify/config/knotifyconfigactionswidget.cpp
-@@ -128,7 +128,7 @@ void KNotifyConfigActionsWidget::slotPlay(  )
- 	KUrl soundURL = m_ui.Sound_select->url();
- 	if ( soundURL.isRelative() )
- 	{
--		QString soundString = soundURL.toLocalFile();
-+		QString soundString = m_ui.Sound_select->text();
- 		// we need a way to get the application name in order to ba able to do this :
- 		/*QString search = QString("%1/sounds/%2").arg(config->appname).arg(soundFile);
- 		search = KGlobal::mainComponent().dirs()->findResource("data", search);
diff --git a/libre/kdelibs-libre/use-pythondontwritebytecode.patch b/libre/kdelibs-libre/use-pythondontwritebytecode.patch
new file mode 100644
index 000000000..bab46a9a2
--- /dev/null
+++ b/libre/kdelibs-libre/use-pythondontwritebytecode.patch
@@ -0,0 +1,80 @@
+--- cmake/modules/PythonMacros.cmake
++++ cmake/modules/PythonMacros.cmake
+@@ -23,40 +23,42 @@
+   # Install the source file.
+   INSTALL(FILES ${SOURCE_FILE} DESTINATION ${DESINATION_DIR})
+ 
+-  # Byte compile and install the .pyc file.        
+-  GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE)
+-  GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME)
+-  GET_FILENAME_COMPONENT(_filenamebase ${SOURCE_FILE} NAME_WE)
+-  GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH)
+-
+-  if(WIN32)
+-    string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}")
+-  endif(WIN32)
+-
+-  SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename})
+-  SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
+-
+-  FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath})
+-
+-  SET(_message "-DMESSAGE=Byte-compiling ${_bin_py}")
+-
+-  GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE)
+-  IF(_abs_bin_py STREQUAL ${_absfilename})    # Don't copy the file onto itself.
+-    ADD_CUSTOM_COMMAND(
+-      TARGET compile_python_files
+-      COMMAND ${CMAKE_COMMAND} -E echo ${message}
+-      COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
+-      DEPENDS ${_absfilename}
+-    )
+-  ELSE(_abs_bin_py STREQUAL ${_absfilename})
+-    ADD_CUSTOM_COMMAND(
+-      TARGET compile_python_files
+-      COMMAND ${CMAKE_COMMAND} -E echo ${message} 
+-      COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py}
+-      COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
+-      DEPENDS ${_absfilename}
+-    )
+-  ENDIF(_abs_bin_py STREQUAL ${_absfilename})
++  # Byte compile and install the .pyc file.
++  IF("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "")
++    GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE)
++    GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME)
++    GET_FILENAME_COMPONENT(_filenamebase ${SOURCE_FILE} NAME_WE)
++    GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH)
++
++    if(WIN32)
++      string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}")
++    endif(WIN32)
++
++    SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename})
++    SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
++
++    FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath})
++
++    SET(_message "-DMESSAGE=Byte-compiling ${_bin_py}")
++
++    GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE)
++    IF(_abs_bin_py STREQUAL ${_absfilename})    # Don't copy the file onto itself.
++      ADD_CUSTOM_COMMAND(
++        TARGET compile_python_files
++        COMMAND ${CMAKE_COMMAND} -E echo ${message}
++        COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
++        DEPENDS ${_absfilename}
++      )
++    ELSE(_abs_bin_py STREQUAL ${_absfilename})
++      ADD_CUSTOM_COMMAND(
++        TARGET compile_python_files
++        COMMAND ${CMAKE_COMMAND} -E echo ${message}
++        COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py}
++        COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
++        DEPENDS ${_absfilename}
++      )
++    ENDIF(_abs_bin_py STREQUAL ${_absfilename})
+ 
+-  INSTALL(FILES ${_bin_pyc} DESTINATION ${DESINATION_DIR})
++    INSTALL(FILES ${_bin_pyc} DESTINATION ${DESINATION_DIR})
++  ENDIF("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "")
+ ENDMACRO(PYTHON_INSTALL)
diff --git a/libre/kdenetwork-libre/PKGBUILD b/libre/kdenetwork-libre/PKGBUILD
index e744b22ef..c19457577 100644
--- a/libre/kdenetwork-libre/PKGBUILD
+++ b/libre/kdenetwork-libre/PKGBUILD
@@ -1,6 +1,7 @@
-# $Id: PKGBUILD 150223 2012-02-15 09:34:48Z andrea $
+# $Id: PKGBUILD 152429 2012-03-06 21:02:38Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
+# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
 
 pkgbase=kdenetwork
 pkgname=('kdenetwork-filesharing'
@@ -10,7 +11,7 @@ pkgname=('kdenetwork-filesharing'
          'kdenetwork-kppp'
          'kdenetwork-krdc'
          'kdenetwork-krfb')
-pkgver=4.8.0
+pkgver=4.8.1
 pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -21,10 +22,10 @@ makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'ppp'
     'v4l-utils' 'libidn' 'rdesktop' 'qimageblitz' 'libxdamage' 'libgadu'
     'libktorrent' 'libmms' 'mediastreamer')
 source=("http://repo.parabolagnulinux.org/other/${pkgbase}-libre-${pkgver}.tar.xz")
-sha1sums=('2472128aef671e3474505cf65397dfc7ef9f79bb')
+sha1sums=('953424a894acf60b6326cd9d9f045f0a9b548e7c')
 
 # Based on http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/make-kdenetwork, revision 34.
-mksource() {
+-mksource() {
     [ -f "${pkgbase}-${pkgver}.tar.bz2" ] || wget "http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
     tar xf "${pkgbase}-${pkgver}.tar.bz2"
     cd "${pkgbase}-${pkgver}"
diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD
index 737c0cb55..d5e9fb378 100644
--- a/libre/kdeutils-ark-libre/PKGBUILD
+++ b/libre/kdeutils-ark-libre/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 147905 2012-01-28 10:36:46Z andrea $
+# $Id: PKGBUILD 152399 2012-03-06 18:32:16Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
 
 _pkgname=kdeutils-ark
 pkgname=kdeutils-ark-libre
-pkgver=4.8.0
+pkgver=4.8.1
 pkgrel=1
 pkgdesc='Archiving Tool'
 url='http://kde.org/applications/utilities/ark/'
@@ -18,7 +19,7 @@ replaces=('kdeutils-ark')
 conflicts=('kdeutils-ark')
 install=${_pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.bz2")
-sha1sums=('99756e0896938371d6d7036fb3d5d0d152de29c3')
+sha1sums=('403622ede8e28ed417c677ac8d71b1221582cff5')
 
 build() {
   cd "${srcdir}"
diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD
index 8ee55b4ba..b3ee94095 100644
--- a/libre/liferea-libre/PKGBUILD
+++ b/libre/liferea-libre/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id$
+# $Id: PKGBUILD 144935 2011-12-11 03:21:39Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
-# Contributor: bitlord
+# Contributor (Parabola): bitlord
+# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
 
 pkgbasename=liferea
 pkgname=liferea-libre
-pkgver=1.6.6b
+pkgver=1.8.1b
 pkgrel=1
 pkgdesc="A desktop news aggregator for online news feeds and weblogs"
 arch=('i686' 'x86_64')
@@ -13,35 +14,18 @@ provides=("liferea=$pkgver")
 replaces=('liferea')
 conflicts=('liferea')
 license=('GPL')
-depends=('gconf' 'libwebkit' 'libxslt' 'libglade' 'sqlite3' 'hicolor-icon-theme')
-makedepends=('pkg-config' 'intltool' 'lua' 'libnotify')
-optdepends=('lua: for lua scripting support'
-            'libnotify: for notification support')
+depends=('gconf' 'libwebkit' 'libnotify' 'libunique' 'json-glib' 'hicolor-icon-theme')
+makedepends=('intltool')
 options=('!libtool' '!emptydirs')
 install=liferea.install
-source=(http://repo.parabolagnulinux.org/other/$pkgname-$pkgver.tar.gz
-        libnotify-0.7.patch
+source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.gz
         remove-non-free-suggestions.patch)
-md5sums=('3e6a113a30f8d813c3a7ece4691d5afe'
-         'fca97e3316c1c51e0179c4c7dcce47a2'
-         'e138b67a6bc62d4ba0eb64b781105bf0')
-
-# source PKGBUILD ; mksource
-mksource() {
-    wget http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.gz \
-         -O - | tar xzf -
-
-    pushd liferea-$pkgver >/dev/null
-    patch -Np1 -i "../remove-non-free-suggestions.patch" || return 1
-    popd >/dev/null
-
-    tar cvzf $pkgname-$pkgver.tar.gz liferea-$pkgver/
-    rm -rvf liferea-$pkgver/
-}
+md5sums=('70f27bfda41ff5b3b4e49c49c9dc88af'
+         'e2fdcbc485ce6ff7956c8527be152ca6')
 
 build() {
   cd "${srcdir}/liferea-${pkgver}"
-  patch -Np1 -i "$srcdir/libnotify-0.7.patch"
+  patch -Np1 -i "$srcdir/remove-non-free-suggestions.patch"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-schemas-install
   make
 }
diff --git a/libre/liferea-libre/remove-non-free-suggestions.patch b/libre/liferea-libre/remove-non-free-suggestions.patch
index 8d1809122..325017567 100644
--- a/libre/liferea-libre/remove-non-free-suggestions.patch
+++ b/libre/liferea-libre/remove-non-free-suggestions.patch
@@ -1,6 +1,6 @@
---- liferea-1.6.6b/src/ui/ui_prefs.c_orig	2011-06-23 01:33:39.761555322 +0200
-+++ liferea-1.6.6b/src/ui/ui_prefs.c	2011-06-23 01:38:02.121556890 +0200
-@@ -76,24 +76,10 @@
+--- liferea-1.8.0/src/browser.c_orig	2011-11-28 19:50:57.000000000 -0200
++++ liferea-1.8.0/src/browser.c	2012-03-07 14:49:31.862987204 -0200
+@@ -35,24 +35,16 @@
  		NULL, NULL
  	},
  	{
@@ -9,8 +9,12 @@
 -		NULL, "mozilla -remote openURL(%s)",
 -		NULL, "mozilla -remote 'openURL(%s,new-window)'",
 -		NULL, "mozilla -remote 'openURL(%s,new-tab)'"
--	},
--	{
++		"iceweasel", "Iceweasel", "iceweasel %s",
++		NULL, "iceweasel \"%s\"",
++		NULL, "iceweasel -new-window \"%s\"",
++		NULL, "iceweasel -new-tab \"%s\""
+ 	},
+ 	{
 -		/* tested with Firefox 1.5 and 2.0 */
 -		"firefox", "Firefox","firefox \"%s\"",
 -		NULL, "firefox -a firefox -remote \"openURL(%s)\"",
@@ -22,10 +26,10 @@
 -		"opera \"%s\"", "opera -remote \"openURL(%s)\"",
 -		"opera -newwindow \"%s\"", NULL,
 -		"opera -newpage \"%s\"", NULL
-+		"icecat", "IceCat","icecat \"%s\"",
-+		NULL, "icecat -a icecat -remote \"openURL(%s)\"",
-+		NULL, "icecat -a icecat -remote 'openURL(%s,new-window)'",
-+		NULL, "icecat -a icecat -remote 'openURL(%s,new-tab)'"
++		"icecat", "Icecat", "icecat %s",
++		NULL, "icecat \"%s\"",
++		NULL, "icecat -new-window \"%s\"",
++		NULL, "icecat -new-tab \"%s\""
  	},
  	{
  		"epiphany", "Epiphany","epiphany \"%s\"",
diff --git a/libre/linux-libre-api-headers/PKGBUILD b/libre/linux-libre-api-headers/PKGBUILD
new file mode 100644
index 000000000..a55354717
--- /dev/null
+++ b/libre/linux-libre-api-headers/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Allan McRae <allan@archlinux.org>
+# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+
+# toolchain build order: linux-libre-api-headers->glibc->binutils->gcc->binutils->glibc
+
+pkgname=linux-libre-api-headers
+pkgver=3.1.6
+_basever=3.1
+pkgrel=2
+pkgdesc="Kernel Libre headers sanitized for use in userspace"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.gnu.org/software/libc"
+license=('GPL2')
+provides=("linux-api-headers=${pkgver}" "kernel-headers=${pkgver}")
+conflicts=('linux-api-headers' 'kernel-headers')
+replaces=('linux-api-headers' 'kernel-headers')
+source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basever}-libre/linux-${_basever}-libre.tar.xz"
+        "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/patch-${_basever}-libre-${pkgver}-libre.xz")
+md5sums=('d73df15ab1d36fe3c102755d8f42117f'
+         'cb42276bca126c676c51d02d74bf7fe7')
+
+build() {
+  cd ${srcdir}/linux-${_basever}
+  [[ $pkgver != $_basever ]] && patch -Np1 -i ${srcdir}/patch-${_basever}-libre-${pkgver}-libre
+
+  make mrproper
+  make headers_check
+}
+
+package() {
+  cd ${srcdir}/linux-${_basever}
+  make INSTALL_HDR_PATH=${pkgdir}/usr headers_install
+
+  # use headers from libdrm
+  rm -rf ${pkgdir}/usr/include/drm
+  
+  # clean-up unnecessary files generated during install
+  find ${pkgdir} -name .install -or -name ..install.cmd | xargs rm -f
+}
diff --git a/libre/linux-libre-lts/.directory b/libre/linux-libre-lts/.directory
new file mode 100644
index 000000000..60156bc93
--- /dev/null
+++ b/libre/linux-libre-lts/.directory
@@ -0,0 +1,2 @@
+[Dolphin]
+Timestamp=2012,3,15,16,10,14
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 0c9e95b83..2fd86a35a 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -2,22 +2,24 @@
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Contributor (Parabola): Márcio Silva <coadde@adinet.com.uy>
 
 pkgbase=linux-libre-lts
 pkgname=('linux-libre-lts' 'linux-libre-lts-headers') # Build stock -LIBRE kernel
 # pkgname=linux-custom       # Build kernel with a different name
-_kernelname=${pkgname#linux-libre}
+_kernelname=-LIBRE-LTS
 _basekernel=3.0
-pkgver=${_basekernel}.22
+_sublevel=25
+pkgver=${_basekernel}.${_sublevel}
+_lxopkgver=${_basekernel}.24 # nearly always the same as pkgver
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 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://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${pkgver}-libre-lemote_0lxo_mipsel.tar.bz2"
+source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz"
+        "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz"
         # the main kernel config files
         'config.i686' 'config.x86_64'
         # standard config files for mkinitcpio ramdisk
@@ -27,25 +29,31 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-li
         'boot-logo.patch'
         'change-default-console-loglevel.patch'
         'i915-fix-ghost-tv-output.patch'
-        'ext4-options.patch')
-md5sums=('44e7bc20c235a193f9b6123a8d5e9509'
-         'ddc0925df01b70f6eef95e9b4160f28a'
-         '248d057fd2341d315ada5e844cdbdc1f'
-         '054af37f538b74a8090fc3e783a2edfa'
-         'e195768d5b8cbe788dbe615561d4314f'
+        'ext4-options.patch'
+        "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-libre-lemote_0lxo_mipsel.tar.bz2")
+md5sums=('5f64180fe7df4e574dac5911b78f5067'
+         'f7b2ffc8ddec5819f8bac7d6c2afc629'
+         '8870dc3eff3ada9abf727892a9503350'
+         '33e7aa6dd13f780b8b65653dfa81c57e'
          'd2c0701480bce49fd4b40dc46b9863f1'
          '2967cecc3af9f954ccc822fd63dca6ff'
          '8267264d9a8966e57fdacd1fa1fc65c4'
          '04b21c79df0a952c22d681dd4f4562df'
          '9d3c56a4b999c8bfbd4018089a62f662'
          '263725f20c0b9eb9c353040792d644e5'
-         '74d2b710d6c97aee441d7566f8f68815')
+         'f36222e7ce20c8e4dc27376f9be60f6c'
+         '0b11552c826f65b666dfb53f2c8c12bb')
+if [ "$CARCH" != "mips64el" ]; then
+    # Don't use the Loongson-specific patches on non-mips64el arches.
+    unset source[${#source[@]}-1]
+    unset md5sums[${#md5sums[@]}-1]
+fi
 
 build() {
   cd "${srcdir}/linux-${_basekernel}"
 
   if [ "${_basekernel}" != "${pkgver}" ]; then
-    patch -Np1 -i "${srcdir}/patch-${_basekernel}-libre-${pkgver}-libre"
+    patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu"
   fi
 
   # Add freedo as boot logo
@@ -71,16 +79,22 @@ build() {
 
   if [ "$CARCH" == "mips64el" ]; then
     sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile
+    sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
+        < "${srcdir}/lxo-config.patch" > lxo-config.patch
     msg2 "Adding loongson-community patches"
     patch -Np1 -i ${srcdir}/${_basekernel}*-*-loongson-community.patch
-    patch -Np0 -i "${srcdir}/lxo-config.patch"
+    patch -Np0 -i lxo-config.patch
 
-# ensure N32, add localversion and remove uevent helper as per
+# ensure N32, add localversion, remove uevent helper as per
 # https://git.kernel.org/?p=linux/hotplug/udev.git;a=blob_plain;f=README
-    sed -i -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \
+# and make USB storage support builtin (e.g. for booting from USB
+# disks without slowly loading an initramfs)
+    sed -ri -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \
         -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \
         -e "s|CONFIG_UEVENT_HELPER_PATH=.*|CONFIG_UEVENT_HELPER_PATH=\"\"|g" \
-        -e "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"-LIBRE\"|g" ./.config
+        -e "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" \
+        -e "s;(CONFIG_USB(_COMMON|_EHCI_HCD|_OHCI_HCD|_STORAGE.*|_UAS)?)=.*;\1=y;g" \
+        ./.config
   else
     cat "${srcdir}/config.${CARCH}" > ./.config # simpler
   fi
@@ -114,7 +128,12 @@ build() {
 
   # build!
   if [ "$CARCH" == "mips64el" ]; then
-    make ${MAKEFLAGS} vmlinuz modules
+    # The build system passes it directly to linker, disable to avoid
+    # having unknown -Wl,... options.
+    export LDFLAGS=""
+    # bzImage is arch-specific and not supported on mips; vmlinux is
+    # useful for oprofile.
+    make ${MAKEFLAGS} vmlinux vmlinuz modules
   else
     make ${MAKEFLAGS} bzImage modules
   fi
@@ -122,14 +141,19 @@ build() {
 
 package_linux-libre-lts() {
   pkgdesc="The Linux-libre Kernel and modules - stable longtime supported kernel package suitable for servers"
-  groups=('base')
-  depends=('coreutils' 'module-init-tools>=3.16' 'mkinitcpio>=0.7')
+  depends=('coreutils' 'module-init-tools>=3.16')
   optdepends=('crda: to set the correct wireless channels of your country')
   provides=('kernel26-lts' "linux-lts=$pkgver")
   conflicts=('kernel26-lts' 'kernel26-libre-lts' 'linux-lts')
   replaces=('kernel26-lts' 'kernel26-libre-lts' 'linux-lts')
   backup=("etc/mkinitcpio.d/${pkgname}.preset")
   install=${pkgname}.install
+  if [ "$CARCH" = "mips64el" ]; then
+      optdepends+=('mkinitcpio: to make the initramfs (needs reinstall of this package)')
+      conflicts+=('mkinitcpio<0.7')
+  else
+      depends+=('mkinitcpio>=0.7')
+  fi
 
   cd "${srcdir}/linux-${_basekernel}"
 
@@ -144,6 +168,7 @@ package_linux-libre-lts() {
 
   if [ "$CARCH" == "mips64el" ]; then
     cp vmlinuz "${pkgdir}/boot/vmlinuz-${pkgname}"
+    cp vmlinux "${pkgdir}/boot/vmlinux-${pkgname}"
   else
     cp "arch/${KARCH}/boot/bzImage" "${pkgdir}/boot/vmlinuz-${pkgname}"
   fi
@@ -156,10 +181,6 @@ package_linux-libre-lts() {
 
   # set correct depmod command for install
   sed \
-    -e  "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/g" \
-    -e  "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \
-    -i "${startdir}/${pkgname}.install"
-  sed \
     -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgname}\"|g" \
     -e "s|default_image=.*|default_image=\"/boot/initramfs-${pkgname}.img\"|g" \
     -e "s|fallback_image=.*|fallback_image=\"/boot/initramfs-${pkgname}-fallback.img\"|g" \
@@ -185,7 +206,7 @@ package_linux-libre-lts() {
 }
 
 package_linux-libre-lts-headers() {
-  pkgdesc="Header files and scripts for building modules for linux-libre longtime supported kernel"
+  pkgdesc="Header files and scripts for building modules for linux-libre-lts-headers longtime supported kernel"
   provides=('kernel26-lts-headers' "linux-lts-headers=${pkgver}")
   conflicts=('kernel26-lts-headers' 'kernel26-libre-lts-headers' 'linux-lts-headers')
   replaces=('kernel26-lts-headers' 'kernel26-libre-lts-headers' 'linux-lts-headers')
@@ -195,7 +216,7 @@ package_linux-libre-lts-headers() {
 
 # In case of repackaging this is empty
   if [ -z "${_kernver}" ]; then
-    cd ${srcdir}/linux-$pkgver
+    cd "${srcdir}/linux-${_basekernel}"
     _kernver="$(make kernelrelease)"
   fi
 
@@ -229,7 +250,7 @@ package_linux-libre-lts-headers() {
 
   if [ "$CARCH" = "mips64el" ]; then
     cp "arch/${KARCH}/Kbuild" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
-    cp "arch/${KARCH}/loongson" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
+    cp -a "arch/${KARCH}/loongson" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
     cp "${srcdir}/Kbuild.platforms" "${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/"
   fi
 
@@ -335,19 +356,3 @@ package_linux-libre-lts-headers() {
   fi
 }
 
-package_linux-libre-docs() {
-  pkgdesc="Kernel hackers manual - HTML documentation that comes with the Linux-libre kernel."
-  provides=('kernel26-docs' "linux-docs=$pkgver")
-  conflicts=('kernel26-docs' 'kernel26-libre-docs' 'linux-docs')
-  replaces=('kernel26-docs' 'kernel26-libre-docs' 'linux-docs')
-
-  cd "${srcdir}/linux-${_basekernel}"
-
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}"
-  cp -al Documentation "${pkgdir}/usr/src/linux-${_kernver}"
-  find "${pkgdir}" -type f -exec chmod 444 {} \;
-  find "${pkgdir}" -type d -exec chmod 755 {} \;
-
-  # remove a file already in linux package
-  rm -f "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile"
-}
diff --git a/libre/linux-libre-lts/config.i686 b/libre/linux-libre-lts/config.i686
index 820ee9b2b..f39e9c870 100644
--- a/libre/linux-libre-lts/config.i686
+++ b/libre/linux-libre-lts/config.i686
@@ -511,17 +511,17 @@ CONFIG_APM_DO_ENABLE=y
 # CPU Frequency scaling
 #
 CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_TABLE=m
+CONFIG_CPU_FREQ_TABLE=y
 CONFIG_CPU_FREQ_STAT=m
 CONFIG_CPU_FREQ_STAT_DETAILS=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=m
 CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
 
 #
@@ -5455,7 +5455,7 @@ CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
 CONFIG_SCHED_DEBUG=y
-# CONFIG_SCHEDSTATS is not set
+CONFIG_SCHEDSTATS=y
 CONFIG_TIMER_STATS=y
 # CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_SLUB_DEBUG_ON is not set
diff --git a/libre/linux-libre-lts/config.x86_64 b/libre/linux-libre-lts/config.x86_64
index a8c0e10c0..6ec74a8a4 100644
--- a/libre/linux-libre-lts/config.x86_64
+++ b/libre/linux-libre-lts/config.x86_64
@@ -494,17 +494,17 @@ CONFIG_SFI=y
 # CPU Frequency scaling
 #
 CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_TABLE=m
+CONFIG_CPU_FREQ_TABLE=y
 CONFIG_CPU_FREQ_STAT=m
 CONFIG_CPU_FREQ_STAT_DETAILS=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=m
 CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
 
 #
@@ -5197,7 +5197,7 @@ CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
 CONFIG_SCHED_DEBUG=y
-# CONFIG_SCHEDSTATS is not set
+CONFIG_SCHEDSTATS=y
 CONFIG_TIMER_STATS=y
 # CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_SLUB_DEBUG_ON is not set
diff --git a/libre/linux-libre-lts/ext4-options.patch b/libre/linux-libre-lts/ext4-options.patch
index 4aa23fdef..ef1b2417d 100644
--- a/libre/linux-libre-lts/ext4-options.patch
+++ b/libre/linux-libre-lts/ext4-options.patch
@@ -12,28 +12,28 @@ index 502c61f..30de9cd 100644
 --- a/fs/ext4/super.c
 +++ b/fs/ext4/super.c
 @@ -1333,6 +1333,7 @@ enum {
-	Opt_inode_readahead_blks, Opt_journal_ioprio,
-	Opt_dioread_nolock, Opt_dioread_lock,
-	Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable,
+ 	Opt_inode_readahead_blks, Opt_journal_ioprio,
+ 	Opt_dioread_nolock, Opt_dioread_lock,
+ 	Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable,
 +	Opt_nocheck, Opt_reservation, Opt_noreservation, Opt_journal_inum,
  };
-
+ 
  static const match_table_t tokens = {
 @@ -1408,6 +1409,10 @@ static const match_table_t tokens = {
-	{Opt_init_itable, "init_itable=%u"},
-	{Opt_init_itable, "init_itable"},
-	{Opt_noinit_itable, "noinit_itable"},
+ 	{Opt_init_itable, "init_itable=%u"},
+ 	{Opt_init_itable, "init_itable"},
+ 	{Opt_noinit_itable, "noinit_itable"},
 +	{Opt_nocheck, "nocheck"},
 +	{Opt_reservation, "reservation"},
 +	{Opt_noreservation, "noreservation"},
 +	{Opt_journal_inum, "journal=%u"},
-	{Opt_err, NULL},
+ 	{Opt_err, NULL},
  };
-
+ 
 @@ -1904,6 +1909,16 @@ set_qf_format:
-		case Opt_noinit_itable:
-			clear_opt(sb, INIT_INODE_TABLE);
-			break;
+ 		case Opt_noinit_itable:
+ 			clear_opt(sb, INIT_INODE_TABLE);
+ 			break;
 +#ifdef CONFIG_EXT4_USE_FOR_EXT23
 +		case Opt_nocheck:
 +		case Opt_reservation:
@@ -44,6 +44,6 @@ index 502c61f..30de9cd 100644
 +			       "by ext4 module", p);
 +			break;
 +#endif
-		default:
-			ext4_msg(sb, KERN_ERR,
-			       "Unrecognized mount option \"%s\" "
-\ No newline at end of file
+ 		default:
+ 			ext4_msg(sb, KERN_ERR,
+ 			       "Unrecognized mount option \"%s\" "
diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install
index 6cf57ce44..8468b0e12 100644
--- a/libre/linux-libre-lts/linux-libre-lts.install
+++ b/libre/linux-libre-lts/linux-libre-lts.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-lts
-KERNEL_VERSION=3.0.22-1-LIBRE-LTS
+KERNEL_VERSION=3.0.25-1-LIBRE-LTS
 
 post_install () {
   # updating module dependencies
@@ -17,8 +17,9 @@ post_install () {
     [ -f /etc/lilo.conf ] && loaders="$loaders /etc/lilo.conf"
     if [ -n "${loaders}" ] && grep -q -e vmlinuz26 -e kernel26.img -e kernel26-fallback.img $loaders; then
       # add compat symlinks for the initramfs images
-      ln -sf initramfs-linux-libre${KERNEL_NAME}.img /boot/kernel26${KERNEL_NAME}.img
-      ln -sf initramfs-linux-libre${KERNEL_NAME}-fallback.img /boot/kernel26${KERNEL_NAME}-fallback.img
+      ln -sf initramfs-linux-libre${KERNEL_NAME}.img boot/kernel26${KERNEL_NAME}.img
+      ln -sf initramfs-linux-libre${KERNEL_NAME}-fallback.img \
+        boot/kernel26${KERNEL_NAME}-fallback.img
       ln -sf vmlinuz-linux-libre${KERNEL_NAME} /boot/vmlinuz26${KERNEL_NAME}
     fi
   fi
diff --git a/libre/linux-libre-manpages/PKGBUILD b/libre/linux-libre-manpages/PKGBUILD
new file mode 100644
index 000000000..1422f451f
--- /dev/null
+++ b/libre/linux-libre-manpages/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+# Maintainer: Thomas Baechler <thomas@archlinux.org>
+# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+
+pkgname=linux-libre-manpages
+pkgver=3.1
+pkgrel=1
+pkgdesc="Kernel hackers manual - Section 9 manpages that comes with the Linux-libre kernel."
+arch=('any')
+url="http://linux-libre.fsfla.org/"
+license=('GPL2')
+makedepends=('xmlto' 'docbook-xsl')
+replaces=('kernel26-manpages' 'linux-manpages')
+conflicts=('kernel26-manpages' 'linux-manpages')
+provides=('kernel26-manpages' 'linux-manpages')
+source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/linux-libre-${pkgver}-gnu.tar.xz")
+md5sums=('38703cdbb0b9107e7220bc094c5e36b1')
+
+build() {
+  cd "${srcdir}/linux-$pkgver"
+  make mandocs
+}
+
+package() {
+  install -d "${pkgdir}/usr/share/man/man9/"
+  install "${srcdir}"/linux-$pkgver/Documentation/DocBook/man/*.9.gz \
+    "${pkgdir}/usr/share/man/man9/"
+
+  find "${pkgdir}" -type f -exec chmod 644 {} \;
+}
diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
new file mode 100644
index 000000000..e87e9ceb2
--- /dev/null
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -0,0 +1,73 @@
+# $Id$
+# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+
+pkgbase=linux-libre-tools
+pkgname=('perf-libre' 'cpupower-libre')
+pkgver=3.3
+kernver=${pkgver}
+pkgrel=1.1
+license=('GPL2')
+arch=('i686' 'x86_64' 'mips64el')
+url='http://linux-libre.fsfla.org/'
+options=('!strip')
+makedepends=('asciidoc' 'xmlto')
+# split packages need all package dependencies set manually in makedepends
+makedepends+=('python2-libre' 'libnewt' 'elfutils' 'pciutils')
+source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$kernver-gnu/linux-libre-$kernver-gnu.tar.xz"
+        'cpupower.rc'
+        'cpupower.conf'
+        'cpupower.service')
+md5sums=('5487da14ca81715a469c7594d39722fa'
+         '26af384ca282bc0dc38ff65acc7bb4b9'
+         '18d5aa9e4c6bb23bb02bf65e155e0f0e'
+         '20870541e88109d2f153be3c58a277f1')
+
+build() {
+  msg2 'Build perf'
+  cd linux-$kernver/tools/perf
+  make PYTHON=python2 DESTDIR="${pkgdir}/usr" perfexecdir="lib/$pkgname" \
+    PERF_VERSION=$pkgver-$pkgrel all man
+
+  msg2 'Build cpupower'
+  # we cannot use --as-needed
+  LDFLAGS=${LDFLAGS:+"$LDFLAGS,--no-as-needed"}
+  cd "$srcdir/linux-$kernver/tools/power/cpupower"
+  make VERSION=$pkgver-$pkgrel
+}
+
+package_perf-libre() {
+  pkgdesc='Linux-libre kernel performance auditing tool'
+  depends=('python2-libre' 'libnewt' 'elfutils')
+  replaces=('perf')  
+  conflicts=('perf')
+  provides=("perf=$pkgver")
+
+  cd linux-${kernver}/tools/perf
+  make PYTHON=python2 DESTDIR="${pkgdir}/usr" perfexecdir="lib/$pkgname" \
+    PERF_VERSION=$pkgver install install-man
+}
+
+package_cpupower-libre() {
+  pkgdesc='Linux-libre kernel tool to examine and tune power saving related features of your processor'
+  backup=('etc/conf.d/cpupower')
+  depends=('pciutils')
+  replaces=('cpupower')
+  conflicts=('cpupower' 'cpufrequtils')
+  provides=("cpupower=$pkgver")
+
+  # install rc.d script
+  install -D -m 755 cpupower.rc "$pkgdir/etc/rc.d/cpupower"
+  install -D -m 644 cpupower.conf "$pkgdir/etc/conf.d/cpupower"
+  install -D -m 644 cpupower.service "$pkgdir/lib/systemd/system/cpupower.service"
+
+  cd linux-$kernver/tools/power/cpupower
+  make \
+    DESTDIR="$pkgdir" \
+    INSTALL='/bin/install -c' \
+    mandir='/usr/share/man' \
+    docdir='/usr/share/doc/cpupower' \
+    install install-man
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/linux-libre-tools/cpupower.conf b/libre/linux-libre-tools/cpupower.conf
new file mode 100644
index 000000000..f4e9cc4c8
--- /dev/null
+++ b/libre/linux-libre-tools/cpupower.conf
@@ -0,0 +1,28 @@
+# Define CPUs governor
+# valid governors: ondemand, performance, powersave, conservative, userspace.
+#governor='ondemand'
+
+# Limit frequency range
+# Valid suffixes: Hz, kHz (default), MHz, GHz, THz
+#min_freq="2.25GHz"
+#max_freq="3GHz"
+
+# Specific frequency to be set.
+# Requires userspace governor to be available and loaded.
+#freq=
+
+# Utilizes cores in one processor package/socket first before processes are
+# scheduled to other processor packages/sockets.
+# See man (1) CPUPOWER-SET for additional details.
+#mc_scheduler=
+
+# Utilizes thread siblings of one processor core first before processes are
+# scheduled to other cores. See man (1) CPUPOWER-SET for additional details.
+#smp_scheduler=
+
+#  Sets a register on supported Intel processore which allows software to convey
+# its policy for the relative importance of performance versus energy savings to
+# the  processor. See man (1) CPUPOWER-SET for additional details.
+#perf_bias=
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/linux-libre-tools/cpupower.rc b/libre/linux-libre-tools/cpupower.rc
new file mode 100644
index 000000000..9b0bcddb7
--- /dev/null
+++ b/libre/linux-libre-tools/cpupower.rc
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+[[ -f /etc/conf.d/cpupower ]] && . /etc/conf.d/cpupower
+
+case "$1" in
+  start|restart)
+    stat_busy "Setting cpupower rules"
+    declare -i fail=0
+
+    # frequency-set options
+    declare -a params=()
+    params+=(${governor:+-g $governor})
+    params+=(${min_freq:+-d $min_freq})
+    params+=(${max_freq:+-u $max_freq})
+    params+=(${freq:+-f $freq})
+    if ((${#params[@]} > 0)); then
+      cpupower frequency-set "${params[@]}" >/dev/null || fail=1
+    fi
+
+    # set options
+    declare -a params=()
+    params+=(${mc_scheduler:+-m $mc_scheduler})
+    params+=(${smp_scheduler:+-s $smp_scheduler})
+    params+=(${perf_bias:+-b $perf_bias})
+    if ((${#params[@]} > 0)); then
+      cpupower set "${params[@]}" >/dev/null || fail=1
+    fi
+
+    # print failure if any
+    (($fail > 0)) && stat_fail && exit 1 || stat_done
+  ;;
+  *)
+  echo "usage: $0 {start|restart}"  
+esac
+
+true
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/linux-libre-tools/cpupower.service b/libre/linux-libre-tools/cpupower.service
new file mode 100644
index 000000000..f77cfdc97
--- /dev/null
+++ b/libre/linux-libre-tools/cpupower.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Apply cpupower configuration
+
+[Service]
+Type=oneshot
+ExecStart=/etc/rc.d/cpupower start
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/libre/linux-libre/.directory b/libre/linux-libre/.directory
new file mode 100644
index 000000000..73b1767da
--- /dev/null
+++ b/libre/linux-libre/.directory
@@ -0,0 +1,2 @@
+[Dolphin]
+Timestamp=2012,3,19,13,36,16
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 4b8523b51..67e0f252c 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -4,22 +4,26 @@
 # Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
 # Maintainer (Parabola): Sorin-Mihai Vârgolici <smv@yobicore.org>
 # Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
+# Contributor (Parabola): Márcio Silva <coadde@adinet.com.uy>
 
 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.2
-pkgver=${_basekernel}.7
+_kernelname=-LIBRE
+_basekernel=3.3
+#_sublevel=11
+#pkgver=${_basekernel}.${_sublevel}
+pkgver=${_basekernel}
+#_lxopkgver=${_basekernel}.11 # nearly always the same as pkgver
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 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://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${pkgver}-libre-lemote_0lxo_mipsel.tar.bz2"
+source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz"
+        #"http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/patch-${_basekernel}-libre-${pkgver}-libre.xz"
         # the main kernel config files
         'config.i686' 'config.x86_64'
         # standard config files for mkinitcpio ramdisk
@@ -29,26 +33,32 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-li
         'boot-logo.patch'
         'change-default-console-loglevel.patch'
         'i915-fix-ghost-tv-output.patch'
-        'i915-gpu-finish.patch')
-md5sums=('27c641c4f6785fc647cdd3e44963a55c'
-         '37a0fdc7ad19c9489faf09925b4fae5b'
-         '690e6201d219638544d2fba3996dc822'
-         '79db8a444fd149e409f706830d8cee9a'
-         'e26dbcb367a2b48f5ed09560e2ae8fa0'
+        'i915-gpu-finish.patch'
+        'ext4-options.patch')
+        #"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-libre-lemote_0lxo_mipsel.tar.bz2")
+md5sums=('5487da14ca81715a469c7594d39722fa'
+         '20cd44a8bc4056cfa0b9ce2cc659dd30'
+         'aaf85ef4f4c87959c07a5cef7c216788'
          'a8a3843046926eb7ab81312cd438c5c5'
          '2967cecc3af9f954ccc822fd63dca6ff'
          '8267264d9a8966e57fdacd1fa1fc65c4'
          '04b21c79df0a952c22d681dd4f4562df'
          '9d3c56a4b999c8bfbd4018089a62f662'
          '263725f20c0b9eb9c353040792d644e5'
-         '4cd79aa147825837dc8bc9f6b736c0a0')
+         '4cd79aa147825837dc8bc9f6b736c0a0'
+         'bb7fd1aa23016c8057046b84fd4eb528')
+#if [ "$CARCH" != "mips64el" ]; then
+#    # Don't use the Loongson-specific patches on non-mips64el arches.
+#    unset source[${#source[@]}-1]
+#    unset md5sums[${#md5sums[@]}-1]
+#fi
 
 build() {
   cd "${srcdir}/linux-${_basekernel}"
 
-  if [ "${_basekernel}" != "${pkgver}" ]; then
-    patch -Np1 -i "${srcdir}/patch-${_basekernel}-libre-${pkgver}-libre"
-  fi
+#  if [ "${_basekernel}" != "${pkgver}" ]; then
+#    patch -Np1 -i "${srcdir}/patch-${_basekernel}-libre-${pkgver}-libre"
+#  fi
 
   # Add freedo as boot logo
   patch -Np1 -i "${srcdir}/boot-logo.patch"
@@ -71,20 +81,28 @@ build() {
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
   patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
 
+  # fix ext4 module to mount ext3/2 correct
+  # https://bugs.archlinux.org/task/28653
+  patch -Np1 -i "${srcdir}/ext4-options.patch"
+
   if [ "$CARCH" == "mips64el" ]; then
     sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile
+    sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
+        < "${srcdir}/lxo-config.patch" > lxo-config.patch
     msg2 "Adding loongson-community patches"
     patch -Np1 -i ${srcdir}/${_basekernel}*-*-loongson-community.patch
-    patch -Np0 -i "${srcdir}/lxo-config.patch"
+    patch -Np0 -i lxo-config.patch
 
-# ensure N32, add localversion and remove uevent helper as per
+# ensure N32, add localversion, remove uevent helper as per
 # https://git.kernel.org/?p=linux/hotplug/udev.git;a=blob_plain;f=README
-    sed -i -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \
+# and make USB storage support builtin (e.g. for booting from USB
+# disks without slowly loading an initramfs)
+    sed -ri -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \
+        -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \
         -e "s|CONFIG_UEVENT_HELPER_PATH=.*|CONFIG_UEVENT_HELPER_PATH=\"\"|g" \
-        -e "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"-LIBRE\"|g" ./.config
-
-# Build BATMAN_ADV module
-    sed -i -e "s|\(# \)\?CONFIG_BATMAN_ADV\[ =\].*|CONFIG_BATMAN_ADV=m|g" ./.config
+        -e "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" \
+        -e "s;(CONFIG_USB(_COMMON|_EHCI_HCD|_OHCI_HCD|_STORAGE.*|_UAS)?)=.*;\1=y;g" \
+        ./.config
   else
     cat "${srcdir}/config.${CARCH}" > ./.config # simpler
   fi
@@ -118,7 +136,12 @@ build() {
 
   # build!
   if [ "$CARCH" == "mips64el" ]; then
-    make ${MAKEFLAGS} vmlinuz modules
+    # The build system passes it directly to linker, disable to avoid
+    # having unknown -Wl,... options.
+    export LDFLAGS=""
+    # bzImage is arch-specific and not supported on mips; vmlinux is
+    # useful for oprofile.
+    make ${MAKEFLAGS} vmlinux vmlinuz modules
   else
     make ${MAKEFLAGS} bzImage modules
   fi
@@ -127,13 +150,19 @@ build() {
 package_linux-libre() {
   pkgdesc="The Linux-libre Kernel and modules"
   groups=('base')
-  depends=('coreutils' 'module-init-tools>=3.16' 'mkinitcpio>=0.7')
+  depends=('coreutils' 'module-init-tools>=3.16')
   optdepends=('crda: to set the correct wireless channels of your country')
   provides=('kernel26' "linux=$pkgver")
   conflicts=('kernel26' 'kernel26-libre' 'linux')
   replaces=('kernel26' 'kernel26-libre' 'linux')
   backup=("etc/mkinitcpio.d/${pkgname}.preset")
   install=${pkgname}.install
+  if [ "$CARCH" = "mips64el" ]; then
+      optdepends+=('mkinitcpio: to make the initramfs (needs reinstall of this package)')
+      conflicts+=('mkinitcpio<0.7')
+  else
+      depends+=('mkinitcpio>=0.7')
+  fi
 
   cd "${srcdir}/linux-${_basekernel}"
 
@@ -148,6 +177,7 @@ package_linux-libre() {
 
   if [ "$CARCH" == "mips64el" ]; then
     cp vmlinuz "${pkgdir}/boot/vmlinuz-${pkgname}"
+    cp vmlinux "${pkgdir}/boot/vmlinux-${pkgname}"
   else
     cp "arch/${KARCH}/boot/bzImage" "${pkgdir}/boot/vmlinuz-${pkgname}"
   fi
@@ -160,10 +190,6 @@ package_linux-libre() {
 
   # set correct depmod command for install
   sed \
-    -e  "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/g" \
-    -e  "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \
-    -i "${startdir}/${pkgname}.install"
-  sed \
     -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgname}\"|g" \
     -e "s|default_image=.*|default_image=\"/boot/initramfs-${pkgname}.img\"|g" \
     -e "s|fallback_image=.*|fallback_image=\"/boot/initramfs-${pkgname}-fallback.img\"|g" \
@@ -199,7 +225,7 @@ package_linux-libre-headers() {
 
 # In case of repackaging this is empty
   if [ -z "${_kernver}" ]; then
-    cd ${srcdir}/linux-$pkgver
+    cd "${srcdir}/linux-${_basekernel}"
     _kernver="$(make kernelrelease)"
   fi
 
@@ -233,7 +259,7 @@ package_linux-libre-headers() {
 
   if [ "$CARCH" = "mips64el" ]; then
     cp "arch/${KARCH}/Kbuild" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
-    cp "arch/${KARCH}/loongson" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
+    cp -a "arch/${KARCH}/loongson" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
     cp "${srcdir}/Kbuild.platforms" "${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/"
   fi
 
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index d2d688197..6003887c9 100644
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.2.6-1 Kernel Configuration
+# Linux/i386 3.3.0 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -17,11 +17,9 @@ CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_MMU=y
-CONFIG_ZONE_DMA=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_SG_DMA_LENGTH=y
 CONFIG_GENERIC_ISA_DMA=y
-CONFIG_GENERIC_IOMAP=y
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_GPIO=y
@@ -40,7 +38,6 @@ CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 # CONFIG_ZONE_DMA32 is not set
-CONFIG_ARCH_POPULATES_NODE_MAP=y
 # CONFIG_AUDIT_ARCH is not set
 CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -89,6 +86,7 @@ CONFIG_AUDIT=y
 CONFIG_AUDITSYSCALL=y
 CONFIG_AUDIT_WATCH=y
 CONFIG_AUDIT_TREE=y
+# CONFIG_AUDIT_LOGINUID_IMMUTABLE is not set
 CONFIG_HAVE_GENERIC_HARDIRQS=y
 
 #
@@ -111,6 +109,7 @@ CONFIG_PREEMPT_RCU=y
 # CONFIG_RCU_TRACE is not set
 CONFIG_RCU_FANOUT=32
 # CONFIG_RCU_FANOUT_EXACT is not set
+CONFIG_RCU_FAST_NO_HZ=y
 # CONFIG_TREE_RCU_TRACE is not set
 # CONFIG_RCU_BOOST is not set
 CONFIG_IKCONFIG=y
@@ -128,6 +127,7 @@ CONFIG_RESOURCE_COUNTERS=y
 CONFIG_CGROUP_MEM_RES_CTLR=y
 CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
 # CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
+CONFIG_CGROUP_MEM_RES_CTLR_KMEM=y
 # CONFIG_CGROUP_PERF is not set
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
@@ -135,6 +135,7 @@ CONFIG_CFS_BANDWIDTH=y
 CONFIG_RT_GROUP_SCHED=y
 CONFIG_BLK_CGROUP=y
 # CONFIG_DEBUG_BLK_CGROUP is not set
+# CONFIG_CHECKPOINT_RESTORE is not set
 CONFIG_NAMESPACES=y
 CONFIG_UTS_NS=y
 CONFIG_IPC_NS=y
@@ -194,6 +195,7 @@ CONFIG_TRACEPOINTS=y
 CONFIG_OPROFILE=m
 # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
 CONFIG_HAVE_OPROFILE=y
+CONFIG_OPROFILE_NMI_TIMER=y
 # CONFIG_KPROBES is not set
 CONFIG_JUMP_LABEL=y
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -213,6 +215,9 @@ 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
+CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
+CONFIG_HAVE_CMPXCHG_LOCAL=y
+CONFIG_HAVE_CMPXCHG_DOUBLE=y
 
 #
 # GCOV-based kernel profiling
@@ -237,6 +242,29 @@ CONFIG_BLK_DEV_BSGLIB=y
 CONFIG_BLK_DEV_THROTTLING=y
 
 #
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+CONFIG_MAC_PARTITION=y
+CONFIG_MSDOS_PARTITION=y
+CONFIG_BSD_DISKLABEL=y
+CONFIG_MINIX_SUBPARTITION=y
+CONFIG_SOLARIS_X86_PARTITION=y
+# CONFIG_UNIXWARE_DISKLABEL is not set
+CONFIG_LDM_PARTITION=y
+# CONFIG_LDM_DEBUG is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+CONFIG_KARMA_PARTITION=y
+CONFIG_EFI_PARTITION=y
+# CONFIG_SYSV68_PARTITION is not set
+
+#
 # IO Schedulers
 #
 CONFIG_IOSCHED_NOOP=y
@@ -283,6 +311,7 @@ CONFIG_FREEZER=y
 #
 # Processor type and features
 #
+CONFIG_ZONE_DMA=y
 CONFIG_TICK_ONESHOT=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
@@ -335,8 +364,6 @@ CONFIG_M686=y
 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
@@ -407,6 +434,8 @@ CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_SPARSEMEM_STATIC=y
 CONFIG_HAVE_MEMBLOCK=y
+CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
+CONFIG_ARCH_DISCARD_MEMBLOCK=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_COMPACTION=y
@@ -422,8 +451,8 @@ CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_MEMORY_FAILURE=y
 CONFIG_HWPOISON_INJECT=m
 CONFIG_TRANSPARENT_HUGEPAGE=y
-# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
-CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
+CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
+# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
 CONFIG_CLEANCACHE=y
 # CONFIG_HIGHPTE is not set
 CONFIG_X86_CHECK_BIOS_CORRUPTION=y
@@ -438,6 +467,7 @@ CONFIG_X86_PAT=y
 CONFIG_ARCH_USES_PG_UNCACHED=y
 CONFIG_ARCH_RANDOM=y
 CONFIG_EFI=y
+CONFIG_EFI_STUB=y
 CONFIG_SECCOMP=y
 CONFIG_CC_STACKPROTECTOR=y
 # CONFIG_HZ_100 is not set
@@ -520,17 +550,17 @@ CONFIG_APM_DO_ENABLE=y
 # CPU Frequency scaling
 #
 CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_TABLE=m
+CONFIG_CPU_FREQ_TABLE=y
 CONFIG_CPU_FREQ_STAT=m
 CONFIG_CPU_FREQ_STAT_DETAILS=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=m
 CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
 
 #
@@ -654,6 +684,7 @@ CONFIG_RAPIDIO_TSI500=y
 # Executable file formats / Emulations
 #
 CONFIG_BINFMT_ELF=y
+CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_HAVE_AOUT=y
 CONFIG_BINFMT_AOUT=m
@@ -667,6 +698,7 @@ CONFIG_NET=y
 #
 CONFIG_PACKET=y
 CONFIG_UNIX=y
+CONFIG_UNIX_DIAG=m
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=m
 # CONFIG_XFRM_SUB_POLICY is not set
@@ -705,6 +737,7 @@ CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_LRO=y
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
+CONFIG_INET_UDP_DIAG=m
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_CONG_BIC=m
 CONFIG_TCP_CONG_CUBIC=y
@@ -756,12 +789,14 @@ CONFIG_BRIDGE_NETFILTER=y
 # Core Netfilter Configuration
 #
 CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_ACCT=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_SECMARK=y
 CONFIG_NF_CONNTRACK_ZONES=y
+# CONFIG_NF_CONNTRACK_PROCFS is not set
 CONFIG_NF_CONNTRACK_EVENTS=y
 CONFIG_NF_CONNTRACK_TIMESTAMP=y
 CONFIG_NF_CT_PROTO_DCCP=m
@@ -829,6 +864,7 @@ CONFIG_NETFILTER_XT_MATCH_CPU=m
 CONFIG_NETFILTER_XT_MATCH_DCCP=m
 CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
 CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ECN=m
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
@@ -840,6 +876,7 @@ CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 CONFIG_NETFILTER_XT_MATCH_MAC=m
 CONFIG_NETFILTER_XT_MATCH_MARK=m
 CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
 CONFIG_NETFILTER_XT_MATCH_OSF=m
 CONFIG_NETFILTER_XT_MATCH_OWNER=m
 CONFIG_NETFILTER_XT_MATCH_POLICY=m
@@ -900,6 +937,11 @@ CONFIG_IP_VS_SED=m
 CONFIG_IP_VS_NQ=m
 
 #
+# IPVS SH scheduler
+#
+CONFIG_IP_VS_SH_TAB_BITS=8
+
+#
 # IPVS application helper
 #
 CONFIG_IP_VS_FTP=m
@@ -911,11 +953,11 @@ CONFIG_IP_VS_PE_SIP=m
 #
 CONFIG_NF_DEFRAG_IPV4=m
 CONFIG_NF_CONNTRACK_IPV4=m
-CONFIG_NF_CONNTRACK_PROC_COMPAT=y
 CONFIG_IP_NF_QUEUE=m
 CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_RPFILTER=m
 CONFIG_IP_NF_MATCH_TTL=m
 CONFIG_IP_NF_FILTER=m
 CONFIG_IP_NF_TARGET_REJECT=m
@@ -962,6 +1004,7 @@ CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_HL=m
 CONFIG_IP6_NF_MATCH_IPV6HEADER=m
 CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RPFILTER=m
 CONFIG_IP6_NF_MATCH_RT=m
 CONFIG_IP6_NF_TARGET_HL=m
 CONFIG_IP6_NF_TARGET_LOG=m
@@ -1112,9 +1155,12 @@ CONFIG_NET_SCH_FIFO=y
 CONFIG_DNS_RESOLVER=y
 CONFIG_BATMAN_ADV=m
 # CONFIG_BATMAN_ADV_DEBUG is not set
+CONFIG_OPENVSWITCH=m
 CONFIG_RPS=y
 CONFIG_RFS_ACCEL=y
 CONFIG_XPS=y
+CONFIG_NETPRIO_CGROUP=m
+CONFIG_BQL=y
 
 #
 # Network testing
@@ -1181,8 +1227,6 @@ CONFIG_VLSI_FIR=m
 CONFIG_VIA_FIR=m
 CONFIG_MCS_FIR=m
 CONFIG_BT=m
-CONFIG_BT_L2CAP=y
-CONFIG_BT_SCO=y
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BT_BNEP=m
@@ -1259,11 +1303,13 @@ CONFIG_NET_9P_VIRTIO=m
 CONFIG_CAIF=m
 # CONFIG_CAIF_DEBUG is not set
 CONFIG_CAIF_NETDEV=m
+CONFIG_CAIF_USB=m
 CONFIG_CEPH_LIB=m
 # CONFIG_CEPH_LIB_PRETTYDEBUG is not set
 # CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
 CONFIG_NFC=m
 CONFIG_NFC_NCI=m
+# CONFIG_NFC_LLCP is not set
 
 #
 # Near Field Communication (NFC) devices
@@ -1290,9 +1336,12 @@ CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_GENERIC_CPU_DEVICES is not set
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=m
 CONFIG_REGMAP_SPI=y
+CONFIG_REGMAP_IRQ=y
+# CONFIG_DMA_SHARED_BUFFER is not set
 CONFIG_CONNECTOR=y
 CONFIG_PROC_EVENTS=y
 CONFIG_MTD=m
@@ -1393,6 +1442,8 @@ CONFIG_MTD_BLOCK2MTD=m
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
 CONFIG_MTD_DOCG3=m
+CONFIG_BCH_CONST_M=14
+CONFIG_BCH_CONST_T=4
 CONFIG_MTD_NAND_ECC=m
 CONFIG_MTD_NAND_ECC_SMC=y
 CONFIG_MTD_NAND=m
@@ -1430,6 +1481,7 @@ CONFIG_OF=y
 # Device Tree and Open Firmware support
 #
 CONFIG_PROC_DEVICETREE=y
+# CONFIG_OF_SELFTEST is not set
 CONFIG_OF_PROMTREE=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_IRQ=y
@@ -1464,6 +1516,7 @@ CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_FD=m
 # CONFIG_BLK_DEV_XD is not set
 # CONFIG_PARIDE is not set
+CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
 CONFIG_BLK_CPQ_DA=m
 CONFIG_BLK_CPQ_CISS_DA=m
 # CONFIG_CISS_SCSI_TAPE is not set
@@ -1476,6 +1529,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_DRBD=m
 # CONFIG_DRBD_FAULT_INJECTION is not set
 CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_NVME=m
 CONFIG_BLK_DEV_OSD=m
 CONFIG_BLK_DEV_SX8=m
 # CONFIG_BLK_DEV_UB is not set
@@ -1490,8 +1544,11 @@ CONFIG_ATA_OVER_ETH=m
 CONFIG_VIRTIO_BLK=m
 # CONFIG_BLK_DEV_HD is not set
 CONFIG_BLK_DEV_RBD=m
+
+#
+# Misc devices
+#
 CONFIG_SENSORS_LIS3LV02D=m
-CONFIG_MISC_DEVICES=y
 CONFIG_AD525X_DPOT=m
 CONFIG_AD525X_DPOT_I2C=m
 CONFIG_AD525X_DPOT_SPI=m
@@ -1891,6 +1948,9 @@ CONFIG_MII=m
 CONFIG_IEEE802154_DRIVERS=m
 CONFIG_IEEE802154_FAKEHARD=m
 CONFIG_IFB=m
+CONFIG_NET_TEAM=m
+CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
 CONFIG_MACVLAN=m
 CONFIG_MACVTAP=m
 CONFIG_NETCONSOLE=m
@@ -1982,6 +2042,7 @@ CONFIG_TIGON3=m
 CONFIG_BNX2X=m
 CONFIG_NET_VENDOR_BROCADE=y
 CONFIG_BNA=m
+CONFIG_NET_CALXEDA_XGMAC=m
 CONFIG_NET_VENDOR_CHELSIO=y
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T1_1G=y
@@ -2125,6 +2186,8 @@ CONFIG_EPIC100=m
 CONFIG_SMSC9420=m
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_STMMAC_ETH=m
+CONFIG_STMMAC_PLATFORM=m
+CONFIG_STMMAC_PCI=m
 # CONFIG_STMMAC_DEBUG_FS is not set
 # CONFIG_STMMAC_DA is not set
 CONFIG_STMMAC_RING=y
@@ -2167,6 +2230,7 @@ CONFIG_STE10XP=m
 CONFIG_LSI_ET1011C_PHY=m
 CONFIG_MICREL_PHY=m
 # CONFIG_MDIO_BITBANG is not set
+CONFIG_MICREL_KS8995MA=m
 CONFIG_PLIP=m
 CONFIG_PPP=m
 CONFIG_PPP_BSDCOMP=m
@@ -2257,6 +2321,7 @@ CONFIG_ATH9K_PCI=y
 CONFIG_ATH9K_AHB=y
 # CONFIG_ATH9K_DEBUGFS is not set
 CONFIG_ATH9K_RATE_CONTROL=y
+CONFIG_ATH9K_BTCOEX_SUPPORT=y
 CONFIG_ATH9K_HTC=m
 # CONFIG_ATH9K_HTC_DEBUGFS is not set
 CONFIG_CARL9170=m
@@ -2266,11 +2331,14 @@ CONFIG_CARL9170_WPC=y
 CONFIG_ATH6KL=m
 # CONFIG_ATH6KL_DEBUG is not set
 CONFIG_B43=m
+CONFIG_B43_BCMA=y
+# CONFIG_B43_BCMA_EXTRA is not set
 CONFIG_B43_SSB=y
 CONFIG_B43_PCI_AUTOSELECT=y
 CONFIG_B43_PCICORE_AUTOSELECT=y
 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
@@ -2292,6 +2360,7 @@ CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
 CONFIG_BRCMUTIL=m
 CONFIG_BRCMSMAC=m
 CONFIG_BRCMFMAC=m
+CONFIG_BRCMFMAC_SDIO=y
 # CONFIG_BRCMDBG is not set
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
@@ -2317,14 +2386,14 @@ CONFIG_IWLWIFI=m
 #
 # CONFIG_IWLWIFI_DEBUG is not set
 CONFIG_IWLWIFI_DEVICE_TRACING=y
-CONFIG_IWLWIFI_DEVICE_SVTOOL=y
-CONFIG_IWLWIFI_LEGACY=m
+CONFIG_IWLWIFI_DEVICE_TESTMODE=y
+# CONFIG_IWLWIFI_P2P is not set
+CONFIG_IWLEGACY=m
 
 #
 # Debugging Options
 #
-# CONFIG_IWLWIFI_LEGACY_DEBUG is not set
-# CONFIG_IWLWIFI_LEGACY_DEVICE_TRACING is not set
+# CONFIG_IWLEGACY_DEBUG is not set
 CONFIG_IWL4965=m
 CONFIG_IWL3945=m
 CONFIG_IWM=m
@@ -2389,7 +2458,6 @@ CONFIG_WL12XX_MENU=m
 CONFIG_WL12XX=m
 CONFIG_WL12XX_SPI=m
 CONFIG_WL12XX_SDIO=m
-CONFIG_WL12XX_SDIO_TEST=m
 CONFIG_WL12XX_PLATFORM_DATA=y
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
@@ -2407,6 +2475,7 @@ CONFIG_WIMAX_I2400M_SDIO=m
 CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
 # CONFIG_WAN is not set
 CONFIG_VMXNET3=m
+CONFIG_HYPERV_NET=m
 CONFIG_ISDN=y
 CONFIG_ISDN_I4L=m
 CONFIG_ISDN_PPP=y
@@ -2587,6 +2656,7 @@ CONFIG_KEYBOARD_QT2160=m
 CONFIG_KEYBOARD_GPIO=m
 CONFIG_KEYBOARD_GPIO_POLLED=m
 CONFIG_KEYBOARD_TCA6416=m
+CONFIG_KEYBOARD_TCA8418=m
 CONFIG_KEYBOARD_MATRIX=m
 # CONFIG_KEYBOARD_LM8323 is not set
 # CONFIG_KEYBOARD_MAX7359 is not set
@@ -2596,6 +2666,7 @@ CONFIG_KEYBOARD_MPR121=m
 # CONFIG_KEYBOARD_OPENCORES is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_KEYBOARD_SUNKBD is not set
+CONFIG_KEYBOARD_STMPE=m
 # CONFIG_KEYBOARD_XTKBD is not set
 CONFIG_INPUT_MOUSE=y
 CONFIG_MOUSE_PS2=m
@@ -2663,11 +2734,13 @@ CONFIG_TOUCHSCREEN_AD7879=m
 CONFIG_TOUCHSCREEN_AD7879_I2C=m
 CONFIG_TOUCHSCREEN_AD7879_SPI=m
 CONFIG_TOUCHSCREEN_ATMEL_MXT=m
+CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
 CONFIG_TOUCHSCREEN_BU21013=m
 CONFIG_TOUCHSCREEN_CY8CTMG110=m
 CONFIG_TOUCHSCREEN_DYNAPRO=m
 CONFIG_TOUCHSCREEN_HAMPSHIRE=m
 CONFIG_TOUCHSCREEN_EETI=m
+CONFIG_TOUCHSCREEN_EGALAX=m
 CONFIG_TOUCHSCREEN_FUJITSU=m
 CONFIG_TOUCHSCREEN_GUNZE=m
 CONFIG_TOUCHSCREEN_ELO=m
@@ -2682,6 +2755,7 @@ CONFIG_TOUCHSCREEN_PENMOUNT=m
 CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
 CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_UCB1400=m
+CONFIG_TOUCHSCREEN_PIXCIR=m
 CONFIG_TOUCHSCREEN_WM831X=m
 CONFIG_TOUCHSCREEN_WM97XX=m
 CONFIG_TOUCHSCREEN_WM9705=y
@@ -2701,6 +2775,7 @@ CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
 CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
 CONFIG_TOUCHSCREEN_USB_GOTOP=y
 CONFIG_TOUCHSCREEN_USB_JASTEC=y
+CONFIG_TOUCHSCREEN_USB_ELO=y
 CONFIG_TOUCHSCREEN_USB_E2I=y
 CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
 CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
@@ -2711,6 +2786,7 @@ CONFIG_TOUCHSCREEN_TSC2005=m
 CONFIG_TOUCHSCREEN_TSC2007=m
 CONFIG_TOUCHSCREEN_PCAP=m
 CONFIG_TOUCHSCREEN_ST1232=m
+CONFIG_TOUCHSCREEN_STMPE=m
 CONFIG_TOUCHSCREEN_TPS6507X=m
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_AB8500_PONKEY=m
@@ -2723,6 +2799,8 @@ CONFIG_INPUT_MC13783_PWRBUTTON=m
 CONFIG_INPUT_MMA8450=m
 CONFIG_INPUT_MPU3050=m
 CONFIG_INPUT_APANEL=m
+CONFIG_INPUT_GP2A=m
+CONFIG_INPUT_GPIO_TILT_POLLED=m
 CONFIG_INPUT_WISTRON_BTNS=m
 CONFIG_INPUT_ATLAS_BTNS=m
 CONFIG_INPUT_ATI_REMOTE2=m
@@ -3020,6 +3098,7 @@ CONFIG_GPIO_MAX7300=m
 CONFIG_GPIO_MAX732X=m
 CONFIG_GPIO_PCA953X=m
 CONFIG_GPIO_PCF857X=m
+CONFIG_GPIO_STMPE=y
 CONFIG_GPIO_TPS65912=m
 CONFIG_GPIO_WM831X=m
 CONFIG_GPIO_ADP5588=m
@@ -3086,7 +3165,7 @@ CONFIG_BATTERY_DS2760=m
 CONFIG_BATTERY_DS2780=m
 CONFIG_BATTERY_DS2782=m
 CONFIG_BATTERY_OLPC=m
-CONFIG_BATTERY_BQ20Z75=m
+CONFIG_BATTERY_SBS=m
 CONFIG_BATTERY_BQ27x00=m
 CONFIG_BATTERY_BQ27X00_I2C=y
 CONFIG_BATTERY_BQ27X00_PLATFORM=y
@@ -3095,7 +3174,9 @@ CONFIG_BATTERY_MAX17042=m
 CONFIG_CHARGER_PCF50633=m
 CONFIG_CHARGER_ISP1704=m
 CONFIG_CHARGER_MAX8903=m
+CONFIG_CHARGER_LP8727=m
 CONFIG_CHARGER_GPIO=m
+# CONFIG_CHARGER_MANAGER is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
@@ -3268,6 +3349,7 @@ CONFIG_SBC7240_WDT=m
 CONFIG_CPU5_WDT=m
 CONFIG_SMSC_SCH311X_WDT=m
 CONFIG_SMSC37B787_WDT=m
+CONFIG_VIA_WDT=m
 CONFIG_W83627HF_WDT=m
 CONFIG_W83697HF_WDT=m
 CONFIG_W83697UG_WDT=m
@@ -3316,7 +3398,11 @@ CONFIG_BCMA_POSSIBLE=y
 #
 # Broadcom specific AMBA
 #
-# CONFIG_BCMA is not set
+CONFIG_BCMA=m
+CONFIG_BCMA_BLOCKIO=y
+CONFIG_BCMA_HOST_PCI_POSSIBLE=y
+CONFIG_BCMA_HOST_PCI=y
+# CONFIG_BCMA_DEBUG is not set
 
 #
 # Multifunction device drivers
@@ -3331,7 +3417,15 @@ CONFIG_TPS65010=m
 CONFIG_TPS6507X=m
 CONFIG_MFD_TPS65912=y
 CONFIG_MFD_TPS65912_SPI=y
+CONFIG_MFD_STMPE=y
+
+#
+# STMPE Interface Drivers
+#
+CONFIG_STMPE_SPI=y
 # CONFIG_MFD_TMIO is not set
+CONFIG_PMIC_DA9052=y
+CONFIG_MFD_DA9052_SPI=y
 CONFIG_MFD_WM8400=m
 CONFIG_MFD_WM831X=y
 CONFIG_MFD_WM831X_SPI=y
@@ -3366,6 +3460,7 @@ CONFIG_REGULATOR_MAX8660=m
 CONFIG_REGULATOR_MAX8952=m
 CONFIG_REGULATOR_WM831X=m
 CONFIG_REGULATOR_WM8400=m
+CONFIG_REGULATOR_DA9052=m
 CONFIG_REGULATOR_PCF50633=m
 CONFIG_REGULATOR_LP3971=m
 CONFIG_REGULATOR_LP3972=m
@@ -3408,6 +3503,7 @@ CONFIG_IR_RC6_DECODER=m
 CONFIG_IR_JVC_DECODER=m
 CONFIG_IR_SONY_DECODER=m
 CONFIG_IR_RC5_SZ_DECODER=m
+CONFIG_IR_SANYO_DECODER=m
 CONFIG_IR_MCE_KBD_DECODER=m
 CONFIG_IR_LIRC_CODEC=m
 CONFIG_RC_ATI_REMOTE=m
@@ -3449,7 +3545,6 @@ CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEOBUF_GEN=m
 CONFIG_VIDEOBUF_DMA_SG=m
 CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEOBUF_DMA_CONTIG=m
 CONFIG_VIDEOBUF_DVB=m
 CONFIG_VIDEO_BTCX=m
 CONFIG_VIDEO_TVEEPROM=m
@@ -3545,6 +3640,7 @@ CONFIG_VIDEO_S5K6AA=m
 # Flash devices
 #
 CONFIG_VIDEO_ADP1653=m
+CONFIG_VIDEO_AS3645A=m
 
 #
 # Video improvement chips
@@ -3558,63 +3654,6 @@ CONFIG_VIDEO_UPD64083=m
 CONFIG_VIDEO_THS7303=m
 CONFIG_VIDEO_M52790=m
 CONFIG_VIDEO_VIVI=m
-CONFIG_VIDEO_BT848=m
-CONFIG_VIDEO_BT848_DVB=y
-CONFIG_VIDEO_PMS=m
-CONFIG_VIDEO_BWQCAM=m
-CONFIG_VIDEO_CQCAM=m
-CONFIG_VIDEO_W9966=m
-CONFIG_VIDEO_CPIA2=m
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_ZR36060=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN_AVS6EYES=m
-CONFIG_VIDEO_MEYE=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7134_ALSA=m
-CONFIG_VIDEO_SAA7134_RC=y
-CONFIG_VIDEO_SAA7134_DVB=m
-CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_TIMBERDALE=m
-CONFIG_VIDEO_CX88=m
-CONFIG_VIDEO_CX88_ALSA=m
-CONFIG_VIDEO_CX88_BLACKBIRD=m
-CONFIG_VIDEO_CX88_DVB=m
-CONFIG_VIDEO_CX88_MPEG=m
-CONFIG_VIDEO_CX88_VP3054=m
-CONFIG_VIDEO_CX23885=m
-CONFIG_MEDIA_ALTERA_CI=m
-CONFIG_VIDEO_CX25821=m
-CONFIG_VIDEO_CX25821_ALSA=m
-CONFIG_VIDEO_AU0828=m
-CONFIG_VIDEO_IVTV=m
-CONFIG_VIDEO_FB_IVTV=m
-CONFIG_VIDEO_CX18=m
-CONFIG_VIDEO_CX18_ALSA=m
-CONFIG_VIDEO_SAA7164=m
-CONFIG_VIDEO_CAFE_CCIC=m
-CONFIG_SOC_CAMERA=m
-CONFIG_SOC_CAMERA_IMX074=m
-CONFIG_SOC_CAMERA_MT9M001=m
-CONFIG_SOC_CAMERA_MT9M111=m
-CONFIG_SOC_CAMERA_MT9T031=m
-CONFIG_SOC_CAMERA_MT9T112=m
-CONFIG_SOC_CAMERA_MT9V022=m
-CONFIG_SOC_CAMERA_RJ54N1=m
-CONFIG_SOC_CAMERA_TW9910=m
-CONFIG_SOC_CAMERA_PLATFORM=m
-CONFIG_SOC_CAMERA_OV2640=m
-CONFIG_SOC_CAMERA_OV5642=m
-CONFIG_SOC_CAMERA_OV6650=m
-CONFIG_SOC_CAMERA_OV772X=m
-CONFIG_SOC_CAMERA_OV9640=m
-CONFIG_SOC_CAMERA_OV9740=m
 CONFIG_V4L_USB_DRIVERS=y
 CONFIG_USB_VIDEO_CLASS=m
 CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
@@ -3628,6 +3667,7 @@ CONFIG_USB_GSPCA_CPIA1=m
 CONFIG_USB_GSPCA_ETOMS=m
 CONFIG_USB_GSPCA_FINEPIX=m
 CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_JL2005BCD=m
 CONFIG_USB_GSPCA_KINECT=m
 CONFIG_USB_GSPCA_KONICA=m
 CONFIG_USB_GSPCA_MARS=m
@@ -3687,32 +3727,58 @@ CONFIG_USB_SN9C102=m
 CONFIG_USB_PWC=m
 # CONFIG_USB_PWC_DEBUG is not set
 CONFIG_USB_PWC_INPUT_EVDEV=y
+CONFIG_VIDEO_CPIA2=m
 CONFIG_USB_ZR364XX=m
 CONFIG_USB_STKWEBCAM=m
 CONFIG_USB_S2255=m
+CONFIG_V4L_PCI_DRIVERS=y
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_BT848=m
+CONFIG_VIDEO_BT848_DVB=y
+CONFIG_VIDEO_CX18=m
+CONFIG_VIDEO_CX18_ALSA=m
+CONFIG_VIDEO_CX23885=m
+CONFIG_MEDIA_ALTERA_CI=m
+CONFIG_VIDEO_CX25821=m
+CONFIG_VIDEO_CX25821_ALSA=m
+CONFIG_VIDEO_CX88=m
+CONFIG_VIDEO_CX88_ALSA=m
+CONFIG_VIDEO_CX88_BLACKBIRD=m
+CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_VP3054=m
+CONFIG_VIDEO_CX88_MPEG=m
+CONFIG_VIDEO_HEXIUM_GEMINI=m
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_IVTV=m
+CONFIG_VIDEO_FB_IVTV=m
+CONFIG_VIDEO_MEYE=m
+CONFIG_VIDEO_MXB=m
+CONFIG_VIDEO_SAA7134=m
+CONFIG_VIDEO_SAA7134_ALSA=m
+CONFIG_VIDEO_SAA7134_RC=y
+CONFIG_VIDEO_SAA7134_DVB=m
+CONFIG_VIDEO_SAA7164=m
+CONFIG_VIDEO_ZORAN=m
+CONFIG_VIDEO_ZORAN_DC30=m
+CONFIG_VIDEO_ZORAN_ZR36060=m
+CONFIG_VIDEO_ZORAN_BUZ=m
+CONFIG_VIDEO_ZORAN_DC10=m
+CONFIG_VIDEO_ZORAN_LML33=m
+CONFIG_VIDEO_ZORAN_LML33R10=m
+CONFIG_VIDEO_ZORAN_AVS6EYES=m
+# CONFIG_V4L_ISA_PARPORT_DRIVERS is not set
+# CONFIG_V4L_PLATFORM_DRIVERS is not set
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 CONFIG_VIDEO_MEM2MEM_TESTDEV=m
 CONFIG_RADIO_ADAPTERS=y
-CONFIG_RADIO_CADET=m
-CONFIG_RADIO_RTRACK=m
-CONFIG_RADIO_RTRACK2=m
-CONFIG_RADIO_AZTECH=m
-CONFIG_RADIO_GEMTEK=m
-CONFIG_RADIO_MAXIRADIO=m
-CONFIG_RADIO_MIROPCM20=m
-CONFIG_RADIO_SF16FMI=m
-CONFIG_RADIO_SF16FMR2=m
-CONFIG_RADIO_TERRATEC=m
-CONFIG_RADIO_TRUST=m
-CONFIG_RADIO_TYPHOON=m
-CONFIG_RADIO_ZOLTRIX=m
-CONFIG_I2C_SI4713=m
-CONFIG_RADIO_SI4713=m
-CONFIG_USB_DSBR=m
 CONFIG_RADIO_SI470X=y
 CONFIG_USB_SI470X=m
 CONFIG_I2C_SI470X=m
 CONFIG_USB_MR800=m
+CONFIG_USB_DSBR=m
+CONFIG_RADIO_MAXIRADIO=m
+CONFIG_I2C_SI4713=m
+CONFIG_RADIO_SI4713=m
 CONFIG_RADIO_TEA5764=m
 CONFIG_RADIO_SAA7706H=m
 CONFIG_RADIO_TEF6862=m
@@ -3723,6 +3789,7 @@ CONFIG_RADIO_WL1273=m
 # Texas Instruments WL128x FM driver (ST based)
 #
 CONFIG_RADIO_WL128X=m
+# CONFIG_V4L_RADIO_ISA_DRIVERS is not set
 CONFIG_DVB_MAX_ADAPTERS=8
 # CONFIG_DVB_DYNAMIC_MINORS is not set
 CONFIG_DVB_CAPTURE_DRIVERS=y
@@ -3995,6 +4062,9 @@ CONFIG_DRM_SIS=m
 CONFIG_DRM_VIA=m
 CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_VMWGFX=m
+CONFIG_DRM_GMA500=m
+CONFIG_DRM_GMA600=y
+CONFIG_DRM_GMA3600=y
 CONFIG_STUB_POULSBO=m
 CONFIG_VGASTATE=m
 CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -4053,7 +4123,7 @@ CONFIG_FB_I810_I2C=y
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_3DFX is not set
 CONFIG_FB_VOODOO1=m
-# CONFIG_FB_VT8623 is not set
+CONFIG_FB_VT8623=m
 # CONFIG_FB_TRIDENT is not set
 # CONFIG_FB_ARK is not set
 # CONFIG_FB_PM3 is not set
@@ -4090,15 +4160,6 @@ CONFIG_BACKLIGHT_ADP8870=m
 CONFIG_BACKLIGHT_PCF50633=m
 
 #
-# Display device support
-#
-CONFIG_DISPLAY_SUPPORT=m
-
-#
-# Display hardware drivers
-#
-
-#
 # Console display driver support
 #
 CONFIG_VGA_CONSOLE=y
@@ -4144,6 +4205,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SND_VERBOSE_PRINTK is not set
 # CONFIG_SND_DEBUG is not set
 CONFIG_SND_VMASTER=y
+CONFIG_SND_KCTL_JACK=y
 CONFIG_SND_DMA_SGBUF=y
 CONFIG_SND_RAWMIDI_SEQ=m
 CONFIG_SND_OPL3_LIB_SEQ=m
@@ -4320,7 +4382,6 @@ CONFIG_SND_PCMCIA=y
 CONFIG_SND_VXPOCKET=m
 CONFIG_SND_PDAUDIOCF=m
 CONFIG_SND_SOC=m
-CONFIG_SND_SOC_CACHE_LZO=y
 CONFIG_SND_SOC_I2C_AND_SPI=m
 # CONFIG_SND_SOC_ALL_CODECS is not set
 # CONFIG_SOUND_PRIME is not set
@@ -4384,10 +4445,10 @@ CONFIG_HID_PICOLCD_BACKLIGHT=y
 CONFIG_HID_PICOLCD_LCD=y
 CONFIG_HID_PICOLCD_LEDS=y
 CONFIG_HID_PRIMAX=m
-CONFIG_HID_QUANTA=m
 CONFIG_HID_ROCCAT=m
 CONFIG_HID_ROCCAT_COMMON=m
 CONFIG_HID_ROCCAT_ARVO=m
+CONFIG_HID_ROCCAT_ISKU=m
 CONFIG_HID_ROCCAT_KONE=m
 CONFIG_HID_ROCCAT_KONEPLUS=m
 CONFIG_HID_ROCCAT_KOVAPLUS=m
@@ -4398,6 +4459,7 @@ CONFIG_HID_SPEEDLINK=m
 CONFIG_HID_SUNPLUS=m
 CONFIG_HID_GREENASIA=m
 CONFIG_GREENASIA_FF=y
+CONFIG_HID_HYPERV_MOUSE=m
 CONFIG_HID_SMARTJOYPLUS=m
 CONFIG_SMARTJOYPLUS_FF=y
 CONFIG_HID_TOPSEED=m
@@ -4406,6 +4468,7 @@ CONFIG_THRUSTMASTER_FF=y
 CONFIG_HID_WACOM=m
 CONFIG_HID_WACOM_POWER_SUPPLY=y
 CONFIG_HID_WIIMOTE=m
+CONFIG_HID_WIIMOTE_EXT=y
 CONFIG_HID_ZEROPLUS=m
 CONFIG_ZEROPLUS_FF=y
 CONFIG_HID_ZYDACRON=m
@@ -4427,8 +4490,7 @@ CONFIG_USB_DEVICEFS=y
 CONFIG_USB_DYNAMIC_MINORS=y
 CONFIG_USB_SUSPEND=y
 # CONFIG_USB_OTG is not set
-CONFIG_USB_DWC3=m
-# CONFIG_USB_DWC3_DEBUG is not set
+# CONFIG_USB_DWC3 is not set
 CONFIG_USB_MON=m
 CONFIG_USB_WUSB=m
 CONFIG_USB_WUSB_CBAF=m
@@ -4443,6 +4505,7 @@ CONFIG_USB_XHCI_HCD=m
 CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_EHCI_MV=y
 CONFIG_USB_OXU210HP_HCD=m
 CONFIG_USB_ISP116X_HCD=m
 CONFIG_USB_ISP1760_HCD=m
@@ -4461,6 +4524,9 @@ CONFIG_USB_R8A66597_HCD=m
 CONFIG_USB_RENESAS_USBHS_HCD=m
 CONFIG_USB_WHCI_HCD=m
 CONFIG_USB_HWA_HCD=m
+CONFIG_USB_MUSB_HDRC=m
+CONFIG_USB_MUSB_TUSB6010=m
+CONFIG_MUSB_PIO_ONLY=y
 CONFIG_USB_RENESAS_USBHS=m
 
 #
@@ -4611,7 +4677,9 @@ CONFIG_USB_GADGET_VBUS_DRAW=2
 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 CONFIG_USB_FUSB300=m
 CONFIG_USB_R8A66597=m
-CONFIG_USB_GADGET_DWC3=m
+CONFIG_USB_RENESAS_USBHS_UDC=m
+CONFIG_USB_MV_UDC=m
+CONFIG_USB_GADGET_MUSB_HDRC=m
 CONFIG_USB_M66592=m
 CONFIG_USB_AMD5536UDC=m
 CONFIG_USB_CI13XXX_PCI=m
@@ -4655,9 +4723,10 @@ CONFIG_USB_G_WEBCAM=m
 # OTG and related infrastructure
 #
 CONFIG_USB_OTG_UTILS=y
-CONFIG_USB_GPIO_VBUS=m
+# CONFIG_USB_GPIO_VBUS is not set
 CONFIG_NOP_USB_XCEIV=m
-CONFIG_AB8500_USB=m
+# CONFIG_AB8500_USB is not set
+# CONFIG_USB_MV_OTG is not set
 CONFIG_UWB=m
 CONFIG_UWB_HWA=m
 CONFIG_UWB_WHCI=m
@@ -4665,7 +4734,7 @@ CONFIG_UWB_I1480U=m
 CONFIG_MMC=m
 # CONFIG_MMC_DEBUG is not set
 # CONFIG_MMC_UNSAFE_RESUME is not set
-CONFIG_MMC_CLKGATE=y
+# CONFIG_MMC_CLKGATE is not set
 
 #
 # MMC/SD/SDIO Card Drivers
@@ -4729,6 +4798,8 @@ CONFIG_LEDS_INTEL_SS4200=m
 CONFIG_LEDS_LT3593=m
 CONFIG_LEDS_DELL_NETBOOKS=m
 CONFIG_LEDS_MC13783=m
+CONFIG_LEDS_TCA6507=m
+CONFIG_LEDS_OT200=m
 CONFIG_LEDS_TRIGGERS=y
 
 #
@@ -4889,6 +4960,12 @@ CONFIG_VIRTIO_RING=y
 CONFIG_VIRTIO_PCI=m
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_MMIO=m
+
+#
+# Microsoft Hyper-V guest support
+#
+CONFIG_HYPERV=m
+CONFIG_HYPERV_UTILS=m
 CONFIG_STAGING=y
 CONFIG_ET131X=m
 CONFIG_SLICOSS=m
@@ -5035,6 +5112,10 @@ CONFIG_ASUS_OLED=m
 # CONFIG_PANEL is not set
 CONFIG_R8187SE=m
 CONFIG_RTL8192U=m
+CONFIG_RTLLIB=m
+CONFIG_RTLLIB_CRYPTO_CCMP=m
+CONFIG_RTLLIB_CRYPTO_TKIP=m
+CONFIG_RTLLIB_CRYPTO_WEP=m
 CONFIG_RTL8192E=m
 CONFIG_R8712U=m
 CONFIG_R8712_AP=y
@@ -5043,8 +5124,6 @@ CONFIG_RTS_PSTOR=m
 CONFIG_RTS5139=m
 # CONFIG_RTS5139_DEBUG is not set
 # CONFIG_TRANZPORT is not set
-CONFIG_POHMELFS=m
-# CONFIG_POHMELFS_DEBUG is not set
 CONFIG_IDE_PHISON=m
 CONFIG_LINE6_USB=m
 # CONFIG_LINE6_USB_DEBUG is not set
@@ -5067,8 +5146,6 @@ CONFIG_USB_SERIAL_QUATECH_USB2=m
 CONFIG_VT6655=m
 CONFIG_VT6656=m
 CONFIG_HYPERV_STORAGE=m
-CONFIG_HYPERV_NET=m
-CONFIG_HYPERV_MOUSE=m
 # CONFIG_VME_BUS is not set
 CONFIG_DX_SEP=m
 # CONFIG_IIO is not set
@@ -5109,10 +5186,6 @@ CONFIG_SPEAKUP_SYNTH_TXPRT=m
 CONFIG_SPEAKUP_SYNTH_DUMMY=m
 CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
 CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
-CONFIG_DRM_PSB=m
-CONFIG_DRM_PSB_MRST=y
-CONFIG_DRM_PSB_MFLD=y
-CONFIG_DRM_PSB_CDV=y
 CONFIG_INTEL_MEI=m
 CONFIG_STAGING_MEDIA=y
 CONFIG_DVB_AS102=m
@@ -5144,6 +5217,11 @@ CONFIG_LIRC_SERIAL_TRANSMITTER=y
 CONFIG_LIRC_SIR=m
 CONFIG_LIRC_TTUSBIR=m
 CONFIG_LIRC_ZILOG=m
+
+#
+# Android
+#
+# CONFIG_ANDROID is not set
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 CONFIG_ACERHDF=m
@@ -5153,6 +5231,8 @@ CONFIG_DELL_WMI=m
 CONFIG_DELL_WMI_AIO=m
 CONFIG_FUJITSU_LAPTOP=m
 # CONFIG_FUJITSU_LAPTOP_DEBUG is not set
+CONFIG_FUJITSU_TABLET=m
+CONFIG_AMILO_RFKILL=m
 CONFIG_TC1100_WMI=m
 CONFIG_HP_ACCEL=m
 CONFIG_HP_WMI=m
@@ -5205,8 +5285,6 @@ CONFIG_INTEL_IOMMU=y
 # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
 CONFIG_INTEL_IOMMU_FLOPPY_WA=y
 CONFIG_VIRT_DRIVERS=y
-CONFIG_HYPERV=m
-CONFIG_HYPERV_UTILS=m
 # CONFIG_PM_DEVFREQ is not set
 
 #
@@ -5221,7 +5299,6 @@ CONFIG_DCDBAS=m
 CONFIG_DMIID=y
 CONFIG_DMI_SYSFS=m
 # CONFIG_ISCSI_IBFT_FIND is not set
-CONFIG_SIGMA=m
 # CONFIG_GOOGLE_FIRMWARE is not set
 
 #
@@ -5235,8 +5312,6 @@ CONFIG_EXT4_FS_XATTR=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 # CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD=m
-# CONFIG_JBD_DEBUG is not set
 CONFIG_JBD2=m
 # CONFIG_JBD2_DEBUG is not set
 CONFIG_FS_MBCACHE=m
@@ -5266,6 +5341,7 @@ CONFIG_OCFS2_FS_STATS=y
 # CONFIG_OCFS2_DEBUG_FS is not set
 CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
+# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
 CONFIG_NILFS2_FS=m
 CONFIG_FS_POSIX_ACL=y
 CONFIG_EXPORTFS=m
@@ -5401,6 +5477,7 @@ CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3=y
 CONFIG_NFSD_V3_ACL=y
 CONFIG_NFSD_V4=y
+# CONFIG_NFSD_FAULT_INJECTION is not set
 CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
 CONFIG_NFS_ACL_SUPPORT=m
@@ -5436,29 +5513,6 @@ CONFIG_AFS_FSCACHE=y
 CONFIG_9P_FS=m
 CONFIG_9P_FSCACHE=y
 CONFIG_9P_FS_POSIX_ACL=y
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_MAC_PARTITION=y
-CONFIG_MSDOS_PARTITION=y
-CONFIG_BSD_DISKLABEL=y
-CONFIG_MINIX_SUBPARTITION=y
-CONFIG_SOLARIS_X86_PARTITION=y
-# CONFIG_UNIXWARE_DISKLABEL is not set
-CONFIG_LDM_PARTITION=y
-# CONFIG_LDM_DEBUG is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-CONFIG_KARMA_PARTITION=y
-CONFIG_EFI_PARTITION=y
-# CONFIG_SYSV68_PARTITION is not set
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
 CONFIG_NLS_CODEPAGE_437=m
@@ -5530,7 +5584,7 @@ CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
 CONFIG_SCHED_DEBUG=y
-# CONFIG_SCHEDSTATS is not set
+CONFIG_SCHEDSTATS=y
 CONFIG_TIMER_STATS=y
 # CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_SLUB_DEBUG_ON is not set
@@ -5655,6 +5709,7 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
 # CONFIG_CPA_DEBUG is not set
 # CONFIG_OPTIMIZE_INLINING is not set
 # CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
+# CONFIG_DEBUG_NMI_SELFTEST is not set
 
 #
 # Security options
@@ -5786,6 +5841,7 @@ CONFIG_CRYPTO_SALSA20=m
 CONFIG_CRYPTO_SALSA20_586=m
 CONFIG_CRYPTO_SEED=m
 CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_SERPENT_SSE2_586=m
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TWOFISH=m
 CONFIG_CRYPTO_TWOFISH_COMMON=m
@@ -5833,6 +5889,8 @@ CONFIG_BINARY_PRINTF=y
 CONFIG_RAID6_PQ=m
 CONFIG_BITREVERSE=y
 CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_GENERIC_IOMAP=y
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
 CONFIG_CRC_T10DIF=m
@@ -5863,6 +5921,8 @@ CONFIG_DECOMPRESS_LZO=y
 CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_REED_SOLOMON=m
 CONFIG_REED_SOLOMON_DEC16=y
+CONFIG_BCH=m
+CONFIG_BCH_CONST_PARAMS=y
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m
 CONFIG_TEXTSEARCH_BM=m
@@ -5873,6 +5933,7 @@ CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
 CONFIG_CHECK_SIGNATURE=y
 CONFIG_CPU_RMAP=y
+CONFIG_DQL=y
 CONFIG_NLATTR=y
 CONFIG_LRU_CACHE=m
 CONFIG_AVERAGE=y
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index 80ea3030f..083e0e977 100644
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.2.6-1 Kernel Configuration
+# Linux/x86_64 3.3.0 Kernel Configuration
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -18,11 +18,9 @@ CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_MMU=y
-CONFIG_ZONE_DMA=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_SG_DMA_LENGTH=y
 CONFIG_GENERIC_ISA_DMA=y
-CONFIG_GENERIC_IOMAP=y
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
 CONFIG_GENERIC_HWEIGHT=y
@@ -42,7 +40,6 @@ CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ZONE_DMA32=y
-CONFIG_ARCH_POPULATES_NODE_MAP=y
 CONFIG_AUDIT_ARCH=y
 CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -91,6 +88,7 @@ CONFIG_AUDIT=y
 CONFIG_AUDITSYSCALL=y
 CONFIG_AUDIT_WATCH=y
 CONFIG_AUDIT_TREE=y
+# CONFIG_AUDIT_LOGINUID_IMMUTABLE is not set
 CONFIG_HAVE_GENERIC_HARDIRQS=y
 
 #
@@ -113,6 +111,7 @@ CONFIG_PREEMPT_RCU=y
 # CONFIG_RCU_TRACE is not set
 CONFIG_RCU_FANOUT=64
 # CONFIG_RCU_FANOUT_EXACT is not set
+CONFIG_RCU_FAST_NO_HZ=y
 # CONFIG_TREE_RCU_TRACE is not set
 # CONFIG_RCU_BOOST is not set
 CONFIG_IKCONFIG=y
@@ -130,6 +129,7 @@ CONFIG_RESOURCE_COUNTERS=y
 CONFIG_CGROUP_MEM_RES_CTLR=y
 CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
 # CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
+CONFIG_CGROUP_MEM_RES_CTLR_KMEM=y
 # CONFIG_CGROUP_PERF is not set
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
@@ -137,6 +137,7 @@ CONFIG_CFS_BANDWIDTH=y
 CONFIG_RT_GROUP_SCHED=y
 CONFIG_BLK_CGROUP=y
 # CONFIG_DEBUG_BLK_CGROUP is not set
+# CONFIG_CHECKPOINT_RESTORE is not set
 CONFIG_NAMESPACES=y
 CONFIG_UTS_NS=y
 CONFIG_IPC_NS=y
@@ -196,6 +197,7 @@ CONFIG_TRACEPOINTS=y
 CONFIG_OPROFILE=m
 # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
 CONFIG_HAVE_OPROFILE=y
+CONFIG_OPROFILE_NMI_TIMER=y
 # CONFIG_KPROBES is not set
 CONFIG_JUMP_LABEL=y
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -215,6 +217,9 @@ 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
+CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
+CONFIG_HAVE_CMPXCHG_LOCAL=y
+CONFIG_HAVE_CMPXCHG_DOUBLE=y
 
 #
 # GCOV-based kernel profiling
@@ -236,6 +241,29 @@ CONFIG_BLK_DEV_BSG=y
 CONFIG_BLK_DEV_BSGLIB=y
 # CONFIG_BLK_DEV_INTEGRITY is not set
 CONFIG_BLK_DEV_THROTTLING=y
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+CONFIG_MAC_PARTITION=y
+CONFIG_MSDOS_PARTITION=y
+CONFIG_BSD_DISKLABEL=y
+CONFIG_MINIX_SUBPARTITION=y
+CONFIG_SOLARIS_X86_PARTITION=y
+# CONFIG_UNIXWARE_DISKLABEL is not set
+CONFIG_LDM_PARTITION=y
+# CONFIG_LDM_DEBUG is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+CONFIG_KARMA_PARTITION=y
+CONFIG_EFI_PARTITION=y
+# CONFIG_SYSV68_PARTITION is not set
 CONFIG_BLOCK_COMPAT=y
 
 #
@@ -285,6 +313,7 @@ CONFIG_FREEZER=y
 #
 # Processor type and features
 #
+CONFIG_ZONE_DMA=y
 CONFIG_TICK_ONESHOT=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
@@ -302,7 +331,7 @@ CONFIG_XEN=y
 CONFIG_XEN_DOM0=y
 CONFIG_XEN_PRIVILEGED_GUEST=y
 CONFIG_XEN_PVHVM=y
-CONFIG_XEN_MAX_DOMAIN_MEMORY=128
+CONFIG_XEN_MAX_DOMAIN_MEMORY=500
 CONFIG_XEN_SAVE_RESTORE=y
 # CONFIG_XEN_DEBUG_FS is not set
 CONFIG_KVM_CLOCK=y
@@ -320,8 +349,6 @@ CONFIG_NO_BOOTMEM=y
 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
@@ -391,6 +418,8 @@ CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
 CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y
 CONFIG_SPARSEMEM_VMEMMAP=y
 CONFIG_HAVE_MEMBLOCK=y
+CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
+CONFIG_ARCH_DISCARD_MEMBLOCK=y
 CONFIG_MEMORY_HOTPLUG=y
 CONFIG_MEMORY_HOTPLUG_SPARSE=y
 CONFIG_MEMORY_HOTREMOVE=y
@@ -409,8 +438,8 @@ CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_MEMORY_FAILURE=y
 CONFIG_HWPOISON_INJECT=m
 CONFIG_TRANSPARENT_HUGEPAGE=y
-# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
-CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y 
+CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
+# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
 CONFIG_CLEANCACHE=y
 CONFIG_X86_CHECK_BIOS_CORRUPTION=y
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
@@ -423,6 +452,7 @@ CONFIG_X86_PAT=y
 CONFIG_ARCH_USES_PG_UNCACHED=y
 CONFIG_ARCH_RANDOM=y
 CONFIG_EFI=y
+CONFIG_EFI_STUB=y
 CONFIG_SECCOMP=y
 CONFIG_CC_STACKPROTECTOR=y
 # CONFIG_HZ_100 is not set
@@ -502,17 +532,17 @@ CONFIG_SFI=y
 # CPU Frequency scaling
 #
 CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_TABLE=m
+CONFIG_CPU_FREQ_TABLE=y
 CONFIG_CPU_FREQ_STAT=m
 CONFIG_CPU_FREQ_STAT_DETAILS=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=m
 CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
 
 #
@@ -611,6 +641,7 @@ CONFIG_RAPIDIO_TSI500=y
 #
 CONFIG_BINFMT_ELF=y
 CONFIG_COMPAT_BINFMT_ELF=y
+CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 # CONFIG_HAVE_AOUT is not set
 CONFIG_BINFMT_MISC=y
@@ -629,6 +660,7 @@ CONFIG_COMPAT_NETLINK_MESSAGES=y
 #
 CONFIG_PACKET=y
 CONFIG_UNIX=y
+CONFIG_UNIX_DIAG=m
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=m
 # CONFIG_XFRM_SUB_POLICY is not set
@@ -667,6 +699,7 @@ CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_LRO=y
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
+CONFIG_INET_UDP_DIAG=m
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_CONG_BIC=m
 CONFIG_TCP_CONG_CUBIC=y
@@ -718,12 +751,14 @@ CONFIG_BRIDGE_NETFILTER=y
 # Core Netfilter Configuration
 #
 CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_ACCT=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_SECMARK=y
 CONFIG_NF_CONNTRACK_ZONES=y
+# CONFIG_NF_CONNTRACK_PROCFS is not set
 CONFIG_NF_CONNTRACK_EVENTS=y
 CONFIG_NF_CONNTRACK_TIMESTAMP=y
 CONFIG_NF_CT_PROTO_DCCP=m
@@ -791,6 +826,7 @@ CONFIG_NETFILTER_XT_MATCH_CPU=m
 CONFIG_NETFILTER_XT_MATCH_DCCP=m
 CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
 CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ECN=m
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
@@ -802,6 +838,7 @@ CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 CONFIG_NETFILTER_XT_MATCH_MAC=m
 CONFIG_NETFILTER_XT_MATCH_MARK=m
 CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
 CONFIG_NETFILTER_XT_MATCH_OSF=m
 CONFIG_NETFILTER_XT_MATCH_OWNER=m
 CONFIG_NETFILTER_XT_MATCH_POLICY=m
@@ -862,6 +899,11 @@ CONFIG_IP_VS_SED=m
 CONFIG_IP_VS_NQ=m
 
 #
+# IPVS SH scheduler
+#
+CONFIG_IP_VS_SH_TAB_BITS=8
+
+#
 # IPVS application helper
 #
 CONFIG_IP_VS_FTP=m
@@ -873,11 +915,11 @@ CONFIG_IP_VS_PE_SIP=m
 #
 CONFIG_NF_DEFRAG_IPV4=m
 CONFIG_NF_CONNTRACK_IPV4=m
-CONFIG_NF_CONNTRACK_PROC_COMPAT=y
 CONFIG_IP_NF_QUEUE=m
 CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_RPFILTER=m
 CONFIG_IP_NF_MATCH_TTL=m
 CONFIG_IP_NF_FILTER=m
 CONFIG_IP_NF_TARGET_REJECT=m
@@ -924,6 +966,7 @@ CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_HL=m
 CONFIG_IP6_NF_MATCH_IPV6HEADER=m
 CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RPFILTER=m
 CONFIG_IP6_NF_MATCH_RT=m
 CONFIG_IP6_NF_TARGET_HL=m
 CONFIG_IP6_NF_TARGET_LOG=m
@@ -1070,9 +1113,12 @@ CONFIG_NET_SCH_FIFO=y
 CONFIG_DNS_RESOLVER=y
 CONFIG_BATMAN_ADV=m
 # CONFIG_BATMAN_ADV_DEBUG is not set
+CONFIG_OPENVSWITCH=m
 CONFIG_RPS=y
 CONFIG_RFS_ACCEL=y
 CONFIG_XPS=y
+CONFIG_NETPRIO_CGROUP=m
+CONFIG_BQL=y
 CONFIG_HAVE_BPF_JIT=y
 CONFIG_BPF_JIT=y
 
@@ -1140,8 +1186,6 @@ CONFIG_VLSI_FIR=m
 CONFIG_VIA_FIR=m
 CONFIG_MCS_FIR=m
 CONFIG_BT=m
-CONFIG_BT_L2CAP=y
-CONFIG_BT_SCO=y
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BT_BNEP=m
@@ -1218,11 +1262,13 @@ CONFIG_NET_9P_VIRTIO=m
 CONFIG_CAIF=m
 # CONFIG_CAIF_DEBUG is not set
 CONFIG_CAIF_NETDEV=m
+CONFIG_CAIF_USB=m
 CONFIG_CEPH_LIB=m
 # CONFIG_CEPH_LIB_PRETTYDEBUG is not set
 # CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
 CONFIG_NFC=m
 CONFIG_NFC_NCI=m
+# CONFIG_NFC_LLCP is not set
 
 #
 # Near Field Communication (NFC) devices
@@ -1249,9 +1295,12 @@ CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 CONFIG_SYS_HYPERVISOR=y
+# CONFIG_GENERIC_CPU_DEVICES is not set
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=m
 CONFIG_REGMAP_SPI=y
+CONFIG_REGMAP_IRQ=y
+# CONFIG_DMA_SHARED_BUFFER is not set
 CONFIG_CONNECTOR=y
 CONFIG_PROC_EVENTS=y
 CONFIG_MTD=m
@@ -1350,6 +1399,8 @@ CONFIG_MTD_BLOCK2MTD=m
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
 CONFIG_MTD_DOCG3=m
+CONFIG_BCH_CONST_M=14
+CONFIG_BCH_CONST_T=4
 CONFIG_MTD_NAND_ECC=m
 CONFIG_MTD_NAND_ECC_SMC=y
 CONFIG_MTD_NAND=m
@@ -1400,6 +1451,7 @@ CONFIG_PNPACPI=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_FD=m
 # CONFIG_PARIDE is not set
+CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
 CONFIG_BLK_CPQ_DA=m
 CONFIG_BLK_CPQ_CISS_DA=m
 # CONFIG_CISS_SCSI_TAPE is not set
@@ -1412,6 +1464,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_DRBD=m
 # CONFIG_DRBD_FAULT_INJECTION is not set
 CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_NVME=m
 CONFIG_BLK_DEV_OSD=m
 CONFIG_BLK_DEV_SX8=m
 # CONFIG_BLK_DEV_UB is not set
@@ -1428,8 +1481,11 @@ CONFIG_XEN_BLKDEV_BACKEND=m
 CONFIG_VIRTIO_BLK=m
 # CONFIG_BLK_DEV_HD is not set
 CONFIG_BLK_DEV_RBD=m
+
+#
+# Misc devices
+#
 CONFIG_SENSORS_LIS3LV02D=m
-CONFIG_MISC_DEVICES=y
 CONFIG_AD525X_DPOT=m
 CONFIG_AD525X_DPOT_I2C=m
 CONFIG_AD525X_DPOT_SPI=m
@@ -1805,6 +1861,9 @@ CONFIG_MII=m
 CONFIG_IEEE802154_DRIVERS=m
 CONFIG_IEEE802154_FAKEHARD=m
 CONFIG_IFB=m
+CONFIG_NET_TEAM=m
+CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
 CONFIG_MACVLAN=m
 CONFIG_MACVTAP=m
 CONFIG_NETCONSOLE=m
@@ -1890,6 +1949,7 @@ CONFIG_TIGON3=m
 CONFIG_BNX2X=m
 CONFIG_NET_VENDOR_BROCADE=y
 CONFIG_BNA=m
+CONFIG_NET_CALXEDA_XGMAC=m
 CONFIG_NET_VENDOR_CHELSIO=y
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T1_1G=y
@@ -2011,6 +2071,8 @@ CONFIG_EPIC100=m
 CONFIG_SMSC9420=m
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_STMMAC_ETH=m
+CONFIG_STMMAC_PLATFORM=m
+CONFIG_STMMAC_PCI=m
 # CONFIG_STMMAC_DEBUG_FS is not set
 # CONFIG_STMMAC_DA is not set
 CONFIG_STMMAC_RING=y
@@ -2053,6 +2115,7 @@ CONFIG_STE10XP=m
 CONFIG_LSI_ET1011C_PHY=m
 CONFIG_MICREL_PHY=m
 # CONFIG_MDIO_BITBANG is not set
+CONFIG_MICREL_KS8995MA=m
 CONFIG_PLIP=m
 CONFIG_PPP=m
 CONFIG_PPP_BSDCOMP=m
@@ -2143,6 +2206,7 @@ CONFIG_ATH9K_PCI=y
 CONFIG_ATH9K_AHB=y
 # CONFIG_ATH9K_DEBUGFS is not set
 CONFIG_ATH9K_RATE_CONTROL=y
+CONFIG_ATH9K_BTCOEX_SUPPORT=y
 CONFIG_ATH9K_HTC=m
 # CONFIG_ATH9K_HTC_DEBUGFS is not set
 CONFIG_CARL9170=m
@@ -2152,11 +2216,14 @@ CONFIG_CARL9170_WPC=y
 CONFIG_ATH6KL=m
 # CONFIG_ATH6KL_DEBUG is not set
 CONFIG_B43=m
+CONFIG_B43_BCMA=y
+# CONFIG_B43_BCMA_EXTRA is not set
 CONFIG_B43_SSB=y
 CONFIG_B43_PCI_AUTOSELECT=y
 CONFIG_B43_PCICORE_AUTOSELECT=y
 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
@@ -2178,6 +2245,7 @@ CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
 CONFIG_BRCMUTIL=m
 CONFIG_BRCMSMAC=m
 CONFIG_BRCMFMAC=m
+CONFIG_BRCMFMAC_SDIO=y
 # CONFIG_BRCMDBG is not set
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
@@ -2203,14 +2271,14 @@ CONFIG_IWLWIFI=m
 #
 # CONFIG_IWLWIFI_DEBUG is not set
 CONFIG_IWLWIFI_DEVICE_TRACING=y
-CONFIG_IWLWIFI_DEVICE_SVTOOL=y
-CONFIG_IWLWIFI_LEGACY=m
+CONFIG_IWLWIFI_DEVICE_TESTMODE=y
+# CONFIG_IWLWIFI_P2P is not set
+CONFIG_IWLEGACY=m
 
 #
 # Debugging Options
 #
-# CONFIG_IWLWIFI_LEGACY_DEBUG is not set
-# CONFIG_IWLWIFI_LEGACY_DEVICE_TRACING is not set
+# CONFIG_IWLEGACY_DEBUG is not set
 CONFIG_IWL4965=m
 CONFIG_IWL3945=m
 CONFIG_IWM=m
@@ -2275,7 +2343,6 @@ CONFIG_WL12XX_MENU=m
 CONFIG_WL12XX=m
 CONFIG_WL12XX_SPI=m
 CONFIG_WL12XX_SDIO=m
-CONFIG_WL12XX_SDIO_TEST=m
 CONFIG_WL12XX_PLATFORM_DATA=y
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
@@ -2295,6 +2362,7 @@ CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
 CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_VMXNET3=m
+CONFIG_HYPERV_NET=m
 CONFIG_ISDN=y
 CONFIG_ISDN_I4L=m
 CONFIG_ISDN_PPP=y
@@ -2459,6 +2527,7 @@ CONFIG_KEYBOARD_QT2160=m
 CONFIG_KEYBOARD_GPIO=m
 CONFIG_KEYBOARD_GPIO_POLLED=m
 CONFIG_KEYBOARD_TCA6416=m
+CONFIG_KEYBOARD_TCA8418=m
 CONFIG_KEYBOARD_MATRIX=m
 # CONFIG_KEYBOARD_LM8323 is not set
 # CONFIG_KEYBOARD_MAX7359 is not set
@@ -2468,6 +2537,7 @@ CONFIG_KEYBOARD_MPR121=m
 # CONFIG_KEYBOARD_OPENCORES is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_KEYBOARD_SUNKBD is not set
+CONFIG_KEYBOARD_STMPE=m
 # CONFIG_KEYBOARD_XTKBD is not set
 CONFIG_INPUT_MOUSE=y
 CONFIG_MOUSE_PS2=m
@@ -2530,11 +2600,13 @@ CONFIG_TOUCHSCREEN_AD7879=m
 CONFIG_TOUCHSCREEN_AD7879_I2C=m
 CONFIG_TOUCHSCREEN_AD7879_SPI=m
 CONFIG_TOUCHSCREEN_ATMEL_MXT=m
+CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
 CONFIG_TOUCHSCREEN_BU21013=m
 CONFIG_TOUCHSCREEN_CY8CTMG110=m
 CONFIG_TOUCHSCREEN_DYNAPRO=m
 CONFIG_TOUCHSCREEN_HAMPSHIRE=m
 CONFIG_TOUCHSCREEN_EETI=m
+CONFIG_TOUCHSCREEN_EGALAX=m
 CONFIG_TOUCHSCREEN_FUJITSU=m
 CONFIG_TOUCHSCREEN_GUNZE=m
 CONFIG_TOUCHSCREEN_ELO=m
@@ -2548,6 +2620,7 @@ CONFIG_TOUCHSCREEN_PENMOUNT=m
 CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
 CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_UCB1400=m
+CONFIG_TOUCHSCREEN_PIXCIR=m
 CONFIG_TOUCHSCREEN_WM831X=m
 CONFIG_TOUCHSCREEN_WM97XX=m
 CONFIG_TOUCHSCREEN_WM9705=y
@@ -2567,6 +2640,7 @@ CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
 CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
 CONFIG_TOUCHSCREEN_USB_GOTOP=y
 CONFIG_TOUCHSCREEN_USB_JASTEC=y
+CONFIG_TOUCHSCREEN_USB_ELO=y
 CONFIG_TOUCHSCREEN_USB_E2I=y
 CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
 CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
@@ -2577,6 +2651,7 @@ CONFIG_TOUCHSCREEN_TSC2005=m
 CONFIG_TOUCHSCREEN_TSC2007=m
 CONFIG_TOUCHSCREEN_PCAP=m
 CONFIG_TOUCHSCREEN_ST1232=m
+CONFIG_TOUCHSCREEN_STMPE=m
 CONFIG_TOUCHSCREEN_TPS6507X=m
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_AB8500_PONKEY=m
@@ -2589,6 +2664,8 @@ CONFIG_INPUT_MC13783_PWRBUTTON=m
 CONFIG_INPUT_MMA8450=m
 CONFIG_INPUT_MPU3050=m
 CONFIG_INPUT_APANEL=m
+CONFIG_INPUT_GP2A=m
+CONFIG_INPUT_GPIO_TILT_POLLED=m
 CONFIG_INPUT_ATLAS_BTNS=m
 CONFIG_INPUT_ATI_REMOTE2=m
 CONFIG_INPUT_KEYSPAN_REMOTE=m
@@ -2877,6 +2954,7 @@ CONFIG_GPIO_MAX7300=m
 CONFIG_GPIO_MAX732X=m
 CONFIG_GPIO_PCA953X=m
 CONFIG_GPIO_PCF857X=m
+CONFIG_GPIO_STMPE=y
 CONFIG_GPIO_TPS65912=m
 CONFIG_GPIO_WM831X=m
 CONFIG_GPIO_ADP5588=m
@@ -2942,7 +3020,7 @@ CONFIG_TEST_POWER=m
 CONFIG_BATTERY_DS2760=m
 CONFIG_BATTERY_DS2780=m
 CONFIG_BATTERY_DS2782=m
-CONFIG_BATTERY_BQ20Z75=m
+CONFIG_BATTERY_SBS=m
 CONFIG_BATTERY_BQ27x00=m
 CONFIG_BATTERY_BQ27X00_I2C=y
 CONFIG_BATTERY_BQ27X00_PLATFORM=y
@@ -2951,7 +3029,9 @@ CONFIG_BATTERY_MAX17042=m
 CONFIG_CHARGER_PCF50633=m
 CONFIG_CHARGER_ISP1704=m
 CONFIG_CHARGER_MAX8903=m
+CONFIG_CHARGER_LP8727=m
 CONFIG_CHARGER_GPIO=m
+# CONFIG_CHARGER_MANAGER is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
@@ -3123,6 +3203,7 @@ CONFIG_SBC8360_WDT=m
 CONFIG_CPU5_WDT=m
 CONFIG_SMSC_SCH311X_WDT=m
 CONFIG_SMSC37B787_WDT=m
+CONFIG_VIA_WDT=m
 CONFIG_W83627HF_WDT=m
 CONFIG_W83697HF_WDT=m
 CONFIG_W83697UG_WDT=m
@@ -3165,7 +3246,11 @@ CONFIG_BCMA_POSSIBLE=y
 #
 # Broadcom specific AMBA
 #
-# CONFIG_BCMA is not set
+CONFIG_BCMA=m
+CONFIG_BCMA_BLOCKIO=y
+CONFIG_BCMA_HOST_PCI_POSSIBLE=y
+CONFIG_BCMA_HOST_PCI=y
+# CONFIG_BCMA_DEBUG is not set
 
 #
 # Multifunction device drivers
@@ -3180,7 +3265,15 @@ CONFIG_TPS65010=m
 CONFIG_TPS6507X=m
 CONFIG_MFD_TPS65912=y
 CONFIG_MFD_TPS65912_SPI=y
+CONFIG_MFD_STMPE=y
+
+#
+# STMPE Interface Drivers
+#
+CONFIG_STMPE_SPI=y
 # CONFIG_MFD_TMIO is not set
+CONFIG_PMIC_DA9052=y
+CONFIG_MFD_DA9052_SPI=y
 CONFIG_MFD_WM8400=m
 CONFIG_MFD_WM831X=y
 CONFIG_MFD_WM831X_SPI=y
@@ -3215,6 +3308,7 @@ CONFIG_REGULATOR_MAX8660=m
 CONFIG_REGULATOR_MAX8952=m
 CONFIG_REGULATOR_WM831X=m
 CONFIG_REGULATOR_WM8400=m
+CONFIG_REGULATOR_DA9052=m
 CONFIG_REGULATOR_PCF50633=m
 CONFIG_REGULATOR_LP3971=m
 CONFIG_REGULATOR_LP3972=m
@@ -3257,6 +3351,7 @@ CONFIG_IR_RC6_DECODER=m
 CONFIG_IR_JVC_DECODER=m
 CONFIG_IR_SONY_DECODER=m
 CONFIG_IR_RC5_SZ_DECODER=m
+CONFIG_IR_SANYO_DECODER=m
 CONFIG_IR_MCE_KBD_DECODER=m
 CONFIG_IR_LIRC_CODEC=m
 CONFIG_RC_ATI_REMOTE=m
@@ -3298,7 +3393,6 @@ CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEOBUF_GEN=m
 CONFIG_VIDEOBUF_DMA_SG=m
 CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEOBUF_DMA_CONTIG=m
 CONFIG_VIDEOBUF_DVB=m
 CONFIG_VIDEO_BTCX=m
 CONFIG_VIDEO_TVEEPROM=m
@@ -3394,6 +3488,7 @@ CONFIG_VIDEO_S5K6AA=m
 # Flash devices
 #
 CONFIG_VIDEO_ADP1653=m
+CONFIG_VIDEO_AS3645A=m
 
 #
 # Video improvement chips
@@ -3407,62 +3502,6 @@ CONFIG_VIDEO_UPD64083=m
 CONFIG_VIDEO_THS7303=m
 CONFIG_VIDEO_M52790=m
 CONFIG_VIDEO_VIVI=m
-CONFIG_VIDEO_BT848=m
-CONFIG_VIDEO_BT848_DVB=y
-CONFIG_VIDEO_BWQCAM=m
-CONFIG_VIDEO_CQCAM=m
-CONFIG_VIDEO_W9966=m
-CONFIG_VIDEO_CPIA2=m
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_ZR36060=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN_AVS6EYES=m
-CONFIG_VIDEO_MEYE=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7134_ALSA=m
-CONFIG_VIDEO_SAA7134_RC=y
-CONFIG_VIDEO_SAA7134_DVB=m
-CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_TIMBERDALE=m
-CONFIG_VIDEO_CX88=m
-CONFIG_VIDEO_CX88_ALSA=m
-CONFIG_VIDEO_CX88_BLACKBIRD=m
-CONFIG_VIDEO_CX88_DVB=m
-CONFIG_VIDEO_CX88_MPEG=m
-CONFIG_VIDEO_CX88_VP3054=m
-CONFIG_VIDEO_CX23885=m
-CONFIG_MEDIA_ALTERA_CI=m
-CONFIG_VIDEO_CX25821=m
-CONFIG_VIDEO_CX25821_ALSA=m
-CONFIG_VIDEO_AU0828=m
-CONFIG_VIDEO_IVTV=m
-CONFIG_VIDEO_FB_IVTV=m
-CONFIG_VIDEO_CX18=m
-CONFIG_VIDEO_CX18_ALSA=m
-CONFIG_VIDEO_SAA7164=m
-CONFIG_VIDEO_CAFE_CCIC=m
-CONFIG_SOC_CAMERA=m
-CONFIG_SOC_CAMERA_IMX074=m
-CONFIG_SOC_CAMERA_MT9M001=m
-CONFIG_SOC_CAMERA_MT9M111=m
-CONFIG_SOC_CAMERA_MT9T031=m
-CONFIG_SOC_CAMERA_MT9T112=m
-CONFIG_SOC_CAMERA_MT9V022=m
-CONFIG_SOC_CAMERA_RJ54N1=m
-CONFIG_SOC_CAMERA_TW9910=m
-CONFIG_SOC_CAMERA_PLATFORM=m
-CONFIG_SOC_CAMERA_OV2640=m
-CONFIG_SOC_CAMERA_OV5642=m
-CONFIG_SOC_CAMERA_OV6650=m
-CONFIG_SOC_CAMERA_OV772X=m
-CONFIG_SOC_CAMERA_OV9640=m
-CONFIG_SOC_CAMERA_OV9740=m
 CONFIG_V4L_USB_DRIVERS=y
 CONFIG_USB_VIDEO_CLASS=m
 CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
@@ -3476,6 +3515,7 @@ CONFIG_USB_GSPCA_CPIA1=m
 CONFIG_USB_GSPCA_ETOMS=m
 CONFIG_USB_GSPCA_FINEPIX=m
 CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_JL2005BCD=m
 CONFIG_USB_GSPCA_KINECT=m
 CONFIG_USB_GSPCA_KONICA=m
 CONFIG_USB_GSPCA_MARS=m
@@ -3535,20 +3575,58 @@ CONFIG_USB_SN9C102=m
 CONFIG_USB_PWC=m
 # CONFIG_USB_PWC_DEBUG is not set
 CONFIG_USB_PWC_INPUT_EVDEV=y
+CONFIG_VIDEO_CPIA2=m
 CONFIG_USB_ZR364XX=m
 CONFIG_USB_STKWEBCAM=m
 CONFIG_USB_S2255=m
+CONFIG_V4L_PCI_DRIVERS=y
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_BT848=m
+CONFIG_VIDEO_BT848_DVB=y
+CONFIG_VIDEO_CX18=m
+CONFIG_VIDEO_CX18_ALSA=m
+CONFIG_VIDEO_CX23885=m
+CONFIG_MEDIA_ALTERA_CI=m
+CONFIG_VIDEO_CX25821=m
+CONFIG_VIDEO_CX25821_ALSA=m
+CONFIG_VIDEO_CX88=m
+CONFIG_VIDEO_CX88_ALSA=m
+CONFIG_VIDEO_CX88_BLACKBIRD=m
+CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_VP3054=m
+CONFIG_VIDEO_CX88_MPEG=m
+CONFIG_VIDEO_HEXIUM_GEMINI=m
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_IVTV=m
+CONFIG_VIDEO_FB_IVTV=m
+CONFIG_VIDEO_MEYE=m
+CONFIG_VIDEO_MXB=m
+CONFIG_VIDEO_SAA7134=m
+CONFIG_VIDEO_SAA7134_ALSA=m
+CONFIG_VIDEO_SAA7134_RC=y
+CONFIG_VIDEO_SAA7134_DVB=m
+CONFIG_VIDEO_SAA7164=m
+CONFIG_VIDEO_ZORAN=m
+CONFIG_VIDEO_ZORAN_DC30=m
+CONFIG_VIDEO_ZORAN_ZR36060=m
+CONFIG_VIDEO_ZORAN_BUZ=m
+CONFIG_VIDEO_ZORAN_DC10=m
+CONFIG_VIDEO_ZORAN_LML33=m
+CONFIG_VIDEO_ZORAN_LML33R10=m
+CONFIG_VIDEO_ZORAN_AVS6EYES=m
+# CONFIG_V4L_ISA_PARPORT_DRIVERS is not set
+# CONFIG_V4L_PLATFORM_DRIVERS is not set
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 CONFIG_VIDEO_MEM2MEM_TESTDEV=m
 CONFIG_RADIO_ADAPTERS=y
-CONFIG_RADIO_MAXIRADIO=m
-CONFIG_I2C_SI4713=m
-CONFIG_RADIO_SI4713=m
-CONFIG_USB_DSBR=m
 CONFIG_RADIO_SI470X=y
 CONFIG_USB_SI470X=m
 CONFIG_I2C_SI470X=m
 CONFIG_USB_MR800=m
+CONFIG_USB_DSBR=m
+CONFIG_RADIO_MAXIRADIO=m
+CONFIG_I2C_SI4713=m
+CONFIG_RADIO_SI4713=m
 CONFIG_RADIO_TEA5764=m
 CONFIG_RADIO_SAA7706H=m
 CONFIG_RADIO_TEF6862=m
@@ -3825,6 +3903,9 @@ CONFIG_DRM_SIS=m
 CONFIG_DRM_VIA=m
 CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_VMWGFX=m
+CONFIG_DRM_GMA500=m
+CONFIG_DRM_GMA600=y
+CONFIG_DRM_GMA3600=y
 CONFIG_STUB_POULSBO=m
 CONFIG_VGASTATE=m
 CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -3880,7 +3961,7 @@ CONFIG_FB_EFI=y
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_3DFX is not set
 CONFIG_FB_VOODOO1=m
-# CONFIG_FB_VT8623 is not set
+CONFIG_FB_VT8623=m
 # CONFIG_FB_TRIDENT is not set
 # CONFIG_FB_ARK is not set
 # CONFIG_FB_PM3 is not set
@@ -3918,15 +3999,6 @@ CONFIG_BACKLIGHT_ADP8870=m
 CONFIG_BACKLIGHT_PCF50633=m
 
 #
-# Display device support
-#
-CONFIG_DISPLAY_SUPPORT=m
-
-#
-# Display hardware drivers
-#
-
-#
 # Console display driver support
 #
 CONFIG_VGA_CONSOLE=y
@@ -3971,6 +4043,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SND_VERBOSE_PRINTK is not set
 # CONFIG_SND_DEBUG is not set
 CONFIG_SND_VMASTER=y
+CONFIG_SND_KCTL_JACK=y
 CONFIG_SND_DMA_SGBUF=y
 CONFIG_SND_RAWMIDI_SEQ=m
 CONFIG_SND_OPL3_LIB_SEQ=m
@@ -4110,7 +4183,6 @@ CONFIG_SND_PCMCIA=y
 CONFIG_SND_VXPOCKET=m
 CONFIG_SND_PDAUDIOCF=m
 CONFIG_SND_SOC=m
-CONFIG_SND_SOC_CACHE_LZO=y
 CONFIG_SND_SOC_I2C_AND_SPI=m
 # CONFIG_SND_SOC_ALL_CODECS is not set
 # CONFIG_SOUND_PRIME is not set
@@ -4174,10 +4246,10 @@ CONFIG_HID_PICOLCD_BACKLIGHT=y
 CONFIG_HID_PICOLCD_LCD=y
 CONFIG_HID_PICOLCD_LEDS=y
 CONFIG_HID_PRIMAX=m
-CONFIG_HID_QUANTA=m
 CONFIG_HID_ROCCAT=m
 CONFIG_HID_ROCCAT_COMMON=m
 CONFIG_HID_ROCCAT_ARVO=m
+CONFIG_HID_ROCCAT_ISKU=m
 CONFIG_HID_ROCCAT_KONE=m
 CONFIG_HID_ROCCAT_KONEPLUS=m
 CONFIG_HID_ROCCAT_KOVAPLUS=m
@@ -4188,6 +4260,7 @@ CONFIG_HID_SPEEDLINK=m
 CONFIG_HID_SUNPLUS=m
 CONFIG_HID_GREENASIA=m
 CONFIG_GREENASIA_FF=y
+CONFIG_HID_HYPERV_MOUSE=m
 CONFIG_HID_SMARTJOYPLUS=m
 CONFIG_SMARTJOYPLUS_FF=y
 CONFIG_HID_TOPSEED=m
@@ -4196,6 +4269,7 @@ CONFIG_THRUSTMASTER_FF=y
 CONFIG_HID_WACOM=m
 CONFIG_HID_WACOM_POWER_SUPPLY=y
 CONFIG_HID_WIIMOTE=m
+CONFIG_HID_WIIMOTE_EXT=y
 CONFIG_HID_ZEROPLUS=m
 CONFIG_ZEROPLUS_FF=y
 CONFIG_HID_ZYDACRON=m
@@ -4217,8 +4291,7 @@ CONFIG_USB_DEVICEFS=y
 CONFIG_USB_DYNAMIC_MINORS=y
 CONFIG_USB_SUSPEND=y
 # CONFIG_USB_OTG is not set
-CONFIG_USB_DWC3=m
-# CONFIG_USB_DWC3_DEBUG is not set
+# CONFIG_USB_DWC3 is not set
 CONFIG_USB_MON=m
 CONFIG_USB_WUSB=m
 CONFIG_USB_WUSB_CBAF=m
@@ -4233,6 +4306,7 @@ CONFIG_USB_XHCI_HCD=m
 CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_EHCI_MV=y
 CONFIG_USB_OXU210HP_HCD=m
 CONFIG_USB_ISP116X_HCD=m
 CONFIG_USB_ISP1760_HCD=m
@@ -4251,6 +4325,9 @@ CONFIG_USB_R8A66597_HCD=m
 CONFIG_USB_RENESAS_USBHS_HCD=m
 CONFIG_USB_WHCI_HCD=m
 CONFIG_USB_HWA_HCD=m
+CONFIG_USB_MUSB_HDRC=m
+CONFIG_USB_MUSB_TUSB6010=m
+CONFIG_MUSB_PIO_ONLY=y
 CONFIG_USB_RENESAS_USBHS=m
 
 #
@@ -4400,7 +4477,9 @@ CONFIG_USB_GADGET=m
 CONFIG_USB_GADGET_VBUS_DRAW=2
 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 CONFIG_USB_R8A66597=m
-CONFIG_USB_GADGET_DWC3=m
+CONFIG_USB_RENESAS_USBHS_UDC=m
+CONFIG_USB_MV_UDC=m
+CONFIG_USB_GADGET_MUSB_HDRC=m
 CONFIG_USB_M66592=m
 CONFIG_USB_AMD5536UDC=m
 CONFIG_USB_CI13XXX_PCI=m
@@ -4443,9 +4522,10 @@ CONFIG_USB_G_WEBCAM=m
 # OTG and related infrastructure
 #
 CONFIG_USB_OTG_UTILS=y
-CONFIG_USB_GPIO_VBUS=m
+# CONFIG_USB_GPIO_VBUS is not set
 CONFIG_NOP_USB_XCEIV=m
-CONFIG_AB8500_USB=m
+# CONFIG_AB8500_USB is not set
+# CONFIG_USB_MV_OTG is not set
 CONFIG_UWB=m
 CONFIG_UWB_HWA=m
 CONFIG_UWB_WHCI=m
@@ -4453,7 +4533,7 @@ CONFIG_UWB_I1480U=m
 CONFIG_MMC=m
 # CONFIG_MMC_DEBUG is not set
 # CONFIG_MMC_UNSAFE_RESUME is not set
-CONFIG_MMC_CLKGATE=y
+# CONFIG_MMC_CLKGATE is not set
 
 #
 # MMC/SD/SDIO Card Drivers
@@ -4518,6 +4598,8 @@ CONFIG_LEDS_INTEL_SS4200=m
 CONFIG_LEDS_LT3593=m
 CONFIG_LEDS_DELL_NETBOOKS=m
 CONFIG_LEDS_MC13783=m
+CONFIG_LEDS_TCA6507=m
+CONFIG_LEDS_OT200=m
 CONFIG_LEDS_TRIGGERS=y
 
 #
@@ -4678,6 +4760,12 @@ CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_MMIO=m
 
 #
+# Microsoft Hyper-V guest support
+#
+CONFIG_HYPERV=m
+CONFIG_HYPERV_UTILS=m
+
+#
 # Xen driver support
 #
 CONFIG_XEN_BALLOON=y
@@ -4695,6 +4783,7 @@ CONFIG_XEN_GRANT_DEV_ALLOC=m
 CONFIG_SWIOTLB_XEN=y
 CONFIG_XEN_TMEM=y
 CONFIG_XEN_PCIDEV_BACKEND=m
+CONFIG_XEN_PRIVCMD=m
 CONFIG_STAGING=y
 CONFIG_ET131X=m
 CONFIG_SLICOSS=m
@@ -4796,6 +4885,10 @@ CONFIG_ASUS_OLED=m
 # CONFIG_PANEL is not set
 CONFIG_R8187SE=m
 CONFIG_RTL8192U=m
+CONFIG_RTLLIB=m
+CONFIG_RTLLIB_CRYPTO_CCMP=m
+CONFIG_RTLLIB_CRYPTO_TKIP=m
+CONFIG_RTLLIB_CRYPTO_WEP=m
 CONFIG_RTL8192E=m
 CONFIG_R8712U=m
 CONFIG_R8712_AP=y
@@ -4804,8 +4897,6 @@ CONFIG_RTS_PSTOR=m
 CONFIG_RTS5139=m
 # CONFIG_RTS5139_DEBUG is not set
 # CONFIG_TRANZPORT is not set
-CONFIG_POHMELFS=m
-# CONFIG_POHMELFS_DEBUG is not set
 CONFIG_IDE_PHISON=m
 CONFIG_LINE6_USB=m
 # CONFIG_LINE6_USB_DEBUG is not set
@@ -4828,8 +4919,6 @@ CONFIG_USB_SERIAL_QUATECH_USB2=m
 CONFIG_VT6655=m
 CONFIG_VT6656=m
 CONFIG_HYPERV_STORAGE=m
-CONFIG_HYPERV_NET=m
-CONFIG_HYPERV_MOUSE=m
 # CONFIG_VME_BUS is not set
 CONFIG_DX_SEP=m
 # CONFIG_IIO is not set
@@ -4870,10 +4959,6 @@ CONFIG_SPEAKUP_SYNTH_TXPRT=m
 CONFIG_SPEAKUP_SYNTH_DUMMY=m
 CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
 CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
-CONFIG_DRM_PSB=m
-CONFIG_DRM_PSB_MRST=y
-CONFIG_DRM_PSB_MFLD=y
-CONFIG_DRM_PSB_CDV=y
 CONFIG_INTEL_MEI=m
 CONFIG_STAGING_MEDIA=y
 CONFIG_DVB_AS102=m
@@ -4905,6 +4990,11 @@ CONFIG_LIRC_SERIAL_TRANSMITTER=y
 CONFIG_LIRC_SIR=m
 CONFIG_LIRC_TTUSBIR=m
 CONFIG_LIRC_ZILOG=m
+
+#
+# Android
+#
+# CONFIG_ANDROID is not set
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 CONFIG_ACERHDF=m
@@ -4914,6 +5004,8 @@ CONFIG_DELL_WMI=m
 CONFIG_DELL_WMI_AIO=m
 CONFIG_FUJITSU_LAPTOP=m
 # CONFIG_FUJITSU_LAPTOP_DEBUG is not set
+CONFIG_FUJITSU_TABLET=m
+CONFIG_AMILO_RFKILL=m
 CONFIG_HP_ACCEL=m
 CONFIG_HP_WMI=m
 CONFIG_MSI_LAPTOP=m
@@ -4960,14 +5052,13 @@ CONFIG_IOMMU_API=y
 CONFIG_IOMMU_SUPPORT=y
 CONFIG_AMD_IOMMU=y
 # CONFIG_AMD_IOMMU_STATS is not set
+CONFIG_AMD_IOMMU_V2=m
 CONFIG_DMAR_TABLE=y
 CONFIG_INTEL_IOMMU=y
 # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
 CONFIG_INTEL_IOMMU_FLOPPY_WA=y
 CONFIG_IRQ_REMAP=y
 CONFIG_VIRT_DRIVERS=y
-CONFIG_HYPERV=m
-CONFIG_HYPERV_UTILS=m
 # CONFIG_PM_DEVFREQ is not set
 
 #
@@ -4982,7 +5073,6 @@ CONFIG_DCDBAS=m
 CONFIG_DMIID=y
 CONFIG_DMI_SYSFS=m
 # CONFIG_ISCSI_IBFT_FIND is not set
-CONFIG_SIGMA=m
 # CONFIG_GOOGLE_FIRMWARE is not set
 
 #
@@ -4996,8 +5086,6 @@ CONFIG_EXT4_FS_XATTR=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 # CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD=m
-# CONFIG_JBD_DEBUG is not set
 CONFIG_JBD2=m
 # CONFIG_JBD2_DEBUG is not set
 CONFIG_FS_MBCACHE=m
@@ -5027,6 +5115,7 @@ CONFIG_OCFS2_FS_STATS=y
 # CONFIG_OCFS2_DEBUG_FS is not set
 CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
+# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
 CONFIG_NILFS2_FS=m
 CONFIG_FS_POSIX_ACL=y
 CONFIG_EXPORTFS=m
@@ -5163,6 +5252,7 @@ CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3=y
 CONFIG_NFSD_V3_ACL=y
 CONFIG_NFSD_V4=y
+# CONFIG_NFSD_FAULT_INJECTION is not set
 CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
 CONFIG_NFS_ACL_SUPPORT=m
@@ -5198,29 +5288,6 @@ CONFIG_AFS_FSCACHE=y
 CONFIG_9P_FS=m
 CONFIG_9P_FSCACHE=y
 CONFIG_9P_FS_POSIX_ACL=y
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_MAC_PARTITION=y
-CONFIG_MSDOS_PARTITION=y
-CONFIG_BSD_DISKLABEL=y
-CONFIG_MINIX_SUBPARTITION=y
-CONFIG_SOLARIS_X86_PARTITION=y
-# CONFIG_UNIXWARE_DISKLABEL is not set
-CONFIG_LDM_PARTITION=y
-# CONFIG_LDM_DEBUG is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-CONFIG_KARMA_PARTITION=y
-CONFIG_EFI_PARTITION=y
-# CONFIG_SYSV68_PARTITION is not set
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
 CONFIG_NLS_CODEPAGE_437=m
@@ -5292,11 +5359,12 @@ CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
 CONFIG_SCHED_DEBUG=y
-# CONFIG_SCHEDSTATS is not set
+CONFIG_SCHEDSTATS=y
 CONFIG_TIMER_STATS=y
 # CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_SLUB_STATS is not set
+# CONFIG_DEBUG_KMEMLEAK is not set
 # CONFIG_DEBUG_PREEMPT is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
@@ -5415,6 +5483,7 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
 # CONFIG_CPA_DEBUG is not set
 # CONFIG_OPTIMIZE_INLINING is not set
 # CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
+# CONFIG_DEBUG_NMI_SELFTEST is not set
 
 #
 # Security options
@@ -5549,6 +5618,7 @@ CONFIG_CRYPTO_SALSA20=m
 CONFIG_CRYPTO_SALSA20_X86_64=m
 CONFIG_CRYPTO_SEED=m
 CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TWOFISH=m
 CONFIG_CRYPTO_TWOFISH_COMMON=m
@@ -5593,6 +5663,8 @@ CONFIG_BINARY_PRINTF=y
 CONFIG_RAID6_PQ=m
 CONFIG_BITREVERSE=y
 CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_GENERIC_IOMAP=y
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
 CONFIG_CRC_T10DIF=m
@@ -5622,6 +5694,8 @@ CONFIG_DECOMPRESS_LZO=y
 CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_REED_SOLOMON=m
 CONFIG_REED_SOLOMON_DEC16=y
+CONFIG_BCH=m
+CONFIG_BCH_CONST_PARAMS=y
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m
 CONFIG_TEXTSEARCH_BM=m
@@ -5632,6 +5706,7 @@ CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
 CONFIG_CHECK_SIGNATURE=y
 CONFIG_CPU_RMAP=y
+CONFIG_DQL=y
 CONFIG_NLATTR=y
 CONFIG_LRU_CACHE=m
 CONFIG_AVERAGE=y
diff --git a/libre/linux-libre/ext4-options.patch b/libre/linux-libre/ext4-options.patch
new file mode 100644
index 000000000..ea48c384b
--- /dev/null
+++ b/libre/linux-libre/ext4-options.patch
@@ -0,0 +1,50 @@
+Report: https://bbs.archlinux.org/profile.php?id=33804
+Signed-off-by: Tom Gundersen <teg@jklm.no>
+Cc: Thomas Baechler <thomas@archlinux.org>
+Cc: Tobias Powalowski <tobias.powalowski@googlemail.com>
+Cc: Dave Reisner <d@falconindy.com>
+---
+ fs/ext4/super.c |   15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/fs/ext4/super.c b/fs/ext4/super.c
+index 502c61f..30de9cd 100644
+--- a/fs/ext4/super.c
++++ b/fs/ext4/super.c
+@@ -1333,6 +1333,7 @@ enum {
+ 	Opt_inode_readahead_blks, Opt_journal_ioprio,
+ 	Opt_dioread_nolock, Opt_dioread_lock,
+ 	Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable,
++	Opt_nocheck, Opt_reservation, Opt_noreservation, Opt_journal_inum,
+ };
+ 
+ static const match_table_t tokens = {
+@@ -1408,6 +1409,10 @@ static const match_table_t tokens = {
+ 	{Opt_init_itable, "init_itable=%u"},
+ 	{Opt_init_itable, "init_itable"},
+ 	{Opt_noinit_itable, "noinit_itable"},
++	{Opt_nocheck, "nocheck"},
++	{Opt_reservation, "reservation"},
++	{Opt_noreservation, "noreservation"},
++	{Opt_journal_inum, "journal=%u"},
+ 	{Opt_err, NULL},
+ };
+ 
+@@ -1904,6 +1909,16 @@ set_qf_format:
+ 		case Opt_noinit_itable:
+ 			clear_opt(sb, INIT_INODE_TABLE);
+ 			break;
++#ifdef CONFIG_EXT4_USE_FOR_EXT23
++		case Opt_nocheck:
++		case Opt_reservation:
++		case Opt_noreservation:
++		case Opt_journal_inum:
++			ext4_msg(sb, KERN_WARNING,
++			       "ext3 mount option \"%s\" ignored "
++			       "by ext4 module", p);
++			break;
++#endif
+ 		default:
+ 			ext4_msg(sb, KERN_ERR,
+ 			       "Unrecognized mount option \"%s\" "
+
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 6e3e16986..4b8d1dccb 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.2.7-1-LIBRE
+KERNEL_VERSION=3.3.0-1-LIBRE
 
 post_install () {
   # updating module dependencies
@@ -17,8 +17,9 @@ post_install () {
     [ -f /etc/lilo.conf ] && loaders="$loaders /etc/lilo.conf"
     if [ -n "${loaders}" ] && grep -q -e vmlinuz26 -e kernel26.img -e kernel26-fallback.img $loaders; then
       # add compat symlinks for the initramfs images
-      ln -sf initramfs-linux-libre${KERNEL_NAME}.img /boot/kernel26${KERNEL_NAME}.img
-      ln -sf initramfs-linux-libre${KERNEL_NAME}-fallback.img /boot/kernel26${KERNEL_NAME}-fallback.img
+      ln -sf initramfs-linux-libre${KERNEL_NAME}.img boot/kernel26${KERNEL_NAME}.img
+      ln -sf initramfs-linux-libre${KERNEL_NAME}-fallback.img \
+        boot/kernel26${KERNEL_NAME}-fallback.img
       ln -sf vmlinuz-linux-libre${KERNEL_NAME} /boot/vmlinuz26${KERNEL_NAME}
     fi
   fi
diff --git a/libre/maven-libre/PKGBUILD b/libre/maven-libre/PKGBUILD
new file mode 100644
index 000000000..2bd99940e
--- /dev/null
+++ b/libre/maven-libre/PKGBUILD
@@ -0,0 +1,76 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: William Rea <sillywilly@gmail.com>
+
+_pkgname=maven
+pkgname=maven-libre
+pkgver=3.0.4
+
+provides=("$_pkgname=$pkgver")
+replaces=("$_pkgname")
+conflicts=("$_pkgname")
+
+pkgrel=1
+pkgdesc="A Java project management and project comprehension tool"
+arch=('any')
+url="http://maven.apache.org"
+license=('Apache')
+depends=('java-environment')
+makedepends=('apache-ant')
+backup=('etc/maven/settings.xml')
+
+_mirror=http://archive.apache.org/dist
+source=($_mirror/maven/source/apache-maven-$pkgver-src.tar.gz
+	maven.sh maven.csh)
+
+_M2_LOCALREPO="/usr/share/maven/repository"
+
+# FIXME: This also does tasks for package()
+build() {
+  cd $srcdir/apache-maven-$pkgver
+
+  . /etc/profile.d/jre.sh
+  . /etc/profile.d/jdk.sh
+
+  export MAVEN_OPTS=-Xmx512m
+  export M2_HOME="$pkgdir"/opt/maven
+  export PATH="$PATH:$M2_HOME/bin"
+
+  # FIXME: Downloads many deps from Internet. They should be
+  #        packaged separately and added to depends=()
+  install -d "$pkgdir`dirname $_M2_LOCALREPO`"
+  cp -r $_M2_LOCALREPO "$pkgdir$_M2_LOCALREPO"
+  install -d "$pkgdir"/opt
+  ant -Dmaven.repo.local="$pkgdir$_M2_LOCALREPO"
+  rm "$pkgdir"/opt/maven/*.txt
+}
+
+package() {
+  install -d "$pkgdir$_M2_LOCALREPO"
+
+  # Install config file in /etc
+  #  Unlike the other directories, we symlink from the system to /opt/maven
+  #  because that way all conf files stay in /etc
+  install -d "$pkgdir"/etc/maven
+  sed "55i<localRepository>$_M2_LOCALREPO</localRepository>" \
+    < "$pkgdir"/opt/maven/conf/settings.xml \
+    > "$pkgdir"/etc/maven/settings.xml
+  rm -rf "$pkgdir"/opt/maven/conf
+  ln -s /etc/maven "$pkgdir"/opt/maven/conf
+
+  # Install profile.d settings
+  install -d "$pkgdir"/etc/profile.d
+  install -m 755 "$srcdir"/maven.{csh,sh} "$pkgdir"/etc/profile.d
+
+  # Link executables to /usr/bin
+  install -d "$pkgdir"/usr/bin
+  ln -s /opt/maven/bin/{mvn,mvnDebug,mvnyjp} "$pkgdir"/usr/bin
+
+  # Link jar files to appropriate place in /usr/share
+  install -d "$pkgdir"/usr/share/java
+  ln -s /opt/maven/lib "$pkgdir"/usr/share/java/maven
+}
+
+md5sums=('17ca94d5be05a78c6ab12425b7a0ee10'
+         '58820067a4d7384477daa134023d9b57'
+         'e2bbdeffed100cd51d05b2ba8ebd6321')
diff --git a/libre/maven-libre/maven.csh b/libre/maven-libre/maven.csh
new file mode 100644
index 000000000..f5750cfc8
--- /dev/null
+++ b/libre/maven-libre/maven.csh
@@ -0,0 +1,2 @@
+setenv MAVEN_OPTS -Xmx512m
+setenv M2_HOME=/opt/maven
diff --git a/libre/maven-libre/maven.sh b/libre/maven-libre/maven.sh
new file mode 100644
index 000000000..b6655cc22
--- /dev/null
+++ b/libre/maven-libre/maven.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+export MAVEN_OPTS=-Xmx512m
+export M2_HOME=/opt/maven
diff --git a/libre/mplayer-libre/.directory b/libre/mplayer-libre/.directory
new file mode 100644
index 000000000..724f09760
--- /dev/null
+++ b/libre/mplayer-libre/.directory
@@ -0,0 +1,2 @@
+[Dolphin]
+Timestamp=2012,3,7,11,33,38
diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD
index 3ca302e09..cf2be2b5f 100644
--- a/libre/mplayer-libre/PKGBUILD
+++ b/libre/mplayer-libre/PKGBUILD
@@ -1,43 +1,49 @@
-# $Id: PKGBUILD 134009 2011-07-31 18:23:34Z ibiru $
+# $Id: PKGBUILD 152227 2012-03-05 09:38:48Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
+# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
 
 # libvdpau is currently useful only with proprietary software
 
 _pkgbase=mplayer
 pkgbase=mplayer-libre
 pkgname=('mplayer-libre' 'mencoder-libre')
-pkgver=34426
-pkgrel=3
+pkgver=34799
+pkgrel=2
 arch=('i686' 'x86_64')
 makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
-'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils'  'libxvmc' 'enca' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' 'speex'
-'libpulse' 'fribidi' 'unzip-libre' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray')
+'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils'  'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx'
+'libpulse' 'fribidi' 'unzip-libre' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray' 'libcdio')
 license=('GPL')
 url="http://www.mplayerhq.hu/"
 options=(!buildflags !emptydirs)
-source=(ftp://ftp.archlinux.org/other/${_pkgbase}/${_pkgbase}-${pkgver}.tar.xz mplayer.desktop)
-md5sums=('ff81117293e76b59e54debc439d8e612'
-         'c0d6ef795cf6de48e3b87ff7c23f0319')
+source=(ftp://ftp.archlinux.org/other/$_pkgbase/$_pkgbase-$pkgver.tar.xz mplayer.desktop
+        live-media.patch)
+md5sums=('e8bd960bcdb48fdc5a1f45390dc13c53'
+         'c0d6ef795cf6de48e3b87ff7c23f0319'
+         'b6c057633ff7001ee0c102b5f81ec1e3')
 
 build() {
-    cd ${srcdir}/${_pkgbase}
+    cd "$srcdir/$_pkgbase"
+
+    patch -Np0 -i "$srcdir/live-media.patch"
 
     ./configure --prefix=/usr \
         --enable-runtime-cpudetection \
         --disable-gui \
         --disable-arts \
         --disable-liblzo \
-        --enable-speex \
+        --disable-speex \
         --disable-openal \
         --disable-libdv \
         --disable-musepack \
         --disable-esd \
         --disable-mga \
         --disable-ass-internal \
-        --disable-vdpau \
+        --disable-cdparanoia \
         --enable-xvmc \
         --enable-radio \
+        --enable-radio-capture \
         --language=all \
         --confdir=/etc/mplayer
     [ "$CARCH" = "i686" ] &&  sed 's|-march=i486|-march=i686|g' -i config.mak
@@ -46,39 +52,37 @@ build() {
 }
 
 package_mplayer-libre() {
-    pkgdesc="A movie player for linux (no unfree faac support)"
+    pkgdesc="A movie player for GNU/Linux (no unfree faac support)"
     install=mplayer.install
     backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
     depends=('desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 'libvpx' 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig'  'libgl'
-    'libxinerama' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'cdparanoia' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi'
-    'libjpeg' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass' 'libxxf86vm' 'libbluray')
+    'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'cdparanoia' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi'
+    'libjpeg' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass' 'libxxf86vm' 'libbluray' 'libcdio')
     provides=("mplayer=$pkgver")
     replaces=('mplayer')
     conflicts=('mplayer')
 
-    cd "${srcdir}/${_pkgbase}"
+    cd "$srcdir/$_pkgbase"
 
-    make DESTDIR="${pkgdir}" install-mplayer install-mplayer-man
-    install -Dm644 etc/{codecs.conf,input.conf,example.conf} "${pkgdir}/etc/mplayer/"
-    install -dm755 "${pkgdir}/usr/share/mplayer/"
-    ln -s /usr/share/fonts/TTF/DejaVuSans.ttf "${pkgdir}/usr/share/mplayer/subfont.ttf"
-    rm -rf "${pkgdir}/usr/share/mplayer/font"
+    make DESTDIR="$pkgdir" install-mplayer install-mplayer-man
+    install -Dm644 etc/{codecs.conf,input.conf,example.conf} "$pkgdir/etc/mplayer/"
+    install -dm755 "$pkgdir/usr/share/mplayer/"
+    ln -s /usr/share/fonts/TTF/DejaVuSans.ttf "$pkgdir/usr/share/mplayer/subfont.ttf"
+    rm -rf "$pkgdir/usr/share/mplayer/font"
     #desktop file  FS#14770
-    install -Dm644 "${srcdir}/mplayer.desktop" "${pkgdir}/usr/share/applications/mplayer.desktop"
-    install -Dm644 etc/mplayer.png "${pkgdir}/usr/share/pixmaps/mplayer.png"
+    install -Dm644 "$srcdir/mplayer.desktop" "$pkgdir/usr/share/applications/mplayer.desktop"
+    install -Dm644 etc/mplayer256x256.png "$pkgdir/usr/share/pixmaps/mplayer.png"
 }
 
 package_mencoder-libre() {
     pkgdesc="Free command line video decoding, encoding and filtering tool (without unfree faac support)"
     depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr' 'cdparanoia'
-    'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faad2' 'schroedinger' 'mpg123' 'libass' 'libbluray')
+    'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faad2' 'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio')
     provides=("mencoder=$pkgver")
     replaces=('mencoder')
     conflicts=('mencoder')
 
-    cd "${srcdir}/${_pkgbase}"
-    make DESTDIR="${pkgdir}" install-mencoder install-mencoder-man
+    cd "$srcdir/$_pkgbase"
+    make DESTDIR="$pkgdir" install-mencoder install-mencoder-man
     find "$pkgdir/usr/share/man" -name 'mplayer.1' -exec bash -c 'mv "$1" "${1/mplayer/mencoder}"' _ {} \;
 }
-md5sums=('ff81117293e76b59e54debc439d8e612'
-         '647b9f4ab5284a7fef3f84f992214e77')
diff --git a/libre/mplayer-libre/live-media.patch b/libre/mplayer-libre/live-media.patch
new file mode 100644
index 000000000..b704b5381
--- /dev/null
+++ b/libre/mplayer-libre/live-media.patch
@@ -0,0 +1,13 @@
+Index: libmpdemux/demux_rtp.cpp
+===================================================================
+--- libmpdemux/demux_rtp.cpp	(revision 34798)
++++ libmpdemux/demux_rtp.cpp	(working copy)
+@@ -19,6 +19,8 @@
+  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#define RTSPCLIENT_SYNCHRONOUS_INTERFACE 1
++
+ extern "C" {
+ // on MinGW, we must include windows.h before the things it conflicts
+ #ifdef __MINGW32__    // with.  they are each protected from
diff --git a/libre/mplayer-libre/mplayer.desktop b/libre/mplayer-libre/mplayer.desktop
index e3229d042..07acea13f 100644
--- a/libre/mplayer-libre/mplayer.desktop
+++ b/libre/mplayer-libre/mplayer.desktop
@@ -14,7 +14,7 @@ Comment[zh]=多媒体播放器
 Comment[pl]=Odtwarzaj filmy i muzykę
 Icon=mplayer
 TryExec=mplayer
-Exec=mplayer -really-quiet %F
+Exec=mplayer %F
 Terminal=false
 NoDisplay=true
 Categories=GTK;AudioVideo;Audio;Video;Player;TV;
diff --git a/libre/mplayer-libre/mplayer.install b/libre/mplayer-libre/mplayer.install
index f98ba7338..660593cf5 100644
--- a/libre/mplayer-libre/mplayer.install
+++ b/libre/mplayer-libre/mplayer.install
@@ -3,9 +3,9 @@ post_install() {
 }
 
 post_upgrade() {
-    post_install $1
+    post_install
 }
 
 post_remove() {
-    post_install $1
+    post_install
 }
diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD
index 632ac4e12..b44c007a5 100644
--- a/libre/mplayer-vaapi-libre/PKGBUILD
+++ b/libre/mplayer-vaapi-libre/PKGBUILD
@@ -1,5 +1,6 @@
-# $Id: PKGBUILD 32760 2010-11-18 03:40:37Z foutrelis $
+# $Id$
 # Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
+# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
 # Maintainer: Evangelos Foutras <foutrelis@gmail.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
@@ -7,13 +8,13 @@
 _pkgname=mplayer-vaapi
 pkgname=mplayer-vaapi-libre
 pkgver=34578
-pkgrel=3
+pkgrel=4
 pkgdesc="A movie player, compiled with vaapi support"
 arch=('i686' 'x86_64')
 url="http://gitorious.org/vaapi/mplayer"
 license=('GPL')
-depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libcdio' 'libxinerama' 'sdl'
-         'lame' 'fontconfig' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'mesa'
+depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libcdio' 'libxinerama' 'sdl-libre'
+         'lame-libre' 'fontconfig' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'mesa'
          'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'speex' 'faad2'
          'lirc-utils' 'ttf-dejavu' 'libxvmc' 'enca' 'opencore-amr' 'libdca'
          'a52dec' 'schroedinger' 'mpg123' 'libvpx' 'libpulse' 'fribidi' 'faad2'
diff --git a/libre/pacman-mirrorlist-libre/PKGBUILD b/libre/pacman-mirrorlist-libre/PKGBUILD
index 65fc932ef..914c939d2 100644
--- a/libre/pacman-mirrorlist-libre/PKGBUILD
+++ b/libre/pacman-mirrorlist-libre/PKGBUILD
@@ -7,31 +7,21 @@ pkgver=$(date +%Y%m%d)
 pkgrel=1
 pkgdesc="Parabola GNU/Linux mirror list for use by pacman"
 arch=('any')
-url="http://repo.parabolagnulinux.org/files/mirrorlist"
+url="http://repo.parabolagnulinux.org/mirrorlist.txt"
 license=('GPL')
 groups=('base')
-#backup=(etc/pacman.d/mirrorlist)
-source=(mirrorlist)
+backup=(etc/pacman.d/mirrorlist)
+source=(mirrorlist::${url})
 conflicts=(pacman-mirrorlist)
 replaces=(pacman-mirrorlist)
 provides=(pacman-mirrorlist)
+md5sums=('3c7958c93c36a41ad18f8d09fd1803ff')
 
 # keep an upgrade path for older installations
 PKGEXT='.pkg.tar.gz'
 
-# NOTE on building this package:
-# * Go to the trunk/ directory
-# * Run bash -c ". PKGBUILD; updatelist"
-# * Update the checksums, update pkgver
-# * Build the package
-
-updatelist() {
-  wget -O mirrorlist http://repo.parabolagnulinux.org/files/mirrorlist
-}
-
 build() {
   mkdir -p $pkgdir/etc/pacman.d
   install -m644 $srcdir/mirrorlist $pkgdir/etc/pacman.d/
 }
 
-md5sums=('6440731bd17b4b6da3927e4882783946')
diff --git a/libre/pacman-mirrorlist-libre/mirrorlist b/libre/pacman-mirrorlist-libre/mirrorlist
deleted file mode 100644
index f353d0bd0..000000000
--- a/libre/pacman-mirrorlist-libre/mirrorlist
+++ /dev/null
@@ -1,4 +0,0 @@
-# Parabola GNU/Linux
-Server = http://repo.parabolagnulinux.org/$repo/os/$arch
-Server = ftp://ftp.inf.utfsm.cl/pub/parabola/$repo/os/$arch
-
diff --git a/libre/pacman/0001-makepkg-fix-removing-symbolic-link.patch b/libre/pacman/0001-makepkg-fix-removing-symbolic-link.patch
deleted file mode 100644
index a14e1de69..000000000
--- a/libre/pacman/0001-makepkg-fix-removing-symbolic-link.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From c493eef643ecb3a54c79083c51a8975f816ed9de Mon Sep 17 00:00:00 2001
-From: Allan McRae <allan@archlinux.org>
-Date: Tue, 28 Jun 2011 22:47:35 +1000
-Subject: [PATCH] makepkg: fix removing symbolic link
-
-The path was not being stripped from $file before prefixing with
-$srcdir resulting in the attempted removal of a very weird
-filename.
-
-Signed-off-by: Allan McRae <allan@archlinux.org>
-Signed-off-by: Dan McGee <dan@archlinux.org>
-(cherry picked from commit e92905a2c8c14c7855e2841f44d3c139aa40844c)
----
- scripts/makepkg.sh.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
-index 3ace945..b0b0882 100644
---- a/scripts/makepkg.sh.in
-+++ b/scripts/makepkg.sh.in
-@@ -509,7 +509,7 @@ download_sources() {
- 		local file=$(get_filepath "$netfile" || true)
- 		if [[ -n "$file" ]]; then
- 			msg2 "$(gettext "Found %s")" "${file##*/}"
--			rm -f "$srcdir/$file"
-+			rm -f "$srcdir/${file##*/}"
- 			ln -s "$file" "$srcdir/"
- 			continue
- 		fi
--- 
-1.7.6
-
diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index 00faf0842..d8d3a6d26 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -1,11 +1,11 @@
 # vim: set ts=2 sw=2 et:
-# $Id: PKGBUILD 146568 2012-01-13 16:47:02Z dreisner $
+# $Id: PKGBUILD 150148 2012-02-13 14:49:35Z dreisner $
 # Maintainer: Dan McGee <dan@archlinux.org>
 # Maintainer: Dave Reisner <dave@archlinux.org>
 
 pkgname=pacman
-pkgver=4.0.1
-pkgrel=4
+pkgver=4.0.2
+pkgrel=1
 pkgdesc="A library-based package manager with dependency support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.archlinux.org/pacman/"
@@ -18,15 +18,16 @@ optdepends=('fakeroot: for makepkg usage as normal user')
 backup=(etc/pacman.conf etc/makepkg.conf)
 install=pacman.install
 options=(!libtool)
-source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz
+source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
         pacman.conf
         pacman.conf.x86_64
         pacman.conf.mips64el
         makepkg.conf)
-md5sums=('76bd88eff8cd94bc9899faa091822dc1'
+md5sums=('289ba4a19a16393096e065cec1cb9b0a'
+         '575140dce3ea597d91b6d081aa3f6a00'
          '858d1ffb284afc6b15f72578ba3cac50'
          '7dade0c0a4d597c480d779afa4f5097c'
-         '150a2854816cd67b1608e00f99701c1c'
+         'd4ca1a1d8e6708c0302a225628a489eb'
          'debc512689a1aa8c124fe0ccf27f5758')
 
 # keep an upgrade path for older installations
@@ -40,6 +41,10 @@ build() {
   make
 }
 
+check() {
+  make -C "$pkgname-$pkgver" check
+}
+
 package() {
   cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
@@ -59,14 +64,14 @@ package() {
       mycarch="x86_64"
       mychost="x86_64-unknown-linux-gnu"
       myflags="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
-      myldflags="-Wl,--hash-style=gnu -Wl,--as-needed"
+      myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu"
       ;;
     mips64el)
       install -m644 $srcdir/pacman.conf.mips64el $pkgdir/etc/pacman.conf
       mycarch="mips64el"
       mychost="mips64el-unknown-linux-gnu"
       myflags="-O2 -march=loongson2f -mabi=n32 -pipe -mplt -Wa,-mfix-loongson2f-nop -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
-      myldflags=""
+      myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro"
       ;;
   esac
   install -m644 $srcdir/makepkg.conf $pkgdir/etc/
diff --git a/libre/pacman/pacman.conf.mips64el b/libre/pacman/pacman.conf.mips64el
index 82955b965..a74f2d3da 100644
--- a/libre/pacman/pacman.conf.mips64el
+++ b/libre/pacman/pacman.conf.mips64el
@@ -13,11 +13,14 @@
 #DBPath      = /var/lib/pacman/
 #CacheDir    = /var/cache/pacman/pkg/
 #LogFile     = /var/log/pacman.log
+#GPGDir      = /etc/pacman.d/gnupg/
 HoldPkg     = pacman glibc
 # If upgrades are available for these packages they will be asked for first
-SyncFirst   = pacman
-#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+# Don't list pacman here unless you want it broken when there is a
+# libarchive or glibc update.
+#SyncFirst   =
 #XferCommand = /usr/bin/curl -C - -f %u > %o
+#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
 Architecture = mips64el
 
@@ -28,12 +31,25 @@ Architecture = mips64el
 #NoUpgrade   =
 #NoExtract   =
 
-# Misc options (all disabled by default)
+# Misc options
 #UseSyslog
-#ShowSize
 #UseDelta
 #TotalDownload
 #CheckSpace
+#VerbosePkgLists
+
+# PGP signature checking
+# NOTE: None of this will work without running `pacman-key --init` first.
+# The compiled in default is equivalent to the following line. This requires
+# you to locally sign and trust packager keys using `pacman-key` for them to be
+# considered valid.
+#SigLevel = Optional TrustedOnly
+# If you wish to check signatures but avoid local sign and trust issues, use
+# the following line. This will treat any key imported into pacman's keyring as
+# trusted.
+#SigLevel = Optional TrustAll
+# For now, off by default unless you read the above.
+SigLevel = Never
 
 #
 # REPOSITORIES
@@ -59,24 +75,31 @@ Architecture = mips64el
 # after the header, and they will be used before the default mirrors.
 
 #[libre-testing]
+#SigLevel = PackageRequired
 #Include = /etc/pacman.d/mirrorlist
 
 [libre]
+#SigLevel = PackageRequired
 Include = /etc/pacman.d/mirrorlist
 
 #[testing]
+#SigLevel = PackageRequired
 #Include = /etc/pacman.d/mirrorlist
 
 [core]
+#SigLevel = PackageRequired
 Include = /etc/pacman.d/mirrorlist
 
 [extra]
+#SigLevel = PackageOptional
 Include = /etc/pacman.d/mirrorlist
 
 #[community-testing]
+#SigLevel = PackageRequired
 #Include = /etc/pacman.d/mirrorlist
 
 [community]
+#SigLevel = PackageOptional
 Include = /etc/pacman.d/mirrorlist
 
 # Parabola also supports community projects and personal repositories, to find
@@ -85,5 +108,6 @@ Include = /etc/pacman.d/mirrorlist
 # An example of a custom package repository.  See the pacman manpage for
 # tips on creating your own repositories.
 #[custom]
+#SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
 
diff --git a/libre/pacman/rePKGBUILD b/libre/pacman/rePKGBUILD
deleted file mode 100644
index 3967b90ab..000000000
--- a/libre/pacman/rePKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
-source PKGBUILD
-CARCH=x86_64
-unset build package md5sums source
-_repo=core
-source=(PKGBUILD
-	ftp://ftp.archlinux.org/${_repo}/os/${CARCH}/${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT
-	# files for pkg modifications
-  pacman.conf
-  pacman.conf.x86_64
-        )
-options=(!strip)
-
-build() {
-  cd "${srcdir}/"
-  rm .{INSTALL,PKGINFO} ${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT
-  # put actions for package modifications below this line
-
-}
-
-package() {
-  cd ${srcdir}
-  cp -a ./* ${pkgdir}
-
-  rm ${pkgdir}/{PKGBUILD,pacman.conf{,.x86_64}}
-
-# No need to repackage for mips64el
-  case "$CARCH" in
-    i686)
-      install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf
-      ;;
-    x86_64)
-      install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf
-      ;;
-  esac
-}
-
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/sdl-libre/PKGBUILD b/libre/sdl-libre/PKGBUILD
index 20f6ece4b..ffc0ec5f4 100644
--- a/libre/sdl-libre/PKGBUILD
+++ b/libre/sdl-libre/PKGBUILD
@@ -1,11 +1,12 @@
 # $Id: PKGBUILD 135310 2011-08-12 14:45:48Z ibiru $
 #mips64el Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
-# Maintainer: Henry Jensen <hjensen@connochaetos.org>
+# Maintainer (Connochaetos): Henry Jensen <hjensen@connochaetos.org>
+# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
 
 pkgname=sdl-libre
-pkgver=1.2.14
-pkgrel=7.1
+pkgver=1.2.15
+pkgrel=1
 pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard"
 arch=('i686' 'x86_64')
 url="http://www.libsdl.org"
@@ -13,32 +14,29 @@ license=('LGPL')
 provides=("sdl=${pkgver}")
 conflicts=('sdl')
 depends=('glibc' 'libxext' 'libxrender' 'libx11')
-makedepends=('alsa-lib' 'mesa')
+makedepends=('alsa-lib' 'mesa' 'libpulse')
 replaces=('sdl')
 options=('!libtool')
-source=(http://repo.parabolagnulinux.org/other/SDL-${pkgver}-libre.tar.gz
-        sdl-1.2.14-joystick-crash.diff
+source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz
         sdl-1.2.14-fix-mouse-clicking.patch
-        sdl-1.2.14-fix-disappearing-cursor.patch
+        sdl-1.2.14-disable-mmx.patch
         no-riva-accel.patch)
-md5sums=('b8ac7254fe5425a0fb238fb535d3d14c'
-         '9d8890b3817736a5d365f7497f096634'
+md5sums=('9d96df8417572a2afb781a7c4c811a85'
          '04d8c179f125e04bcd4c9d60e013c2d7'
-         'a6cf3e71b653aa97d0d8ae6c0a789807'
+         'e5c16b7611f62c7cb25f0534eff68852'
          'eb2f5899db608ad27b379faa5e0beb80')
 
 build() {
-  cd ${srcdir}/SDL-${pkgver}-libre
-  patch -Np1 -i $srcdir/sdl-1.2.14-joystick-crash.diff
+  cd ${srcdir}/SDL-${pkgver}
   patch -Np1 -i $srcdir/sdl-1.2.14-fix-mouse-clicking.patch
-  patch -Np1 -i $srcdir/sdl-1.2.14-fix-disappearing-cursor.patch
+  patch -Np1 -i $srcdir/sdl-1.2.14-disable-mmx.patch
   patch -Np0 -i $srcdir/no-riva-accel.patch
   ./configure --prefix=/usr --disable-nasm --enable-alsa --enable-esd \
-              --with-x --disable-rpath
+              --with-x --disable-rpath --disable-static
   make
 }
 
 package() {
-  cd ${srcdir}/SDL-${pkgver}-libre
+  cd ${srcdir}/SDL-${pkgver}
   make DESTDIR=${pkgdir} install
 }
diff --git a/libre/sdl-libre/sdl-1.2.14-disable-mmx.patch b/libre/sdl-libre/sdl-1.2.14-disable-mmx.patch
new file mode 100644
index 000000000..1bb6e0e47
--- /dev/null
+++ b/libre/sdl-libre/sdl-1.2.14-disable-mmx.patch
@@ -0,0 +1,13 @@
+# and another one from FS#26020
+
+--- a/src/video/SDL_yuv_sw.c    2009-10-13 06:07:15.000000000 +0700
++++ b/src/video/SDL_yuv_sw.c    2011-09-20 19:26:30.247742620 +0700
+@@ -89,6 +89,8 @@
+ #include "SDL_yuvfuncs.h"
+ #include "SDL_yuv_sw_c.h"
+ 
++#undef __OPTIMIZE__
++
+ /* The functions used to manipulate software video overlays */
+ static struct private_yuvhwfuncs sw_yuvfuncs = {
+ 	SDL_LockYUV_SW,
diff --git a/libre/thunderbird-libre/PKGBUILD b/libre/thunderbird-libre/PKGBUILD
index 8f51c47e3..d8e8b0db1 100644
--- a/libre/thunderbird-libre/PKGBUILD
+++ b/libre/thunderbird-libre/PKGBUILD
@@ -1,10 +1,12 @@
-# $Id: PKGBUILD 150412 2012-02-17 12:38:42Z ibiru $
+# $Id: PKGBUILD 153450 2012-03-14 16:21:51Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 # Contributor: Dale Blount <dale@archlinux.org>
 # Contributor: Anders Bostrom <anders.bostrom@home.se>
+# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+
 pkgname=thunderbird-libre
-pkgver=10.0.2
+pkgver=11.0
 pkgrel=1
 pkgdesc="Standalone Mail/News reader"
 arch=('i686' 'x86_64')
@@ -24,7 +26,7 @@ source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/sourc
         channel-prefs.js
         vendor.js
         libvpx.patch)
-md5sums=('624bef982d7ac610b1175737d9905150'
+md5sums=('1d7127a3282e62d95eb9b59d47291b70'
          'ca98c2bf1017b33e19dae22fdcef2e73'
          'af3e5b344d2edf1c7d61bb0a5a96de9a'
          'aea906acf72c43dd82ead2fabcc1c6db'
diff --git a/libre/virtualbox-libre/LocalConfig.kmk b/libre/virtualbox-libre/LocalConfig.kmk
index e5cbcebcd..d42cd3e1f 100644
--- a/libre/virtualbox-libre/LocalConfig.kmk
+++ b/libre/virtualbox-libre/LocalConfig.kmk
@@ -14,6 +14,6 @@ VBOX_WITH_REGISTRATION_REQUEST =
 VBOX_WITH_UPDATE_REQUEST =
 VBOX_WITH_VNC := 1
 VBOX_BLD_PYTHON = python2
-VBOX_JAVA_HOME = /usr/lib/jvm/java-6-openjdk
+VBOX_JAVA_HOME = /usr/lib/jvm/java-7-openjdk
 VBOX_GCC_WERR =
 VBOX_GCC_WARN =
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index edf35ff62..9384e9c1e 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -1,5 +1,7 @@
 # $Id: PKGBUILD 63763 2012-02-05 12:13:00Z ibiru $
-# Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
+# Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar>
+# Maintainer (Parabola): Jorge López <jorginho@adinet.com.uy>
+# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
 # Changes:
 # * Adapt to linux-libre
 # * virtualbox-{archlinux,parabola}-*
@@ -9,35 +11,41 @@
 #Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgbase=virtualbox-libre
 pkgname=('virtualbox-libre' 'virtualbox-parabola-additions' 'virtualbox-sdk' 'virtualbox-source')
-pkgver=4.1.8
-pkgrel=2
+pkgver=4.1.10
+pkgrel=1.1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
 makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libxcursor' 'qt' 'libidl2' 'sdl_ttf' 'alsa-lib' 'libpulse' 'libxtst'
-'xalan-c' 'sdl' 'libxmu' 'curl' 'python2' 'linux-libre-headers' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'openjdk6' 'gsoap' 'vde2')
+'xalan-c' 'sdl' 'libxmu' 'curl' 'python2' 'linux-libre-headers' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'jdk7-openjdk' 'gsoap' 'vde2')
 #'xorg-server-devel' 'xf86driproto' 'libxcomposite')
 [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc')
 source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2
-        10-vboxdrv.rules  vboxdrv-reference.patch LocalConfig.kmk vboxbuild
-        change_default_driver_dir.patch vbox-service.conf vbox-service.rc)
-md5sums=('2092bba46baa62fab5520d67dee2ece8'
+        10-vboxdrv.rules  vboxdrv-reference.patch gsoap.patch LocalConfig.kmk vboxbuild
+        change_default_driver_dir.patch vbox-service.conf vbox-service.rc
+        vboxweb.conf vboxweb.rc)
+
+md5sums=('263e495ef3a7ab75943af28d446ee702'
          '5f85710e0b8606de967716ded7b2d351'
-         '6ab2455c391d8cc005e2f4461ae26a3b'
-         '78ffa67ff131680f1d2b6f06d4325c5b'
-         '67688bff176d3c6fac5664dc282fea52'
+         '755ab0dd9bcacf2c00d2275b1ca69547'
+         'b9f4da759d23b60b69b12005213c3aa7'
+         'a1ff1d1b4423556887e48a32978226a6'
+         '3c96faa76894c182c1bb56bb30d9a17e'
          '97e193f050574dd272a38e5ee5ebe62b'
          '3c08ad30b89add47d3f45121200a5360'
-         'e7416331d0bc331f3b5aae3e5d104642')
+         '208cf5f842eb2e3a5b6dcfc59080d26c'
+         '3ac185709bfe688bb753c46e170d0546'
+         'c159d683ba1947290fc2ad2c64194150')
 
-_extramodules=extramodules-3.2-LIBRE
+_extramodules=extramodules-3.3-LIBRE
 _kernver="$(cat /lib/modules/${_extramodules}/version)"
 
 build() {
-    cd "$srcdir/VirtualBox-${pkgver}_OSE"
+    cd "$srcdir/VirtualBox-${pkgver}"
 
     patch -Np1 -i "$srcdir/vboxdrv-reference.patch"
     patch -Np1 -i "$srcdir/change_default_driver_dir.patch"
+    patch -Np0 -i "$srcdir//gsoap.patch"
 
     cp "$srcdir/LocalConfig.kmk" .
 
@@ -66,11 +74,12 @@ package_virtualbox-libre() {
     provides=("virtualbox=$pkgver")
     install=virtualbox.install
 
-    source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh"
+    source "$srcdir/VirtualBox-${pkgver}/env.sh"
 
-    cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
+    cd "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
     mkdir -p "$pkgdir"/usr/{bin,lib/virtualbox/components,lib/virtualbox/ExtensionPacks,share/virtualbox/nls}
 
+
     #Binaries and Wrapper with Launchers
     install -m 0755 VBox.sh "$pkgdir/usr/bin/VBox"
 
@@ -116,23 +125,30 @@ package_virtualbox-libre() {
     echo 'INSTALL_DIR=/usr/lib/virtualbox' > "$pkgdir/etc/vbox/vbox.cfg"
 
     #udev and licence
-    install -D -m 0644 "$srcdir/VirtualBox-${pkgver}_OSE/COPYING" \
+    install -D -m 0644 "$srcdir/VirtualBox-${pkgver}/COPYING" \
         "$pkgdir/usr/share/licenses/virtualbox/LICENSE"
     install -D -m 0644 "$srcdir/10-vboxdrv.rules" \
         "$pkgdir/lib/udev/rules.d/10-vboxdrv.rules"
+
+    # install rc.d script
+    install -D -m755 "$srcdir/vboxweb.rc" "$pkgdir/etc/rc.d/vboxweb"
+    # install sample config
+    install -D -m644 "$srcdir/vboxweb.conf" "$pkgdir/etc/conf.d/vboxweb"
+
 }
 
 package_virtualbox-source() {
     pkgdesc="VirtualBox kernel modules source"
     depends=(gcc make)
     provides=(virtualbox-modules)
-    optdepends=('linux-libre-headers')
+    optdepends=('linux-libre-headers'
+                'linux-libre-lts-headers')
     install=virtualbox-source.install
 
-    source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh"
+    source "$srcdir/VirtualBox-${pkgver}/env.sh"
     mkdir -p $pkgdir/usr/lib/virtualbox
 
-    cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
+    cd "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
 
     #sources for modules
     cp -r src ${pkgdir}/usr/lib/virtualbox
@@ -146,8 +162,8 @@ package_virtualbox-sdk() {
 
     mkdir -p "$pkgdir/usr/lib/virtualbox"
 
-    source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh"
-    cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
+    source "$srcdir/VirtualBox-${pkgver}/env.sh"
+    cd "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
 
     install -D -m 0755 vboxshell.py "$pkgdir/usr/lib/virtualbox/vboxshell.py"
     #python sdk
@@ -165,19 +181,19 @@ package_virtualbox-parabola-additions(){
     conflicts=('virtualbox-guest-additions' 'virtualbox-archlinux-additions')
     provides=("virtualbox-archlinux-additions=${pkgver}")
 
-    source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh"
+    source "$srcdir/VirtualBox-${pkgver}/env.sh"
 
-    cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
+    cd "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
 
     install -d "$pkgdir"/{usr/bin,sbin}
     install -m755 VBoxClient VBoxControl VBoxService "$pkgdir/usr/bin"
     install -m755 mount.vboxsf "$pkgdir/sbin"
 
-    install -m755 -D "$srcdir"/VirtualBox-${pkgver}_OSE/src/VBox/Additions/x11/Installer/98vboxadd-xclient \
+    install -m755 -D "$srcdir"/VirtualBox-${pkgver}/src/VBox/Additions/x11/Installer/98vboxadd-xclient \
         "$pkgdir"/usr/bin/VBoxClient-all
-    install -m755 -D "$srcdir"/VirtualBox-${pkgver}_OSE/src/VBox/Additions/x11/Installer/vboxclient.desktop \
+    install -m755 -D "$srcdir"/VirtualBox-${pkgver}/src/VBox/Additions/x11/Installer/vboxclient.desktop \
         "$pkgdir"/etc/xdg/autostart/vboxclient.desktop
-    install -D vboxvideo_drv_111.so \
+    install -D vboxvideo_drv_112.so \
         "$pkgdir/usr/lib/xorg/modules/drivers/vboxvideo.so"
     install -d "$pkgdir/usr/lib/xorg/modules/dri"
     install -m755 VBoxOGL*.so "$pkgdir/usr/lib"
@@ -185,8 +201,9 @@ package_virtualbox-parabola-additions(){
     install -m755 -D pam_vbox.so "$pkgdir/lib/security/pam_vbox.so"
 
     # install rc.d script
-    install -D -m755 "${srcdir}/vbox-service.rc" "${pkgdir}/etc/rc.d/vbox-service"
+    install -D -m755 "$srcdir/vbox-service.rc" "$pkgdir/etc/rc.d/vbox-service"
 
     # install sample config
-    install -D -m644 "${srcdir}/vbox-service.conf" "${pkgdir}/etc/conf.d/vbox-service"
+    install -D -m644 "$srcdir/vbox-service.conf" "$pkgdir/etc/conf.d/vbox-service"
 }
+
diff --git a/libre/virtualbox-libre/gsoap.patch b/libre/virtualbox-libre/gsoap.patch
new file mode 100644
index 000000000..c49caa720
--- /dev/null
+++ b/libre/virtualbox-libre/gsoap.patch
@@ -0,0 +1,11 @@
+--- configure.orig	2012-03-14 08:40:02.447527213 +0000
++++ configure	2012-03-14 09:05:01.535432453 +0000
+@@ -1959,7 +1959,7 @@
+           else
+             cnf_append "VBOX_GSOAP_CXX_SOURCES" ""
+           fi
+-          cnf_append "VBOX_GSOAP_CXX_LIBS"    "libgsoap++"
++          cnf_append "VBOX_GSOAP_CXX_LIBS"    "libgsoapssl++ libz"
+           log_success "found"
+         else
+           log_failure "stlvector.h not found -- disabling webservice"
diff --git a/libre/virtualbox-libre/vbox-service.rc b/libre/virtualbox-libre/vbox-service.rc
index 6f1b8d892..96233f66d 100644
--- a/libre/virtualbox-libre/vbox-service.rc
+++ b/libre/virtualbox-libre/vbox-service.rc
@@ -27,7 +27,7 @@ case "$1" in
     ;;
   status)
     stat_busy "Checking $name status";
-    ck_status $name
+    ck_status vbox-service
     ;;
   *)
     echo "usage: $0 {start|stop|restart|status}"
diff --git a/libre/virtualbox-libre/vboxbuild b/libre/virtualbox-libre/vboxbuild
index e6fb94edd..4bc8e0c9d 100644
--- a/libre/virtualbox-libre/vboxbuild
+++ b/libre/virtualbox-libre/vboxbuild
@@ -83,4 +83,3 @@ if (( ${#MODLIST[*]} )); then
   stat_busy "Reloading VirtualBox kernel modules"
   modprobe -a "${MODLIST[@]}" && stat_done || stat_fail
 fi
-
diff --git a/libre/virtualbox-libre/vboxdrv-reference.patch b/libre/virtualbox-libre/vboxdrv-reference.patch
index 710e2e511..682175798 100644
--- a/libre/virtualbox-libre/vboxdrv-reference.patch
+++ b/libre/virtualbox-libre/vboxdrv-reference.patch
@@ -16,7 +16,7 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp V
  
  QString g_QStrHintOtherWrongDriverVersion = QApplication::tr(
 @@ -90,11 +89,8 @@
- 
+
  QString g_QStrHintLinuxWrongDriverVersion = QApplication::tr(
    "The VirtualBox kernel modules do not match this version of "
 -  "VirtualBox. The installation of VirtualBox was apparently not "
@@ -27,7 +27,7 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp V
 +  "VirtualBox. Reload the modules or if you don't use our stock kernel execute<br/><br/> "
 +  "  <font color=blue>'/usr/bin/vboxbuild'</font><br/><br/>"
    );
- 
+
  QString g_QStrHintOtherNoDriver = QApplication::tr(
 diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh
 --- VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh	2011-11-04 17:22:13.549415814 +0000
diff --git a/libre/virtualbox-libre/vboxweb.conf b/libre/virtualbox-libre/vboxweb.conf
new file mode 100644
index 000000000..49d82d828
--- /dev/null
+++ b/libre/virtualbox-libre/vboxweb.conf
@@ -0,0 +1,11 @@
+# WebService Mandatory Variables
+#VBOXWEB_USER=
+
+# WebService Variables
+#VBOXWEB_LOGFILE=
+#$VBOXWEB_HOST=
+#$VBOXWEB_PORT=
+#$VBOXWEB_TIMEOUT=
+#$VBOXWEB_CHECK_INTERVAL=
+#$VBOXWEB_THREADS=
+#$VBOXWEB_KEEPALIVE=
diff --git a/libre/virtualbox-libre/vboxweb.rc b/libre/virtualbox-libre/vboxweb.rc
new file mode 100644
index 000000000..97273e3c7
--- /dev/null
+++ b/libre/virtualbox-libre/vboxweb.rc
@@ -0,0 +1,86 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/vbox/vbox.cfg
+. /etc/conf.d/vboxweb
+
+BINARY="$INSTALL_DIR/vboxwebsrv"
+
+start() {
+  stat_busy "Starting VirtualBox Web Service";
+  if ! pidof -o %PPID $BINARY >/dev/null; then
+      [[ "$VBOXWEB_USER" ]] || stat_die
+      lsmod | grep -q "vboxdrv[^_-]" || stat_die
+      PARAMS="--background"
+      [[ "$VBOXWEB_HOST" ]]           && PARAMS+=" -H $VBOXWEB_HOST"
+      [[ "$VBOXWEB_PORT" ]]           && PARAMS+=" -p $VBOXWEB_PORT"
+      [[ "$VBOXWEB_TIMEOUT" ]]        && PARAMS+=" -t $VBOXWEB_TIMEOUT"
+      [[ "$VBOXWEB_CHECK_INTERVAL" ]] && PARAMS+=" -i $VBOXWEB_CHECK_INTERVAL"
+      [[ "$VBOXWEB_THREADS" ]]        && PARAMS+=" -T $VBOXWEB_THREADS"
+      [[ "$VBOXWEB_KEEPALIVE" ]]      && PARAMS+=" -k $VBOXWEB_KEEPALIVE"
+      [[ "$VBOXWEB_LOGFILE" ]]        && PARAMS+=" -F $VBOXWEB_LOGFILE"
+      # prevent inheriting this setting to VBoxSVC
+      unset VBOX_RELEASE_LOG_DEST
+      su - $VBOXWEB_USER -c "$BINARY $PARAMS" &>/dev/null
+      # ugly: wait until the final process has forked
+      sleep .2
+      if pidof -o %PPID $BINARY >/dev/null; then
+          add_daemon vboxweb
+          stat_done
+      else
+          stat_die
+      fi
+  else
+    stat_die
+  fi
+}
+
+stop() {
+  stat_busy "Stopping VirtualBox Web Service"
+  PID=$(pidof -o %PPID $BINARY)
+  [[ $PID ]] && kill $PID &>/dev/null
+  if ! pidof -o %PPID $BINARY >/dev/null; then
+    rm_daemon vboxweb
+    stat_done
+  else
+    stat_die
+  fi
+}
+
+restart() {
+  stop && start
+}
+
+status() {
+  stat_busy "Checking for VirtualBox Web Service"
+  if pidof -o %PPID $BINARY >/dev/null; then
+      stat_done
+  else
+      stat_fail
+      false
+  fi
+}
+
+case "$1" in
+start)
+    start
+    ;;
+stop)
+    stop
+    ;;
+restart)
+    restart
+    ;;
+force-reload)
+    restart
+    ;;
+status)
+    status
+    ;;
+*)
+    echo "Usage: $0 {start|stop|restart|status}"
+    exit 1
+esac
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/virtualbox-libre/virtualbox.install b/libre/virtualbox-libre/virtualbox.install
index 29646e973..6c9baa21e 100644
--- a/libre/virtualbox-libre/virtualbox.install
+++ b/libre/virtualbox-libre/virtualbox.install
@@ -20,7 +20,7 @@ post_install() {
 post_upgrade() {
     getent group vboxusers >> /dev/null || usr/sbin/groupadd -g 108 vboxusers
     utils
-    if [ "$(vercmp $2 4.1.6-1)" -lt 0 ]; then
+    if [ "$(vercmp $2 4.1.10-1)" -lt 0 ]; then
 /bin/cat << EOF
 ===> Starting with virtualbox version 4.1.6-1, kernel modules handling is done by virtualbox-modules.
 ===> Use virtualbox-source package if you don't use our stock linux-libre package.
diff --git a/libre/virtualbox-modules/.directory b/libre/virtualbox-modules/.directory
new file mode 100644
index 000000000..7486c78f1
--- /dev/null
+++ b/libre/virtualbox-modules/.directory
@@ -0,0 +1,2 @@
+[Dolphin]
+Timestamp=2012,3,20,12,36,27
diff --git a/libre/virtualbox-modules/PKGBUILD b/libre/virtualbox-modules/PKGBUILD
index 9359edfb2..cd27b74a8 100644
--- a/libre/virtualbox-modules/PKGBUILD
+++ b/libre/virtualbox-modules/PKGBUILD
@@ -1,29 +1,34 @@
-# $Id: PKGBUILD 62846 2012-01-27 17:21:04Z ibiru $
+# $Id$
 #Maintainer: Ionut Biru <ibiru@archlinux.org>
+#Maintainer (Parabola): Jorge López <jorginho@adinet.com.uy>
+#Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
 
 pkgbase=virtualbox-modules
 pkgname=('virtualbox-modules' 'virtualbox-parabola-modules')
-pkgver=4.1.8
-pkgrel=3
+pkgver=4.1.10
+pkgrel=2.1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
-makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libpng' 'libidl2' 'xalan-c' 'sdl' 'linux-headers')
+replaces=('virtualbox-modules')
+conflicts=('virtualbox-modules')
+provides=("virtualbox-modules=$pkgver")
+makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libpng' 'libidl2' 'xalan-c' 'sdl' 'linux-libre-headers')
 [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc')
 source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2
          LocalConfig.kmk 60-vboxguest.rules)
-md5sums=('2092bba46baa62fab5520d67dee2ece8'
+md5sums=('263e495ef3a7ab75943af28d446ee702'
          '4c88bd122677a35f68abd76eb01b378b'
          'ed1341881437455d9735875ddf455fbe')
 
-_extramodules=extramodules-3.2-LIBRE
+_extramodules=extramodules-3.3-LIBRE
 _kernver="$(cat /lib/modules/${_extramodules}/version || true)"
 
 export KERN_DIR=/lib/modules/${_kernver}/build
 export KERN_INCL=/usr/src/linux-${_kernver}/include/
 
 build() {
-    cd "$srcdir/VirtualBox-${pkgver}_OSE"
+    cd "$srcdir/VirtualBox-${pkgver}"
 
     cp "$srcdir/LocalConfig.kmk" .
 
@@ -43,22 +48,22 @@ build() {
     source ./env.sh
     kmk all
 
-    make -C "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src"
-    make -C "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src"
+    make -C "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src"
+    make -C "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src"
 }
 
 package_virtualbox-parabola-modules(){
     pkgdesc="Additions only for Parabola guests (kernel modules)"
     license=('GPL')
     install=virtualbox-parabola-modules.install
-    depends=('linux>=3.2' 'linux<3.3')
+    depends=('linux-libre>=3.3' 'linux-libre<3.4')
     replaces=('virtualbox-guest-modules' 'virtualbox-archlinux-modules')
     conflicts=('virtualbox-guest-modules' 'virtualbox-archlinux-modules')
     provides=("virtualbox-archlinux-modules=$pkgver")
 
-    source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh"
+    source "$srcdir/VirtualBox-${pkgver}/env.sh"
 
-    cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src"
+    cd "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src"
 
     for module in vboxguest.ko vboxsf.ko vboxvideo.ko; do
         install -D -m644 ${module} \
@@ -77,12 +82,12 @@ package_virtualbox-modules(){
     pkgdesc="Kernel modules for VirtualBox"
     license=('GPL')
     install=virtualbox-modules.install
-    depends=('linux>=3.2' 'linux<3.3')
+    depends=('linux-libre>=3.3' 'linux-libre<3.4')
 
-    source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh"
+    source "$srcdir/VirtualBox-${pkgver}/env.sh"
 
 
-    cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src"
+    cd "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src"
 
     install -D -m644 vboxdrv.ko \
         "$pkgdir/lib/modules/${_extramodules}/vboxdrv.ko"
diff --git a/libre/virtualbox-modules/virtualbox-libre-modules.install b/libre/virtualbox-modules/virtualbox-libre-modules.install
new file mode 100644
index 000000000..b542db1ca
--- /dev/null
+++ b/libre/virtualbox-modules/virtualbox-libre-modules.install
@@ -0,0 +1,17 @@
+post_install() {
+cat << EOF
+===> You may want to load vboxguest, vboxsf and vboxvideo
+EOF
+    EXTRAMODULES='extramodules-3.2-LIBRE'
+    depmod $(cat /lib/modules/$EXTRAMODULES/version)
+}
+
+post_upgrade() {
+    EXTRAMODULES='extramodules-3.2-LIBRE'
+    depmod $(cat /lib/modules/$EXTRAMODULES/version)
+}
+
+post_remove() {
+    EXTRAMODULES='extramodules-3.2-LIBRE'
+    depmod $(cat /lib/modules/$EXTRAMODULES/version)
+}
diff --git a/libre/virtualbox-modules/virtualbox-modules.install b/libre/virtualbox-modules/virtualbox-modules.install
index 671c129d6..72be196c2 100644
--- a/libre/virtualbox-modules/virtualbox-modules.install
+++ b/libre/virtualbox-modules/virtualbox-modules.install
@@ -3,17 +3,17 @@ post_install() {
 ===> You must load vboxdrv module before starting VirtualBox:
 ===> # modprobe vboxdrv
 EOF
-    EXTRAMODULES='extramodules-3.2-LIBRE'
+    EXTRAMODULES='extramodules-3.3-LIBRE'
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }
 
 post_upgrade() {
-    EXTRAMODULES='extramodules-3.2-LIBRE'
+    EXTRAMODULES='extramodules-3.3-LIBRE'
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
-    rmmod vboxdrv || echo 'In order to use the new version, reload all virtualbox modules manually.'
+    echo 'In order to use the new version, reload all virtualbox modules manually.'
 }
 
 post_remove() {
-    EXTRAMODULES='extramodules-3.2-LIBRE'
+    EXTRAMODULES='extramodules-3.3-LIBRE'
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }
diff --git a/libre/virtualbox-modules/virtualbox-parabola-modules.install b/libre/virtualbox-modules/virtualbox-parabola-modules.install
index b542db1ca..0cc4b44fd 100644
--- a/libre/virtualbox-modules/virtualbox-parabola-modules.install
+++ b/libre/virtualbox-modules/virtualbox-parabola-modules.install
@@ -2,16 +2,16 @@ post_install() {
 cat << EOF
 ===> You may want to load vboxguest, vboxsf and vboxvideo
 EOF
-    EXTRAMODULES='extramodules-3.2-LIBRE'
+    EXTRAMODULES='extramodules-3.3-LIBRE'
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }
 
 post_upgrade() {
-    EXTRAMODULES='extramodules-3.2-LIBRE'
+    EXTRAMODULES='extramodules-3.3-LIBRE'
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }
 
 post_remove() {
-    EXTRAMODULES='extramodules-3.2-LIBRE'
+    EXTRAMODULES='extramodules-3.3-LIBRE'
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }
author	Nicolás Reynolds <fauno@kiwwwi.com.ar>	2012-03-23 19:47:42 -0300
committer	Nicolás Reynolds <fauno@kiwwwi.com.ar>	2012-03-23 19:47:42 -0300
commit	c4cc142235d7d77327c2a53d9efb2750b1ec80bf (patch)
tree	41446fa0833a3783d24b6bd12c64336f845e6032 /libre
parent	5ddafb1e55d18275d3f16e9faa3e9da788b54389 (diff)
parent	b1b9debcc7f6756d83dbac37806021de007cf083 (diff)