Merge branch 'master' of gparabola:abslibre/abslibre-pre-mips64el

Conflicts: community/libftdi/PKGBUILD community/lxshortcut/PKGBUILD community/pcmanfm/PKGBUILD community/qingy/PKGBUILD community/yagf/PKGBUILD extra/ethtool/PKGBUILD extra/gptfdisk/PKGBUILD extra/postgresql/PKGBUILD extra/xfburn/PKGBUILD libre/linux-libre/PKGBUILD
author: Nicolás Reynolds <fauno@endefensadelsl.org> 2014-02-23 16:15:08 -0300
committer: Nicolás Reynolds <fauno@endefensadelsl.org> 2014-02-23 16:15:08 -0300
commit: 44ae571c1d57a21af2c915b42bb656cf0d69c9ee (patch)
tree: 757e53f443e27a95d1b1b0cdf337c2147953fc46 /libre
parent: eadbb9961b89668e4aed317f5dd97cb04e86663e (diff)
parent: 1d20e4962664ab152948a14b4320b12204a1053e (diff)
71 files changed, 4800 insertions, 1452 deletions
diff --git a/libre/acpi_call-libre-lts/PKGBUILD b/libre/acpi_call-libre-lts/PKGBUILD
index 1902faf33..7a47e5e4e 100644
--- a/libre/acpi_call-libre-lts/PKGBUILD
+++ b/libre/acpi_call-libre-lts/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 105695 2014-02-14 08:30:36Z alucryd $
+# $Id: PKGBUILD 106023 2014-02-21 10:50:04Z bpiotrowski $
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 # Contributor: mortzu <me@mortzu.de>
 # Contributor: fnord0 <fnord0@riseup.net>
@@ -6,7 +6,7 @@
 _pkgname=acpi_call-lts
 pkgname=acpi_call-libre-lts
 pkgver=1.1.0
-pkgrel=2
+pkgrel=3
 _extramodules=extramodules-3.10-LIBRE-LTS
 pkgdesc='A linux kernel module that enables calls to ACPI methods through /proc/acpi/call (built for the linux-libre-lts kernel package)'
 arch=('i686' 'x86_64')
diff --git a/libre/acpi_call-libre/PKGBUILD b/libre/acpi_call-libre/PKGBUILD
index 11dffa3b3..968d6eead 100644
--- a/libre/acpi_call-libre/PKGBUILD
+++ b/libre/acpi_call-libre/PKGBUILD
@@ -7,14 +7,14 @@
 _pkgname=acpi_call
 pkgname=acpi_call-libre
 pkgver=1.1.0
-pkgrel=1
-_extramodules=extramodules-3.12-LIBRE
+pkgrel=2
+_extramodules=extramodules-3.13-LIBRE
 pkgdesc='A linux kernel module that enables calls to ACPI methods through /proc/acpi/call (built for the linux-libre kernel package)'
 arch=('i686' 'x86_64')
 url="http://github.com/mkottman/${_pkgname}"
 license=('GPL')
-depends=('linux-libre>=3.12' 'linux-libre<3.13')
-makedepends=('linux-libre-headers>=3.12' 'linux-libre-headers<3.13')
+depends=('linux-libre>=3.13' 'linux-libre<3.14')
+makedepends=('linux-libre-headers>=3.13' 'linux-libre-headers<3.14')
 replaces="${_pkgname}"
 conflicts="${_pkgname}"
 provides="${_pkgname}=${pkgver}"
diff --git a/libre/acpi_call-libre/acpi_call.install b/libre/acpi_call-libre/acpi_call.install
index 7b1ca908d..63a662213 100644
--- a/libre/acpi_call-libre/acpi_call.install
+++ b/libre/acpi_call-libre/acpi_call.install
@@ -1,5 +1,5 @@
 post_install() {
-  _extramodules=extramodules-3.12-LIBRE
+  _extramodules=extramodules-3.13-LIBRE
   depmod $(cat /usr/lib/modules/${_extramodules}/version)
 }
 
diff --git a/libre/antlr2/PKGBUILD b/libre/antlr2/PKGBUILD
new file mode 100644
index 000000000..a17f070ae
--- /dev/null
+++ b/libre/antlr2/PKGBUILD
@@ -0,0 +1,100 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org>
+# Contributor: George Giorgidze <giorgidze (at) gmail.com>
+# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
+
+pkgbase=antlr2
+pkgname=(antlr2 antlr2-{java,python2,cxx,sharp})
+pkgver=2.7.7
+pkgdesc="ANother Tool for Language Recognition"
+url="http://www.antlr2.org/"
+license=('custom:Public Domain')
+
+pkgrel=5.1 # newer than Arch's 2.7.7-5
+arch=('i686' 'x86_64')
+options=('staticlibs')
+makedepends=('java-environment' 'python2' 'sh' 'nant' 'jh')
+
+source=("http://www.antlr2.org/download/antlr-${pkgver}.tar.gz"
+	"http://repo.maven.apache.org/maven2/antlr/antlr/$pkgver/antlr-$pkgver.pom"
+	'runantlr2.sh' 'gcc4.4.patch' 'mono.patch')
+md5sums=('01cc9a2a454dd33dcd8c856ec89af090'
+         '78af3de823003f6d8dded39c70bc30ae'
+         '78e9bf86bd44722f232f80bc7b04dcfe'
+         '158677e4c0f357afbb56656231a54815'
+         '0d1960d27ff81f2fea0dd35a8290216f')
+
+build() {
+  cd "${srcdir}/antlr-${pkgver}"
+
+  patch -Np1 -i "${srcdir}"/gcc4.4.patch
+  patch -Np1 -i "${srcdir}"/mono.patch
+
+  ./configure --prefix=/usr --disable-examples
+  make -j1
+
+  cd lib/csharp
+  nant release
+}
+
+_install_license() {
+  install -Dm644 "$srcdir"/antlr-${pkgver}/LICENSE.txt \
+    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+
+package_antlr2() {
+  depends=('sh' 'antlr2-java')
+
+  install -Dm755 "$srcdir"/runantlr2.sh "$pkgdir"/usr/bin/runantlr2
+  _install_license
+}
+
+package_antlr2-java() {
+  pkgdesc+=" (Java version)"
+  depends=('java-runtime')
+
+  provides=("java-antlr2=$pkgver")
+  conflicts=("java-antlr2")
+  replaces=("java-antlr2")
+
+  DESTDIR="$pkgdir" jh mvn-install antlr antlr $pkgver \
+    "$srcdir"/antlr-${pkgver}.pom \
+    "$srcdir"/antlr-${pkgver}/antlr/antlr.jar \
+    antlr2.jar
+
+  _install_license
+}
+
+package_antlr2-python2() {
+  pkgdesc+=" (Python version)"
+  depends=('python2')
+
+  provides=("python2-antlr2=$pkgver")
+  conflicts=("python2-antlr2")
+  replaces=("python2-antlr2")
+
+  cd "$srcdir"/antlr-${pkgver}/lib/python
+  python2 setup.py install --root="${pkgdir}" --optimize=1
+
+  _install_license
+}
+
+package_antlr2-cxx() {
+  pkgdesc+=" (C++ version)"
+
+  cd "$srcdir"/antlr-${pkgver}/lib/cpp
+  make -j1 prefix="${pkgdir}/usr" install
+
+  _install_license
+}
+
+package_antlr2-sharp() {
+  pkgdesc+=" (C Sharp version)"
+  depends=('mono')
+
+  cd "$srcdir"/antlr-${pkgver}/lib/csharp
+  install -d "$pkgdir"/usr/share
+  make -j1 prefix="${pkgdir}/usr" install
+
+  _install_license
+}
diff --git a/libre/antlr2/gcc4.4.patch b/libre/antlr2/gcc4.4.patch
new file mode 100644
index 000000000..15e25fb00
--- /dev/null
+++ b/libre/antlr2/gcc4.4.patch
@@ -0,0 +1,12 @@
+diff -Nur antlr-2.7.7.orig/lib/cpp/antlr/CharScanner.hpp antlr-2.7.7/lib/cpp/antlr/CharScanner.hpp
+--- antlr-2.7.7.orig/lib/cpp/antlr/CharScanner.hpp
++++ antlr-2.7.7/lib/cpp/antlr/CharScanner.hpp
+@@ -10,6 +10,8 @@
+ 
+ #include <antlr/config.hpp>
+ 
++#include <cstdio>
++#include <cstring>
+ #include <map>
+ 
+ #ifdef HAS_NOT_CCTYPE_H
diff --git a/libre/antlr2/mono.patch b/libre/antlr2/mono.patch
new file mode 100644
index 000000000..59c78d811
--- /dev/null
+++ b/libre/antlr2/mono.patch
@@ -0,0 +1,31 @@
+diff -ruN antlr-2.7.7.orig/lib/csharp/antlr.runtime.build antlr-2.7.7/lib/csharp/antlr.runtime.build
+--- antlr-2.7.7.orig/lib/csharp/antlr.runtime.build	2006-11-01 16:37:17.000000000 -0500
++++ antlr-2.7.7/lib/csharp/antlr.runtime.build	2013-05-14 20:07:32.000000000 -0400
+@@ -25,6 +25,9 @@
+     	
+ 		<!-- Use script task to get this from AssemblyInfo.cs using a regular expression -->
+ 		<script language="C#">
++			<imports>
++				<import namespace="System.Text.RegularExpressions" />
++			</imports>
+ 			<code><![CDATA[
+ 				public static void ScriptMain(Project project) {
+ 					string assemblyInfoFileName = Path.Combine(project.BaseDirectory, "antlr.runtime/AssemblyInfo.cs");
+@@ -122,7 +125,7 @@
+         </csc>
+ 
+         <!-- copy the antlr.runtime assembly to the astframe build folder -->
+-        <copy file="${compile.dir}\${project.FileName}.dll" tofile="${astframe.compile.dir}\${project.FileName}.dll" />
++        <copy file="${compile.dir}/${project.FileName}.dll" tofile="${astframe.compile.dir}/${project.FileName}.dll" />
+ 
+         <!-- compile antlr.astframe.dll -->
+         <csc target="library" output="${astframe.compile.dir}/${astframe.FileName}.dll" debug="${debug}" doc="${astframe.build.dir}/${astframe.FileName}.xml">
+@@ -134,7 +137,7 @@
+ 	            	<include name="System.dll" />
+ 					<include name="System.Drawing.dll" />
+ 					<include name="System.Windows.Forms.dll" />
+-					<include name="${astframe.compile.dir}\${project.FileName}.dll" />
++					<include name="${astframe.compile.dir}/${project.FileName}.dll" />
+ 				</references>              					
+ 				<arg value="/nowarn:1591"/>
+         </csc>
diff --git a/libre/antlr2/runantlr2.sh b/libre/antlr2/runantlr2.sh
new file mode 100644
index 000000000..aebc9dfa7
--- /dev/null
+++ b/libre/antlr2/runantlr2.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+echo Running 'java antlr.Tool $*' with /usr/share/java/antlr2.jar appended to the CLASSPATH variable
+export CLASSPATH
+CLASSPATH=$CLASSPATH:/usr/share/java/antlr2.jar
+java antlr.Tool "$@"
diff --git a/libre/apache-ant/PKGBUILD b/libre/apache-ant/PKGBUILD
new file mode 100644
index 000000000..a635c6e90
--- /dev/null
+++ b/libre/apache-ant/PKGBUILD
@@ -0,0 +1,136 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (Arch): Paul Mattal <paul@archlinux.org>
+# Contributor: Andrew Wright <andreww@photism.org>
+
+pkgname=apache-ant
+pkgver=1.9.3
+pkgdesc="A Java-based build tool"
+license=('Apache' 'custom:BSD3')
+url="http://ant.apache.org/"
+
+provides=("apache-ant-libre=$pkgver")
+replaces=("apache-ant-libre")
+conflicts=("apache-ant-libre")
+
+pkgrel=2.2 # newer than Arch's 1.9.3-2
+arch=('any')
+depends=('java-environment')
+makedepends=('jh')
+
+_mirror=http://archive.apache.org/dist
+source=($_mirror/ant/source/${pkgname}-${pkgver}-src.tar.bz2
+        ${pkgname}.sh ${pkgname}.csh)
+md5sums=('995f21618acdf35beacc465c84d79534'
+         'bd63c881be406f515fc4d22635e8326a'
+         'aaa615512cbe1ed7f3b62c1ff46802f8')
+
+# This list is adapted from https://ant.apache.org/manual/install.html#librarydependencies
+# The format is:
+#   jarname:description:pkgname:jarpath
+_library_dependencies=(
+  #jakarta-regexp-1.3.jar:Disregard
+  jakarta-oro-2.0.8.jar:'<ftp task>':jakarta-oro:/usr/share/java/jakarta-oro.jar
+  junit.jar:'<junit> task':junit:/usr/share/java/junit.jar
+  xalan.jar:'<junitreport> task':xalan-java:/usr/share/java/xalan.jar
+  antlr.jar:'<antlr> task':java-antlr2:/usr/share/java/antlr2.jar
+  bsf.jar:'<script> task':java-commons-bsf2:/usr/share/java/bsf2.jar
+  groovy-all.jar:'Groovy with <script> and <scriptdef> tasks':groovy:/usr/share/groovy/embeddable/groovy-all.jar
+  #netrexx.jar:'<netrexx> task, Rexx with <script> task':???????:???????
+  js.jar:'Javascript with <script> task':java-rhino:/usr/share/java/js.jar
+  jython.jar:'Python with <script> task':jython:/opt/jython/jython.jar
+  #jpython.jar:Disregard
+  #jacl.jar:'TCL with <script> task':???????:???????
+  #tcljava.jar:'TCL with <script> task':???????:???????
+  beanshell.jar:'BeanShell with <script> task':'beanshell>=1.3':/usr/share/java/bsh.jar
+  jruby.jar:'Ruby with <script> task':jruby:/opt/jruby/lib/jruby.jar
+  #judo.jar:'Judoscript with <script> task':???????:??????
+  commons-logging.jar:'CommonsLoggingListener':java-commons-logging:/usr/share/java/commons-logging/commons-logging.jar
+  #log4j.jar:'Log4jListener':???????:???????
+  commons-net.jar:'<ftp>, <rexec> and <telnet> tasks':'java-commons-net1>=1.4.0':/usr/share/java/commons-net.jar
+  bcel.jar:"'classfileset' data type, JavaClassHelper for ClassConstants filter reader":java-bcel:/usr/share/java/bcel.jar
+  mail.jar:'<mimemail> task, mime encoding with <mail>':java-gnumail:/usr/share/java/gnumail.jar
+  activation.jar:'<mimemail> task, mime encoding with <mail>':java-activation-gnu:/usr/share/java/activation.jar
+  jdepend.jar:'<jdepend> task':java-jdepend:/usr/share/java/jdepend.jar
+  resolver.jar:"external files for 'xmlcatalog' datatype":java-resolver:/usr/share/java/resolver.jar
+  jsch.jar:'<sshexec> and <scp> tasks':'java-jsch>=0.1.42':/usr/share/java/jsch.jar
+  #jai.jar:'<image> task':???????:???????
+)
+
+for _dep in "${_library_dependencies[@]}"; do
+  IFS=: read _jarname _desc _pkgname _jarpath <<<"$_dep"
+  optdepends+=("${_pkgname}: ${_desc}")
+  makedepends+=("${_pkgname}")
+done
+unset _dep _jarname _desc _pkgname _jarpath
+
+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}
+  # Symlink to external optional libraries/
+  local _dep _jarname _desc _pkgname _jarpath
+  for _dep in "${_library_dependencies[@]}"; do
+    IFS=: read _jarname _desc _pkgname _jarpath <<<"$_dep"
+    ln -sfv "${_jarpath}" lib/optional/${_jarname}
+  done
+  # Build
+  source "/etc/profile.d/jdk.sh"   # Get the JAVA_HOME env var
+  sh build.sh -Ddist.dir="${srcdir}"/${pkgname}-${pkgver}-bin dist
+}
+
+package() {
+  cd "${srcdir}"/${pkgname}-${pkgver}-bin
+  source "${srcdir}"/${pkgname}.sh # Get the ANT_HOME env var
+  source "/etc/profile.d/jdk.sh"   # Get the JAVA_HOME env var
+
+  ## Install profile.d script
+  install -d "${pkgdir}"/etc/profile.d
+  install -m755 "${srcdir}"/${pkgname}.{csh,sh} "${pkgdir}"/etc/profile.d/
+
+  ## Install the main distribution
+  install -d "${pkgdir}"/${ANT_HOME}
+  cp -Rp * "${pkgdir}"/${ANT_HOME}
+
+  ## Fix the distribution
+  # Remove Windows .bat/.cmd files
+  rm -f "${pkgdir}"/${ANT_HOME}/bin/*.{bat,cmd}
+  # Fix python2 path
+  sed -i 's|/usr/bin/python|/usr/bin/python2|' "${pkgdir}"/${ANT_HOME}/bin/runant.py
+  # Symlink to external optional libraries
+  local _dep _jarname _desc _pkgname _jarpath
+  for _dep in "${_library_dependencies[@]}"; do
+    IFS=: read _jarname _desc _pkgname _jarpath <<<"$_dep"
+    ln -svfr "${pkgdir}/${_jarpath}" "${pkgdir}${ANT_HOME}/lib/${_jarname}"
+  done
+
+  ## Symlink the /opt distribution to the normal places
+
+  cd "${pkgdir}"/${ANT_HOME}/lib
+  local pom a
+  for pom in *.pom; do
+    a=${pom%.pom}
+    base=$(jh mvn-basename org.apache.ant $a $pkgver)
+    install -d "${pkgdir}/${base%/*}"
+    ln -sfvr "${pkgdir}/${ANT_HOME}/lib/$a.pom" "${pkgdir}/${base}.pom"
+    if [[ -e "${pkgdir}/${ANT_HOME}/lib/$a.jar" ]]; then
+	    ln -sfvr "${pkgdir}/${ANT_HOME}/lib/$a.jar" "${pkgdir}/${base}.jar"
+    fi
+  done
+
+  cd "${pkgdir}"/${ANT_HOME}/bin
+  install -d "${pkgdir}"/usr/bin
+  local prog
+  for prog in *; do
+    ln -sfvr "${pkgdir}/${ANT_HOME}/bin/$prog" "${pkgdir}/usr/bin/$prog"
+  done
+  install -d "${pkgdir}"/usr/share/{doc,licenses}/${pkgname}
+  ln -sfvr "${pkgdir}/${ANT_HOME}/README"   "${pkgdir}/usr/share/doc/${pkgname}/README"
+  ln -sfvr "${pkgdir}/${ANT_HOME}/WHATSNEW" "${pkgdir}/usr/share/doc/${pkgname}/WHATSNEW"
+  ln -sfvr "${pkgdir}/${ANT_HOME}/manual"   "${pkgdir}/usr/share/doc/${pkgname}/html"
+  ln -sfvr "${pkgdir}/${ANT_HOME}/LICENSE"  "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  ln -sfvr "${pkgdir}/${ANT_HOME}/NOTICE"   "${pkgdir}/usr/share/licenses/${pkgname}/NOTICE"
+}
diff --git a/libre/apache-ant/apache-ant.csh b/libre/apache-ant/apache-ant.csh
new file mode 100644
index 000000000..fdc04b2f8
--- /dev/null
+++ b/libre/apache-ant/apache-ant.csh
@@ -0,0 +1,2 @@
+#!/bin/csh
+setenv ANT_HOME /opt/apache-ant
diff --git a/libre/apache-ant/apache-ant.sh b/libre/apache-ant/apache-ant.sh
new file mode 100644
index 000000000..6e4809da5
--- /dev/null
+++ b/libre/apache-ant/apache-ant.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+export ANT_HOME=/opt/apache-ant
diff --git a/libre/ath9k-htc-firmware/PKGBUILD b/libre/ath9k-htc-firmware/PKGBUILD
index 172cb97b3..9b6c417f8 100644
--- a/libre/ath9k-htc-firmware/PKGBUILD
+++ b/libre/ath9k-htc-firmware/PKGBUILD
@@ -1,9 +1,9 @@
 # Maintainer: André Silva <emulatorman@parabola.nu>
-# Maintainer: Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@parabola.nu>
 
 pkgname=ath9k-htc-firmware
 pkgver=1.3.2
-pkgrel=3
+pkgrel=5
 pkgdesc='Free firmware files for the Qualcomm Atheros AR7010 and AR9271 USB 802.11n NICs'
 arch=('any')
 url=('http://wireless.kernel.org/en/users/Drivers/ath9k_htc')
diff --git a/libre/ath9k-htc-firmware/fix.patch b/libre/ath9k-htc-firmware/fix.patch
new file mode 100644
index 000000000..68a504a8a
--- /dev/null
+++ b/libre/ath9k-htc-firmware/fix.patch
@@ -0,0 +1,22 @@
+diff --git a/libre/ath9k-htc-firmware/PKGBUILD b/libre/ath9k-htc-firmware/PKGBUILD
+index 172cb97..2a6af01 100644
+--- a/libre/ath9k-htc-firmware/PKGBUILD
++++ b/libre/ath9k-htc-firmware/PKGBUILD
+@@ -16,6 +16,9 @@ md5sums=('73c66751151dd47535cb4142477da480'
+ 
+ prepare() {
+ 
++  mkdir -p $srcdir/bin
++  ln -s /usr/bin/xtensa-unknown-elf-as $srcdir/bin/as
++  export PATH=$srcdir/bin:$PATH
+   cd $srcdir/open-ath9k-htc-firmware-$pkgver/target_firmware
+   mkdir -p build/{k2,magpie}
+ 
+@@ -35,6 +38,7 @@ INCLUDE(CMakeForceCompiler)
+ SET(CMAKE_SYSTEM_PROCESSOR xtensa)
+ SET(COMPILER_PREFIX "xtensa-unknown-elf")
+ SET(CMAKE_FIND_ROOT_PATH /usr/xtensa-unknown-elf)
++SET(CMAKE_OBJCOPY /usr/bin/xtensa-unknown-elf-objcopy)
+ 
+ CMAKE_FORCE_C_COMPILER(/usr/bin/xtensa-unknown-elf-gcc GNU)
+ EOF
diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD
index 745c3fce3..ced0a457f 100644
--- a/libre/bbswitch-libre/PKGBUILD
+++ b/libre/bbswitch-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 104385 2014-01-19 20:27:05Z tpowa $
+# $Id: PKGBUILD 104805 2014-01-26 12:32:43Z thomas $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: M0Rf30
 # Contributor: Samsagax <samsagax@gmail.com>
@@ -7,14 +7,14 @@
 _pkgname=bbswitch
 pkgname=bbswitch-libre
 pkgver=0.8
-_extramodules=extramodules-3.12-LIBRE # Don't forget to update bbswitch.install
-pkgrel=5
+_extramodules=extramodules-3.13-LIBRE # Don't forget to update bbswitch.install
+pkgrel=6
 pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops (built for the linux-libre kernel package)"
 arch=('i686' 'x86_64' 'mips64el')
 url=("http://github.com/Bumblebee-Project/bbswitch")
 license=('GPL')
-depends=('linux-libre>=3.12' 'linux-libre<3.13')
-makedepends=('linux-libre-headers>=3.12' 'linux-libre-headers<3.13')
+depends=('linux-libre>=3.13' 'linux-libre<3.14')
+makedepends=('linux-libre-headers>=3.13' 'linux-libre-headers<3.14')
 replaces=$_pkgname
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
@@ -27,7 +27,7 @@ build() {
 
   _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
 
-  make KDIR=/usr/src/linux-${_kernver}
+  make KDIR=/lib/modules/${_kernver}/build
 }
 
 package() {
diff --git a/libre/bbswitch-libre/bbswitch.install b/libre/bbswitch-libre/bbswitch.install
index 02ea911ab..aa603cc8a 100644
--- a/libre/bbswitch-libre/bbswitch.install
+++ b/libre/bbswitch-libre/bbswitch.install
@@ -1,5 +1,5 @@
 post_install() {
-    EXTRAMODULES='extramodules-3.12-LIBRE'
+    EXTRAMODULES='extramodules-3.13-LIBRE'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD
index e09fe35d0..cb6ac5238 100644
--- a/libre/calibre-libre/PKGBUILD
+++ b/libre/calibre-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 105710 2014-02-14 09:37:19Z jelle $
+# $Id: PKGBUILD 106016 2014-02-21 08:27:06Z jelle $
 # Maintainer: jelle van der Waa <jelle@vdwaa.nl>
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
@@ -9,7 +9,7 @@
 
 _pkgname=calibre
 pkgname=calibre-libre
-pkgver=1.24.0
+pkgver=1.25.0
 pkgrel=1
 pkgdesc="Ebook management application, with unar support"
 arch=('i686' 'x86_64' 'mips64el') 
@@ -30,7 +30,7 @@ install=calibre.install
 source=("http://download.calibre-ebook.com/${pkgver}/calibre-${pkgver}.tar.xz"
         'desktop_integration.patch'
         'calibre-mount-helper')
-md5sums=('2acb11d541bc8101ab550bfe80c79348'
+md5sums=('66151757e67a9d0abdb0fd3b7e91614e'
          '8e1855ce1ae254c34d12ddbc358b7a36'
          '675cd87d41342119827ef706055491e7')
 
diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD
index d581427e3..c87f114ea 100644
--- a/libre/cups-filters-libre/PKGBUILD
+++ b/libre/cups-filters-libre/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 206026 2014-02-15 17:21:35Z andyrtr $
+# $Id: PKGBUILD 206208 2014-02-21 18:49:54Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=cups-filters-libre
 _pkgname=cups-filters
-pkgver=1.0.45
+pkgver=1.0.46
 pkgrel=1
 pkgdesc="OpenPrinting CUPS Filters, without foomatic-db-nonfree recommendation"
 arch=('i686' 'x86_64' 'mips64el')
@@ -20,7 +20,7 @@ source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.
 provides=("${_pkgname}=${pkgver}" 'foomatic-filters')
 replaces=("${_pkgname}" 'foomatic-filters')
 conflicts=("${_pkgname}" 'foomatic-filters')
-md5sums=('950c72b6fb7983f9a9fc126042e146c9')
+md5sums=('916b30ad3ee1424fa89883410abd7496')
 
 build() {
   cd $_pkgname-$pkgver
diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD
index 1eb6bb91d..b81fb9cbf 100644
--- a/libre/iceweasel-l10n/PKGBUILD
+++ b/libre/iceweasel-l10n/PKGBUILD
@@ -6,8 +6,8 @@
 # Based on icecat-i18n package, which is in turn based on firefox-i18n
 
 _debname=iceweasel
-_debver=27.0
-_debrel=deb2
+_debver=27.0.1
+_debrel=deb1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
@@ -71,85 +71,85 @@ for lang in ${_langpacks[@]}; do
 done
 
 md5sums=('a4593936bf1c7a9ec9368ff249f9cc56'
-         'de575fedef8fd6b811334d8b9c082479'
-         '36043f6b423fd8c0a378c2e5fcb3a3c1'
-         '306ef53afb18ffa3ec57feb0063ab433'
-         '9af26b5177f1b20cb682299345ad1a87'
-         '21d7586f0dcc740835c9d3a6e9cee397'
-         '94c11e19db72eea7a5630bbf6c4a992d'
-         '86f1a539a8f9af7ea81a63f11a882b70'
-         'c62fdd3ce834337d43c4e59af3b87553'
-         '0678ff6935296e17e36c40b3fc17ac96'
-         '680ff4dbae9ce0b9f1bcd092169e6a34'
-         'dc8e478e69b1ee22126cb6addc744fe5'
-         'a513f4af7f608347225cd4180e89dee6'
-         '17d1e0cd0c7023461fc5dde7b97ee4b1'
-         'c08f2cd5a29737b20ecc2f7c2892bd74'
-         '8ff5f9ea03c3fff51142df8c52626b22'
-         'f8a42eb22e2192793a85112adb8e2278'
-         'f1b221697547feff3e69889a9e9dd1b4'
-         '1c106f032476d2443b368e52d9e1bc69'
-         'dbf5e2a01c84e18dc19ed9be5e12920b'
-         '9d6e6b497af88a0b5c44845adf275f9d'
-         'aeb7f058aabd5d7d4e05f8e7917bd59b'
-         '4612bf235fdfd328e176b3e682e61072'
-         'ebf5aefb15834234fbac6a4310b8f8ab'
-         '7591125ee445836f9e1247f5a7f6a474'
-         '410d090d68240f1f304ff94c4847817e'
-         '96a9dbd806a336936a4642ae95d12a26'
-         '4924dd568df7dc0428f3458758eadca1'
-         '62d46770f79074fc90ce4c1e4f5e5169'
-         'c57d361eaa5d0fb90e872dd8f1d3fce1'
-         'dbbba15f93f960c19bab63599b8f771c'
-         '0025e4609f5d1f72bf784f35d42934a9'
-         '638306adb405c506baa2728a00237d50'
-         '7ae2cbe9e2888b95a513eb8238e6e5d2'
-         '8b560d4ae6f62bb64d8fa8c1a62abe27'
-         '52bd4641b6066a2a0596c7b4f64b25c1'
-         '9293f6d596e7586c7955cc0d6d71dbbb'
-         'a634db784e4bb6efda49e2508d58c96c'
-         'ebf52ea0d70699f5d2651054b975dac2'
-         '6fbf98e9d4477d3355369bbf9c33c9aa'
-         'a0c6cb16be15cdca746f52fe07af0ab8'
-         '934f4c14a9242228da3322bd844f001b'
-         '29df15b3dad1764cb236e1913adb6895'
-         '8f4bd42afb2b0042300b50dbd575ed76'
-         '9f1d8951c50f6dd133089824db8e811b'
-         'df683c5a6b64226311f1158e1cfd7387'
-         'ddf59c931fb1d11337dfb30796172222'
-         '3c69e0fa5c10427c9d95b26fecb73366'
-         'fdf86cfbcf7e6084f01fda86b3907d68'
-         '4f602efbc5ee7dbcf315b7c00c5a9824'
-         '30012df56189ba8de7a2be3089ac7037'
-         '90660c135667807a35d5a424a14a03c7'
-         '39e8128c27e68f03db07ec9d3a4661f4'
-         '34c9463b7bd4000cb6c2178568ea5d57'
-         'd6008349e2b26e11b4bf29d182236d15'
-         '1d51c2c91f10f459227a2c4e16e2cf52'
-         '59b1f8e007070d0ac598cc8782cc775d'
-         '23f7deb8fbbf8b74426299cf239e83bd'
-         '81ec70e9b9fdf887d00c9422d94803d0'
-         'b4aea1741607118d5d128df88181c363'
-         '52dbb00c5e7adcdee972b2daf689401b'
-         'a180a40f9651e8ca3ebdb3001fce6fa7'
-         'fed061bc838b9eec2e1c187e64b93176'
-         '09b9eae4bdfbc1f7f4939f01a325bb40'
-         '337f7aaf9a2d7b94a9c33648a9734287'
-         '647abcd745c18a80e5187bc28b1b67b8'
-         'b9c5f0043fe7c26e23ba42450afb57b6'
-         '6c9bb760adb3ae75ddb969c595649732'
-         '70917dca185cf1f150df72eb848b6315'
-         'cc16dd7b22855338055429a3fd1a2367'
-         '236a36024c7660e7ec0ab2c7931b9ea0'
-         '471e98027910bcbfba3957df1e6a3c4a'
-         'cea62f763650bb50e770055288e3bd7c'
-         '0f4abd8240ecc996fd434b0139a9996b'
-         'cec783e074568d1c750ee88a2bbb003f'
-         '437d59dd764666147bfe5d27b0848b94'
-         'f05ac803378d996351a277ebcc99e0e2'
-         '13ddcd0d7c10e381458d5563476d53c3'
-         'f33a663b92b61fa02c28b881deae2376'
-         '4c4b58d49295b0b873f265ffa369a27d'
-         '67e54d3c0058263192700617500045e7'
-         '1022e9f23438b96df2f0dd054ff195b0'
-         '8274a6aafc5b097ab0659675d66b87c6')
+         '0012b126061c39d6098077e6b33e4ed9'
+         'd9489164f0ee7675345a18b415ca4e54'
+         'a5397f32afa3104a1ac48bd9ba100b3f'
+         '86f24dbc33b20eb967927565a1888c43'
+         '8158132a2d9c3eccdf717012c4b22a2a'
+         '65895a635d466f6c8d13c1e22efe0d1c'
+         '9bd0b1bf0f2c25ad7caa41294802417b'
+         '31d37cf374d9b8c38150a655f3e070c3'
+         'e8e17525549e239d19ebe49ab6b7e003'
+         '3f257fee55f0a2337eba89368703bf89'
+         'f40dffe97508d3f92ba862a92a0f050f'
+         '31de87f7bf67104ed1b75eb23c10b130'
+         '42d32cfc145c77f792b05d0437d0e7a8'
+         'd53470958b10bed4daca8fae50851014'
+         '82320a0b6ecb8f966fbab069f59c331c'
+         '4d13543134ee9ea2b30fb0a3748c9c11'
+         '56174d768e00c018d32fed3b713ce64f'
+         '6abba09b0e8fdc4b31ce2c16f752f053'
+         'd46382eff5f7cffc7ebc734ac7fb73d4'
+         '9e88d117a4f64e183c9f1961fe3372ed'
+         '4477aeb5f4d9e553df1b43588370c5ce'
+         '09636cebf0e08e3c4ca9c1d3b0b37b38'
+         '612b09eb39160e4446a86a0083e76d87'
+         'a83730d408f5be941f42d93300387c4d'
+         '16cde47a162d0c99fb2904571b856de0'
+         'e3783933719fa65afa7d86a89a2be3f0'
+         '386f2895fa4e439f49a30d5b739de9ef'
+         'd9a152c6e3a01e37402e9aa1f49569f4'
+         '1628a11d1e4c3da5d3d6caaaf43418c8'
+         '2c8b7615ec21bc3b890e34a8d395241f'
+         '06b6015cf541dc3b9c5f679cf00d13ab'
+         '457379b8f74fce12fc1fa446651ab380'
+         '998f6a12ebfccbc4196799df67f0d342'
+         '4552e34336b3779fd99927d1c78c028f'
+         '147f1cbab567e2222e622471081ef117'
+         'fd798f352f288df2249f8d43957cafbc'
+         '531acff3ede1eda37109f9de0ba58124'
+         '6386ddbda9c73f6f14fcaf4cb64da384'
+         '91ee1c3b72e6681975b033b1bc035ae7'
+         'de7b96d13177aed06f2a39490241d831'
+         'cfadecb7549afed8fddd3ae9f3aa7f12'
+         'f6a7ae7a336a55ac1f48041c91b7a4ba'
+         '5f599453be844e5a1b1fb6967e52f234'
+         '822b9848fdf54927c81b97d04ec67218'
+         'fc69f156b343a3300114a1ff8a3dd9d3'
+         '6d8fcec0d23679c69578bfbff7de7430'
+         'b3312412e56fa60fb97ea155405d23b0'
+         '1b559f7fc37308b361743876c48194ba'
+         'dbfc6bfed57bc048b3be222f90dd488c'
+         '4ba30eb299671f0bddb2ac5f8839e297'
+         '5c78e9fa5288a2127a5f710554ecd650'
+         '1f28c9bb19599b74120d022353d492d9'
+         '564d72774ff35a370972650be87e23a9'
+         '0274871784da1f22d65ba289588f3c13'
+         'f05d9c0759fca383085f2326d16a120d'
+         'ea21cff3fee8a957d1f335ff45335bc9'
+         '1f48c97748964005259fa06ad1c76b5b'
+         '943580007d82d3e102c05dbd4f99f4e2'
+         'd5f20acd424ba9b10e92079f4a13e219'
+         'e42983785c33a4bf38a2b4ddf5b69440'
+         '28ab7d8e35a59056626e38911fdd0232'
+         '8e847f14b9ff0190fa725621ef42121a'
+         'f78d59c251b949261d9504a5c114443f'
+         '5e587c999d8cf836e901eaf93550852b'
+         '9f9b5e6e8647f73cab9c5d731720b89a'
+         '3dc8cc1726466b5781026a466e8559f6'
+         '88913ef378deaf7a43f4190e8dad2dfb'
+         '9cf5d21edbb01aa0418bdc0a2d751c53'
+         'c73a7c12947c7d8c6ea57da163de8f6a'
+         'c490d19bea49b12673fcec849cf6b175'
+         'db22297468a87badb2a95d3a7c743230'
+         '3f148b7670425830e7ed54fd3bd0d572'
+         '84ff51ef9863e7211044bcbee7d9bac4'
+         'daa6f9b0e321d3da1cb04551a6defc2d'
+         '7d147726fe7b11510c13a1496e849f8b'
+         'aa387c05bf9aac8a6478c56c94c90ccf'
+         '0aaf74e72befbadb1bd0128cd407de48'
+         'db46a8a8e3c83d738eab44c200cffcd4'
+         '032c33f88b6f87226af805459970b5a0'
+         'd7ea83ff84de0969de6510abf278bcd4'
+         '6ff5acbf06ae1cdb45bcd0fd9309ebbf'
+         '2d6d43a2682e82216ec3f831d42c0586')
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 5c6313e9e..2c0b6b8ed 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -14,8 +14,8 @@ _pgo=true
 
 # We're getting this from Debian Experimental
 _debname=iceweasel
-_debver=27.0
-_debrel=deb2
+_debver=27.0.1
+_debrel=deb1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
@@ -60,8 +60,8 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
         iceweasel-20.0.1-fixed-loading-icon.png
         Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
         Fixup-Reset-Firefox-after-bad-merge.patch)
-md5sums=('0baf0b166421f785db79bd33fe7b0748'
-         '2446de5f7844caae8cd7e46b3b72119c'
+md5sums=('fba1a8bfef502635593e2e1b0a653cda'
+         'ea2638a17254cda6cf8b85c39505b6af'
          '023120a970670dc85cea19393f0b94b6'
          'df08eaa1ac3bc6c2356be4fbf8ec8932'
          '641e8b54a684161c60209b81f260a19b'
diff --git a/libre/jakarta-oro/PKGBUILD b/libre/jakarta-oro/PKGBUILD
new file mode 100644
index 000000000..18e0ade64
--- /dev/null
+++ b/libre/jakarta-oro/PKGBUILD
@@ -0,0 +1,31 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (AUR): Xiao-Long Chen <chenxiaolong@cxl.epac.to>
+# Rationale: Build dependency of apache-ant
+
+pkgname=jakarta-oro
+pkgver=2.0.8
+pkgrel=1.2
+pkgdesc="Java regular expression and text-processing library"
+arch=('any')
+url="https://jakarta.apache.org/oro"
+license=('Apache')
+makedepends=('apache-ant')
+source=("http://archive.apache.org/dist/jakarta/oro/${pkgname}-${pkgver}.tar.gz")
+sha512sums=('a7f6eb6a088765f273df18ccc823f918737f18ec8772275054839a87f8370f1848e795d481f226c712651104d7598ab86c7d90a991fb039df6581f42f1447920')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  find . \( -name '*.jar' -o -name '*.class' \) -delete
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ant jar
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  install -Dm644 ${pkgname}-${pkgver}.jar \
+    "${pkgdir}/usr/share/java/${pkgname}.jar"
+}
diff --git a/libre/java-commons-bsf2/PKGBUILD b/libre/java-commons-bsf2/PKGBUILD
new file mode 100644
index 000000000..2f00b024b
--- /dev/null
+++ b/libre/java-commons-bsf2/PKGBUILD
@@ -0,0 +1,58 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Rationale: Build dependency of apache-ant
+
+pkgname=java-commons-bsf2
+pkgver=2.4.0
+url="https://commons.apache.org/proper/commons-bsf/"
+license=('Apache')
+pkgdesc="Bean Scripting Framework"
+
+pkgrel=1.1
+arch=('any')
+depends=('java-commons-logging')
+makedepends=('apache-ant')
+
+_mirror=http://archive.apache.org/dist
+source=($_mirror/commons/bsf/source/bsf-src-$pkgver.tar.gz
+  build-properties.xml::"https://svn.apache.org/viewvc/commons/proper/bsf/tags/bsf-2.4.0/build-properties.xml?view=co&content-type=text%2Fplain"
+)
+
+declare -A _opts
+#_opts[jacl]="/usr/share/java/jacl.jar"
+_opts[jython]="/opt/jython/jython.jar"
+#_opts[nexrexx]="/usr/share/java/nexrexx.jar"
+_opts[java-rhino]="/usr/share/java/js.jar"
+_opts[xalan-java]="/usr/share/java/xalan.jar"
+_opts[junit]="/usr/share/java/junit.jar"
+
+optdepends+=("${!_opts[@]}")
+makedepends+=("${!_opts[@]}")
+
+prepare() {
+  cd "${srcdir}/bsf-${pkgver}"
+  rm lib/*.jar
+}
+
+build() {
+  cd "${srcdir}/bsf-${pkgver}"
+
+  local jar
+  for jar in "${_opts[@]}"; do
+	  ln -s "$jar" lib/
+  done
+
+  # Adjust it to work with jython 2.5+
+  sed -i 's/PyJavaInstance/PyJavaType/g' src/org/apache/bsf/engines/jython/*
+
+  ln -sf ../build-properties.xml ./
+  ant jar
+}
+
+package() {
+  cd "${srcdir}/bsf-${pkgver}"
+  install -Dm644 build/lib/bsf.jar "$pkgdir"/usr/share/java/bsf-$pkgver.jar
+  ln -s bsf-$pkgver.jar "$pkgdir"/usr/share/java/bsf2.jar
+}
+
+md5sums=('7e58b2a009c0f70ab36bbef420b25c07'
+         'd7180c2b95f1a5424f785a2482260eaa')
diff --git a/libre/jh/PKGBUILD b/libre/jh/PKGBUILD
new file mode 100644
index 000000000..1604b849e
--- /dev/null
+++ b/libre/jh/PKGBUILD
@@ -0,0 +1,30 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+pkgname=jh
+pkgver=0.5.2
+pkgdesc="Java helpers for PKGBUILDs"
+url="https://projects.parabolagnulinux.org/packages/jh.git/"
+license=('custom:WTFPL')
+
+pkgrel=1
+arch=(any)
+optdepends=(
+  "maven: for configurable maven local repository location"
+  "librelib: for human readable output from jh checksource"
+)
+
+source=("https://projects.parabolagnulinux.org/packages/${pkgname}.git/snapshot/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('498fadbf2dffc91c53c9ebe29f8ba8a9')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make
+}
+
+package() {
+  depends=(xmlstarlet)
+
+  cd "$srcdir/$pkgname-$pkgver"
+  make install DESTDIR="$pkgdir"
+  install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
+}
diff --git a/libre/jquery-ui/PKGBUILD b/libre/jquery-ui/PKGBUILD
index 0be01f724..64d1e1764 100644
--- a/libre/jquery-ui/PKGBUILD
+++ b/libre/jquery-ui/PKGBUILD
@@ -4,7 +4,7 @@
 _pkgname=jquery
 pkgname=jquery-ui
 pkgver=1.10.4
-pkgrel=1
+pkgrel=2
 pkgdesc='jQuery UI provides abstractions for low-level interaction and animation, advanced effects and high-level, themeable widgets, built on top of the jQuery JavaScript Library, that you can use to build highly interactive web applications'
 arch=any
 url=http://jqueryui.com/
diff --git a/libre/jquery/PKGBUILD b/libre/jquery/PKGBUILD
index 23d56d7c3..bd828c070 100644
--- a/libre/jquery/PKGBUILD
+++ b/libre/jquery/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=jquery
 pkgver=2.1.0
-pkgrel=1
+pkgrel=3
 pkgdesc='jQuery is a fast and concise JavaScript Library that simplifies HTML document traversing, event handling, animating, and Ajax interactions for rapid web development'
 arch=any
 url=http://jquery.com/
@@ -11,7 +11,7 @@ license=MIT
 makedepends=nodejs
 
 source=https://github.com/$pkgname/$pkgname/archive/$pkgver.tar.gz
-sha512sums=aedd1086b3b84ed6705b31ac297b6bef29fc2b19a190b3bded2c135d13931cdc92b9ea7cf3eab86e8157a50f1e4ec9ba2bbe1eeba1af5dd44079f237571d41e4
+sha512sums=a5e1b1f5590e07301dd0793bba0961757211d9020efe67ea73817ad10122a9ecbb138ad868b195da7f9811656e7eb07d522f1a99c341ca833c213b1f1966f3ff
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/libre/junit/PKGBUILD b/libre/junit/PKGBUILD
new file mode 100644
index 000000000..5c10cc43f
--- /dev/null
+++ b/libre/junit/PKGBUILD
@@ -0,0 +1,48 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (Arch): Guillaume ALAUX <Guillaume at Arch Linux dot org>
+# Rationale: Arch version isn't built from source.
+
+pkgname=junit
+pkgver=4.11
+pkgdesc="Automated testing framework for Java"
+url="http://www.junit.org/"
+license=('CPL')
+
+pkgrel=3.3
+arch=('any')
+depends=('java-runtime' 'java-hamcrest')
+makedepends=('apache-ant' 'jakarta-oro' 'jh')
+
+source=("https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz")
+md5sums=('cdaa9856761201de81a61aecb8cfcc9c')
+
+mksource=("$pkgname-$pkgver::git://github.com/junit-team/junit.git#tag=r$pkgver")
+mkmd5sums=('SKIP')
+mksource() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  find . -name '*.jar' -delete
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  ln -sf /usr/share/java/jakarta-oro.jar build/lib/
+  ln -sf /usr/share/java/hamcrest-core.jar lib/hamcrest-core-1.3.jar
+
+  ant -Dversion-status='' jars
+  for artifact in junit junit-dep; do
+    sed \
+      -e "s|@artifactID@|$artifact|" \
+      -e "s|@version@|$pkgver|" \
+      < build/maven/$artifact-pom-template.xml > $pkgname$pkgver/$artifact-$pkgver.pom
+  done
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}${pkgver}"
+
+  export DESTDIR="$pkgdir"
+  jh mvn-install $pkgname junit     $pkgver junit-$pkgver.{pom,jar} junit-$pkgver.jar
+  jh mvn-install $pkgname junit-dep $pkgver junit-dep-$pkgver.pom
+  ln -s ${pkgname}-${pkgver}.jar ${pkgdir}/usr/share/java/${pkgname}.jar
+}
diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD
index a4e4f03ea..3d1fe75e6 100644
--- a/libre/linux-libre-firmware/PKGBUILD
+++ b/libre/linux-libre-firmware/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: André Silva <emulatorman@parabola.nu>
-# Contributor: Márcio Silva <coadde@lavabit.com>
+# Contributor: Márcio Silva <coadde@parabola.nu>
 
 pkgname=linux-libre-firmware
-pkgver=3.12
+pkgver=3.13
 pkgrel=1
 pkgdesc='Free firmware files for Linux-libre'
 arch=('any')
@@ -39,7 +39,7 @@ replaces=('linux-firmware'
           'rt2x00-rt71w-fw'
           'amd-ucode')
 source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$pkgver-gnu/linux-libre-$pkgver-gnu.tar.xz")
-md5sums=('254f59707b6676b59ce5ca5c3c698319')
+md5sums=('98a8e803e0ed08557f3cdd4d56b0ddc1')
 
 package() {
 
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index ae5f590f0..aed04e4aa 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 205955 2014-02-14 20:17:56Z andyrtr $
+# $Id: PKGBUILD 206183 2014-02-21 10:15:31Z bpiotrowski $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
@@ -10,7 +10,7 @@
 pkgbase=linux-libre-lts     # Build stock -LIBRE-LTS kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.10
-_sublevel=30
+_sublevel=31
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
 _lxopkgver=${_basekernel}.30 # nearly always the same as pkgver
@@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'criu-no-expert.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz")
 md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
-         'fa8d8ba21bf5a6fad7edea6b158fd05c'
+         '36a430003252c2f5e7a6f8e3365871ca'
          '85ce008eaacbb2fc54b81116d35cf946'
          '16867e648e4b9f89bec949cb643888c2'
          'c072b17032e80debc6a8626299245d46'
diff --git a/libre/linux-libre-tools/02-parabola-paths.patch b/libre/linux-libre-tools/02-parabola-paths.patch
new file mode 100644
index 000000000..223e7d783
--- /dev/null
+++ b/libre/linux-libre-tools/02-parabola-paths.patch
@@ -0,0 +1,21 @@
+# Seblu was here
+--- a/tools/perf/config/Makefile	2014-02-13 23:00:14.000000000 +0100
++++ b/tools/perf/config/Makefile	2014-02-17 20:01:33.370539725 +0100
+@@ -561,7 +561,7 @@
+ bindir = $(prefix)/$(bindir_relative)
+ mandir = share/man
+ infodir = share/info
+-perfexecdir = libexec/perf-core
++perfexecdir = lib/perf
+ sharedir = $(prefix)/share
+ template_dir = share/perf-core/templates
+ htmldir = share/doc/perf-doc
+@@ -573,7 +573,7 @@
+ ETC_PERFCONFIG = etc/perfconfig
+ endif
+ ifeq ($(IS_X86_64),1)
+-lib = lib64
++lib = lib
+ else
+ lib = lib
+ endif
diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index 95d3bf880..d50c27934 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 104447 2014-01-21 01:10:56Z seblu $
+# $Id: PKGBUILD 105883 2014-02-17 19:21:42Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
@@ -18,7 +18,7 @@ _basekernel=3.13
 #_sublevel=3
 #_pkgver=$_basekernel.$_sublevel
 pkgver=$_basekernel
-pkgrel=1
+pkgrel=2
 license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
 url='http://linux-libre.fsfla.org/'
@@ -41,23 +41,26 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$_basekernel-gnu/
         'cpupower.systemd'
         'cpupower.service'
         'usbipd.service'
-        '01-fix-perf-python.patch')
+        '01-fix-perf-python.patch'
+        '02-parabola-paths.patch')
 sha256sums=('6e68eef826b17ae9d7df01ac13e46ef5d978670071d1b05aed775bdbff8fed96'
             #'561644a6a5d4c434dcd1f1e1dc48c4d8924bfa0407f697b66b7e6de02451acbb'
             '4fa509949d6863d001075fa3e8671eff2599c046d20c98bb4a70778595cd1c3f'
             'fbf6e0ce6eb0ef15703fe212958de6ca46e62188900b5e9f9272ed3cc9cfd54e'
             'a89284d0ecb556ca53a66d1c2087b5fd6d0a901ab2769cd3aebb93f4478905dc'
             '2e187734d8aec58a3046d79883510d779aa93fb3ab20bd3132c1a607ebe5498f'
-            'fce128f5e0abfa6916d5cb881456d892d1b163b9639166a4c6c1d53e4dc5086a')
+            'fce128f5e0abfa6916d5cb881456d892d1b163b9639166a4c6c1d53e4dc5086a'
+            'eb866a589a26b1979ffb2fe08be09417e277a4befac34bdb279a6bb3a27b0570')
 
 prepare() {
+  cd linux-$pkgver
   # apply stable patching set
   if (( NOEXTRACT == 0 )) && [[ -e "$srcdir"/patch-$_basekernel-gnu-$_pkgver-gnu ]]; then
     msg2 'Applying stable patch set'
-    cd linux-$pkgver
     patch -Np1 -i "$srcdir"/patch-$_basekernel-gnu-$_pkgver-gnu
-    cd ..
   fi
+  patch -N -p1 -i "$srcdir/01-fix-perf-python.patch"
+  patch -N -p1 -i "$srcdir/02-parabola-paths.patch"
 }
 
 build() {
diff --git a/libre/linux-libre/0001-SUNRPC-Ensure-that-gss_auth-isn-t-freed-before-its-u.patch b/libre/linux-libre/0001-SUNRPC-Ensure-that-gss_auth-isn-t-freed-before-its-u.patch
new file mode 100644
index 000000000..93803d2e6
--- /dev/null
+++ b/libre/linux-libre/0001-SUNRPC-Ensure-that-gss_auth-isn-t-freed-before-its-u.patch
@@ -0,0 +1,82 @@
+From 2bd7c7b5f011b3d57e4f5625b561a6f3f2f34a81 Mon Sep 17 00:00:00 2001
+From: Trond Myklebust <trond.myklebust@primarydata.com>
+Date: Sun, 16 Feb 2014 12:14:13 -0500
+Subject: [PATCH] SUNRPC: Ensure that gss_auth isn't freed before its upcall
+ messages
+
+Fix a race in which the RPC client is shutting down while the
+gss daemon is processing a downcall. If the RPC client manages to
+shut down before the gss daemon is done, then the struct gss_auth
+used in gss_release_msg() may have already been freed.
+
+Link: http://lkml.kernel.org/r/1392494917.71728.YahooMailNeo@web140002.mail.bf1.yahoo.com
+Reported-by: John <da_audiophile@yahoo.com>
+Reported-by: Borislav Petkov <bp@alien8.de>
+Cc: stable@vger.kernel.org # 3.12+
+Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
+---
+ net/sunrpc/auth_gss/auth_gss.c | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c
+index 42fdfc6..a642fd616 100644
+--- a/net/sunrpc/auth_gss/auth_gss.c
++++ b/net/sunrpc/auth_gss/auth_gss.c
+@@ -108,6 +108,7 @@ struct gss_auth {
+ static DEFINE_SPINLOCK(pipe_version_lock);
+ static struct rpc_wait_queue pipe_version_rpc_waitqueue;
+ static DECLARE_WAIT_QUEUE_HEAD(pipe_version_waitqueue);
++static void gss_put_auth(struct gss_auth *gss_auth);
+ 
+ static void gss_free_ctx(struct gss_cl_ctx *);
+ static const struct rpc_pipe_ops gss_upcall_ops_v0;
+@@ -320,6 +321,7 @@ gss_release_msg(struct gss_upcall_msg *gss_msg)
+ 	if (gss_msg->ctx != NULL)
+ 		gss_put_ctx(gss_msg->ctx);
+ 	rpc_destroy_wait_queue(&gss_msg->rpc_waitqueue);
++	gss_put_auth(gss_msg->auth);
+ 	kfree(gss_msg);
+ }
+ 
+@@ -500,6 +502,7 @@ gss_alloc_msg(struct gss_auth *gss_auth,
+ 		if (err)
+ 			goto err_free_msg;
+ 	};
++	kref_get(&gss_auth->kref);
+ 	return gss_msg;
+ err_free_msg:
+ 	kfree(gss_msg);
+@@ -1071,6 +1074,12 @@ gss_free_callback(struct kref *kref)
+ }
+ 
+ static void
++gss_put_auth(struct gss_auth *gss_auth)
++{
++	kref_put(&gss_auth->kref, gss_free_callback);
++}
++
++static void
+ gss_destroy(struct rpc_auth *auth)
+ {
+ 	struct gss_auth *gss_auth = container_of(auth,
+@@ -1091,7 +1100,7 @@ gss_destroy(struct rpc_auth *auth)
+ 	gss_auth->gss_pipe[1] = NULL;
+ 	rpcauth_destroy_credcache(auth);
+ 
+-	kref_put(&gss_auth->kref, gss_free_callback);
++	gss_put_auth(gss_auth);
+ }
+ 
+ /*
+@@ -1262,7 +1271,7 @@ gss_destroy_nullcred(struct rpc_cred *cred)
+ 	call_rcu(&cred->cr_rcu, gss_free_cred_callback);
+ 	if (ctx)
+ 		gss_put_ctx(ctx);
+-	kref_put(&gss_auth->kref, gss_free_callback);
++	gss_put_auth(gss_auth);
+ }
+ 
+ static void
+-- 
+1.9.0
+
diff --git a/libre/linux-libre/0001-quirk-asm_volatile_goto.patch b/libre/linux-libre/0001-quirk-asm_volatile_goto.patch
new file mode 100644
index 000000000..c9ee40400
--- /dev/null
+++ b/libre/linux-libre/0001-quirk-asm_volatile_goto.patch
@@ -0,0 +1,51 @@
+From a9f180345f5378ac87d80ed0bea55ba421d83859 Mon Sep 17 00:00:00 2001
+From: Steven Noonan <steven@uplinklabs.net>
+Date: Thu, 13 Feb 2014 07:01:07 +0000
+Subject: compiler/gcc4: Make quirk for asm_volatile_goto() unconditional
+
+I started noticing problems with KVM guest destruction on Linux
+3.12+, where guest memory wasn't being cleaned up. I bisected it
+down to the commit introducing the new 'asm goto'-based atomics,
+and found this quirk was later applied to those.
+
+Unfortunately, even with GCC 4.8.2 (which ostensibly fixed the
+known 'asm goto' bug) I am still getting some kind of
+miscompilation. If I enable the asm_volatile_goto quirk for my
+compiler, KVM guests are destroyed correctly and the memory is
+cleaned up.
+
+So make the quirk unconditional for now, until bug is found
+and fixed.
+
+Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Steven Noonan <steven@uplinklabs.net>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Cc: Steven Rostedt <rostedt@goodmis.org>
+Cc: Jakub Jelinek <jakub@redhat.com>
+Cc: Richard Henderson <rth@twiddle.net>
+Cc: Andrew Morton <akpm@linux-foundation.org>
+Cc: Oleg Nesterov <oleg@redhat.com>
+Cc: <stable@vger.kernel.org>
+Link: http://lkml.kernel.org/r/1392274867-15236-1-git-send-email-steven@uplinklabs.net
+Link: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
+Signed-off-by: Ingo Molnar <mingo@kernel.org>
+---
+diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
+index ded4299..2507fd2 100644
+--- a/include/linux/compiler-gcc4.h
++++ b/include/linux/compiler-gcc4.h
+@@ -75,11 +75,7 @@
+  *
+  * (asm goto is automatically volatile - the naming reflects this.)
+  */
+-#if GCC_VERSION <= 40801
+-# define asm_volatile_goto(x...)	do { asm goto(x); asm (""); } while (0)
+-#else
+-# define asm_volatile_goto(x...)	do { asm goto(x); } while (0)
+-#endif
++#define asm_volatile_goto(x...)	do { asm goto(x); asm (""); } while (0)
+ 
+ #ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP
+ #if GCC_VERSION >= 40400
+--
+cgit v0.9.2
diff --git a/libre/linux-libre/sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch b/libre/linux-libre/0001-sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch
index 805498a70..2d398315e 100644
--- a/libre/linux-libre/sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch
+++ b/libre/linux-libre/0001-sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch
@@ -1,5 +1,7 @@
-Bugzilla: N/A
-Upstream-status: queued in NFS git tree (for 3.13/3.14?)
+From 4b9a445e3eeb8bd9278b1ae51c1b3a651e370cd6 Mon Sep 17 00:00:00 2001
+From: Jeff Layton <jlayton@redhat.com>
+Date: Thu, 14 Nov 2013 07:25:17 -0500
+Subject: [PATCH 1/6] sunrpc: create a new dummy pipe for gssd to hold open
 
 rpc.gssd will naturally hold open any pipe named */clnt*/gssd that shows
 up under rpc_pipefs. That behavior gives us a reliable mechanism to tell
@@ -15,16 +17,17 @@ it will just return -EINVAL.
 Signed-off-by: Jeff Layton <jlayton@redhat.com>
 Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
 ---
- include/linux/sunrpc/rpc_pipe_fs.h |    3 +-
- net/sunrpc/netns.h                 |    1 +
- net/sunrpc/rpc_pipe.c              |   93 ++++++++++++++++++++++++++++++++++-
- net/sunrpc/sunrpc_syms.c           |    8 +++-
+ include/linux/sunrpc/rpc_pipe_fs.h |  3 +-
+ net/sunrpc/netns.h                 |  1 +
+ net/sunrpc/rpc_pipe.c              | 93 ++++++++++++++++++++++++++++++++++++--
+ net/sunrpc/sunrpc_syms.c           |  8 +++-
  4 files changed, 100 insertions(+), 5 deletions(-)
 
-diff -up linux-3.11.9-200.fc19.x86_64/include/linux/sunrpc/rpc_pipe_fs.h.orig linux-3.11.9-200.fc19.x86_64/include/linux/sunrpc/rpc_pipe_fs.h
---- linux-3.11.9-200.fc19.x86_64/include/linux/sunrpc/rpc_pipe_fs.h.orig	2013-09-02 16:46:10.000000000 -0400
-+++ linux-3.11.9-200.fc19.x86_64/include/linux/sunrpc/rpc_pipe_fs.h	2013-11-21 10:11:17.893026000 -0500
-@@ -64,7 +64,8 @@ enum {
+diff --git a/include/linux/sunrpc/rpc_pipe_fs.h b/include/linux/sunrpc/rpc_pipe_fs.h
+index a353e03..85f1342 100644
+--- a/include/linux/sunrpc/rpc_pipe_fs.h
++++ b/include/linux/sunrpc/rpc_pipe_fs.h
+@@ -84,7 +84,8 @@ enum {
  
  extern struct dentry *rpc_d_lookup_sb(const struct super_block *sb,
  				      const unsigned char *dir_name);
@@ -34,9 +37,10 @@ diff -up linux-3.11.9-200.fc19.x86_64/include/linux/sunrpc/rpc_pipe_fs.h.orig li
  extern struct super_block *rpc_get_sb_net(const struct net *net);
  extern void rpc_put_sb_net(const struct net *net);
  
-diff -up linux-3.11.9-200.fc19.x86_64/net/sunrpc/netns.h.orig linux-3.11.9-200.fc19.x86_64/net/sunrpc/netns.h
---- linux-3.11.9-200.fc19.x86_64/net/sunrpc/netns.h.orig	2013-09-02 16:46:10.000000000 -0400
-+++ linux-3.11.9-200.fc19.x86_64/net/sunrpc/netns.h	2013-11-21 10:11:17.897029000 -0500
+diff --git a/net/sunrpc/netns.h b/net/sunrpc/netns.h
+index 779742c..8a8e841 100644
+--- a/net/sunrpc/netns.h
++++ b/net/sunrpc/netns.h
 @@ -14,6 +14,7 @@ struct sunrpc_net {
  	struct cache_detail *rsi_cache;
  
@@ -45,9 +49,10 @@ diff -up linux-3.11.9-200.fc19.x86_64/net/sunrpc/netns.h.orig linux-3.11.9-200.f
  	struct mutex pipefs_sb_lock;
  
  	struct list_head all_clients;
-diff -up linux-3.11.9-200.fc19.x86_64/net/sunrpc/rpc_pipe.c.orig linux-3.11.9-200.fc19.x86_64/net/sunrpc/rpc_pipe.c
---- linux-3.11.9-200.fc19.x86_64/net/sunrpc/rpc_pipe.c.orig	2013-09-02 16:46:10.000000000 -0400
-+++ linux-3.11.9-200.fc19.x86_64/net/sunrpc/rpc_pipe.c	2013-11-21 10:11:17.903026000 -0500
+diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
+index bf04b30..c23458b 100644
+--- a/net/sunrpc/rpc_pipe.c
++++ b/net/sunrpc/rpc_pipe.c
 @@ -38,7 +38,7 @@
  #define NET_NAME(net)	((net == &init_net) ? " (init_net)" : "")
  
@@ -57,7 +62,7 @@ diff -up linux-3.11.9-200.fc19.x86_64/net/sunrpc/rpc_pipe.c.orig linux-3.11.9-20
  
  static struct kmem_cache *rpc_inode_cachep __read_mostly;
  
-@@ -1019,6 +1019,7 @@ enum {
+@@ -1159,6 +1159,7 @@ enum {
  	RPCAUTH_nfsd4_cb,
  	RPCAUTH_cache,
  	RPCAUTH_nfsd,
@@ -65,7 +70,7 @@ diff -up linux-3.11.9-200.fc19.x86_64/net/sunrpc/rpc_pipe.c.orig linux-3.11.9-20
  	RPCAUTH_RootEOF
  };
  
-@@ -1055,6 +1056,10 @@ static const struct rpc_filelist files[]
+@@ -1195,6 +1196,10 @@ static const struct rpc_filelist files[] = {
  		.name = "nfsd",
  		.mode = S_IFDIR | S_IRUGO | S_IXUGO,
  	},
@@ -76,7 +81,7 @@ diff -up linux-3.11.9-200.fc19.x86_64/net/sunrpc/rpc_pipe.c.orig linux-3.11.9-20
  };
  
  /*
-@@ -1068,13 +1073,25 @@ struct dentry *rpc_d_lookup_sb(const str
+@@ -1208,13 +1213,25 @@ struct dentry *rpc_d_lookup_sb(const struct super_block *sb,
  }
  EXPORT_SYMBOL_GPL(rpc_d_lookup_sb);
  
@@ -103,7 +108,7 @@ diff -up linux-3.11.9-200.fc19.x86_64/net/sunrpc/rpc_pipe.c.orig linux-3.11.9-20
  }
  
  /*
-@@ -1104,11 +1121,73 @@ void rpc_put_sb_net(const struct net *ne
+@@ -1244,11 +1261,73 @@ void rpc_put_sb_net(const struct net *net)
  }
  EXPORT_SYMBOL_GPL(rpc_put_sb_net);
  
@@ -178,7 +183,7 @@ diff -up linux-3.11.9-200.fc19.x86_64/net/sunrpc/rpc_pipe.c.orig linux-3.11.9-20
  	struct net *net = data;
  	struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);
  	int err;
-@@ -1126,6 +1205,13 @@ rpc_fill_super(struct super_block *sb, v
+@@ -1266,6 +1345,13 @@ rpc_fill_super(struct super_block *sb, void *data, int silent)
  		return -ENOMEM;
  	if (rpc_populate(root, files, RPCAUTH_lockd, RPCAUTH_RootEOF, NULL))
  		return -ENOMEM;
@@ -192,7 +197,7 @@ diff -up linux-3.11.9-200.fc19.x86_64/net/sunrpc/rpc_pipe.c.orig linux-3.11.9-20
  	dprintk("RPC:       sending pipefs MOUNT notification for net %p%s\n",
  		net, NET_NAME(net));
  	mutex_lock(&sn->pipefs_sb_lock);
-@@ -1140,6 +1226,7 @@ rpc_fill_super(struct super_block *sb, v
+@@ -1280,6 +1366,7 @@ rpc_fill_super(struct super_block *sb, void *data, int silent)
  	return 0;
  
  err_depopulate:
@@ -200,10 +205,11 @@ diff -up linux-3.11.9-200.fc19.x86_64/net/sunrpc/rpc_pipe.c.orig linux-3.11.9-20
  	blocking_notifier_call_chain(&rpc_pipefs_notifier_list,
  					   RPC_PIPEFS_UMOUNT,
  					   sb);
-diff -up linux-3.11.9-200.fc19.x86_64/net/sunrpc/sunrpc_syms.c.orig linux-3.11.9-200.fc19.x86_64/net/sunrpc/sunrpc_syms.c
---- linux-3.11.9-200.fc19.x86_64/net/sunrpc/sunrpc_syms.c.orig	2013-09-02 16:46:10.000000000 -0400
-+++ linux-3.11.9-200.fc19.x86_64/net/sunrpc/sunrpc_syms.c	2013-11-21 10:11:17.908026000 -0500
-@@ -44,12 +44,17 @@ static __net_init int sunrpc_init_net(st
+diff --git a/net/sunrpc/sunrpc_syms.c b/net/sunrpc/sunrpc_syms.c
+index 3d6498a..cd30120 100644
+--- a/net/sunrpc/sunrpc_syms.c
++++ b/net/sunrpc/sunrpc_syms.c
+@@ -44,12 +44,17 @@ static __net_init int sunrpc_init_net(struct net *net)
  	if (err)
  		goto err_unixgid;
  
@@ -230,4 +236,6 @@ diff -up linux-3.11.9-200.fc19.x86_64/net/sunrpc/sunrpc_syms.c.orig linux-3.11.9
  	unix_gid_cache_destroy(net);
  	ip_map_cache_destroy(net);
  	rpc_proc_exit(net);
+-- 
+1.8.5.3
 
diff --git a/libre/linux-libre/0001-syscalls.h-use-gcc-alias-instead-of-assembler-aliase.patch b/libre/linux-libre/0001-syscalls.h-use-gcc-alias-instead-of-assembler-aliase.patch
new file mode 100644
index 000000000..c4242e0ae
--- /dev/null
+++ b/libre/linux-libre/0001-syscalls.h-use-gcc-alias-instead-of-assembler-aliase.patch
@@ -0,0 +1,68 @@
+From 83460ec8dcac14142e7860a01fa59c267ac4657c Mon Sep 17 00:00:00 2001
+From: Andi Kleen <ak@linux.intel.com>
+Date: Tue, 12 Nov 2013 15:08:36 -0800
+Subject: [PATCH] syscalls.h: use gcc alias instead of assembler aliases for
+ syscalls
+
+Use standard gcc __attribute__((alias(foo))) to define the syscall aliases
+instead of custom assembler macros.
+
+This is far cleaner, and also fixes my LTO kernel build.
+
+Signed-off-by: Andi Kleen <ak@linux.intel.com>
+Cc: Al Viro <viro@ZenIV.linux.org.uk>
+Cc: Geert Uytterhoeven <geert@linux-m68k.org>
+Cc: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+---
+ include/linux/compat.h   | 4 ++--
+ include/linux/syscalls.h | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/include/linux/compat.h b/include/linux/compat.h
+index 345da00..ada34c9 100644
+--- a/include/linux/compat.h
++++ b/include/linux/compat.h
+@@ -41,14 +41,14 @@
+ 	COMPAT_SYSCALL_DEFINEx(6, _##name, __VA_ARGS__)
+ 
+ #define COMPAT_SYSCALL_DEFINEx(x, name, ...)				\
+-	asmlinkage long compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__));\
++	asmlinkage long compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))\
++		__attribute__((alias(__stringify(compat_SyS##name))));  \
+ 	static inline long C_SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__));\
+ 	asmlinkage long compat_SyS##name(__MAP(x,__SC_LONG,__VA_ARGS__));\
+ 	asmlinkage long compat_SyS##name(__MAP(x,__SC_LONG,__VA_ARGS__))\
+ 	{								\
+ 		return C_SYSC##name(__MAP(x,__SC_DELOUSE,__VA_ARGS__));	\
+ 	}								\
+-	SYSCALL_ALIAS(compat_sys##name, compat_SyS##name);		\
+ 	static inline long C_SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__))
+ 
+ #ifndef compat_user_stack_pointer
+diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
+index 7fac04e..c27f846 100644
+--- a/include/linux/syscalls.h
++++ b/include/linux/syscalls.h
+@@ -184,7 +184,8 @@ extern struct trace_event_functions exit_syscall_print_funcs;
+ 
+ #define __PROTECT(...) asmlinkage_protect(__VA_ARGS__)
+ #define __SYSCALL_DEFINEx(x, name, ...)					\
+-	asmlinkage long sys##name(__MAP(x,__SC_DECL,__VA_ARGS__));	\
++	asmlinkage long sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))	\
++		__attribute__((alias(__stringify(SyS##name))));		\
+ 	static inline long SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__));	\
+ 	asmlinkage long SyS##name(__MAP(x,__SC_LONG,__VA_ARGS__));	\
+ 	asmlinkage long SyS##name(__MAP(x,__SC_LONG,__VA_ARGS__))	\
+@@ -194,7 +195,6 @@ extern struct trace_event_functions exit_syscall_print_funcs;
+ 		__PROTECT(x, ret,__MAP(x,__SC_ARGS,__VA_ARGS__));	\
+ 		return ret;						\
+ 	}								\
+-	SYSCALL_ALIAS(sys##name, SyS##name);				\
+ 	static inline long SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__))
+ 
+ asmlinkage long sys_time(time_t __user *tloc);
+-- 
+1.8.5.3
+
diff --git a/libre/linux-libre/0001-x86-x32-Correct-invalid-use-of-user-timespec-in-the-.patch b/libre/linux-libre/0001-x86-x32-Correct-invalid-use-of-user-timespec-in-the-.patch
deleted file mode 100644
index 3f1bccc80..000000000
--- a/libre/linux-libre/0001-x86-x32-Correct-invalid-use-of-user-timespec-in-the-.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 2def2ef2ae5f3990aabdbe8a755911902707d268 Mon Sep 17 00:00:00 2001
-From: PaX Team <pageexec@freemail.hu>
-Date: Thu, 30 Jan 2014 16:59:25 -0800
-Subject: [PATCH] x86, x32: Correct invalid use of user timespec in the kernel
-
-The x32 case for the recvmsg() timout handling is broken:
-
-  asmlinkage long compat_sys_recvmmsg(int fd, struct compat_mmsghdr __user *mmsg,
-                                      unsigned int vlen, unsigned int flags,
-                                      struct compat_timespec __user *timeout)
-  {
-          int datagrams;
-          struct timespec ktspec;
-
-          if (flags & MSG_CMSG_COMPAT)
-                  return -EINVAL;
-
-          if (COMPAT_USE_64BIT_TIME)
-                  return __sys_recvmmsg(fd, (struct mmsghdr __user *)mmsg, vlen,
-                                        flags | MSG_CMSG_COMPAT,
-                                        (struct timespec *) timeout);
-          ...
-
-The timeout pointer parameter is provided by userland (hence the __user
-annotation) but for x32 syscalls it's simply cast to a kernel pointer
-and is passed to __sys_recvmmsg which will eventually directly
-dereference it for both reading and writing.  Other callers to
-__sys_recvmmsg properly copy from userland to the kernel first.
-
-The bug was introduced by commit ee4fa23c4bfc ("compat: Use
-COMPAT_USE_64BIT_TIME in net/compat.c") and should affect all kernels
-since 3.4 (and perhaps vendor kernels if they backported x32 support
-along with this code).
-
-Note that CONFIG_X86_X32_ABI gets enabled at build time and only if
-CONFIG_X86_X32 is enabled and ld can build x32 executables.
-
-Other uses of COMPAT_USE_64BIT_TIME seem fine.
-
-This addresses CVE-2014-0038.
-
-Signed-off-by: PaX Team <pageexec@freemail.hu>
-Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
-Cc: <stable@vger.kernel.org> # v3.4+
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
----
- net/compat.c | 9 ++-------
- 1 file changed, 2 insertions(+), 7 deletions(-)
-
-diff --git a/net/compat.c b/net/compat.c
-index dd32e34..f50161f 100644
---- a/net/compat.c
-+++ b/net/compat.c
-@@ -780,21 +780,16 @@ asmlinkage long compat_sys_recvmmsg(int fd, struct compat_mmsghdr __user *mmsg,
- 	if (flags & MSG_CMSG_COMPAT)
- 		return -EINVAL;
- 
--	if (COMPAT_USE_64BIT_TIME)
--		return __sys_recvmmsg(fd, (struct mmsghdr __user *)mmsg, vlen,
--				      flags | MSG_CMSG_COMPAT,
--				      (struct timespec *) timeout);
--
- 	if (timeout == NULL)
- 		return __sys_recvmmsg(fd, (struct mmsghdr __user *)mmsg, vlen,
- 				      flags | MSG_CMSG_COMPAT, NULL);
- 
--	if (get_compat_timespec(&ktspec, timeout))
-+	if (compat_get_timespec(&ktspec, timeout))
- 		return -EFAULT;
- 
- 	datagrams = __sys_recvmmsg(fd, (struct mmsghdr __user *)mmsg, vlen,
- 				   flags | MSG_CMSG_COMPAT, &ktspec);
--	if (datagrams > 0 && put_compat_timespec(&ktspec, timeout))
-+	if (datagrams > 0 && compat_put_timespec(&ktspec, timeout))
- 		datagrams = -EFAULT;
- 
- 	return datagrams;
--- 
-1.8.5.3
-
diff --git a/libre/linux-libre/sunrpc-replace-gssd_running-with-more-reliable-check.patch b/libre/linux-libre/0002-sunrpc-replace-sunrpc_net-gssd_running-flag-with-a-m.patch
index 8cd5c0090..19e04da5d 100644
--- a/libre/linux-libre/sunrpc-replace-gssd_running-with-more-reliable-check.patch
+++ b/libre/linux-libre/0002-sunrpc-replace-sunrpc_net-gssd_running-flag-with-a-m.patch
@@ -1,5 +1,8 @@
-Bugzilla: N/A
-Upstream-status: queued in NFS git tree (for 3.13/3.14?)
+From 89f842435c630f8426f414e6030bc2ffea0d6f81 Mon Sep 17 00:00:00 2001
+From: Jeff Layton <jlayton@redhat.com>
+Date: Thu, 14 Nov 2013 07:25:18 -0500
+Subject: [PATCH 2/6] sunrpc: replace sunrpc_net->gssd_running flag with a more
+ reliable check
 
 Now that we have a more reliable method to tell if gssd is running, we
 can replace the sn->gssd_running flag with a function that will query to
@@ -14,12 +17,10 @@ extraneous newline from the message.
 Signed-off-by: Jeff Layton <jlayton@redhat.com>
 Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
 ---
- Fixed up to apply to 3.12.1 by Josh Boyer <jwboyer@fedoraproject.org>
-
- include/linux/sunrpc/rpc_pipe_fs.h |    2 ++
- net/sunrpc/auth_gss/auth_gss.c     |   17 +++++++----------
- net/sunrpc/netns.h                 |    2 --
- net/sunrpc/rpc_pipe.c              |   14 ++++++++++----
+ include/linux/sunrpc/rpc_pipe_fs.h |  2 ++
+ net/sunrpc/auth_gss/auth_gss.c     | 17 +++++++----------
+ net/sunrpc/netns.h                 |  2 --
+ net/sunrpc/rpc_pipe.c              | 14 ++++++++++----
  4 files changed, 19 insertions(+), 16 deletions(-)
 
 diff --git a/include/linux/sunrpc/rpc_pipe_fs.h b/include/linux/sunrpc/rpc_pipe_fs.h
@@ -35,10 +36,10 @@ index 85f1342..7f490be 100644
  #endif
  #endif
 diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c
-index 0846566..1ada878 100644
+index 42fdfc6..0a2aee0 100644
 --- a/net/sunrpc/auth_gss/auth_gss.c
 +++ b/net/sunrpc/auth_gss/auth_gss.c
-@@ -517,8 +517,7 @@ static void warn_gssd(void)
+@@ -536,8 +536,7 @@ static void warn_gssd(void)
  	unsigned long now = jiffies;
  
  	if (time_after(now, ratelimit)) {
@@ -48,7 +49,7 @@ index 0846566..1ada878 100644
  		ratelimit = now + 15*HZ;
  	}
  }
-@@ -581,7 +580,6 @@ gss_create_upcall(struct gss_auth *gss_auth, struct gss_cred *gss_cred)
+@@ -600,7 +599,6 @@ gss_create_upcall(struct gss_auth *gss_auth, struct gss_cred *gss_cred)
  	struct rpc_pipe *pipe;
  	struct rpc_cred *cred = &gss_cred->gc_base;
  	struct gss_upcall_msg *gss_msg;
@@ -56,7 +57,7 @@ index 0846566..1ada878 100644
  	DEFINE_WAIT(wait);
  	int err;
  
-@@ -589,17 +587,16 @@ gss_create_upcall(struct gss_auth *gss_auth, struct gss_cred *gss_cred)
+@@ -608,17 +606,16 @@ gss_create_upcall(struct gss_auth *gss_auth, struct gss_cred *gss_cred)
  		__func__, from_kuid(&init_user_ns, cred->cr_uid));
  retry:
  	err = 0;
@@ -94,7 +95,7 @@ index 8a8e841..94e506f 100644
  
  extern int sunrpc_net_id;
 diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
-index 40aef18..ad444f3 100644
+index c23458b..5cd7ad1 100644
 --- a/net/sunrpc/rpc_pipe.c
 +++ b/net/sunrpc/rpc_pipe.c
 @@ -216,14 +216,11 @@ rpc_destroy_inode(struct inode *inode)
@@ -112,7 +113,7 @@ index 40aef18..ad444f3 100644
  	pipe = RPC_I(inode)->pipe;
  	if (pipe == NULL)
  		goto out;
-@@ -1231,7 +1228,6 @@ int rpc_pipefs_init_net(struct net *net)
+@@ -1222,7 +1219,6 @@ int rpc_pipefs_init_net(struct net *net)
  		return PTR_ERR(sn->gssd_dummy);
  
  	mutex_init(&sn->pipefs_sb_lock);
@@ -120,7 +121,7 @@ index 40aef18..ad444f3 100644
  	sn->pipe_version = -1;
  	return 0;
  }
-@@ -1385,6 +1381,16 @@ err_depopulate:
+@@ -1376,6 +1372,16 @@ err_depopulate:
  	return err;
  }
  
@@ -137,3 +138,6 @@ index 40aef18..ad444f3 100644
  static struct dentry *
  rpc_mount(struct file_system_type *fs_type,
  		int flags, const char *dev_name, void *data)
+-- 
+1.8.5.3
+
diff --git a/libre/linux-libre/nfs-check-gssd-running-before-krb5i-auth.patch b/libre/linux-libre/0003-nfs-check-if-gssd-is-running-before-attempting-to-us.patch
index be81fec76..87b54fc3e 100644
--- a/libre/linux-libre/nfs-check-gssd-running-before-krb5i-auth.patch
+++ b/libre/linux-libre/0003-nfs-check-if-gssd-is-running-before-attempting-to-us.patch
@@ -1,5 +1,8 @@
-Bugzilla: N/A
-Upstream-status: queued in NFS git tree (for 3.13/3.14?)
+From 6aa23d76a7b549521a03b63b6d5b7880ea87eab7 Mon Sep 17 00:00:00 2001
+From: Jeff Layton <jlayton@redhat.com>
+Date: Thu, 14 Nov 2013 07:25:19 -0500
+Subject: [PATCH 3/6] nfs: check if gssd is running before attempting to use
+ krb5i auth in SETCLIENTID call
 
 Currently, the client will attempt to use krb5i in the SETCLIENTID call
 even if rpc.gssd isn't running. When that fails, it'll then fall back to
@@ -14,12 +17,13 @@ fail at a later stage of the mount attempt.
 Signed-off-by: Jeff Layton <jlayton@redhat.com>
 Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
 ---
- fs/nfs/nfs4client.c |    7 ++++++-
- 1 files changed, 6 insertions(+), 1 deletions(-)
+ fs/nfs/nfs4client.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
 
-diff -up linux-3.11.9-200.fc19.x86_64/fs/nfs/nfs4client.c.orig linux-3.11.9-200.fc19.x86_64/fs/nfs/nfs4client.c
---- linux-3.11.9-200.fc19.x86_64/fs/nfs/nfs4client.c.orig	2013-09-02 16:46:10.000000000 -0400
-+++ linux-3.11.9-200.fc19.x86_64/fs/nfs/nfs4client.c	2013-11-21 10:20:27.288286000 -0500
+diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c
+index b4a160a..c1b7a80 100644
+--- a/fs/nfs/nfs4client.c
++++ b/fs/nfs/nfs4client.c
 @@ -10,6 +10,7 @@
  #include <linux/sunrpc/auth.h>
  #include <linux/sunrpc/xprt.h>
@@ -28,10 +32,10 @@ diff -up linux-3.11.9-200.fc19.x86_64/fs/nfs/nfs4client.c.orig linux-3.11.9-200.
  #include "internal.h"
  #include "callback.h"
  #include "delegation.h"
-@@ -206,7 +207,11 @@ struct nfs_client *nfs4_init_client(stru
- 	if (clp->cl_minorversion != 0)
+@@ -370,7 +371,11 @@ struct nfs_client *nfs4_init_client(struct nfs_client *clp,
  		__set_bit(NFS_CS_INFINITE_SLOTS, &clp->cl_flags);
  	__set_bit(NFS_CS_DISCRTRY, &clp->cl_flags);
+ 	__set_bit(NFS_CS_NO_RETRANS_TIMEOUT, &clp->cl_flags);
 -	error = nfs_create_rpc_client(clp, timeparms, RPC_AUTH_GSS_KRB5I);
 +
 +	error = -EINVAL;
@@ -41,8 +45,6 @@ diff -up linux-3.11.9-200.fc19.x86_64/fs/nfs/nfs4client.c.orig linux-3.11.9-200.
  	if (error == -EINVAL)
  		error = nfs_create_rpc_client(clp, timeparms, RPC_AUTH_UNIX);
  	if (error < 0)
+-- 
+1.8.5.3
 
-_______________________________________________
-kernel mailing list
-kernel@lists.fedoraproject.org
-https://admin.fedoraproject.org/mailman/listinfo/kernel
diff --git a/libre/linux-libre/rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-fails.patch b/libre/linux-libre/0004-rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-.patch
index e4b1a255f..5f2c3dae8 100644
--- a/libre/linux-libre/rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-fails.patch
+++ b/libre/linux-libre/0004-rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-.patch
@@ -1,11 +1,15 @@
-Bugzilla: 1037793
-Upstream-status: submitted for 3.14
+From 3396f92f8be606ea485b0a82d4e7749a448b013b Mon Sep 17 00:00:00 2001
+From: Jeff Layton <jlayton@redhat.com>
+Date: Thu, 5 Dec 2013 07:33:49 -0500
+Subject: [PATCH 4/6] rpc_pipe: remove the clntXX dir if creating the pipe
+ fails
 
 In the event that we create the gssd/clntXX dir, but the pipe creation
 subsequently fails, then we should remove the clntXX dir before
 returning.
 
 Signed-off-by: Jeff Layton <jlayton@redhat.com>
+Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
 ---
  net/sunrpc/rpc_pipe.c | 2 ++
  1 file changed, 2 insertions(+)
@@ -24,9 +28,5 @@ index 5cd7ad1..0b74c61 100644
  	dput(clnt_dentry);
  	dput(gssd_dentry);
 -- 
-1.8.4.2
+1.8.5.3
 
---
-To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
-the body of a message to majordomo@vger.kernel.org
-More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff --git a/libre/linux-libre/sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch b/libre/linux-libre/0005-sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch
index dd3b5ba2f..8ef6fe25c 100644
--- a/libre/linux-libre/sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch
+++ b/libre/linux-libre/0005-sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch
@@ -1,5 +1,7 @@
-Bugzilla: 1037793
-Upstream-status: submitted for 3.14
+From e2f0c83a9de331d9352185ca3642616c13127539 Mon Sep 17 00:00:00 2001
+From: Jeff Layton <jlayton@redhat.com>
+Date: Thu, 5 Dec 2013 07:34:44 -0500
+Subject: [PATCH 5/6] sunrpc: add an "info" file for the dummy gssd pipe
 
 rpc.gssd expects to see an "info" file in each clntXX dir. Since adding
 the dummy gssd pipe, users that run rpc.gssd see a lot of these messages
@@ -11,6 +13,7 @@ spamming the logs:
 Add a dummy gssd/clntXX/info file to help silence these messages.
 
 Signed-off-by: Jeff Layton <jlayton@redhat.com>
+Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
 ---
  net/sunrpc/rpc_pipe.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++-
  1 file changed, 49 insertions(+), 1 deletion(-)
@@ -93,4 +96,5 @@ index 0b74c61..5d973b2 100644
  	dput(clnt_dentry);
  	dput(gssd_dentry);
 -- 
-1.8.4.2
+1.8.5.3
+
diff --git a/libre/linux-libre/rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-notification-fails.patch b/libre/linux-libre/0006-rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-no.patch
index ed03f34dd..75505c30d 100644
--- a/libre/linux-libre/rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-notification-fails.patch
+++ b/libre/linux-libre/0006-rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-no.patch
@@ -1,10 +1,14 @@
-Bugzilla: 1037793
-Upstream-status: submitted for 3.14
+From 23e66ba97127ff3b064d4c6c5138aa34eafc492f Mon Sep 17 00:00:00 2001
+From: Jeff Layton <jlayton@redhat.com>
+Date: Mon, 9 Dec 2013 09:38:00 -0500
+Subject: [PATCH 6/6] rpc_pipe: fix cleanup of dummy gssd directory when
+ notification fails
 
 Currently, it could leak dentry references in some cases. Make sure
 we clean up properly.
 
 Signed-off-by: Jeff Layton <jlayton@redhat.com>
+Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
 ---
  net/sunrpc/rpc_pipe.c | 14 +++++++++++++-
  1 file changed, 13 insertions(+), 1 deletion(-)
@@ -42,9 +46,5 @@ index 5d973b2..b185548 100644
  					   RPC_PIPEFS_UMOUNT,
  					   sb);
 -- 
-1.8.4.2
+1.8.5.3
 
---
-To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
-the body of a message to majordomo@vger.kernel.org
-More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 384490ae6..690b6cc8e 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 204911 2014-01-31 09:59:51Z bluewind $
+# $Id: PKGBUILD 206177 2014-02-20 22:43:41Z thomas $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
@@ -9,11 +9,11 @@
 
 pkgbase=linux-libre         # Build stock -LIBRE kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
-_basekernel=3.12
-_sublevel=9
+_basekernel=3.13
+_sublevel=4
 pkgver=${_basekernel}.${_sublevel}
-pkgrel=2
-_lxopkgver=${_basekernel}.9 # nearly always the same as pkgver
+pkgrel=1
+_lxopkgver=${_basekernel}.3 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -30,32 +30,38 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'boot-logo.patch'
         'change-default-console-loglevel.patch'
         'criu-no-expert.patch'
-        'sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch'
-        'sunrpc-replace-gssd_running-with-more-reliable-check.patch'
-        'nfs-check-gssd-running-before-krb5i-auth.patch'
-        'rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-fails.patch'
-        'sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch'
-        'rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-notification-fails.patch'
-        '0001-x86-x32-Correct-invalid-use-of-user-timespec-in-the-.patch'
+        '0001-sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch'
+        '0002-sunrpc-replace-sunrpc_net-gssd_running-flag-with-a-m.patch'
+        '0003-nfs-check-if-gssd-is-running-before-attempting-to-us.patch'
+        '0004-rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-.patch'
+        '0005-sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch'
+        '0006-rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-no.patch'
+        '0001-SUNRPC-Ensure-that-gss_auth-isn-t-freed-before-its-u.patch'
+        '0001-syscalls.h-use-gcc-alias-instead-of-assembler-aliase.patch'
+        '0001-quirk-asm_volatile_goto.patch'
+        'i8042-fix-aliases.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz")
-md5sums=('254f59707b6676b59ce5ca5c3c698319'
-         '348975e36e4dd27f5d8fc50e92de8922'
-         '568ce15a9df133072489cbac8c4fefb3'
-         '772873c548059c57c8ec7898f35c0e2b'
+md5sums=('98a8e803e0ed08557f3cdd4d56b0ddc1'
+         '3659d30b1d06dd5b7874ae04c946863b'
+         'b6a3a3f9cac1be38384241ad58d45d46'
+         '3740951ae165b89a2139d45ae7d82173'
          'e49ac236dfeef709f91a3d993ea7b62c'
          '2967cecc3af9f954ccc822fd63dca6ff'
          '8267264d9a8966e57fdacd1fa1fc65c4'
          '44260d2cb1a8b51c119d2ce1f83e457a'
          '98beb36f9b8cf16e58de2483ea9985e3'
-         'd50c1ac47394e9aec637002ef3392bd1'
-         'd4a75f77e6bd5d700dcd534cd5f0dfce'
-         'dc86fdc37615c97f03c1e0c31b7b833a'
-         '88eef9d3b5012ef7e82af1af8cc4e517'
-         'cec0bb8981936eab2943b2009b7a6fff'
-         '88d9cddf9e0050a76ec4674f264fb2a1'
-         'cb9016630212ef07b168892fbcfd4e5d'
-         '336d2c4afd7ee5f2bdf0dcb1a54df4b2'
-         '9cdff00e5aa53962869857d64a1ccf01')
+         '989dc54ff8b179b0f80333cc97c0d43f'
+         'dd2adb99cd3feed6f11022562901965c'
+         'b00cc399d3797cb0793e18b5bf387a50'
+         '7cbd2349cdf046acc37b652c06ba36be'
+         '10dbaf863e22b2437e68f9190d65c861'
+         'd5907a721b97299f0685c583499f7820'
+         'a724515b350b29c53f20e631c6cf9a14'
+         '1ae4ec847f41fa1b6d488f956e94c893'
+         'e6fa278c092ad83780e2dd0568e24ca6'
+         '6baa312bc166681f48e972824f3f6649'
+         '93dbf73af819b77f03453a9c6de2bb47'
+         'ac92b702b8497d2be14f96e077a7f48f')
 if [ "$CARCH" != "mips64el" ]; then
     # don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
@@ -69,14 +75,11 @@ prepare() {
   cd "${srcdir}/linux-${_basekernel}"
 
   if [ "${_basekernel}" != "${pkgver}" ]; then
-    patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu"
+    patch -p1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu"
   fi
 
   # add freedo as boot logo
-  patch -Np1 -i "${srcdir}/boot-logo.patch"
-
-  # fix issue on Hal8188EFWImg_CE.c deblobbed file
-  sed -i "\|DEBLOBBED| s|,||" drivers/staging/rtl8188eu/hal/Hal8188EFWImg_CE.c
+  patch -p1 -i "${srcdir}/boot-logo.patch"
 
   # add latest fixes from stable queue, if needed
   # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
@@ -84,33 +87,47 @@ prepare() {
   # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
   # remove this when a Kconfig knob is made available by upstream
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
-  patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
+  patch -p1 -i "${srcdir}/change-default-console-loglevel.patch"
 
-  # allow criu without expert option set
-  # patch from fedora
-  patch -Np1 -i "${srcdir}/criu-no-expert.patch"
+  # allow Checkpoint/restore (for criu) without EXPERT=y
+  patch -p1 -i "${srcdir}/criu-no-expert.patch"
 
   # fix 15 seconds nfs delay
-  patch -Np1 -i "${srcdir}/sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch"
-  patch -Np1 -i "${srcdir}/sunrpc-replace-gssd_running-with-more-reliable-check.patch"
-  patch -Np1 -i "${srcdir}/nfs-check-gssd-running-before-krb5i-auth.patch"
-  # fix nfs kernel oops
-  # #37866
-  patch -Np1 -i "${srcdir}/rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-fails.patch"
-  patch -Np1 -i "${srcdir}/sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch"
-
-  patch -Np1 -i "${srcdir}/rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-notification-fails.patch"
+  # http://git.linux-nfs.org/?p=trondmy/linux-nfs.git;a=commitdiff;h=4b9a445e3eeb8bd9278b1ae51c1b3a651e370cd6
+  patch -p1 -i "${srcdir}/0001-sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch"
+  # http://git.linux-nfs.org/?p=trondmy/linux-nfs.git;a=commitdiff;h=89f842435c630f8426f414e6030bc2ffea0d6f81
+  patch -p1 -i "${srcdir}/0002-sunrpc-replace-sunrpc_net-gssd_running-flag-with-a-m.patch"
+  # http://git.linux-nfs.org/?p=trondmy/linux-nfs.git;a=commitdiff;h=6aa23d76a7b549521a03b63b6d5b7880ea87eab7
+  patch -p1 -i "${srcdir}/0003-nfs-check-if-gssd-is-running-before-attempting-to-us.patch"
 
-  # Fix CVE-2014-0038
-  patch -p1 -i "${srcdir}/0001-x86-x32-Correct-invalid-use-of-user-timespec-in-the-.patch"
+  # fix nfs kernel oops
+  # http://git.linux-nfs.org/?p=trondmy/linux-nfs.git;a=commitdiff;h=3396f92f8be606ea485b0a82d4e7749a448b013b
+  patch -p1 -i "${srcdir}/0004-rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-.patch"
+  # http://git.linux-nfs.org/?p=trondmy/linux-nfs.git;a=commitdiff;h=e2f0c83a9de331d9352185ca3642616c13127539
+  patch -p1 -i "${srcdir}/0005-sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch"
+  # http://git.linux-nfs.org/?p=trondmy/linux-nfs.git;a=commitdiff;h=23e66ba97127ff3b064d4c6c5138aa34eafc492f
+  patch -p1 -i "${srcdir}/0006-rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-no.patch"
+
+  # Fix FS#38921
+  # http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=9eb2ddb48ce3a7bd745c14a933112994647fa3cd
+  patch -p1 -i "${srcdir}/0001-SUNRPC-Ensure-that-gss_auth-isn-t-freed-before-its-u.patch"
+
+  # Fix symbols: Revert http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=83460ec8dcac14142e7860a01fa59c267ac4657c
+  patch -Rp1 -i "${srcdir}/0001-syscalls.h-use-gcc-alias-instead-of-assembler-aliase.patch"
+
+  # Fix i8042 aliases
+  patch -p1 -i "${srcdir}/i8042-fix-aliases.patch"
+  # Fix compile issues
+  # http://git.kernel.org/cgit/linux/kernel/git/tip/tip.git/patch/?id=a9f180345f5378ac87d80ed0bea55ba421d83859
+  patch -Np1 -i "${srcdir}/0001-quirk-asm_volatile_goto.patch"
 
   if [ "$CARCH" == "mips64el" ]; then
     sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile
     sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
         < "${srcdir}/config.patch" > config.patch
     msg2 "Adding loongson-community patches"
-    patch -Np1 -i ${srcdir}/${_basekernel}*-*-loongson-community.patch
-    patch -Np0 -i config.patch
+    patch -p1 -i ${srcdir}/${_basekernel}*-*-loongson-community.patch
+    patch -p0 -i lxo-config.patch
 
     # ensure N32, add localversion, remove uevent helper as per
     # https://git.kernel.org/?p=linux/hotplug/udev.git;a=blob_plain;f=README
@@ -146,10 +163,6 @@ prepare() {
   # don't run depmod on 'make install'. We'll do this ourselves in packaging
   sed -i '2iexit 0' scripts/depmod.sh
 
-  test "$CARCH" = "mips64el" && yes "" | make oldconfig
-}
-
-build() {
   cd "${srcdir}/linux-${_basekernel}"
 
   # get kernel version
@@ -165,21 +178,11 @@ build() {
 
   # rewrite configuration
   yes "" | make config >/dev/null
+}
 
-  # save configuration for later reuse
-  if [ "${CARCH}" = "x86_64" ]; then
-    cat .config > "${startdir}/config.x86_64.last"
-  else
-    cat .config > "${startdir}/config.i686.last"
-  fi
-
-  ####################
-  # stop here
-  # this is useful to configure the kernel
-  #msg "Stopping build"; return 1
-  ####################
+build() {
+  cd "${srcdir}/linux-${_basekernel}"
 
-  # build!
   if [ "$CARCH" == "mips64el" ]; then
     # The build system passes it directly to linker, disable to avoid
     # having unknown -Wl,... options.
@@ -231,12 +234,9 @@ _package() {
     cp vmlinuz "${pkgdir}/boot/vmlinuz-${pkgbase}"
     cp vmlinux "${pkgdir}/boot/vmlinux-${pkgbase}"
   else
-    cp "arch/${KARCH}/boot/bzImage" "${pkgdir}/boot/vmlinuz-${pkgbase}"
+    cp arch/${KARCH}/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgbase}"
   fi
 
-  # add vmlinux
-  install -D -m644 vmlinux "${pkgdir}/usr/src/linux-${_kernver}/vmlinux"
-
   # set correct depmod command for install
   cp -f "${startdir}/${install}" "${startdir}/${install}.pkg"
   true && install=${install}.pkg
@@ -273,10 +273,14 @@ _package() {
   echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE}/version"
 
   # Now we call depmod...
-  depmod -b "$pkgdir" -F System.map "$_kernver"
+  depmod -b "${pkgdir}" -F System.map "${_kernver}"
 
   # move module tree /lib -> /usr/lib
-  mv "$pkgdir/lib" "$pkgdir/usr"
+  mkdir -p "${pkgdir}/usr"
+  mv "${pkgdir}/lib" "${pkgdir}/usr/"
+
+  # add vmlinux
+  install -D -m644 vmlinux "${pkgdir}/usr/lib/modules/${_kernver}/build/vmlinux" 
 }
 
 _package-headers() {
@@ -296,130 +300,127 @@ _package-headers() {
 
   install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}"
 
-  cd "${pkgdir}/usr/lib/modules/${_kernver}"
-  ln -sf ../../../src/linux-${_kernver} build
-
   cd "${srcdir}/linux-${_basekernel}"
   install -D -m644 Makefile \
-    "${pkgdir}/usr/src/linux-${_kernver}/Makefile"
+    "${pkgdir}/usr/lib/modules/${_kernver}/build/Makefile"
   install -D -m644 kernel/Makefile \
-    "${pkgdir}/usr/src/linux-${_kernver}/kernel/Makefile"
+    "${pkgdir}/usr/lib/modules/${_kernver}/build/kernel/Makefile"
   install -D -m644 .config \
-    "${pkgdir}/usr/src/linux-${_kernver}/.config"
+    "${pkgdir}/usr/lib/modules/${_kernver}/build/.config"
 
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include"
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/include"
 
   for i in acpi asm-generic config crypto drm generated keys linux math-emu \
     media net pcmcia scsi sound trace uapi video xen; do
-    cp -a include/${i} "${pkgdir}/usr/src/linux-${_kernver}/include/"
+    cp -a include/${i} "${pkgdir}/usr/lib/modules/${_kernver}/build/include/"
   done
 
   # copy arch includes for external modules
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}"
-  cp -a "arch/${KARCH}/include" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}"
+  cp -a arch/${KARCH}/include "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/"
 
   # copy files necessary for later builds
-  cp Module.symvers "${pkgdir}/usr/src/linux-${_kernver}"
-  cp -a scripts "${pkgdir}/usr/src/linux-${_kernver}"
+  cp Module.symvers "${pkgdir}/usr/lib/modules/${_kernver}/build"
+  cp -a scripts "${pkgdir}/usr/lib/modules/${_kernver}/build"
 
   if [ "$CARCH" = "mips64el" ]; then
-    cp "arch/${KARCH}/Kbuild" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
-    cp -a "arch/${KARCH}/loongson" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
-    cp "${srcdir}/Kbuild.platforms" "${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/"
+    cp arch/${KARCH}/Kbuild "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/"
+    cp -a arch/${KARCH}/loongson "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/"
+    cp ${srcdir}/Kbuild.platforms "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/"
   fi
 
   # fix permissions on scripts dir
-  chmod og-w -R "${pkgdir}/usr/src/linux-${_kernver}/scripts"
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/.tmp_versions"
+  chmod og-w -R "${pkgdir}/usr/lib/modules/${_kernver}/build/scripts"
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/.tmp_versions"
 
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel"
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/kernel"
 
-  cp arch/${KARCH}/Makefile "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
+  cp arch/${KARCH}/Makefile "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/"
 
   if [ "${CARCH}" = "i686" ]; then
-    cp arch/${KARCH}/Makefile_32.cpu "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
+    cp arch/${KARCH}/Makefile_32.cpu "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/"
   fi
 
-  cp arch/${KARCH}/kernel/asm-offsets.s "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel/"
+  cp arch/${KARCH}/kernel/asm-offsets.s "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/kernel/"
 
   # add headers for lirc package
   # pci
   for i in bt8xx cx88 saa7134; do
-    mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/pci/${i}"
-    cp -a drivers/media/pci/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/pci/${i}"
+    mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/pci/${i}"
+    cp -a drivers/media/pci/${i}/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/pci/${i}"
   done
   # usb
   for i in cpia2 em28xx pwc sn9c102; do
-    mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/${i}"
-    cp -a drivers/media/usb/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/${i}"
+    mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/usb/${i}"
+    cp -a drivers/media/usb/${i}/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/usb/${i}"
   done
   # i2c
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c"
-  cp drivers/media/i2c/*.h  "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/"
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/i2c"
+  cp drivers/media/i2c/*.h  "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/i2c/"
   for i in cx25840; do
-    mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/${i}"
-    cp -a drivers/media/i2c/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/${i}"
+    mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/i2c/${i}"
+    cp -a drivers/media/i2c/${i}/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/i2c/${i}"
   done
 
   # add docbook makefile
   install -D -m644 Documentation/DocBook/Makefile \
-    "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile"
+    "${pkgdir}/usr/lib/modules/${_kernver}/build/Documentation/DocBook/Makefile"
 
   # add dm headers
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/md"
-  cp drivers/md/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/md"
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/md"
+  cp drivers/md/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/md"
 
   # add inotify.h
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/linux"
-  cp include/linux/inotify.h "${pkgdir}/usr/src/linux-${_kernver}/include/linux/"
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/include/linux"
+  cp include/linux/inotify.h "${pkgdir}/usr/lib/modules/${_kernver}/build/include/linux/"
 
   # add wireless headers
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/"
-  cp net/mac80211/*.h "${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/"
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/net/mac80211/"
+  cp net/mac80211/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/net/mac80211/"
 
   # add dvb headers for external modules
   # in reference to:
   # http://bugs.archlinux.org/task/9912
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-core"
-  cp drivers/media/dvb-core/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-core/"
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-core"
+  cp drivers/media/dvb-core/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-core/"
   # and...
   # http://bugs.archlinux.org/task/11194
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/"
-  cp include/config/dvb/*.h "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/"
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/include/config/dvb/"
+  cp include/config/dvb/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/include/config/dvb/"
 
   # add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
   # in reference to:
   # http://bugs.archlinux.org/task/13146
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends/"
-  cp drivers/media/dvb-frontends/lgdt330x.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends/"
-  cp drivers/media/i2c/msp3400-driver.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/"
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-frontends/"
+  cp drivers/media/dvb-frontends/lgdt330x.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-frontends/"
+  cp drivers/media/i2c/msp3400-driver.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/i2c/"
 
   # add dvb headers
   # in reference to:
   # http://bugs.archlinux.org/task/20402
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/dvb-usb"
-  cp drivers/media/usb/dvb-usb/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/dvb-usb/"
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends"
-  cp drivers/media/dvb-frontends/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends/"
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/tuners"
-  cp drivers/media/tuners/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/tuners/"
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/usb/dvb-usb"
+  cp drivers/media/usb/dvb-usb/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/usb/dvb-usb/"
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-frontends"
+  cp drivers/media/dvb-frontends/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-frontends/"
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/tuners"
+  cp drivers/media/tuners/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/tuners/"
 
   # add xfs and shmem for aufs building
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/fs/xfs"
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/mm"
-  cp fs/xfs/xfs_sb.h "${pkgdir}/usr/src/linux-${_kernver}/fs/xfs/xfs_sb.h"
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/fs/xfs"
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/mm"
+  cp fs/xfs/xfs_sb.h "${pkgdir}/usr/lib/modules/${_kernver}/build/fs/xfs/xfs_sb.h"
 
   # copy in Kconfig files
-  for i in `find . -name "Kconfig*"`; do
-    mkdir -p "${pkgdir}"/usr/src/linux-${_kernver}/`echo ${i} | sed 's|/Kconfig.*||'`
-    cp ${i} "${pkgdir}/usr/src/linux-${_kernver}/${i}"
+  for i in $(find . -name "Kconfig*"); do
+    mkdir -p "${pkgdir}"/usr/lib/modules/${_kernver}/build/`echo ${i} | sed 's|/Kconfig.*||'`
+    cp ${i} "${pkgdir}/usr/lib/modules/${_kernver}/build/${i}"
   done
 
-  chown -R root.root "${pkgdir}/usr/src/linux-${_kernver}"
-  find "${pkgdir}/usr/src/linux-${_kernver}" -type d -exec chmod 755 {} \;
+  chown -R root.root "${pkgdir}/usr/lib/modules/${_kernver}/build"
+  find "${pkgdir}/usr/lib/modules/${_kernver}/build" -type d -exec chmod 755 {} \;
 
   # strip scripts directory
-  find "${pkgdir}/usr/src/linux-${_kernver}/scripts" -type f -perm -u+w 2>/dev/null | while read binary ; do
+  find "${pkgdir}/usr/lib/modules/${_kernver}/build/scripts" -type f -perm -u+w 2>/dev/null | while read binary ; do
     case "$(file -bi "${binary}")" in
       *application/x-sharedlib*) # Libraries (.so)
         /usr/bin/strip ${STRIP_SHARED} "${binary}";;
@@ -431,11 +432,11 @@ _package-headers() {
   done
 
   # remove unneeded architectures
-  rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arc,arm,arm26,arm64,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,metag,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa}
+  rm -rf "${pkgdir}"/usr/lib/modules/${_kernver}/build/arch/{alpha,arc,arm,arm26,arm64,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,metag,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa}
   if [ "$CARCH" = "mips64el" ]; then
-    rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/x86
+    rm -rf ${pkgdir}/usr/lib/modules/${_kernver}/build/arch/x86
   else
-    rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/mips
+    rm -rf ${pkgdir}/usr/lib/modules/${_kernver}/build/arch/mips
   fi
 }
 
@@ -447,13 +448,13 @@ _package-docs() {
 
   cd "${srcdir}/linux-${_basekernel}"
 
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}"
-  cp -al Documentation "${pkgdir}/usr/src/linux-${_kernver}"
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build"
+  cp -al Documentation "${pkgdir}/usr/lib/modules/${_kernver}/build"
   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"
+  rm -f "${pkgdir}/usr/lib/modules/${_kernver}/build/Documentation/DocBook/Makefile"
 }
 
 pkgname=("${pkgbase}" "${pkgbase}-headers" "${pkgbase}-docs")
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index 94cc0e63b..af1c19109 100644
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.12.7-1 Kernel Configuration
+# Linux/x86 3.13.0 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -38,7 +38,6 @@ CONFIG_HAVE_INTEL_TXT=y
 CONFIG_X86_32_SMP=y
 CONFIG_X86_HT=y
 CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
-CONFIG_ARCH_CPU_PROBE_RELEASE=y
 CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 CONFIG_IRQ_WORK=y
@@ -75,7 +74,6 @@ CONFIG_AUDIT=y
 CONFIG_AUDITSYSCALL=y
 CONFIG_AUDIT_WATCH=y
 CONFIG_AUDIT_TREE=y
-CONFIG_AUDIT_LOGINUID_IMMUTABLE=y
 
 #
 # IRQ subsystem
@@ -159,7 +157,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_CHECKPOINT_RESTORE=y
 CONFIG_NAMESPACES=y
 CONFIG_UTS_NS=y
 CONFIG_IPC_NS=y
@@ -240,7 +238,6 @@ CONFIG_HAVE_KPROBES_ON_FTRACE=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_DMA_ATTRS=y
 CONFIG_HAVE_DMA_CONTIGUOUS=y
-CONFIG_USE_GENERIC_SMP_HELPERS=y
 CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_DMA_API_DEBUG=y
@@ -274,6 +271,7 @@ CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
+# CONFIG_SYSTEM_TRUSTED_KEYRING is not set
 CONFIG_MODULES=y
 CONFIG_MODULE_FORCE_LOAD=y
 CONFIG_MODULE_UNLOAD=y
@@ -469,6 +467,7 @@ CONFIG_FRONTSWAP=y
 # CONFIG_CMA is not set
 CONFIG_ZBUD=y
 CONFIG_ZSWAP=y
+CONFIG_MEM_SOFT_DIRTY=y
 # CONFIG_HIGHPTE is not set
 CONFIG_X86_CHECK_BIOS_CORRUPTION=y
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
@@ -526,13 +525,13 @@ CONFIG_PM_DEBUG=y
 CONFIG_PM_ADVANCED_DEBUG=y
 # CONFIG_PM_TEST_SUSPEND is not set
 CONFIG_PM_SLEEP_DEBUG=y
+# CONFIG_DPM_WATCHDOG is not set
 CONFIG_PM_TRACE=y
 CONFIG_PM_TRACE_RTC=y
 CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
 CONFIG_ACPI=y
 CONFIG_ACPI_SLEEP=y
 # CONFIG_ACPI_PROCFS is not set
-# CONFIG_ACPI_PROCFS_POWER is not set
 CONFIG_ACPI_EC_DEBUGFS=m
 CONFIG_ACPI_AC=m
 CONFIG_ACPI_BATTERY=m
@@ -547,7 +546,6 @@ CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
 CONFIG_ACPI_THERMAL=m
 # CONFIG_ACPI_CUSTOM_DSDT is not set
 CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y
-CONFIG_ACPI_BLACKLIST_YEAR=0
 # CONFIG_ACPI_DEBUG is not set
 CONFIG_ACPI_PCI_SLOT=y
 CONFIG_X86_PM_TIMER=y
@@ -562,6 +560,7 @@ CONFIG_ACPI_APEI_PCIEAER=y
 CONFIG_ACPI_APEI_MEMORY_FAILURE=y
 CONFIG_ACPI_APEI_EINJ=m
 CONFIG_ACPI_APEI_ERST_DEBUG=m
+CONFIG_ACPI_EXTLOG=m
 CONFIG_SFI=y
 CONFIG_X86_APM_BOOT=y
 CONFIG_APM=y
@@ -575,7 +574,6 @@ CONFIG_APM_DO_ENABLE=y
 # CPU Frequency scaling
 #
 CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_TABLE=y
 CONFIG_CPU_FREQ_GOV_COMMON=y
 CONFIG_CPU_FREQ_STAT=m
 CONFIG_CPU_FREQ_STAT_DETAILS=y
@@ -676,7 +674,7 @@ CONFIG_OLPC_XO1_PM=y
 CONFIG_OLPC_XO1_RTC=y
 CONFIG_OLPC_XO1_SCI=y
 CONFIG_OLPC_XO15_SCI=y
-# CONFIG_ALIX is not set
+CONFIG_ALIX=y
 # CONFIG_NET5501 is not set
 # CONFIG_GEOS is not set
 CONFIG_AMD_NB=y
@@ -807,7 +805,6 @@ CONFIG_DEFAULT_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
-CONFIG_IPV6_PRIVACY=y
 CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_IPV6_ROUTE_INFO=y
 CONFIG_IPV6_OPTIMISTIC_DAD=y
@@ -821,6 +818,7 @@ CONFIG_INET6_XFRM_MODE_TRANSPORT=m
 CONFIG_INET6_XFRM_MODE_TUNNEL=m
 CONFIG_INET6_XFRM_MODE_BEET=m
 CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
+CONFIG_IPV6_VTI=m
 CONFIG_IPV6_SIT=m
 CONFIG_IPV6_SIT_6RD=y
 CONFIG_IPV6_NDISC_NODETYPE=y
@@ -883,6 +881,17 @@ CONFIG_NF_NAT_IRC=m
 CONFIG_NF_NAT_SIP=m
 CONFIG_NF_NAT_TFTP=m
 CONFIG_NETFILTER_SYNPROXY=m
+CONFIG_NF_TABLES=m
+CONFIG_NFT_EXTHDR=m
+CONFIG_NFT_META=m
+CONFIG_NFT_CT=m
+CONFIG_NFT_RBTREE=m
+CONFIG_NFT_HASH=m
+CONFIG_NFT_COUNTER=m
+CONFIG_NFT_LOG=m
+CONFIG_NFT_LIMIT=m
+CONFIG_NFT_NAT=m
+CONFIG_NFT_COMPAT=m
 CONFIG_NETFILTER_XTABLES=m
 
 #
@@ -976,7 +985,9 @@ CONFIG_IP_SET_HASH_IP=m
 CONFIG_IP_SET_HASH_IPPORT=m
 CONFIG_IP_SET_HASH_IPPORTIP=m
 CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_NETPORTNET=m
 CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETNET=m
 CONFIG_IP_SET_HASH_NETPORT=m
 CONFIG_IP_SET_HASH_NETIFACE=m
 CONFIG_IP_SET_LIST_SET=m
@@ -1027,6 +1038,11 @@ CONFIG_IP_VS_PE_SIP=m
 CONFIG_NF_DEFRAG_IPV4=m
 CONFIG_NF_CONNTRACK_IPV4=m
 # CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
+CONFIG_NF_TABLES_IPV4=m
+CONFIG_NFT_REJECT_IPV4=m
+CONFIG_NFT_CHAIN_ROUTE_IPV4=m
+CONFIG_NFT_CHAIN_NAT_IPV4=m
+CONFIG_NF_TABLES_ARP=m
 CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
@@ -1059,6 +1075,9 @@ CONFIG_IP_NF_ARP_MANGLE=m
 #
 CONFIG_NF_DEFRAG_IPV6=m
 CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_NF_TABLES_IPV6=m
+CONFIG_NFT_CHAIN_ROUTE_IPV6=m
+CONFIG_NFT_CHAIN_NAT_IPV6=m
 CONFIG_IP6_NF_IPTABLES=m
 CONFIG_IP6_NF_MATCH_AH=m
 CONFIG_IP6_NF_MATCH_EUI64=m
@@ -1079,6 +1098,7 @@ CONFIG_IP6_NF_SECURITY=m
 CONFIG_NF_NAT_IPV6=m
 CONFIG_IP6_NF_TARGET_MASQUERADE=m
 CONFIG_IP6_NF_TARGET_NPT=m
+CONFIG_NF_TABLES_BRIDGE=m
 CONFIG_BRIDGE_NF_EBTABLES=m
 CONFIG_BRIDGE_EBT_BROUTE=m
 CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -1215,6 +1235,7 @@ CONFIG_NET_CLS_RSVP=m
 CONFIG_NET_CLS_RSVP6=m
 CONFIG_NET_CLS_FLOW=m
 CONFIG_NET_CLS_CGROUP=y
+CONFIG_NET_CLS_BPF=m
 # CONFIG_NET_EMATCH is not set
 CONFIG_NET_CLS_ACT=y
 CONFIG_NET_ACT_POLICE=m
@@ -1244,6 +1265,7 @@ CONFIG_VMWARE_VMCI_VSOCKETS=m
 CONFIG_NETLINK_MMAP=y
 CONFIG_NETLINK_DIAG=m
 CONFIG_NET_MPLS_GSO=m
+CONFIG_HSR=m
 CONFIG_RPS=y
 CONFIG_RFS_ACCEL=y
 CONFIG_XPS=y
@@ -1411,6 +1433,7 @@ CONFIG_WIMAX_DEBUG_LEVEL=8
 CONFIG_RFKILL=m
 CONFIG_RFKILL_LEDS=y
 CONFIG_RFKILL_INPUT=y
+CONFIG_RFKILL_GPIO=m
 CONFIG_NET_9P=m
 CONFIG_NET_9P_VIRTIO=m
 # CONFIG_NET_9P_DEBUG is not set
@@ -1422,6 +1445,7 @@ 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_DIGITAL=m
 CONFIG_NFC_NCI=m
 # CONFIG_NFC_NCI_SPI is not set
 CONFIG_NFC_HCI=m
@@ -1434,6 +1458,7 @@ CONFIG_NFC_PN533=m
 CONFIG_NFC_WILINK=m
 CONFIG_NFC_MEI_PHY=m
 CONFIG_NFC_SIM=m
+CONFIG_NFC_PORT100=m
 CONFIG_NFC_PN544=m
 CONFIG_NFC_PN544_MEI=m
 CONFIG_NFC_MICROREAD=m
@@ -1596,6 +1621,7 @@ CONFIG_OF_PCI=y
 CONFIG_OF_PCI_IRQ=y
 CONFIG_OF_MTD=y
 CONFIG_PARPORT=m
+CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
 CONFIG_PARPORT_PC=m
 CONFIG_PARPORT_SERIAL=m
 # CONFIG_PARPORT_PC_FIFO is not set
@@ -1615,10 +1641,10 @@ CONFIG_ISAPNP=y
 # CONFIG_PNPBIOS is not set
 CONFIG_PNPACPI=y
 CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_NULL_BLK is not set
 CONFIG_BLK_DEV_FD=m
 # CONFIG_PARIDE is not set
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
-CONFIG_BLK_CPQ_DA=m
 CONFIG_BLK_CPQ_CISS_DA=m
 # CONFIG_CISS_SCSI_TAPE is not set
 CONFIG_BLK_DEV_DAC960=m
@@ -1713,6 +1739,14 @@ CONFIG_ALTERA_STAPL=m
 CONFIG_INTEL_MEI=m
 CONFIG_INTEL_MEI_ME=m
 CONFIG_VMWARE_VMCI=m
+
+#
+# Intel MIC Host Driver
+#
+
+#
+# Intel MIC Card Driver
+#
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
 
@@ -2004,7 +2038,6 @@ CONFIG_MD_MULTIPATH=m
 CONFIG_MD_FAULTY=m
 CONFIG_BCACHE=m
 # CONFIG_BCACHE_DEBUG is not set
-# CONFIG_BCACHE_EDEBUG is not set
 # CONFIG_BCACHE_CLOSURES_DEBUG is not set
 CONFIG_BLK_DEV_DM=m
 # CONFIG_DM_DEBUG is not set
@@ -2019,8 +2052,8 @@ CONFIG_DM_CACHE=m
 CONFIG_DM_CACHE_MQ=m
 CONFIG_DM_CACHE_CLEANER=m
 CONFIG_DM_MIRROR=m
-CONFIG_DM_RAID=m
 CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_RAID=m
 CONFIG_DM_ZERO=m
 CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_QL=m
@@ -2415,6 +2448,7 @@ CONFIG_USB_NET_AX88179_178A=m
 CONFIG_USB_NET_CDCETHER=m
 CONFIG_USB_NET_CDC_EEM=m
 CONFIG_USB_NET_CDC_NCM=m
+CONFIG_USB_NET_HUAWEI_CDC_NCM=m
 CONFIG_USB_NET_CDC_MBIM=m
 CONFIG_USB_NET_DM9601=m
 CONFIG_USB_NET_SR9700=m
@@ -2499,6 +2533,8 @@ CONFIG_ATH10K_PCI=m
 # CONFIG_ATH10K_DEBUG is not set
 CONFIG_ATH10K_DEBUGFS=y
 # CONFIG_ATH10K_TRACING is not set
+CONFIG_WCN36XX=m
+# CONFIG_WCN36XX_DEBUGFS is not set
 CONFIG_B43=m
 CONFIG_B43_BCMA=y
 CONFIG_B43_SSB=y
@@ -2599,6 +2635,7 @@ CONFIG_RT2800USB_RT53XX=y
 CONFIG_RT2800USB_RT55XX=y
 CONFIG_RT2800USB_UNKNOWN=y
 CONFIG_RT2800_LIB=m
+CONFIG_RT2800_LIB_MMIO=m
 CONFIG_RT2X00_LIB_MMIO=m
 CONFIG_RT2X00_LIB_PCI=m
 CONFIG_RT2X00_LIB_USB=m
@@ -2812,7 +2849,7 @@ CONFIG_INPUT_MATRIXKMAP=m
 #
 # Userland interfaces
 #
-CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV=m
 CONFIG_INPUT_MOUSEDEV_PSAUX=y
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
@@ -2826,7 +2863,7 @@ CONFIG_INPUT_EVDEV=m
 CONFIG_INPUT_KEYBOARD=y
 CONFIG_KEYBOARD_ADP5588=m
 CONFIG_KEYBOARD_ADP5589=m
-CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_ATKBD=m
 CONFIG_KEYBOARD_QT1070=m
 CONFIG_KEYBOARD_QT2160=m
 # CONFIG_KEYBOARD_LKKBD is not set
@@ -2857,7 +2894,7 @@ CONFIG_MOUSE_PS2_ELANTECH=y
 CONFIG_MOUSE_PS2_SENTELIC=y
 # CONFIG_MOUSE_PS2_TOUCHKIT is not set
 CONFIG_MOUSE_PS2_OLPC=y
-CONFIG_MOUSE_SERIAL=y
+CONFIG_MOUSE_SERIAL=m
 CONFIG_MOUSE_APPLETOUCH=m
 CONFIG_MOUSE_BCM5974=m
 CONFIG_MOUSE_CYAPA=m
@@ -2976,7 +3013,9 @@ CONFIG_TOUCHSCREEN_TSC_SERIO=m
 # CONFIG_TOUCHSCREEN_TSC2005 is not set
 CONFIG_TOUCHSCREEN_TSC2007=m
 CONFIG_TOUCHSCREEN_ST1232=m
+CONFIG_TOUCHSCREEN_SUR40=m
 CONFIG_TOUCHSCREEN_TPS6507X=m
+CONFIG_TOUCHSCREEN_ZFORCE=m
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_AD714X=m
 CONFIG_INPUT_AD714X_I2C=m
@@ -3002,7 +3041,6 @@ CONFIG_INPUT_RETU_PWRBUTTON=m
 CONFIG_INPUT_UINPUT=m
 CONFIG_INPUT_PCF50633_PMU=m
 CONFIG_INPUT_PCF8574=m
-# CONFIG_INPUT_PWM_BEEPER is not set
 CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
 CONFIG_INPUT_ADXL34X=m
 CONFIG_INPUT_ADXL34X_I2C=m
@@ -3015,19 +3053,20 @@ CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
 #
 # Hardware I/O ports
 #
-CONFIG_SERIO=y
-CONFIG_SERIO_I8042=y
+CONFIG_SERIO=m
+CONFIG_SERIO_I8042=m
 CONFIG_SERIO_SERPORT=m
 CONFIG_SERIO_CT82C710=m
 CONFIG_SERIO_PARKBD=m
 CONFIG_SERIO_PCIPS2=m
-CONFIG_SERIO_LIBPS2=y
+CONFIG_SERIO_LIBPS2=m
 CONFIG_SERIO_RAW=m
 CONFIG_SERIO_ALTERA_PS2=m
 CONFIG_SERIO_PS2MULT=m
 CONFIG_SERIO_ARC_PS2=m
 CONFIG_SERIO_APBPS2=m
 CONFIG_SERIO_OLPC_APSP=m
+CONFIG_HYPERV_KEYBOARD=m
 CONFIG_GAMEPORT=m
 CONFIG_GAMEPORT_NS558=m
 CONFIG_GAMEPORT_L4=m
@@ -3104,7 +3143,6 @@ CONFIG_SERIAL_ARC_NR_PORTS=1
 CONFIG_SERIAL_RP2=m
 CONFIG_SERIAL_RP2_NR_UARTS=32
 CONFIG_SERIAL_FSL_LPUART=m
-CONFIG_SERIAL_ST_ASC=m
 CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
 CONFIG_PPDEV=m
@@ -3143,10 +3181,13 @@ CONFIG_NSC_GPIO=m
 # CONFIG_RAW_DRIVER is not set
 CONFIG_HPET=y
 CONFIG_HPET_MMAP=y
+CONFIG_HPET_MMAP_DEFAULT=y
 CONFIG_HANGCHECK_TIMER=m
 CONFIG_TCG_TPM=m
 CONFIG_TCG_TIS=m
+CONFIG_TCG_TIS_I2C_ATMEL=m
 CONFIG_TCG_TIS_I2C_INFINEON=m
+CONFIG_TCG_TIS_I2C_NUVOTON=m
 CONFIG_TCG_NSC=m
 CONFIG_TCG_ATMEL=m
 CONFIG_TCG_INFINEON=m
@@ -3248,7 +3289,6 @@ CONFIG_SPI_MASTER=y
 # CONFIG_SPI_GPIO is not set
 # CONFIG_SPI_LM70_LLP is not set
 # CONFIG_SPI_FSL_SPI is not set
-# CONFIG_SPI_FSL_DSPI is not set
 # CONFIG_SPI_OC_TINY is not set
 # CONFIG_SPI_PXA2XX is not set
 # CONFIG_SPI_PXA2XX_PCI is not set
@@ -3290,8 +3330,8 @@ CONFIG_PTP_1588_CLOCK=m
 CONFIG_DP83640_PHY=m
 CONFIG_PTP_1588_CLOCK_PCH=m
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
-CONFIG_GPIO_DEVRES=y
 CONFIG_GPIOLIB=y
+CONFIG_GPIO_DEVRES=y
 CONFIG_OF_GPIO=y
 CONFIG_GPIO_ACPI=y
 # CONFIG_DEBUG_GPIO is not set
@@ -3326,7 +3366,7 @@ CONFIG_GPIO_ARIZONA=m
 #
 CONFIG_GPIO_CS5535=y
 CONFIG_GPIO_AMD8111=m
-# CONFIG_GPIO_LANGWELL is not set
+# CONFIG_GPIO_INTEL_MID is not set
 # CONFIG_GPIO_PCH is not set
 # CONFIG_GPIO_ML_IOH is not set
 # CONFIG_GPIO_SODAVILLE is not set
@@ -3343,7 +3383,7 @@ CONFIG_GPIO_AMD8111=m
 #
 # AC97 GPIO expanders:
 #
-CONFIG_GPIO_UCB1400=y
+CONFIG_GPIO_UCB1400=m
 
 #
 # LPC GPIO expanders:
@@ -3352,6 +3392,7 @@ CONFIG_GPIO_UCB1400=y
 #
 # MODULbus GPIO expanders:
 #
+# CONFIG_GPIO_BCM_KONA is not set
 
 #
 # USB GPIO expanders:
@@ -3377,6 +3418,7 @@ CONFIG_BATTERY_OLPC=m
 # CONFIG_CHARGER_GPIO is not set
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_BQ24190 is not set
+CONFIG_CHARGER_BQ24735=m
 # CONFIG_CHARGER_SMB347 is not set
 CONFIG_POWER_RESET=y
 CONFIG_POWER_RESET_GPIO=y
@@ -4108,7 +4150,7 @@ CONFIG_VIDEO_UPD64031A=m
 CONFIG_VIDEO_UPD64083=m
 
 #
-# Miscelaneous helper chips
+# Miscellaneous helper chips
 #
 CONFIG_VIDEO_M52790=m
 
@@ -4184,6 +4226,7 @@ CONFIG_DVB_TUNER_CX24113=m
 CONFIG_DVB_TDA826X=m
 CONFIG_DVB_TUA6100=m
 CONFIG_DVB_CX24116=m
+CONFIG_DVB_CX24117=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_TS2020=m
 CONFIG_DVB_DS3000=m
@@ -4295,6 +4338,7 @@ CONFIG_VGA_SWITCHEROO=y
 CONFIG_DRM=m
 CONFIG_DRM_USB=m
 CONFIG_DRM_KMS_HELPER=m
+CONFIG_DRM_KMS_FB_HELPER=y
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM_TTM=m
 
@@ -4314,6 +4358,7 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_I915=m
 CONFIG_DRM_I915_KMS=y
+CONFIG_DRM_I915_FBDEV=y
 # CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
 CONFIG_DRM_MGA=m
 CONFIG_DRM_SIS=m
@@ -4432,7 +4477,7 @@ CONFIG_BACKLIGHT_APPLE=m
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
 CONFIG_BACKLIGHT_PCF50633=m
-# CONFIG_BACKLIGHT_LM3630 is not set
+CONFIG_BACKLIGHT_LM3630A=m
 # CONFIG_BACKLIGHT_LM3639 is not set
 # CONFIG_BACKLIGHT_LP855X is not set
 # CONFIG_BACKLIGHT_OT200 is not set
@@ -4651,6 +4696,7 @@ CONFIG_SND_USB_6FIRE=m
 CONFIG_SND_USB_HIFACE=m
 CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWIRE_LIB=m
+CONFIG_SND_DICE=m
 CONFIG_SND_FIREWIRE_SPEAKERS=m
 CONFIG_SND_ISIGHT=m
 CONFIG_SND_SCS1X=m
@@ -4728,6 +4774,7 @@ CONFIG_HID_ROCCAT=m
 CONFIG_HID_SAITEK=m
 CONFIG_HID_SAMSUNG=m
 CONFIG_HID_SONY=m
+CONFIG_SONY_FF=y
 CONFIG_HID_SPEEDLINK=m
 CONFIG_HID_STEELSERIES=m
 CONFIG_HID_SUNPLUS=m
@@ -4960,7 +5007,6 @@ CONFIG_USB_XUSBATM=m
 #
 CONFIG_USB_PHY=y
 CONFIG_NOP_USB_XCEIV=m
-# CONFIG_AM335X_PHY_USB is not set
 CONFIG_SAMSUNG_USBPHY=m
 CONFIG_SAMSUNG_USB2PHY=m
 CONFIG_SAMSUNG_USB3PHY=m
@@ -5003,6 +5049,7 @@ CONFIG_USB_F_NCM=m
 CONFIG_USB_F_ECM=m
 CONFIG_USB_F_SUBSET=m
 CONFIG_USB_F_RNDIS=m
+CONFIG_USB_F_MASS_STORAGE=m
 # CONFIG_USB_CONFIGFS is not set
 # CONFIG_USB_ZERO is not set
 CONFIG_USB_AUDIO=m
@@ -5102,6 +5149,7 @@ CONFIG_LEDS_LP5562=m
 CONFIG_LEDS_CLEVO_MAIL=m
 CONFIG_LEDS_PCA955X=m
 # CONFIG_LEDS_PCA963X is not set
+CONFIG_LEDS_PCA9685=m
 # CONFIG_LEDS_DAC124S085 is not set
 # CONFIG_LEDS_PWM is not set
 CONFIG_LEDS_BD2802=m
@@ -5263,6 +5311,7 @@ CONFIG_DMA_OF=y
 #
 CONFIG_ASYNC_TX_DMA=y
 # CONFIG_DMATEST is not set
+CONFIG_DMA_ENGINE_RAID=y
 CONFIG_DCA=m
 CONFIG_AUXDISPLAY=y
 CONFIG_KS0108=m
@@ -5563,7 +5612,6 @@ CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 CONFIG_ACERHDF=m
 CONFIG_ASUS_LAPTOP=m
-CONFIG_CHROMEOS_LAPTOP=m
 CONFIG_DELL_LAPTOP=m
 CONFIG_DELL_WMI=m
 CONFIG_DELL_WMI_AIO=m
@@ -5611,6 +5659,8 @@ CONFIG_APPLE_GMUX=m
 CONFIG_INTEL_RST=y
 CONFIG_INTEL_SMARTCONNECT=y
 CONFIG_PVPANIC=m
+CONFIG_CHROME_PLATFORMS=y
+CONFIG_CHROMEOS_LAPTOP=m
 
 #
 # Hardware Spinlock drivers
@@ -5664,6 +5714,15 @@ CONFIG_FMC_WRITE_EEPROM=m
 CONFIG_FMC_CHARDEV=m
 
 #
+# PHY Subsystem
+#
+CONFIG_GENERIC_PHY=m
+CONFIG_PHY_EXYNOS_MIPI_VIDEO=m
+CONFIG_PHY_EXYNOS_DP_VIDEO=m
+CONFIG_POWERCAP=y
+CONFIG_INTEL_RAPL=m
+
+#
 # Firmware Drivers
 #
 CONFIG_EDD=m
@@ -5681,6 +5740,7 @@ CONFIG_ISCSI_IBFT=m
 # EFI (Extensible Firmware Interface) Support
 #
 # CONFIG_EFI_VARS is not set
+CONFIG_UEFI_CPER=y
 
 #
 # File systems
@@ -5826,6 +5886,11 @@ CONFIG_UBIFS_FS_ZLIB=y
 CONFIG_LOGFS=m
 CONFIG_CRAMFS=m
 CONFIG_SQUASHFS=m
+# CONFIG_SQUASHFS_FILE_CACHE is not set
+CONFIG_SQUASHFS_FILE_DIRECT=y
+# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
+# CONFIG_SQUASHFS_DECOMP_MULTI is not set
+CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
 CONFIG_SQUASHFS_XATTR=y
 CONFIG_SQUASHFS_ZLIB=y
 CONFIG_SQUASHFS_LZO=y
@@ -5855,6 +5920,7 @@ CONFIG_F2FS_STAT_FS=y
 CONFIG_F2FS_FS_XATTR=y
 CONFIG_F2FS_FS_POSIX_ACL=y
 CONFIG_F2FS_FS_SECURITY=y
+CONFIG_F2FS_CHECK_FS=y
 CONFIG_EFIVAR_FS=y
 CONFIG_ORE=m
 CONFIG_NETWORK_FILESYSTEMS=y
@@ -5870,6 +5936,7 @@ CONFIG_PNFS_FILE_LAYOUT=m
 CONFIG_PNFS_BLOCK=m
 CONFIG_PNFS_OBJLAYOUT=m
 CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org"
+CONFIG_NFS_V4_1_MIGRATION=y
 CONFIG_NFS_V4_SECURITY_LABEL=y
 CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
@@ -6007,6 +6074,7 @@ CONFIG_ARCH_WANT_FRAME_POINTERS=y
 CONFIG_FRAME_POINTER=y
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 CONFIG_MAGIC_SYSRQ=y
+CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x0
 CONFIG_DEBUG_KERNEL=y
 
 #
@@ -6143,6 +6211,7 @@ CONFIG_LKDTM=m
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_RBTREE_TEST is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
+CONFIG_PERCPU_TEST=m
 # CONFIG_ATOMIC64_SELFTEST is not set
 CONFIG_ASYNC_RAID6_TEST=m
 # CONFIG_TEST_STRING_HELPERS is not set
@@ -6157,6 +6226,7 @@ CONFIG_STRICT_DEVMEM=y
 CONFIG_X86_VERBOSE_BOOTUP=y
 CONFIG_EARLY_PRINTK=y
 # CONFIG_EARLY_PRINTK_DBGP is not set
+CONFIG_EARLY_PRINTK_EFI=y
 # CONFIG_X86_PTDUMP is not set
 CONFIG_DEBUG_RODATA=y
 # CONFIG_DEBUG_RODATA_TEST is not set
@@ -6186,6 +6256,8 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
 # Security options
 #
 CONFIG_KEYS=y
+CONFIG_PERSISTENT_KEYRINGS=y
+CONFIG_BIG_KEYS=y
 CONFIG_TRUSTED_KEYS=m
 CONFIG_ENCRYPTED_KEYS=m
 # CONFIG_KEYS_DEBUG_PROC_KEYS is not set
@@ -6196,8 +6268,16 @@ CONFIG_SECURITY_NETWORK=y
 # CONFIG_SECURITY_NETWORK_XFRM is not set
 CONFIG_SECURITY_PATH=y
 # CONFIG_INTEL_TXT is not set
-# CONFIG_SECURITY_SELINUX is not set
-# CONFIG_SECURITY_SMACK is not set
+CONFIG_LSM_MMAP_MIN_ADDR=65536
+CONFIG_SECURITY_SELINUX=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
+# CONFIG_SECURITY_SELINUX_DISABLE is not set
+CONFIG_SECURITY_SELINUX_DEVELOP=y
+CONFIG_SECURITY_SELINUX_AVC_STATS=y
+CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
+# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set
+CONFIG_SECURITY_SMACK=y
 CONFIG_SECURITY_TOMOYO=y
 CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
 CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
@@ -6210,6 +6290,8 @@ CONFIG_SECURITY_APPARMOR_HASH=y
 CONFIG_SECURITY_YAMA=y
 CONFIG_SECURITY_YAMA_STACKED=y
 # CONFIG_IMA is not set
+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
+# CONFIG_DEFAULT_SECURITY_SMACK is not set
 # CONFIG_DEFAULT_SECURITY_TOMOYO is not set
 # CONFIG_DEFAULT_SECURITY_APPARMOR is not set
 # CONFIG_DEFAULT_SECURITY_YAMA is not set
@@ -6249,7 +6331,7 @@ CONFIG_CRYPTO_WORKQUEUE=y
 CONFIG_CRYPTO_CRYPTD=m
 CONFIG_CRYPTO_AUTHENC=m
 CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_ABLK_HELPER_X86=m
+CONFIG_CRYPTO_ABLK_HELPER=m
 CONFIG_CRYPTO_GLUE_HELPER_X86=m
 
 #
@@ -6343,6 +6425,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_USER_API=m
 CONFIG_CRYPTO_USER_API_HASH=m
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_HASH_INFO=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
@@ -6363,6 +6446,7 @@ CONFIG_KVM_MMIO=y
 CONFIG_KVM_ASYNC_PF=y
 CONFIG_HAVE_KVM_MSI=y
 CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
+CONFIG_KVM_VFIO=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=m
 CONFIG_KVM_INTEL=m
@@ -6399,6 +6483,7 @@ CONFIG_CRC7=m
 CONFIG_LIBCRC32C=m
 CONFIG_CRC8=m
 CONFIG_AUDIT_GENERIC=y
+# CONFIG_RANDOM32_SELFTEST is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_LZO_COMPRESS=y
@@ -6432,6 +6517,7 @@ CONFIG_TEXTSEARCH_KMP=m
 CONFIG_TEXTSEARCH_BM=m
 CONFIG_TEXTSEARCH_FSM=m
 CONFIG_BTREE=y
+CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index 4cd9f61a0..a51c15a56 100644
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.12.7-1 Kernel Configuration
+# Linux/x86 3.13.0 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -39,7 +39,6 @@ CONFIG_HAVE_INTEL_TXT=y
 CONFIG_X86_64_SMP=y
 CONFIG_X86_HT=y
 CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
-CONFIG_ARCH_CPU_PROBE_RELEASE=y
 CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 CONFIG_IRQ_WORK=y
@@ -76,7 +75,6 @@ CONFIG_AUDIT=y
 CONFIG_AUDITSYSCALL=y
 CONFIG_AUDIT_WATCH=y
 CONFIG_AUDIT_TREE=y
-CONFIG_AUDIT_LOGINUID_IMMUTABLE=y
 
 #
 # IRQ subsystem
@@ -143,6 +141,7 @@ CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=19
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
+CONFIG_ARCH_SUPPORTS_INT128=y
 CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=y
 CONFIG_ARCH_USES_NUMA_PROT_NONE=y
 CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
@@ -247,7 +246,6 @@ CONFIG_HAVE_OPTPROBES=y
 CONFIG_HAVE_KPROBES_ON_FTRACE=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_DMA_ATTRS=y
-CONFIG_USE_GENERIC_SMP_HELPERS=y
 CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_DMA_API_DEBUG=y
@@ -267,10 +265,12 @@ CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 CONFIG_SECCOMP_FILTER=y
 CONFIG_HAVE_CONTEXT_TRACKING=y
+CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
 CONFIG_HAVE_ARCH_SOFT_DIRTY=y
 CONFIG_MODULES_USE_ELF_RELA=y
+CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y
 CONFIG_OLD_SIGSUSPEND3=y
 CONFIG_COMPAT_OLD_SIGACTION=y
 
@@ -282,6 +282,7 @@ CONFIG_COMPAT_OLD_SIGACTION=y
 CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
+# CONFIG_SYSTEM_TRUSTED_KEYRING is not set
 CONFIG_MODULES=y
 CONFIG_MODULE_FORCE_LOAD=y
 CONFIG_MODULE_UNLOAD=y
@@ -450,6 +451,7 @@ CONFIG_MEMORY_HOTPLUG_SPARSE=y
 CONFIG_MEMORY_HOTREMOVE=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
 CONFIG_BALLOON_COMPACTION=y
 CONFIG_COMPACTION=y
 CONFIG_MIGRATION=y
@@ -530,13 +532,13 @@ CONFIG_PM_DEBUG=y
 CONFIG_PM_ADVANCED_DEBUG=y
 # CONFIG_PM_TEST_SUSPEND is not set
 CONFIG_PM_SLEEP_DEBUG=y
+# CONFIG_DPM_WATCHDOG is not set
 CONFIG_PM_TRACE=y
 CONFIG_PM_TRACE_RTC=y
 # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
 CONFIG_ACPI=y
 CONFIG_ACPI_SLEEP=y
 # CONFIG_ACPI_PROCFS is not set
-# CONFIG_ACPI_PROCFS_POWER is not set
 CONFIG_ACPI_EC_DEBUGFS=m
 CONFIG_ACPI_AC=m
 CONFIG_ACPI_BATTERY=m
@@ -552,7 +554,6 @@ CONFIG_ACPI_THERMAL=m
 CONFIG_ACPI_NUMA=y
 # CONFIG_ACPI_CUSTOM_DSDT is not set
 CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y
-CONFIG_ACPI_BLACKLIST_YEAR=0
 # CONFIG_ACPI_DEBUG is not set
 CONFIG_ACPI_PCI_SLOT=y
 CONFIG_X86_PM_TIMER=y
@@ -568,13 +569,13 @@ CONFIG_ACPI_APEI_PCIEAER=y
 CONFIG_ACPI_APEI_MEMORY_FAILURE=y
 CONFIG_ACPI_APEI_EINJ=m
 CONFIG_ACPI_APEI_ERST_DEBUG=m
+CONFIG_ACPI_EXTLOG=m
 CONFIG_SFI=y
 
 #
 # CPU Frequency scaling
 #
 CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_TABLE=y
 CONFIG_CPU_FREQ_GOV_COMMON=y
 CONFIG_CPU_FREQ_STAT=m
 CONFIG_CPU_FREQ_STAT_DETAILS=y
@@ -787,7 +788,6 @@ CONFIG_DEFAULT_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
-CONFIG_IPV6_PRIVACY=y
 CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_IPV6_ROUTE_INFO=y
 CONFIG_IPV6_OPTIMISTIC_DAD=y
@@ -801,6 +801,7 @@ CONFIG_INET6_XFRM_MODE_TRANSPORT=m
 CONFIG_INET6_XFRM_MODE_TUNNEL=m
 CONFIG_INET6_XFRM_MODE_BEET=m
 CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
+CONFIG_IPV6_VTI=m
 CONFIG_IPV6_SIT=m
 CONFIG_IPV6_SIT_6RD=y
 CONFIG_IPV6_NDISC_NODETYPE=y
@@ -863,6 +864,17 @@ CONFIG_NF_NAT_IRC=m
 CONFIG_NF_NAT_SIP=m
 CONFIG_NF_NAT_TFTP=m
 CONFIG_NETFILTER_SYNPROXY=m
+CONFIG_NF_TABLES=m
+CONFIG_NFT_EXTHDR=m
+CONFIG_NFT_META=m
+CONFIG_NFT_CT=m
+CONFIG_NFT_RBTREE=m
+CONFIG_NFT_HASH=m
+CONFIG_NFT_COUNTER=m
+CONFIG_NFT_LOG=m
+CONFIG_NFT_LIMIT=m
+CONFIG_NFT_NAT=m
+CONFIG_NFT_COMPAT=m
 CONFIG_NETFILTER_XTABLES=m
 
 #
@@ -956,7 +968,9 @@ CONFIG_IP_SET_HASH_IP=m
 CONFIG_IP_SET_HASH_IPPORT=m
 CONFIG_IP_SET_HASH_IPPORTIP=m
 CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_NETPORTNET=m
 CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETNET=m
 CONFIG_IP_SET_HASH_NETPORT=m
 CONFIG_IP_SET_HASH_NETIFACE=m
 CONFIG_IP_SET_LIST_SET=m
@@ -1007,6 +1021,11 @@ CONFIG_IP_VS_PE_SIP=m
 CONFIG_NF_DEFRAG_IPV4=m
 CONFIG_NF_CONNTRACK_IPV4=m
 # CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
+CONFIG_NF_TABLES_IPV4=m
+CONFIG_NFT_REJECT_IPV4=m
+CONFIG_NFT_CHAIN_ROUTE_IPV4=m
+CONFIG_NFT_CHAIN_NAT_IPV4=m
+CONFIG_NF_TABLES_ARP=m
 CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
@@ -1039,6 +1058,9 @@ CONFIG_IP_NF_ARP_MANGLE=m
 #
 CONFIG_NF_DEFRAG_IPV6=m
 CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_NF_TABLES_IPV6=m
+CONFIG_NFT_CHAIN_ROUTE_IPV6=m
+CONFIG_NFT_CHAIN_NAT_IPV6=m
 CONFIG_IP6_NF_IPTABLES=m
 CONFIG_IP6_NF_MATCH_AH=m
 CONFIG_IP6_NF_MATCH_EUI64=m
@@ -1059,6 +1081,7 @@ CONFIG_IP6_NF_SECURITY=m
 CONFIG_NF_NAT_IPV6=m
 CONFIG_IP6_NF_TARGET_MASQUERADE=m
 CONFIG_IP6_NF_TARGET_NPT=m
+CONFIG_NF_TABLES_BRIDGE=m
 CONFIG_BRIDGE_NF_EBTABLES=m
 CONFIG_BRIDGE_EBT_BROUTE=m
 CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -1191,6 +1214,7 @@ CONFIG_NET_CLS_RSVP=m
 CONFIG_NET_CLS_RSVP6=m
 CONFIG_NET_CLS_FLOW=m
 CONFIG_NET_CLS_CGROUP=y
+CONFIG_NET_CLS_BPF=m
 # CONFIG_NET_EMATCH is not set
 CONFIG_NET_CLS_ACT=y
 CONFIG_NET_ACT_POLICE=m
@@ -1220,6 +1244,7 @@ CONFIG_VMWARE_VMCI_VSOCKETS=m
 CONFIG_NETLINK_MMAP=y
 CONFIG_NETLINK_DIAG=m
 CONFIG_NET_MPLS_GSO=m
+CONFIG_HSR=m
 CONFIG_RPS=y
 CONFIG_RFS_ACCEL=y
 CONFIG_XPS=y
@@ -1383,6 +1408,7 @@ CONFIG_WIMAX_DEBUG_LEVEL=8
 CONFIG_RFKILL=m
 CONFIG_RFKILL_LEDS=y
 CONFIG_RFKILL_INPUT=y
+CONFIG_RFKILL_GPIO=m
 CONFIG_NET_9P=m
 CONFIG_NET_9P_VIRTIO=m
 # CONFIG_NET_9P_DEBUG is not set
@@ -1394,6 +1420,7 @@ 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_DIGITAL=m
 CONFIG_NFC_NCI=m
 # CONFIG_NFC_NCI_SPI is not set
 CONFIG_NFC_HCI=m
@@ -1406,6 +1433,7 @@ CONFIG_NFC_PN533=m
 CONFIG_NFC_WILINK=m
 CONFIG_NFC_MEI_PHY=m
 CONFIG_NFC_SIM=m
+CONFIG_NFC_PORT100=m
 CONFIG_NFC_PN544=m
 CONFIG_NFC_PN544_MEI=m
 CONFIG_NFC_MICROREAD=m
@@ -1552,6 +1580,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
 # CONFIG_MTD_UBI_FASTMAP is not set
 # CONFIG_MTD_UBI_GLUEBI is not set
 CONFIG_PARPORT=m
+CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
 CONFIG_PARPORT_PC=m
 CONFIG_PARPORT_SERIAL=m
 # CONFIG_PARPORT_PC_FIFO is not set
@@ -1569,10 +1598,10 @@ CONFIG_PNP=y
 #
 CONFIG_PNPACPI=y
 CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_NULL_BLK is not set
 CONFIG_BLK_DEV_FD=m
 # CONFIG_PARIDE is not set
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
-CONFIG_BLK_CPQ_DA=m
 CONFIG_BLK_CPQ_CISS_DA=m
 # CONFIG_CISS_SCSI_TAPE is not set
 CONFIG_BLK_DEV_DAC960=m
@@ -1585,6 +1614,7 @@ 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_SKD=m
 CONFIG_BLK_DEV_OSD=m
 CONFIG_BLK_DEV_SX8=m
 CONFIG_BLK_DEV_RAM=m
@@ -1669,6 +1699,16 @@ CONFIG_ALTERA_STAPL=m
 CONFIG_INTEL_MEI=m
 CONFIG_INTEL_MEI_ME=m
 CONFIG_VMWARE_VMCI=m
+
+#
+# Intel MIC Host Driver
+#
+CONFIG_INTEL_MIC_HOST=m
+
+#
+# Intel MIC Card Driver
+#
+CONFIG_INTEL_MIC_CARD=m
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
 
@@ -1936,7 +1976,6 @@ CONFIG_MD_MULTIPATH=m
 CONFIG_MD_FAULTY=m
 CONFIG_BCACHE=m
 # CONFIG_BCACHE_DEBUG is not set
-# CONFIG_BCACHE_EDEBUG is not set
 # CONFIG_BCACHE_CLOSURES_DEBUG is not set
 CONFIG_BLK_DEV_DM=m
 # CONFIG_DM_DEBUG is not set
@@ -1951,8 +1990,8 @@ CONFIG_DM_CACHE=m
 CONFIG_DM_CACHE_MQ=m
 CONFIG_DM_CACHE_CLEANER=m
 CONFIG_DM_MIRROR=m
-CONFIG_DM_RAID=m
 CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_RAID=m
 CONFIG_DM_ZERO=m
 CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_QL=m
@@ -2333,6 +2372,7 @@ CONFIG_USB_NET_AX88179_178A=m
 CONFIG_USB_NET_CDCETHER=m
 CONFIG_USB_NET_CDC_EEM=m
 CONFIG_USB_NET_CDC_NCM=m
+CONFIG_USB_NET_HUAWEI_CDC_NCM=m
 CONFIG_USB_NET_CDC_MBIM=m
 CONFIG_USB_NET_DM9601=m
 CONFIG_USB_NET_SR9700=m
@@ -2417,6 +2457,8 @@ CONFIG_ATH10K_PCI=m
 # CONFIG_ATH10K_DEBUG is not set
 CONFIG_ATH10K_DEBUGFS=y
 # CONFIG_ATH10K_TRACING is not set
+CONFIG_WCN36XX=m
+# CONFIG_WCN36XX_DEBUGFS is not set
 CONFIG_B43=m
 CONFIG_B43_BCMA=y
 CONFIG_B43_SSB=y
@@ -2517,6 +2559,7 @@ CONFIG_RT2800USB_RT53XX=y
 CONFIG_RT2800USB_RT55XX=y
 CONFIG_RT2800USB_UNKNOWN=y
 CONFIG_RT2800_LIB=m
+CONFIG_RT2800_LIB_MMIO=m
 CONFIG_RT2X00_LIB_MMIO=m
 CONFIG_RT2X00_LIB_PCI=m
 CONFIG_RT2X00_LIB_USB=m
@@ -2716,7 +2759,7 @@ CONFIG_INPUT_MATRIXKMAP=m
 #
 # Userland interfaces
 #
-CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV=m
 CONFIG_INPUT_MOUSEDEV_PSAUX=y
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
@@ -2730,7 +2773,7 @@ CONFIG_INPUT_EVDEV=m
 CONFIG_INPUT_KEYBOARD=y
 CONFIG_KEYBOARD_ADP5588=m
 CONFIG_KEYBOARD_ADP5589=m
-CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_ATKBD=m
 CONFIG_KEYBOARD_QT1070=m
 CONFIG_KEYBOARD_QT2160=m
 # CONFIG_KEYBOARD_LKKBD is not set
@@ -2759,8 +2802,8 @@ CONFIG_MOUSE_PS2_LIFEBOOK=y
 CONFIG_MOUSE_PS2_TRACKPOINT=y
 CONFIG_MOUSE_PS2_ELANTECH=y
 CONFIG_MOUSE_PS2_SENTELIC=y
-# CONFIG_MOUSE_PS2_TOUCHKIT is not set
-CONFIG_MOUSE_SERIAL=y
+CONFIG_MOUSE_PS2_TOUCHKIT=y
+CONFIG_MOUSE_SERIAL=m
 CONFIG_MOUSE_APPLETOUCH=m
 CONFIG_MOUSE_BCM5974=m
 CONFIG_MOUSE_CYAPA=m
@@ -2873,7 +2916,9 @@ CONFIG_TOUCHSCREEN_TSC_SERIO=m
 # CONFIG_TOUCHSCREEN_TSC2005 is not set
 CONFIG_TOUCHSCREEN_TSC2007=m
 CONFIG_TOUCHSCREEN_ST1232=m
+CONFIG_TOUCHSCREEN_SUR40=m
 CONFIG_TOUCHSCREEN_TPS6507X=m
+CONFIG_TOUCHSCREEN_ZFORCE=m
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_AD714X=m
 CONFIG_INPUT_AD714X_I2C=m
@@ -2911,17 +2956,18 @@ CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
 #
 # Hardware I/O ports
 #
-CONFIG_SERIO=y
-CONFIG_SERIO_I8042=y
+CONFIG_SERIO=m
+CONFIG_SERIO_I8042=m
 CONFIG_SERIO_SERPORT=m
 CONFIG_SERIO_CT82C710=m
 CONFIG_SERIO_PARKBD=m
 CONFIG_SERIO_PCIPS2=m
-CONFIG_SERIO_LIBPS2=y
+CONFIG_SERIO_LIBPS2=m
 CONFIG_SERIO_RAW=m
 CONFIG_SERIO_ALTERA_PS2=m
 CONFIG_SERIO_PS2MULT=m
 CONFIG_SERIO_ARC_PS2=m
+CONFIG_HYPERV_KEYBOARD=m
 CONFIG_GAMEPORT=m
 CONFIG_GAMEPORT_NS558=m
 CONFIG_GAMEPORT_L4=m
@@ -2996,7 +3042,6 @@ CONFIG_SERIAL_ARC_NR_PORTS=1
 CONFIG_SERIAL_RP2=m
 CONFIG_SERIAL_RP2_NR_UARTS=32
 CONFIG_SERIAL_FSL_LPUART=m
-CONFIG_SERIAL_ST_ASC=m
 CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
 CONFIG_PPDEV=m
@@ -3033,10 +3078,13 @@ CONFIG_MWAVE=m
 # CONFIG_RAW_DRIVER is not set
 CONFIG_HPET=y
 CONFIG_HPET_MMAP=y
+CONFIG_HPET_MMAP_DEFAULT=y
 CONFIG_HANGCHECK_TIMER=m
 CONFIG_TCG_TPM=m
 CONFIG_TCG_TIS=m
+CONFIG_TCG_TIS_I2C_ATMEL=m
 CONFIG_TCG_TIS_I2C_INFINEON=m
+CONFIG_TCG_TIS_I2C_NUVOTON=m
 CONFIG_TCG_NSC=m
 CONFIG_TCG_ATMEL=m
 CONFIG_TCG_INFINEON=m
@@ -3134,7 +3182,6 @@ CONFIG_SPI_MASTER=y
 # CONFIG_SPI_BUTTERFLY is not set
 # CONFIG_SPI_GPIO is not set
 # CONFIG_SPI_LM70_LLP is not set
-# CONFIG_SPI_FSL_DSPI is not set
 # CONFIG_SPI_OC_TINY is not set
 CONFIG_SPI_PXA2XX_DMA=y
 CONFIG_SPI_PXA2XX=m
@@ -3177,8 +3224,8 @@ CONFIG_PTP_1588_CLOCK=m
 CONFIG_DP83640_PHY=m
 CONFIG_PTP_1588_CLOCK_PCH=m
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
-CONFIG_GPIO_DEVRES=y
 CONFIG_GPIOLIB=y
+CONFIG_GPIO_DEVRES=y
 CONFIG_GPIO_ACPI=y
 # CONFIG_DEBUG_GPIO is not set
 CONFIG_GPIO_SYSFS=y
@@ -3210,7 +3257,7 @@ CONFIG_GPIO_ARIZONA=m
 #
 CONFIG_GPIO_CS5535=m
 CONFIG_GPIO_AMD8111=m
-CONFIG_GPIO_LANGWELL=y
+# CONFIG_GPIO_INTEL_MID is not set
 # CONFIG_GPIO_PCH is not set
 # CONFIG_GPIO_ML_IOH is not set
 # CONFIG_GPIO_RDC321X is not set
@@ -3226,7 +3273,7 @@ CONFIG_GPIO_LANGWELL=y
 #
 # AC97 GPIO expanders:
 #
-CONFIG_GPIO_UCB1400=y
+CONFIG_GPIO_UCB1400=m
 
 #
 # LPC GPIO expanders:
@@ -3259,6 +3306,7 @@ CONFIG_TEST_POWER=m
 # CONFIG_CHARGER_GPIO is not set
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_BQ24190 is not set
+CONFIG_CHARGER_BQ24735=m
 # CONFIG_CHARGER_SMB347 is not set
 CONFIG_POWER_RESET=y
 CONFIG_POWER_AVS=y
@@ -3981,7 +4029,7 @@ CONFIG_VIDEO_UPD64031A=m
 CONFIG_VIDEO_UPD64083=m
 
 #
-# Miscelaneous helper chips
+# Miscellaneous helper chips
 #
 CONFIG_VIDEO_M52790=m
 
@@ -4057,6 +4105,7 @@ CONFIG_DVB_TUNER_CX24113=m
 CONFIG_DVB_TDA826X=m
 CONFIG_DVB_TUA6100=m
 CONFIG_DVB_CX24116=m
+CONFIG_DVB_CX24117=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_TS2020=m
 CONFIG_DVB_DS3000=m
@@ -4162,6 +4211,7 @@ CONFIG_VGA_SWITCHEROO=y
 CONFIG_DRM=m
 CONFIG_DRM_USB=m
 CONFIG_DRM_KMS_HELPER=m
+CONFIG_DRM_KMS_FB_HELPER=y
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM_TTM=m
 
@@ -4181,6 +4231,7 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_I915=m
 CONFIG_DRM_I915_KMS=y
+CONFIG_DRM_I915_FBDEV=y
 # CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
 CONFIG_DRM_MGA=m
 CONFIG_DRM_SIS=m
@@ -4295,7 +4346,7 @@ CONFIG_BACKLIGHT_APPLE=m
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
 CONFIG_BACKLIGHT_PCF50633=m
-# CONFIG_BACKLIGHT_LM3630 is not set
+CONFIG_BACKLIGHT_LM3630A=m
 # CONFIG_BACKLIGHT_LM3639 is not set
 # CONFIG_BACKLIGHT_LP855X is not set
 # CONFIG_BACKLIGHT_OT200 is not set
@@ -4474,6 +4525,7 @@ CONFIG_SND_USB_6FIRE=m
 CONFIG_SND_USB_HIFACE=m
 CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWIRE_LIB=m
+CONFIG_SND_DICE=m
 CONFIG_SND_FIREWIRE_SPEAKERS=m
 CONFIG_SND_ISIGHT=m
 CONFIG_SND_SCS1X=m
@@ -4551,6 +4603,7 @@ CONFIG_HID_ROCCAT=m
 CONFIG_HID_SAITEK=m
 CONFIG_HID_SAMSUNG=m
 CONFIG_HID_SONY=m
+CONFIG_SONY_FF=y
 CONFIG_HID_SPEEDLINK=m
 CONFIG_HID_STEELSERIES=m
 CONFIG_HID_SUNPLUS=m
@@ -4781,7 +4834,6 @@ CONFIG_USB_XUSBATM=m
 #
 CONFIG_USB_PHY=y
 CONFIG_NOP_USB_XCEIV=m
-# CONFIG_AM335X_PHY_USB is not set
 CONFIG_SAMSUNG_USBPHY=m
 CONFIG_SAMSUNG_USB2PHY=m
 CONFIG_SAMSUNG_USB3PHY=m
@@ -4823,6 +4875,7 @@ CONFIG_USB_F_NCM=m
 CONFIG_USB_F_ECM=m
 CONFIG_USB_F_SUBSET=m
 CONFIG_USB_F_RNDIS=m
+CONFIG_USB_F_MASS_STORAGE=m
 # CONFIG_USB_CONFIGFS is not set
 # CONFIG_USB_ZERO is not set
 CONFIG_USB_AUDIO=m
@@ -4923,6 +4976,7 @@ CONFIG_LEDS_LP5562=m
 CONFIG_LEDS_CLEVO_MAIL=m
 CONFIG_LEDS_PCA955X=m
 # CONFIG_LEDS_PCA963X is not set
+CONFIG_LEDS_PCA9685=m
 # CONFIG_LEDS_DAC124S085 is not set
 CONFIG_LEDS_BD2802=m
 CONFIG_LEDS_INTEL_SS4200=m
@@ -5079,6 +5133,7 @@ CONFIG_DMA_ACPI=y
 #
 CONFIG_ASYNC_TX_DMA=y
 # CONFIG_DMATEST is not set
+CONFIG_DMA_ENGINE_RAID=y
 CONFIG_DCA=m
 CONFIG_AUXDISPLAY=y
 CONFIG_KS0108=m
@@ -5279,15 +5334,11 @@ CONFIG_FT1000_PCMCIA=m
 #
 CONFIG_SPEAKUP=m
 CONFIG_SPEAKUP_SYNTH_ACNTSA=m
-CONFIG_SPEAKUP_SYNTH_ACNTPC=m
 CONFIG_SPEAKUP_SYNTH_APOLLO=m
 CONFIG_SPEAKUP_SYNTH_AUDPTR=m
 CONFIG_SPEAKUP_SYNTH_BNS=m
 CONFIG_SPEAKUP_SYNTH_DECTLK=m
 CONFIG_SPEAKUP_SYNTH_DECEXT=m
-CONFIG_SPEAKUP_SYNTH_DECPC=m
-CONFIG_SPEAKUP_SYNTH_DTLK=m
-CONFIG_SPEAKUP_SYNTH_KEYPC=m
 CONFIG_SPEAKUP_SYNTH_LTLK=m
 CONFIG_SPEAKUP_SYNTH_SOFT=m
 CONFIG_SPEAKUP_SYNTH_SPKOUT=m
@@ -5353,7 +5404,6 @@ CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 CONFIG_ACERHDF=m
 CONFIG_ASUS_LAPTOP=m
-CONFIG_CHROMEOS_LAPTOP=m
 CONFIG_DELL_LAPTOP=m
 CONFIG_DELL_WMI=m
 CONFIG_DELL_WMI_AIO=m
@@ -5399,6 +5449,8 @@ CONFIG_APPLE_GMUX=m
 CONFIG_INTEL_RST=m
 CONFIG_INTEL_SMARTCONNECT=y
 CONFIG_PVPANIC=m
+CONFIG_CHROME_PLATFORMS=y
+CONFIG_CHROMEOS_LAPTOP=m
 
 #
 # Hardware Spinlock drivers
@@ -5450,6 +5502,14 @@ CONFIG_FMC_WRITE_EEPROM=m
 CONFIG_FMC_CHARDEV=m
 
 #
+# PHY Subsystem
+#
+CONFIG_GENERIC_PHY=m
+CONFIG_PHY_EXYNOS_MIPI_VIDEO=m
+CONFIG_POWERCAP=y
+CONFIG_INTEL_RAPL=m
+
+#
 # Firmware Drivers
 #
 CONFIG_EDD=m
@@ -5467,6 +5527,7 @@ CONFIG_ISCSI_IBFT=m
 # EFI (Extensible Firmware Interface) Support
 #
 # CONFIG_EFI_VARS is not set
+CONFIG_UEFI_CPER=y
 
 #
 # File systems
@@ -5613,6 +5674,11 @@ CONFIG_UBIFS_FS_ZLIB=y
 CONFIG_LOGFS=m
 CONFIG_CRAMFS=m
 CONFIG_SQUASHFS=m
+# CONFIG_SQUASHFS_FILE_CACHE is not set
+CONFIG_SQUASHFS_FILE_DIRECT=y
+# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
+# CONFIG_SQUASHFS_DECOMP_MULTI is not set
+CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
 CONFIG_SQUASHFS_XATTR=y
 CONFIG_SQUASHFS_ZLIB=y
 CONFIG_SQUASHFS_LZO=y
@@ -5642,6 +5708,7 @@ CONFIG_F2FS_STAT_FS=y
 CONFIG_F2FS_FS_XATTR=y
 CONFIG_F2FS_FS_POSIX_ACL=y
 CONFIG_F2FS_FS_SECURITY=y
+CONFIG_F2FS_CHECK_FS=y
 CONFIG_EFIVAR_FS=y
 CONFIG_ORE=m
 CONFIG_NETWORK_FILESYSTEMS=y
@@ -5657,6 +5724,7 @@ CONFIG_PNFS_FILE_LAYOUT=m
 CONFIG_PNFS_BLOCK=m
 CONFIG_PNFS_OBJLAYOUT=m
 CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org"
+CONFIG_NFS_V4_1_MIGRATION=y
 CONFIG_NFS_V4_SECURITY_LABEL=y
 CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
@@ -5794,6 +5862,7 @@ CONFIG_ARCH_WANT_FRAME_POINTERS=y
 CONFIG_FRAME_POINTER=y
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 CONFIG_MAGIC_SYSRQ=y
+CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x0
 CONFIG_DEBUG_KERNEL=y
 
 #
@@ -5930,6 +5999,7 @@ CONFIG_LKDTM=m
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_RBTREE_TEST is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
+CONFIG_PERCPU_TEST=m
 # CONFIG_ATOMIC64_SELFTEST is not set
 CONFIG_ASYNC_RAID6_TEST=m
 # CONFIG_TEST_STRING_HELPERS is not set
@@ -5944,6 +6014,7 @@ CONFIG_STRICT_DEVMEM=y
 CONFIG_X86_VERBOSE_BOOTUP=y
 CONFIG_EARLY_PRINTK=y
 # CONFIG_EARLY_PRINTK_DBGP is not set
+CONFIG_EARLY_PRINTK_EFI=y
 # CONFIG_X86_PTDUMP is not set
 CONFIG_DEBUG_RODATA=y
 # CONFIG_DEBUG_RODATA_TEST is not set
@@ -5974,6 +6045,8 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
 # Security options
 #
 CONFIG_KEYS=y
+CONFIG_PERSISTENT_KEYRINGS=y
+CONFIG_BIG_KEYS=y
 CONFIG_TRUSTED_KEYS=m
 CONFIG_ENCRYPTED_KEYS=m
 # CONFIG_KEYS_DEBUG_PROC_KEYS is not set
@@ -5984,8 +6057,16 @@ CONFIG_SECURITY_NETWORK=y
 # CONFIG_SECURITY_NETWORK_XFRM is not set
 CONFIG_SECURITY_PATH=y
 # CONFIG_INTEL_TXT is not set
-# CONFIG_SECURITY_SELINUX is not set
-# CONFIG_SECURITY_SMACK is not set
+CONFIG_LSM_MMAP_MIN_ADDR=65536
+CONFIG_SECURITY_SELINUX=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
+# CONFIG_SECURITY_SELINUX_DISABLE is not set
+CONFIG_SECURITY_SELINUX_DEVELOP=y
+CONFIG_SECURITY_SELINUX_AVC_STATS=y
+CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
+# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set
+CONFIG_SECURITY_SMACK=y
 CONFIG_SECURITY_TOMOYO=y
 CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
 CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
@@ -5998,6 +6079,8 @@ CONFIG_SECURITY_APPARMOR_HASH=y
 CONFIG_SECURITY_YAMA=y
 CONFIG_SECURITY_YAMA_STACKED=y
 # CONFIG_IMA is not set
+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
+# CONFIG_DEFAULT_SECURITY_SMACK is not set
 # CONFIG_DEFAULT_SECURITY_TOMOYO is not set
 # CONFIG_DEFAULT_SECURITY_APPARMOR is not set
 # CONFIG_DEFAULT_SECURITY_YAMA is not set
@@ -6037,7 +6120,7 @@ CONFIG_CRYPTO_WORKQUEUE=y
 CONFIG_CRYPTO_CRYPTD=m
 CONFIG_CRYPTO_AUTHENC=m
 CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_ABLK_HELPER_X86=m
+CONFIG_CRYPTO_ABLK_HELPER=m
 CONFIG_CRYPTO_GLUE_HELPER_X86=m
 
 #
@@ -6146,6 +6229,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_USER_API=m
 CONFIG_CRYPTO_USER_API_HASH=m
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_HASH_INFO=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
@@ -6163,6 +6247,7 @@ CONFIG_KVM_MMIO=y
 CONFIG_KVM_ASYNC_PF=y
 CONFIG_HAVE_KVM_MSI=y
 CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
+CONFIG_KVM_VFIO=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=m
 CONFIG_KVM_INTEL=m
@@ -6185,7 +6270,6 @@ CONFIG_GENERIC_IOMAP=y
 CONFIG_GENERIC_IO=y
 CONFIG_PERCPU_RWSEM=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
-CONFIG_CMPXCHG_LOCKREF=y
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
 CONFIG_CRC_T10DIF=m
@@ -6199,6 +6283,7 @@ CONFIG_CRC32_SLICEBY8=y
 CONFIG_CRC7=m
 CONFIG_LIBCRC32C=m
 CONFIG_CRC8=m
+# CONFIG_RANDOM32_SELFTEST is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_LZO_COMPRESS=y
@@ -6232,6 +6317,7 @@ CONFIG_TEXTSEARCH_KMP=m
 CONFIG_TEXTSEARCH_BM=m
 CONFIG_TEXTSEARCH_FSM=m
 CONFIG_BTREE=y
+CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
diff --git a/libre/linux-libre/criu-no-expert.patch b/libre/linux-libre/criu-no-expert.patch
index 2124427e9..9bbc02812 100644
--- a/libre/linux-libre/criu-no-expert.patch
+++ b/libre/linux-libre/criu-no-expert.patch
@@ -1,8 +1,8 @@
 diff --git a/init/Kconfig b/init/Kconfig
-index be8b7f5..7461760 100644
+index 4e5d96a..4b94ffe 100644
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -989,7 +989,7 @@ config DEBUG_BLK_CGROUP
+@@ -1078,7 +1078,7 @@ config DEBUG_BLK_CGROUP
  endif # CGROUPS
  
  config CHECKPOINT_RESTORE
@@ -11,12 +11,3 @@ index be8b7f5..7461760 100644
  	default n
  	help
  	  Enables additional kernel features in a sake of checkpoint/restore.
-@@ -1000,7 +1000,7 @@ config CHECKPOINT_RESTORE
- 	  If unsure, say N here.
- 
- menuconfig NAMESPACES
--	bool "Namespaces support" if EXPERT
-+	bool "Namespaces support"
- 	default !EXPERT
- 	help
- 	  Provides the way to make tasks work with different objects using
diff --git a/libre/linux-libre/i8042-fix-aliases.patch b/libre/linux-libre/i8042-fix-aliases.patch
new file mode 100644
index 000000000..961968c78
--- /dev/null
+++ b/libre/linux-libre/i8042-fix-aliases.patch
@@ -0,0 +1,113 @@
+commit 5a420e61e39862c7c3356080eddb23dfe4ccadb7
+Author: Tom Gundersen <teg@jklm.no>
+Date:   Sun Jan 26 17:00:32 2014 +0100
+
+    Input: i8042 - fix PNP modaliases when both aux and kdb are enabled
+    
+    Commit 78551277e4 exposed the PNP modaliases for the i8042 module. However,
+    when both the aux and the kbd drivers are enabled the aux entries would
+    override the kdb ones.
+    
+    Refactor the device_id lists, and unconditionally attempt to load the driver
+    if either a kdb or aux devices is present.
+    
+    Signed-off-by: Tom Gundersen <teg@jklm.no>
+
+diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
+index 0ec9abb..dbc6958 100644
+--- a/drivers/input/serio/i8042-x86ia64io.h
++++ b/drivers/input/serio/i8042-x86ia64io.h
+@@ -747,25 +747,27 @@ static int i8042_pnp_aux_probe(struct pnp_dev *dev, const struct pnp_device_id *
+ 	return 0;
+ }
+ 
+-static struct pnp_device_id pnp_kbd_devids[] = {
+-	{ .id = "PNP0300", .driver_data = 0 },
+-	{ .id = "PNP0301", .driver_data = 0 },
+-	{ .id = "PNP0302", .driver_data = 0 },
+-	{ .id = "PNP0303", .driver_data = 0 },
+-	{ .id = "PNP0304", .driver_data = 0 },
+-	{ .id = "PNP0305", .driver_data = 0 },
+-	{ .id = "PNP0306", .driver_data = 0 },
+-	{ .id = "PNP0309", .driver_data = 0 },
+-	{ .id = "PNP030a", .driver_data = 0 },
+-	{ .id = "PNP030b", .driver_data = 0 },
+-	{ .id = "PNP0320", .driver_data = 0 },
+-	{ .id = "PNP0343", .driver_data = 0 },
+-	{ .id = "PNP0344", .driver_data = 0 },
+-	{ .id = "PNP0345", .driver_data = 0 },
++#define KBD_DEVIDS \
++	{ .id = "PNP0300", .driver_data = 0 }, \
++	{ .id = "PNP0301", .driver_data = 0 }, \
++	{ .id = "PNP0302", .driver_data = 0 }, \
++	{ .id = "PNP0303", .driver_data = 0 }, \
++	{ .id = "PNP0304", .driver_data = 0 }, \
++	{ .id = "PNP0305", .driver_data = 0 }, \
++	{ .id = "PNP0306", .driver_data = 0 }, \
++	{ .id = "PNP0309", .driver_data = 0 }, \
++	{ .id = "PNP030a", .driver_data = 0 }, \
++	{ .id = "PNP030b", .driver_data = 0 }, \
++	{ .id = "PNP0320", .driver_data = 0 }, \
++	{ .id = "PNP0343", .driver_data = 0 }, \
++	{ .id = "PNP0344", .driver_data = 0 }, \
++	{ .id = "PNP0345", .driver_data = 0 }, \
+ 	{ .id = "CPQA0D7", .driver_data = 0 },
++
++static struct pnp_device_id pnp_kbd_devids[] = {
++	KBD_DEVIDS
+ 	{ .id = "", },
+ };
+-MODULE_DEVICE_TABLE(pnp, pnp_kbd_devids);
+ 
+ static struct pnp_driver i8042_pnp_kbd_driver = {
+ 	.name           = "i8042 kbd",
+@@ -773,21 +775,23 @@ static struct pnp_driver i8042_pnp_kbd_driver = {
+ 	.probe          = i8042_pnp_kbd_probe,
+ };
+ 
+-static struct pnp_device_id pnp_aux_devids[] = {
+-	{ .id = "AUI0200", .driver_data = 0 },
+-	{ .id = "FJC6000", .driver_data = 0 },
+-	{ .id = "FJC6001", .driver_data = 0 },
+-	{ .id = "PNP0f03", .driver_data = 0 },
+-	{ .id = "PNP0f0b", .driver_data = 0 },
+-	{ .id = "PNP0f0e", .driver_data = 0 },
+-	{ .id = "PNP0f12", .driver_data = 0 },
+-	{ .id = "PNP0f13", .driver_data = 0 },
+-	{ .id = "PNP0f19", .driver_data = 0 },
+-	{ .id = "PNP0f1c", .driver_data = 0 },
++#define AUX_DEVIDS \
++	{ .id = "AUI0200", .driver_data = 0 }, \
++	{ .id = "FJC6000", .driver_data = 0 }, \
++	{ .id = "FJC6001", .driver_data = 0 }, \
++	{ .id = "PNP0f03", .driver_data = 0 }, \
++	{ .id = "PNP0f0b", .driver_data = 0 }, \
++	{ .id = "PNP0f0e", .driver_data = 0 }, \
++	{ .id = "PNP0f12", .driver_data = 0 }, \
++	{ .id = "PNP0f13", .driver_data = 0 }, \
++	{ .id = "PNP0f19", .driver_data = 0 }, \
++	{ .id = "PNP0f1c", .driver_data = 0 }, \
+ 	{ .id = "SYN0801", .driver_data = 0 },
++
++static struct pnp_device_id pnp_aux_devids[] = {
++	AUX_DEVIDS
+ 	{ .id = "", },
+ };
+-MODULE_DEVICE_TABLE(pnp, pnp_aux_devids);
+ 
+ static struct pnp_driver i8042_pnp_aux_driver = {
+ 	.name           = "i8042 aux",
+@@ -795,6 +799,13 @@ static struct pnp_driver i8042_pnp_aux_driver = {
+ 	.probe          = i8042_pnp_aux_probe,
+ };
+ 
++static struct pnp_device_id pnp_kdb_aux_devids[] = {
++	KBD_DEVIDS
++	AUX_DEVIDS
++	{ .id = "", },
++};
++MODULE_DEVICE_TABLE(pnp, pnp_kdb_aux_devids);
++
+ static void i8042_pnp_exit(void)
+ {
+ 	if (i8042_pnp_kbd_registered) {
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 8d5658aab..34be5215e 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -26,6 +26,12 @@ post_upgrade() {
     echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
     mkinitcpio -p linux-libre${KERNEL_NAME}
   fi
+
+  if [ $(vercmp $2 3.13) -lt 0 ]; then
+    echo ">>> WARNING: AT keyboard support is no longer built into the kernel."
+    echo ">>>          In order to use your keyboard during early init, you MUST"
+    echo ">>>          include the 'keyboard' hook in your mkinitcpio.conf."
+  fi
 }
 
 post_remove() {
diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD
index 66ca49ac6..0f58294e2 100644
--- a/libre/lirc-libre/PKGBUILD
+++ b/libre/lirc-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 204436 2014-01-19 20:29:01Z tpowa $
+# $Id: PKGBUILD 204737 2014-01-26 10:45:02Z thomas $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
@@ -6,14 +6,14 @@ _pkgbase=lirc
 pkgbase=lirc-libre
 pkgname=('lirc-libre' 'lirc-libre-utils')
 pkgver=0.9.0
-pkgrel=69.1
+pkgrel=70
 epoch=1
-_extramodules=extramodules-3.12-LIBRE
+_extramodules=extramodules-3.13-LIBRE
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lirc.org/"
 license=('GPL')
 ### NOTICE don't forget to bump version in depends in package_lirc
-makedepends=('help2man' 'linux-libre>=3.12' 'linux-libre<3.13' 'linux-libre-headers>=3.12' 'linux-libre-headers<3.13' 'alsa-lib' 'libx11' 'libftdi-compat' 'libirman' 'python2')
+makedepends=('help2man' 'linux-libre>=3.13' 'linux-libre<3.14' 'linux-libre-headers>=3.13' 'linux-libre-headers<3.14' 'alsa-lib' 'libx11' 'libftdi-compat' 'libirman' 'python2')
 options=('!makeflags' '!strip')
 source=(http://prdownloads.sourceforge.net/${_pkgbase}/${_pkgbase}-${pkgver}.tar.bz2
         lirc_wpc8769l.patch
@@ -84,7 +84,7 @@ build() {
 
 package_lirc-libre() {
   pkgdesc="Linux Infrared Remote Control kernel modules for stock kernel (built for the linux-libre kernel package)"
-  depends=('lirc-libre-utils' 'linux-libre>=3.12' 'linux-libre<3.13')
+  depends=('lirc-libre-utils' 'linux-libre>=3.13' 'linux-libre<3.14')
   replaces=('lirc' 'lirc+pctv')
   conflicts=('lirc')
   provides=("lirc=$pkgver")
diff --git a/libre/lirc-libre/lirc.install b/libre/lirc-libre/lirc.install
index 50e7566f9..7795ab412 100644
--- a/libre/lirc-libre/lirc.install
+++ b/libre/lirc-libre/lirc.install
@@ -1,4 +1,4 @@
-EXTRAMODULES=extramodules-3.12-LIBRE
+EXTRAMODULES=extramodules-3.13-LIBRE
 
 post_install() {
   # updating module dependencies
diff --git a/libre/nant/PKGBUILD b/libre/nant/PKGBUILD
new file mode 100644
index 000000000..9f62c70dd
--- /dev/null
+++ b/libre/nant/PKGBUILD
@@ -0,0 +1,26 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Rationale: Build dependency of antlr2
+
+pkgname=nant
+pkgver=0.92
+pkgrel=2.1
+pkgdesc="A free .NET build tool"
+arch=('i686' 'x86_64')
+url="http://nant.sourceforge.net"
+license=("GPL2")
+depends=('mono-basic')
+makedepends=('pkgconfig')
+source=("http://downloads.sourceforge.net/nant/$pkgname-$pkgver-src.tar.gz" 'mono3.patch')
+
+prepare() {
+  cd "$srcdir"/$pkgname-$pkgver
+  patch -p1 -i ../mono3.patch
+}
+
+package() {
+  cd "$srcdir"/$pkgname-$pkgver
+  make -j1 install prefix=/usr DESTDIR="$pkgdir"
+}
+
+md5sums=('d680b47f9b2ce197cec0fac7d7d60950'
+         '06fcf641b6f232c5890ad25c73b2459f')
diff --git a/libre/nant/mono3.patch b/libre/nant/mono3.patch
new file mode 100644
index 000000000..94518d6cd
--- /dev/null
+++ b/libre/nant/mono3.patch
@@ -0,0 +1,2645 @@
+diff -ruN nant-0.92.orig/src/NAnt.Console/App.config nant-0.92/src/NAnt.Console/App.config
+--- nant-0.92.orig/src/NAnt.Console/App.config	2012-06-09 08:05:53.000000000 -0600
++++ nant-0.92/src/NAnt.Console/App.config	2013-08-04 22:41:24.000000000 -0600
+@@ -18,2329 +18,6 @@
+     <!-- nant config settings -->
+     <nant>
+         <frameworks>
+-            <platform name="win32" default="auto">
+-                <task-assemblies>
+-                        <!-- include NAnt task assemblies -->
+-                        <include name="*Tasks.dll" />
+-                        <!-- include NAnt test assemblies -->
+-                        <include name="*Tests.dll" />
+-                        <!-- include framework-neutral assemblies -->
+-                        <include name="extensions/common/neutral/**/*.dll" />
+-                        <!-- exclude Microsoft.NET specific task assembly -->
+-                        <exclude name="NAnt.MSNetTasks.dll" />
+-                        <!-- exclude Microsoft.NET specific test assembly -->
+-                        <exclude name="NAnt.MSNet.Tests.dll" />
+-                </task-assemblies>
+-                <framework 
+-                    name="net-1.0"
+-                    family="net"
+-                    version="1.0"
+-                    description="Microsoft .NET Framework 1.0"
+-                    sdkdirectory="${path::combine(sdkInstallRoot, 'bin')}"
+-                    frameworkdirectory="${path::combine(installRoot, 'v1.0.3705')}"
+-                    frameworkassemblydirectory="${path::combine(installRoot, 'v1.0.3705')}"
+-                    clrversion="1.0.3705"
+-                    clrtype="Desktop"
+-                    vendor="Microsoft"
+-                    >
+-                    <runtime>
+-                        <probing-paths>
+-                            <directory name="lib/net/1.0" />
+-                            <directory name="lib/net/neutral" />
+-                            <directory name="lib/common/1.0" />
+-                            <directory name="lib/common/neutral" />
+-                        </probing-paths>
+-                        <modes>
+-                            <strict>
+-                                <environment>
+-                                    <variable name="COMPLUS_VERSION" value="v1.0.3705" />
+-                                </environment>
+-                            </strict>
+-                        </modes>
+-                    </runtime>
+-                    <reference-assemblies basedir="${path::combine(installRoot, 'v1.0.3705')}">
+-                        <include name="Accessibility.dll" />
+-                        <include name="cscompmgd.dll" />
+-                        <include name="mscorlib.dll" />
+-                        <include name="Microsoft.Vsa.dll" />
+-                        <include name="Microsoft.VisualBasic.dll" />
+-                        <include name="System.Configuration.Install.dll" />
+-                        <include name="System.Data.dll" />
+-                        <include name="System.Design.dll" />
+-                        <include name="System.DirectoryServices.dll" />
+-                        <include name="System.dll" />
+-                        <include name="System.Drawing.Design.dll" />
+-                        <include name="System.Drawing.dll" />
+-                        <include name="System.EnterpriseServices.dll" />
+-                        <include name="System.Management.dll" />
+-                        <include name="System.Messaging.dll" />
+-                        <include name="System.Runtime.Remoting.dll" />
+-                        <include name="System.Runtime.Serialization.Formatters.Soap.dll" />
+-                        <include name="System.Security.dll" />
+-                        <include name="System.ServiceProcess.dll" />
+-                        <include name="System.Web.dll" />
+-                        <include name="System.Web.RegularExpressions.dll" />
+-                        <include name="System.Web.Services.dll" />
+-                        <include name="System.Windows.Forms.dll" />
+-                        <include name="System.XML.dll" />
+-                    </reference-assemblies>
+-                    <task-assemblies>
+-                        <!-- include MS.NET version-neutral assemblies -->
+-                        <include name="extensions/net/neutral/**/*.dll" />
+-                        <!-- include MS.NET 1.0 specific assemblies -->
+-                        <include name="extensions/net/1.0/**/*.dll" />
+-                        <!-- include Microsoft.NET specific task assembly -->
+-                        <include name="NAnt.MSNetTasks.dll" />
+-                        <!-- include Microsoft.NET specific test assembly -->
+-                        <include name="NAnt.MSNet.Tests.dll" />
+-                        <!-- include .NET 1.0 specific assemblies -->
+-                        <include name="extensions/common/1.0/**/*.dll" />
+-                    </task-assemblies>
+-                    <tool-paths>
+-                        <directory name="${path::combine(sdkInstallRoot, 'bin')}"
+-                            if="${property::exists('sdkInstallRoot')}" />
+-                        <directory name="${path::combine(installRoot, 'v1.0.3705')}" />
+-                    </tool-paths>
+-                    <project>
+-                        <readregistry
+-                            property="installRoot"
+-                            key="SOFTWARE\Microsoft\.NETFramework\InstallRoot"
+-                            hive="LocalMachine" />
+-                        <readregistry
+-                            property="sdkInstallRoot"
+-                            key="SOFTWARE\Microsoft\.NETFramework\sdkInstallRoot"
+-                            hive="LocalMachine"
+-                            failonerror="false" />
+-                    </project>
+-                    <tasks>
+-                        <task name="csc">
+-                            <attribute name="supportsnowarnlist">true</attribute>
+-                        </task>
+-                        <task name="vjc">
+-                            <attribute name="supportsnowarnlist">true</attribute>
+-                        </task>
+-                        <task name="delay-sign">
+-                            <attribute name="exename">sn</attribute>
+-                        </task>
+-                        <task name="license">
+-                            <attribute name="exename">lc</attribute>
+-                        </task>
+-                        <task name="aximp">
+-                            <attribute name="supportsrcw">false</attribute>
+-                        </task>
+-                        <task name="tlbimp">
+-                            <attribute name="supportstransform">false</attribute>
+-                        </task>
+-                    </tasks>
+-                </framework>
+-                <framework 
+-                    name="net-1.1"
+-                    family="net"
+-                    version="1.1"
+-                    description="Microsoft .NET Framework 1.1"
+-                    sdkdirectory="${path::combine(sdkInstallRoot, 'bin')}"
+-                    frameworkdirectory="${path::combine(installRoot, 'v1.1.4322')}"
+-                    frameworkassemblydirectory="${path::combine(installRoot, 'v1.1.4322')}"
+-                    clrversion="1.1.4322"
+-                    clrtype="Desktop"
+-                    vendor="Microsoft"
+-                    >
+-                    <runtime>
+-                        <probing-paths>
+-                            <directory name="lib/net/1.1" />
+-                            <directory name="lib/net/neutral" />
+-                            <directory name="lib/common/1.1" />
+-                            <directory name="lib/common/neutral" />
+-                        </probing-paths>
+-                        <modes>
+-                            <strict>
+-                                <environment>
+-                                    <variable name="COMPLUS_VERSION" value="v1.1.4322" />
+-                                </environment>
+-                            </strict>
+-                        </modes>
+-                    </runtime>
+-                    <reference-assemblies basedir="${path::combine(installRoot, 'v1.1.4322')}">
+-                        <include name="Accessibility.dll" />
+-                        <include name="cscompmgd.dll" />
+-                        <include name="mscorlib.dll" />
+-                        <include name="Microsoft.Vsa.dll" />
+-                        <include name="Microsoft.VisualBasic.dll" />
+-                        <include name="Microsoft.VisualBasic.Compatibility.dll" />
+-                        <include name="Microsoft.VisualBasic.Compatibility.Data.dll" />
+-                        <include name="System.Configuration.Install.dll" />
+-                        <include name="System.Data.dll" />
+-                        <include name="System.Data.OracleClient.dll" />
+-                        <include name="System.Design.dll" />
+-                        <include name="System.DirectoryServices.dll" />
+-                        <include name="System.dll" />
+-                        <include name="System.Drawing.Design.dll" />
+-                        <include name="System.Drawing.dll" />
+-                        <include name="System.EnterpriseServices.dll" />
+-                        <include name="System.Management.dll" />
+-                        <include name="System.Messaging.dll" />
+-                        <include name="System.Runtime.Remoting.dll" />
+-                        <include name="System.Runtime.Serialization.Formatters.Soap.dll" />
+-                        <include name="System.Security.dll" />
+-                        <include name="System.ServiceProcess.dll" />
+-                        <include name="System.Web.dll" />
+-                        <include name="System.Web.Mobile.dll" />
+-                        <include name="System.Web.RegularExpressions.dll" />
+-                        <include name="System.Web.Services.dll" />
+-                        <include name="System.Windows.Forms.dll" />
+-                        <include name="System.XML.dll" />
+-                    </reference-assemblies>
+-                    <task-assemblies>
+-                        <!-- include MS.NET version-neutral assemblies -->
+-                        <include name="extensions/net/neutral/**/*.dll" />
+-                        <!-- include MS.NET 1.1 specific assemblies -->
+-                        <include name="extensions/net/1.1/**/*.dll" />
+-                        <!-- include MS.NET specific task assembly -->
+-                        <include name="NAnt.MSNetTasks.dll" />
+-                        <!-- include MS.NET specific test assembly -->
+-                        <include name="NAnt.MSNet.Tests.dll" />
+-                        <!-- include .NET 1.1 specific assemblies -->
+-                        <include name="extensions/common/1.1/**/*.dll" />
+-                    </task-assemblies>
+-                    <tool-paths>
+-                        <directory name="${path::combine(sdkInstallRoot, 'bin')}"
+-                            if="${property::exists('sdkInstallRoot')}" />
+-                        <directory name="${path::combine(installRoot, 'v1.1.4322')}" />
+-                    </tool-paths>
+-                    <project>
+-                        <readregistry 
+-                            property="installRoot"
+-                            key="SOFTWARE\Microsoft\.NETFramework\InstallRoot"
+-                            hive="LocalMachine" />
+-                        <readregistry 
+-                            property="sdkInstallRoot"
+-                            key="SOFTWARE\Microsoft\.NETFramework\sdkInstallRootv1.1"
+-                            hive="LocalMachine"
+-                            failonerror="false" />
+-                    </project>
+-                    <tasks>
+-                        <task name="csc">
+-                            <attribute name="supportsnowarnlist">true</attribute>
+-                        </task>
+-                        <task name="vjc">
+-                            <attribute name="supportsnowarnlist">true</attribute>
+-                        </task>
+-                        <task name="delay-sign">
+-                            <attribute name="exename">sn</attribute>
+-                        </task>
+-                        <task name="license">
+-                            <attribute name="exename">lc</attribute>
+-                        </task>
+-                    </tasks>
+-                </framework>
+-                <framework 
+-                    name="net-2.0"
+-                    family="net"
+-                    version="2.0"
+-                    description="Microsoft .NET Framework 2.0"
+-                    sdkdirectory="${path::combine(sdkInstallRoot, 'bin')}"
+-                    frameworkdirectory="${path::combine(installRoot, 'v2.0.50727')}"
+-                    frameworkassemblydirectory="${path::combine(installRoot, 'v2.0.50727')}"
+-                    clrversion="2.0.50727"
+-                    clrtype="Desktop"
+-                    vendor="Microsoft"
+-                    >
+-                    <runtime>
+-                        <probing-paths>
+-                            <directory name="lib/net/2.0" />
+-                            <directory name="lib/net/neutral" />
+-                            <directory name="lib/common/2.0" />
+-                            <directory name="lib/common/neutral" />
+-                        </probing-paths>
+-                        <modes>
+-                            <strict>
+-                                <environment>
+-                                    <variable name="COMPLUS_VERSION" value="v2.0.50727" />
+-                                </environment>
+-                            </strict>
+-                        </modes>
+-                    </runtime>
+-                    <reference-assemblies basedir="${path::combine(installRoot, 'v2.0.50727')}">
+-                        <include name="Accessibility.dll" />
+-                        <include name="cscompmgd.dll" />
+-                        <include name="mscorlib.dll" />
+-                        <include name="Microsoft.Build.Engine.dll" />
+-                        <include name="Microsoft.Build.Framework.dll" />
+-                        <include name="Microsoft.Build.Utilities.dll" />
+-                        <include name="Microsoft.Vsa.dll" />
+-                        <include name="Microsoft.VisualBasic.dll" />
+-                        <include name="Microsoft.VisualBasic.Compatibility.dll" />
+-                        <include name="Microsoft.VisualBasic.Compatibility.Data.dll" />
+-                        <include name="System.Configuration.dll" />
+-                        <include name="System.Configuration.Install.dll" />
+-                        <include name="System.Data.dll" />
+-                        <include name="System.Data.OracleClient.dll" />
+-                        <include name="System.Data.SqlXml.dll" />
+-                        <include name="System.Deployment.dll" />
+-                        <include name="System.Design.dll" />
+-                        <include name="System.DirectoryServices.dll" />
+-                        <include name="System.dll" />
+-                        <include name="System.Drawing.Design.dll" />
+-                        <include name="System.Drawing.dll" />
+-                        <include name="System.EnterpriseServices.dll" />
+-                        <include name="System.Management.dll" />
+-                        <include name="System.Messaging.dll" />
+-                        <include name="System.Runtime.Remoting.dll" />
+-                        <include name="System.Runtime.Serialization.Formatters.Soap.dll" />
+-                        <include name="System.Security.dll" />
+-                        <include name="System.ServiceProcess.dll" />
+-                        <include name="System.Transactions.dll" />
+-                        <include name="System.Web.dll" />
+-                        <include name="System.Web.Mobile.dll" />
+-                        <include name="System.Web.RegularExpressions.dll" />
+-                        <include name="System.Web.Services.dll" />
+-                        <include name="System.Windows.Forms.dll" />
+-                        <include name="System.XML.dll" />
+-                    </reference-assemblies>
+-                    <task-assemblies>
+-                        <!-- include MS.NET version-neutral assemblies -->
+-                        <include name="extensions/net/neutral/**/*.dll" />
+-                        <!-- include MS.NET 2.0 specific assemblies -->
+-                        <include name="extensions/net/2.0/**/*.dll" />
+-                        <!-- include MS.NET specific task assembly -->
+-                        <include name="NAnt.MSNetTasks.dll" />
+-                        <!-- include MS.NET specific test assembly -->
+-                        <include name="NAnt.MSNet.Tests.dll" />
+-                        <!-- include .NET 2.0 specific assemblies -->
+-                        <include name="extensions/common/2.0/**/*.dll" />
+-                    </task-assemblies>
+-                    <tool-paths>
+-                        <directory name="${path::combine(sdkInstallRoot, 'bin')}"
+-                            if="${property::exists('sdkInstallRoot')}" />
+-                        <directory name="${path::combine(installRoot, 'v2.0.50727')}" />
+-                    </tool-paths>
+-                    <project>
+-                        <readregistry
+-                            property="installRoot"
+-                            key="SOFTWARE\Microsoft\.NETFramework\InstallRoot"
+-                            hive="LocalMachine" />
+-                        <readregistry
+-                            property="sdkInstallRoot"
+-                            key="SOFTWARE\Microsoft\.NETFramework\sdkInstallRootv2.0"
+-                            hive="LocalMachine"
+-                            failonerror="false" />
+-                    </project>
+-                    <tasks>
+-                        <task name="csc">
+-                            <attribute name="supportsnowarnlist">true</attribute>
+-                            <attribute name="supportswarnaserrorlist">true</attribute>
+-                            <attribute name="supportskeycontainer">true</attribute>
+-                            <attribute name="supportskeyfile">true</attribute>
+-                            <attribute name="supportsdelaysign">true</attribute>
+-                            <attribute name="supportsplatform">true</attribute>
+-                            <attribute name="supportslangversion">true</attribute>
+-                        </task>
+-                        <task name="vbc">
+-                            <attribute name="supportsdocgeneration">true</attribute>
+-                            <attribute name="supportsnostdlib">true</attribute>
+-                            <attribute name="supportsnowarnlist">true</attribute>
+-                            <attribute name="supportskeycontainer">true</attribute>
+-                            <attribute name="supportskeyfile">true</attribute>
+-                            <attribute name="supportsdelaysign">true</attribute>
+-                            <attribute name="supportsplatform">true</attribute>
+-                            <attribute name="supportswarnaserrorlist">true</attribute>
+-                        </task>
+-                        <task name="jsc">
+-                            <attribute name="supportsplatform">true</attribute>
+-                        </task>
+-                        <task name="vjc">
+-                            <attribute name="supportsnowarnlist">true</attribute>
+-                            <attribute name="supportskeycontainer">true</attribute>
+-                            <attribute name="supportskeyfile">true</attribute>
+-                            <attribute name="supportsdelaysign">true</attribute>
+-                        </task>
+-                        <task name="resgen">
+-                            <attribute name="supportsassemblyreferences">true</attribute>
+-                            <attribute name="supportsexternalfilereferences">true</attribute>
+-                        </task>
+-                        <task name="delay-sign">
+-                            <attribute name="exename">sn</attribute>
+-                        </task>
+-                        <task name="license">
+-                            <attribute name="exename">lc</attribute>
+-                            <attribute name="supportsassemblyreferences">true</attribute>
+-                        </task>
+-                    </tasks>
+-                </framework>
+-                <framework 
+-                    name="net-3.5"
+-                    family="net"
+-                    version="3.5"
+-                    description="Microsoft .NET Framework 3.5"
+-                    sdkdirectory="${sdkInstallRoot}"
+-                    frameworkdirectory="${path::combine(installRoot, 'v3.5')}"
+-                    frameworkassemblydirectory="${path::combine(installRoot, 'v2.0.50727')}"
+-                    clrversion="2.0.50727"
+-                    clrtype="Desktop"
+-                    vendor="Microsoft"
+-                    >
+-                    <runtime>
+-                        <probing-paths>
+-                            <directory name="lib/net/2.0" />
+-                            <directory name="lib/net/neutral" />
+-                            <directory name="lib/common/2.0" />
+-                            <directory name="lib/common/neutral" />
+-                        </probing-paths>
+-                        <modes>
+-                            <strict>
+-                                <environment>
+-                                    <variable name="COMPLUS_VERSION" value="v2.0.50727" />
+-                                </environment>
+-                            </strict>
+-                        </modes>
+-                    </runtime>
+-                    <reference-assemblies basedir="${path::combine(installRoot, 'v2.0.50727')}">
+-                        <include name="Accessibility.dll" />
+-                        <include name="cscompmgd.dll" />
+-                        <include name="mscorlib.dll" />
+-                        <include name="Microsoft.Build.Utilities.dll" />
+-                        <include name="Microsoft.Vsa.dll" />
+-                        <include name="Microsoft.VisualBasic.dll" />
+-                        <include name="Microsoft.VisualBasic.Compatibility.dll" />
+-                        <include name="Microsoft.VisualBasic.Compatibility.Data.dll" />
+-                        <include name="System.Configuration.dll" />
+-                        <include name="System.Configuration.Install.dll" />
+-                        <include name="System.Data.dll" />
+-                        <include name="System.Data.OracleClient.dll" />
+-                        <include name="System.Data.SqlXml.dll" />
+-                        <include name="System.Deployment.dll" />
+-                        <include name="System.Design.dll" />
+-                        <include name="System.DirectoryServices.dll" />
+-                        <include name="System.dll" />
+-                        <include name="System.Drawing.Design.dll" />
+-                        <include name="System.Drawing.dll" />
+-                        <include name="System.EnterpriseServices.dll" />
+-                        <include name="System.Management.dll" />
+-                        <include name="System.Messaging.dll" />
+-                        <include name="System.Runtime.Remoting.dll" />
+-                        <include name="System.Runtime.Serialization.Formatters.Soap.dll" />
+-                        <include name="System.Security.dll" />
+-                        <include name="System.ServiceProcess.dll" />
+-                        <include name="System.Transactions.dll" />
+-                        <include name="System.Web.dll" />
+-                        <include name="System.Web.Mobile.dll" />
+-                        <include name="System.Web.RegularExpressions.dll" />
+-                        <include name="System.Web.Services.dll" />
+-                        <include name="System.Windows.Forms.dll" />
+-                        <include name="System.XML.dll" />
+-                    </reference-assemblies>
+-                    <reference-assemblies basedir="${environment::get-folder-path('ProgramFiles')}/Reference Assemblies/Microsoft/Framework/v3.5">
+-                        <include name="Microsoft.Build.Engine.dll" />
+-                        <include name="Microsoft.Build.Framework.dll" />
+-                        <include name="System.AddIn.Contract.dll" />
+-                        <include name="System.AddIn.dll" />
+-                        <include name="System.ComponentModel.DataAnnotations.dll" />
+-                        <include name="System.Core.dll" />
+-                        <include name="System.Data.DataSetExtensions.dll" />
+-                        <include name="System.Data.Entity.Design.dll" />
+-                        <include name="System.Data.Entity.dll" />
+-                        <include name="System.Data.Linq.dll" />
+-                        <include name="System.Data.Services.Client.dll" />
+-                        <include name="System.Data.Services.Design.dll" />
+-                        <include name="System.Data.Services.dll" />
+-                        <include name="System.DirectoryServices.AccountManagement.dll" />
+-                        <include name="System.Management.Instrumentation.dll" />
+-                        <include name="System.Net.dll" />
+-                        <include name="System.ServiceModel.Web.dll" />
+-                        <include name="System.Web.Abstractions.dll" />
+-                        <include name="System.Web.DynamicData.Design.dll" />
+-                        <include name="System.Web.DynamicData.dll" />
+-                        <include name="System.Web.Entitly.Design.dll" />
+-                        <include name="System.Web.Entitly.dll" />
+-                        <include name="System.Web.Extensions.Design.dll" />
+-                        <include name="System.Web.Extensions.dll" />
+-                        <include name="System.Web.Routing.dll" />
+-                        <include name="System.Windows.Presentation.dll" />
+-                        <include name="System.WorkflowServices.dll" />
+-                        <include name="System.Xml.Linq.dll" />
+-                    </reference-assemblies>
+-                    <reference-assemblies basedir="${environment::get-folder-path('ProgramFiles')}/Reference Assemblies/Microsoft/Framework/v3.0">
+-                        <include name="PresentationBuildTasks.dll" />
+-                        <include name="PresentationCore.dll" />
+-                        <include name="PresentationFramework.Aero.dll" />
+-                        <include name="PresentationFramework.Classic.dll" />
+-                        <include name="PresentationFramework.dll" />
+-                        <include name="PresentationFramework.Luna.dll" />
+-                        <include name="PresentationFramework.Royale.dll" />
+-                        <include name="ReachFramework.dll" />
+-                        <include name="System.IdentityModel.dll" />
+-                        <include name="System.IdentityModel.Selectors.dll" />
+-                        <include name="System.IO.Log.dll" />
+-                        <include name="System.Printing.dll" />
+-                        <include name="System.Runtime.Serialization.dll" />
+-                        <include name="System.ServiceModel.dll" />
+-                        <include name="System.Speech.dll" />
+-                        <include name="System.Workflow.Activities.dll" />
+-                        <include name="System.Workflow.ComponentModel.dll" />
+-                        <include name="System.Workflow.Runtime.dll" />
+-                        <include name="UIAutomationClient.dll" />
+-                        <include name="UIAutomationClientsideProviders.dll" />
+-                        <include name="UIAutomationProvider.dll" />
+-                        <include name="UIAutomationTypes.dll" />
+-                        <include name="WindowsBase.dll" />
+-                        <include name="WindowsFormsIntegration.dll" />
+-                    </reference-assemblies>
+-                    <task-assemblies>
+-                        <!-- include MS.NET version-neutral assemblies -->
+-                        <include name="extensions/net/neutral/**/*.dll" />
+-                        <!-- include MS.NET 2.0 specific assemblies -->
+-                        <include name="extensions/net/2.0/**/*.dll" />
+-                        <!-- include MS.NET specific task assembly -->
+-                        <include name="NAnt.MSNetTasks.dll" />
+-                        <!-- include MS.NET specific test assembly -->
+-                        <include name="NAnt.MSNet.Tests.dll" />
+-                        <!-- include .NET 2.0 specific assemblies -->
+-                        <include name="extensions/common/2.0/**/*.dll" />
+-                    </task-assemblies>
+-                    <tool-paths>
+-                        <directory name="${sdkInstallRoot}"
+-                            if="${property::exists('sdkInstallRoot')}" />
+-                        <directory name="${path::combine(installRoot, 'v3.5')}" />
+-                        <directory name="${path::combine(installRoot, 'v2.0.50727')}" />
+-                    </tool-paths>
+-                    <project>
+-                        <readregistry
+-                            property="installRoot"
+-                            key="SOFTWARE\Microsoft\.NETFramework\InstallRoot"
+-                            hive="LocalMachine" />
+-                        <locatesdk property="sdkInstallRoot" minwinsdkver="v6.0A" maxnetfxver="3.5" failonerror="false" />
+-                    </project>
+-                    <tasks>
+-                        <task name="csc">
+-                            <attribute name="supportsnowarnlist">true</attribute>
+-                            <attribute name="supportswarnaserrorlist">true</attribute>
+-                            <attribute name="supportskeycontainer">true</attribute>
+-                            <attribute name="supportskeyfile">true</attribute>
+-                            <attribute name="supportsdelaysign">true</attribute>
+-                            <attribute name="supportsplatform">true</attribute>
+-                            <attribute name="supportslangversion">true</attribute>
+-                        </task>
+-                        <task name="vbc">
+-                            <attribute name="supportsdocgeneration">true</attribute>
+-                            <attribute name="supportsnostdlib">true</attribute>
+-                            <attribute name="supportsnowarnlist">true</attribute>
+-                            <attribute name="supportskeycontainer">true</attribute>
+-                            <attribute name="supportskeyfile">true</attribute>
+-                            <attribute name="supportsdelaysign">true</attribute>
+-                            <attribute name="supportsplatform">true</attribute>
+-                            <attribute name="supportswarnaserrorlist">true</attribute>
+-                        </task>
+-                        <task name="jsc">
+-                            <attribute name="supportsplatform">true</attribute>
+-                        </task>
+-                        <task name="vjc">
+-                            <attribute name="supportsnowarnlist">true</attribute>
+-                            <attribute name="supportskeycontainer">true</attribute>
+-                            <attribute name="supportskeyfile">true</attribute>
+-                            <attribute name="supportsdelaysign">true</attribute>
+-                        </task>
+-                        <task name="resgen">
+-                            <attribute name="supportsassemblyreferences">true</attribute>
+-                            <attribute name="supportsexternalfilereferences">true</attribute>
+-                        </task>
+-                        <task name="delay-sign">
+-                            <attribute name="exename">sn</attribute>
+-                        </task>
+-                        <task name="license">
+-                            <attribute name="exename">lc</attribute>
+-                            <attribute name="supportsassemblyreferences">true</attribute>
+-                        </task>
+-                    </tasks>
+-                </framework>
+-                <framework 
+-                    name="net-4.0"
+-                    family="net"
+-                    version="4.0"
+-                    description="Microsoft .NET Framework 4.0"
+-                    sdkdirectory="${sdkInstallRoot}"
+-                    frameworkdirectory="${path::combine(installRoot, 'v4.0.30319')}"
+-                    frameworkassemblydirectory="${path::combine(installRoot, 'v4.0.30319')}"
+-                    clrversion="4.0.30319"
+-                    clrtype="Desktop"
+-                    vendor="Microsoft"
+-                    >
+-                    <runtime>
+-                        <probing-paths>
+-                            <directory name="lib/common/2.0" />
+-                            <directory name="lib/common/neutral" />
+-                        </probing-paths>
+-                        <modes>
+-                            <strict>
+-                                <environment>
+-                                    <variable name="COMPLUS_VERSION" value="v4.0.30319" />
+-                                </environment>
+-                            </strict>
+-                        </modes>
+-                    </runtime>
+-                    <reference-assemblies basedir="${path::combine(installRoot, 'v4.0.30319')}">
+-                        <include name="Accessibility.dll" />
+-                        <include name="Microsoft.Build.Conversion.v4.0.dll" />
+-                        <include name="Microsoft.Build.dll" />
+-                        <include name="Microsoft.Build.Engine.dll" />
+-                        <include name="Microsoft.Build.Framework.dll" />
+-                        <include name="Microsoft.Build.Tasks.v4.0.dll" />
+-                        <include name="Microsoft.Build.Utilities.v4.0.dll" />
+-                        <include name="Microsoft.CSharp.dll" />
+-                        <include name="Microsoft.Data.Entity.Build.Tasks.dll" />
+-                        <include name="Microsoft.JScript.dll" />
+-                        <include name="Microsoft.Transactions.Bridge.dll" />
+-                        <include name="Microsoft.Transactions.Bridge.Dtc.dll" />
+-                        <include name="Microsoft.VisualBasic.Activities.Compiler.dll" />
+-                        <include name="Microsoft.VisualBasic.Compatibility.Data.dll" />
+-                        <include name="Microsoft.VisualBasic.Compatibility.dll" />
+-                        <include name="Microsoft.VisualBasic.dll" />
+-                        <include name="Microsoft.VisualC.dll" />
+-                        <include name="Microsoft.VisualC.STLCLR.dll" />
+-                        <include name="mscorlib.dll" />
+-                        <include name="System.Activities.Core.Presentation.dll" />
+-                        <include name="System.Activities.dll" />
+-                        <include name="System.Activities.DurableInstancing.dll" />
+-                        <include name="System.Activities.Presentation.dll" />
+-                        <include name="System.AddIn.Contract" />
+-                        <include name="System.AddIn.dll" />
+-                        <include name="System.ComponentModel.Composition.dll" />
+-                        <include name="System.ComponentModel.DataAnnotations.dll" />
+-                        <include name="System.Configuration.dll" />
+-                        <include name="System.Configuration.Install.dll" />
+-                        <include name="System.Core.dll" />
+-                        <include name="System.Data.DataSetExtensions.dll" />
+-                        <include name="System.Data.dll" />
+-                        <include name="System.Data.Entity.Design.dll" />
+-                        <include name="System.Data.Entity.dll" />
+-                        <include name="System.Data.Linq.dll" />
+-                        <include name="System.Data.OracleClient.dll" />
+-                        <include name="System.Data.Services.Client.dll" />
+-                        <include name="System.Data.Services.Design.dll" />
+-                        <include name="System.Data.Services.dll" />
+-                        <include name="System.Data.SqlXml.dll" />
+-                        <include name="System.Deployment.dll" />
+-                        <include name="System.Design.dll" />
+-                        <include name="System.Device.dll" />
+-                        <include name="System.DirectoryServices.dll" />
+-                        <include name="System.DirectoryServices.Protocols.dll" />
+-                        <include name="System.dll" />
+-                        <include name="System.Drawing.Design.dll" />
+-                        <include name="System.Drawing.dll" />
+-                        <include name="System.Dynamic.dll" />
+-                        <include name="System.EnterpriseServices.dll" />
+-                        <include name="System.EnterpriseServices.Thunk.dll" />
+-                        <include name="System.EnterpriseServices.Wrapper.dll" />
+-                        <include name="System.IdentityModel.dll" />
+-                        <include name="System.IdentityModel.Selectors.dll" />
+-                        <include name="System.IO.Log.dll" />
+-                        <include name="System.Management.dll" />
+-                        <include name="System.Management.Instrumentation.dll" />
+-                        <include name="System.Messaging.dll" />
+-                        <include name="System.Net.dll" />
+-                        <include name="System.Numerics.dll" />
+-                        <include name="System.Runtime.Caching.dll" />
+-                        <include name="System.Runtime.DurableInstancing.dll" />
+-                        <include name="System.Runtime.Remoting.dll" />
+-                        <include name="System.Runtime.Serialization.dll" />
+-                        <include name="System.Runtime.Serialization.Formatters.Soap.dll" />
+-                        <include name="System.Security.dll" />
+-                        <include name="System.ServiceModel.Activation.dll" />
+-                        <include name="System.ServiceModel.Activities.dll" />
+-                        <include name="System.ServiceModel.Channels.dll" />
+-                        <include name="System.ServiceModel.Discovery.dll" />
+-                        <include name="System.ServiceModel.dll" />
+-                        <include name="System.ServiceModel.Routing.dll" />
+-                        <include name="System.ServiceModel.ServiceMoniker40.dll" />
+-                        <include name="System.ServiceModel.WasHosting.dll" />
+-                        <include name="System.ServiceModel.Web.dll" />
+-                        <include name="System.ServiceProcess.dll" />
+-                        <include name="System.Transactions.dll" />
+-                        <include name="System.Web.Abstractions.dll" />
+-                        <include name="System.Web.ApplicationServices.dll" />
+-                        <include name="System.Web.DataVisualization.Design.dll" />
+-                        <include name="System.Web.DataVisualization.dll" />
+-                        <include name="System.Web.dll" />
+-                        <include name="System.Web.DynamicData.Design.dll" />
+-                        <include name="System.Web.DynamicData.dll" />
+-                        <include name="System.Web.Entity.Design.dll" />
+-                        <include name="System.Web.Entity.dll" />
+-                        <include name="System.Web.Extensions.Design.dll" />
+-                        <include name="System.Web.Extensions.dll" />
+-                        <include name="System.Web.Mobile.dll" />
+-                        <include name="System.Web.RegularExpressions.dll" />
+-                        <include name="System.Web.Routing.dll" />
+-                        <include name="System.Web.Services.dll" />
+-                        <include name="System.Windows.Forms.DataVisualization.Design.dll" />
+-                        <include name="System.Windows.Forms.DataVisualization.dll" />
+-                        <include name="System.Windows.Forms.dll" />
+-                        <include name="System.Workflow.Activities.dll" />
+-                        <include name="System.Workflow.ComponentModel.dll" />
+-                        <include name="System.Workflow.Runtime.dll" />
+-                        <include name="System.WorkflowServices.dll" />
+-                        <include name="System.Xaml.dll" />
+-                        <include name="System.Xaml.Hosting.dll" />
+-                        <include name="System.Xml.dll" />
+-                        <include name="System.Xml.Linq.dll" />
+-                    </reference-assemblies>
+-                    <!-- WPF Assemblies -->
+-                    <reference-assemblies basedir="${path::combine(installRoot, 'v4.0.30319')}/WPF">
+-                        <include name="NaturalLanguage6.dll" />
+-                        <include name="NlsData0009.dll" />
+-                        <include name="NlsLexicons0009.dll" />
+-                        <include name="PenIMC.dll" />
+-                        <include name="PresentationCore.dll" />
+-                        <include name="PresentationFramework.Aero.dll" />
+-                        <include name="PresentationFramework.Classic.dll" />
+-                        <include name="PresentationFramework.dll" />
+-                        <include name="PresentationFramework.Luna.dll" />
+-                        <include name="PresentationFramework.Royale.dll" />
+-                        <include name="PresentationHost_v0400.dll" />
+-                        <include name="PresentationNative_v0400.dll" />
+-                        <include name="PresentationUI.dll" />
+-                        <include name="ReachFramework.dll" />
+-                        <include name="System.Printing.dll" />
+-                        <include name="System.Speech.dll" />
+-                        <include name="System.Windows.Input.Manipulations.dll" />
+-                        <include name="System.Windows.Presentation.dll" />
+-                        <include name="UIAutomationClient.dll" />
+-                        <include name="UIAutomationClientsideProviders.dll" />
+-                        <include name="UIAutomationProvider.dll" />
+-                        <include name="UIAutomationTypes.dll" />
+-                        <include name="WindowsBase.dll" />
+-                        <include name="WindowsFormsIntegration.dll" />
+-                        <include name="wpfgfx_v0400.dll" />
+-                        <include name="wpftxt_v0400.dll" />
+-                    </reference-assemblies>
+-                    <reference-assemblies basedir="${environment::get-folder-path('ProgramFiles')}/Reference Assemblies/Microsoft/Framework/.NETFramework/v4.0">
+-                        <include name="Microsoft.Build.Conversion.v4.0.dll" />
+-                        <include name="Microsoft.Build.dll" />
+-                        <include name="Microsoft.Build.Engine.dll" />
+-                        <include name="Microsoft.Build.Framework.dll" />
+-                        <include name="Microsoft.Build.Tasks.v4.0.dll" />
+-                        <include name="Microsoft.Build.Utilities.v4.0.dll" />
+-                        <include name="Microsoft.CSharp.dll" />
+-                        <include name="Microsoft.JScript.dll" />
+-                        <include name="Microsoft.VisualBasic.Compatibility.Data.dll" />
+-                        <include name="Microsoft.VisualBasic.Comptatibility.dll" />
+-                        <include name="Microsoft.VisualBasic.dll" />
+-                        <include name="Microsoft.VisualC.dll" />
+-                        <include name="Microsoft.VisualC.STLCLR.dll" />
+-                        <include name="mscorlib.dll" />
+-                        <include name="PresentationBuildTasks.dll" />
+-                        <include name="PresentationCore.dll" />
+-                        <include name="WindowsBase.dll" />
+-                        <include name="PresentationFramework.dll" />
+-                        <include name="PresentationFramework.Aero.dll" />
+-                        <include name="PresentationFramework.Classic.dll" />
+-                        <include name="PresentationFramework.Luna.dll" />
+-                        <include name="PresentationFramework.Royale.dll" />
+-                        <include name="ReachFramework.dll" />
+-                        <include name="System.Activities.Core.Presentation.dll" />
+-                        <include name="System.Activities.dll" />
+-                        <include name="System.Activities.DurableInstancing.dll" />
+-                        <include name="System.Activities.Presentation.dll" />
+-                        <include name="System.AddIn.Contract.dll" />
+-                        <include name="System.AddIn.dll" />
+-                        <include name="System.ComponentModel.Composition.dll" />
+-                        <include name="System.ComponentModel.DataAnnotations.dll" />
+-                        <include name="System.Configuration.dll" />
+-                        <include name="System.Core.dll" />
+-                        <include name="System.Data.DataSetExtension.dll" />
+-                        <include name="System.Data.dll" />
+-                        <include name="System.Data.Entity.Design.dll" />
+-                        <include name="System.Data.Entity.dll" />
+-                        <include name="System.Data.Linq.dll" />
+-                        <include name="System.Data.OracleClient.dll" />
+-                        <include name="System.Data.Services.Client.dll" />
+-                        <include name="System.Data.Services.Design.dll" />
+-                        <include name="System.Data.Services.dll" />
+-                        <include name="System.Data.SqlXml.dll" />
+-                        <include name="System.Deployment.dll" />
+-                        <include name="System.Design.dll" />
+-                        <include name="System.Device.dll" />
+-                        <include name="System.DirectoryServices.AccountManagement.dll" />
+-                        <include name="System.DirectoryServices.dll" />
+-                        <include name="System.DirectoryServices.Protocols.dll" />
+-                        <include name="System.dll" />
+-                        <include name="System.Drawing.Design.dll" />
+-                        <include name="System.Drawing.dll" />
+-                        <include name="System.EnterpriseServices.dll" />
+-                        <include name="System.EnterpriseServices.Thunk.dll" />
+-                        <include name="System.EnterpriseServices.Wrapper.dll" />
+-                        <include name="System.IdentityModel.dll" />
+-                        <include name="System.IdentityModel.Selectors.dll" />
+-                        <include name="System.IO.Log.dll" />
+-                        <include name="System.Management.dll" />
+-                        <include name="System.Management.Instrumentation.dll" />
+-                        <include name="System.Messaging.dll" />
+-                        <include name="System.Net.dll" />
+-                        <include name="System.Numerics.dll" />
+-                        <include name="System.Printing.dll" />
+-                        <include name="System.Runtime.Caching.dll" />
+-                        <include name="System.Runtime.DurableInstancing.dll" />
+-                        <include name="System.Runtime.Remoting.dll" />
+-                        <include name="System.Runtime.Serialization.dll" />
+-                        <include name="System.Runtime.Serialization.Formatters.Soap.dll" />
+-                        <include name="System.Security.dll" />
+-                        <include name="System.ServiceModel.Activation.dll" />
+-                        <include name="System.ServiceModel.Activities.dll" />
+-                        <include name="System.ServiceModel.Channels.dll" />
+-                        <include name="System.ServiceModel.Discovery.dll" />
+-                        <include name="System.ServiceModel.dll" />
+-                        <include name="System.ServiceModel.Routing.dll" />
+-                        <include name="System.ServiceModel.Web.dll" />
+-                        <include name="System.ServiceProcess.dll" />
+-                        <include name="System.Speech.dll" />
+-                        <include name="System.Transactions.dll" />
+-                        <include name="System.Web.Abstractions.dll" />
+-                        <include name="System.Web.ApplicationServices.dll" />
+-                        <include name="System.Web.DataVisualization.Design.dll" />
+-                        <include name="System.Web.DataVisualization.dll" />
+-                        <include name="System.Web.dll" />
+-                        <include name="System.Web.DynamicData.Design.dll" />
+-                        <include name="System.Web.DynamicData.dll" />
+-                        <include name="System.Web.Entity.Design.dll" />
+-                        <include name="System.Web.Entity.dll" />
+-                        <include name="System.Web.Extensions.Design.dll" />
+-                        <include name="System.Web.Extensions.dll" />
+-                        <include name="System.Web.Mobile.dll" />
+-                        <include name="System.Web.RegularExpressions.dll" />
+-                        <include name="System.Web.Routing.dll" />
+-                        <include name="System.Web.Services.dll" />
+-                        <include name="System.Windows.Forms.DataVisualization.Design.dll" />
+-                        <include name="System.Windows.Forms.DataVisualization.dll" />
+-                        <include name="System.Windows.Forms.dll" />
+-                        <include name="System.Windows.Input.Manipulations.dll" />
+-                        <include name="System.Windows.Presentation.dll" />
+-                        <include name="System.Workflow.Activities.dll" />
+-                        <include name="System.Workflow.ComponentModel.dll" />
+-                        <include name="System.Workflow.Runtime.dll" />
+-                        <include name="System.WorkflowServices.dll" />
+-                        <include name="System.Xaml.dll" />
+-                        <include name="System.Xml.dll" />
+-                        <include name="System.Xml.Linq.dll" />
+-                    </reference-assemblies>
+-                    <task-assemblies>
+-                        <!-- include MS.NET version-neutral assemblies -->
+-                        <include name="extensions/net/neutral/**/*.dll" />
+-                        <!-- include MS.NET 4.0 specific assemblies -->
+-                        <include name="extensions/net/4.0/**/*.dll" />
+-                        <!-- include MS.NET specific task assembly -->
+-                        <include name="NAnt.MSNetTasks.dll" />
+-                        <!-- include MS.NET specific test assembly -->
+-                        <include name="NAnt.MSNet.Tests.dll" />
+-                        <!-- include .NET 4.0 specific assemblies -->
+-                        <include name="extensions/common/4.0/**/*.dll" />
+-                    </task-assemblies>
+-                    <tool-paths>
+-                        <directory name="${sdkInstallRoot}"
+-                            if="${property::exists('sdkInstallRoot')}" />
+-                        <directory name="${path::combine(installRoot, 'v4.0.30319')}" />
+-                    </tool-paths>
+-                    <project>
+-                        <readregistry
+-                            property="installRoot"
+-                            key="SOFTWARE\Microsoft\.NETFramework\InstallRoot"
+-                            hive="LocalMachine" />
+-                        <locatesdk property="sdkInstallRoot" minwinsdkver="v7.0A" minnetfxver="4.0" maxnetfxver="4.0.99999" failonerror="false" />
+-                    </project>
+-                    <tasks>
+-                        <task name="csc">
+-                            <attribute name="supportsnowarnlist">true</attribute>
+-                            <attribute name="supportswarnaserrorlist">true</attribute>
+-                            <attribute name="supportskeycontainer">true</attribute>
+-                            <attribute name="supportskeyfile">true</attribute>
+-                            <attribute name="supportsdelaysign">true</attribute>
+-                            <attribute name="supportsplatform">true</attribute>
+-                            <attribute name="supportslangversion">true</attribute>
+-                        </task>
+-                        <task name="vbc">
+-                            <attribute name="supportsdocgeneration">true</attribute>
+-                            <attribute name="supportsnostdlib">true</attribute>
+-                            <attribute name="supportsnowarnlist">true</attribute>
+-                            <attribute name="supportskeycontainer">true</attribute>
+-                            <attribute name="supportskeyfile">true</attribute>
+-                            <attribute name="supportsdelaysign">true</attribute>
+-                            <attribute name="supportsplatform">true</attribute>
+-                            <attribute name="supportswarnaserrorlist">true</attribute>
+-                        </task>
+-                        <task name="jsc">
+-                            <attribute name="supportsplatform">true</attribute>
+-                        </task>
+-                        <task name="vjc">
+-                            <attribute name="supportsnowarnlist">true</attribute>
+-                            <attribute name="supportskeycontainer">true</attribute>
+-                            <attribute name="supportskeyfile">true</attribute>
+-                            <attribute name="supportsdelaysign">true</attribute>
+-                        </task>
+-                        <task name="resgen">
+-                            <attribute name="supportsassemblyreferences">true</attribute>
+-                            <attribute name="supportsexternalfilereferences">true</attribute>
+-                        </task>
+-                        <task name="delay-sign">
+-                            <attribute name="exename">sn</attribute>
+-                        </task>
+-                        <task name="license">
+-                            <attribute name="exename">lc</attribute>
+-                            <attribute name="supportsassemblyreferences">true</attribute>
+-                        </task>
+-                    </tasks>
+-                </framework>
+-                <framework 
+-                    name="netcf-1.0"
+-                    family="netcf"
+-                    version="1.0"
+-                    description="Microsoft .NET Compact Framework 1.0"
+-                    sdkdirectory="${path::combine(sdkInstallRoot, 'v1.0.5000\bin')}"
+-                    frameworkdirectory="${path::combine(installRoot, 'v1.1.4322')}"
+-                    frameworkassemblydirectory="${path::combine(sdkInstallRoot, 'v1.0.5000\Windows CE')}"
+-                    clrversion="1.1.4322"
+-                    clrtype="Compact"
+-                    vendor="Microsoft"
+-                    >
+-                    <runtime>
+-                        <modes>
+-                            <strict>
+-                                <environment>
+-                                    <variable name="COMPLUS_VERSION" value="v1.1.4322" />
+-                                </environment>
+-                            </strict>
+-                        </modes>
+-                    </runtime>
+-                    <reference-assemblies basedir="${path::combine(sdkInstallRoot, 'v1.0.5000\Windows CE')}">
+-                        <include name="*.dll" />
+-                    </reference-assemblies>
+-                    <task-assemblies>
+-                        <!-- this is not a supported runtime framework -->
+-                    </task-assemblies>
+-                    <tool-paths>
+-                        <directory name="${path::combine(sdkInstallRoot, 'v1.0.5000\bin')}" />
+-                        <directory name="${path::combine(installRoot, 'v1.1.4322')}" />
+-                        <directory name="${path::combine(sdkInstallRoot.DesktopFramework, 'bin')}" />
+-                    </tool-paths>
+-                    <project>
+-                        <readregistry
+-                            property="installRoot"
+-                            key="SOFTWARE\Microsoft\.NETFramework\InstallRoot"
+-                            hive="LocalMachine" />
+-                        <readregistry
+-                            property="sdkInstallRoot"
+-                            key="SOFTWARE\Microsoft\.NETCompactFramework\sdkInstallRoot"
+-                            hive="LocalMachine" />
+-                        <readregistry
+-                            property="sdkInstallRoot.DesktopFramework"
+-                            key="SOFTWARE\Microsoft\.NETFramework\sdkInstallRootv1.1"
+-                            hive="LocalMachine" />
+-                        <fail if="${not directory::exists(sdkInstallRoot.DesktopFramework)}">The .NET Framework 1.1 SDK is not installed.</fail>
+-                    </project>
+-                    <tasks>
+-                        <task name="csc">
+-                            <attribute name="noconfig">true</attribute>
+-                            <attribute name="nostdlib">true</attribute>
+-                            <attribute name="supportsnowarnlist">true</attribute>
+-                        </task>
+-                        <task name="resgen">
+-                            <attribute name="exename">cfresgen</attribute>
+-                        </task>
+-                        <task name="delay-sign">
+-                            <attribute name="exename">sn</attribute>
+-                        </task>
+-                        <task name="license">
+-                            <attribute name="exename">lc</attribute>
+-                        </task>
+-                    </tasks>
+-                </framework>
+-                <framework 
+-                    name="netcf-2.0"
+-                    family="netcf"
+-                    version="2.0"
+-                    description="Microsoft .NET Compact Framework 2.0"
+-                    sdkdirectory="${path::combine(sdkInstallRoot.DesktopFramework, 'bin')}"
+-                    frameworkdirectory="${path::combine(installRoot, 'v2.0.50727')}"
+-                    frameworkassemblydirectory="${path::combine(sdkInstallRoot, 'WindowsCE')}"
+-                    clrversion="2.0.0"
+-                    clrtype="Compact"
+-                    vendor="Microsoft"
+-                    >
+-                    <runtime>
+-                        <modes>
+-                            <strict>
+-                                <environment>
+-                                    <variable name="COMPLUS_VERSION" value="v2.0.50727" />
+-                                </environment>
+-                            </strict>
+-                        </modes>
+-                    </runtime>
+-                    <reference-assemblies basedir="${path::combine(sdkInstallRoot, 'WindowsCE')}">
+-                        <include name="*.dll" />
+-                    </reference-assemblies>
+-                    <task-assemblies>
+-                        <!-- this is not a supported runtime framework -->
+-                    </task-assemblies>
+-                    <tool-paths>
+-                        <directory name="${path::combine(sdkInstallRoot.DesktopFramework, 'bin')}" />
+-                    </tool-paths>
+-                    <project>
+-                        <readregistry
+-                            property="installRoot"
+-                            key="SOFTWARE\Microsoft\.NETFramework\InstallRoot"
+-                            hive="LocalMachine" />
+-                        <readregistry
+-                            property="sdkInstallRoot"
+-                            key="SOFTWARE\Microsoft\.NETCompactFramework\v2.0.0.0\InstallRoot\"
+-                            hive="LocalMachine" />
+-                        <readregistry
+-                            property="sdkInstallRoot.DesktopFramework"
+-                            key="SOFTWARE\Microsoft\.NETFramework\sdkInstallRootv2.0"
+-                            hive="LocalMachine" />
+-                        <fail if="${not directory::exists(sdkInstallRoot.DesktopFramework)}">The .NET Framework 2.0 SDK is not installed.</fail>
+-                    </project>
+-                    <tasks>
+-                        <task name="csc">
+-                            <attribute name="noconfig">true</attribute>
+-                            <attribute name="nostdlib">true</attribute>
+-                            <attribute name="supportsnowarnlist">true</attribute>
+-                            <attribute name="supportswarnaserrorlist">true</attribute>
+-                            <attribute name="supportskeycontainer">true</attribute>
+-                            <attribute name="supportskeyfile">true</attribute>
+-                            <attribute name="supportsdelaysign">true</attribute>
+-                            <attribute name="supportsplatform">true</attribute>
+-                            <attribute name="supportslangversion">true</attribute>
+-                        </task>
+-                        <task name="vbc">
+-                            <attribute name="nostdlib">true</attribute>
+-                            <attribute name="supportsdocgeneration">true</attribute>
+-                            <attribute name="supportsnostdlib">true</attribute>
+-                            <attribute name="supportsnowarnlist">true</attribute>
+-                            <attribute name="supportskeycontainer">true</attribute>
+-                            <attribute name="supportskeyfile">true</attribute>
+-                            <attribute name="supportsdelaysign">true</attribute>
+-                            <attribute name="supportsplatform">true</attribute>
+-                            <attribute name="supportswarnaserrorlist">true</attribute>
+-                        </task>
+-                        <task name="resgen">
+-                            <attribute name="supportsassemblyreferences">true</attribute>
+-                            <attribute name="supportsexternalfilereferences">true</attribute>
+-                        </task>
+-                        <task name="delay-sign">
+-                            <attribute name="exename">sn</attribute>
+-                        </task>
+-                        <task name="license">
+-                            <attribute name="exename">lc</attribute>
+-                            <attribute name="supportsassemblyreferences">true</attribute>
+-                        </task>
+-                    </tasks>
+-                </framework>
+-                <framework 
+-                    name="silverlight-2.0"
+-                    family="silverlight"
+-                    version="2.0"
+-                    description="Microsoft Silverlight 2.0"
+-                    sdkdirectory="${path::combine(sdkInstallRoot, 'bin')}"
+-                    frameworkdirectory="${path::combine(installRoot, 'v3.5')}"
+-                    frameworkassemblydirectory="${SL2RefAssemblyBaseDir}"
+-                    clrversion="2.0.50727"
+-                    clrtype="Browser"
+-                    vendor="Microsoft"
+-                    >
+-                    <runtime>
+-                        <modes>
+-                            <strict>
+-                                <environment>
+-                                    <variable name="COMPLUS_VERSION" value="v2.0.50727" />
+-                                </environment>
+-                            </strict>
+-                        </modes>
+-                    </runtime>
+-                    <reference-assemblies basedir="${SL2RefAssemblyBaseDir}">
+-                        <include name="Microsoft.VisualBasic.dll" />
+-                        <include name="mscorlib.dll" />
+-                        <include name="System.Core.dll" />
+-                        <include name="System.dll" />
+-                        <include name="System.Net.dll" />
+-                        <include name="System.Runtime.Serialization.dll" />
+-                        <include name="System.ServiceModel.dll" />
+-                        <include name="System.ServiceModel.Web.dll" />
+-                        <include name="System.Windows.Browser.dll" />
+-                        <include name="System.Windows.dll" />
+-                        <include name="System.Xml.dll" />
+-                    </reference-assemblies>
+-                    <task-assemblies>
+-                        <!-- include MS.NET version-neutral assemblies -->
+-                        <include name="extensions/net/neutral/**/*.dll" />
+-                        <!-- include MS.NET 2.0 specific assemblies -->
+-                        <include name="extensions/net/2.0/**/*.dll" />
+-                        <!-- include MS.NET specific task assembly -->
+-                        <include name="NAnt.MSNetTasks.dll" />
+-                        <!-- include MS.NET specific test assembly -->
+-                        <include name="NAnt.MSNet.Tests.dll" />
+-                        <!-- include .NET 2.0 specific assemblies -->
+-                        <include name="extensions/common/2.0/**/*.dll" />
+-                    </task-assemblies>
+-                    <tool-paths>
+-                        <directory name="${SL2RefAssemblyBaseDir}" />
+-                        <directory name="${path::combine(sdkInstallRoot, 'bin')}"
+-                            if="${property::exists('sdkInstallRoot')}" />
+-                        <directory name="${path::combine(installRoot, 'v3.5')}" />
+-                        <directory name="${path::combine(installRoot, 'v2.0.50727')}" />
+-                    </tool-paths>
+-                    <project>
+-                        <readregistry property="SL2RefAssemblyBaseDir" 
+-                            key="SOFTWARE\Microsoft\Microsoft SDKs\Silverlight\v2.0\ReferenceAssemblies\SLRuntimeInstallPath" 
+-                            hive="LocalMachine" />
+-                        <readregistry
+-                            property="installRoot"
+-                            key="SOFTWARE\Microsoft\.NETFramework\InstallRoot"
+-                            hive="LocalMachine" />
+-                        <locatesdk property="sdkInstallRoot" minwinsdkver="v6.0A" maxnetfxver="3.5" failonerror="false" />
+-                    </project>
+-                    <tasks>
+-                        <task name="csc">
+-                            <attribute name="noconfig">true</attribute>
+-                            <attribute name="nostdlib">true</attribute>
+-                            <attribute name="supportsnowarnlist">true</attribute>
+-                            <attribute name="supportswarnaserrorlist">true</attribute>
+-                            <attribute name="supportskeycontainer">true</attribute>
+-                            <attribute name="supportskeyfile">true</attribute>
+-                            <attribute name="supportsdelaysign">true</attribute>
+-                            <attribute name="supportsplatform">true</attribute>
+-                            <attribute name="supportslangversion">true</attribute>
+-                        </task>
+-                        <task name="vbc">
+-                            <attribute name="nostdlib">true</attribute>
+-                            <attribute name="supportsdocgeneration">true</attribute>
+-                            <attribute name="supportsnostdlib">true</attribute>
+-                            <attribute name="supportsnowarnlist">true</attribute>
+-                            <attribute name="supportskeycontainer">true</attribute>
+-                            <attribute name="supportskeyfile">true</attribute>
+-                            <attribute name="supportsdelaysign">true</attribute>
+-                            <attribute name="supportsplatform">true</attribute>
+-                            <attribute name="supportswarnaserrorlist">true</attribute>
+-                        </task>
+-                        <task name="jsc">
+-                            <attribute name="supportsplatform">true</attribute>
+-                        </task>
+-                        <task name="vjc">
+-                            <attribute name="supportsnowarnlist">true</attribute>
+-                            <attribute name="supportskeycontainer">true</attribute>
+-                            <attribute name="supportskeyfile">true</attribute>
+-                            <attribute name="supportsdelaysign">true</attribute>
+-                        </task>
+-                        <task name="resgen">
+-                            <attribute name="supportsassemblyreferences">true</attribute>
+-                            <attribute name="supportsexternalfilereferences">true</attribute>
+-                        </task>
+-                        <task name="delay-sign">
+-                            <attribute name="exename">sn</attribute>
+-                        </task>
+-                        <task name="license">
+-                            <attribute name="exename">lc</attribute>
+-                            <attribute name="supportsassemblyreferences">true</attribute>
+-                        </task>
+-                    </tasks>
+-                </framework>
+-                <framework
+-                    name="silverlight-3.0"
+-                    family="silverlight"
+-                    version="3.0"
+-                    description="Microsoft Silverlight 3.0"
+-                    sdkdirectory="${path::combine(sdkInstallRoot, 'bin')}"
+-                    frameworkdirectory="${path::combine(installRoot, 'v3.5')}"
+-                    frameworkassemblydirectory="${SL3RefAssemblyBaseDir}"
+-                    clrversion="2.0.50727"
+-                    clrtype="Browser"
+-                    vendor="Microsoft"
+-                    >
+-                    <runtime>
+-                        <modes>
+-                            <strict>
+-                                <environment>
+-                                    <variable name="COMPLUS_VERSION" value="v2.0.50727" />
+-                                </environment>
+-                            </strict>
+-                        </modes>
+-                    </runtime>
+-                    <reference-assemblies basedir="${SL3RefAssemblyBaseDir}">
+-                        <include name="Microsoft.VisualBasic.dll" />
+-                        <include name="mscorlib.dll" />
+-                        <include name="System.Core.dll" />
+-                        <include name="System.dll" />
+-                        <include name="System.Xml.dll" />
+-                        <include name="System.Windows.dll" />
+-                        <include name="System.Windows.Browser.dll" />
+-                        <!-- Remaining libraries found in the Reference Assembly directory -->
+-                        <include name="agcore.debug.dll" />
+-                        <include name="agcore.dll" />
+-                        <include name="coreclr.dll" />
+-                        <include name="mscorrc.debug.dll" />
+-                        <include name="mscorrc.dll" />
+-                        <include name="npctrl.dll" />
+-                        <include name="npctrlui.dll" />
+-                        <include name="Silverlight.ConfigurationUI.dll" />
+-                        <include name="System.Net.dll" />
+-                        <include name="System.Runtime.Serialization.dll" />
+-                        <include name="System.ServiceModel.dll" />
+-                        <include name="System.ServiceModel.Web.dll" />
+-                    </reference-assemblies>
+-                    <task-assemblies>
+-                        <!-- include MS.NET version-neutral assemblies -->
+-                        <include name="extensions/net/neutral/**/*.dll" />
+-                        <!-- include MS.NET 2.0 specific assemblies -->
+-                        <include name="extensions/net/2.0/**/*.dll" />
+-                        <!-- include MS.NET specific task assembly -->
+-                        <include name="NAnt.MSNetTasks.dll" />
+-                        <!-- include MS.NET specific test assembly -->
+-                        <include name="NAnt.MSNet.Tests.dll" />
+-                        <!-- include .NET 2.0 specific assemblies -->
+-                        <include name="extensions/common/2.0/**/*.dll" />
+-                    </task-assemblies>
+-                    <tool-paths>
+-                        <directory name="${SL3RefAssemblyBaseDir}" />
+-                        <directory name="${path::combine(sdkInstallRoot, 'bin')}"
+-                            if="${property::exists('sdkInstallRoot')}" />
+-                        <directory name="${path::combine(installRoot, 'v3.5')}" />
+-                    </tool-paths>
+-                    <project>
+-                        <readregistry property="SL3RefAssemblyBaseDir" 
+-                            key="SOFTWARE\Microsoft\Microsoft SDKs\Silverlight\v3.0\ReferenceAssemblies\SLRuntimeInstallPath" 
+-                            hive="LocalMachine" />
+-                        <readregistry
+-                            property="installRoot"
+-                            key="SOFTWARE\Microsoft\.NETFramework\InstallRoot"
+-                            hive="LocalMachine" />
+-                        <locatesdk property="sdkInstallRoot" minwinsdkver="v6.0A" maxnetfxver="3.5" failonerror="false" />
+-                    </project>
+-                    <tasks>
+-                        <task name="csc">
+-                            <attribute name="noconfig">true</attribute>
+-                            <attribute name="nostdlib">true</attribute>
+-                            <attribute name="supportsnowarnlist">true</attribute>
+-                            <attribute name="supportswarnaserrorlist">true</attribute>
+-                            <attribute name="supportskeycontainer">true</attribute>
+-                            <attribute name="supportskeyfile">true</attribute>
+-                            <attribute name="supportsdelaysign">true</attribute>
+-                            <attribute name="supportsplatform">true</attribute>
+-                            <attribute name="supportslangversion">true</attribute>
+-                        </task>
+-                        <task name="vbc">
+-                            <attribute name="nostdlib">true</attribute>
+-                            <attribute name="supportsdocgeneration">true</attribute>
+-                            <attribute name="supportsnostdlib">true</attribute>
+-                            <attribute name="supportsnowarnlist">true</attribute>
+-                            <attribute name="supportskeycontainer">true</attribute>
+-                            <attribute name="supportskeyfile">true</attribute>
+-                            <attribute name="supportsdelaysign">true</attribute>
+-                            <attribute name="supportsplatform">true</attribute>
+-                            <attribute name="supportswarnaserrorlist">true</attribute>
+-                        </task>
+-                        <task name="jsc">
+-                            <attribute name="supportsplatform">true</attribute>
+-                        </task>
+-                        <task name="vjc">
+-                            <attribute name="supportsnowarnlist">true</attribute>
+-                            <attribute name="supportskeycontainer">true</attribute>
+-                            <attribute name="supportskeyfile">true</attribute>
+-                            <attribute name="supportsdelaysign">true</attribute>
+-                        </task>
+-                        <task name="resgen">
+-                            <attribute name="supportsassemblyreferences">true</attribute>
+-                            <attribute name="supportsexternalfilereferences">true</attribute>
+-                        </task>
+-                        <task name="delay-sign">
+-                            <attribute name="exename">sn</attribute>
+-                        </task>
+-                        <task name="license">
+-                            <attribute name="exename">lc</attribute>
+-                            <attribute name="supportsassemblyreferences">true</attribute>
+-                        </task>
+-                    </tasks>
+-                </framework>
+-                <framework
+-                    name="silverlight-4.0"
+-                    family="silverlight"
+-                    version="4.0"
+-                    description="Microsoft Silverlight 4.0"
+-                    sdkdirectory="${path::combine(sdkInstallRoot, 'bin')}"
+-                    frameworkdirectory="${path::combine(installRoot, 'v4.0.30319')}"
+-                    frameworkassemblydirectory="${SL4RefAssemblyBaseDir}"
+-                    clrversion="4.0.30319"
+-                    clrtype="Browser"
+-                    vendor="Microsoft"
+-                    >
+-                    <runtime>
+-                        <modes>
+-                            <strict>
+-                                <environment>
+-                                    <variable name="COMPLUS_VERSION" value="v4.0.30319" />
+-                                </environment>
+-                            </strict>
+-                        </modes>
+-                    </runtime>
+-                    <reference-assemblies basedir="${SL4RefAssemblyBaseDir}">
+-                        <include name="Microsoft.VisualBasic.dll" />
+-                        <include name="mscorlib.dll" />
+-                        <include name="System.Core.dll" />
+-                        <include name="system.dll" />
+-                        <include name="System.Xml.dll" />
+-                        <include name="System.Windows.dll" />
+-                        <include name="System.Windows.Browser.dll" />
+-                        <!-- Remaining libraries found in the Reference Assembly directory -->
+-                        <include name="agcore.debug.dll" />
+-                        <include name="agcore.dll" />
+-                        <include name="coreclr.dll" />
+-                        <include name="mscorrc.debug.dll" />
+-                        <include name="mscorrc.dll" />
+-                        <include name="npctrl.dll" />
+-                        <include name="npctrlui.dll" />
+-                        <include name="System.Net.dll" />
+-                        <include name="System.Runtime.Serialization.dll" />
+-                        <include name="System.ServiceModel.dll" />
+-                        <include name="System.ServiceModel.Web.dll" />
+-                    </reference-assemblies>
+-                    <task-assemblies>
+-                        <!-- include MS.NET version-neutral assemblies -->
+-                        <include name="extensions/net/neutral/**/*.dll" />
+-                        <!-- include MS.NET 4.0 specific assemblies -->
+-                        <include name="extensions/net/4.0/**/*.dll" />
+-                        <!-- include MS.NET specific task assembly -->
+-                        <include name="NAnt.MSNetTasks.dll" />
+-                        <!-- include MS.NET specific test assembly -->
+-                        <include name="NAnt.MSNet.Tests.dll" />
+-                        <!-- include .NET 4.0 specific assemblies -->
+-                        <include name="extensions/common/4.0/**/*.dll" />
+-                    </task-assemblies>
+-                    <tool-paths>
+-                        <directory name="${SL4RefAssemblyBaseDir}" />
+-                        <directory name="${path::combine(sdkInstallRoot, 'bin')}"
+-                            if="${property::exists('sdkInstallRoot')}" />
+-                        <directory name="${path::combine(installRoot, 'v4.0.30319')}" />
+-                    </tool-paths>
+-                    <project>
+-                        <readregistry property="SL4RefAssemblyBaseDir" 
+-                            key="SOFTWARE\Microsoft\Microsoft SDKs\Silverlight\v4.0\ReferenceAssemblies\SLRuntimeInstallPath"
+-                            hive="LocalMachine" />
+-                        <readregistry
+-                            property="installRoot"
+-                            key="SOFTWARE\Microsoft\.NETFramework\InstallRoot"
+-                            hive="LocalMachine" />
+-                        <locatesdk property="sdkInstallRoot" minwinsdkver="v7.0A" minnetfxver="4.0" maxnetfxver="4.0.99999" failonerror="false" />
+-                    </project>
+-                    <tasks>
+-                        <task name="csc">
+-                            <attribute name="noconfig">true</attribute>
+-                            <attribute name="nostdlib">true</attribute>
+-                            <attribute name="supportsnowarnlist">true</attribute>
+-                            <attribute name="supportswarnaserrorlist">true</attribute>
+-                            <attribute name="supportskeycontainer">true</attribute>
+-                            <attribute name="supportskeyfile">true</attribute>
+-                            <attribute name="supportsdelaysign">true</attribute>
+-                            <attribute name="supportsplatform">true</attribute>
+-                            <attribute name="supportslangversion">true</attribute>
+-                        </task>
+-                        <task name="vbc">
+-                            <attribute name="nostdlib">true</attribute>
+-                            <attribute name="supportsdocgeneration">true</attribute>
+-                            <attribute name="supportsnostdlib">true</attribute>
+-                            <attribute name="supportsnowarnlist">true</attribute>
+-                            <attribute name="supportskeycontainer">true</attribute>
+-                            <attribute name="supportskeyfile">true</attribute>
+-                            <attribute name="supportsdelaysign">true</attribute>
+-                            <attribute name="supportsplatform">true</attribute>
+-                            <attribute name="supportswarnaserrorlist">true</attribute>
+-                        </task>
+-                        <task name="jsc">
+-                            <attribute name="supportsplatform">true</attribute>
+-                        </task>
+-                        <task name="vjc">
+-                            <attribute name="supportsnowarnlist">true</attribute>
+-                            <attribute name="supportskeycontainer">true</attribute>
+-                            <attribute name="supportskeyfile">true</attribute>
+-                            <attribute name="supportsdelaysign">true</attribute>
+-                        </task>
+-                        <task name="resgen">
+-                            <attribute name="supportsassemblyreferences">true</attribute>
+-                            <attribute name="supportsexternalfilereferences">true</attribute>
+-                        </task>
+-                        <task name="delay-sign">
+-                            <attribute name="exename">sn</attribute>
+-                        </task>
+-                        <task name="license">
+-                            <attribute name="exename">lc</attribute>
+-                            <attribute name="supportsassemblyreferences">true</attribute>
+-                        </task>
+-                    </tasks>
+-                </framework>
+-                <framework
+-                    name="silverlight-5.0"
+-                    family="silverlight"
+-                    version="5.0"
+-                    description="Microsoft Silverlight 5.0"
+-                    sdkdirectory="${path::combine(sdkInstallRoot, 'bin')}"
+-                    frameworkdirectory="${path::combine(installRoot, 'v4.0.30319')}"
+-                    frameworkassemblydirectory="${SL5RefAssemblyBaseDir}"
+-                    clrversion="4.0.30319"
+-                    clrtype="Browser"
+-                    vendor="Microsoft"
+-                    >
+-                    <runtime>
+-                        <modes>
+-                            <strict>
+-                                <environment>
+-                                    <variable name="COMPLUS_VERSION" value="v4.0.30319" />
+-                                </environment>
+-                            </strict>
+-                        </modes>
+-                    </runtime>
+-                    <reference-assemblies basedir="${SL5RefAssemblyBaseDir}">
+-                        <include name="Microsoft.VisualBasic.dll" />
+-                        <include name="mscorlib.dll" />
+-                        <include name="System.Core.dll" />
+-                        <include name="system.dll" />
+-                        <include name="System.Xml.dll" />
+-                        <include name="System.Windows.dll" />
+-                        <include name="System.Windows.Browser.dll" />
+-                        <!-- Remaining libraries found in the Reference Assembly directory -->
+-                        <include name="agcore.debug.dll" />
+-                        <include name="agcore.dll" />
+-                        <include name="coreclr.dll" />
+-                        <include name="mscorrc.debug.dll" />
+-                        <include name="mscorrc.dll" />
+-                        <include name="npctrl.dll" />
+-                        <include name="npctrlui.dll" />
+-                        <include name="System.Net.dll" />
+-                        <include name="System.Runtime.Serialization.dll" />
+-                        <include name="System.ServiceModel.dll" />
+-                        <include name="System.ServiceModel.Web.dll" />
+-                        <!-- Remaining libraries are specific to XNA programming -->
+-                        <include name="Microsoft.Xna.Framework.dll" />
+-                        <include name="Microsoft.Xna.Framework.Graphics.dll" />
+-                        <include name="Microsoft.Xna.Framework.Graphics.Shaders.dll" />
+-                        <include name="System.Windows.Xna.dll" />
+-                    </reference-assemblies>
+-                    <task-assemblies>
+-                        <!-- include MS.NET version-neutral assemblies -->
+-                        <include name="extensions/net/neutral/**/*.dll" />
+-                        <!-- include MS.NET 4.0 specific assemblies -->
+-                        <include name="extensions/net/4.0/**/*.dll" />
+-                        <!-- include MS.NET specific task assembly -->
+-                        <include name="NAnt.MSNetTasks.dll" />
+-                        <!-- include MS.NET specific test assembly -->
+-                        <include name="NAnt.MSNet.Tests.dll" />
+-                        <!-- include .NET 4.0 specific assemblies -->
+-                        <include name="extensions/common/4.0/**/*.dll" />
+-                    </task-assemblies>
+-                    <tool-paths>
+-                        <directory name="${SL5RefAssemblyBaseDir}" />
+-                        <directory name="${path::combine(sdkInstallRoot, 'bin')}"
+-                            if="${property::exists('sdkInstallRoot')}" />
+-                        <directory name="${path::combine(installRoot, 'v4.0.30319')}" />
+-                    </tool-paths>
+-                    <project>
+-                        <readregistry property="SL5RefAssemblyBaseDir"
+-                            key="SOFTWARE\Microsoft\Microsoft SDKs\Silverlight\v5.0\ReferenceAssemblies\SLRuntimeInstallPath"
+-                            hive="LocalMachine" />
+-                        <readregistry
+-                            property="installRoot"
+-                            key="SOFTWARE\Microsoft\.NETFramework\InstallRoot"
+-                            hive="LocalMachine" />
+-                        <locatesdk property="sdkInstallRoot" minwinsdkver="v7.0A" minnetfxver="4.0" maxnetfxver="4.0.99999" failonerror="false" />
+-                    </project>
+-                    <tasks>
+-                        <task name="csc">
+-                            <attribute name="noconfig">true</attribute>
+-                            <attribute name="nostdlib">true</attribute>
+-                            <attribute name="supportsnowarnlist">true</attribute>
+-                            <attribute name="supportswarnaserrorlist">true</attribute>
+-                            <attribute name="supportskeycontainer">true</attribute>
+-                            <attribute name="supportskeyfile">true</attribute>
+-                            <attribute name="supportsdelaysign">true</attribute>
+-                            <attribute name="supportsplatform">true</attribute>
+-                            <attribute name="supportslangversion">true</attribute>
+-                        </task>
+-                        <task name="vbc">
+-                            <attribute name="nostdlib">true</attribute>
+-                            <attribute name="supportsdocgeneration">true</attribute>
+-                            <attribute name="supportsnostdlib">true</attribute>
+-                            <attribute name="supportsnowarnlist">true</attribute>
+-                            <attribute name="supportskeycontainer">true</attribute>
+-                            <attribute name="supportskeyfile">true</attribute>
+-                            <attribute name="supportsdelaysign">true</attribute>
+-                            <attribute name="supportsplatform">true</attribute>
+-                            <attribute name="supportswarnaserrorlist">true</attribute>
+-                        </task>
+-                        <task name="jsc">
+-                            <attribute name="supportsplatform">true</attribute>
+-                        </task>
+-                        <task name="vjc">
+-                            <attribute name="supportsnowarnlist">true</attribute>
+-                            <attribute name="supportskeycontainer">true</attribute>
+-                            <attribute name="supportskeyfile">true</attribute>
+-                            <attribute name="supportsdelaysign">true</attribute>
+-                        </task>
+-                        <task name="resgen">
+-                            <attribute name="supportsassemblyreferences">true</attribute>
+-                            <attribute name="supportsexternalfilereferences">true</attribute>
+-                        </task>
+-                        <task name="delay-sign">
+-                            <attribute name="exename">sn</attribute>
+-                        </task>
+-                        <task name="license">
+-                            <attribute name="exename">lc</attribute>
+-                            <attribute name="supportsassemblyreferences">true</attribute>
+-                        </task>
+-                    </tasks>
+-                </framework>
+-                <framework
+-                    name="mono-1.0"
+-                    family="mono"
+-                    version="1.0"
+-                    description="Mono 1.0 Profile"
+-                    sdkdirectory="${toolDirectory}"
+-                    frameworkdirectory="${toolDirectory}"
+-                    frameworkassemblydirectory="${path::combine(frameworkAssemblyDirectory, 'mono/1.0')}"
+-                    clrversion="1.1.4322"
+-                    clrtype="Desktop"
+-                    vendor="Mono"
+-                    >
+-                    <runtime>
+-                        <probing-paths>
+-                            <directory name="lib/mono/1.0" />
+-                            <directory name="lib/mono/neutral" />
+-                            <directory name="lib/common/1.1" />
+-                            <directory name="lib/common/neutral" />
+-                        </probing-paths>
+-                        <modes>
+-                            <auto>
+-                                <engine program="${runtimeEngine}" />
+-                                <environment>
+-                                    <variable name="PATH" path="${path::combine(sdkInstallRoot, 'bin')};%PATH%" />
+-                                    <variable name="MONO_CFG_DIR" path="${configDir};%MONO_CFG_DIR%" />
+-                                </environment>
+-                            </auto>
+-                            <strict>
+-                                <engine program="${runtimeEngine}">
+-                                    <arg value="--runtime=v1.1.4322" />
+-                                </engine>
+-                                <environment>
+-                                    <variable name="PATH" path="${path::combine(sdkInstallRoot, 'bin')};%PATH%" />
+-                                    <variable name="MONO_CFG_DIR" path="${configDir};%MONO_CFG_DIR%" />
+-                                </environment>
+-                            </strict>
+-                        </modes>
+-                    </runtime>
+-                    <reference-assemblies basedir="${path::combine(frameworkAssemblyDirectory, 'mono/1.0')}">
+-                        <include name="*.dll" />
+-                    </reference-assemblies>
+-                    <task-assemblies>
+-                        <!-- include Mono version-neutral assemblies -->
+-                        <include name="extensions/mono/neutral/**/*.dll" />
+-                        <!-- include Mono 1.0 specific assemblies -->
+-                        <include name="extensions/mono/1.0/**/*.dll" />
+-                        <!-- include .NET 1.1 specific assemblies -->
+-                        <include name="extensions/common/1.1/**/*.dll" />
+-                    </task-assemblies>
+-                    <tool-paths>
+-                        <directory name="${toolDirectory}" />
+-                        <!-- unmanaged tools -->
+-                        <directory name="${sdkInstallRoot}/bin" />
+-                    </tool-paths>
+-                    <project>
+-                        <!-- quick and dirty check to see if pkg-config is available (and configured) -->
+-                        <property name="pkgconfig.available" value="${environment::variable-exists('PKG_CONFIG_PATH')}" />
+-                        <if test="${pkgconfig.available}">
+-                            <if test="${pkg-config::exists('mono')}">
+-                                <call target="configure-from-pkg-config" />
+-                            </if>
+-                            <if test="${not pkg-config::exists('mono')}">
+-                                <call target="configure-from-registry" />
+-                            </if>
+-                        </if>
+-                        <if test="${not pkgconfig.available}">
+-                            <call target="configure-from-registry" />
+-                        </if>
+-
+-                        <!-- determine if we're dealing with a Mono 1.0.x release -->
+-                        <if test="${version::parse(mono.version) &lt; version::parse('1.1')}">
+-                            <!-- 
+-                                in Mono 1.0.x, the framework tools are located 
+-                                in the <install root>\lib directory
+-                            -->
+-                            <property name="toolDirectory" value="${frameworkAssemblyDirectory}" />
+-                            <property name="runtimeEngine" value="${path::combine(frameworkAssemblyDirectory, 'mono.exe')}" />
+-                            <property name="resgen.tool" value="monoresgen" />
+-                            <!-- in Mono 1.0.x, only mcs and mbas are located in <install root>\lib\mono\<profile> -->
+-                            <property name="csc.tool" value="${path::combine(frameworkAssemblyDirectory, 'mono/1.0/mcs.exe')}" />
+-                            <property name="mbas.tool" value="${path::combine(frameworkAssemblyDirectory, 'mono/1.0/mbas.exe')}" />
+-                            <!-- /doc is not supported in Mono 1.0.x -->
+-                            <property name="csc.supportsdocgeneration" value="false" />
+-
+-                            <!-- 
+-                                Mono 1.0.1 installer incorrectly adds '\mono' to 
+-                                "MonoConfigDir" registry value
+-                            -->
+-                            <if test="${string::ends-with(configDir, 'etc\mono')}">
+-                                <property name="configDir" value="${string::replace(configDir, 'etc\mono', 'etc')}" />
+-                            </if>
+-                        </if>
+-
+-                        <!-- determine if we're dealing with a Mono 1.1.x release or higher -->
+-                        <if test="${version::parse(mono.version) >= version::parse('1.1')}">
+-                            <!-- 
+-                                in Mono 1.1.x (and higher ?), the framework tools 
+-                                are located in the <install root>\lib\mono\<profile>
+-                                directory
+-                            -->
+-                            <property name="toolDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/1.0')}" />
+-                            <property name="runtimeEngine" value="${path::combine(frameworkAssemblyDirectory, 'mono.exe')}" />
+-                            <!-- starting from Mono 1.1.9.2, mono.exe is located in the bin directory -->
+-                            <if test="${not file::exists(runtimeEngine)}">
+-                                <property name="runtimeEngine" value="${path::combine(sdkInstallRoot, 'bin/mono.exe')}" />
+-                            </if>
+-                            <property name="resgen.tool" value="resgen" />
+-                            <property name="csc.tool" value="mcs" />
+-                            <property name="csc.supportsdocgeneration" value="true" />
+-                            <property name="mbas.tool" value="mbas" />
+-                        </if>
+-
+-                        <target name="configure-from-pkg-config">
+-                            <property name="mono.version" value="${pkg-config::get-mod-version('mono')}" />
+-                            <property name="sdkInstallRoot" value="${cygpath::get-windows-path(pkg-config::get-variable('mono', 'prefix'))}" />
+-                            <property name="frameworkAssemblyDirectory" value="${cygpath::get-windows-path(pkg-config::get-variable('mono', 'libdir'))}" />
+-                            <property name="configDir" value="${path::combine(sdkInstallRoot, 'etc')}/" />
+-                        </target>
+-
+-                        <target name="configure-from-registry">
+-                            <monoregistry property="mono.reg" failonerror="false" />
+-                            <readregistry
+-                                property="mono.version"
+-                                key="${mono.reg}\DefaultCLR"
+-                                hive="LocalMachine"
+-                            />
+-                            <property name="monokey" value="${mono.reg}\${mono.version}" />
+-
+-                            <readregistry
+-                                property="sdkInstallRoot"
+-                                key="${monokey}\SdkInstallRoot"
+-                                hive="LocalMachine" />
+-                            <readregistry
+-                                property="frameworkAssemblyDirectory"
+-                                key="${monokey}\FrameworkAssemblyDirectory"
+-                                hive="LocalMachine" />
+-                            <readregistry
+-                                property="configDir"
+-                                key="${monokey}\MonoConfigDir"
+-                                hive="LocalMachine" />
+-                        </target>
+-                    </project>
+-                    <properties>
+-                    </properties>
+-                    <tasks>
+-                        <task name="al">
+-                            <attribute name="managed">true</attribute>
+-                        </task>
+-                        <task name="csc">
+-                            <attribute name="exename">${csc.tool}</attribute>
+-                            <attribute name="managed">true</attribute>
+-                            <attribute name="supportspackagereferences">true</attribute>
+-                            <attribute name="supportsnowarnlist">true</attribute>
+-                            <attribute name="supportsdocgeneration">${csc.supportsdocgeneration}</attribute>
+-                            <attribute name="supportskeycontainer">true</attribute>
+-                            <attribute name="supportskeyfile">true</attribute>
+-                            <attribute name="supportsdelaysign">true</attribute>
+-                            <attribute name="supportslangversion">true</attribute>
+-                        </task>
+-                        <task name="jsc">
+-                            <attribute name="exename">mjs</attribute>
+-                            <attribute name="managed">true</attribute>
+-                        </task>
+-                        <task name="vbc">
+-                            <attribute name="exename">${mbas.tool}</attribute>
+-                            <attribute name="managed">true</attribute>
+-                        </task>
+-                        <task name="resgen">
+-                            <attribute name="exename">${resgen.tool}</attribute>
+-                            <attribute name="managed">true</attribute>
+-                        </task>
+-                        <task name="delay-sign">
+-                            <attribute name="exename">sn</attribute>
+-                            <attribute name="managed">true</attribute>
+-                        </task>
+-                        <task name="license">
+-                            <attribute name="hascommandlinecompiler">false</attribute>
+-                        </task>
+-                        <task name="ilasm">
+-                            <attribute name="managed">true</attribute>
+-                        </task>
+-                    </tasks>
+-                </framework>
+-                <framework 
+-                    name="mono-2.0"
+-                    family="mono"
+-                    version="2.0"
+-                    description="Mono 2.0 Profile"
+-                    sdkdirectory="${toolDirectory}"
+-                    frameworkdirectory="${toolDirectory}"
+-                    frameworkassemblydirectory="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}"
+-                    clrversion="2.0.50727"
+-                    clrtype="Desktop"
+-                    vendor="Mono"
+-                    >
+-                    <runtime>
+-                        <probing-paths>
+-                            <directory name="lib/mono/2.0" />
+-                            <directory name="lib/mono/neutral" />
+-                            <directory name="lib/common/2.0" />
+-                            <directory name="lib/common/neutral" />
+-                        </probing-paths>
+-                        <modes>
+-                            <auto>
+-                                <engine program="${runtimeEngine}" />
+-                                <environment>
+-                                    <variable name="PATH" path="${path::combine(sdkInstallRoot, 'bin')};%PATH%" />
+-                                    <variable name="MONO_CFG_DIR" path="${configDir};%MONO_CFG_DIR%" />
+-                                </environment>
+-                            </auto>
+-                            <strict>
+-                                <engine program="${runtimeEngine}">
+-                                    <arg value="--runtime=v2.0.50727" />
+-                                </engine>
+-                                <environment>
+-                                    <variable name="PATH" path="${path::combine(sdkInstallRoot, 'bin')};%PATH%" />
+-                                    <variable name="MONO_CFG_DIR" path="${configDir};%MONO_CFG_DIR%" />
+-                                </environment>
+-                            </strict>
+-                        </modes>
+-                    </runtime>
+-                    <reference-assemblies basedir="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}">
+-                        <include name="*.dll" />
+-                    </reference-assemblies>
+-                    <task-assemblies>
+-                        <!-- include Mono version-neutral assemblies -->
+-                        <include name="extensions/mono/neutral/**/*.dll" />
+-                        <!-- include Mono 2.0 specific assemblies -->
+-                        <include name="extensions/mono/2.0/**/*.dll" />
+-                        <!-- include .NET 2.0 specific assemblies -->
+-                        <include name="extensions/common/2.0/**/*.dll" />
+-                    </task-assemblies>
+-                    <tool-paths>
+-                        <directory name="${toolDirectory}" />
+-                        <directory name="${path::combine(frameworkAssemblyDirectory, 'mono/1.0')}" />
+-                        <!-- for compatibility with Mono 1.0.x -->
+-                        <directory name="${frameworkAssemblyDirectory}" />
+-                        <!-- unmanaged tools -->
+-                        <directory name="${sdkInstallRoot}/bin" />
+-                    </tool-paths>
+-                    <project>
+-                        <!-- quick and dirty check to see if pkg-config is available (and configured) -->
+-                        <property name="pkgconfig.available" value="${environment::variable-exists('PKG_CONFIG_PATH')}" />
+-                        <if test="${pkgconfig.available}">
+-                            <if test="${pkg-config::exists('mono')}">
+-                                <call target="configure-from-pkg-config" />
+-                            </if>
+-                            <if test="${not pkg-config::exists('mono')}">
+-                                <call target="configure-from-registry" />
+-                            </if>
+-                        </if>
+-                        <if test="${not pkgconfig.available}">
+-                            <call target="configure-from-registry" />
+-                        </if>
+-
+-                        <property name="resgen.supportsexternalfilereferences" value="false" />
+-
+-                        <!-- determine if we're dealing with a Mono 1.0.x release -->
+-                        <if test="${version::parse(mono.version) &lt; version::parse('1.1')}">
+-                            <!-- 
+-                                in Mono 1.0.x, the framework tools are located 
+-                                in the <install root>\lib directory, except for
+-                                mbas and mcs
+-                            -->
+-                            <property name="toolDirectory" value="${frameworkAssemblyDirectory}" />
+-                            <property name="runtimeEngine" value="${path::combine(frameworkAssemblyDirectory, 'mono.exe')}" />
+-                            <property name="resgen.tool" value="monoresgen" />
+-                            <property name="csc.supportsdocgeneration" value="false" />
+-
+-                            <!-- 
+-                                Mono 1.0.1 installer incorrectly adds '\mono' to 
+-                                "MonoConfigDir" registry value
+-                            -->
+-                            <if test="${string::ends-with(configDir, 'etc\mono')}">
+-                                <property name="configDir" value="${string::replace(configDir, 'etc\mono', 'etc')}" />
+-                            </if>
+-                        </if>
+-
+-                        <!-- determine if we're dealing with a Mono 1.1.x release or higher -->
+-                        <if test="${version::parse(mono.version) >= version::parse('1.1')}">
+-                            <property name="toolDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}" />
+-                            <property name="runtimeEngine" value="${path::combine(frameworkAssemblyDirectory, 'mono.exe')}" />
+-                            <!-- starting from Mono 1.1.9.2, mono.exe is located in the bin directory -->
+-                            <if test="${not file::exists(runtimeEngine)}">
+-                                <property name="runtimeEngine" value="${path::combine(sdkInstallRoot, 'bin/mono.exe')}" />
+-                            </if>
+-                            <property name="csc.supportsdocgeneration" value="true" />
+-                        </if>
+-                        <!-- as from Mono 1.2.3.50, resgen supports the /usesourcepath option -->
+-                        <if test="${version::parse(mono.version) >= version::parse('1.2.3.50')}">
+-                            <property name="resgen.supportsexternalfilereferences" value="true" />
+-                        </if>
+-
+-                        <target name="configure-from-pkg-config">
+-                            <property name="mono.version" value="${pkg-config::get-mod-version('mono')}" />
+-                            <property name="sdkInstallRoot" value="${cygpath::get-windows-path(pkg-config::get-variable('mono', 'prefix'))}" />
+-                            <property name="frameworkAssemblyDirectory" value="${cygpath::get-windows-path(pkg-config::get-variable('mono', 'libdir'))}" />
+-                            <property name="configDir" value="${path::combine(sdkInstallRoot, 'etc')}/" />
+-                        </target>
+-
+-                        <target name="configure-from-registry">
+-                            <monoregistry property="mono.reg" failonerror="false" />
+-                            <readregistry
+-                                property="mono.version"
+-                                key="${mono.reg}\DefaultCLR"
+-                                hive="LocalMachine"
+-                            />
+-                            <property name="monokey" value="${mono.reg}\${mono.version}" />
+-
+-                            <readregistry
+-                                property="sdkInstallRoot"
+-                                key="${monokey}\SdkInstallRoot"
+-                                hive="LocalMachine" />
+-                            <readregistry
+-                                property="frameworkAssemblyDirectory"
+-                                key="${monokey}\FrameworkAssemblyDirectory"
+-                                hive="LocalMachine" />
+-                            <readregistry
+-                                property="configDir"
+-                                key="${monokey}\MonoConfigDir"
+-                                hive="LocalMachine" />
+-                        </target>
+-                    </project>
+-                    <properties>
+-                    </properties>
+-                    <tasks>
+-                        <task name="al">
+-                            <attribute name="managed">true</attribute>
+-                        </task>
+-                        <task name="csc">
+-                            <attribute name="exename">gmcs</attribute>
+-                            <attribute name="managed">true</attribute>
+-                            <attribute name="supportspackagereferences">true</attribute>
+-                            <attribute name="supportsnowarnlist">true</attribute>
+-                            <attribute name="supportsdocgeneration">${csc.supportsdocgeneration}</attribute>
+-                            <attribute name="supportskeycontainer">true</attribute>
+-                            <attribute name="supportskeyfile">true</attribute>
+-                            <attribute name="supportsdelaysign">true</attribute>
+-                            <attribute name="supportslangversion">true</attribute>
+-                        </task>
+-                        <task name="jsc">
+-                            <attribute name="exename">mjs</attribute>
+-                            <attribute name="managed">strict</attribute>
+-                        </task>
+-                        <task name="vbc">
+-                            <attribute name="exename">vbnc</attribute>
+-                            <attribute name="managed">true</attribute>
+-                        </task>
+-                        <task name="resgen">
+-                            <attribute name="exename">${resgen.tool}</attribute>
+-                            <attribute name="managed">true</attribute>
+-                            <attribute name="supportsexternalfilereferences">${resgen.supportsexternalfilereferences}</attribute>
+-                        </task>
+-                        <task name="delay-sign">
+-                            <attribute name="exename">sn</attribute>
+-                            <attribute name="managed">true</attribute>
+-                        </task>
+-                        <task name="license">
+-                            <attribute name="hascommandlinecompiler">false</attribute>
+-                        </task>
+-                        <task name="ilasm">
+-                            <attribute name="managed">true</attribute>
+-                        </task>
+-                    </tasks>
+-                </framework>
+-                <framework
+-                    name="mono-3.5"
+-                    family="mono"
+-                    version="3.5"
+-                    description="Mono 3.5 Profile"
+-                    sdkdirectory="${toolDirectory}"
+-                    frameworkdirectory="${toolDirectory}"
+-                    frameworkassemblydirectory="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}"
+-                    clrversion="2.0.50727"
+-                    clrtype="Desktop"
+-                    vendor="Mono"
+-                    >
+-                    <runtime>
+-                        <probing-paths>
+-                            <directory name="lib/mono/2.0" />
+-                            <directory name="lib/mono/neutral" />
+-                            <directory name="lib/common/2.0" />
+-                            <directory name="lib/common/neutral" />
+-                        </probing-paths>
+-                        <modes>
+-                            <auto>
+-                                <engine program="${runtimeEngine}" />
+-                                <environment>
+-                                    <variable name="PATH" path="${path::combine(sdkInstallRoot, 'bin')};%PATH%" />
+-                                    <variable name="MONO_CFG_DIR" path="${configDir};%MONO_CFG_DIR%" />
+-                                </environment>
+-                            </auto>
+-                            <strict>
+-                                <engine program="${runtimeEngine}">
+-                                    <arg value="--runtime=v2.0.50727" />
+-                                </engine>
+-                                <environment>
+-                                    <variable name="PATH" path="${path::combine(sdkInstallRoot, 'bin')};%PATH%" />
+-                                    <variable name="MONO_CFG_DIR" path="${configDir};%MONO_CFG_DIR%" />
+-                                </environment>
+-                            </strict>
+-                        </modes>
+-                    </runtime>
+-                    <reference-assemblies basedir="${path::combine(frameworkAssemblyDirectory, 'mono/3.5')}">
+-                        <include name="*.dll" />
+-                    </reference-assemblies>
+-                    <reference-assemblies basedir="${path::combine(frameworkAssemblyDirectory, 'mono/3.0')}">
+-                        <include name="*.dll" />
+-                    </reference-assemblies>
+-                    <reference-assemblies basedir="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}">
+-                        <include name="*.dll" />
+-                    </reference-assemblies>
+-                    <task-assemblies>
+-                        <!-- include Mono version-neutral assemblies -->
+-                        <include name="extensions/mono/neutral/**/*.dll" />
+-                        <!-- include Mono 2.0 specific assemblies -->
+-                        <include name="extensions/mono/2.0/**/*.dll" />
+-                        <!-- include .NET 2.0 specific assemblies -->
+-                        <include name="extensions/common/2.0/**/*.dll" />
+-                    </task-assemblies>
+-                    <tool-paths>
+-                        <directory name="${path::combine(frameworkAssemblyDirectory, 'mono/3.5')}" />
+-                        <directory name="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}" />
+-                        <directory name="${path::combine(frameworkAssemblyDirectory, 'mono/1.0')}" />
+-                        <!-- unmanaged tools -->
+-                        <directory name="${sdkInstallRoot}/bin" />
+-                    </tool-paths>
+-                    <project>
+-                        <!-- quick and dirty check to see if pkg-config is available (and configured) -->
+-                        <property name="pkgconfig.available" value="${environment::variable-exists('PKG_CONFIG_PATH')}" />
+-                        <if test="${pkgconfig.available}">
+-                            <if test="${pkg-config::exists('mono')}">
+-                                <call target="configure-from-pkg-config" />
+-                            </if>
+-                            <if test="${not pkg-config::exists('mono')}">
+-                                <call target="configure-from-registry" />
+-                            </if>
+-                        </if>
+-                        <if test="${not pkgconfig.available}">
+-                            <call target="configure-from-registry" />
+-                        </if>
+-
+-                        <property name="toolDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/3.5')}" />
+-                        <property name="runtimeEngine" value="${path::combine(sdkInstallRoot, 'bin/mono.exe')}" />
+-
+-                        <target name="configure-from-pkg-config">
+-                            <property name="mono.version" value="${pkg-config::get-mod-version('mono')}" />
+-                            <property name="sdkInstallRoot" value="${cygpath::get-windows-path(pkg-config::get-variable('mono', 'prefix'))}" />
+-                            <property name="frameworkAssemblyDirectory" value="${cygpath::get-windows-path(pkg-config::get-variable('mono', 'libdir'))}" />
+-                            <property name="configDir" value="${path::combine(sdkInstallRoot, 'etc')}/" />
+-                        </target>
+-
+-                        <target name="configure-from-registry">
+-                            <monoregistry property="mono.reg" failonerror="false" />
+-                            <readregistry
+-                                property="mono.version"
+-                                key="${mono.reg}\DefaultCLR"
+-                                hive="LocalMachine"
+-                            />
+-                            <property name="monokey" value="${mono.reg}\${mono.version}" />
+-                           
+-                            <readregistry
+-                                property="sdkInstallRoot"
+-                                key="${monokey}\SdkInstallRoot"
+-                                hive="LocalMachine" />
+-                            <readregistry
+-                                property="frameworkAssemblyDirectory"
+-                                key="${monokey}\FrameworkAssemblyDirectory"
+-                                hive="LocalMachine" />
+-                            <readregistry
+-                                property="configDir"
+-                                key="${monokey}\MonoConfigDir"
+-                                hive="LocalMachine" />
+-                        </target>
+-                    </project>
+-                    <properties>
+-                    </properties>
+-                    <tasks>
+-                        <task name="al">
+-                            <attribute name="managed">true</attribute>
+-                        </task>
+-                        <task name="csc">
+-                            <attribute name="exename">gmcs</attribute>
+-                            <attribute name="managed">true</attribute>
+-                            <attribute name="langversion">linq</attribute>
+-                            <attribute name="supportspackagereferences">true</attribute>
+-                            <attribute name="supportsnowarnlist">true</attribute>
+-                            <attribute name="supportsdocgeneration">true</attribute>
+-                            <attribute name="supportskeycontainer">true</attribute>
+-                            <attribute name="supportskeyfile">true</attribute>
+-                            <attribute name="supportsdelaysign">true</attribute>
+-                            <attribute name="supportslangversion">true</attribute>
+-                        </task>
+-                        <task name="jsc">
+-                            <attribute name="exename">mjs</attribute>
+-                            <attribute name="managed">strict</attribute>
+-                        </task>
+-                        <task name="vbc">
+-                            <attribute name="exename">vbnc</attribute>
+-                            <attribute name="managed">true</attribute>
+-                        </task>
+-                        <task name="resgen">
+-                            <attribute name="managed">true</attribute>
+-                            <attribute name="supportsexternalfilereferences">true</attribute>
+-                        </task>
+-                        <task name="delay-sign">
+-                            <attribute name="exename">sn</attribute>
+-                            <attribute name="managed">true</attribute>
+-                        </task>
+-                        <task name="license">
+-                            <attribute name="hascommandlinecompiler">false</attribute>
+-                        </task>
+-                        <task name="ilasm">
+-                            <attribute name="managed">true</attribute>
+-                        </task>
+-                    </tasks>
+-                </framework>
+-                <framework
+-                    name="mono-4.0"
+-                    family="mono"
+-                    version="4.0"
+-                    description="Mono 4.0 Profile"
+-                    sdkdirectory="${toolDirectory}"
+-                    frameworkdirectory="${toolDirectory}"
+-                    frameworkassemblydirectory="${path::combine(frameworkAssemblyDirectory, 'mono/4.0')}"
+-                    clrversion="4.0.30319"
+-                    clrtype="Desktop"
+-                    vendor="Mono"
+-                    >
+-                    <runtime>
+-                        <probing-paths>
+-                            <directory name="lib/mono/2.0" />
+-                            <directory name="lib/mono/neutral" />
+-                            <directory name="lib/common/2.0" />
+-                            <directory name="lib/common/neutral" />
+-                        </probing-paths>
+-                        <modes>
+-                            <auto>
+-                                <engine program="${runtimeEngine}" />
+-                                <environment>
+-                                    <variable name="PATH" path="${path::combine(sdkInstallRoot, 'bin')};%PATH%" />
+-                                    <variable name="MONO_CFG_DIR" path="${configDir};%MONO_CFG_DIR%" />
+-                                </environment>
+-                            </auto>
+-                            <strict>
+-                                <engine program="${runtimeEngine}">
+-                                    <arg value="--runtime=v4.0.30319" />
+-                                </engine>
+-                                <environment>
+-                                    <variable name="PATH" path="${path::combine(sdkInstallRoot, 'bin')};%PATH%" />
+-                                    <variable name="MONO_CFG_DIR" path="${configDir};%MONO_CFG_DIR%" />
+-                                </environment>
+-                            </strict>
+-                        </modes>
+-                    </runtime>
+-                    <reference-assemblies basedir="${path::combine(frameworkAssemblyDirectory, 'mono/4.0')}">
+-                        <include name="*.dll" />
+-                    </reference-assemblies>
+-                    <reference-assemblies basedir="${path::combine(frameworkAssemblyDirectory, 'mono/3.5')}">
+-                        <include name="*.dll" />
+-                    </reference-assemblies>
+-                    <reference-assemblies basedir="${path::combine(frameworkAssemblyDirectory, 'mono/3.0')}">
+-                        <include name="*.dll" />
+-                    </reference-assemblies>
+-                    <reference-assemblies basedir="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}">
+-                        <include name="*.dll" />
+-                    </reference-assemblies>
+-                    <task-assemblies>
+-                        <!-- include Mono version-neutral assemblies -->
+-                        <include name="extensions/mono/neutral/**/*.dll" />
+-                        <!-- include Mono 2.0 specific assemblies -->
+-                        <include name="extensions/mono/2.0/**/*.dll" />
+-                        <!-- include .NET 2.0 specific assemblies -->
+-                        <include name="extensions/common/2.0/**/*.dll" />
+-                    </task-assemblies>
+-                    <tool-paths>
+-                        <directory name="${path::combine(frameworkAssemblyDirectory, 'mono/4.0')}" />
+-                        <directory name="${path::combine(frameworkAssemblyDirectory, 'mono/3.5')}" />
+-                        <directory name="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}" />
+-                        <directory name="${path::combine(frameworkAssemblyDirectory, 'mono/1.0')}" />
+-                        <!-- unmanaged tools -->
+-                        <directory name="${sdkInstallRoot}/bin" />
+-                    </tool-paths>
+-                    <project>
+-                        <!-- quick and dirty check to see if pkg-config is available (and configured) -->
+-                        <property name="pkgconfig.available" value="${environment::variable-exists('PKG_CONFIG_PATH')}" />
+-                        <if test="${pkgconfig.available}">
+-                            <if test="${pkg-config::exists('mono')}">
+-                                <call target="configure-from-pkg-config" />
+-                            </if>
+-                            <if test="${not pkg-config::exists('mono')}">
+-                                <call target="configure-from-registry" />
+-                            </if>
+-                        </if>
+-                        <if test="${not pkgconfig.available}">
+-                            <call target="configure-from-registry" />
+-                        </if>
+-
+-                        <property name="toolDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/4.0')}" />
+-                        <property name="runtimeEngine" value="${path::combine(sdkInstallRoot, 'bin/mono.exe')}" />
+-
+-                        <target name="configure-from-pkg-config">
+-                            <property name="mono.version" value="${pkg-config::get-mod-version('mono')}" />
+-                            <property name="sdkInstallRoot" value="${cygpath::get-windows-path(pkg-config::get-variable('mono', 'prefix'))}" />
+-                            <property name="frameworkAssemblyDirectory" value="${cygpath::get-windows-path(pkg-config::get-variable('mono', 'libdir'))}" />
+-                            <property name="configDir" value="${path::combine(sdkInstallRoot, 'etc')}/" />
+-                        </target>
+-
+-                        <target name="configure-from-registry">
+-                            <monoregistry property="mono.reg" failonerror="false" />
+-                            <readregistry
+-                                property="mono.version"
+-                                key="${mono.reg}\DefaultCLR"
+-                                hive="LocalMachine"
+-                            />
+-                            <property name="monokey" value="${mono.reg}\${mono.version}" />
+-
+-                            <readregistry
+-                                property="sdkInstallRoot"
+-                                key="${monokey}\SdkInstallRoot"
+-                                hive="LocalMachine" />
+-                            <readregistry
+-                                property="frameworkAssemblyDirectory"
+-                                key="${monokey}\FrameworkAssemblyDirectory"
+-                                hive="LocalMachine" />
+-                            <readregistry
+-                                property="configDir"
+-                                key="${monokey}\MonoConfigDir"
+-                                hive="LocalMachine" />
+-                        </target>
+-                    </project>
+-                    <properties>
+-                    </properties>
+-                    <tasks>
+-                        <task name="al">
+-                            <attribute name="managed">true</attribute>
+-                        </task>
+-                        <task name="csc">
+-                            <attribute name="exename">dmcs</attribute>
+-                            <attribute name="managed">true</attribute>
+-                            <attribute name="langversion">linq</attribute>
+-                            <attribute name="supportspackagereferences">true</attribute>
+-                            <attribute name="supportsnowarnlist">true</attribute>
+-                            <attribute name="supportsdocgeneration">true</attribute>
+-                            <attribute name="supportskeycontainer">true</attribute>
+-                            <attribute name="supportskeyfile">true</attribute>
+-                            <attribute name="supportsdelaysign">true</attribute>
+-                            <attribute name="supportslangversion">true</attribute>
+-                        </task>
+-                        <task name="jsc">
+-                            <attribute name="exename">mjs</attribute>
+-                            <attribute name="managed">strict</attribute>
+-                        </task>
+-                        <task name="vbc">
+-                            <attribute name="exename">vbnc</attribute>
+-                            <attribute name="managed">true</attribute>
+-                        </task>
+-                        <task name="resgen">
+-                            <attribute name="managed">true</attribute>
+-                            <attribute name="supportsexternalfilereferences">true</attribute>
+-                        </task>
+-                        <task name="delay-sign">
+-                            <attribute name="exename">sn</attribute>
+-                            <attribute name="managed">true</attribute>
+-                        </task>
+-                        <task name="license">
+-                            <attribute name="hascommandlinecompiler">false</attribute>
+-                        </task>
+-                        <task name="ilasm">
+-                            <attribute name="managed">true</attribute>
+-                        </task>
+-                    </tasks>
+-                </framework>
+-                <framework
+-                    name="moonlight-2.0" 
+-                    family="moonlight"
+-                    version="2.0"
+-                    description="Moonlight 2.0"
+-                    sdkdirectory="${toolDirectory}"
+-                    frameworkdirectory="${toolDirectory}"
+-                    frameworkassemblydirectory="${toolDirectory}"
+-                    clrversion="2.0.50727"
+-                    clrtype="Browser"
+-                    vendor="Mono"
+-                    >
+-                    <runtime>
+-                        <modes>
+-                            <auto>
+-                                <engine program="${runtimeEngine}">
+-                                    <arg value="--runtime=moonlight" />
+-                                    <arg value="--security=temporary-smcs-hack" />
+-                                </engine>
+-                            </auto>
+-                        </modes>
+-                    </runtime>
+-                    <reference-assemblies basedir="${path::combine(frameworkAssemblyDirectory, 'lib/mono/2.1')}">
+-                        <include name="Microsoft.VisualBasic.dll" />
+-                        <include name="mscorlib.dll" />
+-                        <include name="System.Core.dll" />
+-                        <include name="System.dll" />
+-                        <include name="System.Net.dll" />
+-                        <include name="System.Runtime.Serialization.dll" />
+-                        <include name="System.ServiceModel.dll" />
+-                        <include name="System.ServiceModel.Web.dll" />
+-                        <include name="System.Windows.Browser.dll" />
+-                        <include name="System.Windows.dll" />
+-                        <include name="System.Xml.dll" />
+-                    </reference-assemblies>
+-                    <task-assemblies>
+-                        <!-- include MS.NET version-neutral assemblies -->
+-                        <include name="extensions/net/neutral/**/*.dll" />
+-                        <!-- include MS.NET 2.0 specific assemblies -->
+-                        <include name="extensions/net/2.0/**/*.dll" />
+-                        <!-- include MS.NET specific task assembly -->
+-                        <include name="NAnt.MSNetTasks.dll" />
+-                        <!-- include MS.NET specific test assembly -->
+-                        <include name="NAnt.MSNet.Tests.dll" />
+-                        <!-- include .NET 2.0 specific assemblies -->
+-                        <include name="extensions/common/2.0/**/*.dll" />
+-                    </task-assemblies>
+-                    <tool-paths>
+-                        <directory name="${toolDirectory}" />
+-                        <directory name="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}" />
+-                        <directory name="${path::combine(frameworkAssemblyDirectory, 'mono/1.0')}" />
+-                        <!-- unmanaged tools -->
+-                        <directory name="${sdkInstallRoot}/bin" />
+-                    </tool-paths>
+-                    <project>
+-                        <!-- quick and dirty check to see if pkg-config is available (and configured) -->
+-                        <property name="pkgconfig.available" value="${environment::variable-exists('PKG_CONFIG_PATH')}" />
+-                        <if test="${pkgconfig.available}">
+-                            <if test="${pkg-config::exists('mono')}">
+-                                <call target="configure-from-pkg-config" />
+-                            </if>
+-                            <if test="${not pkg-config::exists('mono')}">
+-                                <call target="configure-from-registry" />
+-                            </if>
+-                        </if>
+-                        <if test="${not pkgconfig.available}">
+-                            <call target="configure-from-registry" />
+-                        </if>
+-
+-                        <property name="toolDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/2.1')}" />
+-                        <property name="runtimeEngine" value="${path::combine(sdkInstallRoot, 'bin/mono.exe')}" />
+-
+-                        <target name="configure-from-pkg-config">
+-                            <property name="mono.version" value="${pkg-config::get-mod-version('mono')}" />
+-                            <property name="sdkInstallRoot" value="${cygpath::get-windows-path(pkg-config::get-variable('mono', 'prefix'))}" />
+-                            <property name="frameworkAssemblyDirectory" value="${cygpath::get-windows-path(pkg-config::get-variable('mono', 'libdir'))}" />
+-                            <property name="configDir" value="${path::combine(sdkInstallRoot, 'etc')}/" />
+-                        </target>
+-
+-                        <target name="configure-from-registry">
+-                            <monoregistry property="mono.reg" failonerror="false" />
+-                            <readregistry
+-                                property="mono.version"
+-                                key="${mono.reg}\DefaultCLR"
+-                                hive="LocalMachine"
+-                            />
+-                            <property name="monokey" value="${mono.reg}\${mono.version}" />
+-
+-                            <readregistry
+-                                property="sdkInstallRoot"
+-                                key="${monokey}\SdkInstallRoot"
+-                                hive="LocalMachine" />
+-                            <readregistry
+-                                property="frameworkAssemblyDirectory"
+-                                key="${monokey}\FrameworkAssemblyDirectory"
+-                                hive="LocalMachine" />
+-                            <readregistry
+-                                property="configDir"
+-                                key="${monokey}\MonoConfigDir"
+-                                hive="LocalMachine" />
+-                        </target>
+-                    </project>
+-                    <tasks>
+-                        <task name="csc">
+-                            <attribute name="exename">smcs</attribute>
+-                            <attribute name="managed">true</attribute>
+-                            <attribute name="supportspackagereferences">true</attribute>
+-                            <attribute name="supportsnowarnlist">true</attribute>
+-                            <attribute name="supportsdocgeneration">true</attribute>
+-                            <attribute name="supportskeycontainer">true</attribute>
+-                            <attribute name="supportskeyfile">true</attribute>
+-                            <attribute name="supportsdelaysign">true</attribute>
+-                            <attribute name="supportslangversion">true</attribute>
+-                        </task>
+-                        <task name="resgen">
+-                            <attribute name="supportsassemblyreferences">true</attribute>
+-                            <attribute name="supportsexternalfilereferences">true</attribute>
+-                        </task>
+-                        <task name="delay-sign">
+-                            <attribute name="exename">sn</attribute>
+-                        </task>
+-                        <task name="license">
+-                            <attribute name="hascommandlinecompiler">false</attribute>
+-                        </task>
+-                    </tasks>
+-                </framework>
+-                <framework 
+-                    name="sscli-1.0"
+-                    family="sscli"
+-                    version="1.0"
+-                    description="Microsoft Shared Source CLI 1.0"
+-                    sdkdirectory="C:\sscli\build\v1.x86fstchk.rotor\sdk\bin"
+-                    frameworkdirectory="C:\sscli\build\v1.x86fstchk.rotor"
+-                    frameworkassemblydirectory="C:\sscli\build\v1.x86fstchk.rotor"
+-                    clrversion="1.0.3"
+-                    clrtype="Desktop"
+-                    vendor="Microsoft"
+-                    >
+-                    <runtime>
+-                        <modes>
+-                            <auto>
+-                                <engine program="C:\sscli\build\v1.x86fstchk.rotor\clix.exe" />
+-                            </auto>
+-                        </modes>
+-                    </runtime>
+-                    <reference-assemblies basedir="C:\sscli\build\v1.x86fstchk.rotor">
+-                        <include name="*.dll" />
+-                    </reference-assemblies>
+-                    <task-assemblies>
+-                        <!-- this is not a supported runtime framework -->
+-                    </task-assemblies>
+-                    <tool-paths>
+-                        <directory name="C:\sscli\build\v1.x86fstchk.rotor\sdk\bin" />
+-                        <directory name="C:\sscli\build\v1.x86fstchk.rotor" />
+-                    </tool-paths>
+-                    <project />
+-                    <tasks>
+-                        <task name="csc">
+-                            <attribute name="supportsnowarnlist">true</attribute>
+-                        </task>
+-                        <task name="jsc">
+-                            <attribute name="managed">true</attribute>
+-                        </task>
+-                        <task name="delay-sign">
+-                            <attribute name="exename">sn</attribute>
+-                        </task>
+-                        <task name="license">
+-                            <attribute name="hascommandlinecompiler">false</attribute>
+-                        </task>
+-                        <task name="ilasm">
+-                            <attribute name="managed">true</attribute>
+-                        </task>
+-                        <task name="ildasm">
+-                            <attribute name="managed">true</attribute>
+-                        </task>
+-                    </tasks>
+-                </framework>
+-            </platform>
+             <platform name="unix" default="auto">
+                 <task-assemblies>
+                         <!-- include NAnt task assemblies -->
+@@ -2415,18 +92,18 @@
+                             <property name="csc.supportsdocgeneration" value="false" />
+                         </if>
+                         <if test="${pkg-config::is-atleast-version('mono', '1.1')}">
+-                            <property name="toolDirectory" value="${path::combine(prefix, 'lib/mono/1.0')}" />
++                            <property name="toolDirectory" value="${path::combine(prefix, 'bin')}" />
+                             <property name="resgen.tool" value="resgen" />
+                             <property name="csc.supportsdocgeneration" value="true" />
+                         </if>
+                     </project>
+                     <tasks>
+                         <task name="al">
+-                            <attribute name="managed">true</attribute>
++                            <attribute name="managed">false</attribute>
+                         </task>
+                         <task name="csc">
+-                            <attribute name="exename">${path::combine(prefix, 'lib/mono/1.0/mcs.exe')}</attribute>
+-                            <attribute name="managed">true</attribute>
++                            <attribute name="exename">${path::combine(prefix, 'bin/mcs')}</attribute>
++                            <attribute name="managed">false</attribute>
+                             <attribute name="supportspackagereferences">true</attribute>
+                             <attribute name="supportsnowarnlist">true</attribute>
+                             <attribute name="supportsdocgeneration">${csc.supportsdocgeneration}</attribute>
+@@ -2437,25 +114,25 @@
+                         </task>
+                         <task name="jsc">
+                             <attribute name="exename">mjs</attribute>
+-                            <attribute name="managed">true</attribute>
++                            <attribute name="managed">false</attribute>
+                         </task>
+                         <task name="vbc">
+-                            <attribute name="exename">${path::combine(prefix, 'lib/mono/1.0/mbas.exe')}</attribute>
+-                            <attribute name="managed">true</attribute>
++                            <attribute name="exename">${path::combine(prefix, 'bin/vbnc')}</attribute>
++                            <attribute name="managed">false</attribute>
+                         </task>
+                         <task name="resgen">
+                             <attribute name="exename">${resgen.tool}</attribute>
+-                            <attribute name="managed">true</attribute>
++                            <attribute name="managed">false</attribute>
+                         </task>
+                         <task name="delay-sign">
+                             <attribute name="exename">sn</attribute>
+-                            <attribute name="managed">true</attribute>
++                            <attribute name="managed">false</attribute>
+                         </task>
+                         <task name="license">
+                             <attribute name="hascommandlinecompiler">false</attribute>
+                         </task>
+                         <task name="ilasm">
+-                            <attribute name="managed">true</attribute>
++                            <attribute name="managed">false</attribute>
+                         </task>
+                     </tasks>
+                 </framework>
+@@ -2502,9 +179,10 @@
+                     </task-assemblies>
+                     <tool-paths>
+                         <directory name="${toolDirectory}" />
+-                        <directory name="${path::combine(prefix, 'lib/mono/1.0')}" />
+-                        <!-- unmanaged tools -->
++			<!-- unmanaged tools -->
+                         <directory name="${prefix}/bin" />
++			<!-- managed tools -->
++                        <directory name="${path::combine(prefix, 'lib/mono/1.0')}" />
+                     </tool-paths>
+                     <project>
+                         <if test="${not pkg-config::exists('mono')}">
+@@ -2518,7 +196,7 @@
+                             <property name="csc.supportsdocgeneration" value="false" />
+                         </if>
+                         <if test="${pkg-config::is-atleast-version('mono', '1.1')}">
+-                            <property name="toolDirectory" value="${path::combine(prefix, 'lib/mono/2.0')}" />
++                            <property name="toolDirectory" value="${path::combine(prefix, 'bin')}" />
+                             <property name="resgen.tool" value="resgen" />
+                             <property name="csc.supportsdocgeneration" value="true" />
+                         </if>
+@@ -2529,11 +207,11 @@
+                     </project>
+                     <tasks>
+                         <task name="al">
+-                            <attribute name="managed">true</attribute>
++                            <attribute name="managed">false</attribute>
+                         </task>
+                         <task name="csc">
+                             <attribute name="exename">gmcs</attribute>
+-                            <attribute name="managed">true</attribute>
++                            <attribute name="managed">false</attribute>
+                             <attribute name="supportspackagereferences">true</attribute>
+                             <attribute name="supportsnowarnlist">true</attribute>
+                             <attribute name="supportsdocgeneration">${csc.supportsdocgeneration}</attribute>
+@@ -2544,26 +222,26 @@
+                         </task>
+                         <task name="jsc">
+                             <attribute name="exename">mjs</attribute>
+-                            <attribute name="managed">strict</attribute>
++                            <attribute name="managed">false</attribute>
+                         </task>
+                         <task name="vbc">
+                             <attribute name="exename">vbnc</attribute>
+-                            <attribute name="managed">true</attribute>
++                            <attribute name="managed">false</attribute>
+                         </task>
+                         <task name="resgen">
+                             <attribute name="exename">${resgen.tool}</attribute>
+-                            <attribute name="managed">true</attribute>
++                            <attribute name="managed">false</attribute>
+                             <attribute name="supportsexternalfilereferences">${resgen.supportsexternalfilereferences}</attribute>
+                         </task>
+                         <task name="delay-sign">
+                             <attribute name="exename">sn</attribute>
+-                            <attribute name="managed">true</attribute>
++                            <attribute name="managed">false</attribute>
+                         </task>
+                         <task name="license">
+                             <attribute name="hascommandlinecompiler">false</attribute>
+                         </task>
+                         <task name="ilasm">
+-                            <attribute name="managed">true</attribute>
++                            <attribute name="managed">false</attribute>
+                         </task>
+                     </tasks>
+                 </framework>
+@@ -2616,10 +294,11 @@
+                     </task-assemblies>
+                     <tool-paths>
+                         <directory name="${toolDirectory}" />
++			<!-- unmanaged tools -->
++                        <directory name="${prefix}/bin" />
++			<!-- managed tools -->
+                         <directory name="${path::combine(prefix, 'lib/mono/2.0')}" />
+                         <directory name="${path::combine(prefix, 'lib/mono/1.0')}" />
+-                        <!-- unmanaged tools -->
+-                        <directory name="${prefix}/bin" />
+                     </tool-paths>
+                     <project>
+                         <if test="${not pkg-config::exists('mono')}">
+@@ -2627,15 +306,15 @@
+                         </if>
+                         <property name="resgen.supportsexternalfilereferences" value="false" />
+                         <property name="prefix" value="${pkg-config::get-variable('mono', 'prefix')}" />
+-                        <property name="toolDirectory" value="${path::combine(prefix, 'lib/mono/3.5')}" />
++                        <property name="toolDirectory" value="${path::combine(prefix, 'bin')}" />
+                     </project>
+                     <tasks>
+                         <task name="al">
+-                            <attribute name="managed">true</attribute>
++                            <attribute name="managed">false</attribute>
+                         </task>
+                         <task name="csc">
+                             <attribute name="exename">gmcs</attribute>
+-                            <attribute name="managed">true</attribute>
++                            <attribute name="managed">false</attribute>
+                             <attribute name="langversion">linq</attribute>
+                             <attribute name="supportspackagereferences">true</attribute>
+                             <attribute name="supportsnowarnlist">true</attribute>
+@@ -2647,25 +326,25 @@
+                         </task>
+                         <task name="jsc">
+                             <attribute name="exename">mjs</attribute>
+-                            <attribute name="managed">strict</attribute>
++                            <attribute name="managed">false</attribute>
+                         </task>
+                         <task name="vbc">
+                             <attribute name="exename">vbnc</attribute>
+-                            <attribute name="managed">true</attribute>
++                            <attribute name="managed">false</attribute>
+                         </task>
+                         <task name="resgen">
+-                            <attribute name="managed">true</attribute>
++                            <attribute name="managed">false</attribute>
+                             <attribute name="supportsexternalfilereferences">true</attribute>
+                         </task>
+                         <task name="delay-sign">
+                             <attribute name="exename">sn</attribute>
+-                            <attribute name="managed">true</attribute>
++                            <attribute name="managed">false</attribute>
+                         </task>
+                         <task name="license">
+                             <attribute name="hascommandlinecompiler">false</attribute>
+                         </task>
+                         <task name="ilasm">
+-                            <attribute name="managed">true</attribute>
++                            <attribute name="managed">false</attribute>
+                         </task>
+                     </tasks>
+                 </framework>
+@@ -2721,11 +400,12 @@
+                     </task-assemblies>
+                     <tool-paths>
+                         <directory name="${toolDirectory}" />
++			<!-- unmanaged tools -->
++                        <directory name="${prefix}/bin" />
++			<!-- managed tools -->
+                         <directory name="${path::combine(prefix, 'lib/mono/3.5')}" />
+                         <directory name="${path::combine(prefix, 'lib/mono/2.0')}" />
+                         <directory name="${path::combine(prefix, 'lib/mono/1.0')}" />
+-                        <!-- unmanaged tools -->
+-                        <directory name="${prefix}/bin" />
+                     </tool-paths>
+                     <project>
+                         <if test="${not pkg-config::exists('mono')}">
+@@ -2733,15 +413,15 @@
+                         </if>
+                         <property name="resgen.supportsexternalfilereferences" value="false" />
+                         <property name="prefix" value="${pkg-config::get-variable('mono', 'prefix')}" />
+-                        <property name="toolDirectory" value="${path::combine(prefix, 'lib/mono/4.0')}" />
++                        <property name="toolDirectory" value="${path::combine(prefix, 'bin')}" />
+                     </project>
+                     <tasks>
+                         <task name="al">
+-                            <attribute name="managed">true</attribute>
++                            <attribute name="managed">false</attribute>
+                         </task>
+                         <task name="csc">
+                             <attribute name="exename">dmcs</attribute>
+-                            <attribute name="managed">true</attribute>
++                            <attribute name="managed">false</attribute>
+                             <attribute name="langversion">linq</attribute>
+                             <attribute name="supportspackagereferences">true</attribute>
+                             <attribute name="supportsnowarnlist">true</attribute>
+@@ -2753,25 +433,25 @@
+                         </task>
+                         <task name="jsc">
+                             <attribute name="exename">mjs</attribute>
+-                            <attribute name="managed">strict</attribute>
++                            <attribute name="managed">false</attribute>
+                         </task>
+                         <task name="vbc">
+                             <attribute name="exename">vbnc</attribute>
+-                            <attribute name="managed">true</attribute>
++                            <attribute name="managed">false</attribute>
+                         </task>
+                         <task name="resgen">
+-                            <attribute name="managed">true</attribute>
++                            <attribute name="managed">false</attribute>
+                             <attribute name="supportsexternalfilereferences">true</attribute>
+                         </task>
+                         <task name="delay-sign">
+                             <attribute name="exename">sn</attribute>
+-                            <attribute name="managed">true</attribute>
++                            <attribute name="managed">false</attribute>
+                         </task>
+                         <task name="license">
+                             <attribute name="hascommandlinecompiler">false</attribute>
+                         </task>
+                         <task name="ilasm">
+-                            <attribute name="managed">true</attribute>
++                            <attribute name="managed">false</attribute>
+                         </task>
+                     </tasks>
+                 </framework>
+@@ -2824,22 +504,23 @@
+                     </task-assemblies>
+                     <tool-paths>
+                         <directory name="${toolDirectory}" />
+-                        <directory name="${path::combine(prefix, 'lib/mono/2.0')}" />
+-                        <directory name="${path::combine(prefix, 'lib/mono/1.0')}" />
+                         <!-- unmanaged tools -->
+                         <directory name="${prefix}/bin" />
++			<!-- managed tools -->
++                        <directory name="${path::combine(prefix, 'lib/mono/2.0')}" />
++                        <directory name="${path::combine(prefix, 'lib/mono/1.0')}" />
+                     </tool-paths>
+                     <project>
+                         <if test="${not pkg-config::exists('mono')}">
+                             <fail>Unable to locate 'mono' module using pkg-config. Download the Mono development packages from http://www.mono-project.com/downloads/.</fail>
+                         </if>
+                         <property name="prefix" value="${pkg-config::get-variable('mono', 'prefix')}" />
+-                        <property name="toolDirectory" value="${path::combine(prefix, 'lib/mono/2.1')}" />
++                        <property name="toolDirectory" value="${path::combine(prefix, 'bin')}" />
+                     </project>
+                     <tasks>
+                         <task name="csc">
+                             <attribute name="exename">smcs</attribute>
+-                            <attribute name="managed">true</attribute>
++                            <attribute name="managed">false</attribute>
+                             <attribute name="supportspackagereferences">true</attribute>
+                             <attribute name="supportsnowarnlist">true</attribute>
+                             <attribute name="supportsdocgeneration">true</attribute>
+diff -ruN nant-0.92.orig/src/NAnt.Core/Tasks/ExternalProgramBase.cs nant-0.92/src/NAnt.Core/Tasks/ExternalProgramBase.cs
+--- nant-0.92.orig/src/NAnt.Core/Tasks/ExternalProgramBase.cs	2012-06-09 08:05:53.000000000 -0600
++++ nant-0.92/src/NAnt.Core/Tasks/ExternalProgramBase.cs	2013-08-04 22:41:24.000000000 -0600
+@@ -633,6 +633,8 @@
+                         if (Project.TargetFramework.FrameworkDirectory != null) {
+                             string frameworkDir = Project.TargetFramework.FrameworkDirectory.FullName;
+                             fullPath = Path.Combine(frameworkDir, ExeName + ".exe");
++                            if (!File.Exists(fullPath))
++                                fullPath = Path.Combine(frameworkDir, ExeName);    
+                         } else {
+                             throw new BuildException(
+                                 string.Format(CultureInfo.InvariantCulture, 
+@@ -644,6 +646,8 @@
+                         if (Project.TargetFramework.SdkDirectory != null) {
+                             string sdkDirectory = Project.TargetFramework.SdkDirectory.FullName;
+                             fullPath = Path.Combine(sdkDirectory, ExeName + ".exe");
++                            if (!File.Exists(fullPath))
++                                fullPath = Path.Combine(sdkDirectory, ExeName);    
+                         } else {
+                             throw new BuildException(
+                                 string.Format(CultureInfo.InvariantCulture, 
+@@ -656,6 +660,10 @@
+                 if (!File.Exists (fullPath)) {
+                     string toolPath = Project.TargetFramework.GetToolPath (
+                         ExeName + ".exe");
++                    if (toolPath == null) {
++                        toolPath = Project.TargetFramework.GetToolPath (
++                        ExeName);
++                    }
+                     if (toolPath != null) {
+                         fullPath = toolPath;
+                     }
diff --git a/libre/qupzilla-libre/PKGBUILD b/libre/qupzilla-libre/PKGBUILD
index 3d23a89f8..7a526cd5f 100644
--- a/libre/qupzilla-libre/PKGBUILD
+++ b/libre/qupzilla-libre/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 104845 2014-01-27 14:16:51Z speps $
+# $Id: PKGBUILD 105935 2014-02-19 15:37:19Z speps $
 # Maintainer: speps <speps at aur dot archlinux dot org>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgbase=qupzilla
 pkgbase=qupzilla-libre
 pkgname=(qupzilla-libre qupzilla-libre-qt5)
-pkgver=1.6.1
+pkgver=1.6.3
 pkgrel=1
 arch=(i686 x86_64 mips64el)
 url="http://www.qupzilla.com/"
 license=('GPL3')
-makedepends=('qtwebkit' 'qt5-webkit' 'qt5-script' 'hunspell')
+makedepends=('qtwebkit' 'qt5-webkit' 'qt5-script' 'hunspell' 'kdelibs' 'libgnome-keyring')
 optdepends=('bash-completion: bash completion support')
+install="$_pkgbase.install"
 source=("$_pkgbase-$pkgver.tar.gz::https://github.com/QupZilla/qupzilla/archive/v$pkgver.tar.gz"
          'searchenginesmanager.cpp.sed'
          'speeddial.cpp.sed'
          'start.html.sed')
 noextract=("$_pkgbase-$pkgver.tar.gz")
-install="$_pkgbase.install"
-md5sums=('ca6fee487c9871d37d2dd09b3617b88f'
+md5sums=('37d962c924a58c616104d0cc732bf69f'
          '1d926e97a5b287d40fb695f6516f2a06'
          '0f166fa102af975b3b8ac030d477e9b8'
          '77120a0c39ba8254e5b2c273910f029a')
@@ -31,7 +31,9 @@ prepare() {
 
   # configure
   export USE_WEBGL=true \
-         QUPZILLA_PREFIX=/usr/
+         QUPZILLA_PREFIX=/usr/ \
+         KDE_INTEGRATION=true \
+         GNOME_INTEGRATION=true
 
   # remove Google and Youtube support, replaces it to DDG HTML
   cd qt4
@@ -58,7 +60,9 @@ build() {
 package_qupzilla-libre() {
   pkgdesc="Cross-platform QtWebKit browser, without non-privacy search providers"
   depends=('qtwebkit' 'hunspell')
-  provides=qupzilla=$pkgver
+  optdepends=('kdelibs: kwallet integration'
+              'libgnome-keyring: gnome keyring integration')
+  provides=(qupzilla=$pkgver)
   conflicts=qupzilla
   replaces=qupzilla
 
@@ -73,6 +77,7 @@ package_qupzilla-libre() {
 package_qupzilla-libre-qt5() {
   pkgdesc="Cross-platform QtWebKit browser (Qt5), without non-privacy search providers"
   depends=('qt5-webkit' 'qt5-script' 'hunspell' 'desktop-file-utils' 'hicolor-icon-theme')
+  optdepends=('libgnome-keyring: gnome keyring integration')
   provides=('qupzilla-libre' "qupzilla-qt5=$pkgver")
   conflicts=('qupzilla-libre' 'qupzilla-qt5')
   replaces=qupzilla-qt5
diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD
index ce3b3789e..404843c67 100644
--- a/libre/texlive-bin-libre/PKGBUILD
+++ b/libre/texlive-bin-libre/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=texlive-bin-libre
 pkgver=2013.30973
-pkgrel=7
+pkgrel=7.1
 pkgdesc="TeX Live binaries, without biber binaries (Parabola rebranded)"
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/libre/texlive-bin-libre/texlive.install b/libre/texlive-bin-libre/texlive.install
index 96a41bcfc..4932650e6 100644
--- a/libre/texlive-bin-libre/texlive.install
+++ b/libre/texlive-bin-libre/texlive.install
@@ -26,7 +26,7 @@ post_upgrade() {
   fi
   _pacout=$(pacman -Q texlive-core 2>/dev/null)
   read corename corever <<< ${_pacout}
-  if [[ ${corever} == 2012* ]]; then
+  if [[ ${corever} == 2013* ]]; then
       if [[ -f usr/bin/fmtutil-sys ]]; then
         echo -n   "recreating all formats..."
         usr/bin/fmtutil-sys --all 1>/dev/null
diff --git a/libre/tp_smapi-libre-lts/PKGBUILD b/libre/tp_smapi-libre-lts/PKGBUILD
index 2a4a1a023..21cbdcc7e 100644
--- a/libre/tp_smapi-libre-lts/PKGBUILD
+++ b/libre/tp_smapi-libre-lts/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 105407 2014-02-06 23:12:06Z bpiotrowski $
+# $Id: PKGBUILD 106027 2014-02-21 10:50:26Z bpiotrowski $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: xduugu
 # Contributor: nh2
@@ -13,7 +13,7 @@ pkgname=tp_smapi-libre-lts
 _pkgname=tp_smapi
 _extramodules=/usr/lib/modules/extramodules-3.10-LIBRE-LTS
 pkgver=0.41
-pkgrel=24
+pkgrel=25
 pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre-lts kernel package)"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://github.com/evgeni/tp_smapi'
diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD
index 4b53e4463..ade0363e7 100644
--- a/libre/tp_smapi-libre/PKGBUILD
+++ b/libre/tp_smapi-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 104391 2014-01-19 20:28:42Z tpowa $
+# $Id: PKGBUILD 104812 2014-01-26 12:42:36Z thomas $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: xduugu
 # Contributor: nh2
@@ -12,13 +12,13 @@
 _pkgname=tp_smapi
 pkgname=tp_smapi-libre
 pkgver=0.41
-pkgrel=43
+pkgrel=44
 pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre kernel package)"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://github.com/evgeni/tp_smapi'
 license=('GPL')
-depends=('linux-libre>=3.12' 'linux-libre<3.13')
-makedepends=('linux-libre-headers>=3.12' 'linux-libre-headers<3.13')
+depends=('linux-libre>=3.13' 'linux-libre<3.14')
+makedepends=('linux-libre-headers>=3.13' 'linux-libre-headers<3.14')
 replaces=("${_pkgname}")
 conflicts=("${_pkgname}")
 provides=("${_pkgname}=${pkgver}")
diff --git a/libre/tp_smapi-libre/tp_smapi.install b/libre/tp_smapi-libre/tp_smapi.install
index 2f81a4e15..288e0eaa5 100644
--- a/libre/tp_smapi-libre/tp_smapi.install
+++ b/libre/tp_smapi-libre/tp_smapi.install
@@ -1,4 +1,4 @@
-extramodules=/usr/lib/modules/extramodules-3.12-LIBRE
+extramodules=/usr/lib/modules/extramodules-3.13-LIBRE
 
 post_install() {
   depmod -v $(< "$extramodules/version") &>/dev/null
diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD
index ed87b2b70..1f2e1fcf3 100644
--- a/libre/vhba-module-libre/PKGBUILD
+++ b/libre/vhba-module-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 104393 2014-01-19 20:29:02Z tpowa $
+# $Id: PKGBUILD 104814 2014-01-26 12:47:02Z thomas $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Charles Lindsay <charles@chaoslizard.org>
@@ -7,13 +7,13 @@
 _pkgname=vhba-module
 pkgname=vhba-module-libre
 pkgver=20130607
-_extramodules=extramodules-3.12-LIBRE
-pkgrel=23
+_extramodules=extramodules-3.13-LIBRE
+pkgrel=24
 pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cdemu.sourceforge.net/"
 license=('GPL')
-depends=('linux-libre>=3.12' 'linux-libre<3.13')
+depends=('linux-libre>=3.13' 'linux-libre<3.14')
 makedepends=('linux-libre-headers')
 options=(!makeflags)
 install=$_pkgname.install
diff --git a/libre/vim-colorsamplerpack-libre/LICENSE b/libre/vim-colorsamplerpack-libre/LICENSE
new file mode 100644
index 000000000..f4a5c1ff4
--- /dev/null
+++ b/libre/vim-colorsamplerpack-libre/LICENSE
@@ -0,0 +1,207 @@
+Compiled licenses for the vim color schemes.
+
+
+==> pkg/usr/share/vim/colors/calmar256-light.vim <==
+" Vim color file:  calmar256-dark.vim
+" Last Change: 21. Aug 2007
+" License: public domain
+" Maintainer:: calmar <mac@calmar.ws>
+"
+
+==> pkg/usr/share/vim/colors/cleanphp.vim <==
+" Vim color file
+" Maintainer:   Billy McIntosh <billymcintosh@ntlworld.com>
+" Last Change:  June 24, 2003
+" Licence:      Public Domain
+
+
+==> pkg/usr/share/vim/colors/dante.vim <==
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" File: "/home/caciano/.vim/dante.vim"
+" Created: "Thu, 23 May 2002 00:12:20 -0300 (caciano)"
+" Updated: "Sat, 24 Aug 2002 14:04:21 -0300 (caciano)"
+" Copyright (C) 2002, Caciano Machado <caciano@inf.ufrgs.br>
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+
+
+==> pkg/usr/share/vim/colors/ekvoli.vim <==
+" Vim color file
+" Maintainer:   Preben Randhol <randhol+ekvoli@pvv.org>
+" Last Change:  2008 Feb 24
+" License:      GNU Public License (GPL) v2
+"
+
+
+==> pkg/usr/share/vim/colors/lettuce.vim <==
+" Vim color file
+"     Version:    1.2 2007.08.08
+"     Author:     Valyaeff Valentin <hhyperr AT gmail DOT com>
+"     License:    GPL
+"
+" Copyright 2007 Valyaeff Valentin
+"
+" This program is free software: you can redistribute it and/or modify
+" it under the terms of the GNU General Public License as published by
+" the Free Software Foundation, either version 3 of the License, or
+" (at your option) any later version.
+"
+" This program is distributed in the hope that it will be useful,
+" but WITHOUT ANY WARRANTY; without even the implied warranty of
+" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+" GNU General Public License for more details.
+"
+" You should have received a copy of the GNU General Public License
+" along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+==> pkg/usr/share/vim/colors/marklar.vim <==
+" ------------------------------------------------------------------
+" Filename:  marklar.vim
+" Last Modified: Nov, 30 2006 (13:01)
+" Version:       0.5
+" Maintainer:    SM Smithfield (m_smithfield AT yahoo DOT com)
+" Copyright:     2006 SM Smithfield
+"                This script is free software; you can redistribute it and/or 
+"                modify it under the terms of the GNU General Public License as 
+"                published by the Free Software Foundation; either version 2 of 
+"                the License, or (at your option) any later version. 
+" Description:   Vim colorscheme file.
+" Install:       Put this file in the users colors directory (~/.vim/colors)
+"                then load it with :colorscheme marklar
+" ------------------------------------------------------------------
+
+
+==> pkg/usr/share/vim/colors/martin_krischik.vim <==
+"-------------------------------------------------------------------------------
+"  Description: My personal colors
+"          $Id: martin_krischik.vim 458 2006-11-18 09:42:10Z krischik $
+"    Copyright: Copyright (C) 2006 Martin Krischik
+"   Maintainer:	Martin Krischik
+"      $Author: krischik $
+"        $Date: 2006-11-18 10:42:10 +0100 (Sa, 18 Nov 2006) $
+"      Version: 3.2
+"    $Revision: 458 $
+"     $HeadURL: https://svn.sourceforge.net/svnroot/gnuada/trunk/tools/vim/colors/martin_krischik.vim $
+"	  Note:	Tried and Tested for 'builtin_gui', 'xterm' (KDE Konsole)
+"		'vt320'" (OpenVMS) and 'linux' (Linux Console).
+"      History: 16.05.2006 MK Check that all vim 7.0 colors are set
+"		16.05.2006 MK Split GUI from terminal.
+"		24.05.2006 MK Unified Headers
+"		24.07.2006 MK Omni-Completion Colors.
+"               15.10.2006 MK Bram's suggestion for runtime integration
+"	 Usage: copy to colors directory
+"------------------------------------------------------------------------------
+
+
+==> pkg/usr/share/vim/colors/motus.vim <==
+" Vim color file
+" Dark (grey on black) color scheme based on on a popular torte config.
+" Maintainer: Sergei Matusevich <motus@motus.kiev.ua>
+" ICQ: 31114346 Yahoo: motus2
+" http://motus.kiev.ua/motus2/Files/motus.vim
+" Last Change: 3 November 2005
+" Orinal torte screme maintainer: Thorsten Maerz <info@netztorte.de>
+" Licence: Public Domain
+
+
+==> pkg/usr/share/vim/colors/railscasts.vim <==
+" Vim color scheme
+"
+" Name:         railscasts.vim
+" Maintainer:   Nick Moffitt <nick@zork.net>
+" Last Change:  01 Mar 2008
+" License:      WTFPL <http://sam.zoy.org/wtfpl/>
+" Version:      2.1
+"
+
+
+==> pkg/usr/share/vim/colors/relaxedgreen.vim <==
+" ----------------------------------------------------------------------------------------------------------------------------------
+" Filename:      relaxedgreen.vim
+" Last Modified: 13 Feb 2007 09:57:24 PM by Dave V
+" Maintainer:    Dave Vehrs (dvehrs at gmail.com)
+" Copyright:     2002,2003,2004,2005,2006,2007 Dave Vehrs
+"                This script is free software; you can redistribute it and/or 
+"                modify it under the terms of the GNU General Public License as 
+"                published by the Free Software Foundation; either version 2 of 
+"                the License, or (at your option) any later version. 
+" Description:   Vim colorscheme file.
+" Install:       Place this file in the users colors directory (~/.vim/colors) or 
+"                in the shared colors directory (/usr/shared/vim/vim<version>/colors/),
+"                then load it with :colorscheme relaxedgreen
+" ----------------------------------------------------------------------------------------------------------------------------------
+
+
+==> pkg/usr/share/vim/colors/synic.vim <==
+" ------------------------------------------------------------------
+" Filename:  synic.vim
+" Last Modified: May, 14 2007 (10:47)
+" Maintainer:    Adam Olsen (arolsen@gmail.com)
+" Copyright:     2007 Adam Olsen
+"                This script is free software; you can redistribute it and/or 
+"                modify it under the terms of the GNU General Public License as 
+"                published by the Free Software Foundation; either version 2 of 
+"                the License, or (at your option) any later version. 
+" Description:   Vim colorscheme file.
+" Install:       Put this file in the users colors directory (~/.vim/colors)
+"                then load it with :colorscheme synic
+" ------------------------------------------------------------------
+
+
+==> pkg/usr/share/vim/colors/tabula.vim <==
+" ============================================================================
+" Filename:  tabula.vim
+" Last Modified: 2007-02-01
+" Version:       1.3
+" Maintainer:    Bernd Pol (bernd.pol AT online DOT de)
+" Copyright:     2006 Bernd Pol
+"                This script is free software; you can redistribute it and/or 
+"                modify it under the terms of the GNU General Public License as 
+"                published by the Free Software Foundation; either version 2 of 
+"                the License, or (at your option) any later version. 
+" Description:   Vim colorscheme based on marklar.vim by SM Smithfield,
+"        slightly modified for harmonic, yet easily distinguishable
+"        display on GUI and a 256 color xterm as well.
+" Install:       Put this file in the users colors directory (~/.vim/colors)
+"                then load it with :colorscheme tabula
+" =============================================================================
+
+
+==> pkg/usr/share/vim/colors/vibrantink.vim <==
+" Vim color scheme
+"
+" Name:         vibrantink.vim
+" Maintainer:   Jo Vermeulen <jo.vermeulen@gmail.com> 
+" Last Change:  30 Jul 2007 
+" License:      public domain
+" Version:      1.2
+"
+
+
+==> pkg/usr/share/vim/colors/vividchalk.vim <==
+" Vim color scheme
+" Name:         vividchalk.vim
+" Author:       Tim Pope <vimNOSPAM@tpope.info>
+" GetLatestVimScripts: 1891 1 :AutoInstall: vividchalk.vim
+" $Id: vividchalk.vim,v 1.8 2007-07-11 18:50:16 tpope Exp $
+
+" Based on the Vibrank Ink theme for TextMate
+" Distributable under the same terms as Vim itself (see :help license)
+
+
+==> pkg/usr/share/vim/colors/xoria256.vim <==
+" Vim color file
+" Name:     xoria256.vim
+" Version:  0.3.2
+" License:  Public Domain
+" Maintainer:   Dmitriy Y. Zotikov (xio) <xio@ungrund.org>
+"
+
+
+==> pkg/usr/share/vim/colors/zenburn.vim <==
+" Vim color file
+" Maintainer:   Jani Nurminen <slinky@iki.fi>
+" Last Change:  $Id: zenburn.vim,v 2.3 2008/07/30 17:34:37 slinky Exp $
+" URL:          http://slinky.imukuppi.org/zenburnpage/
+" License:      GPL
+"
diff --git a/libre/vim-colorsamplerpack-libre/PKGBUILD b/libre/vim-colorsamplerpack-libre/PKGBUILD
new file mode 100644
index 000000000..6d7f800a0
--- /dev/null
+++ b/libre/vim-colorsamplerpack-libre/PKGBUILD
@@ -0,0 +1,44 @@
+# $Id: PKGBUILD 95528 2013-08-13 11:23:39Z svenstaro $
+# Contributor: Aaron Griffin <aaron@archlinux.org>
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+
+_pkgname=vim-colorsamplerpack
+pkgname=vim-colorsamplerpack-libre
+pkgver=2012.10.28
+pkgrel=3
+_scriptid=18915
+pkgdesc="Different colorschemes for vim, without nonfree colorschemes"
+arch=('any')
+url="http://www.vim.org/scripts/script.php?script_id=625"
+license=('GPL2' 'GPL3' 'custom')
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
+depends=('vim')
+makedepends=('unzip')
+groups=('vim-plugins')
+mksource=(ColorSamplerPack.zip::"http://www.vim.org/scripts/download_script.php?src_id=$_scriptid")
+source=("https://repo.parabolagnulinux.org/other/${pkgname}/ColorSamplerPack-libre.tar.xz"
+        'LICENSE')
+mkmd5sums=('b0f1bd54b396e3d6032c01ef1fb421b6')
+md5sums=('73d62829a9ad2cde3f1d03a3fbe154ee'
+         '6db49cf0613715ff3b7c50072367981c')
+
+mksource() {
+   # Remove nonfree colorschemes
+   cd ${srcdir}
+   mv colors colors-tmp
+   install -d colors
+   install -m644 colors-tmp/{calmar256-light,cleanphp,dante,ekvoli,lettuce,marklar,martin_krischik,motus,railscasts,relaxedgreen,synic,tabula,vibrantink,vividchalk,xoria256,zenburn}.vim colors
+   rm -rv colors-tmp
+}
+
+package() {
+    cd ${srcdir}
+    installpath="${pkgdir}/usr/share/vim/vim74"
+    install -d $installpath/colors/
+    install -m644 colors/* $installpath/colors
+    install -D -m644 plugin/color_sample_pack.vim $installpath/plugin/themes.vim
+    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}
diff --git a/libre/xarchiver-libre/PKGBUILD b/libre/xarchiver-libre/PKGBUILD
index e606e65f4..a718b8252 100644
--- a/libre/xarchiver-libre/PKGBUILD
+++ b/libre/xarchiver-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 104651 2014-01-24 08:23:36Z bgyorgy $
+# $Id: PKGBUILD 105928 2014-02-19 11:27:15Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: Andrew Simmons <andrew.simmons@gmail.com>
@@ -6,8 +6,8 @@
 
 _pkgname=xarchiver
 pkgname=xarchiver-libre
-pkgver=0.5.2
-pkgrel=6
+pkgver=0.5.3
+pkgrel=1
 pkgdesc="GTK+ frontend to various command line archivers, with unar support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xarchiver.sourceforge.net/"
@@ -19,78 +19,42 @@ depends=('gtk2' 'desktop-file-utils')
 makedepends=('intltool')
 optdepends=('zip: ZIP support'
             'unzip: ZIP support'
-            'unar: RAR support'
             'p7zip: 7z support'
             'arj: ARJ support'
             'lzop: LZOP support'
-            'cpio: RPM support')
+            'cpio: RPM support'
+            'unar: RAR support')
 install=xarchiver.install
 source=(http://downloads.sourceforge.net/xarchiver/xarchiver-$pkgver.tar.bz2
-        xarchiver-0.5.2-no-donators-menu.patch
-        xarchiver-0.5.2-add_xz_support.patch
-        xarchiver-0.5.2-segfault-open-with.patch
-        xarchiver-0.5.2-fix_7z_support.patch
-        xarchiver-0.5.2-drag-n-drop_escaped_path.patch
-        xarchiver-0.5.2-fix-double-escaping.patch
-        xarchiver-0.5.2-fix-non-existent-archive.patch
-        xarchiver-0.5.2-segfault-delete-file.patch
-        xarchiver-0.5.2-segfault-password-protected.patch
-        xarchiver-0.5.2-add_unar_support.patch
-        xarchiver-0.5.2-add_mime_types.patch)
-md5sums=('2bc7f06403cc6582dd4a8029ec9d038d'
-         '7ef9fe9aee9f0fbc141ed9683e91ea1c'
-         '5d5ef8dd1b8b7790af4ece5fcedcd370'
-         'f9036a44157b318cbc59ed012b04974b'
-         '782f55c1f1021dc02c7739bf8a47336e'
-         'fcd9e04222c5e0ef459977bd7cd0ae4e'
+        xarchiver-0.5.3-fix-rpm-support.patch
+        xarchiver-0.5.3-fix-double-escaping.patch
+        xarchiver-0.5.3-fix-password-protected.patch
+        xarchiver-0.5.3-add-mime-types.patch
+        xarchiver-0.5.3-add-unar-support.patch)
+md5sums=('fd390bbd2df76a5f8a007bdeae82d4aa'
+         '812b93339f5e3332621f3c5abebfe277'
          '6178d7ab679b761469c880a8db991907'
-         '22ed2783e72684a102243c5834bf5ca3'
-         'e518b1e0bc4407383aae2783c0c19a04'
-         'c46daf2ee9fce7ece608eca33174db6b'
-         '1bfed3e1a9f8f4858ec90f0d66cfc5ba'
-         '36a4c3181230aab1e0ce1596acc5ef88')
+         '35ab96d98521a0a36f3e9e9ec0969107'
+         'f9119f5290caa195a56b7d3c63d9137d'
+         '5f0b21efd0159d41f207e664b72210b8')
 
 prepare() {
   cd $_pkgname-$pkgver
 
-  # Fix donators menu item (upstream patch)
-  patch -Np2 -i ../xarchiver-0.5.2-no-donators-menu.patch
-
-  # Add XZ support
-  # http://sourceforge.net/p/xarchiver/bugs/28/
-  patch -Np1 -i ../xarchiver-0.5.2-add_xz_support.patch
-
-  # Fix segfault on open with dialog
-  # http://sourceforge.net/p/xarchiver/bugs/52/
-  patch -Np1 -i ../xarchiver-0.5.2-segfault-open-with.patch
-
-  # Fix 7z support
-  # http://sourceforge.net/p/xarchiver/patches/5/
-  patch -Np1 -i ../xarchiver-0.5.2-fix_7z_support.patch
-
-  # Fix extraction when the Drag'n'Drop target path contains spaces
-  patch -Np1 -i ../xarchiver-0.5.2-drag-n-drop_escaped_path.patch
+  # Fix RPM support
+  patch -Np1 -i ../xarchiver-0.5.3-fix-rpm-support.patch
 
   # Fix error when trying to create archives with spaces
-  patch -Np1 -i ../xarchiver-0.5.2-fix-double-escaping.patch
-
-  # Fix segfault when non-existent archive specified
-  patch -Np1 -i ../xarchiver-0.5.2-fix-non-existent-archive.patch
-
-  # Fix segfault when deleting a file
-  patch -Np1 -i ../xarchiver-0.5.2-segfault-delete-file.patch
+  patch -Np1 -i ../xarchiver-0.5.3-fix-double-escaping.patch
 
   # Fix segfault when handling password protected files
-  patch -Np1 -i ../xarchiver-0.5.2-segfault-password-protected.patch
-
-  # Add unar support
-  patch -Np1 -i ../xarchiver-0.5.2-add_unar_support.patch
+  patch -Np1 -i ../xarchiver-0.5.3-fix-password-protected.patch
 
   # Add more MIME types in the desktop file
-  patch -Np1 -i ../xarchiver-0.5.2-add_mime_types.patch
+  patch -Np1 -i ../xarchiver-0.5.3-add-mime-types.patch
 
-  # Update upstream URL
-  find -type f | xargs sed -i 's|http://xarchiver.xfce.org|http://xarchiver.sf.net|'
+  # Add unar support
+  patch -Np1 -i ../xarchiver-0.5.3-add-unar-support.patch
 }
 
 build() {
diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-add_xz_support.patch b/libre/xarchiver-libre/xarchiver-0.5.2-add_xz_support.patch
deleted file mode 100644
index d246a8e19..000000000
--- a/libre/xarchiver-libre/xarchiver-0.5.2-add_xz_support.patch
+++ /dev/null
@@ -1,397 +0,0 @@
-diff -uNr xarchiver-0.5.2.orig/src/add_dialog.c xarchiver-0.5.2/src/add_dialog.c
---- xarchiver-0.5.2.orig/src/add_dialog.c	2008-11-10 19:41:31.000000000 +0900
-+++ xarchiver-0.5.2/src/add_dialog.c	2013-05-11 10:01:47.887094708 +0900
-@@ -209,7 +209,7 @@
- 	else
- 		gtk_widget_set_size_request (add_dialog->dialog1,530,420);
- 
--	if (archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP || archive->type == XARCHIVETYPE_LZMA || archive->type == XARCHIVETYPE_LZOP)
-+	if (archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP || archive->type == XARCHIVETYPE_LZMA || archive->type == XARCHIVETYPE_XZ || archive->type == XARCHIVETYPE_LZOP)
- 		gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(add_dialog->filechooserwidget1),FALSE);
- 	else
- 		gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(add_dialog->filechooserwidget1),TRUE);
-@@ -222,7 +222,7 @@
- 	else
- 		gtk_widget_set_sensitive(add_dialog->store_path,TRUE);
- 	/* 7z doesn't appear to let the user chooses if storing full paths */
--	if (archive->type == XARCHIVETYPE_7ZIP || archive->type == XARCHIVETYPE_LZOP || archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP || archive->type == XARCHIVETYPE_LZMA)
-+	if (archive->type == XARCHIVETYPE_7ZIP || archive->type == XARCHIVETYPE_LZOP || archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP || archive->type == XARCHIVETYPE_LZMA || archive->type == XARCHIVETYPE_XZ )
-  	{
-  		flag = FALSE;
- 	}
-@@ -244,7 +244,7 @@
- 		flag = TRUE;
- 	gtk_widget_set_sensitive(add_dialog->solid_archive,flag);
- 	
--	if (archive->type != XARCHIVETYPE_TAR && archive->type != XARCHIVETYPE_TAR_GZ && archive->type != XARCHIVETYPE_TAR_LZMA && archive->type != XARCHIVETYPE_TAR_BZ2 && archive->type != XARCHIVETYPE_TAR_LZOP)
-+	if (archive->type != XARCHIVETYPE_TAR && archive->type != XARCHIVETYPE_TAR_GZ && archive->type != XARCHIVETYPE_TAR_LZMA && archive->type != XARCHIVETYPE_TAR_XZ && archive->type != XARCHIVETYPE_TAR_BZ2 && archive->type != XARCHIVETYPE_TAR_LZOP)
- 	{
- 		flag = TRUE;
- 		if (archive->type == XARCHIVETYPE_7ZIP)
-@@ -306,7 +306,7 @@
- 		g_signal_connect (G_OBJECT (add_dialog->compression_value),"value-changed",G_CALLBACK (fix_adjustment_value), NULL);
- 	gtk_tooltips_set_tip (add_dialog->option_tooltip,add_dialog->compression_scale, compression_msg, NULL );
- 
--	if (archive->type == XARCHIVETYPE_TAR || archive->type == XARCHIVETYPE_TAR_GZ || archive->type == XARCHIVETYPE_TAR_LZMA || archive->type == XARCHIVETYPE_TAR_BZ2 || archive->type == XARCHIVETYPE_TAR_LZOP)
-+	if (archive->type == XARCHIVETYPE_TAR || archive->type == XARCHIVETYPE_TAR_GZ || archive->type == XARCHIVETYPE_TAR_LZMA || archive->type == XARCHIVETYPE_TAR_XZ || archive->type == XARCHIVETYPE_TAR_BZ2 || archive->type == XARCHIVETYPE_TAR_LZOP)
- 		flag = FALSE;
- 	else
- 		flag = TRUE;
-diff -uNr xarchiver-0.5.2.orig/src/archive.h xarchiver-0.5.2/src/archive.h
---- xarchiver-0.5.2.orig/src/archive.h	2008-11-07 17:49:41.000000000 +0900
-+++ xarchiver-0.5.2/src/archive.h	2013-05-11 10:01:47.888094708 +0900
-@@ -30,6 +30,7 @@
- 	XARCHIVETYPE_BZIP2,
- 	XARCHIVETYPE_GZIP,
- 	XARCHIVETYPE_LZMA,
-+	XARCHIVETYPE_XZ,
- 	XARCHIVETYPE_LZOP,
- 	XARCHIVETYPE_RAR,
- 	XARCHIVETYPE_RPM,
-@@ -37,6 +38,7 @@
- 	XARCHIVETYPE_TAR_BZ2,
- 	XARCHIVETYPE_TAR_GZ,
- 	XARCHIVETYPE_TAR_LZMA,
-+	XARCHIVETYPE_TAR_XZ,
- 	XARCHIVETYPE_TAR_LZOP,
- 	XARCHIVETYPE_ZIP,
- 	XARCHIVETYPE_LHA,
-diff -uNr xarchiver-0.5.2.orig/src/bzip2.c xarchiver-0.5.2/src/bzip2.c
---- xarchiver-0.5.2.orig/src/bzip2.c	2008-11-10 20:17:48.000000000 +0900
-+++ xarchiver-0.5.2/src/bzip2.c	2013-05-11 10:01:47.888094708 +0900
-@@ -54,6 +54,15 @@
- 		archive->extract = 	extract[archive->type];
- 		xa_open_tar_compressed_file(archive);
- 	}
-+	else if (g_str_has_suffix(archive->escaped_path,".tar.xz") || g_str_has_suffix (archive->escaped_path,".txz"))
-+	{
-+		archive->type = XARCHIVETYPE_TAR_XZ;
-+		archive->format = "TAR.XZ";
-+		archive->delete =	delete[archive->type];
-+		archive->add = 		add[archive->type];
-+		archive->extract = 	extract[archive->type];
-+		xa_open_tar_compressed_file(archive);
-+	}
- 	else if (g_str_has_suffix(archive->escaped_path,".tar.lzop") ||
- 		g_str_has_suffix (archive->escaped_path,".tzo") ||
- 		g_str_has_suffix(archive->escaped_path,".tar.lzo"))
-@@ -85,6 +94,12 @@
- 			executable = "lzma ";
- 			len = 5;
- 		}
-+		else if (archive->type == XARCHIVETYPE_XZ)
-+		{
-+			archive->format = "XZ";
-+			executable = "xz ";
-+			len = 5;
-+		}
- 		else if (archive->type == XARCHIVETYPE_LZOP)
- 		{
- 			archive->format = "LZOP";
-@@ -163,6 +178,8 @@
- 		command = g_strconcat(tar," tfjv ",archive->escaped_path,NULL);
- 	else if (archive->type == XARCHIVETYPE_TAR_LZMA)
- 		command = g_strconcat(tar," tv --use-compress-program=lzma -f ",archive->escaped_path,NULL);
-+	else if (archive->type == XARCHIVETYPE_TAR_XZ)
-+		command = g_strconcat(tar," tv --use-compress-program=xz -f ",archive->escaped_path,NULL);
- 	else if (archive->type == XARCHIVETYPE_TAR_LZOP)
- 		command = g_strconcat(tar," tv --use-compress-program=lzop -f ",archive->escaped_path,NULL);
- 	/* else fail? */
-@@ -205,6 +222,11 @@
- 		executable = "lzma ";
- 		len = 5;
- 	}
-+	else if (archive->type == XARCHIVETYPE_XZ)
-+	{
-+		executable = "xz ";
-+		len = 5;
-+	}
- 	else if (archive->type == XARCHIVETYPE_LZOP)
- 	{
- 		executable = "lzop ";
-diff -uNr xarchiver-0.5.2.orig/src/extract_dialog.c xarchiver-0.5.2/src/extract_dialog.c
---- xarchiver-0.5.2.orig/src/extract_dialog.c	2008-11-10 19:28:11.000000000 +0900
-+++ xarchiver-0.5.2/src/extract_dialog.c	2013-05-11 10:01:47.889094708 +0900
-@@ -815,6 +815,11 @@
- 		archive->type = XARCHIVETYPE_TAR_LZMA;
- 		archive->extract = 	extract[XARCHIVETYPE_TAR_LZMA];
- 	}
-+	else if (g_str_has_suffix(archive->escaped_path,".tar.xz")|| g_str_has_suffix (archive->escaped_path,".txz"))
-+	{
-+		archive->type = XARCHIVETYPE_TAR_XZ;
-+		archive->extract = 	extract[XARCHIVETYPE_TAR_XZ];
-+	}
- 	else if (g_str_has_suffix(archive->escaped_path,".tar.lzop") ||
- 			g_str_has_suffix (archive->escaped_path,".tzo") ||
- 			g_str_has_suffix(archive->escaped_path,".tar.lzo"))
-diff -uNr xarchiver-0.5.2.orig/src/main.c xarchiver-0.5.2/src/main.c
---- xarchiver-0.5.2.orig/src/main.c	2008-11-10 20:21:43.000000000 +0900
-+++ xarchiver-0.5.2/src/main.c	2013-05-11 10:17:01.696094044 +0900
-@@ -296,9 +296,10 @@
- 	open_archive[XARCHIVETYPE_BZIP2]  = &xa_open_bzip2_lzma;
- 	open_archive[XARCHIVETYPE_GZIP]  = &xa_open_gzip;
- 	open_archive[XARCHIVETYPE_LZMA]  = &xa_open_bzip2_lzma;
-+	open_archive[XARCHIVETYPE_XZ]  = &xa_open_bzip2_lzma;
- 	open_archive[XARCHIVETYPE_RAR]  = &xa_open_rar;
- 	open_archive[XARCHIVETYPE_RPM]  = &xa_open_rpm;
--	open_archive[XARCHIVETYPE_TAR]  = open_archive[XARCHIVETYPE_TAR_BZ2] = open_archive[XARCHIVETYPE_TAR_GZ] = open_archive[XARCHIVETYPE_TAR_LZMA] = open_archive[XARCHIVETYPE_TAR_LZOP] = &xa_open_tar;
-+	open_archive[XARCHIVETYPE_TAR]  = open_archive[XARCHIVETYPE_TAR_BZ2] = open_archive[XARCHIVETYPE_TAR_GZ] = open_archive[XARCHIVETYPE_TAR_LZMA] = open_archive[XARCHIVETYPE_TAR_XZ] = open_archive[XARCHIVETYPE_TAR_LZOP] = &xa_open_tar;
- 	open_archive[XARCHIVETYPE_ZIP] = &xa_open_zip;
- 	open_archive[XARCHIVETYPE_LHA] = &xa_open_lha;
- 	open_archive[XARCHIVETYPE_LZOP] = &xa_open_bzip2_lzma;
-@@ -310,9 +311,10 @@
- 	delete[XARCHIVETYPE_BZIP2]  = 0;
- 	delete[XARCHIVETYPE_GZIP]  = 0;
- 	delete[XARCHIVETYPE_LZMA]  = 0;
-+	delete[XARCHIVETYPE_XZ]  = 0;
- 	delete[XARCHIVETYPE_RAR]  = &xa_rar_delete;
- 	delete[XARCHIVETYPE_RPM]  = 0;
--	delete[XARCHIVETYPE_TAR]  = delete[XARCHIVETYPE_TAR_BZ2] = delete[XARCHIVETYPE_TAR_GZ] = delete[XARCHIVETYPE_TAR_LZMA] = delete[XARCHIVETYPE_TAR_LZOP] = &xa_tar_delete;
-+	delete[XARCHIVETYPE_TAR]  = delete[XARCHIVETYPE_TAR_BZ2] = delete[XARCHIVETYPE_TAR_GZ] = delete[XARCHIVETYPE_TAR_LZMA] = delete[XARCHIVETYPE_TAR_XZ] = delete[XARCHIVETYPE_TAR_LZOP] = &xa_tar_delete;
- 	delete[XARCHIVETYPE_ZIP] = &xa_zip_delete;
- 	delete[XARCHIVETYPE_LHA] = &xa_lha_delete;
- 	delete[XARCHIVETYPE_LZOP] = 0;
-@@ -322,10 +324,10 @@
- 	add[XARCHIVETYPE_7ZIP]  = &xa_7zip_add;
- 	add[XARCHIVETYPE_ARJ]  = &xa_arj_add;
- 	add[XARCHIVETYPE_DEB]  = 0;
--	add[XARCHIVETYPE_BZIP2]  = add[XARCHIVETYPE_GZIP] = add[XARCHIVETYPE_LZMA] = &xa_tar_add;
-+	add[XARCHIVETYPE_BZIP2]  = add[XARCHIVETYPE_GZIP] = add[XARCHIVETYPE_LZMA] = add[XARCHIVETYPE_XZ] = &xa_tar_add;
- 	add[XARCHIVETYPE_RAR]  = &xa_rar_add;
- 	add[XARCHIVETYPE_RPM]  = 0;
--	add[XARCHIVETYPE_TAR]  = add[XARCHIVETYPE_TAR_BZ2] = add[XARCHIVETYPE_TAR_GZ] = add[XARCHIVETYPE_TAR_LZMA] = add[XARCHIVETYPE_TAR_LZOP] = &xa_tar_add;
-+	add[XARCHIVETYPE_TAR]  = add[XARCHIVETYPE_TAR_BZ2] = add[XARCHIVETYPE_TAR_GZ] = add[XARCHIVETYPE_TAR_LZMA] = add[XARCHIVETYPE_TAR_XZ] = add[XARCHIVETYPE_TAR_LZOP] = &xa_tar_add;
- 	add[XARCHIVETYPE_ZIP] = &xa_zip_add;
- 	add[XARCHIVETYPE_LHA] = &xa_lha_add;
- 	add[XARCHIVETYPE_LZOP] = &xa_tar_add;
-@@ -334,10 +336,10 @@
- 	extract[XARCHIVETYPE_7ZIP]  = &xa_7zip_extract;
- 	extract[XARCHIVETYPE_ARJ]  = &xa_arj_extract;
- 	extract[XARCHIVETYPE_DEB]  = &xa_deb_extract;;
--	extract[XARCHIVETYPE_BZIP2]  = extract[XARCHIVETYPE_GZIP] = extract[XARCHIVETYPE_LZMA] = &xa_tar_extract;
-+	extract[XARCHIVETYPE_BZIP2]  = extract[XARCHIVETYPE_GZIP] = extract[XARCHIVETYPE_LZMA] = extract[XARCHIVETYPE_XZ] = &xa_tar_extract;
- 	extract[XARCHIVETYPE_RAR]  = &xa_rar_extract;
- 	extract[XARCHIVETYPE_RPM]  = &xa_rpm_extract;
--	extract[XARCHIVETYPE_TAR]  = extract[XARCHIVETYPE_TAR_BZ2] = extract[XARCHIVETYPE_TAR_GZ] = extract[XARCHIVETYPE_TAR_LZMA] = extract[XARCHIVETYPE_TAR_LZOP] = &xa_tar_extract;
-+	extract[XARCHIVETYPE_TAR]  = extract[XARCHIVETYPE_TAR_BZ2] = extract[XARCHIVETYPE_TAR_GZ] = extract[XARCHIVETYPE_TAR_LZMA] = extract[XARCHIVETYPE_TAR_XZ] = extract[XARCHIVETYPE_TAR_LZOP] = &xa_tar_extract;
- 	extract[XARCHIVETYPE_ZIP] = &xa_zip_extract;
- 	extract[XARCHIVETYPE_LHA] = &xa_lha_extract;
- 	extract[XARCHIVETYPE_LZOP] = &xa_tar_extract;
-@@ -345,10 +347,10 @@
- 	test[0]  = 0;
- 	test[XARCHIVETYPE_7ZIP]  = &xa_7zip_test;
- 	test[XARCHIVETYPE_ARJ]  = &xa_arj_test;
--	test[XARCHIVETYPE_DEB]  = test[XARCHIVETYPE_BZIP2] = test[XARCHIVETYPE_GZIP] = test[XARCHIVETYPE_LZMA] = 0;
-+	test[XARCHIVETYPE_DEB]  = test[XARCHIVETYPE_BZIP2] = test[XARCHIVETYPE_GZIP] = test[XARCHIVETYPE_LZMA] = test[XARCHIVETYPE_XZ] = 0;
- 	test[XARCHIVETYPE_RAR]  = &xa_rar_test;
- 	test[XARCHIVETYPE_RPM]  = 0;
--	test[XARCHIVETYPE_TAR]  = test[XARCHIVETYPE_TAR_BZ2] = test[XARCHIVETYPE_TAR_GZ] = test[XARCHIVETYPE_TAR_LZMA] = test[XARCHIVETYPE_TAR_LZOP] = 0;
-+	test[XARCHIVETYPE_TAR]  = test[XARCHIVETYPE_TAR_BZ2] = test[XARCHIVETYPE_TAR_GZ] = test[XARCHIVETYPE_TAR_LZMA] = test[XARCHIVETYPE_TAR_XZ] = test[XARCHIVETYPE_TAR_LZOP] = 0;
- 	test[XARCHIVETYPE_ZIP] = &xa_zip_test;
- 	test[XARCHIVETYPE_LHA] = &xa_lha_test;
- 	test[XARCHIVETYPE_LZOP] = 0;
-@@ -392,6 +394,14 @@
- 		g_free (absolute_path);
- 	}
- 
-+	absolute_path = g_find_program_in_path("xz");
-+	if ( absolute_path )
-+	{
-+		ArchiveType = g_list_append(ArchiveType, "xz");
-+		ArchiveSuffix = g_list_append(ArchiveSuffix, "*.xz");
-+		g_free (absolute_path);
-+	}
-+
- 	absolute_path = g_find_program_in_path("lzop");
- 	if ( absolute_path )
- 	{
-@@ -460,6 +470,11 @@
- 			ArchiveType = g_list_append(ArchiveType, "tar.lzma");
- 			ArchiveSuffix = g_list_append(ArchiveSuffix, "*.tlz");
- 		}
-+		if ( g_list_find ( ArchiveType , "xz") )
-+		{
-+			ArchiveType = g_list_append(ArchiveType, "tar.xz");
-+			ArchiveSuffix = g_list_append(ArchiveSuffix, "*.txz");
-+		}
- 		if ( g_list_find ( ArchiveType , "lzo") )
- 		{
- 			ArchiveType = g_list_append(ArchiveType, "tar.lzo");
-@@ -528,6 +543,8 @@
- 		archive->type = XARCHIVETYPE_TAR_GZ;
- 	else if ( g_str_has_suffix ( archive->escaped_path , ".tar.lzma") || g_str_has_suffix ( archive->escaped_path , ".tlz") )
- 		archive->type = XARCHIVETYPE_TAR_LZMA;
-+	else if ( g_str_has_suffix ( archive->escaped_path , ".tar.xz") || g_str_has_suffix ( archive->escaped_path , ".txz") )
-+		archive->type = XARCHIVETYPE_TAR_XZ;
- 	else if ( g_str_has_suffix ( archive->escaped_path , ".tar.lzo") ||
- 		g_str_has_suffix ( archive->escaped_path , ".tzo") ||
- 		g_str_has_suffix ( archive->escaped_path , ".tar.lzop"))
-diff -uNr xarchiver-0.5.2.orig/src/new_dialog.c xarchiver-0.5.2/src/new_dialog.c
---- xarchiver-0.5.2.orig/src/new_dialog.c	2008-11-11 17:28:46.000000000 +0900
-+++ xarchiver-0.5.2/src/new_dialog.c	2013-05-11 10:01:47.890094708 +0900
-@@ -202,6 +202,8 @@
- 			type = XARCHIVETYPE_GZIP;
- 		else if (strcmp ( ComboArchiveType,"lzma") == 0)
- 			type = XARCHIVETYPE_LZMA;
-+		else if (strcmp ( ComboArchiveType,"xz") == 0)
-+			type = XARCHIVETYPE_XZ;
- 		else if (strcmp ( ComboArchiveType,"lzo") == 0)
- 			type = XARCHIVETYPE_LZOP;
- 		else if (strcmp ( ComboArchiveType,"rar") == 0)
-@@ -214,6 +216,8 @@
- 			type = XARCHIVETYPE_TAR_GZ;
- 		else if (strcmp ( ComboArchiveType,"tar.lzma") == 0)
- 			type = XARCHIVETYPE_TAR_LZMA;
-+		else if (strcmp ( ComboArchiveType,"tar.xz") == 0)
-+			type = XARCHIVETYPE_TAR_XZ;
- 		else if (strcmp ( ComboArchiveType,"tar.lzo") == 0)
- 			type = XARCHIVETYPE_TAR_LZOP;
- 		else if (strcmp ( ComboArchiveType,"jar") == 0 || strcmp ( ComboArchiveType,"zip") == 0 )
-diff -Naur xarchiver-0.5.2.orig/src/rpm.c xarchiver-0.5.2/src/rpm.c
---- xarchiver-0.5.2.orig/src/rpm.c	2014-01-24 03:07:47.729711000 +0100
-+++ xarchiver-0.5.2/src/rpm.c	2014-01-24 03:12:43.717122918 +0100
-@@ -111,8 +111,10 @@
- 	}
- 	if (xa_detect_archive_type (gzip_tmp) == XARCHIVETYPE_GZIP)
- 		executable = "gzip -dc ";
--	else
-+	else if (xa_detect_archive_type (gzip_tmp) == XARCHIVETYPE_BZIP2)
- 		executable = "bzip2 -dc ";
-+	else
-+		executable = "xz -dc ";
- 
- 	command = g_strconcat("sh -c \"",executable,gzip_tmp," > ",archive->tmp,"/file.cpio\"",NULL);
- 	g_free(gzip_tmp);diff -uNr xarchiver-0.5.2.orig/src/tar.c xarchiver-0.5.2/src/tar.c
---- xarchiver-0.5.2.orig/src/tar.c	2008-11-10 19:28:34.000000000 +0900
-+++ xarchiver-0.5.2/src/tar.c	2013-05-11 10:12:01.027094262 +0900
-@@ -242,6 +242,17 @@
- 									files->str , NULL );
- 		break;
- 		
-+		case XARCHIVETYPE_TAR_XZ:
-+		if ( g_file_test ( archive->escaped_path , G_FILE_TEST_EXISTS ) )
-+			xa_add_delete_bzip2_gzip_lzma_compressed_tar (files,archive,1);
-+		else
-+			command = g_strconcat (tar, " ",
-+									archive->add_recurse ? "" : "--no-recursion ",
-+									archive->remove_files ? "--remove-files " : "",
-+									"--use-compress-program=xz -cvvf ",archive->escaped_path,
-+									files->str , NULL );
-+		break;
-+		
- 		case XARCHIVETYPE_TAR_LZOP:
- 		if ( g_file_test ( archive->escaped_path , G_FILE_TEST_EXISTS ) )
- 			xa_add_delete_bzip2_gzip_lzma_compressed_tar (files,archive,1);
-@@ -265,6 +276,10 @@
- 			command = g_strconcat("sh -c \"lzma -c ",files->str,"> ",archive->escaped_path,"\"",NULL);
- 		break;
- 
-+		case XARCHIVETYPE_XZ:
-+			command = g_strconcat("sh -c \"xz -c ",files->str,"> ",archive->escaped_path,"\"",NULL);
-+		break;
-+
- 		case XARCHIVETYPE_LZOP:
- 			command = g_strconcat("sh -c \"lzop -c ",files->str,"> ",archive->escaped_path,"\"",NULL);
- 		break;
-@@ -378,6 +393,25 @@
- 		}
- 		break;
- 
-+		case XARCHIVETYPE_TAR_XZ:
-+		if (archive->full_path == 1)
-+		{
-+			command = g_strconcat (tar, " --use-compress-program=xz -xvf " , archive->escaped_path,
-+						#ifdef __FreeBSD__
-+								archive->overwrite ? " " : " -k",
-+						#else
-+								archive->overwrite ? " --overwrite" : " --keep-old-files",
-+						#endif
-+								archive->tar_touch ? " --touch" : "",
-+								" -C ",archive->extraction_path," ",names->str,NULL);
-+		}
-+		else
-+		{
-+			result = xa_extract_tar_without_directories ( "tar --use-compress-program=xz -xvf ",archive,names->str);
-+			command = NULL;
-+		}
-+		break;
-+
- 		case XARCHIVETYPE_TAR_LZOP:
- 		if (archive->full_path == 1)
- 		{
-@@ -402,6 +436,11 @@
- 		command = NULL;
- 		break;
- 
-+		case XARCHIVETYPE_XZ:
-+		result = lzma_bzip2_extract(archive,NULL);
-+		command = NULL;
-+		break;
-+
- 		case XARCHIVETYPE_LZOP:
- 		result = lzma_bzip2_extract(archive,NULL);
- 		command = NULL;
-@@ -449,6 +488,10 @@
- 			executable = "lzma -f ";
- 			filename = "dummy.lzma";
- 		break;
-+		case XARCHIVETYPE_TAR_XZ:
-+			executable = "xz -f ";
-+			filename = "dummy.xz";
-+		break;
- 		case XARCHIVETYPE_TAR_LZOP:
- 			executable = "lzop -f ";
- 			filename = "dummy.lzo";
-@@ -493,7 +536,7 @@
- 
- gboolean is_tar_compressed (gint type)
- {
--	return (type == XARCHIVETYPE_TAR_BZ2 || type == XARCHIVETYPE_TAR_GZ || type == XARCHIVETYPE_TAR_LZMA || type == XARCHIVETYPE_TAR_LZOP);
-+	return (type == XARCHIVETYPE_TAR_BZ2 || type == XARCHIVETYPE_TAR_GZ || type == XARCHIVETYPE_TAR_LZMA || type == XARCHIVETYPE_TAR_XZ || type == XARCHIVETYPE_TAR_LZOP);
- }
- 
- gboolean xa_extract_tar_without_directories (gchar *string,XArchive *archive,gchar *files_to_extract)
-diff -uNr xarchiver-0.5.2.orig/src/window.c xarchiver-0.5.2/src/window.c
---- xarchiver-0.5.2.orig/src/window.c	2008-11-11 17:31:45.000000000 +0900
-+++ xarchiver-0.5.2/src/window.c	2013-05-11 10:01:47.892094708 +0900
-@@ -1125,6 +1125,8 @@
- 		xx = XARCHIVETYPE_GZIP;
- 	else if (memcmp ( magic,"\x5d\x00\x00\x80",4) == 0)
- 		xx = XARCHIVETYPE_LZMA;
-+	else if ((memcmp ( magic,"\xFD" "7zXZ\x00\x00",7) == 0) || (memcmp ( magic,"\xFD" "7zXZ\x00\x10",7) == 0))
-+		xx = XARCHIVETYPE_XZ;
- 	else if (memcmp ( magic,"\211LZO",4) == 0)
- 		xx = XARCHIVETYPE_LZOP;
- 	else if (memcmp ( magic,"\xed\xab\xee\xdb",4) == 0)
-@@ -1462,6 +1464,7 @@
- 		case XARCHIVETYPE_GZIP:
- 		case XARCHIVETYPE_BZIP2:
- 		case XARCHIVETYPE_LZMA:
-+		case XARCHIVETYPE_XZ:
- 		case XARCHIVETYPE_LZOP:
- 		case XARCHIVETYPE_RPM:
- 		pos = 3;
-@@ -1481,6 +1484,7 @@
- 		case XARCHIVETYPE_TAR_GZ:
- 		case XARCHIVETYPE_TAR_BZ2:
- 		case XARCHIVETYPE_TAR_LZMA:
-+		case XARCHIVETYPE_TAR_XZ:
- 		case XARCHIVETYPE_TAR_LZOP:
- 		case XARCHIVETYPE_TAR:
- 		case XARCHIVETYPE_ZIP:
-@@ -1525,6 +1529,7 @@
- 		case XARCHIVETYPE_GZIP:
- 		case XARCHIVETYPE_BZIP2:
- 		case XARCHIVETYPE_LZMA:
-+		case XARCHIVETYPE_XZ:
- 		case XARCHIVETYPE_LZOP:
- 		case XARCHIVETYPE_RPM:
- 		pos = 3;
-@@ -1544,6 +1549,7 @@
- 		case XARCHIVETYPE_TAR_GZ:
- 		case XARCHIVETYPE_TAR_BZ2:
- 		case XARCHIVETYPE_TAR_LZMA:
-+		case XARCHIVETYPE_TAR_XZ:
- 		case XARCHIVETYPE_TAR_LZOP:
- 		case XARCHIVETYPE_TAR:
- 		case XARCHIVETYPE_ZIP:
diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-drag-n-drop_escaped_path.patch b/libre/xarchiver-libre/xarchiver-0.5.2-drag-n-drop_escaped_path.patch
deleted file mode 100644
index 10def7d21..000000000
--- a/libre/xarchiver-libre/xarchiver-0.5.2-drag-n-drop_escaped_path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur xarchiver-0.5.2.orig/src/window.c xarchiver-0.5.2/src/window.c
---- xarchiver-0.5.2.orig/src/window.c	2012-01-12 13:28:54.000000000 +0100
-+++ xarchiver-0.5.2/src/window.c	2012-01-23 20:43:49.622745851 +0100
-@@ -1724,6 +1724,9 @@
- 			gtk_tree_selection_selected_foreach (selection,(GtkTreeSelectionForeachFunc) xa_concat_selected_filenames,&names);
- 			archive->full_path = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (extract_window->extract_full));
- 			archive->overwrite = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (extract_window->overwrite_check));
-+			gchar *unescaped_extraction_path = archive->extraction_path;
-+			archive->extraction_path = xa_escape_filename(unescaped_extraction_path, "$'`\"\\!?* ()[]&|:;<>#");
-+			g_free(unescaped_extraction_path);
- 			(*archive->extract) (archive,names);
- 
- 			g_list_foreach (row_list,(GFunc) gtk_tree_path_free,NULL);
diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-fix-non-existent-archive.patch b/libre/xarchiver-libre/xarchiver-0.5.2-fix-non-existent-archive.patch
deleted file mode 100644
index e63687579..000000000
--- a/libre/xarchiver-libre/xarchiver-0.5.2-fix-non-existent-archive.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Markus Koschany <apo@gambaru.de>
-Date: Thu, 28 Feb 2013 17:45:50 +0100
-Subject: fix segfault non-existent archive cmdl switch x
-
-If using the command line switch -x, the user needs to specify a valid/existent
-archive. If the name of the archive is mistyped, xarchiver will segfault. This
-patch fixes the issue.
-
-Bug: http://bugs.debian.org/701909
----
- src/main.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/main.c b/src/main.c
-index a6a7f93..a6e05e3 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -141,7 +141,7 @@ int main (int argc, char **argv)
- 		/* Switch -x */
- 		if (extract_path != NULL)
- 		{
--			if (argv[1] == NULL)
-+			if (argv[1] == NULL || archive == NULL)
- 			{
- 				response = xa_show_message_dialog (NULL,GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't extract files from the archive:"),_("You missed the archive name!\n"));
- 				return -1;
diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-fix_7z_support.patch b/libre/xarchiver-libre/xarchiver-0.5.2-fix_7z_support.patch
deleted file mode 100644
index f7ff098c0..000000000
--- a/libre/xarchiver-libre/xarchiver-0.5.2-fix_7z_support.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-diff -Nur xarchiver-0.5.2.orig/src/7zip.c xarchiver-0.5.2/src/7zip.c
---- xarchiver-0.5.2.orig/src/7zip.c	2008-10-25 00:41:17.000000000 +1300
-+++ xarchiver-0.5.2/src/7zip.c	2010-12-15 11:24:26.000000000 +1300
-@@ -64,15 +64,14 @@
- 	XEntry *entry;
- 	gchar *filename;
- 	gpointer item[5];
--	gint linesize = 0,n = 0,a = 0;
--	gboolean dir = FALSE;
-+	gint linesize = 0,a = 0;
- 
- 	if (last_line)
- 		return;
- 
- 	if (jump_header == FALSE)
- 	{
--		if (line[0] == '-')
-+		if ((line[0] == '-') && (line[3] != NULL)) 
- 		{
- 			jump_header = TRUE;
- 			return;
-@@ -93,71 +92,42 @@
- 	item[4] = line;
- 
- 	/* Time */
--	for(n=13; n < linesize; ++n)
--		if(line[n] == ' ')
--			break;
--	line[n] = '\0';
-+	line[19] = '\0';
- 	item[3] = line + 11;
--	a = ++n;
- 	
- 	/* Permissions */
--	for(; n < linesize; n++)
--		if(line[n] == ' ')
--			break;
--	line[n] = '\0';
--	if ((line+a)[0] == 'D')
--		dir = TRUE;
--	item[2] = line + a;
-+	line[25] = '\0';
-+	item[2] = line + 20;
- 	
- 	/* Size */
--	for(++n; n < linesize; ++n)
--		if(line[n] >= '0' && line[n] <= '9')
-+	for(a=26; a < linesize; ++a)
-+		if(line[a] >= '0' && line[a] <= '9')
- 			break;
--	a = n;
- 
--	for(; n < linesize; ++n)
--		if(line[n] == ' ')
--			break;
--
--	line[n] = '\0';
-+	line[38] = '\0';
- 	item[0] = line + a;
- 	archive->dummy_size += g_ascii_strtoull(item[0],NULL,0);
- 
- 	/* Compressed */
--	for(++n; n < linesize; ++n)
--		if(line[n] >= '0' && line[n] <= '9')
--			break;
--	a = n;
--
--	for(; n < linesize; ++n)
--		if(line[n] == ' ')
--			break;
--
--	line[n] = '\0';
--
--	if (line[50] != ' ')
-+	/* Is this item solid? */
-+	if (line[50] == ' ')
- 	{
--		n+=2;
--		item[1] = line + a;
- 		line[linesize-1] = '\0';
--		filename = g_strdup(line + n);
-+		filename = g_strdup(line + 53);
- 	}
--	/* Is this a solid archive? */
-+
- 	else
- 	{
--		item[1] = "0";
--		line[n-1] = '\0';
-+		for(a=39; a < linesize; ++a)
-+			if(line[a] >= '0' && line[a] <= '9')
-+				break;
-+
-+		line[51] = '\0';
-+		item[1] = line + a;
-+		line[linesize-1] = '\0';
- 		filename = g_strdup(line + 53);
- 	}
- 
--	/* Work around for 7za which doesn't
--	* output / with directories */
--	if (dir)
--	{
--		gchar *filename_with_slash = g_strconcat (filename,"/",NULL);
--		g_free (filename);
--		filename = filename_with_slash;
--	}
- 	entry = xa_set_archive_entries_for_each_row (archive,filename,item);
- 	g_free(filename);
- }
diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-no-donators-menu.patch b/libre/xarchiver-libre/xarchiver-0.5.2-no-donators-menu.patch
deleted file mode 100644
index aa2283a7e..000000000
--- a/libre/xarchiver-libre/xarchiver-0.5.2-no-donators-menu.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- xarchiver/trunk/src/interface.c	2009/03/19 18:03:52	29676
-+++ xarchiver/trunk/src/interface.c	2009/03/19 20:48:19	29677
-@@ -310,22 +310,14 @@
- 	gtk_widget_show (tmp_image);
- 	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1),tmp_image);
- 
-+	donate = gtk_image_menu_item_new_with_mnemonic (_("_Donate"));
-+	gtk_widget_show (donate);
-+	gtk_container_add (GTK_CONTAINER (menuitem4_menu),donate);
-+
- 	about1 = gtk_image_menu_item_new_from_stock ("gtk-about",accel_group);
- 	gtk_widget_show (about1);
- 	gtk_container_add (GTK_CONTAINER (menuitem4_menu),about1);
- 
--	thanks_to = gtk_image_menu_item_new_with_mnemonic (_("_Thanks to"));
--	gtk_widget_show (thanks_to);
--	gtk_container_add (GTK_CONTAINER (menuitem4_menu),thanks_to);
--
--	thanks_to_submenu = gtk_menu_new();
--	gtk_widget_show (thanks_to_submenu);
--	gtk_menu_item_set_submenu (GTK_MENU_ITEM (thanks_to),thanks_to_submenu);
--
--	donators = gtk_image_menu_item_new_with_mnemonic ("Your name and website here");
--	gtk_widget_show (donators);
--	gtk_container_add (GTK_CONTAINER (thanks_to_submenu),donators);
--
- 	/* Create the toolbar */
- 	toolbar1 = gtk_toolbar_new ();
- 	gtk_widget_show (toolbar1);
-@@ -543,7 +535,7 @@
- 	g_signal_connect ((gpointer) multi_extract_menu,"activate",G_CALLBACK (xa_show_multi_extract_dialog),NULL);
- 	g_signal_connect ((gpointer) help1,"activate",G_CALLBACK (xa_show_help),NULL);
- 	g_signal_connect ((gpointer) about1,"activate",G_CALLBACK (xa_about),NULL);
--	g_signal_connect ((gpointer) donators,"activate",G_CALLBACK (xa_show_donate_page_on_the_web),NULL);
-+	g_signal_connect ((gpointer) donate,"activate",G_CALLBACK (xa_show_donate_page_on_the_web),NULL);
- 
- 	g_signal_connect ((gpointer) New_button,	"clicked",G_CALLBACK (xa_new_archive),NULL);
- 	g_signal_connect ((gpointer) Open_button,	"clicked",G_CALLBACK (xa_open_archive),NULL);
---- xarchiver/trunk/src/interface.h	2008/11/04 10:06:17	28603
-+++ xarchiver/trunk/src/interface.h	2009/03/19 20:48:19	29677
-@@ -48,8 +48,8 @@
- *name_label, *type_label, *compression_data, *encrypted_data, *encrypted_label,*number_of_files_data, *content_data, *comment_data, *size_data, *modified_data, *path_data, *type_data,
- *name_data, *separatormenuitem1, *separatormenuitem2, *separatormenuitem3, *separatormenuitem4, *separatormenuitem5, *separatormenuitem6, *quit1,
- *close1, *check_menu, *properties, *menuitem2, *menuitem2_menu, *addfile, *extract_menu, *delete_menu, *comment_menu, *multi_extract_menu,*view_shell_output1,
--*prefs_menu,*password_entry_menu, *image1, *image2, *menuitem4, *thanks_to,*thanks_to_submenu,*select_all,*deselect_all,*select_pattern, *exe_menu, *menuitem4_menu,
--*about1, *help1, *donators,*toolbar1, *toolbar2, *hbox1, *tmp_image, *pad_image, *New_button, *Open_button, *back_button, *home_button, *forward_button,
-+*prefs_menu,*password_entry_menu, *image1, *image2, *menuitem4, *donate,*select_all,*deselect_all,*select_pattern, *exe_menu, *menuitem4_menu,
-+*about1, *help1,*toolbar1, *toolbar2, *hbox1, *tmp_image, *pad_image, *New_button, *Open_button, *back_button, *home_button, *forward_button,
- *up_button,*separatortoolitem1,*separatortoolitem2,*separatortoolitem3,*AddFile_button,*Extract_button,*Stop_button,*toolitem1,*location_label,
- *location_entry,*hpaned1,*archive_dir_treeview,*scrolledwindow2,*ddelete,*rename_menu,*rrename,*cut,*copy,*paste,*view,*open_popupmenu;
diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-rpm2cpio.patch b/libre/xarchiver-libre/xarchiver-0.5.2-rpm2cpio.patch
deleted file mode 100644
index d962a44af..000000000
--- a/libre/xarchiver-libre/xarchiver-0.5.2-rpm2cpio.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -up ./src/rpm.c.rpm2cpio ./src/rpm.c
---- ./src/rpm.c.rpm2cpio	2008-10-24 13:43:04.000000000 +0200
-+++ ./src/rpm.c	2011-03-27 03:14:20.225742237 +0200
-@@ -23,11 +23,8 @@ extern gboolean batch_mode;
- 
- void xa_open_rpm (XArchive *archive)
- {
--	unsigned char bytes[8];
- 	unsigned short int i;
--    int dl,il,sigsize,offset,response;
--    gchar *ibs,*executable;
--    gchar *gzip_tmp = NULL;
-+    int response;
- 	GSList *list = NULL;
- 	FILE *stream;
- 	gboolean result;
-@@ -56,66 +53,14 @@ void xa_open_rpm (XArchive *archive)
- 		archive->column_types[i] = types[i];
- 
- 	xa_create_liststore (archive,names);
--    if (fseek ( stream, 104 , SEEK_CUR ) )
--    {
--        fclose (stream);
--        response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't fseek to position 104:"),g_strerror(errno));
--        return;
--    }
--    if ( fread ( bytes, 1, 8, stream ) == 0 )
--	{
--		fclose ( stream );
--		response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't read data from file:"),g_strerror(errno));
--		return;
--    }
--    il = 256 * ( 256 * ( 256 * bytes[0] + bytes[1]) + bytes[2] ) + bytes[3];
--    dl = 256 * ( 256 * ( 256 * bytes[4] + bytes[5]) + bytes[6] ) + bytes[7];
--    sigsize = 8 + 16 * il + dl;
--    offset = 104 + sigsize + ( 8 - ( sigsize % 8 ) ) % 8 + 8;
--    if (fseek ( stream, offset  , SEEK_SET ) )
--    {
--        fclose (stream);
--        response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't fseek in file:"),g_strerror(errno));
--        return;
--    }
--    if ( fread ( bytes, 1, 8, stream ) == 0 )
--	{
--		fclose ( stream );
--		response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't read data from file:"),g_strerror(errno));
--		return;
--    }
--    il = 256 * ( 256 * ( 256 * bytes[0] + bytes[1]) + bytes[2] ) + bytes[3];
--    dl = 256 * ( 256 * ( 256 * bytes[4] + bytes[5]) + bytes[6] ) + bytes[7];
--	sigsize = 8 + 16 * il + dl;
--	offset = offset + sigsize;
--	fclose (stream);
- 
- 	/* Create a unique temp dir in /tmp */
- 	result = xa_create_temp_directory (archive);
- 	if (!result)
- 		return;
- 
--	gzip_tmp = g_strconcat (archive->tmp,"/file.gz_bz",NULL);
--	ibs = g_strdup_printf ( "%u" , offset );
--
- 	/* Now I run dd to have the bzip2 / gzip compressed cpio archive in /tmp */
--	gchar *command = g_strconcat ( "dd if=",archive->escaped_path," ibs=",ibs," skip=1 of=",gzip_tmp,NULL);
--	g_free (ibs);
--	list = g_slist_append(list,command);
--	batch_mode = TRUE;
--	result = xa_run_command (archive,list);
--	if (result == FALSE)
--	{	
--		g_free (gzip_tmp);
--		return;
--	}
--	if (xa_detect_archive_type (gzip_tmp) == XARCHIVETYPE_GZIP)
--		executable = "gzip -dc ";
--	else
--		executable = "bzip2 -dc ";
--
--	command = g_strconcat("sh -c \"",executable,gzip_tmp," > ",archive->tmp,"/file.cpio\"",NULL);
--	g_free(gzip_tmp);
-+	gchar *command = g_strconcat ( "sh -c \"rpm2cpio ",archive->escaped_path," > ",archive->tmp, "/file.cpio\"",NULL);
- 	list = NULL;
- 	list = g_slist_append(list,command);
- 	result = xa_run_command (archive,list);
diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-segfault-delete-file.patch b/libre/xarchiver-libre/xarchiver-0.5.2-segfault-delete-file.patch
deleted file mode 100644
index b8052544b..000000000
--- a/libre/xarchiver-libre/xarchiver-0.5.2-segfault-delete-file.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur xarchiver-0.5.2.orig/src/window.c xarchiver-0.5.2/src/window.c
---- xarchiver-0.5.2.orig/src/window.c	2014-01-24 01:22:27.931903000 +0100
-+++ xarchiver-0.5.2/src/window.c	2014-01-24 01:24:49.952825715 +0100
-@@ -1573,7 +1573,7 @@
- 		gtk_widget_show(selected_frame);
- 		gtk_widget_set_sensitive(deselect_all,TRUE);
- 	}
--	if ( (archive->type == XARCHIVETYPE_RAR && unrar) || archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP)
-+	if ( (archive->type == XARCHIVETYPE_RAR && unrar) || archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP || archive->type == XARCHIVETYPE_LZMA || archive->type == XARCHIVETYPE_XZ || archive->type == XARCHIVETYPE_LZOP)
- 	{
- 		gtk_widget_set_sensitive (delete_menu,FALSE);
- 		gtk_widget_set_sensitive (rename_menu,FALSE);
-@@ -2287,7 +2287,7 @@
- 			else
- 				value = TRUE;
- 		}
--		if (archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP || archive->type == XARCHIVETYPE_DEB || archive->type == XARCHIVETYPE_RPM)
-+		if (archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP || archive->type == XARCHIVETYPE_LZMA || archive->type == XARCHIVETYPE_XZ || archive->type == XARCHIVETYPE_LZOP || archive->type == XARCHIVETYPE_DEB || archive->type == XARCHIVETYPE_RPM)
- 		{
- 			gtk_widget_set_sensitive(ddelete,FALSE);
- 			gtk_widget_set_sensitive(rrename,FALSE);
diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-segfault-open-with.patch b/libre/xarchiver-libre/xarchiver-0.5.2-segfault-open-with.patch
deleted file mode 100644
index e29d40c41..000000000
--- a/libre/xarchiver-libre/xarchiver-0.5.2-segfault-open-with.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -pur xarchiver-0.5.2/src/open-with-dlg.c xarchiver-0.5.2.new/src/open-with-dlg.c
---- xarchiver-0.5.2/src/open-with-dlg.c	2008-10-17 14:06:03.000000000 +0200
-+++ xarchiver-0.5.2.new/src/open-with-dlg.c	2011-05-16 21:48:49.042839556 +0200
-@@ -289,7 +289,10 @@ static void xa_open_with_dialog_selectio
- 	GtkTreeIter iter;
- 	GtkTreeModel *model;
- 
--	gtk_tree_selection_get_selected(selection,&model,&iter);
-+	if (!gtk_tree_selection_get_selected(selection,&model,&iter)) {
-+		return;
-+	}
-+
- 	gtk_tree_model_get(model,&iter,2,&exec,-1);
- 	
- 	gtk_entry_set_text(GTK_ENTRY(data->custom_command_entry),exec);
diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-add_mime_types.patch b/libre/xarchiver-libre/xarchiver-0.5.3-add-mime-types.patch
index 3b510fcb8..4552e5b96 100644
--- a/libre/xarchiver-libre/xarchiver-0.5.2-add_mime_types.patch
+++ b/libre/xarchiver-libre/xarchiver-0.5.3-add-mime-types.patch
@@ -1,9 +1,9 @@
-diff -Naur xarchiver-0.5.2.orig/xarchiver.desktop.in xarchiver-0.5.2/xarchiver.desktop.in
---- xarchiver-0.5.2.orig/xarchiver.desktop.in	2014-01-24 04:05:33.438561000 +0100
-+++ xarchiver-0.5.2/xarchiver.desktop.in	2014-01-24 04:44:00.625750394 +0100
+diff -Naur xarchiver-0.5.3.orig/xarchiver.desktop.in xarchiver-0.5.2/xarchiver.desktop.in
+--- xarchiver-0.5.3.orig/xarchiver.desktop.in	2014-01-24 04:05:33.438561000 +0100
++++ xarchiver-0.5.3/xarchiver.desktop.in	2014-01-24 04:44:00.625750394 +0100
 @@ -11,4 +11,4 @@
  X-MultipleArgs=false
  Categories=GTK;Archiving;Utility;
  StartupNotify=true
 -MimeType=application/x-arj;application/arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-gzip;application/x-rar;application/x-rar-compressed;application/x-tar;application/x-zip;application/x-zip-compressed;application/zip;multipart/x-zip;application/x-7z-compressed;application/x-compressed-tar;application/x-bzip2;application/x-bzip2-compressed-tar;
-+MimeType=application/x-arj;application/arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-gzip;application/x-tar;application/x-zip;application/x-zip-compressed;application/zip;application/x-7z-compressed;application/x-compressed-tar;application/x-bzip2;application/x-bzip2-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-xz;application/x-xz-compressed-tar;application/x-debian-package;application/x-rpm;
++MimeType=application/x-arj;application/arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-gzip;application/x-rar;application/x-rar-compressed;application/x-tar;application/x-zip;application/x-zip-compressed;application/zip;application/x-7z-compressed;application/x-compressed-tar;application/x-bzip2;application/x-bzip2-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-xz;application/x-xz-compressed-tar;application/x-debian-package;application/x-rpm;
diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-add_unar_support.patch b/libre/xarchiver-libre/xarchiver-0.5.3-add-unar-support.patch
index 0168f4e63..0b54cacc1 100644
--- a/libre/xarchiver-libre/xarchiver-0.5.2-add_unar_support.patch
+++ b/libre/xarchiver-libre/xarchiver-0.5.3-add-unar-support.patch
@@ -1,6 +1,6 @@
-diff -Nur xarchiver-0.5.2.orig/doc/html/ch03s03.html xarchiver-0.5.2/doc/html/ch03s03.html
---- xarchiver-0.5.2.orig/doc/html/ch03s03.html	2008-11-03 04:49:49.000000000 -0200
-+++ xarchiver-0.5.2/doc/html/ch03s03.html	2014-01-24 11:02:20.640986656 -0200
+diff -Nur xarchiver-0.5.3.orig/doc/html/ch03s03.html xarchiver-0.5.3/doc/html/ch03s03.html
+--- xarchiver-0.5.3.orig/doc/html/ch03s03.html	2008-11-03 04:49:49.000000000 -0200
++++ xarchiver-0.5.3/doc/html/ch03s03.html	2014-02-20 04:35:34.820373529 -0200
 @@ -1,7 +1,7 @@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -10,9 +10,9 @@ diff -Nur xarchiver-0.5.2.orig/doc/html/ch03s03.html xarchiver-0.5.2/doc/html/ch
  				</p></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h3 class="title"><a id="how_it_works"></a>How it works</h3></div></div></div><p>
  					Xarchiver will run in the background the cmd-line executable of the archiver with the archiver's proper switches to perform the selected operation. If something goes wrong Xarchiver reports the full output of the archiver executable in the command line output window. From the release 0.5 the files in the archive can be opened within Xarchiver. The script <i>xdg-open</i> will detect the file type and run the proper application to handle it. If you don't have such script installed in your system (it's found in the xdg-utils package) Xarchiver will recognize HTML, txt and images files only. The Preferences dialog will notify this to you when you click the Advanced section inside it.
  				</p></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h3 class="title"><a id="dnd"></a>Drag and Drop</h3></div></div></div><p>
-diff -Nur xarchiver-0.5.2.orig/doc/xarchiver.docbook xarchiver-0.5.2/doc/xarchiver.docbook
---- xarchiver-0.5.2.orig/doc/xarchiver.docbook	2007-08-22 07:49:19.000000000 -0300
-+++ xarchiver-0.5.2/doc/xarchiver.docbook	2014-01-24 11:01:17.088748863 -0200
+diff -Nur xarchiver-0.5.3.orig/doc/xarchiver.docbook xarchiver-0.5.3/doc/xarchiver.docbook
+--- xarchiver-0.5.3.orig/doc/xarchiver.docbook	2007-08-22 07:49:19.000000000 -0300
++++ xarchiver-0.5.3/doc/xarchiver.docbook	2014-02-20 04:35:34.820373529 -0200
 @@ -204,7 +204,7 @@
  			<section id="general_startup">
  				<title>Startup</title>
@@ -22,34 +22,9 @@ diff -Nur xarchiver-0.5.2.orig/doc/xarchiver.docbook xarchiver-0.5.2/doc/xarchiv
  				</para>
  			</section>
  			<section id="how_it_works">
-diff -Nur xarchiver-0.5.2.orig/src/extract_dialog.c xarchiver-0.5.2/src/extract_dialog.c
---- xarchiver-0.5.2.orig/src/extract_dialog.c	2008-11-10 08:28:11.000000000 -0200
-+++ xarchiver-0.5.2/src/extract_dialog.c	2014-01-24 10:55:28.209263885 -0200
-@@ -24,7 +24,7 @@
- #include "string_utils.h"
- #include "support.h"
- 
--extern gboolean unrar,batch_mode;
-+extern gboolean unar,batch_mode;
- extern Prefs_dialog_data *prefs_window;
- extern Progress_bar_data *pb;
- extern extract_func extract	[XARCHIVETYPE_COUNT];
-@@ -290,11 +290,7 @@
- 	GSList *names = NULL;
- 	GtkTreeModel *model;
- 	int response;
--
--	if (unrar)
--		rar = "unrar";
--	else
--		rar = "rar";
-+	rar = "unar";
- 
-     while (! done)
- 	{
-diff -Nur xarchiver-0.5.2.orig/src/interface.c xarchiver-0.5.2/src/interface.c
---- xarchiver-0.5.2.orig/src/interface.c	2008-11-11 06:09:01.000000000 -0200
-+++ xarchiver-0.5.2/src/interface.c	2014-01-24 10:56:03.893317117 -0200
+diff -Nur xarchiver-0.5.3.orig/src/interface.c xarchiver-0.5.3/src/interface.c
+--- xarchiver-0.5.3.orig/src/interface.c	2014-02-09 13:26:24.000000000 -0200
++++ xarchiver-0.5.3/src/interface.c	2014-02-20 04:58:54.470139199 -0200
 @@ -45,7 +45,7 @@
    { "text/uri-list",0,0 },
  };
@@ -59,18 +34,18 @@ diff -Nur xarchiver-0.5.2.orig/src/interface.c xarchiver-0.5.2/src/interface.c
  
  static gboolean xa_progress_dialog_delete_event (GtkWidget *caller,GdkEvent *event,GPid pid);
  static void xa_progress_dialog_stop_action (GtkWidget *widget,GPid pid);
-@@ -629,7 +629,7 @@
+@@ -623,7 +623,7 @@
  		{
  			gtk_widget_show(selected_frame);
  			gtk_widget_set_sensitive(deselect_all,TRUE);
--			if (archive[id]->type == XARCHIVETYPE_RAR && unrar)
-+			if (archive[id]->type == XARCHIVETYPE_RAR && unar)
+-			if ((archive[id]->type == XARCHIVETYPE_RAR || archive[id]->type == XARCHIVETYPE_RAR5) && unrar)
++			if ((archive[id]->type == XARCHIVETYPE_RAR) && unar)
  			{
  				gtk_widget_set_sensitive (delete_menu,FALSE);
  				gtk_widget_set_sensitive (rename_menu,FALSE);
-diff -Nur xarchiver-0.5.2.orig/src/main.c xarchiver-0.5.2/src/main.c
---- xarchiver-0.5.2.orig/src/main.c	2008-11-10 09:21:43.000000000 -0200
-+++ xarchiver-0.5.2/src/main.c	2014-01-24 12:18:53.211684553 -0200
+diff -Nur xarchiver-0.5.3.orig/src/main.c xarchiver-0.5.3/src/main.c
+--- xarchiver-0.5.3.orig/src/main.c	2014-02-20 03:24:20.406301116 -0200
++++ xarchiver-0.5.3/src/main.c	2014-02-20 04:43:27.247666292 -0200
 @@ -33,7 +33,7 @@
  gchar *add_files;
  gboolean error_output, file_to_open, ask_and_extract, ask_and_add, multi_extract;
@@ -78,44 +53,50 @@ diff -Nur xarchiver-0.5.2.orig/src/main.c xarchiver-0.5.2/src/main.c
 -gboolean unrar = FALSE;
 +gboolean unar = FALSE;
  gboolean sevenzr = FALSE, sevenza = FALSE, xdg_open = FALSE;
+ static gboolean show_version = FALSE;
  int response;
- extern gchar *current_open_directory;
-@@ -312,7 +312,6 @@
+@@ -330,7 +330,6 @@
  	delete[XARCHIVETYPE_GZIP]  = 0;
  	delete[XARCHIVETYPE_LZMA]  = 0;
  	delete[XARCHIVETYPE_XZ]  = 0;
--	delete[XARCHIVETYPE_RAR]  = &xa_rar_delete;
+-	delete[XARCHIVETYPE_RAR]  = delete[XARCHIVETYPE_RAR5]  = &xa_rar_delete;
  	delete[XARCHIVETYPE_RPM]  = 0;
  	delete[XARCHIVETYPE_TAR]  = delete[XARCHIVETYPE_TAR_BZ2] = delete[XARCHIVETYPE_TAR_GZ] = delete[XARCHIVETYPE_TAR_LZMA] = delete[XARCHIVETYPE_TAR_XZ] = delete[XARCHIVETYPE_TAR_LZOP] = &xa_tar_delete;
  	delete[XARCHIVETYPE_ZIP] = &xa_zip_delete;
-@@ -325,7 +324,6 @@
+@@ -343,7 +342,6 @@
  	add[XARCHIVETYPE_ARJ]  = &xa_arj_add;
  	add[XARCHIVETYPE_DEB]  = 0;
- 	add[XARCHIVETYPE_BZIP2]  = add[XARCHIVETYPE_GZIP] = add[XARCHIVETYPE_LZMA] = add[XARCHIVETYPE_XZ] = &xa_tar_add;
--	add[XARCHIVETYPE_RAR]  = &xa_rar_add;
+ 	add[XARCHIVETYPE_BZIP2]  = add[XARCHIVETYPE_GZIP] = add[XARCHIVETYPE_LZMA] = add[XARCHIVETYPE_XZ] = add[XARCHIVETYPE_LZOP] = &xa_tar_add;
+-	add[XARCHIVETYPE_RAR]  = add[XARCHIVETYPE_RAR5]  = &xa_rar_add;
  	add[XARCHIVETYPE_RPM]  = 0;
  	add[XARCHIVETYPE_TAR]  = add[XARCHIVETYPE_TAR_BZ2] = add[XARCHIVETYPE_TAR_GZ] = add[XARCHIVETYPE_TAR_LZMA] = add[XARCHIVETYPE_TAR_XZ] = add[XARCHIVETYPE_TAR_LZOP] = &xa_tar_add;
  	add[XARCHIVETYPE_ZIP] = &xa_zip_add;
-@@ -348,7 +346,6 @@
+@@ -364,7 +362,6 @@
  	test[XARCHIVETYPE_7ZIP]  = &xa_7zip_test;
  	test[XARCHIVETYPE_ARJ]  = &xa_arj_test;
- 	test[XARCHIVETYPE_DEB]  = test[XARCHIVETYPE_BZIP2] = test[XARCHIVETYPE_GZIP] = test[XARCHIVETYPE_LZMA] = test[XARCHIVETYPE_XZ] = 0;
--	test[XARCHIVETYPE_RAR]  = &xa_rar_test;
+ 	test[XARCHIVETYPE_DEB]  = test[XARCHIVETYPE_BZIP2] = test[XARCHIVETYPE_GZIP] = test[XARCHIVETYPE_LZMA] = test[XARCHIVETYPE_XZ] = test[XARCHIVETYPE_LZOP] = &xa_tar_test;
+-	test[XARCHIVETYPE_RAR]  = test[XARCHIVETYPE_RAR5]  = &xa_rar_test;
  	test[XARCHIVETYPE_RPM]  = 0;
- 	test[XARCHIVETYPE_TAR]  = test[XARCHIVETYPE_TAR_BZ2] = test[XARCHIVETYPE_TAR_GZ] = test[XARCHIVETYPE_TAR_LZMA] = test[XARCHIVETYPE_TAR_XZ] = test[XARCHIVETYPE_TAR_LZOP] = 0;
+ 	test[XARCHIVETYPE_TAR]  = test[XARCHIVETYPE_TAR_BZ2] = test[XARCHIVETYPE_TAR_GZ] = test[XARCHIVETYPE_TAR_LZMA] = test[XARCHIVETYPE_TAR_XZ] = test[XARCHIVETYPE_TAR_LZOP] =  &xa_tar_test;
  	test[XARCHIVETYPE_ZIP] = &xa_zip_test;
-@@ -420,24 +417,14 @@
+@@ -435,38 +432,14 @@
  		//ArchiveSuffix = g_list_append(ArchiveSuffix, "");
  	}
  
 -	absolute_path = g_find_program_in_path ("rar");
--    if ( absolute_path )
-+	absolute_path = g_find_program_in_path("unar");
-+	if ( absolute_path )
++	absolute_path = g_find_program_in_path ("unar");
+     if ( absolute_path )
  	{
 +		unar = TRUE;
  		ArchiveType = g_list_append(ArchiveType, "rar");
  		ArchiveSuffix = g_list_append(ArchiveSuffix, "*.rar");
+-		// Is RAR v5 ?
+-		xa_rar_checkversion (absolute_path);
+-		if (rar_version == 5)
+-		{
+-			ArchiveType = g_list_append(ArchiveType, "rar5");
+-			ArchiveSuffix = g_list_append(ArchiveSuffix, "*.rar5");	
+-		}
  		g_free (absolute_path);
  	}
 -	else
@@ -126,15 +107,22 @@ diff -Nur xarchiver-0.5.2.orig/src/main.c xarchiver-0.5.2/src/main.c
 -			unrar = TRUE;
 -			ArchiveType = g_list_append(ArchiveType, "rar");
 -			ArchiveSuffix = g_list_append(ArchiveSuffix, "*.rar");
+-			// Is RAR v5 ?
+-			xa_rar_checkversion (absolute_path);
+-			if (rar_version == 5)
+-			{
+-				ArchiveType = g_list_append(ArchiveType, "rar5");
+-				ArchiveSuffix = g_list_append(ArchiveSuffix, "*.rar5");	
+-			}
 -			g_free (absolute_path);
 -		}
 -	}
  
  	absolute_path = g_find_program_in_path("cpio");
      if ( absolute_path )
-diff -Nur xarchiver-0.5.2.orig/src/new_dialog.c xarchiver-0.5.2/src/new_dialog.c
---- xarchiver-0.5.2.orig/src/new_dialog.c	2008-11-11 06:28:46.000000000 -0200
-+++ xarchiver-0.5.2/src/new_dialog.c	2014-01-24 10:56:34.274491565 -0200
+diff -Nur xarchiver-0.5.3.orig/src/new_dialog.c xarchiver-0.5.3/src/new_dialog.c
+--- xarchiver-0.5.3.orig/src/new_dialog.c	2014-02-09 13:26:24.000000000 -0200
++++ xarchiver-0.5.3/src/new_dialog.c	2014-02-20 05:13:00.058263839 -0200
 @@ -24,7 +24,7 @@
  #include "string_utils.h"
  #include "main.h"
@@ -144,9 +132,18 @@ diff -Nur xarchiver-0.5.2.orig/src/new_dialog.c xarchiver-0.5.2/src/new_dialog.c
  extern Prefs_dialog_data *prefs_window;
  gchar *current_new_directory = NULL;
  gint  new_combo_box = -1;
-diff -Nur xarchiver-0.5.2.orig/src/pref_dialog.c xarchiver-0.5.2/src/pref_dialog.c
---- xarchiver-0.5.2.orig/src/pref_dialog.c	2008-11-10 06:05:07.000000000 -0200
-+++ xarchiver-0.5.2/src/pref_dialog.c	2014-01-24 10:54:07.611853842 -0200
+@@ -101,7 +101,7 @@
+ 
+ 	while (Name)
+ 	{
+-		if (!(strncmp(Name->data, "rar", 3) == 0 && unrar))
++		if (!(strncmp(Name->data, "rar", 3) == 0 && unar))
+ 			gtk_combo_box_append_text(GTK_COMBO_BOX(combo_box),Name->data);
+ 		Name = g_list_next (Name);
+ 	}
+diff -Nur xarchiver-0.5.3.orig/src/pref_dialog.c xarchiver-0.5.3/src/pref_dialog.c
+--- xarchiver-0.5.3.orig/src/pref_dialog.c	2014-02-09 13:26:24.000000000 -0200
++++ xarchiver-0.5.3/src/pref_dialog.c	2014-02-20 04:44:40.225947167 -0200
 @@ -23,7 +23,7 @@
  #include "main.h"
  #include "support.h"
@@ -160,14 +157,14 @@ diff -Nur xarchiver-0.5.2.orig/src/pref_dialog.c xarchiver-0.5.2/src/pref_dialog
  	{
  		if (strcmp(archive_type->data, "tgz") == 0 ||
  			strcmp(archive_type->data, "rpm") == 0 ||
--			(strcmp(archive_type->data, "rar") == 0 && unrar) )
-+			(strcmp(archive_type->data, "rar") == 0 && unar) )
+-			(strncmp(archive_type->data, "rar", 3) == 0 && unrar) )
++			(strncmp(archive_type->data, "rar", 3) == 0 && unar) )
  			goto next;
  		else
  			gtk_combo_box_append_text (GTK_COMBO_BOX (prefs_data->combo_prefered_format),archive_type->data );
-diff -Nur xarchiver-0.5.2.orig/src/rar.c xarchiver-0.5.2/src/rar.c
---- xarchiver-0.5.2.orig/src/rar.c	2008-11-10 06:05:07.000000000 -0200
-+++ xarchiver-0.5.2/src/rar.c	2014-01-24 13:09:12.838038687 -0200
+diff -Nur xarchiver-0.5.3.orig/src/rar.c xarchiver-0.5.3/src/rar.c
+--- xarchiver-0.5.3.orig/src/rar.c	2014-02-09 13:26:24.000000000 -0200
++++ xarchiver-0.5.3/src/rar.c	2014-02-20 05:11:19.611884642 -0200
 @@ -20,7 +20,7 @@
  #include "rar.h"
  #include <unistd.h>
@@ -176,14 +173,12 @@ diff -Nur xarchiver-0.5.2.orig/src/rar.c xarchiver-0.5.2/src/rar.c
 +extern gboolean unar;
  extern void xa_reload_archive_content(XArchive *archive);
  extern void xa_create_liststore ( XArchive *archive, gchar *columns_names[]);
- 
-@@ -30,19 +30,10 @@
+ extern int rar_version;
+@@ -36,44 +36,15 @@
  	gchar *command = NULL;
  	gchar *rar = NULL;
  	jump_header = read_filename = last_line = encrypted = FALSE;
-+	rar = "unar";
-+	archive->can_add = archive->has_sfx = FALSE;
- 
+-		
 -	if (unrar)
 -	{
 -		rar = "unrar";
@@ -194,13 +189,41 @@ diff -Nur xarchiver-0.5.2.orig/src/rar.c xarchiver-0.5.2/src/rar.c
 -		rar = "rar";
 -		archive->can_add = archive->has_sfx = TRUE;
 -	}
--
++	rar = "unar";
++	archive->can_add = archive->has_sfx = FALSE;
+ 
 -	command = g_strconcat ( rar," v " , archive->escaped_path, NULL );
 +	command = g_strconcat ( rar, archive->escaped_path, NULL );
- 	archive->can_extract = archive->has_test = archive->has_properties = TRUE;
+ 	archive->has_sfx = archive->has_properties = archive->can_extract = archive->has_test = TRUE;
  	archive->dummy_size = 0;
      archive->nr_of_files = 0;
-@@ -222,71 +213,6 @@
+     
+-    if (archive->type == XARCHIVETYPE_RAR5)
+-		archive->format = "RAR5";
+-	else
+-		archive->format = "RAR";
+-
+-		
+-	if (rar_version == 5)
+-	{
+-		archive->nc = 8;
+-		archive->parse_output = xa_get_rar5_line_content;
+-		xa_spawn_async_process (archive,command);
+-		g_free ( command );
+-		if ( archive->child_pid == 0 )
+-			return;
+-		archive->column_types = g_malloc0(sizeof(types5));
+-		for (i = 0; i < archive->nc+2; i++)
+-			archive->column_types[i] = types5[i];
+-			
+-		xa_create_liststore (archive, names5);
+-	}
+-	else
++	archive->format = "RAR";
+ 	{
+ 		archive->nc = 10;
+ 		archive->parse_output = xa_get_rar_line_content;
+@@ -247,32 +218,6 @@
  	}
  }
  
@@ -230,49 +253,10 @@ diff -Nur xarchiver-0.5.2.orig/src/rar.c xarchiver-0.5.2/src/rar.c
 -		xa_reload_archive_content(archive);
 -}
 -
--void xa_rar_add (XArchive *archive,GString *files,gchar *compression_string)
--{
--	GSList *list = NULL;
--	gchar *command = NULL;
--
--	if (archive->location_entry_path != NULL)
--		archive->working_dir = g_strdup(archive->tmp);
--
--	if (compression_string == NULL)
--		compression_string = "3";
--	if (archive->passwd != NULL)
--		command = g_strconcat ( "rar a ",
--									archive->update ? "-u " : "",
--									archive->freshen ? "-f " : "",
--									archive->solid_archive ? "-s " : "",
--									archive->remove_files ? "-df " : "",
--									"-p" , archive->passwd,
--									" -idp ",
--									"-m",compression_string," ",
--									archive->escaped_path,
--									files->str,NULL);
--	else
--		command = g_strconcat ( "rar a ",
--									archive->update ? "-u " : "",
--									archive->freshen ? "-f " : "",
--									archive->solid_archive ? "-s " : " ",
--									archive->remove_files ? "-df " : " ",
--									"-idp ",
--									"-m",compression_string," ",
--									archive->escaped_path,
--									files->str,NULL);
--
--	g_string_free(files,TRUE);
--	list = g_slist_append(list,command);
--
--	xa_run_command (archive,list);
--	xa_reload_archive_content(archive);
--}
--
  gboolean xa_rar_extract(XArchive *archive,GSList *files)
  {
  	gchar *rar, *command, *e_filename = NULL;
-@@ -295,10 +221,7 @@
+@@ -281,10 +226,7 @@
  	gboolean result = FALSE;
  
  	_files = files;
@@ -284,32 +268,7 @@ diff -Nur xarchiver-0.5.2.orig/src/rar.c xarchiver-0.5.2/src/rar.c
  
  	while (_files)
  	{
-@@ -311,42 +234,16 @@
- 	g_slist_free(_files);
- 	
- 	if (archive->passwd != NULL)
--		command = g_strconcat (rar," ",archive->full_path ? "x " : "e ",
--										archive->freshen ? "-f " : "" , archive->update ? "-u " : "",
--										" -p",archive->passwd,
--										archive->overwrite ? " -o+" : " -o-",
--										" -idp ",
--										archive->escaped_path,names->str," ",archive->extraction_path , NULL );
--	else
--		command = g_strconcat (rar," ",archive->full_path ? "x " : "e ",
--										archive->freshen ? "-f " : "" , archive->update ? "-u " : "",
--										archive->overwrite ? "-o+" : "-o-",
--										" -idp ",
--										archive->escaped_path,names->str," ",archive->extraction_path , NULL );
-+		command = g_strconcat (rar," -p",archive->passwd,
-+								archive->overwrite ? " -f" : "" ,
-+								archive->escaped_path,names->str," ",archive->extraction_path , NULL );
-+	else
-+		command = g_strconcat (rar," ",
-+								archive->overwrite ? " -f" : "" ,
-+								archive->escaped_path,names->str," ",archive->extraction_path , NULL );
- 	g_string_free(names,TRUE);
- 	list = g_slist_append(list,command);
- 
+@@ -315,230 +257,3 @@
  	result = xa_run_command (archive,list);
  	return result;
  }
@@ -334,9 +293,215 @@ diff -Nur xarchiver-0.5.2.orig/src/rar.c xarchiver-0.5.2/src/rar.c
 -	list = g_slist_append(list,command);
 -	xa_run_command (archive,list);
 - }
-diff -Nur xarchiver-0.5.2.orig/src/rar.h xarchiver-0.5.2/src/rar.h
---- xarchiver-0.5.2.orig/src/rar.h	2008-08-22 05:12:38.000000000 -0300
-+++ xarchiver-0.5.2/src/rar.h	2014-01-24 10:49:13.140141939 -0200
+-
+-void xa_get_rar5_line_content (gchar *line, gpointer data)
+-{
+-	XArchive *archive = data;
+-	XEntry *entry;
+-	gpointer item[7];
+-	unsigned short int i = 0;
+-	unsigned int linesize,n,a;
+-	gboolean dir = FALSE;
+-	static gchar *filename;
+-
+-	if (last_line)
+-		return;
+-
+-	if (jump_header == FALSE)
+-	{
+-		if (strncmp(line,"Comment:",8) == 0)
+-		{
+-			jump_comment = archive->has_comment = TRUE;
+-			archive->comment = g_string_new("");
+-			archive->comment = g_string_append(archive->comment,&line[9]);
+-			return;
+-		}
+-		if (jump_comment == TRUE)
+-		{
+-			if (strncmp(line,"Name",4) != 0)
+-			{	archive->comment = g_string_append(archive->comment,line);
+-				return;
+-			}
+-			jump_comment = FALSE;
+-		}
+-		if (line[0] == '-')
+-		{
+-			jump_header = TRUE;
+-			return;
+-		}
+-		return;
+-	}
+-
+-	linesize = strlen(line);
+-	line[linesize - 1] = '\0';
+-
+-	if(line[0] == '*')
+-	{
+-		archive->has_passwd = TRUE;
+-		encrypted = TRUE;
+-	}
+-	else if (line[0] == '-')
+-	{
+-		last_line = TRUE;
+-		return;
+-	}
+-
+-	archive->nr_of_files++;
+-
+-	/* Permissions */
+-	for(n=0; n < linesize && line[n] == ' '; n++);
+-	a = n;
+-	for(; n < linesize && line[n] != ' '; n++);
+-	line[n] = '\0';
+-	if ((line+a)[0] == 'd')
+-		dir = TRUE;
+-	item[5] = line + a;
+-	n++;
+-
+-	/* Size */
+-	for(; n < linesize && line[n] == ' '; n++);
+-	a = n;
+-	for(; n < linesize && line[n] != ' '; n++);
+-	line[n]='\0';
+-	item[i] = line + a;
+-	archive->dummy_size += g_ascii_strtoull(item[i],NULL,0);
+-	i++;
+-	n++;
+-	
+-	/* Compressed */
+-	for(; n < linesize && line[n] == ' '; n++);
+-	a = n;
+-	for(; n < linesize && line[n] != ' '; n++);
+-	line[n]='\0';
+-	item[i] = line + a;
+-	i++;
+-	n++;
+-
+-	/* Ratio */
+-	for(; n < linesize && line[n] == ' '; n++);
+-	a = n;
+-	for(; n < linesize && line[n] != ' '; n++);
+-	line[n] = '\0';
+-	item[i] = line + a;
+-	i++;
+-	n++;
+-
+-	/* Date */
+-	for(; n < linesize && line[n] == ' '; n++);
+-	a = n;
+-	for(; n < linesize && line[n] != ' '; n++);
+-	line[n] = '\0';
+-	item[i] = line + a;
+-	i++;
+-	n++;
+-
+-	/* Time */
+-	for(; n < linesize && line[n] == ' '; n++);
+-	a = n;
+-	for(; n < linesize && line[n] != ' '; n++);
+-	line[n] = '\0';
+-	item[i] = line + a;
+-	i+=2;
+-	n++;
+-	
+-	/* CRC */
+-	for(; n < linesize && line[n] == ' '; n++);
+-	a = n;
+-	for(; n < linesize && line[n] != ' '; n++);
+-	line[n] = '\0';
+-	item[i] = line + a;
+-	i++;
+-	n++;
+-	
+-	/* fileName */
+-	for(n=64; n < linesize && line[n] == ' '; n++);
+-	a = n;
+-	for(; n < linesize && line[n] != ' ' && line[n] != '\n'; n++);
+-	line[n]='\0';
+-	filename = g_strdup(line + a);
+-	
+-	/* Work around for rar which doesn't
+-	 * output / with directories */
+-	if (dir)
+-	{
+-		gchar *filename_with_slash = g_strconcat (filename,"/",NULL);
+-		g_free (filename);
+-		filename = filename_with_slash;
+-	}
+-
+-	entry = xa_set_archive_entries_for_each_row (archive,filename,item);
+-	if (entry != NULL)
+-		entry->is_encrypted = encrypted;
+-	g_free(filename);
+-	encrypted = FALSE;
+-}
+-
+-void xa_rar_add (XArchive *archive,GString *files,gchar *compression_string)
+-{
+-	GSList *list = NULL;
+-	gchar *command, *rar_version = NULL;
+-	
+-
+-	if (archive->location_entry_path != NULL)
+-		archive->working_dir = g_strdup(archive->tmp);
+-	
+-	if (archive->type == XARCHIVETYPE_RAR5)
+-		rar_version = "5";
+-	else
+-		rar_version = "4";
+-
+-	if (compression_string == NULL)
+-		compression_string = "3";
+-		
+-	if (archive->passwd != NULL)
+-		command = g_strconcat ( "rar a -ma", rar_version, " ",
+-									archive->update ? "-u " : "",
+-									archive->freshen ? "-f " : "",
+-									archive->solid_archive ? "-s " : "",
+-									archive->remove_files ? "-df " : "",
+-									"-p" , archive->passwd,
+-									" -idp ",
+-									"-m",compression_string," ",
+-									archive->escaped_path,
+-									files->str,NULL);
+-	else
+-		command = g_strconcat ( "rar a -ma", rar_version, " ",
+-									archive->update ? "-u " : "",
+-									archive->freshen ? "-f " : "",
+-									archive->solid_archive ? "-s " : " ",
+-									archive->remove_files ? "-df " : " ",
+-									"-idp ",
+-									"-m",compression_string," ",
+-									archive->escaped_path,
+-									files->str,NULL);
+-
+-	g_string_free(files,TRUE);
+-	list = g_slist_append(list,command);
+-
+-	xa_run_command (archive,list);
+-	xa_reload_archive_content(archive);
+-}
+-
+-int xa_rar_checkversion (gchar *absolute_path)
+-{
+-	//gchar *command;
+-	gchar *output = NULL;
+-
+-	rar_version = 4;  // Default version
+-	
+-	//command = g_strconcat (absolute_path, "" , NULL);
+-	g_spawn_command_line_sync (absolute_path, &output, NULL, NULL, NULL);
+-	
+-	if (g_ascii_strncasecmp ("\nRAR 5", output, 6) == 0 || g_ascii_strncasecmp ("\nUNRAR 5", output, 8) == 0)
+-			rar_version = 5;
+-	
+-	g_free(output);
+-	//g_free(command);
+-	return rar_version;
+-}
+diff -Nur xarchiver-0.5.3.orig/src/rar.h xarchiver-0.5.3/src/rar.h
+--- xarchiver-0.5.3.orig/src/rar.h	2014-02-09 13:26:24.000000000 -0200
++++ xarchiver-0.5.3/src/rar.h	2014-02-20 04:35:34.823706631 -0200
 @@ -26,10 +26,7 @@
  #include "support.h"
  #include "archive.h"
@@ -348,9 +513,9 @@ diff -Nur xarchiver-0.5.2.orig/src/rar.h xarchiver-0.5.2/src/rar.h
  void xa_get_rar_line_content (gchar *line, gpointer data);
  void xa_open_rar ( XArchive *archive );
  #endif
-diff -Nur xarchiver-0.5.2.orig/src/window.c xarchiver-0.5.2/src/window.c
---- xarchiver-0.5.2.orig/src/window.c	2008-11-11 06:31:45.000000000 -0200
-+++ xarchiver-0.5.2/src/window.c	2014-01-24 10:54:28.673636196 -0200
+diff -Nur xarchiver-0.5.3.orig/src/window.c xarchiver-0.5.3/src/window.c
+--- xarchiver-0.5.3.orig/src/window.c	2014-02-20 03:24:30.795581843 -0200
++++ xarchiver-0.5.3/src/window.c	2014-02-20 05:08:49.982243849 -0200
 @@ -26,7 +26,7 @@
  
  extern GList *ArchiveType;
@@ -360,21 +525,21 @@ diff -Nur xarchiver-0.5.2.orig/src/window.c xarchiver-0.5.2/src/window.c
  extern gboolean xdg_open;
  extern Prefs_dialog_data	*prefs_window;
  extern Extract_dialog_data	*extract_window;
-@@ -1567,7 +1567,7 @@
+@@ -1584,7 +1584,7 @@
  		gtk_widget_show(selected_frame);
  		gtk_widget_set_sensitive(deselect_all,TRUE);
  	}
--	if ( (archive->type == XARCHIVETYPE_RAR && unrar) || archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP || archive->type == XARCHIVETYPE_LZMA || archive->type == XARCHIVETYPE_XZ || archive->type == XARCHIVETYPE_LZOP)
+-	if ( (archive->type == XARCHIVETYPE_RAR && unrar) || (archive->type == XARCHIVETYPE_RAR5 && unrar) || archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP || archive->type == XARCHIVETYPE_LZMA || archive->type == XARCHIVETYPE_XZ || archive->type == XARCHIVETYPE_LZOP)
 +	if ( (archive->type == XARCHIVETYPE_RAR && unar) || archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP || archive->type == XARCHIVETYPE_LZMA || archive->type == XARCHIVETYPE_XZ || archive->type == XARCHIVETYPE_LZOP)
  	{
  		gtk_widget_set_sensitive (delete_menu,FALSE);
  		gtk_widget_set_sensitive (rename_menu,FALSE);
-@@ -1781,7 +1781,7 @@
+@@ -1801,7 +1801,7 @@
  	else
  		idx = xa_find_archive_index (current_page);
  
--	if (archive[idx]->type == XARCHIVETYPE_RAR && unrar)
-+	if (archive[idx]->type == XARCHIVETYPE_RAR && unar)
+-	if ((archive[idx]->type == XARCHIVETYPE_RAR || archive[idx]->type == XARCHIVETYPE_RAR5) && unrar)
++	if ((archive[idx]->type == XARCHIVETYPE_RAR) && unar)
  	{
  		response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't perform this action:"),_("You have to install rar package!"));
  		return;
diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-fix-double-escaping.patch b/libre/xarchiver-libre/xarchiver-0.5.3-fix-double-escaping.patch
index 8b44d91a0..8b44d91a0 100644
--- a/libre/xarchiver-libre/xarchiver-0.5.2-fix-double-escaping.patch
+++ b/libre/xarchiver-libre/xarchiver-0.5.3-fix-double-escaping.patch
diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-segfault-password-protected.patch b/libre/xarchiver-libre/xarchiver-0.5.3-fix-password-protected.patch
index a1fa1f2ca..00969349d 100644
--- a/libre/xarchiver-libre/xarchiver-0.5.2-segfault-password-protected.patch
+++ b/libre/xarchiver-libre/xarchiver-0.5.3-fix-password-protected.patch
@@ -1,6 +1,6 @@
-diff -Naur xarchiver-0.5.2.orig/src/window.c xarchiver-0.5.2/src/window.c
---- xarchiver-0.5.2.orig/src/window.c	2014-01-24 08:10:09.305990000 +0100
-+++ xarchiver-0.5.2/src/window.c	2014-01-24 08:42:45.110729290 +0100
+diff -Naur xarchiver-0.5.3.orig/src/window.c xarchiver-0.5.2/src/window.c
+--- xarchiver-0.5.3.orig/src/window.c	2014-01-24 08:10:09.305990000 +0100
++++ xarchiver-0.5.3/src/window.c	2014-01-24 08:42:45.110729290 +0100
 @@ -1694,7 +1694,7 @@
  		{
  			if (archive->passwd == NULL)
@@ -25,19 +25,18 @@ diff -Naur xarchiver-0.5.2.orig/src/window.c xarchiver-0.5.2/src/window.c
  	}
  	filename = g_strconcat(archive[idx]->tmp,"/",entry->filename,NULL);
  	if (g_file_test(filename,G_FILE_TEST_EXISTS))
-@@ -2766,6 +2769,15 @@
- 	/* The selected entry it's not a dir so extract it to the tmp dir and send it to xa_determine_program_to_run() */
- 	else
+@@ -2768,8 +2771,12 @@
  	{
-+		if (entry->is_encrypted)
-+		{
+		if (entry->is_encrypted)
+		{
+-		  if (archive->passwd == NULL)
+-		     return;
 +			if (archive->passwd == NULL)
 +			{
 +				archive->passwd = xa_create_password_dialog(archive);
 +				if (archive->passwd == NULL)
 +					return;
 +			}
-+		}
+		}
  	   	if (archive->extraction_path)
  	   	{
- 	   		dummy = g_strdup(archive->extraction_path);
diff --git a/libre/xarchiver-libre/xarchiver-0.5.3-fix-rpm-support.patch b/libre/xarchiver-libre/xarchiver-0.5.3-fix-rpm-support.patch
new file mode 100644
index 000000000..cf17ff738
--- /dev/null
+++ b/libre/xarchiver-libre/xarchiver-0.5.3-fix-rpm-support.patch
@@ -0,0 +1,86 @@
+diff -Naur xarchiver-0.5.3.orig/src/rpm.c xarchiver-0.5.3/src/rpm.c
+--- xarchiver-0.5.3.orig/src/rpm.c	2014-02-09 16:26:24.000000000 +0100
++++ xarchiver-0.5.3/src/rpm.c	2014-02-19 07:54:27.744136749 +0100
+@@ -23,8 +23,11 @@
+ 
+ void xa_open_rpm (XArchive *archive)
+ {
++	unsigned char bytes[8];
+ 	unsigned short int i;
+-    int response;
++    int dl,il,sigsize,offset,response;
++    gchar *ibs,*executable;
++    gchar *gzip_tmp = NULL;
+ 	GSList *list = NULL;
+ 	FILE *stream;
+ 	gboolean result;
+@@ -53,14 +56,68 @@
+ 		archive->column_types[i] = types[i];
+ 
+ 	xa_create_liststore (archive,names);
++    if (fseek ( stream, 104 , SEEK_CUR ) )
++    {
++        fclose (stream);
++        response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't fseek to position 104:"),g_strerror(errno));
++        return;
++    }
++    if ( fread ( bytes, 1, 8, stream ) == 0 )
++	{
++		fclose ( stream );
++		response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't read data from file:"),g_strerror(errno));
++		return;
++    }
++    il = 256 * ( 256 * ( 256 * bytes[0] + bytes[1]) + bytes[2] ) + bytes[3];
++    dl = 256 * ( 256 * ( 256 * bytes[4] + bytes[5]) + bytes[6] ) + bytes[7];
++    sigsize = 8 + 16 * il + dl;
++    offset = 104 + sigsize + ( 8 - ( sigsize % 8 ) ) % 8 + 8;
++    if (fseek ( stream, offset  , SEEK_SET ) )
++    {
++        fclose (stream);
++        response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't fseek in file:"),g_strerror(errno));
++        return;
++    }
++    if ( fread ( bytes, 1, 8, stream ) == 0 )
++	{
++		fclose ( stream );
++		response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't read data from file:"),g_strerror(errno));
++		return;
++    }
++    il = 256 * ( 256 * ( 256 * bytes[0] + bytes[1]) + bytes[2] ) + bytes[3];
++    dl = 256 * ( 256 * ( 256 * bytes[4] + bytes[5]) + bytes[6] ) + bytes[7];
++	sigsize = 8 + 16 * il + dl;
++	offset = offset + sigsize;
++	fclose (stream);
+ 
+ 	/* Create a unique temp dir in /tmp */
+ 	result = xa_create_temp_directory (archive);
+ 	if (!result)
+ 		return;
+ 
++	gzip_tmp = g_strconcat (archive->tmp,"/file.gz_bz",NULL);
++	ibs = g_strdup_printf ( "%u" , offset );
++
+ 	/* Now I run dd to have the bzip2 / gzip compressed cpio archive in /tmp */
+-	gchar *command = g_strconcat ( "sh -c \"rpm2cpio ",archive->escaped_path," > ",archive->tmp, "/file.cpio\"",NULL);
++	gchar *command = g_strconcat ( "dd if=",archive->escaped_path," ibs=",ibs," skip=1 of=",gzip_tmp,NULL);
++	g_free (ibs);
++	list = g_slist_append(list,command);
++	batch_mode = TRUE;
++	result = xa_run_command (archive,list);
++	if (result == FALSE)
++	{	
++		g_free (gzip_tmp);
++		return;
++	}
++	if (xa_detect_archive_type (gzip_tmp) == XARCHIVETYPE_GZIP)
++		executable = "gzip -dc ";
++	else if (xa_detect_archive_type (gzip_tmp) == XARCHIVETYPE_BZIP2)
++		executable = "bzip2 -dc ";
++	else
++		executable = "xz -dc ";
++
++	command = g_strconcat("sh -c \"",executable,gzip_tmp," > ",archive->tmp,"/file.cpio\"",NULL);
++	g_free(gzip_tmp);
+ 	list = NULL;
+ 	list = g_slist_append(list,command);
+ 	result = xa_run_command (archive,list);
author	Nicolás Reynolds <fauno@endefensadelsl.org>	2014-02-23 16:15:08 -0300
committer	Nicolás Reynolds <fauno@endefensadelsl.org>	2014-02-23 16:15:08 -0300
commit	44ae571c1d57a21af2c915b42bb656cf0d69c9ee (patch)
tree	757e53f443e27a95d1b1b0cdf337c2147953fc46 /libre
parent	eadbb9961b89668e4aed317f5dd97cb04e86663e (diff)
parent	1d20e4962664ab152948a14b4320b12204a1053e (diff)