updating my branches

393 files changed, 20688 insertions, 8347 deletions

diff --git a/java-ugly/junit/PKGBUILD b/java-ugly/junit/PKGBUILD
deleted file mode 100644
index 7204cd5c9..000000000
--- a/java-ugly/junit/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Maintainer (Arch): Guillaume ALAUX <Guillaume at Arch Linux dot org>
-
-pkgname=junit
-pkgver=4.10
-pkgrel=1
-pkgdesc="Automated testing framework for Java"
-arch=('any')
-url="http://www.junit.org/"
-license=('CPL')
-depends=('java-runtime')
-makedepends=('apache-ant' 'jh')
-source=("$pkgname::git://github.com/KentBeck/junit.git#tag=r$pkgver")
-
-mksource() {
-  cd "${srcdir}/${pkgname}"
-  #find . -name '*.jar' -delete
-
-  # Shut up some warnings from javac 1.7
-  sed -ri 's|target="([0-9.]+)"|\0 source="\1"|' build.xml
-}
-
-build() {
-  mksource
-  cd "${srcdir}/${pkgname}"
-
-  # Shut up some warnings from javac 1.7
-  sed -ri 's|target="([0-9.]+)"$|\0 source="\1"|' build.xml
-  
-  ant jars
-  for pkg in junit junit-dep; do
-    sed \
-      -e "s|@artifactID@|$pkg|" \
-      -e "s|@version@|$pkgver|" \
-      < build/maven/pom-template.xml > $pkgname$pkgver/$pkg-$pkgver.pom
-  done
-}
-
-package() {
-  cd "${srcdir}/${pkgname}"
-  install -Dm644 cpl-v10.html "$pkgdir/usr/share/licenses/junit/cpl-v10.html"
-
-  cd "${srcdir}/${pkgname}/${pkgname}${pkgver}"
-
-  export DESTDIR="$pkgdir"
-  jh mvn-install $pkgname junit     $pkgver junit-$pkgver.{jar,pom}
-  jh mvn-install $pkgname junit-dep $pkgver junit-dep-$pkgver.{jar,pom}
-  install -d "${pkgdir}/usr/share/java/${pkgname}"
-  ln -s `jh mvn-basename $pkgname junit     $pkgver`.jar "${pkgdir}/usr/share/java/${pkgname}"
-  ln -s `jh mvn-basename $pkgname junit-dep $pkgver`.jar "${pkgdir}/usr/share/java/${pkgname}"
-  ln -s ${pkgname}/${pkgname}-${pkgver}.jar     ${pkgdir}/usr/share/java/${pkgname}.jar
-  ln -s ${pkgname}/${pkgname}-dep-${pkgver}.jar ${pkgdir}/usr/share/java/${pkgname}-dep.jar
-}
-
-md5sums=('SKIP')
diff --git a/java/antlr2/PKGBUILD b/java/antlr2/PKGBUILD
index 4269d30c7..3468e25fc 100644
--- a/java/antlr2/PKGBUILD
+++ b/java/antlr2/PKGBUILD
@@ -1,17 +1,22 @@
-# $Id: PKGBUILD 167380 2012-10-01 19:24:15Z guillaume $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# 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>
 
+# FIXME: antlr2-sharp doesn't build with mono 3.
+
 pkgbase=antlr2
-pkgname=(antlr2 antlr2-{java,python2,cxx,sharp})
+#MONO pkgname=(antlr2 antlr2-{java,python2,cxx,sharp})
+pkgname=(antlr2 antlr2-{java,python2,cxx})
 pkgver=2.7.7
+pkgdesc="ANother Tool for Language Recognition (formerly PCCTS)"
 url="http://www.antlr2.org/"
 license=('custom:Public Domain')
 
-pkgrel=3
+pkgrel=3.1
 arch=('i686' 'x86_64')
-makedepends=('java-environment' 'python2' 'sh' 'nant' 'jh')
+#MONO makedepends=('java-environment' 'python2' 'sh' 'nant' 'jh')
+makedepends=('java-environment' 'python2' 'sh' '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')
@@ -25,8 +30,8 @@ build() {
   ./configure --prefix=/usr --disable-examples
   make -j1
 
-  cd lib/csharp
-  nant release
+  #MONO cd lib/csharp
+  #MONO nant release
 }
 
 _install_license() {
@@ -35,7 +40,6 @@ _install_license() {
 }
 
 package_antlr2() {
-  pkgdesc="ANother Tool for Language Recognition (formerly PCCTS)"
   depends=('sh' 'antlr2-java')
 
   install -Dm755 "$srcdir"/runantlr2.sh "$pkgdir"/usr/bin/runantlr2
@@ -43,7 +47,7 @@ package_antlr2() {
 }
 
 package_antlr2-java() {
-  pkgdesc="ANother Tool for Language Recognition (formerly PCCTS) (Java version)"
+  pkgdesc+=" (Java version)"
   depends=('java-runtime')
 
   provides=("java-antlr2=$pkgver")
@@ -51,16 +55,16 @@ package_antlr2-java() {
   replaces=("java-antlr2")
 
   DESTDIR="$pkgdir" jh mvn-install antlr antlr $pkgver \
-	  "$srcdir"/antlr-${pkgver}.pom \
-	  "$srcdir"/antlr-${pkgver}/antlr/antlr.jar \
-	  antlr2.jar
+    "$srcdir"/antlr-${pkgver}.pom \
+    "$srcdir"/antlr-${pkgver}/antlr/antlr.jar \
+    antlr2.jar
 
   _install_license
 }
 
 package_antlr2-python2() {
-  pkgdesc="ANother Tool for Language Recognition (formerly PCCTS) (Python version)"
-  depends=('antlr2' 'python2')
+  pkgdesc+=" (Python version)"
+  depends=('python2')
 
   provides=("python2-antlr2=$pkgver")
   conflicts=("python2-antlr2")
@@ -73,8 +77,7 @@ package_antlr2-python2() {
 }
 
 package_antlr2-cxx() {
-  pkgdesc="ANother Tool for Language Recognition (formerly PCCTS) (C++ version)"
-  depends=('java-runtime')
+  pkgdesc+=" (C++ version)"
 
   cd "$srcdir"/antlr-${pkgver}/lib/cpp
   make -j1 prefix="${pkgdir}/usr" install
@@ -83,8 +86,8 @@ package_antlr2-cxx() {
 }
 
 package_antlr2-sharp() {
-  pkgdesc="ANother Tool for Language Recognition (formerly PCCTS) (C Sharp version)"
-  depends=('antlr2' 'mono')
+  pkgdesc+=" (C Sharp version)"
+  depends=('mono')
 
   cd "$srcdir"/antlr-${pkgver}/lib/csharp
   install -d "$pkgdir"/usr/share
diff --git a/java/apache-ant/PKGBUILD b/java/apache-ant/PKGBUILD
index 77e0dfe94..dfda3c28d 100644
--- a/java/apache-ant/PKGBUILD
+++ b/java/apache-ant/PKGBUILD
@@ -3,52 +3,55 @@
 # Contributor: Andrew Wright <andreww@photism.org>
 
 pkgname=apache-ant
-pkgver=1.8.4
+pkgver=1.9.1
+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=1.1
-pkgdesc="A Java-based build tool"
+pkgrel=3
 arch=('any')
-license=('Apache')
-url="http://ant.apache.org/"
+depends=('java-environment')
+makedepends=('jh')
+
 _mirror=http://archive.apache.org/dist
 source=($_mirror/ant/source/${pkgname}-${pkgver}-src.tar.bz2
         ${pkgname}.sh ${pkgname}.csh)
-depends=('java-environment')
 
 # This list is adapted from https://ant.apache.org/manual/install.html#librarydependencies
 declare -A _opts
 _opts[junit]='to have JUnit on the classpath in javac tasks;/usr/share/java/junit.jar'
 _opts[xalan-java]='<junitreport> task;/usr/share/java/xalan.jar'
-_opts[antlr2]='<antlr> task;/usr/share/java/antlr2.jar::antlr.jar'
-#_opts[java-bsf]='<script> task;/usr/share/java/bsf.jar'
+_opts[java-antlr2]='<antlr> task;/usr/share/java/antlr2.jar::antlr.jar'
+_opts[java-commons-bsf2]='<script> task;/usr/share/java/bsf2.jar::bsf.jar'
 #_opts[groovy]='Groovy with <script> and <scriptdef> tasks;/usr/share/java/groovy.jar'
 _opts[java-asm2]='Groovy with <script> and <scriptdef> tasks;/usr/share/java/asm-2.jar::asm.jar /usr/share/java/asm-util-2.jar::asm-util.jar'
 #_opts[netrexx]='<netrexx> task, Rexx with <script> task;/usr/share/java/netrexx.jar'
-_opts[rhino]='Javascript with <script> task;/usr/share/java/js.jar'
+_opts[java-rhino]='Javascript with <script> task;/usr/share/java/js.jar'
 _opts[jython]='Python with <script> task;/opt/jython/jython.jar'
 #_opts[jacl]='TCL with <script> task;/usr/share/java/jacl.jar'
 #_opts[tcljava]='TCL with <script> task;/usr/share/java/tcljava.jar'
 _opts[beanshell>=1.3]='BeanShell with <script> task;/usr/share/java/bsh.jar::beanshell.jar'
-#_opts[jruby]='Ruby with <script> task;/usr/share/java/jruby.jar'
+_opts[jruby]='Ruby with <script> task;/opt/jruby/lib/jruby.jar'
 #_opts[judo]='Judoscript with <script> task;/usr/share/java/judo.jar'
 _opts[java-commons-logging]='CommonsLoggingListener;/usr/share/java/commons-logging/commons-logging.jar'
 #_opts[java-log4j]='Log4jListener;/usr/share/java/log4j.jar'
-#_opts[java-commons-net>=1.4.0]='<ftp>, <rexec> and <telnet> tasks;/usr/share/java/commons-net.jar'
-#_opts[java-bcel]="'classfileset' data type, JavaClassHelper for ClassConstants filter reader;/usr/share/java/bcel.jar"
+_opts[java-commons-net1>=1.4.0]='<ftp>, <rexec> and <telnet> tasks;/usr/share/java/commons-net.jar'
+_opts[java-bcel]="'classfileset' data type, JavaClassHelper for ClassConstants filter reader;/usr/share/java/bcel.jar"
 #_opts[java-mail]='<mimemail> task, mime encoding with <mail>;/usr/share/java/mail.jar'
-#_opts[java-activation]='<mimemail> task, mime encoding with <mail>;/usr/share/java/activation.jar'
-#_opts[jdepend]='<jdepend> task;/usr/share/java/jdepend.jar'
+_opts[java-activation-gnu]='<mimemail> task, mime encoding with <mail>;/usr/share/java/activation.jar'
+_opts[java-jdepend]='<jdepend> task;/usr/share/java/jdepend.jar'
 #_opts[java-xmlcommons-resolver>=1.1beta]="external files for 'xmlcatalog' datatype;/usr/share/java/resolver.jar"
-#_opts[java-jsch>=0.1.42]='<sshexec> and <scp> tasks;/usr/share/java/jsch.jar'
+_opts[java-jsch>=0.1.42]='<sshexec> and <scp> tasks;/usr/share/java/jsch.jar'
 #_opts[java-advanced-imaging]='<image> task/usr/share/java/jai/*.jar'
 
 for pkg in "${!_opts[@]}"; do
   optdepends+=("$pkg: ${_opts[$pkg]%;*}")
   makedepends+=("$pkg")
+  _jars+="${_opts[$pkg]#*;} "
 done
 
 build() {
@@ -59,9 +62,9 @@ build() {
   mkdir -p "${srcdir}"/${pkgname}-${pkgver}-bin
 
   cd "${srcdir}"/${pkgname}-${pkgver}
-  # Symlink to external optional libraries
-  for jar in ${_opts[@]#*;}; do
-    ln -sf ${jar%::*} lib/optional/`basename ${jar/*::}`
+  # Symlink to external optional libraries/
+  for jar in $_jars; do
+    ln -sfv ${jar%::*} lib/optional/`basename ${jar#*::}`
   done
   # Build
   source "/etc/profile.d/jdk.sh"   # Get the JAVA_HOME env var
@@ -87,8 +90,8 @@ package() {
   # Fix python2 path
   sed -i 's|/usr/bin/python|/usr/bin/python2|' "${pkgdir}"/${ANT_HOME}/bin/runant.py
   # Symlink to external optional libraries
-  for jar in ${_opts[@]#*;}; do
-    ln -sf ${jar%::*} "${pkgdir}"/${ANT_HOME}/lib/`basename ${jar/*::}`
+  for jar in $_jars; do
+    ln -sf ${jar%::*} "${pkgdir}"/${ANT_HOME}/lib/`basename ${jar#*::}`
   done
 
   ## Symlink the /opt distribution to the normal places
@@ -96,15 +99,24 @@ package() {
   install -d "${pkgdir}"/usr/share/doc/${pkgname}
   install -d "${pkgdir}"/usr/share/licenses/${pkgname}
 
+  cd "${pkgdir}"/${ANT_HOME}/lib
+  for pom in *.pom; do
+    a=${pom%.pom}
+    base=$(jh mvn-basename org.apache.ant $a $pkgver)
+    install -d "${pkgdir}${base%/*}"
+    ln -sf ${ANT_HOME}/lib/$a.pom "${pkgdir}${base}".pom
+    ln -sf ${ANT_HOME}/lib/$a.jar "${pkgdir}${base}".jar
+  done
+
   cd "${pkgdir}"/${ANT_HOME}
   for prog in bin/*; do
-      ln -sf ${ANT_HOME}/$prog "${pkgdir}"/usr/bin
+    ln -sf ${ANT_HOME}/$prog "${pkgdir}"/usr/bin
   done
   ln -sf ${ANT_HOME}/{README,WHATSNEW} "${pkgdir}"/usr/share/doc/${pkgname}
   ln -sf ${ANT_HOME}/docs "${pkgdir}"/usr/share/doc/${pkgname}/html
   ln -sf ${ANT_HOME}/{LICENSE,NOTICE} "${pkgdir}"/usr/share/licenses/${pkgname}
 }
 
-md5sums=('c474fa9d0c35a24037c23b6e476862c1'
+md5sums=('39771fd8b4ba87cd77ff6f27001cce4e'
          'bd63c881be406f515fc4d22635e8326a'
          'aaa615512cbe1ed7f3b62c1ff46802f8')
diff --git a/java/beanshell/PKGBUILD b/java/beanshell/PKGBUILD
new file mode 100644
index 000000000..95b14d379
--- /dev/null
+++ b/java/beanshell/PKGBUILD
@@ -0,0 +1,45 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (Arch): AndyRTR <andyrtr at archlinux.org>
+
+pkgname=beanshell
+pkgver=2.0b4
+pkgrel=2.1
+pkgdesc="Lightweight scripting for Java"
+url="http://www.beanshell.org/"
+license=('LGPL')
+
+provides=('bsh')
+
+arch=('any')
+depends=('java-runtime')
+makedepends=('apache-ant' 'java-commons-bsf2' 'javacc' 'java-servlet3.0-tomcat')
+source=("http://www.beanshell.org/bsh-${pkgver}-src.jar")
+
+prepare() {
+  cd "$srcdir"/BeanShell-$pkgver
+
+  rm lib/*.jar
+  ln -s /usr/share/java/bsf2.jar lib/
+  ln -s /usr/share/java/javacc.jar lib/
+  ln -s /usr/share/java/servlet-api.jar lib/servlet.jar
+}
+
+build() {
+  cd "$srcdir"/BeanShell-$pkgver
+  ant dist
+}
+
+check() {
+  cd "$srcdir"/BeanShell-$pkgver
+  ant test
+}
+
+package() {
+  cd "$srcdir"/BeanShell-$pkgver/dist
+  install -d "${pkgdir}"/usr/share/java/
+  for artifact in $(printf '%s\n' *.jar|sed 's/-[0-9b.]*\.jar$//'); do
+    install -m644 $artifact-$pkgver.jar "${pkgdir}"/usr/share/java/$artifact.jar
+  done
+}
+
+sha1sums=('69b36df249654a04e777ab899046c50b8cc844ac')
diff --git a/java/jakarta-oro/PKGBUILD b/java/jakarta-oro/PKGBUILD
new file mode 100644
index 000000000..9bc3e11b9
--- /dev/null
+++ b/java/jakarta-oro/PKGBUILD
@@ -0,0 +1,30 @@
+# Maintainer: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
+
+pkgname=jakarta-oro
+pkgver=2.0.8
+pkgrel=1
+pkgdesc="Full regular expressions API"
+arch=('any')
+url="http://jakarta.apache.org/oro"
+license=('Apache')
+makedepends=('apache-ant')
+source=("http://archive.apache.org/dist/jakarta/oro/jakarta-oro-${pkgver}.tar.gz")
+sha512sums=('a7f6eb6a088765f273df18ccc823f918737f18ec8772275054839a87f8370f1848e795d481f226c712651104d7598ab86c7d90a991fb039df6581f42f1447920')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  find . -name '*.jar' -o -name '*.class' -delete
+
+  ant jar
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  install -dm755 "${pkgdir}/usr/share/java/"
+  install -m644 ${pkgname}-${pkgver}.jar \
+    "${pkgdir}/usr/share/java/${pkgname}.jar"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/java/java-asm2/PKGBUILD b/java/java-asm2/PKGBUILD
index 71bc0f303..8860ef86f 100644
--- a/java/java-asm2/PKGBUILD
+++ b/java/java-asm2/PKGBUILD
@@ -1,11 +1,11 @@
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
 
 pkgver=2.2.3
-. common.sh
+. PKGBUILD.common.sh
 
 ####
 
-pkgrel=6
+pkgrel=7
 
 mksource() {
   cd "$srcdir/$_pkgname-$pkgver"
diff --git a/java/java-asm2/common.sh b/java/java-asm2/PKGBUILD.common.sh
index ef4547696..ef4547696 100644
--- a/java/java-asm2/common.sh
+++ b/java/java-asm2/PKGBUILD.common.sh
diff --git a/java/java-asm3/PKGBUILD b/java/java-asm3/PKGBUILD
index 345c83edf..9c9928766 100644
--- a/java/java-asm3/PKGBUILD
+++ b/java/java-asm3/PKGBUILD
@@ -1,11 +1,11 @@
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
 
 pkgver=3.3.1
-. ../java-asm2/common.sh
+. PKGBUILD.common.sh
 
 ####
 
-pkgrel=6
+pkgrel=7
 
 mksource() {
   cd "$srcdir/$_pkgname-$pkgver"
diff --git a/java/java-asm3/PKGBUILD.common.sh b/java/java-asm3/PKGBUILD.common.sh
new file mode 120000
index 000000000..e76a92ae0
--- /dev/null
+++ b/java/java-asm3/PKGBUILD.common.sh
@@ -0,0 +1 @@
+../java-asm2/PKGBUILD.common.sh
\ No newline at end of file
diff --git a/java/java-commons-bsf2/PKGBUILD b/java/java-commons-bsf2/PKGBUILD
new file mode 100644
index 000000000..57a9dfc1a
--- /dev/null
+++ b/java/java-commons-bsf2/PKGBUILD
@@ -0,0 +1,59 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+pkgname=java-commons-bsf2
+pkgver=2.4.0
+url="https://commons.apache.org/proper/commons-bsf/"
+license=('Apache')
+pkgdesc="Bean Scripting Framework"
+
+pkgrel=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"
+
+for pkg in "${!_opts[@]}"; do
+  optdepends+=("$pkg")
+  makedepends+=("$pkg")
+  _jars+="${_opts[$pkg]} "
+done
+
+prepare() {
+  cd "${srcdir}/bsf-${pkgver}"
+  rm lib/*.jar
+}
+
+build() {
+  cd "${srcdir}/bsf-${pkgver}"
+
+  for jar in $_jars; 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/java/java-jarjar/PKGBUILD b/java/java-jarjar/PKGBUILD
index 8d1d1120b..c78d5539e 100644
--- a/java/java-jarjar/PKGBUILD
+++ b/java/java-jarjar/PKGBUILD
@@ -9,30 +9,28 @@ pkgver=1.2
 _pkgrev=132 # v1.2 wasn't tagged, but this is clearly it
 pkgdesc="Java static linker (instead of the normal dynamic linking)"
 url="https://code.google.com/p/jarjar/"
-license=('Apache2')
+license=('Apache')
 
-pkgrel=1
+pkgrel=2
 arch=('any')
 depends=('java-runtime')
-makedepends=('apache-ant' 'java-asm3' 'junit' 'maven' 'jh')
-source=("svn+http://jarjar.googlecode.com/svn/trunk/jarjar#revision=$_pkgrev")
+makedepends=('apache-ant' 'java-asm3' 'junit' 'maven')
 
+source=("libre://${_pkgname}-${pkgver}.tar.gz")
+mksource=("${_pkgname}-${pkgver}::svn+http://jarjar.googlecode.com/svn/trunk/jarjar#revision=$_pkgrev")
 mksource() {
-  cd "$srcdir/$_pkgname"
-  rm -f src/test/*.{class,jar}
+  cd "$srcdir/$_pkgname-$pkgver"
   rm -f lib/*.jar
 }
 
 build() {
-  cd "$srcdir/$_pkgname"
-  eval `jh mksource`
+  cd "$srcdir/$_pkgname-$pkgver"
 
-  ln -s /usr/share/java/asm-3.jar             lib/asm-3.3.1.jar
-  ln -s /usr/share/java/asm-commons-3.jar     lib/asm-commons-3.3.1.jar
-  ln -s /usr/share/java/junit.jar             lib/junit-4.8.1.jar
-  ln -s /opt/maven/lib/maven-plugin-api-*.jar lib/maven-plugin-api.jar
-
-  ln -s /opt/apache-ant/lib/ant.jar lib/
+  ln -sf /usr/share/java/asm-3.jar             lib/asm-3.3.1.jar
+  ln -sf /usr/share/java/asm-commons-3.jar     lib/asm-commons-3.3.1.jar
+  ln -sf /usr/share/java/junit.jar             lib/junit-4.8.1.jar
+  ln -sf /opt/maven/lib/maven-plugin-api-*.jar lib/maven-plugin-api.jar
+  ln -sf /opt/apache-ant/lib/ant.jar           lib/ant.jar
 
   export CLASSPATH=/usr/share/java/asm-3.jar
   echo 'includeantruntime false' > build.properties
@@ -40,10 +38,11 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$_pkgname"
+  cd "$srcdir/$_pkgname-$pkgver"
   install -d "$pkgdir/usr/share/java/$_pkgname"
   install -D "dist/$_pkgname-$pkgver.jar" "$pkgdir/usr/share/java/$_pkgname"
   ln -s "$_pkgname/$_pkgname-$pkgver.jar" "$pkgdir/usr/share/java/$_pkgname.jar"
 }
 
-md5sums=('SKIP')
+mkmd5sums=('SKIP')
+md5sums=('cc2698a58f93cdb22c51f039a1b8a56e')
diff --git a/java/java-json-android/PKGBUILD b/java/java-json-android/PKGBUILD
new file mode 100644
index 000000000..3b0a08195
--- /dev/null
+++ b/java/java-json-android/PKGBUILD
@@ -0,0 +1,50 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+pkgname=java-json-android
+_pkgver=4.2.2_r1
+pkgdesc="Java org.json implementation developed as part of Android's libcore"
+url="https://android.googlesource.com/platform/libcore/"
+license=(Apache2)
+
+pkgver=${_pkgver//_/.}
+provides=(java-json)
+conflicts=(java-json)
+
+pkgrel=1
+arch=(any)
+
+depends=(java-runtime)
+makedepends=(java-environment junit)
+
+source=("libre://android-libcore-$_pkgver.tar.gz")
+md5sums=('367769bb9d7fe571ff4e1e82b99e99ed')
+
+mkdepends=(git)
+mksource=("android-libcore-$_pkgver::git+https://android.googlesource.com/platform/libcore/#tag=android-${_pkgver}")
+mkmd5sums=('SKIP')
+
+build() {
+  cd "$srcdir"/android-libcore-$_pkgver
+  sed 11q < NOTICE > json/NOTICE
+  cd json/src/main/java
+  javac org/json/*.java
+  jar cf json.jar org/json/*.class
+}
+
+check() {
+  cd "$srcdir"/android-libcore-$_pkgver/json/src/test/java
+
+  # disable test for known bug:
+  sed -i 's/test64BitHexValues()/x&/' org/json/ParsingTest.java
+
+  local cp="/usr/share/java/junit.jar:../../main/java/json.jar"
+  javac -cp "$cp" org/json/*.java
+  printf '%s\n' org/json/*.java | sed 's|/|.|g;s|\.java$||' > tests.txt
+  java -cp "$cp:." org.junit.runner.JUnitCore $(cat tests.txt)
+}
+
+package() {
+  cd "$srcdir"/android-libcore-$_pkgver/json
+  install -Dm644 NOTICE "pkgdir"/usr/share/licenses/$pkgname
+  install -Dm644 src/main/java/json.jar "pkgdir"/usr/share/java/json.jar
+}
diff --git a/java/java-rxtx/PKGBUILD b/java/java-rxtx/PKGBUILD
index 4fcabe2a4..ceb0d9bab 100644
--- a/java/java-rxtx/PKGBUILD
+++ b/java/java-rxtx/PKGBUILD
@@ -10,16 +10,18 @@ pkgver=${_pkgver//-/.}
 pkgdesc="A native library providing serial and parallel communication for Java"
 license=(LGPL2.1)
 
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 depends=('java-runtime')
-makedepends=('java-environment' 'pacman>4.0.3')
+makedepends=('java-environment')
 
 case "$_pkgver" in
     *arduino*)
 	url="https://github.com/arduino/RXTX"
-	source=("git://github.com/arduino/RXTX.git#${_gitver}")
-	md5sums=('SKIP')
+	source=("libre://RXTX-$pkgver.tar.gz")
+	md5sums=('a71156587dc8d28d1ff4ece376bc0140')
+	mksource=("git://github.com/arduino/RXTX.git#${_gitver}")
+	mkmd5sums=('SKIP')
 	_dirname=RXTX
 	;;
     *)
diff --git a/java/java-sonatype-oss-parent/PKGBUILD b/java/java-sonatype-oss-parent/PKGBUILD
index f42f6adc5..b62c971ac 100644
--- a/java/java-sonatype-oss-parent/PKGBUILD
+++ b/java/java-sonatype-oss-parent/PKGBUILD
@@ -5,23 +5,17 @@ pkgver=7
 pkgdesc="Metadata file for Maven-based build systems to inherit from"
 license='Apache2'
 
-_groupId=org/sonatype/oss
+_groupId=org.sonatype.oss
 _artifactId=oss-parent
 
 pkgrel=1
 arch=('any')
-depends=('maven')
-makedepends=('java-sonatype-oss-parent=7' 'jh')
+makedepends=('jh')
 source=("http://search.maven.org/remotecontent?filepath=$_groupId/$_artifactId/$pkgver/$_artifactId-$pkgver.pom")
 
-build() {
-  :
-}
-
 package() {
   cd "$srcdir"
-  install -Dm644 $_artifactId-$pkgver.pom \
-      "$pkgdir/`jh mvn-basename $_groupId $_artifactId $pkgver`".pom
+  DESTDIR=$pkgdir jh mvn-install $_groupId $_artifactId $pkgver $_artifactId-$pkgver.pom
 }
 
 md5sums=('3e418cf7f2607bf359e6c514a992cb38')
diff --git a/java/javacc/PKGBUILD b/java/javacc/PKGBUILD
new file mode 100644
index 000000000..032fd7b25
--- /dev/null
+++ b/java/javacc/PKGBUILD
@@ -0,0 +1,47 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+pkgname=javacc
+pkgver=5.0
+pkgdesc="Java Compiler Compiler; a parser generator"
+url="http://javacc.java.net/"
+license=('BSD3')
+
+arch=('any')
+pkgrel=2.1
+depends=('java-runtime')
+makedepends=('apache-ant' 'junit' 'jh')
+source=("http://java.net/projects/${pkgname}/downloads/download/${pkgname}-${pkgver}src.tar.gz")
+
+prepare() {
+  cd "$srcdir/$pkgname"
+  rm lib/junit3.8.1/junit.jar
+  ln -s /usr/share/java/junit.jar lib/junit3.8.1
+  #rm bootstrap/javacc.jar
+}
+
+build() {
+  cd "$srcdir/$pkgname"
+
+  sed -i \
+	  -e 's|<modelVersion>.*</modelVersion>|<modelVersion>4.0.0</modelVersion>|' \
+	  -e "s|<version>.*</version>|<version>$pkgver</version>|" \
+	  pom.xml
+
+  for prog in javacc jjdoc jjtree; do
+	  sed -i 's|JAR=.*|JAR=/usr/share/java/javacc.jar|' bin/$prog
+  done
+
+  CLASSPATH=/usr/share/java/junit.jar ant
+}
+
+package() {
+  cd "$srcdir/$pkgname"
+
+  for prog in javacc jjdoc jjrun jjtree; do
+	  install -Dm755 bin/$prog "$pkgdir"/usr/bin/$prog
+  done
+  install -Dm644 bin/lib/javacc.jar "$pkgdir"/usr/share/java/javacc.jar
+  install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
+
+md5sums=('871d78a2a5859c2eebc712c1f8135be5')
diff --git a/java/jh/PKGBUILD b/java/jh/PKGBUILD
index 4c1dee6f3..5638adbce 100644
--- a/java/jh/PKGBUILD
+++ b/java/jh/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
 
 pkgname=jh
-pkgver=0.5
+pkgver=0.5.1
 pkgdesc="Java helpers for PKGBUILDs"
 url="https://projects.parabolagnulinux.org/packages/jh.git/"
 license=('custom:WTFPL')
@@ -24,4 +24,4 @@ package() {
   install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
 
-md5sums=('5fe2279fbada213eb8df38875450c4d2')
+md5sums=('051d39c5dac14e86b755bab9ec1d0d5d')
diff --git a/java/junit/PKGBUILD b/java/junit/PKGBUILD
new file mode 100644
index 000000000..5e466a029
--- /dev/null
+++ b/java/junit/PKGBUILD
@@ -0,0 +1,53 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (Arch): Guillaume ALAUX <Guillaume at Arch Linux dot org>
+
+pkgname=junit
+pkgver=4.11
+pkgdesc="Automated testing framework for Java"
+url="http://www.junit.org/"
+license=('CPL')
+
+pkgrel=3.1
+arch=('any')
+depends=('java-runtime' 'java-hamcrest')
+makedepends=('apache-ant' 'jakarta-oro' 'jh')
+
+source=("libre://$pkgname-$pkgver.tar.gz")
+md5sums=('47c8879e05effb2ab98461c43243cc65')
+
+mksource=("$pkgname::git://github.com/junit-team/junit.git#tag=r$pkgver")
+mkmd5sums=('SKIP')
+mksource() {
+  cd "${srcdir}"p
+  if [[ -d $pkgname ]]; then
+    rm -rf "$pkgname"-*
+    mv "$pkgname" "$pkgname-$pkgver"
+  fi
+
+  cd "${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/java-ugly/maven/PKGBUILD b/java/maven/PKGBUILD
index 3f8e5071d..3f8e5071d 100644
--- a/java-ugly/maven/PKGBUILD
+++ b/java/maven/PKGBUILD
diff --git a/java-ugly/maven/maven.csh b/java/maven/maven.csh
index f5750cfc8..f5750cfc8 100644
--- a/java-ugly/maven/maven.csh
+++ b/java/maven/maven.csh
diff --git a/java-ugly/maven/maven.sh b/java/maven/maven.sh
index b6655cc22..b6655cc22 100644
--- a/java-ugly/maven/maven.sh
+++ b/java/maven/maven.sh
diff --git a/java/not-working/closure-compiler/PKGBUILD b/java/not-working/closure-compiler/PKGBUILD
deleted file mode 100644
index 8318379a2..000000000
--- a/java/not-working/closure-compiler/PKGBUILD
+++ /dev/null
@@ -1,73 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-pkgname=closure-compiler
-pkgver=20120917
-_pkgrev=2180
-pkgdesc="A JavaScript optimizing compiler."
-url="https://code.google.com/closure/compiler/"
-license=('Apache')
-
-pkgrel=1
-arch=('any')
-depends=('java-runtime')
-makedepends=(
-  'apache-ant'
-  'java-args4j' # does not exist
-  'google-caja' # does not exist
-  'java-guava' # does not build
-  'java-jarjar'
-  'java-json' # does not exist
-  'java-jsr305' # does not exist
-  'junit'
-  'java-protobuf' # does not build
-  # maven-ant-tasks
-  'jh')
-source=("compiler-$pkgver::svn+http://closure-compiler.googlecode.com/svn/trunk/#revision=$_pkgrev")
-
-# For some reason, `file` detects this as a Fortran binary
-_funny_js=(
-  lib/rhino/testsrc/benchmarks/sunspider-0.9.1/bitops-3bit-bits-in-byte.js
-)
-
-mksource() {
-  cd "$srcdir/compiler-$pkgver"
-  rm lib/ant.jar
-  rm lib/ant-launcher.jar
-  rm lib/args4j.jar
-  rm lib/caja-r4314.jar
-  rm lib/guava.jar
-  rm lib/jarjar.jar
-  rm lib/json.jar
-  rm lib/jsr305.jar
-  rm lib/junit.jar
-  rm lib/protobuf-java.jar
-  rm lib/rhino/testsrc/org/mozilla/javascript/tests/commonjs/module/modules.jar
-  rm tools/maven-ant-tasks-2.1.3.jar
-}
-
-build() {
-  cd "$srcdir/compiler-$pkgver"
-  eval `jh mksource ${_funny_js[@]}`
-
-  ln -s /opt/apache-ant/lib/ant.jar          lib/ant.jar
-  ln -s /opt/apache-ant/lib/ant-launcher.jar lib/ant-launcher.jar
-  ln -s /usr/share/java/...                  lib/args4j.jar
-  ln -s /usr/share/java/...                  lib/caja-r4314.jar
-  ln -s /usr/share/java/...                  lib/guava.jar
-  ln -s /usr/share/java/jarjar.jar           lib/jarjar.jar
-  ln -s /usr/share/java/...                  lib/json.jar
-  ln -s /usr/share/java/...                  lib/jsr305.jar
-  ln -s /usr/share/java/junit.jar            lib/junit.jar
-  ln -s /usr/share/java/protobuf.jar         lib/protobuf-java.jar
-  # I think lib/rhino/.../module.jar autogenerates
-  ln -s /...                                 tools/maven-ant-tasks-2.1.3.jar
-
-  ant jar
-}
-
-package() {
-  cd "$srcdir/$pkgname"
-  :
-}
-
-md5sums=('SKIP')
diff --git a/java/not-working/closure-compiler/TODO b/java/not-working/closure-compiler/TODO
deleted file mode 100644
index 8527a4898..000000000
--- a/java/not-working/closure-compiler/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-* Has plenty of missing dependencies (most of the 'not-working' folder)
-* package() has not been written
diff --git a/java/not-working/java-asm4/PKGBUILD b/java/not-working/java-asm4/PKGBUILD
deleted file mode 100644
index 3db06dddc..000000000
--- a/java/not-working/java-asm4/PKGBUILD
+++ /dev/null
@@ -1,17 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-pkgver=4.1
-. ../java-asm2/common.sh
-depends+=('java-bnd')
-
-####
-
-pkgrel=5
-_checksource_ignore=(src/org/objectweb/asm/optimizer/jdk{1.2.2_017,1.3.1_19}.txt.gz)
-
-mksource() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  rm examples/jasmin/test/jasmin.jar
-}
-
-md5sums=('cbfd7445edc517e0867ad410e48cb106')
diff --git a/java/not-working/java-asm4/TODO b/java/not-working/java-asm4/TODO
deleted file mode 100644
index 563c88bc9..000000000
--- a/java/not-working/java-asm4/TODO
+++ /dev/null
@@ -1 +0,0 @@
-Depends on java-bnd, which is not packaged
\ No newline at end of file
diff --git a/java-ugly/not-working/java-bnd/PKGBUILD b/java/not-working/java-bnd/PKGBUILD
index 86820469a..86820469a 100644
--- a/java-ugly/not-working/java-bnd/PKGBUILD
+++ b/java/not-working/java-bnd/PKGBUILD
diff --git a/java/not-working/java-guava/PKGBUILD b/java/not-working/java-guava/PKGBUILD
deleted file mode 100644
index 0250e7183..000000000
--- a/java/not-working/java-guava/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-_pkgname=guava
-pkgname=java-guava
-pkgver=13.0.1
-pkgdesc="Google Core Libraries for Java."
-url="https://code.google.com/p/guava-libraries/"
-license=('Apache2')
-
-pkgrel=1
-arch=('any')
-depends=('java-runtime>=5')
-makedepends=('java-runtime>=6' 'maven' 'junit-truth' 'jh')
-conflicts=('openjdk6') # OpenJDK bug 100167 conflicts
-source=("$pkgname::git+https://code.google.com/p/guava-libraries/#tag=v$pkgver")
-
-mksource() {
-  cd "$srcdir/$pkgname"
-  rm guava/lib/*.jar
-  rm guava-test/lib/*.jar
-}
-
-build() {
-  cd "$srcdir/$pkgname"
-  eval `jh mksource`
-
-  ln -s /usr/share/java/junit-truth.jar guava-tests/lib/libtruth.java
-
-  mvn package
-}
-
-package() {
-    :
-}
diff --git a/java/not-working/java-guava/TODO b/java/not-working/java-guava/TODO
deleted file mode 100644
index ee0a18042..000000000
--- a/java/not-working/java-guava/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-* depends on junit-truth, which does not build yet
-* package() hasn't been written
diff --git a/java/not-working/junit-truth/PKGBUILD b/java/not-working/junit-truth/PKGBUILD
deleted file mode 100644
index 61a0ee469..000000000
--- a/java/not-working/junit-truth/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-pkgname=junit-truth
-pkgdesc="Assertion/Proposition framework for Java unit tests."
-url="https://github.com/truth0/truth"
-license=('Apache2')
-
-#_pkgver=0.5.0-beta1
-#pkgver=${_pkgver//-/.}
-#_tag=v${_pkgver}
-
-#pkgver=0.7.0
-#_tag=truth-rel-${pkgver//./-}
-
-#pkgver=0.8
-#_tag=truth-${pkgver}
-
-#pkgver=0.9
-#_tag=release_${pkgver//./_}
-
-pkgver=0.10
-_tag=release_${pkgver//./_}
-
-pkgrel=1
-arch=('any')
-depends=('junit')
-makedepends=('maven' 'jh')
-conflicts=('openjdk6') # OpenJDK bug 100167 conflicts
-source=("$pkgname::git://github.com/truth0/truth.git#tag=$tag")
-
-build() {
-  cd "${srcdir}/${pkgname}"
-  jh checksource
-  mvn package
-}
-
-package() {
-  cd "${srcdir}/${pkgname}"
-  install -d "${pkgdir}"/usr/share/java/${pkgname}
-  JAR=${pkgname}-${pkgver}.jar
-  install -Dm 644 target/${JAR} "${pkgdir}"/usr/share/java/${pkgname}
-  ln -s       ${pkgname}/${JAR} "${pkgdir}"/usr/share/java/${pkgname}.jar
-}
-
-md5sums=('SKIP')
diff --git a/java/not-working/junit-truth/TODO b/java/not-working/junit-truth/TODO
deleted file mode 100644
index d21b3e472..000000000
--- a/java/not-working/junit-truth/TODO
+++ /dev/null
@@ -1 +0,0 @@
-has unpackaged dependencies
diff --git a/java/not-working/protobuf/PKGBUILD b/java/not-working/protobuf/PKGBUILD
deleted file mode 100644
index 699bde0cf..000000000
--- a/java/not-working/protobuf/PKGBUILD
+++ /dev/null
@@ -1,99 +0,0 @@
-# Maintainer: Thomas S Hatch <thatch45@gmail.com>
-# Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgbase=protobuf
-pkgname=('protobuf' 'python2-protobuf' 'java-protobuf')
-pkgver=2.4.1
-pkgrel=2.1
-pkgdesc="A way of encoding structured data in an efficient yet extensible format"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/protobuf/"
-license=('APACHE')
-depends=('gcc-libs' 'zlib')
-makedepends=('python2' 'python2-distribute' 'java-environment')
-options=(!libtool)
-source=(http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.bz2)
-md5sums=('ed436802019c9e1f40cc750eaf78f318')
-
-####
-
-build() {
-  build_protobuf
-  build_python2-protobuf
-  build_java-protobuf
-}
-
-check() {
-  check_protobuf
-  check_python2-protobuf
-  check_java-protobuf
-}
-
-package() {
-  package_protobuf
-  package_python2-protobuf
-  package_java-protobuf
-}
-
-####
-
-build_protobuf() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-check_protobuf() {
-  cd $srcdir/$pkgname-$pkgver
-  make check
-}
-
-package_protobuf() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-}
-
-####
-
-build_python2-protobuf() {
-  cd $srcdir/$pkgname-$pkgver/python
-  python2 setup.py build
-}
-
-check_python2-protobuf() {
-  cd $srcdir/$pkgname-$pkgver/python
-  python2 setup.py test
-}
-
-package_python2-protobuf() {
-  pkgdesc="protobuf python2 API"
-  replaces=('protobuf-python')
-  provides=("protobuf-python=${pkgver}")
-  depends=("python2" "protobuf=${pkgver}")
-
-  cd $srcdir/protobuf-$pkgver/python
-  python2 setup.py install --prefix=/usr --root $pkgdir
-}
-
-####
-
-build_java-protobuf() {
-  cd $srcdir/$pkgname-$pkgver/java
-  mvn compile
-}
-
-check_java-protobuf() {
-  cd $srcdir/$pkgname-$pkgver/java
-  mvn test
-}
-
-package_java-protobuf() {
-  pkgdesc="protobuf Java API"
-  replaces=('protobuf-java')
-  provides=("protobuf-java=${pkgver}")
-  depends=("java-runtime" "protobuf=${pkgver}")
-
-  cd $srcdir/$pkgname-$pkgver/java
-  :
-}
diff --git a/java/not-working/protobuf/TODO b/java/not-working/protobuf/TODO
deleted file mode 100644
index 6a126b757..000000000
--- a/java/not-working/protobuf/TODO
+++ /dev/null
@@ -1,5 +0,0 @@
-* Missing dependencies:
- * junit:junit:4.4 (4.10 is packaged, patch to use 4.10?)
- * org.easymock:easymock:2.2
- * org.easymock:easymockclassextension:2.2.1
-* package_java-protobuf() has not been written
diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD
index ca6fbb0fa..03ed9a78e 100644
--- a/kernels/linux-libre-pae/PKGBUILD
+++ b/kernels/linux-libre-pae/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186437 2013-05-26 15:22:24Z tpowa $
+# $Id: PKGBUILD 188791 2013-06-21 06:32:50Z tpowa $
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,7 +6,7 @@
 pkgbase=linux-libre-pae     # Build stock -LIBRE-PAE kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.9
-pkgver=${_basekernel}.4
+pkgver=${_basekernel}.7
 pkgrel=1
 arch=('i686')
 url="http://linux-libre.fsfla.org/"
@@ -22,8 +22,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'boot-logo.patch'
         'change-default-console-loglevel.patch')
 md5sums=('120df29f88622dabf7015a22c7cc8e25'
-         'ae8a4997bfa4a6b9acfd0cefbb6e9aa0'
-         '7985f1e2cdb6838cf89bd85c0229db6a'
+         '4f5c670da16dc80fe9482892b636f99d'
+         '0c2bbcd147271839533777cd7b187f88'
          'f302c931bd85309da9d9792b4cc96467'
          '04b21c79df0a952c22d681dd4f4562df'
          'f3def2cefdcbb954c21d8505d23cc83c')
@@ -117,14 +117,16 @@ _package() {
   # add vmlinux
   install -D -m644 vmlinux "${pkgdir}/usr/src/linux-${_kernver}/vmlinux"
 
-  # install fallback mkinitcpio.conf file and preset file for kernel
-  install -D -m644 "${srcdir}/${pkgbase}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
-
   # set correct depmod command for install
+  cp -f "${startdir}/${install}" "${startdir}/${install}.pkg"
+  true && install=${install}.pkg
   sed \
     -e  "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/" \
     -e  "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/" \
-    -i "${startdir}/${pkgbase}.install"
+    -i "${startdir}/${install}"
+
+  # install mkinitcpio preset file for kernel
+  install -D -m644 "${srcdir}/${pkgbase}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
   sed \
     -e "1s|'linux*.*'|'${pkgbase}'|" \
     -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgbase}\"|" \
diff --git a/kernels/linux-libre-pae/config b/kernels/linux-libre-pae/config
index dd3549ac6..f4d6d1686 100644
--- a/kernels/linux-libre-pae/config
+++ b/kernels/linux-libre-pae/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.9.3-1 Kernel Configuration
+# Linux/x86 3.9.7-1 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -2439,7 +2439,7 @@ CONFIG_ATH9K=m
 CONFIG_ATH9K_PCI=y
 CONFIG_ATH9K_AHB=y
 # CONFIG_ATH9K_DEBUGFS is not set
-CONFIG_ATH9K_RATE_CONTROL=y
+# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set
 CONFIG_ATH9K_HTC=m
 # CONFIG_ATH9K_HTC_DEBUGFS is not set
 CONFIG_CARL9170=m
@@ -4723,7 +4723,6 @@ CONFIG_USB_MUSB_TUSB6010=m
 CONFIG_MUSB_PIO_ONLY=y
 CONFIG_USB_CHIPIDEA=m
 CONFIG_USB_CHIPIDEA_UDC=y
-CONFIG_USB_CHIPIDEA_HOST=y
 # CONFIG_USB_CHIPIDEA_DEBUG is not set
 CONFIG_USB_RENESAS_USBHS=m
 
@@ -6036,7 +6035,7 @@ CONFIG_SECURITY_TOMOYO=y
 CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
 CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
 # CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
-CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init"
+CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/usr/bin/tomoyo-init"
 CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd"
 CONFIG_SECURITY_APPARMOR=y
 CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0
diff --git a/kernels/linux-libre-pae/linux-libre-pae.install b/kernels/linux-libre-pae/linux-libre-pae.install
index a5e974c9b..079d1b7ab 100644
--- a/kernels/linux-libre-pae/linux-libre-pae.install
+++ b/kernels/linux-libre-pae/linux-libre-pae.install
@@ -2,10 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-pae
-KERNEL_VERSION=3.9.4-1-LIBRE-PAE
-
-# set a sane PATH to ensure that critical utils like depmod will be found
-export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
+KERNEL_VERSION=
 
 post_install () {
   # updating module dependencies
@@ -15,40 +12,9 @@ post_install () {
     echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
     mkinitcpio -p linux-libre${KERNEL_NAME}
   fi
-
-  # compat symlinks for the official kernels only
-  if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-pae" ]; then
-    loaders="$(find /boot -name syslinux.cfg -or -name extlinux.conf -or -name grub.cfg -or -name menu.lst)"
-    [ -f /etc/lilo.conf ] && loaders="$loaders /etc/lilo.conf"
-    if [ -n "${loaders}" ] && grep -q -e vmlinuz26 -e kernel26.img -e kernel26-fallback.img $loaders; then
-      # add compat symlinks for the initramfs images
-      ln -sf initramfs-linux-libre${KERNEL_NAME}.img boot/kernel26${KERNEL_NAME}.img
-      ln -sf initramfs-linux-libre${KERNEL_NAME}-fallback.img \
-        boot/kernel26${KERNEL_NAME}-fallback.img
-      ln -sf vmlinuz-linux-libre${KERNEL_NAME} /boot/vmlinuz26${KERNEL_NAME}
-    fi
-  fi
 }
 
 post_upgrade() {
-  pacman -Q grub &>/dev/null
-  hasgrub=$?
-  pacman -Q grub-common &>/dev/null
-  hasgrub2=$?
-  pacman -Q lilo &>/dev/null
-  haslilo=$?
-  # reminder notices
-  if [ $haslilo -eq 0 ]; then
-    echo ">>>"
-    if [ $hasgrub -eq 0 -o $hasgrub2 -eq 0 ]; then
-      echo ">>> If you use the LILO bootloader, you should run 'lilo' before rebooting."
-    else
-      echo ">>> You appear to be using the LILO bootloader. You should run"
-      echo ">>> 'lilo' before rebooting."
-    fi
-    echo ">>>"
-  fi
-
   if findmnt --fstab -uno SOURCE /boot &>/dev/null && ! mountpoint -q /boot; then
     echo "WARNING: /boot appears to be a separate partition but is not mounted."
   fi
@@ -64,6 +30,6 @@ post_upgrade() {
 
 post_remove() {
   # also remove the compat symlinks
-  rm -f boot/{initramfs-linux-libre,kernel26}${KERNEL_NAME}.img
-  rm -f boot/{initramfs-linux-libre,kernel26}${KERNEL_NAME}-fallback.img
+  rm -f boot/initramfs-linux-libre${KERNEL_NAME}.img
+  rm -f boot/initramfs-linux-libre${KERNEL_NAME}-fallback.img
 }
diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD
index d93b6247b..aa53303e4 100644
--- a/kernels/linux-libre-rt/PKGBUILD
+++ b/kernels/linux-libre-rt/PKGBUILD
@@ -10,7 +10,7 @@ pkgbase=linux-libre-rt      # Build stock -LIBRE-RT kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.8
 _releasever=13
-_rtpatchver=rt9
+_rtpatchver=rt12
 _pkgver=${_basekernel}.${_releasever}
 pkgver=${_basekernel}.${_releasever}_${_rtpatchver}
 pkgrel=1
@@ -34,7 +34,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('5c7787be882c343e41fb49136ff60aec'
          '2242024493dcb72a8777e11198f5e743'
-         '2b8fc5a819ee9bdf79aec69e07565cae'
+         'aeecda98b77d67f4d1382b27ecba3d34'
          '5ed195b8c44e1e00c1885077566e1f81'
          'f97a0be3b9252e788a0cf67e93cb5c6f'
          '82496e68851d1960543a07ba51cdb44a'
@@ -187,14 +187,16 @@ _package() {
   # add vmlinux
   install -D -m644 vmlinux "${pkgdir}/usr/src/linux-${_kernver}/vmlinux"
 
-  # install fallback mkinitcpio.conf file and preset file for kernel
-  install -D -m644 "${srcdir}/${pkgbase}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
-
   # set correct depmod command for install
+  cp -f "${startdir}/${install}" "${startdir}/${install}.pkg"
+  true && install=${install}.pkg
   sed \
     -e  "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/" \
     -e  "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/" \
-    -i "${startdir}/${pkgbase}.install"
+    -i "${startdir}/${install}"
+
+  # install mkinitcpio preset file for kernel
+  install -D -m644 "${srcdir}/${pkgbase}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
   sed \
     -e "1s|'linux*.*'|'${pkgbase}'|" \
     -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgbase}\"|" \
diff --git a/kernels/linux-libre-rt/linux-libre-rt.install b/kernels/linux-libre-rt/linux-libre-rt.install
index 374862298..434a0207c 100644
--- a/kernels/linux-libre-rt/linux-libre-rt.install
+++ b/kernels/linux-libre-rt/linux-libre-rt.install
@@ -2,10 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-rt
-KERNEL_VERSION=3.8.13-1-rt9-LIBRE-RT
-
-# set a sane PATH to ensure that critical utils like depmod will be found
-export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
+KERNEL_VERSION=
 
 post_install () {
   # updating module dependencies
@@ -15,40 +12,9 @@ post_install () {
     echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
     mkinitcpio -p linux-libre${KERNEL_NAME}
   fi
-
-  # compat symlinks for the official kernels only
-  if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-rt" ]; then
-    loaders="$(find /boot -name syslinux.cfg -or -name extlinux.conf -or -name grub.cfg -or -name menu.lst)"
-    [ -f /etc/lilo.conf ] && loaders="$loaders /etc/lilo.conf"
-    if [ -n "${loaders}" ] && grep -q -e vmlinuz26 -e kernel26.img -e kernel26-fallback.img $loaders; then
-      # add compat symlinks for the initramfs images
-      ln -sf initramfs-linux-libre${KERNEL_NAME}.img boot/kernel26${KERNEL_NAME}.img
-      ln -sf initramfs-linux-libre${KERNEL_NAME}-fallback.img \
-        boot/kernel26${KERNEL_NAME}-fallback.img
-      ln -sf vmlinuz-linux-libre${KERNEL_NAME} /boot/vmlinuz26${KERNEL_NAME}
-    fi
-  fi
 }
 
 post_upgrade() {
-  pacman -Q grub &>/dev/null
-  hasgrub=$?
-  pacman -Q grub-common &>/dev/null
-  hasgrub2=$?
-  pacman -Q lilo &>/dev/null
-  haslilo=$?
-  # reminder notices
-  if [ $haslilo -eq 0 ]; then
-    echo ">>>"
-    if [ $hasgrub -eq 0 -o $hasgrub2 -eq 0 ]; then
-      echo ">>> If you use the LILO bootloader, you should run 'lilo' before rebooting."
-    else
-      echo ">>> You appear to be using the LILO bootloader. You should run"
-      echo ">>> 'lilo' before rebooting."
-    fi
-    echo ">>>"
-  fi
-
   if findmnt --fstab -uno SOURCE /boot &>/dev/null && ! mountpoint -q /boot; then
     echo "WARNING: /boot appears to be a separate partition but is not mounted."
   fi
@@ -64,6 +30,6 @@ post_upgrade() {
 
 post_remove() {
   # also remove the compat symlinks
-  rm -f boot/{initramfs-linux-libre,kernel26}${KERNEL_NAME}.img
-  rm -f boot/{initramfs-linux-libre,kernel26}${KERNEL_NAME}-fallback.img
+  rm -f boot/initramfs-linux-libre${KERNEL_NAME}.img
+  rm -f boot/initramfs-linux-libre${KERNEL_NAME}-fallback.img
 }
diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD
index 7ae0ec08c..2090ce582 100644
--- a/kernels/linux-libre-xen/PKGBUILD
+++ b/kernels/linux-libre-xen/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186437 2013-05-26 15:22:24Z tpowa $
+# $Id: PKGBUILD 188791 2013-06-21 06:32:50Z tpowa $
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,7 +6,7 @@
 pkgbase=linux-libre-xen     # Build stock -LIBRE-XEN kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.9
-pkgver=${_basekernel}.4
+pkgver=${_basekernel}.7
 pkgrel=1
 arch=('i686')
 url="http://linux-libre.fsfla.org/"
@@ -22,8 +22,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'boot-logo.patch'
         'change-default-console-loglevel.patch')
 md5sums=('120df29f88622dabf7015a22c7cc8e25'
-         'ae8a4997bfa4a6b9acfd0cefbb6e9aa0'
-         '8cc2a43c771d0fbb652c8264c746c007'
+         '4f5c670da16dc80fe9482892b636f99d'
+         'c5a088fdf7a6fed1e06a890befca00ab'
          'b7c2805bb287a644c0a303bf7721e534'
          '04b21c79df0a952c22d681dd4f4562df'
          'f3def2cefdcbb954c21d8505d23cc83c')
@@ -117,14 +117,16 @@ _package() {
   # add vmlinux
   install -D -m644 vmlinux "${pkgdir}/usr/src/linux-${_kernver}/vmlinux"
 
-  # install fallback mkinitcpio.conf file and preset file for kernel
-  install -D -m644 "${srcdir}/${pkgbase}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
-
   # set correct depmod command for install
+  cp -f "${startdir}/${install}" "${startdir}/${install}.pkg"
+  true && install=${install}.pkg
   sed \
     -e  "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/" \
     -e  "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/" \
-    -i "${startdir}/${pkgbase}.install"
+    -i "${startdir}/${install}"
+
+  # install mkinitcpio preset file for kernel
+  install -D -m644 "${srcdir}/${pkgbase}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
   sed \
     -e "1s|'linux*.*'|'${pkgbase}'|" \
     -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgbase}\"|" \
diff --git a/kernels/linux-libre-xen/config b/kernels/linux-libre-xen/config
index dd2c45fd8..c4c81ff93 100644
--- a/kernels/linux-libre-xen/config
+++ b/kernels/linux-libre-xen/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.9.3-1 Kernel Configuration
+# Linux/x86 3.9.7-1 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -2447,7 +2447,7 @@ CONFIG_ATH9K=m
 CONFIG_ATH9K_PCI=y
 CONFIG_ATH9K_AHB=y
 # CONFIG_ATH9K_DEBUGFS is not set
-CONFIG_ATH9K_RATE_CONTROL=y
+# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set
 CONFIG_ATH9K_HTC=m
 # CONFIG_ATH9K_HTC_DEBUGFS is not set
 CONFIG_CARL9170=m
@@ -4225,7 +4225,6 @@ CONFIG_DRM_RADEON=m
 # CONFIG_DRM_RADEON_UMS is not set
 CONFIG_DRM_NOUVEAU=m
 CONFIG_NOUVEAU_DEBUG=5
-CONFIG_NOUVEAU_DEBUG=5
 CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_I915=m
@@ -4936,7 +4935,6 @@ CONFIG_USB_FUNCTIONFS_GENERIC=y
 CONFIG_USB_MASS_STORAGE=m
 CONFIG_USB_GADGET_TARGET=m
 CONFIG_USB_G_SERIAL=m
-CONFIG_USB_G_SERIAL=m
 CONFIG_USB_MIDI_GADGET=m
 CONFIG_USB_G_PRINTER=m
 # CONFIG_USB_CDC_COMPOSITE is not set
@@ -6076,7 +6074,7 @@ CONFIG_SECURITY_TOMOYO=y
 CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
 CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
 # CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
-CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init"
+CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/usr/bin/tomoyo-init"
 CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd"
 CONFIG_SECURITY_APPARMOR=y
 CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0
diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install
index 2bde797ef..0683dce3d 100644
--- a/kernels/linux-libre-xen/linux-libre-xen.install
+++ b/kernels/linux-libre-xen/linux-libre-xen.install
@@ -2,10 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-xen
-KERNEL_VERSION=3.9.4-1-LIBRE-XEN
-
-# set a sane PATH to ensure that critical utils like depmod will be found
-export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
+KERNEL_VERSION=
 
 post_install () {
   # updating module dependencies
@@ -15,40 +12,9 @@ post_install () {
     echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
     mkinitcpio -p linux-libre${KERNEL_NAME}
   fi
-
-  # compat symlinks for the official kernels only
-  if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-xen" ]; then
-    loaders="$(find /boot -name syslinux.cfg -or -name extlinux.conf -or -name grub.cfg -or -name menu.lst)"
-    [ -f /etc/lilo.conf ] && loaders="$loaders /etc/lilo.conf"
-    if [ -n "${loaders}" ] && grep -q -e vmlinuz26 -e kernel26.img -e kernel26-fallback.img $loaders; then
-      # add compat symlinks for the initramfs images
-      ln -sf initramfs-linux-libre${KERNEL_NAME}.img boot/kernel26${KERNEL_NAME}.img
-      ln -sf initramfs-linux-libre${KERNEL_NAME}-fallback.img \
-        boot/kernel26${KERNEL_NAME}-fallback.img
-      ln -sf vmlinuz-linux-libre${KERNEL_NAME} /boot/vmlinuz26${KERNEL_NAME}
-    fi
-  fi
 }
 
 post_upgrade() {
-  pacman -Q grub &>/dev/null
-  hasgrub=$?
-  pacman -Q grub-common &>/dev/null
-  hasgrub2=$?
-  pacman -Q lilo &>/dev/null
-  haslilo=$?
-  # reminder notices
-  if [ $haslilo -eq 0 ]; then
-    echo ">>>"
-    if [ $hasgrub -eq 0 -o $hasgrub2 -eq 0 ]; then
-      echo ">>> If you use the LILO bootloader, you should run 'lilo' before rebooting."
-    else
-      echo ">>> You appear to be using the LILO bootloader. You should run"
-      echo ">>> 'lilo' before rebooting."
-    fi
-    echo ">>>"
-  fi
-
   if findmnt --fstab -uno SOURCE /boot &>/dev/null && ! mountpoint -q /boot; then
     echo "WARNING: /boot appears to be a separate partition but is not mounted."
   fi
@@ -64,6 +30,6 @@ post_upgrade() {
 
 post_remove() {
   # also remove the compat symlinks
-  rm -f boot/{initramfs-linux-libre,kernel26}${KERNEL_NAME}.img
-  rm -f boot/{initramfs-linux-libre,kernel26}${KERNEL_NAME}-fallback.img
+  rm -f boot/initramfs-linux-libre${KERNEL_NAME}.img
+  rm -f boot/initramfs-linux-libre${KERNEL_NAME}-fallback.img
 }
diff --git a/libre-testing/libretools/PKGBUILD b/libre-testing/libretools/PKGBUILD
deleted file mode 100644
index 430ab93d5..000000000
--- a/libre-testing/libretools/PKGBUILD
+++ /dev/null
@@ -1,75 +0,0 @@
-# Maintainer: Joshua Haase <hahj87@gmail.com
-# Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor: fauno <fauno@kiwwwi.com.ar>
-
-pkgbase=libretools
-pkgname=(libretools libretools-mips64el)
-pkgdesc="Programs for Parabola development"
-url="https://projects.parabolagnulinux.org/packages/libretools.git/"
-license=('GPL3' 'GPL2')
-
-pkgver=20130528.2
-_libretools_commit=e5c22aaf01484e7fa5926952bbcacd56228dbb64
-_devtools_commit=d197eacf8b7aba0796a0f6ac6ac1667564bd614e
-
-_packages_url=https://projects.parabolagnulinux.org/packages
-source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.tar.bz2
-	$_packages_url/devtools-par.git/snapshot/devtools-par-$_devtools_commit.tar.bz2)
-
-pkgrel=1
-arch=('any')
-makedepends=(emacs) # emacs --batch is used during the build to process text
-checkdepends=(sh-roundup)
-
-build() {
-  cd "$srcdir"
-  ln -sf devtools-par-$_devtools_commit devtools-par
-  cd "$srcdir/$pkgbase-$_libretools_commit"
-  make build-libretools build-libretools-mips64el build-doc
-}
-
-check() {
-  cd "$srcdir/$pkgbase-$_libretools_commit"
-
-  # some tests require 'sudo'; trick those into passing
-  mkdir "$srcdir/bin"
-  ln -s $(which true) "$srcdir/bin/sudo"
-  _PATH=$PATH
-  export PATH="$srcdir/bin:$PATH"
-
-  make check
-
-  export PATH=$_PATH
-}
-
-package_libretools() {
-  backup=(etc/libretools.conf etc/libretools.d/chroot.conf etc/libretools.d/librefetch.conf)
-  install=libretools.install
-  replaces=(chroottools)
-
-  depends=(
-    arch-install-scripts # `archroot` uses `pacstrap`
-    git # `createworkdir`
-    openssh # `librerelease`
-    rsync # `librerelease` and `makechrootpkg.sh`
-    subversion # `diff-unfree`
-    tokyocabinet # `treepkg`
-    wget # `aur` and `lib/blacklist.sh`
-  )
-  optdepends=('namcap: to check package files')
-
-  cd "$srcdir/$pkgbase-$_libretools_commit"
-  make install-libretools install-doc DESTDIR="$pkgdir"
-}
-
-package_libretools-mips64el() {
-  pkgdesc="Scripts for Parabola development (for mips64el architecture)"
-  backup=('etc/libretools.d/mips64el.conf')
-  depends=("$pkgbase=$pkgver")
-
-  cd "$srcdir/$pkgbase-$_libretools_commit"
-  make install-libretools-mips64el DESTDIR="$pkgdir"
-}
-
-md5sums=('47ff5308a56dd8ae2cf18b82a99b0021'
-         '05b987e6b39c963154489ac6d01d0965')
diff --git a/libre-testing/libretools/libretools.install b/libre-testing/libretools/libretools.install
deleted file mode 100644
index ff6a238fe..000000000
--- a/libre-testing/libretools/libretools.install
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-_makepkgconf_append='[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=("libre::/usr/bin/librefetch -p \"\$BUILDFILE\" %u %o")'
-
-# arg 1:  the new package version
-post_install() {
-	if grep -q 'libre::' etc/makepkg.conf; then
-		libremessages msg2 "libretools: librefetch is already in /etc/makepkg.conf"
-	else
-		libremessages msg2 "libretools: Adding librefetch to /etc/makepkg.conf"
-		printf '%s\n' "$_makepkgconf_append" >> etc/makepkg.conf
-	fi
-}
-
-## arg 1:  the new package version
-## arg 2:  the old package version
-post_upgrade() {
-	post_install
-}
-
-pre_remove() {
-	if fgrep -q "$_makepkgconf_append" etc/makepkg.conf; then
-		libremessages msg2 "libretools: removing librefetch from /etc/makepkg.conf"
-		sed -i '/libre::/d'
-	else
-		libremessages msg2 "libretools: librefetch is not in /etc/makepkg.conf as we added it"
-	fi
-}
diff --git a/libre-testing/systemd/rePKGBUILD b/libre-testing/systemd/rePKGBUILD
index 0487320e7..8b9e59932 100644
--- a/libre-testing/systemd/rePKGBUILD
+++ b/libre-testing/systemd/rePKGBUILD
@@ -4,7 +4,7 @@
 # then please put 'unknown'.
 
 # Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
-# Maintainer: André Silva <andre.paulista@adinet.com.uy>
+# Maintainer: André Silva <emulatorman@lavabit.com>
 source PKGBUILD
 unset build package md5sums source check
 _repo=testing
diff --git a/libre/abiword-libre/PKGBUILD b/libre/abiword-libre/PKGBUILD
index 248da54c7..30ef5cec2 100644
--- a/libre/abiword-libre/PKGBUILD
+++ b/libre/abiword-libre/PKGBUILD
@@ -7,7 +7,7 @@ _pkgbase=abiword
 pkgbase=abiword-libre
 pkgname=('abiword-libre' 'abiword-libre-plugins')
 pkgver=2.8.6
-pkgrel=9
+pkgrel=9.1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.abisource.com"
diff --git a/libre/abs-libre/PKGBUILD b/libre/abs-libre/PKGBUILD
deleted file mode 100644
index 1abcd02dc..000000000
--- a/libre/abs-libre/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 134858 2011-08-08 04:45:57Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-_pkgname=abs
-pkgname=abs-libre
-#CARCH=mips64el
-pkgver=2.4.3
-pkgrel=3
-pkgdesc="Utilities to download and work with the Arch Build System (ABS)"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://projects.archlinux.org/abs.git/"
-license=('GPL')
-depends=('bash' 'rsync')
-backup=(etc/abs.conf)
-source=(ftp://ftp.archlinux.org/other/abs/${_pkgname}-${pkgver}.tar.gz)
-md5sums=('b8b46b22d2f9a2aec2c994ccf230b4fd')
-provides=("${_pkgname}=${pkgver}")
-replaces=("${_pkgname}")
-conflicts=("${_pkgname}")
-
-build() {
-  cd ${srcdir}/${_pkgname}
-
-  make prefix=/usr sysconfdir=/etc prepare
-  make DESTDIR=${pkgdir} install
-
-  # Add readme file, and make base /var/abs path
-  install -dm0755 ${pkgdir}/var/abs/local/
-  install -Dm0644 ${srcdir}/abs/README ${pkgdir}/var/abs/README
-
-  sed -i -e 's|rsync.archlinux.org|parabolagnulinux.org|' ${pkgdir}/etc/abs.conf
-  sed -i -e 's|(core|(libre !libre-testing core|' ${pkgdir}/etc/abs.conf
-
-  # make adjustments to abs.conf
-  case $CARCH in
-    "i686")
-        sed -i -e 's| multilib||' -e 's| !multilib-testing||' ${pkgdir}/etc/abs.conf
-        ;;
-    "x86_64")
-        sed -i '/ARCH=/s|i686|x86_64|' ${pkgdir}/etc/abs.conf
-        ;;
-    "mips64el")
-        sed -i -e 's| multilib||' -e 's| !multilib-testing||' ${pkgdir}/etc/abs.conf
-        sed -i '/ARCH=/s|i686|mips64el|' ${pkgdir}/etc/abs.conf
-        ;;
-  esac
-}
-
diff --git a/libre/abs-libre/abs.install b/libre/abs-libre/abs.install
deleted file mode 100644
index ac814c2fc..000000000
--- a/libre/abs-libre/abs.install
+++ /dev/null
@@ -1,13 +0,0 @@
-pre_upgrade() {
-    if [ "$(vercmp $2 2.3.2-1)" -lt 0 ]; then
-        echo "==> Fixing potential ABS tree permission issues (this may take a while...)"
-    
-        for dir in core extra community testing; do
-            if [ -d /var/abs/$dir ]; then
-                find /var/abs/$dir -type d -exec chown root:root {} \;
-                find /var/abs/$dir -type d -exec chmod 755 {} \;
-            fi
-        done
-    fi
-}
-
diff --git a/libre/abs/PKGBUILD b/libre/abs/PKGBUILD
new file mode 100644
index 000000000..f7e85d0ef
--- /dev/null
+++ b/libre/abs/PKGBUILD
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Allan McRae <allan@archlinux.org>
+
+replaces=('abs-libre')
+conflicts=('abs-libre')
+
+pkgname=abs
+pkgver=2.4.4
+pkgrel=1.1
+pkgdesc="Utilities to download and work with the Arch Build System (ABS)"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://projects.archlinux.org/abs.git/"
+license=('GPL')
+depends=('bash' 'rsync')
+backup=(etc/abs.conf)
+source=(ftp://ftp.archlinux.org/other/abs/${pkgname}-${pkgver}.tar.gz{,.sig})
+md5sums=('7258c739a93e02a4f31f114e9fc3b0ba'
+         'a628f7d5b1cd1e838366b88709690c24')
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  make
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+
+  make DESTDIR="${pkgdir}" install
+
+  # Add readme file, and make base /var/abs path
+  install -dm755 "${pkgdir}"/var/abs/local/
+  install -Dm644 README "${pkgdir}"/var/abs/README
+
+  # make adjustments to abs.conf
+  sed -i -e 's|rsync.archlinux.org|parabolagnulinux.org|' "${pkgdir}"/etc/abs.conf
+  sed -i -e 's|(core|(libre !libre-testing core|' "${pkgdir}"/etc/abs.conf
+  if [[ $CARCH != "x86_64" ]]; then
+    sed -i -e 's| multilib||' -e 's| !multilib-testing||' "${pkgdir}"/etc/abs.conf
+  fi
+  sed -i "s/ARCH=.*/ARCH=$CARCH/" "${pkgdir}"/etc/abs.conf
+}
diff --git a/libre/abuse-libre/PKGBUILD b/libre/abuse-libre/PKGBUILD
index 196fb2c85..1b7ed9072 100644
--- a/libre/abuse-libre/PKGBUILD
+++ b/libre/abuse-libre/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: jlvsimoes <jlvsimoes@oninet.pt>
 # Contributor: kevin <kevin@archlinux.org>
-# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=abuse
 pkgname=abuse-libre
diff --git a/libre/ath9k-htc-firmware/PKGBUILD b/libre/ath9k-htc-firmware/PKGBUILD
new file mode 100644
index 000000000..ad545e899
--- /dev/null
+++ b/libre/ath9k-htc-firmware/PKGBUILD
@@ -0,0 +1,123 @@
+# Maintainer: André Silva <emulatorman@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+
+pkgname=ath9k-htc-firmware
+pkgver=$(LC_ALL=C date -u +%Y%m%d)
+pkgrel=1
+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')
+license=('BSD')
+makedepends=('git' 'cmake' 'xtensa-unknown-elf-binutils' 'xtensa-unknown-elf-gcc')
+source=("git://github.com/qca/open-ath9k-htc-firmware")
+md5sums=('SKIP')
+
+prepare() {
+
+  cd $srcdir/open-ath9k-htc-firmware/target_firmware
+  mkdir -p build/{k2,magpie}
+
+}
+
+build() {
+
+  cd $srcdir/open-ath9k-htc-firmware
+
+  export CBUILD=$CHOST
+  export CHOST="xtensa-unknown-elf"
+  export CTARGET="xtensa-unknown-elf"
+  export CFLAGS="-mtext-section-literals -O2 -pipe --param=ssp-buffer-size=4"
+  export CXXFLAGS="${CFLAGS}"
+
+  export CC=/usr/bin/xtensa-unknown-elf-gcc
+  export CPP=/usr/bin/xtensa-unknown-elf-cpp
+  export AR=/usr/bin/xtensa-unknown-elf-ar
+  export AS=/usr/bin/xtensa-unknown-elf-as
+  export LD=/usr/bin/xtensa-unknown-elf-ld
+  export NM=/usr/bin/xtensa-unknown-elf-nm
+  export OBJCOPY=/usr/bin/xtensa-unknown-elf-objcopy
+  export OBJDUMP=/usr/bin/xtensa-unknown-elf-objdump
+  export RANLIB=/usr/bin/xtensa-unknown-elf-ranlib
+  export STRIP=/usr/bin/xtensa-unknown-elf-strip
+
+  cat > target_firmware/build/toolchain.cmake <<EOF
+INCLUDE(CMakeForceCompiler)
+
+SET(CMAKE_CROSSCOMPILING)
+SET(CMAKE_SYSTEM_NAME Linux)
+SET(CMAKE_SYSTEM_PROCESSOR xtensa)
+SET(CMAKE_HOST_SYSTEM_PROCESSOR xtensa)
+SET(COMPILER_PREFIX "xtensa-unknown-elf")
+SET(GNU_HOST "xtensa-unknown-elf")
+SET(CMAKE_FIND_ROOT_PATH /usr/xtensa-unknown-elf)
+SET(CMAKE_C_COMPILER /usr/bin/xtensa-unknown-elf-gcc)
+SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY FIRST)
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE FIRST)
+
+CMAKE_FORCE_C_COMPILER(/usr/bin/xtensa-unknown-elf-gcc GNU)
+EOF
+
+  cd $srcdir/open-ath9k-htc-firmware/target_firmware/build/k2
+
+  cmake -DCMAKE_TOOLCHAIN_FILE=$srcdir/open-ath9k-htc-firmware/target_firmware/build/toolchain.cmake "$@" -DTARGET_K2=ON ../..
+  cd -
+
+  cd $srcdir/open-ath9k-htc-firmware/target_firmware/build/magpie
+
+  cmake -DCMAKE_TOOLCHAIN_FILE=$srcdir/open-ath9k-htc-firmware/target_firmware/build/toolchain.cmake "$@" -DTARGET_MAGPIE=ON ../..
+  cd -
+
+  cd $srcdir/open-ath9k-htc-firmware/target_firmware
+
+  sed -i 's|/usr/bin/gcc|/usr/bin/xtensa-unknown-elf-gcc|g;
+          s|/usr/bin/cpp|/usr/bin/xtensa-unknown-elf-cpp|g;
+          s|/usr/bin/ar|/usr/bin/xtensa-unknown-elf-ar|g;
+          s|/usr/bin/as|/usr/bin/xtensa-unknown-elf-as|g;
+          s|/usr/bin/ld|/usr/bin/xtensa-unknown-elf-ld|g;
+          s|/usr/bin/nm|/usr/bin/xtensa-unknown-elf-nm|g;
+          s|/usr/bin/objcopy|/usr/bin/xtensa-unknown-elf-objcopy|g;
+          s|/usr/bin/objdump|/usr/bin/xtensa-unknown-elf-objdump|g;
+          s|/usr/bin/ranlib|/usr/bin/xtensa-unknown-elf-ranlib|g;
+          s|/usr/bin/strip|/usr/bin/xtensa-unknown-elf-strip|g;
+          s|/usr/local|/usr|g;
+         ' $(grep -rlI /usr/bin/gcc) \
+           $(grep -rlI /usr/bin/cpp) \
+           $(grep -rlI /usr/bin/ld) \
+           $(grep -rlI /usr/bin/ar) \
+           $(grep -rlI /usr/bin/as) \
+           $(grep -rlI /usr/bin/nm) \
+           $(grep -rlI /usr/bin/objcopy) \
+           $(grep -rlI /usr/bin/objdump) \
+           $(grep -rlI /usr/bin/ranlib) \
+           $(grep -rlI /usr/bin/strip) \
+           $(grep -rlI /usr/local)
+
+  make \
+    CC="${CC}" CPP="${CPP}" AR="${AR}" AS="${AS}" LD="${LD}" NM="${NM}" \
+    OBJCOPY="${OBJCOPY}" OBJDUMP="${OBJDUMP}" RANLIB="${RANLIB}" STRIP="${STRIP}" \
+    -C build/k2
+  make \
+    CC="${CC}" CPP="${CPP}" AR="${AR}" AS="${AS}" LD="${LD}" NM="${NM}" \
+    OBJCOPY="${OBJCOPY}" OBJDUMP="${OBJDUMP}" RANLIB="${RANLIB}" STRIP="${STRIP}" \
+    -C build/magpie
+
+}
+
+package() {
+
+  # create firmware folder to put the free firmware files there
+  install -d -m755 $pkgdir/usr/lib/firmware
+
+  cd $srcdir/open-ath9k-htc-firmware/target_firmware
+
+  # move firmware files to firmware folder
+  cp build/{k2,magpie}/htc_*.fw $pkgdir/usr/lib/firmware
+
+  # create license folder to put the license file there
+  install -d -m755 $pkgdir/usr/share/licenses/$pkgname
+
+  # put LICENSE.TXT from ath9k-htc firmware to license folder
+  install -m644 $srcdir/open-ath9k-htc-firmware/LICENCE.TXT $pkgdir/usr/share/licenses/$pkgname/LICENCE
+  
+}
diff --git a/libre/atool-libre/PKGBUILD b/libre/atool-libre/PKGBUILD
index ea1dfec52..0745630ad 100644
--- a/libre/atool-libre/PKGBUILD
+++ b/libre/atool-libre/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: leif_thande <leif.thande@gmail.com>
 # Contributor: tranquility <trankas@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
 _pkgname=atool
 pkgname=atool-libre
diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD
index 90d5acdaa..ee0744317 100644
--- a/libre/audacious-plugins-libre/PKGBUILD
+++ b/libre/audacious-plugins-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 177005 2013-02-04 00:31:50Z bisson $
+# $Id: PKGBUILD 189208 2013-06-29 12:06:26Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: William Rea <sillywilly@gmail.com>
@@ -8,9 +8,9 @@
 
 _pkgname=audacious-plugins
 pkgname=audacious-plugins-libre
-pkgver=3.3.4
-pkgrel=2
-pkgdesc='Plugins for Audacious without unfree plugins'
+pkgver=3.4
+pkgrel=1
+pkgdesc='Plugins for Audacious, without nonfree plugins'
 url='http://audacious-media-player.org/'
 license=('GPL' 'GPL3' 'LGPL' 'custom:BSD')
 arch=('i686' 'x86_64')
@@ -24,17 +24,17 @@ arch=('i686' 'x86_64')
 #
 # All the other custom licensed plugins I think are mostly modified BSD or ISC.
 
-provides=("audacious-plugins=$pkgver")
-replaces=("${pkgname%-libre}")
-conflicts=("${pkgname%-libre}")
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
 
 makedepends=("audacious>=${pkgver}"
-             'oss' 'alsa-lib' 'pulseaudio' 'jack2' 'lame' 'libvorbis' 'flac'
+             'oss-libre' 'alsa-lib' 'pulseaudio' 'jack2' 'lame' 'libvorbis' 'flac'
              'mpg123' 'faad2' 'ffmpeg' 'libmodplug' 'fluidsynth' 'libcdio-paranoia' 'libsidplay' 'wavpack'
-             'libnotify' 'lirc-utils' 'curl' 'libmtp'
+             'libnotify' 'lirc-utils-libre' 'curl' 'libmtp'
              'neon' 'libmms' 'libcue')
 
-optdepends=('oss: Open Sound System v4 output'
+optdepends=('oss-libre: Open Sound System v4 output'
             'alsa-lib: Advanced Linux Sound Arch. output'
             'pulseaudio: PulseAudio output'
             'jack2: Jack Audio Connection Kit output'
@@ -52,7 +52,7 @@ optdepends=('oss: Open Sound System v4 output'
             'wavpack: WavPack input'
 
             'libnotify: libnotify OSD'
-            'lirc-utils: LIRC'
+            'lirc-utils-libre: LIRC'
             'curl: AudioScrobbler Client'
             'libmtp: Upload to MTP device'
 
@@ -61,9 +61,9 @@ optdepends=('oss: Open Sound System v4 output'
             'libcue: CUE playlist format')
 
 source=("http://distfiles.audacious-media-player.org/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('6493f051417a201fc0e2de7ef36a709676f96607')
+sha1sums=('2b2f1d30f0b790e6cc3e00483ed4774b0fa1fc42')
 
-build() {
+prepare() {
 	# Retrieve upstream & remove plugin 'psf' due to issues mentioned above.
 	sed -i s/enable_psf=yes/enable_psf=no/ ${_pkgname}-$pkgver/configure
 
@@ -105,6 +105,10 @@ build() {
 	install -m644 LICENSE.voice_removal $l
 	install -m644 LICENSE.xfs $l
 	popd
+}
+
+build() {
+        cd "${srcdir}/${_pkgname}-${pkgver}"
 
 	./configure \
 		--prefix=/usr \
diff --git a/libre/audacity-libre/PKGBUILD b/libre/audacity-libre/PKGBUILD
index 6d6f287b3..610404545 100644
--- a/libre/audacity-libre/PKGBUILD
+++ b/libre/audacity-libre/PKGBUILD
@@ -1,6 +1,6 @@
 # $Id: PKGBUILD 153455 2012-03-14 17:15:15Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
-# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=audacity
 pkgname=audacity-libre
diff --git a/libre/audio-convert-libre/PKGBUILD b/libre/audio-convert-libre/PKGBUILD
index 07dc6e87c..81db4af67 100644
--- a/libre/audio-convert-libre/PKGBUILD
+++ b/libre/audio-convert-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: PKGBUILD 91081 2013-05-18 21:26:27Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Igor Galic <i.galic@gmail.com>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,8 +6,8 @@
 _pkgname=audio-convert
 pkgname=audio-convert-libre
 pkgver=0.3.1.1
-pkgrel=6
-pkgdesc="A script with an easy to use interface to convert audio files: wav, mp3, ogg, flac, aac, mpc, ape and wma (without nonfree faac recommendation)"
+pkgrel=7
+pkgdesc="A script with an easy to use interface to convert audio files: wav, mp3, ogg, flac, aac, mpc, ape and wma, without nonfree faac recommendation"
 arch=('any')
 url="http://freshmeat.net/projects/audio-convert"
 license=('GPL')
@@ -23,8 +23,11 @@ replaces=$_pkgname
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
 source=(http://savannah.nongnu.org/download/$_pkgname/$_pkgname-$pkgver.tar.bz2)
-md5sums=('0c6b61bc96be4c9879f85b000192f3fd')
+sha256sums=('7b37d5fc2a4dd62885910b6424f5ff6870c329ed4f4f51feeeb952152c7d9d2b')
 
 package() {
   install -D -m755 "$srcdir/$_pkgname-$pkgver/$_pkgname" "$pkgdir/usr/bin/$_pkgname"
+
+#FS#29260 fix
+  sed -i '46 s/^/#/' "$pkgdir/usr/bin/$_pkgname"
 }
diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD
index 2dc83cb5e..f8e66c762 100644
--- a/libre/bbswitch-libre/PKGBUILD
+++ b/libre/bbswitch-libre/PKGBUILD
@@ -7,7 +7,7 @@ _pkgname=bbswitch
 pkgname=bbswitch-libre
 pkgver=0.7
 _extramodules=extramodules-3.9-LIBRE # Don't forget to update bbswitch.install
-pkgrel=1
+pkgrel=4
 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")
@@ -25,7 +25,7 @@ build() {
   cd ${srcdir}/${_pkgname}-${pkgver}
 
   _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
-   
+
   make KDIR=/usr/src/linux-${_kernver}
 }
 
diff --git a/libre/bfgminer-libre/PKGBUILD b/libre/bfgminer-libre/PKGBUILD
index 6c6e19ef4..b37990c09 100644
--- a/libre/bfgminer-libre/PKGBUILD
+++ b/libre/bfgminer-libre/PKGBUILD
@@ -1,14 +1,15 @@
-# $Id$
+# $Id: PKGBUILD 93080 2013-06-24 09:39:28Z tredaelli $
 # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor: Andy Weidenbaum <archbaum@gmail.com>
 
 _pkgname=bfgminer
 pkgname=bfgminer-libre
-pkgver=3.0.0
+pkgver=3.1.1
 pkgrel=1
 pkgdesc="Bitcoin miner featuring overclocking, monitoring, fan speed control and remote management. For FPGA/GPU/CPU Bitcoin mining, without nonfree OpenCL recommendation."
 arch=('i686' 'x86_64' 'mips64el')
-depends=('curl' 'jansson')
+depends=('curl' 'jansson' 'libusbx' 'lm_sensors')
+makedepends=('uthash' 'yasm')
 replaces=$_pkgname
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
@@ -16,20 +17,20 @@ url='https://bitcointalk.org/index.php?topic=168174.0'
 license=('GPL3')
 options=(!libtool)
 source=(http://luke.dashjr.org/programs/bitcoin/files/$_pkgname/$pkgver/$_pkgname-$pkgver.tbz2
-        change-kernel-path.patch
         remove-dangerous-rpath.patch)
-sha256sums=('86f7f977ed57b8d61c728f88a3e5962aa1df0723d667c45b1e1bfa5152292400'
-            'a551f73a430809a9b13bb535a503d24f8fd6d35a07bc579b5616d270a1bbf369'
-            '2c6d09a5e567f5099c9b117415013bf28e7b7aa75c436515d28bc7640f905db2')
+sha256sums=('3c70b017b6c02e22864d4b597ef19608ca3221c9d2547215c5bd05418561a2a3'
+            'c47eb443b870262e3e1a5d6441a06f72c9ca06c0abae459ab577a3f289a91e7a')
 
-[[ "$CARCH" == "x86_64" ]] && makedepends+=('yasm')
+prepare() {
+  cd "$srcdir"/$_pkgname-$pkgver
+
+  patch -p0 < "${srcdir}"/remove-dangerous-rpath.patch
+  NOSUBMODULES=1 ./autogen.sh
+}
 
 build() {
   cd "$srcdir"/$_pkgname-$pkgver
 
-  patch -p0 < "${srcdir}"/change-kernel-path.patch
-  patch -p0 < "${srcdir}"/remove-dangerous-rpath.patch
-  autoreconf -fi
   ./configure --prefix=/usr --enable-cpumining --enable-scrypt
   make
 }
diff --git a/libre/bfgminer-libre/remove-dangerous-rpath.patch b/libre/bfgminer-libre/remove-dangerous-rpath.patch
index a2bcfc87b..b56cb21ba 100644
--- a/libre/bfgminer-libre/remove-dangerous-rpath.patch
+++ b/libre/bfgminer-libre/remove-dangerous-rpath.patch
@@ -1,11 +1,11 @@
---- Makefile.am.orig
-+++ Makefile.am
-@@ -38,7 +38,7 @@
- if NEED_LIBBLKMAKER
- SUBDIRS           += libblkmaker
- bfgminer_CPPFLAGS += -Ilibblkmaker
--bfgminer_LDFLAGS  += -Llibblkmaker/.libs -Wl,-rpath,libblkmaker/.libs
-+bfgminer_LDFLAGS  += -Llibblkmaker/.libs
- bfgminer_LDADD    += -lblkmaker_jansson-0.1 -lblkmaker-0.1
- 
- if HAVE_CYGWIN
+--- configure.ac.orig
++++ configure.ac
+@@ -514,7 +514,7 @@
+ 	])
+ else
+ 	libblkmaker_CFLAGS='-Ilibblkmaker'
+-	libblkmaker_LDFLAGS='-Llibblkmaker/.libs -Wl,-rpath,libblkmaker/.libs'
++	libblkmaker_LDFLAGS='-Llibblkmaker/.libs'
+ 	libblkmaker_LIBS='-lblkmaker_jansson-0.1 -lblkmaker-0.1'
+ 	AC_CONFIG_SUBDIRS([libblkmaker])
+ fi
diff --git a/libre/blackbox-libre/PKGBUILD b/libre/blackbox-libre/PKGBUILD
index c76d7cba5..1c0c49a15 100644
--- a/libre/blackbox-libre/PKGBUILD
+++ b/libre/blackbox-libre/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: durbatuluk <dvdscripter@gmail.org>
 # Contributor: Steve Ponsford <sp4d@lavabit.com>
-# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
 _pkgname=blackbox
 pkgname=${_pkgname}-libre
diff --git a/libre/blender-addon-luxrender/PKGBUILD b/libre/blender-addon-luxrender/PKGBUILD
index 6637e134c..040eeccf4 100644
--- a/libre/blender-addon-luxrender/PKGBUILD
+++ b/libre/blender-addon-luxrender/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
 
 pkgname=blender-addon-luxrender
 _pkgname=${pkgname:14:3}${pkgname::5}25
diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
index f226b76fd..e9dbc1f62 100644
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -11,7 +11,7 @@ else
   _spndesc=''
 fi
 epoch=8
-pkgver=2.67a
+pkgver=2.67b
 _jpgver=1.5
 _pyver=3.3
 pkgrel=1
@@ -59,10 +59,10 @@ conflicts=${_pkgname%-$_pkgflag}
 replaces=${_pkgname%-$_pkgflag}
 install=$_pkgname.install
 source=http://download.${_pkgname%-$_pkgflag}.org/source/${_pkgname%-$_pkgflag}-$pkgver.tar.gz
-sha512sums=1336ed00ab51c581ab5b8ef6ace04b3684290b287745de3260e4072e3527501bf62472057c4c521533678b2529b7d0c2dca93d0ca3854e29d82443a78d5c4061
+sha512sums=d9b24219770e51aac76a15cb6db486835d389e27a89d1ce890da0f0a30f3f76a070ddd9c21e739df93e7f4a670a6b3de993a6f56696983bf466be9c14e906525
 
 prepare() {
-  mkdir cd $srcdir/${_pkgname%-$_pkgflag}-$pkgver/build
+  mkdir $srcdir/${_pkgname%-$_pkgflag}-$pkgver/build
 }
 
 build() {
@@ -70,7 +70,7 @@ build() {
 
   [[ $CARCH == i686 ]] && DSUPPORT_SSE2_BUILD='-DSUPPORT_SSE2_BUILD=OFF'
 
-  setarch $CARCH cmake ..\
+  cmake ..\
     -DCMAKE_BUILD_TYPE=Release\
     -DCMAKE_INSTALL_PREFIX=/usr\
     -DOPENIMAGEIO_ROOT_DIR=/usr\
@@ -96,16 +96,15 @@ build() {
     -DWITH_PYTHON_INSTALL=OFF\
     -DWITH_SYSTEM_GLEW=ON
 
-  setarch $CARCH make $MAKEFLAGS
-  setarch $CARCH make
+  make $MAKEFLAGS
+  make
 }
 
 package() {
   cd $srcdir/${_pkgname%-$_pkgflag}-$pkgver/build
-  setarch $CARCH make DESTDIR=$pkgdir install
-  setarch $CARCH python -m compileall $pkgdir/usr/share/${_pkgname%-$_pkgflag}
-  # drop nonfree povray render support
-  rm -vrf $pkgdir/usr/share/${_pkgname%-$_pkgflag}/${pkgver::4}/scripts/addons/render_povray
+  make DESTDIR=$pkgdir install
+  rm -vrf $pkgdir/usr/share/${_pkgname%-$_pkgflag}/${pkgver::4}/scripts/addons/render_povray # drop nonfree povray render support
+  python -m compileall $pkgdir/usr/share/${_pkgname%-$_pkgflag} || return 0
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/libre/bogofilter-libre/PKGBUILD b/libre/bogofilter-libre/PKGBUILD
index c5718a9fd..42a33a113 100644
--- a/libre/bogofilter-libre/PKGBUILD
+++ b/libre/bogofilter-libre/PKGBUILD
@@ -1,33 +1,29 @@
-# $Id: PKGBUILD 146459 2012-01-11 15:21:47Z stephane $
+# $Id: PKGBUILD 183193 2013-04-18 17:14:00Z andyrtr $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Low Kian Seong <fastmail_low@speedymail.org>
 
 _pkgname=bogofilter
 pkgname=bogofilter-libre
-pkgver=1.2.2
-pkgrel=5
-pkgdesc="A fast Bayesian spam filtering tool"
+pkgver=1.2.3
+pkgrel=1
+pkgdesc="A fast Bayesian spam filtering tool, without noncommercial files"
 arch=('i686' 'x86_64')
 license=('GPL3')
 url="http://bogofilter.sourceforge.net"
 depends=('db' 'perl' 'gsl')
 backup=('etc/bogofilter/bogofilter.cf')
-source=(http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz)
-md5sums=('af9c7857c66b1884c820f54f23082701')
+source=(http://sourceforge.net/projects/${_pkgname}/files/${_pkgname}-current/${_pkgname}-${pkgver}/${_pkgname}-${pkgver}.tar.bz2)
+md5sums=('c3ed7f483b83abcbf6d8c797084bd06e')
 provides=("${_pkgname}=${pkgver}")
 replaces=("${_pkgname}")
 conflicts=("${_pkgname}")
 
-mksource() {
-    [ -f ${_pkgname}-${pkgver}.tar.bz2 ] || wget http://sourceforge.net/projects/${_pkgname}/files/${_pkgname}-current/${_pkgname}-${pkgver}/${_pkgname}-${pkgver}.tar.bz2
-    tar xf ${_pkgname}-${pkgver}.tar.bz2
-    # Remove noncommercial files.
-    rm ${_pkgname}-${pkgver}/doc/bogofilter-SA-{2005-0{1,2},2010-01}
-    tar cJf ${pkgname}-${pkgver}.tar.xz ${_pkgname}-${pkgver}
-}
-
 build() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
+
+  # Remove noncommercial files.
+  rm doc/bogofilter-SA-{2005-0{1,2},2010-01}
+
   ./configure --prefix=/usr \
               --sysconfdir=/etc/bogofilter  \
               --localstatedir=/var \
diff --git a/libre/bumblebee-libre/PKGBUILD b/libre/bumblebee-libre/PKGBUILD
index a7b9ad140..3f43d26c9 100644
--- a/libre/bumblebee-libre/PKGBUILD
+++ b/libre/bumblebee-libre/PKGBUILD
@@ -4,7 +4,7 @@
 _pkgname=bumblebee
 pkgname=bumblebee-libre
 pkgver=3.2.1
-pkgrel=1
+pkgrel=3
 pkgdesc="NVIDIA Optimus support for GNU/Linux through VirtualGL, without nonfree nvidia driver support"
 arch=('i686' 'x86_64')
 depends=('virtualgl' 'glib2' 'mesa-libgl')
@@ -47,6 +47,7 @@ build() {
     ./configure \
         CONF_DRIVER=nouveau \
         --prefix=/usr \
+        --sbindir=/usr/bin \
         --sysconfdir=/etc \
         --without-pidfile
 
@@ -60,6 +61,7 @@ package() {
 
     # Install systemd unit
     install -D -m644 "scripts/systemd/bumblebeed.service" "${pkgdir}/usr/lib/systemd/system/bumblebeed.service"    
+    sed -i "s/sbin/bin/" "${pkgdir}/usr/lib/systemd/system/bumblebeed.service"
 
     # Make bash_completion work
     mv -v "${pkgdir}/etc/bash_completion.d/bumblebee" "${pkgdir}/etc/bash_completion.d/optirun"
diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD
index f7dfe3489..339969ba1 100644
--- a/libre/calibre-libre/PKGBUILD
+++ b/libre/calibre-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 91579 2013-05-24 14:55:19Z dwallace $
+# $Id: PKGBUILD 93260 2013-06-30 12:27:03Z 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=0.9.32
+pkgver=0.9.37
 pkgrel=1
 pkgdesc="Ebook management application, with unar support included and nonfree fonts removed"
 arch=('i686' 'x86_64' 'mips64el') 
@@ -19,7 +19,7 @@ depends=('python2-six' 'python2-dateutil' 'python2-cssutils' 'python2-cherrypy'
          'python2-mechanize' 'podofo' 'libwmf' 'python2-beautifulsoup3' 
          'imagemagick' 'poppler-qt' 'chmlib' 'python2-lxml' 'libusbx' 
          'python2-imaging' 'shared-mime-info' 'python2-dnspython' 
-         'unar' 'python2-pyqt' 'python2-psutil' 'icu' 'libmtp' 
+         'unar' 'python2-pyqt4' 'python2-psutil' 'icu' 'libmtp' 
          'python2-netifaces' 'python2-cssselect')
 makedepends=('python2-pycountry' 'qt4-private-headers')
 optdepends=('ipython2: to use calibre-debug')
@@ -27,14 +27,13 @@ replaces=$_pkgname
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
 install=calibre.install
-source=("http://calibre-ebook.googlecode.com/files/${_pkgname}-${pkgver}.tar.xz"
+source=("http://sourceforge.net/projects/calibre/files/${pkgver}/calibre-${pkgver}.tar.xz"
         'desktop_integration.patch'
         'calibre-mount-helper')
-md5sums=('3b1c89a84872df900b9cfb706027df67'
+md5sums=('76db2eb11fe51d85ae9121203defb677'
          '8353d1878c5a498b3e49eddef473605f'
          '675cd87d41342119827ef706055491e7')
 
-
 prepare(){
   cd "${srcdir}/${_pkgname}"
   #rm -rf src/{cherrypy,pyPdf}
@@ -60,7 +59,9 @@ build() {
 
   LANG='en_US.UTF-8' python2 setup.py build
   # LANG='en_US.UTF-8' python2 setup.py resources
-  LANG='en_US.UTF-8' python2 setup.py translations
+
+  # Don't build translations since building them is broken badly
+#LANG='en_US.UTF-8' python2 setup.py translations
 }
 
 package() {
diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD
index 8ea0dbba7..518e25312 100644
--- a/libre/cdfs-libre/PKGBUILD
+++ b/libre/cdfs-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 91714 2013-05-26 15:39:48Z tpowa $
+# $Id: PKGBUILD 93210 2013-06-28 18:33:45Z foutrelis $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: J. Santiago Hirschfeld <jsantiagoh@yahoo.com.ar>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -7,7 +7,7 @@ _pkgname=cdfs
 pkgname=cdfs-libre
 pkgver=2.6.27
 _extramodules=extramodules-3.9-LIBRE # Don't forget to update cdfs.install
-pkgrel=45
+pkgrel=48
 pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files (built for the linux-libre kernel package)"
 arch=(i686 x86_64 mips64el)
 url="http://www.elis.UGent.be/~ronsse/cdfs/"
diff --git a/libre/cdrkit-libre/PKGBUILD b/libre/cdrkit-libre/PKGBUILD
index af8125f1f..75cf2c1bd 100644
--- a/libre/cdrkit-libre/PKGBUILD
+++ b/libre/cdrkit-libre/PKGBUILD
@@ -5,7 +5,7 @@
 _pkgname=cdrkit
 pkgname=cdrkit-libre
 pkgver=1.1.11
-pkgrel=2.4
+pkgrel=3
 pkgdesc="Suite of programs for CD/DVD recording, ISO image creation, and audio CD extraction (without nonfree apple_driver utility)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cdrkit.org/"
@@ -19,11 +19,16 @@ replaces=('cdrkit' 'cdrtools')
 source=(http://cdrkit.org/releases/$_pkgname-$pkgver.tar.gz)
 md5sums=('efe08e2f3ca478486037b053acd512e9')
 
-build() {
+prepare() {
   cd "$srcdir/$_pkgname-$pkgver"
+  sed -i "s#sbin#bin#" netscsid/CMakeLists.txt
 
   # Remove nonfree apple_driver utility
   rm -rvf {doc/genisoimage/README.hfs_boot,genisoimage/apple_driver.{c,8}}
+}
+
+build() {
+  cd "$srcdir/$_pkgname-$pkgver"
 
   make
 }
diff --git a/libre/cgminer-libre/PKGBUILD b/libre/cgminer-libre/PKGBUILD
index 575ea2d55..0fb3b9116 100644
--- a/libre/cgminer-libre/PKGBUILD
+++ b/libre/cgminer-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90344 2013-05-11 16:51:20Z fyan $
+# $Id: PKGBUILD 93146 2013-06-26 07:01:43Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: monson <holymonson@gmail.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
@@ -7,7 +7,7 @@
 
 pkgname=cgminer-libre
 _pkgflag=libre
-pkgver=3.1.1
+pkgver=3.3.1
 pkgrel=1
 pkgdesc="Multi-threaded multi-pool GPU, FPGA and ASIC miner for bitcoin and derivative coins, without nonfree OpenCL recommendation"
 url='http://forum.bitcoin.org/index.php?topic=28402.0'
@@ -18,7 +18,7 @@ makedepends=('opencl-headers')
 provides=(${pkgname%-$_pkgflag}=$pkgver)
 conflicts=${pkgname%-$_pkgflag}
 replaces=${pkgname%-$_pkgflag}
-source=("https://github.com/ckolivas/${pkgname%-$_pkgflag}/archive/v$pkgver.tar.gz"
+source=("http://ck.kolivas.org/apps/${pkgname%-$_pkgflag}/${pkgname%-$_pkgflag}-${pkgver}.tar.bz2"
         "${pkgname%-$_pkgflag}.conf.d"
         "${pkgname%-$_pkgflag}.service")
 backup=("etc/conf.d/${pkgname%-$_pkgflag}" "etc/${pkgname%-$_pkgflag}.conf")
@@ -34,7 +34,7 @@ build() {
   # Here you may want to use custom CFLAGS
   #export CFLAGS="-O2 -march=native -mtune=native -msse2"
   
-  ./autogen.sh
+  #./autogen.sh
   ./configure --prefix=/usr --enable-scrypt --disable-adl
   
   make
@@ -51,6 +51,6 @@ package() {
   install -Dm644 ${pkgname%-$_pkgflag}.conf "$pkgdir"/etc/${pkgname%-$_pkgflag}.conf
 }
 
-sha512sums=('f95db6ab14fe35ed19c1af152c6eb979787e966afad250252053bf11abe8293dfe857a7a2abfd9e33b60a190b310193a03151eb67a9db255a2a929660278ad62'
-            '99c38bc395848f9712ce172343d31f5c60f5d8ac1cfe2f48df8f3ec6c488fc275763a79c5ef36b99f32faa465b5a65284b38e8a63ef9b144075ee13971313b41'
-            '3317b60c6b1f14c47d8ee636113ef40a4023ab14054129de80a37947b381fd2b647a7053f4e1bb639efa225a514e862fa531908714c34040dda2d6221dde7f5f')
+md5sums=('1e6ccf16c4695fc086581bbb95923abe'
+         'fe4a243fabe24608f5c05e40f0f118f6'
+         'bd76fc92fedce18c59ccea2aa79cc664')
diff --git a/libre/claws-mail-libre/PKGBUILD b/libre/claws-mail-libre/PKGBUILD
index e37ffe283..d9a171e10 100644
--- a/libre/claws-mail-libre/PKGBUILD
+++ b/libre/claws-mail-libre/PKGBUILD
@@ -1,22 +1,23 @@
-# $Id$
+# $Id: PKGBUILD 188143 2013-06-10 13:35:31Z bpiotrowski $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
 pkgname=claws-mail-libre
 _pkgflag=libre
 _pkgname=${pkgname%-$_pkgflag}
-pkgver=3.9.1
-pkgrel=3
+pkgver=3.9.2
+pkgrel=1
 pkgdesc='A GTK+ based e-mail client, without nonfree PalmOS handheld devices support'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
 url="http://www.$_pkgname.org"
 depends=('gtk2' 'gnutls' 'startup-notification' 'enchant'
          'gpgme' 'libetpan>=1.1' 'libsm' 'db' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils')
-makedepends=('compface' 'spamassassin' 'bogofilter' 'valgrind' 
+makedepends=('compface' 'spamassassin' 'bogofilter'
              # dependencies for plugins
              'libsoup' 'libgdata' 'webkitgtk2' 'libnotify' 'libcanberra' 'poppler-glib' 'pygtk') 
              #'libchamplain' needed for geolocation plugin, disabled for now - most time it's not compatible with current gnome releases
+[ "$CARCH" != "mips64el" ] && makedepends+=('valgrind')
 optdepends=('python2:           needed for some tools and python plugin'
             'perl:              needed for some tools and perl plugin'
             'spamassassin:      adds support for spamfiltering'
@@ -39,7 +40,7 @@ provides=("$_pkgname=$pkgver" 'claws')
 options=(!libtool)
 install=$_pkgname.install
 source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/$_pkgname-$pkgver.tar.bz2{,.asc})
-md5sums=('8adc734912ff1b83545cb12850100473'
+md5sums=('90de2a265e65fbd9dffdbf428bb0ee28'
          'SKIP')
 
 build() {
@@ -50,7 +51,7 @@ build() {
   sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py
   sed -i 's:python -c:python2 -c:g' configure
 
-  setarch $CARCH ./configure --prefix=/usr --disable-static \
+  ./configure --prefix=/usr --disable-static \
     --enable-enchant \
     --enable-gnutls \
     --enable-ldap \
@@ -60,16 +61,16 @@ build() {
     --enable-bogofilter-plugin \
     --enable-jpilot \
     #--help
-  setarch $CARCH make
+  make
 }
 
 package() {
   cd $srcdir/$_pkgname-$pkgver
-  setarch $CARCH make DESTDIR=$pkgdir install
+  make DESTDIR=$pkgdir install
 
   # build and install extra tools
   cd tools
-  setarch $CARCH make
+  make
    # all executables and .conf files ; only top directory
   find -maxdepth 1 -type f -and -perm /111 -or -name '*.conf' | while read i ; do
     install -D -m755 $i $pkgdir/usr/lib/$_pkgname/tools/$i
diff --git a/libre/claws-mail-libre/claws-mail.install b/libre/claws-mail-libre/claws-mail.install
index 94313db3a..4d2f155d4 100644
--- a/libre/claws-mail-libre/claws-mail.install
+++ b/libre/claws-mail-libre/claws-mail.install
@@ -1,5 +1,5 @@
 post_install() {
-  echo "install \"html2ps\" from AUR to add support for printing html mails together with html plugins"
+  echo "install \"html2ps\" from AUR to add support for printing html mails with fancy plugin"
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
   update-desktop-database -q
 }
@@ -13,3 +13,4 @@ post_remove() {
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
   update-desktop-database -q
 }
+
diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD
index 517ff84ef..bb17e745b 100644
--- a/libre/cups-filters-libre/PKGBUILD
+++ b/libre/cups-filters-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 185774 2013-05-18 15:32:58Z andyrtr $
+# $Id: PKGBUILD 188974 2013-06-27 14:08:06Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=cups-filters-libre
 _pkgname=cups-filters
-pkgver=1.0.34
-pkgrel=4
+pkgver=1.0.35
+pkgrel=1
 pkgdesc="OpenPrinting CUPS Filters, without foomatic-db-nonfree recommendation"
 arch=('i686' 'x86_64')
 url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting"
@@ -19,7 +19,7 @@ backup=(etc/fonts/conf.d/99pdftoopvp.conf
 options=(!libtool)
 source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz
         cups-browsed.service)
-md5sums=('fea9cad6bbb14ab0635243ed5d1d5c77'
+md5sums=('26f150f1e9ce1f7b0f38ae4ebb01e23d'
          '9ef68d7c2a84713fd421f4e87dec0a6e')
 replaces=("${_pkgname}")
 conflicts=("${_pkgname}")
diff --git a/libre/distcc-nozeroconf/PKGBUILD b/libre/distcc-nozeroconf/PKGBUILD
new file mode 100644
index 000000000..2537b2f87
--- /dev/null
+++ b/libre/distcc-nozeroconf/PKGBUILD
@@ -0,0 +1,59 @@
+# $Id: PKGBUILD 90657 2013-05-13 14:21:37Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Judd Vinet <jvinet@zeroflux.org>
+# Contributor: Giovanni Scafora <giovanni@archlinux.org>
+
+_pkgname=distcc
+pkgname=distcc-nozeroconf
+pkgver=3.1
+provides=("$_pkgname=$pkgver")
+conflicts=("$_pkgname")
+pkgrel=11
+pkgdesc="A distributed C, C++, Obj C compiler (without zeroconf support)"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/distcc/"
+license=('GPL')
+depends=('gcc' 'popt')
+makedepends=('gtk2' 'pkgconfig' 'python2')
+optdepends=('gtk2: for distccmon-gnome'
+	    'python2')
+backup=('etc/conf.d/distccd'
+	'etc/distcc/hosts')
+source=(http://distcc.googlecode.com/files/${_pkgname}-${pkgver}.tar.bz2
+	distccd.conf.d
+	distccd.service)
+md5sums=('a1a9d3853df7133669fffec2a9aab9f3'
+         '239aae53250e3e35288cba566bc0bbf1'
+         '09f0688da9c1840e518d2593bd5c3830')
+
+build() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+
+  [ -f Makefile ] || PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
+	--with-gtk \
+	--sysconfdir=/etc \
+	--mandir=/usr/share/man \
+	--without-avahi
+
+  make WERROR_CFLAGS= INCLUDESERVER_PYTHON=/usr/bin/python2
+}
+
+check() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+#  make TEST_PYTHON=/usr/bin/python2 check
+}
+
+package() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}/" INCLUDESERVER_PYTHON=/usr/bin/python2 install
+  install -D -m644 ${srcdir}/distccd.conf.d ${pkgdir}/etc/conf.d/distccd
+
+  install -d ${pkgdir}/usr/lib/${_pkgname}/bin
+  ln -sf /usr/bin/${_pkgname} ${pkgdir}/usr/lib/${_pkgname}/bin/cc
+  ln -sf /usr/bin/${_pkgname} ${pkgdir}/usr/lib/${_pkgname}/bin/gcc
+  ln -sf /usr/bin/${_pkgname} ${pkgdir}/usr/lib/${_pkgname}/bin/g++
+  ln -sf /usr/bin/${_pkgname} ${pkgdir}/usr/lib/${_pkgname}/bin/c++
+  ln -sf /usr/bin/${_pkgname} ${pkgdir}/usr/lib/${_pkgname}/bin/cpp
+
+  install -Dm0644 $srcdir/distccd.service $pkgdir/usr/lib/systemd/system/distccd.service
+}
diff --git a/libre/distcc-nozeroconf/distccd.conf.d b/libre/distcc-nozeroconf/distccd.conf.d
new file mode 100644
index 000000000..2fe7a4cc6
--- /dev/null
+++ b/libre/distcc-nozeroconf/distccd.conf.d
@@ -0,0 +1,7 @@
+#
+# Parameters to be passed to distccd
+#
+# You must explicitly add IPs (or subnets) that are allowed to connect,
+# using the --allow switch.  See the distccd manpage for more info.
+#
+DISTCC_ARGS="--allow 127.0.0.1"
diff --git a/libre/distcc-nozeroconf/distccd.service b/libre/distcc-nozeroconf/distccd.service
new file mode 100644
index 000000000..0b72fecc3
--- /dev/null
+++ b/libre/distcc-nozeroconf/distccd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=A distributed C/C++ compiler
+Documentation=man:distccd(1)
+After=network.target
+
+[Service]
+User=nobody
+EnvironmentFile=/etc/conf.d/distccd
+ExecStart=/usr/bin/distccd --no-detach --daemon $DISTCC_ARGS
+
+[Install]
+WantedBy=multi-user.target
diff --git a/libre/django13/PKGBUILD b/libre/django13/PKGBUILD
deleted file mode 100644
index 554acccc7..000000000
--- a/libre/django13/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id$
-# Maintainer: Dan McGee <dan@archlinux.org>
-# Contributor: Shahar Weiss <sweiss4@gmx.net>
-
-pkgname=django
-pkgver=1.3.1
-pkgrel=2
-pkgdesc="A high-level Python Web framework."
-arch=('any')
-license=('BSD')
-url="http://www.djangoproject.com/"
-depends=('python2')
-makedepends=('python2-distribute')
-optdepends=('mysql-python: for MySQL backend'
-            'python2-psycopg2: for PostgreSQL backend')
-source=("https://www.djangoproject.com/m/releases/1.3/Django-$pkgver.tar.gz"
-        diff-django_branches_releases_1.3.X-from-16768-to-17460.diff)
-md5sums=('62d8642fd06b9a0bf8544178f8500767'
-         'd09d8f9e156b9aa1b580a1b43209b99f')
-sha256sums=('af9118c4e8a063deb0b8cda901fcff2b805e7cf496c93fd43507163f3cde156b'
-            '8e08b5b5bbe7c042a1df4d5615a9d068ec6718fd00bef627c0a9a9e48ee58c15')
-
-build() {
-  cd "$srcdir/Django-$pkgver"
-  patch -Np1 -i ../diff-django_branches_releases_1.3.X-from-16768-to-17460.diff
-  python2 setup.py build
-}
-
-package() {
-  cd "$srcdir/Django-$pkgver"
-  python2 setup.py install --root="$pkgdir" --optimize=1
-
-  install -Dm644 extras/django_bash_completion \
-    "$pkgdir"/etc/bash_completion.d/django
-
-  find "$pkgdir"/usr/lib/python2.7/site-packages/django/ -name '*.py' | \
-    xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|"
-
-  install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
-
-_pkgname=$pkgname
-pkgname=django13
-pkgdesc+=" (legacy version for ParabolaWeb)"
-pkgrel+=.1
-provides=("$_pkgname=$pkgver")
-conflicts=("$_pkgname")
diff --git a/libre/django13/PKGBUILD.orig b/libre/django13/PKGBUILD.orig
deleted file mode 100644
index c593c5626..000000000
--- a/libre/django13/PKGBUILD.orig
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: Dan McGee <dan@archlinux.org>
-# Contributor: Shahar Weiss <sweiss4@gmx.net>
-
-pkgname=django
-pkgver=1.3.1
-pkgrel=2
-pkgdesc="A high-level Python Web framework."
-arch=('any')
-license=('BSD')
-url="http://www.djangoproject.com/"
-depends=('python2')
-makedepends=('python2-distribute')
-optdepends=('mysql-python: for MySQL backend'
-            'python2-psycopg2: for PostgreSQL backend')
-source=("http://media.djangoproject.com/releases/1.3/Django-$pkgver.tar.gz"
-        diff-django_branches_releases_1.3.X-from-16771-to-17460.diff)
-md5sums=('62d8642fd06b9a0bf8544178f8500767'
-         'ea3d6cbde2fc2332ffe7f901cb60a974')
-sha256sums=('af9118c4e8a063deb0b8cda901fcff2b805e7cf496c93fd43507163f3cde156b'
-            '84e2652a8249e58fdbbd43bce7cd8d6bb2159058be6a675ebe15661ca3ee9ffc')
-
-build() {
-  cd "$srcdir/Django-$pkgver"
-  patch -Np0 < ../diff-django_branches_releases_1.3.X-from-16771-to-17460.diff
-  python2 setup.py build
-}
-
-package() {
-  cd "$srcdir/Django-$pkgver"
-  python2 setup.py install --root="$pkgdir" --optimize=1
-
-  install -Dm644 extras/django_bash_completion \
-    "$pkgdir"/etc/bash_completion.d/django
-
-  find "$pkgdir"/usr/lib/python2.7/site-packages/django/ -name '*.py' | \
-    xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|"
-
-  install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/libre/django13/diff-django_branches_releases_1.3.X-from-16768-to-17460.diff b/libre/django13/diff-django_branches_releases_1.3.X-from-16768-to-17460.diff
deleted file mode 100644
index c6819c1ab..000000000
--- a/libre/django13/diff-django_branches_releases_1.3.X-from-16768-to-17460.diff
+++ /dev/null
@@ -1,1573 +0,0 @@
-diff --git a/README b/README
-index c7d225c..47bfd33 100644
---- a/README
-+++ b/README
-@@ -28,7 +28,7 @@ http://code.djangoproject.com/newticket
- To get more help:
- 
-     * Join the #django channel on irc.freenode.net. Lots of helpful people
--      hang out there. Read the archives at http://botland.oebfare.com/logger/django/.
-+      hang out there. Read the archives at http://django-irc-logs.com/.
- 
-     * Join the django-users mailing list, or read the archives, at
-       http://groups.google.com/group/django-users.
-diff --git a/django/contrib/admin/media/css/forms.css b/django/contrib/admin/media/css/forms.css
-index 1cedf24..35d0ed7 100644
---- a/django/contrib/admin/media/css/forms.css
-+++ b/django/contrib/admin/media/css/forms.css
-@@ -352,9 +352,3 @@ fieldset.monospace textarea {
- .empty-form {
-     display: none;
- }
--
--/* IE7 specific bug fixes */
--
--.submit-row input {
--    float: right;
--}
-\ No newline at end of file
-diff --git a/django/contrib/gis/db/backends/spatialite/compiler.py b/django/contrib/gis/db/backends/spatialite/compiler.py
-deleted file mode 100644
-index 3f81ae6..0000000
---- a/django/contrib/gis/db/backends/spatialite/compiler.py
-+++ /dev/null
-@@ -1,32 +0,0 @@
--from django.db.backends.util import typecast_timestamp
--from django.db.models.sql import compiler
--from django.db.models.sql.constants import MULTI
--from django.contrib.gis.db.models.sql.compiler import GeoSQLCompiler as BaseGeoSQLCompiler
--
--SQLCompiler = compiler.SQLCompiler
--
--class GeoSQLCompiler(BaseGeoSQLCompiler, SQLCompiler):
--    pass
--
--class SQLInsertCompiler(compiler.SQLInsertCompiler, GeoSQLCompiler):
--    pass
--
--class SQLDeleteCompiler(compiler.SQLDeleteCompiler, GeoSQLCompiler):
--    pass
--
--class SQLUpdateCompiler(compiler.SQLUpdateCompiler, GeoSQLCompiler):
--    pass
--
--class SQLAggregateCompiler(compiler.SQLAggregateCompiler, GeoSQLCompiler):
--    pass
--
--class SQLDateCompiler(compiler.SQLDateCompiler, GeoSQLCompiler):
--    """
--    This is overridden for GeoDjango to properly cast date columns, see #16757.
--    """
--    def results_iter(self):
--        offset = len(self.query.extra_select)
--        for rows in self.execute_sql(MULTI):
--            for row in rows:
--                date = typecast_timestamp(str(row[offset]))
--                yield date
-diff --git a/django/contrib/gis/db/backends/spatialite/creation.py b/django/contrib/gis/db/backends/spatialite/creation.py
-index c107d96..ee5f9db 100644
---- a/django/contrib/gis/db/backends/spatialite/creation.py
-+++ b/django/contrib/gis/db/backends/spatialite/creation.py
-@@ -56,14 +56,6 @@ class SpatiaLiteCreation(DatabaseCreation):
-             interactive=False,
-             database=self.connection.alias)
- 
--        # One effect of calling syncdb followed by flush is that the id of the
--        # default site may or may not be 1, depending on how the sequence was
--        # reset.  If the sites app is loaded, then we coerce it.
--        from django.db.models import get_model
--        Site = get_model('sites', 'Site')
--        if Site is not None and Site.objects.using(self.connection.alias).count() == 1:
--            Site.objects.using(self.connection.alias).update(id=settings.SITE_ID)
--
-         from django.core.cache import get_cache
-         from django.core.cache.backends.db import BaseDatabaseCache
-         for cache_alias in settings.CACHES:
-diff --git a/django/contrib/gis/db/backends/spatialite/operations.py b/django/contrib/gis/db/backends/spatialite/operations.py
-index 1dc612c..e6f8409 100644
---- a/django/contrib/gis/db/backends/spatialite/operations.py
-+++ b/django/contrib/gis/db/backends/spatialite/operations.py
-@@ -48,7 +48,7 @@ def get_dist_ops(operator):
-     return (SpatiaLiteDistance(operator),)
- 
- class SpatiaLiteOperations(DatabaseOperations, BaseSpatialOperations):
--    compiler_module = 'django.contrib.gis.db.backends.spatialite.compiler'
-+    compiler_module = 'django.contrib.gis.db.models.sql.compiler'
-     name = 'spatialite'
-     spatialite = True
-     version_regex = re.compile(r'^(?P<major>\d)\.(?P<minor1>\d)\.(?P<minor2>\d+)')
-diff --git a/django/contrib/gis/db/models/sql/compiler.py b/django/contrib/gis/db/models/sql/compiler.py
-index 782ce78..405a000 100644
---- a/django/contrib/gis/db/models/sql/compiler.py
-+++ b/django/contrib/gis/db/models/sql/compiler.py
-@@ -1,7 +1,7 @@
- from itertools import izip
--from django.db.backends.util import truncate_name
-+from django.db.backends.util import truncate_name, typecast_timestamp
- from django.db.models.sql import compiler
--from django.db.models.sql.constants import TABLE_NAME
-+from django.db.models.sql.constants import TABLE_NAME, MULTI
- from django.db.models.sql.query import get_proxied_model
- 
- SQLCompiler = compiler.SQLCompiler
-@@ -194,7 +194,7 @@ class GeoSQLCompiler(compiler.SQLCompiler):
-             # We resolve the rest of the columns if we're on Oracle or if
-             # the `geo_values` attribute is defined.
-             for value, field in map(None, row[index_start:], fields):
--                values.append(self.query.convert_values(value, field, connection=self.connection))
-+                values.append(self.query.convert_values(value, field, self.connection))
-         else:
-             values.extend(row[index_start:])
-         return tuple(values)
-@@ -275,4 +275,24 @@ class SQLAggregateCompiler(compiler.SQLAggregateCompiler, GeoSQLCompiler):
-     pass
- 
- class SQLDateCompiler(compiler.SQLDateCompiler, GeoSQLCompiler):
--    pass
-+    """
-+    This is overridden for GeoDjango to properly cast date columns, since
-+    `GeoQuery.resolve_columns` is used for spatial values.
-+    See #14648, #16757.
-+    """
-+    def results_iter(self):
-+        if self.connection.ops.oracle:
-+            from django.db.models.fields import DateTimeField
-+            fields = [DateTimeField()]
-+        else:
-+            needs_string_cast = self.connection.features.needs_datetime_string_cast
-+
-+        offset = len(self.query.extra_select)
-+        for rows in self.execute_sql(MULTI):
-+            for row in rows:
-+                date = row[offset]
-+                if self.connection.ops.oracle:
-+                    date = self.resolve_columns(row, fields)[offset]
-+                elif needs_string_cast:
-+                    date = typecast_timestamp(str(date))
-+                yield date
-diff --git a/django/contrib/gis/tests/relatedapp/fixtures/initial_data.json.gz b/django/contrib/gis/tests/relatedapp/fixtures/initial_data.json.gz
-index 68bf54c..8937637 100644
-Binary files a/django/contrib/gis/tests/relatedapp/fixtures/initial_data.json.gz and b/django/contrib/gis/tests/relatedapp/fixtures/initial_data.json.gz differ
-diff --git a/django/contrib/gis/tests/relatedapp/models.py b/django/contrib/gis/tests/relatedapp/models.py
-index 2e9a62b..aec4e15 100644
---- a/django/contrib/gis/tests/relatedapp/models.py
-+++ b/django/contrib/gis/tests/relatedapp/models.py
-@@ -36,6 +36,7 @@ class Parcel(models.Model):
- # These use the GeoManager but do not have any geographic fields.
- class Author(models.Model):
-     name = models.CharField(max_length=100)
-+    dob = models.DateField()
-     objects = models.GeoManager()
- 
- class Article(models.Model):
-diff --git a/django/contrib/gis/tests/relatedapp/tests.py b/django/contrib/gis/tests/relatedapp/tests.py
-index 250783b..1a6197c 100644
---- a/django/contrib/gis/tests/relatedapp/tests.py
-+++ b/django/contrib/gis/tests/relatedapp/tests.py
-@@ -1,3 +1,4 @@
-+from datetime import date
- from django.test import TestCase
- 
- from django.contrib.gis.geos import GEOSGeometry, Point, MultiPoint
-@@ -281,4 +282,11 @@ class RelatedGeoModelTest(TestCase):
-         # evaluated as list generation swallows TypeError in CPython.
-         sql = str(qs.query)
- 
-+    def test16_annotated_date_queryset(self):
-+        "Ensure annotated date querysets work if spatial backend is used.  See #14648."
-+        birth_years = [dt.year for dt in 
-+                       list(Author.objects.annotate(num_books=Count('books')).dates('dob', 'year'))]
-+        birth_years.sort()
-+        self.assertEqual([1950, 1974], birth_years)
-+
-     # TODO: Related tests for KML, GML, and distance lookups.
-diff --git a/django/contrib/sites/management.py b/django/contrib/sites/management.py
-index 1987274..9bf5a14 100644
---- a/django/contrib/sites/management.py
-+++ b/django/contrib/sites/management.py
-@@ -3,15 +3,34 @@ Creates the default Site object.
- """
- 
- from django.db.models import signals
-+from django.db import connections
-+from django.db import router
- from django.contrib.sites.models import Site
- from django.contrib.sites import models as site_app
-+from django.core.management.color import no_style
- 
- def create_default_site(app, created_models, verbosity, db, **kwargs):
--    if Site in created_models:
-+    # Only create the default sites in databases where Django created the table
-+    if Site in created_models and router.allow_syncdb(db, Site) :
-+        # The default settings set SITE_ID = 1, and some tests in Django's test
-+        # suite rely on this value. However, if database sequences are reused
-+        # (e.g. in the test suite after flush/syncdb), it isn't guaranteed that
-+        # the next id will be 1, so we coerce it. See #15573 and #16353. This
-+        # can also crop up outside of tests - see #15346.
-         if verbosity >= 2:
-             print "Creating example.com Site object"
--        s = Site(domain="example.com", name="example.com")
--        s.save(using=db)
-+        Site(pk=1, domain="example.com", name="example.com").save(using=db)
-+
-+        # We set an explicit pk instead of relying on auto-incrementation,
-+        # so we need to reset the database sequence.
-+        sequence_sql = connections[db].ops.sequence_reset_sql(no_style(), [Site])
-+        if sequence_sql:
-+            if verbosity >= 2:
-+                print "Resetting sequence"
-+            cursor = connections[db].cursor()
-+            for command in sequence_sql:
-+                cursor.execute(command)
-+
-     Site.objects.clear_cache()
- 
- signals.post_syncdb.connect(create_default_site, sender=site_app)
-diff --git a/django/contrib/sites/tests.py b/django/contrib/sites/tests.py
-index 17ab1f2..828badb 100644
---- a/django/contrib/sites/tests.py
-+++ b/django/contrib/sites/tests.py
-@@ -15,6 +15,12 @@ class SitesFrameworkTests(TestCase):
-     def tearDown(self):
-         Site._meta.installed = self.old_Site_meta_installed
- 
-+    def test_save_another(self):
-+        # Regression for #17415
-+        # On some backends the sequence needs reset after save with explicit ID.
-+        # Test that there is no sequence collisions by saving another site.
-+        Site(domain="example2.com", name="example2.com").save()
-+
-     def test_site_manager(self):
-         # Make sure that get_current() does not return a deleted Site object.
-         s = Site.objects.get_current()
-diff --git a/django/core/management/commands/shell.py b/django/core/management/commands/shell.py
-index e4ce462..039ebb8 100644
---- a/django/core/management/commands/shell.py
-+++ b/django/core/management/commands/shell.py
-@@ -13,9 +13,8 @@ class Command(NoArgsCommand):
- 
-     def ipython(self):
-         try:
--            from IPython.frontend.terminal.embed import TerminalInteractiveShell
--            shell = TerminalInteractiveShell()
--            shell.mainloop()
-+            from IPython import embed
-+            embed()
-         except ImportError:
-             # IPython < 0.11
-             # Explicitly pass an empty list as arguments, because otherwise
-diff --git a/django/core/validators.py b/django/core/validators.py
-index a93c6ac..9dcc2bc 100644
---- a/django/core/validators.py
-+++ b/django/core/validators.py
-@@ -147,7 +147,8 @@ class EmailValidator(RegexValidator):
- 
- email_re = re.compile(
-     r"(^[-!#$%&'*+/=?^_`{}|~0-9A-Z]+(\.[-!#$%&'*+/=?^_`{}|~0-9A-Z]+)*"  # dot-atom
--    r'|^"([\001-\010\013\014\016-\037!#-\[\]-\177]|\\[\001-011\013\014\016-\177])*"' # quoted-string
-+    # quoted-string, see also http://tools.ietf.org/html/rfc2822#section-3.2.5
-+    r'|^"([\001-\010\013\014\016-\037!#-\[\]-\177]|\\[\001-\011\013\014\016-\177])*"'
-     r')@(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+[A-Z]{2,6}\.?$', re.IGNORECASE)  # domain
- validate_email = EmailValidator(email_re, _(u'Enter a valid e-mail address.'), 'invalid')
- 
-diff --git a/django/db/backends/creation.py b/django/db/backends/creation.py
-index 57e3f77..ef594b7 100644
---- a/django/db/backends/creation.py
-+++ b/django/db/backends/creation.py
-@@ -374,15 +374,6 @@ class BaseDatabaseCreation(object):
-             verbosity=max(verbosity - 1, 0),
-             interactive=False,
-             database=self.connection.alias)
--        
--        # One effect of calling syncdb followed by flush is that the id of the
--        # default site may or may not be 1, depending on how the sequence was
--        # reset.  If the sites app is loaded, then we coerce it.
--        from django.db.models import get_model
--        if 'django.contrib.sites' in settings.INSTALLED_APPS:
--            Site = get_model('sites', 'Site')
--            if Site is not None and Site.objects.using(self.connection.alias).count() == 1:
--                Site.objects.using(self.connection.alias).update(id=settings.SITE_ID)
- 
-         from django.core.cache import get_cache
-         from django.core.cache.backends.db import BaseDatabaseCache
-diff --git a/django/http/__init__.py b/django/http/__init__.py
-index 68ac45d..07e5a46 100644
---- a/django/http/__init__.py
-+++ b/django/http/__init__.py
-@@ -92,7 +92,7 @@ else:
-         if not _cookie_allows_colon_in_names:
-             def load(self, rawdata, ignore_parse_errors=False):
-                 if ignore_parse_errors:
--                    self.bad_cookies = []
-+                    self.bad_cookies = set()
-                     self._BaseCookie__set = self._loose_set
-                 super(SimpleCookie, self).load(rawdata)
-                 if ignore_parse_errors:
-@@ -106,8 +106,8 @@ else:
-                 try:
-                     self._strict_set(key, real_value, coded_value)
-                 except Cookie.CookieError:
--                    self.bad_cookies.append(key)
--                    dict.__setitem__(self, key, None)
-+                    self.bad_cookies.add(key)
-+                    dict.__setitem__(self, key, Cookie.Morsel())
- 
- 
- class CompatCookie(SimpleCookie):
-diff --git a/django/http/utils.py b/django/http/utils.py
-index 5eea239..0180864 100644
---- a/django/http/utils.py
-+++ b/django/http/utils.py
-@@ -76,7 +76,8 @@ def fix_IE_for_vary(request, response):
- 
-     # The first part of the Content-Type field will be the MIME type,
-     # everything after ';', such as character-set, can be ignored.
--    if response['Content-Type'].split(';')[0] not in safe_mime_types:
-+    mime_type = response.get('Content-Type', '').partition(';')[0]
-+    if mime_type not in safe_mime_types:
-         try:
-             del response['Vary']
-         except KeyError:
-diff --git a/docs/howto/deployment/modpython.txt b/docs/howto/deployment/modpython.txt
-index f5030e9..693f942 100644
---- a/docs/howto/deployment/modpython.txt
-+++ b/docs/howto/deployment/modpython.txt
-@@ -293,11 +293,14 @@ of the admin app, but this is not the case when you use any other server
- arrangement. You're responsible for setting up Apache, or whichever media
- server you're using, to serve the admin files.
- 
--The admin files live in (:file:`django/contrib/admin/static/admin`) of the
-+The admin files live in (:file:`django/contrib/admin/media/admin`) of the
- Django distribution.
- 
--We **strongly** recommend using :mod:`django.contrib.staticfiles` to handle
--the admin files, but here are two other approaches:
-+We **strongly** recommend using :mod:`django.contrib.staticfiles` to handle the
-+admin files (this means using the :djadmin:`collectstatic` management command
-+to collect the static files in :setting:`STATIC_ROOT`, and then configuring
-+your webserver to serve :setting:`STATIC_ROOT` at :setting:`STATIC_URL`), but
-+here are two other approaches:
- 
-     1. Create a symbolic link to the admin static files from within your
-        document root.
-diff --git a/docs/howto/deployment/modwsgi.txt b/docs/howto/deployment/modwsgi.txt
-index de3a5b6..fdf9d27 100644
---- a/docs/howto/deployment/modwsgi.txt
-+++ b/docs/howto/deployment/modwsgi.txt
-@@ -127,11 +127,14 @@ of the admin app, but this is not the case when you use any other server
- arrangement. You're responsible for setting up Apache, or whichever media
- server you're using, to serve the admin files.
- 
--The admin files live in (:file:`django/contrib/admin/static/admin`) of the
-+The admin files live in (:file:`django/contrib/admin/media/admin`) of the
- Django distribution.
- 
--We **strongly** recommend using :mod:`django.contrib.staticfiles` to handle
--the admin files, but here are two other approaches:
-+We **strongly** recommend using :mod:`django.contrib.staticfiles` to handle the
-+admin files (this means using the :djadmin:`collectstatic` management command
-+to collect the static files in :setting:`STATIC_ROOT`, and then configuring
-+your webserver to serve :setting:`STATIC_ROOT` at :setting:`STATIC_URL`), but
-+here are two other approaches:
- 
-     1. Create a symbolic link to the admin static files from within your
-        document root.
-diff --git a/docs/index.txt b/docs/index.txt
-index 0cf066e..20a7cec 100644
---- a/docs/index.txt
-+++ b/docs/index.txt
-@@ -28,7 +28,7 @@ Having trouble? We'd like to help!
- .. _archives of the django-users mailing list: http://groups.google.com/group/django-users/
- .. _post a question: http://groups.google.com/group/django-users/
- .. _#django IRC channel: irc://irc.freenode.net/django
--.. _IRC logs: http://botland.oebfare.com/logger/django/
-+.. _IRC logs: http://django-irc-logs.com/
- .. _ticket tracker: http://code.djangoproject.com/
- 
- First steps
-diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt
-index 3f0f998..ca29d15 100644
---- a/docs/internals/deprecation.txt
-+++ b/docs/internals/deprecation.txt
-@@ -177,6 +177,12 @@ their deprecation, as per the :ref:`Django deprecation policy
-           required to end with a trailing slash to ensure there is a consistent
-           way to combine paths in templates.
- 
-+        * Translations located under the so-called *project path* will be
-+          ignored during the translation building process performed at runtime.
-+          The :setting:`LOCALE_PATHS` setting can be used for the same task by
-+          including the filesystem path to a ``locale`` directory containing
-+          non-app-specific translations in its value.
-+
-     * 2.0
-         * ``django.views.defaults.shortcut()``. This function has been moved
-           to ``django.contrib.contenttypes.views.shortcut()`` as part of the
-diff --git a/docs/internals/release-process.txt b/docs/internals/release-process.txt
-index 2a56f0b..799a59e 100644
---- a/docs/internals/release-process.txt
-+++ b/docs/internals/release-process.txt
-@@ -99,6 +99,13 @@ varying levels:
-     * Security fixes will be applied to the current trunk and the previous two
-       minor releases.
- 
-+* Documentation fixes will generally be more freely backported to the last
-+  release branch (at the discretion of the committer), and don't need to meet
-+  the "critical fixes only" bar as it's highly advantageous to have the docs
-+  for the last release be up-to-date and correct, and the downside of
-+  backporting (risk of introducing regressions) is much less of a concern
-+  with doc fixes.
-+
- As a concrete example, consider a moment in time halfway between the release of
- Django 1.3 and 1.4. At this point in time:
- 
-@@ -111,6 +118,9 @@ Django 1.3 and 1.4. At this point in time:
-       ``1.2.X`` branch. Security fixes will trigger the release of ``1.3.1``,
-       ``1.2.1``, etc.
- 
-+* Documentation fixes will be applied to trunk, and if easily backported, to
-+  the ``1.3.X`` branch.
-+
- .. _release-process:
- 
- Release process
-diff --git a/docs/intro/index.txt b/docs/intro/index.txt
-index bc61be7..19290a5 100644
---- a/docs/intro/index.txt
-+++ b/docs/intro/index.txt
-@@ -31,6 +31,6 @@ place: read this material to quickly get up and running.
-     
-     .. _python: http://python.org/
-     .. _list of Python resources for non-programmers: http://wiki.python.org/moin/BeginnersGuide/NonProgrammers
--    .. _dive into python: http://diveintopython.org/
-+    .. _dive into python: http://diveintopython.net/
-     .. _dead-tree version: http://www.amazon.com/exec/obidos/ASIN/1590593561/ref=nosim/jacobian20
-     .. _books about Python: http://wiki.python.org/moin/PythonBooks
-\ No newline at end of file
-diff --git a/docs/intro/tutorial01.txt b/docs/intro/tutorial01.txt
-index 2f2e049..4dc1e5c 100644
---- a/docs/intro/tutorial01.txt
-+++ b/docs/intro/tutorial01.txt
-@@ -59,7 +59,7 @@ This will create a ``mysite`` directory in your current directory.
-    can be run as a program. To do this, open Terminal.app and navigate (using
-    the ``cd`` command) to the directory where :doc:`django-admin.py
-    </ref/django-admin>` is installed, then run the command
--   ``chmod +x django-admin.py``.
-+   ``sudo chmod +x django-admin.py``.
- 
- .. note::
- 
-@@ -692,10 +692,9 @@ Save these changes and start a new Python interactive shell by running
- 
- For more information on model relations, see :doc:`Accessing related objects
- </ref/models/relations>`. For more on how to use double underscores to perform
--field lookups via the API, see `Field lookups`__. For full details on the
--database API, see our :doc:`Database API reference </topics/db/queries>`.
--
--__ http://docs.djangoproject.com/en/1.2/topics/db/queries/#field-lookups
-+field lookups via the API, see :ref:`Field lookups <field-lookups-intro>`. For
-+full details on the database API, see our :doc:`Database API reference
-+</topics/db/queries>`.
- 
- When you're comfortable with the API, read :doc:`part 2 of this tutorial
- </intro/tutorial02>` to get Django's automatic admin working.
-diff --git a/docs/intro/tutorial02.txt b/docs/intro/tutorial02.txt
-index 4bd31fb..1e837e6 100644
---- a/docs/intro/tutorial02.txt
-+++ b/docs/intro/tutorial02.txt
-@@ -40,22 +40,22 @@ activate the admin site for your installation, do these three things:
- 
-       .. parsed-literal::
- 
--          from django.conf.urls.defaults import *
-+          from django.conf.urls.defaults import patterns, include, url
- 
-           # Uncomment the next two lines to enable the admin:
-           **from django.contrib import admin**
-           **admin.autodiscover()**
- 
-           urlpatterns = patterns('',
--              # Example:
--              # (r'^mysite/', include('mysite.foo.urls')),
-+              # Examples:
-+              # url(r'^$', 'mysite.views.home', name='home'),
-+              # url(r'^mysite/', include('mysite.foo.urls')),
- 
--              # Uncomment the admin/doc line below and add 'django.contrib.admindocs'
--              # to INSTALLED_APPS to enable admin documentation:
--              # (r'^admin/doc/', include('django.contrib.admindocs.urls')),
-+              # Uncomment the admin/doc line below to enable admin documentation:
-+              # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
- 
-               # Uncomment the next line to enable the admin:
--              **(r'^admin/', include(admin.site.urls)),**
-+              **url(r'^admin/', include(admin.site.urls)),**
-           )
- 
-       (The bold lines are the ones that needed to be uncommented.)
-diff --git a/docs/intro/tutorial03.txt b/docs/intro/tutorial03.txt
-index 41a62a7..566ba55 100644
---- a/docs/intro/tutorial03.txt
-+++ b/docs/intro/tutorial03.txt
-@@ -78,17 +78,17 @@ point at that file::
- 
- Time for an example. Edit ``mysite/urls.py`` so it looks like this::
- 
--    from django.conf.urls.defaults import *
-+    from django.conf.urls.defaults import patterns, include, url
- 
-     from django.contrib import admin
-     admin.autodiscover()
- 
-     urlpatterns = patterns('',
--        (r'^polls/$', 'polls.views.index'),
--        (r'^polls/(?P<poll_id>\d+)/$', 'polls.views.detail'),
--        (r'^polls/(?P<poll_id>\d+)/results/$', 'polls.views.results'),
--        (r'^polls/(?P<poll_id>\d+)/vote/$', 'polls.views.vote'),
--        (r'^admin/', include(admin.site.urls)),
-+        url(r'^polls/$', 'polls.views.index'),
-+        url(r'^polls/(?P<poll_id>\d+)/$', 'polls.views.detail'),
-+        url(r'^polls/(?P<poll_id>\d+)/results/$', 'polls.views.results'),
-+        url(r'^polls/(?P<poll_id>\d+)/vote/$', 'polls.views.vote'),
-+        url(r'^admin/', include(admin.site.urls)),
-     )
- 
- This is worth a review. When somebody requests a page from your Web site -- say,
-@@ -112,7 +112,7 @@ what you can do with them. And there's no need to add URL cruft such as ``.php``
- -- unless you have a sick sense of humor, in which case you can do something
- like this::
- 
--    (r'^polls/latest\.php$', 'polls.views.index'),
-+    url(r'^polls/latest\.php$', 'polls.views.index'),
- 
- But, don't do that. It's silly.
- 
-@@ -357,22 +357,23 @@ the list is empty.
- Write a 404 (page not found) view
- =================================
- 
--When you raise :exc:`~django.http.Http404` from within a view, Django will load
--a special view devoted to handling 404 errors. It finds it by looking for the
--variable ``handler404``, which is a string in Python dotted syntax -- the same
--format the normal URLconf callbacks use. A 404 view itself has nothing special:
--It's just a normal view.
--
--You normally won't have to bother with writing 404 views. By default, URLconfs
--have the following line up top::
--
--    from django.conf.urls.defaults import *
-+When you raise :exc:`~django.http.Http404` from within a view, Django
-+will load a special view devoted to handling 404 errors. It finds it
-+by looking for the variable ``handler404`` in your root URLconf (and
-+only in your root URLconf; setting ``handler404`` anywhere else will
-+have no effect), which is a string in Python dotted syntax -- the same
-+format the normal URLconf callbacks use. A 404 view itself has nothing
-+special: It's just a normal view.
- 
--That takes care of setting ``handler404`` in the current module. As you can see
--in ``django/conf/urls/defaults.py``, ``handler404`` is set to
--:func:`django.views.defaults.page_not_found` by default.
-+You normally won't have to bother with writing 404 views. If you don't set
-+``handler404``, the built-in view :func:`django.views.defaults.page_not_found`
-+is used by default. In this case, you still have one obligation: To create a
-+``404.html`` template in the root of your template directory. The default 404
-+view will use that template for all 404 errors. If :setting:`DEBUG` is set to
-+``False`` (in your settings module) and if you didn't create a ``404.html``
-+file, an ``Http500`` is raised instead.  So remember to create a ``404.html``.
- 
--Four more things to note about 404 views:
-+A couple more things to note about 404 views:
- 
-     * If :setting:`DEBUG` is set to ``True`` (in your settings module) then your
-       404 view will never be used (and thus the ``404.html`` template will never
-@@ -381,21 +382,12 @@ Four more things to note about 404 views:
-     * The 404 view is also called if Django doesn't find a match after checking
-       every regular expression in the URLconf.
- 
--    * If you don't define your own 404 view -- and simply use the default, which
--      is recommended -- you still have one obligation: To create a ``404.html``
--      template in the root of your template directory. The default 404 view will
--      use that template for all 404 errors.
--
--    * If :setting:`DEBUG` is set to ``False`` (in your settings module) and if
--      you didn't create a ``404.html`` file, an ``Http500`` is raised instead.
--      So remember to create a ``404.html``.
--
- Write a 500 (server error) view
- ===============================
- 
--Similarly, URLconfs may define a ``handler500``, which points to a view to call
--in case of server errors. Server errors happen when you have runtime errors in
--view code.
-+Similarly, your root URLconf may define a ``handler500``, which points
-+to a view to call in case of server errors. Server errors happen when
-+you have runtime errors in view code.
- 
- Use the template system
- =======================
-@@ -432,10 +424,10 @@ Take some time to play around with the views and template system. As you edit
- the URLconf, you may notice there's a fair bit of redundancy in it::
- 
-     urlpatterns = patterns('',
--        (r'^polls/$', 'polls.views.index'),
--        (r'^polls/(?P<poll_id>\d+)/$', 'polls.views.detail'),
--        (r'^polls/(?P<poll_id>\d+)/results/$', 'polls.views.results'),
--        (r'^polls/(?P<poll_id>\d+)/vote/$', 'polls.views.vote'),
-+        url(r'^polls/$', 'polls.views.index'),
-+        url(r'^polls/(?P<poll_id>\d+)/$', 'polls.views.detail'),
-+        url(r'^polls/(?P<poll_id>\d+)/results/$', 'polls.views.results'),
-+        url(r'^polls/(?P<poll_id>\d+)/vote/$', 'polls.views.vote'),
-     )
- 
- Namely, ``polls.views`` is in every callback.
-@@ -445,10 +437,10 @@ common prefixes. You can factor out the common prefixes and add them as the
- first argument to :func:`~django.conf.urls.defaults.patterns`, like so::
- 
-     urlpatterns = patterns('polls.views',
--        (r'^polls/$', 'index'),
--        (r'^polls/(?P<poll_id>\d+)/$', 'detail'),
--        (r'^polls/(?P<poll_id>\d+)/results/$', 'results'),
--        (r'^polls/(?P<poll_id>\d+)/vote/$', 'vote'),
-+        url(r'^polls/$', 'index'),
-+        url(r'^polls/(?P<poll_id>\d+)/$', 'detail'),
-+        url(r'^polls/(?P<poll_id>\d+)/results/$', 'results'),
-+        url(r'^polls/(?P<poll_id>\d+)/vote/$', 'vote'),
-     )
- 
- This is functionally identical to the previous formatting. It's just a bit
-@@ -459,20 +451,20 @@ callback in your URLconf, you can concatenate multiple
- :func:`~django.conf.urls.defaults.patterns`. Your full ``mysite/urls.py`` might
- now look like this::
- 
--    from django.conf.urls.defaults import *
-+    from django.conf.urls.defaults import patterns, include, url
- 
-     from django.contrib import admin
-     admin.autodiscover()
-     
-     urlpatterns = patterns('polls.views',
--        (r'^polls/$', 'index'),
--        (r'^polls/(?P<poll_id>\d+)/$', 'detail'),
--        (r'^polls/(?P<poll_id>\d+)/results/$', 'results'),
--        (r'^polls/(?P<poll_id>\d+)/vote/$', 'vote'),
-+        url(r'^polls/$', 'index'),
-+        url(r'^polls/(?P<poll_id>\d+)/$', 'detail'),
-+        url(r'^polls/(?P<poll_id>\d+)/results/$', 'results'),
-+        url(r'^polls/(?P<poll_id>\d+)/vote/$', 'vote'),
-     )
-     
-     urlpatterns += patterns('',
--        (r'^admin/', include(admin.site.urls)),
-+        url(r'^admin/', include(admin.site.urls)),
-     )
- 
- Decoupling the URLconfs
-@@ -502,8 +494,8 @@ Copy the file ``mysite/urls.py`` to ``polls/urls.py``. Then, change
-     admin.autodiscover()
-     
-     urlpatterns = patterns('',
--        (r'^polls/', include('polls.urls')),
--        (r'^admin/', include(admin.site.urls)),
-+        url(r'^polls/', include('polls.urls')),
-+        url(r'^admin/', include(admin.site.urls)),
-     )
- 
- :func:`~django.conf.urls.defaults.include` simply references another URLconf.
-@@ -526,13 +518,13 @@ URLconf by removing the leading "polls/" from each line, and removing the
- lines registering the admin site. Your ``polls/urls.py`` file should now look like
- this::
- 
--    from django.conf.urls.defaults import *
-+    from django.conf.urls.defaults import patterns, include, url
- 
-     urlpatterns = patterns('polls.views',
--        (r'^$', 'index'),
--        (r'^(?P<poll_id>\d+)/$', 'detail'),
--        (r'^(?P<poll_id>\d+)/results/$', 'results'),
--        (r'^(?P<poll_id>\d+)/vote/$', 'vote'),
-+        url(r'^$', 'index'),
-+        url(r'^(?P<poll_id>\d+)/$', 'detail'),
-+        url(r'^(?P<poll_id>\d+)/results/$', 'results'),
-+        url(r'^(?P<poll_id>\d+)/vote/$', 'vote'),
-     )
- 
- The idea behind :func:`~django.conf.urls.defaults.include` and URLconf
-diff --git a/docs/intro/tutorial04.txt b/docs/intro/tutorial04.txt
-index ded5cb2..4c2f2d4 100644
---- a/docs/intro/tutorial04.txt
-+++ b/docs/intro/tutorial04.txt
-@@ -218,13 +218,13 @@ Read on for details.
- First, open the ``polls/urls.py`` URLconf. It looks like this, according to the
- tutorial so far::
- 
--    from django.conf.urls.defaults import *
-+    from django.conf.urls.defaults import patterns, include, url
- 
-     urlpatterns = patterns('polls.views',
--        (r'^$', 'index'),
--        (r'^(?P<poll_id>\d+)/$', 'detail'),
--        (r'^(?P<poll_id>\d+)/results/$', 'results'),
--        (r'^(?P<poll_id>\d+)/vote/$', 'vote'),
-+        url(r'^$', 'index'),
-+        url(r'^(?P<poll_id>\d+)/$', 'detail'),
-+        url(r'^(?P<poll_id>\d+)/results/$', 'results'),
-+        url(r'^(?P<poll_id>\d+)/vote/$', 'vote'),
-     )
- 
- Change it like so::
-@@ -234,12 +234,12 @@ Change it like so::
-     from polls.models import Poll
- 
-     urlpatterns = patterns('',
--        (r'^$',
-+        url(r'^$',
-             ListView.as_view(
-                 queryset=Poll.objects.order_by('-pub_date')[:5],
-                 context_object_name='latest_poll_list',
-                 template_name='polls/index.html')),
--        (r'^(?P<pk>\d+)/$',
-+        url(r'^(?P<pk>\d+)/$',
-             DetailView.as_view(
-                 model=Poll,
-                 template_name='polls/detail.html')),
-@@ -248,7 +248,7 @@ Change it like so::
-                 model=Poll,
-                 template_name='polls/results.html'),
-             name='poll_results'),
--        (r'^(?P<poll_id>\d+)/vote/$', 'polls.views.vote'),
-+        url(r'^(?P<poll_id>\d+)/vote/$', 'polls.views.vote'),
-     )
- 
- We're using two generic views here:
-diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt
-index beff94e..7394c3a 100644
---- a/docs/ref/contrib/admin/index.txt
-+++ b/docs/ref/contrib/admin/index.txt
-@@ -19,8 +19,10 @@ There are six steps in activating the Django admin site:
-     1. Add ``'django.contrib.admin'`` to your :setting:`INSTALLED_APPS`
-        setting.
- 
--    2. Admin has two dependencies - :mod:`django.contrib.auth` and
--       :mod:`django.contrib.contenttypes`. If these applications are not
-+    2. The admin has four dependencies - :mod:`django.contrib.auth`,
-+       :mod:`django.contrib.contenttypes`,
-+       :mod:`django.contrib.messages` and
-+       :mod:`django.contrib.sessions`.  If these applications are not
-        in your :setting:`INSTALLED_APPS` list, add them.
- 
-     3. Determine which of your application's models should be editable in the
-@@ -542,7 +544,7 @@ subclass::
-     Fields in ``list_filter`` can also span relations using the ``__`` lookup::
- 
-         class UserAdminWithLookup(UserAdmin):
--            list_filter = ('groups__name')
-+            list_filter = ('groups__name',)
- 
- .. attribute:: ModelAdmin.list_per_page
- 
-diff --git a/docs/ref/contrib/gis/geoip.txt b/docs/ref/contrib/gis/geoip.txt
-index 6503be7..f5c45e1 100644
---- a/docs/ref/contrib/gis/geoip.txt
-+++ b/docs/ref/contrib/gis/geoip.txt
-@@ -144,7 +144,7 @@ parameters.
- Returns a dictionary of city information for the given query.  Some
- of the values in the dictionary may be undefined (``None``).
- 
--.. method:: GeoIPcountry(query)
-+.. method:: GeoIP.country(query)
- 
- Returns a dictionary with the country code and country for the given 
- query.
-diff --git a/docs/ref/contrib/messages.txt b/docs/ref/contrib/messages.txt
-index ca3212d..ee7e01c 100644
---- a/docs/ref/contrib/messages.txt
-+++ b/docs/ref/contrib/messages.txt
-@@ -210,6 +210,10 @@ If you're using the context processor, your template should be rendered with a
- ``RequestContext``. Otherwise, ensure ``messages`` is available to
- the template context.
- 
-+Even if you know there is only just one message, you should still iterate over
-+the ``messages`` sequence, because otherwise the message storage will not be cleared
-+for the next request.
-+
- Creating custom message levels
- ------------------------------
- 
-diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
-index 89bc43f..58b86ea 100644
---- a/docs/ref/django-admin.txt
-+++ b/docs/ref/django-admin.txt
-@@ -1156,7 +1156,7 @@ variable.
- Note that this option is unnecessary in ``manage.py``, because it takes care of
- setting the Python path for you.
- 
--.. _import search path: http://diveintopython.org/getting_to_know_python/everything_is_an_object.html
-+.. _import search path: http://diveintopython.net/getting_to_know_python/everything_is_an_object.html
- 
- .. django-admin-option:: --settings
- 
-diff --git a/docs/ref/models/instances.txt b/docs/ref/models/instances.txt
-index 3728a09..52c0869 100644
---- a/docs/ref/models/instances.txt
-+++ b/docs/ref/models/instances.txt
-@@ -470,7 +470,7 @@ the URL. For example, if your URLconf contained a line such as::
- 
- Similarly, if you had a URLconf entry that looked like::
- 
--    (r'/archive/(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/$', archive_view)
-+    (r'/archive/(?P<year>\d{4})/(?P<month>\d{2})/(?P<day>\d{2})/$', archive_view)
- 
- ...you could reference this using ``permalink()`` as follows::
- 
-@@ -478,8 +478,8 @@ Similarly, if you had a URLconf entry that looked like::
-     def get_absolute_url(self):
-         return ('archive_view', (), {
-             'year': self.created.year,
--            'month': self.created.month,
--            'day': self.created.day})
-+            'month': self.created.strftime('%m'),
-+            'day': self.created.strftime('%d')})
- 
- Notice that we specify an empty sequence for the second parameter in this case,
- because we only want to pass keyword parameters, not positional ones.
-diff --git a/docs/ref/models/options.txt b/docs/ref/models/options.txt
-index 4530439..c1beab0 100644
---- a/docs/ref/models/options.txt
-+++ b/docs/ref/models/options.txt
-@@ -166,6 +166,13 @@ Django quotes column and table names behind the scenes.
-         >>> answer.get_previous_in_order()
-         <Answer: 1>
- 
-+.. admonition:: Changing order_with_respect_to
-+
-+        ``order_with_respect_to`` adds an additional field/database column
-+        named ``_order``, so be sure to handle that as you would any other
-+        change to your models if you add or change ``order_with_respect_to``
-+        after your initial :djadmin:`syncdb`.
-+
- ``ordering``
- ------------
- 
-@@ -238,6 +245,12 @@ Django quotes column and table names behind the scenes.
- 
-         unique_together = ("driver", "restaurant")
- 
-+    A :class:`~django.db.models.ManyToManyField` cannot be included in
-+    unique_together (it's not even clear what that would mean). If you
-+    need to validate uniqueness related to a
-+    :class:`~django.db.models.ManyToManyField`, look at signals or
-+    using an explicit :attr:`through <ManyToManyField.through>` model.
-+
- ``verbose_name``
- ----------------
- 
-diff --git a/docs/ref/signals.txt b/docs/ref/signals.txt
-index e83142e..ad25dce 100644
---- a/docs/ref/signals.txt
-+++ b/docs/ref/signals.txt
-@@ -352,12 +352,16 @@ post_syncdb
- .. data:: django.db.models.signals.post_syncdb
-    :module:
- 
--Sent by :djadmin:`syncdb` after it installs an application.
-+Sent by :djadmin:`syncdb` command after it installs an application, and
-+:djadmin:`flush` command.
- 
- Any handlers that listen to this signal need to be written in a particular
- place: a ``management`` module in one of your :setting:`INSTALLED_APPS`. If
- handlers are registered anywhere else they may not be loaded by
--:djadmin:`syncdb`.
-+:djadmin:`syncdb`. It is important that handlers of this signal perform
-+idempotent changes (e.g. no database alterations) as this may cause the
-+:djadmin:`flush` management command to fail if it also ran during the
-+:djadmin:`syncdb` command.
- 
- Arguments sent with this signal:
- 
-diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
-index 7d24c1d..6c7057a 100644
---- a/docs/ref/templates/builtins.txt
-+++ b/docs/ref/templates/builtins.txt
-@@ -1868,7 +1868,7 @@ slice
- Returns a slice of the list.
- 
- Uses the same syntax as Python's list slicing. See
--http://diveintopython.org/native_data_types/lists.html#odbchelper.list.slice
-+http://diveintopython.net/native_data_types/lists.html#odbchelper.list.slice
- for an introduction.
- 
- Example::
-diff --git a/docs/releases/0.95.txt b/docs/releases/0.95.txt
-index 7409bff..3632c31 100644
---- a/docs/releases/0.95.txt
-+++ b/docs/releases/0.95.txt
-@@ -92,15 +92,15 @@ changes is described in the `Removing The Magic`_ wiki page. There is also an
- easy checklist_ for reference when undertaking the porting operation.
- 
- .. _Removing The Magic: http://code.djangoproject.com/wiki/RemovingTheMagic
--.. _checklist: http://code.djangoproject.com/wiki/MagicRemovalCheatSheet1
-+.. _checklist: http://code.djangoproject.com/wiki/MagicRemovalCheatSheet
- 
- Problem reports and getting help
- ================================
- 
--Need help resolving a problem with Django? The documentation in the distribution
--is also available online_ at the `Django Web site`_. The :doc:`FAQ </faq/index>`
--document is especially recommended, as it contains a number of issues that come
--up time and again.
-+Need help resolving a problem with Django? The documentation in the
-+distribution is also available :doc:`online </index>` at the `Django Web
-+site`_. The :doc:`FAQ </faq/index>` document is especially recommended, as it
-+contains a number of issues that come up time and again.
- 
- For more personalized help, the `django-users`_ mailing list is a very active
- list, with more than 2,000 subscribers who can help you solve any sort of
-@@ -113,7 +113,6 @@ there's a #django channel on irc.freenode.net that is regularly populated by
- Django users and developers from around the world. Friendly people are usually
- available at any hour of the day -- to help, or just to chat.
- 
--.. _online: http://www.djangoproject.com/documentation/0.95/
- .. _Django Web site: http://www.djangoproject.com/
- .. _django-users: http://groups.google.com/group/django-users
- 
-diff --git a/docs/releases/0.96.txt b/docs/releases/0.96.txt
-index 1224360..8874ccb 100644
---- a/docs/releases/0.96.txt
-+++ b/docs/releases/0.96.txt
-@@ -50,12 +50,10 @@ aside from any necessary security fixes, it will not be actively
- maintained, and it will be removed in a future release of Django.
- 
- Also, note that some features, like the new :setting:`DATABASE_OPTIONS`
--setting (see the `databases documentation`_ for details), are only
--available on the "mysql" backend, and will not be made available for
-+setting (see the :doc:`databases documentation </ref/databases>` for details),
-+are only available on the "mysql" backend, and will not be made available for
- "mysql_old".
- 
--.. _databases documentation: http://www.djangoproject.com/documentation/0.96/databases/
--
- Database constraint names changed
- ---------------------------------
- 
-@@ -164,10 +162,8 @@ Although the ``newforms`` library will continue to evolve, it's ready for use
- for most common cases. We recommend that anyone new to form handling skip the
- old forms system and start with the new.
- 
--For more information about ``django.newforms``, read the `newforms
--documentation`_.
--
--.. _newforms documentation: http://www.djangoproject.com/documentation/0.96/newforms/
-+For more information about ``django.newforms``, read the :doc:`newforms
-+documentation </topics/forms/index>`.
- 
- URLconf improvements
- --------------------
-@@ -216,19 +212,15 @@ The test framework
- ------------------
- 
- Django now includes a test framework so you can start transmuting fear into
--boredom (with apologies to Kent Beck). You can write tests based on doctest_
--or unittest_ and test your views with a simple test client.
-+boredom (with apologies to Kent Beck). You can write tests based on
-+:mod:`doctest` or :mod:`unittest` and test your views with a simple test client.
- 
- There is also new support for "fixtures" -- initial data, stored in any of the
--supported `serialization formats`_, that will be loaded into your database at the
--start of your tests. This makes testing with real data much easier.
--
--See `the testing documentation`_ for the full details.
-+supported :doc:`serialization formats </topics/serialization>`, that will be
-+loaded into your database at the start of your tests. This makes testing with
-+real data much easier.
- 
--.. _doctest: http://docs.python.org/library/doctest.html
--.. _unittest: http://docs.python.org/library/unittest.html
--.. _the testing documentation: http://www.djangoproject.com/documentation/0.96/testing/
--.. _serialization formats: http://www.djangoproject.com/documentation/0.96/serialization/
-+See :doc:`the testing documentation </topics/testing>` for the full details.
- 
- Improvements to the admin interface
- -----------------------------------
-diff --git a/docs/releases/1.0.1.txt b/docs/releases/1.0.1.txt
-index 780dc53..3550e7c 100644
---- a/docs/releases/1.0.1.txt
-+++ b/docs/releases/1.0.1.txt
-@@ -6,10 +6,10 @@ Welcome to Django 1.0.1!
- 
- This is the first "bugfix" release in the Django 1.0 series, improving
- the stability and performance of the Django 1.0 codebase. As such,
--Django 1.0.1 contains no new features (and, pursuant to `our
--compatibility policy`_, maintains backwards compatibility with Django
--1.0), but does contain a number of fixes and other
--improvements. Django 1.0.1 is a recommended upgrade for any
-+Django 1.0.1 contains no new features (and, pursuant to :doc:`our
-+compatibility policy </misc/api-stability/>`, maintains backwards
-+compatibility with Django 1.0), but does contain a number of fixes
-+and other improvements. Django 1.0.1 is a recommended upgrade for any
- development or deployment currently using or targeting Django 1.0.
- 
- 
-@@ -46,8 +46,9 @@ highlights:
- 
- * A fix to the application of autoescaping for literal strings passed
-   to the ``join`` template filter. Previously, literal strings passed
--  to ``join`` were automatically escaped, contrary to `the documented
--  behavior for autoescaping and literal strings`_. Literal strings
-+  to ``join`` were automatically escaped, contrary to :ref:`the
-+  documented behavior for autoescaping and literal strings
-+  <string-literals-and-automatic-escaping>`. Literal strings
-   passed to ``join`` are no longer automatically escaped, meaning you
-   must now manually escape them; this is an incompatibility if you
-   were relying on this bug, but not if you were relying on escaping
-@@ -60,6 +61,4 @@ highlights:
-   documentation, including both corrections to existing documents and
-   expanded and new documentation.
- 
--.. _our compatibility policy: http://docs.djangoproject.com/en/dev/misc/api-stability/
- .. _the Subversion log of the 1.0.X branch: http://code.djangoproject.com/log/django/branches/releases/1.0.X
--.. _the documented behavior for autoescaping and literal strings: http://docs.djangoproject.com/en/dev/topics/templates/#string-literals-and-automatic-escaping
-diff --git a/docs/releases/1.2.6.txt b/docs/releases/1.2.6.txt
-new file mode 100644
-index 0000000..cfd1d9c
---- /dev/null
-+++ b/docs/releases/1.2.6.txt
-@@ -0,0 +1,16 @@
-+==========================
-+Django 1.2.6 release notes
-+==========================
-+
-+*September 9, 2011*
-+
-+Welcome to Django 1.2.6!
-+
-+This is the sixth bugfix/security release in the Django 1.2 series, fixing
-+several security issues present in Django 1.2.5.  Django 1.2.6 is a
-+recommended upgrade for all users of any Django release in the 1.2.X series.
-+
-+For a full list of issues addressed in this release, see the `security
-+advisory`_.
-+
-+.. _security advisory: https://www.djangoproject.com/weblog/2011/sep/09/security-releases-issued/
-diff --git a/docs/releases/1.2.7.txt b/docs/releases/1.2.7.txt
-new file mode 100644
-index 0000000..c0cf698
---- /dev/null
-+++ b/docs/releases/1.2.7.txt
-@@ -0,0 +1,16 @@
-+==========================
-+Django 1.2.7 release notes
-+==========================
-+
-+*September 10, 2011*
-+
-+Welcome to Django 1.2.7!
-+
-+This is the seventh bugfix/security release in the Django 1.2 series. It
-+replaces Django 1.2.6 due to problems with the 1.2.6 release tarball. 
-+Django 1.2.7 is a recommended upgrade for all users of any Django release in
-+the 1.2.X series.
-+
-+For more information, see the `release advisory`_.
-+
-+.. _release advisory: https://www.djangoproject.com/weblog/2011/sep/10/127/
-diff --git a/docs/releases/1.3.1.txt b/docs/releases/1.3.1.txt
-new file mode 100644
-index 0000000..4c28916
---- /dev/null
-+++ b/docs/releases/1.3.1.txt
-@@ -0,0 +1,16 @@
-+==========================
-+Django 1.3.1 release notes
-+==========================
-+
-+*September 9, 2011*
-+
-+Welcome to Django 1.3.1!
-+
-+This is the first security release in the Django 1.3 series, fixing several
-+security issues in Django 1.3.  Django 1.3.1 is a recommended upgrade for
-+all users of Django 1.3.
-+
-+For a full list of issues addressed in this release, see the `security
-+advisory`_.
-+
-+.. _security advisory: https://www.djangoproject.com/weblog/2011/sep/09/security-releases-issued/
-diff --git a/docs/releases/index.txt b/docs/releases/index.txt
-index 8d23c28..40fe5b0 100644
---- a/docs/releases/index.txt
-+++ b/docs/releases/index.txt
-@@ -19,6 +19,7 @@ Final releases
- .. toctree::
-    :maxdepth: 1
- 
-+   1.3.1
-    1.3
- 
- 1.2 release
-@@ -26,6 +27,8 @@ Final releases
- .. toctree::
-    :maxdepth: 1
- 
-+   1.2.7
-+   1.2.6
-    1.2.5
-    1.2.4
-    1.2.2
-diff --git a/docs/topics/auth.txt b/docs/topics/auth.txt
-index 635f18f..5a2608a 100644
---- a/docs/topics/auth.txt
-+++ b/docs/topics/auth.txt
-@@ -1251,16 +1251,19 @@ can or cannot do with Task instances, specific to your application::
-         ...
-         class Meta:
-             permissions = (
--                ("can_view", "Can see available tasks"),
--                ("can_change_status", "Can change the status of tasks"),
--                ("can_close", "Can remove a task by setting its status as closed"),
-+                ("view_task", "Can see available tasks"),
-+                ("change_task_status", "Can change the status of tasks"),
-+                ("close_task", "Can remove a task by setting its status as closed"),
-             )
- 
- The only thing this does is create those extra permissions when you run
- :djadmin:`manage.py syncdb <syncdb>`. Your code is in charge of checking the
- value of these permissions when an user is trying to access the functionality
- provided by the application (viewing tasks, changing the status of tasks,
--closing tasks.)
-+closing tasks.) Continuing the above example, the following checks if a user may
-+view tasks::
-+
-+    user.has_perm('app.view_task')
- 
- API reference
- -------------
-diff --git a/docs/topics/cache.txt b/docs/topics/cache.txt
-index 8ef4ea2..9b68353 100644
---- a/docs/topics/cache.txt
-+++ b/docs/topics/cache.txt
-@@ -99,8 +99,9 @@ To use Memcached with Django:
-       on your chosen memcached binding)
- 
-     * Set :setting:`LOCATION <CACHES-LOCATION>` to ``ip:port`` values,
--      where ``ip`` is the IP address of the Memcached daemon and
--      ``port`` is the port on which Memcached is running.
-+      where ``ip`` is the IP address of the Memcached daemon and ``port`` is the
-+      port on which Memcached is running, or to a ``unix:path`` value, where
-+      ``path`` is the path to a Memcached Unix socket file.
- 
- In this example, Memcached is running on localhost (127.0.0.1) port 11211, using
- the ``python-memcached`` binding::
-@@ -112,6 +113,16 @@ the ``python-memcached`` binding::
-         }
-     }
- 
-+In this example, Memcached is available through a local Unix socket file
-+:file:`/tmp/memcached.sock` using the ``python-memcached`` binding::
-+
-+    CACHES = {
-+        'default': {
-+            'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
-+            'LOCATION': 'unix:/tmp/memcached.sock',
-+        }
-+    }
-+
- One excellent feature of Memcached is its ability to share cache over multiple
- servers. This means you can run Memcached daemons on multiple machines, and the
- program will treat the group of machines as a *single* cache, without the need
-@@ -526,9 +537,10 @@ you may expect. But once a particular URL (e.g., ``/foo/23/``) has been
- requested, subsequent requests to that URL will use the cache.
- 
- ``cache_page`` can also take an optional keyword argument, ``cache``,
--which directs the decorator to use a specific cache alias when caching view
--results. By default, the ``default`` alias will be used, but you can specify
--any cache alias you want::
-+which directs the decorator to use a specific cache (from your
-+:setting:`CACHES` setting) when caching view results. By default, the
-+``default`` cache will be used, but you can specify any cache you
-+want::
- 
-     @cache_page(60 * 15, cache="special_cache")
-     def my_view(request):
-diff --git a/docs/topics/class-based-views.txt b/docs/topics/class-based-views.txt
-index 3831046..4da48ec 100644
---- a/docs/topics/class-based-views.txt
-+++ b/docs/topics/class-based-views.txt
-@@ -380,7 +380,7 @@ Next, we'll write the ``PublisherBookListView`` view itself::
-     class PublisherBookListView(ListView):
- 
-         context_object_name = "book_list"
--        template_name = "books/books_by_publisher.html",
-+        template_name = "books/books_by_publisher.html"
- 
-         def get_queryset(self):
-             publisher = get_object_or_404(Publisher, name__iexact=self.args[0])
-@@ -396,7 +396,7 @@ use it in the template::
-     class PublisherBookListView(ListView):
- 
-         context_object_name = "book_list"
--        template_name = "books/books_by_publisher.html",
-+        template_name = "books/books_by_publisher.html"
- 
-         def get_queryset(self):
-             self.publisher = get_object_or_404(Publisher, name__iexact=self.args[0])
-diff --git a/docs/topics/db/models.txt b/docs/topics/db/models.txt
-index 0e18205..af76344 100644
---- a/docs/topics/db/models.txt
-+++ b/docs/topics/db/models.txt
-@@ -324,11 +324,10 @@ whatever you want. For example::
-     should work; all are optional.
- 
-     For details on accessing backwards-related objects, see the
--    `Following relationships backward example`_.
--    
-+    :ref:`Following relationships backward example <backwards-related-objects>`.
-+
-     For sample code, see the `Many-to-one relationship model tests`_.
- 
--    .. _Following relationships backward example: http://docs.djangoproject.com/en/dev/topics/db/queries/#backwards-related-objects
-     .. _Many-to-one relationship model tests: http://code.djangoproject.com/browser/django/trunk/tests/modeltests/many_to_one
- 
- Many-to-many relationships
-diff --git a/docs/topics/db/sql.txt b/docs/topics/db/sql.txt
-index fe71736..d9b8b1a 100644
---- a/docs/topics/db/sql.txt
-+++ b/docs/topics/db/sql.txt
-@@ -236,6 +236,30 @@ alias::
-     # Your code here...
-     transaction.commit_unless_managed(using='my_db_alias')
- 
-+By default, the Python DB API will return results without their field
-+names, which means you end up with a ``list`` of values, rather than a
-+``dict``. At a small performance cost, you can return results as a
-+``dict`` by using something like this::
-+    
-+    def dictfetchall(cursor):
-+        "Returns all rows from a cursor as a dict"
-+        desc = cursor.description
-+        return [
-+            dict(zip([col[0] for col in desc], row))
-+            for row in cursor.fetchall()
-+        ]
-+
-+Here is an example of the difference between the two::
-+
-+    >>> cursor.execute("SELECT id, parent_id from test LIMIT 2");
-+    >>> cursor.fetchall()
-+    ((54360982L, None), (54360880L, None))
-+    
-+    >>> cursor.execute("SELECT id, parent_id from test LIMIT 2");
-+    >>> dictfetchall(cursor)
-+    [{'parent_id': None, 'id': 54360982L}, {'parent_id': None, 'id': 54360880L}]
-+
-+
- .. _transactions-and-raw-sql:
- 
- Transactions and raw SQL
-diff --git a/docs/topics/forms/modelforms.txt b/docs/topics/forms/modelforms.txt
-index 07bc5e3..24e000e 100644
---- a/docs/topics/forms/modelforms.txt
-+++ b/docs/topics/forms/modelforms.txt
-@@ -332,13 +332,17 @@ Since the Author model has only 3 fields, 'name', 'title', and
- .. note::
- 
-     If you specify ``fields`` or ``exclude`` when creating a form with
--    ``ModelForm``, then the fields that are not in the resulting form will not
--    be set by the form's ``save()`` method. Django will prevent any attempt to
--    save an incomplete model, so if the model does not allow the missing fields
--    to be empty, and does not provide a default value for the missing fields,
--    any attempt to ``save()`` a ``ModelForm`` with missing fields will fail.
--    To avoid this failure, you must instantiate your model with initial values
--    for the missing, but required fields::
-+    ``ModelForm``, then the fields that are not in the resulting form
-+    will not be set by the form's ``save()`` method. Also, if you
-+    manually add the excluded fields back to the form, they will not
-+    be initialized from the model instance.
-+
-+    Django will prevent any attempt to save an incomplete model, so if
-+    the model does not allow the missing fields to be empty, and does
-+    not provide a default value for the missing fields, any attempt to
-+    ``save()`` a ``ModelForm`` with missing fields will fail.  To
-+    avoid this failure, you must instantiate your model with initial
-+    values for the missing, but required fields::
- 
-         author = Author(title='Mr')
-         form = PartialAuthorForm(request.POST, instance=author)
-@@ -633,6 +637,12 @@ database. If a given instance's data didn't change in the bound data, the
- instance won't be saved to the database and won't be included in the return
- value (``instances``, in the above example).
- 
-+When fields are missing from the form (for example because they have
-+been excluded), these fields will not be set by the ``save()``
-+method. You can find more information about this restriction, which
-+also holds for regular ``ModelForms``, in `Using a subset of fields on
-+the form`_.
-+
- Pass ``commit=False`` to return the unsaved model instances::
- 
-     # don't save to the database
-diff --git a/docs/topics/http/urls.txt b/docs/topics/http/urls.txt
-index 1caa801..7a0e724 100644
---- a/docs/topics/http/urls.txt
-+++ b/docs/topics/http/urls.txt
-@@ -54,6 +54,10 @@ algorithm the system follows to determine which Python code to execute:
-        :class:`~django.http.HttpRequest` as its first argument and any values
-        captured in the regex as remaining arguments.
- 
-+    5. If no regex matches, or if an exception is raised during any
-+       point in this process, Django invokes an appropriate
-+       error-handling view. See `Error handling`_ below.
-+
- Example
- =======
- 
-@@ -99,10 +103,10 @@ Example requests:
-     * ``/articles/2003`` would not match any of these patterns, because each
-       pattern requires that the URL end with a slash.
- 
--    * ``/articles/2003/03/3/`` would match the final pattern. Django would call
--      the function ``news.views.article_detail(request, '2003', '03', '3')``.
-+    * ``/articles/2003/03/03/`` would match the final pattern. Django would call
-+      the function ``news.views.article_detail(request, '2003', '03', '03')``.
- 
--.. _Dive Into Python's explanation: http://diveintopython.org/regular_expressions/street_addresses.html#re.matching.2.3
-+.. _Dive Into Python's explanation: http://diveintopython.net/regular_expressions/street_addresses.html#re.matching.2.3
- 
- Named groups
- ============
-@@ -123,7 +127,7 @@ Here's the above example URLconf, rewritten to use named groups::
-         (r'^articles/2003/$', 'news.views.special_case_2003'),
-         (r'^articles/(?P<year>\d{4})/$', 'news.views.year_archive'),
-         (r'^articles/(?P<year>\d{4})/(?P<month>\d{2})/$', 'news.views.month_archive'),
--        (r'^articles/(?P<year>\d{4})/(?P<month>\d{2})/(?P<day>\d+)/$', 'news.views.article_detail'),
-+        (r'^articles/(?P<year>\d{4})/(?P<month>\d{2})/(?P<day>\d{2})/$', 'news.views.article_detail'),
-     )
- 
- This accomplishes exactly the same thing as the previous example, with one
-@@ -134,8 +138,8 @@ arguments rather than positional arguments. For example:
-       ``news.views.month_archive(request, year='2005', month='03')``, instead
-       of ``news.views.month_archive(request, '2005', '03')``.
- 
--    * A request to ``/articles/2003/03/3/`` would call the function
--      ``news.views.article_detail(request, year='2003', month='03', day='3')``.
-+    * A request to ``/articles/2003/03/03/`` would call the function
-+      ``news.views.article_detail(request, year='2003', month='03', day='03')``.
- 
- In practice, this means your URLconfs are slightly more explicit and less prone
- to argument-order bugs -- and you can reorder the arguments in your views'
-@@ -246,6 +250,31 @@ The ``prefix`` parameter has the same meaning as the first argument to
- ``patterns()`` and is only relevant when you're passing a string as the
- ``view`` parameter.
- 
-+include
-+-------
-+
-+.. function:: include(<module or pattern_list>)
-+
-+A function that takes a full Python import path to another URLconf module that
-+should be "included" in this place.
-+
-+:func:`include` also accepts as an argument an iterable that returns URL
-+patterns.
-+
-+See `Including other URLconfs`_ below.
-+
-+Error handling
-+==============
-+
-+When Django can't find a regex matching the requested URL, or when an
-+exception is raised, Django will invoke an error-handling view. The
-+views to use for these cases are specified by two variables which can
-+be set in your root URLconf. Setting these variables in any other
-+URLconf will have no effect.
-+
-+See the documentation on :ref:`customizing error views
-+<customizing-error-views>` for more details.
-+
- handler404
- ----------
- 
-@@ -275,19 +304,6 @@ value should suffice.
- .. versionchanged:: 1.2
-     Previous versions of Django only accepted strings representing import paths.
- 
--include
---------
--
--.. function:: include(<module or pattern_list>)
--
--A function that takes a full Python import path to another URLconf module that
--should be "included" in this place.
--
--:func:`include` also accepts as an argument an iterable that returns URL
--patterns.
--
--See `Including other URLconfs`_ below.
--
- Notes on capturing text in URLs
- ===============================
- 
-@@ -420,8 +436,8 @@ directly the pattern list as returned by `patterns`_ instead. For example::
-     from django.conf.urls.defaults import *
- 
-     extra_patterns = patterns('',
--        url(r'reports/(?P<id>\d+)/$', 'credit.views.report', name='credit-reports'),
--        url(r'charge/$', 'credit.views.charge', name='credit-charge'),
-+        url(r'^reports/(?P<id>\d+)/$', 'credit.views.report', name='credit-reports'),
-+        url(r'^charge/$', 'credit.views.charge', name='credit-charge'),
-     )
- 
-     urlpatterns = patterns('',
-diff --git a/docs/topics/http/views.txt b/docs/topics/http/views.txt
-index 99359ab..83a52cb 100644
---- a/docs/topics/http/views.txt
-+++ b/docs/topics/http/views.txt
-@@ -122,6 +122,8 @@ In order to use the ``Http404`` exception to its fullest, you should create a
- template that is displayed when a 404 error is raised. This template should be
- called ``404.html`` and located in the top level of your template tree.
- 
-+.. _customizing-error-views:
-+
- Customizing error views
- =======================
- 
-diff --git a/docs/topics/i18n/internationalization.txt b/docs/topics/i18n/internationalization.txt
-index 5d50fa7..a83299c 100644
---- a/docs/topics/i18n/internationalization.txt
-+++ b/docs/topics/i18n/internationalization.txt
-@@ -477,7 +477,7 @@ for use within the translation block. Examples::
- 
- You can use multiple expressions inside a single ``blocktrans`` tag::
- 
--    {% blocktrans with book_t=book|title and author_t=author|title %}
-+    {% blocktrans with book_t=book|title author_t=author|title %}
-     This is {{ book_t }} by {{ author_t }}
-     {% endblocktrans %}
- 
-diff --git a/docs/topics/settings.txt b/docs/topics/settings.txt
-index 61ddf8c..bda51f2 100644
---- a/docs/topics/settings.txt
-+++ b/docs/topics/settings.txt
-@@ -39,7 +39,7 @@ The value of ``DJANGO_SETTINGS_MODULE`` should be in Python path syntax, e.g.
- ``mysite.settings``. Note that the settings module should be on the
- Python `import search path`_.
- 
--.. _import search path: http://diveintopython.org/getting_to_know_python/everything_is_an_object.html
-+.. _import search path: http://diveintopython.net/getting_to_know_python/everything_is_an_object.html
- 
- The django-admin.py utility
- ---------------------------
-diff --git a/docs/topics/templates.txt b/docs/topics/templates.txt
-index 83269ae..fc2cd3f 100644
---- a/docs/topics/templates.txt
-+++ b/docs/topics/templates.txt
-@@ -555,6 +555,8 @@ variable that needs escaping. When auto-escaping is on, there's no danger of
- the ``escape`` filter *double-escaping* data -- the ``escape`` filter does not
- affect auto-escaped variables.
- 
-+.. _string-literals-and-automatic-escaping:
-+
- String literals and automatic escaping
- --------------------------------------
- 
-diff --git a/docs/topics/testing.txt b/docs/topics/testing.txt
-index 0a86f0d..8262b57 100644
---- a/docs/topics/testing.txt
-+++ b/docs/topics/testing.txt
-@@ -1586,7 +1586,7 @@ skipUnlessDBFeature
- Skip the decorated test if the named database feature is *not*
- supported.
- 
--For example, the following test will not be executed if the database
-+For example, the following test will only be executed if the database
- supports transactions (e.g., it would run under PostgreSQL, but *not*
- under MySQL with MyISAM tables)::
- 
-diff --git a/tests/modeltests/validators/tests.py b/tests/modeltests/validators/tests.py
-index e585262..4bd5827 100644
---- a/tests/modeltests/validators/tests.py
-+++ b/tests/modeltests/validators/tests.py
-@@ -28,6 +28,9 @@ TEST_DATA = (
-     (validate_email, 'abc', ValidationError),
-     (validate_email, 'a @x.cz', ValidationError),
-     (validate_email, 'something@@somewhere.com', ValidationError),
-+    # Quoted-string format (CR not allowed)
-+    (validate_email, '"\\\011"@here.com', None),
-+    (validate_email, '"\\\012"@here.com', ValidationError),
- 
-     (validate_slug, 'slug-ok', None),
-     (validate_slug, 'longer-slug-still-ok', None),
-diff --git a/tests/regressiontests/httpwrappers/tests.py b/tests/regressiontests/httpwrappers/tests.py
-index 2e2932f..6aabfe6 100644
---- a/tests/regressiontests/httpwrappers/tests.py
-+++ b/tests/regressiontests/httpwrappers/tests.py
-@@ -281,3 +281,9 @@ class CookieTests(unittest.TestCase):
-         Test that a single non-standard cookie name doesn't affect all cookies. Ticket #13007.
-         """
-         self.assertTrue('good_cookie' in parse_cookie('good_cookie=yes;bad:cookie=yes').keys())
-+
-+    def test_repeated_nonstandard_keys(self):
-+        """
-+        Test that a repeated non-standard name doesn't affect all cookies. Ticket #15852
-+        """
-+        self.assertTrue('good_cookie' in parse_cookie('a,=b; a,=c; good_cookie=yes').keys())
-diff --git a/tests/regressiontests/utils/http.py b/tests/regressiontests/utils/http.py
-index 83a4a7f..666d04f 100644
---- a/tests/regressiontests/utils/http.py
-+++ b/tests/regressiontests/utils/http.py
-@@ -1,5 +1,7 @@
- from django.utils import http
- from django.utils import unittest
-+from django.http import HttpResponse, utils
-+from django.test import RequestFactory
- 
- class TestUtilsHttp(unittest.TestCase):
- 
-@@ -21,3 +23,49 @@ class TestUtilsHttp(unittest.TestCase):
-         self.assertFalse(http.same_origin('http://foo.com', 'http://foo.com.evil.com'))
-         # Different port
-         self.assertFalse(http.same_origin('http://foo.com:8000', 'http://foo.com:8001'))
-+
-+    def test_fix_IE_for_vary(self):
-+        """
-+        Regression for #16632.
-+
-+        `fix_IE_for_vary` shouldn't crash when there's no Content-Type header.
-+        """
-+
-+        # functions to generate responses
-+        def response_with_unsafe_content_type():
-+            r = HttpResponse(content_type="text/unsafe")
-+            r['Vary'] = 'Cookie'
-+            return r
-+
-+        def no_content_response_with_unsafe_content_type():
-+            # 'Content-Type' always defaulted, so delete it
-+            r = response_with_unsafe_content_type()
-+            del r['Content-Type']
-+            return r
-+
-+        # request with & without IE user agent
-+        rf = RequestFactory()
-+        request = rf.get('/')
-+        ie_request = rf.get('/', HTTP_USER_AGENT='MSIE')
-+
-+        # not IE, unsafe_content_type
-+        response = response_with_unsafe_content_type()
-+        utils.fix_IE_for_vary(request, response)
-+        self.assertTrue('Vary' in response)
-+
-+        # IE, unsafe_content_type
-+        response = response_with_unsafe_content_type()
-+        utils.fix_IE_for_vary(ie_request, response)
-+        self.assertFalse('Vary' in response)
-+
-+        # not IE, no_content
-+        response = no_content_response_with_unsafe_content_type()
-+        utils.fix_IE_for_vary(request, response)
-+        self.assertTrue('Vary' in response)
-+
-+        # IE, no_content
-+        response = no_content_response_with_unsafe_content_type()
-+        utils.fix_IE_for_vary(ie_request, response)
-+        self.assertFalse('Vary' in response)
-+
-+
diff --git a/libre/django13/diff-django_branches_releases_1.3.X-from-16771-to-17460.diff b/libre/django13/diff-django_branches_releases_1.3.X-from-16771-to-17460.diff
deleted file mode 100644
index ebbf80993..000000000
--- a/libre/django13/diff-django_branches_releases_1.3.X-from-16771-to-17460.diff
+++ /dev/null
@@ -1,1575 +0,0 @@
-Index: django/http/__init__.py
-===================================================================
---- django/http/__init__.py	(revision 16771)
-+++ django/http/__init__.py	(revision 17460)
-@@ -92,7 +92,7 @@
-         if not _cookie_allows_colon_in_names:
-             def load(self, rawdata, ignore_parse_errors=False):
-                 if ignore_parse_errors:
--                    self.bad_cookies = []
-+                    self.bad_cookies = set()
-                     self._BaseCookie__set = self._loose_set
-                 super(SimpleCookie, self).load(rawdata)
-                 if ignore_parse_errors:
-@@ -106,8 +106,8 @@
-                 try:
-                     self._strict_set(key, real_value, coded_value)
-                 except Cookie.CookieError:
--                    self.bad_cookies.append(key)
--                    dict.__setitem__(self, key, None)
-+                    self.bad_cookies.add(key)
-+                    dict.__setitem__(self, key, Cookie.Morsel())
-
-
- class CompatCookie(SimpleCookie):
-Index: django/http/utils.py
-===================================================================
---- django/http/utils.py	(revision 16771)
-+++ django/http/utils.py	(revision 17460)
-@@ -76,7 +76,8 @@
-
-     # The first part of the Content-Type field will be the MIME type,
-     # everything after ';', such as character-set, can be ignored.
--    if response['Content-Type'].split(';')[0] not in safe_mime_types:
-+    mime_type = response.get('Content-Type', '').partition(';')[0]
-+    if mime_type not in safe_mime_types:
-         try:
-             del response['Vary']
-         except KeyError:
-Index: django/db/backends/creation.py
-===================================================================
---- django/db/backends/creation.py	(revision 16771)
-+++ django/db/backends/creation.py	(revision 17460)
-@@ -374,15 +374,6 @@
-             verbosity=max(verbosity - 1, 0),
-             interactive=False,
-             database=self.connection.alias)
--
--        # One effect of calling syncdb followed by flush is that the id of the
--        # default site may or may not be 1, depending on how the sequence was
--        # reset.  If the sites app is loaded, then we coerce it.
--        from django.db.models import get_model
--        if 'django.contrib.sites' in settings.INSTALLED_APPS:
--            Site = get_model('sites', 'Site')
--            if Site is not None and Site.objects.using(self.connection.alias).count() == 1:
--                Site.objects.using(self.connection.alias).update(id=settings.SITE_ID)
-
-         from django.core.cache import get_cache
-         from django.core.cache.backends.db import BaseDatabaseCache
-Index: django/core/validators.py
-===================================================================
---- django/core/validators.py	(revision 16771)
-+++ django/core/validators.py	(revision 17460)
-@@ -147,7 +147,8 @@
-
- email_re = re.compile(
-     r"(^[-!#$%&'*+/=?^_`{}|~0-9A-Z]+(\.[-!#$%&'*+/=?^_`{}|~0-9A-Z]+)*"  # dot-atom
--    r'|^"([\001-\010\013\014\016-\037!#-\[\]-\177]|\\[\001-011\013\014\016-\177])*"' # quoted-string
-+    # quoted-string, see also http://tools.ietf.org/html/rfc2822#section-3.2.5
-+    r'|^"([\001-\010\013\014\016-\037!#-\[\]-\177]|\\[\001-\011\013\014\016-\177])*"'
-     r')@(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+[A-Z]{2,6}\.?$', re.IGNORECASE)  # domain
- validate_email = EmailValidator(email_re, _(u'Enter a valid e-mail address.'), 'invalid')
-
-Index: django/core/management/commands/shell.py
-===================================================================
---- django/core/management/commands/shell.py	(revision 16771)
-+++ django/core/management/commands/shell.py	(revision 17460)
-@@ -13,9 +13,8 @@
-
-     def ipython(self):
-         try:
--            from IPython.frontend.terminal.embed import TerminalInteractiveShell
--            shell = TerminalInteractiveShell()
--            shell.mainloop()
-+            from IPython import embed
-+            embed()
-         except ImportError:
-             # IPython < 0.11
-             # Explicitly pass an empty list as arguments, because otherwise
-Index: django/contrib/gis/db/models/sql/compiler.py
-===================================================================
---- django/contrib/gis/db/models/sql/compiler.py	(revision 16771)
-+++ django/contrib/gis/db/models/sql/compiler.py	(revision 17460)
-@@ -1,7 +1,7 @@
- from itertools import izip
--from django.db.backends.util import truncate_name
-+from django.db.backends.util import truncate_name, typecast_timestamp
- from django.db.models.sql import compiler
--from django.db.models.sql.constants import TABLE_NAME
-+from django.db.models.sql.constants import TABLE_NAME, MULTI
- from django.db.models.sql.query import get_proxied_model
-
- SQLCompiler = compiler.SQLCompiler
-@@ -194,7 +194,7 @@
-             # We resolve the rest of the columns if we're on Oracle or if
-             # the `geo_values` attribute is defined.
-             for value, field in map(None, row[index_start:], fields):
--                values.append(self.query.convert_values(value, field, connection=self.connection))
-+                values.append(self.query.convert_values(value, field, self.connection))
-         else:
-             values.extend(row[index_start:])
-         return tuple(values)
-@@ -275,4 +275,24 @@
-     pass
-
- class SQLDateCompiler(compiler.SQLDateCompiler, GeoSQLCompiler):
--    pass
-+    """
-+    This is overridden for GeoDjango to properly cast date columns, since
-+    `GeoQuery.resolve_columns` is used for spatial values.
-+    See #14648, #16757.
-+    """
-+    def results_iter(self):
-+        if self.connection.ops.oracle:
-+            from django.db.models.fields import DateTimeField
-+            fields = [DateTimeField()]
-+        else:
-+            needs_string_cast = self.connection.features.needs_datetime_string_cast
-+
-+        offset = len(self.query.extra_select)
-+        for rows in self.execute_sql(MULTI):
-+            for row in rows:
-+                date = row[offset]
-+                if self.connection.ops.oracle:
-+                    date = self.resolve_columns(row, fields)[offset]
-+                elif needs_string_cast:
-+                    date = typecast_timestamp(str(date))
-+                yield date
-Index: django/contrib/gis/db/backends/spatialite/compiler.py
-===================================================================
---- django/contrib/gis/db/backends/spatialite/compiler.py	(revision 16771)
-+++ django/contrib/gis/db/backends/spatialite/compiler.py	(revision 17460)
-@@ -1,32 +0,0 @@
--from django.db.backends.util import typecast_timestamp
--from django.db.models.sql import compiler
--from django.db.models.sql.constants import MULTI
--from django.contrib.gis.db.models.sql.compiler import GeoSQLCompiler as BaseGeoSQLCompiler
--
--SQLCompiler = compiler.SQLCompiler
--
--class GeoSQLCompiler(BaseGeoSQLCompiler, SQLCompiler):
--    pass
--
--class SQLInsertCompiler(compiler.SQLInsertCompiler, GeoSQLCompiler):
--    pass
--
--class SQLDeleteCompiler(compiler.SQLDeleteCompiler, GeoSQLCompiler):
--    pass
--
--class SQLUpdateCompiler(compiler.SQLUpdateCompiler, GeoSQLCompiler):
--    pass
--
--class SQLAggregateCompiler(compiler.SQLAggregateCompiler, GeoSQLCompiler):
--    pass
--
--class SQLDateCompiler(compiler.SQLDateCompiler, GeoSQLCompiler):
--    """
--    This is overridden for GeoDjango to properly cast date columns, see #16757.
--    """
--    def results_iter(self):
--        offset = len(self.query.extra_select)
--        for rows in self.execute_sql(MULTI):
--            for row in rows:
--                date = typecast_timestamp(str(row[offset]))
--                yield date
-Index: django/contrib/gis/db/backends/spatialite/operations.py
-===================================================================
---- django/contrib/gis/db/backends/spatialite/operations.py	(revision 16771)
-+++ django/contrib/gis/db/backends/spatialite/operations.py	(revision 17460)
-@@ -48,7 +48,7 @@
-     return (SpatiaLiteDistance(operator),)
-
- class SpatiaLiteOperations(DatabaseOperations, BaseSpatialOperations):
--    compiler_module = 'django.contrib.gis.db.backends.spatialite.compiler'
-+    compiler_module = 'django.contrib.gis.db.models.sql.compiler'
-     name = 'spatialite'
-     spatialite = True
-     version_regex = re.compile(r'^(?P<major>\d)\.(?P<minor1>\d)\.(?P<minor2>\d+)')
-Index: django/contrib/gis/db/backends/spatialite/creation.py
-===================================================================
---- django/contrib/gis/db/backends/spatialite/creation.py	(revision 16771)
-+++ django/contrib/gis/db/backends/spatialite/creation.py	(revision 17460)
-@@ -56,14 +56,6 @@
-             interactive=False,
-             database=self.connection.alias)
-
--        # One effect of calling syncdb followed by flush is that the id of the
--        # default site may or may not be 1, depending on how the sequence was
--        # reset.  If the sites app is loaded, then we coerce it.
--        from django.db.models import get_model
--        Site = get_model('sites', 'Site')
--        if Site is not None and Site.objects.using(self.connection.alias).count() == 1:
--            Site.objects.using(self.connection.alias).update(id=settings.SITE_ID)
--
-         from django.core.cache import get_cache
-         from django.core.cache.backends.db import BaseDatabaseCache
-         for cache_alias in settings.CACHES:
-Index: django/contrib/gis/tests/relatedapp/fixtures/initial_data.json.gz
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
-Index: django/contrib/gis/tests/relatedapp/tests.py
-===================================================================
---- django/contrib/gis/tests/relatedapp/tests.py	(revision 16771)
-+++ django/contrib/gis/tests/relatedapp/tests.py	(revision 17460)
-@@ -1,3 +1,4 @@
-+from datetime import date
- from django.test import TestCase
-
- from django.contrib.gis.geos import GEOSGeometry, Point, MultiPoint
-@@ -281,4 +282,11 @@
-         # evaluated as list generation swallows TypeError in CPython.
-         sql = str(qs.query)
-
-+    def test16_annotated_date_queryset(self):
-+        "Ensure annotated date querysets work if spatial backend is used.  See #14648."
-+        birth_years = [dt.year for dt in
-+                       list(Author.objects.annotate(num_books=Count('books')).dates('dob', 'year'))]
-+        birth_years.sort()
-+        self.assertEqual([1950, 1974], birth_years)
-+
-     # TODO: Related tests for KML, GML, and distance lookups.
-Index: django/contrib/gis/tests/relatedapp/models.py
-===================================================================
---- django/contrib/gis/tests/relatedapp/models.py	(revision 16771)
-+++ django/contrib/gis/tests/relatedapp/models.py	(revision 17460)
-@@ -36,6 +36,7 @@
- # These use the GeoManager but do not have any geographic fields.
- class Author(models.Model):
-     name = models.CharField(max_length=100)
-+    dob = models.DateField()
-     objects = models.GeoManager()
-
- class Article(models.Model):
-Index: django/contrib/sites/management.py
-===================================================================
---- django/contrib/sites/management.py	(revision 16771)
-+++ django/contrib/sites/management.py	(revision 17460)
-@@ -3,15 +3,34 @@
- """
-
- from django.db.models import signals
-+from django.db import connections
-+from django.db import router
- from django.contrib.sites.models import Site
- from django.contrib.sites import models as site_app
-+from django.core.management.color import no_style
-
- def create_default_site(app, created_models, verbosity, db, **kwargs):
--    if Site in created_models:
-+    # Only create the default sites in databases where Django created the table
-+    if Site in created_models and router.allow_syncdb(db, Site) :
-+        # The default settings set SITE_ID = 1, and some tests in Django's test
-+        # suite rely on this value. However, if database sequences are reused
-+        # (e.g. in the test suite after flush/syncdb), it isn't guaranteed that
-+        # the next id will be 1, so we coerce it. See #15573 and #16353. This
-+        # can also crop up outside of tests - see #15346.
-         if verbosity >= 2:
-             print "Creating example.com Site object"
--        s = Site(domain="example.com", name="example.com")
--        s.save(using=db)
-+        Site(pk=1, domain="example.com", name="example.com").save(using=db)
-+
-+        # We set an explicit pk instead of relying on auto-incrementation,
-+        # so we need to reset the database sequence.
-+        sequence_sql = connections[db].ops.sequence_reset_sql(no_style(), [Site])
-+        if sequence_sql:
-+            if verbosity >= 2:
-+                print "Resetting sequence"
-+            cursor = connections[db].cursor()
-+            for command in sequence_sql:
-+                cursor.execute(command)
-+
-     Site.objects.clear_cache()
-
- signals.post_syncdb.connect(create_default_site, sender=site_app)
-Index: django/contrib/sites/tests.py
-===================================================================
---- django/contrib/sites/tests.py	(revision 16771)
-+++ django/contrib/sites/tests.py	(revision 17460)
-@@ -15,6 +15,12 @@
-     def tearDown(self):
-         Site._meta.installed = self.old_Site_meta_installed
-
-+    def test_save_another(self):
-+        # Regression for #17415
-+        # On some backends the sequence needs reset after save with explicit ID.
-+        # Test that there is no sequence collisions by saving another site.
-+        Site(domain="example2.com", name="example2.com").save()
-+
-     def test_site_manager(self):
-         # Make sure that get_current() does not return a deleted Site object.
-         s = Site.objects.get_current()
-Index: django/contrib/admin/media/css/forms.css
-===================================================================
---- django/contrib/admin/media/css/forms.css	(revision 16771)
-+++ django/contrib/admin/media/css/forms.css	(revision 17460)
-@@ -352,9 +352,3 @@
- .empty-form {
-     display: none;
- }
--
--/* IE7 specific bug fixes */
--
--.submit-row input {
--    float: right;
--}
-\ No newline at end of file
-Index: tests/modeltests/validators/tests.py
-===================================================================
---- tests/modeltests/validators/tests.py	(revision 16771)
-+++ tests/modeltests/validators/tests.py	(revision 17460)
-@@ -28,6 +28,9 @@
-     (validate_email, 'abc', ValidationError),
-     (validate_email, 'a @x.cz', ValidationError),
-     (validate_email, 'something@@somewhere.com', ValidationError),
-+    # Quoted-string format (CR not allowed)
-+    (validate_email, '"\\\011"@here.com', None),
-+    (validate_email, '"\\\012"@here.com', ValidationError),
-
-     (validate_slug, 'slug-ok', None),
-     (validate_slug, 'longer-slug-still-ok', None),
-Index: tests/regressiontests/utils/http.py
-===================================================================
---- tests/regressiontests/utils/http.py	(revision 16771)
-+++ tests/regressiontests/utils/http.py	(revision 17460)
-@@ -1,5 +1,7 @@
- from django.utils import http
- from django.utils import unittest
-+from django.http import HttpResponse, utils
-+from django.test import RequestFactory
-
- class TestUtilsHttp(unittest.TestCase):
-
-@@ -21,3 +23,49 @@
-         self.assertFalse(http.same_origin('http://foo.com', 'http://foo.com.evil.com'))
-         # Different port
-         self.assertFalse(http.same_origin('http://foo.com:8000', 'http://foo.com:8001'))
-+
-+    def test_fix_IE_for_vary(self):
-+        """
-+        Regression for #16632.
-+
-+        `fix_IE_for_vary` shouldn't crash when there's no Content-Type header.
-+        """
-+
-+        # functions to generate responses
-+        def response_with_unsafe_content_type():
-+            r = HttpResponse(content_type="text/unsafe")
-+            r['Vary'] = 'Cookie'
-+            return r
-+
-+        def no_content_response_with_unsafe_content_type():
-+            # 'Content-Type' always defaulted, so delete it
-+            r = response_with_unsafe_content_type()
-+            del r['Content-Type']
-+            return r
-+
-+        # request with & without IE user agent
-+        rf = RequestFactory()
-+        request = rf.get('/')
-+        ie_request = rf.get('/', HTTP_USER_AGENT='MSIE')
-+
-+        # not IE, unsafe_content_type
-+        response = response_with_unsafe_content_type()
-+        utils.fix_IE_for_vary(request, response)
-+        self.assertTrue('Vary' in response)
-+
-+        # IE, unsafe_content_type
-+        response = response_with_unsafe_content_type()
-+        utils.fix_IE_for_vary(ie_request, response)
-+        self.assertFalse('Vary' in response)
-+
-+        # not IE, no_content
-+        response = no_content_response_with_unsafe_content_type()
-+        utils.fix_IE_for_vary(request, response)
-+        self.assertTrue('Vary' in response)
-+
-+        # IE, no_content
-+        response = no_content_response_with_unsafe_content_type()
-+        utils.fix_IE_for_vary(ie_request, response)
-+        self.assertFalse('Vary' in response)
-+
-+
-Index: tests/regressiontests/httpwrappers/tests.py
-===================================================================
---- tests/regressiontests/httpwrappers/tests.py	(revision 16771)
-+++ tests/regressiontests/httpwrappers/tests.py	(revision 17460)
-@@ -281,3 +281,9 @@
-         Test that a single non-standard cookie name doesn't affect all cookies. Ticket #13007.
-         """
-         self.assertTrue('good_cookie' in parse_cookie('good_cookie=yes;bad:cookie=yes').keys())
-+
-+    def test_repeated_nonstandard_keys(self):
-+        """
-+        Test that a repeated non-standard name doesn't affect all cookies. Ticket #15852
-+        """
-+        self.assertTrue('good_cookie' in parse_cookie('a,=b; a,=c; good_cookie=yes').keys())
-Index: docs/index.txt
-===================================================================
---- docs/index.txt	(revision 16771)
-+++ docs/index.txt	(revision 17460)
-@@ -28,7 +28,7 @@
- .. _archives of the django-users mailing list: http://groups.google.com/group/django-users/
- .. _post a question: http://groups.google.com/group/django-users/
- .. _#django IRC channel: irc://irc.freenode.net/django
--.. _IRC logs: http://botland.oebfare.com/logger/django/
-+.. _IRC logs: http://django-irc-logs.com/
- .. _ticket tracker: http://code.djangoproject.com/
-
- First steps
-Index: docs/intro/tutorial01.txt
-===================================================================
---- docs/intro/tutorial01.txt	(revision 16771)
-+++ docs/intro/tutorial01.txt	(revision 17460)
-@@ -59,7 +59,7 @@
-    can be run as a program. To do this, open Terminal.app and navigate (using
-    the ``cd`` command) to the directory where :doc:`django-admin.py
-    </ref/django-admin>` is installed, then run the command
--   ``chmod +x django-admin.py``.
-+   ``sudo chmod +x django-admin.py``.
-
- .. note::
-
-@@ -692,10 +692,9 @@
-
- For more information on model relations, see :doc:`Accessing related objects
- </ref/models/relations>`. For more on how to use double underscores to perform
--field lookups via the API, see `Field lookups`__. For full details on the
--database API, see our :doc:`Database API reference </topics/db/queries>`.
-+field lookups via the API, see :ref:`Field lookups <field-lookups-intro>`. For
-+full details on the database API, see our :doc:`Database API reference
-+</topics/db/queries>`.
-
--__ http://docs.djangoproject.com/en/1.2/topics/db/queries/#field-lookups
--
- When you're comfortable with the API, read :doc:`part 2 of this tutorial
- </intro/tutorial02>` to get Django's automatic admin working.
-Index: docs/intro/tutorial02.txt
-===================================================================
---- docs/intro/tutorial02.txt	(revision 16771)
-+++ docs/intro/tutorial02.txt	(revision 17460)
-@@ -40,22 +40,22 @@
-
-       .. parsed-literal::
-
--          from django.conf.urls.defaults import *
-+          from django.conf.urls.defaults import patterns, include, url
-
-           # Uncomment the next two lines to enable the admin:
-           **from django.contrib import admin**
-           **admin.autodiscover()**
-
-           urlpatterns = patterns('',
--              # Example:
--              # (r'^mysite/', include('mysite.foo.urls')),
-+              # Examples:
-+              # url(r'^$', 'mysite.views.home', name='home'),
-+              # url(r'^mysite/', include('mysite.foo.urls')),
-
--              # Uncomment the admin/doc line below and add 'django.contrib.admindocs'
--              # to INSTALLED_APPS to enable admin documentation:
--              # (r'^admin/doc/', include('django.contrib.admindocs.urls')),
-+              # Uncomment the admin/doc line below to enable admin documentation:
-+              # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
-
-               # Uncomment the next line to enable the admin:
--              **(r'^admin/', include(admin.site.urls)),**
-+              **url(r'^admin/', include(admin.site.urls)),**
-           )
-
-       (The bold lines are the ones that needed to be uncommented.)
-Index: docs/intro/tutorial03.txt
-===================================================================
---- docs/intro/tutorial03.txt	(revision 16771)
-+++ docs/intro/tutorial03.txt	(revision 17460)
-@@ -78,17 +78,17 @@
-
- Time for an example. Edit ``mysite/urls.py`` so it looks like this::
-
--    from django.conf.urls.defaults import *
-+    from django.conf.urls.defaults import patterns, include, url
-
-     from django.contrib import admin
-     admin.autodiscover()
-
-     urlpatterns = patterns('',
--        (r'^polls/$', 'polls.views.index'),
--        (r'^polls/(?P<poll_id>\d+)/$', 'polls.views.detail'),
--        (r'^polls/(?P<poll_id>\d+)/results/$', 'polls.views.results'),
--        (r'^polls/(?P<poll_id>\d+)/vote/$', 'polls.views.vote'),
--        (r'^admin/', include(admin.site.urls)),
-+        url(r'^polls/$', 'polls.views.index'),
-+        url(r'^polls/(?P<poll_id>\d+)/$', 'polls.views.detail'),
-+        url(r'^polls/(?P<poll_id>\d+)/results/$', 'polls.views.results'),
-+        url(r'^polls/(?P<poll_id>\d+)/vote/$', 'polls.views.vote'),
-+        url(r'^admin/', include(admin.site.urls)),
-     )
-
- This is worth a review. When somebody requests a page from your Web site -- say,
-@@ -112,7 +112,7 @@
- -- unless you have a sick sense of humor, in which case you can do something
- like this::
-
--    (r'^polls/latest\.php$', 'polls.views.index'),
-+    url(r'^polls/latest\.php$', 'polls.views.index'),
-
- But, don't do that. It's silly.
-
-@@ -357,23 +357,24 @@
- Write a 404 (page not found) view
- =================================
-
--When you raise :exc:`~django.http.Http404` from within a view, Django will load
--a special view devoted to handling 404 errors. It finds it by looking for the
--variable ``handler404``, which is a string in Python dotted syntax -- the same
--format the normal URLconf callbacks use. A 404 view itself has nothing special:
--It's just a normal view.
-+When you raise :exc:`~django.http.Http404` from within a view, Django
-+will load a special view devoted to handling 404 errors. It finds it
-+by looking for the variable ``handler404`` in your root URLconf (and
-+only in your root URLconf; setting ``handler404`` anywhere else will
-+have no effect), which is a string in Python dotted syntax -- the same
-+format the normal URLconf callbacks use. A 404 view itself has nothing
-+special: It's just a normal view.
-
--You normally won't have to bother with writing 404 views. By default, URLconfs
--have the following line up top::
-+You normally won't have to bother with writing 404 views. If you don't set
-+``handler404``, the built-in view :func:`django.views.defaults.page_not_found`
-+is used by default. In this case, you still have one obligation: To create a
-+``404.html`` template in the root of your template directory. The default 404
-+view will use that template for all 404 errors. If :setting:`DEBUG` is set to
-+``False`` (in your settings module) and if you didn't create a ``404.html``
-+file, an ``Http500`` is raised instead.  So remember to create a ``404.html``.
-
--    from django.conf.urls.defaults import *
-+A couple more things to note about 404 views:
-
--That takes care of setting ``handler404`` in the current module. As you can see
--in ``django/conf/urls/defaults.py``, ``handler404`` is set to
--:func:`django.views.defaults.page_not_found` by default.
--
--Four more things to note about 404 views:
--
-     * If :setting:`DEBUG` is set to ``True`` (in your settings module) then your
-       404 view will never be used (and thus the ``404.html`` template will never
-       be rendered) because the traceback will be displayed instead.
-@@ -381,21 +382,12 @@
-     * The 404 view is also called if Django doesn't find a match after checking
-       every regular expression in the URLconf.
-
--    * If you don't define your own 404 view -- and simply use the default, which
--      is recommended -- you still have one obligation: To create a ``404.html``
--      template in the root of your template directory. The default 404 view will
--      use that template for all 404 errors.
--
--    * If :setting:`DEBUG` is set to ``False`` (in your settings module) and if
--      you didn't create a ``404.html`` file, an ``Http500`` is raised instead.
--      So remember to create a ``404.html``.
--
- Write a 500 (server error) view
- ===============================
-
--Similarly, URLconfs may define a ``handler500``, which points to a view to call
--in case of server errors. Server errors happen when you have runtime errors in
--view code.
-+Similarly, your root URLconf may define a ``handler500``, which points
-+to a view to call in case of server errors. Server errors happen when
-+you have runtime errors in view code.
-
- Use the template system
- =======================
-@@ -432,10 +424,10 @@
- the URLconf, you may notice there's a fair bit of redundancy in it::
-
-     urlpatterns = patterns('',
--        (r'^polls/$', 'polls.views.index'),
--        (r'^polls/(?P<poll_id>\d+)/$', 'polls.views.detail'),
--        (r'^polls/(?P<poll_id>\d+)/results/$', 'polls.views.results'),
--        (r'^polls/(?P<poll_id>\d+)/vote/$', 'polls.views.vote'),
-+        url(r'^polls/$', 'polls.views.index'),
-+        url(r'^polls/(?P<poll_id>\d+)/$', 'polls.views.detail'),
-+        url(r'^polls/(?P<poll_id>\d+)/results/$', 'polls.views.results'),
-+        url(r'^polls/(?P<poll_id>\d+)/vote/$', 'polls.views.vote'),
-     )
-
- Namely, ``polls.views`` is in every callback.
-@@ -445,10 +437,10 @@
- first argument to :func:`~django.conf.urls.defaults.patterns`, like so::
-
-     urlpatterns = patterns('polls.views',
--        (r'^polls/$', 'index'),
--        (r'^polls/(?P<poll_id>\d+)/$', 'detail'),
--        (r'^polls/(?P<poll_id>\d+)/results/$', 'results'),
--        (r'^polls/(?P<poll_id>\d+)/vote/$', 'vote'),
-+        url(r'^polls/$', 'index'),
-+        url(r'^polls/(?P<poll_id>\d+)/$', 'detail'),
-+        url(r'^polls/(?P<poll_id>\d+)/results/$', 'results'),
-+        url(r'^polls/(?P<poll_id>\d+)/vote/$', 'vote'),
-     )
-
- This is functionally identical to the previous formatting. It's just a bit
-@@ -459,20 +451,20 @@
- :func:`~django.conf.urls.defaults.patterns`. Your full ``mysite/urls.py`` might
- now look like this::
-
--    from django.conf.urls.defaults import *
-+    from django.conf.urls.defaults import patterns, include, url
-
-     from django.contrib import admin
-     admin.autodiscover()
-
-     urlpatterns = patterns('polls.views',
--        (r'^polls/$', 'index'),
--        (r'^polls/(?P<poll_id>\d+)/$', 'detail'),
--        (r'^polls/(?P<poll_id>\d+)/results/$', 'results'),
--        (r'^polls/(?P<poll_id>\d+)/vote/$', 'vote'),
-+        url(r'^polls/$', 'index'),
-+        url(r'^polls/(?P<poll_id>\d+)/$', 'detail'),
-+        url(r'^polls/(?P<poll_id>\d+)/results/$', 'results'),
-+        url(r'^polls/(?P<poll_id>\d+)/vote/$', 'vote'),
-     )
-
-     urlpatterns += patterns('',
--        (r'^admin/', include(admin.site.urls)),
-+        url(r'^admin/', include(admin.site.urls)),
-     )
-
- Decoupling the URLconfs
-@@ -502,8 +494,8 @@
-     admin.autodiscover()
-
-     urlpatterns = patterns('',
--        (r'^polls/', include('polls.urls')),
--        (r'^admin/', include(admin.site.urls)),
-+        url(r'^polls/', include('polls.urls')),
-+        url(r'^admin/', include(admin.site.urls)),
-     )
-
- :func:`~django.conf.urls.defaults.include` simply references another URLconf.
-@@ -526,13 +518,13 @@
- lines registering the admin site. Your ``polls/urls.py`` file should now look like
- this::
-
--    from django.conf.urls.defaults import *
-+    from django.conf.urls.defaults import patterns, include, url
-
-     urlpatterns = patterns('polls.views',
--        (r'^$', 'index'),
--        (r'^(?P<poll_id>\d+)/$', 'detail'),
--        (r'^(?P<poll_id>\d+)/results/$', 'results'),
--        (r'^(?P<poll_id>\d+)/vote/$', 'vote'),
-+        url(r'^$', 'index'),
-+        url(r'^(?P<poll_id>\d+)/$', 'detail'),
-+        url(r'^(?P<poll_id>\d+)/results/$', 'results'),
-+        url(r'^(?P<poll_id>\d+)/vote/$', 'vote'),
-     )
-
- The idea behind :func:`~django.conf.urls.defaults.include` and URLconf
-Index: docs/intro/index.txt
-===================================================================
---- docs/intro/index.txt	(revision 16771)
-+++ docs/intro/index.txt	(revision 17460)
-@@ -31,6 +31,6 @@
-
-     .. _python: http://python.org/
-     .. _list of Python resources for non-programmers: http://wiki.python.org/moin/BeginnersGuide/NonProgrammers
--    .. _dive into python: http://diveintopython.org/
-+    .. _dive into python: http://diveintopython.net/
-     .. _dead-tree version: http://www.amazon.com/exec/obidos/ASIN/1590593561/ref=nosim/jacobian20
-     .. _books about Python: http://wiki.python.org/moin/PythonBooks
-\ No newline at end of file
-Index: docs/intro/tutorial04.txt
-===================================================================
---- docs/intro/tutorial04.txt	(revision 16771)
-+++ docs/intro/tutorial04.txt	(revision 17460)
-@@ -218,13 +218,13 @@
- First, open the ``polls/urls.py`` URLconf. It looks like this, according to the
- tutorial so far::
-
--    from django.conf.urls.defaults import *
-+    from django.conf.urls.defaults import patterns, include, url
-
-     urlpatterns = patterns('polls.views',
--        (r'^$', 'index'),
--        (r'^(?P<poll_id>\d+)/$', 'detail'),
--        (r'^(?P<poll_id>\d+)/results/$', 'results'),
--        (r'^(?P<poll_id>\d+)/vote/$', 'vote'),
-+        url(r'^$', 'index'),
-+        url(r'^(?P<poll_id>\d+)/$', 'detail'),
-+        url(r'^(?P<poll_id>\d+)/results/$', 'results'),
-+        url(r'^(?P<poll_id>\d+)/vote/$', 'vote'),
-     )
-
- Change it like so::
-@@ -234,12 +234,12 @@
-     from polls.models import Poll
-
-     urlpatterns = patterns('',
--        (r'^$',
-+        url(r'^$',
-             ListView.as_view(
-                 queryset=Poll.objects.order_by('-pub_date')[:5],
-                 context_object_name='latest_poll_list',
-                 template_name='polls/index.html')),
--        (r'^(?P<pk>\d+)/$',
-+        url(r'^(?P<pk>\d+)/$',
-             DetailView.as_view(
-                 model=Poll,
-                 template_name='polls/detail.html')),
-@@ -248,7 +248,7 @@
-                 model=Poll,
-                 template_name='polls/results.html'),
-             name='poll_results'),
--        (r'^(?P<poll_id>\d+)/vote/$', 'polls.views.vote'),
-+        url(r'^(?P<poll_id>\d+)/vote/$', 'polls.views.vote'),
-     )
-
- We're using two generic views here:
-Index: docs/internals/release-process.txt
-===================================================================
---- docs/internals/release-process.txt	(revision 16771)
-+++ docs/internals/release-process.txt	(revision 17460)
-@@ -99,6 +99,13 @@
-     * Security fixes will be applied to the current trunk and the previous two
-       minor releases.
-
-+* Documentation fixes will generally be more freely backported to the last
-+  release branch (at the discretion of the committer), and don't need to meet
-+  the "critical fixes only" bar as it's highly advantageous to have the docs
-+  for the last release be up-to-date and correct, and the downside of
-+  backporting (risk of introducing regressions) is much less of a concern
-+  with doc fixes.
-+
- As a concrete example, consider a moment in time halfway between the release of
- Django 1.3 and 1.4. At this point in time:
-
-@@ -111,6 +118,9 @@
-       ``1.2.X`` branch. Security fixes will trigger the release of ``1.3.1``,
-       ``1.2.1``, etc.
-
-+* Documentation fixes will be applied to trunk, and if easily backported, to
-+  the ``1.3.X`` branch.
-+
- .. _release-process:
-
- Release process
-Index: docs/internals/deprecation.txt
-===================================================================
---- docs/internals/deprecation.txt	(revision 16771)
-+++ docs/internals/deprecation.txt	(revision 17460)
-@@ -177,6 +177,12 @@
-           required to end with a trailing slash to ensure there is a consistent
-           way to combine paths in templates.
-
-+        * Translations located under the so-called *project path* will be
-+          ignored during the translation building process performed at runtime.
-+          The :setting:`LOCALE_PATHS` setting can be used for the same task by
-+          including the filesystem path to a ``locale`` directory containing
-+          non-app-specific translations in its value.
-+
-     * 2.0
-         * ``django.views.defaults.shortcut()``. This function has been moved
-           to ``django.contrib.contenttypes.views.shortcut()`` as part of the
-Index: docs/howto/deployment/modpython.txt
-===================================================================
---- docs/howto/deployment/modpython.txt	(revision 16771)
-+++ docs/howto/deployment/modpython.txt	(revision 17460)
-@@ -293,11 +293,14 @@
- arrangement. You're responsible for setting up Apache, or whichever media
- server you're using, to serve the admin files.
-
--The admin files live in (:file:`django/contrib/admin/static/admin`) of the
-+The admin files live in (:file:`django/contrib/admin/media/admin`) of the
- Django distribution.
-
--We **strongly** recommend using :mod:`django.contrib.staticfiles` to handle
--the admin files, but here are two other approaches:
-+We **strongly** recommend using :mod:`django.contrib.staticfiles` to handle the
-+admin files (this means using the :djadmin:`collectstatic` management command
-+to collect the static files in :setting:`STATIC_ROOT`, and then configuring
-+your webserver to serve :setting:`STATIC_ROOT` at :setting:`STATIC_URL`), but
-+here are two other approaches:
-
-     1. Create a symbolic link to the admin static files from within your
-        document root.
-Index: docs/howto/deployment/modwsgi.txt
-===================================================================
---- docs/howto/deployment/modwsgi.txt	(revision 16771)
-+++ docs/howto/deployment/modwsgi.txt	(revision 17460)
-@@ -127,11 +127,14 @@
- arrangement. You're responsible for setting up Apache, or whichever media
- server you're using, to serve the admin files.
-
--The admin files live in (:file:`django/contrib/admin/static/admin`) of the
-+The admin files live in (:file:`django/contrib/admin/media/admin`) of the
- Django distribution.
-
--We **strongly** recommend using :mod:`django.contrib.staticfiles` to handle
--the admin files, but here are two other approaches:
-+We **strongly** recommend using :mod:`django.contrib.staticfiles` to handle the
-+admin files (this means using the :djadmin:`collectstatic` management command
-+to collect the static files in :setting:`STATIC_ROOT`, and then configuring
-+your webserver to serve :setting:`STATIC_ROOT` at :setting:`STATIC_URL`), but
-+here are two other approaches:
-
-     1. Create a symbolic link to the admin static files from within your
-        document root.
-Index: docs/topics/auth.txt
-===================================================================
---- docs/topics/auth.txt	(revision 16771)
-+++ docs/topics/auth.txt	(revision 17460)
-@@ -1251,17 +1251,20 @@
-         ...
-         class Meta:
-             permissions = (
--                ("can_view", "Can see available tasks"),
--                ("can_change_status", "Can change the status of tasks"),
--                ("can_close", "Can remove a task by setting its status as closed"),
-+                ("view_task", "Can see available tasks"),
-+                ("change_task_status", "Can change the status of tasks"),
-+                ("close_task", "Can remove a task by setting its status as closed"),
-             )
-
- The only thing this does is create those extra permissions when you run
- :djadmin:`manage.py syncdb <syncdb>`. Your code is in charge of checking the
- value of these permissions when an user is trying to access the functionality
- provided by the application (viewing tasks, changing the status of tasks,
--closing tasks.)
-+closing tasks.) Continuing the above example, the following checks if a user may
-+view tasks::
-
-+    user.has_perm('app.view_task')
-+
- API reference
- -------------
-
-Index: docs/topics/http/urls.txt
-===================================================================
---- docs/topics/http/urls.txt	(revision 16771)
-+++ docs/topics/http/urls.txt	(revision 17460)
-@@ -54,6 +54,10 @@
-        :class:`~django.http.HttpRequest` as its first argument and any values
-        captured in the regex as remaining arguments.
-
-+    5. If no regex matches, or if an exception is raised during any
-+       point in this process, Django invokes an appropriate
-+       error-handling view. See `Error handling`_ below.
-+
- Example
- =======
-
-@@ -99,10 +103,10 @@
-     * ``/articles/2003`` would not match any of these patterns, because each
-       pattern requires that the URL end with a slash.
-
--    * ``/articles/2003/03/3/`` would match the final pattern. Django would call
--      the function ``news.views.article_detail(request, '2003', '03', '3')``.
-+    * ``/articles/2003/03/03/`` would match the final pattern. Django would call
-+      the function ``news.views.article_detail(request, '2003', '03', '03')``.
-
--.. _Dive Into Python's explanation: http://diveintopython.org/regular_expressions/street_addresses.html#re.matching.2.3
-+.. _Dive Into Python's explanation: http://diveintopython.net/regular_expressions/street_addresses.html#re.matching.2.3
-
- Named groups
- ============
-@@ -123,7 +127,7 @@
-         (r'^articles/2003/$', 'news.views.special_case_2003'),
-         (r'^articles/(?P<year>\d{4})/$', 'news.views.year_archive'),
-         (r'^articles/(?P<year>\d{4})/(?P<month>\d{2})/$', 'news.views.month_archive'),
--        (r'^articles/(?P<year>\d{4})/(?P<month>\d{2})/(?P<day>\d+)/$', 'news.views.article_detail'),
-+        (r'^articles/(?P<year>\d{4})/(?P<month>\d{2})/(?P<day>\d{2})/$', 'news.views.article_detail'),
-     )
-
- This accomplishes exactly the same thing as the previous example, with one
-@@ -134,8 +138,8 @@
-       ``news.views.month_archive(request, year='2005', month='03')``, instead
-       of ``news.views.month_archive(request, '2005', '03')``.
-
--    * A request to ``/articles/2003/03/3/`` would call the function
--      ``news.views.article_detail(request, year='2003', month='03', day='3')``.
-+    * A request to ``/articles/2003/03/03/`` would call the function
-+      ``news.views.article_detail(request, year='2003', month='03', day='03')``.
-
- In practice, this means your URLconfs are slightly more explicit and less prone
- to argument-order bugs -- and you can reorder the arguments in your views'
-@@ -246,6 +250,31 @@
- ``patterns()`` and is only relevant when you're passing a string as the
- ``view`` parameter.
-
-+include
-+-------
-+
-+.. function:: include(<module or pattern_list>)
-+
-+A function that takes a full Python import path to another URLconf module that
-+should be "included" in this place.
-+
-+:func:`include` also accepts as an argument an iterable that returns URL
-+patterns.
-+
-+See `Including other URLconfs`_ below.
-+
-+Error handling
-+==============
-+
-+When Django can't find a regex matching the requested URL, or when an
-+exception is raised, Django will invoke an error-handling view. The
-+views to use for these cases are specified by two variables which can
-+be set in your root URLconf. Setting these variables in any other
-+URLconf will have no effect.
-+
-+See the documentation on :ref:`customizing error views
-+<customizing-error-views>` for more details.
-+
- handler404
- ----------
-
-@@ -275,19 +304,6 @@
- .. versionchanged:: 1.2
-     Previous versions of Django only accepted strings representing import paths.
-
--include
---------
--
--.. function:: include(<module or pattern_list>)
--
--A function that takes a full Python import path to another URLconf module that
--should be "included" in this place.
--
--:func:`include` also accepts as an argument an iterable that returns URL
--patterns.
--
--See `Including other URLconfs`_ below.
--
- Notes on capturing text in URLs
- ===============================
-
-@@ -420,8 +436,8 @@
-     from django.conf.urls.defaults import *
-
-     extra_patterns = patterns('',
--        url(r'reports/(?P<id>\d+)/$', 'credit.views.report', name='credit-reports'),
--        url(r'charge/$', 'credit.views.charge', name='credit-charge'),
-+        url(r'^reports/(?P<id>\d+)/$', 'credit.views.report', name='credit-reports'),
-+        url(r'^charge/$', 'credit.views.charge', name='credit-charge'),
-     )
-
-     urlpatterns = patterns('',
-Index: docs/topics/http/views.txt
-===================================================================
---- docs/topics/http/views.txt	(revision 16771)
-+++ docs/topics/http/views.txt	(revision 17460)
-@@ -122,6 +122,8 @@
- template that is displayed when a 404 error is raised. This template should be
- called ``404.html`` and located in the top level of your template tree.
-
-+.. _customizing-error-views:
-+
- Customizing error views
- =======================
-
-Index: docs/topics/i18n/internationalization.txt
-===================================================================
---- docs/topics/i18n/internationalization.txt	(revision 16771)
-+++ docs/topics/i18n/internationalization.txt	(revision 17460)
-@@ -477,7 +477,7 @@
-
- You can use multiple expressions inside a single ``blocktrans`` tag::
-
--    {% blocktrans with book_t=book|title and author_t=author|title %}
-+    {% blocktrans with book_t=book|title author_t=author|title %}
-     This is {{ book_t }} by {{ author_t }}
-     {% endblocktrans %}
-
-Index: docs/topics/cache.txt
-===================================================================
---- docs/topics/cache.txt	(revision 16771)
-+++ docs/topics/cache.txt	(revision 17460)
-@@ -99,8 +99,9 @@
-       on your chosen memcached binding)
-
-     * Set :setting:`LOCATION <CACHES-LOCATION>` to ``ip:port`` values,
--      where ``ip`` is the IP address of the Memcached daemon and
--      ``port`` is the port on which Memcached is running.
-+      where ``ip`` is the IP address of the Memcached daemon and ``port`` is the
-+      port on which Memcached is running, or to a ``unix:path`` value, where
-+      ``path`` is the path to a Memcached Unix socket file.
-
- In this example, Memcached is running on localhost (127.0.0.1) port 11211, using
- the ``python-memcached`` binding::
-@@ -112,6 +113,16 @@
-         }
-     }
-
-+In this example, Memcached is available through a local Unix socket file
-+:file:`/tmp/memcached.sock` using the ``python-memcached`` binding::
-+
-+    CACHES = {
-+        'default': {
-+            'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
-+            'LOCATION': 'unix:/tmp/memcached.sock',
-+        }
-+    }
-+
- One excellent feature of Memcached is its ability to share cache over multiple
- servers. This means you can run Memcached daemons on multiple machines, and the
- program will treat the group of machines as a *single* cache, without the need
-@@ -526,9 +537,10 @@
- requested, subsequent requests to that URL will use the cache.
-
- ``cache_page`` can also take an optional keyword argument, ``cache``,
--which directs the decorator to use a specific cache alias when caching view
--results. By default, the ``default`` alias will be used, but you can specify
--any cache alias you want::
-+which directs the decorator to use a specific cache (from your
-+:setting:`CACHES` setting) when caching view results. By default, the
-+``default`` cache will be used, but you can specify any cache you
-+want::
-
-     @cache_page(60 * 15, cache="special_cache")
-     def my_view(request):
-Index: docs/topics/db/models.txt
-===================================================================
---- docs/topics/db/models.txt	(revision 16771)
-+++ docs/topics/db/models.txt	(revision 17460)
-@@ -324,11 +324,10 @@
-     should work; all are optional.
-
-     For details on accessing backwards-related objects, see the
--    `Following relationships backward example`_.
--
-+    :ref:`Following relationships backward example <backwards-related-objects>`.
-+
-     For sample code, see the `Many-to-one relationship model tests`_.
-
--    .. _Following relationships backward example: http://docs.djangoproject.com/en/dev/topics/db/queries/#backwards-related-objects
-     .. _Many-to-one relationship model tests: http://code.djangoproject.com/browser/django/trunk/tests/modeltests/many_to_one
-
- Many-to-many relationships
-Index: docs/topics/db/sql.txt
-===================================================================
---- docs/topics/db/sql.txt	(revision 16771)
-+++ docs/topics/db/sql.txt	(revision 17460)
-@@ -236,6 +236,30 @@
-     # Your code here...
-     transaction.commit_unless_managed(using='my_db_alias')
-
-+By default, the Python DB API will return results without their field
-+names, which means you end up with a ``list`` of values, rather than a
-+``dict``. At a small performance cost, you can return results as a
-+``dict`` by using something like this::
-+
-+    def dictfetchall(cursor):
-+        "Returns all rows from a cursor as a dict"
-+        desc = cursor.description
-+        return [
-+            dict(zip([col[0] for col in desc], row))
-+            for row in cursor.fetchall()
-+        ]
-+
-+Here is an example of the difference between the two::
-+
-+    >>> cursor.execute("SELECT id, parent_id from test LIMIT 2");
-+    >>> cursor.fetchall()
-+    ((54360982L, None), (54360880L, None))
-+
-+    >>> cursor.execute("SELECT id, parent_id from test LIMIT 2");
-+    >>> dictfetchall(cursor)
-+    [{'parent_id': None, 'id': 54360982L}, {'parent_id': None, 'id': 54360880L}]
-+
-+
- .. _transactions-and-raw-sql:
-
- Transactions and raw SQL
-Index: docs/topics/forms/modelforms.txt
-===================================================================
---- docs/topics/forms/modelforms.txt	(revision 16771)
-+++ docs/topics/forms/modelforms.txt	(revision 17460)
-@@ -332,14 +332,18 @@
- .. note::
-
-     If you specify ``fields`` or ``exclude`` when creating a form with
--    ``ModelForm``, then the fields that are not in the resulting form will not
--    be set by the form's ``save()`` method. Django will prevent any attempt to
--    save an incomplete model, so if the model does not allow the missing fields
--    to be empty, and does not provide a default value for the missing fields,
--    any attempt to ``save()`` a ``ModelForm`` with missing fields will fail.
--    To avoid this failure, you must instantiate your model with initial values
--    for the missing, but required fields::
-+    ``ModelForm``, then the fields that are not in the resulting form
-+    will not be set by the form's ``save()`` method. Also, if you
-+    manually add the excluded fields back to the form, they will not
-+    be initialized from the model instance.
-
-+    Django will prevent any attempt to save an incomplete model, so if
-+    the model does not allow the missing fields to be empty, and does
-+    not provide a default value for the missing fields, any attempt to
-+    ``save()`` a ``ModelForm`` with missing fields will fail.  To
-+    avoid this failure, you must instantiate your model with initial
-+    values for the missing, but required fields::
-+
-         author = Author(title='Mr')
-         form = PartialAuthorForm(request.POST, instance=author)
-         form.save()
-@@ -633,6 +637,12 @@
- instance won't be saved to the database and won't be included in the return
- value (``instances``, in the above example).
-
-+When fields are missing from the form (for example because they have
-+been excluded), these fields will not be set by the ``save()``
-+method. You can find more information about this restriction, which
-+also holds for regular ``ModelForms``, in `Using a subset of fields on
-+the form`_.
-+
- Pass ``commit=False`` to return the unsaved model instances::
-
-     # don't save to the database
-Index: docs/topics/class-based-views.txt
-===================================================================
---- docs/topics/class-based-views.txt	(revision 16771)
-+++ docs/topics/class-based-views.txt	(revision 17460)
-@@ -380,7 +380,7 @@
-     class PublisherBookListView(ListView):
-
-         context_object_name = "book_list"
--        template_name = "books/books_by_publisher.html",
-+        template_name = "books/books_by_publisher.html"
-
-         def get_queryset(self):
-             publisher = get_object_or_404(Publisher, name__iexact=self.args[0])
-@@ -396,7 +396,7 @@
-     class PublisherBookListView(ListView):
-
-         context_object_name = "book_list"
--        template_name = "books/books_by_publisher.html",
-+        template_name = "books/books_by_publisher.html"
-
-         def get_queryset(self):
-             self.publisher = get_object_or_404(Publisher, name__iexact=self.args[0])
-Index: docs/topics/testing.txt
-===================================================================
---- docs/topics/testing.txt	(revision 16771)
-+++ docs/topics/testing.txt	(revision 17460)
-@@ -1586,7 +1586,7 @@
- Skip the decorated test if the named database feature is *not*
- supported.
-
--For example, the following test will not be executed if the database
-+For example, the following test will only be executed if the database
- supports transactions (e.g., it would run under PostgreSQL, but *not*
- under MySQL with MyISAM tables)::
-
-Index: docs/topics/templates.txt
-===================================================================
---- docs/topics/templates.txt	(revision 16771)
-+++ docs/topics/templates.txt	(revision 17460)
-@@ -555,6 +555,8 @@
- the ``escape`` filter *double-escaping* data -- the ``escape`` filter does not
- affect auto-escaped variables.
-
-+.. _string-literals-and-automatic-escaping:
-+
- String literals and automatic escaping
- --------------------------------------
-
-Index: docs/topics/settings.txt
-===================================================================
---- docs/topics/settings.txt	(revision 16771)
-+++ docs/topics/settings.txt	(revision 17460)
-@@ -39,7 +39,7 @@
- ``mysite.settings``. Note that the settings module should be on the
- Python `import search path`_.
-
--.. _import search path: http://diveintopython.org/getting_to_know_python/everything_is_an_object.html
-+.. _import search path: http://diveintopython.net/getting_to_know_python/everything_is_an_object.html
-
- The django-admin.py utility
- ---------------------------
-Index: docs/releases/1.2.6.txt
-===================================================================
---- docs/releases/1.2.6.txt	(revision 0)
-+++ docs/releases/1.2.6.txt	(revision 17460)
-@@ -0,0 +1,16 @@
-+==========================
-+Django 1.2.6 release notes
-+==========================
-+
-+*September 9, 2011*
-+
-+Welcome to Django 1.2.6!
-+
-+This is the sixth bugfix/security release in the Django 1.2 series, fixing
-+several security issues present in Django 1.2.5.  Django 1.2.6 is a
-+recommended upgrade for all users of any Django release in the 1.2.X series.
-+
-+For a full list of issues addressed in this release, see the `security
-+advisory`_.
-+
-+.. _security advisory: https://www.djangoproject.com/weblog/2011/sep/09/security-releases-issued/
-Index: docs/releases/1.2.7.txt
-===================================================================
---- docs/releases/1.2.7.txt	(revision 0)
-+++ docs/releases/1.2.7.txt	(revision 17460)
-@@ -0,0 +1,16 @@
-+==========================
-+Django 1.2.7 release notes
-+==========================
-+
-+*September 10, 2011*
-+
-+Welcome to Django 1.2.7!
-+
-+This is the seventh bugfix/security release in the Django 1.2 series. It
-+replaces Django 1.2.6 due to problems with the 1.2.6 release tarball.
-+Django 1.2.7 is a recommended upgrade for all users of any Django release in
-+the 1.2.X series.
-+
-+For more information, see the `release advisory`_.
-+
-+.. _release advisory: https://www.djangoproject.com/weblog/2011/sep/10/127/
-Index: docs/releases/index.txt
-===================================================================
---- docs/releases/index.txt	(revision 16771)
-+++ docs/releases/index.txt	(revision 17460)
-@@ -19,6 +19,7 @@
- .. toctree::
-    :maxdepth: 1
-
-+   1.3.1
-    1.3
-
- 1.2 release
-@@ -26,6 +27,8 @@
- .. toctree::
-    :maxdepth: 1
-
-+   1.2.7
-+   1.2.6
-    1.2.5
-    1.2.4
-    1.2.2
-Index: docs/releases/0.95.txt
-===================================================================
---- docs/releases/0.95.txt	(revision 16771)
-+++ docs/releases/0.95.txt	(revision 17460)
-@@ -92,15 +92,15 @@
- easy checklist_ for reference when undertaking the porting operation.
-
- .. _Removing The Magic: http://code.djangoproject.com/wiki/RemovingTheMagic
--.. _checklist: http://code.djangoproject.com/wiki/MagicRemovalCheatSheet1
-+.. _checklist: http://code.djangoproject.com/wiki/MagicRemovalCheatSheet
-
- Problem reports and getting help
- ================================
-
--Need help resolving a problem with Django? The documentation in the distribution
--is also available online_ at the `Django Web site`_. The :doc:`FAQ </faq/index>`
--document is especially recommended, as it contains a number of issues that come
--up time and again.
-+Need help resolving a problem with Django? The documentation in the
-+distribution is also available :doc:`online </index>` at the `Django Web
-+site`_. The :doc:`FAQ </faq/index>` document is especially recommended, as it
-+contains a number of issues that come up time and again.
-
- For more personalized help, the `django-users`_ mailing list is a very active
- list, with more than 2,000 subscribers who can help you solve any sort of
-@@ -113,7 +113,6 @@
- Django users and developers from around the world. Friendly people are usually
- available at any hour of the day -- to help, or just to chat.
-
--.. _online: http://www.djangoproject.com/documentation/0.95/
- .. _Django Web site: http://www.djangoproject.com/
- .. _django-users: http://groups.google.com/group/django-users
-
-Index: docs/releases/0.96.txt
-===================================================================
---- docs/releases/0.96.txt	(revision 16771)
-+++ docs/releases/0.96.txt	(revision 17460)
-@@ -50,12 +50,10 @@
- maintained, and it will be removed in a future release of Django.
-
- Also, note that some features, like the new :setting:`DATABASE_OPTIONS`
--setting (see the `databases documentation`_ for details), are only
--available on the "mysql" backend, and will not be made available for
-+setting (see the :doc:`databases documentation </ref/databases>` for details),
-+are only available on the "mysql" backend, and will not be made available for
- "mysql_old".
-
--.. _databases documentation: http://www.djangoproject.com/documentation/0.96/databases/
--
- Database constraint names changed
- ---------------------------------
-
-@@ -164,11 +162,9 @@
- for most common cases. We recommend that anyone new to form handling skip the
- old forms system and start with the new.
-
--For more information about ``django.newforms``, read the `newforms
--documentation`_.
-+For more information about ``django.newforms``, read the :doc:`newforms
-+documentation </topics/forms/index>`.
-
--.. _newforms documentation: http://www.djangoproject.com/documentation/0.96/newforms/
--
- URLconf improvements
- --------------------
-
-@@ -216,20 +212,16 @@
- ------------------
-
- Django now includes a test framework so you can start transmuting fear into
--boredom (with apologies to Kent Beck). You can write tests based on doctest_
--or unittest_ and test your views with a simple test client.
-+boredom (with apologies to Kent Beck). You can write tests based on
-+:mod:`doctest` or :mod:`unittest` and test your views with a simple test client.
-
- There is also new support for "fixtures" -- initial data, stored in any of the
--supported `serialization formats`_, that will be loaded into your database at the
--start of your tests. This makes testing with real data much easier.
-+supported :doc:`serialization formats </topics/serialization>`, that will be
-+loaded into your database at the start of your tests. This makes testing with
-+real data much easier.
-
--See `the testing documentation`_ for the full details.
-+See :doc:`the testing documentation </topics/testing>` for the full details.
-
--.. _doctest: http://docs.python.org/library/doctest.html
--.. _unittest: http://docs.python.org/library/unittest.html
--.. _the testing documentation: http://www.djangoproject.com/documentation/0.96/testing/
--.. _serialization formats: http://www.djangoproject.com/documentation/0.96/serialization/
--
- Improvements to the admin interface
- -----------------------------------
-
-Index: docs/releases/1.0.1.txt
-===================================================================
---- docs/releases/1.0.1.txt	(revision 16771)
-+++ docs/releases/1.0.1.txt	(revision 17460)
-@@ -6,10 +6,10 @@
-
- This is the first "bugfix" release in the Django 1.0 series, improving
- the stability and performance of the Django 1.0 codebase. As such,
--Django 1.0.1 contains no new features (and, pursuant to `our
--compatibility policy`_, maintains backwards compatibility with Django
--1.0), but does contain a number of fixes and other
--improvements. Django 1.0.1 is a recommended upgrade for any
-+Django 1.0.1 contains no new features (and, pursuant to :doc:`our
-+compatibility policy </misc/api-stability/>`, maintains backwards
-+compatibility with Django 1.0), but does contain a number of fixes
-+and other improvements. Django 1.0.1 is a recommended upgrade for any
- development or deployment currently using or targeting Django 1.0.
-
-
-@@ -46,8 +46,9 @@
-
- * A fix to the application of autoescaping for literal strings passed
-   to the ``join`` template filter. Previously, literal strings passed
--  to ``join`` were automatically escaped, contrary to `the documented
--  behavior for autoescaping and literal strings`_. Literal strings
-+  to ``join`` were automatically escaped, contrary to :ref:`the
-+  documented behavior for autoescaping and literal strings
-+  <string-literals-and-automatic-escaping>`. Literal strings
-   passed to ``join`` are no longer automatically escaped, meaning you
-   must now manually escape them; this is an incompatibility if you
-   were relying on this bug, but not if you were relying on escaping
-@@ -60,6 +61,4 @@
-   documentation, including both corrections to existing documents and
-   expanded and new documentation.
-
--.. _our compatibility policy: http://docs.djangoproject.com/en/dev/misc/api-stability/
- .. _the Subversion log of the 1.0.X branch: http://code.djangoproject.com/log/django/branches/releases/1.0.X
--.. _the documented behavior for autoescaping and literal strings: http://docs.djangoproject.com/en/dev/topics/templates/#string-literals-and-automatic-escaping
-Index: docs/releases/1.3.1.txt
-===================================================================
---- docs/releases/1.3.1.txt	(revision 0)
-+++ docs/releases/1.3.1.txt	(revision 17460)
-@@ -0,0 +1,16 @@
-+==========================
-+Django 1.3.1 release notes
-+==========================
-+
-+*September 9, 2011*
-+
-+Welcome to Django 1.3.1!
-+
-+This is the first security release in the Django 1.3 series, fixing several
-+security issues in Django 1.3.  Django 1.3.1 is a recommended upgrade for
-+all users of Django 1.3.
-+
-+For a full list of issues addressed in this release, see the `security
-+advisory`_.
-+
-+.. _security advisory: https://www.djangoproject.com/weblog/2011/sep/09/security-releases-issued/
-Index: docs/ref/models/instances.txt
-===================================================================
---- docs/ref/models/instances.txt	(revision 16771)
-+++ docs/ref/models/instances.txt	(revision 17460)
-@@ -470,7 +470,7 @@
-
- Similarly, if you had a URLconf entry that looked like::
-
--    (r'/archive/(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/$', archive_view)
-+    (r'/archive/(?P<year>\d{4})/(?P<month>\d{2})/(?P<day>\d{2})/$', archive_view)
-
- ...you could reference this using ``permalink()`` as follows::
-
-@@ -478,8 +478,8 @@
-     def get_absolute_url(self):
-         return ('archive_view', (), {
-             'year': self.created.year,
--            'month': self.created.month,
--            'day': self.created.day})
-+            'month': self.created.strftime('%m'),
-+            'day': self.created.strftime('%d')})
-
- Notice that we specify an empty sequence for the second parameter in this case,
- because we only want to pass keyword parameters, not positional ones.
-Index: docs/ref/models/options.txt
-===================================================================
---- docs/ref/models/options.txt	(revision 16771)
-+++ docs/ref/models/options.txt	(revision 17460)
-@@ -166,6 +166,13 @@
-         >>> answer.get_previous_in_order()
-         <Answer: 1>
-
-+.. admonition:: Changing order_with_respect_to
-+
-+        ``order_with_respect_to`` adds an additional field/database column
-+        named ``_order``, so be sure to handle that as you would any other
-+        change to your models if you add or change ``order_with_respect_to``
-+        after your initial :djadmin:`syncdb`.
-+
- ``ordering``
- ------------
-
-@@ -238,6 +245,12 @@
-
-         unique_together = ("driver", "restaurant")
-
-+    A :class:`~django.db.models.ManyToManyField` cannot be included in
-+    unique_together (it's not even clear what that would mean). If you
-+    need to validate uniqueness related to a
-+    :class:`~django.db.models.ManyToManyField`, look at signals or
-+    using an explicit :attr:`through <ManyToManyField.through>` model.
-+
- ``verbose_name``
- ----------------
-
-Index: docs/ref/templates/builtins.txt
-===================================================================
---- docs/ref/templates/builtins.txt	(revision 16771)
-+++ docs/ref/templates/builtins.txt	(revision 17460)
-@@ -1868,7 +1868,7 @@
- Returns a slice of the list.
-
- Uses the same syntax as Python's list slicing. See
--http://diveintopython.org/native_data_types/lists.html#odbchelper.list.slice
-+http://diveintopython.net/native_data_types/lists.html#odbchelper.list.slice
- for an introduction.
-
- Example::
-Index: docs/ref/contrib/gis/geoip.txt
-===================================================================
---- docs/ref/contrib/gis/geoip.txt	(revision 16771)
-+++ docs/ref/contrib/gis/geoip.txt	(revision 17460)
-@@ -144,7 +144,7 @@
- Returns a dictionary of city information for the given query.  Some
- of the values in the dictionary may be undefined (``None``).
-
--.. method:: GeoIPcountry(query)
-+.. method:: GeoIP.country(query)
-
- Returns a dictionary with the country code and country for the given
- query.
-Index: docs/ref/contrib/messages.txt
-===================================================================
---- docs/ref/contrib/messages.txt	(revision 16771)
-+++ docs/ref/contrib/messages.txt	(revision 17460)
-@@ -210,6 +210,10 @@
- ``RequestContext``. Otherwise, ensure ``messages`` is available to
- the template context.
-
-+Even if you know there is only just one message, you should still iterate over
-+the ``messages`` sequence, because otherwise the message storage will not be cleared
-+for the next request.
-+
- Creating custom message levels
- ------------------------------
-
-Index: docs/ref/contrib/admin/index.txt
-===================================================================
---- docs/ref/contrib/admin/index.txt	(revision 16771)
-+++ docs/ref/contrib/admin/index.txt	(revision 17460)
-@@ -19,8 +19,10 @@
-     1. Add ``'django.contrib.admin'`` to your :setting:`INSTALLED_APPS`
-        setting.
-
--    2. Admin has two dependencies - :mod:`django.contrib.auth` and
--       :mod:`django.contrib.contenttypes`. If these applications are not
-+    2. The admin has four dependencies - :mod:`django.contrib.auth`,
-+       :mod:`django.contrib.contenttypes`,
-+       :mod:`django.contrib.messages` and
-+       :mod:`django.contrib.sessions`.  If these applications are not
-        in your :setting:`INSTALLED_APPS` list, add them.
-
-     3. Determine which of your application's models should be editable in the
-@@ -542,7 +544,7 @@
-     Fields in ``list_filter`` can also span relations using the ``__`` lookup::
-
-         class UserAdminWithLookup(UserAdmin):
--            list_filter = ('groups__name')
-+            list_filter = ('groups__name',)
-
- .. attribute:: ModelAdmin.list_per_page
-
-Index: docs/ref/django-admin.txt
-===================================================================
---- docs/ref/django-admin.txt	(revision 16771)
-+++ docs/ref/django-admin.txt	(revision 17460)
-@@ -1156,7 +1156,7 @@
- Note that this option is unnecessary in ``manage.py``, because it takes care of
- setting the Python path for you.
-
--.. _import search path: http://diveintopython.org/getting_to_know_python/everything_is_an_object.html
-+.. _import search path: http://diveintopython.net/getting_to_know_python/everything_is_an_object.html
-
- .. django-admin-option:: --settings
-
-Index: docs/ref/signals.txt
-===================================================================
---- docs/ref/signals.txt	(revision 16771)
-+++ docs/ref/signals.txt	(revision 17460)
-@@ -352,12 +352,16 @@
- .. data:: django.db.models.signals.post_syncdb
-    :module:
-
--Sent by :djadmin:`syncdb` after it installs an application.
-+Sent by :djadmin:`syncdb` command after it installs an application, and
-+:djadmin:`flush` command.
-
- Any handlers that listen to this signal need to be written in a particular
- place: a ``management`` module in one of your :setting:`INSTALLED_APPS`. If
- handlers are registered anywhere else they may not be loaded by
--:djadmin:`syncdb`.
-+:djadmin:`syncdb`. It is important that handlers of this signal perform
-+idempotent changes (e.g. no database alterations) as this may cause the
-+:djadmin:`flush` management command to fail if it also ran during the
-+:djadmin:`syncdb` command.
-
- Arguments sent with this signal:
-
-Index: README
-===================================================================
---- README	(revision 16771)
-+++ README	(revision 17460)
-@@ -28,7 +28,7 @@
- To get more help:
-
-     * Join the #django channel on irc.freenode.net. Lots of helpful people
--      hang out there. Read the archives at http://botland.oebfare.com/logger/django/.
-+      hang out there. Read the archives at http://django-irc-logs.com/.
-
-     * Join the django-users mailing list, or read the archives, at
-       http://groups.google.com/group/django-users.
diff --git a/libre/dkms-libre/01-broken-uninstall.patch b/libre/dkms-libre/01-broken-uninstall.patch
new file mode 100644
index 000000000..a859efabe
--- /dev/null
+++ b/libre/dkms-libre/01-broken-uninstall.patch
@@ -0,0 +1,22 @@
+diff --git a/dkms b/dkms
+index abb01a4..265b69a 100644
+--- a/dkms
++++ b/dkms
+@@ -162,11 +162,14 @@ set_kernel_source_dir()
+ 
+ # A little test function for DKMS commands that only work on one kernel.
+ have_one_kernel() {
+-    (( ${#kernelver[@]} > 1 )) && \
+-	die 4 $"The action $1 does not support multiple kernel version" \
+-	$"parameters on the command line."
+-    [[ $all ]] && die 5 $"The action $1 does not support the --all" \
+-	$"parameter."
++       if (( ${#kernelver[@]} != 1 )); then
++	  die 4 $"The action $1 does not support multiple kernel version" \
++	  $"parameters on the command line."
++       fi
++       if [[ $all ]]; then  
++           die 5 $"The action $1 does not support the --all" \
++	   $"parameter."
++       fi 
+ }
diff --git a/libre/dkms-libre/02-no-kernel-hook.patch b/libre/dkms-libre/02-no-kernel-hook.patch
new file mode 100644
index 000000000..f01f22002
--- /dev/null
+++ b/libre/dkms-libre/02-no-kernel-hook.patch
@@ -0,0 +1,13 @@
+# Author: Sébastien Luttringer <seblu@seblu.net>
+--- a/Makefile	2011-12-07 19:23:51.000000000 +0100
++++ b/Makefile	2013-05-13 00:48:19.620000000 +0200
+@@ -46,9 +46,6 @@
+ 	gzip -c -9 dkms.8 > $(MAN)/dkms.8.gz
+ 	chmod 0644 $(MAN)/dkms.8.gz
+ 	touch --reference=dkms.8 $(MAN)/dkms.8.gz
+-	mkdir   -p -m 0755 $(KCONF)/prerm.d $(KCONF)/postinst.d
+-	install -p -m 0755 kernel_prerm.d_dkms  $(KCONF)/prerm.d/dkms
+-	install -p -m 0755 kernel_postinst.d_dkms $(KCONF)/postinst.d/dkms
+ 
+ DOCFILES=sample.spec sample.conf AUTHORS COPYING README.dkms sample-suse-9-mkkmp.spec sample-suse-10-mkkmp.spec
+ 
diff --git a/libre/dkms-libre/PKGBUILD b/libre/dkms-libre/PKGBUILD
new file mode 100644
index 000000000..99caab5fa
--- /dev/null
+++ b/libre/dkms-libre/PKGBUILD
@@ -0,0 +1,66 @@
+# $Id: PKGBUILD 90494 2013-05-12 22:57:28Z seblu $
+# Maintainer: Sébastien Luttringer
+# Contributor: Balwinder S "bsd" Dheeman (bdheeman AT gmail.com)
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+_pkgname=dkms
+pkgname=dkms-libre
+pkgver=2.2.0.3
+pkgrel=14
+pkgdesc='Dynamic Kernel Modules System, with linux-libre-headers and linux-libre-lts-headers recommendation'
+arch=('any')
+url='http://linux.dell.com/dkms/'
+license=('GPL2')
+depends=('bash' 'kmod' 'gcc' 'make' 'patch')
+optdepends=('linux-libre-headers: build modules against linux-libre kernel'
+            'linux-libre-lts-headers: build modules against linux-libre-lts kernel')
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
+backup=('etc/dkms/framework.conf' 'etc/default/dkms')
+install=$_pkgname.install
+source=("http://linux.dell.com/$_pkgname/permalink/$_pkgname-$pkgver.tar.gz"
+        "$_pkgname.default"
+        "$_pkgname.service"
+        "$_pkgname.systemd"
+        '01-broken-uninstall.patch'
+        '02-no-kernel-hook.patch')
+md5sums=('11a8aaade2ebec2803653837c7593030'
+         '33be2fbf1bcc1b3fb2f38d9e7eaa809d'
+         '02e9744e3fdc3d2f68e46966fb32e260'
+         '267632312aa52a190ec0db0758920dd3'
+         '2dfd8656dc79afd229c1481a90fb645b'
+         '82d520c39c99c34977e48b313a189c6c')
+
+prepare() {
+  # patch
+  patches=("$srcdir"/*.patch)
+  cd $_pkgname-$pkgver
+  for p in "${patches[@]}"; do
+    msg2 "Apply patch: ${p##*/}"
+    patch -p1 -i "$p"
+  done
+  # /usr move
+  msg2 '/usr move patching'
+  for i in dkms{,_framework.conf,.bash-completion,.8,_common.postinst}; do
+    sed -ri 's,/lib/modules,/usr/lib/modules,g' "$i"
+  done
+  # fix hardcoded paths
+  sed -i "s|/sbin/depmod|depmod|" dkms
+}
+
+package() {
+  # systemd
+  install -D -m 644 $_pkgname.service "$pkgdir/usr/lib/systemd/system/$_pkgname.service"
+  install -D -m 755 $_pkgname.systemd "$pkgdir/usr/lib/systemd/scripts/$_pkgname"
+  install -D -m 644 $_pkgname.default "$pkgdir/etc/default/$_pkgname"
+  # upstream installer
+  cd $_pkgname-$pkgver
+  make \
+    DESTDIR="$pkgdir" \
+    SBIN="$pkgdir/usr/bin" \
+    BASHDIR="$pkgdir/usr/share/bash-completion/completions" \
+    install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/dkms-libre/dkms.default b/libre/dkms-libre/dkms.default
new file mode 100644
index 000000000..d430855bb
--- /dev/null
+++ b/libre/dkms-libre/dkms.default
@@ -0,0 +1,9 @@
+# vim:set ts=2 sw=2 ft=sh noet:
+
+# With LOAD set to yes, modules listed as installed will be loaded with
+# systemctl start dkms.service. Default is yes.
+LOAD=yes
+
+# With UNLOAD set to yes, modules listed as installed will be unloaded with
+# systemctl stop dkms.service. Default is no.
+UNLOAD=no
diff --git a/libre/dkms-libre/dkms.hook b/libre/dkms-libre/dkms.hook
new file mode 100644
index 000000000..3d656e32d
--- /dev/null
+++ b/libre/dkms-libre/dkms.hook
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+dkms_autoinstall() {
+  export TMPDIR=/dev/shm
+  status 'Starting DKMS autoinstall' dkms autoinstall
+  unset TMPDIR
+}
+
+add_hook single_udevlaunched dkms_autoinstall
+add_hook sysinit_udevlaunched dkms_autoinstall
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/dkms-libre/dkms.install b/libre/dkms-libre/dkms.install
new file mode 100644
index 000000000..4dd18dd19
--- /dev/null
+++ b/libre/dkms-libre/dkms.install
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+  if [ "$(vercmp $2 2.2.0.3-12)" -le 0 ]; then
+    cat << EOF
+===> dkms startup config file moved to /etc/default/dkms
+EOF
+    fi
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/dkms-libre/dkms.service b/libre/dkms-libre/dkms.service
new file mode 100644
index 000000000..0e679a949
--- /dev/null
+++ b/libre/dkms-libre/dkms.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Dynamic Kernel Modules System
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/lib/systemd/scripts/dkms start
+ExecStop=/usr/lib/systemd/scripts/dkms stop
+
+[Install]
+WantedBy=multi-user.target
diff --git a/libre/dkms-libre/dkms.systemd b/libre/dkms-libre/dkms.systemd
new file mode 100644
index 000000000..03e6bfe97
--- /dev/null
+++ b/libre/dkms-libre/dkms.systemd
@@ -0,0 +1,61 @@
+#!/bin/bash
+
+. /etc/default/dkms
+
+# list dkms modules for the current running kernel
+list_dkms_modules() {
+  shopt -s nullglob
+  declare -a DKMS_MOULES
+  # dkms status needs uname -r to list correctly intalled version for current kernel
+  local modules_path=($(dkms status -k "$(uname -r)"|sed -rn 's#(.*), (.*), (.*), (.*): installed#\1/\2/\3/\4#p'))
+  for p in "${modules_path[@]}"; do
+    for m in /var/lib/dkms/"$p"/module/*.ko{,gz}; do
+      m=${m##*/}
+      m=${m%.gz}
+      m=${m%.ko}
+      DKMS_MODULES+=("$m")
+    done
+  done
+}
+
+# load installed kernel modules for the current kernel version
+load_dkms_modules() {
+  local ret=0
+  list_dkms_modules
+  for m in "${DKMS_MODULES[@]}"; do
+    modprobe "$m"
+    ret+=$?
+  done
+  return $ret
+}
+
+# unload installed kernel modules for the current kernel version
+unload_dkms_modules() {
+  list_dkms_modules
+  # ask for removal
+  for m in "${DKMS_MODULES[@]}"; do
+    modprobe --remove --quiet "$m"
+  done
+  # check modules are unloaded
+  # sometimes modprobe -r fail but modules are removed
+  for m in "${DKMS_MODULES[@]}"; do
+    [[ -e /sys/modules/$m ]] && return 1
+  done
+  return 0
+}
+
+case "$1" in
+  start)
+    dkms autoinstall -k "$(uname -r)"
+    [[ $LOAD =~ [Yy][Ee][Ss] ]] && load_dkms_modules
+  ;;
+  stop)
+    [[ $UNLOAD =~ [Yy][Ee][Ss] ]] && unload_dkms_modules
+  ;;
+  *)
+    echo "usage: $0 {start|stop}" >&2
+  ;;
+esac
+
+:
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/ecasound-libre/PKGBUILD b/libre/ecasound-libre/PKGBUILD
index 30cbbc641..6fbdd3fb3 100644
--- a/libre/ecasound-libre/PKGBUILD
+++ b/libre/ecasound-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: PKGBUILD 180827 2013-03-26 13:29:04Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
@@ -7,13 +7,12 @@
 _pkgname=ecasound
 pkgname=ecasound-libre
 pkgver=2.9.0
-pkgrel=2.1
-pkgdesc="A software package designed for multitrack audio processing (without nonfree faac recommendation)"
+pkgrel=3
+pkgdesc="A software package designed for multitrack audio processing, without nonfree faac recommendation"
 arch=('i686' 'x86_64')
 url="http://www.eca.cx/ecasound/"
 license=('GPL' 'LGPL')
-depends=('audiofile' 'liblo'
-         'liboil' 'lilv')
+depends=('audiofile' 'liblo' 'liboil' 'lilv')
 makedepends=('python2' 'ruby')
 optdepends=('python2: ecamonitor, ECI API'
             'ruby: ECI API'
@@ -27,14 +26,16 @@ replaces=$_pkgname
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
 options=('!libtool')
-source=(http://ecasound.seul.org/download/$_pkgname-$pkgver.tar.gz)
-md5sums=('05e7d4664cdf4c7a138c098e9506a551')
+source=("http://ecasound.seul.org/download/$_pkgname-$pkgver.tar.gz"
+        'ruby2.patch')
+md5sums=('05e7d4664cdf4c7a138c098e9506a551'
+         '6909dbd4f67f76d3bd31ce7c7fe16212')
 
 build() {
   cd "$srcdir/$_pkgname-$pkgver"
 
-  # use vendor_ruby for ruby files
-  sed -e 's/CONFIG\["sitedir"\]/CONFIG\["vendordir"\]/' -i configure
+  # fix ruby 2.0 incompatibility + use vendor_ruby for ruby files
+  patch -Np1 -i "$srcdir/ruby2.patch"
 
   PYTHONPATH=/usr/bin/python2 ./configure \
     --prefix=/usr \
diff --git a/libre/ecasound-libre/ruby2.patch b/libre/ecasound-libre/ruby2.patch
new file mode 100644
index 000000000..d55f12140
--- /dev/null
+++ b/libre/ecasound-libre/ruby2.patch
@@ -0,0 +1,12 @@
+diff -aur ecasound-2.9.0.orig/configure ecasound-2.9.0/configure
+--- ecasound-2.9.0.orig/configure	2013-03-26 17:14:51.759045636 +0800
++++ ecasound-2.9.0/configure	2013-03-26 17:15:50.502060731 +0800
+@@ -6535,7 +6535,7 @@
+   rubyecasound_support=no
+   ECA_S_RUBY_SITEDIR=""
+ else
+-  ECA_S_RUBY_SITEDIR="`ruby -e 'require "rbconfig"; include Config; print CONFIG["sitedir"] + "/" + CONFIG["MAJOR"] + "." + CONFIG["MINOR"]'`"
++  ECA_S_RUBY_SITEDIR="`ruby -e 'include RbConfig; print CONFIG["vendordir"] + "/" + CONFIG["MAJOR"] + "." + CONFIG["MINOR"]'`"
+ fi
+ 
+ 
diff --git a/libre/epdfview-libre/PKGBUILD b/libre/epdfview-libre/PKGBUILD
index 28c77eed8..626e653f2 100644
--- a/libre/epdfview-libre/PKGBUILD
+++ b/libre/epdfview-libre/PKGBUILD
@@ -3,7 +3,7 @@
 # Maintainer: schuay <jakob.gruber@gmail.com>
 # Contributor: Tom K <tomk@runbox.com>
 # Contributor: Thayer Williams <thayer@archlinux.org>
-# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
 pkgname=epdfview-libre
 _pkgname=epdfview
diff --git a/libre/file-roller-libre/PKGBUILD b/libre/file-roller-libre/PKGBUILD
index e01981433..6ea777a16 100644
--- a/libre/file-roller-libre/PKGBUILD
+++ b/libre/file-roller-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 185397 2013-05-13 19:05:20Z heftig $
+# $Id: PKGBUILD 189275 2013-07-02 07:37:30Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 _pkgname=file-roller
 pkgname=file-roller-libre
-pkgver=3.8.2
+pkgver=3.8.3
 pkgrel=1
 pkgdesc="Create and modify archives, with unar recommendation included and nonfree unace recommendation removed"
 arch=('i686' 'x86_64' 'mips64el')
@@ -23,7 +23,7 @@ options=('!libtool' '!emptydirs')
 install=file-roller.install
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver::3}/$_pkgname-$pkgver.tar.xz)
-sha256sums=('b251b146d7966d770c98546e2152dbc17785ef3b8cf460f692829d0ac1cbe79e')
+sha256sums=('55caac832ed0bab89085fdf7a3c3fa1afaf8ae6fb05aeb2a872e42cb6c52894e')
 
 build() {
   cd $_pkgname-$pkgver
diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD
index eac7300d4..60fa5924b 100644
--- a/libre/filesystem/PKGBUILD
+++ b/libre/filesystem/PKGBUILD
@@ -4,7 +4,7 @@
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname=filesystem
-pkgver=2013.03
+pkgver=2013.05
 pkgrel=2
 pkgdesc='Base filesystem (Parabola rebranded)'
 arch=('i686' 'x86_64' 'mips64el')
@@ -21,26 +21,6 @@ source=('group' 'issue' 'nsswitch.conf' 'securetty' 'host.conf' 'ld.so.conf'
         'passwd' 'shadow' 'fstab' 'crypttab' 'hosts' 'motd' 'os-release' 'resolv.conf'
         'shells' 'gshadow' 'profile' 'modprobe.d.usb-load-ehci-first' 'parabola.7.txt'
         'locale.sh')
-md5sums=('7b8e40f8f793e60f471511641bb1c9f2'
-         '6be47d893fd49b2e4a8c0e811b350861'
-         '9e4533df61f0c82d6b2e2371f7376282'
-         '4c4540eeb748bf1f71d631b8c1dcf0b3'
-         'f28150d4c0b22a017be51b9f7f9977ed'
-         '6e488ffecc8ba142c0cf7e2d7aeb832e'
-         '1cfd310dff0804a7d21958487c32a3b1'
-         '2ef2429c2c98d0883906aa6f5363be80'
-         '693c97f2c9a519bb97a17008e92c2b74'
-         '1745349eb24ed21b4cfaa6f423bddb76'
-         '7bc65f234dfb6abf24e7c3b03e86f4ff'
-         'd41d8cd98f00b204e9800998ecf8427e'
-         '0e145e18fea8fd190b30d45764f5707c'
-         '6f48288b6fcaf0065fcb7b0e525413e0'
-         '22518e922891f9359f971f4f5b4e793c'
-         'f45389e116ab0b9e9968287617d27c7d'
-         'f3b6ae7db8adffaaa4bffc6099dcbd50'
-         'a8a962370cd0128465d514e6a1f74130'
-         'd5732ffdb3488e1383d4ea199343e767'
-         '3807d07215d9116331fe1cf8feeaa0f8')
 
 build() {
 	cd ${srcdir}
@@ -90,7 +70,7 @@ package() {
 	#
 	# setup /usr hierarchy
 	#
-	for d in bin include lib sbin share/misc src; do
+	for d in bin include lib share/misc src; do
 		install -d -m755 usr/${d}
 	done
 	for d in $(seq 8); do
@@ -112,6 +92,13 @@ package() {
 	)
 
 	#
+	# add bin symlinks
+	#
+	ln -s usr/bin ${pkgdir}/bin
+	ln -s usr/bin ${pkgdir}/sbin
+	ln -s bin ${pkgdir}/usr/sbin
+
+	#
 	# install parabola(7) manpage
 	#
 	install -D -m644 ${srcdir}/parabola.7 usr/share/man/man7/parabola.7
@@ -124,3 +111,23 @@ package() {
 	done
 	ln -s ../man usr/local/share/man
 }
+md5sums=('7b8e40f8f793e60f471511641bb1c9f2'
+         '6be47d893fd49b2e4a8c0e811b350861'
+         '9e4533df61f0c82d6b2e2371f7376282'
+         '4c4540eeb748bf1f71d631b8c1dcf0b3'
+         'f28150d4c0b22a017be51b9f7f9977ed'
+         '6e488ffecc8ba142c0cf7e2d7aeb832e'
+         '1cfd310dff0804a7d21958487c32a3b1'
+         '2ef2429c2c98d0883906aa6f5363be80'
+         '693c97f2c9a519bb97a17008e92c2b74'
+         '1745349eb24ed21b4cfaa6f423bddb76'
+         '7bc65f234dfb6abf24e7c3b03e86f4ff'
+         'd41d8cd98f00b204e9800998ecf8427e'
+         '0e145e18fea8fd190b30d45764f5707c'
+         '6f48288b6fcaf0065fcb7b0e525413e0'
+         '22518e922891f9359f971f4f5b4e793c'
+         'f45389e116ab0b9e9968287617d27c7d'
+         '0b6f835598c7640184e476057b3c7722'
+         'a8a962370cd0128465d514e6a1f74130'
+         'd5732ffdb3488e1383d4ea199343e767'
+         '3807d07215d9116331fe1cf8feeaa0f8')
diff --git a/libre/filesystem/profile b/libre/filesystem/profile
index 3bc22db9f..59d0abc83 100644
--- a/libre/filesystem/profile
+++ b/libre/filesystem/profile
@@ -4,7 +4,7 @@
 umask 022
 
 # Set our default path
-PATH="/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin"
+PATH="/usr/local/sbin:/usr/local/bin:/usr/bin"
 export PATH
 
 # Load profiles from /etc/profile.d
diff --git a/libre/foomatic-filters-libre/PKGBUILD b/libre/foomatic-filters-libre/PKGBUILD
index 73a7af6c4..eeb26a639 100644
--- a/libre/foomatic-filters-libre/PKGBUILD
+++ b/libre/foomatic-filters-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id$
+# $Id: PKGBUILD 185778 2013-05-18 16:33:20Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor (Parabola): André Silva <emulatorman@lavabit.com>
  
 pkgbase="foomatic"
 pkgname=('foomatic-filters-libre')
 arch=('i686' 'x86_64' 'mips64el') # needs to be changed  in the subpackages when makepkg will support it
-_snapdate=20120712
+_snapdate=20130518
 _filtersver=4.0.17
 pkgver=${_filtersver}_${_snapdate}
 pkgrel=1
@@ -18,7 +18,7 @@ md5sums=('b05f5dcbfe359f198eef3df5b283d896')
 
 package_foomatic-filters-libre() {
 
- pkgdesc="Foomatic - Filter scripts used by the printer spoolers to convert the incoming PostScript data into the printer's native format."
+ pkgdesc="Foomatic - Filter scripts used by the printer spoolers to convert the incoming PostScript data into the printer's native format, without nonfree scripts"
 # arch=('i686' 'x86_64')
  license=('GPL')
  backup=(etc/foomatic/filter.conf)
@@ -30,6 +30,7 @@ package_foomatic-filters-libre() {
             'net-snmp:  certain (mostly HP) printers need it to work')
 
    cd ${srcdir}/foomatic-filters-${_filtersver}
+   # remove nonfree scripts
    rm -rfv test/{lsbfuncs,shfuncs,tcm,tetapi}.sh
    ./configure --prefix=/usr --sysconfdir=/etc
    make
diff --git a/libre/gloobus-preview-libre/PKGBUILD b/libre/gloobus-preview-libre/PKGBUILD
new file mode 100644
index 000000000..5881a4c2e
--- /dev/null
+++ b/libre/gloobus-preview-libre/PKGBUILD
@@ -0,0 +1,94 @@
+# $Id: PKGBUILD 91026 2013-05-18 11:44:23Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+_pkgname=gloobus-preview
+pkgname=gloobus-preview-libre
+pkgver=0.4.5.290
+_pkgver=0.4.5-ubuntu11~ppa290
+pkgrel=1.1
+pkgdesc="Gnome application designed to enable a full screen preview of any kind of file, with libarchive support"
+arch=('i686' 'x86_64')
+url="http://gloobus.net/"
+license=('GPL')
+depends=('gstreamer0.10-base-plugins' 'gtksourceview3' 'poppler-glib' 'python2-dbus' 'python2-gconf' 'taglib' 'xdg-utils')
+makedepends=('boost' 'bzr' 'djvulibre' 'libspectre')
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
+optdepends=('djvulibre: Preview DjVu documents'
+            'gstreamer0.10-bad-plugins: Extra media codecs'
+            'gstreamer0.10-good-plugins: Extra media codecs'
+            'gstreamer0.10-ffmpeg: Extra media codecs'
+            'gstreamer0.10-ugly-plugins: Extra media codecs'
+            'libspectre: Preview PostScript documents'
+            'p7zip: View content of 7z archives'
+            'unoconv: Preview LibreOffice compatible documents'
+            'libarchive: View content of RAR archives'
+            'unzip: View content of .ZIP archives')
+options=('!libtool')
+install=$_pkgname.install
+source=(https://launchpad.net/~gloobus-dev/+archive/$_pkgname/+files/${_pkgname}_$_pkgver.orig.tar.xz
+        gloobus-sushi::bzr+http://bazaar.launchpad.net/~gloobus-dev/gloobus-sushi/gloobus-sushi
+        fix-gtksource-include.patch
+        fix-unoconv.patch
+        use-xdg-open.patch
+	gloobus-preview-usr-bsdtar-for-rar.patch)
+md5sums=('27b3db2043ecaf47fa928940bbb4f32a'
+         'SKIP'
+         'ca15a3e31cec01d3d4fc5a4e1720f692'
+         '03379c173e67ad1b6804bc609336451d'
+         'd6d9e2b3e001f0ea8440cccdf90480af'
+         'eeab61846c861540bb16ca00fa14cdb6')
+
+prepare() {
+  cd "$srcdir/$_pkgname-$_pkgver"
+
+  # Python2 fix
+  sed -i 's@^#!.*python$@#!/usr/bin/python2@' src/gloobus-preview-configuration
+
+  # Fix build
+  patch -Np1 -i "$srcdir/fix-gtksource-include.patch"
+  sed -i 's/-Werror//' configure.ac src/Makefile.am
+
+  # Fix unoconv support
+  patch -Np1 -i "$srcdir/fix-unoconv.patch"
+
+  # Use xdg-open
+  patch -Np1 -i "$srcdir/use-xdg-open.patch"
+
+  # Use bsdtar (libarchive) if unrar is not found.
+  patch -Np0 -i "$srcdir/gloobus-preview-usr-bsdtar-for-rar.patch"
+
+  ### Prepare gloobus-sushi
+  cd "$srcdir/gloobus-sushi"
+
+  # Python2 fix
+  sed -i 's/python /python2 /' src/gloobus-sushi.in
+}
+
+
+build() {
+  cd "$srcdir/$_pkgname-$_pkgver"
+
+  ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+               --disable-static
+  make
+
+  ### Build gloobus-sushi
+  cd "$srcdir/gloobus-sushi"
+
+  ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  make
+}
+
+package() {
+  cd "$srcdir/$_pkgname-$_pkgver"
+  make DESTDIR="$pkgdir" install
+
+  ### Install gloobus-sushi
+  cd "$srcdir/gloobus-sushi"
+  make DESTDIR="$pkgdir" install
+
+  # Rename service file to avoid conflict with sushi
+  mv "$pkgdir"/usr/share/dbus-1/services/{org.gnome.Sushi.service,net.gloobus.Sushi.service}
+}
diff --git a/libre/gloobus-preview-libre/fix-gtksource-include.patch b/libre/gloobus-preview-libre/fix-gtksource-include.patch
new file mode 100644
index 000000000..053169a43
--- /dev/null
+++ b/libre/gloobus-preview-libre/fix-gtksource-include.patch
@@ -0,0 +1,39 @@
+diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-interface-text.h gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-interface-text.h
+--- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-interface-text.h	2012-04-06 15:07:29.000000000 +0200
++++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-interface-text.h	2013-05-17 06:27:37.833360264 +0200
+@@ -1,8 +1,7 @@
+ #ifndef _ITEXT_
+ #define _ITEXT_
+ 
+-#include <gtksourceview/gtksourceview.h>
+-#include <gtksourceview/gtksourcelanguagemanager.h>
++#include <gtksourceview/gtksource.h>
+ //sudo ln -s /usr/include/gtksourceview-2.0/gtksourceview/ /usr/include/gtksourceview
+ 
+ #include "gloobus-preview-interface-main.h"
+diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-plugin-manager.cpp gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-plugin-manager.cpp
+--- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-plugin-manager.cpp	2012-04-06 15:07:29.000000000 +0200
++++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-plugin-manager.cpp	2013-05-17 06:28:19.300984059 +0200
+@@ -1,6 +1,6 @@
+ #include "gloobus-preview-plugin-manager.h"
+ #include <dlfcn.h>
+-#include <gtksourceview/gtksourcelanguagemanager.h>
++#include <gtksourceview/gtksource.h>
+ 
+ vector<gp_plugin_container*> PluginManager::plugins;
+ map<string, int> PluginManager::filetypes;
+diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-text/plugin-text.h gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-text/plugin-text.h
+--- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-text/plugin-text.h	2012-04-06 15:07:29.000000000 +0200
++++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-text/plugin-text.h	2013-05-17 06:26:26.788384315 +0200
+@@ -3,10 +3,7 @@
+ 
+ #ifndef PLUGIN_LOADER
+ 
+-#include <gtksourceview/gtksourceview.h>
+-#include <gtksourceview/gtksourcelanguagemanager.h>
+-#include <gtksourceview/gtksourcestylescheme.h>
+-#include <gtksourceview/gtksourcestyleschememanager.h>
++#include <gtksourceview/gtksource.h>
+ #include <gio/gio.h>
+ 
+ #include "../gloobus-preview-config.h"
diff --git a/libre/gloobus-preview-libre/fix-unoconv.patch b/libre/gloobus-preview-libre/fix-unoconv.patch
new file mode 100644
index 000000000..f918f3019
--- /dev/null
+++ b/libre/gloobus-preview-libre/fix-unoconv.patch
@@ -0,0 +1,46 @@
+diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-pdf/office-loader.cpp gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-pdf/office-loader.cpp
+--- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-pdf/office-loader.cpp	2012-04-06 15:07:29.000000000 +0200
++++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-pdf/office-loader.cpp	2013-05-18 10:24:33.558221788 +0200
+@@ -87,7 +87,7 @@
+ 
+     if( NULL == uri && Utils::isProgramAvailable("unoconv") ) {
+         gchar *path = g_file_get_path(file);
+-        gchar *cmd = g_strdup_printf("unoconv --stdout \"%s\" > \"%s\"", path, tmp);
++        gchar *cmd = g_strdup_printf("unoconv -f pdf -o \"%s\" \"%s\"", tmp, path);
+ 
+         if( system(cmd) == 0) {
+             uri = pathToUri(tmp);
+@@ -123,4 +123,4 @@
+ {
+     path = "file://" + path;
+     return g_uri_escape_string(path.c_str(), G_URI_RESERVED_CHARS_ALLOWED_IN_PATH, false);
+-}
+\ No newline at end of file
++}
+diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-pdf/office-plugin.h gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-pdf/office-plugin.h
+--- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-pdf/office-plugin.h	2012-04-06 15:07:29.000000000 +0200
++++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-pdf/office-plugin.h	2013-05-18 10:33:02.352806550 +0200
+@@ -6,15 +6,21 @@
+ PluginManager::register_plugin("office");
+ 
+ PluginManager::register_filetype("application/vnd.oasis.opendocument.text", 1);
++PluginManager::register_filetype("application/vnd.openxmlformats-officedocument.wordprocessingml.document", 1);
+ PluginManager::register_filetype("application/msword", 1);
+ PluginManager::register_filetype("application/rtf", 1);
+ PluginManager::register_filetype("application/vnd.ms-excel", 1);
+ PluginManager::register_filetype("application/vnd.oasis.opendocument.spreadsheet", 1);
++PluginManager::register_filetype("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", 1);
+ PluginManager::register_filetype("application/vnd.ms-powerpoint", 1);
++PluginManager::register_filetype("application/vnd.oasis.opendocument.presentation", 1);
++PluginManager::register_filetype("application/vnd.openxmlformats-officedocument.presentationml.presentation", 1);
+ PluginManager::register_filetype("application/vnd.sun.xml.calc", 1);
++PluginManager::register_filetype("application/vnd.oasis.opendocument.graphics", 1);
++
+ 
+ // TODO: add more filetypes supported by abiword and/or OpenOffice
+ 
+ #endif
+ 
+-#endif /* OFFICE_PLUGIN_H */
+\ No newline at end of file
++#endif /* OFFICE_PLUGIN_H */
diff --git a/libre/gloobus-preview-libre/gloobus-preview-usr-bsdtar-for-rar.patch b/libre/gloobus-preview-libre/gloobus-preview-usr-bsdtar-for-rar.patch
new file mode 100644
index 000000000..f5b7c8e00
--- /dev/null
+++ b/libre/gloobus-preview-libre/gloobus-preview-usr-bsdtar-for-rar.patch
@@ -0,0 +1,57 @@
+------------------------------------------------------------
+revno: 291
+committer: Michał Masłowski <mtjm@mtjm.eu>
+branch nick: gloobus-preview
+timestamp: Sun 2013-06-23 14:43:35 +0200
+message:
+  Use bsdtar to open RAR archives if unrar is not available.
+  
+  Needs bsdtar from libarchive 3.0 or newer, not tested with older
+  versions nor checking for them.
+diff:
+=== modified file 'src/plugin-compressed/plugin-compressed.cpp'
+--- src/plugin-compressed/plugin-compressed.cpp	2012-04-06 11:25:47 +0000
++++ src/plugin-compressed/plugin-compressed.cpp	2013-06-23 12:43:35 +0000
+@@ -52,8 +52,9 @@
+ 		cmd_args.push_back("--");
+ 		line_parser = &iCompressed::parse_line_7z;
+ 	}
+-	else if ( type == GP_COMPRESSED_RAR
+-			|| type == GP_COMPRESSED_RAR_X )
++	else if ( (type == GP_COMPRESSED_RAR
++				|| type == GP_COMPRESSED_RAR_X)
++			&& interface::is_program_available("unrar") )
+ 	{
+ 		cmd_args.push_back("unrar");
+ 		cmd_args.push_back("vb");
+@@ -70,9 +71,15 @@
+ 			|| type == GP_COMPRESSED_TAR_LZOP
+ 			|| type == GP_COMPRESSED_TAR_X
+ 			|| type == GP_COMPRESSED_TAR_XZ
+-			|| type == GP_COMPRESSED_TAR_Z )
++			|| type == GP_COMPRESSED_TAR_Z
++			|| type == GP_COMPRESSED_RAR
++			|| type == GP_COMPRESSED_RAR_X )
+ 	{
+-		cmd_args.push_back("tar");
++		if ( type == GP_COMPRESSED_RAR
++	       		|| type == GP_COMPRESSED_RAR_X )
++			cmd_args.push_back("bsdtar");
++		else
++			cmd_args.push_back("tar");
+ 		cmd_args.push_back("-tf");
+ 		line_parser = &iCompressed::parse_line_rar;
+ 	}
+
+=== modified file 'src/plugin-compressed/plugin-compressed.h'
+--- src/plugin-compressed/plugin-compressed.h	2010-03-27 15:55:08 +0000
++++ src/plugin-compressed/plugin-compressed.h	2013-06-23 12:43:35 +0000
+@@ -102,7 +102,7 @@
+ 	PluginManager::register_filetype(GP_COMPRESSED_7Z, 1);
+ }
+ 
+-if(interface::is_program_available("unrar")) {
++if(interface::is_program_available("unrar") || interface::is_program_available("bsdtar")) {
+ 	PluginManager::register_filetype(GP_COMPRESSED_RAR, 1);
+ 	PluginManager::register_filetype(GP_COMPRESSED_RAR_X, 1);
+ }
diff --git a/libre/gloobus-preview-libre/gloobus-preview.install b/libre/gloobus-preview-libre/gloobus-preview.install
new file mode 100644
index 000000000..16ad7278f
--- /dev/null
+++ b/libre/gloobus-preview-libre/gloobus-preview.install
@@ -0,0 +1,12 @@
+post_install() {
+  xdg-icon-resource forceupdate
+  gdk-pixbuf-query-loaders --update-cache
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
diff --git a/libre/gloobus-preview-libre/use-xdg-open.patch b/libre/gloobus-preview-libre/use-xdg-open.patch
new file mode 100644
index 000000000..68e219e6a
--- /dev/null
+++ b/libre/gloobus-preview-libre/use-xdg-open.patch
@@ -0,0 +1,20 @@
+diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-window.cpp gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-window.cpp
+--- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-window.cpp	2012-04-06 15:07:29.000000000 +0200
++++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-window.cpp	2013-05-18 09:49:24.833574800 +0200
+@@ -560,12 +560,12 @@
+     string label(gtk_menu_item_get_label(item));
+     if(label ==  _("Settings"))
+         cmd = "gloobus-preview-configuration";
+-    else if(label ==  _("Report a Bug"))
+-        cmd = "gnome-open \"https://bugs.launchpad.net/gloobus-preview/\"";
++    else if(label ==  _("Report a Problem"))
++        cmd = "xdg-open \"https://bugs.launchpad.net/gloobus-preview/\"";
+     else if(label == _("Blog"))
+-        cmd = "gnome-open \"http://gloobus.wordpress.com\"" ;
++        cmd = "xdg-open \"http://gloobus.wordpress.com\"" ;
+     else if(label == _("Donate"))
+-        cmd = "gnome-open \"https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=guitarboy000%40gmail%2ecom&item_name=Gloobus%2c%20A%20Quicklook%20for%20linux&no_shipping=0&no_note=1&tax=0&currency_code=EUR&lc=US&bn=PP%2dDonationsBF&chars\"" ;
++        cmd = "xdg-open \"https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=guitarboy000%40gmail%2ecom&item_name=Gloobus%2c%20A%20Quicklook%20for%20linux&no_shipping=0&no_note=1&tax=0&currency_code=EUR&lc=US&bn=PP%2dDonationsBF&chars\"" ;
+     else if(label == _("About"))
+         ui->create_about();
+     else if(label == _("Quit"))
diff --git a/libre/gnormalize-libre/PKGBUILD b/libre/gnormalize-libre/PKGBUILD
index 8df68e2b6..6a07966b2 100644
--- a/libre/gnormalize-libre/PKGBUILD
+++ b/libre/gnormalize-libre/PKGBUILD
@@ -1,5 +1,6 @@
-# $Id$
-# Maintainer: Chris Brannon <cmbrannon79@gmail.com>
+# $Id: PKGBUILD 91575 2013-05-24 12:41:56Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Chris Brannon <cmbrannon79@gmail.com>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
 # Contributor:JZsolt Varadi (karmaxxl) 
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -7,13 +8,13 @@
 _pkgname=gnormalize
 pkgname=gnormalize-libre
 pkgver=0.63
-pkgrel=4
-pkgdesc="An audio normalizer, converter, encoder/decoder, ripper, tagger and player (without nonfree faac and mac recommendation)"
-arch=(any)
-url="http://gnormalize.sourceforge.net/"
+pkgrel=5
+pkgdesc='Audio normalizer, converter, encoder/decoder, ripper, tagger and player, without nonfree faac and mac recommendation'
+arch=('any')
+url='http://gnormalize.sourceforge.net/'
 license=('GPL')
-depends=(perl cddb_get desktop-file-utils gtk2-perl hicolor-icon-theme)
-makedepends=('xz')
+depends=('perl' 'cddb_get' 'desktop-file-utils' 'gtk2-perl' 'hicolor-icon-theme')
+makedepends=('xz' 'gendesk')
 optdepends=('flac: FLAC encoding, FLAC playing in conjunction with mplayer'
             'lame: MP3 encoding'
             'mpg321: MP3 playing'
@@ -29,26 +30,33 @@ replaces=$_pkgname
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
 install=gnormalize.install
-source=(http://downloads.sourceforge.net/sourceforge/gnormalize/${_pkgname}-${pkgver}.tar.gz
-        gnormalize.desktop)
-md5sums=('25ca7520731e61a8b7f4b7fa61928d54' '81c6dffab2139816919842e042705884')
+source=("http://downloads.sourceforge.net/sourceforge/gnormalize/${_pkgname}-${pkgver}.tar.gz")
+sha256sums=('80fd9aa2da8d7fcc88bd180be2adce1aed863bedba7d715144029bd95b61ccb6')
 
-package() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  install -Dm755 gnormalize "${pkgdir}/usr/bin/gnormalize"
+prepare() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  gendesk -n --pkgname "$_pkgname" --pkgdesc "$pkgdesc" --mimetypes \
+  'audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/x-wav;application/x-ogg'
   lzma -qd gnormalize.1.lzma
-  install -Dm644 gnormalize.1 "${pkgdir}/usr/share/man/man1/gnormalize.1"
-  install -d "${pkgdir}/usr/share/gnormalize/animations"
-  install -m644 animations/*.gif "${pkgdir}/usr/share/gnormalize/animations/"
-  install -Dm644 README "${pkgdir}/usr/share/doc/gnormalize/README"
-  install -Dm644 icons/gnormalize.png  \
-    "${pkgdir}/usr/share/pixmaps/gnormalize.png"
+} 
+
+package() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  install -Dm755 "$_pkgname" "$pkgdir/usr/bin/$_pkgname"
+  install -Dm644 "$_pkgname.1" "$pkgdir/usr/share/man/man1/$_pkgname.1"
+  install -d "$pkgdir/usr/share/$_pkgname/animations"
+  install -m644 animations/*.gif "$pkgdir/usr/share/$_pkgname/animations/"
+  install -Dm644 README "$pkgdir/usr/share/doc/$_pkgname/README"
+  install -Dm644 "icons/$_pkgname.png" \
+    "$pkgdir/usr/share/pixmaps/$_pkgname.png"
   for i in 16 32 48 ; do
-    install -Dm644 icons/gnormalize-${i}.png \
-      "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps/gnormalize.png"
+    install -Dm644 "icons/gnormalize-$i.png" \
+      "$pkgdir/usr/share/icons/hicolor/${i}x$i/apps/$_pkgname.png"
   done
-  install -Dm644 "${srcdir}/gnormalize.desktop" \
-    "${pkgdir}/usr/share/applications/gnormalize.desktop"
+  install -Dm644 "$_pkgname.desktop" \
+    "$pkgdir/usr/share/applications/$_pkgname.desktop"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/libre/grub-legacy/PKGBUILD b/libre/grub-legacy/PKGBUILD
index 6c2afd3a8..036540e79 100644
--- a/libre/grub-legacy/PKGBUILD
+++ b/libre/grub-legacy/PKGBUILD
@@ -2,20 +2,18 @@
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Maintainer: ava1ar <mail(dot)avatar(at)gmail(dot)com>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
-# Maintainer (Parabola): Jorge López <jorginho@lavabit.com>
+# Contributor (Parabola): Jorge López <jorginho@lavabit.com>
 
 pkgname=grub-legacy
 _srcname=grub
 pkgver=0.97
-pkgrel=24
+pkgrel=25.1
 pkgdesc="A GNU multiboot boot loader (Parabola rebranded)"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.gnu.org/software/grub/"
 depends=('ncurses' 'diffutils' 'sed')
-conflicts=('grub' 'grub-common' 'grub-bios' 'grub-efi-i386' 'grub-efi-x86_64')
-replaces=('grub')
-provides=("grub=${pkgver}")
+conflicts=('grub')
 [ "$CARCH" = 'x86_64' ] && makedepends=('gcc-multilib')
 optdepends=('xfsprogs: freezing of xfs /boot in install-grub script')
 source=(ftp://alpha.gnu.org/gnu/grub/${_srcname}-${pkgver}.tar.gz
@@ -80,10 +78,10 @@ build() {
     patch -Np1 -i ../040_all_grub-0.96-nxstack.patch
     # patch from frugalware to make it boot when more than 2GB ram installed
     patch -Np1 -i ../05-grub-0.97-initrdaddr.diff
-    CFLAGS="-static -fno-strict-aliasing" ./configure --prefix=/usr --bindir=/bin --sbindir=/sbin \
+    CFLAGS="-static -fno-strict-aliasing" ./configure --prefix=/usr --bindir=/usr/bin --sbindir=/usr/bin \
                          --mandir=/usr/share/man --infodir=/usr/share/info
   else
-    CFLAGS="-fno-strict-aliasing" ./configure --prefix=/usr --bindir=/bin --sbindir=/sbin \
+    CFLAGS="-fno-strict-aliasing" ./configure --prefix=/usr --bindir=/usr/bin --sbindir=/usr/bin \
                 --mandir=/usr/share/man --infodir=/usr/share/info
   fi
 }
@@ -94,6 +92,6 @@ package() {
   CFLAGS= make
   make DESTDIR=${pkgdir} install
   install -D -m644 ../menu.lst ${pkgdir}/boot/grub/menu.lst
-  install -D -m755 ../install-grub ${pkgdir}/sbin/install-grub
+  install -D -m755 ../install-grub ${pkgdir}/usr/bin/install-grub
 
 }
diff --git a/libre/grub/20_memtest86+ b/libre/grub/20_memtest86+
deleted file mode 100644
index 1d3096f6b..000000000
--- a/libre/grub/20_memtest86+
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /bin/sh -e
-########################################################
-# This script generates a memtest86+ entry on grub.cfg #
-# if memtest is installed on the system.               #
-########################################################
-
-prefix="/usr"
-exec_prefix="${prefix}"
-
-datarootdir="/usr/share"
-datadir="${datarootdir}"
-
-. "${datadir}/grub/grub-mkconfig_lib"
-
-MEMTEST86_IMAGE="/boot/memtest86+/memtest.bin"
-CLASS="--class memtest86 --class gnu --class tool"
-
-if [ -e $MEMTEST86_IMAGE ] && is_path_readable_by_grub $MEMTEST86_IMAGE; then
-  # image exists, create menu entry
-  echo "Found memtest86+ image: $MEMTEST86_IMAGE" >&2
-  cat << EOF
-menuentry "Memory test (memtest86+)" $CLASS {
-EOF
-  prepare_grub_to_access_device `${grub_probe} --target=device $MEMTEST86_IMAGE` | sed -e "s/^/  /"
-  cat << EOF
-  linux16 (\$root)`make_system_path_relative_to_its_root $MEMTEST86_IMAGE`
-}
-EOF
-fi
diff --git a/libre/grub/60_memtest86+ b/libre/grub/60_memtest86+
new file mode 100644
index 000000000..086f0cc84
--- /dev/null
+++ b/libre/grub/60_memtest86+
@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+########################################################
+# This script generates a memtest86+ entry on grub.cfg #
+# if memtest is installed on the system.               #
+########################################################
+
+prefix="/usr"
+exec_prefix="${prefix}"
+
+datarootdir="/usr/share"
+datadir="${datarootdir}"
+
+. "${datadir}/grub/grub-mkconfig_lib"
+
+MEMTEST86_IMAGE="/boot/memtest86+/memtest.bin"
+CLASS="--class memtest86 --class gnu --class tool"
+
+if [ -e "${MEMTEST86_IMAGE}" ] && is_path_readable_by_grub "${MEMTEST86_IMAGE}" ; then
+    ## image exists, create menu entry
+    echo "Found memtest86+ image: ${MEMTEST86_IMAGE}" >&2
+    _GRUB_MEMTEST_HINTS_STRING="$(${grub_probe} --target=hints_string ${MEMTEST86_IMAGE})"
+    _GRUB_MEMTEST_FS_UUID="$(${grub_probe} --target=fs_uuid ${MEMTEST86_IMAGE})"
+    _GRUB_MEMTEST_REL_PATH="$(make_system_path_relative_to_its_root ${MEMTEST86_IMAGE})"
+    cat << EOF
+if [ "\${grub_platform}" == "pc" ]; then
+    menuentry "Memory Tester (memtest86+)" ${CLASS} {
+        search --fs-uuid --no-floppy --set=root ${_GRUB_MEMTEST_HINTS_STRING} ${_GRUB_MEMTEST_FS_UUID}
+        linux16 ${_GRUB_MEMTEST_REL_PATH} ${GRUB_CMDLINE_MEMTEST86}
+    }
+fi
+EOF
+fi
diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD
index 3969d713a..56d994beb 100644
--- a/libre/grub/PKGBUILD
+++ b/libre/grub/PKGBUILD
@@ -1,85 +1,88 @@
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
+# Maintainer : Tobias Powalowski <tpowa@archlinux.org>
+# Maintainer : Ronald van Haren <ronald.archlinux.org>
+# Contributor: Keshav Padram (the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
-_grub_lua_ver=24
-_grub_ntldr_ver=21
-_grub_915_ver=9
+_GRUB_BZR_REV="5043"
 
-pkgname=('grub-common' 'grub-bios' 'grub-efi-i386')
-pkgbase=grub
-pkgver=2.00
+## grub-extras lua and gpxe fail to build with grub bzr rev 5043
+
+[[ "${CARCH}" == "x86_64" ]] && _EFI_ARCH="x86_64"
+[[ "${CARCH}" == "i686" ]] && _EFI_ARCH="i386"
+
+pkgname=grub
+pkgdesc="GNU GRand Unified Bootloader (2), (Parabola rebranded)"
+pkgver=2.00.${_GRUB_BZR_REV}
 pkgrel=2
 url="https://www.gnu.org/software/grub/"
-arch=('i686' 'x86_64')
+arch=('x86_64' 'i686')
 license=('GPL3')
-makedepends=('xz' 'bdf-unifont' 'ttf-dejavu' 'python' 'autogen'
-             'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse')
-
-source=("http://ftp.gnu.org/gnu/grub/grub-${pkgver}.tar.xz"
-        "ftp://ftp.archlinux.org/other/grub2/grub2_extras_lua_r${_grub_lua_ver}.tar.xz"
-        "ftp://ftp.archlinux.org/other/grub2/grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz"
-        "ftp://ftp.archlinux.org/other/grub2/grub2_extras_915resolution_r${_grub_915_ver}.tar.xz"
+backup=('etc/default/grub' 'etc/grub.d/40_custom')
+install="${pkgname}.install"
+options=('!makeflags')
+
+conflicts=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}" 'grub-legacy')
+replaces=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}")
+provides=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}")
+
+makedepends=('xz' 'freetype2' 'bdf-unifont' 'ttf-dejavu' 'python' 'autogen'
+             'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse' 'bzr' 'rsync')
+depends=('sh' 'xz' 'gettext' 'device-mapper')
+optdepends=('freetype2: For grub-mkfont usage'
+            'fuse: For grub-mount usage'
+            'dosfstools: For grub-mkrescue FAT FS and EFI support' 
+            'efibootmgr: For grub-install EFI support'
+            'libisoburn: Provides xorriso for generating grub rescue iso using grub-mkrescue'
+            'os-prober: To detect other OSes when generating grub.cfg in BIOS systems'
+            'mtools: For grub-mkrescue FAT FS support')
+
+# source=("http://ftp.gnu.org/gnu/grub/grub-${pkgver}.tar.xz"
+source=("grub-${pkgver}::bzr+bzr://bzr.savannah.gnu.org/grub/trunk/grub/#revision=${_GRUB_BZR_REV}"
         'parabola_grub_mkconfig_fixes.patch'
-        'grub.default'
-        'grub.cfg'
-        '20_memtest86+'
-        'grub_bzr_export.sh'
-        '0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch'
-        'grub-2.00-fix-docs.patch')
+        '60_memtest86+'
+        'grub.default')
 
-noextract=("grub2_extras_lua_r${_grub_lua_ver}.tar.xz"
-           "grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz"
-           "grub2_extras_915resolution_r${_grub_915_ver}.tar.xz")
+for _DIR_ in 915resolution ntldr-img ; do
+	source+=("grub-extras-${_DIR_}::bzr+bzr://bzr.savannah.gnu.org/grub-extras/${_DIR_}/#revision=")
+done
 
+# sha1sums=('274d91e96b56a5b9dd0a07accff69dbb6dfb596b'
+sha1sums=('SKIP'
+          '513172d91d1a2e2cda7c0a744c766d5868cb28bf'
+          '2aa2deeb7d7dc56f389aa1487b7a57b0d44ce559'
+          '06b926320cb2add6c157d59d46e553b89dd3aa03'
+          'SKIP'
+          'SKIP')
 
 _build_grub-common_and_bios() {
-
-	## copy the source for building the common/bios package
-	cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub_bios-${pkgver}"
-	cd "${srcdir}/grub_bios-${pkgver}"
-
-	## Apply Parabola specific fixes to enable grub-mkconfig detect kernels and initramfs
-	patch -Np1 -i "${srcdir}/parabola_grub_mkconfig_fixes.patch"
-	echo
-
-	## fix unifont.bdf location so that grub-mkfont can create *.pf2 files
-	sed 's|/usr/share/fonts/unifont|/usr/share/fonts/unifont /usr/share/fonts/misc|g' -i "${srcdir}/grub_bios-${pkgver}/configure.ac"
-
-	## fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2 files for starfield theme
-	sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "${srcdir}/grub_bios-${pkgver}/configure.ac"
-
-	## add the grub-extra sources
-	export GRUB_CONTRIB="${srcdir}/grub_bios-${pkgver}/grub-extras/"
-	install -d "${srcdir}/grub_bios-${pkgver}/grub-extras"
-
-	bsdtar xf "${srcdir}/grub2_extras_lua_r${_grub_lua_ver}.tar.xz" \
-		-C "${srcdir}/grub_bios-${pkgver}/grub-extras"
-
-	bsdtar xf "${srcdir}/grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz" \
-		-C "${srcdir}/grub_bios-${pkgver}/grub-extras"
-
-	bsdtar xf "${srcdir}/grub2_extras_915resolution_r${_grub_915_ver}.tar.xz" \
-		-C "${srcdir}/grub_bios-${pkgver}/grub-extras"
-
-	## Requires python2
-	# sed 's|python |python2 |g' -i "${srcdir}/grub_bios-${pkgver}/autogen.sh"
-
-	# fix compiling with gcc48
-        patch -Np1 -i ${srcdir}/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch
-
-	#fix docs compiling
-        patch -Np1 -i ${srcdir}/grub-2.00-fix-docs.patch
-
-        ## start the actual build process
-	cd "${srcdir}/grub_bios-${pkgver}"
+	
+	## Copy the source for building the common/bios package
+	cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub-${pkgver}-bios"
+	cd "${srcdir}/grub-${pkgver}-bios/"
+	
+	## Add the grub-extra sources
+	export GRUB_CONTRIB="${srcdir}/grub-${pkgver}-bios/grub-extras/"
+	
+	install -d "${srcdir}/grub-${pkgver}-bios/grub-extras"
+	for _DIR_ in 915resolution ntldr-img ; do
+		cp -r "${srcdir}/grub-extras-${_DIR_}" "${srcdir}/grub-${pkgver}-bios/grub-extras/${_DIR_}"
+	done
+	
+	## Unset all compiler FLAGS for bios build
+	unset CFLAGS
+	unset CPPFLAGS
+	unset CXXFLAGS
+	unset LDFLAGS
+	unset MAKEFLAGS
+	
+	## Start the actual build process
+	cd "${srcdir}/grub-${pkgver}-bios/"
 	./autogen.sh
 	echo
-
-	CFLAGS="" ./configure \
+	
+	./configure \
 		--with-platform="pc" \
 		--target="i386" \
-		--host="${CARCH}-unknown-linux-gnu" \
 		"${_EFIEMU}" \
 		--enable-mm-debug \
 		--enable-nls \
@@ -94,43 +97,43 @@ _build_grub-common_and_bios() {
 		--infodir="/usr/share/info" \
 		--datarootdir="/usr/share" \
 		--sysconfdir="/etc" \
-		--program-prefix="" \
+	 	--program-prefix="" \
 		--with-bootdir="/boot" \
 		--with-grubdir="grub" \
 		--disable-werror
 	echo
-
-	CFLAGS="" make
+	
+	make
 	echo
-
 }
 
-_build_grub-efi-i386() {
-
-	## copy the source for building the efi package
-	cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub_efi-${pkgver}"
-	cd "${srcdir}/grub_efi-${pkgver}"
-
-	export GRUB_CONTRIB="${srcdir}/grub_efi-${pkgver}/grub-extras/"
-	install -d "${srcdir}/grub_efi-${pkgver}/grub-extras"
-
-	bsdtar xf "${srcdir}/grub2_extras_lua_r${_grub_lua_ver}.tar.xz" \
-		-C "${srcdir}/grub_efi-${pkgver}/grub-extras"
-
-        # fix compiling with gcc48
-        patch -Np1 -i ${srcdir}/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch
-
-	#fix docs compiling
-        patch -Np1 -i ${srcdir}/grub-2.00-fix-docs.patch
-
-	cd "${srcdir}/grub_efi-${pkgver}"
+_build_grub-efi() {
+	
+	## Copy the source for building the efi package
+	cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub-${pkgver}-efi"
+	cd "${srcdir}/grub-${pkgver}-efi/"
+	
+	# export GRUB_CONTRIB="${srcdir}/grub-${pkgver}-efi/grub-extras/"
+	
+	# install -d "${srcdir}/grub-${pkgver}-efi/grub-extras/"
+	# for _DIR_ in lua gpxe ; do
+	#	cp -r "${srcdir}/grub-extras-${_DIR_}" "${srcdir}/grub-${pkgver}-bios/grub-extras/${_DIR_}"
+	# done
+	
+	## Unset all compiler FLAGS for efi build
+	unset CFLAGS
+	unset CPPFLAGS
+	unset CXXFLAGS
+	unset LDFLAGS
+	unset MAKEFLAGS
+	
+	cd "${srcdir}/grub-${pkgver}-efi/"
 	./autogen.sh
 	echo
-
-	CFLAGS="" ./configure \
+	
+	./configure \
 		--with-platform="efi" \
-		--target="i386" \
-		--host="${CARCH}-unknown-linux-gnu" \
+		--target="${_EFI_ARCH}" \
 		--disable-efiemu \
 		--enable-mm-debug \
 		--enable-nls \
@@ -150,117 +153,91 @@ _build_grub-efi-i386() {
 		--with-grubdir="grub" \
 		--disable-werror
 	echo
-
-	CFLAGS="" make
+	
+	make
 	echo
-
+	
 }
 
-build() {
-
-	## set architecture dependent variables
+prepare() {
+	
+	## Set ARCH dependent variables
 	if [[ "${CARCH}" == 'x86_64' ]]; then
 		_EFIEMU="--enable-efiemu"
 	else
 		_EFIEMU="--disable-efiemu"
 	fi
-
-	_HOST="${CARCH}"
-
-	cd "${srcdir}/grub-${pkgver}"
-	# _get_locale_files
-
-	_build_grub-common_and_bios
+	
+	cd "${srcdir}/grub-${pkgver}/"
+	
+	## Apply Parabola specific fixes to enable grub-mkconfig detect kernels and initramfs
+	patch -Np1 -i "${srcdir}/parabola_grub_mkconfig_fixes.patch"
 	echo
+	
+	## fix unifont.bdf location so that grub-mkfont can create *.pf2 files
+	sed 's|/usr/share/fonts/unifont|/usr/share/fonts/unifont /usr/share/fonts/misc|g' -i "${srcdir}/grub-${pkgver}/configure.ac"
+	
+	## fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2 files for starfield theme
+	sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "${srcdir}/grub-${pkgver}/configure.ac"
+	
+	## Requires python2
+	# sed 's|python |python2 |g' -i "${srcdir}/grub-${pkgver}/autogen.sh"
 
-	_build_grub-efi-i386
-	echo
+        ## pull in language files
+        ./linguas.sh
 
 }
 
-package_grub-common() {
+build() {
 
-	pkgdesc="GNU GRand Unified Bootloader - Utilities and Common Files (Parabola rebranded)"
-	depends=('sh' 'xz' 'freetype2' 'gettext' 'device-mapper' 'fuse')
-	conflicts=('grub-legacy' 'grub')
-	replaces=('grub2-common')
-	provides=('grub2-common')
-	backup=('boot/grub/grub.cfg' 'etc/default/grub' 'etc/grub.d/40_custom')
-	optdepends=('libisoburn: provides xorriso for generating grub rescue iso using grub-mkrescue'
-	            'os-prober: to detect other OSes when generating grub.cfg in BIOS systems'
-	            'mtools: for grub-mkrescue FAT FS support')
-	install="grub.install"
-	options=('strip' 'purge' 'docs' 'zipman' '!emptydirs')
+        cd "${srcdir}/grub-${pkgver}/"
 
-	cd "${srcdir}/grub_bios-${pkgver}"
-	make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
+        # remove not working langs which need LC_ALL=C.UTF-8
+        sed -i -e 's#en@cyrillic en@greek##g' po/LINGUAS
+	_build_grub-common_and_bios
+	echo
+	
+	_build_grub-efi
 	echo
-
-	## install extra /etc/grub.d/ files
-	install -D -m0755 "${srcdir}/20_memtest86+" "${pkgdir}/etc/grub.d/20_memtest86+"
-
-	## install /etc/default/grub (used by grub-mkconfig)
-	install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub"
-
-	## install grub.cfg (needed so it doesn't get removed on upgrading because it was previously here)
-	install -D -m0644 "${srcdir}/grub.cfg" "${pkgdir}/boot/grub/grub.cfg"
-
-	# remove platform specific files
-	rm -rf "${pkgdir}/usr/lib/grub/i386-pc/"
 
 }
 
-package_grub-bios() {
-
-	pkgdesc="GNU GRand Unified Bootloader - i386 PC BIOS Modules"
-	depends=("grub-common=${pkgver}")
-	options=('!strip' '!emptydirs')
-	replaces=('grub2-bios')
-	provides=('grub2-bios')
-
-	cd "${srcdir}/grub_bios-${pkgver}"
-	make DESTDIR="${pkgdir}/" install
+_package_grub-common_and_bios() {
+	
+	cd "${srcdir}/grub-${pkgver}-bios/"
+	make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
 	echo
-
-	## remove non platform-specific files
-	rm -rf "${pkgdir}"/{boot,etc,usr/{share,bin,sbin}}
-
+	
 	## remove gdb debugging related files
 	rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.module || true
 	rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.image || true
 	rm -f "${pkgdir}/usr/lib/grub/i386-pc"/{kernel.exec,gdb_grub,gmodule.pl} || true
-
+	
+	## Install extra /etc/grub.d/ files
+	install -D -m0755 "${srcdir}/60_memtest86+" "${pkgdir}/etc/grub.d/60_memtest86+"
+	
+	## Install /etc/default/grub (used by grub-mkconfig)
+	install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub"
+	
 }
 
-package_grub-efi-i386() {
-
-	pkgdesc="GNU GRand Unified Bootloader - i386 UEFI Modules"
-	depends=("grub-common=${pkgver}" 'dosfstools' 'efibootmgr')
-	options=('!strip' '!emptydirs')
-	replaces=('grub2-efi-i386')
-	provides=('grub2-efi-i386')
-
-	cd "${srcdir}/grub_efi-${pkgver}"
-	make DESTDIR="${pkgdir}/" install
+_package_grub-efi() {
+	
+	cd "${srcdir}/grub-${pkgver}-efi/"
+	make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
 	echo
-
-	## remove non platform-specific files
-	rm -rf "${pkgdir}"/{boot,etc,usr/{share,bin,sbin}}
-
+	
 	## remove gdb debugging related files
-	rm -f "${pkgdir}/usr/lib/grub/i386-efi"/*.module || true
-	rm -f "${pkgdir}/usr/lib/grub/i386-efi"/*.image || true
-	rm -f "${pkgdir}/usr/lib/grub/i386-efi"/{kernel.exec,gdb_grub,gmodule.pl} || true
+	rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/*.module || true
+	rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/*.image || true
+	rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/{kernel.exec,gdb_grub,gmodule.pl} || true
+	
+}
 
+package() {
+	
+	_package_grub-efi
+	
+	_package_grub-common_and_bios
+	
 }
-md5sums=('a1043102fbc7bcedbf53e7ee3d17ab91'
-         '704ea9f250b6137f05fa0197fd07053a'
-         '77f7d5f8ce395663cd7fff4d37099957'
-         'a80e2b1d3bab778c3b6117d5a698992f'
-         'c776aaf2cc35488a7c531b59e697470d'
-         '52d374e0194e3f2e39ff7c92ecd58a6c'
-         '255eafb440b8c285b20431366c2d2d27'
-         '9b6358d3de5c4bb95a041ab7c44a21ec'
-         'f343ed2340ebc86c427873641bb72419'
-         'ab751d1d8cd3fd47e5ee24d71ecc31ed'
-         '342dd18472a24e5fd252458b24f39a29')
diff --git a/libre/grub/grub_bzr_export.sh b/libre/grub/grub_bzr_export.sh
deleted file mode 100644
index ff8f99ecc..000000000
--- a/libre/grub/grub_bzr_export.sh
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/usr/bin/env bash
-
-## For actual repos
-
-# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/lua lua
-# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/gpxe gpxe
-# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/ntldr-img ntldr-img
-# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/915resolution 915resolution
-
-## For launchpad mirror
-
-# bzr branch lp:~the-ridikulus-rat/grub/grub-extras-lua lua
-# bzr branch lp:~the-ridikulus-rat/grub/grub-extras-gpxe gpxe
-# bzr branch lp:~the-ridikulus-rat/grub/grub-extras-ntldr-img ntldr-img
-# bzr branch lp:~the-ridikulus-rat/grub/grub-extras-915resolution 915resolution
-
-## grub-extras zfs is integrated into grub bzr main repo and is no longer needed separately.
-
-_WD="${PWD}/"
-_OUTPUT_DIR="${_WD}/"
-
-_ACTUAL_PKGVER="2.00"
-
-_GRUB_BZR_REPO_DIR="${_WD}/grub_mainline_BZR/"
-_GRUB_BZR_EXP_REPO_DIR="${_WD}/grub_experimental_BZR/"
-_GRUB_EXTRAS_REPOS_DIR="${_WD}/grub_extras_BZR/"
-
-_MAIN_SNAPSHOT() {
-	
-	cd "${_GRUB_BZR_REPO_DIR}/"
-	echo
-	
-	_REVNUM="$(bzr revno ${_GRUB_BZR_REPO_DIR})"
-	bzr export --root="grub-${_ACTUAL_PKGVER}" --format="tar" "${_OUTPUT_DIR}/grub_r${_REVNUM}.tar"
-	echo
-	
-	cd "${_OUTPUT_DIR}/"
-	
-	xz -9 "${_OUTPUT_DIR}/grub_r${_REVNUM}.tar"
-	echo
-	
-}
-
-_EXP_SNAPSHOT() {
-	
-	cd "${_GRUB_BZR_EXP_REPO_DIR}/"
-	echo
-	
-	_REVNUM="$(bzr revno ${_GRUB_BZR_EXP_REPO_DIR})"
-	bzr export --root="grub-${_ACTUAL_PKGVER}" --format="tar" "${_OUTPUT_DIR}/grub_exp_r${_REVNUM}.tar"
-	echo
-	
-	cd "${_OUTPUT_DIR}/"
-	
-	xz -9 "${_OUTPUT_DIR}/grub_exp_r${_REVNUM}.tar"
-	echo
-	
-}
-
-_EXTRAS_SNAPSHOT() {
-	
-	cd "${_GRUB_EXTRAS_REPOS_DIR}/${_GRUB_EXTRAS_NAME}/"
-	echo
-	
-	_REVNUM="$(bzr revno ${_GRUB_EXTRAS_REPOS_DIR}/${_GRUB_EXTRAS_NAME})"
-	bzr export --root="${_GRUB_EXTRAS_NAME}" --format="tar" "${_OUTPUT_DIR}/grub_extras_${_GRUB_EXTRAS_NAME}_r${_REVNUM}.tar"
-	echo
-	
-	cd "${_OUTPUT_DIR}/"
-	echo
-	
-	xz -9 "${_OUTPUT_DIR}/grub_extras_${_GRUB_EXTRAS_NAME}_r${_REVNUM}.tar"
-	echo
-	
-}
-
-echo
-
-set -x -e
-
-echo
-
-_MAIN_SNAPSHOT
-
-echo
-
-# _EXP_SNAPSHOT
-
-echo
-
-_GRUB_EXTRAS_NAME="lua"
-_EXTRAS_SNAPSHOT
-
-# _GRUB_EXTRAS_NAME="gpxe"
-# _EXTRAS_SNAPSHOT
-
-_GRUB_EXTRAS_NAME="ntldr-img"
-_EXTRAS_SNAPSHOT
-
-_GRUB_EXTRAS_NAME="915resolution"
-_EXTRAS_SNAPSHOT
-
-echo
-
-set +x +e
-
-echo
-
-unset _WD
-unset _OUTPUT_DIR
-unset _GRUB_BZR_REPO_DIR
-unset _GRUB_EXTRAS_REPOS_DIR
-unset _GRUB_EXTRAS_NAME
diff --git a/libre/grub/parabola_grub_mkconfig_fixes.patch b/libre/grub/parabola_grub_mkconfig_fixes.patch
index 5324afa01..fbcca19ec 100644
--- a/libre/grub/parabola_grub_mkconfig_fixes.patch
+++ b/libre/grub/parabola_grub_mkconfig_fixes.patch
@@ -1,8 +1,8 @@
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 516be86..5f37db2 100644
+index 8decc1d..170047f 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
-@@ -213,6 +213,8 @@ export GRUB_DEFAULT \
+@@ -212,6 +212,8 @@ export GRUB_DEFAULT \
    GRUB_THEME \
    GRUB_GFXPAYLOAD_LINUX \
    GRUB_DISABLE_OS_PROBER \
@@ -12,10 +12,10 @@ index 516be86..5f37db2 100644
    GRUB_SAVEDEFAULT \
    GRUB_ENABLE_CRYPTODISK \
 diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
-index 765bfdc..b148558 100644
+index 2c4bb0a..c7120d2 100644
 --- a/util/grub.d/00_header.in
 +++ b/util/grub.d/00_header.in
-@@ -115,6 +115,14 @@ cat <<EOF
+@@ -125,6 +125,14 @@ cat <<EOF
  
  EOF
  
@@ -64,7 +64,7 @@ index 14402e8..e85f7d6 100644
    fi      
 -  if [ x$type != xrecovery ] ; then
 +  if [ x$type != xrecovery ] && [ x$type != xfallback ] ; then
-       save_default_entry | sed -e "s/^/\t/"
+       save_default_entry | grub_add_tab
    fi
  
 @@ -132,7 +140,8 @@ linux_entry ()
@@ -75,7 +75,7 @@ index 14402e8..e85f7d6 100644
 +
 +  message="$(gettext_printf "Loading Linux %s ..." "${version}")"
    sed "s/^/$submenu_indentation/" << EOF
- 	echo	'$message'
+ 	echo	'$(echo "$message" | grub_quote)'
  	linux	${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
 @@ -190,7 +199,22 @@ while [ "x$list" != "x" ] ; do
    alt_version=`echo $version | sed -e "s,\.old$,,g"`
diff --git a/libre/gsoap-legacy/LICENSE b/libre/gsoap-legacy/LICENSE
new file mode 100644
index 000000000..00b8ad810
--- /dev/null
+++ b/libre/gsoap-legacy/LICENSE
@@ -0,0 +1,163 @@
+gSOAP Public License
+Version 1.3a
+The gSOAP public license is derived from the Mozilla Public License (MPL1.1). The sections that were deleted from the original MPL1.1 text are 1.0.1, 2.1.(c),(d), 2.2.(c),(d), 8.2.(b), 10, and 11. Section 3.8 was added. The modified sections are 2.1.(b), 2.2.(b), 3.2 (simplified), 3.5 (deleted the last sentence), and 3.6 (simplified).
+1  DEFINITIONS.
+
+1.0.1.
+1.1. "Contributor"
+    means each entity that creates or contributes to the creation of Modifications.
+1.2. "Contributor Version"
+    means the combination of the Original Code, prior Modifications used by a Contributor, and the Modifications made by that particular Contributor.
+1.3. "Covered Code"
+    means the Original Code, or Modifications or the combination of the Original Code, and Modifications, in each case including portions thereof.
+1.4. "Electronic Distribution Mechanism"
+    means a mechanism generally accepted in the software development community for the electronic transfer of data.
+1.5. "Executable"
+    means Covered Code in any form other than Source Code.
+1.6. "Initial Developer"
+    means the individual or entity identified as the Initial Developer in the Source Code notice required by Exhibit A.
+1.7. "Larger Work"
+    means a work which combines Covered Code or portions thereof with code not governed by the terms of this License.
+1.8. "License"
+    means this document.
+1.8.1. "Licensable"
+    means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein.
+1.9. "Modifications"
+    means any addition to or deletion from the substance or structure of either the Original Code or any previous Modifications. When Covered Code is released as a series of files, a Modification is:
+
+    A.
+        Any addition to or deletion from the contents of a file containing Original Code or previous Modifications.
+    B.
+        Any new file that contains any part of the Original Code, or previous Modifications. 
+
+1.10. "Original Code"
+    means Source Code of computer software code which is described in the Source Code notice required by Exhibit A as Original Code, and which, at the time of its release under this License is not already Covered Code governed by this License.
+1.10.1. "Patent Claims"
+    means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent Licensable by grantor.
+1.11. "Source Code"
+    means the preferred form of the Covered Code for making modifications to it, including all modules it contains, plus any associated interface definition files, scripts used to control compilation and installation of an Executable, or source code differential comparisons against either the Original Code or another well known, available Covered Code of the Contributor's choice. The Source Code can be in a compressed or archival form, provided the appropriate decompression or de-archiving software is widely available for no charge.
+1.12. "You" (or "Your")
+    means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License or a future version of this License issued under Section 6.1. For legal entities, "You" includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, "control" means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity.
+
+2  SOURCE CODE LICENSE.
+
+2.1. The Initial Developer Grant.
+
+    The Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims:
+
+    (a)
+        under intellectual property rights (other than patent or trademark) Licensable by Initial Developer to use, reproduce, modify, display, perform, sublicense and distribute the Original Code (or portions thereof) with or without Modifications, and/or as part of a Larger Work; and
+    (b)
+        under patents now or hereafter owned or controlled by Initial Developer, to make, have made, use and sell ("offer to sell and import") the Original Code, Modifications, or portions thereof, but solely to the extent that any such patent is reasonably necessary to enable You to utilize, alone or in combination with other software, the Original Code, Modifications, or any combination or portions thereof.
+    (c)
+    (d)
+
+
+2.2. Contributor Grant.
+
+    Subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license
+
+    (a)
+        under intellectual property rights (other than patent or trademark) Licensable by Contributor, to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof) either on an unmodified basis, with other Modifications, as Covered Code and/or as part of a Larger Work; and
+    (b)
+        under patents now or hereafter owned or controlled by Contributor, to make, have made, use and sell ("offer to sell and import") the Contributor Version (or portions thereof), but solely to the extent that any such patent is reasonably necessary to enable You to utilize, alone or in combination with other software, the Contributor Version (or portions thereof).
+    (c)
+    (d)
+
+3  DISTRIBUTION OBLIGATIONS.
+
+3.1. Application of License.
+
+    The Modifications which You create or to which You contribute are governed by the terms of this License, including without limitation Section 2.2. The Source Code version of Covered Code may be distributed only under the terms of this License or a future version of this License released under Section 6.1, and You must include a copy of this License with every copy of the Source Code You distribute. You may not offer or impose any terms on any Source Code version that alters or restricts the applicable version of this License or the recipients' rights hereunder. However, You may include an additional document offering the additional rights described in Section 3.5.
+
+3.2. Availability of Source Code.
+
+    Any Modification created by You will be provided to the Initial Developer in Source Code form and are subject to the terms of the License.
+
+3.3. Description of Modifications.
+
+    You must cause all Covered Code to which You contribute to contain a file documenting the changes You made to create that Covered Code and the date of any change. You must include a prominent statement that the Modification is derived, directly or indirectly, from Original Code provided by the Initial Developer and including the name of the Initial Developer in (a) the Source Code, and (b) in any notice in an Executable version or related documentation in which You describe the origin or ownership of the Covered Code.
+
+3.4. Intellectual Property Matters.
+
+    (a) Third Party Claims.
+        If Contributor has knowledge that a license under a third party's intellectual property rights is required to exercise the rights granted by such Contributor under Sections 2.1 or 2.2, Contributor must include a text file with the Source Code distribution titled "LEGAL" which describes the claim and the party making the claim in sufficient detail that a recipient will know whom to contact. If Contributor obtains such knowledge after the Modification is made available as described in Section 3.2, Contributor shall promptly modify the LEGAL file in all copies Contributor makes available thereafter and shall take other steps (such as notifying appropriate mailing lists or newsgroups) reasonably calculated to inform those who received the Covered Code that new knowledge has been obtained.
+    (b) Contributor APIs.
+        If Contributor's Modifications include an application programming interface and Contributor has knowledge of patent licenses which are reasonably necessary to implement that API, Contributor must also include this information in the LEGAL file.
+    (c) Representations.
+        Contributor represents that, except as disclosed pursuant to Section 3.4(a) above, Contributor believes that Contributor's Modifications are Contributor's original creation(s) and/or Contributor has sufficient rights to grant the rights conveyed by this License.
+
+
+3.5. Required Notices.
+
+    You must duplicate the notice in Exhibit A in each file of the Source Code. If it is not possible to put such notice in a particular Source Code file due to its structure, then You must include such notice in a location (such as a relevant directory) where a user would be likely to look for such a notice. If You created one or more Modification(s) You may add your name as a Contributor to the notice described in Exhibit A. You must also duplicate this License in any documentation for the Source Code where You describe recipients' rights or ownership rights relating to Covered Code. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Code. However, You may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor.
+
+3.6. Distribution of Executable Versions.
+
+    You may distribute Covered Code in Executable form only if the requirements of Section 3.1-3.5 have been met for that Covered Code. You may distribute the Executable version of Covered Code or ownership rights under a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable version does not attempt to limit or alter the recipient's rights in the Source Code version from the rights set forth in this License. If You distribute the Executable version under a different license You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or any Contributor. If you distribute executable versions containing Covered Code as part of a product, you must reproduce the notice in Exhibit B in the documentation and/or other materials provided with the product.
+
+3.7. Larger Works.
+
+    You may create a Larger Work by combining Covered Code with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Code.
+
+3.8. Restrictions.
+
+    You may not remove any product identification, copyright, proprietary notices or labels from gSOAP.
+
+4  INABILITY TO COMPLY DUE TO STATUTE OR REGULATION.
+If it is impossible for You to comply with any of the terms of this License with respect to some or all of the Covered Code due to statute, judicial order, or regulation then You must: (a) comply with the terms of this License to the maximum extent possible; and (b) describe the limitations and the code they affect. Such description must be included in the LEGAL file described in Section 3.4 and must be included with all distributions of the Source Code. Except to the extent prohibited by statute or regulation, such description must be sufficiently detailed for a recipient of ordinary skill to be able to understand it.
+5  APPLICATION OF THIS LICENSE.
+This License applies to code to which the Initial Developer has attached the notice in Exhibit A and to related Covered Code.
+6  VERSIONS OF THE LICENSE.
+
+6.1. New Versions.
+
+    Grantor may publish revised and/or new versions of the License from time to time. Each version will be given a distinguishing version number.
+
+6.2. Effect of New Versions.
+
+    Once Covered Code has been published under a particular version of the License, You may always continue to use it under the terms of that version. You may also choose to use such Covered Code under the terms of any subsequent version of the License.
+
+6.3. Derivative Works.
+
+    If You create or use a modified version of this License (which you may only do in order to apply it to code which is not already Covered Code governed by this License), You must (a) rename Your license so that the phrase "gSOAP" or any confusingly similar phrase do not appear in your license (except to note that your license differs from this License) and (b) otherwise make it clear that Your version of the license contains terms which differ from the gSOAP Public License. (Filling in the name of the Initial Developer, Original Code or Contributor in the notice described in Exhibit A shall not of themselves be deemed to be modifications of this License.)
+
+7  DISCLAIMER OF WARRANTY.
+COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY OF ANY KIND, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY RIGHTS, AND ANY WARRANTY THAT MAY ARISE BY REASON OF TRADE USAGE, CUSTOM, OR COURSE OF DEALING. WITHOUT LIMITING THE FOREGOING, YOU ACKNOWLEDGE THAT THE SOFTWARE IS PROVIDED "AS IS" AND THAT THE AUTHORS DO NOT WARRANT THE SOFTWARE WILL RUN UNINTERRUPTED OR ERROR FREE. LIMITED LIABILITY THE ENTIRE RISK AS TO RESULTS AND PERFORMANCE OF THE SOFTWARE IS ASSUMED BY YOU. UNDER NO CIRCUMSTANCES WILL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES OF ANY KIND OR NATURE WHATSOEVER, WHETHER BASED ON CONTRACT, WARRANTY, TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, ARISING OUT OF OR IN ANY WAY RELATED TO THE SOFTWARE, EVEN IF THE AUTHORS HAVE BEEN ADVISED ON THE POSSIBILITY OF SUCH DAMAGE OR IF SUCH DAMAGE COULD HAVE BEEN REASONABLY FORESEEN, AND NOTWITHSTANDING ANY FAILURE OF ESSENTIAL PURPOSE OF ANY EXCLUSIVE REMEDY PROVIDED. SUCH LIMITATION ON DAMAGES INCLUDES, BUT IS NOT LIMITED TO, DAMAGES FOR LOSS OF GOODWILL, LOST PROFITS, LOSS OF DATA OR SOFTWARE, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION OR IMPAIRMENT OF OTHER GOODS. IN NO EVENT WILL THE AUTHORS BE LIABLE FOR THE COSTS OF PROCUREMENT OF SUBSTITUTE SOFTWARE OR SERVICES. YOU ACKNOWLEDGE THAT THIS SOFTWARE IS NOT DESIGNED FOR USE IN ON-LINE EQUIPMENT IN HAZARDOUS ENVIRONMENTS SUCH AS OPERATION OF NUCLEAR FACILITIES, AIRCRAFT NAVIGATION OR CONTROL, OR LIFE-CRITICAL APPLICATIONS. THE AUTHORS EXPRESSLY DISCLAIM ANY LIABILITY RESULTING FROM USE OF THE SOFTWARE IN ANY SUCH ON-LINE EQUIPMENT IN HAZARDOUS ENVIRONMENTS AND ACCEPTS NO LIABILITY IN RESPECT OF ANY ACTIONS OR CLAIMS BASED ON THE USE OF THE SOFTWARE IN ANY SUCH ON-LINE EQUIPMENT IN HAZARDOUS ENVIRONMENTS BY YOU. FOR PURPOSES OF THIS PARAGRAPH, THE TERM "LIFE-CRITICAL APPLICATION" MEANS AN APPLICATION IN WHICH THE FUNCTIONING OR MALFUNCTIONING OF THE SOFTWARE MAY RESULT DIRECTLY OR INDIRECTLY IN PHYSICAL INJURY OR LOSS OF HUMAN LIFE. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+8  TERMINATION.
+
+8.1.
+    This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. All sublicenses to the Covered Code which are properly granted shall survive any termination of this License. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive.
+8.2.
+8.3.
+    If You assert a patent infringement claim against Participant alleging that such Participant's Contributor Version directly or indirectly infringes any patent where such claim is resolved (such as by license or settlement) prior to the initiation of patent infringement litigation, then the reasonable value of the licenses granted by such Participant under Sections 2.1 or 2.2 shall be taken into account in determining the amount or value of any payment or license.
+8.4.
+    In the event of termination under Sections 8.1 or 8.2 above, all end user license agreements (excluding distributors and resellers) which have been validly granted by You or any distributor hereunder prior to termination shall survive termination.
+
+9  LIMITATION OF LIABILITY.
+UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+10  U.S. GOVERNMENT END USERS.
+11  MISCELLANEOUS.
+12  RESPONSIBILITY FOR CLAIMS.
+As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability.
+EXHIBIT A.
+"The contents of this file are subject to the gSOAP Public License Version 1.3 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
+
+    http://genivia.com/Products/gsoap/license.pdf 
+
+More information on licensing options, support contracts, and consulting can be found at
+
+    http://genivia.com/Products/gsoap/contract.html 
+
+Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License.
+The Original Code of the gSOAP Software is: stdsoap.h, stdsoap2.h, stdsoap.c, stdsoap2.c, stdsoap.cpp, stdsoap2.cpp, soapcpp2.h, soapcpp2.c, soapcpp2_lex.l, soapcpp2_yacc.y, error2.h, error2.c, symbol2.c, init2.c, soapdoc2.html, and soapdoc2.pdf, httpget.h, httpget.c, stl.h, stldeque.h, stllist.h, stlvector.h, stlset.h.
+The Initial Developer of the Original Code is Robert A. van Engelen. Portions created by Robert A. van Engelen are Copyright (C) 2001-2004 Robert A. van Engelen, Genivia inc. All Rights Reserved.
+Contributor(s):
+
+"________________________."
+
+[Note: The text of this Exhibit A may differ slightly form the text of the notices in the Source Code files of the Original code. You should use the text of this Exhibit A rather than the text found in the Original Code Source Code for Your Modifications.]
+EXHIBIT B.
+"Part of the software embedded in this product is gSOAP software.
+Portions created by gSOAP are Copyright (C) 2001-2004 Robert A. van Engelen, Genivia inc. All Rights Reserved.
+THE SOFTWARE IN THIS PRODUCT WAS IN PART PROVIDED BY GENIVIA INC AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." 
diff --git a/libre/gsoap-legacy/PKGBUILD b/libre/gsoap-legacy/PKGBUILD
new file mode 100644
index 000000000..addcd690a
--- /dev/null
+++ b/libre/gsoap-legacy/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Tor Krill <tor@krill.nu>
+# Contributor: Lee.MaRS <leemars@gmail.com>
+
+_pkgname=gsoap
+pkgname=gsoap-legacy
+pkgver=2.8.11
+pkgrel=1
+pkgdesc="Offers an XML language binding to ease the development of SOAP/XML Web services in C and C/C++ (legacy version)"
+url="http://www.cs.fsu.edu/~engelen/soap.html"
+arch=('i686' 'x86_64')
+license=('GPL' 'custom')
+depends=('openssl' 'zlib' 'gcc-libs')
+makedepends=('autoconf' 'automake')
+conflicts=('gsoap')
+source=(http://prdownloads.sourceforge.net/gsoap2/${_pkgname}_${pkgver}.zip
+	LICENSE)
+md5sums=('ea2d7ee876d274a188b8fbb365702eec'
+         '27aaa3f5166db94d44044c11a7b2c37b')
+
+build() {
+  cd $srcdir/gsoap-2.8
+  [ -f Makefile ] || CXXFLAGS=-fPIC CFLAGS=-fPIC LDFLAGS=-fPIC ./configure --prefix=/usr
+  make -j1
+}
+
+package() {
+  cd $srcdir/gsoap-2.8
+  make DESTDIR=$pkgdir install
+  mkdir -p $pkgdir/usr/share/gsoap/import
+  mkdir -p $pkgdir/usr/share/gsoap/WS
+  cp -R gsoap/import $pkgdir/usr/share/gsoap/
+  cp -R gsoap/WS $pkgdir/usr/share/gsoap/
+  install -D ../LICENSE $pkgdir/usr/share/licenses/$_pkgname/LICENSE
+}
diff --git a/libre/gummiboot/PKGBUILD b/libre/gummiboot/PKGBUILD
index 1195912e8..156525eef 100644
--- a/libre/gummiboot/PKGBUILD
+++ b/libre/gummiboot/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186011 2013-05-20 13:11:55Z tomegun $
+# $Id: PKGBUILD 188624 2013-06-17 06:29:16Z tpowa $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
@@ -6,7 +6,7 @@
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname="gummiboot"
-pkgver="31"
+pkgver="33"
 pkgrel="1"
 pkgdesc="Simple text-mode UEFI Boot Manager (Parabola rebranded)"
 url="http://freedesktop.org/wiki/Software/gummiboot"
diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD
index 2623328ac..d70fde92d 100644
--- a/libre/hplip-libre/PKGBUILD
+++ b/libre/hplip-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 185808 2013-05-19 10:16:28Z andyrtr $
+# $Id: PKGBUILD 188976 2013-06-27 14:29:36Z andyrtr $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor : Rémy Oudompheng <remy@archlinux.org>
 # Contributor: Morgan LEFIEUX <comete@archlinuxfr.org>
@@ -6,8 +6,8 @@
 
 _pkgname=hplip
 pkgname=hplip-libre
-pkgver=3.13.5
-pkgrel=2
+pkgver=3.13.6
+pkgrel=1
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet, without hplip-plugin binary blobs recommendation"
 arch=('i686' 'x86_64')
 url="http://hplipopensource.com"
@@ -30,26 +30,16 @@ provides=$_pkgname=$pkgver
 options=('!libtool')
 install=hplip.install
 source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc}
-        cups-1.6-buildfix.diff
-        hp-mkuri.patch
-        hplip_typo.patch)
-md5sums=('f0c406f06f191a120f7d283b69ff10e8'
+        hp-mkuri.patch)
+md5sums=('3dd5052864052b8cd4ce013bb71f4d6c'
          'SKIP'
-         'ef64578c6cb3ce252dbdcb0f1c2f4a47'
-         '0bd7779fdbc4d7a9386df04dce2cb8d4'
-         'b3dd33a538ed8a3774f3c22f13e0a549')
+         '0bd7779fdbc4d7a9386df04dce2cb8d4')
 
 build() {
  cd "$srcdir/$_pkgname-$pkgver"
 
- # fix build with cups 1.6 - FC hplip-ipp-accessors.patch
- patch -p1 -i "${srcdir}/cups-1.6-buildfix.diff"
- 
  # fix linking libnotify, FS#34283
  patch -Np0 -i ${srcdir}/hp-mkuri.patch
-
- # fix typo preventing FW to load
- patch -Np0 -i ${srcdir}/hplip_typo.patch
  
  export PYTHON=python2
  
diff --git a/libre/icecat-noscript/PKGBUILD b/libre/icecat-noscript/PKGBUILD
index 1a0e3ddd0..3f83618e0 100644
--- a/libre/icecat-noscript/PKGBUILD
+++ b/libre/icecat-noscript/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 90901 2013-05-15 12:56:28Z spupykin $
+# $Id: PKGBUILD 93410 2013-07-03 10:50:31Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=firefox-noscript
 pkgname=icecat-noscript
-pkgver=2.6.6
-pkgrel=2
+pkgver=2.6.6.7
+pkgrel=1
 pkgdesc="plugin for icecat which disables script"
 arch=('any')
 url="http://noscript.net/"
@@ -14,7 +14,7 @@ depends=()
 provides=$_pkgname=$pkgver
 makedepends=('unzip')
 source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi)
-md5sums=('a018efb1fe0f722ff307382791bf3c98')
+md5sums=('10b6704f34568d226fb5fe69b7d6043d')
 
 package() {
 #  _ffver=`pacman -Q icecat | cut -f2 -d\ | cut -f1 -d-`
diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD
index d9c2c7481..45294e48e 100644
--- a/libre/icedove-l10n/PKGBUILD
+++ b/libre/icedove-l10n/PKGBUILD
@@ -2,8 +2,8 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
 pkgbase=icedove-l10n
-_pkgver=17.0.5
-pkgver=17.0.5.2
+_pkgver=17.0.7
+pkgver=17.0.7.1
 
 _langpacks=(ar ast be bg bn-BD br ca cs da de el en-GB en-US es-AR es-ES et eu fi fr fy-NL ga-IE gd gl he hr hu hy-AM id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW)
 
@@ -64,58 +64,58 @@ done
 
 md5sums=('d5b2567a8cc8f64591f313a6efdaaffc'
          'f3719964e893c1002b7a923e8f95f923'
-         'ef463b3772f804beb4108e15917485fd'
-         '6125a2e91119afe4cd4fb78909bc2168'
-         '990067ee981db3bf9873e4bd9b2b1eba'
-         'e32d496230cba49a435775359d4485ce'
-         'd212d8bc244184e816cf36a9b654e7e6'
-         '4a83b506d1b81dfffa0b33bc0f12b24f'
-         '6349985a77b2db81a43cb22291bfd972'
-         'dd4a259bfa4ce6816c55e9d7ff7f1172'
-         'dc3ec06ccb5e98cfa332fca40af77470'
-         'e81e63d8fac6c61cbbe72b1c8b0ce05c'
-         'f0850f83f396c33a4e69abd00bda0e55'
-         'ffc5de6b5409cf7cdd411ae853e0ba05'
-         '169780df5d160a04221dd80c92dd131a'
-         '8d1eacb770748156dbe02e493c41a5a6'
-         'a3a0d856da6af722a6444567b684eb14'
-         '798415f06ce916eb6c84ea4cf97e1253'
-         'c8eefe6a65295d354beb59e8f1b3116e'
-         '3ec1490226e064bc1145072ecdf031b4'
-         'a3ff2959c9375084683b0741797103f9'
-         '99ea64506470bf7938e169bfe5f569b3'
-         '8170d58dcbb1b84820ef0ace6dc23965'
-         '24ba56f81446d551101d1848ed660682'
-         '53b9b22f7ad5916c8dfccd8b758828dc'
-         '0bdcd2f628dff58a4544e93a88344b76'
-         '87d516fbb68ae06d5ee7439a8a4d3d96'
-         'c3cfa07d55fec1eb558e11c63ebd2a97'
-         '9845802371f603cb70df77a63088c16d'
-         '552e297a315a1b6f308604da4b492c53'
-         'dc6755c33351b95f9e883c8e64fab7b6'
-         'f3a67c52f5c5ca8cd5484250617f1aff'
-         '48fc583c7e67e87113fb73243da46313'
-         '4450b7753336f279296260e444cb0ba2'
-         '3a639521e20e5fb936f6d1b7679becd9'
-         '241a29846743f4dbcd5704e470193f30'
-         '71d71192e076a889da26129efd5f2f3d'
-         'efc91beb8c199d459e1f24164066d75e'
-         'ed717c1b94618faa8304796f1ff0acd7'
-         '8fc0aea02c1373f0ac0b7fa7eac2fa0c'
-         '808c60d4af8ee7b6bbbd82a5079c293e'
-         '6f0e4c6fe66e6d0e98f2fc444b59d629'
-         'bc5e9972f5a092f4f28f577f7ade7ad7'
-         '2f852610ddc1550200965d4be6320879'
-         '6ad80cd433ef69c3577bfea9fd26cedc'
-         '0dd02b5317c9656c64543067956940bf'
-         '9e0d2f288130f048358135a89732ca85'
-         '936dbda4758d9a65f8c27603a2dee3bd'
-         '820d70ce31ca9731c162ab942b0daea1'
-         'd737350d9edb73c15096e867fbdd8f3c'
-         'b1896502d411dd6037f141d3561461d4'
-         '491a3a386c4963f162e050c370ffa140'
-         'aa9f4e83501e624e4054f3ff61b71db3'
-         '257ee623933cfda550a8643a1a0b1d1c'
-         'c3a8fa4fc511d914892e08fa17fab8a9'
-         '44be6381519c6c5ea785a4f5a5122a64'
-         '6693c752bf6272caed2e204556fc69b8')
+         'fb33f8da3bc9f0906baf5222098e9359'
+         '0ceada37eed6ea7986fdffd6b0ea5aac'
+         '612dcc6e280b547efe9d6cebf82a1eb5'
+         'fcc841359ef595fb58e6ef2333453ca0'
+         '69c31584fd7b442b655e58e4556f5034'
+         '479b6a37772b6885c52f26187818c542'
+         'b723a4ae893838f4d332c5118bacd2fb'
+         '8cae26bd3354071f96faaa58f633f7f3'
+         '99fcd0609b232ba167d22200df617ce4'
+         '14e0224981659188f41d15d8a2a116bf'
+         '1da89ba6776c5be68851ab6782809b25'
+         '4e5e74537f138c0a5cfef02931e57c6b'
+         '67bb0b85fd5fd3f7344982cb0f93cc60'
+         'a7120022d3a957f152044f5d7ce155e2'
+         '44a35e42bc9682b42f7fad416f803b83'
+         '149da69e91a018b8c2d2341b62091b18'
+         'e78c3749605674623a5ebd455d1da5e6'
+         '18d4429db86023c3cff4cdfdb3c7db61'
+         '327f085c787a61c95b7904f1d68ba8ba'
+         'c7f83c1d5fac8bae0257f5269d6318a9'
+         '2d8f1bf1e814fc984d791a95c4ef8811'
+         '2513698f14cbc85651c5b752845a9d7f'
+         '5d727ff5a17e105abe44b1e970868ea2'
+         'e233b53dce6072308c190cdb83cb3d08'
+         'f8c1f680d62c76607c12cf517fb4d9b1'
+         '124a5110c4e807bae739fa5542b21e6f'
+         '8031d7162eeb68343d0879550653c13d'
+         'af6f26ef85012c84fb28279230a6bf47'
+         '93a25ac664d66deb4e0e88a9dd0f601f'
+         'f834580781619b97659dc95d8f203d2b'
+         'd54e1e7ed5c5d88db1ef2445bc0c9948'
+         '7a899329dafb829075f735990171823f'
+         '46fb6882a4350a86616dd0859b230602'
+         '80492e996b180062f56f9005d4083608'
+         '9fab024f293084e98e00639bb156b7aa'
+         'a24adcb523efdfb836d7aa8dcb192a8b'
+         '3742697f98cec4bb7c565cdede33263f'
+         'd9362ae826eb8591db5d6cf3f56bba0f'
+         '5e05ee5c2ef8ee9e5869a1f26277df2c'
+         '6cd8b8a4f19df69408ed03e7d09032dd'
+         '5ff06adb7f42975034f29910f5c9698d'
+         '74b76de767b3d1fc5eae3b40f55bca20'
+         'd387e154d9a6d322551a16ac9e9b38e3'
+         '03c41d2d47146ca18aab8dff9023d3aa'
+         '8fb9aa07d7c5244da75192ebaa254d3c'
+         '84377496e3bc15d46f85bef767ca13ba'
+         '07ac58fb12e6744279670c22bbe41d9b'
+         'b12f1a56bc7ce08c2800955257db1799'
+         '36ffa376a0e38e5b7000c2725cca994d'
+         '1fb8619dff3c3ee7c07e659a88094b8f'
+         '158ca3414b6ac982fc0c97d8b4f28c98'
+         '1fdabfde405e2bf54a4c8ad25c04d98f'
+         'ffce5a4d36bc8a42496fda405ac677f7'
+         'e183f1b3c17813399a930cb7b66d545d'
+         '12a93560247c526b0d29cacfc9f4882d')
diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD
index 8473cadd8..5fcf9f112 100644
--- a/libre/icedove-libre/PKGBUILD
+++ b/libre/icedove-libre/PKGBUILD
@@ -3,8 +3,8 @@
 
 # We're getting this from Debian Sid
 _debname=icedove
-_debver=17.0.5
-_debrel=2
+_debver=17.0.7
+_debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
@@ -33,8 +33,8 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
         ${_pkgname}.desktop
         Icedove-branding.patch)
 options=(!emptydirs)
-md5sums=('0c68298c17757257da79b6bb39e3fd10'
-         '2086f544ef90570d7629374aeac22aa6'
+md5sums=('d5c0351b374b6caf536c11522929d822'
+         '0c9fc53103e7168edd972466a29cc8cf'
          '5cf95ea94f69cdd36604890cfbf7b954'
          'a8fc4658d45b6bf9350023e5c3f34e56'
          '4eecc4fc5aafaf0da651a09eadc90bee'
@@ -94,6 +94,8 @@ prepare() {
 }
 
 build() {
+  export DEBIAN_BUILD="comm-esr17"
+
   cd "${srcdir}/${DEBIAN_BUILD}"
 
   export LDFLAGS="${LDFLAGS} -Wl,-rpath,/usr/lib/${_pkgname}"
@@ -103,6 +105,8 @@ build() {
 }
 
 package() {
+  export DEBIAN_BUILD="comm-esr17"
+
   cd "${srcdir}/${DEBIAN_BUILD}"
 
   make -j1 -f client.mk DESTDIR="${pkgdir}" install
diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD
index 3c3d957a4..375785d88 100644
--- a/libre/iceweasel-l10n/PKGBUILD
+++ b/libre/iceweasel-l10n/PKGBUILD
@@ -1,8 +1,8 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer: André Silva <emulatorman@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+# Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
 # Contributor: fauno <fauno@kiwwwi.com.ar>
 # Contributor: Figue <ffigue@gmail.com>
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-# Maintainer: André Silva <emulatorman@lavabit.com>
 # Based on icecat-i18n package, which is in turn based on firefox-i18n
 
 # When updating to a newer upstream release:
@@ -11,7 +11,7 @@
 # - Run 'make'. It will take care of everything else for you.
 
 _debname=iceweasel
-_debver=21.0
+_debver=22.0
 _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -54,7 +54,7 @@ build() {
     cd $srcdir/$_path
     unzip -q langpack-$i@iceweasel.mozilla.org.xpi -d $i
     rm langpack-$i@iceweasel.mozilla.org.xpi
-    install -Dm644 $srcdir/region.properties $i/chrome/$i/locale/browser-region
+    install -Dm644 $srcdir/region.properties $i/browser/chrome/$i/locale/browser-region
     cd $i
     zip -q -r $srcdir/$_path/langpack-$i@iceweasel.mozilla.org.xpi .
   done
@@ -75,91 +75,91 @@ package_iceweasel-l10n-$(echo $lang | tr A-Z a-z)() {
 done
 
 md5sums=('e88728730ecf9f0f145de5f70e362b15'
-         '59b4b2a362eece9edabb2fdc0f548ea2'
-         '24df894af578b902d16d4bc91759e926'
-         '489f555d46d08e3cb37eb5cb16203a3b'
-         '3b71f901014bd3fdcfc53d19a13cff10'
-         'fc4a5af84dcf6b055b11b8d2ac9868ac'
-         '7d03e2d5c2660942d5fbb5078b71c8cc'
-         'd12132ce5c0a4a881363dfebbf23fbee'
-         '09a5cf2d291f052433bdf834fe1f5100'
-         'a8eb8983f0c63c1383f18f894f2292ee'
-         'ef6fbffbad81223386c30c06da584f65'
-         'f4b80fc31cea5e0aa3c03eab9f36765f'
-         'c7ba7f36e104046ab22f37202c5e291e'
-         'e884fe1127ef15376f4d72047e2ee924'
-         'b235bed0eb4f872d5478a58c00341458'
-         '577498e39c9dd00ea2fb72146b3b5eac'
-         'c611cfc16c7c7b5b6c877fd88b40c10e'
-         '5c6e2f317aba37bc701e4aab4720fcd7'
-         'f9f7db03d1fcf2337902eba79289934c'
-         'e601dc8a1bdd9204ca3a4db5e4fe0df1'
-         'c2075468a1fea47efb7c65000fe73652'
-         'fcf2f689a8d06c7c2c6bb49f57037d55'
-         'f0c8d22cc820bb7177326bb069a38f5e'
-         '9dd2dc6c155ec3a61e26fba4baa980bc'
-         '41eff39b7c819c78fcac10f8064a2627'
-         'c3f9a5f5305fece3f165d5d946805180'
-         'd424c55b8a0242e500916f5bfdc60319'
-         'f5d41bf99c08a27c4f4a2d370e6414f2'
-         '420a3b3194938ecc31e05899bd0c52e4'
-         '19e23ac8f3e187c1b7112e1a252adacb'
-         'f1c9f646c5b70f591497cc36b7312aae'
-         'b246026367f3c5416397566bd5980e5b'
-         '24e4bf6cc17e3fd724387e157e6a49b1'
-         '60af06bc25f259311284d83cb6b2ba02'
-         'c5d8d2fecb6b0d2172ea1b4a4bdb2d68'
-         '58c93fd5ad320935666f0e10a2111f0a'
-         '7777c5b6bfa40c3ece5b48ef18d12938'
-         '47725d7fa7594f5739725096ae999dd1'
-         'c2f34c4fbd2eaf0a9c7e8d97ac49ae43'
-         '7900a33d5694744af6c1b3a6b8a5f2df'
-         '97a95a5c30d8ba542a4c5457a831259d'
-         '02a3052bf3af409c56cdca72c23f2669'
-         'a617e607fe3f952b6a152707c5c895e4'
-         '8d93b0550a30af8377e6198d67fb740e'
-         '938c22bdb193a8be3cf317deded8a49e'
-         'f343106f50810e14ae1264933d5495fb'
-         'a58187d70e895b90ea7667b08e0df6e4'
-         'a014309f9621a15a7f86e759d5a42aa5'
-         '8a4c8bea9c508ad4ca395eb5d31e3105'
-         '6e728d930ca539a022d1d5cc5d8cc9c8'
-         '6c10afb3a86a1305ec4fdfde5702908e'
-         '3f749b1b19d5534442eb9daf5f9ddba1'
-         'd8876e6f3ee24768a602128963f80e1c'
-         '6b7213d8c4d625ff0293e7a7c8eb4254'
-         '3d2b5b760c369ce1ff764205b196f0e5'
-         'c09eec3566a2352f1dd2f2ad0e7cbf6c'
-         '5e560da497a4e448413bfd343d23493d'
-         'faf5235cb19f5d1ee1d8868eb9399d8a'
-         '1dc06a576d7c87059125fa51e8677500'
-         'ea7c6eb5df30fbf3b7b4737025492fd9'
-         'f50c41542503959ddcc0ce200c2f8ec4'
-         '1a633a935016e3570327b52b66bb0dca'
-         '59bcc03566d356ac027655453775efa4'
-         '2d8644f035fe7d4e77a0f5eb196ddb0b'
-         'a5cf6b19492d3e969187fe847d4ee990'
-         'e3167e646b7c556e0d43565a13b066f9'
-         'b1ce311e588dd120d04c2d94597ae100'
-         '129a07881b89c3f3ab14971dec88007f'
-         '37bc634c1f82bd9a01ea7e817e100d71'
-         'd9b39409aa83bcae7aa22c54ebcd48b0'
-         '582926879e8d10d52448f373cd3fbd33'
-         'cf6bafb6e3ee659c27579b43038f704c'
-         '083f69fd4f64fd436d7fdfe8a7747b41'
-         '6f65d6a154fa2c7d72045b4b34fc8890'
-         '1a060b1b08d6fa8413995003c62b220f'
-         '84194eba8c736cd8036975a8423758c0'
-         '30f15d767b3e867df514175680a78a8d'
-         '32946289930406ed3ccd1c174e464210'
-         '05547b17ebd589408a9633aeb4fede40'
-         'f53c078d1ed0e90f2d68f098b34279f2'
-         'a11cf418be9247856f3179f85fe57c9a'
-         '39d47c6e738749b1c01d06a1b112c368'
-         '63adbbe9ac9dde80d2c3ae0c861f1d33'
-         '82d6b78bf72083a5e01652c02e152680'
-         '725a322b12f522591a5fba5aa32031bb'
-         '98c7ed17e8fbe4478032a31ad2c2aa07'
-         'a7c33685d88af8a90a14c874538fa53a'
-         '9b43e2e557c82a20509f34a54cc42e0f'
-         '84e12ebfd749a04adc5b3ace348a06f1')
+         'ee742b573a169d31560f6a6becb41e3a'
+         '5d0dc39924ce4e0db437996d8a34fdd0'
+         '0f0ac315f5fbb5e081e5e9969c5482fc'
+         '4f9acf9efb7bfdaaa6061d76a61f1fe0'
+         'ba5e95c3b6a48c8078353658e90a86f0'
+         '62b101c5e3ec1bfb7096c1728a5a1f89'
+         '33c910cb338f15b1f8bb53642f926c3a'
+         'c971d199e6ce406095c82fe0aa11fe01'
+         '023ffab908dfd2ba970a1b5b9e5d2b0e'
+         '4c268fbe223e195ead80454880d064c7'
+         '8bd1c3303d7c17f2bc60240496c76ce2'
+         'cf9e7a05dfa86d45246d0605d00e2d87'
+         'a5fc01397dbe6d52f996b93b8a3cf55d'
+         '0b838e5ff9bdef95353f6e7dcd259558'
+         'b529eea7fba51b4384fde80b47e7bebc'
+         '4f7fd9e189de9df37ff69cf34fc99f02'
+         'c43a7be1aa8a0f00023e024de46198c2'
+         'a4122057c2b2d4cec5079fef3c195b69'
+         'adf7ca92a9df2d80a150fba8f94d12ad'
+         'ce406f27700d972231e6a58f137068e2'
+         '1183cf8ff60af67e723bf3279d45058f'
+         'bf22f66d181f97f5d818b8a1cd708617'
+         'a684274da448a765a47a9c945803ab4a'
+         '328a0a2affc13ec597233ab0011ea506'
+         '099cc06876fe8e59a50bedb498169721'
+         '2e4cfd617507d28fc7083cfd9a49b5c7'
+         '8065c4a6d1634f6571d8dd3b428d3e6b'
+         '03a8757b10ca780690b80685918d9fb3'
+         '650db5a5d7d84ee533a34d4e6927e7b4'
+         'eafd888466b00b1130aa24ce3e5ff689'
+         '1904330faee4503f733e006aa4f70d12'
+         '2a9846c969feacdba46956b57231667a'
+         'e28a0fdf769432fed614da3252f03b41'
+         '3268b4c75e04c8315c93c0c47fedc602'
+         '5a0358ed95f4be6a1fe2f7654ea97e38'
+         '9ab21ef94c416f0925dee7fa1bd7feb0'
+         'bee9b7995ccefdfe76b911032aa91a1b'
+         '59e6062bc9b97ae55f33ac7354491ce1'
+         'b449c0dd635d34005b72a0f8a6c6573e'
+         'b21e26451d5fc860a58d8a4cc0b9be99'
+         'b558424e457aff17c582d642aa85fc24'
+         '5b603ba3e3c54902057308cb09c80e4e'
+         '20c17f3d945614cc36916dcf0c479a5a'
+         'a2178a56487c0449244f50763893583e'
+         'e256a82b04816566e10c9d4c8cb62c57'
+         'afc5407fae17c2e894216b2e649d230a'
+         '92f60bbe78aae87dfa2df2bf008db10a'
+         'a02788678251a677c6cf7c2123391f2a'
+         '4f927451a8b375e0f5ddb291c1fb7b80'
+         'bcd9dbdabbe837b615c3c94e664addc1'
+         '2b50509cf00c2fa27292b055c31fc415'
+         'e7b48db429e08751ed60b9500bba9d7d'
+         'cab6a762cb378503f797da42d47283ad'
+         '8be4595d4788114c9c167435a5bc8d3c'
+         'd03539bb9460209fa474385060077032'
+         '2ce9415f8f11aa7e8498a1abfc3ef39f'
+         '4119ba2afd5db58625571a119c1f09cb'
+         '981e12b8649b4450c5ac1e9e8ffbac83'
+         '881032091c863b249d1f463a1f1ab58f'
+         '13b6072c1adf21a2b8363a77073c83ea'
+         'ba3646116673d62583b03c8789b72370'
+         'b40dfef3bf5c27673a600e22135a86d3'
+         'f2d5b8b91a20ab2170c5c62db1179ad4'
+         'badc3b2a5c87b9df2d4176b0542fa836'
+         '882799e21bf63baaf4b1d335ae3ffffa'
+         'f0ff3990e05f7d7d4386a1dc9cc78423'
+         '7bff28a8b1dee5f603b582d0ecd51f35'
+         '015469155969f9c2bdb79a2bd0d41402'
+         '59a8ff29e9a15d6b174dea2c7995ab3f'
+         '63b5a9127a721dd40ed3ad8f78132ad5'
+         'f3f2fcdd40ea556de88cff9edae0ee3d'
+         '0d07f11308c2c339b965389e221fb6d5'
+         'ae002208626b4b52680f33f2645c1d47'
+         'a170a839e3fae8ef76f80c30d5f136f1'
+         '16d6fa49650822e036c50892b4f0c3f1'
+         '6eb5c5b1caf73c6d4bc9ec60991db988'
+         '846e79dbc479856f919f264d9821233c'
+         '01bb7fe8b663610ef4a5813ff3f7d895'
+         '670495986ec1643302641ec214a6c38e'
+         '251ced2c35aed8d301b23922b35d5e7a'
+         'ce1d7bc395ccec6b9d4b143d5b8c5ba7'
+         'f90747e32f6414f3494219becd331eb3'
+         '8fba2382f07aecec5234608741fdb72d'
+         '9c06e17e2dbba42dbe01a1264c57e39e'
+         '0a3aff57dab8c018daf0d9e71211bbb5'
+         'a15982154bccdb4abdedaa8a86edd259'
+         '92a75129f4dd1f9700bd355e2c15b393'
+         'bb02b3047d33b870ca5f549ce5561d98')
diff --git a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
index d89e4d1ae..f561d5d39 100644
--- a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
+++ b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
@@ -3,7 +3,7 @@ Date: Tue, 5 Jun 2012 08:57:06 +0200
 Subject: Bug 756390 - Make the "Reset Firefox" feature more generic

 

 diff --git a/browser/components/migration/content/migration.js b/browser/components/migration/content/migration.js

-index 0e8ccf5..fa46c08 100644

+index 91c5c1c..2f8bd1a 100644

 --- a/browser/components/migration/content/migration.js

 +++ b/browser/components/migration/content/migration.js

 @@ -249,7 +249,7 @@ var MigrationWizard = {

@@ -184,7 +184,7 @@ index 260bc29..52b32cc 100644
 -64_firefox=Bookmarks Backups

 +64_self=Bookmarks Backups

 diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn

-index fa45115..1fcf3cd 100644

+index 0541ebf..f983ae4 100644

 --- a/toolkit/content/jar.mn

 +++ b/toolkit/content/jar.mn

 @@ -42,7 +42,7 @@ toolkit.jar:

@@ -267,10 +267,10 @@ index f35c227..7062886 100644
  

  %{C++

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

-index b08f8ce..446ee74 100644

+index 17f5598..0b9a24a 100644

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

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

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

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

          if (gDoProfileReset) {

            // Automatically migrate from the current application if we just

            // reset the profile.

diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index eebf10e57..359dd684b 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -1,10 +1,10 @@
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 # Contributor (ConnochaetOS): Henry Jensen <hjensen@connochaetos.org>
 # Contributor (Parabola): Luke Shumaker <lukeshu@sbcglobal.net>
 # Contributor: Figue <ffigue at gmail>
 # Contributor (Parabola): fauno <fauno@kiwwwi.com.ar>
 # Contributor (Parabola): vando <facundo@esdebian.org>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
-# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
 # Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com>
 # Thank you very much to the older contributors:
 # Contributor: evr <evanroman at gmail>
@@ -14,7 +14,7 @@ _pgo=true
 
 # We're getting this from Debian Experimental
 _debname=iceweasel
-_debver=21.0
+_debver=22.0
 _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -22,20 +22,21 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 _pkgname=iceweasel
 pkgname=iceweasel-libre
 pkgver=$_debver.$_debrel
-pkgrel=3
+pkgrel=1
 
 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox."
 arch=(i686 x86_64 mips64el)
 license=(MPL GPL LGPL)
 depends=(alsa-lib dbus-glib desktop-file-utils gtk2 gstreamer0.10-base hicolor-icon-theme hunspell libevent libnotify libvpx libxt mime-types mozilla-common mozilla-searchplugins nss sqlite startup-notification)
-makedepends=(autoconf2.13 diffutils imagemagick libidl2 librsvg libxslt mesa pkg-config python2 quilt unzip zip)
+makedepends=(autoconf2.13 diffutils imagemagick libidl2 libpulse librsvg libxslt mesa pkg-config python2 quilt unzip zip)
 [ "$CARCH" != "mips64el" ] && makedepends+=('yasm')
 options=(!emptydirs !makeflags)
 if $_pgo; then
   makedepends+=(xorg-server-xvfb)
   options+=(!ccache)
 fi
-optdepends=('networkmanager: Location detection via available WiFi networks')
+optdepends=('networkmanager: Location detection via available WiFi networks'
+            'libpulse: PulseAudio audio driver')
 url="http://packages.debian.org/experimental/${_pkgname}"
 install=iceweasel.install
 replaces=('firefox')
@@ -51,18 +52,22 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
         vendor.js
         shared-libs.patch
         replace-urls.txt
+        $_pkgname-22.0-do-not-fallback-to-manual-proxy-settings.patch
+        $_pkgname-20.0.1-fixed-loading-icon.png
         Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
-md5sums=('0a7c51bb494463c327af918bae6c4ee4'
-         'c17121a4ffd40f463e16d7828445d96e'
-         'e1e903ca91997f18b428c54ef604f27d'
+md5sums=('45d7121606cc3b21cd2797c87b5dc3bd'
+         'bf0440dd8c31527359d797daaf0d3edd'
+         '2d7ac85c32df6a4ccfcc6de7a1420bf7'
          '383e8e2a97a8b13fe56d153adb6878b6'
-         '2930f3bffe0d7a6b9845f8c006821bc2'
+         '0bbedfc161291de9dc61c531bf062c22'
          '7b9e5996dd9fe0b186a43a297db1c6b5'
          'abf5ecb74caa857abb42bcfbb3442d9c'
          '0c26941504d3f2abed759221e9bb5de1'
          '52e52f840a49eb1d14be1c0065b03a93'
          'a8fc4658d45b6bf9350023e5c3f34e56'
-         '85e67561e0e491cd538ce018dfc2d948')
+         'bc27a39d08ab3f6705e487c85598d8bf'
+         '6e335a517c68488941340ee1c23f97b0'
+         '86d4045285a9a15c20a62f46535809cb')
 
 prepare() {
   export DEBIAN_BUILD="mozilla-release"
@@ -131,6 +136,10 @@ prepare() {
       echo 'ac_add_options --disable-jemalloc' >> .mozconfig
   fi
 
+  # Should be fixed in Iceweasel 23
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=817533
+  patch -Np1 -i ../$_pkgname-22.0-do-not-fallback-to-manual-proxy-settings.patch
+
   # Fix PRE_RELEASE_SUFFIX
   sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \
     browser/base/Makefile.in
@@ -143,15 +152,27 @@ prepare() {
   # configure script misdetects the preprocessor without an optimization level
   # https://bugs.archlinux.org/task/34644
   sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure
+
+  # Fix tab loading icon (flickers with libpng 1.6)
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=841734
+  cp "$srcdir/$_pkgname-20.0.1-fixed-loading-icon.png" \
+    browser/themes/linux/tabbrowser/loading.png
 }
 
 build() {
+  export DEBIAN_BUILD="mozilla-release"
+
   cd "$srcdir/$DEBIAN_BUILD"
 
   export PATH="$srcdir/path:$PATH"
   export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname"
   export PYTHON="/usr/bin/python2"
 
+  # Work around memory address space exhaustion during linking on i686
+  if [[ $CARCH == i686 ]]; then
+    LDFLAGS+=' -Wl,--no-keep-memory'
+  fi
+
   if $_pgo; then
     export DISPLAY=:99
     Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY &
@@ -167,6 +188,8 @@ build() {
 }
 
 package() {
+  export DEBIAN_BUILD="mozilla-release"
+
   cd "$srcdir/$DEBIAN_BUILD"
   make -f client.mk DESTDIR="$pkgdir" install
 
diff --git a/libre/iceweasel-libre/iceweasel-20.0.1-fixed-loading-icon.png b/libre/iceweasel-libre/iceweasel-20.0.1-fixed-loading-icon.png
new file mode 100644
index 000000000..55f25e591
--- /dev/null
+++ b/libre/iceweasel-libre/iceweasel-20.0.1-fixed-loading-icon.png
diff --git a/libre/iceweasel-libre/iceweasel-22.0-do-not-fallback-to-manual-proxy-settings.patch b/libre/iceweasel-libre/iceweasel-22.0-do-not-fallback-to-manual-proxy-settings.patch
new file mode 100644
index 000000000..56e4bfc45
--- /dev/null
+++ b/libre/iceweasel-libre/iceweasel-22.0-do-not-fallback-to-manual-proxy-settings.patch
@@ -0,0 +1,36 @@
+
+# HG changeset patch
+# User Patrick McManus <mcmanus@ducksong.com>
+# Date 1365623297 14400
+# Node ID 85f1d207f52546e0e5fe78990cdefe6efae485fb
+# Parent  2bb26d742f5ffd2d946291fd3c688dc3d6d34f67
+bug 817533 - failed system proxy lookups should not fallback to manual configs r=jduell
+
+diff --git a/netwerk/base/src/nsProtocolProxyService.cpp b/netwerk/base/src/nsProtocolProxyService.cpp
+--- a/netwerk/base/src/nsProtocolProxyService.cpp
++++ b/netwerk/base/src/nsProtocolProxyService.cpp
+@@ -1553,17 +1553,22 @@ nsProtocolProxyService::Resolve_Internal
+ 
+     // Proxy auto config magic...
+     if (mProxyConfig == PROXYCONFIG_PAC || mProxyConfig == PROXYCONFIG_WPAD) {
+         // Do not query PAC now.
+         *usePACThread = true;
+         return NS_OK;
+     }
+ 
+-    // proxy info values
++    // If we aren't in manual proxy configuration mode then we don't
++    // want to honor any manual specific prefs that might be still set
++    if (mProxyConfig != PROXYCONFIG_MANUAL)
++        return NS_OK;
++
++    // proxy info values for manual configuration mode
+     const char *type = nullptr;
+     const nsACString *host = nullptr;
+     int32_t port = -1;
+ 
+     uint32_t proxyFlags = 0;
+ 
+     if ((flags & RESOLVE_PREFER_SOCKS_PROXY) &&
+         !mSOCKSProxyHost.IsEmpty() && mSOCKSProxyPort > 0) {
+
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index 3bb39d215..b5f0a4126 100644
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -1,7 +1,7 @@
 diff -ruN mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/browser/app/profile/firefox.js
---- mozilla-release.orig/browser/app/profile/firefox.js	2013-05-11 16:19:20.000000000 -0300
-+++ mozilla-release/browser/app/profile/firefox.js	2013-05-18 13:47:28.091097903 -0300
-@@ -1203,12 +1203,6 @@
+--- mozilla-release.orig/browser/app/profile/firefox.js	2013-06-26 23:50:49.004052388 -0300
++++ mozilla-release/browser/app/profile/firefox.js	2013-06-26 23:45:52.697802427 -0300
+@@ -1208,12 +1208,6 @@
  // (This is intentionally on the high side; see bug 746055.)
  pref("image.mem.max_decoded_image_kb", 256000);
  
@@ -11,12 +11,12 @@ diff -ruN mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/br
 -pref("social.manifest.cliqz", "{\"builtin\": \"true\",\"origin\": \"https://mozsocial.cliqz.com\",\"name\": \"Cliqz\",\"description\": \"Cliqz for Firefox Social\",\"author\": \"Cliqz\",\"homepageURL\": \"https://mozsocial.cliqz.com/\",\"version\": \"0.9\",\"workerURL\": \"https://mozsocial.cliqz.com/worker\",\"sidebarURL\": \"https://mozsocial.cliqz.com/sidebar\",\"iconURL\": \"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9wKEgkPNcdyEiIAAANaSURBVDjLVZNPUJR1HMY/39/77vLXZYFhKf4sbEKRTlrjFFIzFgtlJmQyddAmrOlgjdIAt+yQp04Wzti9sUZwPFgzOdg0sIuThaGUOBROEqLAimsoiqy77Lvvt0s09ZyeZ+Z5ntPzCKvo2w+7Poe+/YXAQeBtEINqX9gX+2JT3mKpgznT0zhwpyvaTE/jAAACQG8H7D4CJ/YZHFkA/ICi4JW01FtXWFco5NjcPxweXMN/YADw/KMyEkHEj7qKugJQQZxlR4klUEvI74o0H/hfQXc0DG8cgd7uLah5Gle1oWSt7KzYyIH1WyXotYknYHBGJDIHk/fc1tXw5lPbsIaPXuXg2aZ1Wcn5L/3OzbKkeGVTyXpa86u044lmuRC7pkOxCbGMhTGqapuKqnfqArPHrvTP9k4inZFwgSLXz8cTvnDldj0zPcXrj+5gauZPQUT7fo9KVWUJo7f/wJDi2eoACSt1yxa79VzL6Z+lK9L0yVJ65cONpW26u/ZdOT87wUJqCUln9NvpC9IQXK8dT+2Qk5NDvFq7BdsYfWton4zfu9ydbbyHbYW2omw/raGXpGf4OP6cAurL6xCF0O0Ae598hUPnTuDPd4gtzVOc6xdLLIyx6tWYLAPUPJRbzuJyhkNj/fy6cFXzvblqWbZU+AM6Mjshlf4AP8Z+I+Wm+GFmmLG743iNXSyqxlZ0xWNl54SKgnzz2kfM3YnL7L1bpB1H60qCUr6mRPOycqTS9yZluaWMLPzC3sf28P3ckDt6+1LGatjzyDaQ4ONFm/jp2hQ3kotcvxvn1uJfYtse8myvLK08IJlOUVZQSI0vpM8FnuHFsudrkunUBemKNrcLenQxZeuxcVtWXME4GVh6oJlsj3Q07NQNxdXSffYzNqzNxRjFqKXv1bZLla/yvnFd97gqA/leR8r9adRRzSSSmlFXWF7WUEGpXIxfpcAnOLpC2nVIaWp810Bb9Wh87CsB6Iy+kJVlrA8u3+X9Gzfd0Mik8+9NPF6vbq57WJJ5N7FtC4X7ItI+vL3/awDpijbR0zgIQOdguEqMmU6kVCdiLhkX2Ri0UIuxiw88EYWMoB8Pt3yXWJ2zrJLOSBOHw4N0RppeFuGkCDkArnLJQrZ+2jgwv+ptOLWN4ZbTAPwNmUptT0KshT0AAAAASUVORK5CYII=\",\"icon32URL\": \"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB90DEgoTOwK3bfUAAAj8SURBVFjDnZd5cFXlGcZ/7znnLslNCIEkQBJI2IksAWpcgmjFugRxA41lwFKmTgd0tB2qqVVpLXWGAk4V1y5IxRnRCR2tWIgwWhYxCJECYQmEVWQLSch2c7dz73n7x80NIVKgfn+d78x3zvu8z/d+z/e8wtWMt2YJkA88ATwA5AF+YBOwFKhk7orA02sLkkSwAP/ikhotqyhgcUnNZX8tVwgMc1fAW7OWAPMA47uLFNT8bEafHStzkyOliqQBu4EFi0tqzlwpN7mK4OuB2y9E6/aNQo5V5+9v1bmuywqrx1CvxFfUA/2B8OVYMK4QfFFHcL00YMUtkXCedSZJwVNV73EUHI2vzgTe+35b8NYsgBuArRdlrQoiF2U/xHWivbfZ7ANBFTK8sbYxvcOpjkriu75A3f8CcmkG5q4AeK87SJ/hBtuOA0EBgwyzydB4MAxRGsNmqj9itBmoCIoqpd9nC24FBnVE6kx39oiJzC+YDOqQl9SL61Iy2xx1kkTQYIzwcb/VXN1kNa086jM2nkmqP9zqag3G5AaA4vKi/wOAmmWoRFFT4ruviuNwU99hLPjRDCUQ4rMpT+u2GYt8PieFuqC0H26zjFZbegqaHoyJN6r0POF39djR6L35xvKiSZWlVVcH4NcVIxaOc1dPutazxxrlPtjgNcJ+VIRohCl5hQpItiadG9I7WzAw+voKA+fCZiqKSwQVEQTMlogREVAHegp8XlxeNOhSLFiJh7KKggGqbDsfNrIscQwR1SQCGePdNdGacH5bD7M3Pm9SaiQS0dPHq7MSxXm2LeQRcFQQVAURRNBWW+jlcUSMzhzXV5ZWDSkuL6IrG0ZZRQFlFQVeoFJE+zZHjLAhEAgHpL9ngLaEok6kqd64N+caF6Brd20WnADlX6+XxqbzbD6wL9Re394eCLRKRKMoiqMqLbYSdSKECBmKqqoOLi4v+nn3rTA6KvRlIEcAv23YkWhEl5e8S/n0D2XONfOt9kA0uaSg2APIJzVf8NTtj/HIyt8G+70ylZgZ1WWT/5B65vHN3N93Il7bIs1IZkzK0OTSQdOdZwqfc/tsn0j8+L74HR3oyD4IqIHK1joz+sS4F6xpYx4kbIfVdERcvxlHdHE1pmWS9quJ+sW85bK5dkfkiY1L3c8U/0QX3jlXAFr8rfr+rn/JDwYXUtRvZKd+LK98m2Wn/4yoABQC1QkmDGB253kX6O8bHp425kE9eOZI9HD9SQKREAOzCzAtk6bWZrvV9suYnKGMyx7mTnL5dOEdcwTgmVUvB9NSekhuj36c9Td26oeqkpGUgaNOIumpF9UAcGdiEtMYj46bGwPk2fVvRHPTsmTLsd1MG3UrAB/u2+T6cdHkMMDRxlM8XTxdEGHNzk3U2Oe8AEcaDzoBuyHQRb7jmV24SyZ0PwWjExPbjnFT3m0+gH/WVuL+eLHGVOWXEx6OA9i/iceKpynAmsNfsfSBeQDM3/A2f5zyuAB8fWpbtOXs2WS71c/EwTfH8jLzzb0NezDEAEWAEd11ICcxyU4ZqaYlZkNTQ9TRqPuDA5/Jqj3rKM6PY1xbs0VLht/oBTjeeFr7pPbG3+5nd+NR7hh2PXHg1U5LuJlRA0ZrXma+Wf1NNWvOrU7sP0Cf7gy4OwGkjhCAUNS2EFGX5aWw32AAak8dY1juYDEMg2AwqP0y+gjAp/u3UvbDRwDYeWQ/flzORw99TC9fljS3NTPn80eR1HgtAIiIqzsDwc7Lxp0OQG5mP56b8DPZMuNVxmcOAeDT2m3cOTSe5eZDO4LjBxQA4HG7eeHWeB2vOVjJu1N/n9zLl6XRqM2bX77OXcNLmNTnNgp7jsWHD9ux/V3vBgv4FhgOEIi0kKjcFyfPYd3eL7k+fxQA645sZ+rYeDF+XlvlDMobiKpyT+EttLb78VhuVtd+yYZJb6Ad1+Ozdz3fmWkoEuK0/xSvb301uerNXTmVpVWnEgzsSiyqqd8ExPUc0AUb3qE51AbAlm+rtTHQqgCVx3anNAZaAyLCifrTnGs7D0DV4e34vMkqIrgsl3al2uv2MjB9EH+6e6k81X/evsQZsYA1wMMAQRp4f/vzMijz7tjKnZVm5dnd7N14gnEZQ2gNnufFje9Er80a6jrceJJl2z+Woj7DdcG6ZbLlF3/j0Mlj4IXjdSelOdxgN9r1rohGsMRFmjuN3JRcstNzAGTRXUvSjqw49PeP+GS2lFUUJM6nAhKLRTnRmtqyaq8nFbdloIpHXITVhpDd5o4ZqVGN4VgExO1OnjKsmNUzF/GXzf9gzr9fJie5HyNy6traJZga1SimmHitJNI96QxMHshjY59kSOYQXbPrE7l3x72ZibtgQYdyqWlapCaFzZ5phOOQhDBRgBB2LCWiURwUomqoSeyW/LEKsOWbPSAmpwJ1rWFPyGu4DHW73ZguE1sinIvU8VXz1qr71kye/8Hulc7dY+9h9LmRs40O7/47oDoBoofLsfLSIyKidgc5NoGIdpU0VL2EIu15afHjuPXUXsVB8zPtmKO4uvlN7VDEsv2zD704a/PMCa99/cqx+0bff4fRxa/dAuwAxGupN8XlyLDMsE3MaCdg28QcL8iFwhJRIk7KquoNQUCP1B+TdF/U3zc96tbvel0BVleWVm0sLi8i8qRue2n3ohu2BiozzMSKCTMzQ4tLav46YWbmGYUs2zGCvb2xpGxPKHS8wUiL2+G44bgg8cK+s7XhHccPuo9Evm0fk20ni9dwuosNcBq4rv9DOZ1mZOT4gnY7K7LzIqhdW6l3vhqUeqDZ3WoKHKiz2rYcdVt1TaYLwUI6rLqCx6OhgtxQsGeaZQQxephes3v6a4GfVpZW1Xd9mXBGl23NyioKlqjylCFKKCrRpoBhH6izAu0R6e0yNDwg3WnPTY+lpXgcsR0xtrX5pqtQKiIZQC2wHPhPZWlVqLsVu2JrlmCjrKLgeEczqqBiCEhHi6LaYQbjL55cMrnmte7/+V+BL2/LoWtXOwHYFwcrOCrEVMRRUaWzJBYumVzzWoemXDQuF/yyALqwcAq4EXipq8noYO8b4DbguatpxS81/gvSJCNlZUMZjgAAAABJRU5ErkJggg==\",\"icon64URL\": \"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB90DEgoTJxa2MboAABYBSURBVHjazZt5fFXlue+/z1p7SnYmMjHPMwJaNAhxQFTUWJHj0FBrK7W2tdajtYPYW/3ce+w5tz2N3rannh7s7amntLXHwxFbtYpinTUKQcFAEhAhEAghZCLJTva01nruH3vI3mEnjNL7fj7wgb3e913v83vm53mXcCbHmlVw11pYs8oAioFy4CZgITAJ8AD9wG7gTeC/gQbuWtuRtv4sDvkUiP8McC9wPVA4aJZmeOceYD3wKHetbTvbIMgZJv4nwLcA7zAEZxoakwy9hbt+9zzA6g2zvw9UAuOAZuBp4EdVFQ26esNsqioa/j8AYIDw/Lg4LzsJogdjoCAy09v82PJRzV8xRP0ZtrHjoDwDnBEQjNNaHSO+BHjvtIlXQya5DjYXaMfdtR2eABBWRQdNNOPqUlVV0cDqDbP/hhKwZlUCwEPAyFMnPjZKjfbmye5DY0FQhRy3c6CsJDTeUVGRjPveXlXR8Nu/DQAx4gV4A7j09I6gamJHLvTuCFtq5saJVUeRsdnWgZkFkUwgJMAuBjpORxWMUxZ9+D9x4vX06Ddkurup1cbISyFSDFFt7neNbg26OkRUhmDcv56uHThVCTgf2HL6NljVQAMXemtzHMxMZ1HLoXfpmKDPEPUMcdw8oPdUgTBOQfSJuyQ9ffpFRpttQQdjKEaIy9C87Z2e9mEOevfZU4GY1f/7eFR3fOlRe8DDDSGApWZnRFWGAVO0M2yOOhoxWjN4BQU+f3bc4AD3f3pC3FdleeEczN5wDKoECKrx5QrgZEl4VKqB0+TfiiqWrViOovVdHmxFog6W7RBBUVBR5dyzZwPWrPom8MsTmmtH2XL9P9B5tIurXnwE8v0Dz4JhvLaB5Qs2l/kbx2qcD6qoiIoq/V0RI9gdFaffMkKWUuAo/mm5dme2S51slxMs9dmlxT67s8DrjHWUOVUVOxs+fRWAfzhh3Y9EOX/cdJbNW8j3Z14d47wC4Qg7bvlnmr/5ODe6xrkUAR0gPhCVxp09LmnuN/MCUaPEUcYbkOsSNTrCRtQULQ1ZxsSmgNu3rcNbuq3du9ctOvXTVYE1q2DNbYtRSlAkBsHwOMwtnAQCqsqPl98Bnb2A8o/n38Q5oyZSmJXDU3f8vDTcGU3Iod0aNPbtCbgm20qWCG4RGPgjdEekQJVIzHwiirg6w+aUv7blrC5fVzYGoHxd2acAwF1rQd13ATbi9IMoaoLKEBZOuXri/JiOiYApzMsbC5EQ9y64GlVFRDDchiwbd7WKgd3UZxxpDZmTTBk6oDSErK6IEUh5LHGAzgU+KF9XNre6subMAJAaZz/08sxvnefZfukF3h1mmac+6wLvds711u8qMjt3ooYcIwyOzXXj56chkuXyUpJVRF52jooMUDB/1Dxp7OVQT9QYY8jw0bSI0hE2+g1SAqPYkjAwCqgpX1eWezJSMJwEeFZvmP3l+1+cHWoPmf/LLdZEQ1QNUTFExSeRmTPcTbMW+mr35BmBXhQnKQ1Rh8umpAEgTR9vazzHMvYOpjDPW9rXGWK8CHp8myz0W1KkYA3QryCE4v/1Ae8CcqIguIbgvAn8BVgmorSHXFGJnVwGXIdgIyro1DmePf2tdtHhRmvCGByr55Ks0ihCUdLoB4N6uPvA5Al9o9NqBKqqLf2dfpdpxJPhE+CYkBWIykG/i7EJ9ymGGCnyMA/4SXVlzepTkoB4VFUXT28RoC1kdqYeTuOMFpCYx5asUrNzzDjrkzr21JsVE+cXpVrJDVveFPKy2dK8MxbZJNaLyNY9uy0nZDTG4v3jOxgRpc+S0pT8wBZDxgxy6/eXryubdFIAJHR+9YbZzwAzUxAnEDUKBokcUTtKxIoko5ZDPZ5DB9uYAVbn8tkXozqgpy/UvQ1uNw4Wv3nzGUQGIr/1O14Lhdt0UvgozSBRTcZCmhoZpUWGPVHjiCSCaUNaMxgOBZ44KQDiBYY7gRtSXxuypVNiCQeqiqI4fQ7LS1fwxYmrcPWY0tjlaznQ5SlB1O3y55XOnTCDVEP359o3Yv+IRrnnhZ/yxGvrpT/Q59z+qwdp94aCGCpWQEf17e8+0t/VLf3BfhAh4sRdpKaRJkFbvPHtRd3qcsRJk8z4WFq+rmz+8WyBpHDfA4QHFzY6Q8b+2k7vRIn79Cmuaaz9/B/weDwA9Pf1WwUPX+WK+g0FleUTF/Hclx9JHqito52R378Ysrw8vbKKm9f9AFzSCozE7wPT6KE3lFvozuG52x6Vi+acr798aa3cs+VR7pi6nCcbX8bIcsWNBhhiIGowP9+xjYhpTiycFOgP9+U060HIjs2Jg6/A+urKms8d1wjGuf+zweGxKvTbkgNgOxbn55fx+I3/nmY5sv3ZrqrL79Rvv/crQeCzM8vTnPTzH7wOuTnML53OTRdfw/17a3mk7mmTbF/SEUwuHNu++e+fKC7OL0RV5e5rVrG+biO/vuVHnPPSVL734S+4anI5V41ZRGn2CCblj2FW6RQKCwoVyAF49v1nebj+IbJys1KZe3P5ujI3EB0qPjBWb5jN6g2z3cA3B2ucCBp1pFAE8p0RPPZ3a9KI19jgxnOXCsEghIOsmHVxmig+v+MtME2Wz4sVjqpuW02u5c1JvisU0tfu/GVRnPik6vzm1h8DcN81dzBDRjN/1AzuW7KKL5RdT/mMC7SwoNBM8SasWLSCaFs0E423DmsD4lb/7szJkUrYkoBlR/nh0h/hMl1J4roC3Y7EBiX5hWBZFGQXM2pESZr+v7DrXSUa5oZzLkus1RvnXOZDENThwUtul0nFYyU1GVRVJo+akHzXlZMXY9n2kElc4n1jfeMyldsrh4sOE/z8ekZ7C0RU+s/NW0D5tKRoa9OR/dHH/vqknVjTerQDXC5WzLgozVXu3LfbtoywZHlyOH/ynMRBZfyIkQDkGFk8fNXXSXWLL25+nT9UP59GmKgQtELHteh5nvzBLBSgYlgJWL1hdg4we6gYtDcUtL6z6P7kgUREbl17f/iCqfPdqiqqyvt7a8Hr4rrp6fr/yq7NXfj93Dzv8rQ9u/sDgPKDi76I6TIREVSVcCjMZ9fe3/KnHW8GUuc3tO3hcKDjuBlYtic74+/l68pmDicB1wy36VTfdD1nwjlJrn7c1MA7Bz8KTSscqwlC39q/DWyHilnlaWufrN1YjGOFV553VZpdqGvZA1GL715ySyr3eWDdT5Viz+jKCytyUufXtm4Pd/Yd2Juq85mGZVtDkXHhUO7QABYP3a9yuGXequwUruoT76/vpKC4+N39tZIQ0Q273mdqwST82SkccGBT83YQaf3svEvS7MLbB7Zzw8yleDyeJPejkSj/suUZwVZWzh+QmKZD+ykq6vX2RHZN6e3vSYCufcF+AsE0QaEr2DUUKecNZQdcwJyhmhr9oSAXTanIT7HO8vvtG724TL7yl5/gx0NleQX7uvfz7bI70vT/1Y/eBb+HZRPK8lN33ntwP1Gjj68vuC5NXf7vq+ugwMPyaRchhpHc5836mqP+An+BiMGq9V+Um8ZXsmV/jeT5c3sevvmfkgGaIOwJfkKRFmYyhNOGU4HJQ+l/kWuq5vpzzAT3jna3c6ivO4IqeF2sfPZBXN9bDHnZXDttUZo4/2VnNXhcesO8y/JT93y5rhr8fq6Zk64u//b+M4DNvRfenLbPf9W+7TcMM4zCQesA/1z/j4wYXaAP3/xPeaqadJ3/8sLPyB+fl0k9BJgwXCA0aqiHs0ZekgbM7ubGfrKzRhALCyE7BxuF/n6unLkwLZ17tu5tsIPy+flXpvn3l3dv4oopC9Pe09bRTn3XJ+SWjoztkwrY3vfck71mc2G2PSYYDsqPLq1i+dwVaXu+VfsWTx78He4i91CkFA8nATmZ9d9mXP7cNESbe7oE00hv6CKcM2oWidK+qhIMBtnXu5/xBRMYkZOfqv/60p7NVMxYlPau/968EQpyuG/hzWlq9ElTI5YnSm/YLLVtSx67fA3L565IiwMOt7dwz8Zv4C5yD2kc43WCIQEwMxZ1HYvS7OlpxksMMyuWEcWTd8cBhaunXZi29oWtb0Ken+tmpIv54bZWDdtHuWjsvLTDbty9OZbDXnxrmvi/vONdyPVrf9Db8eiSn7FkxmVpz1s7W7nlyZXkTMpJk4hMxZ3hAMgYPzqOTaE/XTsun7MQjvYKakNvD09UPACdnSyZeG7awV7c9R6YwrIpFyR/V1Verd8UJcvDBeNnpx323aZa7rngJnKz/Wm/v/zxJrAj8vvlPyxZMv3yNCL7+/v1tie/QP/IAI468crEkKN/OBvQBxQcA4A6eN3+tN9yc3J54cv/xp/q3+T+y7/IyJwivmJFuGzqgmMPLhEumXTeQDQnwmu7awLiy/O63OmFqHNLpvKL5d85houv7Klh8Tmf4fr5l5qpkWFvX69z82N/Z8g4YaprGoZjEFWLzmgHtmljmVGiGk0EbqjqsAC0ZAIABNuxBjV7lGsXXMq1C2KJzUtb3sJTOJo8f25yTiAQ4FB/C+TmUpw/Im39hrrq/tGjRhQN3vOvD/w6rfihqhw43ExI+vjaBcuPAeZw12F55r7n1e/LPkbmWztb2XF4O5uPvM8rjRvp8Xbj9XgPDKcCezM9ME2TrsBhMiUdifFcw9t8Zsz0NGJe2V4NednMLkz3PKFgiJaeg/jdvmP2VFU6urvS9n/xo7ch10v52LmDmaDTx02XTMQDjCwcyRVzruSBS3/A+pXPcoVrGX29fecveWFxXjllGQHYkVE0DDdNR2uHaPvFWPXEthfxmu40Yl7b8wG43eR4s9LmV9dvgWxfSW8kqIP3EhG27qlL22fjrk0ATBgxMt0Qi5xQO88wDAqyCvhJ5aPcO+k7/kib1cQzx9xawwCqM5eKTDbtfzpTqQkR4dG//AfhLIfa1r1pc97ZXwsKDe37kxwTEbY0NYDH4zvcc6R9cJiy9ZM6wthp73lp9yZwHHxu76k3PuPS9ZWld/CDeQ/l97YE3rs7cod50bqFaQC8NFQm0Gp/xLY9bx0j+h837eX+N9aA281Rq5c/ffBqcs62lp0xW2D369M1r2iCYzta9sRcp9rRmsYdmoziEK78+Tf47IIlyT2aW1sImrG6YNiKnt4NkDgI1y24Xr85/Z4Z7z1Z85t3KzenFUQiwNZjU03B5XLzxIdfY9OuDRzubNLG1mbnuQ9fZ87PvgB5WbFAyHRx47oHeWXHexxqbQFvvK5ruuRzf3ygd937L2FZFge6DsdLmq68rz1bJXuPHOTjln1cUfVVSqakFzJer9sEeX4Qk7ZAV7xwFNLWzlZnT+sn1LfUsb2llo8ObaPu8A52te7iQMcBugPdGVU1DoJ8Y9ldOjYwdlX5+rK5g4uidwKPZ9J1EQj2hckzx/BUQ0FgT1erH78v1g5LhMQCEna4qGQW73Q2gCvu5gKho4Qi+ZdM+IzsPtLEYe1VhA6y3cX5+LGtKAEJcs+ilfzium8n33v7rx/ity1vgRXlx4u+SmNrM2FjX6DbaQsfNbqKgk6QKFEsx8JrevEYXvLceRR5ihibNY6y4gu5/twVuL3HhsZ7D+3l2qeWfbjru3vPB5DErcvVG2brUBcdQDAN5andeQ2N7d7Zx1bhNVMm3UxfaFwSpERfSRVys5pBxwCCY/Pnyh+zYu6S5OJJ/+Na9vtiRRPsGJ8WTgz0uXJdhqI+QGLbSfyexLH5n9Nrc9O4lXxn2fcwTTNVGvSr/3G77C7eOc8K2TuMlPs1jwyhRMRb+IzJjRa4TKf9WG1J62PHxCYc8ZNogIik55sRKysepYAVYenkBakRGPu7mxIlSTAFhIDHJ0cRshJ1SEk26CQZ8CR+F0MwC1z6X0f/2HPJ2sVH/7j1DwSCAU2owl2L79Yjje3fra6sidUE432Bh4DQUGUnVfCbjjGjJOzgyHBXYwTb6cRyRmRMs0WUiOWL9yDw+wqSgZSqUl33wYB9iedXpqkd6jFKdZhs55hyqSJe0/uvdr61+Kd1jzx9x0u3ScPBehURzp91AcXR4i8li6JVFQ3EjeGdHNuLSeynBV6nIM9rl/p9dnNGmGJJkkMwoogMfTNKNRvL7gaYVzIlzWK/07gNsnyJ1FpRZHShZSjiPtEYIOX8P3Q5rp0ffKn2c81O8y23vrrSeWPX6wBcNulyc8lzixek9QarKhp+B/xnJhBUkQKP02arMKsklINof5ryxyxmlGC0HUeLj9voD0U9QLDQl5v2nk1NDSl1BRWPy+maUBT1ZLghdjw5eLS6siZcXVlD+boyqj9X85Q/N3vBt96/++Pff7hWrphyJR2HOpYO7g0CfAl4fTAIIjDCa4+2laDL1PwZxeFOHJE4l2LhXDjaQtQuHob7Awd0tICI3d3Y1ZIG1LbDHye7AzjSPXdU0I9p+Ia4LzwU94PAA4lCaAKEd27aXJuTk7Pw8d2/bNja8yGRgHWekaE1bldVNFweB8EZJFJmgcfpACjMtsaV5kbjqqA2YWsvYWtC3DrJCUQoSihS2nDk47YPGusH3FTH/qQBnF4a6nOb2o6QfxLEC/CF6soaJ7UQmvy3Q7dLXPP+89AfWgtHj5g01P0A4iDcA+xKlqOBcX4rW1WwVZhQGCkpyY7W0Wd1EY5OiXNeTkJMDdT0Xfbbe3vXbX4ZjdjgUnAITxgRaS32W2PEbbhPkvjHqytr/jxUGby6soa3Vr5nu93uiw23UXLcw8YbJwuBL6uyUEQL3jyU1Vnoc/qm5Ebn+lxqbqjzHqxvcU+O3x87mbuHiqrgMg66s7LGzXWP1q19+2TKaLupJMcep6qGmWP2AjknaABfqq6sqShfV8Zw7bDE8/J1ZTeeCADHfJnx4MuzfmU7fN2JeT31uFRervfu/fCge4zjiA85SRxUwe06INnmyGnFkZaiLGuio4KYHDCzzfEnuMsb1ZU1S49H/GAQTvq2eNxQlgBHEmKnirpNlX2dZucrO709bUfNScR6t8dBInY9EovQ7HHR3rIpFp/0uq2oI6MFxfSb3Qh5Q3A/de//Cfzv6soa56STpVPNslZvmP14PG5IIUXFUXEOdpmt6z/y9UWjMm3gC4CUA+sACQV+Z+vnFwSn5/o0W0QNVaH+qHtrW8Q1zpVtlhyH8HpgObD3ZO8HnhYAcSnwAV3EvhBLvVShhqh4XNDSYzTvOOQ62t5nlkQsSh0VDFHH5+bwmHy749yx0fG5Xi2I2ANHUUVNUWlzXIvqA76lIrIMKIq/JxIvcNYBv62urHknVZzPGgApQFwHPJ+ptZYAIpkigNqKJL4MUAVHYzYkxccnVOrbj1zb8PMUfc2NAx4Bek9F1D8VAOIg/DtwB6f50VTK+lerKhquPJPfBn6aEpCIIDdyWp/NJddtA8oA62wQf0YkIA6EN55D3HAKICTmbwaurKpo6OUsDuMM7ROuqmi4EfgVKfd4T3DYwItVFQ0XAmeV+DMmAYPUoQK4D7hqGPeVGO8Aa6oqGv7I32jImdwsBYQsYh8930rsktJcYtcYw8BOYCPwO2BfVUVDgL/h+H+8Ex3DrupO9wAAAABJRU5ErkJggg==\"}");
 -pref("social.manifest.msnnow", "{\"builtin\": \"true\",\"origin\": \"https://now.msn.com\",\"name\": \"msnNOW\",\"workerURL\": \"https://now.msn.com/js/firefoxworker\",\"iconURL\": \"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2RpVFh0WE1MomNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDozMkY0QkZFREQxM0JFMTExQUE0MEYwQTFBRTFEN0QwMyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo5RjUxOThGOTJDRjkxMUUyQTQ5NzkxRkQxQjI1Mzg2NCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo5RjUxOThGODJDRjkxMUUyQTQ5NzkxRkQxQjI1Mzg2NCIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1IFdpbmRvd3MiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDowMTVCMTdDQ0M1MkFFMjExODNDRENFQTc0Q0EwNzEyMCIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDozMkY0QkZFREQxM0JFMTExQUE0MEYwQTFBRTFEN0QwMyIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Ppp4JKMAAABiSURBVHjaYvz//z8DJYCJgULAAmNwJEwk2Sk/FuQzUuyCUQMGgwGM+FIitrQBintKXKCG0wVA27Cl0t9IfEUgfoDmGuwuAEkAAbLzJdE14/UC1DUwOW6ggS/ICkRiAECAAQBDhCEtt+sSkAAAAABJRU5ErkJggg==\",\"icon32URL\": \"data:image/gif;base64,R0lGODlhIAAgAMQAAABgkm+lwf///y99psDY5K/N3c/h6k+RtA9pmO/1+I+5zz+HrR9zn7/X5N/r8V+bu3+vyJ/D1oCwySB0oGCcu+Ht80CIrRBqmTB+pwAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAAHAP8ALAAAAAAgACAAAAXAICCOZGmeaKqubOu+cCzPdG3fraDvfO//OhFwSNwJi0jfUQBpKCCRnQNCdQgMDV0iK9haBcvS4ooYIZyAAjMtUAC4YUYiwQAkDgBIAgIYJAAPAnWBDAxGAEZjAgtvYYgHCAYAFpEACoeJOowNZVZ/CAIFfRcOfQBfYIhBipsPfRADgDoTshgABzxhrG8JjCILCToBb21smEUODahIS0nOzc7MAATU1dbX1qjYBDUSOhQ4JN7g4SMS5OXp6uvs7eshADs=\",\"icon64URL\": \"data:image/gif;base64, R0lGODlhQABAAPcAAABgkonIVjuOhf///7tnLwhnmY6bU8/h6gGO/7/X5H+vyK/N3WBaW0+RtACSnF+buy6Gl0uy/9l7J6PXeV6HaO/1+PvIIwyNxY+5z02acCpfghaw6hR5mPh2FKlXUn/I8v+UcgJ2wSCwoyB0oD+HrfB5TpuZV4TDXsyyOiCc/9/r8Uuf0G+lwdtcPACvoESShBGt+Z/D1iN6hIbFUid/rQea/Ri79x2Cwt9VFZPRYf1bB3B8jHhmYwNnoD1tdjeIjwN7yG+0YK2oRQtokRGV/xKupgWcpLBoTx7E6QWAxy99pueyQJ3Rj1i5/+pJPUmahwl7qjBsjw2m+wC3qQGblftlDB9jgkCIrVGfgn1nUJrRbRzC9h9zn+eEIi+k/5HMYhi33iaqlsHZ5SaKyRBqmRa2+P9PBfH3+Quh+wCllzB+pwNupmC5+WCcuwWV/YrHWBFti4zJWxCUxKxPVJfPaQ5omYCwyabZfjBhfuHt83CmwgCZmQmGxgC8rdHj61CStLHP3YHK+QR4uhaX/1C0/w+TxASjo6HF1xCq+o3MWh7G9RKv+ZG70QOS/kSVgQme/Ad5yQCxo5rSbgqj+xOx+QSV/xKV/43JXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAAHAP8ALAAAAABAAEAAAAj/AAEIHEiwoMGDCBMqXMiwocOHECNKnEixosWLGDNq3Mixo8ePIC2uCPSBRkiNYyJEaMKmwMmLPSzJTOHlxkuLIdzodIMA0s2IO6IITIKmKJoaQH5CBFECDwA+i6IikiJI6cMjZnAAuGCjaxlKazJeKTjW4BU1B0eUBcBAR5UshcCAUaRow8UrMQboTTAi714yAEYk0Lt37BU7ZwgnQEuggwQoVNIYQSLn4oAzba60SYxZ85kEABac+TNCzZ8YdgDotXPFswoAVrrM0bDHhQtDHCy3GdhmwJ+BegYASKAiM+CBAzAQ/DMArQ8nHhxM6RPmBByLA9ZeyT5wOwA1fggP//CD1jfB7WV5tIBQRISkS0Gwa+cu0Ht3zSr8qF4LAL1AIRYYwMQdWsQRgAAV0defgt7pgdZAC+in4IJlUWABCj9MQMcbiWCR4HzzhXZZAgkkttuE/glkwhIAvPDFDDk8UdEVxwFABo0D3VifHTzqMUJ9NdqIo0EyZODIEBWRqOSSTDbp5JNQRvmkQOJVaeWVWGap5ZZ6Ucnll2CGeaWXYpZpZpZknqmmmmmu6WaYbb4pp5ZxVlkBiQdoeecCCww2p5VxkmBjAoLmqICVKjxgEAsV6FWBApD6qZcKkPpFGAaVVhmoQg+Id0CQBCmhgl4/AqCEeMoJ1KheBwyEgaaqVf9ZqEANKNAAQX5WECQJSoSqV6oAjKpXrwJZysJAqxK2qY156hXDQJ0OoMBAorJKLAB5VeDqpAQ1QBgXAkUr3rIkVAkuAOUOcC4ZyQ7QKq163WrqrwU1+q6IsFpZaLqE7dslvFUSy4VeCww06rml5nVsYGPGKp6/DwtUrrYCHSorcnodh8G7IxQMgLfnWpzvxeiSnC60+mI8wMJKLMzCAMeBJpCwI0dcss3pHjeweBTf7O5A5+apKADnbtdwyj7rBfHQAIg7gLwAvErYgwKNQHBBltbcr8Qmc0utAiyca2O7zw70csY5tjuuw1snPQDEA5SNkKSOEtTsAEw7rbXSXONxLN4CYgN9t3hDW02YxwAMvre7eFZ5QONVLqDAAw8oQPefwrGN+ebKas755nV+Pmfoor9Jeulrno76mQJJ6frrSyZW5WevWzXQ5WdQbXtDdOe+O0SS+v77Q34KP7xDgxl/PO/KL8/QAro7L/301FcfUkAAOw==\",\"sidebarURL\": \"https://now.msn.com/sidebar\",\"description\": \"See what's trending in realtime on Twitter, Facebook, Bing, YouTube and more.\",\"author\": \"Microsoft\",\"homepageURL\": \"https://now.msn.com/now-for-firefox\"}");
 -
- pref("social.sidebar.open", true);
- pref("social.sidebar.unload_timeout_ms", 10000);
- pref("social.toast-notifications.enabled", true);
+ // comma separated list of domain origins (e.g. https://domain.com) for
+ // providers that can install from their own website without user warnings.
+ // entries are
 diff -ruN mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozilla-release/browser/base/content/abouthome/aboutHome.js
---- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js	2013-05-11 16:19:20.000000000 -0300
-+++ mozilla-release/browser/base/content/abouthome/aboutHome.js	2013-05-20 17:49:18.467307120 -0300
+--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js	2013-06-26 22:53:37.285513294 -0300
++++ mozilla-release/browser/base/content/abouthome/aboutHome.js	2013-06-26 22:57:20.932228108 -0300
 @@ -3,69 +3,41 @@
   * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
  
@@ -130,7 +130,7 @@ diff -ruN mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil
  , "https://www.gnu.org/software/gnuzilla/addons.html"
  ];
  
-@@ -139,10 +111,6 @@
+@@ -203,10 +175,6 @@
    if (searchEngineInfo.image) {
      let logoElt = document.getElementById("searchEngineLogo");
      logoElt.src = searchEngineInfo.image;
@@ -155,9 +155,9 @@ diff -urN mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi
  
  #searchText {
 diff -urN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties
---- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties	2013-02-15 19:14:45.000000000 -0200
-+++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties	2013-02-20 19:55:41.962705914 -0200
-@@ -3,19 +3,12 @@
+--- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties	2013-06-18 08:01:12.000000000 -0300
++++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties	2013-06-26 22:44:10.393864883 -0300
+@@ -3,17 +3,12 @@
  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
  # Default search engine
@@ -171,17 +171,15 @@ diff -urN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/regio
 -
 -# This is the default set of web based feed handlers shown in the reader
 -# selection UI
--browser.contentHandlers.types.0.title=Google
--browser.contentHandlers.types.0.uri=http://fusion.google.com/add?feedurl=%s
--browser.contentHandlers.types.1.title=My Yahoo!
--browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s
+-browser.contentHandlers.types.0.title=My Yahoo!
+-browser.contentHandlers.types.0.uri=http://add.my.yahoo.com/rss?url=%s
 +browser.search.order.1=DuckDuckGo HTML
 +browser.search.order.2=DuckDuckGo Lite
 +browser.search.order.3=Seeks Search
  
  # increment this number when anything gets changed in the list below.  This will
  # cause Firefox to re-read these prefs and inject any new handlers into the 
-@@ -24,20 +17,10 @@
+@@ -22,20 +17,10 @@
  # don't make any spelling errors here.
  gecko.handlerService.defaultHandlersVersion=3
  
diff --git a/libre/iceweasel-libre/mozconfig b/libre/iceweasel-libre/mozconfig
index 21d56e13c..a5af10e63 100644
--- a/libre/iceweasel-libre/mozconfig
+++ b/libre/iceweasel-libre/mozconfig
@@ -25,10 +25,10 @@ ac_add_options --enable-system-pixman
 # Features
 ac_add_options --enable-startup-notification
 ac_add_options --enable-gstreamer
+ac_add_options --enable-pulseaudio
 
 ac_add_options --disable-crashreporter
 ac_add_options --disable-updater
-ac_add_options --disable-tests
 ac_add_options --disable-installer
 
 # Parabola features
diff --git a/libre/iceweasel-noscript/PKGBUILD b/libre/iceweasel-noscript/PKGBUILD
index 7db206be9..2d5f48040 100644
--- a/libre/iceweasel-noscript/PKGBUILD
+++ b/libre/iceweasel-noscript/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 90901 2013-05-15 12:56:28Z spupykin $
+# $Id: PKGBUILD 93410 2013-07-03 10:50:31Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=firefox-noscript
 pkgname=iceweasel-noscript
-pkgver=2.6.6
-pkgrel=2
+pkgver=2.6.6.7
+pkgrel=1
 pkgdesc="plugin for iceweasel which disables script"
 arch=('any')
 url="http://noscript.net/"
@@ -14,7 +14,7 @@ depends=()
 provides=$_pkgname=$pkgver
 makedepends=('unzip')
 source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi)
-md5sums=('a018efb1fe0f722ff307382791bf3c98')
+md5sums=('10b6704f34568d226fb5fe69b7d6043d')
 
 package() {
 #  _ffver=`pacman -Q iceweasel-libre | cut -f2 -d\ | cut -f1 -d-`
diff --git a/libre/ipsec-tools-libre/PKGBUILD b/libre/ipsec-tools-libre/PKGBUILD
new file mode 100644
index 000000000..6de9bd7d5
--- /dev/null
+++ b/libre/ipsec-tools-libre/PKGBUILD
@@ -0,0 +1,48 @@
+# $Id: PKGBUILD 91859 2013-05-28 17:36:54Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Allan Henriksen <allan.henriksen@gmail.com>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+_pkgname=ipsec-tools
+pkgname=ipsec-tools-libre
+pkgver=0.8.1
+pkgrel=4
+pkgdesc="KAME IPSec tools ported to Linux (built for the linux-libre-headers package)"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://ipsec-tools.sourceforge.net/"
+depends=('readline' 'openssl' 'krb5')
+makedepends=('linux-libre-headers')
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
+license=('GPL')
+options=('!makeflags' '!libtool')
+source=(http://downloads.sourceforge.net/sourceforge/ipsec-tools/$_pkgname-$pkgver.tar.bz2
+	racoon.service
+	ipsec.service
+	ipsec-tools-linux-3.7-compat.patch)
+md5sums=('d38b39f291ba2962387c3232e7335dd8'
+         '3a64a9e3b498c6da90450ffb0b758aea'
+         '387a0b0c4f10e42b2bb62282885cdc9c'
+         'ae1dd20c83dcfce3dedb46ee73e83613')
+
+build() {
+  cd $srcdir/$_pkgname-$pkgver
+
+  patch -p1 <$srcdir/ipsec-tools-linux-3.7-compat.patch
+  sed -i 's#-Werror##' configure.ac
+
+  ./bootstrap
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin \
+	--enable-security-context=no --enable-hybrid --enable-dpd --enable-natt \
+	--enable-adminport --enable-gssapi \
+	--with-kernel-headers=/lib/modules/`pacman -Q linux-libre-headers | cut -f2 -d\ `-LIBRE/build/include
+  make
+}
+
+package() {
+  cd $srcdir/$_pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+  install -Dm0644 $srcdir/racoon.service $pkgdir/usr/lib/systemd/system/racoon.service
+  install -Dm0644 $srcdir/ipsec.service $pkgdir/usr/lib/systemd/system/ipsec.service
+}
diff --git a/libre/ipsec-tools-libre/ipsec-tools-linux-3.7-compat.patch b/libre/ipsec-tools-libre/ipsec-tools-linux-3.7-compat.patch
new file mode 100644
index 000000000..46b11ee51
--- /dev/null
+++ b/libre/ipsec-tools-libre/ipsec-tools-linux-3.7-compat.patch
@@ -0,0 +1,50 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -74,9 +74,10 @@ case "$host_os" in
+ 	    [ KERNEL_INCLUDE="/lib/modules/`uname -r`/build/include" ])
+ 
+     AC_CHECK_HEADER($KERNEL_INCLUDE/linux/pfkeyv2.h, ,
+-	[ AC_CHECK_HEADER(/usr/src/linux/include/linux/pfkeyv2.h,
+-	  KERNEL_INCLUDE=/usr/src/linux/include ,
+-	  [ AC_MSG_ERROR([Unable to find linux-2.6 kernel headers. Aborting.]) ] ) ] )
++	[ AC_CHECK_HEADER($KERNEL_INCLUDE/uapi/linux/pfkeyv2.h, ,
++	  [ AC_CHECK_HEADER(/usr/src/linux/include/linux/pfkeyv2.h,
++	    KERNEL_INCLUDE=/usr/src/linux/include ,
++	    [ AC_MSG_ERROR([Unable to find linux-2.6 kernel headers. Aborting.]) ] ) ] ) ] )
+     AC_SUBST(KERNEL_INCLUDE)
+     # We need the configure script to run with correct kernel headers.
+     # However we don't want to point to kernel source tree in compile time,
+@@ -643,7 +644,14 @@ AC_EGREP_CPP(yes,
+ #ifdef SADB_X_EXT_NAT_T_TYPE
+ yes
+ #endif
+-], [kernel_natt="yes"])
++], [kernel_natt="yes"], [
++  AC_EGREP_CPP(yes,
++  [#include <uapi/linux/pfkeyv2.h>
++  #ifdef SADB_X_EXT_NAT_T_TYPE
++  yes
++  #endif
++  ], [kernel_natt="yes"])
++])
+ 	;;
+ freebsd*|netbsd*)
+ # NetBSD case
+--- a/src/include-glibc/Makefile.am
++++ b/src/include-glibc/Makefile.am
+@@ -1,14 +1,7 @@
+-
+-.includes: ${top_builddir}/config.status
+-	ln -snf $(KERNEL_INCLUDE)/linux
+-	touch .includes
+-
+-all: .includes
+-
+ EXTRA_DIST = \
+   glibc-bugs.h \
+   net/pfkeyv2.h \
+   netinet/ipsec.h \
+   sys/queue.h
+ 
+-DISTCLEANFILES = .includes linux
++DISTCLEANFILES = linux
diff --git a/libre/ipsec-tools-libre/ipsec.service b/libre/ipsec-tools-libre/ipsec.service
new file mode 100644
index 000000000..483a5b58d
--- /dev/null
+++ b/libre/ipsec-tools-libre/ipsec.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Load IPSec Security Policy Database
+After=syslog.target network.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=true
+ExecStart=/usr/bin/setkey -f /etc/ipsec.conf
+ExecStop=/usr/bin/setkey -F -P ; /usr/bin/setkey -F
+
+[Install]
+WantedBy=multi-user.target
diff --git a/libre/ipsec-tools-libre/racoon.service b/libre/ipsec-tools-libre/racoon.service
new file mode 100644
index 000000000..95324bd5d
--- /dev/null
+++ b/libre/ipsec-tools-libre/racoon.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Racoon IKEv1 key management daemon for IPSEC
+After=syslog.target network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/racoon
+
+[Install]
+WantedBy=multi-user.target
diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD
index 62bca0307..f1264b0c7 100644
--- a/libre/kdebase-konqueror-libre/PKGBUILD
+++ b/libre/kdebase-konqueror-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 184487 2013-05-07 13:27:00Z andrea $
+# $Id: PKGBUILD 189302 2013-07-02 21:26:19Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
@@ -6,7 +6,7 @@
 
 _pkgname='kdebase-konqueror'
 pkgname='kdebase-konqueror-libre'
-pkgver=4.10.3
+pkgver=4.10.5
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://kde.org/applications/internet/konqueror/"
@@ -15,7 +15,7 @@ groups=('kde' 'kdebase')
 makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml' 'nepomuk-widgets')
 source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz"
     	"konq-about-fsdg.diff")
-sha1sums=('c9949ef6dafbc567bb3f088bf9e156c3a5a9ec08'
+sha1sums=('3953c441d508408becfbb1177d3a834775b92bf6'
           'd6cbb53c04179b8180f9439eca156b7ff2e76b3a')
 pkgdesc='KDE File Manager & Web Browser, without Google and nonfree software recommendation'
 depends=('kdebase-dolphin' 'kdebase-keditbookmarks')
diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD
index 6d3291252..224d304e1 100644
--- a/libre/kdebase-runtime-libre/PKGBUILD
+++ b/libre/kdebase-runtime-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 184473 2013-05-07 13:26:42Z andrea $
+# $Id: PKGBUILD 189302 2013-07-02 21:26:19Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=kdebase-runtime
 pkgname=kdebase-runtime-libre
-pkgver=4.10.3
+pkgver=4.10.5
 pkgrel=1
 pkgdesc="Plugins and applications necessary for the running of KDE applications, without non-privacy search providers"
 arch=('i686' 'x86_64' 'mips64el')
@@ -26,7 +26,7 @@ install="${_pkgname}.install"
 source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz"
         'duckduckgo_html.desktop'
         'duckduckgo_lite.desktop')
-sha1sums=('22869b2ee7eb4b5b341a6d596dd904c0b0b812d1'
+sha1sums=('1d472ceff3a38ff778803817b9c0eeb5b1880db6'
           'aa6f39f4b0ad3c110fd05cd6c41190afae9773dd'
           'ac3bac94a2c4b1444642524bc5fb539c4c5dcc5b')
 
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD
index 96c8530a3..8cdf5228e 100644
--- a/libre/kdelibs-libre/PKGBUILD
+++ b/libre/kdelibs-libre/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 185044 2013-05-10 17:08:02Z andrea $
+# $Id: PKGBUILD 189302 2013-07-02 21:26:19Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=kdelibs
 pkgname=kdelibs-libre
-pkgver=4.10.3
-pkgrel=3
+pkgver=4.10.5
+pkgrel=1
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/kde/kdelibs'
@@ -23,31 +23,24 @@ conflicts=('kdelibs')
 install=${_pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
         'kde-applications-menu.patch' 'qt4.patch' 
-        'security-fix.patch' 'fix-xfreepixmap-call.patch'
         'khtml-fsdg.diff')
-sha1sums=('aa154998e227121be82f5b04442e908e7dece01b'
+sha1sums=('6caab0c70ab742dd711b44dd3f9bfdcbf9be31eb'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
           'ed1f57ee661e5c7440efcaba7e51d2554709701c'
-          '506562009a667f18481be0d2c5035b181fce38bb'
-          '556c5473219d8208ec920f46c08bf61fda5b60d9'
           'a1502a964081ad583a00cf90c56e74bf60121830')
 
-build() {
-       cd ${_pkgname}-${pkgver}
+prepare() {
+       cd "${srcdir}"/${_pkgname}-${pkgver}
        # avoid file conflict with gnome-menus
        patch -p1 -i "${srcdir}"/kde-applications-menu.patch
        # qmake refers to Qt5
        patch -p1 -i "${srcdir}"/qt4.patch
        # Don't ask the user to download a plugin, it's probably nonfree.
        patch -p1 -i "${srcdir}"/khtml-fsdg.diff
+}
 
-       # KDEBUG#319428
-       patch -p1 -i "${srcdir}"/security-fix.patch
-       # KDEBUG#319137
-       patch -p1 -i "${srcdir}"/fix-xfreepixmap-call.patch
-      
-       cd ../
-
+build() {
+       cd "${srcdir}"
        mkdir build
        cd build
        cmake ../${_pkgname}-${pkgver} \
diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD
index 463f69c88..3b4295415 100644
--- a/libre/kdenetwork-kopete-libre/PKGBUILD
+++ b/libre/kdenetwork-kopete-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 184589 2013-05-07 13:30:07Z andrea $
+# $Id: PKGBUILD 189302 2013-07-02 21:26:19Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgbase=kdenetwork
 pkgname=('kdenetwork-kopete-libre')
-pkgver=4.10.3
+pkgver=4.10.5
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
@@ -14,21 +14,23 @@ groups=('kde' 'kdenetwork')
 makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr3' 'ppp'
 	'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver'
     'v4l-utils' 'libidn' 'qimageblitz' 'libxdamage' 'libgadu' 'libmsn'
-    'libktorrent' 'libmms' 'mediastreamer' 'telepathy-qt')
+    'libktorrent' 'libmms' 'telepathy-qt')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
         'use-libotr3.patch')
-sha1sums=('9c5e14b1ebc575777d1e6d09b593f62940a4fd1d'
+sha1sums=('3ee86a1a227593e9f37881da3c1db1a3c384b2e4'
           '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384')
 
-build() {
+prepare() {
     cd ${pkgbase}-${pkgver}
     patch -p1 -i "${srcdir}"/use-libotr3.patch
     cd ../
 # Based on http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/make-kdenetwork, revision 34.
     sed -i 's/Skype protocol" ON/Skype protocol" OFF/g' "${pkgbase}-${pkgver}/kopete/protocols/CMakeLists.txt"
     rm -rf "${pkgbase}-${pkgver}/kopete/protocols/skype"
-    sed 's/, Skype//' -i "${pkgbase}-${pkgver}/doc/kopete/index.docbook"
+    sed 's/, Skype//' -i "${pkgbase}-${pkgver}/kopete/doc/index.docbook"
+}
 
+build() {
 	mkdir build
 	cd build
 	cmake ../${pkgbase}-${pkgver} \
@@ -46,7 +48,7 @@ build() {
 package_kdenetwork-kopete-libre() {
 	pkgdesc='Instant Messenger, without skype support'
 	depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr3' 'libmsn'
-	         'libidn' 'qimageblitz' 'libgadu' 'mediastreamer')
+	         'libidn' 'qimageblitz' 'libgadu')
         conflicts=('kdenetwork-kopete')
         provides=("kdenetwork-kopete=${pkgver}")
         replaces=('kdenetwork-kopete')
@@ -54,6 +56,6 @@ package_kdenetwork-kopete-libre() {
 	install='kdenetwork-kopete.install'
 	cd $srcdir/build/kopete
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kopete
+	cd $srcdir/build/kopete/doc
 	make DESTDIR=$pkgdir install
 }
diff --git a/libre/kdepim-libre/PKGBUILD b/libre/kdepim-libre/PKGBUILD
index 7ed1b1a01..3f9b3ce28 100644
--- a/libre/kdepim-libre/PKGBUILD
+++ b/libre/kdepim-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 185074 2013-05-10 20:52:59Z tomegun $
+# $Id: PKGBUILD 189302 2013-07-02 21:26:19Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -22,8 +22,8 @@ pkgname=('kdepim-akonadiconsole-libre'
          'kdepim-ktimetracker-libre'
          'kdepim-ktnef-libre'
          'kdepim-libkdepim-libre')
-pkgver=4.10.3
-pkgrel=2
+pkgver=4.10.5
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://pim.kde.org'
 license=('GPL' 'LGPL' 'FDL')
@@ -31,7 +31,7 @@ groups=('kde' 'kdepim-libre')
 makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss'
              'kde-agent' 'nepomuk-widgets')
              source=("http://download.kde.org/stable/${pkgver}/src/${_pkgbase}-${pkgver}.tar.xz")
-sha1sums=('78ca9b822f905355ec00142a7de6c08c38b97c08')
+sha1sums=('a7c791e748558a194d020104dc62604ee9f632ae')
 
 build() {
 	mkdir build
diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD
index 90921bb7d..5efee348d 100644
--- a/libre/kdeutils-ark-libre/PKGBUILD
+++ b/libre/kdeutils-ark-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 184594 2013-05-07 13:30:17Z andrea $
+# $Id: PKGBUILD 189302 2013-07-02 21:26:19Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=kdeutils-ark
 pkgname=kdeutils-ark-libre
-pkgver=4.10.3
+pkgver=4.10.5
 pkgrel=1
 pkgdesc='Archiving Tool, with unar support'
 url='http://kde.org/applications/utilities/ark/'
@@ -20,7 +20,7 @@ replaces=('kdeutils-ark')
 conflicts=('kdeutils-ark')
 source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz"
         'ark-unar-06.patch')
-sha1sums=('26437751ddf6f466a948a402f253f66bfc19660e'
+sha1sums=('8c50a864af0dbf62e3df46414c7bf9cd1d8c8620'
           'a0a836950f185d9b2245204579f969203036fdec')
 
 build() {
diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index 9f67689df..80b154dff 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -1,41 +1,78 @@
 # Maintainer: Joshua Haase <hahj87@gmail.com
 # Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
 # Contributor: fauno <fauno@kiwwwi.com.ar>
+# Contributor: Márcio Silva <coadde@lavabit.com>
 
 pkgbase=libretools
-pkgname=(libretools libretools-mips64el)
-pkgver=20130117
+pkgname=(libretools libretools-mips64el librelib)
 pkgdesc="Programs for Parabola development"
-url="https://projects.parabolagnulinux.org/libretools.git/"
-license=('GPL3+' 'GPL2')
+url="https://projects.parabolagnulinux.org/packages/libretools.git/"
+license=('GPL3' 'GPL2')
 
-pkgrel=3
+pkgver=20130627
+_libretools_commit=08375ed421d18b48388169c7fc7cf4ca076577ba
+_devtools_commit=bf8513ae631484a0c292ad085ea7ede9859f8e0f
+
+_packages_url=https://projects.parabolagnulinux.org/packages
+source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.tar.bz2
+	$_packages_url/devtools-par.git/snapshot/devtools-par-$_devtools_commit.tar.bz2)
+
+pkgrel=1
 arch=('any')
-groups=(base-devel)
-depends=(openssh rsync git wget tokyocabinet)
-conflicts=(chroottools)
-source=(https://projects.parabolagnulinux.org/$pkgbase.git/snapshot/$pkgbase-$pkgver.tar)
+makedepends=(emacs) # emacs --batch is used during the build to process text
+checkdepends=(sh-roundup)
 
 build() {
-  cd "$srcdir/$pkgbase-$pkgver"
-  make
+  cd "$srcdir"
+  ln -sf devtools-par-$_devtools_commit devtools-par
+  cd "$srcdir/$pkgbase-$_libretools_commit"
+  make build-libretools build-libretools-mips64el build-librelib build-doc
+}
+
+check() {
+  cd "$srcdir/$pkgbase-$_libretools_commit"
+
+  make check TESTENVFLAGS='--no-network --no-sudo'
+}
+
+package_librelib() {
+  pkgdesc="Shell library portion of libretools"
+  depends=(
+    wget # `aur` and `lib/blacklist.sh`
+  )
+
+  cd "$srcdir/$pkgbase-$_libretools_commit"
+  make install-librelib DESTDIR="$pkgdir"
 }
 
 package_libretools() {
-  backup=(etc/libretools.conf etc/libretools.d/chroot.conf)
+  backup=(etc/libretools.conf etc/libretools.d/chroot.conf etc/libretools.d/librefetch.conf)
   install=libretools.install
+  replaces=(chroottools)
+  conflicts=(devtools)
+
+  depends=(
+    "librelib=$pkgver"
+    arch-install-scripts # `archroot` uses `pacstrap`
+    git # `createworkdir` (also mips-add in -mips64el)
+    openssh # `librerelease`
+    rsync # `librerelease` and `makechrootpkg.sh`
+    subversion # `diff-unfree`
+    tokyocabinet # `treepkg`
+  )
+  optdepends=('namcap: to check package files')
 
-  cd "$srcdir/$pkgbase-$pkgver"
-  make install-libretools DESTDIR="$pkgdir"
-  install -Dm755 rePKGBUILD.proto ${pkgdir}/usr/share/pacman/rePKGBUILD.proto
+  cd "$srcdir/$pkgbase-$_libretools_commit"
+  make install-libretools install-doc DESTDIR="$pkgdir"
 }
 
 package_libretools-mips64el() {
   pkgdesc="Scripts for Parabola development (for mips64el architecture)"
-  backup=('etc/libretools.d/mips64el.conf')
+  depends=("$pkgbase=$pkgver")
 
-  cd "$srcdir/$pkgbase-$pkgver"
+  cd "$srcdir/$pkgbase-$_libretools_commit"
   make install-libretools-mips64el DESTDIR="$pkgdir"
 }
 
-md5sums=('77dcfb2fbf5b8a9894a13c5e6151b693')
+md5sums=('acbdcd22c1b922f943651dbf7c320bbd'
+         'b28b1492fda205be7c577fc03cbc3399')
diff --git a/libre/libretools/libretools.install b/libre/libretools/libretools.install
index 50f03ee88..ff6a238fe 100644
--- a/libre/libretools/libretools.install
+++ b/libre/libretools/libretools.install
@@ -1,26 +1,28 @@
 #!/bin/sh
 
+_makepkgconf_append='[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=("libre::/usr/bin/librefetch -p \"\$BUILDFILE\" %u %o")'
+
 # arg 1:  the new package version
 post_install() {
-  cat <<EOF
-Please check https://wiki.parabolagnulinux.org/Package_maintainer_guide
-and follow instructions there before using libretools.
-
-If you plan using fullpkg you should read https://wiki.parabolagnulinux.org/fullpkg
-and install libretools-\$arch if avaliable
-
-EOF
+	if grep -q 'libre::' etc/makepkg.conf; then
+		libremessages msg2 "libretools: librefetch is already in /etc/makepkg.conf"
+	else
+		libremessages msg2 "libretools: Adding librefetch to /etc/makepkg.conf"
+		printf '%s\n' "$_makepkgconf_append" >> etc/makepkg.conf
+	fi
 }
 
 ## arg 1:  the new package version
 ## arg 2:  the old package version
 post_upgrade() {
-  cat <<EOF
-Check your /etc/libretools.conf, it has changed substantially.
-
-If using fullpkg, you should install libretools-\$arch if avaliable
-
-EOF
+	post_install
 }
 
-# vim:set ts=2 sw=2 et:
+pre_remove() {
+	if fgrep -q "$_makepkgconf_append" etc/makepkg.conf; then
+		libremessages msg2 "libretools: removing librefetch from /etc/makepkg.conf"
+		sed -i '/libre::/d'
+	else
+		libremessages msg2 "libretools: librefetch is not in /etc/makepkg.conf as we added it"
+	fi
+}
diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD
index 3ac0fdb5d..4126d4d01 100644
--- a/libre/liferea-libre/PKGBUILD
+++ b/libre/liferea-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 186254 2013-05-23 00:44:27Z eric $
+# $Id: PKGBUILD 188905 2013-06-25 03:54:44Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Contributor (Parabola): bitlord
 # Contributor (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=liferea
 pkgname=liferea-libre
-pkgver=1.8.14
+pkgver=1.8.15
 pkgrel=1
 pkgdesc="A desktop news aggregator for online news feeds and weblogs, without nonfree suggestions"
 arch=('i686' 'x86_64')
@@ -21,7 +21,7 @@ options=('!libtool' '!emptydirs')
 install=liferea.install
 source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.bz2
         remove-non-free-suggestions.patch)
-sha1sums=('980939a9f6483f4e9ca2353ffdba131cb9a88a6e'
+sha1sums=('9a86773996d61d03c03e9a5137a2c0a3e2539f4f'
           '0d68c567c3d37932a49709c58c37c3f138fd19cb')
 
 build() {
diff --git a/libre/lilo/PKGBUILD b/libre/lilo/PKGBUILD
deleted file mode 100644
index a896613ee..000000000
--- a/libre/lilo/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
-
-pkgname=lilo
-pkgver=23.2
-pkgrel=3.2
-pkgdesc="A bootloader for GNU/Linux, Parabola rebranded"
-arch=('i686' 'x86_64')
-url="https://alioth.debian.org/projects/lilo/"
-license=('BSD')
-# While lilo should stay in the base category,
-# it usually makes no sense if it is installed
-# with pacman -S base, therefore, don't add
-# the base group here.
-#groups=('base')
-backup=('etc/lilo.conf')
-depends=('device-mapper' 'coreutils')
-makedepends=('bin86' 'sharutils')
-optdepends=('perl: to use keytab-lilo')
-install=lilo.install
-options=('!makeflags')
-source=("http://lilo.alioth.debian.org/ftp/sources/${pkgname}-${pkgver}.tar.gz"
-        'lilo.conf')
-md5sums=('51b9b9db665d3b8724919e3d46054d12'
-         'd06b3c4655577ed01fea79ec5743b4b0')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  export LC_ALL=C
-  make all
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -D -m644 "${srcdir}/lilo.conf" "${pkgdir}/etc/lilo.conf"
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD
index 99c54a1b2..2ddc046b6 100644
--- a/libre/linux-libre-firmware/PKGBUILD
+++ b/libre/linux-libre-firmware/PKGBUILD
@@ -3,11 +3,12 @@
 
 pkgname=linux-libre-firmware
 pkgver=3.9
-pkgrel=1
+pkgrel=2
 pkgdesc='Free firmware files for Linux-libre'
 arch=('any')
-url='http://linux-libre.fsfla.org/'
+url=('http://linux-libre.fsfla.org/')
 license=('GPL2')
+depends=('ath9k-htc-firmware')
 provides=('linux-firmware'
           'kernel26-firmware=2.6.34.99')
 conflicts=('linux-firmware'
@@ -39,11 +40,20 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$pkgver-gnu/linux
 md5sums=('120df29f88622dabf7015a22c7cc8e25')
 
 package() {
+
+  # create firmware folder to put the free firmware files there
+  install -d -m755 $pkgdir/usr/lib/firmware
+
   cd $srcdir/linux-$pkgver
-  
+
+  # compile free firmware files  
   make INSTALL_FW_PATH=$pkgdir/usr/lib/firmware firmware_install
 
-  # move WHENCE file to linux-firmware license folder
+  # create licenses folder to put the licenses files there
   install -d -m755 $pkgdir/usr/share/licenses/$pkgname
-  mv firmware/WHENCE $pkgdir/usr/share/licenses/$pkgname
+
+  # move WHENCE file to linux-firmware license folder
+  cd $srcdir/linux-$pkgver
+  install -m644 firmware/WHENCE $pkgdir/usr/share/licenses/$pkgname
+
 }
diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD
index ec385c23a..56137aaf3 100644
--- a/libre/linux-libre-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-kmod-alx/PKGBUILD
@@ -1,12 +1,12 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
-_kernver=3.9.4
+_kernver=3.9.8
 _kernrel=1
 pkgname=('linux-libre-kmod-alx')
 _version=v3.9-rc4
 _pkgver=3.9-rc4-2-su
 pkgver=3.9rc4.2
-pkgrel=5
+pkgrel=9
 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel'
 arch=('i686' 'x86_64')
 url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx'
diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD
index 7c3e3ad47..740cb40fd 100644
--- a/libre/linux-libre-lts-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD
@@ -1,12 +1,12 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
-_kernver=3.0.80
+_kernver=3.0.83
 _kernrel=1
 pkgname=('linux-libre-lts-kmod-alx')
 _version=v3.9-rc4
 _pkgver=3.9-rc4-2-su
 pkgver=3.9rc4.2
-pkgrel=4
+pkgrel=7
 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel'
 arch=('i686' 'x86_64')
 url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx'
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index baab66b5c..434a922af 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -1,16 +1,17 @@
-# $Id: PKGBUILD 186439 2013-05-26 15:23:17Z tpowa $
+# $Id: PKGBUILD 189000 2013-06-28 06:57:30Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Contributor (Parabola): Jorge LÃpez <jorginho@lavabit.com>
+# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
 
 pkgbase=linux-libre-lts     # Build stock -LIBRE-LTS kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.0
-_sublevel=80
+_sublevel=84
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.80 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.83 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -32,9 +33,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'module-init-wait-3.0.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu1_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('f30a562307b6f71204370fcd33756466'
-         '6dfc33fc2587b36e2bf61ff1b26584c2'
-         'fe0e9b4415b82f306fc1b63eb9a742a4'
-         '69a689019ea0b6ed46b387907f14bc8a'
+         'a2ab5e3c758f35d0a2ffe33b23cfe04d'
+         '6ab0f1a509481d93117b7630105757cc'
+         '18dfa330a7da88d7c09c3e24a5cd608f'
          'c072b17032e80debc6a8626299245d46'
          '2967cecc3af9f954ccc822fd63dca6ff'
          '8267264d9a8966e57fdacd1fa1fc65c4'
@@ -44,7 +45,7 @@ md5sums=('f30a562307b6f71204370fcd33756466'
          'f36222e7ce20c8e4dc27376f9be60f6c'
          '670931649c60fcb3ef2e0119ed532bd4'
          '8a71abc4224f575008f974a099b5cf6f'
-         '7a0757288e0f61cbd91f7fc6b2bafb7b')
+         '1327df75d631529dcf29f46f474cf16d')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
@@ -204,14 +205,18 @@ _package() {
   # add vmlinux
   install -D -m644 vmlinux "${pkgdir}/usr/src/linux-${_kernver}/vmlinux"
 
-  # install fallback mkinitcpio.conf file and preset file for kernel
-  install -D -m644 "${srcdir}/${pkgbase}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
 
   # set correct depmod command for install
+  cp -f "${startdir}/${install}" "${startdir}/${install}.pkg"
+  true && install=${install}.pkg
   sed \
     -e  "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/" \
     -e  "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/" \
-    -i "${startdir}/${pkgbase}.install"
+    -i "${startdir}/${install}"
+
+  # install fallback mkinitcpio.conf file and preset file for kernel
+  install -D -m644 "${srcdir}/${pkgbase}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
+
   sed \
     -e "1s|'linux*.*'|'${pkgbase}'|" \
     -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgbase}\"|" \
diff --git a/libre/linux-libre-lts/config.i686 b/libre/linux-libre-lts/config.i686
index 849fd016b..a1d065a1a 100644
--- a/libre/linux-libre-lts/config.i686
+++ b/libre/linux-libre-lts/config.i686
@@ -1438,8 +1438,8 @@ CONFIG_OF_PCI=y
 CONFIG_PARPORT=m
 CONFIG_PARPORT_PC=m
 CONFIG_PARPORT_SERIAL=m
-CONFIG_PARPORT_PC_FIFO=y
-CONFIG_PARPORT_PC_SUPERIO=y
+# CONFIG_PARPORT_PC_FIFO is not set
+# CONFIG_PARPORT_PC_SUPERIO is not set
 CONFIG_PARPORT_PC_PCMCIA=m
 # CONFIG_PARPORT_GSC is not set
 CONFIG_PARPORT_AX88796=m
diff --git a/libre/linux-libre-lts/config.x86_64 b/libre/linux-libre-lts/config.x86_64
index fe5875138..a5dc36205 100644
--- a/libre/linux-libre-lts/config.x86_64
+++ b/libre/linux-libre-lts/config.x86_64
@@ -1381,8 +1381,8 @@ CONFIG_MTD_UBI_BEB_RESERVE=1
 CONFIG_PARPORT=m
 CONFIG_PARPORT_PC=m
 CONFIG_PARPORT_SERIAL=m
-CONFIG_PARPORT_PC_FIFO=y
-CONFIG_PARPORT_PC_SUPERIO=y
+# CONFIG_PARPORT_PC_FIFO is not set
+# CONFIG_PARPORT_PC_SUPERIO is not set
 CONFIG_PARPORT_PC_PCMCIA=m
 # CONFIG_PARPORT_GSC is not set
 CONFIG_PARPORT_AX88796=m
diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install
index 3c8ebbdae..7a4a271df 100644
--- a/libre/linux-libre-lts/linux-libre-lts.install
+++ b/libre/linux-libre-lts/linux-libre-lts.install
@@ -2,10 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-lts
-KERNEL_VERSION=3.0.80-1-LIBRE-LTS
-
-# set a sane PATH to ensure that critical utils like depmod will be found
-export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
+KERNEL_VERSION=
 
 post_install () {
   # updating module dependencies
@@ -15,40 +12,9 @@ post_install () {
     echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
     mkinitcpio -p linux-libre${KERNEL_NAME}
   fi
-
-  # compat symlinks for the official kernels only
-  if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-lts" ]; then
-    loaders="$(find /boot -name syslinux.cfg -or -name extlinux.conf -or -name grub.cfg -or -name menu.lst)"
-    [ -f /etc/lilo.conf ] && loaders="$loaders /etc/lilo.conf"
-    if [ -n "${loaders}" ] && grep -q -e vmlinuz26 -e kernel26.img -e kernel26-fallback.img $loaders; then
-      # add compat symlinks for the initramfs images
-      ln -sf initramfs-linux-libre${KERNEL_NAME}.img boot/kernel26${KERNEL_NAME}.img
-      ln -sf initramfs-linux-libre${KERNEL_NAME}-fallback.img \
-        boot/kernel26${KERNEL_NAME}-fallback.img
-      ln -sf vmlinuz-linux-libre${KERNEL_NAME} /boot/vmlinuz26${KERNEL_NAME}
-    fi
-  fi
 }
 
 post_upgrade() {
-  pacman -Q grub &>/dev/null
-  hasgrub=$?
-  pacman -Q grub-common &>/dev/null
-  hasgrub2=$?
-  pacman -Q lilo &>/dev/null
-  haslilo=$?
-  # reminder notices
-  if [ $haslilo -eq 0 ]; then
-    echo ">>>"
-    if [ $hasgrub -eq 0 -o $hasgrub2 -eq 0 ]; then
-      echo ">>> If you use the LILO bootloader, you should run 'lilo' before rebooting."
-    else
-      echo ">>> You appear to be using the LILO bootloader. You should run"
-      echo ">>> 'lilo' before rebooting."
-    fi
-    echo ">>>"
-  fi
-
   if findmnt --fstab -uno SOURCE /boot &>/dev/null && ! mountpoint -q /boot; then
     echo "WARNING: /boot appears to be a separate partition but is not mounted."
   fi
@@ -64,6 +30,6 @@ post_upgrade() {
 
 post_remove() {
   # also remove the compat symlinks
-  rm -f boot/{initramfs-linux-libre,kernel26}${KERNEL_NAME}.img
-  rm -f boot/{initramfs-linux-libre,kernel26}${KERNEL_NAME}-fallback.img
+  rm -f boot/initramfs-linux-libre${KERNEL_NAME}.img
+  rm -f boot/initramfs-linux-libre${KERNEL_NAME}-fallback.img
 }
diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index 85ba7dba7..54ac4b74f 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 91131 2013-05-19 23:48:35Z seblu $
+# $Id: PKGBUILD 93323 2013-07-01 22:56:01Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
@@ -9,11 +9,11 @@ pkgname=('linux-libre-tools-meta'
          'cpupower-libre'
          'x86_energy_perf_policy-libre'
          'usbip-libre')
-_basekernel=3.9
+_basekernel=3.10
 #_sublevel=6
 _pkgver=$_basekernel.$_sublevel
 pkgver=$_basekernel
-pkgrel=3
+pkgrel=1
 license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
 url='http://linux-libre.fsfla.org/'
@@ -34,13 +34,13 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$_basekernel-gnu/
         'cpupower.systemd'
         'cpupower.service'
         'usbipd.service')
-sha256sums=('62f113b4bd9ee832e8906da970c5bf4585c057af4eab14ec6ad57e9b2fd084ef'
+sha256sums=('abee814b92422cfa3df90b62ad9ba888697fcc03a713adc2c7f68e0d0c23c329'
             '4fa509949d6863d001075fa3e8671eff2599c046d20c98bb4a70778595cd1c3f'
             'fbf6e0ce6eb0ef15703fe212958de6ca46e62188900b5e9f9272ed3cc9cfd54e'
             'a89284d0ecb556ca53a66d1c2087b5fd6d0a901ab2769cd3aebb93f4478905dc'
             '2e187734d8aec58a3046d79883510d779aa93fb3ab20bd3132c1a607ebe5498f')
 
-build() {
+prepare() {
   # apply stable patching set
   if (( NOEXTRACT == 0 )) && [[ -e "$srcdir"/patch-$_basekernel-gnu-$_pkgver-gnu ]]; then
     msg2 'Applying stable patch set'
@@ -48,7 +48,9 @@ build() {
     patch -Np1 -i "$srcdir"/patch-$_basekernel-gnu-$_pkgver-gnu
     cd ..
   fi
+}
 
+build() {
   msg2 'Build libtraceevent-libre'
   pushd linux-$pkgver/tools/lib/traceevent
   make
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 76c1908f7..57539c3aa 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 186437 2013-05-26 15:22:24Z tpowa $
+# $Id: PKGBUILD 188998 2013-06-28 05:50:01Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
-# Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
-# Maintainer (Parabola): Sorin-Mihai Vârgolici <smv@yobicore.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
-# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Contributor (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
+# Contributor (Parabola): Sorin-Mihai Vârgolici <smv@yobicore.org>
+# Contributor (Parabola): Michał Masłowski <mtjm@mtjm.eu>
+# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
 
 pkgbase=linux-libre         # Build stock -LIBRE kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.9
-_sublevel=4
+_sublevel=8
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.4 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.8 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -31,15 +31,15 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'change-default-console-loglevel.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('120df29f88622dabf7015a22c7cc8e25'
-         'ae8a4997bfa4a6b9acfd0cefbb6e9aa0'
-         'b0bc969b9e8c1767b16cdc0504a7bad7'
-         '42dfd3a3702433b68c079d6b3fd13c3c'
+         'b628d7ff09667dc5546993bb83461d45'
+         '5bb868d38a27edafac1eb114cd2f3659'
+         'c180de34b0450d7eef8e0c1a68433d7c'
          'e49ac236dfeef709f91a3d993ea7b62c'
          '2967cecc3af9f954ccc822fd63dca6ff'
          '8267264d9a8966e57fdacd1fa1fc65c4'
          '04b21c79df0a952c22d681dd4f4562df'
          'f3def2cefdcbb954c21d8505d23cc83c'
-         '846eb5948403dd0f2f02c50d3acb69c3')
+         '30092ce96affb12f89a9eddfad966741')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
@@ -181,14 +181,16 @@ _package() {
   # add vmlinux
   install -D -m644 vmlinux "${pkgdir}/usr/src/linux-${_kernver}/vmlinux"
 
-  # install fallback mkinitcpio.conf file and preset file for kernel
-  install -D -m644 "${srcdir}/${pkgbase}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
-
   # set correct depmod command for install
+  cp -f "${startdir}/${install}" "${startdir}/${install}.pkg"
+  true && install=${install}.pkg
   sed \
     -e  "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/" \
     -e  "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/" \
-    -i "${startdir}/${pkgbase}.install"
+    -i "${startdir}/${install}"
+
+  # install mkinitcpio preset file for kernel
+  install -D -m644 "${srcdir}/${pkgbase}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
   sed \
     -e "1s|'linux*.*'|'${pkgbase}'|" \
     -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgbase}\"|" \
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index 107968129..e84812997 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.9.3-1 Kernel Configuration
+# Linux/x86 3.9.7-1 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -1581,8 +1581,8 @@ CONFIG_OF_MTD=y
 CONFIG_PARPORT=m
 CONFIG_PARPORT_PC=m
 CONFIG_PARPORT_SERIAL=m
-CONFIG_PARPORT_PC_FIFO=y
-CONFIG_PARPORT_PC_SUPERIO=y
+# CONFIG_PARPORT_PC_FIFO is not set
+# CONFIG_PARPORT_PC_SUPERIO is not set
 CONFIG_PARPORT_PC_PCMCIA=m
 # CONFIG_PARPORT_GSC is not set
 CONFIG_PARPORT_AX88796=m
@@ -2434,7 +2434,7 @@ CONFIG_ATH9K=m
 CONFIG_ATH9K_PCI=y
 CONFIG_ATH9K_AHB=y
 # CONFIG_ATH9K_DEBUGFS is not set
-CONFIG_ATH9K_RATE_CONTROL=y
+# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set
 CONFIG_ATH9K_HTC=m
 # CONFIG_ATH9K_HTC_DEBUGFS is not set
 CONFIG_CARL9170=m
@@ -4709,7 +4709,6 @@ CONFIG_USB_MUSB_TUSB6010=m
 CONFIG_MUSB_PIO_ONLY=y
 CONFIG_USB_CHIPIDEA=m
 CONFIG_USB_CHIPIDEA_UDC=y
-CONFIG_USB_CHIPIDEA_HOST=y
 # CONFIG_USB_CHIPIDEA_DEBUG is not set
 CONFIG_USB_RENESAS_USBHS=m
 
@@ -6022,7 +6021,7 @@ CONFIG_SECURITY_TOMOYO=y
 CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
 CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
 # CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
-CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init"
+CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/usr/bin/tomoyo-init"
 CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd"
 CONFIG_SECURITY_APPARMOR=y
 CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0
diff --git a/libre/linux-libre/config.i686.3.10 b/libre/linux-libre/config.i686.3.10
new file mode 100644
index 000000000..9eaa84b4f
--- /dev/null
+++ b/libre/linux-libre/config.i686.3.10
@@ -0,0 +1,6325 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Linux/x86 3.10.0-rc7 Kernel Configuration
+#
+# CONFIG_64BIT is not set
+CONFIG_X86_32=y
+CONFIG_X86=y
+CONFIG_INSTRUCTION_DECODER=y
+CONFIG_OUTPUT_FORMAT="elf32-i386"
+CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+CONFIG_MMU=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_NEED_SG_DMA_LENGTH=y
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ARCH_HAS_CPU_RELAX=y
+CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+CONFIG_ARCH_HAS_CPU_AUTOPROBE=y
+CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
+CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+# CONFIG_ZONE_DMA32 is not set
+# CONFIG_AUDIT_ARCH is not set
+CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_HAVE_INTEL_TXT=y
+CONFIG_X86_32_SMP=y
+CONFIG_X86_HT=y
+CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
+CONFIG_ARCH_CPU_PROBE_RELEASE=y
+CONFIG_ARCH_SUPPORTS_UPROBES=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_IRQ_WORK=y
+CONFIG_BUILDTIME_EXTABLE_SORT=y
+
+#
+# General setup
+#
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_CROSS_COMPILE=""
+CONFIG_LOCALVERSION="-LIBRE"
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_BZIP2=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_XZ=y
+CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_KERNEL_GZIP=y
+# CONFIG_KERNEL_BZIP2 is not set
+# CONFIG_KERNEL_LZMA is not set
+# CONFIG_KERNEL_XZ is not set
+# CONFIG_KERNEL_LZO is not set
+CONFIG_DEFAULT_HOSTNAME="(none)"
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_FHANDLE=y
+CONFIG_AUDIT=y
+CONFIG_AUDITSYSCALL=y
+CONFIG_AUDIT_WATCH=y
+CONFIG_AUDIT_TREE=y
+CONFIG_AUDIT_LOGINUID_IMMUTABLE=y
+CONFIG_HAVE_GENERIC_HARDIRQS=y
+
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_PENDING_IRQ=y
+CONFIG_IRQ_DOMAIN=y
+# CONFIG_IRQ_DOMAIN_DEBUG is not set
+CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_SPARSE_IRQ=y
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_KTIME_SCALAR=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+
+#
+# Timers subsystem
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ_COMMON=y
+# CONFIG_HZ_PERIODIC is not set
+CONFIG_NO_HZ_IDLE=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+
+#
+# CPU/Task time and stats accounting
+#
+CONFIG_TICK_CPU_ACCOUNTING=y
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_PREEMPT_RCU=y
+CONFIG_PREEMPT_RCU=y
+CONFIG_RCU_STALL_COMMON=y
+CONFIG_RCU_FANOUT=32
+CONFIG_RCU_FANOUT_LEAF=16
+# CONFIG_RCU_FANOUT_EXACT is not set
+CONFIG_RCU_FAST_NO_HZ=y
+# CONFIG_TREE_RCU_TRACE is not set
+# CONFIG_RCU_BOOST is not set
+CONFIG_RCU_NOCB_CPU=y
+CONFIG_RCU_NOCB_CPU_NONE=y
+# CONFIG_RCU_NOCB_CPU_ZERO is not set
+# CONFIG_RCU_NOCB_CPU_ALL is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=19
+CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
+CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=y
+CONFIG_CGROUPS=y
+# CONFIG_CGROUP_DEBUG is not set
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_RESOURCE_COUNTERS=y
+CONFIG_MEMCG=y
+CONFIG_MEMCG_SWAP=y
+# CONFIG_MEMCG_SWAP_ENABLED is not set
+CONFIG_MEMCG_KMEM=y
+# CONFIG_CGROUP_HUGETLB is not set
+# CONFIG_CGROUP_PERF is not set
+CONFIG_CGROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_CFS_BANDWIDTH=y
+CONFIG_RT_GROUP_SCHED=y
+CONFIG_BLK_CGROUP=y
+# CONFIG_DEBUG_BLK_CGROUP is not set
+# CONFIG_CHECKPOINT_RESTORE is not set
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_IPC_NS=y
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
+CONFIG_SCHED_AUTOGROUP=y
+CONFIG_MM_OWNER=y
+# CONFIG_SYSFS_DEPRECATED is not set
+CONFIG_RELAY=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_XZ=y
+CONFIG_RD_LZO=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
+CONFIG_HAVE_UID16=y
+CONFIG_SYSCTL_EXCEPTION_TRACE=y
+CONFIG_HOTPLUG=y
+CONFIG_HAVE_PCSPKR_PLATFORM=y
+# CONFIG_EXPERT is not set
+CONFIG_UID16=y
+# CONFIG_SYSCTL_SYSCALL is not set
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_PCSPKR_PLATFORM=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_PCI_QUIRKS=y
+# CONFIG_EMBEDDED is not set
+CONFIG_HAVE_PERF_EVENTS=y
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_PERF_EVENTS=y
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLUB_DEBUG=y
+# CONFIG_COMPAT_BRK is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+CONFIG_PROFILING=y
+CONFIG_TRACEPOINTS=y
+CONFIG_OPROFILE=m
+# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
+CONFIG_HAVE_OPROFILE=y
+CONFIG_OPROFILE_NMI_TIMER=y
+CONFIG_KPROBES=y
+CONFIG_JUMP_LABEL=y
+CONFIG_KPROBES_ON_FTRACE=y
+CONFIG_UPROBES=y
+# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_ARCH_USE_BUILTIN_BSWAP=y
+CONFIG_KRETPROBES=y
+CONFIG_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_IOREMAP_PROT=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_OPTPROBES=y
+CONFIG_HAVE_KPROBES_ON_FTRACE=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_HAVE_DMA_CONTIGUOUS=y
+CONFIG_USE_GENERIC_SMP_HELPERS=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
+CONFIG_HAVE_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_PERF_EVENTS_NMI=y
+CONFIG_HAVE_PERF_REGS=y
+CONFIG_HAVE_PERF_USER_STACK_DUMP=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
+CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
+CONFIG_HAVE_CMPXCHG_LOCAL=y
+CONFIG_HAVE_CMPXCHG_DOUBLE=y
+CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP_FILTER=y
+CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+CONFIG_MODULES_USE_ELF_REL=y
+CONFIG_CLONE_BACKWARDS=y
+CONFIG_OLD_SIGSUSPEND3=y
+CONFIG_OLD_SIGACTION=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+CONFIG_HAVE_GENERIC_DMA_COHERENT=y
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+CONFIG_MODULE_FORCE_LOAD=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_MODVERSIONS=y
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+# CONFIG_MODULE_SIG is not set
+CONFIG_STOP_MACHINE=y
+CONFIG_BLOCK=y
+CONFIG_LBDAF=y
+CONFIG_BLK_DEV_BSG=y
+CONFIG_BLK_DEV_BSGLIB=y
+# CONFIG_BLK_DEV_INTEGRITY is not set
+CONFIG_BLK_DEV_THROTTLING=y
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+CONFIG_MAC_PARTITION=y
+CONFIG_MSDOS_PARTITION=y
+CONFIG_BSD_DISKLABEL=y
+CONFIG_MINIX_SUBPARTITION=y
+CONFIG_SOLARIS_X86_PARTITION=y
+# CONFIG_UNIXWARE_DISKLABEL is not set
+CONFIG_LDM_PARTITION=y
+# CONFIG_LDM_DEBUG is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+CONFIG_KARMA_PARTITION=y
+CONFIG_EFI_PARTITION=y
+# CONFIG_SYSV68_PARTITION is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+CONFIG_CFQ_GROUP_IOSCHED=y
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_PREEMPT_NOTIFIERS=y
+CONFIG_PADATA=y
+CONFIG_ASN1=m
+CONFIG_UNINLINE_SPIN_UNLOCK=y
+CONFIG_FREEZER=y
+
+#
+# Processor type and features
+#
+CONFIG_ZONE_DMA=y
+CONFIG_SMP=y
+CONFIG_X86_MPPARSE=y
+# CONFIG_X86_BIGSMP is not set
+# CONFIG_X86_EXTENDED_PLATFORM is not set
+# CONFIG_X86_GOLDFISH is not set
+# CONFIG_X86_INTEL_LPSS is not set
+CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_X86_32_IRIS=m
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
+CONFIG_HYPERVISOR_GUEST=y
+CONFIG_PARAVIRT=y
+# CONFIG_PARAVIRT_DEBUG is not set
+# CONFIG_PARAVIRT_SPINLOCKS is not set
+# CONFIG_XEN_PRIVILEGED_GUEST is not set
+CONFIG_KVM_GUEST=y
+CONFIG_LGUEST_GUEST=y
+CONFIG_PARAVIRT_TIME_ACCOUNTING=y
+CONFIG_PARAVIRT_CLOCK=y
+CONFIG_NO_BOOTMEM=y
+# CONFIG_MEMTEST is not set
+# CONFIG_M486 is not set
+# CONFIG_M586 is not set
+# CONFIG_M586TSC is not set
+# CONFIG_M586MMX is not set
+CONFIG_M686=y
+# CONFIG_MPENTIUMII is not set
+# CONFIG_MPENTIUMIII is not set
+# CONFIG_MPENTIUMM is not set
+# CONFIG_MPENTIUM4 is not set
+# CONFIG_MK6 is not set
+# CONFIG_MK7 is not set
+# CONFIG_MK8 is not set
+# CONFIG_MCRUSOE is not set
+# CONFIG_MEFFICEON is not set
+# CONFIG_MWINCHIPC6 is not set
+# CONFIG_MWINCHIP3D is not set
+# CONFIG_MELAN is not set
+# CONFIG_MGEODEGX1 is not set
+# CONFIG_MGEODE_LX is not set
+# CONFIG_MCYRIXIII is not set
+# CONFIG_MVIAC3_2 is not set
+# CONFIG_MVIAC7 is not set
+# CONFIG_MCORE2 is not set
+# CONFIG_MATOM is not set
+CONFIG_X86_GENERIC=y
+CONFIG_X86_INTERNODE_CACHE_SHIFT=6
+CONFIG_X86_L1_CACHE_SHIFT=6
+# CONFIG_X86_PPRO_FENCE is not set
+CONFIG_X86_INTEL_USERCOPY=y
+CONFIG_X86_USE_PPRO_CHECKSUM=y
+CONFIG_X86_TSC=y
+CONFIG_X86_CMPXCHG64=y
+CONFIG_X86_CMOV=y
+CONFIG_X86_MINIMUM_CPU_FAMILY=5
+CONFIG_X86_DEBUGCTLMSR=y
+CONFIG_CPU_SUP_INTEL=y
+CONFIG_CPU_SUP_AMD=y
+CONFIG_CPU_SUP_CENTAUR=y
+CONFIG_CPU_SUP_TRANSMETA_32=y
+CONFIG_HPET_TIMER=y
+CONFIG_HPET_EMULATE_RTC=y
+CONFIG_DMI=y
+CONFIG_NR_CPUS=8
+CONFIG_SCHED_SMT=y
+CONFIG_SCHED_MC=y
+# CONFIG_PREEMPT_NONE is not set
+# CONFIG_PREEMPT_VOLUNTARY is not set
+CONFIG_PREEMPT=y
+CONFIG_PREEMPT_COUNT=y
+CONFIG_X86_LOCAL_APIC=y
+CONFIG_X86_IO_APIC=y
+CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
+CONFIG_X86_MCE=y
+CONFIG_X86_MCE_INTEL=y
+CONFIG_X86_MCE_AMD=y
+# CONFIG_X86_ANCIENT_MCE is not set
+CONFIG_X86_MCE_THRESHOLD=y
+# CONFIG_X86_MCE_INJECT is not set
+CONFIG_X86_THERMAL_VECTOR=y
+CONFIG_VM86=y
+CONFIG_TOSHIBA=m
+CONFIG_I8K=m
+CONFIG_X86_REBOOTFIXUPS=y
+CONFIG_MICROCODE=m
+# CONFIG_MICROCODE_INTEL is not set
+# CONFIG_MICROCODE_AMD is not set
+CONFIG_MICROCODE_OLD_INTERFACE=y
+CONFIG_X86_MSR=m
+CONFIG_X86_CPUID=m
+# CONFIG_NOHIGHMEM is not set
+CONFIG_HIGHMEM4G=y
+# CONFIG_HIGHMEM64G is not set
+CONFIG_PAGE_OFFSET=0xC0000000
+CONFIG_HIGHMEM=y
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ILLEGAL_POINTER_VALUE=0
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_SPARSEMEM_STATIC=y
+CONFIG_HAVE_MEMBLOCK=y
+CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
+CONFIG_ARCH_DISCARD_MEMBLOCK=y
+CONFIG_MEMORY_ISOLATION=y
+# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_BALLOON_COMPACTION=y
+CONFIG_COMPACTION=y
+CONFIG_MIGRATION=y
+# CONFIG_PHYS_ADDR_T_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_MMU_NOTIFIER=y
+CONFIG_KSM=y
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_MEMORY_FAILURE=y
+CONFIG_HWPOISON_INJECT=m
+CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
+# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
+CONFIG_CROSS_MEMORY_ATTACH=y
+CONFIG_CLEANCACHE=y
+CONFIG_FRONTSWAP=y
+# CONFIG_HIGHPTE is not set
+CONFIG_X86_CHECK_BIOS_CORRUPTION=y
+CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
+CONFIG_X86_RESERVE_LOW=64
+# CONFIG_MATH_EMULATION is not set
+CONFIG_MTRR=y
+CONFIG_MTRR_SANITIZER=y
+CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
+CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
+CONFIG_X86_PAT=y
+CONFIG_ARCH_USES_PG_UNCACHED=y
+CONFIG_ARCH_RANDOM=y
+CONFIG_X86_SMAP=y
+CONFIG_EFI=y
+CONFIG_EFI_STUB=y
+CONFIG_SECCOMP=y
+CONFIG_CC_STACKPROTECTOR=y
+# CONFIG_HZ_100 is not set
+# CONFIG_HZ_250 is not set
+CONFIG_HZ_300=y
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=300
+CONFIG_SCHED_HRTICK=y
+CONFIG_KEXEC=y
+# CONFIG_CRASH_DUMP is not set
+# CONFIG_KEXEC_JUMP is not set
+CONFIG_PHYSICAL_START=0x1000000
+CONFIG_RELOCATABLE=y
+CONFIG_X86_NEED_RELOCS=y
+CONFIG_PHYSICAL_ALIGN=0x100000
+CONFIG_HOTPLUG_CPU=y
+# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
+# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
+# CONFIG_COMPAT_VDSO is not set
+# CONFIG_CMDLINE_BOOL is not set
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+
+#
+# Power management and ACPI options
+#
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+CONFIG_HIBERNATE_CALLBACKS=y
+CONFIG_HIBERNATION=y
+CONFIG_PM_STD_PARTITION=""
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_SMP=y
+CONFIG_PM_AUTOSLEEP=y
+CONFIG_PM_WAKELOCKS=y
+CONFIG_PM_WAKELOCKS_LIMIT=100
+CONFIG_PM_WAKELOCKS_GC=y
+CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
+CONFIG_PM_DEBUG=y
+CONFIG_PM_ADVANCED_DEBUG=y
+# CONFIG_PM_TEST_SUSPEND is not set
+CONFIG_PM_SLEEP_DEBUG=y
+CONFIG_PM_TRACE=y
+CONFIG_PM_TRACE_RTC=y
+CONFIG_ACPI=y
+CONFIG_ACPI_SLEEP=y
+# CONFIG_ACPI_PROCFS is not set
+# CONFIG_ACPI_PROCFS_POWER is not set
+CONFIG_ACPI_EC_DEBUGFS=m
+# CONFIG_ACPI_PROC_EVENT is not set
+CONFIG_ACPI_AC=m
+CONFIG_ACPI_BATTERY=m
+CONFIG_ACPI_BUTTON=m
+CONFIG_ACPI_VIDEO=m
+CONFIG_ACPI_FAN=m
+CONFIG_ACPI_DOCK=y
+CONFIG_ACPI_I2C=m
+CONFIG_ACPI_PROCESSOR=m
+CONFIG_ACPI_IPMI=m
+CONFIG_ACPI_HOTPLUG_CPU=y
+CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
+CONFIG_ACPI_THERMAL=m
+# CONFIG_ACPI_CUSTOM_DSDT is not set
+CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y
+CONFIG_ACPI_BLACKLIST_YEAR=0
+# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_PCI_SLOT=y
+CONFIG_X86_PM_TIMER=y
+CONFIG_ACPI_CONTAINER=y
+CONFIG_ACPI_SBS=m
+CONFIG_ACPI_HED=y
+CONFIG_ACPI_CUSTOM_METHOD=m
+CONFIG_ACPI_BGRT=y
+CONFIG_ACPI_APEI=y
+CONFIG_ACPI_APEI_GHES=y
+CONFIG_ACPI_APEI_PCIEAER=y
+CONFIG_ACPI_APEI_MEMORY_FAILURE=y
+CONFIG_ACPI_APEI_EINJ=m
+CONFIG_ACPI_APEI_ERST_DEBUG=m
+CONFIG_SFI=y
+CONFIG_X86_APM_BOOT=y
+CONFIG_APM=y
+# CONFIG_APM_IGNORE_USER_SUSPEND is not set
+CONFIG_APM_DO_ENABLE=y
+# CONFIG_APM_CPU_IDLE is not set
+# CONFIG_APM_DISPLAY_BLANK is not set
+# CONFIG_APM_ALLOW_INTS is not set
+
+#
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_TABLE=y
+CONFIG_CPU_FREQ_GOV_COMMON=y
+CONFIG_CPU_FREQ_STAT=m
+CONFIG_CPU_FREQ_STAT_DETAILS=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+
+#
+# x86 CPU frequency scaling drivers
+#
+CONFIG_X86_INTEL_PSTATE=y
+CONFIG_X86_PCC_CPUFREQ=m
+CONFIG_X86_ACPI_CPUFREQ=m
+CONFIG_X86_ACPI_CPUFREQ_CPB=y
+CONFIG_X86_POWERNOW_K6=m
+CONFIG_X86_POWERNOW_K7=m
+CONFIG_X86_POWERNOW_K7_ACPI=y
+CONFIG_X86_POWERNOW_K8=m
+CONFIG_X86_AMD_FREQ_SENSITIVITY=m
+CONFIG_X86_GX_SUSPMOD=m
+# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
+CONFIG_X86_SPEEDSTEP_ICH=m
+CONFIG_X86_SPEEDSTEP_SMI=m
+CONFIG_X86_P4_CLOCKMOD=m
+CONFIG_X86_CPUFREQ_NFORCE2=m
+CONFIG_X86_LONGRUN=m
+CONFIG_X86_LONGHAUL=m
+CONFIG_X86_E_POWERSAVER=m
+
+#
+# shared options
+#
+CONFIG_X86_SPEEDSTEP_LIB=m
+CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y
+CONFIG_CPU_IDLE=y
+# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_MENU=y
+# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
+CONFIG_INTEL_IDLE=y
+
+#
+# Bus options (PCI etc.)
+#
+CONFIG_PCI=y
+# CONFIG_PCI_GOBIOS is not set
+# CONFIG_PCI_GOMMCONFIG is not set
+# CONFIG_PCI_GODIRECT is not set
+# CONFIG_PCI_GOOLPC is not set
+CONFIG_PCI_GOANY=y
+CONFIG_PCI_BIOS=y
+CONFIG_PCI_DIRECT=y
+CONFIG_PCI_MMCONFIG=y
+CONFIG_PCI_OLPC=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_HOTPLUG_PCI_PCIE=m
+CONFIG_PCIEAER=y
+# CONFIG_PCIE_ECRC is not set
+# CONFIG_PCIEAER_INJECT is not set
+CONFIG_PCIEASPM=y
+# CONFIG_PCIEASPM_DEBUG is not set
+CONFIG_PCIEASPM_DEFAULT=y
+# CONFIG_PCIEASPM_POWERSAVE is not set
+# CONFIG_PCIEASPM_PERFORMANCE is not set
+CONFIG_PCIE_PME=y
+CONFIG_ARCH_SUPPORTS_MSI=y
+CONFIG_PCI_MSI=y
+# CONFIG_PCI_DEBUG is not set
+CONFIG_PCI_REALLOC_ENABLE_AUTO=y
+CONFIG_PCI_STUB=m
+CONFIG_HT_IRQ=y
+CONFIG_PCI_ATS=y
+CONFIG_PCI_IOV=y
+CONFIG_PCI_PRI=y
+CONFIG_PCI_PASID=y
+CONFIG_PCI_IOAPIC=y
+CONFIG_PCI_LABEL=y
+CONFIG_ISA_DMA_API=y
+CONFIG_ISA=y
+# CONFIG_EISA is not set
+# CONFIG_SCx200 is not set
+CONFIG_OLPC=y
+CONFIG_OLPC_XO1_PM=y
+CONFIG_OLPC_XO1_RTC=y
+CONFIG_OLPC_XO1_SCI=y
+CONFIG_OLPC_XO15_SCI=y
+# CONFIG_ALIX is not set
+# CONFIG_NET5501 is not set
+# CONFIG_GEOS is not set
+CONFIG_AMD_NB=y
+CONFIG_PCCARD=m
+CONFIG_PCMCIA=m
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_CARDBUS=y
+
+#
+# PC-card bridges
+#
+CONFIG_YENTA=m
+CONFIG_YENTA_O2=y
+CONFIG_YENTA_RICOH=y
+CONFIG_YENTA_TI=y
+CONFIG_YENTA_ENE_TUNE=y
+CONFIG_YENTA_TOSHIBA=y
+CONFIG_PD6729=m
+CONFIG_I82092=m
+CONFIG_I82365=m
+CONFIG_TCIC=m
+CONFIG_PCMCIA_PROBE=y
+CONFIG_PCCARD_NONSTATIC=y
+CONFIG_HOTPLUG_PCI=m
+CONFIG_HOTPLUG_PCI_COMPAQ=m
+# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
+CONFIG_HOTPLUG_PCI_IBM=m
+CONFIG_HOTPLUG_PCI_CPCI=y
+CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
+CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
+CONFIG_HOTPLUG_PCI_SHPC=m
+CONFIG_RAPIDIO=y
+CONFIG_RAPIDIO_TSI721=y
+CONFIG_RAPIDIO_DISC_TIMEOUT=30
+# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set
+CONFIG_RAPIDIO_DMA_ENGINE=y
+CONFIG_RAPIDIO_DEBUG=y
+CONFIG_RAPIDIO_ENUM_BASIC=m
+CONFIG_RAPIDIO_TSI57X=y
+CONFIG_RAPIDIO_CPS_XX=y
+CONFIG_RAPIDIO_TSI568=y
+CONFIG_RAPIDIO_CPS_GEN2=y
+CONFIG_RAPIDIO_TSI500=y
+
+#
+# Executable file formats / Emulations
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_BINFMT_SCRIPT=y
+CONFIG_HAVE_AOUT=y
+CONFIG_BINFMT_AOUT=m
+CONFIG_BINFMT_MISC=y
+CONFIG_COREDUMP=y
+CONFIG_HAVE_ATOMIC_IOMAP=y
+CONFIG_HAVE_TEXT_POKE_SMP=y
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_PACKET_DIAG=m
+CONFIG_UNIX=y
+CONFIG_UNIX_DIAG=m
+CONFIG_XFRM=y
+CONFIG_XFRM_ALGO=m
+CONFIG_XFRM_USER=m
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_IPCOMP=m
+CONFIG_NET_KEY=m
+# CONFIG_NET_KEY_MIGRATE is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_FIB_TRIE_STATS=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_ROUTE_CLASSID=y
+# CONFIG_IP_PNP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IP_TUNNEL=m
+CONFIG_NET_IPGRE=m
+# CONFIG_NET_IPGRE_BROADCAST is not set
+CONFIG_IP_MROUTE=y
+# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_ARPD=y
+CONFIG_SYN_COOKIES=y
+CONFIG_NET_IPVTI=m
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_INET_XFRM_MODE_BEET=m
+CONFIG_INET_LRO=y
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+CONFIG_INET_UDP_DIAG=m
+CONFIG_TCP_CONG_ADVANCED=y
+CONFIG_TCP_CONG_BIC=m
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_TCP_CONG_WESTWOOD=m
+CONFIG_TCP_CONG_HTCP=m
+CONFIG_TCP_CONG_HSTCP=m
+CONFIG_TCP_CONG_HYBLA=m
+CONFIG_TCP_CONG_VEGAS=m
+CONFIG_TCP_CONG_SCALABLE=m
+CONFIG_TCP_CONG_LP=m
+CONFIG_TCP_CONG_VENO=m
+CONFIG_TCP_CONG_YEAH=m
+CONFIG_TCP_CONG_ILLINOIS=m
+CONFIG_DEFAULT_CUBIC=y
+# CONFIG_DEFAULT_RENO is not set
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+CONFIG_IPV6=y
+CONFIG_IPV6_PRIVACY=y
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_IPV6_OPTIMISTIC_DAD=y
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_SIT_6RD=y
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_GRE=m
+CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_IPV6_SUBTREES=y
+# CONFIG_IPV6_MROUTE is not set
+CONFIG_NETLABEL=y
+CONFIG_NETWORK_SECMARK=y
+CONFIG_NETWORK_PHY_TIMESTAMPING=y
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_ACCT=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_SECMARK=y
+CONFIG_NF_CONNTRACK_ZONES=y
+CONFIG_NF_CONNTRACK_PROCFS=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_TIMEOUT=y
+CONFIG_NF_CONNTRACK_TIMESTAMP=y
+CONFIG_NF_CONNTRACK_LABELS=y
+CONFIG_NF_CT_PROTO_DCCP=m
+CONFIG_NF_CT_PROTO_GRE=m
+CONFIG_NF_CT_PROTO_SCTP=m
+CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_BROADCAST=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NF_CT_NETLINK_TIMEOUT=m
+CONFIG_NF_CT_NETLINK_HELPER=m
+CONFIG_NETFILTER_NETLINK_QUEUE_CT=y
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_NF_NAT_PROTO_DCCP=m
+CONFIG_NF_NAT_PROTO_UDPLITE=m
+CONFIG_NF_NAT_PROTO_SCTP=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NETFILTER_TPROXY=m
+CONFIG_NETFILTER_XTABLES=m
+
+#
+# Xtables combined modules
+#
+CONFIG_NETFILTER_XT_MARK=m
+CONFIG_NETFILTER_XT_CONNMARK=m
+CONFIG_NETFILTER_XT_SET=m
+
+#
+# Xtables targets
+#
+CONFIG_NETFILTER_XT_TARGET_AUDIT=m
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_HMARK=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
+CONFIG_NETFILTER_XT_TARGET_LOG=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NETMAP=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+
+#
+# Xtables matches
+#
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_BPF=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_CPU=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ECN=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_HL=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_IP_SET=m
+CONFIG_IP_SET_MAX=256
+CONFIG_IP_SET_BITMAP_IP=m
+CONFIG_IP_SET_BITMAP_IPMAC=m
+CONFIG_IP_SET_BITMAP_PORT=m
+CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPPORT=m
+CONFIG_IP_SET_HASH_IPPORTIP=m
+CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_HASH_NETIFACE=m
+CONFIG_IP_SET_LIST_SET=m
+CONFIG_IP_VS=m
+# CONFIG_IP_VS_IPV6 is not set
+# CONFIG_IP_VS_DEBUG is not set
+CONFIG_IP_VS_TAB_BITS=12
+
+#
+# IPVS transport protocol load balancing support
+#
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_AH_ESP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+CONFIG_IP_VS_PROTO_SCTP=y
+
+#
+# IPVS scheduler
+#
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+
+#
+# IPVS SH scheduler
+#
+CONFIG_IP_VS_SH_TAB_BITS=8
+
+#
+# IPVS application helper
+#
+CONFIG_IP_VS_FTP=m
+CONFIG_IP_VS_NFCT=y
+CONFIG_IP_VS_PE_SIP=m
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_CONNTRACK_IPV4=m
+# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_RPFILTER=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_NF_NAT_IPV4=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PROTO_GRE=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_SECURITY=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV6=m
+CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RPFILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_SECURITY=m
+CONFIG_NF_NAT_IPV6=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+CONFIG_IP6_NF_TARGET_NPT=m
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_ULOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+CONFIG_IP_DCCP=m
+CONFIG_INET_DCCP_DIAG=m
+
+#
+# DCCP CCIDs Configuration
+#
+# CONFIG_IP_DCCP_CCID2_DEBUG is not set
+CONFIG_IP_DCCP_CCID3=y
+# CONFIG_IP_DCCP_CCID3_DEBUG is not set
+CONFIG_IP_DCCP_TFRC_LIB=y
+
+#
+# DCCP Kernel Hacking
+#
+# CONFIG_IP_DCCP_DEBUG is not set
+CONFIG_NET_DCCPPROBE=m
+CONFIG_IP_SCTP=m
+CONFIG_NET_SCTPPROBE=m
+# CONFIG_SCTP_DBG_MSG is not set
+# CONFIG_SCTP_DBG_OBJCNT is not set
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
+CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
+CONFIG_SCTP_COOKIE_HMAC_MD5=y
+CONFIG_SCTP_COOKIE_HMAC_SHA1=y
+# CONFIG_RDS is not set
+# CONFIG_TIPC is not set
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+# CONFIG_ATM_CLIP_NO_ICMP is not set
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+# CONFIG_ATM_BR2684_IPFILTER is not set
+CONFIG_L2TP=m
+# CONFIG_L2TP_DEBUGFS is not set
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+CONFIG_STP=m
+CONFIG_MRP=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_IGMP_SNOOPING=y
+CONFIG_BRIDGE_VLAN_FILTERING=y
+CONFIG_HAVE_NET_DSA=y
+CONFIG_NET_DSA=m
+CONFIG_NET_DSA_TAG_DSA=y
+CONFIG_NET_DSA_TAG_EDSA=y
+CONFIG_NET_DSA_TAG_TRAILER=y
+CONFIG_VLAN_8021Q=m
+# CONFIG_VLAN_8021Q_GVRP is not set
+CONFIG_VLAN_8021Q_MVRP=y
+# CONFIG_DECNET is not set
+CONFIG_LLC=m
+CONFIG_LLC2=m
+CONFIG_IPX=m
+# CONFIG_IPX_INTERN is not set
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=m
+CONFIG_LTPC=m
+CONFIG_COPS=m
+CONFIG_COPS_DAYNA=y
+CONFIG_COPS_TANGENT=y
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+CONFIG_PHONET=m
+CONFIG_IEEE802154=m
+CONFIG_IEEE802154_6LOWPAN=m
+CONFIG_MAC802154=m
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_ATM=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFB=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_MQPRIO=m
+CONFIG_NET_SCH_CHOKE=m
+CONFIG_NET_SCH_QFQ=m
+CONFIG_NET_SCH_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_SCH_PLUG=m
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+# CONFIG_CLS_U32_PERF is not set
+# CONFIG_CLS_U32_MARK is not set
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_CLS_CGROUP=y
+# CONFIG_NET_EMATCH is not set
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=m
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_CLS_IND=y
+CONFIG_NET_SCH_FIFO=y
+# CONFIG_DCB is not set
+CONFIG_DNS_RESOLVER=y
+CONFIG_BATMAN_ADV=m
+CONFIG_BATMAN_ADV_BLA=y
+CONFIG_BATMAN_ADV_DAT=y
+CONFIG_BATMAN_ADV_NC=y
+# CONFIG_BATMAN_ADV_DEBUG is not set
+CONFIG_OPENVSWITCH=m
+CONFIG_VSOCKETS=m
+CONFIG_VMWARE_VMCI_VSOCKETS=m
+CONFIG_NETLINK_MMAP=y
+CONFIG_NETLINK_DIAG=m
+CONFIG_RPS=y
+CONFIG_RFS_ACCEL=y
+CONFIG_XPS=y
+CONFIG_NETPRIO_CGROUP=m
+CONFIG_BQL=y
+
+#
+# Network testing
+#
+CONFIG_NET_PKTGEN=m
+CONFIG_NET_TCPPROBE=m
+CONFIG_NET_DROP_MONITOR=y
+CONFIG_HAMRADIO=y
+
+#
+# Packet Radio protocols
+#
+CONFIG_AX25=m
+CONFIG_AX25_DAMA_SLAVE=y
+CONFIG_NETROM=m
+CONFIG_ROSE=m
+
+#
+# AX.25 network device drivers
+#
+CONFIG_MKISS=m
+CONFIG_6PACK=m
+CONFIG_BPQETHER=m
+CONFIG_SCC=m
+# CONFIG_SCC_DELAY is not set
+# CONFIG_SCC_TRXECHO is not set
+CONFIG_BAYCOM_SER_FDX=m
+CONFIG_BAYCOM_SER_HDX=m
+CONFIG_BAYCOM_PAR=m
+CONFIG_BAYCOM_EPP=m
+CONFIG_YAM=m
+# CONFIG_CAN is not set
+CONFIG_IRDA=m
+
+#
+# IrDA protocols
+#
+CONFIG_IRLAN=m
+CONFIG_IRNET=m
+CONFIG_IRCOMM=m
+CONFIG_IRDA_ULTRA=y
+
+#
+# IrDA options
+#
+CONFIG_IRDA_CACHE_LAST_LSAP=y
+CONFIG_IRDA_FAST_RR=y
+# CONFIG_IRDA_DEBUG is not set
+
+#
+# Infrared-port device drivers
+#
+
+#
+# SIR device drivers
+#
+CONFIG_IRTTY_SIR=m
+
+#
+# Dongle support
+#
+CONFIG_DONGLE=y
+CONFIG_ESI_DONGLE=m
+CONFIG_ACTISYS_DONGLE=m
+CONFIG_TEKRAM_DONGLE=m
+CONFIG_TOIM3232_DONGLE=m
+CONFIG_LITELINK_DONGLE=m
+CONFIG_MA600_DONGLE=m
+CONFIG_GIRBIL_DONGLE=m
+CONFIG_MCP2120_DONGLE=m
+CONFIG_OLD_BELKIN_DONGLE=m
+CONFIG_ACT200L_DONGLE=m
+CONFIG_KINGSUN_DONGLE=m
+CONFIG_KSDAZZLE_DONGLE=m
+CONFIG_KS959_DONGLE=m
+
+#
+# FIR device drivers
+#
+CONFIG_USB_IRDA=m
+CONFIG_SIGMATEL_FIR=m
+CONFIG_NSC_FIR=m
+CONFIG_WINBOND_FIR=m
+CONFIG_TOSHIBA_FIR=m
+CONFIG_SMC_IRCC_FIR=m
+CONFIG_ALI_FIR=m
+CONFIG_VLSI_FIR=m
+CONFIG_VIA_FIR=m
+CONFIG_MCS_FIR=m
+CONFIG_BT=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+# CONFIG_BT_BNEP_MC_FILTER is not set
+# CONFIG_BT_BNEP_PROTO_FILTER is not set
+# CONFIG_BT_CMTP is not set
+CONFIG_BT_HIDP=m
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_HCIBTUSB=m
+CONFIG_BT_HCIBTSDIO=m
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_ATH3K=y
+CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_HCIUART_3WIRE=y
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIDTL1=m
+CONFIG_BT_HCIBT3C=m
+CONFIG_BT_HCIBLUECARD=m
+CONFIG_BT_HCIBTUART=m
+CONFIG_BT_HCIVHCI=m
+CONFIG_BT_MRVL=m
+CONFIG_BT_MRVL_SDIO=m
+CONFIG_BT_ATH3K=m
+CONFIG_BT_WILINK=m
+CONFIG_AF_RXRPC=m
+# CONFIG_AF_RXRPC_DEBUG is not set
+CONFIG_RXKAD=m
+CONFIG_FIB_RULES=y
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+CONFIG_WEXT_PRIV=y
+CONFIG_CFG80211=m
+# CONFIG_NL80211_TESTMODE is not set
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+# CONFIG_CFG80211_REG_DEBUG is not set
+CONFIG_CFG80211_DEFAULT_PS=y
+# CONFIG_CFG80211_DEBUGFS is not set
+# CONFIG_CFG80211_INTERNAL_REGDB is not set
+CONFIG_CFG80211_WEXT=y
+CONFIG_LIB80211=m
+CONFIG_LIB80211_CRYPT_WEP=m
+CONFIG_LIB80211_CRYPT_CCMP=m
+CONFIG_LIB80211_CRYPT_TKIP=m
+# CONFIG_LIB80211_DEBUG is not set
+CONFIG_MAC80211=m
+CONFIG_MAC80211_HAS_RC=y
+CONFIG_MAC80211_RC_MINSTREL=y
+CONFIG_MAC80211_RC_MINSTREL_HT=y
+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
+CONFIG_MAC80211_MESH=y
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_MESSAGE_TRACING is not set
+# CONFIG_MAC80211_DEBUG_MENU is not set
+CONFIG_WIMAX=m
+CONFIG_WIMAX_DEBUG_LEVEL=8
+CONFIG_RFKILL=m
+CONFIG_RFKILL_LEDS=y
+CONFIG_RFKILL_INPUT=y
+CONFIG_NET_9P=m
+CONFIG_NET_9P_VIRTIO=m
+# CONFIG_NET_9P_DEBUG is not set
+CONFIG_CAIF=m
+# CONFIG_CAIF_DEBUG is not set
+CONFIG_CAIF_NETDEV=m
+CONFIG_CAIF_USB=m
+CONFIG_CEPH_LIB=m
+# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
+# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
+CONFIG_NFC=m
+CONFIG_NFC_NCI=m
+CONFIG_NFC_HCI=m
+# CONFIG_NFC_SHDLC is not set
+
+#
+# Near Field Communication (NFC) devices
+#
+CONFIG_NFC_PN533=m
+CONFIG_NFC_WILINK=m
+CONFIG_NFC_MEI_PHY=m
+CONFIG_NFC_PN544=m
+CONFIG_NFC_PN544_MEI=m
+CONFIG_NFC_MICROREAD=m
+CONFIG_NFC_MICROREAD_MEI=m
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH=""
+CONFIG_DEVTMPFS=y
+# CONFIG_DEVTMPFS_MOUNT is not set
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+CONFIG_FIRMWARE_IN_KERNEL=y
+CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_FW_LOADER_USER_HELPER is not set
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_GENERIC_CPU_DEVICES is not set
+CONFIG_REGMAP=y
+CONFIG_REGMAP_I2C=m
+CONFIG_REGMAP_MMIO=m
+CONFIG_REGMAP_IRQ=y
+CONFIG_DMA_SHARED_BUFFER=y
+# CONFIG_CMA is not set
+
+#
+# Bus devices
+#
+CONFIG_CONNECTOR=y
+CONFIG_PROC_EVENTS=y
+CONFIG_MTD=m
+CONFIG_MTD_TESTS=m
+CONFIG_MTD_REDBOOT_PARTS=m
+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
+# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
+# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+CONFIG_MTD_CMDLINE_PARTS=m
+CONFIG_MTD_OF_PARTS=m
+CONFIG_MTD_AR7_PARTS=m
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_BLOCK_RO=m
+CONFIG_FTL=m
+CONFIG_NFTL=m
+CONFIG_NFTL_RW=y
+CONFIG_INFTL=m
+CONFIG_RFD_FTL=m
+CONFIG_SSFDC=m
+# CONFIG_SM_FTL is not set
+CONFIG_MTD_OOPS=m
+CONFIG_MTD_SWAP=m
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=m
+CONFIG_MTD_JEDECPROBE=m
+CONFIG_MTD_GEN_PROBE=m
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+CONFIG_MTD_CFI_INTELEXT=m
+CONFIG_MTD_CFI_AMDSTD=m
+CONFIG_MTD_CFI_STAA=m
+CONFIG_MTD_CFI_UTIL=m
+CONFIG_MTD_RAM=m
+CONFIG_MTD_ROM=m
+CONFIG_MTD_ABSENT=m
+
+#
+# Mapping drivers for chip access
+#
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+# CONFIG_MTD_PHYSMAP is not set
+CONFIG_MTD_PHYSMAP_OF=m
+CONFIG_MTD_SC520CDP=m
+CONFIG_MTD_NETSC520=m
+CONFIG_MTD_TS5500=m
+# CONFIG_MTD_SBC_GXX is not set
+# CONFIG_MTD_AMD76XROM is not set
+# CONFIG_MTD_ICHXROM is not set
+# CONFIG_MTD_ESB2ROM is not set
+# CONFIG_MTD_CK804XROM is not set
+CONFIG_MTD_SCB2_FLASH=m
+# CONFIG_MTD_NETtel is not set
+# CONFIG_MTD_L440GX is not set
+CONFIG_MTD_PCI=m
+# CONFIG_MTD_PCMCIA is not set
+# CONFIG_MTD_GPIO_ADDR is not set
+# CONFIG_MTD_INTEL_VR_NOR is not set
+CONFIG_MTD_PLATRAM=m
+# CONFIG_MTD_LATCH_ADDR is not set
+
+#
+# Self-contained MTD device drivers
+#
+CONFIG_MTD_PMC551=m
+# CONFIG_MTD_PMC551_BUGFIX is not set
+# CONFIG_MTD_PMC551_DEBUG is not set
+# CONFIG_MTD_DATAFLASH is not set
+# CONFIG_MTD_M25P80 is not set
+# CONFIG_MTD_SST25L is not set
+# CONFIG_MTD_SLRAM is not set
+CONFIG_MTD_PHRAM=m
+CONFIG_MTD_MTDRAM=m
+CONFIG_MTDRAM_TOTAL_SIZE=4096
+CONFIG_MTDRAM_ERASE_SIZE=128
+CONFIG_MTD_BLOCK2MTD=m
+
+#
+# Disk-On-Chip Device Drivers
+#
+CONFIG_MTD_DOCG3=m
+CONFIG_BCH_CONST_M=14
+CONFIG_BCH_CONST_T=4
+CONFIG_MTD_NAND_ECC=m
+CONFIG_MTD_NAND_ECC_SMC=y
+CONFIG_MTD_NAND=m
+# CONFIG_MTD_NAND_ECC_BCH is not set
+CONFIG_MTD_SM_COMMON=m
+# CONFIG_MTD_NAND_DENALI is not set
+CONFIG_MTD_NAND_IDS=m
+CONFIG_MTD_NAND_RICOH=m
+CONFIG_MTD_NAND_DISKONCHIP=m
+# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
+# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
+CONFIG_MTD_NAND_DOCG4=m
+# CONFIG_MTD_NAND_CAFE is not set
+CONFIG_MTD_NAND_CS553X=m
+CONFIG_MTD_NAND_NANDSIM=m
+# CONFIG_MTD_NAND_PLATFORM is not set
+CONFIG_MTD_ALAUDA=m
+# CONFIG_MTD_ONENAND is not set
+
+#
+# LPDDR flash memory drivers
+#
+CONFIG_MTD_LPDDR=m
+CONFIG_MTD_QINFO_PROBE=m
+CONFIG_MTD_UBI=m
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_LIMIT=20
+# CONFIG_MTD_UBI_FASTMAP is not set
+# CONFIG_MTD_UBI_GLUEBI is not set
+CONFIG_OF=y
+
+#
+# Device Tree and Open Firmware support
+#
+CONFIG_PROC_DEVICETREE=y
+# CONFIG_OF_SELFTEST is not set
+CONFIG_OF_PROMTREE=y
+CONFIG_OF_ADDRESS=y
+CONFIG_OF_IRQ=y
+CONFIG_OF_DEVICE=y
+CONFIG_OF_I2C=m
+CONFIG_OF_NET=y
+CONFIG_OF_MDIO=m
+CONFIG_OF_PCI=y
+CONFIG_OF_PCI_IRQ=y
+CONFIG_OF_MTD=y
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_SERIAL=m
+# CONFIG_PARPORT_PC_FIFO is not set
+# CONFIG_PARPORT_PC_SUPERIO is not set
+CONFIG_PARPORT_PC_PCMCIA=m
+# CONFIG_PARPORT_GSC is not set
+CONFIG_PARPORT_AX88796=m
+CONFIG_PARPORT_1284=y
+CONFIG_PARPORT_NOT_PC=y
+CONFIG_PNP=y
+# CONFIG_PNP_DEBUG_MESSAGES is not set
+
+#
+# Protocols
+#
+CONFIG_ISAPNP=y
+# CONFIG_PNPBIOS is not set
+CONFIG_PNPACPI=y
+CONFIG_BLK_DEV=y
+CONFIG_BLK_DEV_FD=m
+# CONFIG_PARIDE is not set
+CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
+CONFIG_BLK_CPQ_DA=m
+CONFIG_BLK_CPQ_CISS_DA=m
+# CONFIG_CISS_SCSI_TAPE is not set
+CONFIG_BLK_DEV_DAC960=m
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+CONFIG_BLK_DEV_DRBD=m
+# CONFIG_DRBD_FAULT_INJECTION is not set
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_NVME=m
+CONFIG_BLK_DEV_OSD=m
+CONFIG_BLK_DEV_SX8=m
+CONFIG_BLK_DEV_RAM=m
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=16384
+# CONFIG_BLK_DEV_XIP is not set
+CONFIG_CDROM_PKTCDVD=m
+CONFIG_CDROM_PKTCDVD_BUFFERS=8
+# CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_ATA_OVER_ETH=m
+CONFIG_VIRTIO_BLK=m
+# CONFIG_BLK_DEV_HD is not set
+CONFIG_BLK_DEV_RBD=m
+CONFIG_BLK_DEV_RSXX=m
+
+#
+# Misc devices
+#
+CONFIG_SENSORS_LIS3LV02D=m
+CONFIG_AD525X_DPOT=m
+CONFIG_AD525X_DPOT_I2C=m
+# CONFIG_AD525X_DPOT_SPI is not set
+# CONFIG_DUMMY_IRQ is not set
+# CONFIG_IBM_ASM is not set
+CONFIG_PHANTOM=m
+CONFIG_INTEL_MID_PTI=m
+CONFIG_SGI_IOC4=m
+CONFIG_TIFM_CORE=m
+CONFIG_TIFM_7XX1=m
+CONFIG_ICS932S401=m
+# CONFIG_ATMEL_SSC is not set
+CONFIG_ENCLOSURE_SERVICES=m
+CONFIG_CS5535_MFGPT=m
+CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7
+CONFIG_CS5535_CLOCK_EVENT_SRC=m
+CONFIG_HP_ILO=m
+CONFIG_APDS9802ALS=m
+CONFIG_ISL29003=m
+CONFIG_ISL29020=m
+CONFIG_SENSORS_TSL2550=m
+CONFIG_SENSORS_BH1780=m
+CONFIG_SENSORS_BH1770=m
+CONFIG_SENSORS_APDS990X=m
+CONFIG_HMC6352=m
+CONFIG_DS1682=m
+# CONFIG_TI_DAC7512 is not set
+CONFIG_VMWARE_BALLOON=m
+CONFIG_BMP085=y
+CONFIG_BMP085_I2C=m
+# CONFIG_BMP085_SPI is not set
+# CONFIG_PCH_PHUB is not set
+CONFIG_USB_SWITCH_FSA9480=m
+# CONFIG_LATTICE_ECP3_CONFIG is not set
+# CONFIG_SRAM is not set
+CONFIG_C2PORT=m
+CONFIG_C2PORT_DURAMAR_2150=m
+
+#
+# EEPROM support
+#
+CONFIG_EEPROM_AT24=m
+# CONFIG_EEPROM_AT25 is not set
+CONFIG_EEPROM_LEGACY=m
+CONFIG_EEPROM_MAX6875=m
+CONFIG_EEPROM_93CX6=m
+# CONFIG_EEPROM_93XX46 is not set
+CONFIG_CB710_CORE=m
+# CONFIG_CB710_DEBUG is not set
+CONFIG_CB710_DEBUG_ASSUMPTIONS=y
+
+#
+# Texas Instruments shared transport line discipline
+#
+CONFIG_TI_ST=m
+CONFIG_SENSORS_LIS3_I2C=m
+
+#
+# Altera FPGA firmware download module
+#
+CONFIG_ALTERA_STAPL=m
+CONFIG_INTEL_MEI=y
+CONFIG_INTEL_MEI_ME=y
+CONFIG_VMWARE_VMCI=m
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=m
+CONFIG_RAID_ATTRS=m
+CONFIG_SCSI=m
+CONFIG_SCSI_DMA=y
+CONFIG_SCSI_TGT=m
+CONFIG_SCSI_NETLINK=y
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=m
+CONFIG_CHR_DEV_ST=m
+CONFIG_CHR_DEV_OSST=m
+CONFIG_BLK_DEV_SR=m
+CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_CHR_DEV_SG=m
+CONFIG_CHR_DEV_SCH=m
+CONFIG_SCSI_ENCLOSURE=m
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+
+#
+# SCSI Transports
+#
+CONFIG_SCSI_SPI_ATTRS=m
+CONFIG_SCSI_FC_ATTRS=m
+# CONFIG_SCSI_FC_TGT_ATTRS is not set
+CONFIG_SCSI_ISCSI_ATTRS=m
+CONFIG_SCSI_SAS_ATTRS=m
+CONFIG_SCSI_SAS_LIBSAS=m
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_SCSI_SAS_HOST_SMP=y
+CONFIG_SCSI_SRP_ATTRS=m
+CONFIG_SCSI_SRP_TGT_ATTRS=y
+CONFIG_SCSI_LOWLEVEL=y
+CONFIG_ISCSI_TCP=m
+CONFIG_ISCSI_BOOT_SYSFS=m
+CONFIG_SCSI_CXGB3_ISCSI=m
+CONFIG_SCSI_CXGB4_ISCSI=m
+CONFIG_SCSI_BNX2_ISCSI=m
+CONFIG_SCSI_BNX2X_FCOE=m
+CONFIG_BE2ISCSI=m
+CONFIG_BLK_DEV_3W_XXXX_RAID=m
+CONFIG_SCSI_HPSA=m
+CONFIG_SCSI_3W_9XXX=m
+CONFIG_SCSI_3W_SAS=m
+CONFIG_SCSI_7000FASST=m
+CONFIG_SCSI_ACARD=m
+CONFIG_SCSI_AHA152X=m
+CONFIG_SCSI_AHA1542=m
+CONFIG_SCSI_AACRAID=m
+CONFIG_SCSI_AIC7XXX=m
+CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
+CONFIG_AIC7XXX_RESET_DELAY_MS=15000
+# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
+CONFIG_AIC7XXX_DEBUG_MASK=0
+CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+CONFIG_SCSI_AIC79XX=m
+CONFIG_AIC79XX_CMDS_PER_DEVICE=32
+CONFIG_AIC79XX_RESET_DELAY_MS=15000
+# CONFIG_AIC79XX_DEBUG_ENABLE is not set
+CONFIG_AIC79XX_DEBUG_MASK=0
+CONFIG_AIC79XX_REG_PRETTY_PRINT=y
+CONFIG_SCSI_AIC94XX=m
+# CONFIG_AIC94XX_DEBUG is not set
+CONFIG_SCSI_MVSAS=m
+# CONFIG_SCSI_MVSAS_DEBUG is not set
+CONFIG_SCSI_MVSAS_TASKLET=y
+CONFIG_SCSI_MVUMI=m
+CONFIG_SCSI_DPT_I2O=m
+CONFIG_SCSI_ADVANSYS=m
+CONFIG_SCSI_IN2000=m
+CONFIG_SCSI_ARCMSR=m
+CONFIG_MEGARAID_NEWGEN=y
+CONFIG_MEGARAID_MM=m
+CONFIG_MEGARAID_MAILBOX=m
+CONFIG_MEGARAID_LEGACY=m
+CONFIG_MEGARAID_SAS=m
+CONFIG_SCSI_MPT2SAS=m
+CONFIG_SCSI_MPT2SAS_MAX_SGE=128
+# CONFIG_SCSI_MPT2SAS_LOGGING is not set
+CONFIG_SCSI_MPT3SAS=m
+CONFIG_SCSI_MPT3SAS_MAX_SGE=128
+CONFIG_SCSI_MPT3SAS_LOGGING=y
+CONFIG_SCSI_UFSHCD=m
+CONFIG_SCSI_UFSHCD_PCI=m
+CONFIG_SCSI_UFSHCD_PLATFORM=m
+CONFIG_SCSI_HPTIOP=m
+CONFIG_SCSI_BUSLOGIC=m
+# CONFIG_SCSI_FLASHPOINT is not set
+CONFIG_VMWARE_PVSCSI=m
+CONFIG_HYPERV_STORAGE=m
+CONFIG_LIBFC=m
+CONFIG_LIBFCOE=m
+CONFIG_FCOE=m
+CONFIG_FCOE_FNIC=m
+CONFIG_SCSI_DMX3191D=m
+CONFIG_SCSI_DTC3280=m
+CONFIG_SCSI_EATA=m
+# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set
+# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set
+CONFIG_SCSI_EATA_MAX_TAGS=16
+CONFIG_SCSI_FUTURE_DOMAIN=m
+CONFIG_SCSI_GDTH=m
+CONFIG_SCSI_ISCI=m
+CONFIG_SCSI_GENERIC_NCR5380=m
+CONFIG_SCSI_GENERIC_NCR5380_MMIO=m
+CONFIG_SCSI_GENERIC_NCR53C400=y
+CONFIG_SCSI_IPS=m
+CONFIG_SCSI_INITIO=m
+CONFIG_SCSI_INIA100=m
+CONFIG_SCSI_PPA=m
+CONFIG_SCSI_IMM=m
+# CONFIG_SCSI_IZIP_EPP16 is not set
+# CONFIG_SCSI_IZIP_SLOW_CTR is not set
+CONFIG_SCSI_NCR53C406A=m
+CONFIG_SCSI_STEX=m
+CONFIG_SCSI_SYM53C8XX_2=m
+CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
+CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
+CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
+CONFIG_SCSI_SYM53C8XX_MMIO=y
+CONFIG_SCSI_IPR=m
+# CONFIG_SCSI_IPR_TRACE is not set
+# CONFIG_SCSI_IPR_DUMP is not set
+CONFIG_SCSI_PAS16=m
+CONFIG_SCSI_QLOGIC_FAS=m
+CONFIG_SCSI_QLOGIC_1280=m
+CONFIG_SCSI_QLA_FC=m
+CONFIG_TCM_QLA2XXX=m
+CONFIG_SCSI_QLA_ISCSI=m
+CONFIG_SCSI_LPFC=m
+# CONFIG_SCSI_LPFC_DEBUG_FS is not set
+CONFIG_SCSI_SYM53C416=m
+CONFIG_SCSI_DC395x=m
+CONFIG_SCSI_DC390T=m
+CONFIG_SCSI_T128=m
+CONFIG_SCSI_U14_34F=m
+# CONFIG_SCSI_U14_34F_TAGGED_QUEUE is not set
+# CONFIG_SCSI_U14_34F_LINKED_COMMANDS is not set
+CONFIG_SCSI_U14_34F_MAX_TAGS=8
+CONFIG_SCSI_ULTRASTOR=m
+CONFIG_SCSI_NSP32=m
+# CONFIG_SCSI_DEBUG is not set
+CONFIG_SCSI_PMCRAID=m
+CONFIG_SCSI_PM8001=m
+CONFIG_SCSI_SRP=m
+CONFIG_SCSI_BFA_FC=m
+CONFIG_SCSI_VIRTIO=m
+CONFIG_SCSI_CHELSIO_FCOE=m
+CONFIG_SCSI_LOWLEVEL_PCMCIA=y
+CONFIG_PCMCIA_AHA152X=m
+CONFIG_PCMCIA_FDOMAIN=m
+CONFIG_PCMCIA_NINJA_SCSI=m
+CONFIG_PCMCIA_QLOGIC=m
+CONFIG_PCMCIA_SYM53C500=m
+CONFIG_SCSI_DH=m
+CONFIG_SCSI_DH_RDAC=m
+CONFIG_SCSI_DH_HP_SW=m
+CONFIG_SCSI_DH_EMC=m
+CONFIG_SCSI_DH_ALUA=m
+CONFIG_SCSI_OSD_INITIATOR=m
+CONFIG_SCSI_OSD_ULD=m
+CONFIG_SCSI_OSD_DPRINT_SENSE=0
+# CONFIG_SCSI_OSD_DEBUG is not set
+CONFIG_ATA=m
+# CONFIG_ATA_NONSTANDARD is not set
+CONFIG_ATA_VERBOSE_ERROR=y
+CONFIG_ATA_ACPI=y
+CONFIG_SATA_ZPODD=y
+CONFIG_SATA_PMP=y
+
+#
+# Controllers with non-SFF native interface
+#
+CONFIG_SATA_AHCI=m
+CONFIG_SATA_AHCI_PLATFORM=m
+CONFIG_SATA_INIC162X=m
+CONFIG_SATA_ACARD_AHCI=m
+CONFIG_SATA_SIL24=m
+CONFIG_ATA_SFF=y
+
+#
+# SFF controllers with custom DMA interface
+#
+CONFIG_PDC_ADMA=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_SX4=m
+CONFIG_ATA_BMDMA=y
+
+#
+# SATA SFF controllers with BMDMA
+#
+CONFIG_ATA_PIIX=m
+CONFIG_SATA_HIGHBANK=m
+CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_SIL=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
+
+#
+# PATA SFF controllers with BMDMA
+#
+CONFIG_PATA_ALI=m
+CONFIG_PATA_AMD=m
+CONFIG_PATA_ARASAN_CF=m
+CONFIG_PATA_ARTOP=m
+CONFIG_PATA_ATIIXP=m
+CONFIG_PATA_ATP867X=m
+CONFIG_PATA_CMD64X=m
+CONFIG_PATA_CS5520=m
+CONFIG_PATA_CS5530=m
+CONFIG_PATA_CS5535=m
+CONFIG_PATA_CS5536=m
+CONFIG_PATA_CYPRESS=m
+CONFIG_PATA_EFAR=m
+CONFIG_PATA_HPT366=m
+CONFIG_PATA_HPT37X=m
+CONFIG_PATA_HPT3X2N=m
+CONFIG_PATA_HPT3X3=m
+# CONFIG_PATA_HPT3X3_DMA is not set
+CONFIG_PATA_IT8213=m
+CONFIG_PATA_IT821X=m
+CONFIG_PATA_JMICRON=m
+CONFIG_PATA_MARVELL=m
+CONFIG_PATA_NETCELL=m
+CONFIG_PATA_NINJA32=m
+CONFIG_PATA_NS87415=m
+CONFIG_PATA_OLDPIIX=m
+CONFIG_PATA_OPTIDMA=m
+CONFIG_PATA_PDC2027X=m
+CONFIG_PATA_PDC_OLD=m
+CONFIG_PATA_RADISYS=m
+CONFIG_PATA_RDC=m
+CONFIG_PATA_SC1200=m
+CONFIG_PATA_SCH=m
+CONFIG_PATA_SERVERWORKS=m
+CONFIG_PATA_SIL680=m
+CONFIG_PATA_SIS=m
+CONFIG_PATA_TOSHIBA=m
+CONFIG_PATA_TRIFLEX=m
+CONFIG_PATA_VIA=m
+CONFIG_PATA_WINBOND=m
+
+#
+# PIO-only SFF controllers
+#
+CONFIG_PATA_CMD640_PCI=m
+CONFIG_PATA_ISAPNP=m
+CONFIG_PATA_MPIIX=m
+CONFIG_PATA_NS87410=m
+CONFIG_PATA_OPTI=m
+CONFIG_PATA_PCMCIA=m
+CONFIG_PATA_QDI=m
+CONFIG_PATA_RZ1000=m
+CONFIG_PATA_WINBOND_VLB=m
+
+#
+# Generic fallback / legacy drivers
+#
+CONFIG_PATA_ACPI=m
+CONFIG_ATA_GENERIC=m
+CONFIG_PATA_LEGACY=m
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=m
+CONFIG_MD_LINEAR=m
+CONFIG_MD_RAID0=m
+CONFIG_MD_RAID1=m
+CONFIG_MD_RAID10=m
+CONFIG_MD_RAID456=m
+CONFIG_MD_MULTIPATH=m
+CONFIG_MD_FAULTY=m
+CONFIG_BCACHE=m
+# CONFIG_BCACHE_DEBUG is not set
+# CONFIG_BCACHE_EDEBUG is not set
+# CONFIG_BCACHE_CLOSURES_DEBUG is not set
+CONFIG_BLK_DEV_DM=m
+# CONFIG_DM_DEBUG is not set
+CONFIG_DM_BUFIO=m
+CONFIG_DM_BIO_PRISON=m
+CONFIG_DM_PERSISTENT_DATA=m
+CONFIG_DM_CRYPT=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_THIN_PROVISIONING=m
+# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
+CONFIG_DM_CACHE=m
+CONFIG_DM_CACHE_MQ=m
+CONFIG_DM_CACHE_CLEANER=m
+CONFIG_DM_MIRROR=m
+CONFIG_DM_RAID=m
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+CONFIG_DM_DELAY=m
+CONFIG_DM_UEVENT=y
+CONFIG_DM_FLAKEY=m
+CONFIG_DM_VERITY=m
+CONFIG_TARGET_CORE=m
+CONFIG_TCM_IBLOCK=m
+CONFIG_TCM_FILEIO=m
+CONFIG_TCM_PSCSI=m
+CONFIG_LOOPBACK_TARGET=m
+CONFIG_TCM_FC=m
+CONFIG_ISCSI_TARGET=m
+CONFIG_SBP_TARGET=m
+CONFIG_FUSION=y
+CONFIG_FUSION_SPI=m
+CONFIG_FUSION_FC=m
+CONFIG_FUSION_SAS=m
+CONFIG_FUSION_MAX_SGE=128
+CONFIG_FUSION_CTL=m
+# CONFIG_FUSION_LOGGING is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
+CONFIG_FIREWIRE_NET=m
+CONFIG_FIREWIRE_NOSY=m
+CONFIG_I2O=m
+CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
+CONFIG_I2O_EXT_ADAPTEC=y
+CONFIG_I2O_CONFIG=m
+CONFIG_I2O_CONFIG_OLD_IOCTL=y
+CONFIG_I2O_BUS=m
+CONFIG_I2O_BLOCK=m
+CONFIG_I2O_SCSI=m
+CONFIG_I2O_PROC=m
+CONFIG_MACINTOSH_DRIVERS=y
+CONFIG_MAC_EMUMOUSEBTN=y
+CONFIG_NETDEVICES=y
+CONFIG_NET_CORE=y
+CONFIG_BONDING=m
+CONFIG_DUMMY=m
+CONFIG_EQUALIZER=m
+# CONFIG_NET_FC is not set
+CONFIG_MII=m
+CONFIG_IFB=m
+CONFIG_NET_TEAM=m
+CONFIG_NET_TEAM_MODE_BROADCAST=m
+CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
+CONFIG_NET_TEAM_MODE_RANDOM=m
+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
+CONFIG_NET_TEAM_MODE_LOADBALANCE=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+CONFIG_VXLAN=m
+CONFIG_NETCONSOLE=m
+CONFIG_NETCONSOLE_DYNAMIC=y
+CONFIG_NETPOLL=y
+# CONFIG_NETPOLL_TRAP is not set
+CONFIG_NET_POLL_CONTROLLER=y
+CONFIG_RIONET=m
+CONFIG_RIONET_TX_SIZE=128
+CONFIG_RIONET_RX_SIZE=128
+CONFIG_TUN=m
+CONFIG_VETH=m
+CONFIG_VIRTIO_NET=m
+CONFIG_SUNGEM_PHY=m
+# CONFIG_ARCNET is not set
+CONFIG_ATM_DRIVERS=y
+# CONFIG_ATM_DUMMY is not set
+CONFIG_ATM_TCP=m
+CONFIG_ATM_LANAI=m
+CONFIG_ATM_ENI=m
+# CONFIG_ATM_ENI_DEBUG is not set
+# CONFIG_ATM_ENI_TUNE_BURST is not set
+CONFIG_ATM_FIRESTREAM=m
+CONFIG_ATM_ZATM=m
+# CONFIG_ATM_ZATM_DEBUG is not set
+CONFIG_ATM_NICSTAR=m
+# CONFIG_ATM_NICSTAR_USE_SUNI is not set
+# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
+CONFIG_ATM_IDT77252=m
+# CONFIG_ATM_IDT77252_DEBUG is not set
+# CONFIG_ATM_IDT77252_RCV_ALL is not set
+CONFIG_ATM_IDT77252_USE_SUNI=y
+CONFIG_ATM_AMBASSADOR=m
+# CONFIG_ATM_AMBASSADOR_DEBUG is not set
+CONFIG_ATM_HORIZON=m
+# CONFIG_ATM_HORIZON_DEBUG is not set
+CONFIG_ATM_IA=m
+# CONFIG_ATM_IA_DEBUG is not set
+CONFIG_ATM_FORE200E=m
+# CONFIG_ATM_FORE200E_USE_TASKLET is not set
+CONFIG_ATM_FORE200E_TX_RETRY=16
+CONFIG_ATM_FORE200E_DEBUG=0
+CONFIG_ATM_HE=m
+# CONFIG_ATM_HE_USE_SUNI is not set
+CONFIG_ATM_SOLOS=m
+
+#
+# CAIF transport drivers
+#
+CONFIG_CAIF_TTY=m
+CONFIG_CAIF_SPI_SLAVE=m
+CONFIG_CAIF_SPI_SYNC=y
+CONFIG_CAIF_HSI=m
+CONFIG_CAIF_VIRTIO=m
+CONFIG_VHOST_NET=m
+CONFIG_VHOST_SCSI=m
+CONFIG_VHOST_RING=m
+
+#
+# Distributed Switch Architecture drivers
+#
+CONFIG_NET_DSA_MV88E6XXX=m
+CONFIG_NET_DSA_MV88E6060=m
+CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y
+CONFIG_NET_DSA_MV88E6131=m
+CONFIG_NET_DSA_MV88E6123_61_65=m
+CONFIG_ETHERNET=y
+CONFIG_MDIO=m
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_EL3=m
+CONFIG_3C515=m
+CONFIG_PCMCIA_3C574=m
+CONFIG_PCMCIA_3C589=m
+CONFIG_VORTEX=m
+CONFIG_TYPHOON=m
+CONFIG_NET_VENDOR_ADAPTEC=y
+CONFIG_ADAPTEC_STARFIRE=m
+CONFIG_NET_VENDOR_ALTEON=y
+CONFIG_ACENIC=m
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+CONFIG_NET_VENDOR_AMD=y
+CONFIG_AMD8111_ETH=m
+CONFIG_LANCE=m
+CONFIG_PCNET32=m
+CONFIG_PCMCIA_NMCLAN=m
+CONFIG_NI65=m
+CONFIG_NET_VENDOR_ATHEROS=y
+CONFIG_ATL2=m
+CONFIG_ATL1=m
+CONFIG_ATL1E=m
+CONFIG_ATL1C=m
+CONFIG_NET_CADENCE=y
+CONFIG_ARM_AT91_ETHER=m
+CONFIG_MACB=m
+CONFIG_NET_VENDOR_BROADCOM=y
+CONFIG_B44=m
+CONFIG_B44_PCI_AUTOSELECT=y
+CONFIG_B44_PCICORE_AUTOSELECT=y
+CONFIG_B44_PCI=y
+CONFIG_BNX2=m
+CONFIG_CNIC=m
+CONFIG_TIGON3=m
+CONFIG_BNX2X=m
+CONFIG_BNX2X_SRIOV=y
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_BNA=m
+CONFIG_NET_CALXEDA_XGMAC=m
+CONFIG_NET_VENDOR_CHELSIO=y
+CONFIG_CHELSIO_T1=m
+CONFIG_CHELSIO_T1_1G=y
+CONFIG_CHELSIO_T3=m
+CONFIG_CHELSIO_T4=m
+CONFIG_CHELSIO_T4VF=m
+CONFIG_NET_VENDOR_CIRRUS=y
+CONFIG_CS89x0=m
+# CONFIG_CS89x0_PLATFORM is not set
+CONFIG_NET_VENDOR_CISCO=y
+CONFIG_ENIC=m
+CONFIG_DNET=m
+CONFIG_NET_VENDOR_DEC=y
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_DE2104X_DSL=0
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+# CONFIG_TULIP_MMIO is not set
+# CONFIG_TULIP_NAPI is not set
+CONFIG_DE4X5=m
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+CONFIG_ULI526X=m
+CONFIG_PCMCIA_XIRCOM=m
+CONFIG_NET_VENDOR_DLINK=y
+CONFIG_DL2K=m
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+CONFIG_NET_VENDOR_EMULEX=y
+CONFIG_BE2NET=m
+CONFIG_NET_VENDOR_EXAR=y
+CONFIG_S2IO=m
+CONFIG_VXGE=m
+# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
+CONFIG_NET_VENDOR_FUJITSU=y
+CONFIG_PCMCIA_FMVJ18X=m
+CONFIG_NET_VENDOR_HP=y
+CONFIG_HP100=m
+CONFIG_NET_VENDOR_INTEL=y
+CONFIG_E100=m
+CONFIG_E1000=m
+CONFIG_E1000E=m
+CONFIG_IGB=m
+CONFIG_IGB_HWMON=y
+CONFIG_IGB_DCA=y
+CONFIG_IGBVF=m
+CONFIG_IXGB=m
+CONFIG_IXGBE=m
+CONFIG_IXGBE_HWMON=y
+CONFIG_IXGBE_DCA=y
+CONFIG_IXGBEVF=m
+CONFIG_NET_VENDOR_I825XX=y
+CONFIG_IP1000=m
+CONFIG_JME=m
+CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_MVMDIO=m
+CONFIG_SKGE=m
+# CONFIG_SKGE_DEBUG is not set
+CONFIG_SKGE_GENESIS=y
+CONFIG_SKY2=m
+# CONFIG_SKY2_DEBUG is not set
+CONFIG_NET_VENDOR_MELLANOX=y
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_CORE=m
+CONFIG_MLX4_DEBUG=y
+CONFIG_NET_VENDOR_MICREL=y
+CONFIG_KS8842=m
+# CONFIG_KS8851 is not set
+CONFIG_KS8851_MLL=m
+CONFIG_KSZ884X_PCI=m
+CONFIG_NET_VENDOR_MICROCHIP=y
+# CONFIG_ENC28J60 is not set
+CONFIG_NET_VENDOR_MYRI=y
+CONFIG_MYRI10GE=m
+CONFIG_MYRI10GE_DCA=y
+CONFIG_FEALNX=m
+CONFIG_NET_VENDOR_NATSEMI=y
+CONFIG_NATSEMI=m
+CONFIG_NS83820=m
+CONFIG_NET_VENDOR_8390=y
+CONFIG_PCMCIA_AXNET=m
+CONFIG_NE2000=m
+CONFIG_NE2K_PCI=m
+CONFIG_PCMCIA_PCNET=m
+CONFIG_ULTRA=m
+CONFIG_WD80x3=m
+CONFIG_NET_VENDOR_NVIDIA=y
+CONFIG_FORCEDETH=m
+CONFIG_NET_VENDOR_OKI=y
+CONFIG_PCH_GBE=m
+CONFIG_ETHOC=m
+CONFIG_NET_PACKET_ENGINE=y
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+CONFIG_NET_VENDOR_QLOGIC=y
+CONFIG_QLA3XXX=m
+CONFIG_QLCNIC=m
+CONFIG_QLCNIC_SRIOV=y
+CONFIG_QLGE=m
+CONFIG_NETXEN_NIC=m
+CONFIG_NET_VENDOR_REALTEK=y
+CONFIG_ATP=m
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+# CONFIG_8139TOO_PIO is not set
+CONFIG_8139TOO_TUNE_TWISTER=y
+CONFIG_8139TOO_8129=y
+# CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_R8169=m
+CONFIG_NET_VENDOR_RDC=y
+CONFIG_R6040=m
+CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_SC92031=m
+CONFIG_NET_VENDOR_SIS=y
+CONFIG_SIS900=m
+CONFIG_SIS190=m
+CONFIG_SFC=m
+CONFIG_SFC_MTD=y
+CONFIG_SFC_MCDI_MON=y
+CONFIG_SFC_SRIOV=y
+CONFIG_NET_VENDOR_SMSC=y
+CONFIG_SMC9194=m
+CONFIG_PCMCIA_SMC91C92=m
+CONFIG_EPIC100=m
+CONFIG_SMSC9420=m
+CONFIG_NET_VENDOR_STMICRO=y
+CONFIG_STMMAC_ETH=m
+# CONFIG_STMMAC_PLATFORM is not set
+CONFIG_STMMAC_PCI=y
+# CONFIG_STMMAC_DEBUG_FS is not set
+# CONFIG_STMMAC_DA is not set
+CONFIG_NET_VENDOR_SUN=y
+CONFIG_HAPPYMEAL=m
+CONFIG_SUNGEM=m
+CONFIG_CASSINI=m
+CONFIG_NIU=m
+CONFIG_NET_VENDOR_TEHUTI=y
+CONFIG_TEHUTI=m
+CONFIG_NET_VENDOR_TI=y
+CONFIG_TLAN=m
+CONFIG_NET_VENDOR_VIA=y
+CONFIG_VIA_RHINE=m
+# CONFIG_VIA_RHINE_MMIO is not set
+CONFIG_VIA_VELOCITY=m
+CONFIG_NET_VENDOR_WIZNET=y
+CONFIG_WIZNET_W5100=m
+CONFIG_WIZNET_W5300=m
+# CONFIG_WIZNET_BUS_DIRECT is not set
+# CONFIG_WIZNET_BUS_INDIRECT is not set
+CONFIG_WIZNET_BUS_ANY=y
+CONFIG_NET_VENDOR_XIRCOM=y
+CONFIG_PCMCIA_XIRC2PS=m
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+CONFIG_NET_SB1000=m
+CONFIG_PHYLIB=m
+
+#
+# MII PHY device drivers
+#
+CONFIG_AT803X_PHY=m
+CONFIG_AMD_PHY=m
+CONFIG_MARVELL_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_CICADA_PHY=m
+CONFIG_VITESSE_PHY=m
+CONFIG_SMSC_PHY=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_BCM87XX_PHY=m
+CONFIG_ICPLUS_PHY=m
+CONFIG_REALTEK_PHY=m
+CONFIG_NATIONAL_PHY=m
+CONFIG_STE10XP=m
+CONFIG_LSI_ET1011C_PHY=m
+CONFIG_MICREL_PHY=m
+# CONFIG_MDIO_BITBANG is not set
+CONFIG_MDIO_BUS_MUX=m
+CONFIG_MDIO_BUS_MUX_GPIO=m
+CONFIG_MDIO_BUS_MUX_MMIOREG=m
+# CONFIG_MICREL_KS8995MA is not set
+CONFIG_PLIP=m
+CONFIG_PPP=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_MPPE=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPPOATM=m
+CONFIG_PPPOE=m
+CONFIG_PPTP=m
+CONFIG_PPPOL2TP=m
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_SLIP=m
+CONFIG_SLHC=m
+# CONFIG_SLIP_COMPRESSED is not set
+# CONFIG_SLIP_SMART is not set
+# CONFIG_SLIP_MODE_SLIP6 is not set
+
+#
+# USB Network Adapters
+#
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_RTL8152=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_AX88179_178A=m
+CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_CDC_NCM=m
+CONFIG_USB_NET_CDC_MBIM=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
+CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_NET_CX82310_ETH=m
+CONFIG_USB_NET_KALMIA=m
+CONFIG_USB_NET_QMI_WWAN=m
+CONFIG_USB_HSO=m
+CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_CDC_PHONET=m
+CONFIG_USB_IPHETH=m
+CONFIG_USB_SIERRA_NET=m
+CONFIG_USB_VL600=m
+CONFIG_WLAN=y
+CONFIG_PCMCIA_RAYCS=m
+CONFIG_LIBERTAS_THINFIRM=m
+# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
+CONFIG_LIBERTAS_THINFIRM_USB=m
+CONFIG_AIRO=m
+CONFIG_ATMEL=m
+CONFIG_PCI_ATMEL=m
+CONFIG_PCMCIA_ATMEL=m
+CONFIG_AT76C50X_USB=m
+CONFIG_AIRO_CS=m
+CONFIG_PCMCIA_WL3501=m
+CONFIG_PRISM54=m
+CONFIG_USB_ZD1201=m
+CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_RTL8180=m
+CONFIG_RTL8187=m
+CONFIG_RTL8187_LEDS=y
+CONFIG_ADM8211=m
+# CONFIG_MAC80211_HWSIM is not set
+CONFIG_MWL8K=m
+CONFIG_ATH_COMMON=m
+CONFIG_ATH_CARDS=m
+# CONFIG_ATH_DEBUG is not set
+CONFIG_ATH5K=m
+# CONFIG_ATH5K_DEBUG is not set
+# CONFIG_ATH5K_TRACER is not set
+CONFIG_ATH5K_PCI=y
+CONFIG_ATH9K_HW=m
+CONFIG_ATH9K_COMMON=m
+CONFIG_ATH9K_BTCOEX_SUPPORT=y
+CONFIG_ATH9K=m
+CONFIG_ATH9K_PCI=y
+CONFIG_ATH9K_AHB=y
+# CONFIG_ATH9K_DEBUGFS is not set
+# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set
+CONFIG_ATH9K_HTC=m
+# CONFIG_ATH9K_HTC_DEBUGFS is not set
+CONFIG_CARL9170=m
+CONFIG_CARL9170_LEDS=y
+CONFIG_CARL9170_WPC=y
+# CONFIG_CARL9170_HWRNG is not set
+CONFIG_ATH6KL=m
+CONFIG_ATH6KL_SDIO=m
+CONFIG_ATH6KL_USB=m
+# CONFIG_ATH6KL_DEBUG is not set
+# CONFIG_ATH6KL_TRACING is not set
+CONFIG_AR5523=m
+CONFIG_WIL6210=m
+CONFIG_WIL6210_ISR_COR=y
+CONFIG_B43=m
+CONFIG_B43_BCMA=y
+# CONFIG_B43_BCMA_EXTRA is not set
+CONFIG_B43_SSB=y
+CONFIG_B43_PCI_AUTOSELECT=y
+CONFIG_B43_PCICORE_AUTOSELECT=y
+CONFIG_B43_PCMCIA=y
+CONFIG_B43_SDIO=y
+CONFIG_B43_BCMA_PIO=y
+CONFIG_B43_PIO=y
+CONFIG_B43_PHY_N=y
+CONFIG_B43_PHY_LP=y
+CONFIG_B43_PHY_HT=y
+CONFIG_B43_LEDS=y
+CONFIG_B43_HWRNG=y
+# CONFIG_B43_DEBUG is not set
+CONFIG_B43LEGACY=m
+CONFIG_B43LEGACY_PCI_AUTOSELECT=y
+CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
+CONFIG_B43LEGACY_LEDS=y
+CONFIG_B43LEGACY_HWRNG=y
+# CONFIG_B43LEGACY_DEBUG is not set
+CONFIG_B43LEGACY_DMA=y
+CONFIG_B43LEGACY_PIO=y
+CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
+# CONFIG_B43LEGACY_DMA_MODE is not set
+# CONFIG_B43LEGACY_PIO_MODE is not set
+CONFIG_BRCMUTIL=m
+CONFIG_BRCMSMAC=m
+CONFIG_BRCMFMAC=m
+CONFIG_BRCMFMAC_SDIO=y
+CONFIG_BRCMFMAC_USB=y
+# CONFIG_BRCM_TRACING is not set
+# CONFIG_BRCMDBG is not set
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
+CONFIG_HOSTAP_CS=m
+# CONFIG_IPW2100 is not set
+# CONFIG_IPW2200 is not set
+CONFIG_IWLWIFI=m
+CONFIG_IWLDVM=m
+CONFIG_IWLMVM=m
+CONFIG_IWLWIFI_OPMODE_MODULAR=y
+
+#
+# Debugging Options
+#
+# CONFIG_IWLWIFI_DEBUG is not set
+CONFIG_IWLWIFI_DEVICE_TRACING=y
+# CONFIG_IWLWIFI_P2P is not set
+CONFIG_IWLEGACY=m
+CONFIG_IWL4965=m
+CONFIG_IWL3945=m
+
+#
+# iwl3945 / iwl4965 Debugging Options
+#
+# CONFIG_IWLEGACY_DEBUG is not set
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_CS=m
+CONFIG_LIBERTAS_SDIO=m
+# CONFIG_LIBERTAS_SPI is not set
+# CONFIG_LIBERTAS_DEBUG is not set
+CONFIG_LIBERTAS_MESH=y
+CONFIG_HERMES=m
+CONFIG_HERMES_PRISM=y
+CONFIG_HERMES_CACHE_FW_ON_INIT=y
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCI_HERMES=m
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
+CONFIG_ORINOCO_USB=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+# CONFIG_P54_SPI is not set
+CONFIG_P54_LEDS=y
+CONFIG_RT2X00=m
+CONFIG_RT2400PCI=m
+CONFIG_RT2500PCI=m
+CONFIG_RT61PCI=m
+CONFIG_RT2800PCI=m
+CONFIG_RT2800PCI_RT33XX=y
+CONFIG_RT2800PCI_RT35XX=y
+CONFIG_RT2800PCI_RT53XX=y
+CONFIG_RT2800PCI_RT3290=y
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2800USB_RT33XX=y
+CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_RT53XX=y
+CONFIG_RT2800USB_RT55XX=y
+CONFIG_RT2800USB_UNKNOWN=y
+CONFIG_RT2800_LIB=m
+CONFIG_RT2X00_LIB_MMIO=m
+CONFIG_RT2X00_LIB_PCI=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_CRYPTO=y
+CONFIG_RT2X00_LIB_LEDS=y
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_RTLWIFI=m
+# CONFIG_RTLWIFI_DEBUG is not set
+CONFIG_RTL8192CE=m
+CONFIG_RTL8192SE=m
+CONFIG_RTL8192DE=m
+CONFIG_RTL8723AE=m
+CONFIG_RTL8188EE=m
+CONFIG_RTL8192CU=m
+CONFIG_RTL8192C_COMMON=m
+CONFIG_WL_TI=y
+CONFIG_WL1251=m
+# CONFIG_WL1251_SPI is not set
+CONFIG_WL1251_SDIO=m
+CONFIG_WL12XX=m
+CONFIG_WL18XX=m
+CONFIG_WLCORE=m
+# CONFIG_WLCORE_SPI is not set
+CONFIG_WLCORE_SDIO=m
+CONFIG_WILINK_PLATFORM_DATA=y
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_MWIFIEX=m
+CONFIG_MWIFIEX_SDIO=m
+CONFIG_MWIFIEX_PCIE=m
+CONFIG_MWIFIEX_USB=m
+
+#
+# WiMAX Wireless Broadband devices
+#
+CONFIG_WIMAX_I2400M=m
+CONFIG_WIMAX_I2400M_USB=m
+CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
+# CONFIG_WAN is not set
+CONFIG_IEEE802154_DRIVERS=m
+CONFIG_IEEE802154_FAKEHARD=m
+CONFIG_IEEE802154_FAKELB=m
+CONFIG_IEEE802154_AT86RF230=m
+# CONFIG_IEEE802154_MRF24J40 is not set
+CONFIG_VMXNET3=m
+CONFIG_HYPERV_NET=m
+CONFIG_ISDN=y
+CONFIG_ISDN_I4L=m
+CONFIG_ISDN_PPP=y
+CONFIG_ISDN_PPP_VJ=y
+CONFIG_ISDN_MPP=y
+CONFIG_IPPP_FILTER=y
+CONFIG_ISDN_PPP_BSDCOMP=m
+CONFIG_ISDN_AUDIO=y
+CONFIG_ISDN_TTY_FAX=y
+
+#
+# ISDN feature submodules
+#
+CONFIG_ISDN_DIVERSION=m
+
+#
+# ISDN4Linux hardware drivers
+#
+
+#
+# Passive cards
+#
+CONFIG_ISDN_DRV_HISAX=m
+
+#
+# D-channel protocol features
+#
+CONFIG_HISAX_EURO=y
+CONFIG_DE_AOC=y
+# CONFIG_HISAX_NO_SENDCOMPLETE is not set
+# CONFIG_HISAX_NO_LLC is not set
+# CONFIG_HISAX_NO_KEYPAD is not set
+CONFIG_HISAX_1TR6=y
+CONFIG_HISAX_NI1=y
+CONFIG_HISAX_MAX_CARDS=8
+
+#
+# HiSax supported cards
+#
+CONFIG_HISAX_16_0=y
+CONFIG_HISAX_16_3=y
+CONFIG_HISAX_TELESPCI=y
+CONFIG_HISAX_S0BOX=y
+CONFIG_HISAX_AVM_A1=y
+CONFIG_HISAX_FRITZPCI=y
+CONFIG_HISAX_AVM_A1_PCMCIA=y
+CONFIG_HISAX_ELSA=y
+CONFIG_HISAX_IX1MICROR2=y
+CONFIG_HISAX_DIEHLDIVA=y
+CONFIG_HISAX_ASUSCOM=y
+CONFIG_HISAX_TELEINT=y
+CONFIG_HISAX_HFCS=y
+CONFIG_HISAX_SEDLBAUER=y
+CONFIG_HISAX_SPORTSTER=y
+CONFIG_HISAX_MIC=y
+CONFIG_HISAX_NETJET=y
+CONFIG_HISAX_NETJET_U=y
+CONFIG_HISAX_NICCY=y
+CONFIG_HISAX_ISURF=y
+CONFIG_HISAX_HSTSAPHIR=y
+CONFIG_HISAX_BKM_A4T=y
+CONFIG_HISAX_SCT_QUADRO=y
+CONFIG_HISAX_GAZEL=y
+CONFIG_HISAX_HFC_PCI=y
+CONFIG_HISAX_W6692=y
+CONFIG_HISAX_HFC_SX=y
+CONFIG_HISAX_ENTERNOW_PCI=y
+# CONFIG_HISAX_DEBUG is not set
+
+#
+# HiSax PCMCIA card service modules
+#
+CONFIG_HISAX_SEDLBAUER_CS=m
+CONFIG_HISAX_ELSA_CS=m
+CONFIG_HISAX_AVM_A1_CS=m
+CONFIG_HISAX_TELES_CS=m
+
+#
+# HiSax sub driver modules
+#
+CONFIG_HISAX_ST5481=m
+CONFIG_HISAX_HFCUSB=m
+CONFIG_HISAX_HFC4S8S=m
+CONFIG_HISAX_FRITZ_PCIPNP=m
+
+#
+# Active cards
+#
+CONFIG_ISDN_DRV_ICN=m
+CONFIG_ISDN_DRV_PCBIT=m
+CONFIG_ISDN_DRV_SC=m
+CONFIG_ISDN_DRV_ACT2000=m
+CONFIG_ISDN_CAPI=m
+CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
+CONFIG_CAPI_TRACE=y
+CONFIG_ISDN_CAPI_MIDDLEWARE=y
+CONFIG_ISDN_CAPI_CAPI20=m
+CONFIG_ISDN_CAPI_CAPIDRV=m
+
+#
+# CAPI hardware drivers
+#
+CONFIG_CAPI_AVM=y
+CONFIG_ISDN_DRV_AVMB1_B1ISA=m
+CONFIG_ISDN_DRV_AVMB1_B1PCI=m
+CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
+CONFIG_ISDN_DRV_AVMB1_T1ISA=m
+CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
+CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
+CONFIG_ISDN_DRV_AVMB1_T1PCI=m
+CONFIG_ISDN_DRV_AVMB1_C4=m
+CONFIG_CAPI_EICON=y
+CONFIG_ISDN_DIVAS=m
+CONFIG_ISDN_DIVAS_BRIPCI=y
+CONFIG_ISDN_DIVAS_PRIPCI=y
+CONFIG_ISDN_DIVAS_DIVACAPI=m
+CONFIG_ISDN_DIVAS_USERIDI=m
+CONFIG_ISDN_DIVAS_MAINT=m
+CONFIG_ISDN_DRV_GIGASET=m
+CONFIG_GIGASET_CAPI=y
+# CONFIG_GIGASET_I4L is not set
+# CONFIG_GIGASET_DUMMYLL is not set
+CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M105=m
+CONFIG_GIGASET_M101=m
+# CONFIG_GIGASET_DEBUG is not set
+CONFIG_HYSDN=m
+CONFIG_HYSDN_CAPI=y
+CONFIG_MISDN=m
+CONFIG_MISDN_DSP=m
+CONFIG_MISDN_L1OIP=m
+
+#
+# mISDN hardware drivers
+#
+CONFIG_MISDN_HFCPCI=m
+CONFIG_MISDN_HFCMULTI=m
+CONFIG_MISDN_HFCUSB=m
+CONFIG_MISDN_AVMFRITZ=m
+CONFIG_MISDN_SPEEDFAX=m
+CONFIG_MISDN_INFINEON=m
+CONFIG_MISDN_W6692=m
+CONFIG_MISDN_NETJET=m
+CONFIG_MISDN_IPAC=m
+CONFIG_MISDN_ISAR=m
+CONFIG_ISDN_HDLC=m
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+CONFIG_INPUT_FF_MEMLESS=m
+CONFIG_INPUT_POLLDEV=m
+CONFIG_INPUT_SPARSEKMAP=m
+CONFIG_INPUT_MATRIXKMAP=m
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_EVDEV=m
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ADP5588=m
+CONFIG_KEYBOARD_ADP5589=m
+CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_QT1070=m
+CONFIG_KEYBOARD_QT2160=m
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_GPIO is not set
+# CONFIG_KEYBOARD_GPIO_POLLED is not set
+CONFIG_KEYBOARD_TCA6416=m
+CONFIG_KEYBOARD_TCA8418=m
+CONFIG_KEYBOARD_MATRIX=m
+# CONFIG_KEYBOARD_LM8323 is not set
+CONFIG_KEYBOARD_LM8333=m
+# CONFIG_KEYBOARD_MAX7359 is not set
+CONFIG_KEYBOARD_MCS=m
+CONFIG_KEYBOARD_MPR121=m
+# CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_OPENCORES is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=m
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_CYPRESS=y
+CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+CONFIG_MOUSE_PS2_ELANTECH=y
+CONFIG_MOUSE_PS2_SENTELIC=y
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
+CONFIG_MOUSE_PS2_OLPC=y
+CONFIG_MOUSE_SERIAL=y
+CONFIG_MOUSE_APPLETOUCH=m
+CONFIG_MOUSE_BCM5974=m
+CONFIG_MOUSE_CYAPA=m
+CONFIG_MOUSE_INPORT=m
+# CONFIG_MOUSE_ATIXL is not set
+CONFIG_MOUSE_LOGIBM=m
+CONFIG_MOUSE_PC110PAD=m
+CONFIG_MOUSE_VSXXXAA=m
+# CONFIG_MOUSE_GPIO is not set
+CONFIG_MOUSE_SYNAPTICS_I2C=m
+CONFIG_MOUSE_SYNAPTICS_USB=m
+CONFIG_INPUT_JOYSTICK=y
+CONFIG_JOYSTICK_ANALOG=m
+CONFIG_JOYSTICK_A3D=m
+CONFIG_JOYSTICK_ADI=m
+CONFIG_JOYSTICK_COBRA=m
+CONFIG_JOYSTICK_GF2K=m
+CONFIG_JOYSTICK_GRIP=m
+CONFIG_JOYSTICK_GRIP_MP=m
+CONFIG_JOYSTICK_GUILLEMOT=m
+CONFIG_JOYSTICK_INTERACT=m
+CONFIG_JOYSTICK_SIDEWINDER=m
+CONFIG_JOYSTICK_TMDC=m
+CONFIG_JOYSTICK_IFORCE=m
+CONFIG_JOYSTICK_IFORCE_USB=y
+CONFIG_JOYSTICK_IFORCE_232=y
+CONFIG_JOYSTICK_WARRIOR=m
+CONFIG_JOYSTICK_MAGELLAN=m
+CONFIG_JOYSTICK_SPACEORB=m
+CONFIG_JOYSTICK_SPACEBALL=m
+CONFIG_JOYSTICK_STINGER=m
+CONFIG_JOYSTICK_TWIDJOY=m
+CONFIG_JOYSTICK_ZHENHUA=m
+CONFIG_JOYSTICK_DB9=m
+CONFIG_JOYSTICK_GAMECON=m
+CONFIG_JOYSTICK_TURBOGRAFX=m
+CONFIG_JOYSTICK_AS5011=m
+CONFIG_JOYSTICK_JOYDUMP=m
+CONFIG_JOYSTICK_XPAD=m
+CONFIG_JOYSTICK_XPAD_FF=y
+CONFIG_JOYSTICK_XPAD_LEDS=y
+CONFIG_JOYSTICK_WALKERA0701=m
+CONFIG_INPUT_TABLET=y
+CONFIG_TABLET_USB_ACECAD=m
+CONFIG_TABLET_USB_AIPTEK=m
+CONFIG_TABLET_USB_GTCO=m
+CONFIG_TABLET_USB_HANWANG=m
+CONFIG_TABLET_USB_KBTAB=m
+CONFIG_TABLET_USB_WACOM=m
+CONFIG_INPUT_TOUCHSCREEN=y
+# CONFIG_TOUCHSCREEN_ADS7846 is not set
+# CONFIG_TOUCHSCREEN_AD7877 is not set
+CONFIG_TOUCHSCREEN_AD7879=m
+CONFIG_TOUCHSCREEN_AD7879_I2C=m
+# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
+CONFIG_TOUCHSCREEN_ATMEL_MXT=m
+CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
+CONFIG_TOUCHSCREEN_BU21013=m
+CONFIG_TOUCHSCREEN_CY8CTMG110=m
+CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
+CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
+# CONFIG_TOUCHSCREEN_CYTTSP_SPI is not set
+CONFIG_TOUCHSCREEN_DYNAPRO=m
+CONFIG_TOUCHSCREEN_HAMPSHIRE=m
+CONFIG_TOUCHSCREEN_EETI=m
+CONFIG_TOUCHSCREEN_EGALAX=m
+CONFIG_TOUCHSCREEN_FUJITSU=m
+CONFIG_TOUCHSCREEN_ILI210X=m
+CONFIG_TOUCHSCREEN_GUNZE=m
+CONFIG_TOUCHSCREEN_ELO=m
+CONFIG_TOUCHSCREEN_WACOM_W8001=m
+CONFIG_TOUCHSCREEN_WACOM_I2C=m
+CONFIG_TOUCHSCREEN_MAX11801=m
+CONFIG_TOUCHSCREEN_MCS5000=m
+CONFIG_TOUCHSCREEN_MMS114=m
+CONFIG_TOUCHSCREEN_MTOUCH=m
+CONFIG_TOUCHSCREEN_INEXIO=m
+CONFIG_TOUCHSCREEN_MK712=m
+CONFIG_TOUCHSCREEN_HTCPEN=m
+CONFIG_TOUCHSCREEN_PENMOUNT=m
+CONFIG_TOUCHSCREEN_EDT_FT5X06=m
+CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
+CONFIG_TOUCHSCREEN_TOUCHWIN=m
+CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m
+CONFIG_TOUCHSCREEN_UCB1400=m
+CONFIG_TOUCHSCREEN_PIXCIR=m
+CONFIG_TOUCHSCREEN_WM97XX=m
+CONFIG_TOUCHSCREEN_WM9705=y
+CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_WM9713=y
+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+CONFIG_TOUCHSCREEN_MC13783=m
+CONFIG_TOUCHSCREEN_USB_EGALAX=y
+CONFIG_TOUCHSCREEN_USB_PANJIT=y
+CONFIG_TOUCHSCREEN_USB_3M=y
+CONFIG_TOUCHSCREEN_USB_ITM=y
+CONFIG_TOUCHSCREEN_USB_ETURBO=y
+CONFIG_TOUCHSCREEN_USB_GUNZE=y
+CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
+CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
+CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
+CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
+CONFIG_TOUCHSCREEN_USB_GOTOP=y
+CONFIG_TOUCHSCREEN_USB_JASTEC=y
+CONFIG_TOUCHSCREEN_USB_ELO=y
+CONFIG_TOUCHSCREEN_USB_E2I=y
+CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
+CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
+CONFIG_TOUCHSCREEN_USB_NEXIO=y
+CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
+CONFIG_TOUCHSCREEN_TOUCHIT213=m
+CONFIG_TOUCHSCREEN_TSC_SERIO=m
+# CONFIG_TOUCHSCREEN_TSC2005 is not set
+CONFIG_TOUCHSCREEN_TSC2007=m
+CONFIG_TOUCHSCREEN_ST1232=m
+CONFIG_TOUCHSCREEN_TPS6507X=m
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_AD714X=m
+CONFIG_INPUT_AD714X_I2C=m
+CONFIG_INPUT_AD714X_SPI=m
+CONFIG_INPUT_BMA150=m
+CONFIG_INPUT_PCSPKR=m
+CONFIG_INPUT_MC13783_PWRBUTTON=m
+CONFIG_INPUT_MMA8450=m
+CONFIG_INPUT_MPU3050=m
+CONFIG_INPUT_APANEL=m
+CONFIG_INPUT_GP2A=m
+# CONFIG_INPUT_GPIO_TILT_POLLED is not set
+CONFIG_INPUT_WISTRON_BTNS=m
+CONFIG_INPUT_ATLAS_BTNS=m
+CONFIG_INPUT_ATI_REMOTE2=m
+CONFIG_INPUT_KEYSPAN_REMOTE=m
+CONFIG_INPUT_KXTJ9=m
+# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set
+CONFIG_INPUT_POWERMATE=m
+CONFIG_INPUT_YEALINK=m
+CONFIG_INPUT_CM109=m
+CONFIG_INPUT_RETU_PWRBUTTON=m
+CONFIG_INPUT_UINPUT=m
+CONFIG_INPUT_PCF50633_PMU=m
+CONFIG_INPUT_PCF8574=m
+CONFIG_INPUT_PWM_BEEPER=m
+CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
+CONFIG_INPUT_ADXL34X=m
+CONFIG_INPUT_ADXL34X_I2C=m
+CONFIG_INPUT_ADXL34X_SPI=m
+# CONFIG_INPUT_IMS_PCU is not set
+CONFIG_INPUT_CMA3000=m
+CONFIG_INPUT_CMA3000_I2C=m
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=m
+CONFIG_SERIO_CT82C710=m
+CONFIG_SERIO_PARKBD=m
+CONFIG_SERIO_PCIPS2=m
+CONFIG_SERIO_LIBPS2=y
+CONFIG_SERIO_RAW=m
+CONFIG_SERIO_ALTERA_PS2=m
+CONFIG_SERIO_PS2MULT=m
+CONFIG_SERIO_ARC_PS2=m
+CONFIG_SERIO_APBPS2=m
+CONFIG_GAMEPORT=m
+CONFIG_GAMEPORT_NS558=m
+CONFIG_GAMEPORT_L4=m
+CONFIG_GAMEPORT_EMU10K1=m
+CONFIG_GAMEPORT_FM801=m
+
+#
+# Character devices
+#
+CONFIG_TTY=y
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_VT_CONSOLE_SLEEP=y
+CONFIG_HW_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
+# CONFIG_LEGACY_PTYS is not set
+CONFIG_SERIAL_NONSTANDARD=y
+CONFIG_ROCKETPORT=m
+CONFIG_CYCLADES=m
+# CONFIG_CYZ_INTR is not set
+# CONFIG_MOXA_INTELLIO is not set
+# CONFIG_MOXA_SMARTIO is not set
+CONFIG_SYNCLINK=m
+CONFIG_SYNCLINKMP=m
+# CONFIG_SYNCLINK_GT is not set
+CONFIG_NOZOMI=m
+# CONFIG_ISI is not set
+CONFIG_N_HDLC=m
+CONFIG_N_GSM=m
+CONFIG_TRACE_ROUTER=m
+CONFIG_TRACE_SINK=m
+# CONFIG_DEVKMEM is not set
+# CONFIG_STALDRV is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
+CONFIG_SERIAL_8250_PNP=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_SERIAL_8250_DMA=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_CS=m
+CONFIG_SERIAL_8250_NR_UARTS=32
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
+CONFIG_SERIAL_8250_DW=m
+
+#
+# Non-8250 serial port support
+#
+# CONFIG_SERIAL_MAX3100 is not set
+# CONFIG_SERIAL_MAX310X is not set
+CONFIG_SERIAL_MFD_HSU=m
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_OF_PLATFORM=m
+CONFIG_SERIAL_SCCNXP=m
+# CONFIG_SERIAL_TIMBERDALE is not set
+CONFIG_SERIAL_ALTERA_JTAGUART=m
+CONFIG_SERIAL_ALTERA_UART=m
+CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
+CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
+# CONFIG_SERIAL_IFX6X60 is not set
+CONFIG_SERIAL_PCH_UART=m
+CONFIG_SERIAL_XILINX_PS_UART=m
+CONFIG_SERIAL_ARC=m
+CONFIG_SERIAL_ARC_NR_PORTS=1
+CONFIG_SERIAL_RP2=m
+CONFIG_SERIAL_RP2_NR_UARTS=32
+CONFIG_PRINTER=m
+# CONFIG_LP_CONSOLE is not set
+CONFIG_PPDEV=m
+CONFIG_HVC_DRIVER=y
+CONFIG_VIRTIO_CONSOLE=y
+CONFIG_IPMI_HANDLER=m
+# CONFIG_IPMI_PANIC_EVENT is not set
+CONFIG_IPMI_DEVICE_INTERFACE=m
+CONFIG_IPMI_SI=m
+CONFIG_IPMI_WATCHDOG=m
+CONFIG_IPMI_POWEROFF=m
+CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_TIMERIOMEM=m
+CONFIG_HW_RANDOM_INTEL=m
+CONFIG_HW_RANDOM_AMD=m
+CONFIG_HW_RANDOM_GEODE=m
+CONFIG_HW_RANDOM_VIA=m
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_HW_RANDOM_TPM=m
+CONFIG_NVRAM=m
+CONFIG_DTLK=m
+CONFIG_R3964=m
+CONFIG_APPLICOM=m
+CONFIG_SONYPI=m
+
+#
+# PCMCIA character devices
+#
+CONFIG_SYNCLINK_CS=m
+CONFIG_CARDMAN_4000=m
+CONFIG_CARDMAN_4040=m
+CONFIG_IPWIRELESS=m
+CONFIG_MWAVE=m
+CONFIG_PC8736x_GPIO=m
+CONFIG_NSC_GPIO=m
+# CONFIG_RAW_DRIVER is not set
+CONFIG_HPET=y
+CONFIG_HPET_MMAP=y
+CONFIG_HANGCHECK_TIMER=m
+CONFIG_TCG_TPM=m
+CONFIG_TCG_TIS=m
+CONFIG_TCG_TIS_I2C_INFINEON=m
+CONFIG_TCG_NSC=m
+CONFIG_TCG_ATMEL=m
+CONFIG_TCG_INFINEON=m
+CONFIG_TCG_ST33_I2C=m
+CONFIG_TELCLOCK=m
+CONFIG_DEVPORT=y
+CONFIG_I2C=m
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
+CONFIG_I2C_CHARDEV=m
+# CONFIG_I2C_MUX is not set
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_SMBUS=m
+CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOPCA=m
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# PC SMBus host controller drivers
+#
+CONFIG_I2C_ALI1535=m
+CONFIG_I2C_ALI1563=m
+CONFIG_I2C_ALI15X3=m
+CONFIG_I2C_AMD756=m
+CONFIG_I2C_AMD756_S4882=m
+CONFIG_I2C_AMD8111=m
+CONFIG_I2C_I801=m
+CONFIG_I2C_ISCH=m
+CONFIG_I2C_ISMT=m
+CONFIG_I2C_PIIX4=m
+CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_NFORCE2_S4985=m
+CONFIG_I2C_SIS5595=m
+CONFIG_I2C_SIS630=m
+CONFIG_I2C_SIS96X=m
+CONFIG_I2C_VIA=m
+CONFIG_I2C_VIAPRO=m
+
+#
+# ACPI drivers
+#
+CONFIG_I2C_SCMI=m
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+# CONFIG_I2C_CBUS_GPIO is not set
+CONFIG_I2C_DESIGNWARE_CORE=m
+CONFIG_I2C_DESIGNWARE_PCI=m
+CONFIG_I2C_EG20T=m
+# CONFIG_I2C_GPIO is not set
+CONFIG_I2C_INTEL_MID=m
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_PCA_PLATFORM=m
+CONFIG_I2C_PXA=m
+CONFIG_I2C_PXA_PCI=y
+CONFIG_I2C_SIMTEC=m
+CONFIG_I2C_XILINX=m
+
+#
+# External I2C/SMBus adapter drivers
+#
+CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_PARPORT=m
+CONFIG_I2C_PARPORT_LIGHT=m
+CONFIG_I2C_TAOS_EVM=m
+CONFIG_I2C_TINY_USB=m
+CONFIG_I2C_VIPERBOARD=m
+
+#
+# Other I2C/SMBus bus drivers
+#
+CONFIG_I2C_PCA_ISA=m
+CONFIG_SCx200_ACB=m
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+CONFIG_SPI=y
+# CONFIG_SPI_DEBUG is not set
+CONFIG_SPI_MASTER=y
+
+#
+# SPI Master Controller Drivers
+#
+# CONFIG_SPI_ALTERA is not set
+# CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_BUTTERFLY is not set
+# CONFIG_SPI_GPIO is not set
+# CONFIG_SPI_LM70_LLP is not set
+# CONFIG_SPI_FSL_SPI is not set
+# CONFIG_SPI_OC_TINY is not set
+# CONFIG_SPI_PXA2XX is not set
+# CONFIG_SPI_PXA2XX_PCI is not set
+# CONFIG_SPI_SC18IS602 is not set
+# CONFIG_SPI_TOPCLIFF_PCH is not set
+# CONFIG_SPI_XCOMM is not set
+# CONFIG_SPI_XILINX is not set
+# CONFIG_SPI_DESIGNWARE is not set
+
+#
+# SPI Protocol Masters
+#
+# CONFIG_SPI_SPIDEV is not set
+# CONFIG_SPI_TLE62X0 is not set
+
+#
+# Qualcomm MSM SSBI bus support
+#
+# CONFIG_SSBI is not set
+# CONFIG_HSI is not set
+
+#
+# PPS support
+#
+CONFIG_PPS=m
+# CONFIG_PPS_DEBUG is not set
+
+#
+# PPS clients support
+#
+CONFIG_PPS_CLIENT_KTIMER=m
+CONFIG_PPS_CLIENT_LDISC=m
+CONFIG_PPS_CLIENT_PARPORT=m
+CONFIG_PPS_CLIENT_GPIO=m
+
+#
+# PPS generators support
+#
+
+#
+# PTP clock support
+#
+CONFIG_PTP_1588_CLOCK=m
+CONFIG_DP83640_PHY=m
+CONFIG_PTP_1588_CLOCK_PCH=m
+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+CONFIG_GPIO_DEVRES=y
+CONFIG_GPIOLIB=y
+CONFIG_OF_GPIO=y
+CONFIG_GPIO_ACPI=y
+# CONFIG_DEBUG_GPIO is not set
+CONFIG_GPIO_SYSFS=y
+
+#
+# Memory mapped GPIO drivers:
+#
+# CONFIG_GPIO_GENERIC_PLATFORM is not set
+# CONFIG_GPIO_IT8761E is not set
+# CONFIG_GPIO_TS5500 is not set
+CONFIG_GPIO_SCH=m
+CONFIG_GPIO_ICH=m
+# CONFIG_GPIO_VX855 is not set
+# CONFIG_GPIO_LYNXPOINT is not set
+# CONFIG_GPIO_GRGPIO is not set
+
+#
+# I2C GPIO expanders:
+#
+CONFIG_GPIO_ARIZONA=m
+# CONFIG_GPIO_MAX7300 is not set
+# CONFIG_GPIO_MAX732X is not set
+# CONFIG_GPIO_PCA953X is not set
+# CONFIG_GPIO_PCF857X is not set
+# CONFIG_GPIO_ADP5588 is not set
+# CONFIG_GPIO_ADNP is not set
+
+#
+# PCI GPIO expanders:
+#
+CONFIG_GPIO_CS5535=y
+CONFIG_GPIO_AMD8111=m
+# CONFIG_GPIO_LANGWELL is not set
+# CONFIG_GPIO_PCH is not set
+# CONFIG_GPIO_ML_IOH is not set
+# CONFIG_GPIO_SODAVILLE is not set
+# CONFIG_GPIO_RDC321X is not set
+
+#
+# SPI GPIO expanders:
+#
+# CONFIG_GPIO_MAX7301 is not set
+# CONFIG_GPIO_MCP23S08 is not set
+# CONFIG_GPIO_MC33880 is not set
+# CONFIG_GPIO_74X164 is not set
+
+#
+# AC97 GPIO expanders:
+#
+CONFIG_GPIO_UCB1400=y
+
+#
+# MODULbus GPIO expanders:
+#
+
+#
+# USB GPIO expanders:
+#
+CONFIG_GPIO_VIPERBOARD=m
+# CONFIG_W1 is not set
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_PDA_POWER=m
+CONFIG_TEST_POWER=m
+# CONFIG_BATTERY_DS2780 is not set
+# CONFIG_BATTERY_DS2781 is not set
+# CONFIG_BATTERY_DS2782 is not set
+CONFIG_BATTERY_OLPC=m
+# CONFIG_BATTERY_SBS is not set
+# CONFIG_BATTERY_BQ27x00 is not set
+# CONFIG_BATTERY_MAX17040 is not set
+# CONFIG_BATTERY_MAX17042 is not set
+# CONFIG_CHARGER_PCF50633 is not set
+# CONFIG_CHARGER_ISP1704 is not set
+# CONFIG_CHARGER_MAX8903 is not set
+# CONFIG_CHARGER_LP8727 is not set
+# CONFIG_CHARGER_GPIO is not set
+# CONFIG_CHARGER_BQ2415X is not set
+# CONFIG_CHARGER_SMB347 is not set
+# CONFIG_BATTERY_GOLDFISH is not set
+CONFIG_POWER_RESET=y
+CONFIG_POWER_RESET_GPIO=y
+CONFIG_POWER_AVS=y
+CONFIG_HWMON=y
+CONFIG_HWMON_VID=m
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
+CONFIG_SENSORS_ABITUGURU=m
+CONFIG_SENSORS_ABITUGURU3=m
+# CONFIG_SENSORS_AD7314 is not set
+CONFIG_SENSORS_AD7414=m
+CONFIG_SENSORS_AD7418=m
+# CONFIG_SENSORS_ADCXX is not set
+CONFIG_SENSORS_ADM1021=m
+CONFIG_SENSORS_ADM1025=m
+CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
+CONFIG_SENSORS_ADM1031=m
+CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_ADT7X10=m
+CONFIG_SENSORS_ADT7310=m
+CONFIG_SENSORS_ADT7410=m
+CONFIG_SENSORS_ADT7411=m
+CONFIG_SENSORS_ADT7462=m
+CONFIG_SENSORS_ADT7470=m
+CONFIG_SENSORS_ADT7475=m
+CONFIG_SENSORS_ASC7621=m
+CONFIG_SENSORS_K8TEMP=m
+CONFIG_SENSORS_K10TEMP=m
+CONFIG_SENSORS_FAM15H_POWER=m
+CONFIG_SENSORS_ASB100=m
+CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_DS620=m
+CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_I5K_AMB=m
+CONFIG_SENSORS_F71805F=m
+CONFIG_SENSORS_F71882FG=m
+CONFIG_SENSORS_F75375S=m
+CONFIG_SENSORS_FSCHMD=m
+CONFIG_SENSORS_G760A=m
+CONFIG_SENSORS_GL518SM=m
+CONFIG_SENSORS_GL520SM=m
+# CONFIG_SENSORS_GPIO_FAN is not set
+CONFIG_SENSORS_HIH6130=m
+CONFIG_SENSORS_CORETEMP=m
+CONFIG_SENSORS_IBMAEM=m
+CONFIG_SENSORS_IBMPEX=m
+CONFIG_SENSORS_IT87=m
+CONFIG_SENSORS_JC42=m
+CONFIG_SENSORS_LINEAGE=m
+CONFIG_SENSORS_LM63=m
+# CONFIG_SENSORS_LM70 is not set
+CONFIG_SENSORS_LM73=m
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM77=m
+CONFIG_SENSORS_LM78=m
+CONFIG_SENSORS_LM80=m
+CONFIG_SENSORS_LM83=m
+CONFIG_SENSORS_LM85=m
+CONFIG_SENSORS_LM87=m
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_LM92=m
+CONFIG_SENSORS_LM93=m
+CONFIG_SENSORS_LTC4151=m
+CONFIG_SENSORS_LTC4215=m
+CONFIG_SENSORS_LTC4245=m
+CONFIG_SENSORS_LTC4261=m
+CONFIG_SENSORS_LM95234=m
+CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_LM95245=m
+# CONFIG_SENSORS_MAX1111 is not set
+CONFIG_SENSORS_MAX16065=m
+CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX1668=m
+CONFIG_SENSORS_MAX197=m
+CONFIG_SENSORS_MAX6639=m
+CONFIG_SENSORS_MAX6642=m
+CONFIG_SENSORS_MAX6650=m
+CONFIG_SENSORS_MAX6697=m
+CONFIG_SENSORS_MCP3021=m
+CONFIG_SENSORS_NCT6775=m
+CONFIG_SENSORS_PC87360=m
+CONFIG_SENSORS_PC87427=m
+CONFIG_SENSORS_PCF8591=m
+CONFIG_PMBUS=m
+CONFIG_SENSORS_PMBUS=m
+CONFIG_SENSORS_ADM1275=m
+CONFIG_SENSORS_LM25066=m
+CONFIG_SENSORS_LTC2978=m
+CONFIG_SENSORS_MAX16064=m
+CONFIG_SENSORS_MAX34440=m
+CONFIG_SENSORS_MAX8688=m
+CONFIG_SENSORS_UCD9000=m
+CONFIG_SENSORS_UCD9200=m
+CONFIG_SENSORS_ZL6100=m
+CONFIG_SENSORS_SHT15=m
+CONFIG_SENSORS_SHT21=m
+CONFIG_SENSORS_SIS5595=m
+CONFIG_SENSORS_SMM665=m
+CONFIG_SENSORS_DME1737=m
+CONFIG_SENSORS_EMC1403=m
+CONFIG_SENSORS_EMC2103=m
+CONFIG_SENSORS_EMC6W201=m
+CONFIG_SENSORS_SMSC47M1=m
+CONFIG_SENSORS_SMSC47M192=m
+CONFIG_SENSORS_SMSC47B397=m
+CONFIG_SENSORS_SCH56XX_COMMON=m
+CONFIG_SENSORS_SCH5627=m
+CONFIG_SENSORS_SCH5636=m
+CONFIG_SENSORS_ADS1015=m
+CONFIG_SENSORS_ADS7828=m
+# CONFIG_SENSORS_ADS7871 is not set
+CONFIG_SENSORS_AMC6821=m
+CONFIG_SENSORS_INA209=m
+CONFIG_SENSORS_INA2XX=m
+CONFIG_SENSORS_THMC50=m
+CONFIG_SENSORS_TMP102=m
+CONFIG_SENSORS_TMP401=m
+CONFIG_SENSORS_TMP421=m
+CONFIG_SENSORS_VIA_CPUTEMP=m
+CONFIG_SENSORS_VIA686A=m
+CONFIG_SENSORS_VT1211=m
+CONFIG_SENSORS_VT8231=m
+CONFIG_SENSORS_W83781D=m
+CONFIG_SENSORS_W83791D=m
+CONFIG_SENSORS_W83792D=m
+CONFIG_SENSORS_W83793=m
+CONFIG_SENSORS_W83795=m
+# CONFIG_SENSORS_W83795_FANCTRL is not set
+CONFIG_SENSORS_W83L785TS=m
+CONFIG_SENSORS_W83L786NG=m
+CONFIG_SENSORS_W83627HF=m
+CONFIG_SENSORS_W83627EHF=m
+CONFIG_SENSORS_APPLESMC=m
+CONFIG_SENSORS_MC13783_ADC=m
+
+#
+# ACPI drivers
+#
+CONFIG_SENSORS_ACPI_POWER=m
+CONFIG_SENSORS_ATK0110=m
+CONFIG_THERMAL=y
+CONFIG_THERMAL_HWMON=y
+CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
+# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
+CONFIG_THERMAL_GOV_FAIR_SHARE=y
+CONFIG_THERMAL_GOV_STEP_WISE=y
+# CONFIG_THERMAL_GOV_USER_SPACE is not set
+# CONFIG_CPU_THERMAL is not set
+# CONFIG_THERMAL_EMULATION is not set
+CONFIG_INTEL_POWERCLAMP=m
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+
+#
+# Watchdog Device Drivers
+#
+CONFIG_SOFT_WATCHDOG=m
+CONFIG_RETU_WATCHDOG=m
+CONFIG_ACQUIRE_WDT=m
+CONFIG_ADVANTECH_WDT=m
+CONFIG_ALIM1535_WDT=m
+CONFIG_ALIM7101_WDT=m
+CONFIG_F71808E_WDT=m
+CONFIG_SP5100_TCO=m
+CONFIG_GEODE_WDT=m
+CONFIG_SC520_WDT=m
+CONFIG_SBC_FITPC2_WATCHDOG=m
+CONFIG_EUROTECH_WDT=m
+CONFIG_IB700_WDT=m
+CONFIG_IBMASR=m
+CONFIG_WAFER_WDT=m
+CONFIG_I6300ESB_WDT=m
+CONFIG_IE6XX_WDT=m
+CONFIG_ITCO_WDT=m
+CONFIG_ITCO_VENDOR_SUPPORT=y
+CONFIG_IT8712F_WDT=m
+CONFIG_IT87_WDT=m
+CONFIG_HP_WATCHDOG=m
+CONFIG_HPWDT_NMI_DECODING=y
+CONFIG_SC1200_WDT=m
+CONFIG_PC87413_WDT=m
+CONFIG_NV_TCO=m
+CONFIG_60XX_WDT=m
+CONFIG_SBC8360_WDT=m
+CONFIG_SBC7240_WDT=m
+CONFIG_CPU5_WDT=m
+CONFIG_SMSC_SCH311X_WDT=m
+CONFIG_SMSC37B787_WDT=m
+CONFIG_VIA_WDT=m
+CONFIG_W83627HF_WDT=m
+CONFIG_W83697HF_WDT=m
+CONFIG_W83697UG_WDT=m
+CONFIG_W83877F_WDT=m
+CONFIG_W83977F_WDT=m
+CONFIG_MACHZ_WDT=m
+CONFIG_SBC_EPX_C3_WATCHDOG=m
+
+#
+# ISA-based Watchdog Cards
+#
+CONFIG_PCWATCHDOG=m
+CONFIG_MIXCOMWD=m
+CONFIG_WDT=m
+
+#
+# PCI-based Watchdog Cards
+#
+CONFIG_PCIPCWATCHDOG=m
+CONFIG_WDTPCI=m
+
+#
+# USB-based Watchdog Cards
+#
+CONFIG_USBPCWATCHDOG=m
+CONFIG_SSB_POSSIBLE=y
+
+#
+# Sonics Silicon Backplane
+#
+CONFIG_SSB=m
+CONFIG_SSB_SPROM=y
+CONFIG_SSB_BLOCKIO=y
+CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_B43_PCI_BRIDGE=y
+CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
+CONFIG_SSB_PCMCIAHOST=y
+CONFIG_SSB_SDIOHOST_POSSIBLE=y
+CONFIG_SSB_SDIOHOST=y
+# CONFIG_SSB_DEBUG is not set
+CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_DRIVER_PCICORE=y
+CONFIG_SSB_DRIVER_GPIO=y
+CONFIG_BCMA_POSSIBLE=y
+
+#
+# Broadcom specific AMBA
+#
+CONFIG_BCMA=m
+CONFIG_BCMA_BLOCKIO=y
+CONFIG_BCMA_HOST_PCI_POSSIBLE=y
+CONFIG_BCMA_HOST_PCI=y
+CONFIG_BCMA_DRIVER_GMAC_CMN=y
+CONFIG_BCMA_DRIVER_GPIO=y
+# CONFIG_BCMA_DEBUG is not set
+
+#
+# Multifunction device drivers
+#
+CONFIG_MFD_CORE=y
+CONFIG_MFD_CS5535=m
+# CONFIG_MFD_CROS_EC is not set
+# CONFIG_MFD_DA9052_SPI is not set
+CONFIG_MFD_MC13783=m
+CONFIG_MFD_MC13XXX=m
+# CONFIG_MFD_MC13XXX_SPI is not set
+CONFIG_MFD_MC13XXX_I2C=m
+CONFIG_HTC_PASIC3=m
+CONFIG_LPC_ICH=m
+CONFIG_LPC_SCH=m
+# CONFIG_MFD_JANZ_CMODIO is not set
+# CONFIG_EZX_PCAP is not set
+CONFIG_MFD_VIPERBOARD=m
+CONFIG_MFD_RETU=m
+CONFIG_MFD_PCF50633=m
+CONFIG_PCF50633_ADC=m
+CONFIG_PCF50633_GPIO=m
+CONFIG_UCB1400_CORE=m
+CONFIG_MFD_RDC321X=m
+CONFIG_MFD_RTSX_PCI=m
+CONFIG_MFD_SI476X_CORE=m
+CONFIG_MFD_SM501=m
+CONFIG_MFD_SM501_GPIO=y
+CONFIG_ABX500_CORE=y
+# CONFIG_MFD_STMPE is not set
+# CONFIG_MFD_SYSCON is not set
+CONFIG_MFD_TI_AM335X_TSCADC=m
+# CONFIG_TPS6105X is not set
+CONFIG_TPS65010=m
+CONFIG_TPS6507X=m
+CONFIG_MFD_TPS65217=m
+# CONFIG_MFD_TPS65912 is not set
+# CONFIG_MFD_TPS65912_SPI is not set
+CONFIG_MFD_WL1273_CORE=m
+CONFIG_MFD_LM3533=m
+# CONFIG_MFD_TIMBERDALE is not set
+# CONFIG_MFD_TMIO is not set
+CONFIG_MFD_VX855=m
+CONFIG_MFD_ARIZONA=y
+CONFIG_MFD_ARIZONA_I2C=m
+# CONFIG_MFD_ARIZONA_SPI is not set
+CONFIG_MFD_WM5102=y
+CONFIG_MFD_WM5110=y
+# CONFIG_MFD_WM831X_SPI is not set
+# CONFIG_REGULATOR is not set
+CONFIG_MEDIA_SUPPORT=m
+
+#
+# Multimedia core support
+#
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
+CONFIG_MEDIA_RADIO_SUPPORT=y
+CONFIG_MEDIA_RC_SUPPORT=y
+CONFIG_MEDIA_CONTROLLER=y
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2_SUBDEV_API=y
+CONFIG_VIDEO_V4L2=m
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+CONFIG_VIDEO_TUNER=m
+CONFIG_V4L2_MEM2MEM_DEV=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_DMA_SG=m
+CONFIG_VIDEOBUF_VMALLOC=m
+CONFIG_VIDEOBUF_DVB=m
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_DMA_CONTIG=m
+CONFIG_VIDEOBUF2_VMALLOC=m
+CONFIG_VIDEOBUF2_DMA_SG=m
+# CONFIG_VIDEO_V4L2_INT_DEVICE is not set
+CONFIG_DVB_CORE=m
+CONFIG_DVB_NET=y
+CONFIG_TTPCI_EEPROM=m
+CONFIG_DVB_MAX_ADAPTERS=8
+# CONFIG_DVB_DYNAMIC_MINORS is not set
+
+#
+# Media drivers
+#
+CONFIG_RC_CORE=m
+CONFIG_RC_MAP=m
+CONFIG_RC_DECODERS=y
+CONFIG_LIRC=m
+CONFIG_IR_LIRC_CODEC=m
+CONFIG_IR_NEC_DECODER=m
+CONFIG_IR_RC5_DECODER=m
+CONFIG_IR_RC6_DECODER=m
+CONFIG_IR_JVC_DECODER=m
+CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_RC5_SZ_DECODER=m
+CONFIG_IR_SANYO_DECODER=m
+CONFIG_IR_MCE_KBD_DECODER=m
+CONFIG_RC_DEVICES=y
+CONFIG_RC_ATI_REMOTE=m
+CONFIG_IR_ENE=m
+CONFIG_IR_IMON=m
+CONFIG_IR_MCEUSB=m
+CONFIG_IR_ITE_CIR=m
+CONFIG_IR_FINTEK=m
+CONFIG_IR_NUVOTON=m
+CONFIG_IR_REDRAT3=m
+CONFIG_IR_STREAMZAP=m
+CONFIG_IR_WINBOND_CIR=m
+CONFIG_IR_IGUANA=m
+CONFIG_IR_TTUSBIR=m
+CONFIG_RC_LOOPBACK=m
+CONFIG_IR_GPIO_CIR=m
+CONFIG_MEDIA_USB_SUPPORT=y
+
+#
+# Webcam devices
+#
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+CONFIG_USB_GSPCA=m
+CONFIG_USB_M5602=m
+CONFIG_USB_STV06XX=m
+CONFIG_USB_GL860=m
+CONFIG_USB_GSPCA_BENQ=m
+CONFIG_USB_GSPCA_CONEX=m
+CONFIG_USB_GSPCA_CPIA1=m
+CONFIG_USB_GSPCA_ETOMS=m
+CONFIG_USB_GSPCA_FINEPIX=m
+CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_JL2005BCD=m
+CONFIG_USB_GSPCA_KINECT=m
+CONFIG_USB_GSPCA_KONICA=m
+CONFIG_USB_GSPCA_MARS=m
+CONFIG_USB_GSPCA_MR97310A=m
+CONFIG_USB_GSPCA_NW80X=m
+CONFIG_USB_GSPCA_OV519=m
+CONFIG_USB_GSPCA_OV534=m
+CONFIG_USB_GSPCA_OV534_9=m
+CONFIG_USB_GSPCA_PAC207=m
+CONFIG_USB_GSPCA_PAC7302=m
+CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SE401=m
+CONFIG_USB_GSPCA_SN9C2028=m
+CONFIG_USB_GSPCA_SN9C20X=m
+CONFIG_USB_GSPCA_SONIXB=m
+CONFIG_USB_GSPCA_SONIXJ=m
+CONFIG_USB_GSPCA_SPCA500=m
+CONFIG_USB_GSPCA_SPCA501=m
+CONFIG_USB_GSPCA_SPCA505=m
+CONFIG_USB_GSPCA_SPCA506=m
+CONFIG_USB_GSPCA_SPCA508=m
+CONFIG_USB_GSPCA_SPCA561=m
+CONFIG_USB_GSPCA_SPCA1528=m
+CONFIG_USB_GSPCA_SQ905=m
+CONFIG_USB_GSPCA_SQ905C=m
+CONFIG_USB_GSPCA_SQ930X=m
+CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STV0680=m
+CONFIG_USB_GSPCA_SUNPLUS=m
+CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TOPRO=m
+CONFIG_USB_GSPCA_TV8532=m
+CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_VICAM=m
+CONFIG_USB_GSPCA_XIRLINK_CIT=m
+CONFIG_USB_GSPCA_ZC3XX=m
+CONFIG_USB_PWC=m
+# CONFIG_USB_PWC_DEBUG is not set
+CONFIG_USB_PWC_INPUT_EVDEV=y
+CONFIG_VIDEO_CPIA2=m
+CONFIG_USB_ZR364XX=m
+CONFIG_USB_STKWEBCAM=m
+CONFIG_USB_S2255=m
+CONFIG_USB_SN9C102=m
+
+#
+# Analog TV USB devices
+#
+CONFIG_VIDEO_PVRUSB2=m
+CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_PVRUSB2_DVB=y
+# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
+CONFIG_VIDEO_HDPVR=m
+CONFIG_VIDEO_TLG2300=m
+CONFIG_VIDEO_USBVISION=m
+CONFIG_VIDEO_STK1160=m
+CONFIG_VIDEO_STK1160_AC97=y
+
+#
+# Analog/digital TV USB devices
+#
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_AU0828_V4L2=y
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_RC=y
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
+CONFIG_VIDEO_TM6000=m
+CONFIG_VIDEO_TM6000_ALSA=m
+CONFIG_VIDEO_TM6000_DVB=m
+
+#
+# Digital TV USB devices
+#
+CONFIG_DVB_USB=m
+# CONFIG_DVB_USB_DEBUG is not set
+CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_DIBUSB_MB=m
+CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
+CONFIG_DVB_USB_DIBUSB_MC=m
+CONFIG_DVB_USB_DIB0700=m
+CONFIG_DVB_USB_UMT_010=m
+CONFIG_DVB_USB_CXUSB=m
+CONFIG_DVB_USB_M920X=m
+CONFIG_DVB_USB_DIGITV=m
+CONFIG_DVB_USB_VP7045=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_OPERA1=m
+CONFIG_DVB_USB_AF9005=m
+CONFIG_DVB_USB_AF9005_REMOTE=m
+CONFIG_DVB_USB_PCTV452E=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_FRIIO=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_USB_V2=m
+CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_AF9035=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_AZ6007=m
+CONFIG_DVB_USB_CE6230=m
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_IT913X=m
+CONFIG_DVB_USB_LME2510=m
+CONFIG_DVB_USB_MXL111SF=m
+CONFIG_DVB_USB_RTL28XXU=m
+CONFIG_DVB_TTUSB_BUDGET=m
+CONFIG_DVB_TTUSB_DEC=m
+CONFIG_SMS_USB_DRV=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
+
+#
+# Webcam, TV (analog/digital) USB devices
+#
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_EM28XX_RC=m
+CONFIG_MEDIA_PCI_SUPPORT=y
+
+#
+# Media capture support
+#
+CONFIG_VIDEO_MEYE=m
+
+#
+# Media capture/analog TV support
+#
+CONFIG_VIDEO_IVTV=m
+CONFIG_VIDEO_IVTV_ALSA=m
+CONFIG_VIDEO_FB_IVTV=m
+CONFIG_VIDEO_ZORAN=m
+CONFIG_VIDEO_ZORAN_DC30=m
+CONFIG_VIDEO_ZORAN_ZR36060=m
+CONFIG_VIDEO_ZORAN_BUZ=m
+CONFIG_VIDEO_ZORAN_DC10=m
+CONFIG_VIDEO_ZORAN_LML33=m
+CONFIG_VIDEO_ZORAN_LML33R10=m
+CONFIG_VIDEO_ZORAN_AVS6EYES=m
+CONFIG_VIDEO_HEXIUM_GEMINI=m
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_MXB=m
+
+#
+# Media capture/analog/hybrid TV support
+#
+CONFIG_VIDEO_CX18=m
+CONFIG_VIDEO_CX18_ALSA=m
+CONFIG_VIDEO_CX23885=m
+CONFIG_MEDIA_ALTERA_CI=m
+CONFIG_VIDEO_CX25821=m
+CONFIG_VIDEO_CX25821_ALSA=m
+CONFIG_VIDEO_CX88=m
+CONFIG_VIDEO_CX88_ALSA=m
+CONFIG_VIDEO_CX88_BLACKBIRD=m
+CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_VP3054=m
+CONFIG_VIDEO_CX88_MPEG=m
+CONFIG_VIDEO_BT848=m
+CONFIG_DVB_BT8XX=m
+CONFIG_VIDEO_SAA7134=m
+CONFIG_VIDEO_SAA7134_ALSA=m
+CONFIG_VIDEO_SAA7134_RC=y
+CONFIG_VIDEO_SAA7134_DVB=m
+CONFIG_VIDEO_SAA7164=m
+
+#
+# Media digital TV PCI Adapters
+#
+CONFIG_DVB_AV7110=m
+CONFIG_DVB_AV7110_OSD=y
+CONFIG_DVB_BUDGET_CORE=m
+CONFIG_DVB_BUDGET=m
+CONFIG_DVB_BUDGET_CI=m
+CONFIG_DVB_BUDGET_AV=m
+CONFIG_DVB_BUDGET_PATCH=m
+CONFIG_DVB_B2C2_FLEXCOP_PCI=m
+# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
+CONFIG_DVB_PLUTO2=m
+CONFIG_DVB_DM1105=m
+CONFIG_DVB_PT1=m
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
+CONFIG_DVB_HOPPER=m
+CONFIG_DVB_NGENE=m
+CONFIG_DVB_DDBRIDGE=m
+# CONFIG_V4L_PLATFORM_DRIVERS is not set
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
+CONFIG_VIDEO_SH_VEU=m
+# CONFIG_V4L_TEST_DRIVERS is not set
+
+#
+# Supported MMC/SDIO adapters
+#
+CONFIG_SMS_SDIO_DRV=m
+CONFIG_MEDIA_PARPORT_SUPPORT=y
+CONFIG_VIDEO_BWQCAM=m
+CONFIG_VIDEO_CQCAM=m
+CONFIG_VIDEO_PMS=m
+CONFIG_VIDEO_W9966=m
+CONFIG_RADIO_ADAPTERS=y
+CONFIG_RADIO_SI470X=y
+CONFIG_USB_SI470X=m
+CONFIG_I2C_SI470X=m
+CONFIG_USB_MR800=m
+CONFIG_USB_DSBR=m
+CONFIG_RADIO_MAXIRADIO=m
+CONFIG_RADIO_SHARK=m
+CONFIG_RADIO_SHARK2=m
+CONFIG_I2C_SI4713=m
+CONFIG_RADIO_SI4713=m
+CONFIG_USB_KEENE=m
+CONFIG_USB_MA901=m
+CONFIG_RADIO_TEA5764=m
+CONFIG_RADIO_SAA7706H=m
+CONFIG_RADIO_TEF6862=m
+CONFIG_RADIO_WL1273=m
+
+#
+# Texas Instruments WL128x FM driver (ST based)
+#
+CONFIG_RADIO_WL128X=m
+# CONFIG_V4L_RADIO_ISA_DRIVERS is not set
+
+#
+# Supported FireWire (IEEE 1394) Adapters
+#
+CONFIG_DVB_FIREDTV=m
+CONFIG_DVB_FIREDTV_INPUT=y
+CONFIG_MEDIA_COMMON_OPTIONS=y
+
+#
+# common driver options
+#
+CONFIG_VIDEO_CX2341X=m
+CONFIG_VIDEO_BTCX=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_CYPRESS_FIRMWARE=m
+CONFIG_DVB_B2C2_FLEXCOP=m
+CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
+CONFIG_SMS_SIANO_MDTV=m
+CONFIG_SMS_SIANO_RC=y
+# CONFIG_SMS_SIANO_DEBUGFS is not set
+
+#
+# Media ancillary drivers (tuners, sensors, i2c, frontends)
+#
+CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
+CONFIG_MEDIA_ATTACH=y
+CONFIG_VIDEO_IR_I2C=m
+
+#
+# Audio decoders, processors and mixers
+#
+CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_TDA9840=m
+CONFIG_VIDEO_TEA6415C=m
+CONFIG_VIDEO_TEA6420=m
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_CS5345=m
+CONFIG_VIDEO_CS53L32A=m
+CONFIG_VIDEO_UDA1342=m
+CONFIG_VIDEO_WM8775=m
+CONFIG_VIDEO_WM8739=m
+CONFIG_VIDEO_VP27SMPX=m
+CONFIG_VIDEO_SONY_BTF_MPX=m
+
+#
+# RDS decoders
+#
+CONFIG_VIDEO_SAA6588=m
+
+#
+# Video decoders
+#
+CONFIG_VIDEO_BT819=m
+CONFIG_VIDEO_BT856=m
+CONFIG_VIDEO_BT866=m
+CONFIG_VIDEO_KS0127=m
+CONFIG_VIDEO_SAA7110=m
+CONFIG_VIDEO_SAA711X=m
+CONFIG_VIDEO_TVP5150=m
+CONFIG_VIDEO_TW2804=m
+CONFIG_VIDEO_TW9903=m
+CONFIG_VIDEO_TW9906=m
+CONFIG_VIDEO_VPX3220=m
+
+#
+# Video and audio decoders
+#
+CONFIG_VIDEO_SAA717X=m
+CONFIG_VIDEO_CX25840=m
+
+#
+# Video encoders
+#
+CONFIG_VIDEO_SAA7127=m
+CONFIG_VIDEO_SAA7185=m
+CONFIG_VIDEO_ADV7170=m
+CONFIG_VIDEO_ADV7175=m
+
+#
+# Camera sensor devices
+#
+CONFIG_VIDEO_OV7640=m
+CONFIG_VIDEO_MT9V011=m
+
+#
+# Flash devices
+#
+
+#
+# Video improvement chips
+#
+CONFIG_VIDEO_UPD64031A=m
+CONFIG_VIDEO_UPD64083=m
+
+#
+# Miscelaneous helper chips
+#
+CONFIG_VIDEO_M52790=m
+
+#
+# Sensors used on soc_camera driver
+#
+CONFIG_MEDIA_TUNER=m
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_MT2060=m
+CONFIG_MEDIA_TUNER_MT2063=m
+CONFIG_MEDIA_TUNER_MT2266=m
+CONFIG_MEDIA_TUNER_MT2131=m
+CONFIG_MEDIA_TUNER_QT1010=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
+CONFIG_MEDIA_TUNER_MXL5005S=m
+CONFIG_MEDIA_TUNER_MXL5007T=m
+CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
+CONFIG_MEDIA_TUNER_TDA18218=m
+CONFIG_MEDIA_TUNER_FC0011=m
+CONFIG_MEDIA_TUNER_FC0012=m
+CONFIG_MEDIA_TUNER_FC0013=m
+CONFIG_MEDIA_TUNER_TDA18212=m
+CONFIG_MEDIA_TUNER_E4000=m
+CONFIG_MEDIA_TUNER_FC2580=m
+CONFIG_MEDIA_TUNER_TUA9001=m
+CONFIG_MEDIA_TUNER_IT913X=m
+CONFIG_MEDIA_TUNER_R820T=m
+
+#
+# Multistandard (satellite) frontends
+#
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
+CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV6110x=m
+
+#
+# Multistandard (cable + terrestrial) frontends
+#
+CONFIG_DVB_DRXK=m
+CONFIG_DVB_TDA18271C2DD=m
+
+#
+# DVB-S (satellite) frontends
+#
+CONFIG_DVB_CX24110=m
+CONFIG_DVB_CX24123=m
+CONFIG_DVB_MT312=m
+CONFIG_DVB_ZL10036=m
+CONFIG_DVB_ZL10039=m
+CONFIG_DVB_S5H1420=m
+CONFIG_DVB_STV0288=m
+CONFIG_DVB_STB6000=m
+CONFIG_DVB_STV0299=m
+CONFIG_DVB_STV6110=m
+CONFIG_DVB_STV0900=m
+CONFIG_DVB_TDA8083=m
+CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TDA8261=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_TUNER_ITD1000=m
+CONFIG_DVB_TUNER_CX24113=m
+CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TUA6100=m
+CONFIG_DVB_CX24116=m
+CONFIG_DVB_SI21XX=m
+CONFIG_DVB_TS2020=m
+CONFIG_DVB_DS3000=m
+CONFIG_DVB_MB86A16=m
+CONFIG_DVB_TDA10071=m
+
+#
+# DVB-T (terrestrial) frontends
+#
+CONFIG_DVB_SP8870=m
+CONFIG_DVB_SP887X=m
+CONFIG_DVB_CX22700=m
+CONFIG_DVB_CX22702=m
+CONFIG_DVB_DRXD=m
+CONFIG_DVB_L64781=m
+CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_NXT6000=m
+CONFIG_DVB_MT352=m
+CONFIG_DVB_ZL10353=m
+CONFIG_DVB_DIB3000MB=m
+CONFIG_DVB_DIB3000MC=m
+CONFIG_DVB_DIB7000M=m
+CONFIG_DVB_DIB7000P=m
+CONFIG_DVB_TDA10048=m
+CONFIG_DVB_AF9013=m
+CONFIG_DVB_EC100=m
+CONFIG_DVB_STV0367=m
+CONFIG_DVB_CXD2820R=m
+CONFIG_DVB_RTL2830=m
+CONFIG_DVB_RTL2832=m
+
+#
+# DVB-C (cable) frontends
+#
+CONFIG_DVB_VES1820=m
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
+CONFIG_DVB_STV0297=m
+
+#
+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
+#
+CONFIG_DVB_NXT200X=m
+CONFIG_DVB_OR51211=m
+CONFIG_DVB_OR51132=m
+CONFIG_DVB_BCM3510=m
+CONFIG_DVB_LGDT330X=m
+CONFIG_DVB_LGDT3305=m
+CONFIG_DVB_LG2160=m
+CONFIG_DVB_S5H1409=m
+CONFIG_DVB_AU8522=m
+CONFIG_DVB_AU8522_DTV=m
+CONFIG_DVB_AU8522_V4L=m
+CONFIG_DVB_S5H1411=m
+
+#
+# ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_S921=m
+CONFIG_DVB_DIB8000=m
+CONFIG_DVB_MB86A20S=m
+
+#
+# Digital terrestrial only tuners/PLL
+#
+CONFIG_DVB_PLL=m
+CONFIG_DVB_TUNER_DIB0070=m
+CONFIG_DVB_TUNER_DIB0090=m
+
+#
+# SEC control devices for DVB-S
+#
+CONFIG_DVB_LNBP21=m
+CONFIG_DVB_LNBP22=m
+CONFIG_DVB_ISL6405=m
+CONFIG_DVB_ISL6421=m
+CONFIG_DVB_ISL6423=m
+CONFIG_DVB_A8293=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
+CONFIG_DVB_TDA665x=m
+CONFIG_DVB_IX2505V=m
+CONFIG_DVB_IT913X_FE=m
+CONFIG_DVB_M88RS2000=m
+CONFIG_DVB_AF9033=m
+
+#
+# Tools to develop new frontends
+#
+# CONFIG_DVB_DUMMY_FE is not set
+
+#
+# Graphics support
+#
+CONFIG_AGP=m
+CONFIG_AGP_ALI=m
+CONFIG_AGP_ATI=m
+CONFIG_AGP_AMD=m
+CONFIG_AGP_AMD64=m
+CONFIG_AGP_INTEL=m
+CONFIG_AGP_NVIDIA=m
+CONFIG_AGP_SIS=m
+CONFIG_AGP_SWORKS=m
+CONFIG_AGP_VIA=m
+CONFIG_AGP_EFFICEON=m
+CONFIG_VGA_ARB=y
+CONFIG_VGA_ARB_MAX_GPUS=16
+CONFIG_VGA_SWITCHEROO=y
+CONFIG_DRM=m
+CONFIG_DRM_USB=m
+CONFIG_DRM_KMS_HELPER=m
+CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+CONFIG_DRM_TTM=m
+
+#
+# I2C encoder or helper chips
+#
+CONFIG_DRM_I2C_CH7006=m
+CONFIG_DRM_I2C_SIL164=m
+CONFIG_DRM_I2C_NXP_TDA998X=m
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_R128=m
+CONFIG_DRM_RADEON=m
+# CONFIG_DRM_RADEON_UMS is not set
+CONFIG_DRM_NOUVEAU=m
+CONFIG_NOUVEAU_DEBUG=5
+CONFIG_NOUVEAU_DEBUG_DEFAULT=3
+CONFIG_DRM_NOUVEAU_BACKLIGHT=y
+CONFIG_DRM_I915=m
+CONFIG_DRM_I915_KMS=y
+CONFIG_DRM_MGA=m
+CONFIG_DRM_SIS=m
+CONFIG_DRM_VIA=m
+CONFIG_DRM_SAVAGE=m
+CONFIG_DRM_VMWGFX=m
+CONFIG_DRM_VMWGFX_FBCON=y
+CONFIG_DRM_GMA500=m
+CONFIG_DRM_GMA600=y
+CONFIG_DRM_GMA3600=y
+CONFIG_DRM_UDL=m
+CONFIG_DRM_AST=m
+CONFIG_DRM_MGAG200=m
+CONFIG_DRM_CIRRUS_QEMU=m
+CONFIG_DRM_QXL=m
+CONFIG_VGASTATE=m
+CONFIG_VIDEO_OUTPUT_CONTROL=m
+CONFIG_HDMI=y
+CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+CONFIG_FB_DDC=m
+CONFIG_FB_BOOT_VESA_SUPPORT=y
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+CONFIG_FB_SYS_FILLRECT=m
+CONFIG_FB_SYS_COPYAREA=m
+CONFIG_FB_SYS_IMAGEBLIT=m
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+CONFIG_FB_SYS_FOPS=m
+CONFIG_FB_DEFERRED_IO=y
+# CONFIG_FB_SVGALIB is not set
+# CONFIG_FB_MACMODES is not set
+CONFIG_FB_BACKLIGHT=y
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_FB_TILEBLITTING=y
+
+#
+# Frame buffer hardware drivers
+#
+# CONFIG_FB_CIRRUS is not set
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_ARC is not set
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+CONFIG_FB_VGA16=m
+CONFIG_FB_UVESA=m
+CONFIG_FB_VESA=y
+CONFIG_FB_EFI=y
+# CONFIG_FB_N411 is not set
+# CONFIG_FB_HGA is not set
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_NVIDIA is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_I740 is not set
+CONFIG_FB_I810=m
+CONFIG_FB_I810_GTF=y
+CONFIG_FB_I810_I2C=y
+# CONFIG_FB_LE80578 is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_S3 is not set
+# CONFIG_FB_SAVAGE is not set
+# CONFIG_FB_SIS is not set
+CONFIG_FB_VIA=m
+CONFIG_FB_VIA_DIRECT_PROCFS=y
+CONFIG_FB_VIA_X_COMPATIBILITY=y
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_3DFX is not set
+CONFIG_FB_VOODOO1=m
+CONFIG_FB_VT8623=m
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_PM3 is not set
+# CONFIG_FB_CARMINE is not set
+# CONFIG_FB_GEODE is not set
+# CONFIG_FB_TMIO is not set
+# CONFIG_FB_SM501 is not set
+# CONFIG_FB_SMSCUFX is not set
+CONFIG_FB_UDL=m
+# CONFIG_FB_GOLDFISH is not set
+CONFIG_FB_VIRTUAL=m
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MB862XX is not set
+# CONFIG_FB_BROADSHEET is not set
+# CONFIG_FB_AUO_K190X is not set
+CONFIG_FB_HYPERV=m
+# CONFIG_FB_SIMPLE is not set
+# CONFIG_EXYNOS_VIDEO is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_LCD_CLASS_DEVICE=m
+# CONFIG_LCD_L4F00242T03 is not set
+# CONFIG_LCD_LMS283GF05 is not set
+# CONFIG_LCD_LTV350QV is not set
+# CONFIG_LCD_ILI922X is not set
+# CONFIG_LCD_ILI9320 is not set
+# CONFIG_LCD_TDO24M is not set
+# CONFIG_LCD_VGG2432A4 is not set
+CONFIG_LCD_PLATFORM=m
+# CONFIG_LCD_S6E63M0 is not set
+# CONFIG_LCD_LD9040 is not set
+# CONFIG_LCD_AMS369FG06 is not set
+# CONFIG_LCD_LMS501KF03 is not set
+# CONFIG_LCD_HX8357 is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+# CONFIG_BACKLIGHT_GENERIC is not set
+CONFIG_BACKLIGHT_LM3533=m
+CONFIG_BACKLIGHT_PWM=m
+CONFIG_BACKLIGHT_APPLE=m
+# CONFIG_BACKLIGHT_SAHARA is not set
+# CONFIG_BACKLIGHT_ADP8860 is not set
+# CONFIG_BACKLIGHT_ADP8870 is not set
+CONFIG_BACKLIGHT_PCF50633=m
+# CONFIG_BACKLIGHT_LM3630 is not set
+# CONFIG_BACKLIGHT_LM3639 is not set
+# CONFIG_BACKLIGHT_LP855X is not set
+# CONFIG_BACKLIGHT_OT200 is not set
+# CONFIG_BACKLIGHT_TPS65217 is not set
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+# CONFIG_VGACON_SOFT_SCROLLBACK is not set
+# CONFIG_MDA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+CONFIG_FONTS=y
+# CONFIG_FONT_8x8 is not set
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
+CONFIG_FONT_AUTOSELECT=y
+# CONFIG_LOGO is not set
+CONFIG_FB_SSD1307=m
+CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
+# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_JACK=y
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+CONFIG_SND_SEQUENCER_OSS=y
+CONFIG_SND_HRTIMER=m
+CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
+CONFIG_SND_DYNAMIC_MINORS=y
+CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_VMASTER=y
+CONFIG_SND_KCTL_JACK=y
+CONFIG_SND_DMA_SGBUF=y
+CONFIG_SND_RAWMIDI_SEQ=m
+CONFIG_SND_OPL3_LIB_SEQ=m
+CONFIG_SND_OPL4_LIB_SEQ=m
+CONFIG_SND_SBAWE_SEQ=m
+CONFIG_SND_EMU10K1_SEQ=m
+CONFIG_SND_MPU401_UART=m
+CONFIG_SND_OPL3_LIB=m
+CONFIG_SND_OPL4_LIB=m
+CONFIG_SND_VX_LIB=m
+CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_DRIVERS=y
+# CONFIG_SND_PCSP is not set
+CONFIG_SND_DUMMY=m
+CONFIG_SND_ALOOP=m
+CONFIG_SND_VIRMIDI=m
+CONFIG_SND_MTPAV=m
+CONFIG_SND_MTS64=m
+CONFIG_SND_SERIAL_U16550=m
+CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
+CONFIG_SND_AC97_POWER_SAVE=y
+CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
+CONFIG_SND_WSS_LIB=m
+CONFIG_SND_SB_COMMON=m
+CONFIG_SND_SB8_DSP=m
+CONFIG_SND_SB16_DSP=m
+CONFIG_SND_ISA=y
+CONFIG_SND_ADLIB=m
+CONFIG_SND_AD1816A=m
+CONFIG_SND_AD1848=m
+CONFIG_SND_ALS100=m
+CONFIG_SND_AZT1605=m
+CONFIG_SND_AZT2316=m
+CONFIG_SND_AZT2320=m
+CONFIG_SND_CMI8328=m
+CONFIG_SND_CMI8330=m
+CONFIG_SND_CS4231=m
+CONFIG_SND_CS4236=m
+CONFIG_SND_ES1688=m
+CONFIG_SND_ES18XX=m
+CONFIG_SND_SC6000=m
+CONFIG_SND_GUSCLASSIC=m
+CONFIG_SND_GUSEXTREME=m
+CONFIG_SND_GUSMAX=m
+CONFIG_SND_INTERWAVE=m
+CONFIG_SND_INTERWAVE_STB=m
+CONFIG_SND_JAZZ16=m
+CONFIG_SND_OPL3SA2=m
+CONFIG_SND_OPTI92X_AD1848=m
+CONFIG_SND_OPTI92X_CS4231=m
+CONFIG_SND_OPTI93X=m
+CONFIG_SND_MIRO=m
+CONFIG_SND_SB8=m
+CONFIG_SND_SB16=m
+CONFIG_SND_SBAWE=m
+CONFIG_SND_SB16_CSP=y
+CONFIG_SND_SSCAPE=m
+CONFIG_SND_WAVEFRONT=m
+CONFIG_SND_MSND_PINNACLE=m
+CONFIG_SND_MSND_CLASSIC=m
+CONFIG_SND_TEA575X=m
+CONFIG_SND_PCI=y
+CONFIG_SND_AD1889=m
+CONFIG_SND_ALS300=m
+CONFIG_SND_ALS4000=m
+CONFIG_SND_ALI5451=m
+CONFIG_SND_ASIHPI=m
+CONFIG_SND_ATIIXP=m
+CONFIG_SND_ATIIXP_MODEM=m
+CONFIG_SND_AU8810=m
+CONFIG_SND_AU8820=m
+CONFIG_SND_AU8830=m
+CONFIG_SND_AW2=m
+CONFIG_SND_AZT3328=m
+CONFIG_SND_BT87X=m
+# CONFIG_SND_BT87X_OVERCLOCK is not set
+CONFIG_SND_CA0106=m
+CONFIG_SND_CMIPCI=m
+CONFIG_SND_OXYGEN_LIB=m
+CONFIG_SND_OXYGEN=m
+CONFIG_SND_CS4281=m
+CONFIG_SND_CS46XX=m
+CONFIG_SND_CS46XX_NEW_DSP=y
+CONFIG_SND_CS5530=m
+CONFIG_SND_CS5535AUDIO=m
+CONFIG_SND_CTXFI=m
+CONFIG_SND_DARLA20=m
+CONFIG_SND_GINA20=m
+CONFIG_SND_LAYLA20=m
+CONFIG_SND_DARLA24=m
+CONFIG_SND_GINA24=m
+CONFIG_SND_LAYLA24=m
+CONFIG_SND_MONA=m
+CONFIG_SND_MIA=m
+CONFIG_SND_ECHO3G=m
+CONFIG_SND_INDIGO=m
+CONFIG_SND_INDIGOIO=m
+CONFIG_SND_INDIGODJ=m
+CONFIG_SND_INDIGOIOX=m
+CONFIG_SND_INDIGODJX=m
+CONFIG_SND_EMU10K1=m
+CONFIG_SND_EMU10K1X=m
+CONFIG_SND_ENS1370=m
+CONFIG_SND_ENS1371=m
+CONFIG_SND_ES1938=m
+CONFIG_SND_ES1968=m
+CONFIG_SND_ES1968_INPUT=y
+CONFIG_SND_ES1968_RADIO=y
+CONFIG_SND_FM801=m
+CONFIG_SND_FM801_TEA575X_BOOL=y
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_DSP_LOADER=y
+CONFIG_SND_HDA_PREALLOC_SIZE=4096
+CONFIG_SND_HDA_HWDEP=y
+CONFIG_SND_HDA_RECONFIG=y
+CONFIG_SND_HDA_INPUT_BEEP=y
+CONFIG_SND_HDA_INPUT_BEEP_MODE=1
+CONFIG_SND_HDA_INPUT_JACK=y
+CONFIG_SND_HDA_PATCH_LOADER=y
+CONFIG_SND_HDA_CODEC_REALTEK=y
+CONFIG_SND_HDA_CODEC_ANALOG=y
+CONFIG_SND_HDA_CODEC_SIGMATEL=y
+CONFIG_SND_HDA_CODEC_VIA=y
+CONFIG_SND_HDA_CODEC_HDMI=y
+CONFIG_SND_HDA_CODEC_CIRRUS=y
+CONFIG_SND_HDA_CODEC_CONEXANT=y
+CONFIG_SND_HDA_CODEC_CA0110=y
+CONFIG_SND_HDA_CODEC_CA0132=y
+CONFIG_SND_HDA_CODEC_CA0132_DSP=y
+CONFIG_SND_HDA_CODEC_CMEDIA=y
+CONFIG_SND_HDA_CODEC_SI3054=y
+CONFIG_SND_HDA_GENERIC=y
+CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
+CONFIG_SND_HDSP=m
+CONFIG_SND_HDSPM=m
+CONFIG_SND_ICE1712=m
+CONFIG_SND_ICE1724=m
+CONFIG_SND_INTEL8X0=m
+CONFIG_SND_INTEL8X0M=m
+CONFIG_SND_KORG1212=m
+CONFIG_SND_LOLA=m
+CONFIG_SND_LX6464ES=m
+CONFIG_SND_MAESTRO3=m
+CONFIG_SND_MAESTRO3_INPUT=y
+CONFIG_SND_MIXART=m
+CONFIG_SND_NM256=m
+CONFIG_SND_PCXHR=m
+CONFIG_SND_RIPTIDE=m
+CONFIG_SND_RME32=m
+CONFIG_SND_RME96=m
+CONFIG_SND_RME9652=m
+CONFIG_SND_SIS7019=m
+CONFIG_SND_SONICVIBES=m
+CONFIG_SND_TRIDENT=m
+CONFIG_SND_VIA82XX=m
+CONFIG_SND_VIA82XX_MODEM=m
+CONFIG_SND_VIRTUOSO=m
+CONFIG_SND_VX222=m
+CONFIG_SND_YMFPCI=m
+CONFIG_SND_SPI=y
+CONFIG_SND_USB=y
+CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_UA101=m
+CONFIG_SND_USB_USX2Y=m
+CONFIG_SND_USB_CAIAQ=m
+CONFIG_SND_USB_CAIAQ_INPUT=y
+CONFIG_SND_USB_US122L=m
+CONFIG_SND_USB_6FIRE=m
+CONFIG_SND_FIREWIRE=y
+CONFIG_SND_FIREWIRE_LIB=m
+CONFIG_SND_FIREWIRE_SPEAKERS=m
+CONFIG_SND_ISIGHT=m
+CONFIG_SND_SCS1X=m
+CONFIG_SND_PCMCIA=y
+CONFIG_SND_VXPOCKET=m
+CONFIG_SND_PDAUDIOCF=m
+# CONFIG_SND_SOC is not set
+# CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=m
+
+#
+# HID support
+#
+CONFIG_HID=m
+CONFIG_HIDRAW=y
+CONFIG_UHID=m
+CONFIG_HID_GENERIC=m
+
+#
+# Special HID drivers
+#
+CONFIG_HID_A4TECH=m
+CONFIG_HID_ACRUX=m
+CONFIG_HID_ACRUX_FF=y
+CONFIG_HID_APPLE=m
+CONFIG_HID_APPLEIR=m
+CONFIG_HID_AUREAL=m
+CONFIG_HID_BELKIN=m
+CONFIG_HID_CHERRY=m
+CONFIG_HID_CHICONY=m
+CONFIG_HID_PRODIKEYS=m
+CONFIG_HID_CYPRESS=m
+CONFIG_HID_DRAGONRISE=m
+CONFIG_DRAGONRISE_FF=y
+CONFIG_HID_EMS_FF=m
+CONFIG_HID_ELECOM=m
+CONFIG_HID_EZKEY=m
+CONFIG_HID_HOLTEK=m
+CONFIG_HOLTEK_FF=y
+CONFIG_HID_KEYTOUCH=m
+CONFIG_HID_KYE=m
+CONFIG_HID_UCLOGIC=m
+CONFIG_HID_WALTOP=m
+CONFIG_HID_GYRATION=m
+CONFIG_HID_ICADE=m
+CONFIG_HID_TWINHAN=m
+CONFIG_HID_KENSINGTON=m
+CONFIG_HID_LCPOWER=m
+CONFIG_HID_LENOVO_TPKBD=m
+CONFIG_HID_LOGITECH=m
+CONFIG_HID_LOGITECH_DJ=m
+CONFIG_LOGITECH_FF=y
+CONFIG_LOGIRUMBLEPAD2_FF=y
+CONFIG_LOGIG940_FF=y
+CONFIG_LOGIWHEELS_FF=y
+CONFIG_HID_MAGICMOUSE=m
+CONFIG_HID_MICROSOFT=m
+CONFIG_HID_MONTEREY=m
+CONFIG_HID_MULTITOUCH=m
+CONFIG_HID_NTRIG=m
+CONFIG_HID_ORTEK=m
+CONFIG_HID_PANTHERLORD=m
+CONFIG_PANTHERLORD_FF=y
+CONFIG_HID_PETALYNX=m
+CONFIG_HID_PICOLCD=m
+CONFIG_HID_PICOLCD_FB=y
+CONFIG_HID_PICOLCD_BACKLIGHT=y
+CONFIG_HID_PICOLCD_LCD=y
+CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_PICOLCD_CIR=y
+CONFIG_HID_PRIMAX=m
+CONFIG_HID_PS3REMOTE=m
+CONFIG_HID_ROCCAT=m
+CONFIG_HID_SAITEK=m
+CONFIG_HID_SAMSUNG=m
+CONFIG_HID_SONY=m
+CONFIG_HID_SPEEDLINK=m
+CONFIG_HID_STEELSERIES=m
+CONFIG_HID_SUNPLUS=m
+CONFIG_HID_GREENASIA=m
+CONFIG_GREENASIA_FF=y
+CONFIG_HID_HYPERV_MOUSE=m
+CONFIG_HID_SMARTJOYPLUS=m
+CONFIG_SMARTJOYPLUS_FF=y
+CONFIG_HID_TIVO=m
+CONFIG_HID_TOPSEED=m
+CONFIG_HID_THINGM=m
+CONFIG_HID_THRUSTMASTER=m
+CONFIG_THRUSTMASTER_FF=y
+CONFIG_HID_WACOM=m
+CONFIG_HID_WIIMOTE=m
+CONFIG_HID_WIIMOTE_EXT=y
+CONFIG_HID_ZEROPLUS=m
+CONFIG_ZEROPLUS_FF=y
+CONFIG_HID_ZYDACRON=m
+CONFIG_HID_SENSOR_HUB=m
+
+#
+# USB HID support
+#
+CONFIG_USB_HID=m
+CONFIG_HID_PID=y
+CONFIG_USB_HIDDEV=y
+
+#
+# I2C HID support
+#
+CONFIG_I2C_HID=m
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+CONFIG_USB_ARCH_HAS_XHCI=y
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_COMMON=m
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB=m
+# CONFIG_USB_DEBUG is not set
+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEFAULT_PERSIST=y
+CONFIG_USB_DYNAMIC_MINORS=y
+# CONFIG_USB_OTG is not set
+CONFIG_USB_MON=m
+CONFIG_USB_WUSB=m
+CONFIG_USB_WUSB_CBAF=m
+# CONFIG_USB_WUSB_CBAF_DEBUG is not set
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_C67X00_HCD=m
+CONFIG_USB_XHCI_HCD=m
+# CONFIG_USB_XHCI_HCD_DEBUGGING is not set
+CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_EHCI_PCI=m
+# CONFIG_USB_EHCI_HCD_PLATFORM is not set
+CONFIG_USB_OXU210HP_HCD=m
+CONFIG_USB_ISP116X_HCD=m
+CONFIG_USB_ISP1760_HCD=m
+CONFIG_USB_ISP1362_HCD=m
+CONFIG_USB_OHCI_HCD=m
+# CONFIG_USB_OHCI_HCD_SSB is not set
+# CONFIG_USB_OHCI_HCD_PLATFORM is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_UHCI_HCD=m
+CONFIG_USB_U132_HCD=m
+CONFIG_USB_SL811_HCD=m
+# CONFIG_USB_SL811_HCD_ISO is not set
+CONFIG_USB_SL811_CS=m
+CONFIG_USB_R8A66597_HCD=m
+CONFIG_USB_RENESAS_USBHS_HCD=m
+CONFIG_USB_WHCI_HCD=m
+CONFIG_USB_HWA_HCD=m
+# CONFIG_USB_HCD_BCMA is not set
+# CONFIG_USB_HCD_SSB is not set
+CONFIG_USB_MUSB_HDRC=m
+CONFIG_USB_MUSB_TUSB6010=m
+CONFIG_USB_MUSB_DSPS=m
+CONFIG_USB_MUSB_UX500=m
+# CONFIG_USB_UX500_DMA is not set
+CONFIG_MUSB_PIO_ONLY=y
+CONFIG_USB_RENESAS_USBHS=m
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_WDM=m
+CONFIG_USB_TMC=m
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
+# also be needed; see USB_STORAGE Help for more info
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_REALTEK=m
+CONFIG_REALTEK_AUTOPM=y
+CONFIG_USB_STORAGE_DATAFAB=m
+CONFIG_USB_STORAGE_FREECOM=m
+CONFIG_USB_STORAGE_ISD200=m
+CONFIG_USB_STORAGE_USBAT=m
+CONFIG_USB_STORAGE_SDDR09=m
+CONFIG_USB_STORAGE_SDDR55=m
+CONFIG_USB_STORAGE_JUMPSHOT=m
+CONFIG_USB_STORAGE_ALAUDA=m
+CONFIG_USB_STORAGE_ONETOUCH=m
+CONFIG_USB_STORAGE_KARMA=m
+CONFIG_USB_STORAGE_CYPRESS_ATACB=m
+CONFIG_USB_STORAGE_ENE_UB6250=m
+
+#
+# USB Imaging devices
+#
+CONFIG_USB_MDC800=m
+CONFIG_USB_MICROTEK=m
+# CONFIG_USB_DWC3 is not set
+CONFIG_USB_CHIPIDEA=m
+CONFIG_USB_CHIPIDEA_UDC=y
+# CONFIG_USB_CHIPIDEA_DEBUG is not set
+
+#
+# USB port drivers
+#
+CONFIG_USB_USS720=m
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_AIRCABLE=m
+CONFIG_USB_SERIAL_ARK3116=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_CH341=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_FUNSOFT=m
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+CONFIG_USB_SERIAL_F81232=m
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_IPW=m
+CONFIG_USB_SERIAL_IUU=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KEYSPAN_MPR=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19=y
+CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
+CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
+CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
+CONFIG_USB_SERIAL_KLSI=m
+CONFIG_USB_SERIAL_KOBIL_SCT=m
+CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_METRO=m
+CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7715_PARPORT=y
+CONFIG_USB_SERIAL_MOS7840=m
+CONFIG_USB_SERIAL_MOTOROLA=m
+CONFIG_USB_SERIAL_NAVMAN=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OTI6858=m
+CONFIG_USB_SERIAL_QCAUX=m
+CONFIG_USB_SERIAL_QUALCOMM=m
+CONFIG_USB_SERIAL_SPCP8X5=m
+CONFIG_USB_SERIAL_HP4X=m
+CONFIG_USB_SERIAL_SAFE=m
+# CONFIG_USB_SERIAL_SAFE_PADDED is not set
+CONFIG_USB_SERIAL_SIEMENS_MPI=m
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+CONFIG_USB_SERIAL_SYMBOL=m
+CONFIG_USB_SERIAL_TI=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_XIRCOM=m
+CONFIG_USB_SERIAL_WWAN=m
+CONFIG_USB_SERIAL_OPTION=m
+CONFIG_USB_SERIAL_OMNINET=m
+CONFIG_USB_SERIAL_OPTICON=m
+CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m
+CONFIG_USB_SERIAL_XSENS_MT=m
+CONFIG_USB_SERIAL_ZIO=m
+CONFIG_USB_SERIAL_WISHBONE=m
+CONFIG_USB_SERIAL_ZTE=m
+CONFIG_USB_SERIAL_SSU100=m
+CONFIG_USB_SERIAL_QT2=m
+# CONFIG_USB_SERIAL_DEBUG is not set
+
+#
+# USB Miscellaneous drivers
+#
+CONFIG_USB_EMI62=m
+CONFIG_USB_EMI26=m
+CONFIG_USB_ADUTUX=m
+CONFIG_USB_SEVSEG=m
+CONFIG_USB_RIO500=m
+CONFIG_USB_LEGOTOWER=m
+CONFIG_USB_LCD=m
+CONFIG_USB_LED=m
+CONFIG_USB_CYPRESS_CY7C63=m
+CONFIG_USB_CYTHERM=m
+CONFIG_USB_IDMOUSE=m
+CONFIG_USB_FTDI_ELAN=m
+CONFIG_USB_APPLEDISPLAY=m
+CONFIG_USB_SISUSBVGA=m
+# CONFIG_USB_SISUSBVGA_CON is not set
+CONFIG_USB_LD=m
+CONFIG_USB_TRANCEVIBRATOR=m
+CONFIG_USB_IOWARRIOR=m
+CONFIG_USB_TEST=m
+CONFIG_USB_ISIGHTFW=m
+CONFIG_USB_YUREX=m
+CONFIG_USB_EZUSB_FX2=m
+CONFIG_USB_HSIC_USB3503=m
+CONFIG_USB_ATM=m
+CONFIG_USB_SPEEDTOUCH=m
+CONFIG_USB_CXACRU=m
+CONFIG_USB_UEAGLEATM=m
+CONFIG_USB_XUSBATM=m
+CONFIG_USB_PHY=y
+CONFIG_NOP_USB_XCEIV=m
+# CONFIG_OMAP_CONTROL_USB is not set
+# CONFIG_OMAP_USB3 is not set
+CONFIG_SAMSUNG_USBPHY=m
+CONFIG_SAMSUNG_USB2PHY=m
+CONFIG_SAMSUNG_USB3PHY=m
+# CONFIG_USB_GPIO_VBUS is not set
+CONFIG_USB_ISP1301=m
+CONFIG_USB_RCAR_PHY=m
+CONFIG_USB_GADGET=m
+# CONFIG_USB_GADGET_DEBUG is not set
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_DEBUG_FS is not set
+CONFIG_USB_GADGET_VBUS_DRAW=2
+CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+
+#
+# USB Peripheral Controller
+#
+CONFIG_USB_FUSB300=m
+CONFIG_USB_R8A66597=m
+CONFIG_USB_RENESAS_USBHS_UDC=m
+CONFIG_USB_PXA27X=m
+CONFIG_USB_MV_UDC=m
+CONFIG_USB_MV_U3D=m
+CONFIG_USB_GADGET_MUSB_HDRC=m
+CONFIG_USB_M66592=m
+CONFIG_USB_AMD5536UDC=m
+CONFIG_USB_NET2272=m
+CONFIG_USB_NET2272_DMA=y
+CONFIG_USB_NET2280=m
+CONFIG_USB_GOKU=m
+CONFIG_USB_EG20T=m
+CONFIG_USB_DUMMY_HCD=m
+CONFIG_USB_LIBCOMPOSITE=m
+CONFIG_USB_F_ACM=m
+CONFIG_USB_U_SERIAL=m
+CONFIG_USB_F_SERIAL=m
+CONFIG_USB_F_OBEX=m
+# CONFIG_USB_ZERO is not set
+CONFIG_USB_AUDIO=m
+# CONFIG_GADGET_UAC1 is not set
+CONFIG_USB_ETH=m
+CONFIG_USB_ETH_RNDIS=y
+# CONFIG_USB_ETH_EEM is not set
+CONFIG_USB_G_NCM=m
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_FUNCTIONFS=m
+CONFIG_USB_FUNCTIONFS_ETH=y
+CONFIG_USB_FUNCTIONFS_RNDIS=y
+CONFIG_USB_FUNCTIONFS_GENERIC=y
+CONFIG_USB_MASS_STORAGE=m
+CONFIG_USB_GADGET_TARGET=m
+CONFIG_USB_G_SERIAL=m
+CONFIG_USB_MIDI_GADGET=m
+CONFIG_USB_G_PRINTER=m
+# CONFIG_USB_CDC_COMPOSITE is not set
+# CONFIG_USB_G_NOKIA is not set
+# CONFIG_USB_G_ACM_MS is not set
+# CONFIG_USB_G_MULTI is not set
+CONFIG_USB_G_HID=m
+CONFIG_USB_G_DBGP=m
+# CONFIG_USB_G_DBGP_PRINTK is not set
+CONFIG_USB_G_DBGP_SERIAL=y
+CONFIG_USB_G_WEBCAM=m
+CONFIG_UWB=m
+CONFIG_UWB_HWA=m
+CONFIG_UWB_WHCI=m
+CONFIG_UWB_I1480U=m
+CONFIG_MMC=m
+# CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC_UNSAFE_RESUME is not set
+# CONFIG_MMC_CLKGATE is not set
+
+#
+# MMC/SD/SDIO Card Drivers
+#
+CONFIG_MMC_BLOCK=m
+CONFIG_MMC_BLOCK_MINORS=8
+CONFIG_MMC_BLOCK_BOUNCE=y
+CONFIG_SDIO_UART=m
+# CONFIG_MMC_TEST is not set
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+CONFIG_MMC_SDHCI=m
+CONFIG_MMC_SDHCI_PCI=m
+CONFIG_MMC_RICOH_MMC=y
+CONFIG_MMC_SDHCI_ACPI=m
+CONFIG_MMC_SDHCI_PLTFM=m
+CONFIG_MMC_WBSD=m
+CONFIG_MMC_TIFM_SD=m
+CONFIG_MMC_SDRICOH_CS=m
+CONFIG_MMC_CB710=m
+CONFIG_MMC_VIA_SDMMC=m
+CONFIG_MMC_VUB300=m
+CONFIG_MMC_USHC=m
+CONFIG_MMC_REALTEK_PCI=m
+CONFIG_MEMSTICK=m
+# CONFIG_MEMSTICK_DEBUG is not set
+
+#
+# MemoryStick drivers
+#
+# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
+CONFIG_MSPRO_BLOCK=m
+
+#
+# MemoryStick Host Controller Drivers
+#
+CONFIG_MEMSTICK_TIFM_MS=m
+CONFIG_MEMSTICK_JMICRON_38X=m
+CONFIG_MEMSTICK_R592=m
+CONFIG_MEMSTICK_REALTEK_PCI=m
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+
+#
+# LED drivers
+#
+CONFIG_LEDS_LM3530=m
+CONFIG_LEDS_LM3533=m
+CONFIG_LEDS_LM3642=m
+CONFIG_LEDS_PCA9532=m
+# CONFIG_LEDS_PCA9532_GPIO is not set
+# CONFIG_LEDS_GPIO is not set
+CONFIG_LEDS_LP3944=m
+CONFIG_LEDS_LP55XX_COMMON=m
+CONFIG_LEDS_LP5521=m
+CONFIG_LEDS_LP5523=m
+CONFIG_LEDS_LP5562=m
+CONFIG_LEDS_CLEVO_MAIL=m
+CONFIG_LEDS_PCA955X=m
+CONFIG_LEDS_PCA9633=m
+# CONFIG_LEDS_DAC124S085 is not set
+# CONFIG_LEDS_PWM is not set
+CONFIG_LEDS_BD2802=m
+CONFIG_LEDS_INTEL_SS4200=m
+CONFIG_LEDS_LT3593=m
+CONFIG_LEDS_DELL_NETBOOKS=m
+CONFIG_LEDS_MC13783=m
+CONFIG_LEDS_TCA6507=m
+CONFIG_LEDS_LM355x=m
+CONFIG_LEDS_OT200=m
+CONFIG_LEDS_BLINKM=m
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_ONESHOT=m
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+# CONFIG_LEDS_TRIGGER_CPU is not set
+CONFIG_LEDS_TRIGGER_GPIO=m
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+CONFIG_LEDS_TRIGGER_TRANSIENT=m
+CONFIG_LEDS_TRIGGER_CAMERA=m
+CONFIG_ACCESSIBILITY=y
+CONFIG_A11Y_BRAILLE_CONSOLE=y
+# CONFIG_INFINIBAND is not set
+CONFIG_EDAC=y
+CONFIG_EDAC_LEGACY_SYSFS=y
+# CONFIG_EDAC_DEBUG is not set
+CONFIG_EDAC_DECODE_MCE=m
+CONFIG_EDAC_MCE_INJ=m
+CONFIG_EDAC_MM_EDAC=m
+CONFIG_EDAC_AMD76X=m
+CONFIG_EDAC_E7XXX=m
+CONFIG_EDAC_E752X=m
+CONFIG_EDAC_I82875P=m
+CONFIG_EDAC_I82975X=m
+CONFIG_EDAC_I3000=m
+CONFIG_EDAC_I3200=m
+CONFIG_EDAC_X38=m
+CONFIG_EDAC_I5400=m
+CONFIG_EDAC_I7CORE=m
+CONFIG_EDAC_I82860=m
+CONFIG_EDAC_R82600=m
+CONFIG_EDAC_I5000=m
+CONFIG_EDAC_I5100=m
+CONFIG_EDAC_I7300=m
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_SYSTOHC=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+CONFIG_RTC_INTF_DEV_UIE_EMUL=y
+CONFIG_RTC_DRV_TEST=m
+
+#
+# I2C RTC drivers
+#
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1374=m
+CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_DS3232=m
+CONFIG_RTC_DRV_MAX6900=m
+CONFIG_RTC_DRV_RS5C372=m
+CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_ISL12022=m
+CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF8523=m
+CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_M41T80=m
+CONFIG_RTC_DRV_M41T80_WDT=y
+CONFIG_RTC_DRV_BQ32K=m
+CONFIG_RTC_DRV_S35390A=m
+CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_RX8581=m
+CONFIG_RTC_DRV_RX8025=m
+CONFIG_RTC_DRV_EM3027=m
+CONFIG_RTC_DRV_RV3029C2=m
+
+#
+# SPI RTC drivers
+#
+# CONFIG_RTC_DRV_M41T93 is not set
+# CONFIG_RTC_DRV_M41T94 is not set
+# CONFIG_RTC_DRV_DS1305 is not set
+# CONFIG_RTC_DRV_DS1390 is not set
+# CONFIG_RTC_DRV_MAX6902 is not set
+# CONFIG_RTC_DRV_R9701 is not set
+# CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_DS3234 is not set
+# CONFIG_RTC_DRV_PCF2123 is not set
+# CONFIG_RTC_DRV_RX4581 is not set
+
+#
+# Platform RTC drivers
+#
+CONFIG_RTC_DRV_CMOS=y
+CONFIG_RTC_DRV_DS1286=m
+CONFIG_RTC_DRV_DS1511=m
+CONFIG_RTC_DRV_DS1553=m
+CONFIG_RTC_DRV_DS1742=m
+CONFIG_RTC_DRV_STK17TA8=m
+CONFIG_RTC_DRV_M48T86=m
+CONFIG_RTC_DRV_M48T35=m
+CONFIG_RTC_DRV_M48T59=m
+CONFIG_RTC_DRV_MSM6242=m
+CONFIG_RTC_DRV_BQ4802=m
+CONFIG_RTC_DRV_RP5C01=m
+CONFIG_RTC_DRV_V3020=m
+CONFIG_RTC_DRV_DS2404=m
+CONFIG_RTC_DRV_PCF50633=m
+
+#
+# on-CPU RTC drivers
+#
+CONFIG_RTC_DRV_MC13XXX=m
+CONFIG_RTC_DRV_SNVS=m
+
+#
+# HID Sensor RTC drivers
+#
+# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
+CONFIG_DMADEVICES=y
+# CONFIG_DMADEVICES_DEBUG is not set
+
+#
+# DMA Devices
+#
+CONFIG_INTEL_MID_DMAC=m
+CONFIG_INTEL_IOATDMA=m
+CONFIG_DW_DMAC=m
+# CONFIG_DW_DMAC_BIG_ENDIAN_IO is not set
+CONFIG_TIMB_DMA=m
+CONFIG_PCH_DMA=m
+CONFIG_DMA_ENGINE=y
+CONFIG_DMA_ACPI=y
+CONFIG_DMA_OF=y
+
+#
+# DMA Clients
+#
+CONFIG_NET_DMA=y
+CONFIG_ASYNC_TX_DMA=y
+# CONFIG_DMATEST is not set
+CONFIG_DCA=m
+CONFIG_AUXDISPLAY=y
+CONFIG_KS0108=m
+CONFIG_KS0108_PORT=0x378
+CONFIG_KS0108_DELAY=2
+CONFIG_CFAG12864B=m
+CONFIG_CFAG12864B_RATE=20
+CONFIG_UIO=m
+CONFIG_UIO_CIF=m
+CONFIG_UIO_PDRV=m
+CONFIG_UIO_PDRV_GENIRQ=m
+# CONFIG_UIO_DMEM_GENIRQ is not set
+CONFIG_UIO_AEC=m
+CONFIG_UIO_SERCOS3=m
+CONFIG_UIO_PCI_GENERIC=m
+CONFIG_UIO_NETX=m
+CONFIG_VFIO_IOMMU_TYPE1=m
+CONFIG_VFIO=m
+CONFIG_VFIO_PCI=m
+CONFIG_VFIO_PCI_VGA=y
+CONFIG_VIRT_DRIVERS=y
+CONFIG_VIRTIO=y
+
+#
+# Virtio drivers
+#
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_MMIO=m
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
+
+#
+# Microsoft Hyper-V guest support
+#
+CONFIG_HYPERV=m
+CONFIG_HYPERV_UTILS=m
+CONFIG_HYPERV_BALLOON=m
+CONFIG_STAGING=y
+CONFIG_ET131X=m
+CONFIG_SLICOSS=m
+CONFIG_USBIP_CORE=m
+CONFIG_USBIP_VHCI_HCD=m
+CONFIG_USBIP_HOST=m
+# CONFIG_USBIP_DEBUG is not set
+CONFIG_W35UND=m
+CONFIG_PRISM2_USB=m
+CONFIG_ECHO=m
+CONFIG_COMEDI=m
+# CONFIG_COMEDI_DEBUG is not set
+CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048
+CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480
+CONFIG_COMEDI_MISC_DRIVERS=y
+CONFIG_COMEDI_KCOMEDILIB=m
+CONFIG_COMEDI_BOND=m
+CONFIG_COMEDI_TEST=m
+CONFIG_COMEDI_PARPORT=m
+CONFIG_COMEDI_SERIAL2002=m
+CONFIG_COMEDI_SKEL=m
+CONFIG_COMEDI_ISA_DRIVERS=y
+CONFIG_COMEDI_ACL7225B=m
+CONFIG_COMEDI_PCL711=m
+CONFIG_COMEDI_PCL724=m
+CONFIG_COMEDI_PCL725=m
+CONFIG_COMEDI_PCL726=m
+CONFIG_COMEDI_PCL730=m
+CONFIG_COMEDI_PCL812=m
+CONFIG_COMEDI_PCL816=m
+CONFIG_COMEDI_PCL818=m
+CONFIG_COMEDI_PCM3724=m
+CONFIG_COMEDI_PCM3730=m
+CONFIG_COMEDI_AMPLC_DIO200_ISA=m
+CONFIG_COMEDI_AMPLC_PC236_ISA=m
+CONFIG_COMEDI_AMPLC_PC263_ISA=m
+CONFIG_COMEDI_RTI800=m
+CONFIG_COMEDI_RTI802=m
+CONFIG_COMEDI_DAS16M1=m
+CONFIG_COMEDI_DAS08_ISA=m
+CONFIG_COMEDI_DAS16=m
+CONFIG_COMEDI_DAS800=m
+CONFIG_COMEDI_DAS1800=m
+CONFIG_COMEDI_DAS6402=m
+CONFIG_COMEDI_DT2801=m
+CONFIG_COMEDI_DT2811=m
+CONFIG_COMEDI_DT2814=m
+CONFIG_COMEDI_DT2815=m
+CONFIG_COMEDI_DT2817=m
+CONFIG_COMEDI_DT282X=m
+CONFIG_COMEDI_DMM32AT=m
+CONFIG_COMEDI_FL512=m
+CONFIG_COMEDI_AIO_AIO12_8=m
+CONFIG_COMEDI_AIO_IIRO_16=m
+CONFIG_COMEDI_C6XDIGIO=m
+CONFIG_COMEDI_MPC624=m
+CONFIG_COMEDI_ADQ12B=m
+CONFIG_COMEDI_NI_AT_A2150=m
+CONFIG_COMEDI_NI_AT_AO=m
+CONFIG_COMEDI_NI_ATMIO=m
+CONFIG_COMEDI_NI_ATMIO16D=m
+CONFIG_COMEDI_NI_LABPC_ISA=m
+CONFIG_COMEDI_PCMAD=m
+CONFIG_COMEDI_PCMDA12=m
+CONFIG_COMEDI_PCMMIO=m
+CONFIG_COMEDI_PCMUIO=m
+CONFIG_COMEDI_MULTIQ3=m
+CONFIG_COMEDI_POC=m
+CONFIG_COMEDI_PCI_DRIVERS=y
+CONFIG_COMEDI_8255_PCI=m
+CONFIG_COMEDI_ADDI_WATCHDOG=m
+CONFIG_COMEDI_ADDI_APCI_035=m
+CONFIG_COMEDI_ADDI_APCI_1032=m
+CONFIG_COMEDI_ADDI_APCI_1500=m
+CONFIG_COMEDI_ADDI_APCI_1516=m
+CONFIG_COMEDI_ADDI_APCI_1564=m
+CONFIG_COMEDI_ADDI_APCI_16XX=m
+CONFIG_COMEDI_ADDI_APCI_2032=m
+CONFIG_COMEDI_ADDI_APCI_2200=m
+CONFIG_COMEDI_ADDI_APCI_3120=m
+CONFIG_COMEDI_ADDI_APCI_3501=m
+CONFIG_COMEDI_ADDI_APCI_3XXX=m
+CONFIG_COMEDI_ADL_PCI6208=m
+CONFIG_COMEDI_ADL_PCI7X3X=m
+CONFIG_COMEDI_ADL_PCI8164=m
+CONFIG_COMEDI_ADL_PCI9111=m
+CONFIG_COMEDI_ADL_PCI9118=m
+CONFIG_COMEDI_ADV_PCI1710=m
+CONFIG_COMEDI_ADV_PCI1723=m
+CONFIG_COMEDI_ADV_PCI1724=m
+CONFIG_COMEDI_ADV_PCI_DIO=m
+CONFIG_COMEDI_AMPLC_DIO200_PCI=m
+CONFIG_COMEDI_AMPLC_PC236_PCI=m
+CONFIG_COMEDI_AMPLC_PC263_PCI=m
+CONFIG_COMEDI_AMPLC_PCI224=m
+CONFIG_COMEDI_AMPLC_PCI230=m
+CONFIG_COMEDI_CONTEC_PCI_DIO=m
+CONFIG_COMEDI_DAS08_PCI=m
+CONFIG_COMEDI_DT3000=m
+CONFIG_COMEDI_DYNA_PCI10XX=m
+CONFIG_COMEDI_UNIOXX5=m
+CONFIG_COMEDI_GSC_HPDI=m
+CONFIG_COMEDI_ICP_MULTI=m
+CONFIG_COMEDI_II_PCI20KC=m
+CONFIG_COMEDI_DAQBOARD2000=m
+CONFIG_COMEDI_JR3_PCI=m
+CONFIG_COMEDI_KE_COUNTER=m
+CONFIG_COMEDI_CB_PCIDAS64=m
+CONFIG_COMEDI_CB_PCIDAS=m
+CONFIG_COMEDI_CB_PCIDDA=m
+# CONFIG_COMEDI_CB_PCIMDAS is not set
+CONFIG_COMEDI_CB_PCIMDDA=m
+CONFIG_COMEDI_ME4000=m
+CONFIG_COMEDI_ME_DAQ=m
+CONFIG_COMEDI_NI_6527=m
+CONFIG_COMEDI_NI_65XX=m
+CONFIG_COMEDI_NI_660X=m
+CONFIG_COMEDI_NI_670X=m
+CONFIG_COMEDI_NI_LABPC_PCI=m
+CONFIG_COMEDI_NI_PCIDIO=m
+CONFIG_COMEDI_NI_PCIMIO=m
+CONFIG_COMEDI_RTD520=m
+CONFIG_COMEDI_S526=m
+CONFIG_COMEDI_S626=m
+CONFIG_COMEDI_SSV_DNP=m
+CONFIG_COMEDI_MITE=m
+CONFIG_COMEDI_NI_TIOCMD=m
+CONFIG_COMEDI_PCMCIA_DRIVERS=y
+CONFIG_COMEDI_CB_DAS16_CS=m
+CONFIG_COMEDI_DAS08_CS=m
+CONFIG_COMEDI_NI_DAQ_700_CS=m
+CONFIG_COMEDI_NI_DAQ_DIO24_CS=m
+CONFIG_COMEDI_NI_LABPC_CS=m
+CONFIG_COMEDI_NI_MIO_CS=m
+CONFIG_COMEDI_QUATECH_DAQP_CS=m
+CONFIG_COMEDI_USB_DRIVERS=y
+CONFIG_COMEDI_DT9812=m
+CONFIG_COMEDI_USBDUX=m
+CONFIG_COMEDI_USBDUXFAST=m
+CONFIG_COMEDI_USBDUXSIGMA=m
+CONFIG_COMEDI_VMK80XX=m
+CONFIG_COMEDI_8255=m
+CONFIG_COMEDI_FC=m
+CONFIG_COMEDI_AMPLC_DIO200=m
+CONFIG_COMEDI_AMPLC_PC236=m
+CONFIG_COMEDI_DAS08=m
+CONFIG_COMEDI_NI_LABPC=m
+CONFIG_COMEDI_NI_TIO=m
+# CONFIG_FB_OLPC_DCON is not set
+CONFIG_ASUS_OLED=m
+# CONFIG_PANEL is not set
+CONFIG_R8187SE=m
+CONFIG_RTL8192U=m
+CONFIG_RTLLIB=m
+CONFIG_RTLLIB_CRYPTO_CCMP=m
+CONFIG_RTLLIB_CRYPTO_TKIP=m
+CONFIG_RTLLIB_CRYPTO_WEP=m
+CONFIG_RTL8192E=m
+CONFIG_R8712U=m
+CONFIG_RTS5139=m
+# CONFIG_RTS5139_DEBUG is not set
+# CONFIG_TRANZPORT is not set
+CONFIG_IDE_PHISON=m
+CONFIG_LINE6_USB=m
+# CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set
+CONFIG_USB_SERIAL_QUATECH2=m
+CONFIG_VT6655=m
+CONFIG_VT6656=m
+CONFIG_DX_SEP=m
+CONFIG_ZSMALLOC=y
+CONFIG_ZRAM=m
+# CONFIG_ZRAM_DEBUG is not set
+CONFIG_WLAGS49_H2=m
+CONFIG_WLAGS49_H25=m
+CONFIG_FB_SM7XX=m
+CONFIG_CRYSTALHD=m
+CONFIG_FB_XGI=m
+CONFIG_ACPI_QUICKSTART=m
+CONFIG_USB_ENESTORAGE=m
+CONFIG_BCM_WIMAX=m
+CONFIG_FT1000=m
+CONFIG_FT1000_USB=m
+CONFIG_FT1000_PCMCIA=m
+
+#
+# Speakup console speech
+#
+CONFIG_SPEAKUP=m
+CONFIG_SPEAKUP_SYNTH_ACNTSA=m
+CONFIG_SPEAKUP_SYNTH_ACNTPC=m
+CONFIG_SPEAKUP_SYNTH_APOLLO=m
+CONFIG_SPEAKUP_SYNTH_AUDPTR=m
+CONFIG_SPEAKUP_SYNTH_BNS=m
+CONFIG_SPEAKUP_SYNTH_DECTLK=m
+CONFIG_SPEAKUP_SYNTH_DECEXT=m
+CONFIG_SPEAKUP_SYNTH_DECPC=m
+CONFIG_SPEAKUP_SYNTH_DTLK=m
+CONFIG_SPEAKUP_SYNTH_KEYPC=m
+CONFIG_SPEAKUP_SYNTH_LTLK=m
+CONFIG_SPEAKUP_SYNTH_SOFT=m
+CONFIG_SPEAKUP_SYNTH_SPKOUT=m
+CONFIG_SPEAKUP_SYNTH_TXPRT=m
+CONFIG_SPEAKUP_SYNTH_DUMMY=m
+CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
+CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
+CONFIG_STAGING_MEDIA=y
+CONFIG_DVB_AS102=m
+CONFIG_DVB_CXD2099=m
+CONFIG_VIDEO_DT3155=m
+CONFIG_DT3155_CCIR=y
+CONFIG_DT3155_STREAMING=y
+CONFIG_VIDEO_GO7007=m
+CONFIG_VIDEO_GO7007_USB=m
+CONFIG_VIDEO_GO7007_LOADER=m
+# CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set
+CONFIG_SOLO6X10=m
+CONFIG_LIRC_STAGING=y
+CONFIG_LIRC_BT829=m
+CONFIG_LIRC_IGORPLUGUSB=m
+CONFIG_LIRC_IMON=m
+CONFIG_LIRC_PARALLEL=m
+CONFIG_LIRC_SASEM=m
+CONFIG_LIRC_SERIAL=m
+CONFIG_LIRC_SERIAL_TRANSMITTER=y
+CONFIG_LIRC_SIR=m
+CONFIG_LIRC_ZILOG=m
+
+#
+# Android
+#
+# CONFIG_ANDROID is not set
+CONFIG_USB_WPAN_HCD=m
+CONFIG_WIMAX_GDM72XX=m
+CONFIG_WIMAX_GDM72XX_QOS=y
+CONFIG_WIMAX_GDM72XX_K_MODE=y
+CONFIG_WIMAX_GDM72XX_WIMAX2=y
+CONFIG_WIMAX_GDM72XX_USB=y
+# CONFIG_WIMAX_GDM72XX_SDIO is not set
+CONFIG_WIMAX_GDM72XX_USB_PM=y
+CONFIG_CSR_WIFI=m
+CONFIG_NET_VENDOR_SILICOM=y
+CONFIG_SBYPASS=m
+CONFIG_BPCTL=m
+CONFIG_CED1401=m
+CONFIG_DGRP=m
+CONFIG_FIREWIRE_SERIAL=m
+CONFIG_ZCACHE=y
+# CONFIG_ZCACHE_DEBUG is not set
+# CONFIG_USB_DWC2 is not set
+CONFIG_X86_PLATFORM_DEVICES=y
+CONFIG_ACER_WMI=m
+CONFIG_ACERHDF=m
+CONFIG_ASUS_LAPTOP=m
+CONFIG_CHROMEOS_LAPTOP=m
+CONFIG_DELL_LAPTOP=m
+CONFIG_DELL_WMI=m
+CONFIG_DELL_WMI_AIO=m
+CONFIG_FUJITSU_LAPTOP=m
+# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
+CONFIG_FUJITSU_TABLET=m
+CONFIG_AMILO_RFKILL=m
+CONFIG_TC1100_WMI=m
+CONFIG_HP_ACCEL=m
+CONFIG_HP_WMI=m
+CONFIG_MSI_LAPTOP=m
+CONFIG_PANASONIC_LAPTOP=m
+CONFIG_COMPAL_LAPTOP=m
+CONFIG_SONY_LAPTOP=m
+# CONFIG_SONYPI_COMPAT is not set
+CONFIG_IDEAPAD_LAPTOP=m
+CONFIG_THINKPAD_ACPI=m
+CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
+# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
+# CONFIG_THINKPAD_ACPI_DEBUG is not set
+# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
+CONFIG_THINKPAD_ACPI_VIDEO=y
+CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
+CONFIG_SENSORS_HDAPS=m
+CONFIG_INTEL_MENLOW=m
+CONFIG_EEEPC_LAPTOP=m
+CONFIG_ASUS_WMI=m
+CONFIG_ASUS_NB_WMI=m
+CONFIG_EEEPC_WMI=m
+CONFIG_ACPI_WMI=m
+CONFIG_MSI_WMI=m
+CONFIG_TOPSTAR_LAPTOP=m
+CONFIG_ACPI_TOSHIBA=m
+CONFIG_TOSHIBA_BT_RFKILL=m
+CONFIG_ACPI_CMPC=m
+CONFIG_INTEL_IPS=m
+CONFIG_IBM_RTL=m
+CONFIG_XO1_RFKILL=m
+CONFIG_XO15_EBOOK=m
+CONFIG_SAMSUNG_LAPTOP=m
+CONFIG_MXM_WMI=m
+CONFIG_INTEL_OAKTRAIL=m
+CONFIG_SAMSUNG_Q10=m
+CONFIG_APPLE_GMUX=m
+CONFIG_PVPANIC=m
+
+#
+# Hardware Spinlock drivers
+#
+CONFIG_CLKSRC_I8253=y
+CONFIG_CLKEVT_I8253=y
+CONFIG_I8253_LOCK=y
+CONFIG_CLKBLD_I8253=y
+# CONFIG_MAILBOX is not set
+CONFIG_IOMMU_API=y
+CONFIG_IOMMU_SUPPORT=y
+CONFIG_OF_IOMMU=y
+CONFIG_DMAR_TABLE=y
+CONFIG_INTEL_IOMMU=y
+# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
+CONFIG_INTEL_IOMMU_FLOPPY_WA=y
+
+#
+# Remoteproc drivers
+#
+CONFIG_REMOTEPROC=m
+CONFIG_STE_MODEM_RPROC=m
+
+#
+# Rpmsg drivers
+#
+# CONFIG_PM_DEVFREQ is not set
+CONFIG_EXTCON=m
+
+#
+# Extcon Device Drivers
+#
+CONFIG_EXTCON_GPIO=m
+CONFIG_MEMORY=y
+# CONFIG_IIO is not set
+# CONFIG_VME_BUS is not set
+CONFIG_PWM=y
+CONFIG_IRQCHIP=y
+CONFIG_IPACK_BUS=m
+CONFIG_BOARD_TPCI200=m
+CONFIG_SERIAL_IPOCTAL=m
+# CONFIG_RESET_CONTROLLER is not set
+
+#
+# Firmware Drivers
+#
+CONFIG_EDD=m
+# CONFIG_EDD_OFF is not set
+CONFIG_FIRMWARE_MEMMAP=y
+CONFIG_DELL_RBU=m
+CONFIG_DCDBAS=m
+CONFIG_DMIID=y
+CONFIG_DMI_SYSFS=m
+CONFIG_ISCSI_IBFT_FIND=y
+CONFIG_ISCSI_IBFT=m
+# CONFIG_GOOGLE_FIRMWARE is not set
+
+#
+# EFI (Extensible Firmware Interface) Support
+#
+CONFIG_EFI_VARS=m
+CONFIG_EFI_VARS_PSTORE=m
+CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
+
+#
+# File systems
+#
+CONFIG_DCACHE_WORD_ACCESS=y
+# CONFIG_EXT2_FS is not set
+# CONFIG_EXT3_FS is not set
+CONFIG_EXT4_FS=m
+CONFIG_EXT4_USE_FOR_EXT23=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+# CONFIG_EXT4_DEBUG is not set
+CONFIG_JBD2=m
+# CONFIG_JBD2_DEBUG is not set
+CONFIG_FS_MBCACHE=m
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+CONFIG_REISERFS_PROC_INFO=y
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_REISERFS_FS_SECURITY=y
+CONFIG_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+# CONFIG_JFS_DEBUG is not set
+CONFIG_JFS_STATISTICS=y
+CONFIG_XFS_FS=m
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
+# CONFIG_XFS_WARN is not set
+# CONFIG_XFS_DEBUG is not set
+CONFIG_GFS2_FS=m
+CONFIG_GFS2_FS_LOCKING_DLM=y
+CONFIG_OCFS2_FS=m
+CONFIG_OCFS2_FS_O2CB=m
+CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
+CONFIG_OCFS2_FS_STATS=y
+# CONFIG_OCFS2_DEBUG_MASKLOG is not set
+# CONFIG_OCFS2_DEBUG_FS is not set
+CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS_POSIX_ACL=y
+# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
+# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+# CONFIG_BTRFS_DEBUG is not set
+CONFIG_NILFS2_FS=m
+CONFIG_FS_POSIX_ACL=y
+CONFIG_EXPORTFS=y
+CONFIG_FILE_LOCKING=y
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY_USER=y
+CONFIG_FANOTIFY=y
+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
+CONFIG_QUOTA=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+# CONFIG_PRINT_QUOTA_WARNING is not set
+# CONFIG_QUOTA_DEBUG is not set
+CONFIG_QUOTA_TREE=m
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
+CONFIG_QUOTACTL=y
+CONFIG_AUTOFS4_FS=y
+CONFIG_FUSE_FS=m
+CONFIG_CUSE=m
+CONFIG_GENERIC_ACL=y
+
+#
+# Caches
+#
+CONFIG_FSCACHE=m
+CONFIG_FSCACHE_STATS=y
+CONFIG_FSCACHE_HISTOGRAM=y
+# CONFIG_FSCACHE_DEBUG is not set
+# CONFIG_FSCACHE_OBJECT_LIST is not set
+CONFIG_CACHEFILES=m
+# CONFIG_CACHEFILES_DEBUG is not set
+# CONFIG_CACHEFILES_HISTOGRAM is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_UDF_NLS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_DEBUG is not set
+CONFIG_NTFS_RW=y
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_XATTR=y
+CONFIG_HUGETLBFS=y
+CONFIG_HUGETLB_PAGE=y
+CONFIG_CONFIGFS_FS=y
+CONFIG_MISC_FILESYSTEMS=y
+# CONFIG_ADFS_FS is not set
+CONFIG_AFFS_FS=m
+CONFIG_ECRYPT_FS=m
+# CONFIG_ECRYPT_FS_MESSAGING is not set
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+CONFIG_UBIFS_FS=m
+# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
+CONFIG_UBIFS_FS_LZO=y
+CONFIG_UBIFS_FS_ZLIB=y
+CONFIG_LOGFS=m
+CONFIG_CRAMFS=m
+CONFIG_SQUASHFS=m
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_ZLIB=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
+# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+# CONFIG_VXFS_FS is not set
+CONFIG_MINIX_FS=m
+CONFIG_OMFS_FS=m
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_QNX6FS_FS is not set
+# CONFIG_ROMFS_FS is not set
+CONFIG_PSTORE=y
+# CONFIG_PSTORE_CONSOLE is not set
+# CONFIG_PSTORE_FTRACE is not set
+CONFIG_PSTORE_RAM=m
+# CONFIG_SYSV_FS is not set
+CONFIG_UFS_FS=m
+# CONFIG_UFS_FS_WRITE is not set
+# CONFIG_UFS_DEBUG is not set
+CONFIG_EXOFS_FS=m
+# CONFIG_EXOFS_DEBUG is not set
+CONFIG_F2FS_FS=m
+CONFIG_F2FS_STAT_FS=y
+CONFIG_F2FS_FS_XATTR=y
+CONFIG_F2FS_FS_POSIX_ACL=y
+CONFIG_EFIVAR_FS=y
+CONFIG_ORE=m
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=m
+CONFIG_NFS_V2=m
+CONFIG_NFS_V3=m
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=m
+CONFIG_NFS_SWAP=y
+CONFIG_NFS_V4_1=y
+CONFIG_PNFS_FILE_LAYOUT=m
+CONFIG_PNFS_BLOCK=m
+CONFIG_PNFS_OBJLAYOUT=m
+CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org"
+CONFIG_NFS_FSCACHE=y
+# CONFIG_NFS_USE_LEGACY_DNS is not set
+CONFIG_NFS_USE_KERNEL_DNS=y
+CONFIG_NFS_DEBUG=y
+CONFIG_NFSD=m
+CONFIG_NFSD_V2_ACL=y
+CONFIG_NFSD_V3=y
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
+# CONFIG_NFSD_FAULT_INJECTION is not set
+CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_ACL_SUPPORT=m
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
+CONFIG_SUNRPC_BACKCHANNEL=y
+CONFIG_SUNRPC_SWAP=y
+CONFIG_RPCSEC_GSS_KRB5=m
+CONFIG_SUNRPC_DEBUG=y
+CONFIG_CEPH_FS=m
+CONFIG_CIFS=m
+CONFIG_CIFS_STATS=y
+# CONFIG_CIFS_STATS2 is not set
+CONFIG_CIFS_WEAK_PW_HASH=y
+CONFIG_CIFS_UPCALL=y
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+CONFIG_CIFS_ACL=y
+# CONFIG_CIFS_DEBUG is not set
+CONFIG_CIFS_DFS_UPCALL=y
+CONFIG_CIFS_SMB2=y
+CONFIG_CIFS_FSCACHE=y
+CONFIG_NCP_FS=m
+# CONFIG_NCPFS_PACKET_SIGNING is not set
+# CONFIG_NCPFS_IOCTL_LOCKING is not set
+# CONFIG_NCPFS_STRONG is not set
+CONFIG_NCPFS_NFS_NS=y
+CONFIG_NCPFS_OS2_NS=y
+CONFIG_NCPFS_SMALLDOS=y
+CONFIG_NCPFS_NLS=y
+# CONFIG_NCPFS_EXTRAS is not set
+CONFIG_CODA_FS=m
+CONFIG_AFS_FS=m
+# CONFIG_AFS_DEBUG is not set
+CONFIG_AFS_FSCACHE=y
+CONFIG_9P_FS=m
+CONFIG_9P_FSCACHE=y
+CONFIG_9P_FS_POSIX_ACL=y
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_MAC_ROMAN=m
+CONFIG_NLS_MAC_CELTIC=m
+CONFIG_NLS_MAC_CENTEURO=m
+CONFIG_NLS_MAC_CROATIAN=m
+CONFIG_NLS_MAC_CYRILLIC=m
+CONFIG_NLS_MAC_GAELIC=m
+CONFIG_NLS_MAC_GREEK=m
+CONFIG_NLS_MAC_ICELAND=m
+CONFIG_NLS_MAC_INUIT=m
+CONFIG_NLS_MAC_ROMANIAN=m
+CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UTF8=m
+CONFIG_DLM=m
+# CONFIG_DLM_DEBUG is not set
+
+#
+# Kernel hacking
+#
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_PRINTK_TIME=y
+CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
+CONFIG_ENABLE_WARN_DEPRECATED=y
+# CONFIG_ENABLE_MUST_CHECK is not set
+CONFIG_FRAME_WARN=1024
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_STRIP_ASM_SYMS=y
+# CONFIG_READABLE_ASM is not set
+CONFIG_UNUSED_SYMBOLS=y
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
+CONFIG_LOCKUP_DETECTOR=y
+CONFIG_HARDLOCKUP_DETECTOR=y
+# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
+CONFIG_DETECT_HUNG_TASK=y
+CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
+CONFIG_SCHED_DEBUG=y
+CONFIG_SCHEDSTATS=y
+CONFIG_TIMER_STATS=y
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_PREEMPT is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+CONFIG_DEBUG_MUTEXES=y
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+CONFIG_STACKTRACE=y
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_HIGHMEM is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_VIRTUAL is not set
+# CONFIG_DEBUG_WRITECOUNT is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_TEST_LIST_SORT is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
+CONFIG_FRAME_POINTER=y
+# CONFIG_BOOT_PRINTK_DELAY is not set
+
+#
+# RCU Debugging
+#
+# CONFIG_PROVE_RCU_DELAY is not set
+# CONFIG_SPARSE_RCU_POINTER is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
+# CONFIG_RCU_CPU_STALL_VERBOSE is not set
+# CONFIG_RCU_CPU_STALL_INFO is not set
+# CONFIG_RCU_TRACE is not set
+# CONFIG_KPROBES_SANITY_TEST is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+CONFIG_LKDTM=m
+# CONFIG_NOTIFIER_ERROR_INJECTION is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_LATENCYTOP is not set
+CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y
+# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
+CONFIG_USER_STACKTRACE_SUPPORT=y
+CONFIG_NOP_TRACER=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
+CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_TRACER_MAX_TRACE=y
+CONFIG_TRACE_CLOCK=y
+CONFIG_RING_BUFFER=y
+CONFIG_EVENT_TRACING=y
+CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_RING_BUFFER_ALLOW_SWAP=y
+CONFIG_TRACING=y
+CONFIG_GENERIC_TRACER=y
+CONFIG_TRACING_SUPPORT=y
+CONFIG_FTRACE=y
+CONFIG_FUNCTION_TRACER=y
+CONFIG_FUNCTION_GRAPH_TRACER=y
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_PREEMPT_TRACER is not set
+CONFIG_SCHED_TRACER=y
+CONFIG_FTRACE_SYSCALLS=y
+CONFIG_TRACER_SNAPSHOT=y
+# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+# CONFIG_PROFILE_ALL_BRANCHES is not set
+CONFIG_STACK_TRACER=y
+CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_KPROBE_EVENT=y
+CONFIG_UPROBE_EVENT=y
+CONFIG_PROBE_EVENTS=y
+CONFIG_DYNAMIC_FTRACE=y
+CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
+CONFIG_FUNCTION_PROFILER=y
+CONFIG_FTRACE_MCOUNT_RECORD=y
+# CONFIG_FTRACE_STARTUP_TEST is not set
+CONFIG_MMIOTRACE=y
+# CONFIG_MMIOTRACE_TEST is not set
+CONFIG_RING_BUFFER_BENCHMARK=m
+# CONFIG_RING_BUFFER_STARTUP_TEST is not set
+# CONFIG_RBTREE_TEST is not set
+# CONFIG_INTERVAL_TREE_TEST is not set
+# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
+# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
+CONFIG_DYNAMIC_DEBUG=y
+# CONFIG_DMA_API_DEBUG is not set
+# CONFIG_ATOMIC64_SELFTEST is not set
+CONFIG_ASYNC_RAID6_TEST=m
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_KGDB is not set
+CONFIG_HAVE_ARCH_KMEMCHECK=y
+# CONFIG_TEST_STRING_HELPERS is not set
+CONFIG_TEST_KSTRTOX=m
+CONFIG_STRICT_DEVMEM=y
+CONFIG_X86_VERBOSE_BOOTUP=y
+CONFIG_EARLY_PRINTK=y
+# CONFIG_EARLY_PRINTK_DBGP is not set
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+# CONFIG_X86_PTDUMP is not set
+CONFIG_DEBUG_RODATA=y
+# CONFIG_DEBUG_RODATA_TEST is not set
+# CONFIG_DEBUG_SET_MODULE_RONX is not set
+# CONFIG_DEBUG_NX_TEST is not set
+CONFIG_DOUBLEFAULT=y
+# CONFIG_DEBUG_TLBFLUSH is not set
+# CONFIG_IOMMU_STRESS is not set
+CONFIG_HAVE_MMIOTRACE_SUPPORT=y
+# CONFIG_X86_DECODER_SELFTEST is not set
+CONFIG_IO_DELAY_TYPE_0X80=0
+CONFIG_IO_DELAY_TYPE_0XED=1
+CONFIG_IO_DELAY_TYPE_UDELAY=2
+CONFIG_IO_DELAY_TYPE_NONE=3
+CONFIG_IO_DELAY_0X80=y
+# CONFIG_IO_DELAY_0XED is not set
+# CONFIG_IO_DELAY_UDELAY is not set
+# CONFIG_IO_DELAY_NONE is not set
+CONFIG_DEFAULT_IO_DELAY_TYPE=0
+# CONFIG_DEBUG_BOOT_PARAMS is not set
+# CONFIG_CPA_DEBUG is not set
+# CONFIG_OPTIMIZE_INLINING is not set
+# CONFIG_DEBUG_NMI_SELFTEST is not set
+
+#
+# Security options
+#
+CONFIG_KEYS=y
+CONFIG_TRUSTED_KEYS=m
+CONFIG_ENCRYPTED_KEYS=m
+# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
+# CONFIG_SECURITY_DMESG_RESTRICT is not set
+CONFIG_SECURITY=y
+CONFIG_SECURITYFS=y
+CONFIG_SECURITY_NETWORK=y
+# CONFIG_SECURITY_NETWORK_XFRM is not set
+CONFIG_SECURITY_PATH=y
+# CONFIG_INTEL_TXT is not set
+# CONFIG_SECURITY_SELINUX is not set
+# CONFIG_SECURITY_SMACK is not set
+CONFIG_SECURITY_TOMOYO=y
+CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
+CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
+# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
+CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/usr/bin/tomoyo-init"
+CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd"
+CONFIG_SECURITY_APPARMOR=y
+CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0
+# CONFIG_SECURITY_YAMA is not set
+# CONFIG_IMA is not set
+# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
+# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_SECURITY=""
+CONFIG_XOR_BLOCKS=m
+CONFIG_ASYNC_CORE=m
+CONFIG_ASYNC_MEMCPY=m
+CONFIG_ASYNC_XOR=m
+CONFIG_ASYNC_PQ=m
+CONFIG_ASYNC_RAID6_RECOV=m
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=m
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_HASH=m
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=m
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_PCOMP=m
+CONFIG_CRYPTO_PCOMP2=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_USER=m
+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
+CONFIG_CRYPTO_GF128MUL=m
+CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_PCRYPT=m
+CONFIG_CRYPTO_WORKQUEUE=y
+CONFIG_CRYPTO_CRYPTD=m
+CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_ABLK_HELPER_X86=m
+CONFIG_CRYPTO_GLUE_HELPER_X86=m
+
+#
+# Authenticated Encryption with Associated Data
+#
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_SEQIV=m
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_CTR=m
+CONFIG_CRYPTO_CTS=m
+CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_XTS=m
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_CMAC=m
+CONFIG_CRYPTO_HMAC=m
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_VMAC=m
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=m
+CONFIG_CRYPTO_CRC32C_INTEL=m
+CONFIG_CRYPTO_CRC32=m
+CONFIG_CRYPTO_CRC32_PCLMUL=m
+CONFIG_CRYPTO_GHASH=m
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=m
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_RMD128=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_RMD256=m
+CONFIG_CRYPTO_RMD320=m
+CONFIG_CRYPTO_SHA1=m
+CONFIG_CRYPTO_SHA256=m
+CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_TGR192=m
+CONFIG_CRYPTO_WP512=m
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_AES_586=m
+CONFIG_CRYPTO_AES_NI_INTEL=m
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_BLOWFISH_COMMON=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAST_COMMON=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_KHAZAD=m
+CONFIG_CRYPTO_SALSA20=m
+CONFIG_CRYPTO_SALSA20_586=m
+CONFIG_CRYPTO_SEED=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_SERPENT_SSE2_586=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+CONFIG_CRYPTO_TWOFISH_586=m
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=m
+CONFIG_CRYPTO_ZLIB=m
+CONFIG_CRYPTO_LZO=y
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_DEV_PADLOCK=m
+CONFIG_CRYPTO_DEV_PADLOCK_AES=m
+CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
+CONFIG_CRYPTO_DEV_GEODE=m
+CONFIG_CRYPTO_DEV_HIFN_795X=m
+CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
+CONFIG_ASYMMETRIC_KEY_TYPE=m
+CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m
+CONFIG_PUBLIC_KEY_ALGO_RSA=m
+CONFIG_X509_CERTIFICATE_PARSER=m
+CONFIG_HAVE_KVM=y
+CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM_IRQ_ROUTING=y
+CONFIG_HAVE_KVM_EVENTFD=y
+CONFIG_KVM_APIC_ARCHITECTURE=y
+CONFIG_KVM_MMIO=y
+CONFIG_KVM_ASYNC_PF=y
+CONFIG_HAVE_KVM_MSI=y
+CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM=m
+CONFIG_KVM_INTEL=m
+CONFIG_KVM_AMD=m
+CONFIG_KVM_MMU_AUDIT=y
+CONFIG_KVM_DEVICE_ASSIGNMENT=y
+CONFIG_LGUEST=m
+CONFIG_BINARY_PRINTF=y
+
+#
+# Library routines
+#
+CONFIG_RAID6_PQ=m
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_GENERIC_IOMAP=y
+CONFIG_GENERIC_IO=y
+CONFIG_PERCPU_RWSEM=y
+CONFIG_CRC_CCITT=m
+CONFIG_CRC16=m
+CONFIG_CRC_T10DIF=m
+CONFIG_CRC_ITU_T=m
+CONFIG_CRC32=y
+# CONFIG_CRC32_SELFTEST is not set
+CONFIG_CRC32_SLICEBY8=y
+# CONFIG_CRC32_SLICEBY4 is not set
+# CONFIG_CRC32_SARWATE is not set
+# CONFIG_CRC32_BIT is not set
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=m
+CONFIG_CRC8=m
+CONFIG_AUDIT_GENERIC=y
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=m
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_XZ_DEC=y
+CONFIG_XZ_DEC_X86=y
+CONFIG_XZ_DEC_POWERPC=y
+CONFIG_XZ_DEC_IA64=y
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_ARMTHUMB=y
+CONFIG_XZ_DEC_SPARC=y
+CONFIG_XZ_DEC_BCJ=y
+# CONFIG_XZ_DEC_TEST is not set
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_XZ=y
+CONFIG_DECOMPRESS_LZO=y
+CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_REED_SOLOMON=m
+CONFIG_REED_SOLOMON_ENC8=y
+CONFIG_REED_SOLOMON_DEC8=y
+CONFIG_REED_SOLOMON_DEC16=y
+CONFIG_BCH=m
+CONFIG_BCH_CONST_PARAMS=y
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_BTREE=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_CHECK_SIGNATURE=y
+CONFIG_CPU_RMAP=y
+CONFIG_DQL=y
+CONFIG_NLATTR=y
+CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
+CONFIG_LRU_CACHE=m
+CONFIG_AVERAGE=y
+CONFIG_CLZ_TAB=y
+CONFIG_CORDIC=m
+CONFIG_DDR=y
+CONFIG_MPILIB=m
+CONFIG_OID_REGISTRY=m
+CONFIG_UCS2_STRING=y
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index 24d6be2bd..0937bed6f 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.9.4-1 Kernel Configuration
+# Linux/x86 3.9.7-1 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -1530,8 +1530,8 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
 CONFIG_PARPORT=m
 CONFIG_PARPORT_PC=m
 CONFIG_PARPORT_SERIAL=m
-CONFIG_PARPORT_PC_FIFO=y
-CONFIG_PARPORT_PC_SUPERIO=y
+# CONFIG_PARPORT_PC_FIFO is not set
+# CONFIG_PARPORT_PC_SUPERIO is not set
 CONFIG_PARPORT_PC_PCMCIA=m
 # CONFIG_PARPORT_GSC is not set
 CONFIG_PARPORT_AX88796=m
@@ -2345,7 +2345,7 @@ CONFIG_ATH9K=m
 CONFIG_ATH9K_PCI=y
 CONFIG_ATH9K_AHB=y
 # CONFIG_ATH9K_DEBUGFS is not set
-CONFIG_ATH9K_RATE_CONTROL=y
+# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set
 CONFIG_ATH9K_HTC=m
 # CONFIG_ATH9K_HTC_DEBUGFS is not set
 CONFIG_CARL9170=m
@@ -4526,7 +4526,6 @@ CONFIG_USB_MUSB_TUSB6010=m
 CONFIG_MUSB_PIO_ONLY=y
 CONFIG_USB_CHIPIDEA=m
 CONFIG_USB_CHIPIDEA_UDC=y
-CONFIG_USB_CHIPIDEA_HOST=y
 # CONFIG_USB_CHIPIDEA_DEBUG is not set
 CONFIG_USB_RENESAS_USBHS=m
 
@@ -5813,7 +5812,7 @@ CONFIG_SECURITY_TOMOYO=y
 CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
 CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
 # CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
-CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init"
+CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/usr/bin/tomoyo-init"
 CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd"
 CONFIG_SECURITY_APPARMOR=y
 CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0
diff --git a/libre/linux-libre/config.x86_64.3.10 b/libre/linux-libre/config.x86_64.3.10
new file mode 100644
index 000000000..ed592fa43
--- /dev/null
+++ b/libre/linux-libre/config.x86_64.3.10
@@ -0,0 +1,6125 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Linux/x86 3.10.0-rc7 Kernel Configuration
+#
+CONFIG_64BIT=y
+CONFIG_X86_64=y
+CONFIG_X86=y
+CONFIG_INSTRUCTION_DECODER=y
+CONFIG_OUTPUT_FORMAT="elf64-x86-64"
+CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+CONFIG_MMU=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_NEED_SG_DMA_LENGTH=y
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ARCH_HAS_CPU_RELAX=y
+CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+CONFIG_ARCH_HAS_CPU_AUTOPROBE=y
+CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
+CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ZONE_DMA32=y
+CONFIG_AUDIT_ARCH=y
+CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_HAVE_INTEL_TXT=y
+CONFIG_X86_64_SMP=y
+CONFIG_X86_HT=y
+CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
+CONFIG_ARCH_CPU_PROBE_RELEASE=y
+CONFIG_ARCH_SUPPORTS_UPROBES=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_IRQ_WORK=y
+CONFIG_BUILDTIME_EXTABLE_SORT=y
+
+#
+# General setup
+#
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_CROSS_COMPILE=""
+CONFIG_LOCALVERSION="-LIBRE"
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_BZIP2=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_XZ=y
+CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_KERNEL_GZIP=y
+# CONFIG_KERNEL_BZIP2 is not set
+# CONFIG_KERNEL_LZMA is not set
+# CONFIG_KERNEL_XZ is not set
+# CONFIG_KERNEL_LZO is not set
+CONFIG_DEFAULT_HOSTNAME="(none)"
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_FHANDLE=y
+CONFIG_AUDIT=y
+CONFIG_AUDITSYSCALL=y
+CONFIG_AUDIT_WATCH=y
+CONFIG_AUDIT_TREE=y
+CONFIG_AUDIT_LOGINUID_IMMUTABLE=y
+CONFIG_HAVE_GENERIC_HARDIRQS=y
+
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_PENDING_IRQ=y
+CONFIG_IRQ_DOMAIN=y
+# CONFIG_IRQ_DOMAIN_DEBUG is not set
+CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_SPARSE_IRQ=y
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_ARCH_CLOCKSOURCE_DATA=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+
+#
+# Timers subsystem
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ_COMMON=y
+# CONFIG_HZ_PERIODIC is not set
+CONFIG_NO_HZ_IDLE=y
+# CONFIG_NO_HZ_FULL is not set
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+
+#
+# CPU/Task time and stats accounting
+#
+CONFIG_TICK_CPU_ACCOUNTING=y
+# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_PREEMPT_RCU=y
+CONFIG_PREEMPT_RCU=y
+CONFIG_RCU_STALL_COMMON=y
+# CONFIG_RCU_USER_QS is not set
+CONFIG_RCU_FANOUT=64
+CONFIG_RCU_FANOUT_LEAF=16
+# CONFIG_RCU_FANOUT_EXACT is not set
+CONFIG_RCU_FAST_NO_HZ=y
+# CONFIG_TREE_RCU_TRACE is not set
+# CONFIG_RCU_BOOST is not set
+CONFIG_RCU_NOCB_CPU=y
+CONFIG_RCU_NOCB_CPU_NONE=y
+# CONFIG_RCU_NOCB_CPU_ZERO is not set
+# CONFIG_RCU_NOCB_CPU_ALL is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=19
+CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
+CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=y
+CONFIG_ARCH_USES_NUMA_PROT_NONE=y
+CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
+CONFIG_NUMA_BALANCING=y
+CONFIG_CGROUPS=y
+# CONFIG_CGROUP_DEBUG is not set
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_RESOURCE_COUNTERS=y
+CONFIG_MEMCG=y
+CONFIG_MEMCG_SWAP=y
+# CONFIG_MEMCG_SWAP_ENABLED is not set
+CONFIG_MEMCG_KMEM=y
+# CONFIG_CGROUP_HUGETLB is not set
+# CONFIG_CGROUP_PERF is not set
+CONFIG_CGROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_CFS_BANDWIDTH=y
+CONFIG_RT_GROUP_SCHED=y
+CONFIG_BLK_CGROUP=y
+# CONFIG_DEBUG_BLK_CGROUP is not set
+# CONFIG_CHECKPOINT_RESTORE is not set
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_IPC_NS=y
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
+CONFIG_SCHED_AUTOGROUP=y
+CONFIG_MM_OWNER=y
+# CONFIG_SYSFS_DEPRECATED is not set
+CONFIG_RELAY=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_XZ=y
+CONFIG_RD_LZO=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
+CONFIG_HAVE_UID16=y
+CONFIG_SYSCTL_EXCEPTION_TRACE=y
+CONFIG_HOTPLUG=y
+CONFIG_HAVE_PCSPKR_PLATFORM=y
+# CONFIG_EXPERT is not set
+CONFIG_UID16=y
+# CONFIG_SYSCTL_SYSCALL is not set
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_PCSPKR_PLATFORM=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_PCI_QUIRKS=y
+# CONFIG_EMBEDDED is not set
+CONFIG_HAVE_PERF_EVENTS=y
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_PERF_EVENTS=y
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLUB_DEBUG=y
+# CONFIG_COMPAT_BRK is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+CONFIG_PROFILING=y
+CONFIG_TRACEPOINTS=y
+CONFIG_OPROFILE=m
+# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
+CONFIG_HAVE_OPROFILE=y
+CONFIG_OPROFILE_NMI_TIMER=y
+CONFIG_KPROBES=y
+CONFIG_JUMP_LABEL=y
+CONFIG_KPROBES_ON_FTRACE=y
+CONFIG_UPROBES=y
+# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_ARCH_USE_BUILTIN_BSWAP=y
+CONFIG_KRETPROBES=y
+CONFIG_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_IOREMAP_PROT=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_OPTPROBES=y
+CONFIG_HAVE_KPROBES_ON_FTRACE=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_USE_GENERIC_SMP_HELPERS=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
+CONFIG_HAVE_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_PERF_EVENTS_NMI=y
+CONFIG_HAVE_PERF_REGS=y
+CONFIG_HAVE_PERF_USER_STACK_DUMP=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
+CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
+CONFIG_HAVE_CMPXCHG_LOCAL=y
+CONFIG_HAVE_CMPXCHG_DOUBLE=y
+CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
+CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP_FILTER=y
+CONFIG_HAVE_CONTEXT_TRACKING=y
+CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+CONFIG_MODULES_USE_ELF_RELA=y
+CONFIG_OLD_SIGSUSPEND3=y
+CONFIG_COMPAT_OLD_SIGACTION=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+CONFIG_MODULE_FORCE_LOAD=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_MODVERSIONS=y
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+# CONFIG_MODULE_SIG is not set
+CONFIG_STOP_MACHINE=y
+CONFIG_BLOCK=y
+CONFIG_BLK_DEV_BSG=y
+CONFIG_BLK_DEV_BSGLIB=y
+# CONFIG_BLK_DEV_INTEGRITY is not set
+CONFIG_BLK_DEV_THROTTLING=y
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+CONFIG_MAC_PARTITION=y
+CONFIG_MSDOS_PARTITION=y
+CONFIG_BSD_DISKLABEL=y
+CONFIG_MINIX_SUBPARTITION=y
+CONFIG_SOLARIS_X86_PARTITION=y
+# CONFIG_UNIXWARE_DISKLABEL is not set
+CONFIG_LDM_PARTITION=y
+# CONFIG_LDM_DEBUG is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+CONFIG_KARMA_PARTITION=y
+CONFIG_EFI_PARTITION=y
+# CONFIG_SYSV68_PARTITION is not set
+CONFIG_BLOCK_COMPAT=y
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+CONFIG_CFQ_GROUP_IOSCHED=y
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_PREEMPT_NOTIFIERS=y
+CONFIG_PADATA=y
+CONFIG_ASN1=m
+CONFIG_UNINLINE_SPIN_UNLOCK=y
+CONFIG_FREEZER=y
+
+#
+# Processor type and features
+#
+CONFIG_ZONE_DMA=y
+CONFIG_SMP=y
+CONFIG_X86_X2APIC=y
+CONFIG_X86_MPPARSE=y
+# CONFIG_X86_EXTENDED_PLATFORM is not set
+# CONFIG_X86_INTEL_LPSS is not set
+CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
+CONFIG_HYPERVISOR_GUEST=y
+CONFIG_PARAVIRT=y
+# CONFIG_PARAVIRT_DEBUG is not set
+# CONFIG_PARAVIRT_SPINLOCKS is not set
+CONFIG_XEN=y
+CONFIG_XEN_DOM0=y
+CONFIG_XEN_PRIVILEGED_GUEST=y
+CONFIG_XEN_PVHVM=y
+CONFIG_XEN_MAX_DOMAIN_MEMORY=500
+CONFIG_XEN_SAVE_RESTORE=y
+# CONFIG_XEN_DEBUG_FS is not set
+CONFIG_KVM_GUEST=y
+CONFIG_PARAVIRT_TIME_ACCOUNTING=y
+CONFIG_PARAVIRT_CLOCK=y
+CONFIG_NO_BOOTMEM=y
+# CONFIG_MEMTEST is not set
+# CONFIG_MK8 is not set
+# CONFIG_MPSC is not set
+# CONFIG_MCORE2 is not set
+# CONFIG_MATOM is not set
+CONFIG_GENERIC_CPU=y
+CONFIG_X86_INTERNODE_CACHE_SHIFT=6
+CONFIG_X86_L1_CACHE_SHIFT=6
+CONFIG_X86_TSC=y
+CONFIG_X86_CMPXCHG64=y
+CONFIG_X86_CMOV=y
+CONFIG_X86_MINIMUM_CPU_FAMILY=64
+CONFIG_X86_DEBUGCTLMSR=y
+CONFIG_CPU_SUP_INTEL=y
+CONFIG_CPU_SUP_AMD=y
+CONFIG_CPU_SUP_CENTAUR=y
+CONFIG_HPET_TIMER=y
+CONFIG_HPET_EMULATE_RTC=y
+CONFIG_DMI=y
+CONFIG_GART_IOMMU=y
+CONFIG_CALGARY_IOMMU=y
+CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
+CONFIG_SWIOTLB=y
+CONFIG_IOMMU_HELPER=y
+# CONFIG_MAXSMP is not set
+CONFIG_NR_CPUS=64
+CONFIG_SCHED_SMT=y
+CONFIG_SCHED_MC=y
+# CONFIG_PREEMPT_NONE is not set
+# CONFIG_PREEMPT_VOLUNTARY is not set
+CONFIG_PREEMPT=y
+CONFIG_PREEMPT_COUNT=y
+CONFIG_X86_LOCAL_APIC=y
+CONFIG_X86_IO_APIC=y
+CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
+CONFIG_X86_MCE=y
+CONFIG_X86_MCE_INTEL=y
+CONFIG_X86_MCE_AMD=y
+CONFIG_X86_MCE_THRESHOLD=y
+# CONFIG_X86_MCE_INJECT is not set
+CONFIG_X86_THERMAL_VECTOR=y
+CONFIG_I8K=m
+CONFIG_MICROCODE=m
+# CONFIG_MICROCODE_INTEL is not set
+# CONFIG_MICROCODE_AMD is not set
+CONFIG_MICROCODE_OLD_INTERFACE=y
+CONFIG_X86_MSR=m
+CONFIG_X86_CPUID=m
+CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+CONFIG_DIRECT_GBPAGES=y
+CONFIG_NUMA=y
+CONFIG_AMD_NUMA=y
+CONFIG_X86_64_ACPI_NUMA=y
+CONFIG_NODES_SPAN_OTHER_NODES=y
+# CONFIG_NUMA_EMU is not set
+CONFIG_NODES_SHIFT=6
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ARCH_MEMORY_PROBE=y
+CONFIG_ARCH_PROC_KCORE_TEXT=y
+CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_SPARSEMEM_MANUAL=y
+CONFIG_SPARSEMEM=y
+CONFIG_NEED_MULTIPLE_NODES=y
+CONFIG_HAVE_MEMORY_PRESENT=y
+CONFIG_SPARSEMEM_EXTREME=y
+CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
+CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y
+CONFIG_SPARSEMEM_VMEMMAP=y
+CONFIG_HAVE_MEMBLOCK=y
+CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
+CONFIG_ARCH_DISCARD_MEMBLOCK=y
+CONFIG_MEMORY_ISOLATION=y
+# CONFIG_MOVABLE_NODE is not set
+CONFIG_HAVE_BOOTMEM_INFO_NODE=y
+CONFIG_MEMORY_HOTPLUG=y
+CONFIG_MEMORY_HOTPLUG_SPARSE=y
+CONFIG_MEMORY_HOTREMOVE=y
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_BALLOON_COMPACTION=y
+CONFIG_COMPACTION=y
+CONFIG_MIGRATION=y
+CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_MMU_NOTIFIER=y
+CONFIG_KSM=y
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_MEMORY_FAILURE=y
+CONFIG_HWPOISON_INJECT=m
+CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
+# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
+CONFIG_CROSS_MEMORY_ATTACH=y
+CONFIG_CLEANCACHE=y
+CONFIG_FRONTSWAP=y
+CONFIG_X86_CHECK_BIOS_CORRUPTION=y
+CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
+CONFIG_X86_RESERVE_LOW=64
+CONFIG_MTRR=y
+CONFIG_MTRR_SANITIZER=y
+CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
+CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
+CONFIG_X86_PAT=y
+CONFIG_ARCH_USES_PG_UNCACHED=y
+CONFIG_ARCH_RANDOM=y
+CONFIG_X86_SMAP=y
+CONFIG_EFI=y
+CONFIG_EFI_STUB=y
+CONFIG_SECCOMP=y
+CONFIG_CC_STACKPROTECTOR=y
+# CONFIG_HZ_100 is not set
+# CONFIG_HZ_250 is not set
+CONFIG_HZ_300=y
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=300
+CONFIG_SCHED_HRTICK=y
+CONFIG_KEXEC=y
+# CONFIG_CRASH_DUMP is not set
+CONFIG_KEXEC_JUMP=y
+CONFIG_PHYSICAL_START=0x1000000
+CONFIG_RELOCATABLE=y
+CONFIG_PHYSICAL_ALIGN=0x1000000
+CONFIG_HOTPLUG_CPU=y
+# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
+# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
+# CONFIG_COMPAT_VDSO is not set
+# CONFIG_CMDLINE_BOOL is not set
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
+CONFIG_USE_PERCPU_NUMA_NODE_ID=y
+
+#
+# Power management and ACPI options
+#
+CONFIG_ARCH_HIBERNATION_HEADER=y
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+CONFIG_HIBERNATE_CALLBACKS=y
+CONFIG_HIBERNATION=y
+CONFIG_PM_STD_PARTITION=""
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_SMP=y
+CONFIG_PM_AUTOSLEEP=y
+CONFIG_PM_WAKELOCKS=y
+CONFIG_PM_WAKELOCKS_LIMIT=100
+CONFIG_PM_WAKELOCKS_GC=y
+CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
+CONFIG_PM_DEBUG=y
+CONFIG_PM_ADVANCED_DEBUG=y
+# CONFIG_PM_TEST_SUSPEND is not set
+CONFIG_PM_SLEEP_DEBUG=y
+CONFIG_PM_TRACE=y
+CONFIG_PM_TRACE_RTC=y
+CONFIG_ACPI=y
+CONFIG_ACPI_SLEEP=y
+# CONFIG_ACPI_PROCFS is not set
+# CONFIG_ACPI_PROCFS_POWER is not set
+CONFIG_ACPI_EC_DEBUGFS=m
+# CONFIG_ACPI_PROC_EVENT is not set
+CONFIG_ACPI_AC=m
+CONFIG_ACPI_BATTERY=m
+CONFIG_ACPI_BUTTON=m
+CONFIG_ACPI_VIDEO=m
+CONFIG_ACPI_FAN=m
+CONFIG_ACPI_DOCK=y
+CONFIG_ACPI_I2C=m
+CONFIG_ACPI_PROCESSOR=m
+CONFIG_ACPI_IPMI=m
+CONFIG_ACPI_HOTPLUG_CPU=y
+CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
+CONFIG_ACPI_THERMAL=m
+CONFIG_ACPI_NUMA=y
+# CONFIG_ACPI_CUSTOM_DSDT is not set
+CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y
+CONFIG_ACPI_BLACKLIST_YEAR=0
+# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_PCI_SLOT=y
+CONFIG_X86_PM_TIMER=y
+CONFIG_ACPI_CONTAINER=y
+CONFIG_ACPI_HOTPLUG_MEMORY=y
+CONFIG_ACPI_SBS=m
+CONFIG_ACPI_HED=y
+CONFIG_ACPI_CUSTOM_METHOD=m
+CONFIG_ACPI_BGRT=y
+CONFIG_ACPI_APEI=y
+CONFIG_ACPI_APEI_GHES=y
+CONFIG_ACPI_APEI_PCIEAER=y
+CONFIG_ACPI_APEI_MEMORY_FAILURE=y
+CONFIG_ACPI_APEI_EINJ=m
+CONFIG_ACPI_APEI_ERST_DEBUG=m
+CONFIG_SFI=y
+
+#
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_TABLE=y
+CONFIG_CPU_FREQ_GOV_COMMON=y
+CONFIG_CPU_FREQ_STAT=m
+CONFIG_CPU_FREQ_STAT_DETAILS=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+
+#
+# x86 CPU frequency scaling drivers
+#
+CONFIG_X86_INTEL_PSTATE=y
+CONFIG_X86_PCC_CPUFREQ=m
+CONFIG_X86_ACPI_CPUFREQ=m
+CONFIG_X86_ACPI_CPUFREQ_CPB=y
+CONFIG_X86_POWERNOW_K8=m
+CONFIG_X86_AMD_FREQ_SENSITIVITY=m
+# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
+CONFIG_X86_P4_CLOCKMOD=m
+
+#
+# shared options
+#
+CONFIG_X86_SPEEDSTEP_LIB=m
+CONFIG_CPU_IDLE=y
+# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_MENU=y
+# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
+CONFIG_INTEL_IDLE=y
+
+#
+# Memory power savings
+#
+CONFIG_I7300_IDLE_IOAT_CHANNEL=y
+CONFIG_I7300_IDLE=m
+
+#
+# Bus options (PCI etc.)
+#
+CONFIG_PCI=y
+CONFIG_PCI_DIRECT=y
+CONFIG_PCI_MMCONFIG=y
+CONFIG_PCI_XEN=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_HOTPLUG_PCI_PCIE=m
+CONFIG_PCIEAER=y
+# CONFIG_PCIE_ECRC is not set
+# CONFIG_PCIEAER_INJECT is not set
+CONFIG_PCIEASPM=y
+# CONFIG_PCIEASPM_DEBUG is not set
+CONFIG_PCIEASPM_DEFAULT=y
+# CONFIG_PCIEASPM_POWERSAVE is not set
+# CONFIG_PCIEASPM_PERFORMANCE is not set
+CONFIG_PCIE_PME=y
+CONFIG_ARCH_SUPPORTS_MSI=y
+CONFIG_PCI_MSI=y
+# CONFIG_PCI_DEBUG is not set
+CONFIG_PCI_REALLOC_ENABLE_AUTO=y
+CONFIG_PCI_STUB=m
+CONFIG_XEN_PCIDEV_FRONTEND=m
+CONFIG_HT_IRQ=y
+CONFIG_PCI_ATS=y
+CONFIG_PCI_IOV=y
+CONFIG_PCI_PRI=y
+CONFIG_PCI_PASID=y
+CONFIG_PCI_IOAPIC=y
+CONFIG_PCI_LABEL=y
+CONFIG_ISA_DMA_API=y
+CONFIG_AMD_NB=y
+CONFIG_PCCARD=m
+CONFIG_PCMCIA=m
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_CARDBUS=y
+
+#
+# PC-card bridges
+#
+CONFIG_YENTA=m
+CONFIG_YENTA_O2=y
+CONFIG_YENTA_RICOH=y
+CONFIG_YENTA_TI=y
+CONFIG_YENTA_ENE_TUNE=y
+CONFIG_YENTA_TOSHIBA=y
+CONFIG_PD6729=m
+CONFIG_I82092=m
+CONFIG_PCCARD_NONSTATIC=y
+CONFIG_HOTPLUG_PCI=m
+CONFIG_HOTPLUG_PCI_CPCI=y
+CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
+CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
+CONFIG_HOTPLUG_PCI_SHPC=m
+CONFIG_RAPIDIO=y
+CONFIG_RAPIDIO_TSI721=y
+CONFIG_RAPIDIO_DISC_TIMEOUT=30
+# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set
+CONFIG_RAPIDIO_DMA_ENGINE=y
+CONFIG_RAPIDIO_DEBUG=y
+CONFIG_RAPIDIO_ENUM_BASIC=m
+CONFIG_RAPIDIO_TSI57X=y
+CONFIG_RAPIDIO_CPS_XX=y
+CONFIG_RAPIDIO_TSI568=y
+CONFIG_RAPIDIO_CPS_GEN2=y
+CONFIG_RAPIDIO_TSI500=y
+
+#
+# Executable file formats / Emulations
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_COMPAT_BINFMT_ELF=y
+CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_BINFMT_SCRIPT=y
+# CONFIG_HAVE_AOUT is not set
+CONFIG_BINFMT_MISC=y
+CONFIG_COREDUMP=y
+CONFIG_IA32_EMULATION=y
+CONFIG_IA32_AOUT=m
+CONFIG_X86_X32=y
+CONFIG_COMPAT=y
+CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
+CONFIG_SYSVIPC_COMPAT=y
+CONFIG_KEYS_COMPAT=y
+CONFIG_HAVE_TEXT_POKE_SMP=y
+CONFIG_X86_DEV_DMA_OPS=y
+CONFIG_NET=y
+CONFIG_COMPAT_NETLINK_MESSAGES=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_PACKET_DIAG=m
+CONFIG_UNIX=y
+CONFIG_UNIX_DIAG=m
+CONFIG_XFRM=y
+CONFIG_XFRM_ALGO=m
+CONFIG_XFRM_USER=m
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_IPCOMP=m
+CONFIG_NET_KEY=m
+# CONFIG_NET_KEY_MIGRATE is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_FIB_TRIE_STATS=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_ROUTE_CLASSID=y
+# CONFIG_IP_PNP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IP_TUNNEL=m
+CONFIG_NET_IPGRE=m
+# CONFIG_NET_IPGRE_BROADCAST is not set
+CONFIG_IP_MROUTE=y
+# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_ARPD=y
+CONFIG_SYN_COOKIES=y
+CONFIG_NET_IPVTI=m
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_INET_XFRM_MODE_BEET=m
+CONFIG_INET_LRO=y
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+CONFIG_INET_UDP_DIAG=m
+CONFIG_TCP_CONG_ADVANCED=y
+CONFIG_TCP_CONG_BIC=m
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_TCP_CONG_WESTWOOD=m
+CONFIG_TCP_CONG_HTCP=m
+CONFIG_TCP_CONG_HSTCP=m
+CONFIG_TCP_CONG_HYBLA=m
+CONFIG_TCP_CONG_VEGAS=m
+CONFIG_TCP_CONG_SCALABLE=m
+CONFIG_TCP_CONG_LP=m
+CONFIG_TCP_CONG_VENO=m
+CONFIG_TCP_CONG_YEAH=m
+CONFIG_TCP_CONG_ILLINOIS=m
+CONFIG_DEFAULT_CUBIC=y
+# CONFIG_DEFAULT_RENO is not set
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+CONFIG_IPV6=y
+CONFIG_IPV6_PRIVACY=y
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_IPV6_OPTIMISTIC_DAD=y
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_SIT_6RD=y
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_GRE=m
+CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_IPV6_SUBTREES=y
+# CONFIG_IPV6_MROUTE is not set
+CONFIG_NETLABEL=y
+CONFIG_NETWORK_SECMARK=y
+CONFIG_NETWORK_PHY_TIMESTAMPING=y
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_ACCT=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_SECMARK=y
+CONFIG_NF_CONNTRACK_ZONES=y
+CONFIG_NF_CONNTRACK_PROCFS=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_TIMEOUT=y
+CONFIG_NF_CONNTRACK_TIMESTAMP=y
+CONFIG_NF_CONNTRACK_LABELS=y
+CONFIG_NF_CT_PROTO_DCCP=m
+CONFIG_NF_CT_PROTO_GRE=m
+CONFIG_NF_CT_PROTO_SCTP=m
+CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_BROADCAST=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NF_CT_NETLINK_TIMEOUT=m
+CONFIG_NF_CT_NETLINK_HELPER=m
+CONFIG_NETFILTER_NETLINK_QUEUE_CT=y
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_NF_NAT_PROTO_DCCP=m
+CONFIG_NF_NAT_PROTO_UDPLITE=m
+CONFIG_NF_NAT_PROTO_SCTP=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NETFILTER_TPROXY=m
+CONFIG_NETFILTER_XTABLES=m
+
+#
+# Xtables combined modules
+#
+CONFIG_NETFILTER_XT_MARK=m
+CONFIG_NETFILTER_XT_CONNMARK=m
+CONFIG_NETFILTER_XT_SET=m
+
+#
+# Xtables targets
+#
+CONFIG_NETFILTER_XT_TARGET_AUDIT=m
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_HMARK=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
+CONFIG_NETFILTER_XT_TARGET_LOG=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NETMAP=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+
+#
+# Xtables matches
+#
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_BPF=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_CPU=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ECN=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_HL=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_IP_SET=m
+CONFIG_IP_SET_MAX=256
+CONFIG_IP_SET_BITMAP_IP=m
+CONFIG_IP_SET_BITMAP_IPMAC=m
+CONFIG_IP_SET_BITMAP_PORT=m
+CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPPORT=m
+CONFIG_IP_SET_HASH_IPPORTIP=m
+CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_HASH_NETIFACE=m
+CONFIG_IP_SET_LIST_SET=m
+CONFIG_IP_VS=m
+# CONFIG_IP_VS_IPV6 is not set
+# CONFIG_IP_VS_DEBUG is not set
+CONFIG_IP_VS_TAB_BITS=12
+
+#
+# IPVS transport protocol load balancing support
+#
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_AH_ESP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+CONFIG_IP_VS_PROTO_SCTP=y
+
+#
+# IPVS scheduler
+#
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+
+#
+# IPVS SH scheduler
+#
+CONFIG_IP_VS_SH_TAB_BITS=8
+
+#
+# IPVS application helper
+#
+CONFIG_IP_VS_FTP=m
+CONFIG_IP_VS_NFCT=y
+CONFIG_IP_VS_PE_SIP=m
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_CONNTRACK_IPV4=m
+# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_RPFILTER=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_NF_NAT_IPV4=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PROTO_GRE=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_SECURITY=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV6=m
+CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RPFILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_SECURITY=m
+CONFIG_NF_NAT_IPV6=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+CONFIG_IP6_NF_TARGET_NPT=m
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_ULOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+CONFIG_IP_DCCP=m
+CONFIG_INET_DCCP_DIAG=m
+
+#
+# DCCP CCIDs Configuration
+#
+# CONFIG_IP_DCCP_CCID2_DEBUG is not set
+CONFIG_IP_DCCP_CCID3=y
+# CONFIG_IP_DCCP_CCID3_DEBUG is not set
+CONFIG_IP_DCCP_TFRC_LIB=y
+
+#
+# DCCP Kernel Hacking
+#
+# CONFIG_IP_DCCP_DEBUG is not set
+CONFIG_NET_DCCPPROBE=m
+CONFIG_IP_SCTP=m
+CONFIG_NET_SCTPPROBE=m
+# CONFIG_SCTP_DBG_MSG is not set
+# CONFIG_SCTP_DBG_OBJCNT is not set
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
+CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
+CONFIG_SCTP_COOKIE_HMAC_MD5=y
+CONFIG_SCTP_COOKIE_HMAC_SHA1=y
+# CONFIG_RDS is not set
+# CONFIG_TIPC is not set
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+# CONFIG_ATM_CLIP_NO_ICMP is not set
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+# CONFIG_ATM_BR2684_IPFILTER is not set
+CONFIG_L2TP=m
+# CONFIG_L2TP_DEBUGFS is not set
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+CONFIG_STP=m
+CONFIG_MRP=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_IGMP_SNOOPING=y
+CONFIG_BRIDGE_VLAN_FILTERING=y
+CONFIG_HAVE_NET_DSA=y
+CONFIG_NET_DSA=m
+CONFIG_NET_DSA_TAG_DSA=y
+CONFIG_NET_DSA_TAG_EDSA=y
+CONFIG_NET_DSA_TAG_TRAILER=y
+CONFIG_VLAN_8021Q=m
+# CONFIG_VLAN_8021Q_GVRP is not set
+CONFIG_VLAN_8021Q_MVRP=y
+# CONFIG_DECNET is not set
+CONFIG_LLC=m
+CONFIG_LLC2=m
+CONFIG_IPX=m
+# CONFIG_IPX_INTERN is not set
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=m
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+CONFIG_PHONET=m
+CONFIG_IEEE802154=m
+CONFIG_IEEE802154_6LOWPAN=m
+CONFIG_MAC802154=m
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_ATM=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFB=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_MQPRIO=m
+CONFIG_NET_SCH_CHOKE=m
+CONFIG_NET_SCH_QFQ=m
+CONFIG_NET_SCH_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_SCH_PLUG=m
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+# CONFIG_CLS_U32_PERF is not set
+# CONFIG_CLS_U32_MARK is not set
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_CLS_CGROUP=y
+# CONFIG_NET_EMATCH is not set
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=m
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_CLS_IND=y
+CONFIG_NET_SCH_FIFO=y
+# CONFIG_DCB is not set
+CONFIG_DNS_RESOLVER=y
+CONFIG_BATMAN_ADV=m
+CONFIG_BATMAN_ADV_BLA=y
+CONFIG_BATMAN_ADV_DAT=y
+CONFIG_BATMAN_ADV_NC=y
+# CONFIG_BATMAN_ADV_DEBUG is not set
+CONFIG_OPENVSWITCH=m
+CONFIG_VSOCKETS=m
+CONFIG_VMWARE_VMCI_VSOCKETS=m
+CONFIG_NETLINK_MMAP=y
+CONFIG_NETLINK_DIAG=m
+CONFIG_RPS=y
+CONFIG_RFS_ACCEL=y
+CONFIG_XPS=y
+CONFIG_NETPRIO_CGROUP=m
+CONFIG_BQL=y
+CONFIG_BPF_JIT=y
+
+#
+# Network testing
+#
+CONFIG_NET_PKTGEN=m
+CONFIG_NET_TCPPROBE=m
+CONFIG_NET_DROP_MONITOR=y
+CONFIG_HAMRADIO=y
+
+#
+# Packet Radio protocols
+#
+CONFIG_AX25=m
+CONFIG_AX25_DAMA_SLAVE=y
+CONFIG_NETROM=m
+CONFIG_ROSE=m
+
+#
+# AX.25 network device drivers
+#
+CONFIG_MKISS=m
+CONFIG_6PACK=m
+CONFIG_BPQETHER=m
+CONFIG_BAYCOM_SER_FDX=m
+CONFIG_BAYCOM_SER_HDX=m
+CONFIG_BAYCOM_PAR=m
+CONFIG_YAM=m
+# CONFIG_CAN is not set
+CONFIG_IRDA=m
+
+#
+# IrDA protocols
+#
+CONFIG_IRLAN=m
+CONFIG_IRNET=m
+CONFIG_IRCOMM=m
+CONFIG_IRDA_ULTRA=y
+
+#
+# IrDA options
+#
+CONFIG_IRDA_CACHE_LAST_LSAP=y
+CONFIG_IRDA_FAST_RR=y
+# CONFIG_IRDA_DEBUG is not set
+
+#
+# Infrared-port device drivers
+#
+
+#
+# SIR device drivers
+#
+CONFIG_IRTTY_SIR=m
+
+#
+# Dongle support
+#
+CONFIG_DONGLE=y
+CONFIG_ESI_DONGLE=m
+CONFIG_ACTISYS_DONGLE=m
+CONFIG_TEKRAM_DONGLE=m
+CONFIG_TOIM3232_DONGLE=m
+CONFIG_LITELINK_DONGLE=m
+CONFIG_MA600_DONGLE=m
+CONFIG_GIRBIL_DONGLE=m
+CONFIG_MCP2120_DONGLE=m
+CONFIG_OLD_BELKIN_DONGLE=m
+CONFIG_ACT200L_DONGLE=m
+CONFIG_KINGSUN_DONGLE=m
+CONFIG_KSDAZZLE_DONGLE=m
+CONFIG_KS959_DONGLE=m
+
+#
+# FIR device drivers
+#
+CONFIG_USB_IRDA=m
+CONFIG_SIGMATEL_FIR=m
+CONFIG_NSC_FIR=m
+CONFIG_WINBOND_FIR=m
+CONFIG_SMC_IRCC_FIR=m
+CONFIG_ALI_FIR=m
+CONFIG_VLSI_FIR=m
+CONFIG_VIA_FIR=m
+CONFIG_MCS_FIR=m
+CONFIG_BT=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+# CONFIG_BT_BNEP_MC_FILTER is not set
+# CONFIG_BT_BNEP_PROTO_FILTER is not set
+# CONFIG_BT_CMTP is not set
+CONFIG_BT_HIDP=m
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_HCIBTUSB=m
+CONFIG_BT_HCIBTSDIO=m
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_ATH3K=y
+CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_HCIUART_3WIRE=y
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIDTL1=m
+CONFIG_BT_HCIBT3C=m
+CONFIG_BT_HCIBLUECARD=m
+CONFIG_BT_HCIBTUART=m
+CONFIG_BT_HCIVHCI=m
+CONFIG_BT_MRVL=m
+CONFIG_BT_MRVL_SDIO=m
+CONFIG_BT_ATH3K=m
+CONFIG_BT_WILINK=m
+CONFIG_AF_RXRPC=m
+# CONFIG_AF_RXRPC_DEBUG is not set
+CONFIG_RXKAD=m
+CONFIG_FIB_RULES=y
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+CONFIG_WEXT_PRIV=y
+CONFIG_CFG80211=m
+# CONFIG_NL80211_TESTMODE is not set
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+# CONFIG_CFG80211_REG_DEBUG is not set
+CONFIG_CFG80211_DEFAULT_PS=y
+# CONFIG_CFG80211_DEBUGFS is not set
+# CONFIG_CFG80211_INTERNAL_REGDB is not set
+CONFIG_CFG80211_WEXT=y
+CONFIG_LIB80211=m
+CONFIG_LIB80211_CRYPT_WEP=m
+CONFIG_LIB80211_CRYPT_CCMP=m
+CONFIG_LIB80211_CRYPT_TKIP=m
+# CONFIG_LIB80211_DEBUG is not set
+CONFIG_MAC80211=m
+CONFIG_MAC80211_HAS_RC=y
+CONFIG_MAC80211_RC_MINSTREL=y
+CONFIG_MAC80211_RC_MINSTREL_HT=y
+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
+CONFIG_MAC80211_MESH=y
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_MESSAGE_TRACING is not set
+# CONFIG_MAC80211_DEBUG_MENU is not set
+CONFIG_WIMAX=m
+CONFIG_WIMAX_DEBUG_LEVEL=8
+CONFIG_RFKILL=m
+CONFIG_RFKILL_LEDS=y
+CONFIG_RFKILL_INPUT=y
+CONFIG_NET_9P=m
+CONFIG_NET_9P_VIRTIO=m
+# CONFIG_NET_9P_DEBUG is not set
+CONFIG_CAIF=m
+# CONFIG_CAIF_DEBUG is not set
+CONFIG_CAIF_NETDEV=m
+CONFIG_CAIF_USB=m
+CONFIG_CEPH_LIB=m
+# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
+# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
+CONFIG_NFC=m
+CONFIG_NFC_NCI=m
+CONFIG_NFC_HCI=m
+# CONFIG_NFC_SHDLC is not set
+
+#
+# Near Field Communication (NFC) devices
+#
+CONFIG_NFC_PN533=m
+CONFIG_NFC_WILINK=m
+CONFIG_NFC_MEI_PHY=m
+CONFIG_NFC_PN544=m
+CONFIG_NFC_PN544_MEI=m
+CONFIG_NFC_MICROREAD=m
+CONFIG_NFC_MICROREAD_MEI=m
+CONFIG_HAVE_BPF_JIT=y
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH=""
+CONFIG_DEVTMPFS=y
+# CONFIG_DEVTMPFS_MOUNT is not set
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+CONFIG_FIRMWARE_IN_KERNEL=y
+CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_FW_LOADER_USER_HELPER is not set
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+CONFIG_SYS_HYPERVISOR=y
+# CONFIG_GENERIC_CPU_DEVICES is not set
+CONFIG_REGMAP=y
+CONFIG_REGMAP_I2C=m
+CONFIG_REGMAP_MMIO=m
+CONFIG_REGMAP_IRQ=y
+CONFIG_DMA_SHARED_BUFFER=y
+
+#
+# Bus devices
+#
+CONFIG_CONNECTOR=y
+CONFIG_PROC_EVENTS=y
+CONFIG_MTD=m
+CONFIG_MTD_TESTS=m
+CONFIG_MTD_REDBOOT_PARTS=m
+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
+# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
+# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+CONFIG_MTD_CMDLINE_PARTS=m
+CONFIG_MTD_AR7_PARTS=m
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_BLOCK_RO=m
+CONFIG_FTL=m
+CONFIG_NFTL=m
+CONFIG_NFTL_RW=y
+CONFIG_INFTL=m
+CONFIG_RFD_FTL=m
+CONFIG_SSFDC=m
+# CONFIG_SM_FTL is not set
+CONFIG_MTD_OOPS=m
+CONFIG_MTD_SWAP=m
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=m
+CONFIG_MTD_JEDECPROBE=m
+CONFIG_MTD_GEN_PROBE=m
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+CONFIG_MTD_CFI_INTELEXT=m
+CONFIG_MTD_CFI_AMDSTD=m
+CONFIG_MTD_CFI_STAA=m
+CONFIG_MTD_CFI_UTIL=m
+CONFIG_MTD_RAM=m
+CONFIG_MTD_ROM=m
+CONFIG_MTD_ABSENT=m
+
+#
+# Mapping drivers for chip access
+#
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+# CONFIG_MTD_PHYSMAP is not set
+CONFIG_MTD_SC520CDP=m
+CONFIG_MTD_NETSC520=m
+CONFIG_MTD_TS5500=m
+# CONFIG_MTD_SBC_GXX is not set
+# CONFIG_MTD_AMD76XROM is not set
+# CONFIG_MTD_ICHXROM is not set
+# CONFIG_MTD_ESB2ROM is not set
+# CONFIG_MTD_CK804XROM is not set
+CONFIG_MTD_SCB2_FLASH=m
+# CONFIG_MTD_NETtel is not set
+# CONFIG_MTD_L440GX is not set
+CONFIG_MTD_PCI=m
+# CONFIG_MTD_PCMCIA is not set
+# CONFIG_MTD_GPIO_ADDR is not set
+# CONFIG_MTD_INTEL_VR_NOR is not set
+CONFIG_MTD_PLATRAM=m
+# CONFIG_MTD_LATCH_ADDR is not set
+
+#
+# Self-contained MTD device drivers
+#
+CONFIG_MTD_PMC551=m
+# CONFIG_MTD_PMC551_BUGFIX is not set
+# CONFIG_MTD_PMC551_DEBUG is not set
+# CONFIG_MTD_DATAFLASH is not set
+# CONFIG_MTD_M25P80 is not set
+# CONFIG_MTD_SST25L is not set
+# CONFIG_MTD_SLRAM is not set
+CONFIG_MTD_PHRAM=m
+CONFIG_MTD_MTDRAM=m
+CONFIG_MTDRAM_TOTAL_SIZE=4096
+CONFIG_MTDRAM_ERASE_SIZE=128
+CONFIG_MTD_BLOCK2MTD=m
+
+#
+# Disk-On-Chip Device Drivers
+#
+CONFIG_MTD_DOCG3=m
+CONFIG_BCH_CONST_M=14
+CONFIG_BCH_CONST_T=4
+CONFIG_MTD_NAND_ECC=m
+CONFIG_MTD_NAND_ECC_SMC=y
+CONFIG_MTD_NAND=m
+# CONFIG_MTD_NAND_ECC_BCH is not set
+CONFIG_MTD_SM_COMMON=m
+# CONFIG_MTD_NAND_DENALI is not set
+CONFIG_MTD_NAND_IDS=m
+CONFIG_MTD_NAND_RICOH=m
+CONFIG_MTD_NAND_DISKONCHIP=m
+# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
+# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
+CONFIG_MTD_NAND_DOCG4=m
+# CONFIG_MTD_NAND_CAFE is not set
+CONFIG_MTD_NAND_NANDSIM=m
+# CONFIG_MTD_NAND_PLATFORM is not set
+CONFIG_MTD_ALAUDA=m
+# CONFIG_MTD_ONENAND is not set
+
+#
+# LPDDR flash memory drivers
+#
+CONFIG_MTD_LPDDR=m
+CONFIG_MTD_QINFO_PROBE=m
+CONFIG_MTD_UBI=m
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_LIMIT=20
+# CONFIG_MTD_UBI_FASTMAP is not set
+# CONFIG_MTD_UBI_GLUEBI is not set
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_SERIAL=m
+# CONFIG_PARPORT_PC_FIFO is not set
+# CONFIG_PARPORT_PC_SUPERIO is not set
+CONFIG_PARPORT_PC_PCMCIA=m
+# CONFIG_PARPORT_GSC is not set
+CONFIG_PARPORT_AX88796=m
+CONFIG_PARPORT_1284=y
+CONFIG_PARPORT_NOT_PC=y
+CONFIG_PNP=y
+# CONFIG_PNP_DEBUG_MESSAGES is not set
+
+#
+# Protocols
+#
+CONFIG_PNPACPI=y
+CONFIG_BLK_DEV=y
+CONFIG_BLK_DEV_FD=m
+# CONFIG_PARIDE is not set
+CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
+CONFIG_BLK_CPQ_DA=m
+CONFIG_BLK_CPQ_CISS_DA=m
+# CONFIG_CISS_SCSI_TAPE is not set
+CONFIG_BLK_DEV_DAC960=m
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+CONFIG_BLK_DEV_DRBD=m
+# CONFIG_DRBD_FAULT_INJECTION is not set
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_NVME=m
+CONFIG_BLK_DEV_OSD=m
+CONFIG_BLK_DEV_SX8=m
+CONFIG_BLK_DEV_RAM=m
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=16384
+# CONFIG_BLK_DEV_XIP is not set
+CONFIG_CDROM_PKTCDVD=m
+CONFIG_CDROM_PKTCDVD_BUFFERS=8
+# CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_ATA_OVER_ETH=m
+CONFIG_XEN_BLKDEV_FRONTEND=m
+CONFIG_XEN_BLKDEV_BACKEND=m
+CONFIG_VIRTIO_BLK=m
+# CONFIG_BLK_DEV_HD is not set
+CONFIG_BLK_DEV_RBD=m
+CONFIG_BLK_DEV_RSXX=m
+
+#
+# Misc devices
+#
+CONFIG_SENSORS_LIS3LV02D=m
+CONFIG_AD525X_DPOT=m
+CONFIG_AD525X_DPOT_I2C=m
+# CONFIG_AD525X_DPOT_SPI is not set
+# CONFIG_DUMMY_IRQ is not set
+# CONFIG_IBM_ASM is not set
+CONFIG_PHANTOM=m
+CONFIG_INTEL_MID_PTI=m
+CONFIG_SGI_IOC4=m
+CONFIG_TIFM_CORE=m
+CONFIG_TIFM_7XX1=m
+CONFIG_ICS932S401=m
+# CONFIG_ATMEL_SSC is not set
+CONFIG_ENCLOSURE_SERVICES=m
+CONFIG_CS5535_MFGPT=m
+CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7
+CONFIG_CS5535_CLOCK_EVENT_SRC=m
+CONFIG_HP_ILO=m
+CONFIG_APDS9802ALS=m
+CONFIG_ISL29003=m
+CONFIG_ISL29020=m
+CONFIG_SENSORS_TSL2550=m
+CONFIG_SENSORS_BH1780=m
+CONFIG_SENSORS_BH1770=m
+CONFIG_SENSORS_APDS990X=m
+CONFIG_HMC6352=m
+CONFIG_DS1682=m
+# CONFIG_TI_DAC7512 is not set
+CONFIG_VMWARE_BALLOON=m
+CONFIG_BMP085=y
+CONFIG_BMP085_I2C=m
+# CONFIG_BMP085_SPI is not set
+CONFIG_PCH_PHUB=m
+CONFIG_USB_SWITCH_FSA9480=m
+# CONFIG_LATTICE_ECP3_CONFIG is not set
+# CONFIG_SRAM is not set
+CONFIG_C2PORT=m
+CONFIG_C2PORT_DURAMAR_2150=m
+
+#
+# EEPROM support
+#
+CONFIG_EEPROM_AT24=m
+# CONFIG_EEPROM_AT25 is not set
+CONFIG_EEPROM_LEGACY=m
+CONFIG_EEPROM_MAX6875=m
+CONFIG_EEPROM_93CX6=m
+# CONFIG_EEPROM_93XX46 is not set
+CONFIG_CB710_CORE=m
+# CONFIG_CB710_DEBUG is not set
+CONFIG_CB710_DEBUG_ASSUMPTIONS=y
+
+#
+# Texas Instruments shared transport line discipline
+#
+CONFIG_TI_ST=m
+CONFIG_SENSORS_LIS3_I2C=m
+
+#
+# Altera FPGA firmware download module
+#
+CONFIG_ALTERA_STAPL=m
+CONFIG_INTEL_MEI=y
+CONFIG_INTEL_MEI_ME=y
+CONFIG_VMWARE_VMCI=m
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=m
+CONFIG_RAID_ATTRS=m
+CONFIG_SCSI=m
+CONFIG_SCSI_DMA=y
+CONFIG_SCSI_TGT=m
+CONFIG_SCSI_NETLINK=y
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=m
+CONFIG_CHR_DEV_ST=m
+CONFIG_CHR_DEV_OSST=m
+CONFIG_BLK_DEV_SR=m
+CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_CHR_DEV_SG=m
+CONFIG_CHR_DEV_SCH=m
+CONFIG_SCSI_ENCLOSURE=m
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+
+#
+# SCSI Transports
+#
+CONFIG_SCSI_SPI_ATTRS=m
+CONFIG_SCSI_FC_ATTRS=m
+# CONFIG_SCSI_FC_TGT_ATTRS is not set
+CONFIG_SCSI_ISCSI_ATTRS=m
+CONFIG_SCSI_SAS_ATTRS=m
+CONFIG_SCSI_SAS_LIBSAS=m
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_SCSI_SAS_HOST_SMP=y
+CONFIG_SCSI_SRP_ATTRS=m
+CONFIG_SCSI_SRP_TGT_ATTRS=y
+CONFIG_SCSI_LOWLEVEL=y
+CONFIG_ISCSI_TCP=m
+CONFIG_ISCSI_BOOT_SYSFS=m
+CONFIG_SCSI_CXGB3_ISCSI=m
+CONFIG_SCSI_CXGB4_ISCSI=m
+CONFIG_SCSI_BNX2_ISCSI=m
+CONFIG_SCSI_BNX2X_FCOE=m
+CONFIG_BE2ISCSI=m
+CONFIG_BLK_DEV_3W_XXXX_RAID=m
+CONFIG_SCSI_HPSA=m
+CONFIG_SCSI_3W_9XXX=m
+CONFIG_SCSI_3W_SAS=m
+CONFIG_SCSI_ACARD=m
+CONFIG_SCSI_AACRAID=m
+CONFIG_SCSI_AIC7XXX=m
+CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
+CONFIG_AIC7XXX_RESET_DELAY_MS=15000
+# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
+CONFIG_AIC7XXX_DEBUG_MASK=0
+CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+CONFIG_SCSI_AIC79XX=m
+CONFIG_AIC79XX_CMDS_PER_DEVICE=32
+CONFIG_AIC79XX_RESET_DELAY_MS=15000
+# CONFIG_AIC79XX_DEBUG_ENABLE is not set
+CONFIG_AIC79XX_DEBUG_MASK=0
+CONFIG_AIC79XX_REG_PRETTY_PRINT=y
+CONFIG_SCSI_AIC94XX=m
+# CONFIG_AIC94XX_DEBUG is not set
+CONFIG_SCSI_MVSAS=m
+# CONFIG_SCSI_MVSAS_DEBUG is not set
+CONFIG_SCSI_MVSAS_TASKLET=y
+CONFIG_SCSI_MVUMI=m
+CONFIG_SCSI_DPT_I2O=m
+CONFIG_SCSI_ADVANSYS=m
+CONFIG_SCSI_ARCMSR=m
+CONFIG_MEGARAID_NEWGEN=y
+CONFIG_MEGARAID_MM=m
+CONFIG_MEGARAID_MAILBOX=m
+CONFIG_MEGARAID_LEGACY=m
+CONFIG_MEGARAID_SAS=m
+CONFIG_SCSI_MPT2SAS=m
+CONFIG_SCSI_MPT2SAS_MAX_SGE=128
+# CONFIG_SCSI_MPT2SAS_LOGGING is not set
+CONFIG_SCSI_MPT3SAS=m
+CONFIG_SCSI_MPT3SAS_MAX_SGE=128
+CONFIG_SCSI_MPT3SAS_LOGGING=y
+CONFIG_SCSI_UFSHCD=m
+CONFIG_SCSI_UFSHCD_PCI=m
+CONFIG_SCSI_UFSHCD_PLATFORM=m
+CONFIG_SCSI_HPTIOP=m
+CONFIG_SCSI_BUSLOGIC=m
+CONFIG_VMWARE_PVSCSI=m
+CONFIG_HYPERV_STORAGE=m
+CONFIG_LIBFC=m
+CONFIG_LIBFCOE=m
+CONFIG_FCOE=m
+CONFIG_FCOE_FNIC=m
+CONFIG_SCSI_DMX3191D=m
+CONFIG_SCSI_EATA=m
+# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set
+# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set
+CONFIG_SCSI_EATA_MAX_TAGS=16
+CONFIG_SCSI_FUTURE_DOMAIN=m
+CONFIG_SCSI_GDTH=m
+CONFIG_SCSI_ISCI=m
+CONFIG_SCSI_IPS=m
+CONFIG_SCSI_INITIO=m
+CONFIG_SCSI_INIA100=m
+CONFIG_SCSI_PPA=m
+CONFIG_SCSI_IMM=m
+# CONFIG_SCSI_IZIP_EPP16 is not set
+# CONFIG_SCSI_IZIP_SLOW_CTR is not set
+CONFIG_SCSI_STEX=m
+CONFIG_SCSI_SYM53C8XX_2=m
+CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
+CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
+CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
+CONFIG_SCSI_SYM53C8XX_MMIO=y
+CONFIG_SCSI_IPR=m
+# CONFIG_SCSI_IPR_TRACE is not set
+# CONFIG_SCSI_IPR_DUMP is not set
+CONFIG_SCSI_QLOGIC_1280=m
+CONFIG_SCSI_QLA_FC=m
+CONFIG_TCM_QLA2XXX=m
+CONFIG_SCSI_QLA_ISCSI=m
+CONFIG_SCSI_LPFC=m
+# CONFIG_SCSI_LPFC_DEBUG_FS is not set
+CONFIG_SCSI_DC395x=m
+CONFIG_SCSI_DC390T=m
+# CONFIG_SCSI_DEBUG is not set
+CONFIG_SCSI_PMCRAID=m
+CONFIG_SCSI_PM8001=m
+CONFIG_SCSI_SRP=m
+CONFIG_SCSI_BFA_FC=m
+CONFIG_SCSI_VIRTIO=m
+CONFIG_SCSI_CHELSIO_FCOE=m
+CONFIG_SCSI_LOWLEVEL_PCMCIA=y
+CONFIG_PCMCIA_AHA152X=m
+CONFIG_PCMCIA_FDOMAIN=m
+CONFIG_PCMCIA_QLOGIC=m
+CONFIG_PCMCIA_SYM53C500=m
+CONFIG_SCSI_DH=m
+CONFIG_SCSI_DH_RDAC=m
+CONFIG_SCSI_DH_HP_SW=m
+CONFIG_SCSI_DH_EMC=m
+CONFIG_SCSI_DH_ALUA=m
+CONFIG_SCSI_OSD_INITIATOR=m
+CONFIG_SCSI_OSD_ULD=m
+CONFIG_SCSI_OSD_DPRINT_SENSE=0
+# CONFIG_SCSI_OSD_DEBUG is not set
+CONFIG_ATA=m
+# CONFIG_ATA_NONSTANDARD is not set
+CONFIG_ATA_VERBOSE_ERROR=y
+CONFIG_ATA_ACPI=y
+CONFIG_SATA_ZPODD=y
+CONFIG_SATA_PMP=y
+
+#
+# Controllers with non-SFF native interface
+#
+CONFIG_SATA_AHCI=m
+CONFIG_SATA_AHCI_PLATFORM=m
+CONFIG_SATA_INIC162X=m
+CONFIG_SATA_ACARD_AHCI=m
+CONFIG_SATA_SIL24=m
+CONFIG_ATA_SFF=y
+
+#
+# SFF controllers with custom DMA interface
+#
+CONFIG_PDC_ADMA=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_SX4=m
+CONFIG_ATA_BMDMA=y
+
+#
+# SATA SFF controllers with BMDMA
+#
+CONFIG_ATA_PIIX=m
+CONFIG_SATA_HIGHBANK=m
+CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_SIL=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
+
+#
+# PATA SFF controllers with BMDMA
+#
+CONFIG_PATA_ALI=m
+CONFIG_PATA_AMD=m
+CONFIG_PATA_ARASAN_CF=m
+CONFIG_PATA_ARTOP=m
+CONFIG_PATA_ATIIXP=m
+CONFIG_PATA_ATP867X=m
+CONFIG_PATA_CMD64X=m
+CONFIG_PATA_CS5520=m
+CONFIG_PATA_CS5530=m
+CONFIG_PATA_CS5536=m
+CONFIG_PATA_CYPRESS=m
+CONFIG_PATA_EFAR=m
+CONFIG_PATA_HPT366=m
+CONFIG_PATA_HPT37X=m
+CONFIG_PATA_HPT3X2N=m
+CONFIG_PATA_HPT3X3=m
+# CONFIG_PATA_HPT3X3_DMA is not set
+CONFIG_PATA_IT8213=m
+CONFIG_PATA_IT821X=m
+CONFIG_PATA_JMICRON=m
+CONFIG_PATA_MARVELL=m
+CONFIG_PATA_NETCELL=m
+CONFIG_PATA_NINJA32=m
+CONFIG_PATA_NS87415=m
+CONFIG_PATA_OLDPIIX=m
+CONFIG_PATA_OPTIDMA=m
+CONFIG_PATA_PDC2027X=m
+CONFIG_PATA_PDC_OLD=m
+CONFIG_PATA_RADISYS=m
+CONFIG_PATA_RDC=m
+CONFIG_PATA_SC1200=m
+CONFIG_PATA_SCH=m
+CONFIG_PATA_SERVERWORKS=m
+CONFIG_PATA_SIL680=m
+CONFIG_PATA_SIS=m
+CONFIG_PATA_TOSHIBA=m
+CONFIG_PATA_TRIFLEX=m
+CONFIG_PATA_VIA=m
+CONFIG_PATA_WINBOND=m
+
+#
+# PIO-only SFF controllers
+#
+CONFIG_PATA_CMD640_PCI=m
+CONFIG_PATA_MPIIX=m
+CONFIG_PATA_NS87410=m
+CONFIG_PATA_OPTI=m
+CONFIG_PATA_PCMCIA=m
+CONFIG_PATA_RZ1000=m
+
+#
+# Generic fallback / legacy drivers
+#
+CONFIG_PATA_ACPI=m
+CONFIG_ATA_GENERIC=m
+CONFIG_PATA_LEGACY=m
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=m
+CONFIG_MD_LINEAR=m
+CONFIG_MD_RAID0=m
+CONFIG_MD_RAID1=m
+CONFIG_MD_RAID10=m
+CONFIG_MD_RAID456=m
+CONFIG_MD_MULTIPATH=m
+CONFIG_MD_FAULTY=m
+CONFIG_BCACHE=m
+# CONFIG_BCACHE_DEBUG is not set
+# CONFIG_BCACHE_EDEBUG is not set
+# CONFIG_BCACHE_CLOSURES_DEBUG is not set
+CONFIG_BLK_DEV_DM=m
+# CONFIG_DM_DEBUG is not set
+CONFIG_DM_BUFIO=m
+CONFIG_DM_BIO_PRISON=m
+CONFIG_DM_PERSISTENT_DATA=m
+CONFIG_DM_CRYPT=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_THIN_PROVISIONING=m
+# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
+CONFIG_DM_CACHE=m
+CONFIG_DM_CACHE_MQ=m
+CONFIG_DM_CACHE_CLEANER=m
+CONFIG_DM_MIRROR=m
+CONFIG_DM_RAID=m
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+CONFIG_DM_DELAY=m
+CONFIG_DM_UEVENT=y
+CONFIG_DM_FLAKEY=m
+CONFIG_DM_VERITY=m
+CONFIG_TARGET_CORE=m
+CONFIG_TCM_IBLOCK=m
+CONFIG_TCM_FILEIO=m
+CONFIG_TCM_PSCSI=m
+CONFIG_LOOPBACK_TARGET=m
+CONFIG_TCM_FC=m
+CONFIG_ISCSI_TARGET=m
+CONFIG_SBP_TARGET=m
+CONFIG_FUSION=y
+CONFIG_FUSION_SPI=m
+CONFIG_FUSION_FC=m
+CONFIG_FUSION_SAS=m
+CONFIG_FUSION_MAX_SGE=128
+CONFIG_FUSION_CTL=m
+# CONFIG_FUSION_LOGGING is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
+CONFIG_FIREWIRE_NET=m
+CONFIG_FIREWIRE_NOSY=m
+CONFIG_I2O=m
+CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
+CONFIG_I2O_EXT_ADAPTEC=y
+CONFIG_I2O_EXT_ADAPTEC_DMA64=y
+CONFIG_I2O_CONFIG=m
+CONFIG_I2O_CONFIG_OLD_IOCTL=y
+CONFIG_I2O_BUS=m
+CONFIG_I2O_BLOCK=m
+CONFIG_I2O_SCSI=m
+CONFIG_I2O_PROC=m
+CONFIG_MACINTOSH_DRIVERS=y
+CONFIG_MAC_EMUMOUSEBTN=y
+CONFIG_NETDEVICES=y
+CONFIG_NET_CORE=y
+CONFIG_BONDING=m
+CONFIG_DUMMY=m
+CONFIG_EQUALIZER=m
+# CONFIG_NET_FC is not set
+CONFIG_MII=m
+CONFIG_IFB=m
+CONFIG_NET_TEAM=m
+CONFIG_NET_TEAM_MODE_BROADCAST=m
+CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
+CONFIG_NET_TEAM_MODE_RANDOM=m
+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
+CONFIG_NET_TEAM_MODE_LOADBALANCE=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+CONFIG_VXLAN=m
+CONFIG_NETCONSOLE=m
+CONFIG_NETCONSOLE_DYNAMIC=y
+CONFIG_NETPOLL=y
+# CONFIG_NETPOLL_TRAP is not set
+CONFIG_NET_POLL_CONTROLLER=y
+CONFIG_RIONET=m
+CONFIG_RIONET_TX_SIZE=128
+CONFIG_RIONET_RX_SIZE=128
+CONFIG_TUN=m
+CONFIG_VETH=m
+CONFIG_VIRTIO_NET=m
+CONFIG_SUNGEM_PHY=m
+# CONFIG_ARCNET is not set
+CONFIG_ATM_DRIVERS=y
+# CONFIG_ATM_DUMMY is not set
+CONFIG_ATM_TCP=m
+CONFIG_ATM_LANAI=m
+CONFIG_ATM_ENI=m
+# CONFIG_ATM_ENI_DEBUG is not set
+# CONFIG_ATM_ENI_TUNE_BURST is not set
+CONFIG_ATM_FIRESTREAM=m
+CONFIG_ATM_ZATM=m
+# CONFIG_ATM_ZATM_DEBUG is not set
+CONFIG_ATM_NICSTAR=m
+# CONFIG_ATM_NICSTAR_USE_SUNI is not set
+# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
+CONFIG_ATM_IDT77252=m
+# CONFIG_ATM_IDT77252_DEBUG is not set
+# CONFIG_ATM_IDT77252_RCV_ALL is not set
+CONFIG_ATM_IDT77252_USE_SUNI=y
+CONFIG_ATM_AMBASSADOR=m
+# CONFIG_ATM_AMBASSADOR_DEBUG is not set
+CONFIG_ATM_HORIZON=m
+# CONFIG_ATM_HORIZON_DEBUG is not set
+CONFIG_ATM_IA=m
+# CONFIG_ATM_IA_DEBUG is not set
+CONFIG_ATM_FORE200E=m
+# CONFIG_ATM_FORE200E_USE_TASKLET is not set
+CONFIG_ATM_FORE200E_TX_RETRY=16
+CONFIG_ATM_FORE200E_DEBUG=0
+CONFIG_ATM_HE=m
+# CONFIG_ATM_HE_USE_SUNI is not set
+CONFIG_ATM_SOLOS=m
+
+#
+# CAIF transport drivers
+#
+CONFIG_CAIF_TTY=m
+CONFIG_CAIF_SPI_SLAVE=m
+CONFIG_CAIF_SPI_SYNC=y
+CONFIG_CAIF_HSI=m
+CONFIG_CAIF_VIRTIO=m
+CONFIG_VHOST_NET=m
+CONFIG_VHOST_SCSI=m
+CONFIG_VHOST_RING=m
+
+#
+# Distributed Switch Architecture drivers
+#
+CONFIG_NET_DSA_MV88E6XXX=m
+CONFIG_NET_DSA_MV88E6060=m
+CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y
+CONFIG_NET_DSA_MV88E6131=m
+CONFIG_NET_DSA_MV88E6123_61_65=m
+CONFIG_ETHERNET=y
+CONFIG_MDIO=m
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_PCMCIA_3C574=m
+CONFIG_PCMCIA_3C589=m
+CONFIG_VORTEX=m
+CONFIG_TYPHOON=m
+CONFIG_NET_VENDOR_ADAPTEC=y
+CONFIG_ADAPTEC_STARFIRE=m
+CONFIG_NET_VENDOR_ALTEON=y
+CONFIG_ACENIC=m
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+CONFIG_NET_VENDOR_AMD=y
+CONFIG_AMD8111_ETH=m
+CONFIG_PCNET32=m
+CONFIG_PCMCIA_NMCLAN=m
+CONFIG_NET_VENDOR_ATHEROS=y
+CONFIG_ATL2=m
+CONFIG_ATL1=m
+CONFIG_ATL1E=m
+CONFIG_ATL1C=m
+CONFIG_NET_CADENCE=y
+CONFIG_ARM_AT91_ETHER=m
+CONFIG_MACB=m
+CONFIG_NET_VENDOR_BROADCOM=y
+CONFIG_B44=m
+CONFIG_B44_PCI_AUTOSELECT=y
+CONFIG_B44_PCICORE_AUTOSELECT=y
+CONFIG_B44_PCI=y
+CONFIG_BNX2=m
+CONFIG_CNIC=m
+CONFIG_TIGON3=m
+CONFIG_BNX2X=m
+CONFIG_BNX2X_SRIOV=y
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_BNA=m
+CONFIG_NET_CALXEDA_XGMAC=m
+CONFIG_NET_VENDOR_CHELSIO=y
+CONFIG_CHELSIO_T1=m
+CONFIG_CHELSIO_T1_1G=y
+CONFIG_CHELSIO_T3=m
+CONFIG_CHELSIO_T4=m
+CONFIG_CHELSIO_T4VF=m
+CONFIG_NET_VENDOR_CISCO=y
+CONFIG_ENIC=m
+CONFIG_DNET=m
+CONFIG_NET_VENDOR_DEC=y
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_DE2104X_DSL=0
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+# CONFIG_TULIP_MMIO is not set
+# CONFIG_TULIP_NAPI is not set
+CONFIG_DE4X5=m
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+CONFIG_ULI526X=m
+CONFIG_PCMCIA_XIRCOM=m
+CONFIG_NET_VENDOR_DLINK=y
+CONFIG_DL2K=m
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+CONFIG_NET_VENDOR_EMULEX=y
+CONFIG_BE2NET=m
+CONFIG_NET_VENDOR_EXAR=y
+CONFIG_S2IO=m
+CONFIG_VXGE=m
+# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
+CONFIG_NET_VENDOR_FUJITSU=y
+CONFIG_PCMCIA_FMVJ18X=m
+CONFIG_NET_VENDOR_HP=y
+CONFIG_HP100=m
+CONFIG_NET_VENDOR_INTEL=y
+CONFIG_E100=m
+CONFIG_E1000=m
+CONFIG_E1000E=m
+CONFIG_IGB=m
+CONFIG_IGB_HWMON=y
+CONFIG_IGB_DCA=y
+CONFIG_IGBVF=m
+CONFIG_IXGB=m
+CONFIG_IXGBE=m
+CONFIG_IXGBE_HWMON=y
+CONFIG_IXGBE_DCA=y
+CONFIG_IXGBEVF=m
+CONFIG_NET_VENDOR_I825XX=y
+CONFIG_IP1000=m
+CONFIG_JME=m
+CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_MVMDIO=m
+CONFIG_SKGE=m
+# CONFIG_SKGE_DEBUG is not set
+CONFIG_SKGE_GENESIS=y
+CONFIG_SKY2=m
+# CONFIG_SKY2_DEBUG is not set
+CONFIG_NET_VENDOR_MELLANOX=y
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_CORE=m
+CONFIG_MLX4_DEBUG=y
+CONFIG_NET_VENDOR_MICREL=y
+CONFIG_KS8842=m
+# CONFIG_KS8851 is not set
+CONFIG_KS8851_MLL=m
+CONFIG_KSZ884X_PCI=m
+CONFIG_NET_VENDOR_MICROCHIP=y
+# CONFIG_ENC28J60 is not set
+CONFIG_NET_VENDOR_MYRI=y
+CONFIG_MYRI10GE=m
+CONFIG_MYRI10GE_DCA=y
+CONFIG_FEALNX=m
+CONFIG_NET_VENDOR_NATSEMI=y
+CONFIG_NATSEMI=m
+CONFIG_NS83820=m
+CONFIG_NET_VENDOR_8390=y
+CONFIG_PCMCIA_AXNET=m
+CONFIG_NE2K_PCI=m
+CONFIG_PCMCIA_PCNET=m
+CONFIG_NET_VENDOR_NVIDIA=y
+CONFIG_FORCEDETH=m
+CONFIG_NET_VENDOR_OKI=y
+CONFIG_PCH_GBE=m
+CONFIG_ETHOC=m
+CONFIG_NET_PACKET_ENGINE=y
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+CONFIG_NET_VENDOR_QLOGIC=y
+CONFIG_QLA3XXX=m
+CONFIG_QLCNIC=m
+CONFIG_QLCNIC_SRIOV=y
+CONFIG_QLGE=m
+CONFIG_NETXEN_NIC=m
+CONFIG_NET_VENDOR_REALTEK=y
+CONFIG_ATP=m
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+# CONFIG_8139TOO_PIO is not set
+CONFIG_8139TOO_TUNE_TWISTER=y
+CONFIG_8139TOO_8129=y
+# CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_R8169=m
+CONFIG_NET_VENDOR_RDC=y
+CONFIG_R6040=m
+CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_SC92031=m
+CONFIG_NET_VENDOR_SIS=y
+CONFIG_SIS900=m
+CONFIG_SIS190=m
+CONFIG_SFC=m
+CONFIG_SFC_MTD=y
+CONFIG_SFC_MCDI_MON=y
+CONFIG_SFC_SRIOV=y
+CONFIG_NET_VENDOR_SMSC=y
+CONFIG_PCMCIA_SMC91C92=m
+CONFIG_EPIC100=m
+CONFIG_SMSC9420=m
+CONFIG_NET_VENDOR_STMICRO=y
+CONFIG_STMMAC_ETH=m
+# CONFIG_STMMAC_PLATFORM is not set
+CONFIG_STMMAC_PCI=y
+# CONFIG_STMMAC_DEBUG_FS is not set
+# CONFIG_STMMAC_DA is not set
+CONFIG_NET_VENDOR_SUN=y
+CONFIG_HAPPYMEAL=m
+CONFIG_SUNGEM=m
+CONFIG_CASSINI=m
+CONFIG_NIU=m
+CONFIG_NET_VENDOR_TEHUTI=y
+CONFIG_TEHUTI=m
+CONFIG_NET_VENDOR_TI=y
+CONFIG_TLAN=m
+CONFIG_NET_VENDOR_VIA=y
+CONFIG_VIA_RHINE=m
+# CONFIG_VIA_RHINE_MMIO is not set
+CONFIG_VIA_VELOCITY=m
+CONFIG_NET_VENDOR_WIZNET=y
+CONFIG_WIZNET_W5100=m
+CONFIG_WIZNET_W5300=m
+# CONFIG_WIZNET_BUS_DIRECT is not set
+# CONFIG_WIZNET_BUS_INDIRECT is not set
+CONFIG_WIZNET_BUS_ANY=y
+CONFIG_NET_VENDOR_XIRCOM=y
+CONFIG_PCMCIA_XIRC2PS=m
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+CONFIG_NET_SB1000=m
+CONFIG_PHYLIB=m
+
+#
+# MII PHY device drivers
+#
+CONFIG_AT803X_PHY=m
+CONFIG_AMD_PHY=m
+CONFIG_MARVELL_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_CICADA_PHY=m
+CONFIG_VITESSE_PHY=m
+CONFIG_SMSC_PHY=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_BCM87XX_PHY=m
+CONFIG_ICPLUS_PHY=m
+CONFIG_REALTEK_PHY=m
+CONFIG_NATIONAL_PHY=m
+CONFIG_STE10XP=m
+CONFIG_LSI_ET1011C_PHY=m
+CONFIG_MICREL_PHY=m
+# CONFIG_MDIO_BITBANG is not set
+# CONFIG_MICREL_KS8995MA is not set
+CONFIG_PLIP=m
+CONFIG_PPP=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_MPPE=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPPOATM=m
+CONFIG_PPPOE=m
+CONFIG_PPTP=m
+CONFIG_PPPOL2TP=m
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_SLIP=m
+CONFIG_SLHC=m
+# CONFIG_SLIP_COMPRESSED is not set
+# CONFIG_SLIP_SMART is not set
+# CONFIG_SLIP_MODE_SLIP6 is not set
+
+#
+# USB Network Adapters
+#
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_RTL8152=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_AX88179_178A=m
+CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_CDC_NCM=m
+CONFIG_USB_NET_CDC_MBIM=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
+CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_NET_CX82310_ETH=m
+CONFIG_USB_NET_KALMIA=m
+CONFIG_USB_NET_QMI_WWAN=m
+CONFIG_USB_HSO=m
+CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_CDC_PHONET=m
+CONFIG_USB_IPHETH=m
+CONFIG_USB_SIERRA_NET=m
+CONFIG_USB_VL600=m
+CONFIG_WLAN=y
+CONFIG_PCMCIA_RAYCS=m
+CONFIG_LIBERTAS_THINFIRM=m
+# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
+CONFIG_LIBERTAS_THINFIRM_USB=m
+CONFIG_AIRO=m
+CONFIG_ATMEL=m
+CONFIG_PCI_ATMEL=m
+CONFIG_PCMCIA_ATMEL=m
+CONFIG_AT76C50X_USB=m
+CONFIG_AIRO_CS=m
+CONFIG_PCMCIA_WL3501=m
+CONFIG_PRISM54=m
+CONFIG_USB_ZD1201=m
+CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_RTL8180=m
+CONFIG_RTL8187=m
+CONFIG_RTL8187_LEDS=y
+CONFIG_ADM8211=m
+# CONFIG_MAC80211_HWSIM is not set
+CONFIG_MWL8K=m
+CONFIG_ATH_COMMON=m
+CONFIG_ATH_CARDS=m
+# CONFIG_ATH_DEBUG is not set
+CONFIG_ATH5K=m
+# CONFIG_ATH5K_DEBUG is not set
+# CONFIG_ATH5K_TRACER is not set
+CONFIG_ATH5K_PCI=y
+CONFIG_ATH9K_HW=m
+CONFIG_ATH9K_COMMON=m
+CONFIG_ATH9K_BTCOEX_SUPPORT=y
+CONFIG_ATH9K=m
+CONFIG_ATH9K_PCI=y
+CONFIG_ATH9K_AHB=y
+# CONFIG_ATH9K_DEBUGFS is not set
+# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set
+CONFIG_ATH9K_HTC=m
+# CONFIG_ATH9K_HTC_DEBUGFS is not set
+CONFIG_CARL9170=m
+CONFIG_CARL9170_LEDS=y
+CONFIG_CARL9170_WPC=y
+# CONFIG_CARL9170_HWRNG is not set
+CONFIG_ATH6KL=m
+CONFIG_ATH6KL_SDIO=m
+CONFIG_ATH6KL_USB=m
+# CONFIG_ATH6KL_DEBUG is not set
+# CONFIG_ATH6KL_TRACING is not set
+CONFIG_AR5523=m
+CONFIG_WIL6210=m
+CONFIG_WIL6210_ISR_COR=y
+CONFIG_B43=m
+CONFIG_B43_BCMA=y
+# CONFIG_B43_BCMA_EXTRA is not set
+CONFIG_B43_SSB=y
+CONFIG_B43_PCI_AUTOSELECT=y
+CONFIG_B43_PCICORE_AUTOSELECT=y
+CONFIG_B43_PCMCIA=y
+CONFIG_B43_SDIO=y
+CONFIG_B43_BCMA_PIO=y
+CONFIG_B43_PIO=y
+CONFIG_B43_PHY_N=y
+CONFIG_B43_PHY_LP=y
+CONFIG_B43_PHY_HT=y
+CONFIG_B43_LEDS=y
+CONFIG_B43_HWRNG=y
+# CONFIG_B43_DEBUG is not set
+CONFIG_B43LEGACY=m
+CONFIG_B43LEGACY_PCI_AUTOSELECT=y
+CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
+CONFIG_B43LEGACY_LEDS=y
+CONFIG_B43LEGACY_HWRNG=y
+# CONFIG_B43LEGACY_DEBUG is not set
+CONFIG_B43LEGACY_DMA=y
+CONFIG_B43LEGACY_PIO=y
+CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
+# CONFIG_B43LEGACY_DMA_MODE is not set
+# CONFIG_B43LEGACY_PIO_MODE is not set
+CONFIG_BRCMUTIL=m
+CONFIG_BRCMSMAC=m
+CONFIG_BRCMFMAC=m
+CONFIG_BRCMFMAC_SDIO=y
+CONFIG_BRCMFMAC_USB=y
+# CONFIG_BRCM_TRACING is not set
+# CONFIG_BRCMDBG is not set
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
+CONFIG_HOSTAP_CS=m
+# CONFIG_IPW2100 is not set
+# CONFIG_IPW2200 is not set
+CONFIG_IWLWIFI=m
+CONFIG_IWLDVM=m
+CONFIG_IWLMVM=m
+CONFIG_IWLWIFI_OPMODE_MODULAR=y
+
+#
+# Debugging Options
+#
+# CONFIG_IWLWIFI_DEBUG is not set
+CONFIG_IWLWIFI_DEVICE_TRACING=y
+# CONFIG_IWLWIFI_P2P is not set
+CONFIG_IWLEGACY=m
+CONFIG_IWL4965=m
+CONFIG_IWL3945=m
+
+#
+# iwl3945 / iwl4965 Debugging Options
+#
+# CONFIG_IWLEGACY_DEBUG is not set
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_CS=m
+CONFIG_LIBERTAS_SDIO=m
+# CONFIG_LIBERTAS_SPI is not set
+# CONFIG_LIBERTAS_DEBUG is not set
+CONFIG_LIBERTAS_MESH=y
+CONFIG_HERMES=m
+CONFIG_HERMES_PRISM=y
+CONFIG_HERMES_CACHE_FW_ON_INIT=y
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCI_HERMES=m
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
+CONFIG_ORINOCO_USB=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+# CONFIG_P54_SPI is not set
+CONFIG_P54_LEDS=y
+CONFIG_RT2X00=m
+CONFIG_RT2400PCI=m
+CONFIG_RT2500PCI=m
+CONFIG_RT61PCI=m
+CONFIG_RT2800PCI=m
+CONFIG_RT2800PCI_RT33XX=y
+CONFIG_RT2800PCI_RT35XX=y
+CONFIG_RT2800PCI_RT53XX=y
+CONFIG_RT2800PCI_RT3290=y
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2800USB_RT33XX=y
+CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_RT53XX=y
+CONFIG_RT2800USB_RT55XX=y
+CONFIG_RT2800USB_UNKNOWN=y
+CONFIG_RT2800_LIB=m
+CONFIG_RT2X00_LIB_MMIO=m
+CONFIG_RT2X00_LIB_PCI=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_CRYPTO=y
+CONFIG_RT2X00_LIB_LEDS=y
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_RTLWIFI=m
+# CONFIG_RTLWIFI_DEBUG is not set
+CONFIG_RTL8192CE=m
+CONFIG_RTL8192SE=m
+CONFIG_RTL8192DE=m
+CONFIG_RTL8723AE=m
+CONFIG_RTL8188EE=m
+CONFIG_RTL8192CU=m
+CONFIG_RTL8192C_COMMON=m
+CONFIG_WL_TI=y
+CONFIG_WL1251=m
+# CONFIG_WL1251_SPI is not set
+CONFIG_WL1251_SDIO=m
+CONFIG_WL12XX=m
+CONFIG_WL18XX=m
+CONFIG_WLCORE=m
+# CONFIG_WLCORE_SPI is not set
+CONFIG_WLCORE_SDIO=m
+CONFIG_WILINK_PLATFORM_DATA=y
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_MWIFIEX=m
+CONFIG_MWIFIEX_SDIO=m
+CONFIG_MWIFIEX_PCIE=m
+CONFIG_MWIFIEX_USB=m
+
+#
+# WiMAX Wireless Broadband devices
+#
+CONFIG_WIMAX_I2400M=m
+CONFIG_WIMAX_I2400M_USB=m
+CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
+# CONFIG_WAN is not set
+CONFIG_IEEE802154_DRIVERS=m
+CONFIG_IEEE802154_FAKEHARD=m
+CONFIG_IEEE802154_FAKELB=m
+CONFIG_IEEE802154_AT86RF230=m
+# CONFIG_IEEE802154_MRF24J40 is not set
+CONFIG_XEN_NETDEV_FRONTEND=m
+CONFIG_XEN_NETDEV_BACKEND=m
+CONFIG_VMXNET3=m
+CONFIG_HYPERV_NET=m
+CONFIG_ISDN=y
+CONFIG_ISDN_I4L=m
+CONFIG_ISDN_PPP=y
+CONFIG_ISDN_PPP_VJ=y
+CONFIG_ISDN_MPP=y
+CONFIG_IPPP_FILTER=y
+CONFIG_ISDN_PPP_BSDCOMP=m
+CONFIG_ISDN_AUDIO=y
+CONFIG_ISDN_TTY_FAX=y
+
+#
+# ISDN feature submodules
+#
+CONFIG_ISDN_DIVERSION=m
+
+#
+# ISDN4Linux hardware drivers
+#
+
+#
+# Passive cards
+#
+CONFIG_ISDN_DRV_HISAX=m
+
+#
+# D-channel protocol features
+#
+CONFIG_HISAX_EURO=y
+CONFIG_DE_AOC=y
+# CONFIG_HISAX_NO_SENDCOMPLETE is not set
+# CONFIG_HISAX_NO_LLC is not set
+# CONFIG_HISAX_NO_KEYPAD is not set
+CONFIG_HISAX_1TR6=y
+CONFIG_HISAX_NI1=y
+CONFIG_HISAX_MAX_CARDS=8
+
+#
+# HiSax supported cards
+#
+CONFIG_HISAX_16_3=y
+CONFIG_HISAX_TELESPCI=y
+CONFIG_HISAX_S0BOX=y
+CONFIG_HISAX_FRITZPCI=y
+CONFIG_HISAX_AVM_A1_PCMCIA=y
+CONFIG_HISAX_ELSA=y
+CONFIG_HISAX_DIEHLDIVA=y
+CONFIG_HISAX_SEDLBAUER=y
+CONFIG_HISAX_NETJET=y
+CONFIG_HISAX_NETJET_U=y
+CONFIG_HISAX_NICCY=y
+CONFIG_HISAX_BKM_A4T=y
+CONFIG_HISAX_SCT_QUADRO=y
+CONFIG_HISAX_GAZEL=y
+CONFIG_HISAX_HFC_PCI=y
+CONFIG_HISAX_W6692=y
+CONFIG_HISAX_HFC_SX=y
+CONFIG_HISAX_ENTERNOW_PCI=y
+# CONFIG_HISAX_DEBUG is not set
+
+#
+# HiSax PCMCIA card service modules
+#
+CONFIG_HISAX_SEDLBAUER_CS=m
+CONFIG_HISAX_ELSA_CS=m
+CONFIG_HISAX_AVM_A1_CS=m
+CONFIG_HISAX_TELES_CS=m
+
+#
+# HiSax sub driver modules
+#
+CONFIG_HISAX_ST5481=m
+CONFIG_HISAX_HFCUSB=m
+CONFIG_HISAX_HFC4S8S=m
+CONFIG_HISAX_FRITZ_PCIPNP=m
+
+#
+# Active cards
+#
+CONFIG_ISDN_CAPI=m
+CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
+CONFIG_CAPI_TRACE=y
+CONFIG_ISDN_CAPI_MIDDLEWARE=y
+CONFIG_ISDN_CAPI_CAPI20=m
+CONFIG_ISDN_CAPI_CAPIDRV=m
+
+#
+# CAPI hardware drivers
+#
+CONFIG_CAPI_AVM=y
+CONFIG_ISDN_DRV_AVMB1_B1PCI=m
+CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
+CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
+CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
+CONFIG_ISDN_DRV_AVMB1_T1PCI=m
+CONFIG_ISDN_DRV_AVMB1_C4=m
+CONFIG_CAPI_EICON=y
+CONFIG_ISDN_DIVAS=m
+CONFIG_ISDN_DIVAS_BRIPCI=y
+CONFIG_ISDN_DIVAS_PRIPCI=y
+CONFIG_ISDN_DIVAS_DIVACAPI=m
+CONFIG_ISDN_DIVAS_USERIDI=m
+CONFIG_ISDN_DIVAS_MAINT=m
+CONFIG_ISDN_DRV_GIGASET=m
+CONFIG_GIGASET_CAPI=y
+# CONFIG_GIGASET_I4L is not set
+# CONFIG_GIGASET_DUMMYLL is not set
+CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M105=m
+CONFIG_GIGASET_M101=m
+# CONFIG_GIGASET_DEBUG is not set
+CONFIG_HYSDN=m
+CONFIG_HYSDN_CAPI=y
+CONFIG_MISDN=m
+CONFIG_MISDN_DSP=m
+CONFIG_MISDN_L1OIP=m
+
+#
+# mISDN hardware drivers
+#
+CONFIG_MISDN_HFCPCI=m
+CONFIG_MISDN_HFCMULTI=m
+CONFIG_MISDN_HFCUSB=m
+CONFIG_MISDN_AVMFRITZ=m
+CONFIG_MISDN_SPEEDFAX=m
+CONFIG_MISDN_INFINEON=m
+CONFIG_MISDN_W6692=m
+CONFIG_MISDN_NETJET=m
+CONFIG_MISDN_IPAC=m
+CONFIG_MISDN_ISAR=m
+CONFIG_ISDN_HDLC=m
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+CONFIG_INPUT_FF_MEMLESS=m
+CONFIG_INPUT_POLLDEV=m
+CONFIG_INPUT_SPARSEKMAP=m
+CONFIG_INPUT_MATRIXKMAP=m
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_EVDEV=m
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ADP5588=m
+CONFIG_KEYBOARD_ADP5589=m
+CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_QT1070=m
+CONFIG_KEYBOARD_QT2160=m
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_GPIO is not set
+# CONFIG_KEYBOARD_GPIO_POLLED is not set
+CONFIG_KEYBOARD_TCA6416=m
+CONFIG_KEYBOARD_TCA8418=m
+CONFIG_KEYBOARD_MATRIX=m
+# CONFIG_KEYBOARD_LM8323 is not set
+CONFIG_KEYBOARD_LM8333=m
+# CONFIG_KEYBOARD_MAX7359 is not set
+CONFIG_KEYBOARD_MCS=m
+CONFIG_KEYBOARD_MPR121=m
+# CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_OPENCORES is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=m
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_CYPRESS=y
+CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+CONFIG_MOUSE_PS2_ELANTECH=y
+CONFIG_MOUSE_PS2_SENTELIC=y
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
+CONFIG_MOUSE_SERIAL=y
+CONFIG_MOUSE_APPLETOUCH=m
+CONFIG_MOUSE_BCM5974=m
+CONFIG_MOUSE_CYAPA=m
+CONFIG_MOUSE_VSXXXAA=m
+# CONFIG_MOUSE_GPIO is not set
+CONFIG_MOUSE_SYNAPTICS_I2C=m
+CONFIG_MOUSE_SYNAPTICS_USB=m
+CONFIG_INPUT_JOYSTICK=y
+CONFIG_JOYSTICK_ANALOG=m
+CONFIG_JOYSTICK_A3D=m
+CONFIG_JOYSTICK_ADI=m
+CONFIG_JOYSTICK_COBRA=m
+CONFIG_JOYSTICK_GF2K=m
+CONFIG_JOYSTICK_GRIP=m
+CONFIG_JOYSTICK_GRIP_MP=m
+CONFIG_JOYSTICK_GUILLEMOT=m
+CONFIG_JOYSTICK_INTERACT=m
+CONFIG_JOYSTICK_SIDEWINDER=m
+CONFIG_JOYSTICK_TMDC=m
+CONFIG_JOYSTICK_IFORCE=m
+CONFIG_JOYSTICK_IFORCE_USB=y
+CONFIG_JOYSTICK_IFORCE_232=y
+CONFIG_JOYSTICK_WARRIOR=m
+CONFIG_JOYSTICK_MAGELLAN=m
+CONFIG_JOYSTICK_SPACEORB=m
+CONFIG_JOYSTICK_SPACEBALL=m
+CONFIG_JOYSTICK_STINGER=m
+CONFIG_JOYSTICK_TWIDJOY=m
+CONFIG_JOYSTICK_ZHENHUA=m
+CONFIG_JOYSTICK_DB9=m
+CONFIG_JOYSTICK_GAMECON=m
+CONFIG_JOYSTICK_TURBOGRAFX=m
+CONFIG_JOYSTICK_AS5011=m
+CONFIG_JOYSTICK_JOYDUMP=m
+CONFIG_JOYSTICK_XPAD=m
+CONFIG_JOYSTICK_XPAD_FF=y
+CONFIG_JOYSTICK_XPAD_LEDS=y
+CONFIG_JOYSTICK_WALKERA0701=m
+CONFIG_INPUT_TABLET=y
+CONFIG_TABLET_USB_ACECAD=m
+CONFIG_TABLET_USB_AIPTEK=m
+CONFIG_TABLET_USB_GTCO=m
+CONFIG_TABLET_USB_HANWANG=m
+CONFIG_TABLET_USB_KBTAB=m
+CONFIG_TABLET_USB_WACOM=m
+CONFIG_INPUT_TOUCHSCREEN=y
+# CONFIG_TOUCHSCREEN_ADS7846 is not set
+# CONFIG_TOUCHSCREEN_AD7877 is not set
+CONFIG_TOUCHSCREEN_AD7879=m
+CONFIG_TOUCHSCREEN_AD7879_I2C=m
+# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
+CONFIG_TOUCHSCREEN_ATMEL_MXT=m
+CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
+CONFIG_TOUCHSCREEN_BU21013=m
+CONFIG_TOUCHSCREEN_CY8CTMG110=m
+CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
+CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
+# CONFIG_TOUCHSCREEN_CYTTSP_SPI is not set
+CONFIG_TOUCHSCREEN_DYNAPRO=m
+CONFIG_TOUCHSCREEN_HAMPSHIRE=m
+CONFIG_TOUCHSCREEN_EETI=m
+CONFIG_TOUCHSCREEN_FUJITSU=m
+CONFIG_TOUCHSCREEN_ILI210X=m
+CONFIG_TOUCHSCREEN_GUNZE=m
+CONFIG_TOUCHSCREEN_ELO=m
+CONFIG_TOUCHSCREEN_WACOM_W8001=m
+CONFIG_TOUCHSCREEN_WACOM_I2C=m
+CONFIG_TOUCHSCREEN_MAX11801=m
+CONFIG_TOUCHSCREEN_MCS5000=m
+CONFIG_TOUCHSCREEN_MMS114=m
+CONFIG_TOUCHSCREEN_MTOUCH=m
+CONFIG_TOUCHSCREEN_INEXIO=m
+CONFIG_TOUCHSCREEN_MK712=m
+CONFIG_TOUCHSCREEN_PENMOUNT=m
+CONFIG_TOUCHSCREEN_EDT_FT5X06=m
+CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
+CONFIG_TOUCHSCREEN_TOUCHWIN=m
+CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m
+CONFIG_TOUCHSCREEN_UCB1400=m
+CONFIG_TOUCHSCREEN_PIXCIR=m
+CONFIG_TOUCHSCREEN_WM97XX=m
+CONFIG_TOUCHSCREEN_WM9705=y
+CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_WM9713=y
+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+CONFIG_TOUCHSCREEN_MC13783=m
+CONFIG_TOUCHSCREEN_USB_EGALAX=y
+CONFIG_TOUCHSCREEN_USB_PANJIT=y
+CONFIG_TOUCHSCREEN_USB_3M=y
+CONFIG_TOUCHSCREEN_USB_ITM=y
+CONFIG_TOUCHSCREEN_USB_ETURBO=y
+CONFIG_TOUCHSCREEN_USB_GUNZE=y
+CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
+CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
+CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
+CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
+CONFIG_TOUCHSCREEN_USB_GOTOP=y
+CONFIG_TOUCHSCREEN_USB_JASTEC=y
+CONFIG_TOUCHSCREEN_USB_ELO=y
+CONFIG_TOUCHSCREEN_USB_E2I=y
+CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
+CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
+CONFIG_TOUCHSCREEN_USB_NEXIO=y
+CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
+CONFIG_TOUCHSCREEN_TOUCHIT213=m
+CONFIG_TOUCHSCREEN_TSC_SERIO=m
+# CONFIG_TOUCHSCREEN_TSC2005 is not set
+CONFIG_TOUCHSCREEN_TSC2007=m
+CONFIG_TOUCHSCREEN_ST1232=m
+CONFIG_TOUCHSCREEN_TPS6507X=m
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_AD714X=m
+CONFIG_INPUT_AD714X_I2C=m
+CONFIG_INPUT_AD714X_SPI=m
+CONFIG_INPUT_BMA150=m
+CONFIG_INPUT_PCSPKR=m
+CONFIG_INPUT_MC13783_PWRBUTTON=m
+CONFIG_INPUT_MMA8450=m
+CONFIG_INPUT_MPU3050=m
+CONFIG_INPUT_APANEL=m
+CONFIG_INPUT_GP2A=m
+# CONFIG_INPUT_GPIO_TILT_POLLED is not set
+CONFIG_INPUT_ATLAS_BTNS=m
+CONFIG_INPUT_ATI_REMOTE2=m
+CONFIG_INPUT_KEYSPAN_REMOTE=m
+CONFIG_INPUT_KXTJ9=m
+# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set
+CONFIG_INPUT_POWERMATE=m
+CONFIG_INPUT_YEALINK=m
+CONFIG_INPUT_CM109=m
+CONFIG_INPUT_RETU_PWRBUTTON=m
+CONFIG_INPUT_UINPUT=m
+CONFIG_INPUT_PCF50633_PMU=m
+CONFIG_INPUT_PCF8574=m
+CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
+CONFIG_INPUT_ADXL34X=m
+CONFIG_INPUT_ADXL34X_I2C=m
+CONFIG_INPUT_ADXL34X_SPI=m
+# CONFIG_INPUT_IMS_PCU is not set
+CONFIG_INPUT_CMA3000=m
+CONFIG_INPUT_CMA3000_I2C=m
+CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=m
+CONFIG_SERIO_CT82C710=m
+CONFIG_SERIO_PARKBD=m
+CONFIG_SERIO_PCIPS2=m
+CONFIG_SERIO_LIBPS2=y
+CONFIG_SERIO_RAW=m
+CONFIG_SERIO_ALTERA_PS2=m
+CONFIG_SERIO_PS2MULT=m
+CONFIG_SERIO_ARC_PS2=m
+CONFIG_GAMEPORT=m
+CONFIG_GAMEPORT_NS558=m
+CONFIG_GAMEPORT_L4=m
+CONFIG_GAMEPORT_EMU10K1=m
+CONFIG_GAMEPORT_FM801=m
+
+#
+# Character devices
+#
+CONFIG_TTY=y
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_VT_CONSOLE_SLEEP=y
+CONFIG_HW_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
+# CONFIG_LEGACY_PTYS is not set
+CONFIG_SERIAL_NONSTANDARD=y
+CONFIG_ROCKETPORT=m
+CONFIG_CYCLADES=m
+# CONFIG_CYZ_INTR is not set
+# CONFIG_MOXA_INTELLIO is not set
+# CONFIG_MOXA_SMARTIO is not set
+CONFIG_SYNCLINK=m
+CONFIG_SYNCLINKMP=m
+# CONFIG_SYNCLINK_GT is not set
+CONFIG_NOZOMI=m
+# CONFIG_ISI is not set
+CONFIG_N_HDLC=m
+CONFIG_N_GSM=m
+CONFIG_TRACE_ROUTER=m
+CONFIG_TRACE_SINK=m
+# CONFIG_DEVKMEM is not set
+# CONFIG_STALDRV is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
+CONFIG_SERIAL_8250_PNP=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_SERIAL_8250_DMA=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_CS=m
+CONFIG_SERIAL_8250_NR_UARTS=32
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
+CONFIG_SERIAL_8250_DW=m
+
+#
+# Non-8250 serial port support
+#
+# CONFIG_SERIAL_MAX3100 is not set
+# CONFIG_SERIAL_MAX310X is not set
+CONFIG_SERIAL_MFD_HSU=m
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_SCCNXP=m
+# CONFIG_SERIAL_TIMBERDALE is not set
+CONFIG_SERIAL_ALTERA_JTAGUART=m
+CONFIG_SERIAL_ALTERA_UART=m
+CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
+CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
+# CONFIG_SERIAL_IFX6X60 is not set
+CONFIG_SERIAL_PCH_UART=m
+CONFIG_SERIAL_ARC=m
+CONFIG_SERIAL_ARC_NR_PORTS=1
+CONFIG_SERIAL_RP2=m
+CONFIG_SERIAL_RP2_NR_UARTS=32
+CONFIG_PRINTER=m
+# CONFIG_LP_CONSOLE is not set
+CONFIG_PPDEV=m
+CONFIG_HVC_DRIVER=y
+CONFIG_HVC_IRQ=y
+CONFIG_HVC_XEN=y
+CONFIG_HVC_XEN_FRONTEND=y
+CONFIG_VIRTIO_CONSOLE=m
+CONFIG_IPMI_HANDLER=m
+# CONFIG_IPMI_PANIC_EVENT is not set
+CONFIG_IPMI_DEVICE_INTERFACE=m
+CONFIG_IPMI_SI=m
+CONFIG_IPMI_WATCHDOG=m
+CONFIG_IPMI_POWEROFF=m
+CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_TIMERIOMEM=m
+CONFIG_HW_RANDOM_INTEL=m
+CONFIG_HW_RANDOM_AMD=m
+CONFIG_HW_RANDOM_VIA=m
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_HW_RANDOM_TPM=m
+CONFIG_NVRAM=m
+CONFIG_R3964=m
+CONFIG_APPLICOM=m
+
+#
+# PCMCIA character devices
+#
+CONFIG_SYNCLINK_CS=m
+CONFIG_CARDMAN_4000=m
+CONFIG_CARDMAN_4040=m
+CONFIG_IPWIRELESS=m
+CONFIG_MWAVE=m
+# CONFIG_RAW_DRIVER is not set
+CONFIG_HPET=y
+CONFIG_HPET_MMAP=y
+CONFIG_HANGCHECK_TIMER=m
+CONFIG_TCG_TPM=m
+CONFIG_TCG_TIS=m
+CONFIG_TCG_TIS_I2C_INFINEON=m
+CONFIG_TCG_NSC=m
+CONFIG_TCG_ATMEL=m
+CONFIG_TCG_INFINEON=m
+CONFIG_TCG_ST33_I2C=m
+CONFIG_TELCLOCK=m
+CONFIG_DEVPORT=y
+CONFIG_I2C=m
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
+CONFIG_I2C_CHARDEV=m
+# CONFIG_I2C_MUX is not set
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_SMBUS=m
+CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOPCA=m
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# PC SMBus host controller drivers
+#
+CONFIG_I2C_ALI1535=m
+CONFIG_I2C_ALI1563=m
+CONFIG_I2C_ALI15X3=m
+CONFIG_I2C_AMD756=m
+CONFIG_I2C_AMD756_S4882=m
+CONFIG_I2C_AMD8111=m
+CONFIG_I2C_I801=m
+CONFIG_I2C_ISCH=m
+CONFIG_I2C_ISMT=m
+CONFIG_I2C_PIIX4=m
+CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_NFORCE2_S4985=m
+CONFIG_I2C_SIS5595=m
+CONFIG_I2C_SIS630=m
+CONFIG_I2C_SIS96X=m
+CONFIG_I2C_VIA=m
+CONFIG_I2C_VIAPRO=m
+
+#
+# ACPI drivers
+#
+CONFIG_I2C_SCMI=m
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+# CONFIG_I2C_CBUS_GPIO is not set
+CONFIG_I2C_DESIGNWARE_CORE=m
+CONFIG_I2C_DESIGNWARE_PCI=m
+CONFIG_I2C_EG20T=m
+# CONFIG_I2C_GPIO is not set
+CONFIG_I2C_INTEL_MID=m
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_PCA_PLATFORM=m
+# CONFIG_I2C_PXA_PCI is not set
+CONFIG_I2C_SIMTEC=m
+CONFIG_I2C_XILINX=m
+
+#
+# External I2C/SMBus adapter drivers
+#
+CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_PARPORT=m
+CONFIG_I2C_PARPORT_LIGHT=m
+CONFIG_I2C_TAOS_EVM=m
+CONFIG_I2C_TINY_USB=m
+CONFIG_I2C_VIPERBOARD=m
+
+#
+# Other I2C/SMBus bus drivers
+#
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+CONFIG_SPI=y
+# CONFIG_SPI_DEBUG is not set
+CONFIG_SPI_MASTER=y
+
+#
+# SPI Master Controller Drivers
+#
+# CONFIG_SPI_ALTERA is not set
+# CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_BUTTERFLY is not set
+# CONFIG_SPI_GPIO is not set
+# CONFIG_SPI_LM70_LLP is not set
+# CONFIG_SPI_OC_TINY is not set
+CONFIG_SPI_PXA2XX_DMA=y
+CONFIG_SPI_PXA2XX=m
+CONFIG_SPI_PXA2XX_PCI=m
+# CONFIG_SPI_SC18IS602 is not set
+# CONFIG_SPI_TOPCLIFF_PCH is not set
+# CONFIG_SPI_XCOMM is not set
+# CONFIG_SPI_XILINX is not set
+# CONFIG_SPI_DESIGNWARE is not set
+
+#
+# SPI Protocol Masters
+#
+# CONFIG_SPI_SPIDEV is not set
+# CONFIG_SPI_TLE62X0 is not set
+
+#
+# Qualcomm MSM SSBI bus support
+#
+CONFIG_SSBI=m
+# CONFIG_HSI is not set
+
+#
+# PPS support
+#
+CONFIG_PPS=m
+# CONFIG_PPS_DEBUG is not set
+
+#
+# PPS clients support
+#
+CONFIG_PPS_CLIENT_KTIMER=m
+CONFIG_PPS_CLIENT_LDISC=m
+CONFIG_PPS_CLIENT_PARPORT=m
+CONFIG_PPS_CLIENT_GPIO=m
+
+#
+# PPS generators support
+#
+
+#
+# PTP clock support
+#
+CONFIG_PTP_1588_CLOCK=m
+CONFIG_DP83640_PHY=m
+CONFIG_PTP_1588_CLOCK_PCH=m
+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+CONFIG_GPIO_DEVRES=y
+CONFIG_GPIOLIB=y
+CONFIG_GPIO_ACPI=y
+# CONFIG_DEBUG_GPIO is not set
+CONFIG_GPIO_SYSFS=y
+
+#
+# Memory mapped GPIO drivers:
+#
+# CONFIG_GPIO_GENERIC_PLATFORM is not set
+# CONFIG_GPIO_IT8761E is not set
+# CONFIG_GPIO_TS5500 is not set
+CONFIG_GPIO_SCH=m
+CONFIG_GPIO_ICH=m
+# CONFIG_GPIO_VX855 is not set
+# CONFIG_GPIO_LYNXPOINT is not set
+
+#
+# I2C GPIO expanders:
+#
+CONFIG_GPIO_ARIZONA=m
+# CONFIG_GPIO_MAX7300 is not set
+# CONFIG_GPIO_MAX732X is not set
+# CONFIG_GPIO_PCA953X is not set
+# CONFIG_GPIO_PCF857X is not set
+# CONFIG_GPIO_ADP5588 is not set
+
+#
+# PCI GPIO expanders:
+#
+CONFIG_GPIO_CS5535=m
+CONFIG_GPIO_AMD8111=m
+CONFIG_GPIO_LANGWELL=y
+# CONFIG_GPIO_PCH is not set
+# CONFIG_GPIO_ML_IOH is not set
+# CONFIG_GPIO_RDC321X is not set
+
+#
+# SPI GPIO expanders:
+#
+# CONFIG_GPIO_MAX7301 is not set
+# CONFIG_GPIO_MCP23S08 is not set
+# CONFIG_GPIO_MC33880 is not set
+# CONFIG_GPIO_74X164 is not set
+
+#
+# AC97 GPIO expanders:
+#
+CONFIG_GPIO_UCB1400=y
+
+#
+# MODULbus GPIO expanders:
+#
+
+#
+# USB GPIO expanders:
+#
+CONFIG_GPIO_VIPERBOARD=m
+# CONFIG_W1 is not set
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_PDA_POWER=m
+CONFIG_TEST_POWER=m
+# CONFIG_BATTERY_DS2780 is not set
+# CONFIG_BATTERY_DS2781 is not set
+# CONFIG_BATTERY_DS2782 is not set
+# CONFIG_BATTERY_SBS is not set
+# CONFIG_BATTERY_BQ27x00 is not set
+# CONFIG_BATTERY_MAX17040 is not set
+# CONFIG_BATTERY_MAX17042 is not set
+# CONFIG_CHARGER_PCF50633 is not set
+# CONFIG_CHARGER_ISP1704 is not set
+# CONFIG_CHARGER_MAX8903 is not set
+# CONFIG_CHARGER_LP8727 is not set
+# CONFIG_CHARGER_GPIO is not set
+# CONFIG_CHARGER_BQ2415X is not set
+# CONFIG_CHARGER_SMB347 is not set
+# CONFIG_BATTERY_GOLDFISH is not set
+CONFIG_POWER_RESET=y
+CONFIG_POWER_AVS=y
+CONFIG_HWMON=y
+CONFIG_HWMON_VID=m
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
+CONFIG_SENSORS_ABITUGURU=m
+CONFIG_SENSORS_ABITUGURU3=m
+# CONFIG_SENSORS_AD7314 is not set
+CONFIG_SENSORS_AD7414=m
+CONFIG_SENSORS_AD7418=m
+# CONFIG_SENSORS_ADCXX is not set
+CONFIG_SENSORS_ADM1021=m
+CONFIG_SENSORS_ADM1025=m
+CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
+CONFIG_SENSORS_ADM1031=m
+CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_ADT7X10=m
+CONFIG_SENSORS_ADT7310=m
+CONFIG_SENSORS_ADT7410=m
+CONFIG_SENSORS_ADT7411=m
+CONFIG_SENSORS_ADT7462=m
+CONFIG_SENSORS_ADT7470=m
+CONFIG_SENSORS_ADT7475=m
+CONFIG_SENSORS_ASC7621=m
+CONFIG_SENSORS_K8TEMP=m
+CONFIG_SENSORS_K10TEMP=m
+CONFIG_SENSORS_FAM15H_POWER=m
+CONFIG_SENSORS_ASB100=m
+CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_DS620=m
+CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_I5K_AMB=m
+CONFIG_SENSORS_F71805F=m
+CONFIG_SENSORS_F71882FG=m
+CONFIG_SENSORS_F75375S=m
+CONFIG_SENSORS_FSCHMD=m
+CONFIG_SENSORS_G760A=m
+CONFIG_SENSORS_GL518SM=m
+CONFIG_SENSORS_GL520SM=m
+# CONFIG_SENSORS_GPIO_FAN is not set
+CONFIG_SENSORS_HIH6130=m
+CONFIG_SENSORS_CORETEMP=m
+CONFIG_SENSORS_IBMAEM=m
+CONFIG_SENSORS_IBMPEX=m
+CONFIG_SENSORS_IT87=m
+CONFIG_SENSORS_JC42=m
+CONFIG_SENSORS_LINEAGE=m
+CONFIG_SENSORS_LM63=m
+# CONFIG_SENSORS_LM70 is not set
+CONFIG_SENSORS_LM73=m
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM77=m
+CONFIG_SENSORS_LM78=m
+CONFIG_SENSORS_LM80=m
+CONFIG_SENSORS_LM83=m
+CONFIG_SENSORS_LM85=m
+CONFIG_SENSORS_LM87=m
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_LM92=m
+CONFIG_SENSORS_LM93=m
+CONFIG_SENSORS_LTC4151=m
+CONFIG_SENSORS_LTC4215=m
+CONFIG_SENSORS_LTC4245=m
+CONFIG_SENSORS_LTC4261=m
+CONFIG_SENSORS_LM95234=m
+CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_LM95245=m
+# CONFIG_SENSORS_MAX1111 is not set
+CONFIG_SENSORS_MAX16065=m
+CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX1668=m
+CONFIG_SENSORS_MAX197=m
+CONFIG_SENSORS_MAX6639=m
+CONFIG_SENSORS_MAX6642=m
+CONFIG_SENSORS_MAX6650=m
+CONFIG_SENSORS_MAX6697=m
+CONFIG_SENSORS_MCP3021=m
+CONFIG_SENSORS_NCT6775=m
+CONFIG_SENSORS_NTC_THERMISTOR=m
+CONFIG_SENSORS_PC87360=m
+CONFIG_SENSORS_PC87427=m
+CONFIG_SENSORS_PCF8591=m
+CONFIG_PMBUS=m
+CONFIG_SENSORS_PMBUS=m
+CONFIG_SENSORS_ADM1275=m
+CONFIG_SENSORS_LM25066=m
+CONFIG_SENSORS_LTC2978=m
+CONFIG_SENSORS_MAX16064=m
+CONFIG_SENSORS_MAX34440=m
+CONFIG_SENSORS_MAX8688=m
+CONFIG_SENSORS_UCD9000=m
+CONFIG_SENSORS_UCD9200=m
+CONFIG_SENSORS_ZL6100=m
+CONFIG_SENSORS_SHT15=m
+CONFIG_SENSORS_SHT21=m
+CONFIG_SENSORS_SIS5595=m
+CONFIG_SENSORS_SMM665=m
+CONFIG_SENSORS_DME1737=m
+CONFIG_SENSORS_EMC1403=m
+CONFIG_SENSORS_EMC2103=m
+CONFIG_SENSORS_EMC6W201=m
+CONFIG_SENSORS_SMSC47M1=m
+CONFIG_SENSORS_SMSC47M192=m
+CONFIG_SENSORS_SMSC47B397=m
+CONFIG_SENSORS_SCH56XX_COMMON=m
+CONFIG_SENSORS_SCH5627=m
+CONFIG_SENSORS_SCH5636=m
+CONFIG_SENSORS_ADS1015=m
+CONFIG_SENSORS_ADS7828=m
+# CONFIG_SENSORS_ADS7871 is not set
+CONFIG_SENSORS_AMC6821=m
+CONFIG_SENSORS_INA209=m
+CONFIG_SENSORS_INA2XX=m
+CONFIG_SENSORS_THMC50=m
+CONFIG_SENSORS_TMP102=m
+CONFIG_SENSORS_TMP401=m
+CONFIG_SENSORS_TMP421=m
+CONFIG_SENSORS_VIA_CPUTEMP=m
+CONFIG_SENSORS_VIA686A=m
+CONFIG_SENSORS_VT1211=m
+CONFIG_SENSORS_VT8231=m
+CONFIG_SENSORS_W83781D=m
+CONFIG_SENSORS_W83791D=m
+CONFIG_SENSORS_W83792D=m
+CONFIG_SENSORS_W83793=m
+CONFIG_SENSORS_W83795=m
+# CONFIG_SENSORS_W83795_FANCTRL is not set
+CONFIG_SENSORS_W83L785TS=m
+CONFIG_SENSORS_W83L786NG=m
+CONFIG_SENSORS_W83627HF=m
+CONFIG_SENSORS_W83627EHF=m
+CONFIG_SENSORS_APPLESMC=m
+CONFIG_SENSORS_MC13783_ADC=m
+
+#
+# ACPI drivers
+#
+CONFIG_SENSORS_ACPI_POWER=m
+CONFIG_SENSORS_ATK0110=m
+CONFIG_THERMAL=y
+CONFIG_THERMAL_HWMON=y
+CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
+# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
+CONFIG_THERMAL_GOV_FAIR_SHARE=y
+CONFIG_THERMAL_GOV_STEP_WISE=y
+# CONFIG_THERMAL_GOV_USER_SPACE is not set
+# CONFIG_CPU_THERMAL is not set
+# CONFIG_THERMAL_EMULATION is not set
+CONFIG_INTEL_POWERCLAMP=m
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+
+#
+# Watchdog Device Drivers
+#
+CONFIG_SOFT_WATCHDOG=m
+CONFIG_RETU_WATCHDOG=m
+CONFIG_ACQUIRE_WDT=m
+CONFIG_ADVANTECH_WDT=m
+CONFIG_ALIM1535_WDT=m
+CONFIG_ALIM7101_WDT=m
+CONFIG_F71808E_WDT=m
+CONFIG_SP5100_TCO=m
+CONFIG_GEODE_WDT=m
+CONFIG_SC520_WDT=m
+CONFIG_SBC_FITPC2_WATCHDOG=m
+CONFIG_EUROTECH_WDT=m
+CONFIG_IB700_WDT=m
+CONFIG_IBMASR=m
+CONFIG_WAFER_WDT=m
+CONFIG_I6300ESB_WDT=m
+CONFIG_IE6XX_WDT=m
+CONFIG_ITCO_WDT=m
+CONFIG_ITCO_VENDOR_SUPPORT=y
+CONFIG_IT8712F_WDT=m
+CONFIG_IT87_WDT=m
+CONFIG_HP_WATCHDOG=m
+CONFIG_HPWDT_NMI_DECODING=y
+CONFIG_SC1200_WDT=m
+CONFIG_PC87413_WDT=m
+CONFIG_NV_TCO=m
+CONFIG_60XX_WDT=m
+CONFIG_SBC8360_WDT=m
+CONFIG_CPU5_WDT=m
+CONFIG_SMSC_SCH311X_WDT=m
+CONFIG_SMSC37B787_WDT=m
+CONFIG_VIA_WDT=m
+CONFIG_W83627HF_WDT=m
+CONFIG_W83697HF_WDT=m
+CONFIG_W83697UG_WDT=m
+CONFIG_W83877F_WDT=m
+CONFIG_W83977F_WDT=m
+CONFIG_MACHZ_WDT=m
+CONFIG_SBC_EPX_C3_WATCHDOG=m
+CONFIG_XEN_WDT=m
+
+#
+# PCI-based Watchdog Cards
+#
+CONFIG_PCIPCWATCHDOG=m
+CONFIG_WDTPCI=m
+
+#
+# USB-based Watchdog Cards
+#
+CONFIG_USBPCWATCHDOG=m
+CONFIG_SSB_POSSIBLE=y
+
+#
+# Sonics Silicon Backplane
+#
+CONFIG_SSB=m
+CONFIG_SSB_SPROM=y
+CONFIG_SSB_BLOCKIO=y
+CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_B43_PCI_BRIDGE=y
+CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
+CONFIG_SSB_PCMCIAHOST=y
+CONFIG_SSB_SDIOHOST_POSSIBLE=y
+CONFIG_SSB_SDIOHOST=y
+# CONFIG_SSB_DEBUG is not set
+CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_DRIVER_PCICORE=y
+CONFIG_SSB_DRIVER_GPIO=y
+CONFIG_BCMA_POSSIBLE=y
+
+#
+# Broadcom specific AMBA
+#
+CONFIG_BCMA=m
+CONFIG_BCMA_BLOCKIO=y
+CONFIG_BCMA_HOST_PCI_POSSIBLE=y
+CONFIG_BCMA_HOST_PCI=y
+CONFIG_BCMA_DRIVER_GMAC_CMN=y
+CONFIG_BCMA_DRIVER_GPIO=y
+# CONFIG_BCMA_DEBUG is not set
+
+#
+# Multifunction device drivers
+#
+CONFIG_MFD_CORE=y
+CONFIG_MFD_CS5535=m
+# CONFIG_MFD_CROS_EC is not set
+# CONFIG_MFD_DA9052_SPI is not set
+CONFIG_MFD_MC13783=m
+CONFIG_MFD_MC13XXX=m
+# CONFIG_MFD_MC13XXX_SPI is not set
+CONFIG_MFD_MC13XXX_I2C=m
+CONFIG_HTC_PASIC3=m
+CONFIG_LPC_ICH=m
+CONFIG_LPC_SCH=m
+# CONFIG_MFD_JANZ_CMODIO is not set
+# CONFIG_EZX_PCAP is not set
+CONFIG_MFD_VIPERBOARD=m
+CONFIG_MFD_RETU=m
+CONFIG_MFD_PCF50633=m
+CONFIG_PCF50633_ADC=m
+CONFIG_PCF50633_GPIO=m
+CONFIG_UCB1400_CORE=m
+CONFIG_MFD_RDC321X=m
+CONFIG_MFD_RTSX_PCI=m
+CONFIG_MFD_SI476X_CORE=m
+CONFIG_MFD_SM501=m
+CONFIG_MFD_SM501_GPIO=y
+CONFIG_ABX500_CORE=y
+# CONFIG_MFD_STMPE is not set
+# CONFIG_MFD_SYSCON is not set
+CONFIG_MFD_TI_AM335X_TSCADC=m
+# CONFIG_TPS6105X is not set
+CONFIG_TPS65010=m
+CONFIG_TPS6507X=m
+CONFIG_MFD_TPS65217=m
+# CONFIG_MFD_TPS65912 is not set
+# CONFIG_MFD_TPS65912_SPI is not set
+CONFIG_MFD_WL1273_CORE=m
+CONFIG_MFD_LM3533=m
+# CONFIG_MFD_TIMBERDALE is not set
+# CONFIG_MFD_TMIO is not set
+CONFIG_MFD_VX855=m
+CONFIG_MFD_ARIZONA=y
+CONFIG_MFD_ARIZONA_I2C=m
+# CONFIG_MFD_ARIZONA_SPI is not set
+CONFIG_MFD_WM5102=y
+CONFIG_MFD_WM5110=y
+# CONFIG_MFD_WM831X_SPI is not set
+# CONFIG_REGULATOR is not set
+CONFIG_MEDIA_SUPPORT=m
+
+#
+# Multimedia core support
+#
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
+CONFIG_MEDIA_RADIO_SUPPORT=y
+CONFIG_MEDIA_RC_SUPPORT=y
+CONFIG_MEDIA_CONTROLLER=y
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2_SUBDEV_API=y
+CONFIG_VIDEO_V4L2=m
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+CONFIG_VIDEO_TUNER=m
+CONFIG_V4L2_MEM2MEM_DEV=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_DMA_SG=m
+CONFIG_VIDEOBUF_VMALLOC=m
+CONFIG_VIDEOBUF_DVB=m
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_DMA_CONTIG=m
+CONFIG_VIDEOBUF2_VMALLOC=m
+CONFIG_VIDEOBUF2_DMA_SG=m
+# CONFIG_VIDEO_V4L2_INT_DEVICE is not set
+CONFIG_DVB_CORE=m
+CONFIG_DVB_NET=y
+CONFIG_TTPCI_EEPROM=m
+CONFIG_DVB_MAX_ADAPTERS=8
+# CONFIG_DVB_DYNAMIC_MINORS is not set
+
+#
+# Media drivers
+#
+CONFIG_RC_CORE=m
+CONFIG_RC_MAP=m
+CONFIG_RC_DECODERS=y
+CONFIG_LIRC=m
+CONFIG_IR_LIRC_CODEC=m
+CONFIG_IR_NEC_DECODER=m
+CONFIG_IR_RC5_DECODER=m
+CONFIG_IR_RC6_DECODER=m
+CONFIG_IR_JVC_DECODER=m
+CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_RC5_SZ_DECODER=m
+CONFIG_IR_SANYO_DECODER=m
+CONFIG_IR_MCE_KBD_DECODER=m
+CONFIG_RC_DEVICES=y
+CONFIG_RC_ATI_REMOTE=m
+CONFIG_IR_ENE=m
+CONFIG_IR_IMON=m
+CONFIG_IR_MCEUSB=m
+CONFIG_IR_ITE_CIR=m
+CONFIG_IR_FINTEK=m
+CONFIG_IR_NUVOTON=m
+CONFIG_IR_REDRAT3=m
+CONFIG_IR_STREAMZAP=m
+CONFIG_IR_WINBOND_CIR=m
+CONFIG_IR_IGUANA=m
+CONFIG_IR_TTUSBIR=m
+CONFIG_RC_LOOPBACK=m
+CONFIG_IR_GPIO_CIR=m
+CONFIG_MEDIA_USB_SUPPORT=y
+
+#
+# Webcam devices
+#
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+CONFIG_USB_GSPCA=m
+CONFIG_USB_M5602=m
+CONFIG_USB_STV06XX=m
+CONFIG_USB_GL860=m
+CONFIG_USB_GSPCA_BENQ=m
+CONFIG_USB_GSPCA_CONEX=m
+CONFIG_USB_GSPCA_CPIA1=m
+CONFIG_USB_GSPCA_ETOMS=m
+CONFIG_USB_GSPCA_FINEPIX=m
+CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_JL2005BCD=m
+CONFIG_USB_GSPCA_KINECT=m
+CONFIG_USB_GSPCA_KONICA=m
+CONFIG_USB_GSPCA_MARS=m
+CONFIG_USB_GSPCA_MR97310A=m
+CONFIG_USB_GSPCA_NW80X=m
+CONFIG_USB_GSPCA_OV519=m
+CONFIG_USB_GSPCA_OV534=m
+CONFIG_USB_GSPCA_OV534_9=m
+CONFIG_USB_GSPCA_PAC207=m
+CONFIG_USB_GSPCA_PAC7302=m
+CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SE401=m
+CONFIG_USB_GSPCA_SN9C2028=m
+CONFIG_USB_GSPCA_SN9C20X=m
+CONFIG_USB_GSPCA_SONIXB=m
+CONFIG_USB_GSPCA_SONIXJ=m
+CONFIG_USB_GSPCA_SPCA500=m
+CONFIG_USB_GSPCA_SPCA501=m
+CONFIG_USB_GSPCA_SPCA505=m
+CONFIG_USB_GSPCA_SPCA506=m
+CONFIG_USB_GSPCA_SPCA508=m
+CONFIG_USB_GSPCA_SPCA561=m
+CONFIG_USB_GSPCA_SPCA1528=m
+CONFIG_USB_GSPCA_SQ905=m
+CONFIG_USB_GSPCA_SQ905C=m
+CONFIG_USB_GSPCA_SQ930X=m
+CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STV0680=m
+CONFIG_USB_GSPCA_SUNPLUS=m
+CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TOPRO=m
+CONFIG_USB_GSPCA_TV8532=m
+CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_VICAM=m
+CONFIG_USB_GSPCA_XIRLINK_CIT=m
+CONFIG_USB_GSPCA_ZC3XX=m
+CONFIG_USB_PWC=m
+# CONFIG_USB_PWC_DEBUG is not set
+CONFIG_USB_PWC_INPUT_EVDEV=y
+CONFIG_VIDEO_CPIA2=m
+CONFIG_USB_ZR364XX=m
+CONFIG_USB_STKWEBCAM=m
+CONFIG_USB_S2255=m
+CONFIG_USB_SN9C102=m
+
+#
+# Analog TV USB devices
+#
+CONFIG_VIDEO_PVRUSB2=m
+CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_PVRUSB2_DVB=y
+# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
+CONFIG_VIDEO_HDPVR=m
+CONFIG_VIDEO_TLG2300=m
+CONFIG_VIDEO_USBVISION=m
+CONFIG_VIDEO_STK1160=m
+CONFIG_VIDEO_STK1160_AC97=y
+
+#
+# Analog/digital TV USB devices
+#
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_AU0828_V4L2=y
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_RC=y
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
+CONFIG_VIDEO_TM6000=m
+CONFIG_VIDEO_TM6000_ALSA=m
+CONFIG_VIDEO_TM6000_DVB=m
+
+#
+# Digital TV USB devices
+#
+CONFIG_DVB_USB=m
+# CONFIG_DVB_USB_DEBUG is not set
+CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_DIBUSB_MB=m
+CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
+CONFIG_DVB_USB_DIBUSB_MC=m
+CONFIG_DVB_USB_DIB0700=m
+CONFIG_DVB_USB_UMT_010=m
+CONFIG_DVB_USB_CXUSB=m
+CONFIG_DVB_USB_M920X=m
+CONFIG_DVB_USB_DIGITV=m
+CONFIG_DVB_USB_VP7045=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_OPERA1=m
+CONFIG_DVB_USB_AF9005=m
+CONFIG_DVB_USB_AF9005_REMOTE=m
+CONFIG_DVB_USB_PCTV452E=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_FRIIO=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_USB_V2=m
+CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_AF9035=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_AZ6007=m
+CONFIG_DVB_USB_CE6230=m
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_IT913X=m
+CONFIG_DVB_USB_LME2510=m
+CONFIG_DVB_USB_MXL111SF=m
+CONFIG_DVB_USB_RTL28XXU=m
+CONFIG_DVB_TTUSB_BUDGET=m
+CONFIG_DVB_TTUSB_DEC=m
+CONFIG_SMS_USB_DRV=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
+
+#
+# Webcam, TV (analog/digital) USB devices
+#
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_EM28XX_RC=m
+CONFIG_MEDIA_PCI_SUPPORT=y
+
+#
+# Media capture support
+#
+CONFIG_VIDEO_MEYE=m
+
+#
+# Media capture/analog TV support
+#
+CONFIG_VIDEO_IVTV=m
+CONFIG_VIDEO_IVTV_ALSA=m
+CONFIG_VIDEO_FB_IVTV=m
+CONFIG_VIDEO_ZORAN=m
+CONFIG_VIDEO_ZORAN_DC30=m
+CONFIG_VIDEO_ZORAN_ZR36060=m
+CONFIG_VIDEO_ZORAN_BUZ=m
+CONFIG_VIDEO_ZORAN_DC10=m
+CONFIG_VIDEO_ZORAN_LML33=m
+CONFIG_VIDEO_ZORAN_LML33R10=m
+CONFIG_VIDEO_ZORAN_AVS6EYES=m
+CONFIG_VIDEO_HEXIUM_GEMINI=m
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_MXB=m
+
+#
+# Media capture/analog/hybrid TV support
+#
+CONFIG_VIDEO_CX18=m
+CONFIG_VIDEO_CX18_ALSA=m
+CONFIG_VIDEO_CX23885=m
+CONFIG_MEDIA_ALTERA_CI=m
+CONFIG_VIDEO_CX25821=m
+CONFIG_VIDEO_CX25821_ALSA=m
+CONFIG_VIDEO_CX88=m
+CONFIG_VIDEO_CX88_ALSA=m
+CONFIG_VIDEO_CX88_BLACKBIRD=m
+CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_VP3054=m
+CONFIG_VIDEO_CX88_MPEG=m
+CONFIG_VIDEO_BT848=m
+CONFIG_DVB_BT8XX=m
+CONFIG_VIDEO_SAA7134=m
+CONFIG_VIDEO_SAA7134_ALSA=m
+CONFIG_VIDEO_SAA7134_RC=y
+CONFIG_VIDEO_SAA7134_DVB=m
+CONFIG_VIDEO_SAA7164=m
+
+#
+# Media digital TV PCI Adapters
+#
+CONFIG_DVB_AV7110=m
+CONFIG_DVB_AV7110_OSD=y
+CONFIG_DVB_BUDGET_CORE=m
+CONFIG_DVB_BUDGET=m
+CONFIG_DVB_BUDGET_CI=m
+CONFIG_DVB_BUDGET_AV=m
+CONFIG_DVB_BUDGET_PATCH=m
+CONFIG_DVB_B2C2_FLEXCOP_PCI=m
+# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
+CONFIG_DVB_PLUTO2=m
+CONFIG_DVB_DM1105=m
+CONFIG_DVB_PT1=m
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
+CONFIG_DVB_HOPPER=m
+CONFIG_DVB_NGENE=m
+CONFIG_DVB_DDBRIDGE=m
+# CONFIG_V4L_PLATFORM_DRIVERS is not set
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
+CONFIG_VIDEO_SH_VEU=m
+# CONFIG_V4L_TEST_DRIVERS is not set
+
+#
+# Supported MMC/SDIO adapters
+#
+CONFIG_SMS_SDIO_DRV=m
+CONFIG_MEDIA_PARPORT_SUPPORT=y
+CONFIG_VIDEO_BWQCAM=m
+CONFIG_VIDEO_CQCAM=m
+CONFIG_VIDEO_W9966=m
+CONFIG_RADIO_ADAPTERS=y
+CONFIG_RADIO_SI470X=y
+CONFIG_USB_SI470X=m
+CONFIG_I2C_SI470X=m
+CONFIG_USB_MR800=m
+CONFIG_USB_DSBR=m
+CONFIG_RADIO_MAXIRADIO=m
+CONFIG_RADIO_SHARK=m
+CONFIG_RADIO_SHARK2=m
+CONFIG_I2C_SI4713=m
+CONFIG_RADIO_SI4713=m
+CONFIG_USB_KEENE=m
+CONFIG_USB_MA901=m
+CONFIG_RADIO_TEA5764=m
+CONFIG_RADIO_SAA7706H=m
+CONFIG_RADIO_TEF6862=m
+CONFIG_RADIO_WL1273=m
+
+#
+# Texas Instruments WL128x FM driver (ST based)
+#
+CONFIG_RADIO_WL128X=m
+
+#
+# Supported FireWire (IEEE 1394) Adapters
+#
+CONFIG_DVB_FIREDTV=m
+CONFIG_DVB_FIREDTV_INPUT=y
+CONFIG_MEDIA_COMMON_OPTIONS=y
+
+#
+# common driver options
+#
+CONFIG_VIDEO_CX2341X=m
+CONFIG_VIDEO_BTCX=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_CYPRESS_FIRMWARE=m
+CONFIG_DVB_B2C2_FLEXCOP=m
+CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
+CONFIG_SMS_SIANO_MDTV=m
+CONFIG_SMS_SIANO_RC=y
+# CONFIG_SMS_SIANO_DEBUGFS is not set
+
+#
+# Media ancillary drivers (tuners, sensors, i2c, frontends)
+#
+CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
+CONFIG_MEDIA_ATTACH=y
+CONFIG_VIDEO_IR_I2C=m
+
+#
+# Audio decoders, processors and mixers
+#
+CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_TDA9840=m
+CONFIG_VIDEO_TEA6415C=m
+CONFIG_VIDEO_TEA6420=m
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_CS5345=m
+CONFIG_VIDEO_CS53L32A=m
+CONFIG_VIDEO_UDA1342=m
+CONFIG_VIDEO_WM8775=m
+CONFIG_VIDEO_WM8739=m
+CONFIG_VIDEO_VP27SMPX=m
+CONFIG_VIDEO_SONY_BTF_MPX=m
+
+#
+# RDS decoders
+#
+CONFIG_VIDEO_SAA6588=m
+
+#
+# Video decoders
+#
+CONFIG_VIDEO_BT819=m
+CONFIG_VIDEO_BT856=m
+CONFIG_VIDEO_BT866=m
+CONFIG_VIDEO_KS0127=m
+CONFIG_VIDEO_SAA7110=m
+CONFIG_VIDEO_SAA711X=m
+CONFIG_VIDEO_TVP5150=m
+CONFIG_VIDEO_TW2804=m
+CONFIG_VIDEO_TW9903=m
+CONFIG_VIDEO_TW9906=m
+CONFIG_VIDEO_VPX3220=m
+
+#
+# Video and audio decoders
+#
+CONFIG_VIDEO_SAA717X=m
+CONFIG_VIDEO_CX25840=m
+
+#
+# Video encoders
+#
+CONFIG_VIDEO_SAA7127=m
+CONFIG_VIDEO_SAA7185=m
+CONFIG_VIDEO_ADV7170=m
+CONFIG_VIDEO_ADV7175=m
+
+#
+# Camera sensor devices
+#
+CONFIG_VIDEO_OV7640=m
+CONFIG_VIDEO_MT9V011=m
+
+#
+# Flash devices
+#
+
+#
+# Video improvement chips
+#
+CONFIG_VIDEO_UPD64031A=m
+CONFIG_VIDEO_UPD64083=m
+
+#
+# Miscelaneous helper chips
+#
+CONFIG_VIDEO_M52790=m
+
+#
+# Sensors used on soc_camera driver
+#
+CONFIG_MEDIA_TUNER=m
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_MT2060=m
+CONFIG_MEDIA_TUNER_MT2063=m
+CONFIG_MEDIA_TUNER_MT2266=m
+CONFIG_MEDIA_TUNER_MT2131=m
+CONFIG_MEDIA_TUNER_QT1010=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
+CONFIG_MEDIA_TUNER_MXL5005S=m
+CONFIG_MEDIA_TUNER_MXL5007T=m
+CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
+CONFIG_MEDIA_TUNER_TDA18218=m
+CONFIG_MEDIA_TUNER_FC0011=m
+CONFIG_MEDIA_TUNER_FC0012=m
+CONFIG_MEDIA_TUNER_FC0013=m
+CONFIG_MEDIA_TUNER_TDA18212=m
+CONFIG_MEDIA_TUNER_E4000=m
+CONFIG_MEDIA_TUNER_FC2580=m
+CONFIG_MEDIA_TUNER_TUA9001=m
+CONFIG_MEDIA_TUNER_IT913X=m
+CONFIG_MEDIA_TUNER_R820T=m
+
+#
+# Multistandard (satellite) frontends
+#
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
+CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV6110x=m
+
+#
+# Multistandard (cable + terrestrial) frontends
+#
+CONFIG_DVB_DRXK=m
+CONFIG_DVB_TDA18271C2DD=m
+
+#
+# DVB-S (satellite) frontends
+#
+CONFIG_DVB_CX24110=m
+CONFIG_DVB_CX24123=m
+CONFIG_DVB_MT312=m
+CONFIG_DVB_ZL10036=m
+CONFIG_DVB_ZL10039=m
+CONFIG_DVB_S5H1420=m
+CONFIG_DVB_STV0288=m
+CONFIG_DVB_STB6000=m
+CONFIG_DVB_STV0299=m
+CONFIG_DVB_STV6110=m
+CONFIG_DVB_STV0900=m
+CONFIG_DVB_TDA8083=m
+CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TDA8261=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_TUNER_ITD1000=m
+CONFIG_DVB_TUNER_CX24113=m
+CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TUA6100=m
+CONFIG_DVB_CX24116=m
+CONFIG_DVB_SI21XX=m
+CONFIG_DVB_TS2020=m
+CONFIG_DVB_DS3000=m
+CONFIG_DVB_MB86A16=m
+CONFIG_DVB_TDA10071=m
+
+#
+# DVB-T (terrestrial) frontends
+#
+CONFIG_DVB_SP8870=m
+CONFIG_DVB_SP887X=m
+CONFIG_DVB_CX22700=m
+CONFIG_DVB_CX22702=m
+CONFIG_DVB_DRXD=m
+CONFIG_DVB_L64781=m
+CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_NXT6000=m
+CONFIG_DVB_MT352=m
+CONFIG_DVB_ZL10353=m
+CONFIG_DVB_DIB3000MB=m
+CONFIG_DVB_DIB3000MC=m
+CONFIG_DVB_DIB7000M=m
+CONFIG_DVB_DIB7000P=m
+CONFIG_DVB_TDA10048=m
+CONFIG_DVB_AF9013=m
+CONFIG_DVB_EC100=m
+CONFIG_DVB_STV0367=m
+CONFIG_DVB_CXD2820R=m
+CONFIG_DVB_RTL2830=m
+CONFIG_DVB_RTL2832=m
+
+#
+# DVB-C (cable) frontends
+#
+CONFIG_DVB_VES1820=m
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
+CONFIG_DVB_STV0297=m
+
+#
+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
+#
+CONFIG_DVB_NXT200X=m
+CONFIG_DVB_OR51211=m
+CONFIG_DVB_OR51132=m
+CONFIG_DVB_BCM3510=m
+CONFIG_DVB_LGDT330X=m
+CONFIG_DVB_LGDT3305=m
+CONFIG_DVB_LG2160=m
+CONFIG_DVB_S5H1409=m
+CONFIG_DVB_AU8522=m
+CONFIG_DVB_AU8522_DTV=m
+CONFIG_DVB_AU8522_V4L=m
+CONFIG_DVB_S5H1411=m
+
+#
+# ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_S921=m
+CONFIG_DVB_DIB8000=m
+CONFIG_DVB_MB86A20S=m
+
+#
+# Digital terrestrial only tuners/PLL
+#
+CONFIG_DVB_PLL=m
+CONFIG_DVB_TUNER_DIB0070=m
+CONFIG_DVB_TUNER_DIB0090=m
+
+#
+# SEC control devices for DVB-S
+#
+CONFIG_DVB_LNBP21=m
+CONFIG_DVB_LNBP22=m
+CONFIG_DVB_ISL6405=m
+CONFIG_DVB_ISL6421=m
+CONFIG_DVB_ISL6423=m
+CONFIG_DVB_A8293=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
+CONFIG_DVB_TDA665x=m
+CONFIG_DVB_IX2505V=m
+CONFIG_DVB_IT913X_FE=m
+CONFIG_DVB_M88RS2000=m
+CONFIG_DVB_AF9033=m
+
+#
+# Tools to develop new frontends
+#
+# CONFIG_DVB_DUMMY_FE is not set
+
+#
+# Graphics support
+#
+CONFIG_AGP=y
+CONFIG_AGP_AMD64=y
+CONFIG_AGP_INTEL=m
+CONFIG_AGP_SIS=m
+CONFIG_AGP_VIA=m
+CONFIG_VGA_ARB=y
+CONFIG_VGA_ARB_MAX_GPUS=16
+CONFIG_VGA_SWITCHEROO=y
+CONFIG_DRM=m
+CONFIG_DRM_USB=m
+CONFIG_DRM_KMS_HELPER=m
+CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+CONFIG_DRM_TTM=m
+
+#
+# I2C encoder or helper chips
+#
+CONFIG_DRM_I2C_CH7006=m
+CONFIG_DRM_I2C_SIL164=m
+CONFIG_DRM_I2C_NXP_TDA998X=m
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_R128=m
+CONFIG_DRM_RADEON=m
+# CONFIG_DRM_RADEON_UMS is not set
+CONFIG_DRM_NOUVEAU=m
+CONFIG_NOUVEAU_DEBUG=5
+CONFIG_NOUVEAU_DEBUG_DEFAULT=3
+CONFIG_DRM_NOUVEAU_BACKLIGHT=y
+CONFIG_DRM_I915=m
+CONFIG_DRM_I915_KMS=y
+CONFIG_DRM_MGA=m
+CONFIG_DRM_SIS=m
+CONFIG_DRM_VIA=m
+CONFIG_DRM_SAVAGE=m
+CONFIG_DRM_VMWGFX=m
+CONFIG_DRM_VMWGFX_FBCON=y
+CONFIG_DRM_GMA500=m
+CONFIG_DRM_GMA600=y
+CONFIG_DRM_GMA3600=y
+CONFIG_DRM_UDL=m
+CONFIG_DRM_AST=m
+CONFIG_DRM_MGAG200=m
+CONFIG_DRM_CIRRUS_QEMU=m
+CONFIG_DRM_QXL=m
+CONFIG_VGASTATE=m
+CONFIG_VIDEO_OUTPUT_CONTROL=m
+CONFIG_HDMI=y
+CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+# CONFIG_FB_DDC is not set
+CONFIG_FB_BOOT_VESA_SUPPORT=y
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+CONFIG_FB_SYS_FILLRECT=m
+CONFIG_FB_SYS_COPYAREA=m
+CONFIG_FB_SYS_IMAGEBLIT=m
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+CONFIG_FB_SYS_FOPS=m
+CONFIG_FB_DEFERRED_IO=y
+# CONFIG_FB_SVGALIB is not set
+# CONFIG_FB_MACMODES is not set
+CONFIG_FB_BACKLIGHT=y
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_FB_TILEBLITTING=y
+
+#
+# Frame buffer hardware drivers
+#
+# CONFIG_FB_CIRRUS is not set
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_ARC is not set
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+CONFIG_FB_VGA16=m
+CONFIG_FB_UVESA=m
+CONFIG_FB_VESA=y
+CONFIG_FB_EFI=y
+# CONFIG_FB_N411 is not set
+# CONFIG_FB_HGA is not set
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_NVIDIA is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_I740 is not set
+# CONFIG_FB_LE80578 is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_S3 is not set
+# CONFIG_FB_SAVAGE is not set
+# CONFIG_FB_SIS is not set
+CONFIG_FB_VIA=m
+CONFIG_FB_VIA_DIRECT_PROCFS=y
+CONFIG_FB_VIA_X_COMPATIBILITY=y
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_3DFX is not set
+CONFIG_FB_VOODOO1=m
+CONFIG_FB_VT8623=m
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_PM3 is not set
+# CONFIG_FB_CARMINE is not set
+# CONFIG_FB_GEODE is not set
+# CONFIG_FB_TMIO is not set
+# CONFIG_FB_SM501 is not set
+# CONFIG_FB_SMSCUFX is not set
+CONFIG_FB_UDL=m
+# CONFIG_FB_GOLDFISH is not set
+CONFIG_FB_VIRTUAL=m
+CONFIG_XEN_FBDEV_FRONTEND=m
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MB862XX is not set
+# CONFIG_FB_BROADSHEET is not set
+# CONFIG_FB_AUO_K190X is not set
+CONFIG_FB_HYPERV=m
+# CONFIG_EXYNOS_VIDEO is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_LCD_CLASS_DEVICE=m
+# CONFIG_LCD_L4F00242T03 is not set
+# CONFIG_LCD_LMS283GF05 is not set
+# CONFIG_LCD_LTV350QV is not set
+# CONFIG_LCD_ILI922X is not set
+# CONFIG_LCD_ILI9320 is not set
+# CONFIG_LCD_TDO24M is not set
+# CONFIG_LCD_VGG2432A4 is not set
+CONFIG_LCD_PLATFORM=m
+# CONFIG_LCD_S6E63M0 is not set
+# CONFIG_LCD_LD9040 is not set
+# CONFIG_LCD_AMS369FG06 is not set
+# CONFIG_LCD_LMS501KF03 is not set
+# CONFIG_LCD_HX8357 is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+# CONFIG_BACKLIGHT_GENERIC is not set
+CONFIG_BACKLIGHT_LM3533=m
+CONFIG_BACKLIGHT_APPLE=m
+# CONFIG_BACKLIGHT_SAHARA is not set
+# CONFIG_BACKLIGHT_ADP8860 is not set
+# CONFIG_BACKLIGHT_ADP8870 is not set
+CONFIG_BACKLIGHT_PCF50633=m
+# CONFIG_BACKLIGHT_LM3630 is not set
+# CONFIG_BACKLIGHT_LM3639 is not set
+# CONFIG_BACKLIGHT_LP855X is not set
+# CONFIG_BACKLIGHT_OT200 is not set
+# CONFIG_BACKLIGHT_TPS65217 is not set
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+# CONFIG_VGACON_SOFT_SCROLLBACK is not set
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+CONFIG_FONTS=y
+# CONFIG_FONT_8x8 is not set
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
+CONFIG_FONT_AUTOSELECT=y
+# CONFIG_LOGO is not set
+CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
+# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_JACK=y
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+CONFIG_SND_SEQUENCER_OSS=y
+CONFIG_SND_HRTIMER=m
+CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
+CONFIG_SND_DYNAMIC_MINORS=y
+CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_VMASTER=y
+CONFIG_SND_KCTL_JACK=y
+CONFIG_SND_DMA_SGBUF=y
+CONFIG_SND_RAWMIDI_SEQ=m
+CONFIG_SND_OPL3_LIB_SEQ=m
+# CONFIG_SND_OPL4_LIB_SEQ is not set
+# CONFIG_SND_SBAWE_SEQ is not set
+CONFIG_SND_EMU10K1_SEQ=m
+CONFIG_SND_MPU401_UART=m
+CONFIG_SND_OPL3_LIB=m
+CONFIG_SND_VX_LIB=m
+CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_DRIVERS=y
+# CONFIG_SND_PCSP is not set
+CONFIG_SND_DUMMY=m
+CONFIG_SND_ALOOP=m
+CONFIG_SND_VIRMIDI=m
+CONFIG_SND_MTPAV=m
+CONFIG_SND_MTS64=m
+CONFIG_SND_SERIAL_U16550=m
+CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
+CONFIG_SND_AC97_POWER_SAVE=y
+CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
+CONFIG_SND_SB_COMMON=m
+CONFIG_SND_SB16_DSP=m
+CONFIG_SND_TEA575X=m
+CONFIG_SND_PCI=y
+CONFIG_SND_AD1889=m
+CONFIG_SND_ALS300=m
+CONFIG_SND_ALS4000=m
+CONFIG_SND_ALI5451=m
+CONFIG_SND_ASIHPI=m
+CONFIG_SND_ATIIXP=m
+CONFIG_SND_ATIIXP_MODEM=m
+CONFIG_SND_AU8810=m
+CONFIG_SND_AU8820=m
+CONFIG_SND_AU8830=m
+CONFIG_SND_AW2=m
+CONFIG_SND_AZT3328=m
+CONFIG_SND_BT87X=m
+# CONFIG_SND_BT87X_OVERCLOCK is not set
+CONFIG_SND_CA0106=m
+CONFIG_SND_CMIPCI=m
+CONFIG_SND_OXYGEN_LIB=m
+CONFIG_SND_OXYGEN=m
+CONFIG_SND_CS4281=m
+CONFIG_SND_CS46XX=m
+CONFIG_SND_CS46XX_NEW_DSP=y
+CONFIG_SND_CS5530=m
+CONFIG_SND_CS5535AUDIO=m
+CONFIG_SND_CTXFI=m
+CONFIG_SND_DARLA20=m
+CONFIG_SND_GINA20=m
+CONFIG_SND_LAYLA20=m
+CONFIG_SND_DARLA24=m
+CONFIG_SND_GINA24=m
+CONFIG_SND_LAYLA24=m
+CONFIG_SND_MONA=m
+CONFIG_SND_MIA=m
+CONFIG_SND_ECHO3G=m
+CONFIG_SND_INDIGO=m
+CONFIG_SND_INDIGOIO=m
+CONFIG_SND_INDIGODJ=m
+CONFIG_SND_INDIGOIOX=m
+CONFIG_SND_INDIGODJX=m
+CONFIG_SND_EMU10K1=m
+CONFIG_SND_EMU10K1X=m
+CONFIG_SND_ENS1370=m
+CONFIG_SND_ENS1371=m
+CONFIG_SND_ES1938=m
+CONFIG_SND_ES1968=m
+CONFIG_SND_ES1968_INPUT=y
+CONFIG_SND_ES1968_RADIO=y
+CONFIG_SND_FM801=m
+CONFIG_SND_FM801_TEA575X_BOOL=y
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_DSP_LOADER=y
+CONFIG_SND_HDA_PREALLOC_SIZE=4096
+CONFIG_SND_HDA_HWDEP=y
+CONFIG_SND_HDA_RECONFIG=y
+CONFIG_SND_HDA_INPUT_BEEP=y
+CONFIG_SND_HDA_INPUT_BEEP_MODE=1
+CONFIG_SND_HDA_INPUT_JACK=y
+CONFIG_SND_HDA_PATCH_LOADER=y
+CONFIG_SND_HDA_CODEC_REALTEK=y
+CONFIG_SND_HDA_CODEC_ANALOG=y
+CONFIG_SND_HDA_CODEC_SIGMATEL=y
+CONFIG_SND_HDA_CODEC_VIA=y
+CONFIG_SND_HDA_CODEC_HDMI=y
+CONFIG_SND_HDA_CODEC_CIRRUS=y
+CONFIG_SND_HDA_CODEC_CONEXANT=y
+CONFIG_SND_HDA_CODEC_CA0110=y
+CONFIG_SND_HDA_CODEC_CA0132=y
+CONFIG_SND_HDA_CODEC_CA0132_DSP=y
+CONFIG_SND_HDA_CODEC_CMEDIA=y
+CONFIG_SND_HDA_CODEC_SI3054=y
+CONFIG_SND_HDA_GENERIC=y
+CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
+CONFIG_SND_HDSP=m
+CONFIG_SND_HDSPM=m
+CONFIG_SND_ICE1712=m
+CONFIG_SND_ICE1724=m
+CONFIG_SND_INTEL8X0=m
+CONFIG_SND_INTEL8X0M=m
+CONFIG_SND_KORG1212=m
+CONFIG_SND_LOLA=m
+CONFIG_SND_LX6464ES=m
+CONFIG_SND_MAESTRO3=m
+CONFIG_SND_MAESTRO3_INPUT=y
+CONFIG_SND_MIXART=m
+CONFIG_SND_NM256=m
+CONFIG_SND_PCXHR=m
+CONFIG_SND_RIPTIDE=m
+CONFIG_SND_RME32=m
+CONFIG_SND_RME96=m
+CONFIG_SND_RME9652=m
+CONFIG_SND_SONICVIBES=m
+CONFIG_SND_TRIDENT=m
+CONFIG_SND_VIA82XX=m
+CONFIG_SND_VIA82XX_MODEM=m
+CONFIG_SND_VIRTUOSO=m
+CONFIG_SND_VX222=m
+CONFIG_SND_YMFPCI=m
+CONFIG_SND_SPI=y
+CONFIG_SND_USB=y
+CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_UA101=m
+CONFIG_SND_USB_USX2Y=m
+CONFIG_SND_USB_CAIAQ=m
+CONFIG_SND_USB_CAIAQ_INPUT=y
+CONFIG_SND_USB_US122L=m
+CONFIG_SND_USB_6FIRE=m
+CONFIG_SND_FIREWIRE=y
+CONFIG_SND_FIREWIRE_LIB=m
+CONFIG_SND_FIREWIRE_SPEAKERS=m
+CONFIG_SND_ISIGHT=m
+CONFIG_SND_SCS1X=m
+CONFIG_SND_PCMCIA=y
+CONFIG_SND_VXPOCKET=m
+CONFIG_SND_PDAUDIOCF=m
+# CONFIG_SND_SOC is not set
+# CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=m
+
+#
+# HID support
+#
+CONFIG_HID=m
+CONFIG_HIDRAW=y
+CONFIG_UHID=m
+CONFIG_HID_GENERIC=m
+
+#
+# Special HID drivers
+#
+CONFIG_HID_A4TECH=m
+CONFIG_HID_ACRUX=m
+CONFIG_HID_ACRUX_FF=y
+CONFIG_HID_APPLE=m
+CONFIG_HID_APPLEIR=m
+CONFIG_HID_AUREAL=m
+CONFIG_HID_BELKIN=m
+CONFIG_HID_CHERRY=m
+CONFIG_HID_CHICONY=m
+CONFIG_HID_PRODIKEYS=m
+CONFIG_HID_CYPRESS=m
+CONFIG_HID_DRAGONRISE=m
+CONFIG_DRAGONRISE_FF=y
+CONFIG_HID_EMS_FF=m
+CONFIG_HID_ELECOM=m
+CONFIG_HID_EZKEY=m
+CONFIG_HID_HOLTEK=m
+CONFIG_HOLTEK_FF=y
+CONFIG_HID_KEYTOUCH=m
+CONFIG_HID_KYE=m
+CONFIG_HID_UCLOGIC=m
+CONFIG_HID_WALTOP=m
+CONFIG_HID_GYRATION=m
+CONFIG_HID_ICADE=m
+CONFIG_HID_TWINHAN=m
+CONFIG_HID_KENSINGTON=m
+CONFIG_HID_LCPOWER=m
+CONFIG_HID_LENOVO_TPKBD=m
+CONFIG_HID_LOGITECH=m
+CONFIG_HID_LOGITECH_DJ=m
+CONFIG_LOGITECH_FF=y
+CONFIG_LOGIRUMBLEPAD2_FF=y
+CONFIG_LOGIG940_FF=y
+CONFIG_LOGIWHEELS_FF=y
+CONFIG_HID_MAGICMOUSE=m
+CONFIG_HID_MICROSOFT=m
+CONFIG_HID_MONTEREY=m
+CONFIG_HID_MULTITOUCH=m
+CONFIG_HID_NTRIG=m
+CONFIG_HID_ORTEK=m
+CONFIG_HID_PANTHERLORD=m
+CONFIG_PANTHERLORD_FF=y
+CONFIG_HID_PETALYNX=m
+CONFIG_HID_PICOLCD=m
+CONFIG_HID_PICOLCD_FB=y
+CONFIG_HID_PICOLCD_BACKLIGHT=y
+CONFIG_HID_PICOLCD_LCD=y
+CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_PICOLCD_CIR=y
+CONFIG_HID_PRIMAX=m
+CONFIG_HID_PS3REMOTE=m
+CONFIG_HID_ROCCAT=m
+CONFIG_HID_SAITEK=m
+CONFIG_HID_SAMSUNG=m
+CONFIG_HID_SONY=m
+CONFIG_HID_SPEEDLINK=m
+CONFIG_HID_STEELSERIES=m
+CONFIG_HID_SUNPLUS=m
+CONFIG_HID_GREENASIA=m
+CONFIG_GREENASIA_FF=y
+CONFIG_HID_HYPERV_MOUSE=m
+CONFIG_HID_SMARTJOYPLUS=m
+CONFIG_SMARTJOYPLUS_FF=y
+CONFIG_HID_TIVO=m
+CONFIG_HID_TOPSEED=m
+CONFIG_HID_THINGM=m
+CONFIG_HID_THRUSTMASTER=m
+CONFIG_THRUSTMASTER_FF=y
+CONFIG_HID_WACOM=m
+CONFIG_HID_WIIMOTE=m
+CONFIG_HID_WIIMOTE_EXT=y
+CONFIG_HID_ZEROPLUS=m
+CONFIG_ZEROPLUS_FF=y
+CONFIG_HID_ZYDACRON=m
+CONFIG_HID_SENSOR_HUB=m
+
+#
+# USB HID support
+#
+CONFIG_USB_HID=m
+CONFIG_HID_PID=y
+CONFIG_USB_HIDDEV=y
+
+#
+# I2C HID support
+#
+CONFIG_I2C_HID=m
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+CONFIG_USB_ARCH_HAS_XHCI=y
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_COMMON=m
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB=m
+# CONFIG_USB_DEBUG is not set
+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEFAULT_PERSIST=y
+CONFIG_USB_DYNAMIC_MINORS=y
+# CONFIG_USB_OTG is not set
+CONFIG_USB_MON=m
+CONFIG_USB_WUSB=m
+CONFIG_USB_WUSB_CBAF=m
+# CONFIG_USB_WUSB_CBAF_DEBUG is not set
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_C67X00_HCD=m
+CONFIG_USB_XHCI_HCD=m
+# CONFIG_USB_XHCI_HCD_DEBUGGING is not set
+CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_EHCI_PCI=m
+# CONFIG_USB_EHCI_HCD_PLATFORM is not set
+CONFIG_USB_OXU210HP_HCD=m
+CONFIG_USB_ISP116X_HCD=m
+CONFIG_USB_ISP1760_HCD=m
+CONFIG_USB_ISP1362_HCD=m
+CONFIG_USB_OHCI_HCD=m
+# CONFIG_USB_OHCI_HCD_SSB is not set
+# CONFIG_USB_OHCI_HCD_PLATFORM is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_UHCI_HCD=m
+CONFIG_USB_U132_HCD=m
+CONFIG_USB_SL811_HCD=m
+# CONFIG_USB_SL811_HCD_ISO is not set
+CONFIG_USB_SL811_CS=m
+CONFIG_USB_R8A66597_HCD=m
+CONFIG_USB_RENESAS_USBHS_HCD=m
+CONFIG_USB_WHCI_HCD=m
+CONFIG_USB_HWA_HCD=m
+# CONFIG_USB_HCD_BCMA is not set
+# CONFIG_USB_HCD_SSB is not set
+CONFIG_USB_MUSB_HDRC=m
+CONFIG_USB_MUSB_TUSB6010=m
+CONFIG_USB_MUSB_DSPS=m
+CONFIG_USB_MUSB_UX500=m
+# CONFIG_USB_UX500_DMA is not set
+CONFIG_MUSB_PIO_ONLY=y
+CONFIG_USB_RENESAS_USBHS=m
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_WDM=m
+CONFIG_USB_TMC=m
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
+# also be needed; see USB_STORAGE Help for more info
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_REALTEK=m
+CONFIG_REALTEK_AUTOPM=y
+CONFIG_USB_STORAGE_DATAFAB=m
+CONFIG_USB_STORAGE_FREECOM=m
+CONFIG_USB_STORAGE_ISD200=m
+CONFIG_USB_STORAGE_USBAT=m
+CONFIG_USB_STORAGE_SDDR09=m
+CONFIG_USB_STORAGE_SDDR55=m
+CONFIG_USB_STORAGE_JUMPSHOT=m
+CONFIG_USB_STORAGE_ALAUDA=m
+CONFIG_USB_STORAGE_ONETOUCH=m
+CONFIG_USB_STORAGE_KARMA=m
+CONFIG_USB_STORAGE_CYPRESS_ATACB=m
+CONFIG_USB_STORAGE_ENE_UB6250=m
+
+#
+# USB Imaging devices
+#
+CONFIG_USB_MDC800=m
+CONFIG_USB_MICROTEK=m
+# CONFIG_USB_DWC3 is not set
+CONFIG_USB_CHIPIDEA=m
+CONFIG_USB_CHIPIDEA_UDC=y
+# CONFIG_USB_CHIPIDEA_DEBUG is not set
+
+#
+# USB port drivers
+#
+CONFIG_USB_USS720=m
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_AIRCABLE=m
+CONFIG_USB_SERIAL_ARK3116=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_CH341=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_FUNSOFT=m
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+CONFIG_USB_SERIAL_F81232=m
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_IPW=m
+CONFIG_USB_SERIAL_IUU=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KEYSPAN_MPR=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19=y
+CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
+CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
+CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
+CONFIG_USB_SERIAL_KLSI=m
+CONFIG_USB_SERIAL_KOBIL_SCT=m
+CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_METRO=m
+CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7715_PARPORT=y
+CONFIG_USB_SERIAL_MOS7840=m
+CONFIG_USB_SERIAL_MOTOROLA=m
+CONFIG_USB_SERIAL_NAVMAN=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OTI6858=m
+CONFIG_USB_SERIAL_QCAUX=m
+CONFIG_USB_SERIAL_QUALCOMM=m
+CONFIG_USB_SERIAL_SPCP8X5=m
+CONFIG_USB_SERIAL_HP4X=m
+CONFIG_USB_SERIAL_SAFE=m
+# CONFIG_USB_SERIAL_SAFE_PADDED is not set
+CONFIG_USB_SERIAL_SIEMENS_MPI=m
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+CONFIG_USB_SERIAL_SYMBOL=m
+CONFIG_USB_SERIAL_TI=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_XIRCOM=m
+CONFIG_USB_SERIAL_WWAN=m
+CONFIG_USB_SERIAL_OPTION=m
+CONFIG_USB_SERIAL_OMNINET=m
+CONFIG_USB_SERIAL_OPTICON=m
+CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m
+CONFIG_USB_SERIAL_XSENS_MT=m
+CONFIG_USB_SERIAL_ZIO=m
+CONFIG_USB_SERIAL_WISHBONE=m
+CONFIG_USB_SERIAL_ZTE=m
+CONFIG_USB_SERIAL_SSU100=m
+CONFIG_USB_SERIAL_QT2=m
+# CONFIG_USB_SERIAL_DEBUG is not set
+
+#
+# USB Miscellaneous drivers
+#
+CONFIG_USB_EMI62=m
+CONFIG_USB_EMI26=m
+CONFIG_USB_ADUTUX=m
+CONFIG_USB_SEVSEG=m
+CONFIG_USB_RIO500=m
+CONFIG_USB_LEGOTOWER=m
+CONFIG_USB_LCD=m
+CONFIG_USB_LED=m
+CONFIG_USB_CYPRESS_CY7C63=m
+CONFIG_USB_CYTHERM=m
+CONFIG_USB_IDMOUSE=m
+CONFIG_USB_FTDI_ELAN=m
+CONFIG_USB_APPLEDISPLAY=m
+CONFIG_USB_SISUSBVGA=m
+# CONFIG_USB_SISUSBVGA_CON is not set
+CONFIG_USB_LD=m
+CONFIG_USB_TRANCEVIBRATOR=m
+CONFIG_USB_IOWARRIOR=m
+CONFIG_USB_TEST=m
+CONFIG_USB_ISIGHTFW=m
+CONFIG_USB_YUREX=m
+CONFIG_USB_EZUSB_FX2=m
+CONFIG_USB_HSIC_USB3503=m
+CONFIG_USB_ATM=m
+CONFIG_USB_SPEEDTOUCH=m
+CONFIG_USB_CXACRU=m
+CONFIG_USB_UEAGLEATM=m
+CONFIG_USB_XUSBATM=m
+CONFIG_USB_PHY=y
+CONFIG_NOP_USB_XCEIV=m
+# CONFIG_OMAP_CONTROL_USB is not set
+# CONFIG_OMAP_USB3 is not set
+CONFIG_SAMSUNG_USBPHY=m
+CONFIG_SAMSUNG_USB2PHY=m
+CONFIG_SAMSUNG_USB3PHY=m
+# CONFIG_USB_GPIO_VBUS is not set
+CONFIG_USB_ISP1301=m
+CONFIG_USB_RCAR_PHY=m
+CONFIG_USB_GADGET=m
+# CONFIG_USB_GADGET_DEBUG is not set
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_DEBUG_FS is not set
+CONFIG_USB_GADGET_VBUS_DRAW=2
+CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+
+#
+# USB Peripheral Controller
+#
+CONFIG_USB_R8A66597=m
+CONFIG_USB_RENESAS_USBHS_UDC=m
+CONFIG_USB_PXA27X=m
+CONFIG_USB_MV_UDC=m
+CONFIG_USB_MV_U3D=m
+CONFIG_USB_GADGET_MUSB_HDRC=m
+CONFIG_USB_M66592=m
+CONFIG_USB_AMD5536UDC=m
+CONFIG_USB_NET2272=m
+CONFIG_USB_NET2272_DMA=y
+CONFIG_USB_NET2280=m
+CONFIG_USB_GOKU=m
+CONFIG_USB_EG20T=m
+CONFIG_USB_DUMMY_HCD=m
+CONFIG_USB_LIBCOMPOSITE=m
+CONFIG_USB_F_ACM=m
+CONFIG_USB_U_SERIAL=m
+CONFIG_USB_F_SERIAL=m
+CONFIG_USB_F_OBEX=m
+# CONFIG_USB_ZERO is not set
+CONFIG_USB_AUDIO=m
+# CONFIG_GADGET_UAC1 is not set
+CONFIG_USB_ETH=m
+CONFIG_USB_ETH_RNDIS=y
+# CONFIG_USB_ETH_EEM is not set
+CONFIG_USB_G_NCM=m
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_FUNCTIONFS=m
+CONFIG_USB_FUNCTIONFS_ETH=y
+CONFIG_USB_FUNCTIONFS_RNDIS=y
+CONFIG_USB_FUNCTIONFS_GENERIC=y
+CONFIG_USB_MASS_STORAGE=m
+CONFIG_USB_GADGET_TARGET=m
+CONFIG_USB_G_SERIAL=m
+CONFIG_USB_MIDI_GADGET=m
+CONFIG_USB_G_PRINTER=m
+# CONFIG_USB_CDC_COMPOSITE is not set
+# CONFIG_USB_G_NOKIA is not set
+# CONFIG_USB_G_ACM_MS is not set
+# CONFIG_USB_G_MULTI is not set
+CONFIG_USB_G_HID=m
+CONFIG_USB_G_DBGP=m
+# CONFIG_USB_G_DBGP_PRINTK is not set
+CONFIG_USB_G_DBGP_SERIAL=y
+CONFIG_USB_G_WEBCAM=m
+CONFIG_UWB=m
+CONFIG_UWB_HWA=m
+CONFIG_UWB_WHCI=m
+CONFIG_UWB_I1480U=m
+CONFIG_MMC=m
+# CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC_UNSAFE_RESUME is not set
+# CONFIG_MMC_CLKGATE is not set
+
+#
+# MMC/SD/SDIO Card Drivers
+#
+CONFIG_MMC_BLOCK=m
+CONFIG_MMC_BLOCK_MINORS=8
+CONFIG_MMC_BLOCK_BOUNCE=y
+CONFIG_SDIO_UART=m
+# CONFIG_MMC_TEST is not set
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+CONFIG_MMC_SDHCI=m
+CONFIG_MMC_SDHCI_PCI=m
+CONFIG_MMC_RICOH_MMC=y
+CONFIG_MMC_SDHCI_ACPI=m
+CONFIG_MMC_SDHCI_PLTFM=m
+CONFIG_MMC_WBSD=m
+CONFIG_MMC_TIFM_SD=m
+# CONFIG_MMC_SPI is not set
+CONFIG_MMC_SDRICOH_CS=m
+CONFIG_MMC_CB710=m
+CONFIG_MMC_VIA_SDMMC=m
+CONFIG_MMC_VUB300=m
+CONFIG_MMC_USHC=m
+CONFIG_MMC_REALTEK_PCI=m
+CONFIG_MEMSTICK=m
+# CONFIG_MEMSTICK_DEBUG is not set
+
+#
+# MemoryStick drivers
+#
+# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
+CONFIG_MSPRO_BLOCK=m
+
+#
+# MemoryStick Host Controller Drivers
+#
+CONFIG_MEMSTICK_TIFM_MS=m
+CONFIG_MEMSTICK_JMICRON_38X=m
+CONFIG_MEMSTICK_R592=m
+CONFIG_MEMSTICK_REALTEK_PCI=m
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+
+#
+# LED drivers
+#
+CONFIG_LEDS_LM3530=m
+CONFIG_LEDS_LM3533=m
+CONFIG_LEDS_LM3642=m
+CONFIG_LEDS_PCA9532=m
+# CONFIG_LEDS_PCA9532_GPIO is not set
+# CONFIG_LEDS_GPIO is not set
+CONFIG_LEDS_LP3944=m
+CONFIG_LEDS_LP55XX_COMMON=m
+CONFIG_LEDS_LP5521=m
+CONFIG_LEDS_LP5523=m
+CONFIG_LEDS_LP5562=m
+CONFIG_LEDS_CLEVO_MAIL=m
+CONFIG_LEDS_PCA955X=m
+CONFIG_LEDS_PCA9633=m
+# CONFIG_LEDS_DAC124S085 is not set
+CONFIG_LEDS_BD2802=m
+CONFIG_LEDS_INTEL_SS4200=m
+CONFIG_LEDS_LT3593=m
+CONFIG_LEDS_DELL_NETBOOKS=m
+CONFIG_LEDS_MC13783=m
+CONFIG_LEDS_TCA6507=m
+CONFIG_LEDS_LM355x=m
+CONFIG_LEDS_OT200=m
+CONFIG_LEDS_BLINKM=m
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_ONESHOT=m
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+# CONFIG_LEDS_TRIGGER_CPU is not set
+CONFIG_LEDS_TRIGGER_GPIO=m
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+CONFIG_LEDS_TRIGGER_TRANSIENT=m
+CONFIG_LEDS_TRIGGER_CAMERA=m
+CONFIG_ACCESSIBILITY=y
+CONFIG_A11Y_BRAILLE_CONSOLE=y
+# CONFIG_INFINIBAND is not set
+CONFIG_EDAC=y
+CONFIG_EDAC_LEGACY_SYSFS=y
+# CONFIG_EDAC_DEBUG is not set
+CONFIG_EDAC_DECODE_MCE=m
+CONFIG_EDAC_MCE_INJ=m
+CONFIG_EDAC_MM_EDAC=m
+CONFIG_EDAC_AMD64=m
+# CONFIG_EDAC_AMD64_ERROR_INJECTION is not set
+CONFIG_EDAC_E752X=m
+CONFIG_EDAC_I82975X=m
+CONFIG_EDAC_I3000=m
+CONFIG_EDAC_I3200=m
+CONFIG_EDAC_X38=m
+CONFIG_EDAC_I5400=m
+CONFIG_EDAC_I7CORE=m
+CONFIG_EDAC_I5000=m
+CONFIG_EDAC_I5100=m
+CONFIG_EDAC_I7300=m
+CONFIG_EDAC_SBRIDGE=m
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_SYSTOHC=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+CONFIG_RTC_INTF_DEV_UIE_EMUL=y
+CONFIG_RTC_DRV_TEST=m
+
+#
+# I2C RTC drivers
+#
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1374=m
+CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_DS3232=m
+CONFIG_RTC_DRV_MAX6900=m
+CONFIG_RTC_DRV_RS5C372=m
+CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_ISL12022=m
+CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF8523=m
+CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_M41T80=m
+CONFIG_RTC_DRV_M41T80_WDT=y
+CONFIG_RTC_DRV_BQ32K=m
+CONFIG_RTC_DRV_S35390A=m
+CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_RX8581=m
+CONFIG_RTC_DRV_RX8025=m
+CONFIG_RTC_DRV_EM3027=m
+CONFIG_RTC_DRV_RV3029C2=m
+
+#
+# SPI RTC drivers
+#
+# CONFIG_RTC_DRV_M41T93 is not set
+# CONFIG_RTC_DRV_M41T94 is not set
+# CONFIG_RTC_DRV_DS1305 is not set
+# CONFIG_RTC_DRV_DS1390 is not set
+# CONFIG_RTC_DRV_MAX6902 is not set
+# CONFIG_RTC_DRV_R9701 is not set
+# CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_DS3234 is not set
+# CONFIG_RTC_DRV_PCF2123 is not set
+# CONFIG_RTC_DRV_RX4581 is not set
+
+#
+# Platform RTC drivers
+#
+CONFIG_RTC_DRV_CMOS=y
+CONFIG_RTC_DRV_DS1286=m
+CONFIG_RTC_DRV_DS1511=m
+CONFIG_RTC_DRV_DS1553=m
+CONFIG_RTC_DRV_DS1742=m
+CONFIG_RTC_DRV_STK17TA8=m
+CONFIG_RTC_DRV_M48T86=m
+CONFIG_RTC_DRV_M48T35=m
+CONFIG_RTC_DRV_M48T59=m
+CONFIG_RTC_DRV_MSM6242=m
+CONFIG_RTC_DRV_BQ4802=m
+CONFIG_RTC_DRV_RP5C01=m
+CONFIG_RTC_DRV_V3020=m
+CONFIG_RTC_DRV_DS2404=m
+CONFIG_RTC_DRV_PCF50633=m
+
+#
+# on-CPU RTC drivers
+#
+CONFIG_RTC_DRV_MC13XXX=m
+
+#
+# HID Sensor RTC drivers
+#
+# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
+CONFIG_DMADEVICES=y
+# CONFIG_DMADEVICES_DEBUG is not set
+
+#
+# DMA Devices
+#
+CONFIG_INTEL_MID_DMAC=m
+CONFIG_INTEL_IOATDMA=m
+CONFIG_DW_DMAC=m
+# CONFIG_DW_DMAC_BIG_ENDIAN_IO is not set
+CONFIG_TIMB_DMA=m
+CONFIG_PCH_DMA=m
+CONFIG_DMA_ENGINE=y
+CONFIG_DMA_ACPI=y
+
+#
+# DMA Clients
+#
+CONFIG_NET_DMA=y
+CONFIG_ASYNC_TX_DMA=y
+# CONFIG_DMATEST is not set
+CONFIG_DCA=m
+CONFIG_AUXDISPLAY=y
+CONFIG_KS0108=m
+CONFIG_KS0108_PORT=0x378
+CONFIG_KS0108_DELAY=2
+CONFIG_CFAG12864B=m
+CONFIG_CFAG12864B_RATE=20
+CONFIG_UIO=m
+CONFIG_UIO_CIF=m
+CONFIG_UIO_PDRV=m
+CONFIG_UIO_PDRV_GENIRQ=m
+# CONFIG_UIO_DMEM_GENIRQ is not set
+CONFIG_UIO_AEC=m
+CONFIG_UIO_SERCOS3=m
+CONFIG_UIO_PCI_GENERIC=m
+CONFIG_UIO_NETX=m
+CONFIG_VFIO_IOMMU_TYPE1=m
+CONFIG_VFIO=m
+CONFIG_VFIO_PCI=m
+CONFIG_VFIO_PCI_VGA=y
+CONFIG_VIRT_DRIVERS=y
+CONFIG_VIRTIO=m
+
+#
+# Virtio drivers
+#
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_MMIO=m
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
+
+#
+# Microsoft Hyper-V guest support
+#
+CONFIG_HYPERV=m
+CONFIG_HYPERV_UTILS=m
+CONFIG_HYPERV_BALLOON=m
+
+#
+# Xen driver support
+#
+CONFIG_XEN_BALLOON=y
+# CONFIG_XEN_SELFBALLOONING is not set
+CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y
+CONFIG_XEN_SCRUB_PAGES=y
+CONFIG_XEN_DEV_EVTCHN=m
+CONFIG_XEN_BACKEND=y
+CONFIG_XENFS=m
+CONFIG_XEN_COMPAT_XENFS=y
+CONFIG_XEN_SYS_HYPERVISOR=y
+CONFIG_XEN_XENBUS_FRONTEND=y
+CONFIG_XEN_GNTDEV=m
+CONFIG_XEN_GRANT_DEV_ALLOC=m
+CONFIG_SWIOTLB_XEN=y
+CONFIG_XEN_TMEM=m
+CONFIG_XEN_PCIDEV_BACKEND=m
+CONFIG_XEN_PRIVCMD=m
+CONFIG_XEN_ACPI_PROCESSOR=m
+# CONFIG_XEN_MCE_LOG is not set
+CONFIG_XEN_HAVE_PVMMU=y
+CONFIG_STAGING=y
+CONFIG_ET131X=m
+CONFIG_SLICOSS=m
+CONFIG_USBIP_CORE=m
+CONFIG_USBIP_VHCI_HCD=m
+CONFIG_USBIP_HOST=m
+# CONFIG_USBIP_DEBUG is not set
+CONFIG_W35UND=m
+CONFIG_PRISM2_USB=m
+CONFIG_ECHO=m
+CONFIG_COMEDI=m
+# CONFIG_COMEDI_DEBUG is not set
+CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048
+CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480
+CONFIG_COMEDI_MISC_DRIVERS=y
+CONFIG_COMEDI_KCOMEDILIB=m
+CONFIG_COMEDI_BOND=m
+CONFIG_COMEDI_TEST=m
+CONFIG_COMEDI_PARPORT=m
+CONFIG_COMEDI_SERIAL2002=m
+CONFIG_COMEDI_SKEL=m
+CONFIG_COMEDI_PCI_DRIVERS=y
+CONFIG_COMEDI_8255_PCI=m
+CONFIG_COMEDI_ADDI_WATCHDOG=m
+CONFIG_COMEDI_ADDI_APCI_035=m
+CONFIG_COMEDI_ADDI_APCI_1032=m
+CONFIG_COMEDI_ADDI_APCI_1500=m
+CONFIG_COMEDI_ADDI_APCI_1516=m
+CONFIG_COMEDI_ADDI_APCI_1564=m
+CONFIG_COMEDI_ADDI_APCI_16XX=m
+CONFIG_COMEDI_ADDI_APCI_2032=m
+CONFIG_COMEDI_ADDI_APCI_2200=m
+CONFIG_COMEDI_ADDI_APCI_3120=m
+CONFIG_COMEDI_ADDI_APCI_3501=m
+CONFIG_COMEDI_ADDI_APCI_3XXX=m
+CONFIG_COMEDI_ADL_PCI6208=m
+CONFIG_COMEDI_ADL_PCI7X3X=m
+CONFIG_COMEDI_ADL_PCI8164=m
+CONFIG_COMEDI_ADL_PCI9111=m
+CONFIG_COMEDI_ADL_PCI9118=m
+CONFIG_COMEDI_ADV_PCI1710=m
+CONFIG_COMEDI_ADV_PCI1723=m
+CONFIG_COMEDI_ADV_PCI1724=m
+CONFIG_COMEDI_ADV_PCI_DIO=m
+CONFIG_COMEDI_AMPLC_DIO200_PCI=m
+CONFIG_COMEDI_AMPLC_PC236_PCI=m
+CONFIG_COMEDI_AMPLC_PC263_PCI=m
+CONFIG_COMEDI_AMPLC_PCI224=m
+CONFIG_COMEDI_AMPLC_PCI230=m
+CONFIG_COMEDI_CONTEC_PCI_DIO=m
+CONFIG_COMEDI_DAS08_PCI=m
+CONFIG_COMEDI_DT3000=m
+CONFIG_COMEDI_DYNA_PCI10XX=m
+CONFIG_COMEDI_UNIOXX5=m
+CONFIG_COMEDI_GSC_HPDI=m
+CONFIG_COMEDI_ICP_MULTI=m
+CONFIG_COMEDI_II_PCI20KC=m
+CONFIG_COMEDI_DAQBOARD2000=m
+CONFIG_COMEDI_JR3_PCI=m
+CONFIG_COMEDI_KE_COUNTER=m
+CONFIG_COMEDI_CB_PCIDAS64=m
+CONFIG_COMEDI_CB_PCIDAS=m
+CONFIG_COMEDI_CB_PCIDDA=m
+CONFIG_COMEDI_CB_PCIMDAS=m
+CONFIG_COMEDI_CB_PCIMDDA=m
+CONFIG_COMEDI_ME4000=m
+CONFIG_COMEDI_ME_DAQ=m
+CONFIG_COMEDI_NI_6527=m
+CONFIG_COMEDI_NI_65XX=m
+CONFIG_COMEDI_NI_660X=m
+CONFIG_COMEDI_NI_670X=m
+CONFIG_COMEDI_NI_LABPC_PCI=m
+CONFIG_COMEDI_NI_PCIDIO=m
+CONFIG_COMEDI_NI_PCIMIO=m
+CONFIG_COMEDI_RTD520=m
+CONFIG_COMEDI_S526=m
+CONFIG_COMEDI_S626=m
+CONFIG_COMEDI_SSV_DNP=m
+CONFIG_COMEDI_MITE=m
+CONFIG_COMEDI_NI_TIOCMD=m
+CONFIG_COMEDI_PCMCIA_DRIVERS=y
+CONFIG_COMEDI_CB_DAS16_CS=m
+CONFIG_COMEDI_DAS08_CS=m
+CONFIG_COMEDI_NI_DAQ_700_CS=m
+CONFIG_COMEDI_NI_DAQ_DIO24_CS=m
+CONFIG_COMEDI_NI_LABPC_CS=m
+CONFIG_COMEDI_NI_MIO_CS=m
+CONFIG_COMEDI_QUATECH_DAQP_CS=m
+CONFIG_COMEDI_USB_DRIVERS=y
+CONFIG_COMEDI_DT9812=m
+CONFIG_COMEDI_USBDUX=m
+CONFIG_COMEDI_USBDUXFAST=m
+CONFIG_COMEDI_USBDUXSIGMA=m
+CONFIG_COMEDI_VMK80XX=m
+CONFIG_COMEDI_8255=m
+CONFIG_COMEDI_FC=m
+CONFIG_COMEDI_AMPLC_DIO200=m
+CONFIG_COMEDI_AMPLC_PC236=m
+CONFIG_COMEDI_DAS08=m
+CONFIG_COMEDI_NI_LABPC=m
+CONFIG_COMEDI_NI_TIO=m
+CONFIG_ASUS_OLED=m
+# CONFIG_PANEL is not set
+CONFIG_R8187SE=m
+CONFIG_RTL8192U=m
+CONFIG_RTLLIB=m
+CONFIG_RTLLIB_CRYPTO_CCMP=m
+CONFIG_RTLLIB_CRYPTO_TKIP=m
+CONFIG_RTLLIB_CRYPTO_WEP=m
+CONFIG_RTL8192E=m
+CONFIG_R8712U=m
+CONFIG_RTS5139=m
+# CONFIG_RTS5139_DEBUG is not set
+# CONFIG_TRANZPORT is not set
+CONFIG_IDE_PHISON=m
+CONFIG_LINE6_USB=m
+# CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set
+CONFIG_USB_SERIAL_QUATECH2=m
+CONFIG_VT6655=m
+CONFIG_VT6656=m
+CONFIG_DX_SEP=m
+CONFIG_ZSMALLOC=y
+CONFIG_ZRAM=m
+# CONFIG_ZRAM_DEBUG is not set
+CONFIG_WLAGS49_H2=m
+CONFIG_WLAGS49_H25=m
+CONFIG_FB_SM7XX=m
+CONFIG_CRYSTALHD=m
+CONFIG_FB_XGI=m
+CONFIG_ACPI_QUICKSTART=m
+CONFIG_USB_ENESTORAGE=m
+CONFIG_BCM_WIMAX=m
+CONFIG_FT1000=m
+CONFIG_FT1000_USB=m
+CONFIG_FT1000_PCMCIA=m
+
+#
+# Speakup console speech
+#
+CONFIG_SPEAKUP=m
+CONFIG_SPEAKUP_SYNTH_ACNTSA=m
+CONFIG_SPEAKUP_SYNTH_ACNTPC=m
+CONFIG_SPEAKUP_SYNTH_APOLLO=m
+CONFIG_SPEAKUP_SYNTH_AUDPTR=m
+CONFIG_SPEAKUP_SYNTH_BNS=m
+CONFIG_SPEAKUP_SYNTH_DECTLK=m
+CONFIG_SPEAKUP_SYNTH_DECEXT=m
+CONFIG_SPEAKUP_SYNTH_DECPC=m
+CONFIG_SPEAKUP_SYNTH_DTLK=m
+CONFIG_SPEAKUP_SYNTH_KEYPC=m
+CONFIG_SPEAKUP_SYNTH_LTLK=m
+CONFIG_SPEAKUP_SYNTH_SOFT=m
+CONFIG_SPEAKUP_SYNTH_SPKOUT=m
+CONFIG_SPEAKUP_SYNTH_TXPRT=m
+CONFIG_SPEAKUP_SYNTH_DUMMY=m
+CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
+CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
+CONFIG_STAGING_MEDIA=y
+CONFIG_DVB_AS102=m
+CONFIG_DVB_CXD2099=m
+CONFIG_VIDEO_DT3155=m
+CONFIG_DT3155_CCIR=y
+CONFIG_DT3155_STREAMING=y
+CONFIG_VIDEO_GO7007=m
+CONFIG_VIDEO_GO7007_USB=m
+CONFIG_VIDEO_GO7007_LOADER=m
+# CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set
+CONFIG_SOLO6X10=m
+CONFIG_LIRC_STAGING=y
+CONFIG_LIRC_BT829=m
+CONFIG_LIRC_IGORPLUGUSB=m
+CONFIG_LIRC_IMON=m
+CONFIG_LIRC_PARALLEL=m
+CONFIG_LIRC_SASEM=m
+CONFIG_LIRC_SERIAL=m
+CONFIG_LIRC_SERIAL_TRANSMITTER=y
+CONFIG_LIRC_SIR=m
+CONFIG_LIRC_ZILOG=m
+
+#
+# Android
+#
+# CONFIG_ANDROID is not set
+CONFIG_USB_WPAN_HCD=m
+CONFIG_WIMAX_GDM72XX=m
+CONFIG_WIMAX_GDM72XX_QOS=y
+CONFIG_WIMAX_GDM72XX_K_MODE=y
+CONFIG_WIMAX_GDM72XX_WIMAX2=y
+CONFIG_WIMAX_GDM72XX_USB=y
+# CONFIG_WIMAX_GDM72XX_SDIO is not set
+CONFIG_WIMAX_GDM72XX_USB_PM=y
+CONFIG_CSR_WIFI=m
+CONFIG_NET_VENDOR_SILICOM=y
+CONFIG_SBYPASS=m
+CONFIG_BPCTL=m
+CONFIG_CED1401=m
+CONFIG_DGRP=m
+CONFIG_FIREWIRE_SERIAL=m
+CONFIG_ZCACHE=y
+# CONFIG_ZCACHE_DEBUG is not set
+CONFIG_RAMSTER=y
+# CONFIG_RAMSTER_DEBUG is not set
+# CONFIG_USB_DWC2 is not set
+CONFIG_X86_PLATFORM_DEVICES=y
+CONFIG_ACER_WMI=m
+CONFIG_ACERHDF=m
+CONFIG_ASUS_LAPTOP=m
+CONFIG_CHROMEOS_LAPTOP=m
+CONFIG_DELL_LAPTOP=m
+CONFIG_DELL_WMI=m
+CONFIG_DELL_WMI_AIO=m
+CONFIG_FUJITSU_LAPTOP=m
+# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
+CONFIG_FUJITSU_TABLET=m
+CONFIG_AMILO_RFKILL=m
+CONFIG_HP_ACCEL=m
+CONFIG_HP_WMI=m
+CONFIG_MSI_LAPTOP=m
+CONFIG_PANASONIC_LAPTOP=m
+CONFIG_COMPAL_LAPTOP=m
+CONFIG_SONY_LAPTOP=m
+# CONFIG_SONYPI_COMPAT is not set
+CONFIG_IDEAPAD_LAPTOP=m
+CONFIG_THINKPAD_ACPI=m
+CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
+# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
+# CONFIG_THINKPAD_ACPI_DEBUG is not set
+# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
+CONFIG_THINKPAD_ACPI_VIDEO=y
+CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
+CONFIG_SENSORS_HDAPS=m
+CONFIG_INTEL_MENLOW=m
+CONFIG_EEEPC_LAPTOP=m
+CONFIG_ASUS_WMI=m
+CONFIG_ASUS_NB_WMI=m
+CONFIG_EEEPC_WMI=m
+CONFIG_ACPI_WMI=m
+CONFIG_MSI_WMI=m
+CONFIG_TOPSTAR_LAPTOP=m
+CONFIG_ACPI_TOSHIBA=m
+CONFIG_TOSHIBA_BT_RFKILL=m
+CONFIG_ACPI_CMPC=m
+CONFIG_INTEL_IPS=m
+CONFIG_IBM_RTL=m
+CONFIG_XO15_EBOOK=m
+CONFIG_SAMSUNG_LAPTOP=m
+CONFIG_MXM_WMI=m
+CONFIG_INTEL_OAKTRAIL=m
+CONFIG_SAMSUNG_Q10=m
+CONFIG_APPLE_GMUX=m
+CONFIG_PVPANIC=m
+
+#
+# Hardware Spinlock drivers
+#
+CONFIG_CLKEVT_I8253=y
+CONFIG_I8253_LOCK=y
+CONFIG_CLKBLD_I8253=y
+# CONFIG_MAILBOX is not set
+CONFIG_IOMMU_API=y
+CONFIG_IOMMU_SUPPORT=y
+CONFIG_AMD_IOMMU=y
+# CONFIG_AMD_IOMMU_STATS is not set
+CONFIG_AMD_IOMMU_V2=m
+CONFIG_DMAR_TABLE=y
+CONFIG_INTEL_IOMMU=y
+# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
+CONFIG_INTEL_IOMMU_FLOPPY_WA=y
+CONFIG_IRQ_REMAP=y
+
+#
+# Remoteproc drivers
+#
+CONFIG_REMOTEPROC=m
+CONFIG_STE_MODEM_RPROC=m
+
+#
+# Rpmsg drivers
+#
+# CONFIG_PM_DEVFREQ is not set
+CONFIG_EXTCON=m
+
+#
+# Extcon Device Drivers
+#
+CONFIG_EXTCON_GPIO=m
+CONFIG_MEMORY=y
+# CONFIG_IIO is not set
+# CONFIG_NTB is not set
+# CONFIG_VME_BUS is not set
+# CONFIG_PWM is not set
+CONFIG_IPACK_BUS=m
+CONFIG_BOARD_TPCI200=m
+CONFIG_SERIAL_IPOCTAL=m
+# CONFIG_RESET_CONTROLLER is not set
+
+#
+# Firmware Drivers
+#
+CONFIG_EDD=m
+# CONFIG_EDD_OFF is not set
+CONFIG_FIRMWARE_MEMMAP=y
+CONFIG_DELL_RBU=m
+CONFIG_DCDBAS=m
+CONFIG_DMIID=y
+CONFIG_DMI_SYSFS=m
+CONFIG_ISCSI_IBFT_FIND=y
+CONFIG_ISCSI_IBFT=m
+# CONFIG_GOOGLE_FIRMWARE is not set
+
+#
+# EFI (Extensible Firmware Interface) Support
+#
+CONFIG_EFI_VARS=m
+CONFIG_EFI_VARS_PSTORE=m
+CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
+
+#
+# File systems
+#
+CONFIG_DCACHE_WORD_ACCESS=y
+# CONFIG_EXT2_FS is not set
+# CONFIG_EXT3_FS is not set
+CONFIG_EXT4_FS=m
+CONFIG_EXT4_USE_FOR_EXT23=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+# CONFIG_EXT4_DEBUG is not set
+CONFIG_JBD2=m
+# CONFIG_JBD2_DEBUG is not set
+CONFIG_FS_MBCACHE=m
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+CONFIG_REISERFS_PROC_INFO=y
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_REISERFS_FS_SECURITY=y
+CONFIG_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+# CONFIG_JFS_DEBUG is not set
+CONFIG_JFS_STATISTICS=y
+CONFIG_XFS_FS=m
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
+# CONFIG_XFS_WARN is not set
+# CONFIG_XFS_DEBUG is not set
+CONFIG_GFS2_FS=m
+CONFIG_GFS2_FS_LOCKING_DLM=y
+CONFIG_OCFS2_FS=m
+CONFIG_OCFS2_FS_O2CB=m
+CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
+CONFIG_OCFS2_FS_STATS=y
+# CONFIG_OCFS2_DEBUG_MASKLOG is not set
+# CONFIG_OCFS2_DEBUG_FS is not set
+CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS_POSIX_ACL=y
+# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
+# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+# CONFIG_BTRFS_DEBUG is not set
+CONFIG_NILFS2_FS=m
+CONFIG_FS_POSIX_ACL=y
+CONFIG_EXPORTFS=y
+CONFIG_FILE_LOCKING=y
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY_USER=y
+CONFIG_FANOTIFY=y
+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
+CONFIG_QUOTA=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+# CONFIG_PRINT_QUOTA_WARNING is not set
+# CONFIG_QUOTA_DEBUG is not set
+CONFIG_QUOTA_TREE=m
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
+CONFIG_QUOTACTL=y
+CONFIG_QUOTACTL_COMPAT=y
+CONFIG_AUTOFS4_FS=y
+CONFIG_FUSE_FS=m
+CONFIG_CUSE=m
+CONFIG_GENERIC_ACL=y
+
+#
+# Caches
+#
+CONFIG_FSCACHE=m
+CONFIG_FSCACHE_STATS=y
+CONFIG_FSCACHE_HISTOGRAM=y
+# CONFIG_FSCACHE_DEBUG is not set
+# CONFIG_FSCACHE_OBJECT_LIST is not set
+CONFIG_CACHEFILES=m
+# CONFIG_CACHEFILES_DEBUG is not set
+# CONFIG_CACHEFILES_HISTOGRAM is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_UDF_NLS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_DEBUG is not set
+CONFIG_NTFS_RW=y
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_XATTR=y
+CONFIG_HUGETLBFS=y
+CONFIG_HUGETLB_PAGE=y
+CONFIG_CONFIGFS_FS=y
+CONFIG_MISC_FILESYSTEMS=y
+# CONFIG_ADFS_FS is not set
+CONFIG_AFFS_FS=m
+CONFIG_ECRYPT_FS=m
+# CONFIG_ECRYPT_FS_MESSAGING is not set
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+CONFIG_UBIFS_FS=m
+# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
+CONFIG_UBIFS_FS_LZO=y
+CONFIG_UBIFS_FS_ZLIB=y
+CONFIG_LOGFS=m
+CONFIG_CRAMFS=m
+CONFIG_SQUASHFS=m
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_ZLIB=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
+# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+# CONFIG_VXFS_FS is not set
+CONFIG_MINIX_FS=m
+CONFIG_OMFS_FS=m
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_QNX6FS_FS is not set
+# CONFIG_ROMFS_FS is not set
+CONFIG_PSTORE=y
+# CONFIG_PSTORE_CONSOLE is not set
+# CONFIG_PSTORE_FTRACE is not set
+CONFIG_PSTORE_RAM=m
+# CONFIG_SYSV_FS is not set
+CONFIG_UFS_FS=m
+# CONFIG_UFS_FS_WRITE is not set
+# CONFIG_UFS_DEBUG is not set
+CONFIG_EXOFS_FS=m
+# CONFIG_EXOFS_DEBUG is not set
+CONFIG_F2FS_FS=m
+CONFIG_F2FS_STAT_FS=y
+CONFIG_F2FS_FS_XATTR=y
+CONFIG_F2FS_FS_POSIX_ACL=y
+CONFIG_EFIVAR_FS=y
+CONFIG_ORE=m
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=m
+CONFIG_NFS_V2=m
+CONFIG_NFS_V3=m
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=m
+CONFIG_NFS_SWAP=y
+CONFIG_NFS_V4_1=y
+CONFIG_PNFS_FILE_LAYOUT=m
+CONFIG_PNFS_BLOCK=m
+CONFIG_PNFS_OBJLAYOUT=m
+CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org"
+CONFIG_NFS_FSCACHE=y
+# CONFIG_NFS_USE_LEGACY_DNS is not set
+CONFIG_NFS_USE_KERNEL_DNS=y
+CONFIG_NFS_DEBUG=y
+CONFIG_NFSD=m
+CONFIG_NFSD_V2_ACL=y
+CONFIG_NFSD_V3=y
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
+# CONFIG_NFSD_FAULT_INJECTION is not set
+CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_ACL_SUPPORT=m
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
+CONFIG_SUNRPC_BACKCHANNEL=y
+CONFIG_SUNRPC_SWAP=y
+CONFIG_RPCSEC_GSS_KRB5=m
+CONFIG_SUNRPC_DEBUG=y
+CONFIG_CEPH_FS=m
+CONFIG_CIFS=m
+CONFIG_CIFS_STATS=y
+# CONFIG_CIFS_STATS2 is not set
+CONFIG_CIFS_WEAK_PW_HASH=y
+CONFIG_CIFS_UPCALL=y
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+CONFIG_CIFS_ACL=y
+# CONFIG_CIFS_DEBUG is not set
+CONFIG_CIFS_DFS_UPCALL=y
+CONFIG_CIFS_SMB2=y
+CONFIG_CIFS_FSCACHE=y
+CONFIG_NCP_FS=m
+# CONFIG_NCPFS_PACKET_SIGNING is not set
+# CONFIG_NCPFS_IOCTL_LOCKING is not set
+# CONFIG_NCPFS_STRONG is not set
+CONFIG_NCPFS_NFS_NS=y
+CONFIG_NCPFS_OS2_NS=y
+CONFIG_NCPFS_SMALLDOS=y
+CONFIG_NCPFS_NLS=y
+# CONFIG_NCPFS_EXTRAS is not set
+CONFIG_CODA_FS=m
+CONFIG_AFS_FS=m
+# CONFIG_AFS_DEBUG is not set
+CONFIG_AFS_FSCACHE=y
+CONFIG_9P_FS=m
+CONFIG_9P_FSCACHE=y
+CONFIG_9P_FS_POSIX_ACL=y
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_MAC_ROMAN=m
+CONFIG_NLS_MAC_CELTIC=m
+CONFIG_NLS_MAC_CENTEURO=m
+CONFIG_NLS_MAC_CROATIAN=m
+CONFIG_NLS_MAC_CYRILLIC=m
+CONFIG_NLS_MAC_GAELIC=m
+CONFIG_NLS_MAC_GREEK=m
+CONFIG_NLS_MAC_ICELAND=m
+CONFIG_NLS_MAC_INUIT=m
+CONFIG_NLS_MAC_ROMANIAN=m
+CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UTF8=m
+CONFIG_DLM=m
+# CONFIG_DLM_DEBUG is not set
+
+#
+# Kernel hacking
+#
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_PRINTK_TIME=y
+CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
+CONFIG_ENABLE_WARN_DEPRECATED=y
+# CONFIG_ENABLE_MUST_CHECK is not set
+CONFIG_FRAME_WARN=2048
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_STRIP_ASM_SYMS=y
+# CONFIG_READABLE_ASM is not set
+CONFIG_UNUSED_SYMBOLS=y
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
+CONFIG_LOCKUP_DETECTOR=y
+CONFIG_HARDLOCKUP_DETECTOR=y
+# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
+CONFIG_DETECT_HUNG_TASK=y
+CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
+CONFIG_SCHED_DEBUG=y
+CONFIG_SCHEDSTATS=y
+CONFIG_TIMER_STATS=y
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_PREEMPT is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+CONFIG_DEBUG_MUTEXES=y
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+CONFIG_STACKTRACE=y
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_VIRTUAL is not set
+# CONFIG_DEBUG_WRITECOUNT is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_TEST_LIST_SORT is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
+CONFIG_FRAME_POINTER=y
+# CONFIG_BOOT_PRINTK_DELAY is not set
+
+#
+# RCU Debugging
+#
+# CONFIG_PROVE_RCU_DELAY is not set
+# CONFIG_SPARSE_RCU_POINTER is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
+# CONFIG_RCU_CPU_STALL_VERBOSE is not set
+# CONFIG_RCU_CPU_STALL_INFO is not set
+# CONFIG_RCU_TRACE is not set
+# CONFIG_KPROBES_SANITY_TEST is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+CONFIG_LKDTM=m
+# CONFIG_NOTIFIER_ERROR_INJECTION is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_LATENCYTOP is not set
+CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y
+# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
+CONFIG_USER_STACKTRACE_SUPPORT=y
+CONFIG_NOP_TRACER=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
+CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_FENTRY=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_TRACER_MAX_TRACE=y
+CONFIG_TRACE_CLOCK=y
+CONFIG_RING_BUFFER=y
+CONFIG_EVENT_TRACING=y
+CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_RING_BUFFER_ALLOW_SWAP=y
+CONFIG_TRACING=y
+CONFIG_GENERIC_TRACER=y
+CONFIG_TRACING_SUPPORT=y
+CONFIG_FTRACE=y
+CONFIG_FUNCTION_TRACER=y
+CONFIG_FUNCTION_GRAPH_TRACER=y
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_PREEMPT_TRACER is not set
+CONFIG_SCHED_TRACER=y
+CONFIG_FTRACE_SYSCALLS=y
+CONFIG_TRACER_SNAPSHOT=y
+# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+# CONFIG_PROFILE_ALL_BRANCHES is not set
+CONFIG_STACK_TRACER=y
+CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_KPROBE_EVENT=y
+CONFIG_UPROBE_EVENT=y
+CONFIG_PROBE_EVENTS=y
+CONFIG_DYNAMIC_FTRACE=y
+CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
+CONFIG_FUNCTION_PROFILER=y
+CONFIG_FTRACE_MCOUNT_RECORD=y
+# CONFIG_FTRACE_STARTUP_TEST is not set
+CONFIG_MMIOTRACE=y
+# CONFIG_MMIOTRACE_TEST is not set
+CONFIG_RING_BUFFER_BENCHMARK=m
+# CONFIG_RING_BUFFER_STARTUP_TEST is not set
+# CONFIG_RBTREE_TEST is not set
+# CONFIG_INTERVAL_TREE_TEST is not set
+# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
+# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
+CONFIG_DYNAMIC_DEBUG=y
+# CONFIG_DMA_API_DEBUG is not set
+# CONFIG_ATOMIC64_SELFTEST is not set
+CONFIG_ASYNC_RAID6_TEST=m
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_KGDB is not set
+CONFIG_HAVE_ARCH_KMEMCHECK=y
+# CONFIG_TEST_STRING_HELPERS is not set
+CONFIG_TEST_KSTRTOX=m
+CONFIG_STRICT_DEVMEM=y
+CONFIG_X86_VERBOSE_BOOTUP=y
+CONFIG_EARLY_PRINTK=y
+# CONFIG_EARLY_PRINTK_DBGP is not set
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+# CONFIG_X86_PTDUMP is not set
+CONFIG_DEBUG_RODATA=y
+# CONFIG_DEBUG_RODATA_TEST is not set
+# CONFIG_DEBUG_SET_MODULE_RONX is not set
+# CONFIG_DEBUG_NX_TEST is not set
+# CONFIG_DEBUG_TLBFLUSH is not set
+# CONFIG_IOMMU_DEBUG is not set
+# CONFIG_IOMMU_STRESS is not set
+CONFIG_HAVE_MMIOTRACE_SUPPORT=y
+# CONFIG_X86_DECODER_SELFTEST is not set
+CONFIG_IO_DELAY_TYPE_0X80=0
+CONFIG_IO_DELAY_TYPE_0XED=1
+CONFIG_IO_DELAY_TYPE_UDELAY=2
+CONFIG_IO_DELAY_TYPE_NONE=3
+CONFIG_IO_DELAY_0X80=y
+# CONFIG_IO_DELAY_0XED is not set
+# CONFIG_IO_DELAY_UDELAY is not set
+# CONFIG_IO_DELAY_NONE is not set
+CONFIG_DEFAULT_IO_DELAY_TYPE=0
+# CONFIG_DEBUG_BOOT_PARAMS is not set
+# CONFIG_CPA_DEBUG is not set
+# CONFIG_OPTIMIZE_INLINING is not set
+# CONFIG_DEBUG_NMI_SELFTEST is not set
+
+#
+# Security options
+#
+CONFIG_KEYS=y
+CONFIG_TRUSTED_KEYS=m
+CONFIG_ENCRYPTED_KEYS=m
+# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
+# CONFIG_SECURITY_DMESG_RESTRICT is not set
+CONFIG_SECURITY=y
+CONFIG_SECURITYFS=y
+CONFIG_SECURITY_NETWORK=y
+# CONFIG_SECURITY_NETWORK_XFRM is not set
+CONFIG_SECURITY_PATH=y
+# CONFIG_INTEL_TXT is not set
+# CONFIG_SECURITY_SELINUX is not set
+# CONFIG_SECURITY_SMACK is not set
+CONFIG_SECURITY_TOMOYO=y
+CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
+CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
+# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
+CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/usr/bin/tomoyo-init"
+CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd"
+CONFIG_SECURITY_APPARMOR=y
+CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0
+# CONFIG_SECURITY_YAMA is not set
+# CONFIG_IMA is not set
+# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
+# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_SECURITY=""
+CONFIG_XOR_BLOCKS=m
+CONFIG_ASYNC_CORE=m
+CONFIG_ASYNC_MEMCPY=m
+CONFIG_ASYNC_XOR=m
+CONFIG_ASYNC_PQ=m
+CONFIG_ASYNC_RAID6_RECOV=m
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=m
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_HASH=m
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=m
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_PCOMP=m
+CONFIG_CRYPTO_PCOMP2=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_USER=m
+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
+CONFIG_CRYPTO_GF128MUL=m
+CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_PCRYPT=m
+CONFIG_CRYPTO_WORKQUEUE=y
+CONFIG_CRYPTO_CRYPTD=m
+CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_ABLK_HELPER_X86=m
+CONFIG_CRYPTO_GLUE_HELPER_X86=m
+
+#
+# Authenticated Encryption with Associated Data
+#
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_SEQIV=m
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_CTR=m
+CONFIG_CRYPTO_CTS=m
+CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_XTS=m
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_CMAC=m
+CONFIG_CRYPTO_HMAC=m
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_VMAC=m
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=m
+CONFIG_CRYPTO_CRC32C_INTEL=m
+CONFIG_CRYPTO_CRC32=m
+CONFIG_CRYPTO_CRC32_PCLMUL=m
+CONFIG_CRYPTO_GHASH=m
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=m
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_RMD128=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_RMD256=m
+CONFIG_CRYPTO_RMD320=m
+CONFIG_CRYPTO_SHA1=m
+CONFIG_CRYPTO_SHA1_SSSE3=m
+CONFIG_CRYPTO_SHA256_SSSE3=m
+CONFIG_CRYPTO_SHA512_SSSE3=m
+CONFIG_CRYPTO_SHA256=m
+CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_TGR192=m
+CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_AES_X86_64=m
+CONFIG_CRYPTO_AES_NI_INTEL=m
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_BLOWFISH_COMMON=m
+CONFIG_CRYPTO_BLOWFISH_X86_64=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAMELLIA_X86_64=m
+CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m
+CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m
+CONFIG_CRYPTO_CAST_COMMON=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST5_AVX_X86_64=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_CAST6_AVX_X86_64=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_KHAZAD=m
+CONFIG_CRYPTO_SALSA20=m
+CONFIG_CRYPTO_SALSA20_X86_64=m
+CONFIG_CRYPTO_SEED=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
+CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
+CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+CONFIG_CRYPTO_TWOFISH_X86_64=m
+CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
+CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=m
+CONFIG_CRYPTO_ZLIB=m
+CONFIG_CRYPTO_LZO=y
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_DEV_PADLOCK=m
+CONFIG_CRYPTO_DEV_PADLOCK_AES=m
+CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
+CONFIG_ASYMMETRIC_KEY_TYPE=m
+CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m
+CONFIG_PUBLIC_KEY_ALGO_RSA=m
+CONFIG_X509_CERTIFICATE_PARSER=m
+CONFIG_HAVE_KVM=y
+CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM_IRQ_ROUTING=y
+CONFIG_HAVE_KVM_EVENTFD=y
+CONFIG_KVM_APIC_ARCHITECTURE=y
+CONFIG_KVM_MMIO=y
+CONFIG_KVM_ASYNC_PF=y
+CONFIG_HAVE_KVM_MSI=y
+CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM=m
+CONFIG_KVM_INTEL=m
+CONFIG_KVM_AMD=m
+CONFIG_KVM_MMU_AUDIT=y
+CONFIG_KVM_DEVICE_ASSIGNMENT=y
+CONFIG_BINARY_PRINTF=y
+
+#
+# Library routines
+#
+CONFIG_RAID6_PQ=m
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_GENERIC_IOMAP=y
+CONFIG_GENERIC_IO=y
+CONFIG_PERCPU_RWSEM=y
+CONFIG_CRC_CCITT=m
+CONFIG_CRC16=m
+CONFIG_CRC_T10DIF=m
+CONFIG_CRC_ITU_T=m
+CONFIG_CRC32=y
+# CONFIG_CRC32_SELFTEST is not set
+CONFIG_CRC32_SLICEBY8=y
+# CONFIG_CRC32_SLICEBY4 is not set
+# CONFIG_CRC32_SARWATE is not set
+# CONFIG_CRC32_BIT is not set
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=m
+CONFIG_CRC8=m
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=m
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_XZ_DEC=y
+CONFIG_XZ_DEC_X86=y
+CONFIG_XZ_DEC_POWERPC=y
+CONFIG_XZ_DEC_IA64=y
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_ARMTHUMB=y
+CONFIG_XZ_DEC_SPARC=y
+CONFIG_XZ_DEC_BCJ=y
+# CONFIG_XZ_DEC_TEST is not set
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_XZ=y
+CONFIG_DECOMPRESS_LZO=y
+CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_REED_SOLOMON=m
+CONFIG_REED_SOLOMON_ENC8=y
+CONFIG_REED_SOLOMON_DEC8=y
+CONFIG_REED_SOLOMON_DEC16=y
+CONFIG_BCH=m
+CONFIG_BCH_CONST_PARAMS=y
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_BTREE=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_CHECK_SIGNATURE=y
+CONFIG_CPU_RMAP=y
+CONFIG_DQL=y
+CONFIG_NLATTR=y
+CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
+CONFIG_LRU_CACHE=m
+CONFIG_AVERAGE=y
+CONFIG_CLZ_TAB=y
+CONFIG_CORDIC=m
+CONFIG_DDR=y
+CONFIG_MPILIB=m
+CONFIG_OID_REGISTRY=m
+CONFIG_UCS2_STRING=y
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 619ad6090..8d5658aab 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,10 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=
-KERNEL_VERSION=3.9.4-1-LIBRE
-
-# set a sane PATH to ensure that critical utils like depmod will be found
-export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
+KERNEL_VERSION=
 
 post_install () {
   # updating module dependencies
@@ -15,40 +12,9 @@ post_install () {
     echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
     mkinitcpio -p linux-libre${KERNEL_NAME}
   fi
-
-  # compat symlinks for the official kernels only
-  if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-lts" ]; then
-    loaders="$(find /boot -name syslinux.cfg -or -name extlinux.conf -or -name grub.cfg -or -name menu.lst)"
-    [ -f /etc/lilo.conf ] && loaders="$loaders /etc/lilo.conf"
-    if [ -n "${loaders}" ] && grep -q -e vmlinuz26 -e kernel26.img -e kernel26-fallback.img $loaders; then
-      # add compat symlinks for the initramfs images
-      ln -sf initramfs-linux-libre${KERNEL_NAME}.img boot/kernel26${KERNEL_NAME}.img
-      ln -sf initramfs-linux-libre${KERNEL_NAME}-fallback.img \
-        boot/kernel26${KERNEL_NAME}-fallback.img
-      ln -sf vmlinuz-linux-libre${KERNEL_NAME} /boot/vmlinuz26${KERNEL_NAME}
-    fi
-  fi
 }
 
 post_upgrade() {
-  pacman -Q grub &>/dev/null
-  hasgrub=$?
-  pacman -Q grub-common &>/dev/null
-  hasgrub2=$?
-  pacman -Q lilo &>/dev/null
-  haslilo=$?
-  # reminder notices
-  if [ $haslilo -eq 0 ]; then
-    echo ">>>"
-    if [ $hasgrub -eq 0 -o $hasgrub2 -eq 0 ]; then
-      echo ">>> If you use the LILO bootloader, you should run 'lilo' before rebooting."
-    else
-      echo ">>> You appear to be using the LILO bootloader. You should run"
-      echo ">>> 'lilo' before rebooting."
-    fi
-    echo ">>>"
-  fi
-
   if findmnt --fstab -uno SOURCE /boot &>/dev/null && ! mountpoint -q /boot; then
     echo "WARNING: /boot appears to be a separate partition but is not mounted."
   fi
@@ -64,6 +30,6 @@ post_upgrade() {
 
 post_remove() {
   # also remove the compat symlinks
-  rm -f boot/{initramfs-linux-libre,kernel26}${KERNEL_NAME}.img
-  rm -f boot/{initramfs-linux-libre,kernel26}${KERNEL_NAME}-fallback.img
+  rm -f boot/initramfs-linux-libre${KERNEL_NAME}.img
+  rm -f boot/initramfs-linux-libre${KERNEL_NAME}-fallback.img
 }
diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD
index 509275d5d..fc749260c 100644
--- a/libre/lirc-libre/PKGBUILD
+++ b/libre/lirc-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186447 2013-05-26 15:45:25Z tpowa $
+# $Id: PKGBUILD 189186 2013-06-28 18:41:29Z foutrelis $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
@@ -6,14 +6,14 @@ _pkgbase=lirc
 pkgbase=lirc-libre
 pkgname=('lirc-libre' 'lirc-utils-libre')
 pkgver=0.9.0
-pkgrel=46
+pkgrel=49
 epoch=1
 _extramodules=extramodules-3.9-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-headers>=3.9' 'linux-libre-headers<3.10' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2')
+makedepends=('help2man' 'linux-libre>=3.9' 'linux-libre-headers>=3.9' 'linux-libre-headers<3.10' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2')
 options=('!makeflags' '!strip')
 source=(http://prdownloads.sourceforge.net/${_pkgbase}/${_pkgbase}-${pkgver}.tar.bz2
         lirc_wpc8769l.patch
diff --git a/libre/lsb-release-libre/PKGBUILD b/libre/lsb-release/PKGBUILD
index 51ec79bea..adf9c4774 100644
--- a/libre/lsb-release-libre/PKGBUILD
+++ b/libre/lsb-release/PKGBUILD
@@ -1,35 +1,36 @@
-# Parabola maintainer: Michał Masłowski <mtjm@mtjm.eu>
-# Parabola contributor: André Silva <andre.paulista@adinet.com.uy>
-# $Id: PKGBUILD 22635 2010-07-25 20:05:28Z svenstaro $
+# $Id: PKGBUILD 79819 2012-11-13 13:12:30Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Malte Rabenseifner <malte@zearan.de>
 # Contributor: John Gerritse <reaphsharc@gmail.com>
+# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
+# Contributor (Parabola): André Silva emulatorman@lavabit.com>
 
-_pkgname=lsb-release
-pkgname=lsb-release-libre
+pkgname=lsb-release
 pkgver=1.4
-pkgrel=12
-pkgdesc="LSB version query program with Parabola name"
+pkgrel=13
+pkgdesc="LSB version query program (Parabola rebranded)"
 arch=('any')
 url="http://www.linuxbase.org/"
 license=('GPL2')
-provides=('lsb-release')
-conflicts=('lsb-release')
-replaces=('lsb-release')
+depends=('bash')
+provides=('lsb-release-libre')
+conflicts=('lsb-release-libre')
+replaces=('lsb-release-libre')
 install=lsb-release.install
-source=(http://downloads.sourceforge.net/lsb/$_pkgname-$pkgver.tar.gz)
+source=(http://downloads.sourceforge.net/lsb/$pkgname-$pkgver.tar.gz)
 md5sums=('30537ef5a01e0ca94b7b8eb6a36bb1e4')
 
 build() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
 
   make
 }
 
 package() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
 
   install -dm755 "$pkgdir/etc"
+  echo "LSB_VERSION=$pkgver" >> "$pkgdir/etc/lsb-release"
   echo "DISTRIB_ID=parabola" > "$pkgdir/etc/lsb-release"
   echo "DISTRIB_RELEASE=rolling" >> "$pkgdir/etc/lsb-release"
   echo "DISTRIB_DESCRIPTION=\"Parabola GNU/Linux-libre\"" >> "$pkgdir/etc/lsb-release"
diff --git a/libre/lsb-release-libre/lsb-release.install b/libre/lsb-release/lsb-release.install
index 62d404892..62d404892 100644
--- a/libre/lsb-release-libre/lsb-release.install
+++ b/libre/lsb-release/lsb-release.install
diff --git a/libre/mc-libre/PKGBUILD b/libre/mc-libre/PKGBUILD
index 3528fba0e..d286f9cf3 100644
--- a/libre/mc-libre/PKGBUILD
+++ b/libre/mc-libre/PKGBUILD
@@ -1,36 +1,44 @@
-# $Id$
+# $Id: PKGBUILD 87679 2013-04-05 09:08:28Z schuay $
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Maintainer: schuay <jakob.gruber@gmail.com>
 
 _pkgname=mc
 pkgname=mc-libre
-pkgver=4.8.4
+pkgver=4.8.8
 pkgrel=1
-pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander"
+pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander, with unar and arj recommendation included and nonfree unace recommendation removed"
 arch=('i686' 'x86_64')
 url="http://www.ibiblio.org/mc/"
 license=('GPL')
-depends=('e2fsprogs' 'glib2' 'pcre' 'gpm' 'slang')
+depends=(
+    'e2fsprogs'
+    'glib2'
+    'gpm'
+    'libssh2'
+    'pcre'
+    'slang')
 makedepends=('libxt' 'libx11')
-optdepends=('p7zip: support for 7zip archives'
-	'mtools: a+ extfs'
-	'cdparanoia: audio extfs'
-	'gawk: hp48+ extfs'
-	'cdrkit: iso9660 extfs'
-	'perl: needed by several extfs scripts'
-	'python-boto: s3+ extfs'
-	'python2-pytz: s3+ extfs'
-	'p7zip: u7z extfs'
-	'arj: uarj extfs'
-	'cabextract: ucab extfs'
-	'ununrar: urar extfs'
-	'zip: uzip extfs')
+optdepends=(
+    'cabextract: ucab extfs'
+    'cdparanoia: audio extfs'
+    'cdrkit: iso9660 extfs'
+    'gawk: hp48+ extfs'
+    'aspell: spelling corrections'
+    'cvs: CVS support'
+    'mtools: a+ extfs'
+    'perl: needed by several extfs scripts'
+    'python2-boto: s3+ extfs'
+    'python2-pytz: s3+ extfs'
+    'smb: VFS support'
+    'arj: uarj extfs'
+    'unar: urar extfs'
+    'zip: uzip extfs'
+    'p7zip: support for 7zip archives')
 conflicts=('mc')
 replaces=('mc')
 provides=("mc=${pkgver}")
 options=('!emptydirs' '!makeflags')
 backup=('etc/mc/edit.indent.rc'
-        'etc/mc/edit.spell.rc'
         'etc/mc/filehighlight.ini'
         'etc/mc/mcedit.menu'
         'etc/mc/mc.ext'
@@ -40,30 +48,25 @@ backup=('etc/mc/edit.indent.rc'
 source=("http://www.midnight-commander.org/downloads/${_pkgname}-${pkgver}.tar.bz2")
 
 build() {
-	cd "${srcdir}/${_pkgname}-${pkgver}"
+    cd "${srcdir}/${_pkgname}-${pkgver}"
 
-	./configure \
-	    --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man \
-	    --enable-background --enable-charset --enable-largefile \
-	    --with-edit --with-gpm-mouse --with-mmap --enable-vfs-smb \
-	    --with-screen=slang --with-subshell --with-vfs --with-x \
-	    --without-debug --without-gnome --without-included-gettext \
-	    --libexecdir=/usr/lib
+    ./configure --prefix=/usr --sysconfdir=/etc --enable-vfs-smb \
+        --with-x --libexecdir=/usr/lib
 
-	make
+    make
 }
 
 package() {
-	cd "${srcdir}/${_pkgname}-${pkgver}"
+    cd "${srcdir}/${_pkgname}-${pkgver}"
 
-	make DESTDIR="${pkgdir}" install
+    make DESTDIR="${pkgdir}" install
 
-	# Fix FS#15177
-	sed 's|op_has_zipinfo = 0|op_has_zipinfo = 1|' \
-		-i "${pkgdir}/usr/lib/mc/extfs.d/uzip"
+    # Fix FS#15177
+    sed 's|op_has_zipinfo = 0|op_has_zipinfo = 1|' \
+        -i "${pkgdir}/usr/lib/mc/extfs.d/uzip"
 
-	sed 's#/usr/bin/env python#/usr/bin/python2#' \
-		-i "${pkgdir}/usr/lib/mc/extfs.d/s3+"
+    sed 's#/usr/bin/env python#/usr/bin/python2#' \
+        -i "${pkgdir}/usr/lib/mc/extfs.d/s3+"
 }
 
-md5sums=('a8edb8226cb25869f925ecce043faf1e')
+md5sums=('324ff5a192d30d3a3b234c130550eb0a')
diff --git a/libre/mime-types/PKGBUILD b/libre/mime-types/PKGBUILD
index 2ac7928c1..31e373545 100644
--- a/libre/mime-types/PKGBUILD
+++ b/libre/mime-types/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id$
+# $Id: PKGBUILD 188113 2013-06-10 01:37:40Z bisson $
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=mime-types
-pkgver=8
-pkgrel=1.2
-pkgdesc='Provides /etc/mime.types, Parabola rebranded'
+pkgver=9
+pkgrel=1
+pkgdesc='Provides /etc/mime.types (Parabola rebranded)'
 url='https://parabolagnulinux.org/'
 license=('GPL2')
 arch=('any')
 backup=('etc/mime.types')
 source=("http://mirrors.kernel.org/gentoo/distfiles/${pkgname}-${pkgver}.tar.bz2"
         'parabola.patch')
-sha1sums=('01682b0ad3111a6cf65e6c9db0c18ddd7523c593'
+sha1sums=('b21b7775a006b60113a6648e20beb1decdac8899'
           '0d3b34c7b4a384be674192ecbfd8f22271906ae8')
 
 package() {
diff --git a/libre/mkbootcd/PKGBUILD b/libre/mkbootcd/PKGBUILD
deleted file mode 100644
index 8990fbae3..000000000
--- a/libre/mkbootcd/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 137619 2011-09-10 08:04:29Z pierre $
-# Maintainer : Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=mkbootcd
-pkgver=2008.09
-pkgrel=2.2
-pkgdesc="Advanced, modular isolinux bootcd image creation utility (Parabola rebranded)"
-arch=('any')
-license=('GPL')
-url="https://parabolagnulinux.org/"
-depends=('mkinitcpio' 'cdrkit' 'syslinux')
-source=('boot.msg' 'mkbootcd' 'mkbootcd.conf' 'options.msg')
-backup=('etc/mkbootcd.conf')
-md5sums=('2b55189d64e5263c5a3925a7b949c1f8'
-         '521107289007f0c3f11ddbb6fdfcbd22'
-         '4794673fa413eb5459b40172be7ae541'
-         '75b69407f88f2838c66f4dda4d8455e3')
-
-package() {
-  cd $srcdir
-  install -D -m755 mkbootcd $pkgdir/usr/sbin/mkbootcd
-  install -D -m644 mkbootcd.conf $pkgdir/etc/mkbootcd.conf
-  install -D -m644 boot.msg $pkgdir/usr/share/mkbootcd/boot.msg
-  install -D -m644 options.msg $pkgdir/usr/share/mkbootcd/options.msg
-}
diff --git a/libre/mkbootcd/mkbootcd b/libre/mkbootcd/mkbootcd
deleted file mode 100755
index 012267be9..000000000
--- a/libre/mkbootcd/mkbootcd
+++ /dev/null
@@ -1,144 +0,0 @@
-#! /bin/sh
-# Created by Tobias Powalowski <tpowa@archlinux.org>
-# Rebranded for Parabola by André Silva <emulatorman@lavabit.com>
-# Settings
-APPNAME=$(basename "${0}")
-CONFIG="/etc/mkbootcd.conf"
-GENIMG=""
-BURN="0"
-BLANK="0"
-GRUB="0"
-TARNAME=""
-export TEMPDIR=$(mktemp /tmp/mkbootcd.XXXX)
-usage ()
-{
-    echo "${APPNAME}: usage"
-    echo "  -g=IMAGE         Generate a ISO image as IMAGE"
-    echo "  -c=CONFIG        Use CONFIG file. default: /etc/mkbootcd.conf"
-    echo "  -B               Burn the ISO image after creation"
-    echo "  -b               Blanking media first"
-    echo "  -grub            Use grub instead of isolinux"
-    echo "  -t=TARNAME       Generate a tar image instead of an iso image"
-    echo "  -h               This message."
-    exit 1
-}
-
-[ "$1" == "" ] && usage
-
-while [ $# -gt 0 ]; do
-	case $1 in
-		-c=*|--c=*) CONFIG="$(echo $1 | awk -F= '{print $2;}')" ;;
-		-g=*|--g=*) GENIMG="$(echo $1 | awk -F= '{print $2;}')" ;;
-		-B|--B) BURN="1" ;;
-		-b|--b) BLANK="1" ;;
-		-grub|--grub) GRUB="1" ;;
-		-t=*|--t=*) TARNAME="$(echo $1 | awk -F= '{print $2;}')" ;;
-		-h|--h|?) usage ;; 
-		*) usage ;;
-		esac
-	shift
-done
-
-if [ "${TARNAME}" = "" -a "${GENIMG}" = "" ]; then 
-	echo "ERROR: No image name specified, please use the -g option"
-	exit 1
-fi
-
-if [ ! -f "${CONFIG}" ]; then
-	echo "config file '${CONFIG}' cannot be found, aborting..."
-	exit 1
-fi
-
-. "${CONFIG}"
-# export for mkinitcpio
-[ -n "${APPENDBOOTMESSAGE}" ] && export APPENDBOOTMESSAGE
-[ -n "${APPENDBOOTMESSAGE_SYSLINUX}" ] && export APPENDBOOTMESSAGE_SYSLINUX
-[ -n "${APPENDBOOTMESSAGE_SYSLINUX_LOWMEM}" ] && export APPENDBOOTMESSAGE_SYSLINUX_LOWMEM
-[ -n "${APPENDOPTIONSBOOTMESSAGE}" ] && export APPENDOPTIONSBOOTMESSAGE
-
-if [ "$GRUB" = "1" ]; then
-	export RUNPROGRAM="${APPNAME}-grub"
-	export BOOTDIRNAME="boot"
-else
-	export RUNPROGRAM="${APPNAME}"
-	export BOOTDIRNAME="isolinux"
-fi
-[ "${BOOTMESSAGE}" = "" ] && export BOOTMESSAGE=$(mktemp /tmp/bootmessage.XXXX)
-[ "${OPTIONSBOOTMESSAGE}" = "" ] && export OPTIONSBOOTMESSAGE=$(mktemp /tmp/optionsbootmessage.XXXX)
-[ "${ISONAME}" = "" ] && export ISONAME=$(mktemp /tmp/isoname.XXXX)
-export USEKERNEL=${VERSION}
-# begin script
-[ -e ${TEMPDIR} ] && rm -r ${TEMPDIR}
-mkdir -p ${TEMPDIR}/${BOOTDIRNAME}
-if [ "$GRUB" = "1" ]; then
-	mkdir ${TEMPDIR}/${BOOTDIRNAME}/grub
-	install -m755 /usr/share/grub/i386-pc/stage2_eltorito ${TEMPDIR}/${BOOTDIRNAME}/grub/stage2_eltorito
-else
-	install -m755 /usr/lib/syslinux/isolinux.bin ${TEMPDIR}/${BOOTDIRNAME}/isolinux.bin
-fi
-# create isolinux.cfg
-if [ "$GRUB" = "1" ]; then
-	echo ":: Creating menu.lst ..."
-	[ ! -e "${MENULST}" ] && echo "No menu.lst found" && exit 1
-	sed "s|@@PROMPT@@|${PROMPT}|g;s|@@TIMEOUT@@|${TIMEOUT}|g;s|@@KERNEL_BOOT_OPTIONS@@|${KERNEL_BOOT_OPTIONS}|g" \
-		${MENULST} \
-		> ${TEMPDIR}/${BOOTDIRNAME}/grub/menu.lst
-else
-	echo ":: Creating isolinux.cfg ..."
-	if [ "${ISOLINUXCFG}" = "" ]; then
-		[ -e  ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg ] && rm  ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
-		echo "prompt ${PROMPT}" >>  ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
-		echo "timeout ${TIMEOUT}" >>  ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
-		echo "display boot.msg" >>  ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
-		echo "F1 boot.msg" >>  ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
-		echo "F2 options.msg" >>  ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
-		echo "default parabola"  >>  ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
-		echo "label parabola" >>  ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
-		echo "kernel vmlinuz" >>  ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
-		echo "append initrd=initrd.img ${KERNEL_BOOT_OPTIONS}" >>  ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
-	else
-	sed "s|@@PROMPT@@|${PROMPT}|g;s|@@TIMEOUT@@|${TIMEOUT}|g;s|@@KERNEL_BOOT_OPTIONS@@|${KERNEL_BOOT_OPTIONS}|g" \
-		${ISOLINUXCFG} > ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
-	fi
-	[ ! -s ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg ] && echo "No isolinux.cfg found" && exit 1
-fi
-echo ":: Calling mkinitcpio CONFIG=${MKINITCPIO_CONFIG} KERNEL=${VERSION} ..." 
-# generate initramdisk
-echo ":: Creating initramdisk ..."
-	mkinitcpio -c ${MKINITCPIO_CONFIG} -k ${VERSION} -g ${TEMPDIR}/${BOOTDIRNAME}/initrd.img
-echo ":: Using ${KERNEL} as image kernel ..."
-	install -m644 ${KERNEL} ${TEMPDIR}/${BOOTDIRNAME}/vmlinuz
-	install -m644 ${BOOTMESSAGE} ${TEMPDIR}/${BOOTDIRNAME}/boot.msg
-	install -m644 ${OPTIONSBOOTMESSAGE} ${TEMPDIR}/${BOOTDIRNAME}/options.msg
-	[ ! -s ${TEMPDIR}/${BOOTDIRNAME}/boot.msg ] && echo 'ERROR:no boot.msg found, aborting!' && exit 1
-	[ ! -s ${TEMPDIR}/${BOOTDIRNAME}/options.msg ] && echo 'ERROR:no options.msg found, aborting!' && exit 1
-# create image
-if ! [ "${TARNAME}" = "" ]; then
-	echo ":: Creating tar image ..."
-	[ -e ${TARNAME} ] && rm ${TARNAME}
-	rm ${TEMPDIR}/parabola/pkg/*.pkg.tar.gz > /dev/null 2>&1
-	tar cfv ${TARNAME} ${TEMPDIR} > /dev/null 2>&1 && echo ":: tar Image succesfull created at ${TARNAME}"
-else
-	echo ":: Creating ISO image ..."
-		[ -e ${GENIMG} ] && rm ${GENIMG}
-		[ -s "${ISONAME}" ] && ISONAME=$(cat $ISONAME) || ISONAME="Parabola GNU/Linux-libre"
-		if [ "$GRUB" = "1" ]; then
-			mkisofs -RlDJLV "${ISONAME}" -b boot/grub/stage2_eltorito -c boot/boot.cat \
-				-no-emul-boot -boot-load-size 4 -boot-info-table -o ${GENIMG} ${TEMPDIR}/ > /dev/null 2>&1
-		else
-			mkisofs -RlDJLV "${ISONAME}" -b isolinux/isolinux.bin -c isolinux/boot.cat \
-				-no-emul-boot -boot-load-size 4 -boot-info-table -o ${GENIMG} ${TEMPDIR}/ > /dev/null 2>&1
-		fi
-		[ $? -ne 0 ] && echo ":: ISO Image succesfull created at ${GENIMG}"
-	# burning/blanking image
-	if [ "$BLANK" = "1" ]; then
-		echo ":: Blanking media DEVICE=${DEVICE}, BLANKMODE=${BLANKMODE}, SPEED=${SPEED} ..."
-			cdrecord dev=${DEVICE} speed=${SPEED} blank=${BLANKMODE} > /dev/null 2>&1 && echo ":: Successfull."
-	fi
-	if [ "$BURN" = "1" ]; then
-		echo ":: Burning ISO image DEVICE=${DEVICE}, SPEED=${SPEED} ..."
-			cdrecord dev=${DEVICE} speed=${SPEED} -eject ${GENIMG}  > /dev/null 2>&1 && echo ":: Successfull."
-	fi
-fi
-# clean /tmp
-rm -r ${TEMPDIR}
diff --git a/libre/mkisolinux/PKGBUILD b/libre/mkisolinux/PKGBUILD
index 1c02bb01b..7c9ab6cc4 100644
--- a/libre/mkisolinux/PKGBUILD
+++ b/libre/mkisolinux/PKGBUILD
@@ -2,8 +2,8 @@
 # Maintainer : Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=mkisolinux
-pkgver=2013.03
-pkgrel=2
+pkgver=2013.05
+pkgrel=1
 pkgdesc="Advanced, modular isolinux bootcd image creation utility (Parabola rebranded)"
 arch=(any)
 license=('GPL')
@@ -12,10 +12,7 @@ depends=('mkinitcpio' 'cdrkit' 'syslinux' 'pciutils')
 replaces=('mkbootcd')
 backup=(etc/mkisolinux.conf)
 source=('boot.msg' 'mkisolinux' 'mkisolinux.conf' 'options.msg')
-md5sums=('945d5f5d74f37718c8c9d518bfd5698d'
-         'e28b82502ae44087852ea6bfac398d5c'
-         '456eba83dfba319f8132c89e7ba42ce5'
-         'ae0007d6679b5a575b2a9e5ac3664baf')
+
 
 package()
 {
@@ -25,3 +22,7 @@ package()
   install -D -m644 boot.msg "$pkgdir/usr/share/mkisolinux/boot.msg"
   install -D -m644 options.msg "$pkgdir/usr/share/mkisolinux/options.msg"
 }
+md5sums=('945d5f5d74f37718c8c9d518bfd5698d'
+         '384aac3786506ff96ec3d1147bcacfe5'
+         '3cc23d74d7e4378d1be431d68a71a173'
+         'ae0007d6679b5a575b2a9e5ac3664baf')
diff --git a/libre/mkisolinux/mkisolinux b/libre/mkisolinux/mkisolinux
index 0cb53e81e..ce1187d2a 100755
--- a/libre/mkisolinux/mkisolinux
+++ b/libre/mkisolinux/mkisolinux
@@ -65,7 +65,6 @@ install -m755 /usr/lib/syslinux/isolinux.bin ${TEMPDIR}/${BOOTDIRNAME}/isolinux.
 for i in /usr/lib/syslinux/*.c32; do
     install -m644 $i ${TEMPDIR}/${BOOTDIRNAME}/$(basename $i)
 done
-install -m644 /lib/modules/$(uname -r)/modules.pcimap ${TEMPDIR}/${BOOTDIRNAME}/modules.pcimap
 install -m644 /usr/share/hwdata/pci.ids ${TEMPDIR}/${BOOTDIRNAME}/pci.ids
 # create syslinux.cfg
 echo ":: Creating syslinux.cfg ..."
diff --git a/libre/mkisolinux/mkisolinux.conf b/libre/mkisolinux/mkisolinux.conf
index 83d36219d..4af6f098c 100644
--- a/libre/mkisolinux/mkisolinux.conf
+++ b/libre/mkisolinux/mkisolinux.conf
@@ -2,7 +2,7 @@
 # Rebranded for Parabola by André Silva <emulatorman@lavabit.com>
 # config file of mkisolinux
 
-# DEFAULT kernel boot options like root=/dev/hda3 etc.
+# DEFAULT kernel boot options like root=/dev/sda3 etc.
 # add your root= option, if you boot from a disk device
 # and don't want to add it by hand on each boot
 KERNEL_BOOT_OPTIONS=""
diff --git a/libre/mksyslinux/PKGBUILD b/libre/mksyslinux/PKGBUILD
new file mode 100644
index 000000000..a64f141fd
--- /dev/null
+++ b/libre/mksyslinux/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 187120 2013-06-04 06:46:39Z tpowa $
+# Maintainer : Tobias Powalowski <tpowa@archlinux.org>
+
+pkgname=mksyslinux
+pkgver=2013.06
+pkgrel=1
+pkgdesc="Advanced, modular syslinux boot image creation utility (Parabola rebranded)"
+arch=(any)
+license=('GPL')
+url="https://parabolagnulinux.org/"
+depends=('mkinitcpio' 'syslinux' 'pciutils')
+backup=(etc/mksyslinux.conf)
+source=('boot.msg' 'mksyslinux' 'mksyslinux.conf' 'options.msg')
+
+package()
+{
+  cd "$srcdir/"
+  install -D -m755 mksyslinux "$pkgdir/usr/bin/mksyslinux"
+  install -D -m644 mksyslinux.conf "$pkgdir/etc/mksyslinux.conf"
+  install -D -m644 boot.msg "$pkgdir/usr/share/mksyslinux/boot.msg"
+  install -D -m644 options.msg  "$pkgdir/usr/share/mksyslinux/options.msg"
+}
+md5sums=('287aad9693ca8061495e248c41ba43a7'
+         '0a9fd93356b5d98ab386f28bc849b808'
+         '15742e47e40a46491694b4b7680d4e38'
+         'ae0007d6679b5a575b2a9e5ac3664baf')
diff --git a/libre/mkbootcd/boot.msg b/libre/mksyslinux/boot.msg
index 5e441e746..15476f2bd 100644
--- a/libre/mkbootcd/boot.msg
+++ b/libre/mksyslinux/boot.msg
@@ -2,11 +2,11 @@
 
 ------------------------------------------------------------------------------
 Parabola GNU/Linux-libre
-ISOLINUX BOOT
-created with 'mkbootcd' written by Tobias Powalowski <tpowa@archlinux.org>
+SYSLINUX BOOT
+created with 'mksyslinux' by Tobias Powalowski <tpowa@archlinux.org>
 rebranded for Parabola by André Silva <emulatorman@lavabit.com>
 
-Press ENTER or type 'parabola' to boot the CD.
+Press ENTER or type 'parabola' to boot image.
 
 If you wish to change your defaults to boot into your existing system,
 type 'vmlinuz initrd=initrd.img <any_other_boot_option>'
diff --git a/libre/mksyslinux/mksyslinux b/libre/mksyslinux/mksyslinux
new file mode 100755
index 000000000..96ad45133
--- /dev/null
+++ b/libre/mksyslinux/mksyslinux
@@ -0,0 +1,144 @@
+#! /bin/sh
+# Created by Tobias Powalowski <tpowa@archlinux.org>
+# Settings
+APPNAME=$(basename "${0}")
+CONFIG="/etc/mksyslinux.conf"
+export TEMPDIR=$(mktemp /tmp/mksyslinux.XXX)
+TMPDIR=$(mktemp -d /tmp/mksyslinux-image.XXX)
+BOOTDIRNAME=boot/syslinux
+
+usage ()
+{
+    echo "${APPNAME}: usage"
+    echo "WRITING TO DEVICE:"
+    echo "- PREPARATION: Your device must have a bootable first partition in FAT16 format!"
+    echo "- ATTENTION: The MBR of your DEVICE will be overwritten! You have been warned!"
+    echo ""
+    echo "CREATING AN IMAGE FILE:"
+    echo "- For creating an image file use the -i=IMAGEFILE switch"
+    echo "- use 'dd if=<yourimage> of=<yourdevice>' to write to your device afterwards."
+    echo ""
+    echo "PARAMETERS:"
+    echo "  -d=DEVICE        Your DEVICE first partition from /dev/xxx tree to install"
+    echo "  -i=IMAGENAME     Your IMAGENAME"
+    echo "  -c=CONFIG        Use CONFIG file. default: /etc/mksyslinux.conf"
+    echo "  -h               This message."
+    exit 1
+}
+
+[ "$1" == "" ] && usage && exit 1
+
+
+while [ $# -gt 0 ]; do
+	case $1 in
+		-c=*|--c=*) CONFIG="$(echo $1 | awk -F= '{print $2;}')" ;;
+		-d=*|--d=*) DEVICE="$(echo $1 | awk -F= '{print $2;}')" ;;
+		-i=*|--i=*) IMAGENAME="$(echo $1 | awk -F= '{print $2;}')" ;;
+		-h|--h|?) usage ;; 
+		*) usage ;;
+		esac
+	shift
+done
+
+if [ ! -f "${CONFIG}" ]; then
+	echo "config file '${CONFIG}' cannot be found, aborting..."
+    exit 1
+fi
+
+if [ "${IMAGENAME}" = "" ]; then
+	if [ "${DEVICE}" = "" ]; then 
+		echo "ERROR: No DEVICE name specified, please use the -d option"
+	 	exit 1
+	fi
+fi
+
+if ! [ $UID -eq 0 ]; then 
+	echo "ERROR: only works when run as root!"
+	exit 1
+fi
+
+. "${CONFIG}"
+# export for mkinitcpio
+[ -n "${APPENDBOOTMESSAGE}" ] && export APPENDBOOTMESSAGE
+[ -n "${APPENDBOOTMESSAGE_SYSLINUX}" ] && export APPENDBOOTMESSAGE_SYSLINUX
+[ -n "${APPENDOPTIONSBOOTMESSAGE}" ] && export APPENDOPTIONSBOOTMESSAGE
+
+MBRDEVICE="$(echo ${DEVICE} | sed -e 's/[0-9]//g')"
+
+export RUNPROGRAM="${APPNAME}"
+[ "${BOOTMESSAGE}" = "" ] && export BOOTMESSAGE=$(mktemp /tmp/bootmessage.XXXX)
+[ "${OPTIONSBOOTMESSAGE}" = "" ] && export OPTIONSBOOTMESSAGE=$(mktemp /tmp/optionsbootmessage.XXXX)
+export USEKERNEL=${VERSION}
+# begin script
+[ -e ${TEMPDIR} ] && rm -r ${TEMPDIR}
+mkdir -p ${TEMPDIR}
+echo ":: Mounting ${DEVICE} ..."
+if ! [ "${IMAGENAME}" = "" ]; then
+	modprobe loop
+else
+	mount ${DEVICE} ${TEMPDIR} || exit 1
+fi
+mkdir -p ${TEMPDIR}/${BOOTDIRNAME}
+# prepare syslinux bootloader
+install -m755 /usr/lib/syslinux/isolinux.bin ${TEMPDIR}/${BOOTDIRNAME}/isolinux.bin
+for i in /usr/lib/syslinux/*.c32; do
+    install -m644 $i ${TEMPDIR}/${BOOTDIRNAME}/$(basename $i)
+done
+install -m644 /usr/share/hwdata/pci.ids ${TEMPDIR}/${BOOTDIRNAME}/pci.ids
+
+# create syslinux.cfg
+echo ":: Creating syslinux.cfg ..."
+if [ "${SYSLINUXCFG}" = "" ]; then
+	[ -e ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg ] && rm ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
+	echo "prompt ${PROMPT}" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
+	echo "timeout ${TIMEOUT}" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
+	echo "display boot.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
+	echo "F1 boot.msg" >>  ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
+	echo "F2 options.msg" >>  ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
+	echo "default parabola"  >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
+	echo "label parabola" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
+	echo "kernel /boot/vmlinuz" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
+	echo "append initrd=/boot/initrd.img ${KERNEL_BOOT_OPTIONS}" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
+else
+	sed "s|@@PROMPT@@|${PROMPT}|g;s|@@TIMEOUT@@|${TIMEOUT}|g;s|@@KERNEL_BOOT_OPTIONS@@|${KERNEL_BOOT_OPTIONS}|g" \
+		${SYSLINUXCFG} > ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
+fi
+[ ! -s ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg ] && echo "No syslinux.cfg found" && exit 1
+echo ":: Calling mkinitcpio CONFIG=${MKINITCPIO_CONFIG} KERNEL=${VERSION} ..." 
+# generate initramdisk
+echo ":: Creating initramdisk ..."
+	mkinitcpio -c ${MKINITCPIO_CONFIG} -k ${VERSION} -g ${TEMPDIR}/boot/initrd.img
+echo ":: Using ${KERNEL} as image kernel ..."
+	install -m644 ${KERNEL} ${TEMPDIR}/boot/vmlinuz
+	install -m644 ${BOOTMESSAGE} ${TEMPDIR}/${BOOTDIRNAME}/boot.msg
+	install -m644 ${OPTIONSBOOTMESSAGE} ${TEMPDIR}/${BOOTDIRNAME}/options.msg
+	[ ! -s ${TEMPDIR}/${BOOTDIRNAME}/boot.msg ] && echo 'ERROR:no boot.msg found, aborting!' && exit 1
+	[ ! -s ${TEMPDIR}/${BOOTDIRNAME}/options.msg ] && echo 'ERROR:no options.msg found, aborting!' && exit 1
+if ! [ "${IMAGENAME}" = "" ]; then
+	# ext2 overhead's upper bound is 6%
+	# empirically tested up to 1GB
+	rootsize=$(du -bs ${TEMPDIR}|cut -f1)
+	IMGSZ=$(( (${rootsize}*106)/100/512 + 1)) # image size in sectors
+	# create the filesystem image file
+	dd if=/dev/zero of="${IMAGENAME}" bs=512 count="${IMGSZ}"
+	# create a filesystem on the image
+	mkfs.vfat "${IMAGENAME}"
+	mount -o loop ${IMAGENAME} ${TMPDIR} || exit 1
+	cp -r "${TEMPDIR}"/* "$TMPDIR"
+	umount ${TMPDIR}
+else
+	echo ":: Unmounting ${DEVICE} ..."
+	umount ${TEMPDIR} || exit 1
+fi
+if ! [ "${IMAGENAME}" = "" ]; then
+	echo ":: Installing SYSLINUX on ${IMAGENAME} ..."
+	syslinux ${IMAGENAME} && echo "Installation completed."
+else
+	echo ":: Installing MBR on ${MBRDEVICE} ..."
+	cat ${MBR} > ${MBRDEVICE}
+	echo ":: Installing SYSLINUX on ${DEVICE} ..."
+	syslinux -t offset ${DEVICE} && echo "Installation completed."
+fi
+# clean /tmp
+rm -r ${TEMPDIR}
+! [ ${IMAGENAME} = "" ] && rm -r ${TMPDIR}
diff --git a/libre/mkbootcd/mkbootcd.conf b/libre/mksyslinux/mksyslinux.conf
index 5b287a6ea..cfbfc49d8 100644
--- a/libre/mkbootcd/mkbootcd.conf
+++ b/libre/mksyslinux/mksyslinux.conf
@@ -1,8 +1,8 @@
 # Created by Tobias Powalowski <tpowa@archlinux.org>
 # Rebranded for Parabola by André Silva <emulatorman@lavabit.com>
-# config file of mkbootcd
+# config file of mksyslinux
 
-# DEFAULT kernel boot options like root=/dev/hda3 etc.
+# DEFAULT kernel boot options like root=/dev/sda3 etc.
 # add your root= option, if you boot from a disk device
 # and don't want to add it by hand on each boot
 KERNEL_BOOT_OPTIONS=""
@@ -17,23 +17,18 @@ VERSION="$(uname -r)"
 KERNEL="/boot/vmlinuz-linux-libre"
 
 # boot message files
-BOOTMESSAGE="/usr/share/mkbootcd/boot.msg"
-OPTIONSBOOTMESSAGE="/usr/share/mkbootcd/options.msg"
+BOOTMESSAGE="/usr/share/mksyslinux/boot.msg"
+OPTIONSBOOTMESSAGE="/usr/share/mksyslinux/options.msg"
 
-# menu.lst or isolinux.cfg file to use
-ISOLINUXCFG=""
-MENULST=""
+# syslinux.cfg file to use
+SYSLINUXCFG=""
 
-# Prompt on CD boot, defaulted to yes, 1=yes 0=no
+# Prompt on boot, 1=yes 0=no
 PROMPT="1"
 
-# Name of the ISO, if empty Parabola GNU/Linux-libre is used if not set by a HOOK later
-ISONAME=""
+# Timeout, 30 seconds to fix usb keyboard issues
+# 0 means wait for prompt
+TIMEOUT="300"
 
-# Timeout in seconds on CD boot, defaulted to 0, because we prompt by default
-TIMEOUT="0"
-
-# Setting cdrecord options
-DEVICE=""
-SPEED=""
-BLANKMODE=""
+# default MBR
+MBR="/usr/lib/syslinux/mbr.bin"
diff --git a/libre/mkbootcd/options.msg b/libre/mksyslinux/options.msg
index 63f56e755..16c6b2eda 100644
--- a/libre/mkbootcd/options.msg
+++ b/libre/mksyslinux/options.msg
@@ -2,5 +2,5 @@
 Parabola GNU/Linux-libre options and troubleshooting:
 
 - If your system hangs during the boot process, any combinations of the
-  boot options noapic acpi=off pci=routeirq nosmp may be useful.
+  boot options noapic acpi=off pci=routeirq nosmp nomsi may be useful.
 ------------------------------------------------------------------------------
diff --git a/libre/mozilla-searchplugins/PKGBUILD b/libre/mozilla-searchplugins/PKGBUILD
index 0d1d14cd0..b2e362899 100644
--- a/libre/mozilla-searchplugins/PKGBUILD
+++ b/libre/mozilla-searchplugins/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Figue <ffigue at gmail>
 # Contributor (Parabola): fauno <fauno@kiwwwi.com.ar>
 # Contributor (Parabola): vando <facundo@esdebian.org>
-# Contributor (Parabola): Márcio Silva <coadde@adinet.com.uy>
+# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
 # Thank you very much to the older contributors:
 # Contributor: evr <evanroman at gmail>
 # Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> 
diff --git a/libre/newton-dynamics-libre/PKGBUILD b/libre/newton-dynamics-libre/PKGBUILD
new file mode 100644
index 000000000..1702cca70
--- /dev/null
+++ b/libre/newton-dynamics-libre/PKGBUILD
@@ -0,0 +1,50 @@
+# $Id: PKGBUILD 84449 2013-02-19 04:20:15Z svenstaro $
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Josh Taylor (deficite) <joshtaylor.mail@gmail.com> 
+# Contributor: Christophe Robin (bombstrike) <crobin@php.net> 
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+_pkgname=newton-dynamics
+pkgname=newton-dynamics-libre
+pkgver=2.36
+pkgrel=1
+pkgdesc="A simple physics API"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.newtondynamics.com"
+license=('custom')
+depends=()
+makedepends=('unar')
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
+source=("http://newton-dynamics.googlecode.com/files/newton-dynamics-${pkgver}.rar")
+noextract=("newton-dynamics-${pkgver}.rar")
+md5sums=('0dffa112d0a6ea39ad9e904e555da69a')
+
+build() {
+  _srcdir="${srcdir}/newton-dynamics-${pkgver}"
+  [[ "$CARCH" = "i686" ]]  && platform="linux32"
+  [[ "$CARCH" = "x86_64" ]] && platform="linux64"
+  builddir="${_srcdir}/coreLibrary_200/projets/${platform}"
+
+  # clean build directory
+  [[ -d "${_srcdir}" ]] && rm -Rf "${_srcdir}"
+
+  # decompress package
+  cd "${srcdir}"
+  unar "newton-dynamics-${pkgver}.rar"
+
+  # needed for building
+  mkdir -p "${_srcdir}/packages/${platform}"
+  
+  ## build lib
+  cd "${builddir}"
+  sed -i 's/ -o libNewton.so/ -lpthread -lstdc++ -o libNewton.so/' makefile
+  sed -i 's/Debug\.cpp.*$/Debug \\/g' makefile
+  make
+}
+
+package() {
+  install -D -m644 "${builddir}/libNewton.a" "${pkgdir}/usr/lib/libNewton.a"
+  install -D -m755 "${builddir}/libNewton.so" "${pkgdir}/usr/lib/libNewton.so"
+  install -D -m644 "${_srcdir}/coreLibrary_200/source/newton/Newton.h" "${pkgdir}/usr/include/Newton.h"
+}
diff --git a/libre/newton-dynamics-libre/assert-fix.patch b/libre/newton-dynamics-libre/assert-fix.patch
new file mode 100644
index 000000000..83dfdd790
--- /dev/null
+++ b/libre/newton-dynamics-libre/assert-fix.patch
@@ -0,0 +1,13 @@
+Index: source/core/dgTypes.cpp
+===================================================================
+--- source/core/dgTypes.cpp	(revision 506)
++++ source/core/dgTypes.cpp	(working copy)
+@@ -515,7 +515,7 @@
+ 		return 0;

+ 	}

+ 	_ASSERTE (compareCount <= dgInt32 (strideInBytes / sizeof (dgFloat64)));

+-	_ASSERT (strideInBytes == dgInt32 (sizeof (dgFloat64) * (strideInBytes / sizeof (dgFloat64))));

++	_ASSERTE (strideInBytes == dgInt32 (sizeof (dgFloat64) * (strideInBytes / sizeof (dgFloat64))));

+ 

+ 	dgInt32 stride = strideInBytes / dgInt32 (sizeof (dgFloat64));

+ 	dgInt32 stride2 = stride + 2;

diff --git a/libre/ogmrip-libre/PKGBUILD b/libre/ogmrip-libre/PKGBUILD
index cd2e48f2b..6876f699f 100644
--- a/libre/ogmrip-libre/PKGBUILD
+++ b/libre/ogmrip-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: PKGBUILD 89460 2013-04-29 13:17:27Z jelle $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Daenyth
 # Contributor: Allan McRae <allan@archlinux.org>
@@ -7,9 +7,9 @@
 
 _pkgname=ogmrip
 pkgname=ogmrip-libre
-pkgver=0.13.8
-pkgrel=1
-pkgdesc="Libraries and GTK2 interface for DVD ripping using mencoder (without nonfree faac support)"
+pkgver=1.0.0
+pkgrel=2
+pkgdesc="Libraries and GTK2 interface for DVD ripping using mencoder, without nonfree faac support"
 arch=('i686' 'x86_64')
 url="http://ogmrip.sourceforge.net/"
 license=('GPL')
@@ -31,7 +31,7 @@ options=('!libtool' '!makeflags')
 changelog=$_pkgname.changelog
 install=$_pkgname.install
 source=(http://downloads.sourceforge.net/sourceforge/${_pkgname}/${_pkgname}-${pkgver}.tar.gz)
-sha256sums=('ea6a75e6cc4fe7df1ed65648af208c87748959a6b372847b1005c3b92cc5a423')
+sha256sums=('6848a622152a62899b6e876e70ec36df1af7be9803b8b9c809ed631196bc18cc')
 
 build() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
diff --git a/libre/ogmrip-libre/ogmrip.changelog b/libre/ogmrip-libre/ogmrip.changelog
index 76179a2d3..bf5d84482 100644
--- a/libre/ogmrip-libre/ogmrip.changelog
+++ b/libre/ogmrip-libre/ogmrip.changelog
@@ -1,3 +1,6 @@
+2013-04-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* ogmrip 1.0.0-1
+
 2013-03-13 André Silva <emulatorman@lavabit.com>
 	* Remove nonfree faac support
 
diff --git a/libre/openshot-libre/PKGBUILD b/libre/openshot-libre/PKGBUILD
index 31ea71824..4c5c97a12 100644
--- a/libre/openshot-libre/PKGBUILD
+++ b/libre/openshot-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: PKGBUILD 92333 2013-06-04 05:05:15Z svenstaro $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Asa Marco <marcoasa90[at]gmail[.]com>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,8 +6,8 @@
 _pkgname=openshot
 pkgname=openshot-libre
 pkgver=1.4.3
-pkgrel=1
-pkgdesc="a free, non-linear video editor for GNU/Linux based on MLT framework (without nonfree faac recommendation)"
+pkgrel=2
+pkgdesc="a free, non-linear video editor for GNU/Linux based on MLT framework, without nonfree faac recommendation"
 arch=('any')
 url="http://www.openshotvideo.com/"
 license=('GPL')
diff --git a/libre/openshot-libre/openshot.install b/libre/openshot-libre/openshot.install
index cc0de896d..aab69abed 100644
--- a/libre/openshot-libre/openshot.install
+++ b/libre/openshot-libre/openshot.install
@@ -1,11 +1,11 @@
 post_install() {
-	[ -x `which update-mime-database` ] &&  update-mime-database usr/share/mime
+    update-mime-database usr/share/mime &>/dev/null
 }
 
 post_upgrade() {
-	[ -x `which update-mime-database` ] &&  update-mime-database usr/share/mime
+    post_install
 }
 
 post_remove() {
-	[ -x `which update-mime-database` ] &&  update-mime-database usr/share/mime
+    post_install
 }
diff --git a/libre/oss-libre/PKGBUILD b/libre/oss-libre/PKGBUILD
new file mode 100644
index 000000000..ab51da0cd
--- /dev/null
+++ b/libre/oss-libre/PKGBUILD
@@ -0,0 +1,104 @@
+# $Id: PKGBUILD 92058 2013-05-31 02:02:47Z seblu $
+# Maintainer: Kyle Keen <keenerd@gmail.com>
+# Contributor: Florian Pritz <bluewind@xinu.at>
+# Contributor: Paulo Matias <matiasΘarchlinux-br·org>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+pkgname=oss-libre
+pkgver=4.2_2007
+pkgrel=4
+arch=('i686' 'x86_64')
+url="http://developer.opensound.com/"
+license=('GPL2')
+makedepends=('gtk2')
+source=("http://www.4front-tech.com/developer/sources/stable/gpl/oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl.tar.bz2"
+  "rm-init-scripts.patch"
+  "soundon.patch"
+  "remove-hal.patch"
+  "linux-3.8.patch"
+  "oss.service"
+)
+md5sums=('f995118db1759fee3bcd38483940da6f'
+         'b9a380a0ac8896390d71ac13676f27e1'
+         '65f07fe241bfbf912f76d8b6d8f276b5'
+         'cd7f1dc6166bba8c94d96f3a28e948a5'
+         'effecefb774f1d08ef9f0af0ad205c34'
+         '39c46b10a6bc56fc146d669a61bd3028')
+_dir=oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl
+
+build() {
+  cd "${srcdir}/${_dir}"
+
+  # Avoid these flags conflicting with OSS build system.
+  unset CFLAGS
+  unset LDFLAGS
+  unset OSFLAGS
+  unset LIBRARIES
+  export NO_WARNING_CHECKS=yes
+
+  msg "Preparing the build environment."
+  cd "${srcdir}"
+
+  # Create build directory and configure
+  rm -rf build
+  mkdir build && cd build
+  "${srcdir}/${_dir}/configure" --enable-libsalsa=NO --regparm
+
+  # ossvermagic hardcodes /lib/modules *grumble*
+  sed -i 's|/lib/modules|/usr&|' \
+      os_cmd/Linux/ossvermagic/ossvermagic.c
+
+  pushd "$srcdir/$_dir"
+  patch -p0 -i "${srcdir}/linux-3.8.patch"
+  popd
+
+  msg "Building OSS."
+  make build
+
+  msg "Patching init scripts."
+  cd "${srcdir}/build/prototype"
+  rm usr/lib/oss/etc/S89oss
+  patch -p0 -i "${srcdir}/rm-init-scripts.patch"
+  patch -p0 -i "${srcdir}/soundon.patch"
+  # remove hal dependency
+  patch -p0 -i "${srcdir}/remove-hal.patch"
+  rm -rf usr/lib/oss/scripts/oss_usb-create-devices usr/lib/oss/scripts/90-oss_usb-create-device.fdi
+
+  # fix kernel module directories
+  sed -i 's#/lib/modules/$KERNEL_VERSION/kernel/#/usr/lib/modules/$KERNEL_VERSION/extramodules/kernel/#g' usr/sbin/soundon
+  sed -i 's#/lib/modules/$UNAME/kernel/#/usr/lib/modules/$UNAME/extramodules/kernel/#g' usr/lib/oss/build/install.sh
+  sed -i 's#mkdir /lib/modules#mkdir -p /usr/lib/modules#' usr/lib/oss/build/install.sh
+  sed -i 's#mkdir \(/usr/lib/modules/$UNAME/extramodules/kernel/oss\)#mkdir -p \1#' usr/lib/oss/build/install.sh
+  sed -i 's#\([= ]\)/lib/modules#\1/usr/lib/modules#g' \
+    usr/lib/oss/build/install.sh \
+    usr/lib/oss/scripts/restore_drv.sh \
+    usr/lib/oss/scripts/setup-alsa.sh \
+    usr/lib/oss/scripts/remove_drv.sh \
+    usr/lib/oss/build/Makefile.tmpl \
+    usr/lib/oss/build/Makefile.osscore \
+    usr/lib/oss/cuckoo/Makefile
+}
+
+package() {
+  pkgdesc="Open Sound System UNIX audio architecture, without nonfree libflashsupport-oss recommendation (built for the linux-libre-headers package)"
+  depends=('gcc' 'make' 'linux-libre-headers' 'libtool' 'sed')
+  optdepends=('gtk2: for graphical mixer (ossxmix)')
+  replaces=('oss')
+  conflicts=('oss' 'oss-linux' 'oss-linux-free' 'oss-testing')
+  provides=("oss=${pkgver}")
+  backup=('usr/lib/oss/soundon.user')
+  install=oss.install
+
+  cd "${srcdir}/build/prototype"
+  cp -a * "${pkgdir}"
+
+  cd "$pkgdir"
+  mv usr/sbin/* usr/bin
+  rmdir usr/sbin
+  chmod -R a+r . # All files can have read permission (FS#13815)
+  find . -type d -exec chmod a+x '{}' \; # Make namcap happy
+  install -Dm644 "$srcdir/oss.service" usr/lib/systemd/system/oss.service
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/oss-libre/linux-3.8.patch b/libre/oss-libre/linux-3.8.patch
new file mode 100644
index 000000000..46200e01a
--- /dev/null
+++ b/libre/oss-libre/linux-3.8.patch
@@ -0,0 +1,40 @@
+--- setup/Linux/oss/build/pci_wrapper.inc	2009-08-27 05:19:07.000000000 +0300
++++ setup/Linux/oss/build/pci_wrapper.inc	2013-02-08 13:56:10.519794975 +0200
+@@ -17,7 +17,11 @@
+ static dev_map_t dev_map[MAX_INSTANCE];
+ static int n_devmap = 0;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0)
+ static int __devinit
++#else
++static int
++#endif
+ osspci_probe (struct pci_dev *pcidev, const struct pci_device_id *pciid)
+ {
+   oss_device_t *osdev;
+@@ -65,7 +69,11 @@
+   return 0;
+ }
+ 
+-static void __devexit
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0)
++static int __devexit
++#else
++static int
++#endif
+ osspci_remove (struct pci_dev *pcidev)
+ {
+   int i;
+@@ -80,10 +88,11 @@
+ 	pci_disable_device (dev_map[i].pcidev);
+ 	osdev_delete (osdev);
+ 
+-	return;
++	return 0;
+       }
+ 
+   printk (KERN_ALERT DRIVER_NICK ": Can't find the PCI device to detach\n");
++  return -EIO;
+ }
+ 
+ void
diff --git a/libre/oss-libre/oss.install b/libre/oss-libre/oss.install
new file mode 100644
index 000000000..9bd4e1fbc
--- /dev/null
+++ b/libre/oss-libre/oss.install
@@ -0,0 +1,25 @@
+post_install() {
+	echo "Running OSS install script..."
+	sh /usr/lib/oss/build/install.sh &>/dev/null
+	echo
+	echo " Note that OSS can't currently work together with kernel"
+	echo " ALSA modules, so they were moved out by the OSS install"
+	echo " scripts. If you want the ALSA kernel modules back, you can"
+	echo " just remove this package using pacman."
+}
+
+post_upgrade() {
+	echo "Running OSS update script..."
+	sh /usr/lib/oss/build/install.sh &>/dev/null
+}
+
+pre_remove() {
+	# Restore any replaced ALSA drivers.
+	sh /usr/lib/oss/scripts/restore_drv.sh
+}
+
+post_remove() {
+	echo " Open Sound System was now removed, and the ALSA kernel"
+	echo " modules were restored."
+}
+
diff --git a/libre/oss-libre/oss.service b/libre/oss-libre/oss.service
new file mode 100644
index 000000000..0200d2477
--- /dev/null
+++ b/libre/oss-libre/oss.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Open Sound System v4
+Before=sound.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/bin/soundon
+ExecStop=/usr/bin/soundoff
+
+[Install]
+WantedBy=multi-user.target
diff --git a/libre/oss-libre/remove-hal.patch b/libre/oss-libre/remove-hal.patch
new file mode 100644
index 000000000..27e2ef2de
--- /dev/null
+++ b/libre/oss-libre/remove-hal.patch
@@ -0,0 +1,20 @@
+Date: Tue Aug  2 16:37:31 CEST 2011
+Author: Florian Pritz <bluewind@xinu.at>
+This removes all hal dependencies
+
+References:
+http://www.archlinux.org/todo/92/
+
+--- usr/lib/oss/build/install_2011-08-02_162647.sh	2011-08-02 16:26:47.000000000 +0200
++++ usr/lib/oss/build/install.sh	2011-08-02 16:27:13.000000000 +0200
+@@ -336,10 +336,4 @@
+   echo "autosave_mixer yes" > $OSSLIBDIR/etc/userdefs
+ fi
+ 
+-# Hal 0.5.0+ hotplug
+-mkdir -p /usr/lib/hal/scripts
+-ln -sf $OSSLIBDIR/scripts/oss_usb-create-devices /usr/lib/hal/scripts/
+-mkdir -p /usr/share/hal/fdi/policy/20thirdparty/
+-ln -sf $OSSLIBDIR/scripts/90-oss_usb-create-device.fdi /usr/share/hal/fdi/policy/20thirdparty/
+-
+ exit 0
diff --git a/libre/oss-libre/rm-init-scripts.patch b/libre/oss-libre/rm-init-scripts.patch
new file mode 100644
index 000000000..981ff605f
--- /dev/null
+++ b/libre/oss-libre/rm-init-scripts.patch
@@ -0,0 +1,52 @@
+--- usr/lib/oss/build/install.sh.orig	2008-09-25 11:41:47.180167692 -0300
++++ usr/lib/oss/build/install.sh	2008-09-25 11:41:47.180167692 -0300
+@@ -290,38 +290,6 @@
+    echo 
+ fi
+ 
+-if ! test -d /etc/init.d
+-then
+-  mkdir /etc/init.d
+-fi
+-
+-rm -f /etc/init.d/oss /etc/rc.d/rc3.d/S89oss /etc/rc3.d/S89oss
+-cp -f $OSSLIBDIR/etc/S89oss /etc/init.d/oss
+-
+-chmod 744 /etc/init.d/oss
+-
+-if test -x /sbin/chkconfig
+-then
+-  /sbin/chkconfig oss on        > /dev/null 2>&1
+-else
+- if test -x /usr/sbin/update-rc.d
+- then
+-   /usr/sbin/update-rc.d oss defaults > /dev/null 2>&1
+- else
+-  if test -d etc/rc.d/rc3.d
+-  then
+-    rm -f /etc/rc.d/rc3.d/S89oss
+-    ln -s /etc/init.d/oss /etc/rc.d/rc3.d/S89oss
+-  else
+-    if test -d /etc/rc3.d
+-    then
+-      rm -f /etc/rc3.d/S89oss
+-      ln -s /etc/init.d/oss /etc/rc3.d/S89oss
+-    fi
+-  fi
+- fi
+-fi
+-
+ # Install ALSA interface module (Cuckoo)
+ #(cd $OSSLIBDIR/cuckoo && make clean) > /dev/null 2>&1
+ #if (cd $OSSLIBDIR/cuckoo && make install) > /var/log/cuckoo.log 2>&1
+--- usr/lib/oss/scripts/restore_drv.sh.orig	2008-09-25 11:41:47.210168487 -0300
++++ usr/lib/oss/scripts/restore_drv.sh	2008-09-25 11:41:47.210168487 -0300
+@@ -18,8 +18,6 @@
+   fi
+ fi
+ 
+-rm -f /etc/init.d/oss
+-
+ if ! test -d /lib/modules/`uname -r`/kernel/sound
+ then
+    if test -f /lib/modules/`uname -r`/sound-preoss.tar.bz2
diff --git a/libre/oss-libre/soundon.patch b/libre/oss-libre/soundon.patch
new file mode 100644
index 000000000..4702b8680
--- /dev/null
+++ b/libre/oss-libre/soundon.patch
@@ -0,0 +1,28 @@
+--- usr/sbin/soundon.old	2009-09-04 06:35:26.000000000 +0100
++++ usr/sbin/soundon	2009-11-15 13:59:53.000000000 +0000
+@@ -255,7 +255,10 @@
+   then
+      if test "`uname -m` " = "x86_64 "
+      then
+-       ln -sf $OSSLIBDIR/lib/libsalsa.so.2.0.0 /usr/lib64/libasound.so.2
++       # Fix for compatibility with Arch's directory structure
++       # Not that we use it, there is no $OSSLIBDIR/.libsalsa_installed
++       ln -sf $OSSLIBDIR/lib/libsalsa.so.2.0.0 /usr/lib/libasound.so.2
++       #ln -sf $OSSLIBDIR/lib/libsalsa.so.2.0.0 /usr/lib64/libasound.so.2
+        #ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib64
+      else
+        if test -s /lib/libasound.so.2
+@@ -278,8 +281,11 @@
+ then
+    if test "`uname -m` " = "x86_64 "
+    then
+-     ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib64
+-     ln -sf $OSSLIBDIR/lib/libossmix.so /usr/lib64
++     # Fix for compatibility with Arch's directory structure
++     ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib
++     ln -sf $OSSLIBDIR/lib/libossmix.so /usr/lib
++     #ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib64
++     #ln -sf $OSSLIBDIR/lib/libossmix.so /usr/lib64
+    else
+      if test -s /lib/libasound.so.2
+      then
diff --git a/libre/p7zip-libre/PKGBUILD b/libre/p7zip-libre/PKGBUILD
index 2e6ab6e01..fbd189a81 100644
--- a/libre/p7zip-libre/PKGBUILD
+++ b/libre/p7zip-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: PKGBUILD 188504 2013-06-15 04:51:48Z bisson $
 # Contributor: Thayer Williams <thayer@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 # Contributor: TuxSpirit<tuxspirit@archlinux.fr>  2007/11/17 21:22:36 UTC
@@ -8,7 +8,7 @@
 pkgname=p7zip-libre
 _pkgname=${pkgname%-libre}
 pkgver=9.20.1
-pkgrel=6
+pkgrel=7
 pkgdesc='Command-line version of the 7zip compressed file archiver without Rar'
 url='http://p7zip.sourceforge.net/'
 license=('GPL')
@@ -20,21 +20,22 @@ depends=('gcc-libs' 'bash')
 optdepends=('wxgtk: GUI'
             'desktop-file-utils: desktop entries')
 makedepends=('yasm' 'nasm' 'wxgtk')
-source=("http://repo.parabolagnulinux.org/other/${pkgname}_${pkgver}.tar.bz2"
+source=("http://downloads.sourceforge.net/project/${_pkgname}/${_pkgname}/${pkgver}/${_pkgname}_${pkgver}_src_all.tar.bz2"
         'p7zip-libre.patch'
         '7zFM.desktop')
-sha1sums=('4cffac613e7f3d8fc3c60677491b83a2d5cf16c9'
+sha1sums=('1cd567e043ee054bf08244ce15f32cb3258306b7'
           '8fc0e6e80aeec371a8c80e7a6082594ac6d08aed'
           'f2c370d6f1b286b7ce9a2804e22541b755616a40')
+
+options=('!makeflags')
 install=install
 
-mksource() {
-    if [ ! -d "${_pkgname}_${pkgver}" ]; then
-    wget -O - "http://downloads.sourceforge.net/project/${_pkgname}/${_pkgname}/${pkgver}/${_pkgname}_${pkgver}_src_all.tar.bz2" | \
-        tar xjf -
-    fi
+build() {
+	cd "${srcdir}/${_pkgname}_${pkgver}"
 
-    pushd "${_pkgname}_${pkgver}"
+	[[ $CARCH = x86_64 ]] \
+	&& cp makefile.linux_amd64_asm makefile.machine \
+	|| cp makefile.linux_x86_asm_gcc_4.X makefile.machine
 
     msg "Removing unRar"
 # Generate patch
@@ -43,20 +44,7 @@ mksource() {
 # Remove Rar mentions in CPP/7zip/Bundles/Format7zFree/makefile
     patch -Np1 -i ../p7zip-libre.patch
 
-    popd
-
-    tar czvf "${pkgname}_${pkgver}.tar.bz2" "${_pkgname}_${pkgver}"
-}
-
-build() {
-	cd "${srcdir}/${_pkgname}_${pkgver}"
-
-        case $CARCH in
-            x86_64) cp makefile.linux_amd64_asm makefile.machine ;;
-            i686) cp makefile.linux_x86_asm_gcc_4.X makefile.machine ;;
-        esac
-
-        make all4 OPTFLAGS="${CXXFLAGS}"
+	make all4 OPTFLAGS="${CXXFLAGS}"
 }
 
 package() {
@@ -68,7 +56,7 @@ package() {
 		DEST_MAN="/usr/share/man"
 
 	# Integration with stuff...
-	install -D GUI/p7zip_32.png "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/p7zip.png
+	install -Dm644 GUI/p7zip_32.png "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/p7zip.png
 	install -d "${pkgdir}"/usr/share/{applications,kde4/services/ServiceMenus}
 	cp GUI/kde4/* "${pkgdir}"/usr/share/kde4/services/ServiceMenus/
 	cp ../7zFM.desktop "${pkgdir}"/usr/share/applications/
diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index 614c1156e..1dec5dcc9 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -1,10 +1,10 @@
 # vim: set ts=2 sw=2 et:
-# $Id: PKGBUILD 184462 2013-05-07 03:37:44Z allan $
+# $Id: PKGBUILD 188692 2013-06-18 04:04:38Z allan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 
 pkgname=pacman
-pkgver=4.1.1
+pkgver=4.1.2
 pkgrel=1
 pkgdesc="A library-based package manager with dependency support"
 arch=('i686' 'x86_64' 'mips64el')
@@ -26,7 +26,7 @@ source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
         pacman.conf.x86_64
         pacman.conf.mips64el
         makepkg.conf)
-md5sums=('72a1688ff73c1c0b79d8f87b3793d446'
+md5sums=('063c8b0ff6bdf903dc235445525627cd'
          'SKIP'
          '688feb0a552f42643a76f72e7198bfe4'
          '765858b55d2112d948932fc645ea538b'
diff --git a/libre/parabola-keyring/PKGBUILD b/libre/parabola-keyring/PKGBUILD
index d5a1e561d..af130b5c0 100644
--- a/libre/parabola-keyring/PKGBUILD
+++ b/libre/parabola-keyring/PKGBUILD
@@ -1,19 +1,18 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
 pkgname=parabola-keyring
-pkgver=$(LC_ALL=C date -u +%Y%m%d)
+pkgver=$(LC_ALL=C date -u +%Y%m%d).1
 pkgrel=1
 pkgdesc='Parabola GNU/Linux-libre PGP keyring'
 arch=('any')
 url='https://projects.parabolagnulinux.org/hackers.git/'
 license=('GPL')
 install="${pkgname}.install"
-source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz"
-        "http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz.sig")
+source=(http://repo.parabolagnulinux.org/other/parabola-keyring-20130221.tar.gz{,.sig})
 
 package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
+	cd "${srcdir}/${pkgname}-"*
 	make PREFIX=/usr DESTDIR=${pkgdir} install
 }
-md5sums=('ad747cf1f710e5962aa6b0931fcb580f'
-         'c1030ca1c960d2ee6cfe11d798a7b471')
+md5sums=('007c35459478f86484f66323bf90b1e0'
+         'SKIP')
diff --git a/libre/psutils-libre/PKGBUILD b/libre/psutils-libre/PKGBUILD
index 3679222b1..4a55ea38e 100644
--- a/libre/psutils-libre/PKGBUILD
+++ b/libre/psutils-libre/PKGBUILD
@@ -1,16 +1,17 @@
-# $Id: PKGBUILD 140791 2011-10-19 10:03:22Z andrea $
+# $Id: PKGBUILD 176972 2013-02-03 07:11:03Z allan $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: eric <eric@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Contributor: xihh <hahj87@gmail.com>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): xihh <hahj87@gmail.com>
 
 _pkgname=psutils
 pkgname=psutils-libre
 pkgver=1.17
-pkgrel=3.1
+pkgrel=4
 arch=('i686' 'x86_64' 'mips64el')
-pkgdesc="A set of postscript utilities"
-url="http://www.tardis.ed.ac.uk/~ajcd/psutils/index.html"
+pkgdesc="A set of postscript utilities, without nonfree files"
+url="http://knackered.org/angus/psutils/"
 license=('custom')
 depends=('glibc' 'ghostscript')
 provides=('psutils-lprng' 'psutils')
@@ -18,16 +19,22 @@ replaces=('psutils-lprng' 'psutils')
 conflicts=('psutils-lprng' 'psutils')
 options=('!makeflags')
 source=("ftp://ftp.archlinux.org/other/psutils/${_pkgname}-${pkgver}.tar.gz"
-        'psutils-1.17.diff')
+        'psutils-1.17.diff'
+        'libre.patch')
 md5sums=('b161522f3bd1507655326afa7db4a0ad'
-         '2b49e9e796000b42f42804d4b50a2be1')
+         '2b49e9e796000b42f42804d4b50a2be1'
+         'a4beaf371607085e89ef190c1db7aee3')
 
 build() {
   cd "${srcdir}/${_pkgname}"
   patch -Np1 -i "${srcdir}/psutils-1.17.diff"
-  make -f Makefile.unix BINDIR="${pkgdir}/usr/bin" \
-    INCLUDEDIR="${pkgdir}/usr/include/psutils" PERL=/usr/bin/perl \
-    MANDIR="${pkgdir}/usr/share/man/man1" \
+  # apply patch to remove nonfree files support from Makefile
+  patch -Np1 -i "${srcdir}/libre.patch"
+  # remove nonfree files
+  rm -v {fixmacps.{man,pl},md{68_0,71_0}.ps} 
+  make -f Makefile.unix BINDIR=/usr/bin \
+    INCLUDEDIR=/usr/include/psutils PERL=/usr/bin/perl \
+    MANDIR=/usr/share/man/man1 \
     CFLAGS="$CFLAGS -DPAPER=\\\"letter\\\" -DUNIX -Wall" \
     CCFLAGS="$LDFLAGS"
 }
diff --git a/libre/psutils-libre/libre.patch b/libre/psutils-libre/libre.patch
new file mode 100644
index 000000000..c2bd21245
--- /dev/null
+++ b/libre/psutils-libre/libre.patch
@@ -0,0 +1,41 @@
+--- psutils.orig/Makefile.unix	2013-06-21 05:46:39.671197867 -0300
++++ psutils/Makefile.unix	2013-06-21 05:55:30.248672628 -0300
+@@ -44,15 +44,14 @@
+ BIN = psbook psselect pstops epsffit psnup \
+ 	psresize
+ SHELLSCRIPTS = getafm showchar
+-PERLSCRIPTS = fixfmps fixmacps fixpsditps fixpspps \
++PERLSCRIPTS = fixfmps fixpsditps fixpspps \
+ 	fixtpps fixwfwps fixwpps fixscribeps fixwwps \
+ 	fixdlsrps extractres includeres psmerge
+ MANPAGES = psbook.$(MANEXT) psselect.$(MANEXT) pstops.$(MANEXT) epsffit.$(MANEXT) psnup.$(MANEXT) \
+ 	psresize.$(MANEXT) psmerge.$(MANEXT) fixscribeps.$(MANEXT) getafm.$(MANEXT) \
+-	fixdlsrps.$(MANEXT) fixfmps.$(MANEXT) fixmacps.$(MANEXT) fixpsditps.$(MANEXT) \
++	fixdlsrps.$(MANEXT) fixfmps.$(MANEXT) fixpsditps.$(MANEXT) \
+ 	fixpspps.$(MANEXT) fixtpps.$(MANEXT) fixwfwps.$(MANEXT) fixwpps.$(MANEXT) \
+ 	fixwwps.$(MANEXT) extractres.$(MANEXT) includeres.$(MANEXT)
+-INCLUDES = md68_0.ps md71_0.ps
+ 
+ all: $(BIN) $(PERLSCRIPTS) $(MANPAGES) $(SHELLSCRIPTS)
+ 
+@@ -106,10 +105,6 @@
+ 	$(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
+ 	$(CHMOD) $(BINMODE) $@
+ 
+-fixmacps: fixmacps.pl
+-	$(PERL) maketext OS=$(OS) PERL=$(PERL) INCLUDE=$(INCLUDEDIR) $? > $@
+-	$(CHMOD) $(BINMODE) $@
+-
+ fixpsditps: fixpsditps.pl
+ 	$(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
+ 	$(CHMOD) $(BINMODE) $@
+@@ -174,9 +169,6 @@
+ fixfmps.$(MANEXT): fixfmps.man
+ 	$(PERL) maketext "MAN=$(MANPAGES)" $? > $@
+ 
+-fixmacps.$(MANEXT): fixmacps.man
+-	$(PERL) maketext "MAN=$(MANPAGES)" INCLUDE=$(INCLUDEDIR) $? > $@
+-
+ fixpsditps.$(MANEXT): fixpsditps.man
+ 	$(PERL) maketext "MAN=$(MANPAGES)" $? > $@
+ 
diff --git a/libre/python2-bencode/PKGBUILD b/libre/python2-bencode/PKGBUILD
new file mode 100644
index 000000000..762d55cad
--- /dev/null
+++ b/libre/python2-bencode/PKGBUILD
@@ -0,0 +1,24 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+_pkgname=bencode
+pkgname=python2-bencode
+pkgver=1.0
+pkgdesc="BitTorrent bencode module as leight-weight, standalone package"
+url="http://pypi.python.org/pypi/BitTorrent-bencode"
+license=('custom:BitTorrent Open Source License')
+
+pkgrel=1
+arch=('any')
+depends=('python2')
+makedepends=('python2-distribute')
+source=(http://pypi.python.org/packages/source/${_pkgname:0:1}/${_pkgname}/${_pkgname}-${pkgver}.tar.gz
+	bittorrent-osl.txt)
+
+package(){
+  cd "$srcdir/$_pkgname-$pkgver"
+  python2 setup.py install --root="$pkgdir" --optimize=1
+  install -Dm644 "$srcdir"/bittorrent-osl.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
+
+md5sums=('400dd42ff346eb7db91245403f8f2b7b'
+         '016d959cb9f7a319e48d9699c4ef2f42')
diff --git a/libre/python2-bencode/bittorrent-osl.txt b/libre/python2-bencode/bittorrent-osl.txt
new file mode 100644
index 000000000..f0625f45c
--- /dev/null
+++ b/libre/python2-bencode/bittorrent-osl.txt
@@ -0,0 +1,510 @@
+BitTorrent Open Source License
+
+Version 1.1
+
+This BitTorrent Open Source License (the "License") applies to the
+BitTorrent client and related software products as well as any updates
+or maintenance releases of that software ("BitTorrent Products") that
+are distributed by BitTorrent, Inc. ("Licensor"). Any BitTorrent
+Product licensed pursuant to this License is a Licensed
+Product. Licensed Product, in its entirety, is protected by
+U.S. copyright law. This License identifies the terms under which you
+may use, copy, distribute or modify Licensed Product.
+
+Preamble
+
+This Preamble is intended to describe, in plain English, the nature
+and scope of this License. However, this Preamble is not a part of
+this license. The legal effect of this License is dependent only upon
+the terms of the License and not this Preamble.
+
+This License complies with the Open Source Definition and is derived
+from the Jabber Open Source License 1.0 (the "JOSL"), which has been
+approved by Open Source Initiative. Sections 4(c) and 4(f)(iii) from
+the JOSL have been deleted.
+
+This License provides that:
+
+1. You may use or give away the Licensed Product, alone or as a
+component of an aggregate software distribution containing programs
+from several different sources. No royalty or other fee is required.
+
+2. Both Source Code and executable versions of the Licensed Product,
+including Modifications made by previous Contributors, are available
+for your use. (The terms "Licensed Product," "Modifications,"
+"Contributors" and "Source Code" are defined in the License.)
+
+3. You are allowed to make Modifications to the Licensed Product, and
+you can create Derivative Works from it. (The term "Derivative Works"
+is defined in the License.)
+
+4. By accepting the Licensed Product under the provisions of this
+License, you agree that any Modifications you make to the Licensed
+Product and then distribute are governed by the provisions of this
+License. In particular, you must make the Source Code of your
+Modifications available to others free of charge and without a
+royalty.
+
+5. You may sell, accept donations or otherwise receive compensation
+for executable versions of a Licensed Product, without paying a
+royalty or other fee to the Licensor or any Contributor, provided that
+such executable versions contain your or another Contributor?s
+material Modifications. For the avoidance of doubt, to the extent your
+executable version of a Licensed Product does not contain your or
+another Contributor?s material Modifications, you may not sell, accept
+donations or otherwise receive compensation for such executable.
+
+You may use the Licensed Product for any purpose, but the Licensor is
+not providing you any warranty whatsoever, nor is the Licensor
+accepting any liability in the event that the Licensed Product doesn't
+work properly or causes you any injury or damages.
+
+6. If you sublicense the Licensed Product or Derivative Works, you may
+charge fees for warranty or support, or for accepting indemnity or
+liability obligations to your customers. You cannot charge for, sell,
+accept donations or otherwise receive compensation for the Source
+Code.
+
+7. If you assert any patent claims against the Licensor relating to
+the Licensed Product, or if you breach any terms of the License, your
+rights to the Licensed Product under this License automatically
+terminate.
+
+You may use this License to distribute your own Derivative Works, in
+which case the provisions of this License will apply to your
+Derivative Works just as they do to the original Licensed Product.
+
+Alternatively, you may distribute your Derivative Works under any
+other OSI-approved Open Source license, or under a proprietary license
+of your choice. If you use any license other than this License,
+however, you must continue to fulfill the requirements of this License
+(including the provisions relating to publishing the Source Code) for
+those portions of your Derivative Works that consist of the Licensed
+Product, including the files containing Modifications.
+
+New versions of this License may be published from time to time in
+connection with new versions of a Licensed Product or otherwise. You
+may choose to continue to use the license terms in this version of the
+License for the Licensed Product that was originally licensed
+hereunder, however, the new versions of this License will at all times
+apply to new versions of the Licensed Product released by Licensor
+after the release of the new version of this License. Only the
+Licensor has the right to change the License terms as they apply to
+the Licensed Product.
+
+This License relies on precise definitions for certain terms. Those
+terms are defined when they are first used, and the definitions are
+repeated for your convenience in a Glossary at the end of the License.
+
+License Terms
+
+1. Grant of License From Licensor. Subject to the terms and conditions
+of this License, Licensor hereby grants you a world-wide,
+royalty-free, non-exclusive license, subject to third party
+intellectual property claims, to do the following:
+
+a. Use, reproduce, modify, display, perform, sublicense and distribute
+any Modifications created by a Contributor or portions thereof, in
+both Source Code or as an executable program, either on an unmodified
+basis or as part of Derivative Works.
+
+b. Under claims of patents now or hereafter owned or controlled by
+Contributor, to make, use, sell, offer for sale, have made, and/or
+otherwise dispose of Modifications or portions thereof, but solely to
+the extent that any such claim is necessary to enable you to make,
+use, sell, offer for sale, have made, and/or otherwise dispose of
+Modifications or portions thereof or Derivative Works thereof.
+
+2. Grant of License to Modifications From Contributor. "Modifications"
+means any additions to or deletions from the substance or structure of
+(i) a file containing a Licensed Product, or (ii) any new file that
+contains any part of a Licensed Product. Hereinafter in this License,
+the term "Licensed Product" shall include all previous Modifications
+that you receive from any Contributor. Subject to the terms and
+conditions of this License, By application of the provisions in
+Section 4(a) below, each person or entity who created or contributed
+to the creation of, and distributed, a Modification (a "Contributor")
+hereby grants you a world-wide, royalty-free, non-exclusive license,
+subject to third party intellectual property claims, to do the
+following:
+
+a. Use, reproduce, modify, display, perform, sublicense and distribute
+any Modifications created by such Contributor or portions thereof, in
+both Source Code or as an executable program, either on an unmodified
+basis or as part of Derivative Works.
+
+b. Under claims of patents now or hereafter owned or controlled by
+Contributor, to make, use, sell, offer for sale, have made, and/or
+otherwise dispose of Modifications or portions thereof, but solely to
+the extent that any such claim is necessary to enable you to make,
+use, sell, offer for sale, have made, and/or otherwise dispose of
+Modifications or portions thereof or Derivative Works thereof.
+
+3. Exclusions From License Grant. Nothing in this License shall be
+deemed to grant any rights to trademarks, copyrights, patents, trade
+secrets or any other intellectual property of Licensor or any
+Contributor except as expressly stated herein. No patent license is
+granted separate from the Licensed Product, for code that you delete
+from the Licensed Product, or for combinations of the Licensed Product
+with other software or hardware. No right is granted to the trademarks
+of Licensor or any Contributor even if such marks are included in the
+Licensed Product. Nothing in this License shall be interpreted to
+prohibit Licensor from licensing under different terms from this
+License any code that Licensor otherwise would have a right to
+license. As an express condition for your use of the Licensed Product,
+you hereby agree that you will not, without the prior written consent
+of Licensor, use any trademarks, copyrights, patents, trade secrets or
+any other intellectual property of Licensor or any Contributor except
+as expressly stated herein. For the avoidance of doubt and without
+limiting the foregoing, you hereby agree that you will not use or
+display any trademark of Licensor or any Contributor in any domain
+name, directory filepath, advertisement, link or other reference to
+you in any manner or in any media.
+
+4. Your Obligations Regarding Distribution.
+
+a. Application of This License to Your Modifications. As an express
+condition for your use of the Licensed Product, you hereby agree that
+any Modifications that you create or to which you contribute, and
+which you distribute, are governed by the terms of this License
+including, without limitation, Section 2. Any Modifications that you
+create or to which you contribute may be distributed only under the
+terms of this License or a future version of this License released
+under Section 7. You must include a copy of this License with every
+copy of the Modifications you distribute. You agree not to offer or
+impose any terms on any Source Code or executable version of the
+Licensed Product or Modifications that alter or restrict the
+applicable version of this License or the recipients' rights
+hereunder. However, you may include an additional document offering
+the additional rights described in Section 4(d).
+
+b. Availability of Source Code. You must make available, without
+charge, under the terms of this License, the Source Code of the
+Licensed Product and any Modifications that you distribute, either on
+the same media as you distribute any executable or other form of the
+Licensed Product, or via a mechanism generally accepted in the
+software development community for the electronic transfer of data (an
+"Electronic Distribution Mechanism"). The Source Code for any version
+of Licensed Product or Modifications that you distribute must remain
+available for as long as any executable or other form of the Licensed
+Product is distributed by you. You are responsible for ensuring that
+the Source Code version remains available even if the Electronic
+Distribution Mechanism is maintained by a third party.
+
+c. Intellectual Property Matters.
+
+i. Third Party Claims. If you have knowledge that a license to a third
+party's intellectual property right is required to exercise the rights
+granted by this License, you must include a text file with the Source
+Code distribution titled "LEGAL" that describes the claim and the
+party making the claim in sufficient detail that a recipient will know
+whom to contact. If you obtain such knowledge after you make any
+Modifications available as described in Section 4(b), you shall
+promptly modify the LEGAL file in all copies you make available
+thereafter and shall take other steps (such as notifying appropriate
+mailing lists or newsgroups) reasonably calculated to inform those who
+received the Licensed Product from you that new knowledge has been
+obtained.
+
+ii. Contributor APIs. If your Modifications include an application
+programming interface ("API") and you have knowledge of patent
+licenses that are reasonably necessary to implement that API, you must
+also include this information in the LEGAL file.
+
+iii. Representations. You represent that, except as disclosed pursuant
+to 4(c)(i) above, you believe that any Modifications you distribute
+are your original creations and that you have sufficient rights to
+grant the rights conveyed by this License.
+
+d. Required Notices. You must duplicate this License in any
+documentation you provide along with the Source Code of any
+Modifications you create or to which you contribute, and which you
+distribute, wherever you describe recipients' rights relating to
+Licensed Product. You must duplicate the notice contained in Exhibit A
+(the "Notice") in each file of the Source Code of any copy you
+distribute of the Licensed Product. If you created a Modification, you
+may add your name as a Contributor to the Notice. If it is not
+possible to put the Notice in a particular Source Code file due to its
+structure, then you must include such Notice in a location (such as a
+relevant directory file) where a user would be likely to look for such
+a notice. You may choose to offer, and charge a fee for, warranty,
+support, indemnity or liability obligations to one or more recipients
+of Licensed Product. However, you may do so only on your own behalf,
+and not on behalf of the Licensor or any Contributor. You must make it
+clear that any such warranty, support, indemnity or liability
+obligation is offered by you alone, and you hereby agree to indemnify
+the Licensor and every Contributor for any liability incurred by the
+Licensor or such Contributor as a result of warranty, support,
+indemnity or liability terms you offer.
+
+e. Distribution of Executable Versions. You may distribute Licensed
+Product as an executable program under a license of your choice that
+may contain terms different from this License provided (i) you have
+satisfied the requirements of Sections 4(a) through 4(d) for that
+distribution, (ii) you include a conspicuous notice in the executable
+version, related documentation and collateral materials stating that
+the Source Code version of the Licensed Product is available under the
+terms of this License, including a description of how and where you
+have fulfilled the obligations of Section 4(b), and (iii) you make it
+clear that any terms that differ from this License are offered by you
+alone, not by Licensor or any Contributor. You hereby agree to
+indemnify the Licensor and every Contributor for any liability
+incurred by Licensor or such Contributor as a result of any terms you
+offer.
+
+f. Distribution of Derivative Works. You may create Derivative Works
+(e.g., combinations of some or all of the Licensed Product with other
+code) and distribute the Derivative Works as products under any other
+license you select, with the proviso that the requirements of this
+License are fulfilled for those portions of the Derivative Works that
+consist of the Licensed Product or any Modifications thereto.
+
+g. Compensation for Distribution of Executable Versions of Licensed
+Products, Modifications or Derivative Works. Notwithstanding any
+provision of this License to the contrary, by distributing, selling,
+licensing, sublicensing or otherwise making available any Licensed
+Product, or Modification or Derivative Work thereof, you and Licensor
+hereby acknowledge and agree that you may sell, license or sublicense
+for a fee, accept donations or otherwise receive compensation for
+executable versions of a Licensed Product, without paying a royalty or
+other fee to the Licensor or any other Contributor, provided that such
+executable versions (i) contain your or another Contributor?s material
+Modifications, or (ii) are otherwise material Derivative Works. For
+purposes of this License, an executable version of the Licensed
+Product will be deemed to contain a material Modification, or will
+otherwise be deemed a material Derivative Work, if (a) the Licensed
+Product is modified with your own or a third party?s software programs
+or other code, and/or the Licensed Product is combined with a number
+of your own or a third party?s software programs or code,
+respectively, and (b) such software programs or code add or contribute
+material value, functionality or features to the License Product. For
+the avoidance of doubt, to the extent your executable version of a
+Licensed Product does not contain your or another Contributor?s
+material Modifications or is otherwise not a material Derivative Work,
+in each case as contemplated herein, you may not sell, license or
+sublicense for a fee, accept donations or otherwise receive
+compensation for such executable. Additionally, without limitation of
+the foregoing and notwithstanding any provision of this License to the
+contrary, you cannot charge for, sell, license or sublicense for a
+fee, accept donations or otherwise receive compensation for the Source
+Code.
+
+5. Inability to Comply Due to Statute or Regulation. If it is
+impossible for you to comply with any of the terms of this License
+with respect to some or all of the Licensed Product due to statute,
+judicial order, or regulation, then you must (i) comply with the terms
+of this License to the maximum extent possible, (ii) cite the statute
+or regulation that prohibits you from adhering to the License, and
+(iii) describe the limitations and the code they affect. Such
+description must be included in the LEGAL file described in Section
+4(d), and must be included with all distributions of the Source
+Code. Except to the extent prohibited by statute or regulation, such
+description must be sufficiently detailed for a recipient of ordinary
+skill at computer programming to be able to understand it.
+
+6. Application of This License. This License applies to code to which
+Licensor or Contributor has attached the Notice in Exhibit A, which is
+incorporated herein by this reference.
+
+7. Versions of This License.
+
+a. New Versions. Licensor may publish from time to time revised and/or
+new versions of the License.
+
+b. Effect of New Versions. Once Licensed Product has been published
+under a particular version of the License, you may always continue to
+use it under the terms of that version, provided that any such license
+be in full force and effect at the time, and has not been revoked or
+otherwise terminated. You may also choose to use such Licensed Product
+under the terms of any subsequent version (but not any prior version)
+of the License published by Licensor. No one other than Licensor has
+the right to modify the terms applicable to Licensed Product created
+under this License.
+
+c. Derivative Works of this License. If you create or use a modified
+version of this License, which you may do only in order to apply it to
+software that is not already a Licensed Product under this License,
+you must rename your license so that it is not confusingly similar to
+this License, and must make it clear that your license contains terms
+that differ from this License. In so naming your license, you may not
+use any trademark of Licensor or any Contributor.
+
+8. Disclaimer of Warranty. LICENSED PRODUCT IS PROVIDED UNDER THIS
+LICENSE ON AN AS IS BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER
+EXPRESS OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE
+LICENSED PRODUCT IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A
+PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE
+QUALITY AND PERFORMANCE OF THE LICENSED PRODUCT IS WITH YOU. SHOULD
+LICENSED PRODUCT PROVE DEFECTIVE IN ANY RESPECT, YOU (AND NOT THE
+LICENSOR OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
+SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY
+CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF LICENSED
+PRODUCT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+9. Termination.
+
+a. Automatic Termination Upon Breach. This license and the rights
+granted hereunder will terminate automatically if you fail to comply
+with the terms herein and fail to cure such breach within ten (10)
+days of being notified of the breach by the Licensor. For purposes of
+this provision, proof of delivery via email to the address listed in
+the ?WHOIS? database of the registrar for any website through which
+you distribute or market any Licensed Product, or to any alternate
+email address which you designate in writing to the Licensor, shall
+constitute sufficient notification. All sublicenses to the Licensed
+Product that are properly granted shall survive any termination of
+this license so long as they continue to complye with the terms of
+this License. Provisions that, by their nature, must remain in effect
+beyond the termination of this License, shall survive.
+
+b. Termination Upon Assertion of Patent Infringement. If you initiate
+litigation by asserting a patent infringement claim (excluding
+declaratory judgment actions) against Licensor or a Contributor
+(Licensor or Contributor against whom you file such an action is
+referred to herein as Respondent) alleging that Licensed Product
+directly or indirectly infringes any patent, then any and all rights
+granted by such Respondent to you under Sections 1 or 2 of this
+License shall terminate prospectively upon sixty (60) days notice from
+Respondent (the "Notice Period") unless within that Notice Period you
+either agree in writing (i) to pay Respondent a mutually agreeable
+reasonably royalty for your past or future use of Licensed Product
+made by such Respondent, or (ii) withdraw your litigation claim with
+respect to Licensed Product against such Respondent. If within said
+Notice Period a reasonable royalty and payment arrangement are not
+mutually agreed upon in writing by the parties or the litigation claim
+is not withdrawn, the rights granted by Licensor to you under Sections
+1 and 2 automatically terminate at the expiration of said Notice
+Period.
+
+c. Reasonable Value of This License. If you assert a patent
+infringement claim against Respondent alleging that Licensed Product
+directly or indirectly infringes any patent where such claim is
+resolved (such as by license or settlement) prior to the initiation of
+patent infringement litigation, then the reasonable value of the
+licenses granted by said Respondent under Sections 1 and 2 shall be
+taken into account in determining the amount or value of any payment
+or license.
+
+d. No Retroactive Effect of Termination. In the event of termination
+under Sections 9(a) or 9(b) above, all end user license agreements
+(excluding licenses to distributors and resellers) that have been
+validly granted by you or any distributor hereunder prior to
+termination shall survive termination.
+
+10. Limitation of Liability. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL
+THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE,
+SHALL THE LICENSOR, ANY CONTRIBUTOR, OR ANY DISTRIBUTOR OF LICENSED
+PRODUCT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY
+PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF
+GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND
+ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE
+BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
+LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
+RESULTING FROM SUCH PARTYS NEGLIGENCE TO THE EXTENT APPLICABLE LAW
+PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
+EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
+THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+
+11. Responsibility for Claims. As between Licensor and Contributors,
+each party is responsible for claims and damages arising, directly or
+indirectly, out of its utilization of rights under this License. You
+agree to work with Licensor and Contributors to distribute such
+responsibility on an equitable basis. Nothing herein is intended or
+shall be deemed to constitute any admission of liability.
+
+12. U.S. Government End Users. The Licensed Product is a commercial
+item, as that term is defined in 48 C.F.R. 2.101 (Oct. 1995),
+consisting of commercial computer software and commercial computer
+software documentation, as such terms are used in 48 C.F.R. 12.212
+(Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48
+C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government
+End Users acquire Licensed Product with only those rights set forth
+herein.
+
+13. Miscellaneous. This License represents the complete agreement
+concerning the subject matter hereof. If any provision of this License
+is held to be unenforceable, such provision shall be reformed only to
+the extent necessary to make it enforceable. This License shall be
+governed by California law provisions (except to the extent applicable
+law, if any, provides otherwise), excluding its conflict-of-law
+provisions. You expressly agree that in any litigation relating to
+this license the losing party shall be responsible for costs
+including, without limitation, court costs and reasonable attorneys
+fees and expenses. The application of the United Nations Convention on
+Contracts for the International Sale of Goods is expressly
+excluded. Any law or regulation that provides that the language of a
+contract shall be construed against the drafter shall not apply to
+this License.
+
+14. Definition of You in This License. You throughout this License,
+whether in upper or lower case, means an individual or a legal entity
+exercising rights under, and complying with all of the terms of, this
+License or a future version of this License issued under Section
+7. For legal entities, you includes any entity that controls, is
+controlled by, is under common control with, or affiliated with,
+you. For purposes of this definition, control means (i) the power,
+direct or indirect, to cause the direction or management of such
+entity, whether by contract or otherwise, or (ii) ownership of fifty
+percent (50%) or more of the outstanding shares, or (iii) beneficial
+ownership of such entity. You are responsible for advising any
+affiliated entity of the terms of this License, and that any rights or
+privileges derived from or obtained by way of this License are subject
+to the restrictions outlined herein.
+
+15. Glossary. All defined terms in this License that are used in more
+than one Section of this License are repeated here, in alphabetical
+order, for the convenience of the reader. The Section of this License
+in which each defined term is first used is shown in parentheses.
+
+Contributor: Each person or entity who created or contributed to the
+creation of, and distributed, a Modification. (See Section 2)
+
+Derivative Works: That term as used in this License is defined under
+U.S. copyright law. (See Section 1(b))
+
+License: This BitTorrent Open Source License. (See first paragraph of License)
+
+Licensed Product: Any BitTorrent Product licensed pursuant to this
+License. The term "Licensed Product" includes all previous
+Modifications from any Contributor that you receive. (See first
+paragraph of License and Section 2)
+
+Licensor: BitTorrent, Inc. (See first paragraph of License)
+
+Modifications: Any additions to or deletions from the substance or
+structure of (i) a file containing Licensed Product, or (ii) any new
+file that contains any part of Licensed Product. (See Section 2)
+
+Notice: The notice contained in Exhibit A. (See Section 4(e))
+
+Source Code: The preferred form for making modifications to the
+Licensed Product, including all modules contained therein, plus any
+associated interface definition files, scripts used to control
+compilation and installation of an executable program, or a list of
+differential comparisons against the Source Code of the Licensed
+Product. (See Section 1(a))
+
+You: This term is defined in Section 14 of this License.
+
+EXHIBIT A
+
+The Notice below must appear in each file of the Source Code of any
+copy you distribute of the Licensed Product or any
+hereto. Contributors to any Modifications may add their own copyright
+notices to identify their own contributions.
+
+License:
+
+The contents of this file are subject to the BitTorrent Open Source
+License Version 1.0 (the License). You may not copy or use this file,
+in either source code or executable form, except in compliance with
+the License. You may obtain a copy of the License at
+http://www.bittorrent.com/license/.
+
+Software distributed under the License is distributed on an AS IS
+basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+the License for the specific language governing rights and limitations
+under the License.
+
+BitTorrent, Inc.
diff --git a/libre/python2-cssmin-fredj/PKGBUILD b/libre/python2-cssmin-fredj/PKGBUILD
index 0f155de89..ba21b8fc4 100644
--- a/libre/python2-cssmin-fredj/PKGBUILD
+++ b/libre/python2-cssmin-fredj/PKGBUILD
@@ -4,14 +4,13 @@ _pkgname=python2-cssmin
 pkgname=python2-cssmin-fredj
 pkgver=0.1.4.git4 # 0.1.4.git<number of commits after 0.1.4>
 _gitver='commit=3422b9962c5a6c2adb9597f418131d73e991c9b6'
-pkgdesc="Provides a country field for Django models"
-license=('custom:MIT')
-url="http://bitbucket.org/smileychris/django-countries/"
-
+pkgdesc="A Python port of the YUI CSS compression algorithm"
+license=('custom:MIT' 'custom:BSD3')
+url="https://github.com/fredj/cssmin"
 provides=("$_pkgname=$pkgver")
 conflicts=("$_pkgname")
 
-pkgrel=1
+pkgrel=2
 arch=(any)
 
 makedepends=('python2-distribute')
diff --git a/libre/python2-jsmin/PKGBUILD b/libre/python2-jsmin/PKGBUILD
new file mode 100644
index 000000000..5c7646ec2
--- /dev/null
+++ b/libre/python2-jsmin/PKGBUILD
@@ -0,0 +1,27 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+_pkgname=jsmin
+pkgname=python2-jsmin
+pkgver=2.0.3
+pkgdesc="JavaScript minifier"
+url="https://bitbucket.org/dcs/jsmin"
+license=('MIT')
+
+pkgrel=1
+arch=('any')
+depends=('python2')
+makedepends=('python2-distribute')
+source=(http://pypi.python.org/packages/source/${_pkgname:0:1}/${_pkgname}/${_pkgname}-${pkgver}.tar.gz)
+
+build() {
+	cd "$srcdir/$_pkgname-$pkgver"
+	sed -rn 's/^#\s?//p' jsmin/__init__.py > license.txt
+}
+
+package() {
+	cd "$srcdir/$_pkgname-$pkgver"
+	python2 setup.py install --root="$pkgdir" --optimize=1
+	install -Dm644 license.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
+
+md5sums=('6bdce452c7508d9bd11b133e965fb64e')
diff --git a/libre-testing/ronn/PKGBUILD b/libre/ronn/PKGBUILD
index 4bd097048..4bd097048 100644
--- a/libre-testing/ronn/PKGBUILD
+++ b/libre/ronn/PKGBUILD
diff --git a/libre-testing/ruby-hpricot/PKGBUILD b/libre/ruby-hpricot/PKGBUILD
index ad9aefc36..ad9aefc36 100644
--- a/libre-testing/ruby-hpricot/PKGBUILD
+++ b/libre/ruby-hpricot/PKGBUILD
diff --git a/libre-testing/ruby-mustache/PKGBUILD b/libre/ruby-mustache/PKGBUILD
index d7090cc0d..d7090cc0d 100644
--- a/libre-testing/ruby-mustache/PKGBUILD
+++ b/libre/ruby-mustache/PKGBUILD
diff --git a/libre-testing/ruby-rdiscount/PKGBUILD b/libre/ruby-rdiscount/PKGBUILD
index 76e4b58bd..76e4b58bd 100644
--- a/libre-testing/ruby-rdiscount/PKGBUILD
+++ b/libre/ruby-rdiscount/PKGBUILD
diff --git a/libre-testing/sh-roundup/PKGBUILD b/libre/sh-roundup/PKGBUILD
index 7c17669d3..7c17669d3 100644
--- a/libre-testing/sh-roundup/PKGBUILD
+++ b/libre/sh-roundup/PKGBUILD
diff --git a/libre-testing/sh-roundup/makefile-fix.patch b/libre/sh-roundup/makefile-fix.patch
index b97bebf23..b97bebf23 100644
--- a/libre-testing/sh-roundup/makefile-fix.patch
+++ b/libre/sh-roundup/makefile-fix.patch
diff --git a/libre/soundkonverter-libre/PKGBUILD b/libre/soundkonverter-libre/PKGBUILD
index a5c04bec4..b8872fa5d 100644
--- a/libre/soundkonverter-libre/PKGBUILD
+++ b/libre/soundkonverter-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90159 2013-05-07 13:40:35Z stativ $
+# $Id: PKGBUILD 92587 2013-06-09 14:53:02Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Eric Belanger <eric@archlinux.org>
@@ -7,7 +7,7 @@
 
 _pkgname=soundkonverter
 pkgname=soundkonverter-libre
-pkgver=2.0.2
+pkgver=2.0.3
 pkgrel=1
 pkgdesc="Front-end to various audio converters, without nonfree faac and mac recommendation"
 arch=('i686' 'x86_64')
@@ -36,7 +36,7 @@ conflicts=$_pkgname
 provides=$_pkgname=$pkgver
 install=$_pkgname.install
 source=("http://kde-apps.org/CONTENT/content-files/29024-${_pkgname}-${pkgver}.tar.gz")
-md5sums=('08076f9d8c017d8c31f18b94bc9e6878')
+md5sums=('1c18d9227bac57a910e2a7b2e18870d8')
 
 build() {
   cd "$srcdir"/$_pkgname-$pkgver
diff --git a/libre/spectrwm-libre/PKGBUILD b/libre/spectrwm-libre/PKGBUILD
index d873da4f7..27758d8a0 100644
--- a/libre/spectrwm-libre/PKGBUILD
+++ b/libre/spectrwm-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id$
+# $Id: PKGBUILD 92647 2013-06-10 15:12:25Z bpiotrowski $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
 
 _pkgname=spectrwm
 pkgname=spectrwm-libre
-pkgver=2.2.0
+pkgver=2.3.0
 pkgrel=1
 pkgdesc="A minimalistic automatic tiling window manager that tries to stay out of the way, without nonfree profont support"
 arch=('i686' 'x86_64' 'mips64el')
@@ -21,7 +21,7 @@ backup=(etc/spectrwm.conf)
 source=(http://opensource.conformal.com/snapshots/$_pkgname/$_pkgname-$pkgver.tgz \
 	LICENSE \
         baraction.sh)
-md5sums=('c572727b5fb9fe3674c03a7e51d191c4'
+md5sums=('7698a5b219fdabad07a76ef45b1360d1'
          'a67cfe51079481e5b0eab1ad371379e3'
          '950d663692e1da56e0ac864c6c3ed80e')
 
@@ -56,8 +56,8 @@ package() {
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$_pkgname/LICENSE"
   install -Dm755 baraction.sh "$pkgdir/usr/share/spectrwm/baraction.sh"
 
-  ln -s /usr/lib/libswmhack.so.0.0 "$pkgdir/usr/lib/libswmhack.so.0"
-  ln -s /usr/lib/libswmhack.so.0.0 "$pkgdir/usr/lib/libswmhack.so"
+  #ln -s /usr/lib/libswmhack.so.0.0 "$pkgdir/usr/lib/libswmhack.so.0"
+  #ln -s /usr/lib/libswmhack.so.0.0 "$pkgdir/usr/lib/libswmhack.so"
 
   # fix this for real in the makefile
   rm "$pkgdir/usr/bin/scrotwm"
diff --git a/libre/syslinux/PKGBUILD b/libre/syslinux/PKGBUILD
index d23deae0a..f9907d3f4 100644
--- a/libre/syslinux/PKGBUILD
+++ b/libre/syslinux/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 185894 2013-05-19 17:17:51Z tpowa $
+# $Id: PKGBUILD 187808 2013-06-06 07:51:31Z tpowa $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname=syslinux
-pkgver=5.01
-pkgrel=4
+pkgver=5.10
+pkgrel=3
 arch=('i686' 'x86_64')
 pkgdesc="Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE (Parabola rebranded)"
 url="http://www.syslinux.org"
@@ -25,7 +25,7 @@ source=(http://www.kernel.org/pub/linux/utils/boot/syslinux/$pkgname-${pkgver}.t
         syslinux.cfg
         syslinux-install_update
         splash.png)
-md5sums=('6c21244277fa4e444967ba45469de863'
+md5sums=('8f51d6a5d2730f534ba90e71f3347bff'
          '25af85a05e7b212b7fb8b7587175e492'
          'e5a69630e3f7083aad2d14362b6117b3'
          '4450792e13a0270c1b89bb6a66ce2fbc'
diff --git a/libre/syslinux/syslinux-install_update b/libre/syslinux/syslinux-install_update
index 6d52f7703..47d4d88be 100644
--- a/libre/syslinux/syslinux-install_update
+++ b/libre/syslinux/syslinux-install_update
@@ -334,7 +334,7 @@ _install() {
 update() {
     # Update c32 files in /boot, if /boot is not on same fs
     if [[ "$boot" = boot ]]; then
-        for file in "$bootpath"/*.{c32}; do
+        for file in "$bootpath"/*.c32; do
             file=${file##*/}
             cp "$libpath/$file" "$bootpath/$file" &> /dev/null
         done
diff --git a/libre/tomoyo-tools-libre/PKGBUILD b/libre/tomoyo-tools-libre/PKGBUILD
new file mode 100644
index 000000000..02a181b55
--- /dev/null
+++ b/libre/tomoyo-tools-libre/PKGBUILD
@@ -0,0 +1,42 @@
+# $Id: PKGBUILD 92638 2013-06-10 09:53:54Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Jamie Nguyen <jamie AT tomoyolinux.co.uk>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+_pkgname=tomoyo-tools
+pkgname=tomoyo-tools-libre
+_basever=2.5.0
+_timestamp=20130406
+_file=53357
+pkgver=${_basever}.${_timestamp}
+pkgrel=1
+pkgdesc='TOMOYO Linux userspace tools for Linux kernels >=3.2 (built for the linux-libre kernel package)'
+arch=('i686' 'x86_64' 'mips64el')
+url='http://tomoyo.sourceforge.jp'
+#url='http://sourceforge.jp/projects/tomoyo/releases/?package_id=9818'
+license=('GPL')
+depends=('ncurses' 'linux-libre>=3.2')
+replaces=${_pkgname}
+conflicts=${_pkgname}
+provides=${_pkgname}=${pkgver}
+install=tomoyo-tools.install
+source=("http://sourceforge.jp/frs/redir.php?f=/tomoyo/${_file}/${_pkgname}-${_basever}-${_timestamp}.tar.gz")
+md5sums=('8888f83fcb87823d714ff551e8680d0d')
+
+prepare() {
+  cd "${srcdir}/${_pkgname}"
+  sed -i \
+    -e 's|usr/sbin|usr/bin|g' \
+    -e 's|sbin|usr/bin|g' \
+    usr_lib_tomoyo/init_policy.c
+}
+
+build() {
+  cd "${srcdir}/${_pkgname}"
+  make USRSBINDIR=/usr/bin SBINDIR=/usr/bin
+}
+
+package() {
+  cd "${srcdir}/${_pkgname}"
+  make USRSBINDIR=/usr/bin SBINDIR=/usr/bin INSTALLDIR="${pkgdir}" install
+}
diff --git a/libre/tomoyo-tools-libre/tomoyo-tools.install b/libre/tomoyo-tools-libre/tomoyo-tools.install
new file mode 100644
index 000000000..c23df1212
--- /dev/null
+++ b/libre/tomoyo-tools-libre/tomoyo-tools.install
@@ -0,0 +1,11 @@
+post_install () {
+  echo
+  echo " * To enable TOMOYO Linux, append 'security=tomoyo TOMOYO_trigger=/usr/bin/init' to the kernel"
+  echo "   boot options and initialize policy with this command:"
+  echo "     /usr/lib/tomoyo/init_policy"
+  echo
+}
+
+post_upgrade () {
+    post_install $1
+}
diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD
index 4dd77dda3..d1f32979d 100644
--- a/libre/tp_smapi-libre/PKGBUILD
+++ b/libre/tp_smapi-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 91724 2013-05-26 15:41:39Z tpowa $
+# $Id: PKGBUILD 93220 2013-06-28 18:55:23Z foutrelis $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: xduugu
 # Contributor: nh2
@@ -12,7 +12,7 @@
 _pkgname=tp_smapi
 pkgname=tp_smapi-libre
 pkgver=0.41
-pkgrel=22
+pkgrel=25
 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'
diff --git a/libre/vhba-module-libre/60-vhba.rules b/libre/vhba-module-libre/60-vhba.rules
index e4de1dca7..39ae3a4ec 100644
--- a/libre/vhba-module-libre/60-vhba.rules
+++ b/libre/vhba-module-libre/60-vhba.rules
@@ -1,13 +1 @@
-ACTION=="remove", GOTO="vhba_end"
-KERNEL!="vhba_ctl", GOTO="vhba_end"
-
-NAME="vhba_ctl", MODE="0660", OWNER="root", GROUP="cdemu"
-
-TEST=="/sys/fs/cgroup/systemd", GOTO="vhba_uaccess"
-TAG+="udev-acl"
-GOTO="vhba_end"
-
-LABEL="vhba_uaccess"
-TAG+="uaccess"
-
-LABEL="vhba_end"
+ACTION=="add", KERNEL=="vhba_ctl", NAME="vhba_ctl", MODE="0660", OWNER="root", GROUP="cdemu", TAG+="uaccess"
diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD
index b1f8c6ffb..caa3016d1 100644
--- a/libre/vhba-module-libre/PKGBUILD
+++ b/libre/vhba-module-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 91726 2013-05-26 15:41:55Z tpowa $
+# $Id: PKGBUILD 93222 2013-06-28 18:56:50Z foutrelis $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Charles Lindsay <charles@chaoslizard.org>
@@ -6,9 +6,9 @@
 
 _pkgname=vhba-module
 pkgname=vhba-module-libre
-pkgver=20120422
+pkgver=20130607
 _extramodules=extramodules-3.9-LIBRE
-pkgrel=25
+pkgrel=4
 pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cdemu.sourceforge.net/"
@@ -22,28 +22,24 @@ conflicts=('vhba-module')
 provides=("vhba-module=$pkgver")
 source=("http://downloads.sourceforge.net/cdemu/$_pkgname-$pkgver.tar.bz2"
         '60-vhba.rules')
-md5sums=('d97372da1d270d1605742b2995fb6678'
-         'b5e82d0160e7a181219b67c1794d5c27')
+md5sums=('92a681e4665aa85a8335d00395a61697'
+         '4dc37dc348b5a2c83585829bde790dcc')
 
 build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
+  cd $_pkgname-$pkgver
   _kernver="$(cat /usr/lib/modules/$_extramodules/version)"
-
   make KDIR=/usr/lib/modules/$_kernver/build
 }
 
 package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  install -Dm644 vhba.ko \
-    "$pkgdir/usr/lib/modules/$_extramodules/vhba.ko"
-
-  sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extramodules'/" \
-    "$startdir/vhba-module.install"
-
-  install -Dm644 "$srcdir/60-vhba.rules" \
-	  "$pkgdir/usr/lib/udev/rules.d/60-vhba.rules"
+  cd $_pkgname-$pkgver
+  install -Dm644 vhba.ko "$pkgdir/usr/lib/modules/$_extramodules/vhba.ko"
+  install -Dm644 ../60-vhba.rules "$pkgdir/usr/lib/udev/rules.d/60-vhba.rules"
+
+  cd $startdir
+  cp -f $install ${install}.pkg
+  true && install=${install}.pkg
+  sed -i "s/EXTRAMODULES=.*/EXTRAMODULES=$_extramodules/" $install
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/libre/vhba-module-libre/vhba-module.install b/libre/vhba-module-libre/vhba-module.install
index 88b96f7b4..793cffd8d 100644
--- a/libre/vhba-module-libre/vhba-module.install
+++ b/libre/vhba-module-libre/vhba-module.install
@@ -1,6 +1,7 @@
+EXTRAMODULES=
+
 _updatemod() {
   echo "  > Updating module dependencies..."
-  EXTRAMODULES='extramodules-3.9-LIBRE'
   depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD
index 175c9c49f..4378a3fdb 100644
--- a/libre/virtualbox-libre-modules-lts/PKGBUILD
+++ b/libre/virtualbox-libre-modules-lts/PKGBUILD
@@ -1,26 +1,28 @@
-# $Id$
+# $Id: PKGBUILD 93050 2013-06-23 10:32:13Z bpiotrowski $
 # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Sébastien Luttringer <seblu@aur.archlinux.org>
-# Maintainer (Parabola): Jorge López <jorginho@lavabit.com>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): Jorge López <jorginho@lavabit.com>
 
 pkgbase=virtualbox-libre-modules-lts
 pkgname=('virtualbox-libre-host-modules-lts' 'virtualbox-libre-guest-modules-lts')
-pkgver=4.2.12
-pkgrel=3
+pkgver=4.2.14
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
-makedepends=('linux-libre-lts-headers'
+makedepends=('linux-libre-lts'
+             'linux-libre-lts-headers'
              "virtualbox-libre-host-dkms>=$pkgver"
              "virtualbox-libre-guest-dkms>=$pkgver"
              'expac'
+             'sed'
              'bc')
 
 build() {
-  _kernver=$(expac -Q '%v' linux-libre-lts-headers)-LIBRE-LTS
-
+  _kernmaj=$(expac -Q '%v' linux-libre-lts|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/')
+  _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-LIBRE-LTS/version)
   # dkms need modification to be run as user
   cp -r /var/lib/dkms .
   echo "dkms_tree='$srcdir/dkms'" > dkms.conf
@@ -33,9 +35,8 @@ build() {
 }
 
 package_virtualbox-libre-host-modules-lts(){
-  _kernver=$(expac -Q '%v' linux-libre-lts-headers)-LIBRE-LTS
-  _extraver=extramodules-${_kernver%.*}-LIBRE-LTS
-
+  _kernmaj=$(expac -Q '%v' linux-libre-lts|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/')
+  _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-LIBRE-LTS/version)
   pkgdesc='Host kernel modules for VirtualBox (built for the linux-libre-lts kernel package)'
 #  depends=("linux-libre-lts>=${_kernver%.*}" "linux-libre-lts<$(echo "${_kernver%.*}+0.1"|bc)")
   depends=('linux-libre-lts>=3.0' 'linux-libre-lts<3.1')
@@ -44,17 +45,16 @@ package_virtualbox-libre-host-modules-lts(){
   provides=("virtualbox-host-modules-lts=$pkgver" "virtualbox-libre-host-modules=$pkgver")
   install=virtualbox-libre-host-modules-lts.install
 
-  install -dm755 "$pkgdir/usr/lib/modules/$_extraver"
   cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module"
-  install -m644 * "$pkgdir/usr/lib/modules/$_extraver"
+  install -dm755 "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-LIBRE-LTS/"
+  install -m644 * "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-LIBRE-LTS/"
   find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-  sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-libre-host-modules-lts.install"
+  sed -ie "s/VERSION='.*'/VERSION='$_kernver'/" "$startdir/virtualbox-libre-host-modules-lts.install"
 }
 
 package_virtualbox-libre-guest-modules-lts(){
-  _kernver=$(expac -Q '%v' linux-libre-lts-headers)-LIBRE-LTS
-  _extraver=extramodules-${_kernver%.*}-LIBRE-LTS
-
+  _kernmaj=$(expac -Q '%v' linux-libre-lts|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/')
+  _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-LIBRE-LTS/version)
   pkgdesc='Guest kernel modules for VirtualBox (built for the linux-libre-lts kernel package)'
   license=('GPL')
 #  depends=("linux-libre-lts>=${_kernver%.*}" "linux-libre-lts<$(echo "${_kernver%.*}+0.1"|bc)")
@@ -64,11 +64,11 @@ package_virtualbox-libre-guest-modules-lts(){
   provides=("virtualbox-guest-modules-lts=$pkgver" "virtualbox-libre-host-modules=$pkgver")
   install=virtualbox-libre-guest-modules-lts.install
 
-  install -dm755 "$pkgdir/usr/lib/modules/$_extraver"
   cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module"
-  install -m644 * "$pkgdir/usr/lib/modules/$_extraver"
+  install -dm755 "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-LIBRE-LTS/"
+  install -m644 * "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-LIBRE-LTS/"
   find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-  sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-libre-guest-modules-lts.install"
+  sed -ie "s/VERSION='.*'/VERSION='$_kernver'/" "$startdir/virtualbox-libre-guest-modules-lts.install"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD
index a6c22c177..5e11fd6df 100644
--- a/libre/virtualbox-libre-modules/PKGBUILD
+++ b/libre/virtualbox-libre-modules/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 91728 2013-05-26 15:42:12Z tpowa $
+# $Id: PKGBUILD 93205 2013-06-28 17:53:08Z foutrelis $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Maintainer: Sébastien Luttringer <seblu@archlinux.org>
+# Maintainer: Sébastien Luttringer
 # Maintainer (Parabola): Jorge López <jorginho@lavabit.com>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgbase=virtualbox-libre-modules
 pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules')
-pkgver=4.2.12
-pkgrel=6
+pkgver=4.2.14
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
@@ -19,6 +19,9 @@ makedepends=('linux-libre'
              'sed'
              'bc')
 
+# remember to also adjust the .install files and the package deps below
+_extramodules=extramodules-3.9-LIBRE
+
 build() {
   _kernmaj=$(expac -Q '%v' linux-libre|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/')
   _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-LIBRE/version)
diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install
index 9a98c5752..d2e34dfc1 100644
--- a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install
+++ b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install
@@ -1,4 +1,4 @@
-VERSION='3.9.4-1-LIBRE'
+VERSION='3.9.7-1-LIBRE'
 
 post_install() {
 cat << EOF
diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install
index f0ca024ed..b1d86b9e6 100644
--- a/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install
+++ b/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install
@@ -1,4 +1,4 @@
-VERSION='3.9.4-1-LIBRE'
+VERSION='3.9.7-1-LIBRE'
 
 post_install() {
 cat << EOF
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index b7b1988f9..d6050ed9d 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90797 2013-05-14 00:31:45Z seblu $
+# $Id: PKGBUILD 93046 2013-06-23 10:17:47Z bpiotrowski $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -13,8 +13,8 @@ pkgname=('virtualbox-libre'
          'virtualbox-libre-guest-dkms'
          'virtualbox-libre-sdk'
          'virtualbox-libre-guest-utils')
-pkgver=4.2.12
-pkgrel=3
+pkgver=4.2.14
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -25,7 +25,7 @@ makedepends=('alsa-lib'
              'dev86'
              'device-mapper'
              'glu'
-             'gsoap'
+             'gsoap-legacy'
              'iasl'
              'jdk7-openjdk'
              'libidl2'
@@ -58,7 +58,6 @@ source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.ta
         'vboxweb.service'
         '001-vboxdrv-reference.patch'
         '002-change_default_driver_dir.patch'
-        '003-gcc-48.patch'
         '004-system-xorg.patch'
         'os_blag_64.png'
         'os_blag.png'
@@ -80,7 +79,7 @@ source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.ta
         'os_venenux.png'
         'libre.patch'
         'free-distros.patch')
-md5sums=('654e45054ae6589452508d37403dc800'
+md5sums=('be834de415adaf2f696f7a499f88b4e6'
          '5f85710e0b8606de967716ded7b2d351'
          'ed1341881437455d9735875ddf455fbe'
          '58d6e5bb4b4c1c6f3f0b3daa6aaeed03'
@@ -88,7 +87,6 @@ md5sums=('654e45054ae6589452508d37403dc800'
          'bc9efed88e0469cd7fc460d5a5cd7b4b'
          'f4e4c7895ede9c524109589bf16ae660'
          '97e193f050574dd272a38e5ee5ebe62b'
-         '7cf8611ae5850b86323b690e430eeed7'
          '4da461f8c90caa123b47c62479f426b4'
          '8538dba8686d7449cb481c9bae9d722a'
          '545c925b46f2ac95e5f8ae407fad101a'
@@ -108,8 +106,8 @@ md5sums=('654e45054ae6589452508d37403dc800'
          'c7951fe6888d939f3a7d0dafe477e82b'
          '4da8eeb2ece7e475fc7a0d1003da26c6'
          '5e4187af59726d71c5be48d0cd816c34'
-         '17fca4ba3a751c8a1db19b92b1820462'
-         '50387fba578646a9d29de3f917a199d2')
+         '9e0b199059faa3f99def5b0ba6e74009'
+         '2dc83a3286aa8eab080a3a6608ab3f67')
 
 prepare() {
     cd "VirtualBox-$pkgver"
@@ -135,7 +133,7 @@ prepare() {
     rm -v "./src/VBox/Resources/win/OSE/virtualbox-vbox-extpack.ico"
     rm -v "./src/VBox/Frontends/VirtualBox/images/extension_pack_"{16px,32px,disabled{_16px,_32px},install{_16px,_32px},install_disabled{_16px,_32px},uninstall{_16px,_32px},uninstall_disabled{_16px,_32px}}.png
 
- ## Adding free distros icons
+ ## Adding distros icons
     for i in {dynebolic,venenux,{gnu,parabola,gnewsense,blag,dragora,ututo,musix,trisquel}{,_64}}; do
       cp -v "$srcdir/os_${i}.png" "./src/VBox/Frontends/VirtualBox/images"
     done
@@ -317,7 +315,7 @@ package_virtualbox-libre-guest-utils(){
 
     source "VirtualBox-$pkgver/env.sh"
     pushd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
-    install -d "$pkgdir"/{usr/bin,sbin}
+    install -d "$pkgdir/usr/bin"
     install -m755 VBoxClient VBoxControl VBoxService mount.vboxsf "$pkgdir/usr/bin"
     install -m755 -D "$srcdir"/VirtualBox-$pkgver/src/VBox/Additions/x11/Installer/98vboxadd-xclient \
         "$pkgdir"/usr/bin/VBoxClient-all
diff --git a/libre/virtualbox-libre/free-distros.patch b/libre/virtualbox-libre/free-distros.patch
index 913fe7039..fd6d29f3d 100644
--- a/libre/virtualbox-libre/free-distros.patch
+++ b/libre/virtualbox-libre/free-distros.patch
@@ -506,7 +506,7 @@ index 8c6ab79..1e048d9 100644
          1024, 4,  8 * _1G64, NetworkAdapterType_I82545EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_BusLogic, StorageBus_SCSI, ChipsetType_PIIX3, AudioControllerType_AC97  },
 diff --git a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
-index b335043..59ee885 100644
+index 25928b9..0fd3a6e 100644
 --- a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
 +++ b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
 @@ -44,46 +44,32 @@ struct osTypePattern
@@ -579,8 +579,8 @@ index b335043..59ee885 100644
 +    { QRegExp("Dyn", Qt::CaseInsensitive), "Dynebolic" },
 +
 +    /* Code names for non-free GNU/Linux distributions: */
-     { QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)|(quantal)).*64", Qt::CaseInsensitive), "Ubuntu_64" },
-     { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)|(quantal)", Qt::CaseInsensitive), "Ubuntu" },
+     { QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)|(quantal)|(raring)).*64", Qt::CaseInsensitive), "Ubuntu_64" },
+     { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)|(quantal)|(raring)", Qt::CaseInsensitive), "Ubuntu" },
      { QRegExp("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(jessie)|(sid)).*64", Qt::CaseInsensitive), "Debian_64" },
 @@ -91,7 +77,7 @@ static const osTypePattern gs_OSTypePattern[] =
      { QRegExp("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)|(beefy)|(spherical)).*64", Qt::CaseInsensitive), "Fedora_64" },
diff --git a/libre/virtualbox-libre/libre.patch b/libre/virtualbox-libre/libre.patch
index 75a5ed22f..7f236a678 100644
--- a/libre/virtualbox-libre/libre.patch
+++ b/libre/virtualbox-libre/libre.patch
@@ -1051,18 +1051,18 @@ diff -Nur VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIAct
  
  #ifdef VBOX_WITH_DEBUGGER_GUI
      /* 'Debugger' menu actions: */
-diff -Nur VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp
---- VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp	2013-04-12 07:38:01.000000000 -0300
-+++ VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp	2013-05-24 11:27:14.723176263 -0300
-@@ -651,7 +651,6 @@
+diff -Nur VirtualBox-4.2.14.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp VirtualBox-4.2.14/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp
+--- VirtualBox-4.2.14.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp	2013-06-21 09:26:42.000000000 -0300
++++ VirtualBox-4.2.14/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp	2013-06-24 18:08:12.915719347 -0300
+@@ -704,7 +704,6 @@
      m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Menu_SharedFolders));
      m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_SharedFoldersDialog));
      m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_VRDEServer));
 -    m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_InstallGuestTools));
- }
  
- void UIMachineLogic::prepareActionConnections()
-@@ -705,8 +704,6 @@
+     /* Move actions into running-n-paused-n-stuck actions group: */
+     m_pRunningOrPausedOrStuckActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_PowerOff));
+@@ -765,8 +764,6 @@
              this, SLOT(sltOpenSharedFoldersDialog()));
      connect(gActionPool->action(UIActionIndexRuntime_Toggle_VRDEServer), SIGNAL(toggled(bool)),
              this, SLOT(sltSwitchVrde(bool)));
diff --git a/libre/xarchiver-libre/PKGBUILD b/libre/xarchiver-libre/PKGBUILD
index 87d775d4e..9c0c0729c 100644
--- a/libre/xarchiver-libre/PKGBUILD
+++ b/libre/xarchiver-libre/PKGBUILD
@@ -5,7 +5,7 @@
 _pkgname=xarchiver
 pkgname=xarchiver-libre
 pkgver=0.5.2
-pkgrel=5
+pkgrel=5.1
 pkgdesc="GTK+ frontend to various command line archivers"
 arch=('i686' 'x86_64')
 url="http://xarchiver.sourceforge.net"
@@ -21,7 +21,7 @@ optdepends=('tar: TAR support'
             'bzip2: BZIP2 support'
             'zip: ZIP support'
             'unzip: ZIP support'
-            'ununrar: RAR support'
+            'unar: RAR support'
             'p7zip: 7z support'
             'arj: ARJ support'
             'lha: LHA support'
diff --git a/libre/xbmc-libre/ChangeLog b/libre/xbmc-libre/ChangeLog
new file mode 100644
index 000000000..66ae97e3b
--- /dev/null
+++ b/libre/xbmc-libre/ChangeLog
@@ -0,0 +1,69 @@
+2010-04-10 BlackEagle <ike DOT devolder AT gmail DOT com>
+	* 9.11-15 :
+	Made it back compliant with FHS ( thx pierre for pointing that out )
+	namcap checked and modified to fit its needs as far as it was possible
+
+2009-03-07 [vEX] <niechift.dot.vex.at.gmail.dot.com>
+
+	* 8.10-10 :
+	Try and fix some autoconf issues (thanks Gentoo ebuild).
+
+2009-02-08 [vEX] <niechift.dot.vex.at.gmail.dot.com>
+
+	* 8.10-9 :
+	Replace some libtool 'ltmain.sh' scripts with the one from libtool 
+	installed with Arch.
+	Make sure XBMCTex isn't linked to OpenGL libraries or it will segfault
+	on systems using the nvidia driver.
+	
+2009-01-30 [vEX] <niechift.dot.vex.at.gmail.dot.com>
+
+	* 8.10-8 :
+	Fix some include's so that gcc 4.3.x is happy, shouldn't complain about
+	undefined '::realloc' anymore.
+	Remove Mac OS X specific files.
+	
+2009-01-25 [vEX] <niechift.dot.vex.at.gmail.dot.com>
+
+	* 8.10-7 :
+	Moved libcdio, pmount, smbclient and unrar to optdepends.
+	Removed unneeded dependency on sdl_gfx.
+	Removed dependency on libpng as sdl_image depends on it.
+
+2008-12-14 [vEX] <niechift.dot.vex.at.gmail.dot.com>
+
+	* 8.10-6 :
+	Added libpng to dependency list.
+	Added gawk to dependency list.
+	Removed '--disable-mms' and '--enable-halmount' configure flags as they
+	are not mentioned as supported in the configure script.
+	
+2008-12-06 [vEX] <niechift.dot.vex.at.gmail.dot.com>
+
+	* 8.10-5 :
+	Added libmad to the dependency list.
+	Streamripper 1.64.0+ does not include tre anymore, removed streamripper
+	and added tre instead.
+	Removed subversion from makedepends.
+	
+2008-12-06 [vEX] <niechift.dot.vex.at.gmail.dot.com>
+
+	* 8.10-4 :
+	Fix permissions for some more scripts, ffmpeg/texi2doc.pl should not
+	fail any longer.
+
+2008-12-05 [vEX] <niechift.dot.vex.at.gmail.dot.com>
+
+	* 8.10-3 :
+	Added lirc to the optdepends array.
+	
+2008-11-26 [vEX] <niechift.dot.vex.at.gmail.dot.com>
+
+	* 8.10-2 :
+	Added install file which informs users that a display depth of at
+	least 24-bit is required.
+
+2008-11-17 [vEX] <niechift.dot.vex.at.gmail.dot.com>
+
+	* 8.10-1 :
+	Initial package, based on previous work by Zeqadious.
diff --git a/libre/xbmc-libre/PKGBUILD b/libre/xbmc-libre/PKGBUILD
new file mode 100644
index 000000000..37fae91a9
--- /dev/null
+++ b/libre/xbmc-libre/PKGBUILD
@@ -0,0 +1,116 @@
+# $Id: PKGBUILD 92439 2013-06-05 11:42:01Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Brad Fanella <bradfanella@archlinux.us>
+# Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>
+# Contributor: Zeqadious <zeqadious.at.gmail.dot.com>
+# Contributor: BlackIkeEagle < ike DOT devolder AT gmail DOT com >
+
+_prefix=/usr
+
+_pkgname=xbmc
+pkgname=xbmc-libre
+pkgver=12.2
+pkgrel=4.1
+pkgdesc="A software media player and entertainment hub for digital media, with libarchive recommendation"
+arch=('i686' 'x86_64')
+url="http://xbmc.org"
+license=('GPL' 'custom')
+depends=('libpulse' 'hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva'
+	 'libpng' 'libcdio' 'yajl' 'libmariadbclient' 'libjpeg-turbo' 'libsamplerate'
+	 'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image' 'python2'
+	 'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'mesa-demos'
+	 'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng' 'libshairport' 'avahi' 'bluez-libs' 'glu'
+	 'tinyxml' 'taglib')
+makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'libvdpau' 'libcec'
+	     'udisks' 'upower' 'mesa' 'doxygen' 'swig' 'java-environment')
+optdepends=('libcec: support for Pulse-Eight USB-CEC adapter'
+	    'pulseaudio: pulseaudio support'
+	    'lirc: remote controller support'
+	    'udisks: automount external drives'
+	    'upower: used to trigger suspend functionality'
+	    'libarchive: access compressed files without unpacking them'
+	    'xorg-xinit: autostart xbmc')
+install="${_pkgname}.install"
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
+source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz"
+	"xbmc.service")
+md5sums=('489f3877decae4e265ece54f9eaef0ba'
+         '76fae229ebc3bcfaab7e7f27e4fb51f5')
+
+build() {
+  cd "${srcdir}/xbmc-$pkgver"
+
+  # fix lsb_release dependency
+  sed -i -e 's:/usr/bin/lsb_release -d:cat /etc/arch-release:' xbmc/utils/SystemInfo.cpp
+  sed -i -e 's:#include <libsmbclient.h>:#include <samba-4.0/libsmbclient.h>:' xbmc/filesystem/{SmbFile,SMBDirectory}.cpp
+
+  # Bootstrapping XBMC
+  ./bootstrap
+
+  # Configuring XBMC
+  export PYTHON_VERSION=2  # external python v2
+  ./configure --prefix=$_prefix --exec-prefix=$_prefix \
+    --disable-debug \
+    --enable-optimizations \
+    --enable-gl \
+    --enable-sdl \
+    --enable-vaapi \
+    --enable-vdpau \
+    --enable-xvba \
+    --enable-joystick \
+    --enable-xrandr \
+    --enable-rsxs \
+    --enable-projectm \
+    --enable-x11 \
+    --enable-pulse \
+    --enable-rtmp \
+    --enable-samba \
+    --enable-nfs \
+    --enable-afpclient \
+    --enable-airplay \
+    --enable-airtunes \
+    --enable-ffmpeg-libvorbis \
+    --enable-dvdcss \
+    --disable-hal \
+    --enable-avahi \
+    --enable-webserver \
+    --enable-optical-drive \
+    --enable-libbluray \
+    --enable-texturepacker \
+    --enable-udev \
+    --enable-libusb \
+    --enable-libcec \
+    --enable-external-libraries \
+    --disable-external-ffmpeg
+  # Now (finally) build
+  make
+}
+
+package() {
+  cd "${srcdir}/xbmc-$pkgver"
+  # Running make install
+  make DESTDIR="${pkgdir}" install
+
+  # run feh with python2
+  sed -i -e 's/python/python2/g' ${pkgdir}${_prefix}/bin/xbmc
+
+  # lsb_release fix
+  sed -i -e 's/which lsb_release &> \/dev\/null/\[ -f \/etc\/arch-release ]/g' "${pkgdir}${_prefix}/bin/xbmc"
+  sed -i -e "s/lsb_release -a 2> \/dev\/null | sed -e 's\/\^\/    \/'/cat \/etc\/arch-release/g" "${pkgdir}${_prefix}/bin/xbmc"
+
+  # Tools
+  install -D -m 0755 "${srcdir}/xbmc-$pkgver/xbmc-xrandr" "${pkgdir}${_prefix}/share/xbmc/xbmc-xrandr"
+  install -D -m 0755 "${srcdir}/xbmc-$pkgver/tools/TexturePacker/TexturePacker" "${pkgdir}${_prefix}/share/xbmc/"
+
+  # Licenses
+  install -d -m 0755 "${pkgdir}${_prefix}/share/licenses/${_pkgname}"
+  for licensef in LICENSE.GPL copying.txt; do
+    mv "${pkgdir}${_prefix}/share/doc/xbmc/${licensef}" "${pkgdir}${_prefix}/share/licenses/${_pkgname}"
+  done
+
+  # systemd stuff
+  install -Dm0644 $srcdir/xbmc.service $pkgdir/usr/lib/systemd/system/xbmc.service
+}
+# vim:set ts=2 sw=2 et:
diff --git a/libre/xbmc-libre/xbmc.install b/libre/xbmc-libre/xbmc.install
new file mode 100644
index 000000000..b104b33e8
--- /dev/null
+++ b/libre/xbmc-libre/xbmc.install
@@ -0,0 +1,16 @@
+post_install() {
+  [[ $(type -p gtk-update-icon-cache) ]] && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor
+  [[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications
+  getent group xbmc > /dev/null || groupadd xbmc
+  getent passwd xbmc > /dev/null || useradd -m -d /var/lib/xbmc -g xbmc xbmc
+  usermod -a -G xbmc,audio,video,power,network,optical,storage,disk xbmc
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+  echo "You may want to remove xbmc user and group"
+}
diff --git a/libre/xbmc-libre/xbmc.service b/libre/xbmc-libre/xbmc.service
new file mode 100644
index 000000000..431582f1b
--- /dev/null
+++ b/libre/xbmc-libre/xbmc.service
@@ -0,0 +1,13 @@
+[Unit]
+Description = Starts instance of XBMC using xinit
+After = remote-fs.target
+
+[Service]
+User = xbmc
+Group = xbmc
+Type = simple
+ExecStart = /usr/bin/xinit /usr/bin/xbmc-standalone -- :0 -nolisten tcp
+Restart = always
+
+[Install]
+WantedBy = multi-user.target
diff --git a/libre/xorg-fonts-type1-libre/PKGBUILD b/libre/xorg-fonts-type1-libre/PKGBUILD
index 3e52ef85a..4904a4477 100644
--- a/libre/xorg-fonts-type1-libre/PKGBUILD
+++ b/libre/xorg-fonts-type1-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 71695 2010-03-08 13:31:38Z jgc $
+# $Id: PKGBUILD 150375 2012-02-17 09:54:09Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-fonts-type1-libre
 pkgver=7.4
-pkgrel=1
-pkgdesc="X.org Type1 fonts without Adobe fonts"
+pkgrel=2
+pkgdesc="X.org Type1 fonts, without nonfree fonts"
 arch=(any)
 license=('custom')
 url="http://xorg.freedesktop.org/"
@@ -20,15 +20,25 @@ md5sums=('27c55f6a938e7153c59fb551b2f491f9'
 
 build() {
   cd "${srcdir}"
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   for dir in *; do
     if [ -d "${dir}" ]; then
       pushd "${dir}"
       ./configure --prefix=/usr \
-		      --with-fontdir=/usr/share/fonts/Type1 || return 1
-      make || return 1
-      make DESTDIR="${pkgdir}" install || return 1
-      install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.${dir%-*}" || return 1
+        --with-fontdir=/usr/share/fonts/Type1
+      make
+      popd
+    fi
+  done
+}
+
+package() {
+  cd "${srcdir}"
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  for dir in *; do
+    if [ -d "${dir}" ]; then
+      pushd "${dir}"
+      make DESTDIR="${pkgdir}" install
+      install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.${dir%-*}"
       popd
     fi
   done
diff --git a/libre/xsp/PKGBUILD b/libre/xsp/PKGBUILD
index 1692357e7..02e172c8f 100644
--- a/libre/xsp/PKGBUILD
+++ b/libre/xsp/PKGBUILD
@@ -1,19 +1,23 @@
-# $Id$
+# $Id: PKGBUILD 188153 2013-06-10 16:36:32Z daniel $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=xsp
-pkgver=2.10.2
-pkgrel=4.1
-pkgdesc="A simple webserver based on mono - provides ASP.NET support, Parabola rebranded"
-arch=(i686 x86_64 mips64el)
+pkgver=3.0.11
+pkgrel=1
+pkgdesc="A simple webserver based on mono - provides ASP.NET support (Parabola rebranded)"
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://www.go-mono.com"
-depends=('mono>=2.10.2' 'sqlite')
+depends=('mono' 'sqlite')
 options=(!makeflags)
 install=${pkgname}.install
-source=(http://download.mono-project.com/sources/xsp/xsp-2.10.2.tar.bz2
-        ${pkgname}.rc.d ${pkgname}.conf.d ${pkgname}.webapp ${pkgname}.service)
+source=(https://github.com/mono/xsp/archive/${pkgver}.tar.gz
+        ${pkgname}.webapp
+        ${pkgname}.service)
+md5sums=('6a694d5e87ebe57e532ec80a16b6966d'
+         'c917c07f68b945691506c29750db482f'
+         '9d83bd36d209f8d36a11dfbc4fa50819')
 
 build() {
  # get rid of that .wapi errors; thanks to brice
@@ -23,8 +27,9 @@ build() {
  # build
   cd ${srcdir}/${pkgname}-${pkgver}
   #sed -i 's|/bin/sh|\0\nexport MONO_PATH=${MONO_PATH}:/opt/mono/lib/mono/1.0|' scripts/script.in
+  ./autogen.sh
   ./configure --prefix=/usr --sysconfdir=/etc
-  make || return 1
+  make
  # tweak the xsp shellscript to grab system dll's
   for script in scripts/*2; do
     sed -i 's|/usr/lib/mono/1.0|/usr/lib/mono/2.0|' $script
@@ -43,12 +48,6 @@ package(){
   rm -rf ${pkgdir}/usr/share
   chown -R http:http ${pkgdir}/srv/http/html/${pkgname}
 
- # install a deamon
-  install -D -m755 ${srcdir}/${pkgname}.rc.d \
-    ${pkgdir}/etc/rc.d/${pkgname}
- # install a deamon configurationfile
-  install -D -m644 ${srcdir}/$pkgname.conf.d \
-    ${pkgdir}/etc/conf.d/${pkgname}
  # install a xsp configuration home
   install -D -m644 ${srcdir}/${pkgname}.webapp \
     ${pkgdir}/etc/${pkgname}/${pkgname}.webapp
@@ -57,8 +56,3 @@ package(){
   install -D -m644 ${srcdir}/${pkgname}.service \
     ${pkgdir}/usr/lib/systemd/system/xsp.service
 }
-md5sums=('4fe62fc95ad5dc136d8a7f3299d523b6'
-         '9575bd7d6f64d51ba05bdd6370665858'
-         'b2063679d9c77a9e7b2d90d1fee76608'
-         'c917c07f68b945691506c29750db482f'
-         '9d83bd36d209f8d36a11dfbc4fa50819')
diff --git a/libre/xtensa-unknown-elf-binutils/PKGBUILD b/libre/xtensa-unknown-elf-binutils/PKGBUILD
new file mode 100644
index 000000000..deb8d4b0e
--- /dev/null
+++ b/libre/xtensa-unknown-elf-binutils/PKGBUILD
@@ -0,0 +1,68 @@
+# $Id: PKGBUILD 182407 2013-04-10 07:34:20Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+
+_pkgname=binutils
+_target="xtensa-unknown-elf"
+
+pkgname=${_target}-binutils
+pkgver=2.23.2
+pkgrel=2.4
+pkgdesc="A set of programs to assemble and manipulate binary and object files for the Xtensa architecture"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.gnu.org/software/binutils/"
+license=('GPL')
+groups=("${_target}-base-devel")
+depends=('glibc>=2.17' 'zlib')
+options=('!libtool' '!distcc' '!ccache')
+install=${_target}-binutils.install
+source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.bz2{,.sig}
+        binutils-2.23.2-texinfo-5.0.patch)
+md5sums=('4f8fa651e35ef262edc01d60fb45702e'
+         'dfde4428f08d91f309cdcfe92bf28d08'
+         '34e439ce23213a91e2af872dfbb5094c')
+
+prepare() {
+  cd ${srcdir}/binutils-${pkgver}
+
+  # http://sourceware.org/git/?p=binutils.git;a=patch;h=e02bf935
+  # http://sourceware.org/git/?p=binutils.git;a=patch;h=935f8542
+  patch -p1 -i ${srcdir}/binutils-2.23.2-texinfo-5.0.patch
+
+  # hack! - libiberty configure tests for header files using "$CPP $CPPFLAGS"
+  sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure
+
+  mkdir ${srcdir}/binutils-build
+}
+
+build() {
+  cd ${srcdir}/binutils-build
+
+  ${srcdir}/binutils-${pkgver}/configure --prefix=/usr \
+    --target=${_target} \
+    --disable-nls \
+    --with-lib-path=/usr/lib:/usr/local/lib \
+    --with-bugurl=https://labs.parabola.nu/ \
+    --enable-shared \
+    --disable-werror --disable-multilib
+
+  # check the host environment and makes sure all the necessary tools are available
+  make configure-host
+
+  make tooldir=/usr
+}
+
+package() {
+  cd ${srcdir}/binutils-build
+  make prefix=${pkgdir}/usr tooldir=${pkgdir}/usr install
+
+  # Remove unwanted files
+  rm ${pkgdir}/usr/share/man/man1/${_target}-{dlltool,nlmconv,windres,windmc}*
+
+  # Remove unnecessary files and folders
+  rm $pkgdir/usr/bin/{a{r,s},nm,obj{copy,dump},ranlib,strip}
+  rm $pkgdir/usr/lib/libiberty.a
+  rm $pkgdir/usr/$CHOST/${_target}/include/* && rmdir $pkgdir/usr/$CHOST/${_target}/include
+  rm $pkgdir/usr/share/info/* && rmdir $pkgdir/usr/share/info
+}
diff --git a/libre/xtensa-unknown-elf-binutils/binutils-2.23.2-texinfo-5.0.patch b/libre/xtensa-unknown-elf-binutils/binutils-2.23.2-texinfo-5.0.patch
new file mode 100644
index 000000000..38dc19fb0
--- /dev/null
+++ b/libre/xtensa-unknown-elf-binutils/binutils-2.23.2-texinfo-5.0.patch
@@ -0,0 +1,162 @@
+diff --git a/bfd/doc/bfd.texinfo b/bfd/doc/bfd.texinfo
+index 45ffa73..3aa3300 100644
+--- a/bfd/doc/bfd.texinfo
++++ b/bfd/doc/bfd.texinfo
+@@ -322,7 +324,7 @@ All of BFD lives in one directory.
+ @printindex cp
+ 
+ @tex
+-% I think something like @colophon should be in texinfo.  In the
++% I think something like @@colophon should be in texinfo.  In the
+ % meantime:
+ \long\def\colophon{\hbox to0pt{}\vfill
+ \centerline{The body of this manual is set in}
+@@ -333,7 +335,7 @@ All of BFD lives in one directory.
+ \centerline{{\sl\fontname\tensl\/}}
+ \centerline{are used for emphasis.}\vfill}
+ \page\colophon
+-% Blame: doc@cygnus.com, 28mar91.
++% Blame: doc@@cygnus.com, 28mar91.
+ @end tex
+ 
+ @bye
+diff --git a/binutils/doc/binutils.texi b/binutils/doc/binutils.texi
+index 56a0510..fb1802b 100644
+--- a/binutils/doc/binutils.texi
++++ b/binutils/doc/binutils.texi
+@@ -148,18 +148,18 @@ in the section entitled ``GNU Free Documentation License''.
+ * objcopy::			Copy and translate object files
+ * objdump::                     Display information from object files
+ * ranlib::                      Generate index to archive contents
+-* readelf::                     Display the contents of ELF format files
+ * size::                        List section sizes and total size
+ * strings::                     List printable strings from files
+ * strip::                       Discard symbols
+-* elfedit::                     Update the ELF header of ELF files
+ * c++filt::			Filter to demangle encoded C++ symbols
+ * cxxfilt: c++filt.             MS-DOS name for c++filt
+ * addr2line::			Convert addresses to file and line
+ * nlmconv::                     Converts object code into an NLM
+-* windres::			Manipulate Windows resources
+ * windmc::			Generator for Windows message resources
++* windres::			Manipulate Windows resources
+ * dlltool::			Create files needed to build and use DLLs
++* readelf::                     Display the contents of ELF format files
++* elfedit::                     Update the ELF header of ELF files
+ * Common Options::              Command-line options for all utilities
+ * Selecting the Target System:: How these utilities determine the target
+ * Reporting Bugs::              Reporting Bugs
+@@ -2907,7 +2907,7 @@ the Info entries for @file{binutils}.
+ @c man end
+ @end ignore
+ 
+-@node c++filt, addr2line, elfedit, Top
++@node c++filt, addr2line, strip, Top
+ @chapter c++filt
+ 
+ @kindex c++filt
+@@ -4384,7 +4384,7 @@ equivalent. At least one of the @option{--output-mach},
+ 
+ @table @env
+ 
+-@itemx --input-mach=@var{machine}
++@item --input-mach=@var{machine}
+ Set the matching input ELF machine type to @var{machine}.  If
+ @option{--input-mach} isn't specified, it will match any ELF
+ machine types.
+@@ -4392,21 +4392,21 @@ machine types.
+ The supported ELF machine types are, @var{L1OM}, @var{K1OM} and
+ @var{x86-64}.
+ 
+-@itemx --output-mach=@var{machine}
++@item --output-mach=@var{machine}
+ Change the ELF machine type in the ELF header to @var{machine}.  The
+ supported ELF machine types are the same as @option{--input-mach}.
+ 
+-@itemx --input-type=@var{type}
++@item --input-type=@var{type}
+ Set the matching input ELF file type to @var{type}.  If
+ @option{--input-type} isn't specified, it will match any ELF file types.
+ 
+ The supported ELF file types are, @var{rel}, @var{exec} and @var{dyn}.
+ 
+-@itemx --output-type=@var{type}
++@item --output-type=@var{type}
+ Change the ELF file type in the ELF header to @var{type}.  The
+ supported ELF types are the same as @option{--input-type}.
+ 
+-@itemx --input-osabi=@var{osabi}
++@item --input-osabi=@var{osabi}
+ Set the matching input ELF file OSABI to @var{osabi}.  If
+ @option{--input-osabi} isn't specified, it will match any ELF OSABIs.
+ 
+@@ -4416,7 +4416,7 @@ The supported ELF OSABIs are, @var{none}, @var{HPUX}, @var{NetBSD},
+ @var{FreeBSD}, @var{TRU64}, @var{Modesto}, @var{OpenBSD}, @var{OpenVMS},
+ @var{NSK}, @var{AROS} and @var{FenixOS}.
+ 
+-@itemx --output-osabi=@var{osabi}
++@item --output-osabi=@var{osabi}
+ Change the ELF OSABI in the ELF header to @var{osabi}.  The
+ supported ELF OSABI are the same as @option{--input-osabi}.
+ 
+diff --git a/ld/ld.texinfo b/ld/ld.texinfo
+index c7ae2a5..4777ad5 100644
+--- a/ld/ld.texinfo
++++ b/ld/ld.texinfo
+@@ -142,12 +144,12 @@ in the section entitled ``GNU Free Documentation License''.
+ @ifset ARM
+ * ARM::				ld and the ARM family
+ @end ifset
+-@ifset HPPA
+-* HPPA ELF32::                  ld and HPPA 32-bit ELF
+-@end ifset
+ @ifset M68HC11
+ * M68HC11/68HC12::              ld and the Motorola 68HC11 and 68HC12 families
+ @end ifset
++@ifset HPPA
++* HPPA ELF32::                  ld and HPPA 32-bit ELF
++@end ifset
+ @ifset M68K
+ * M68K::                        ld and Motorola 68K family
+ @end ifset
+@@ -6012,6 +6014,9 @@ functionality are not listed.
+ @ifset I960
+ * i960::                        @command{ld} and the Intel 960 family
+ @end ifset
++@ifset M68HC11
++* M68HC11/68HC12::		@code{ld} and the Motorola 68HC11 and 68HC12 families
++@end ifset
+ @ifset ARM
+ * ARM::				@command{ld} and the ARM family
+ @end ifset
+@@ -6027,9 +6032,6 @@ functionality are not listed.
+ @ifset MSP430
+ * MSP430::			@command{ld} and MSP430
+ @end ifset
+-@ifset M68HC11
+-* M68HC11/68HC12::		@code{ld} and the Motorola 68HC11 and 68HC12 families
+-@end ifset
+ @ifset POWERPC
+ * PowerPC ELF32::		@command{ld} and PowerPC 32-bit ELF Support
+ @end ifset
+@@ -7877,7 +7879,7 @@ If you have more than one @code{SECT} statement for the same
+ @printindex cp
+ 
+ @tex
+-% I think something like @colophon should be in texinfo.  In the
++% I think something like @@colophon should be in texinfo.  In the
+ % meantime:
+ \long\def\colophon{\hbox to0pt{}\vfill
+ \centerline{The body of this manual is set in}
+@@ -7888,7 +7890,7 @@ If you have more than one @code{SECT} statement for the same
+ \centerline{{\sl\fontname\tensl\/}}
+ \centerline{are used for emphasis.}\vfill}
+ \page\colophon
+-% Blame: doc@cygnus.com, 28mar91.
++% Blame: doc@@cygnus.com, 28mar91.
+ @end tex
+ 
+ @bye
+-- 
+1.7.1
+
diff --git a/libre/xtensa-unknown-elf-binutils/xtensa-unknown-elf-binutils.install b/libre/xtensa-unknown-elf-binutils/xtensa-unknown-elf-binutils.install
new file mode 100644
index 000000000..9de0533ee
--- /dev/null
+++ b/libre/xtensa-unknown-elf-binutils/xtensa-unknown-elf-binutils.install
@@ -0,0 +1,17 @@
+infodir=usr/share/info
+filelist=(as.info bfd.info binutils.info gprof.info ld.info)
+
+post_upgrade() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
diff --git a/libre/xtensa-unknown-elf-gcc/PKGBUILD b/libre/xtensa-unknown-elf-gcc/PKGBUILD
new file mode 100644
index 000000000..02611d173
--- /dev/null
+++ b/libre/xtensa-unknown-elf-gcc/PKGBUILD
@@ -0,0 +1,89 @@
+# $Id: PKGBUILD 186915 2013-05-31 23:25:14Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
+
+_pkgname=gcc
+_target="xtensa-unknown-elf"
+_sysroot="/usr/$CHOST/${_target}"
+
+pkgname=${_target}-gcc
+pkgver=4.8.1
+pkgrel=1
+pkgdesc="The GNU Compiler Collection for the Xtensa architecture"
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL' 'LGPL' 'FDL' 'custom')
+url="http://gcc.gnu.org"
+makedepends=('binutils>=2.23' 'libmpc' 'cloog' 'gcc-ada' 'doxygen')
+checkdepends=('dejagnu' 'inetutils')
+options=('!libtool' '!emptydirs')
+source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2)
+md5sums=('3b2386c114cd74185aa3754b58a79304')
+
+_basedir=gcc-${pkgver}
+
+prepare() {
+  cd ${srcdir}/${_basedir}
+
+  # Do not run fixincludes
+  sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
+
+  # Parabola installs x86_64 libraries /lib
+  [[ $CARCH == "x86_64" ]] && sed -i '/m64=/s/lib64/lib/' gcc/config/i386/t-linux64
+
+  echo ${pkgver} > gcc/BASE-VER
+
+  # hack! - some configure tests for header files using "$CPP $CPPFLAGS"
+  sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure
+
+  mkdir ${srcdir}/gcc-build
+}
+
+build() {
+  cd ${srcdir}/gcc-build
+
+  ${srcdir}/${_basedir}/configure --prefix=/usr \
+    --target=${_target} \
+    --disable-multilib \
+    --disable-nls \
+    --disable-shared \
+    --disable-threads \
+    --enable-languages=c \
+    --disable-libquadmath \
+    --disable-libssp \
+    --with-newlib \
+    --disable-werror \
+    --libdir=/usr/lib --libexecdir=/usr/lib
+#      --mandir=/usr/share/man --infodir=/usr/share/info \
+#      --with-bugurl=https://labs.parabola.nu/ \
+#      --disable-shared --enable-threads=posix \
+#      --with-system-zlib --enable-__cxa_atexit \
+#      --disable-libunwind-exceptions --enable-clocale=gnu \
+#      --disable-libstdcxx-pch \
+#      --enable-gnu-unique-object --enable-linker-build-id \
+#      --enable-cloog-backend=isl --disable-cloog-version-check \
+#      --enable-lto --enable-gold --enable-ld=default \
+#      --enable-plugin --with-plugin-ld=ld.gold \
+#      --with-linker-hash-style=gnu --disable-install-libiberty \
+#      --enable-checking=release \
+  make all-gcc
+}
+
+package()
+{
+  pkgdesc="The GNU Compiler Collection for the Xtensa architecture"
+  depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.23' 'libmpc' 'cloog')
+  groups=("${_target}-devel")
+  install=${_target}-gcc.install
+
+  cd ${srcdir}/gcc-build
+  
+  make -j1 DESTDIR=${pkgdir} install-gcc
+
+  # many packages expect this symlinks
+  ln -s ${_target}-gcc ${pkgdir}/usr/bin/${_target}-cc
+
+  # Remove unnecessary files and folders
+  rm $pkgdir/usr/share/info/* && rmdir $pkgdir/usr/share/info
+  rm $pkgdir/usr/share/man/man7/* && rmdir $pkgdir/usr/share/man/man7
+}
diff --git a/~brendan/guile/guile.install b/libre/xtensa-unknown-elf-gcc/xtensa-unknown-elf-gcc.install
index ed113ab8f..3407a5e1f 100644
--- a/~brendan/guile/guile.install
+++ b/libre/xtensa-unknown-elf-gcc/xtensa-unknown-elf-gcc.install
@@ -1,11 +1,10 @@
 infodir=usr/share/info
-filelist=(guile.info
-          r5rs.info)
+filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.info)
 
 post_install() {
   [ -x usr/bin/install-info ] || return 0
   for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
   done
 }
 
@@ -16,8 +15,6 @@ post_upgrade() {
 pre_remove() {
   [ -x usr/bin/install-info ] || return 0
   for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
   done
 }
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/xtensa-unknown-elf-glibc/PKGBUILD b/libre/xtensa-unknown-elf-glibc/PKGBUILD
new file mode 100644
index 000000000..0a459b10b
--- /dev/null
+++ b/libre/xtensa-unknown-elf-glibc/PKGBUILD
@@ -0,0 +1,155 @@
+# $Id: PKGBUILD 186623 2013-05-30 07:47:03Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+
+# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
+# NOTE: valgrind requires rebuilt with each major glibc version
+
+_pkgname=glibc
+_target="xtensa-unknown-elf"
+_sysroot="usr/$CHOST/${_target}"
+
+pkgname=${_target}-glibc
+pkgver=2.17
+pkgrel=6
+pkgdesc="GNU C Library for Xtensa processors"
+arch=('i686' 'x86_64')
+url="http://www.gnu.org/software/libc"
+license=('GPL' 'LGPL')
+groups=('base')
+depends=("${_target}-linux-api-headers>=3.7" 'tzdata' 'filesystem>=2013.01')
+makedepends=('gcc>=4.7')
+backup=(etc/gai.conf
+        etc/locale.gen
+        etc/nscd.conf)
+options=('!strip')
+install=${_target}-glibc.install
+source=(http://ftp.gnu.org/gnu/libc/${_pkgname}-${pkgver}.tar.xz{,.sig}
+        glibc-2.17-sync-with-linux37.patch
+        glibc-2.17-getaddrinfo-stack-overflow.patch
+        glibc-2.17-regexp-matcher-overrun.patch
+        nscd.service
+        nscd.tmpfiles
+        locale.gen.txt
+        locale-gen)
+md5sums=('87bf675c8ee523ebda4803e8e1cec638'
+         'SKIP'
+         'fb99380d94598cc76d793deebf630022'
+         '56d5f2c09503a348281a20ae404b7de3'
+         '200acc05961b084ee00dde919e64f82d'
+         'c1e07c0bec0fe89791bfd9d13fc85edf'
+         'bccbe5619e75cf1d97312ec3681c605c'
+         '07ac979b6ab5eeb778d55f041529d623'
+         '476e9113489f93b348b21e144b6a8fcf')
+
+
+build() {
+  cd ${srcdir}/${_pkgname}-${pkgver}
+
+  # combination of upstream commits 318cd0b, b540704 and fc1abbe
+  patch -p1 -i ${srcdir}/glibc-2.17-sync-with-linux37.patch
+
+  # CVE-2013-1914 - upstream commit 1cef1b19
+  patch -p1 -i ${srcdir}/glibc-2.17-getaddrinfo-stack-overflow.patch
+
+  # CVE-2013-0242 - upstream commit a445af0b
+  patch -p1 -i ${srcdir}/glibc-2.17-regexp-matcher-overrun.patch
+
+  cd ${srcdir}
+  mkdir glibc-build
+  cd glibc-build
+
+  if [[ ${CARCH} = "i686" ]]; then
+    # Hack to fix NPTL issues with Xen, only required on 32bit platforms
+    # TODO: make separate glibc-xen package for i686
+    export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs"
+  fi
+
+  echo "slibdir=/usr/lib" >> configparms
+  echo "sbindir=/usr/bin" >> configparms
+  echo "rootsbindir=/usr/bin" >> configparms
+
+  # remove hardening options for building libraries
+  CFLAGS=${CFLAGS/-fstack-protector/}
+  CPPFLAGS=${CPPFLAGS/-D_FORTIFY_SOURCE=2/}
+
+  ${srcdir}/${_pkgname}-${pkgver}/configure --prefix=/usr \
+      --libdir=/usr/lib --libexecdir=/usr/lib \
+      --build=$CHOST --host=$_target \
+      --with-headers=/${_sysroot}/include \
+      --with-bugurl=https://labs.parabola.nu/ \
+      --enable-add-ons=nptl,libidn \
+      --enable-obsolete-rpc \
+      --enable-kernel=2.6.32 \
+      --enable-bind-now --disable-profile \
+      --enable-stackguard-randomization \
+      --enable-multi-arch
+
+  # build libraries with hardening disabled
+  echo "build-programs=no" >> configparms
+  make
+  
+  # re-enable hardening for programs
+  sed -i "/build-programs=/s#no#yes#" configparms
+  echo "CC += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms
+  echo "CXX += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms
+  make
+
+  # remove harding in preparation to run test-suite
+  sed -i '4,6d' configparms
+}
+
+check() {
+  # bug to file - the linker commands need to be reordered
+  LDFLAGS=${LDFLAGS/--as-needed,/}
+
+  cd ${srcdir}/glibc-build
+  make check
+}
+
+package() {
+  cd ${srcdir}/glibc-build
+
+  install -dm755 ${pkgdir}/etc
+  touch ${pkgdir}/etc/ld.so.conf
+
+  make install_root=${pkgdir} install
+
+  rm -f ${pkgdir}/etc/ld.so.{cache,conf}
+
+  install -dm755 ${pkgdir}/usr/lib/{locale,systemd/system,tmpfiles.d}
+
+  install -m644 ${srcdir}/${_pkgname}-${pkgver}/nscd/nscd.conf ${pkgdir}/etc/nscd.conf
+  install -m644 ${srcdir}/nscd.service ${pkgdir}/usr/lib/systemd/system
+  install -m644 ${srcdir}/nscd.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/nscd.conf
+
+  install -m644 ${srcdir}/${_pkgname}-${pkgver}/posix/gai.conf ${pkgdir}/etc/gai.conf
+
+  install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/bin
+
+  # create /etc/locale.gen
+  install -m644 ${srcdir}/locale.gen.txt ${pkgdir}/etc/locale.gen
+  sed -e '1,3d' -e 's|/| |g' -e 's|\\| |g' -e 's|^|#|g' \
+    ${srcdir}/glibc-${pkgver}/localedata/SUPPORTED >> ${pkgdir}/etc/locale.gen
+
+  # Do not strip the following files for improved debugging support
+  # ("improved" as in not breaking gdb and valgrind...):
+  #   ld-${pkgver}.so
+  #   libc-${pkgver}.so
+  #   libpthread-${pkgver}.so
+  #   libthread_db-1.0.so
+
+  cd $pkgdir
+  strip $STRIP_BINARIES usr/bin/{gencat,getconf,getent,iconv,iconvconfig} \
+                        usr/bin/{ldconfig,locale,localedef,nscd,makedb} \
+                        usr/bin/{pcprofiledump,pldd,rpcgen,sln,sprof} \
+                        usr/lib/getconf/*
+  [[ $CARCH = "i686" ]] && strip $STRIP_BINARIES usr/bin/lddlibc4
+
+  strip $STRIP_STATIC usr/lib/*.a
+
+  strip $STRIP_SHARED usr/lib/{libanl,libBrokenLocale,libcidn,libcrypt}-*.so \
+                      usr/lib/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-*.so \
+                      usr/lib/{libdl,libm,libnsl,libresolv,librt,libutil}-*.so \
+                      usr/lib/{libmemusage,libpcprofile,libSegFault}.so \
+                      usr/lib/{pt_chown,{audit,gconv}/*.so}
+}
diff --git a/libre/xtensa-unknown-elf-glibc/glibc-2.17-getaddrinfo-stack-overflow.patch b/libre/xtensa-unknown-elf-glibc/glibc-2.17-getaddrinfo-stack-overflow.patch
new file mode 100644
index 000000000..aa916ac2c
--- /dev/null
+++ b/libre/xtensa-unknown-elf-glibc/glibc-2.17-getaddrinfo-stack-overflow.patch
@@ -0,0 +1,47 @@
+diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
+index d95c2d1..2309281 100644
+--- a/sysdeps/posix/getaddrinfo.c
++++ b/sysdeps/posix/getaddrinfo.c
+@@ -2489,11 +2489,27 @@ getaddrinfo (const char *name, const char *service,
+       __typeof (once) old_once = once;
+       __libc_once (once, gaiconf_init);
+       /* Sort results according to RFC 3484.  */
+-      struct sort_result results[nresults];
+-      size_t order[nresults];
++      struct sort_result *results;
++      size_t *order;
+       struct addrinfo *q;
+       struct addrinfo *last = NULL;
+       char *canonname = NULL;
++      bool malloc_results;
++
++      malloc_results
++	= !__libc_use_alloca (nresults * (sizeof (*results) + sizeof (size_t)));
++      if (malloc_results)
++	{
++	  results = malloc (nresults * (sizeof (*results) + sizeof (size_t)));
++	  if (results == NULL)
++	    {
++	      __free_in6ai (in6ai);
++	      return EAI_MEMORY;
++	    }
++	}
++      else
++	results = alloca (nresults * (sizeof (*results) + sizeof (size_t)));
++      order = (size_t *) (results + nresults);
+ 
+       /* Now we definitely need the interface information.  */
+       if (! check_pf_called)
+@@ -2664,6 +2680,9 @@ getaddrinfo (const char *name, const char *service,
+ 
+       /* Fill in the canonical name into the new first entry.  */
+       p->ai_canonname = canonname;
++
++      if (malloc_results)
++	free (results);
+     }
+ 
+   __free_in6ai (in6ai);
+-- 
+1.7.1
+
diff --git a/libre/xtensa-unknown-elf-glibc/glibc-2.17-regexp-matcher-overrun.patch b/libre/xtensa-unknown-elf-glibc/glibc-2.17-regexp-matcher-overrun.patch
new file mode 100644
index 000000000..b108f9d42
--- /dev/null
+++ b/libre/xtensa-unknown-elf-glibc/glibc-2.17-regexp-matcher-overrun.patch
@@ -0,0 +1,137 @@
+diff --git a/posix/Makefile b/posix/Makefile
+index 88d409f..2cacd21 100644
+--- a/posix/Makefile
++++ b/posix/Makefile
+@@ -86,7 +86,7 @@ tests		:= tstgetopt testfnm runtests runptests	     \
+ 		   tst-rfc3484-3 \
+ 		   tst-getaddrinfo3 tst-fnmatch2 tst-cpucount tst-cpuset \
+ 		   bug-getopt1 bug-getopt2 bug-getopt3 bug-getopt4 \
+-		   bug-getopt5 tst-getopt_long1
++		   bug-getopt5 tst-getopt_long1 bug-regex34
+ xtests		:= bug-ga2
+ ifeq (yes,$(build-shared))
+ test-srcs	:= globtest
+@@ -199,5 +199,6 @@ bug-regex26-ENV = LOCPATH=$(common-objpfx)localedata
+ bug-regex30-ENV = LOCPATH=$(common-objpfx)localedata
+ bug-regex32-ENV = LOCPATH=$(common-objpfx)localedata
+ bug-regex33-ENV = LOCPATH=$(common-objpfx)localedata
++bug-regex34-ENV = LOCPATH=$(common-objpfx)localedata
+ tst-rxspencer-ARGS = --utf8 rxspencer/tests
+ tst-rxspencer-ENV = LOCPATH=$(common-objpfx)localedata
+diff --git a/posix/bug-regex34.c b/posix/bug-regex34.c
+new file mode 100644
+index 0000000..bb3b613
+--- /dev/null
++++ b/posix/bug-regex34.c
+@@ -0,0 +1,46 @@
++/* Test re_search with multi-byte characters in UTF-8.
++   Copyright (C) 2013 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#define _GNU_SOURCE 1
++#include <stdio.h>
++#include <string.h>
++#include <locale.h>
++#include <regex.h>
++
++static int
++do_test (void)
++{
++  struct re_pattern_buffer r;
++  /* ကျွန်ုပ်x */
++  const char *s = "\xe1\x80\x80\xe1\x80\xbb\xe1\x80\xbd\xe1\x80\x94\xe1\x80\xba\xe1\x80\xaf\xe1\x80\x95\xe1\x80\xbax";
++
++  if (setlocale (LC_ALL, "en_US.UTF-8") == NULL)
++    {
++      puts ("setlocale failed");
++      return 1;
++    }
++  memset (&r, 0, sizeof (r));
++
++  re_compile_pattern ("[^x]x", 5, &r);
++  /* This was triggering a buffer overflow.  */
++  re_search (&r, s, strlen (s), 0, strlen (s), 0);
++  return 0;
++}
++
++#define TEST_FUNCTION do_test ()
++#include "../test-skeleton.c"
+diff --git a/posix/regexec.c b/posix/regexec.c
+index 7f2de85..5ca2bf6 100644
+--- a/posix/regexec.c
++++ b/posix/regexec.c
+@@ -197,7 +197,7 @@ static int group_nodes_into_DFAstates (const re_dfa_t *dfa,
+ static int check_node_accept (const re_match_context_t *mctx,
+ 			      const re_token_t *node, int idx)
+      internal_function;
+-static reg_errcode_t extend_buffers (re_match_context_t *mctx)
++static reg_errcode_t extend_buffers (re_match_context_t *mctx, int min_len)
+      internal_function;
+ 
+ /* Entry point for POSIX code.  */
+@@ -1160,7 +1160,7 @@ check_matching (re_match_context_t *mctx, int fl_longest_match,
+ 	  || (BE (next_char_idx >= mctx->input.valid_len, 0)
+ 	      && mctx->input.valid_len < mctx->input.len))
+ 	{
+-	  err = extend_buffers (mctx);
++	  err = extend_buffers (mctx, next_char_idx + 1);
+ 	  if (BE (err != REG_NOERROR, 0))
+ 	    {
+ 	      assert (err == REG_ESPACE);
+@@ -1738,7 +1738,7 @@ clean_state_log_if_needed (re_match_context_t *mctx, int next_state_log_idx)
+ 	  && mctx->input.valid_len < mctx->input.len))
+     {
+       reg_errcode_t err;
+-      err = extend_buffers (mctx);
++      err = extend_buffers (mctx, next_state_log_idx + 1);
+       if (BE (err != REG_NOERROR, 0))
+ 	return err;
+     }
+@@ -2792,7 +2792,7 @@ get_subexp (re_match_context_t *mctx, int bkref_node, int bkref_str_idx)
+ 		  if (bkref_str_off >= mctx->input.len)
+ 		    break;
+ 
+-		  err = extend_buffers (mctx);
++		  err = extend_buffers (mctx, bkref_str_off + 1);
+ 		  if (BE (err != REG_NOERROR, 0))
+ 		    return err;
+ 
+@@ -4102,7 +4102,7 @@ check_node_accept (const re_match_context_t *mctx, const re_token_t *node,
+ 
+ static reg_errcode_t
+ internal_function __attribute_warn_unused_result__
+-extend_buffers (re_match_context_t *mctx)
++extend_buffers (re_match_context_t *mctx, int min_len)
+ {
+   reg_errcode_t ret;
+   re_string_t *pstr = &mctx->input;
+@@ -4111,8 +4111,10 @@ extend_buffers (re_match_context_t *mctx)
+   if (BE (INT_MAX / 2 / sizeof (re_dfastate_t *) <= pstr->bufs_len, 0))
+     return REG_ESPACE;
+ 
+-  /* Double the lengthes of the buffers.  */
+-  ret = re_string_realloc_buffers (pstr, MIN (pstr->len, pstr->bufs_len * 2));
++  /* Double the lengthes of the buffers, but allocate at least MIN_LEN.  */
++  ret = re_string_realloc_buffers (pstr,
++				   MAX (min_len,
++					MIN (pstr->len, pstr->bufs_len * 2)));
+   if (BE (ret != REG_NOERROR, 0))
+     return ret;
+ 
+-- 
+1.7.1
+
diff --git a/libre/xtensa-unknown-elf-glibc/glibc-2.17-sync-with-linux37.patch b/libre/xtensa-unknown-elf-glibc/glibc-2.17-sync-with-linux37.patch
new file mode 100644
index 000000000..24b25c997
--- /dev/null
+++ b/libre/xtensa-unknown-elf-glibc/glibc-2.17-sync-with-linux37.patch
@@ -0,0 +1,130 @@
+diff --git a/sysdeps/gnu/netinet/tcp.h b/sysdeps/gnu/netinet/tcp.h
+index 06e8414..b62a696 100644
+--- a/sysdeps/gnu/netinet/tcp.h
++++ b/sysdeps/gnu/netinet/tcp.h
+@@ -37,20 +37,29 @@
+ /*
+  * User-settable options (used with setsockopt).
+  */
+-#define	TCP_NODELAY	 1	/* Don't delay send to coalesce packets  */
+-#define	TCP_MAXSEG	 2	/* Set maximum segment size  */
+-#define TCP_CORK	 3	/* Control sending of partial frames  */
+-#define TCP_KEEPIDLE	 4	/* Start keeplives after this period */
+-#define TCP_KEEPINTVL	 5	/* Interval between keepalives */
+-#define TCP_KEEPCNT	 6	/* Number of keepalives before death */
+-#define TCP_SYNCNT	 7	/* Number of SYN retransmits */
+-#define TCP_LINGER2	 8	/* Life time of orphaned FIN-WAIT-2 state */
+-#define TCP_DEFER_ACCEPT 9	/* Wake up listener only when data arrive */
+-#define TCP_WINDOW_CLAMP 10	/* Bound advertised window */
+-#define TCP_INFO	 11	/* Information about this connection. */
+-#define	TCP_QUICKACK	 12	/* Bock/reenable quick ACKs.  */
+-#define TCP_CONGESTION	 13	/* Congestion control algorithm.  */
+-#define TCP_MD5SIG	 14	/* TCP MD5 Signature (RFC2385) */
++#define	TCP_NODELAY		 1  /* Don't delay send to coalesce packets  */
++#define	TCP_MAXSEG		 2  /* Set maximum segment size  */
++#define TCP_CORK		 3  /* Control sending of partial frames  */
++#define TCP_KEEPIDLE		 4  /* Start keeplives after this period */
++#define TCP_KEEPINTVL		 5  /* Interval between keepalives */
++#define TCP_KEEPCNT		 6  /* Number of keepalives before death */
++#define TCP_SYNCNT		 7  /* Number of SYN retransmits */
++#define TCP_LINGER2		 8  /* Life time of orphaned FIN-WAIT-2 state */
++#define TCP_DEFER_ACCEPT	 9  /* Wake up listener only when data arrive */
++#define TCP_WINDOW_CLAMP	 10 /* Bound advertised window */
++#define TCP_INFO		 11 /* Information about this connection. */
++#define	TCP_QUICKACK		 12 /* Bock/reenable quick ACKs.  */
++#define TCP_CONGESTION		 13 /* Congestion control algorithm.  */
++#define TCP_MD5SIG		 14 /* TCP MD5 Signature (RFC2385) */
++#define TCP_COOKIE_TRANSACTIONS	 15 /* TCP Cookie Transactions */
++#define TCP_THIN_LINEAR_TIMEOUTS 16 /* Use linear timeouts for thin streams*/
++#define TCP_THIN_DUPACK		 17 /* Fast retrans. after 1 dupack */
++#define TCP_USER_TIMEOUT	 18 /* How long for loss retry before timeout */
++#define TCP_REPAIR		 19 /* TCP sock is under repair right now */
++#define TCP_REPAIR_QUEUE	 20 /* Set TCP queue to repair */
++#define TCP_QUEUE_SEQ		 21 /* Set sequence number of repaired queue. */
++#define TCP_REPAIR_OPTIONS	 22 /* Repair TCP connection options */
++#define TCP_FASTOPEN		 23 /* Enable FastOpen on listeners */
+ 
+ #ifdef __USE_MISC
+ # include <sys/types.h>
+@@ -173,7 +182,9 @@ enum
+ # define TCPI_OPT_TIMESTAMPS	1
+ # define TCPI_OPT_SACK		2
+ # define TCPI_OPT_WSCALE	4
+-# define TCPI_OPT_ECN		8
++# define TCPI_OPT_ECN		8  /* ECN was negociated at TCP session init */
++# define TCPI_OPT_ECN_SEEN	16 /* we received at least one packet with ECT */
++# define TCPI_OPT_SYN_DATA	32 /* SYN-ACK acked data in SYN sent or rcvd */
+ 
+ /* Values for tcpi_state.  */
+ enum tcp_ca_state
+@@ -241,6 +252,49 @@ struct tcp_md5sig
+   u_int8_t	tcpm_key[TCP_MD5SIG_MAXKEYLEN];	/* Key (binary).  */
+ };
+ 
++/* For socket repair options.  */
++struct tcp_repair_opt
++{
++  u_int32_t	opt_code;
++  u_int32_t	opt_val;
++};
++
++/* Queue to repair, for TCP_REPAIR_QUEUE.  */
++enum
++{
++  TCP_NO_QUEUE,
++  TCP_RECV_QUEUE,
++  TCP_SEND_QUEUE,
++  TCP_QUEUES_NR,
++};
++
++/* For cookie transactions socket options.  */
++#define TCP_COOKIE_MIN		8		/*  64-bits */
++#define TCP_COOKIE_MAX		16		/* 128-bits */
++#define TCP_COOKIE_PAIR_SIZE	(2*TCP_COOKIE_MAX)
++
++/* Flags for both getsockopt and setsockopt */
++#define TCP_COOKIE_IN_ALWAYS	(1 << 0)	/* Discard SYN without cookie */
++#define TCP_COOKIE_OUT_NEVER	(1 << 1)	/* Prohibit outgoing cookies,
++						 * supercedes everything. */
++
++/* Flags for getsockopt */
++#define TCP_S_DATA_IN		(1 << 2)	/* Was data received? */
++#define TCP_S_DATA_OUT		(1 << 3)	/* Was data sent? */
++
++#define TCP_MSS_DEFAULT		 536U	/* IPv4 (RFC1122, RFC2581) */
++#define TCP_MSS_DESIRED		1220U	/* IPv6 (tunneled), EDNS0 (RFC3226) */
++
++struct tcp_cookie_transactions
++{
++  u_int16_t	tcpct_flags;
++  u_int8_t	__tcpct_pad1;
++  u_int8_t	tcpct_cookie_desired;
++  u_int16_t	tcpct_s_data_desired;
++  u_int16_t	tcpct_used;
++  u_int8_t	tcpct_value[TCP_MSS_DEFAULT];
++};
++
+ #endif /* Misc.  */
+ 
+ #endif /* netinet/tcp.h */
+diff --git a/sysdeps/unix/sysv/linux/bits/socket.h b/sysdeps/unix/sysv/linux/bits/socket.h
+index df8f167..eadd7d9 100644
+--- a/sysdeps/unix/sysv/linux/bits/socket.h
++++ b/sysdeps/unix/sysv/linux/bits/socket.h
+@@ -1,6 +1,5 @@
+ /* System-specific socket constants and types.  Linux version.
+-   Copyright (C) 1991, 1992, 1994-2001, 2004, 2006-2010, 2011, 2012
+-   Free Software Foundation, Inc.
++   Copyright (C) 1991-2013 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -208,6 +207,8 @@ enum
+ #define	MSG_MORE	MSG_MORE
+     MSG_WAITFORONE	= 0x10000, /* Wait for at least one packet to return.*/
+ #define MSG_WAITFORONE	MSG_WAITFORONE
++    MSG_FASTOPEN	= 0x20000000, /* Send data in TCP SYN.  */
++#define MSG_FASTOPEN	MSG_FASTOPEN
+ 
+     MSG_CMSG_CLOEXEC	= 0x40000000	/* Set close_on_exit for file
+ 					   descriptor received through
diff --git a/libre/xtensa-unknown-elf-glibc/locale-gen b/libre/xtensa-unknown-elf-glibc/locale-gen
new file mode 100644
index 000000000..5aff344c4
--- /dev/null
+++ b/libre/xtensa-unknown-elf-glibc/locale-gen
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+set -e
+
+LOCALEGEN=/etc/locale.gen
+LOCALES=/usr/share/i18n/locales
+if [ -n "$POSIXLY_CORRECT" ]; then
+  unset POSIXLY_CORRECT
+fi
+
+
+[ -f $LOCALEGEN -a -s $LOCALEGEN ] || exit 0;
+
+# Remove all old locale dir and locale-archive before generating new
+# locale data.
+rm -rf /usr/lib/locale/* || true
+
+umask 022
+
+is_entry_ok() {
+  if [ -n "$locale" -a -n "$charset" ] ; then
+    true
+  else
+    echo "error: Bad entry '$locale $charset'"
+    false
+  fi
+}
+
+echo "Generating locales..."
+while read locale charset; do \
+	case $locale in \#*) continue;; "") continue;; esac; \
+	is_entry_ok || continue
+	echo -n "  `echo $locale | sed 's/\([^.\@]*\).*/\1/'`"; \
+	echo -n ".$charset"; \
+	echo -n `echo $locale | sed 's/\([^\@]*\)\(\@.*\)*/\2/'`; \
+	echo -n '...'; \
+        if [ -f $LOCALES/$locale ]; then input=$locale; else \
+        input=`echo $locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; fi; \
+	localedef -i $input -c -f $charset -A /usr/share/locale/locale.alias $locale; \
+	echo ' done'; \
+done < $LOCALEGEN
+echo "Generation complete."
diff --git a/libre/xtensa-unknown-elf-glibc/locale.gen.txt b/libre/xtensa-unknown-elf-glibc/locale.gen.txt
new file mode 100644
index 000000000..ccdd81734
--- /dev/null
+++ b/libre/xtensa-unknown-elf-glibc/locale.gen.txt
@@ -0,0 +1,23 @@
+# Configuration file for locale-gen
+#
+# lists of locales that are to be generated by the locale-gen command.
+#
+# Each line is of the form:
+#
+#     <locale> <charset>
+#
+#  where <locale> is one of the locales given in /usr/share/i18n/locales
+#  and <charset> is one of the character sets listed in /usr/share/i18n/charmaps
+#
+#  Examples:
+#  en_US ISO-8859-1
+#  en_US.UTF-8 UTF-8
+#  de_DE ISO-8859-1
+#  de_DE@euro ISO-8859-15
+#
+#  The locale-gen command will generate all the locales,
+#  placing them in /usr/lib/locale.
+#
+#  A list of supported locales is included in this file.
+#  Uncomment the ones you need.
+#
diff --git a/libre/xtensa-unknown-elf-glibc/nscd.service b/libre/xtensa-unknown-elf-glibc/nscd.service
new file mode 100644
index 000000000..bc80a0730
--- /dev/null
+++ b/libre/xtensa-unknown-elf-glibc/nscd.service
@@ -0,0 +1,17 @@
+[Unit]
+Description=Name Service Cache Daemon
+After=syslog.target
+ 
+[Service]
+Type=forking
+ExecStart=/usr/sbin/nscd
+ExecStop=/usr/sbin/nscd --shutdown
+ExecReload=/usr/sbin/nscd -i passwd
+ExecReload=/usr/sbin/nscd -i group
+ExecReload=/usr/sbin/nscd -i hosts
+ExecReload=/usr/sbin/nscd -i services
+Restart=always
+PIDFile=/run/nscd/nscd.pid
+ 
+[Install]
+WantedBy=multi-user.target
diff --git a/libre/xtensa-unknown-elf-glibc/nscd.tmpfiles b/libre/xtensa-unknown-elf-glibc/nscd.tmpfiles
new file mode 100644
index 000000000..8a24a785e
--- /dev/null
+++ b/libre/xtensa-unknown-elf-glibc/nscd.tmpfiles
@@ -0,0 +1 @@
+d /run/nscd 0755 root root
diff --git a/libre/xtensa-unknown-elf-glibc/xtensa-unknown-elf-glibc.install b/libre/xtensa-unknown-elf-glibc/xtensa-unknown-elf-glibc.install
new file mode 100644
index 000000000..f8147a6cf
--- /dev/null
+++ b/libre/xtensa-unknown-elf-glibc/xtensa-unknown-elf-glibc.install
@@ -0,0 +1,19 @@
+infodir=usr/share/info
+filelist=(libc.info{,-1,-2,-3,-4,-5,-6,-7,-8,-9,-10,-11})
+
+post_upgrade() {
+  ldconfig -r .
+  locale-gen
+  
+  [[ -x usr/bin/install-info ]] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+pre_remove() {
+  [[ -x usr/bin/install-info ]] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
diff --git a/libre/xtensa-unknown-elf-linux-libre-api-headers/PKGBUILD b/libre/xtensa-unknown-elf-linux-libre-api-headers/PKGBUILD
new file mode 100644
index 000000000..23dada50b
--- /dev/null
+++ b/libre/xtensa-unknown-elf-linux-libre-api-headers/PKGBUILD
@@ -0,0 +1,47 @@
+# $Id: PKGBUILD 180857 2013-03-27 11:11:40Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+# toolchain build order: linux-libre-api-headers->glibc->binutils->gcc->binutils->glibc
+export ARCH=xtensa
+_target=xtensa-unknown-elf
+_sysroot="usr/$CHOST/${_target}"
+
+pkgname=${_target}-linux-libre-api-headers
+_basekernel=3.8
+_sublevel=4
+pkgver=${_basekernel}.${_sublevel}
+pkgrel=1
+pkgdesc="Kernel headers sanitized for use in userspace for Xtensa processors"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.gnu.org/software/libc"
+license=('GPL2')
+provides=("${_target}-linux-api-headers=${pkgver}")
+conflicts=("${_target}-linux-api-headers")
+replaces=("${_target}-linux-api-headers" )
+source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz"
+        "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz")
+md5sums=('84c2a77910932ffc7d958744ac9cf2f5'
+         'be610dd93dbe033cfe04018b27557c3e')
+
+build() {
+  cd ${srcdir}/linux-${_basekernel}
+
+  if [ "${_basekernel}" != "${pkgver}" ]; then
+    patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu"
+  fi
+
+  make mrproper
+  make headers_check
+}
+
+package() {
+  cd ${srcdir}/linux-${_basekernel}
+  make ARCH=${ARCH} INSTALL_HDR_PATH=${pkgdir}/${_sysroot} headers_install
+
+  # use headers from libdrm
+  rm -r ${pkgdir}/${_sysroot}/include/drm
+
+  # clean-up unnecessary files generated during install
+  find ${pkgdir} \( -name .install -o -name ..install.cmd \) -delete
+}
diff --git a/pcr/amsynth/PKGBUILD b/pcr/amsynth/PKGBUILD
index 1cd3cccf6..7142d6c9f 100644
--- a/pcr/amsynth/PKGBUILD
+++ b/pcr/amsynth/PKGBUILD
@@ -1,26 +1,25 @@
 # Maintainer : Guest One <theguestone at gmail dot com>
 
 pkgname=amsynth
-pkgver=1.3.2
-pkgrel=2
+pkgver=1.4.0
+pkgrel=1
 pkgdesc="Analogue Modeling SYNTHesizer"
 arch=('i686' 'x86_64')
-url="http://code.google.com/p/amsynth/"
+url="http://code.google.com/p/$pkgname/"
 license=('GPL')
-depends=('gtkmm' 'jack' 'liblo')
-makedepends=('desktop-file-utils' 'dssi' 'libtool' 'ladspa')
+depends=('gtkmm' 'jack' 'liblo' 'ladspa')
+makedepends=('desktop-file-utils' 'dssi' 'libtool')
 install="$pkgname.install"
-source=("http://amsynth.googlecode.com/files/amSynth-$pkgver.tar.gz")
-md5sums=('991329e433bb8c496f9ca5158faf0bca')
+source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.gz")
+md5sums=('9193d334c89996cf44e98422e03318bb')
 
 build() {
-  cd "$srcdir/amSynth-$pkgver"
-  libtoolize
+  cd "$srcdir/$pkgname-$pkgver"
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "$srcdir/amSynth-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir/" install
 }
diff --git a/pcr/bibletime/PKGBUILD b/pcr/bibletime/PKGBUILD
new file mode 100644
index 000000000..3a2941623
--- /dev/null
+++ b/pcr/bibletime/PKGBUILD
@@ -0,0 +1,39 @@
+# Maintainer: SanskritFritz (gmail)
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Tobias T. <OldShatterhand at gmx-topmail dot de>
+
+pkgname=bibletime
+pkgver=2.9.2
+pkgrel=10
+pkgdesc="Bible study tool for KDE4"
+arch=('x86_64' 'i686')
+url="http://www.bibletime.info/"
+license=('GPL2')
+depends=('sword' 'openssl' 'clucene' 'qtwebkit')
+makedepends=('cmake')
+install=$pkgname.install
+source=("http://sourceforge.net/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2")
+
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+
+	CXXFLAGS+=" -fpermissive"
+
+#	rm CMakeCache.txt
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DQT_QMAKE_EXECUTABLE=qmake4 \
+		-DBT_FORCE_USE_QT4=TRUE \
+		"$srcdir/$pkgname-$pkgver"
+	make
+}
+
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
+
+	make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
+sha256sums=('393c77419b0514645cf2417f52d37bdbd604f8eeb37e76355e14c38d896093c8')
diff --git a/pcr/bibletime/bibletime.install b/pcr/bibletime/bibletime.install
new file mode 100644
index 000000000..ad97d7bab
--- /dev/null
+++ b/pcr/bibletime/bibletime.install
@@ -0,0 +1,13 @@
+post_upgrade() {
+  update-desktop-database -q
+}
+
+post_install() {
+  post_upgrade
+}
+
+post_remove() {
+  post_upgrade
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/chiliproject/PKGBUILD b/pcr/chiliproject/PKGBUILD
index 4f933934a..976316dc4 100644
--- a/pcr/chiliproject/PKGBUILD
+++ b/pcr/chiliproject/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
 
 pkgname=chiliproject
 pkgver=3.3.0
diff --git a/pcr/cinepaint-lts/PKGBUILD b/pcr/cinepaint-lts/PKGBUILD
index c680ac904..da085729f 100644
--- a/pcr/cinepaint-lts/PKGBUILD
+++ b/pcr/cinepaint-lts/PKGBUILD
@@ -1,7 +1,7 @@
 # $Id$
 # Maintainer: tobias [tobias.archlinux.org]
 # Contributor: tobias [tobias.justdreams.de]
-# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
 pkgname=cinepaint-lts
 pkgver=1.0
diff --git a/pcr/cluster-glue/PKGBUILD b/pcr/cluster-glue/PKGBUILD
index f23f88ef3..2c45a3b0c 100644
--- a/pcr/cluster-glue/PKGBUILD
+++ b/pcr/cluster-glue/PKGBUILD
@@ -1,24 +1,23 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
 
 pkgname=cluster-glue
 _pkgname1=${pkgname::7}
 _pkgname2=${pkgname:8}
 _pkgname=${_pkgname1^}_${_pkgname2^}
-_grpname=linux-ha
 pkgver=1.0.11
-pkgrel=9
-pkgdesc='Set of libraries, tools and utilities suitable for the Heartbeat/Pacemaker cluster stack'
+pkgrel=14
+pkgdesc='Set of libraries, tools and utilities suitable for the Heartbeat/Pacemaker cluster stack (Linux-HA)'
 arch=(
   i686
   x86_64
   mips64el
 )
-url=http://$_grpname.org/wiki/$_pkgname
+group=linux-ha
+url=http://$group.org/wiki/$_pkgname
 license=(
   GPL2
   LGPL2.1
 )
-group=$_grpname
 depends=(
   curl
   dbus-glib
@@ -31,14 +30,11 @@ depends=(
   net-snmp
   openhpi
   openipmi
-  python
-  util-linux
-  #vacm
-)
-optdepends=(
-  net-tools
   openssh
+  python2
+  util-linux
 )
+optdepends=net-tools
 makedepends=(
   help2man
   libxslt
@@ -53,8 +49,20 @@ provides=(ha-$_pkgname2)
 conflicts=ha-$_pkgname2
 replaces=ha-$_pkgname2
 install=$pkgname.install
-source=http://hg.$_grpname.org/$_pkgname2/archive/$_pkgname2-$pkgver.tar.bz2
-sha512sums=35ac8ac555c39f24c11e3a768cc50eba051fe617edf4cdc0429dac73f45a472f144cfe6ec5faff575606f2b04ff76a2f732556d848b61410c2683d93ba928413
+source=(
+  http://hg.$group.org/$_pkgname2/archive/$_pkgname2-$pkgver.tar.bz2
+  ha-log.service
+  fixing-path.sed
+  replace-linux_os-to-gnulinux_os-term.sed
+  replace-opensource-to-free-term.sed
+)
+sha512sums=(
+  35ac8ac555c39f24c11e3a768cc50eba051fe617edf4cdc0429dac73f45a472f144cfe6ec5faff575606f2b04ff76a2f732556d848b61410c2683d93ba928413
+  bb5bc5c5a9347302be583c43b100c0c3760ec4dcc3348a9f9708d5b2c58ec02dd5782c5ac9dcb86223258493ad3fba8ddd8dc5670390f0f602c34869b26bee6d
+  ce58a2af9f32265f12cc4984e9ae7f285fdb7737813ecccc0780015d048938d9dd79278635eb1cc6833f12f37a8c43211fec17411780220cf38fc44b91ecc076
+  e59386aee4db5857fa131798327aa449a5efcd7d50c3ab45dadfa0becc31698a62367ce83b85ca739bdebaad4a9daf96d02c42673a4e26294ec0fa67323fdb5b
+  c82bd919d1cd02afccd10aea3e015f289ac97e387a1485097d681f9161a00c64859a5dce0ed36b98ad6a340264c2d854dcc83e3248e12828795b73c6ff67ef5b
+)
 
 prepare() {
   export _CLUSTER_USER=hacluster
@@ -85,78 +93,61 @@ prepare() {
           s|/sbin:/usr/sbin:/usr/local/sbin:/usr/local/bin|/usr/bin|;
          ' configure.ac
   sed -i 's|INCLUDES|AM_CPPFLAGS|;
-         ' $(grep -rl INCLUDES . | grep Makefile.am)
+         ' $(grep -rlI INCLUDES | grep Makefile.am)
 
   # fixing path
-  sed -i 's|bin/sh|usr/bin/bash|;
-         ' $(grep -rl bin/sh .)
-  sed -i 's|usr/sbin|usr/bin|;
-         ' $(grep -rl usr/bin .)
-  sed -i 's| /bin| /usr/bin|;
-         ' $(grep -rl ' /bin' .)
-  sed -i 's| /sbin| /usr/bin|;
-         ' $(grep -rl ' /sbin' .)
-  sed -i 's|/var/lock|/run/lock|;
-         ' $(grep -rl /var/lock .)
-  sed -i 's|var/run|run|;
-         ' $(grep -rl var/run)
+  sed -i -f $srcdir/fixing-path.sed\
+    $(grep -rlI /bin)\
+    $(grep -rlI /sbin)\
+    $(grep -rlI /lib)\
+    $(grep -rlI /var)
 
-  # remove Open Source term
-  sed -i 's|Open Source / ||;
-          s|open source / ||;
-          s|Open Source|Free Software|;
-          s|open source|free software|;
-         ' $(grep -ril 'open source')
-  sed -i 's|OpenSource / ||;
-          s|opensource / ||;
-          s|OpenSource|FreeSoftware|;
-          s|opensource|freesoftware|;
-         ' $(grep -ril opensource)
+  # fixing python2 path
+  sed -i 's|bin/env python|bin/env python2|g;
+          s|bin/python|bin/python2|g;
+         ' $(grep -rlI 'bin/env python')\
+           $(grep -rlI bin/python)
 
-  # remove Linux term
-  sed -i '/, Linux/ s|Linux|GNU/Linux|;
-          /And Linux/ s|Linux|GNU/Linux|;
-          /and Linux/ s|Linux|GNU/Linux|;
-          /For Linux/ s|Linux|GNU/Linux|;
-          /for Linux/ s|Linux|GNU/Linux|;
-          /Like Linux/ s|Linux|GNU/Linux|;
-          /like Linux/ s|Linux|GNU/Linux|;
-          /Linux,/ s|Linux|GNU/Linux|;
-          /Linux and/ s|Linux|GNU/Linux|;
-          /Linux distribution/ s|Linux|GNU/Linux|;
-          /Linux machine/ s|Linux|GNU/Linux|;
-          /Linux operating/ s|Linux|GNU/Linux|;
-          /Linux OS/ s|Linux|GNU/Linux|;
-          /Linux specific/ s|Linux|GNU/Linux|;
-          /Linux system/ s|Linux|GNU/Linux|;
-          /Under Linux/ s|Linux|GNU/Linux|;
-          /under Linux/ s|Linux|GNU/Linux|;
-          /On Linux/ s|Linux|GNU/Linux|;
-          /on Linux/ s|Linux|GNU/Linux|;
-          /(e.g. Linux)/ s|Linux|GNU/Linux|;
-          /High-Availability Linux/ s|Linux|GNU/Linux|;
-          /sysDescr.0 = STRING: Linux/ s|Linux|GNU/Linux|;
-          /This is what the Linux/ s|Linux|GNU/Linux|;
-          s|GNU/GNU|GNU|;
-          s|GNU/Linux kernel|Linux kernel|;
-          s|GNU/Linux specific kernel|Linux specific kernel|;
-         ' $(grep -rl Linux)
-}
+  # remove Linux (OS) term to GNU/Linux (OS) term
+  sed -i -f $srcdir/replace-linux_os-to-gnulinux_os-term.sed\
+    $(grep -rlI Linux)
 
-build() {
+  # replace Open Source term to Free term
+  sed -i -f $srcdir/replace-opensource-to-free-term.sed\
+    $(grep -rilI 'open.\{0,1\}source')
+#}
+
+#build() { # disabled, due that is needed internet for generating man pages with libxslt.
   cd $srcdir/Reusable-${_pkgname1^}-Components-$_pkgname2--$_pkgname2-$pkgver
   setarch $CARCH ./autogen.sh
-  setarch $CARCH ./configure --prefix=/usr\
+  setarch $CARCH ./configure\
+    --sysconfdir=/etc\
+    --prefix=/usr\
+    --exec-prefix=/usr\
+    --bindir=/usr/bin\
+    --sbindir=/usr/bin\
+    --includedir=/usr/include\
+    --oldincludedir=/usr/include\
+    --libdir=/usr/lib\
+    --libexecdir=/usr/lib\
+    --datarootdir=/usr/share\
+    --datadir=/usr/share\
+    --docdir=/usr/share/doc/$pkgname\
+    --dvidir=/usr/share/doc/$pkgname\
+    --htmldir=/usr/share/doc/$pkgname\
+    --pdfdir=/usr/share/doc/$pkgname\
+    --psdir=/usr/share/doc/$pkgname\
+    --infodir=/usr/share/info\
+    --localedir=/usr/share/locale\
+    --mandir=/usr/share/man\
+    --localstatedir=/var\
     --disable-ansi\
     --disable-fatal-warnings\
     --disable-static\
     --enable-doc\
     --enable-libnet\
+    --enable-shared\
     --enable-upstart\
-    --libdir=/usr/lib\
-    --localstatedir=/var\
-    --sbindir=/usr/bin\
-    --sysconfdir=/etc\
     --with-daemon-group=haclient\
     --with-daemon-user=hacluster\
     --with-ocf-root=/usr/lib/ocf
@@ -167,19 +158,8 @@ package() {
   cd $srcdir/Reusable-${_pkgname1^}-Components-$_pkgname2--$_pkgname2-$pkgver
   setarch $CARCH make DESTDIR=$pkgdir install
 
-  rm $pkgdir/etc/rc.d/logd && rmdir $pkgdir/etc{/rc.d,}
-
   install -d $pkgdir/usr/lib/systemd/system
-  echo '[Unit]'                                   >  $pkgdir/usr/lib/systemd/system/ha_log.service
-  echo 'Description=Startup script logd service'  >> $pkgdir/usr/lib/systemd/system/ha_log.service
-  echo 'Requires=network.target remote-fs.target' >> $pkgdir/usr/lib/systemd/system/ha_log.service
-  echo ''                                         >> $pkgdir/usr/lib/systemd/system/ha_log.service
-  echo '[Service]'                                >> $pkgdir/usr/lib/systemd/system/ha_log.service
-  echo 'Type=forking'                             >> $pkgdir/usr/lib/systemd/system/ha_log.service
-  echo 'ExecStart=/usr/lib/heartbeat/ha_logd'     >> $pkgdir/usr/lib/systemd/system/ha_log.service
-  echo ''                                         >> $pkgdir/usr/lib/systemd/system/ha_log.service
-  echo '[Install]'                                >> $pkgdir/usr/lib/systemd/system/ha_log.service
-  echo 'WantedBy=multi-user.target'               >> $pkgdir/usr/lib/systemd/system/ha_log.service
+  install -m644 $srcdir/ha-log.service $pkgdir/usr/lib/systemd/system
 
   msg 'AFTER COMPILE THIS SOFTWARE YOU MUST DELETE A CLUSTER USER AND A CLUSTER GROUP, EXECUTE AS ROOT:'
   echo -e "# userdel $_CLUSTER_USER"
diff --git a/pcr/cluster-glue/fixing-path.sed b/pcr/cluster-glue/fixing-path.sed
new file mode 100644
index 000000000..43ef66253
--- /dev/null
+++ b/pcr/cluster-glue/fixing-path.sed
@@ -0,0 +1,29 @@
+s|/bin/sh|/bin/bash|g;
+s| /bin| /usr/bin|g;
+s|=/bin|=/usr/bin|g;
+s|!/bin|!/usr/bin|g;
+s|:/bin|:/usr/bin|g;
+s|#/bin|#/usr/bin|g;
+s| /sbin| /usr/bin|g;
+s|=/sbin|=/usr/bin|g;
+s|!/sbin|!/usr/bin|g;
+s|:/sbin|:/usr/bin|g;
+s|#/sbin|#/usr/bin|g;
+s| /usr/sbin| /usr/bin|g;
+s|=/usr/sbin|=/usr/bin|g;
+s|!/usr/sbin|!/usr/bin|g;
+s|:/usr/sbin|:/usr/bin|g;
+s|#/usr/sbin|#/usr/bin|g;
+s|:/usr/bin:/usr/bin|:/usr/bin|g;
+s|lib64|lib|g;
+s| /lib| /usr/lib|g;
+s|=/lib|=/usr/lib|g;
+s|#/lib|#/usr/lib|g;
+s| /usr/libexec| /usr/lib|g;
+s|=/usr/libexec|=/usr/lib|g;
+s|#/usr/libexec|#/usr/lib|g;
+s| /usr/var| /var|g;
+s|=/usr/var|=/var|g;
+s|#/usr/var|#/var|g;
+s|/var/lock|/run/lock|g;
+s|/var/run|/run|g;
diff --git a/pcr/cluster-glue/ha-log.service b/pcr/cluster-glue/ha-log.service
new file mode 100644
index 000000000..5115298d7
--- /dev/null
+++ b/pcr/cluster-glue/ha-log.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Non-blocking logging daemon.
+Requires=network.target remote-fs.target
+Before=heartbeat.service openais.service corosync.service
+
+[Service]
+Type=forking
+ExecStart=/usr/lib/heartbeat/ha_logd -d >/dev/null 2>&1
+ExecStop=/usr/lib/heartbeat/ha_logd -k >/dev/null 2>&1
+
+[Install]
+WantedBy=multi-user.target
diff --git a/pcr/cluster-glue/replace-linux_os-to-gnulinux_os-term.sed b/pcr/cluster-glue/replace-linux_os-to-gnulinux_os-term.sed
new file mode 100644
index 000000000..2c9801c11
--- /dev/null
+++ b/pcr/cluster-glue/replace-linux_os-to-gnulinux_os-term.sed
@@ -0,0 +1,73 @@
+s|Linux,|GNU/Linux,|g;
+s|Linux and|GNU/Linux and|g;
+s|Linux distro|GNU/Linux distro|g;
+s|Linux distribution|GNU/Linux distribution|g;
+s|Linux machine|GNU/Linux machine|g;
+s|Linux Only|GNU/Linux Only|g;
+s|Linux only|GNU/Linux only|g;
+s|Linux operating|GNU/Linux operating|g;
+s|Linux OS|GNU/Linux OS|g;
+s|Linux platform|GNU/Linux platform|g;
+s|Linux software|GNU/Linux software|g;
+s|Linux specific|GNU/Linux specific|g;
+s|Linux system|GNU/Linux system|g;
+s|Linux will|GNU/Linux will|g;
+s|# Linux$|# GNU/Linux|g;
+s|# Linux[.]$|# GNU/Linux.|g;
+s|* Linux$|* GNU/Linux|g;
+s|* Linux[.]$|* GNU/Linux.|g;
+s|// Linux$|// GNU/Linux|g;
+s|// Linux[.]$|// GNU/Linux.|g;
+s|, Linux|, GNU/Linux|g;
+s|As Linux|As GNU/Linux|g;
+s|as Linux|as GNU/Linux|g;
+s|And Linux|And GNU/Linux|g;
+s|and Linux|and GNU/Linux|g;
+s|Be Linux|Be GNU/Linux|g;
+s|be Linux|be GNU/Linux|g;
+s|Because Linux|Because GNU/Linux|g;
+s|because Linux|because GNU/Linux|g;
+s|e[.]g[.] Linux|e.g. GNU/Linux|g;
+s|For Linux|For GNU/Linux|g;
+s|for Linux|for GNU/Linux|g;
+s|In Linux|In GNU/Linux|g;
+s|in Linux|in GNU/Linux|g;
+s|Like Linux|Like GNU/Linux|g;
+s|like Linux|like GNU/Linux|g;
+s|non-Linux|non GNU/Linux|g;
+s|Of Linux|Of GNU/Linux|g;
+s|of Linux|of GNU/Linux|g;
+s|On Linux|On GNU/Linux|g;
+s|on Linux|on GNU/Linux|g;
+s|OS type: Linux|OS type: GNU/Linux|g;
+s|Other Linux|Other GNU/Linux|g;
+s|other Linux|other GNU/Linux|g;
+s|The Linux|The GNU/Linux|g;
+s|the Linux|the GNU/Linux|g;
+s|Typically Linux|Typically GNU/Linux|g;
+s|typically Linux|typically GNU/Linux|g;
+s|To Linux|To GNU/Linux|g;
+s|to Linux|to GNU/Linux|g;
+s|Under Linux|Under GNU/Linux|g;
+s|under Linux|under GNU/Linux|g;
+s|e2fsprogs, typically GNU/Linux|e2fsprogs, typically Linux|g;
+s|GNU/GNU|GNU|g;
+s|ArchGNU/Linux|ArchLinux|g;
+s|MkGNU/Linux|MkLinux|g;
+s|GNU/Linux device|Linux device|g;
+s|GNU/Linux Director Daemon|Linux Director Daemon|g;
+s|GNU/Linux is a registered trademark of Linus Torvalds|Linux is a registered trademark of Linus Torvalds|g;
+s|GNU/Linux kernel|Linux kernel|g;
+s|GNU/Linux specific kernel|Linux specific kernel|g;
+s|GNU/Linux Standard Base|Linux Standard Base|g;
+s|GNU/Linux sysfs|Linux sysfs|g;
+s|GNU/Linux Virtual Server|Linux Virtual Server|g;
+s|GNU/Linux Watchdog|Linux Watchdog|g;
+s|GNU/Linux watchdog|Linux watchdog|g;
+s|GNU/LinuxHA|LinuxHA|g;
+s|GNU/Linux-HA|Linux-HA|g;
+s|GNU/LinuxSCSI|LinuxSCSI|g;
+s|HA GNU/Linux|HA Linux|g;
+s|High-Availability GNU/Linux|High-Availability Linux|g;
+s|SEGNU/Linux|SELinux|g;
+s|VA GNU/Linux Cluster|VA Linux Cluster|g;
diff --git a/pcr/cluster-glue/replace-opensource-to-free-term.sed b/pcr/cluster-glue/replace-opensource-to-free-term.sed
new file mode 100644
index 000000000..c086bb91e
--- /dev/null
+++ b/pcr/cluster-glue/replace-opensource-to-free-term.sed
@@ -0,0 +1,19 @@
+s|Open Source Definition (Version [0-9].[0-9])|Free Software Definition|g;
+s|Open Source Definition|Free Software Definition|g;
+s|Open Source Initiative|Free Software Foundation|g;
+s|OSI Certifi|FSF Certif|g;
+s|OSI certifi|FSF certif|g;
+s|opensource[.]org/osd-annotated|gnu.org/philosophy/free-sw.html|g;
+s|opensource[.]org/osd|gnu.org/philosophy/free-sw.html|g;
+s|opensource[.]org/|gnu.org/philosophy/free-sw.html|g;
+s|[ _-].\{1,3\}[ _-][oO][pP][eE][nN].\{0,1\}[sS][oO][uU][rR][cC][eE]||g;
+s|[oO][pP][eE][nN].\{0,1\}[sS][oO][uU][rR][cC][eE][ _-].\{1,3\}[ _-]||g;
+s|OPEN.\{0,1\}SOURCE|FREE|g;
+s|Open.\{0,1\}[sS]ource|Free|g;
+s|open.\{0,1\}[sS]ource|free|g;
+s|Free Development Lab|Open Source Development Lab|g;
+s|free[.]org|opensource.org|g;
+s|gnu[.]org/philosophy/free-sw[.]htmllicenses|opensource.org/licenses|g;
+s|oss[.]software[.]ibm[.]com/developerworks/free|oss.software.ibm.com/developerworks/opensource|g;
+s|oberhumer[.]com/free|oberhumer.com/opensource|g;
+s|free@google[.]com|opensource@google.com|g;
diff --git a/pcr/clusterit/PKGBUILD b/pcr/clusterit/PKGBUILD
index c325a003b..59ef12be3 100644
--- a/pcr/clusterit/PKGBUILD
+++ b/pcr/clusterit/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
 
 pkgname=clusterit
 pkgver=2.5
diff --git a/pcr/collada-dom/PKGBUILD b/pcr/collada-dom/PKGBUILD
index ebcc90448..1b42c921c 100644
--- a/pcr/collada-dom/PKGBUILD
+++ b/pcr/collada-dom/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
 
 pkgname=collada-dom
 pkgver=2.4.0
diff --git a/pcr/corosync/PKGBUILD b/pcr/corosync/PKGBUILD
index e176cb112..a24064722 100644
--- a/pcr/corosync/PKGBUILD
+++ b/pcr/corosync/PKGBUILD
@@ -1,9 +1,9 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
 
 pkgname=corosync
 _pkgflag=lts
 pkgver=2.3.0
-pkgrel=2
+pkgrel=4
 pkgdesc='Cluster engine for nodal communication systems with additional features for implementing high availability within applications'
 arch=(
   i686
@@ -13,21 +13,23 @@ arch=(
 url=http://www.$pkgname.org
 license=BSD
 depends=(
+  dbus
   libqb
   libstatgrab
   net-snmp
   nss
 )
-makedepends=doxygen
+optdepends='augeas: for config files'
+makedepends=(
+  augeas
+  doxygen
+  graphviz
+)
 conflicts=$pkgname-$_pkgflag
 options=(!libtool)
 source=http://$pkgname.org/download/$pkgname-$pkgver.tar.gz
 sha512sums=cd2ff5182f0d4827a10d50a211aa073e3d544bf7b98f9b0c834243c0d2cd5446d7950021cb1a21fc16f4951c8b2acf4b75c0b0c72d815b7d67dcba71623d2e51
 
-prepare() {
-  cd $srcdir/$pkgname-$pkgver
-}
-
 build() {
   cd $srcdir/$pkgname-$pkgver
   setarch $CARCH ./configure --prefix=/usr\
@@ -49,6 +51,7 @@ build() {
     --enable-xmlconf\
     --libdir=/usr/lib\
     --localstatedir=/var\
+    --sbindir=/usr/bin\
     --sysconfdir=/etc\
     --with-initddir=/etc/rc.d\
     --with-systemddir=/usr/lib/systemd/system
diff --git a/pcr/debootstrap/PKGBUILD b/pcr/debootstrap/PKGBUILD
index e46a7d0b1..d5a45b5b1 100644
--- a/pcr/debootstrap/PKGBUILD
+++ b/pcr/debootstrap/PKGBUILD
@@ -1,9 +1,8 @@
-# $Id$
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
 pkgname=debootstrap
-pkgver=1.0.48
-pkgrel=1
+pkgver=1.0.52
+pkgrel=3
 pkgdesc="A tool used to create a gNewSense or Trisquel base system from scratch, without requiring the availability of dpkg or apt"
 arch=('any')
 license=('GPL')
@@ -13,15 +12,20 @@ source=("http://ftp.debian.org/debian/pool/main/d/${pkgname}/${pkgname}_${pkgver
         'metad'
         'trisquel')
 install="debootstrap.install"
-md5sums=('f75ae43204ed273c7a95c12a5a2f715a'
+md5sums=('97ac467bf63cf066f52d0dd7fcf77e9a'
          '4425300ca68d60fb60a6d699e153a519'
          'b020aa8426e70a6024c8e76312c17d78')
 
 package(){
-  tar -xzf "$srcdir/data.tar.gz" -C "$pkgdir/"
-
+  tar -xzf "${srcdir}/data.tar.gz" -C "${pkgdir}/"
+  # move the executables to /usr/bin
+  mkdir -p ${pkgdir}/usr/bin
+  mv "${pkgdir}/usr/sbin"/* "${pkgdir}/usr/bin/"
+  rmdir "${pkgdir}/usr/sbin"
+  # patch the path to use gNewSense or Trisquel defaults (prevents error in chrooted environment) 
+  sed -i 's|export PATH|export PATH="/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:/opt/java/jre/bin:/usr/bin/vendor_perl:/usr/bin/core_perl"|' ${pkgdir}/usr/bin/debootstrap
   # doesn't work with gpg 2.x, patch to point to gpg1v
-  sed 's/gpgv/gpg1v/g;' -i "$pkgdir/usr/sbin/debootstrap" "$pkgdir/usr/share/debootstrap/functions"
+  sed 's/gpgv/gpg1v/g;' -i "${pkgdir}/usr/bin/debootstrap" "${pkgdir}/usr/share/debootstrap/functions"
 
   # add gNewSense script
   install -m644  metad        "$pkgdir/usr/share/debootstrap/scripts"
diff --git a/pcr/drumgizmo/PKGBUILD b/pcr/drumgizmo/PKGBUILD
new file mode 100644
index 000000000..d423a6f82
--- /dev/null
+++ b/pcr/drumgizmo/PKGBUILD
@@ -0,0 +1,26 @@
+# Maintainer: Guest One <theguestone at gmail dot com>
+
+pkgname=drumgizmo
+pkgver=0.9.3
+pkgrel=1
+pkgdesc="A drum LV2 plugin and stand-alone application"
+arch=('i686' 'x86_64')
+url="http://www.drumgizmo.org/"
+license=('GPL')
+groups=('lv2-plugins')
+depends=('lv2' 'libsmf' 'libao' 'jack' 'qt4')
+options=('!libtool')
+source=("${url}releases/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz")
+md5sums=('a0aeef33f74792afd528bec21b8d0f6b')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr \
+              --enable-static=no
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir/" install
+}
diff --git a/pcr/drumkv1/PKGBUILD b/pcr/drumkv1/PKGBUILD
new file mode 100644
index 000000000..4a55012f6
--- /dev/null
+++ b/pcr/drumkv1/PKGBUILD
@@ -0,0 +1,31 @@
+# Maintainer: Guest One <theguestone at gmail dot com>
+
+pkgname=drumkv1
+pkgver=0.3.3
+pkgrel=1
+pkgdesc="An old-school drum-kit sampler"
+arch=('i686' 'x86_64')
+url="http://$pkgname.sourceforge.net/$pkgname-index.html"
+license=('GPL')
+groups=('lv2-plugins')
+depends=('jack' 'liblo' 'lv2' 'qt4')
+install="$pkgname.install"
+source=("http://download.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
+md5sums=('d7c7270fdd01552b74eead36dd638ea4')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # x86_64 lib path fix
+  sed -i "s/lib64/lib/" src/src_lv2.pro
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir/" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/drumkv1/drumkv1.install b/pcr/drumkv1/drumkv1.install
new file mode 100644
index 000000000..029294d67
--- /dev/null
+++ b/pcr/drumkv1/drumkv1.install
@@ -0,0 +1,12 @@
+post_install() {
+  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/pcr/ffmpeg-static/PKGBUILD b/pcr/ffmpeg-static/PKGBUILD
deleted file mode 100644
index 1e5634fb6..000000000
--- a/pcr/ffmpeg-static/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id$
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Contributor: Paul Mattal <paul@archlinux.org>
-# Maintainer (Parabola): Márcio Silva    <coadde@lavabit.com>
-
-pkgname=ffmpeg-static
-pkgver=1.0
-pkgrel=2
-epoch=1
-pkgdesc='Complete and free Internet live audio and video broadcasting solution for GNU/Linux, with static library'
-arch=(i686 x86_64 mips64el)
-url=http://${pkgname%-static}.org/
-license=(GPL)
-depends=(alsa-lib bzip2 gsm lame libpulse libtheora libva libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex v4l-utils x264 xvidcore zlib)
-makedepends=(yasm libvdpau)
-provides=(${pkgname%-static})
-conflicts=(${pkgname%-static})
-source=(http://${pkgname%-static}.org/releases/${pkgname%-static}-$pkgver.tar.bz2)
-md5sums=(3ed526cea20c1bffb5a37f7730f710bd)
-
-build() {
-  cd ${pkgname%-static}-$pkgver
-
-  ./configure \
-    --prefix=/usr \
-    --enable-libmp3lame \
-    --enable-libvorbis \
-    --enable-libxvid \
-    --enable-libx264 \
-    --enable-libvpx \
-    --enable-libtheora \
-    --enable-libgsm \
-    --enable-libspeex \
-    --enable-postproc \
-    --enable-shared \
-    --enable-x11grab \
-    --enable-libopencore_amrnb \
-    --enable-libopencore_amrwb \
-    --enable-libschroedinger \
-    --enable-libopenjpeg \
-    --enable-librtmp \
-    --enable-libpulse \
-    --enable-libv4l2 \
-    --enable-gpl \
-    --enable-version3 \
-    --enable-runtime-cpudetect \
-    --disable-debug \
-    --enable-static
-  make
-  make tools/qt-faststart
-  make doc/ff{mpeg,play,server}.1
-}
-
-package() {
-  cd ${pkgname%-static}-$pkgver
-  make DESTDIR="$pkgdir" install install-man
-  install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/ganglia/PKGBUILD b/pcr/ganglia/PKGBUILD
index 3a2e54dd8..efa005071 100644
--- a/pcr/ganglia/PKGBUILD
+++ b/pcr/ganglia/PKGBUILD
@@ -1,9 +1,9 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
 
 pkgname=ganglia
 pkgver=3.6.0
-pkgrel=1
-pkgdesc='Scalable distributed monitoring system for high-performance computing systems such as clusters and Grids'
+pkgrel=4
+pkgdesc='Scalable distributed monitoring system for high-performance computing systems such as clusters and Grids.'
 arch=(
   i686
   x86_64
@@ -18,41 +18,35 @@ depends=(
   python2
   rrdtool
 )
+install=$pkgname.install
 options=(!libtool)
 optdepends="$pkgname-web: Web frontend"
 backup=(
-  etc/gmond.conf
-  etc/gmetad.conf
+  etc/ganglia/gmond.conf
+  etc/ganglia/gmetad.conf
+)
+source=(
+  http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
+  gmetad.service.in
+  gmond.service.in
+)
+sha512sums=(
+  2a05d37787f1440c0c4aa91cdf0f4f4cb39c840b3b0fdcd6fe58cfb5892a75f81d36f6191c83c17558c37154298268df74fa255d2c940a8b84a7bf3ddb102394
+  a42b7dcb7dd81961cc9fef114f8c4c352375ed931dc2ae77b1139c6fde7cbd6544fcb5fe286ff6066ef37696821dc9f6fcab7c6b14d3ebaa59e895219cd89836
+  c362a383cbbaf5540b5d698f664534bd0da73bcc5ee4336c468844ed17706e05450f35e4f6cf969f1d2495c462883873b30e4575b9ee8ded74ab475afda608bb
 )
-source=http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
-sha512sums=2a05d37787f1440c0c4aa91cdf0f4f4cb39c840b3b0fdcd6fe58cfb5892a75f81d36f6191c83c17558c37154298268df74fa255d2c940a8b84a7bf3ddb102394
 
 prepare() {
   cd $srcdir/$pkgname-$pkgver
+
   #sed -i 's|sapi/embed/php_embed.h|php/sapi/embed/php_embed.h|' configure
-  touch gm{on,eta}d/gm{on,eta}d.service.in
 
-  echo '[Unit]'                                        >  gmetad/gmetad.service.in
-  echo 'Description=Ganglia Meta Daemon'               >> gmetad/gmetad.service.in
-  echo 'After=network.target'                          >> gmetad/gmetad.service.in
-  echo ''                                              >> gmetad/gmetad.service.in
-  echo '[Service]'                                     >> gmetad/gmetad.service.in
-  echo 'Type=forking'                                  >> gmetad/gmetad.service.in
-  echo 'PIDFile=/run/gmetad.pid'                       >> gmetad/gmetad.service.in
-  echo 'ExecStart=/usr/sbin/gmetad -p /run/gmetad.pid' >> gmetad/gmetad.service.in
-  echo ''                                              >> gmetad/gmetad.service.in
-  echo '[Install]'                                     >> gmetad/gmetad.service.in
-  echo 'WantedBy=multi-user.target'                    >> gmetad/gmetad.service.in
+  sed -i 's|nobody|ganglia|' gmetad/gmetad.conf.in
 
-  echo '[Unit]'                                         >  gmond/gmond.service.in
-  echo 'Description=Ganglia Monitor Daemon'             >> gmond/gmond.service.in
-  echo 'After=network.target'                           >> gmond/gmond.service.in
-  echo ''                                               >> gmond/gmond.service.in
-  echo '[Service]'                                      >> gmond/gmond.service.in
-  echo 'ExecStart=/usr/sbin/gmond -f -p /run/gmond.pid' >> gmond/gmond.service.in
-  echo ''                                               >> gmond/gmond.service.in
-  echo '[Install]'                                      >> gmond/gmond.service.in
-  echo 'WantedBy=multi-user.target'                     >> gmond/gmond.service.in
+  # FIXME: Hopefully this will soon no longer be required?
+  msg2 'Copying systemd units into source as workaround for bug'
+  cp $srcdir/gmetad.service.in gmetad/gmetad.service.in
+  cp $srcdir/gmond.service.in  gmond/gmond.service.in
 }
 
 build() {
@@ -60,13 +54,16 @@ build() {
   setarch $CARCH ./configure --prefix=/usr\
     --enable-gexec\
     --enable-perl\
+    --enable-setuid=ganglia\
     --enable-status\
     --disable-static\
     --libdir=/usr/lib\
     --with-gmetad\
     --with-python=/usr/bin/python2\
-    --sysconfdir=/etc
+    --sbindir=/usr/bin\
+    --sysconfdir=/etc/ganglia
 #    --enable-php\
+#    --enable-setgid=ganglia\
   setarch $CARCH make
 }
 
@@ -77,5 +74,5 @@ package() {
   mkdir $pkgdir/usr/lib/$pkgname/python_modules
 
   msg2 'Generating default gmond.conf'
-  ./gmond/gmond --default_config > $pkgdir/etc/gmond.conf
+  ./gmond/gmond --default_config > $pkgdir/etc/ganglia/gmond.conf
 }
diff --git a/pcr/ganglia/ganglia.install b/pcr/ganglia/ganglia.install
new file mode 100644
index 000000000..6a196af1f
--- /dev/null
+++ b/pcr/ganglia/ganglia.install
@@ -0,0 +1,24 @@
+post_install() {
+  if [ "`vercmp $2 3.4.0`" -lt 0 ]; then
+    echo 'WARNING: The ganglia package has been split. If you use the' \
+         "web frontend, you'll need to install the ganglia-web package as well."
+  fi
+  id ganglia  >& /dev/null
+  if [ $? -ne 0 ]; then
+     echo 'Adding ganglia system group and user...'
+     groupadd -r ganglia && useradd -r -d /var/lib/ganglia -g ganglia -s /bin/false ganglia
+     # Lock the account to prevent logging in
+     passwd -l ganglia &> /dev/null
+  fi
+  install -d -o ganglia -g ganglia /var/lib/ganglia && install -d -o ganglia -g ganglia /var/lib/ganglia/rrds
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  echo 'Removing ganglia system group and user...'
+  userdel ganglia
+  echo 'NOTE: Please remove /var/lib/ganglia manually if it is no longer required.'
+}
diff --git a/pcr/ganglia/gmetad.service.in b/pcr/ganglia/gmetad.service.in
new file mode 100644
index 000000000..a721c2b4c
--- /dev/null
+++ b/pcr/ganglia/gmetad.service.in
@@ -0,0 +1,11 @@
+[Unit]
+Description=Ganglia Meta Daemon
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/run/gmetad.pid
+ExecStart=/usr/bin/gmetad -p /run/gmetad.pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/pcr/ganglia/gmond.service.in b/pcr/ganglia/gmond.service.in
new file mode 100644
index 000000000..5cbd31629
--- /dev/null
+++ b/pcr/ganglia/gmond.service.in
@@ -0,0 +1,9 @@
+[Unit]
+Description=Ganglia Monitor Daemon
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/gmond -f -p /run/gmond.pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/pcr/gimp-art/PKGBUILD b/pcr/gimp-art/PKGBUILD
index 11c3b191b..cd38b329d 100644
--- a/pcr/gimp-art/PKGBUILD
+++ b/pcr/gimp-art/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
 
 pkgname=gimp-art
 pkgver=2.8.2
diff --git a/pcr/gimp-art/gimp-splash-artwork.license b/pcr/gimp-art/gimp-splash-artwork.license
index 64267a6c0..0f060c013 100644
--- a/pcr/gimp-art/gimp-splash-artwork.license
+++ b/pcr/gimp-art/gimp-splash-artwork.license
@@ -1,7 +1,7 @@
 GIMP LIBRE SPLASH LICENSE
 
-Logo and Effects is created by Zé Lara <ze.lara@adinet.com.uy> and Márcio Silva <coadde@adinet.com.uy>
-Idea by André Silva <andre.paulista@adinet.com.uy>
+Logo and Effects is created by Zé Lara <ze.miguel.lara@gmail.com> and Márcio Silva <coadde@lavabit.com>
+Idea by André Silva <emulatorman@lavabit.com>
 
 The GIMP LIBRE splash screen is licensed under the Creative Commons Attribution-ShareAlike 3.0 Unported License. 
 To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/ or send aletter to Creative Commons, 444 Castro Street,
@@ -10,4 +10,4 @@ Suite 900, Mountain View, California, 94041, USA.
 Sangeno Waterfall Picture is created by Abedinali from Wikimedia Commons under the Creative Commons CC0 1.0 Universal license (Public Domain).
 To the extent possible under law, Abedinali from Wikimedia Commons has waived all copyright and related or neighboring rights to Sangeno Waterfall. 
 This work is published from: United States. 
-https://upload.wikimedia.org/wikipedia/commons/8/8b/Sangeno.jpg
\ No newline at end of file
+https://upload.wikimedia.org/wikipedia/commons/8/8b/Sangeno.jpg
diff --git a/pcr/gimp-toolkit-gps/PKGBUILD b/pcr/gimp-toolkit-gps/PKGBUILD
new file mode 100644
index 000000000..9f5784608
--- /dev/null
+++ b/pcr/gimp-toolkit-gps/PKGBUILD
@@ -0,0 +1,53 @@
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+
+pkgname=gimp-toolkit-gps
+_pkgname=${pkgname:13}
+_reqname=${pkgname::4}
+pkgver=2.0
+_pkgver=${pkgver/./_}
+pkgrel=1
+_pkgsrc1=${_pkgname^^}%20$_pkgver%20final
+_pkgsrc2=${_pkgname^^}%20extras
+pkgdesc='GIMP Paint Studio is a collection of brushes and accompanying tool presets. highly useful feature of the GIMP.'
+arch=any
+license=(
+  GPL2
+  CCPL:by-sa
+)
+url=https://code.google.com/p/$_pkgname-gimp-paint-studio
+depends=gimp
+conflicts=${pkgname/kit/set}
+replaces=${pkgname/kit/set}
+makedepends=unzip-libre
+noextract=(
+  $_pkgsrc1.zip
+  $_pkgsrc2.zip
+)
+source=(
+  https://$_pkgname-gimp-paint-studio.googlecode.com/files/$_pkgsrc1.zip
+  https://$_pkgname-gimp-paint-studio.googlecode.com/files/$_pkgsrc2.zip
+)
+sha512sums=(
+  b06016eab194db7862590940c6fb7e9c14bbb6d3ce83c2b85293da2c75ecf8b9e64585a38f749da36d63e2711a25a0073415568f10be4b997120d93ba2b5c112
+  c3ef322898299bde60f2c8e29ebdd5fa47236f6b2859bf5d3d01a92290e1ad888ba71b0813f7325921c87bf57632cf794da31e8ccab0c46cb020be52d2c1135f
+)
+
+prepare() {
+  a=$srcdir/$_pkgname-$pkgver
+  mkdir $a
+  unzip $srcdir/$_pkgsrc1.zip -d $a
+  unzip $srcdir/$_pkgsrc2.zip -d $a
+  # drop useless splashes
+  rm -v $a/splashes/* && rmdir -v $a/splashes
+  # fix perm for custom umask
+  find $srcdir/$_pkgname-$pkgver -type d -exec chmod 0755 -R {} \; &&\
+    find $srcdir/$_pkgname-$pkgver -type f -exec chmod 0644 -R {} \;
+}
+
+package() {
+  b=$pkgdir/usr/share/gimp/2.0
+  install -d $b
+  cp -va $srcdir/$_pkgname-$pkgver/* $b
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/gitflow/PKGBUILD b/pcr/gitflow/PKGBUILD
new file mode 100644
index 000000000..b62042262
--- /dev/null
+++ b/pcr/gitflow/PKGBUILD
@@ -0,0 +1,34 @@
+# Maintainer: Techlive Zheng <techlivezheng@gmail.com>
+# Contributor: Ernie Brodeur <ebrodeur@ujami.net>
+
+pkgname=gitflow
+pkgver=0.4.1
+pkgrel=3
+pkgdesc='Extend git with the Gitflow branching model.'
+arch=('any')
+url='https://github.com/nvie/gitflow'
+license=('BSD')
+depends=('git' 'shflags')
+source=("https://github.com/nvie/gitflow/tarball/${pkgver}/${pkgname}-${pkgver}.tar.gz")
+md5sums=('adc7a52512052938a9b42ac8bd7d91dd')
+
+prepare() {
+  cd $srcdir/`find . -maxdepth 1 -type d -name nvie\*`
+  sed -i "s:\$GITFLOW_DIR/gitflow-shFlags:/usr/share/lib/shflags/shflags.sh:" git-flow
+}
+
+package() {
+  cd $srcdir/`find . -maxdepth 1 -type d -name nvie\*`
+
+  install -d -m 0755 $pkgdir/usr/lib/git-core
+  install -m 0755 git-flow $pkgdir/usr/lib/git-core
+  install -m 0644 git-flow-feature \
+                  git-flow-hotfix \
+                  git-flow-release \
+                  git-flow-support \
+                  git-flow-version \
+                  git-flow-init \
+                  gitflow-common \
+                  $pkgdir/usr/lib/git-core/
+}
+md5sums=('adc7a52512052938a9b42ac8bd7d91dd')
diff --git a/pcr/ha-heartbeat/PKGBUILD b/pcr/ha-heartbeat/PKGBUILD
deleted file mode 100644
index f913344a0..000000000
--- a/pcr/ha-heartbeat/PKGBUILD
+++ /dev/null
@@ -1,84 +0,0 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-
-pkgname=ha-heartbeat
-_pkgname=${pkgname:3}
-pkgver=3.0.5
-_pkgver=${pkgver::1}_${pkgver:2:1}
-pkgrel=6
-pkgdesc='Daemon that provides cluster infrastructure services to its clients'
-arch=(
-  i686
-  x86_64
-  mips64el
-)
-url=http://linux-ha.org/wiki/${_pkgname^}
-license=(
-  GPL2
-  lGPL2.1
-)
-depends=(
-  gnutls
-  ha-glue
-)
-optdepends=(
-  lynx
-  net-tools
-  openssh
-  swig
-  valgrind
-  w3m
-)
-makedepends=(
-  docbook-xsl
-  libxslt
-  lynx
-  net-tools
-  openssh
-  swig
-  valgrind
-  w3m
-)
-options=!libtool
-source=(
-  http://hg.linux-ha.org/$_pkgname-STABLE_$_pkgver/archive/STABLE-$pkgver.tar.bz2
-  $pkgname.service
-)
-sha512sums=(
-  e38083b87c56a72eb8925ac42adeabb92618608e92218a63960ec0d0bca264f92a8e9c3ebfb0589cc4538da1a82b268b5cc9ee5a51ed33057c969e694e16b27d
-  d14013b4ee133ed07e17fa6e09cae1f9f7bdbabaadfda9b9bb8ed25d4d5ff2f3d419f344195c6d5211da33293d5fe5ad64dbc8be6e1a02f7fa21563f54907a20
-)
-
-prepare() {
-  cd $srcdir/${_pkgname^}-3-0-STABLE-$pkgver
-  mv configure.{in,ac}
-  sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|;
-          s|AM_INIT_AUTOMAKE(heartbeat, $HAPKGVERSION)|AM_INIT_AUTOMAKE|;
-         ' configure.ac
-  sed -i "s|AC_INIT(GNUmakefile)|AC_INIT(heartbeat, $pkgver)|;
-         " configure.ac
-  sed -i 's|INCLUDES|AM_CPPFLAGS|;
-         ' {contrib/{drbd-outdate-peer,ipfail,mlock},cts,heartbeat,lib/{apphb,hbclient,plugins/{HB{auth,comm,compress},quorum{,d},tiebreaker}},membership/{ccm,quorumd},replace,telecom/apphbd,tools}/Makefile.am
-}
-
-build() {
-  cd $srcdir/${_pkgname^}-3-0-STABLE-$pkgver
-  setarch $CARCH ./bootstrap
-  setarch $CARCH ./configure --prefix=/usr\
-    --disable-fatal-warnings\
-    --enable-static=no\
-    --enable-valgrind\
-    --libdir=/usr/lib\
-    --localstatedir=/var\
-    --sysconfdir=/etc
-  setarch $CARCH make
-}
-
-package() {
-  cd $srcdir/${_pkgname^}-3-0-STABLE-$pkgver
-  setarch $CARCH make DESTDIR=$pkgdir install
-
-  install -d $pkgdir/usr/lib/systemd/system
-  install -Dm644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/ha-heartbeat/ha-heartbeat.service b/pcr/ha-heartbeat/ha-heartbeat.service
deleted file mode 100644
index aacde3dbb..000000000
--- a/pcr/ha-heartbeat/ha-heartbeat.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Startup script high-availability services.
-Requires=network.target remote-fs.target timers.target
-
-[Service]
-Type=forking
-ExecStart=/usr/lib/heartbeat/heartbeat
-
-[Install]
-WantedBy=multi-user.target
diff --git a/pcr/ha-pacemaker/PKGBUILD b/pcr/ha-pacemaker/PKGBUILD
deleted file mode 100644
index 2cd0be84c..000000000
--- a/pcr/ha-pacemaker/PKGBUILD
+++ /dev/null
@@ -1,83 +0,0 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-
-pkgname=ha-pacemaker
-_pkgname=${pkgname:3}
-pkgver=1.1.9
-pkgrel=3
-pkgdesc='Cluster resource manager'
-arch=(
-  i686
-  x86_64
-  mips64el
-)
-url=http://linux-ha.org/wiki/${_pkgname^}
-license=GPL2
-depends=(
-  corosync
-  ha-heartbeat
-  ha-resourceagent
-  libqb
-)
-optdepens=(
-  inkscape
-  lynx
-  openssh
-  valgrind
-  w3m
-)
-makedepends=(
-  help2man
-  inkscape
-  libxslt
-  lynx
-  openssh
-  valgrind
-  w3m
-)
-options=(!libtool)
-source=https://github.com/ClusterLabs/$_pkgname/archive/${_pkgname^}-$pkgver.tar.gz
-sha512sums=97d13cf722aea9cba1ce344afc3137d9edc15a978d2a7acc44179c4859ecb18f800312caf02c9574b0fab528cd6e2c3e4876a1ffde8a08c2500c0ba816cdf071
-
-prepare() {
-  cd $srcdir/$_pkgname-${_pkgname^}-$pkgver
-  sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|;
-          s|AM_INIT_AUTOMAKE($PACKAGE_NAME, $PACKAGE_VERSION)|AM_INIT_AUTOMAKE|;
-         ' configure.ac
-  sed -i 's|INCLUDES|AM_CPPFLAGS|;
-         ' {cib,crmd,cts,lib/{cib,cluster,common,fencing,lrmd,pengine,services,transition},mcp,pengine,replace,tools}/Makefile.am
-}
-
-build() {
-  cd $srcdir/$_pkgname-${_pkgname^}-$pkgver
-  setarch $CARCH ./autogen.sh
-  setarch $CARCH ./configure --prefix=/usr\
-    --enable-fatal-warnings=yes\
-    --disable-static\
-    --enable-systemd\
-    --enable-upstart\
-    --libdir=/usr/lib\
-    --libexecdir=/usr/lib\
-    --localstatedir=/var\
-    --sysconfdir=/etc\
-    --with-acl\
-    --with-ais\
-    --with-cibsecrets\
-    --with-cman\
-    --with-corosync\
-    --with-cs-quorum\
-    --with-esmtp\
-    --with-heartbeat\
-    --with-lcrso-dir=/usr/lib/lcrso\
-    --with-nagios\
-    --with-profiling\
-    --with-snmp\
-    --without-gcov
-  setarch $CARCH make
-}
-
-package() {
-  cd $srcdir/$_pkgname-${_pkgname^}-$pkgver
-  setarch $CARCH make DESTDIR=$pkgdir install
-
-  mv $pkgdir/usr/sbin/cibsecret{,-pacemaker}
-}
diff --git a/pcr/ha-resourceagent/PKGBUILD b/pcr/ha-resourceagent/PKGBUILD
deleted file mode 100644
index 15438769a..000000000
--- a/pcr/ha-resourceagent/PKGBUILD
+++ /dev/null
@@ -1,68 +0,0 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-
-pkgname=ha-resourceagent
-_pkgname=${pkgname:3}
-_xname=${_pkgname::8}
-_yname=${_pkgname:8}
-_Name=${_xname^}_${_yname^}
-_name=${_xname}-${_yname}s
-pkgver=3.9.5
-pkgrel=3
-pkgdesc='Standardized interface for a cluster resource'
-arch=(
-  i686
-  x86_64
-  mips64el
-)
-url=http://linux-ha.org/wiki/$_Name
-license=GPL
-depends=ha-glue
-optdepends=(
-  net-tools
-  openssh
-)
-makedepends=(
-  #libxslt
-  libvirt
-  net-tools
-  openssh
-)
-source=(
-  https://github.com/ClusterLabs/$_name/archive/v$pkgver.tar.gz
-  ha-ldirector.service
-)
-sha512sums=(
-  668955de7a80577a1fb599d03b0a47589a00aed3017b532931b5132b877e45778c590f26d3057ee763c35973b0f6b032e2f74ebdf0b5f45b5e402b0f13b8ff4e
-  9e257b31305657a5164eebf6893d84496ef5dc5e80058dda5cd250c847c8247e10410cca99f0a481fa461487198fa59640e09d1e81fc3199a54f3ec85c56d9a3
-)
-
-prepare() {
-  cd $srcdir/$_name-$pkgver
-  sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|;
-         ' configure.ac
-  sed -i 's|INCLUDES|AM_CPPFLAGS|;
-         ' {heartbeat,tools}/Makefile.am
-}
-
-build() {
-  cd $srcdir/$_name-$pkgver
-  setarch $CARCH ./autogen.sh
-  setarch $CARCH ./configure --prefix=/usr\
-    --enable-fatal-warnings\
-    --enable-libnet\
-    --libdir=/usr/lib\
-    --localstatedir=/var\
-    --sysconfdir=/etc\
-    --with-ocf-root=/usr/lib/ocf
-  setarch $CARCH make
-}
-
-package() {
-  cd $srcdir/$_name-$pkgver
-  setarch $CARCH make DESTDIR=$pkgdir install
-
-  install -d $pkgdir/usr/lib/systemd/system
-  install -Dm644 $srcdir/ha-ldirector.service $pkgdir/usr/lib/systemd/system
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/ha-resourceagent/ha-ldirector.service b/pcr/ha-resourceagent/ha-ldirector.service
deleted file mode 100644
index c5809a216..000000000
--- a/pcr/ha-resourceagent/ha-ldirector.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Non-heartbeat systems service, that manages the Linux Virtual Server component for TCP/UDP load-balancing.
-Requires=network.target remote-fs.target
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/ldirectord
-
-[Install]
-WantedBy=multi-user.target
diff --git a/pcr/heartbeat/PKGBUILD b/pcr/heartbeat/PKGBUILD
new file mode 100644
index 000000000..a33250f84
--- /dev/null
+++ b/pcr/heartbeat/PKGBUILD
@@ -0,0 +1,203 @@
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+
+pkgname=heartbeat
+pkgver=3.0.5
+_pkgver=${pkgver::1}_${pkgver:2:1}
+pkgrel=11
+pkgdesc='Daemon that provides cluster infrastructure services to its clients (Linux-HA)'
+arch=(
+  i686
+  x86_64
+  mips64el
+)
+group=linux-ha
+url=http://$group.org/wiki/${pkgname^}
+license=(
+  GPL2
+  lGPL2.1
+)
+depends=(
+  gnutls
+  cluster-glue
+)
+optdepends=net-tools
+makedepends=(
+  docbook-xsl
+  libxslt
+  lynx
+  net-tools
+  openssh
+  swig
+  valgrind
+  w3m
+)
+options=(!libtool)
+provides=(ha-$pkgname)
+conflicts=ha-$pkgname
+replaces=ha-$pkgname
+source=http://hg.$group.org/$pkgname-STABLE_$_pkgver/archive/STABLE-$pkgver.tar.bz2
+sha512sums=e38083b87c56a72eb8925ac42adeabb92618608e92218a63960ec0d0bca264f92a8e9c3ebfb0589cc4538da1a82b268b5cc9ee5a51ed33057c969e694e16b27d
+
+prepare() {
+  cd $srcdir/${pkgname^}-3-0-STABLE-$pkgver
+
+  mv configure.{in,ac}
+
+  sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|;
+          s|AM_INIT_AUTOMAKE(heartbeat, $HAPKGVERSION)|AM_INIT_AUTOMAKE|;
+         ' configure.ac
+  sed -i "s|AC_INIT(GNUmakefile)|AC_INIT(heartbeat, $pkgver)|;
+         " configure.ac
+
+  sed -i 's|INCLUDES|AM_CPPFLAGS|;
+         ' $(grep -rlI INCLUDES | grep Makefile.am)
+
+  # fixing path
+  sed -i 's|bin/sh|usr/bin/bash|;
+         ' $(grep -rlI bin/sh)
+  sed -i 's| /bin| /usr/bin|;
+         ' $(grep -rlI ' /bin')
+  sed -i 's| /sbin| /usr/bin|;
+         ' $(grep -rlI ' /sbin')
+  sed -i 's|usr/sbin|usr/bin|;
+         ' $(grep -rlI usr/sbin)
+  #sed -i 's|/lib64|/lib|;
+  #       ' $(grep -rlI /lib64)
+  #sed -i 's|usr/libexec|usr/lib|;
+  #       ' $(grep -rlI usr/libexec)
+  sed -i 's|var/lock|run/lock|;
+         ' $(grep -rlI var/lock)
+  sed -i 's|var/run|run|;
+         ' $(grep -rlI var/run)
+
+  # remove Open Source term
+  sed -i 's|Open Source / ||;
+          s|open source / ||;
+          s|Open Source|Free|;
+          s|open source|free|;
+          s|Free Software Development Lab|Open Source Development Lab|;
+         ' $(grep -rilI 'open source')
+  #sed -i 's|OpenSource / ||;
+  #        s|opensource / ||;
+  #        s|OpenSource|Free|;
+  #        s|opensource|free|;
+  #        s|freesoftware.org|opensource.org|;
+  #        s|http://www.opensource.org/|http://www.gnu.org/philosophy/free-sw.html|;
+  #        s|http://www.gnu.org/philosophy/free-sw.htmllicenses/osl-|http://opensource.org/licenses/osl-|;
+  #        s|http://www.gnu.org/philosophy/free-sw.htmlosd|http://opensource.org/osd|;
+  #       ' $(grep -rilI opensource)
+
+  # remove Linux term
+  sed -i 's|Linux,|GNU/Linux,|;
+          s|Linux and|GNU/Linux and|;
+          s|Linux distro|GNU/Linux distro|;
+          s|Linux distribution|GNU/Linux distribution|;
+          s|Linux machine|GNU/Linux machine|;
+          s|Linux Only|GNU/Linux Only|;
+          s|Linux only|GNU/Linux only|;
+          s|Linux operating|GNU/Linux operating|;
+          s|Linux OS|GNU/Linux OS|;
+          s|Linux platform|GNU/Linux platform|;
+          s|Linux software|GNU/Linux software|;
+          s|Linux specific|GNU/Linux specific|;
+          s|Linux system|GNU/Linux system|;
+          s|Linux will|GNU/Linux will|;
+          s|# Linux$|# GNU/Linux|;
+          s|# Linux.$|# GNU/Linux.|;
+          s|* Linux$|* GNU/Linux|;
+          s|* Linux.$|* GNU/Linux.|;
+          s|// Linux$|// GNU/Linux|;
+          s|// Linux.$|// GNU/Linux.|;
+          s|, Linux|, GNU/Linux|;
+          s|As Linux|As GNU/Linux|;
+          s|as Linux|as GNU/Linux|;
+          s|And Linux|And GNU/Linux|;
+          s|and Linux|and GNU/Linux|;
+          s|Be Linux|Be GNU/Linux|;
+          s|be Linux|be GNU/Linux|;
+          s|Because Linux|Because GNU/Linux|;
+          s|because Linux|because GNU/Linux|;
+          s|e.g. Linux|e.g. GNU/Linux|;
+          s|For Linux|For GNU/Linux|;
+          s|for Linux|for GNU/Linux|;
+          s|In Linux|In GNU/Linux|;
+          s|in Linux|in GNU/Linux|;
+          s|Like Linux|Like GNU/Linux|;
+          s|like Linux|like GNU/Linux|;
+          s|non-Linux|non GNU/Linux|;
+          s|Of Linux|Of GNU/Linux|;
+          s|of Linux|of GNU/Linux|;
+          s|On Linux|On GNU/Linux|;
+          s|on Linux|on GNU/Linux|;
+          s|OS type: Linux|OS type: GNU/Linux|;
+          s|Other Linux|Other GNU/Linux|;
+          s|other Linux|other GNU/Linux|;
+          s|The Linux|The GNU/Linux|;
+          s|the Linux|the GNU/Linux|;
+          s|Typically Linux|Typically GNU/Linux|;
+          s|typically Linux|typically GNU/Linux|;
+          s|To Linux|To GNU/Linux|;
+          s|to Linux|to GNU/Linux|;
+          s|Under Linux|Under GNU/Linux|;
+          s|under Linux|under GNU/Linux|;
+          /Linux: "mail" offers "-s"./ s|Linux|GNU/Linux|;
+          s|ArchGNU/Linux|ArchLinux|;
+          s|e2fsprogs, typically GNU/Linux|e2fsprogs, typically Linux|;
+          s|GNU/GNU|GNU|;
+          s|GNU/Linux device|Linux device|;
+          s|GNU/Linux Director Daemon|Linux Director Daemon|;
+          s|GNU/Linux is a registered trademark of Linus Torvalds|Linux is a registered trademark of Linus Torvalds|;
+          s|GNU/Linux kernel|Linux kernel|;
+          s|GNU/Linux specific kernel|Linux specific kernel|;
+          s|GNU/Linux Standard Base|Linux Standard Base|;
+          s|GNU/Linux sysfs|Linux sysfs|;
+          s|GNU/Linux Virtual Server|Linux Virtual Server|;
+          s|GNU/Linux Watchdog|Linux Watchdog|;
+          s|GNU/Linux watchdog|Linux watchdog|;
+          s|GNU/LinuxHA|LinuxHA|;
+          s|GNU/Linux-HA|Linux-HA|;
+          s|GNU/LinuxSCSI|LinuxSCSI|;
+          s|HA GNU/Linux|HA Linux|;
+          s|High-Availability GNU/Linux|High-Availability Linux|;
+          s|MkGNU/Linux|MkLinux|;
+          s|SEGNU/Linux|SELinux|;
+          s|VA GNU/Linux Cluster|VA Linux Cluster|;
+          s|ConfigureLinux|ConfigureGNULinux|;
+         ' $(grep -rlI Linux)
+}
+
+build() {
+  cd $srcdir/${pkgname^}-3-0-STABLE-$pkgver
+  setarch $CARCH ./bootstrap
+  setarch $CARCH ./configure --prefix=/usr\
+    --disable-fatal-warnings\
+    --disable-static\
+    --enable-valgrind\
+    --libdir=/usr/lib\
+    --localstatedir=/var\
+    --sysconfdir=/etc\
+    --with-initdir=/etc/rc.d
+  setarch $CARCH make
+}
+
+package() {
+  cd $srcdir/${pkgname^}-3-0-STABLE-$pkgver
+  setarch $CARCH make DESTDIR=$pkgdir install
+
+  mv $pkgdir/{var/,}run
+  rm $pkgdir/etc/{ha.d/,}rc.d/* && rmdir $pkgdir/etc/{ha.d/,}rc.d
+
+  install -d $pkgdir/usr/lib/systemd/system
+  echo '[Unit]'                                                 >  $pkgdir/usr/lib/systemd/system/$pkgname.service
+  echo 'Description=Startup script high-availability services'  >> $pkgdir/usr/lib/systemd/system/$pkgname.service
+  echo 'Requires=network.target remote-fs.target timers.target' >> $pkgdir/usr/lib/systemd/system/$pkgname.service
+  echo ''                                                       >> $pkgdir/usr/lib/systemd/system/$pkgname.service
+  echo '[Service]'                                              >> $pkgdir/usr/lib/systemd/system/$pkgname.service
+  echo 'Type=forking'                                           >> $pkgdir/usr/lib/systemd/system/$pkgname.service
+  echo 'ExecStart=/usr/lib/heartbeat/heartbeat'                 >> $pkgdir/usr/lib/systemd/system/$pkgname.service
+  echo ''                                                       >> $pkgdir/usr/lib/systemd/system/$pkgname.service
+  echo '[Install]'                                              >> $pkgdir/usr/lib/systemd/system/$pkgname.service
+  echo 'WantedBy=multi-user.target'                             >> $pkgdir/usr/lib/systemd/system/$pkgname.service
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/hiredis/ChangeLog b/pcr/hiredis/ChangeLog
new file mode 100644
index 000000000..fbe55643a
--- /dev/null
+++ b/pcr/hiredis/ChangeLog
@@ -0,0 +1,4 @@
+2013-06-07 Vladimir Tsanev <tsachev@gamil.com>
+    
+    * 0.11.0-1 :
+    Initial PKGBUILD.
diff --git a/pcr/hiredis/PKGBUILD b/pcr/hiredis/PKGBUILD
new file mode 100644
index 000000000..29762e87e
--- /dev/null
+++ b/pcr/hiredis/PKGBUILD
@@ -0,0 +1,33 @@
+# Maintainer: Vladimir Tsanev <tsachev@gmail.com>
+
+pkgname=hiredis
+pkgver=0.11.0
+pkgrel=1
+pkgdesc='minimalistic C client library for Redis'
+arch=('x86_64' 'i686')
+url="https://github.com/redis/hiredis/"
+license=('BSD')
+depends=('glibc')
+changelog='ChangeLog'
+source=(https://codeload.github.com/redis/${pkgname}/tar.gz/v${pkgver})
+md5sums=('e2ac29509823ccc96990b6fe765b5d46')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make 
+}
+
+#
+#check() {
+#  cd "${srcdir}/${pkgname}-${pkgver}"
+#  make test check c
+#}
+
+package() {
+  
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make PREFIX="$pkgdir/usr" clean dep install
+
+  install -Dm 644 COPYING "$pkgdir/usr/share/licenses/${pkgname}/COPYING"
+
+}
diff --git a/pcr/kamailio/PKGBUILD b/pcr/kamailio/PKGBUILD
new file mode 100644
index 000000000..3e040a495
--- /dev/null
+++ b/pcr/kamailio/PKGBUILD
@@ -0,0 +1,36 @@
+# Maintainer: Xavier Devlamynck <magicrhesus@ouranos.be>
+
+pkgname=kamailio
+pkgver=4.0.1
+pkgrel=1
+pkgdesc="Rock solid SIP server"
+url="http://www.kamailio.org/"
+license=('GPL2')
+arch=('i686' 'x86_64')
+makedepends=('flex' 'bison' 'docbook2x' 'mariadb' 'postgresql' 'libxml2'
+             'radiusclient-ng' 'lua51' 'mono' 'hiredis' 'libpurple' 'net-snmp'
+             'libunistring' 'python2')
+optdepends=('mariadb: mysql support'
+            'expat: xmpp/jabber support'
+            'libxml2: cpl and presence modules support'
+            'radiusclient-ng: radius support'
+            'postgresql: postgresql backend')
+source=(http://www.kamailio.org/pub/kamailio/$pkgver/src/kamailio-${pkgver}_src.tar.gz)
+sha256sums=('dd8652f47a572c0b0e1e45bdd0f6f838a14e50f2dbbeed77726ec0c7076e1769')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make cfg prefix=/usr cfg_prefix=/ bin_dir=/usr/bin
+  make PYTHON="python2" all
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make prefix=${pkgdir}/usr \
+       PYTHON="python2" \
+       cfg_prefix=${pkgdir} \
+       bind_dir=${pkgdir}/usr/bin \
+       bingroup_include="standard standard-dep stable experimental" \
+       skip_modules="iptrtpproxy osp dbtext oracle" \
+       install
+}
diff --git a/pcr/lcmc/PKGBUILD b/pcr/lcmc/PKGBUILD
index 538949f60..6b27ff5f4 100644
--- a/pcr/lcmc/PKGBUILD
+++ b/pcr/lcmc/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
 
 pkgname=lcmc
 pkgver=1.5.1
diff --git a/pcr/libav-builder/PKGBUILD b/pcr/libav-builder/PKGBUILD
deleted file mode 100644
index 5f7168f86..000000000
--- a/pcr/libav-builder/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-
-static=false
-pkgbase=libav
-if [[ $static == true ]] || [[ $static == 1 ]] || [[ $static == enable ]]; then
-  pkgname=libav-static-builder
-elif [[ $static == false ]] || [[ $static == 0 ]] || [[ $static == disable ]]; then
-  pkgname=libav-builder
-fi
-pkgflag=builder
-pkgver=9.3
-pkgrel=1
-pkgdesc="Link files on /usr/include and /usr/lib dir (ONLY FOR BUILD OTHERS PACKAGES)"
-arch=any
-url="http://$pkgbase.org/"
-license=GPL
-depends=${pkgname%-$pkgflag}=$pkgver
-conflicts=(
-  ffmpeg
-  ffmpeg-static
-)
-if [[ $static == true ]] || [[ $static == 1 ]] || [[ $static == enable ]]; then
-  conflicts+=(
-    ${pkgname%-static-$pkgflag}
-  )
-elif [[ $static == false ]] || [[ $static == 0 ]] || [[ $static == disable ]]; then
-  conflicts+=(
-    ${pkgname%-$pkgflag}-static
-  )
-fi
-
-package() {
-  install -m755 -d $pkgdir/usr/{include,lib{,/pkgconfig}}
-  include_list=$(ls /opt/${pkgname%-$pkgflag}/include)
-  for i in $include_list; do
-    ln -s /opt/${pkgname%-$pkgflag}/include/$i $pkgdir/usr/include
-  done
-  lib_list=$(ls /opt/${pkgname%-$pkgflag}/lib | grep lib)
-  for l in $lib_list; do
-    ln -s /opt/${pkgname%-$pkgflag}/lib/$l $pkgdir/usr/lib
-  done
-  pkgconfig_list=$(ls /opt/${pkgname%-$pkgflag}/lib/pkgconfig)
-  for c in $pkgconfig_list; do
-    ln -s /opt/${pkgname%-$pkgflag}/lib/pkgconfig/$c $pkgdir/usr/lib/pkgconfig
-  done
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/libav/PKGBUILD b/pcr/libav/PKGBUILD
index 05dd756c0..782e12a15 100644
--- a/pcr/libav/PKGBUILD
+++ b/pcr/libav/PKGBUILD
@@ -1,11 +1,7 @@
-# $Id$
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Contributor: Paul Mattal <paul@archlinux.org>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
 
 static=false
-pkgbase=libav
+_pkgname=libav
 if [[ $static == true ]] || [[ $static == 1 ]] || [[ $static == enable ]]; then
   pkgname=libav-static
   pkgflag=-static
@@ -13,7 +9,7 @@ if [[ $static == true ]] || [[ $static == 1 ]] || [[ $static == enable ]]; then
 elif [[ $static == false ]] || [[ $static == 0 ]] || [[ $static == disable ]]; then
   pkgname=libav
 fi
-pkgver=9.3
+pkgver=9.7
 pkgrel=1
 pkgdesc="Complete and free Internet live audio and video broadcasting solution for GNU/Linux$staticdesc"
 arch=(
@@ -21,10 +17,8 @@ arch=(
   x86_64
   mips64el
 )
-url="http://$pkgbase.org/"
-license=(
-  GPL
-)
+url=http://$_pkgname.org/
+license=GPL3
 depends=(
   alsa-lib
   bzip2
@@ -37,7 +31,8 @@ depends=(
   libvorbis
   libvpx
   opencore-amr
-  openjpeg
+  #openjpeg
+  opus
   rtmpdump
   schroedinger
   sdl
@@ -50,30 +45,29 @@ makedepends=(
   yasm
   libvdpau
 )
-source=(
-  http://$pkgbase.org/releases/$pkgbase-$pkgver.tar.gz
-)
-sha512sums=(
-  de3aaa571fed67d22ec2a0c53599af56684afa38445cf67fd09d26c23eeded5a184d045f472d414815d17783b421f937fd3d9565637e20f2050aaaf0081164fe
-)
+source=http://$_pkgname.org/releases/$_pkgname-$pkgver.tar.gz
+sha512sums=6a446e8dceb9ee4f1fb7a7d68d254086990bbcab5b1014598b21c75e0add22dab47c30a95bc3129835cc40a8d32de9c61fb267b2fa2aa9353dbbfc4b716767e4
 
 build() {
-  cd $pkgbase-$pkgver
+  cd $_pkgname-$pkgver
 
   [[ $static == false ]] && sttcv=disable || sttcv=enable
 
-  ./configure\
+  setarch $CARCH ./configure\
     --prefix=/opt/$pkgname\
     --disable-debug\
     --$sttcv-static\
     --enable-avresample\
+    --enable-avserver\
+    --enable-dxva2\
     --enable-gpl\
     --enable-libfreetype\
     --enable-libgsm\
     --enable-libmp3lame\
     --enable-libopencore_amrnb\
     --enable-libopencore_amrwb\
-    --enable-libopenjpeg\
+    --disable-libopenjpeg\
+    --enable-libopus\
     --enable-libpulse\
     --enable-librtmp\
     --enable-libschroedinger\
@@ -87,14 +81,13 @@ build() {
     --enable-shared\
     --enable-version3\
     --enable-x11grab
-
   setarch $CARCH make
   setarch $CARCH make tools/qt-faststart
   setarch $CARCH make doc/av{conv,play,server}.1
 }
 
 package() {
-  cd $pkgbase-$pkgver
+  cd $_pkgname-$pkgver
   setarch $CARCH make DESTDIR=$pkgdir install install-man
   install -m755 -d                              $pkgdir/etc/ld.so.conf.d
   install -m755 -d                              $pkgdir/usr/bin
@@ -103,10 +96,12 @@ package() {
   ln -s /opt/$pkgname/bin/avconv                $pkgdir/usr/bin/avconv$pkgflag
   ln -s /opt/$pkgname/bin/avplay                $pkgdir/usr/bin/avplay$pkgflag
   ln -s /opt/$pkgname/bin/avprobe               $pkgdir/usr/bin/avprobe$pkgflag
+  ln -s /opt/$pkgname/bin/avserver              $pkgdir/usr/bin/avserver$pkgflag
   ln -s /opt/$pkgname/bin/qt-faststart          $pkgdir/usr/bin/qt-faststart-$pkgname
   ln -s /opt/$pkgname/share/man/man1/avconv.1   $pkgdir/usr/share/man/man1/avconv$pkgflag.1
   ln -s /opt/$pkgname/share/man/man1/avplay.1   $pkgdir/usr/share/man/man1/avplay$pkgflag.1
   ln -s /opt/$pkgname/share/man/man1/avprobe.1  $pkgdir/usr/share/man/man1/avprobe$pkgflag.1
+  ln -s /opt/$pkgname/share/man/man1/avserver.1 $pkgdir/usr/share/man/man1/avserver$pkgflag.1
   echo /opt/libav$pkgflag/lib                 > $pkgdir/etc/ld.so.conf.d/libav$pkgflag.conf
 }
 
diff --git a/pcr/libqb/PKGBUILD b/pcr/libqb/PKGBUILD
index 6b9d7d9d7..85b3ff082 100644
--- a/pcr/libqb/PKGBUILD
+++ b/pcr/libqb/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=libqb
 pkgver=0.14.4
-pkgrel=2
+pkgrel=3
 pkgdesc='Library with the primary purpose of providing high performance client server reusable features'
 arch=(
   i686
@@ -14,7 +14,7 @@ makedepends=(
   splint
 )
 license=LGPL2.1
-options=!libtool
+options=(!libtool)
 url=https://github.com/asalkeld/$pkgname/wiki
 source=https://github.com/asalkeld/$pkgname/archive/v$pkgver.tar.gz
 sha512sums=1377e38d5547eb516b255c0aa0972e858048053202692d7d5ef1c746d79dee2c78eddc29e797215376990f2c776b34261f765858606b59d77f9218fb0dac5977
@@ -25,7 +25,8 @@ build() {
   setarch $CARCH ./configure --prefix=/usr\
     --disable-fatal-warnings\
     --disable-static\
-    --libdir=/usr/lib
+    --libdir=/usr/lib\
+    --sbindir=/usr/bin
   setarch $CARCH make
 }
 
diff --git a/pcr/lilo/PKGBUILD b/pcr/lilo/PKGBUILD
new file mode 100644
index 000000000..10d334b05
--- /dev/null
+++ b/pcr/lilo/PKGBUILD
@@ -0,0 +1,47 @@
+# Maintainer: Connor Behan <connor.behan@gmail.com>
+# Contributor: Eric Belanger <eric@archlinux.org>
+# Contributor: judd <jvinet@zeroflux.org>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+pkgname=lilo
+pkgver=24.0
+pkgrel=1
+pkgdesc="A bootloader for GNU/Linux (Parabola rebranded)"
+arch=('i686' 'x86_64')
+url="https://alioth.debian.org/projects/lilo/"
+license=('BSD')
+backup=('etc/lilo.conf')
+depends=('device-mapper' 'coreutils')
+makedepends=('bin86' 'sharutils')
+optdepends=('perl: to use keytab-lilo')
+install=lilo.install
+options=('!makeflags')
+source=("http://lilo.alioth.debian.org/ftp/sources/${pkgname}-${pkgver}.tar.gz"
+        'lilo.conf')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  export LC_ALL=C
+
+  sed -i -e 's/strip lilo.static/strip lilo.static || true/' src/Makefile
+  make all
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  install -D -m644 "${srcdir}"/lilo.conf "${pkgdir}"/etc/lilo.conf
+  install -D -m644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+
+  # All binaries in /usr/bin
+  mkdir "${pkgdir}"/usr/bin
+  mv "${pkgdir}"/sbin/lilo "${pkgdir}"/usr/bin/
+  mv "${pkgdir}"/usr/sbin/* "${pkgdir}"/usr/bin/
+  rm -rf "${pkgdir}"/sbin
+  rm -rf "${pkgdir}"/usr/sbin
+
+  # Avoid conflict with syslinux
+  mv "${pkgdir}"/usr/bin/keytab-lilo "${pkgdir}"/usr/bin/keytab-lilo.pl
+}
+md5sums=('03d7090835a5675314082847f1ac7910' 'd06b3c4655577ed01fea79ec5743b4b0')
diff --git a/libre/lilo/lilo.conf b/pcr/lilo/lilo.conf
index 479390df5..479390df5 100644
--- a/libre/lilo/lilo.conf
+++ b/pcr/lilo/lilo.conf
diff --git a/libre/lilo/lilo.install b/pcr/lilo/lilo.install
index 7375fddf8..7375fddf8 100644
--- a/libre/lilo/lilo.install
+++ b/pcr/lilo/lilo.install
diff --git a/pcr/lv2-ir/PKGBUILD b/pcr/lv2-ir/PKGBUILD
new file mode 100644
index 000000000..cdeaf7414
--- /dev/null
+++ b/pcr/lv2-ir/PKGBUILD
@@ -0,0 +1,33 @@
+# Maintainer: Guest One <theguestone at gmail dot com>
+
+pkgname=lv2-ir
+pkgver=1.3.2
+pkgrel=1
+pkgdesc="zero-latency, realtime, high performance signal convolver especially for creating reverb effects."
+arch=('i686' 'x86_64')
+url="http://factorial.hu/plugins/lv2/ir"
+license=('GPL')
+depends=('zita-convolver' 'libsamplerate' 'gtk2')
+provides=('ir-lv2')
+conflicts=('ir-lv2')
+groups=('lv2-plugins')
+makedepends=('lv2core' )
+
+source=("http://factorial.hu/system/files/ir.lv2-${pkgver}.tar.gz")
+md5sums=('01140e1f70e7f4949f502eafc1958bcd')
+
+build() {
+  cd "$srcdir/ir.lv2-${pkgver}"
+  make
+  make convert4chan
+}
+
+package() {
+  cd "$srcdir/ir.lv2-${pkgver}"
+  make PREFIX="$pkgdir/usr" install
+  install -Dm755 convert4chan "$pkgdir/usr/bin/convert4chan"
+  # fixed location
+  sed -i 's/, but seem like its gone://' README
+  sed -i  's@rhythminmind.net/1313@rhythminmind.net/STN@' README
+  install -Dm644 README "${pkgdir}"/usr/share/doc/$pkgname/README
+}
diff --git a/pcr/maliit-framework/PKGBUILD b/pcr/maliit-framework/PKGBUILD
new file mode 100644
index 000000000..545c34a0c
--- /dev/null
+++ b/pcr/maliit-framework/PKGBUILD
@@ -0,0 +1,33 @@
+# Contributor: Jon Nordby <jononor@gmail.com>
+# Maintainer: Jon Nordby <jononor@gmail.com>
+# Maintainer (Parabola): Javier Barcena <javierbuilder@gmail.com>
+# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+
+pkgname=maliit-framework
+pkgver=0.99.0
+pkgrel=6
+pkgdesc="Maliit Input Methods - Framework"
+arch=('x86_64' 'i686')
+url="http://maliit.org"
+license=('LGPL')
+depends=('qt5-base' 'qt5-quick1' 'gtk2' 'gtk3' 'gconf')
+install=$pkgname.install
+source=(http://maliit.org/releases/$pkgname/$pkgname-$pkgver.tar.bz2)
+md5sums=('c5e8c67cbfb514122518d92f1edcc990')
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  # BUILD
+  qmake -r .
+  make
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+  make INSTALL_ROOT="$pkgdir" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install
+
+  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
+  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain maliit-framework "$pkgdir"/etc/gconf/schemas/*.schemas
+  rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
+} 
diff --git a/pcr/maliit-framework/maliit-framework.install b/pcr/maliit-framework/maliit-framework.install
new file mode 100755
index 000000000..08c54ae1b
--- /dev/null
+++ b/pcr/maliit-framework/maliit-framework.install
@@ -0,0 +1,30 @@
+pkgname=maliit-framework
+
+post_install() {
+  echo "Updating gtk.immodules..."
+  gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+  gtk-query-immodules-3.0 --update-cache
+  echo "Done."
+
+  gconfpkg --install ${pkgname}
+}
+
+pre_upgrade() {
+  pre_remove $1
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  gconfpkg --uninstall ${pkgname}
+}
+
+post_remove() {
+  echo "Updating gtk.immodules..."
+  gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+  gtk-query-immodules-3.0 --update-cache
+  echo "Done."
+
+}
diff --git a/pcr/maliit-plugins/PKGBUILD b/pcr/maliit-plugins/PKGBUILD
new file mode 100644
index 000000000..cdab07003
--- /dev/null
+++ b/pcr/maliit-plugins/PKGBUILD
@@ -0,0 +1,32 @@
+# Contributor: Jon Nordby <jononor@gmail.com>
+# Maintainer: Jon Nordby <jononor@gmail.com>
+
+pkgname=maliit-plugins
+pkgver=0.99.0
+pkgrel=1
+pkgdesc="Maliit Input Methods - Plugins"
+arch=('x86_64' 'i686')
+url="http://maliit.org"
+license=('LGPL')
+depends=('qt5-base' 'maliit-framework')
+source=(http://maliit.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+        config.patch)
+md5sums=('29f07d937803a61e74301e4616d55dbb'
+         'f43d45c9917924750edf36000492bd73')
+
+build() {
+  cd "$srcdir/${pkgname}-${pkgver}"
+
+  # fix issue on building
+  patch -Np1 -i "$srcdir/config.patch"
+
+  # BUILD
+  qmake -r . CONFIG+=notests
+  make
+}
+
+package() {
+  cd "$srcdir/${pkgname}-${pkgver}"
+
+  make install INSTALL_ROOT="$pkgdir/"
+} 
diff --git a/pcr/mednafen-server/PKGBUILD b/pcr/mednafen-server/PKGBUILD
index 0c7057908..9968dde38 100644
--- a/pcr/mednafen-server/PKGBUILD
+++ b/pcr/mednafen-server/PKGBUILD
@@ -1,26 +1,24 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
 
 pkgname=mednafen-server
+_pkgname=${pkgname%-server}
 pkgver=0.5.0
-pkgrel=1
+pkgrel=2
 pkgdesc='A server multi-system gaming emulator'
-url=http://${pkgname%-server}.sourceforge.net/
-license=(
-  GPL
-)
+url=http://$_pkgname.sourceforge.net/
+license=GPL2
 arch=(
   i686
   x86_64
   mips64el
 )
+backup=etc/$pkgname/standard.conf
 source=(
-  http://downloads.sourceforge.net/project/${pkgname%-server}/Mednafen-Server/$pkgver/$pkgname-$pkgver.tar.gz
-  ${pkgname}d
+  http://downloads.sourceforge.net/project/$_pkgname/${_pkgname^}-Server/$pkgver/$pkgname-$pkgver.tar.gz
   $pkgname.service
 )
 sha512sums=(
   700b2021e5085761b90bb5ee802ff9ccded3cdade76682fe9faa98ebbb0653c9b00baea5baa1c486f850bad606aae33a88e4d9486015babb210648aa0cd4542d
-  55cba761db9c10978a5146e4f92ccce2a645e0566d0744e745b36ede56a0332d1cb1f6c8a09df6a1c01320b539f07ccd7073b2d85eca6b340449a1c3b9761407
   cd3d19b789ec7f62c4b8f5fe0f93e7836fab5406a3416434701caf6404cce02c7223dcb8b82bd1e4b00bdcf4df623f0cd44f850a7f79a7be73e04c0804972700
 )
 
@@ -34,6 +32,5 @@ package() {
   cd $srcdir/$pkgname
   make DESTDIR=$pkgdir install
   install -Dm644 standard.conf            $pkgdir/etc/$pkgname/standard.conf
-  install -Dm644 $srcdir/${pkgname}d      $pkgdir/etc/rc.d/$pkgname
   install -Dm644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
 }
diff --git a/pcr/miniupnpd/PKGBUILD b/pcr/miniupnpd/PKGBUILD
index 543002e04..57a04c290 100644
--- a/pcr/miniupnpd/PKGBUILD
+++ b/pcr/miniupnpd/PKGBUILD
@@ -1,20 +1,19 @@
 # $Id$
-# Maintainer: None
+# Maintainer: fauno <fauno@parabola.nu>
 pkgname=miniupnpd
 pkgver=1.8.20130503
-pkgrel=1
+pkgrel=3
 pkgdesc="Lightweight UPnP IGD daemon"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://miniupnp.free.fr"
 license=('BSD')
 backup=(etc/miniupnpd/miniupnpd.conf)
-depends=('libnfnetlink' 'iptables>=1.4.3')
+depends=('libnfnetlink' 'iptables>=1.4.3' 'net-tools')
 makedepends=('lsb-release')
 source=("http://miniupnp.free.fr/files/$pkgname-$pkgver.tar.gz"
         miniupnpd.systemd)
 md5sums=('484dbda7c428b2d5f3768500a48d3375'
-         'f862f79b673359adc80faf0be914394f'
-         '2cc73f661cacb2fa374eee3d1030f428')
+         '0c3f1777b6c043dd5029092d62896660')
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
@@ -34,8 +33,11 @@ package() {
 	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 	install -Dm644 "${srcdir}/miniupnpd.systemd" "${pkgdir}/usr/lib/systemd/system/miniupnpd.service"
 
-	sed -i 's:/sbin/iptables:/usr/sbin/iptables:
+	sed -i 's:/s\?bin/iptables:/usr/bin/iptables:
 	        s:eth0:"`cat /etc/miniupnpd/miniupnpd.conf | '"awk -F= '/^ext_ifname/ { print \$2 }'"'`":' "${pkgdir}"/etc/miniupnpd/*.sh
 	sed -i -e "s/^uuid=[-0-9a-f]*/uuid=00000000-0000-0000-0000-000000000000/
 	           s/make genuuid/uuidgen/" "${pkgdir}/etc/miniupnpd/miniupnpd.conf"
+        # usrmove
+        cd "$pkgdir"
+        mv usr/sbin usr/bin
 }
diff --git a/pcr/miniupnpd/miniupnpd.systemd b/pcr/miniupnpd/miniupnpd.systemd
index 4c5aa77cc..88973535c 100644
--- a/pcr/miniupnpd/miniupnpd.systemd
+++ b/pcr/miniupnpd/miniupnpd.systemd
@@ -3,9 +3,9 @@ Description=Lightweight UPnP IGD daemon
 
 [Service]
 ExecStartPre=/etc/miniupnpd/iptables_init.sh
-ExecStart=/usr/sbin/miniupnpd -f /etc/miniupnpd/miniupnpd.conf -d
+ExecStart=/usr/bin/miniupnpd -f /etc/miniupnpd/miniupnpd.conf -d
 ExecStopPost=/etc/miniupnpd/iptables_removeall.sh
-PIDFile=/var/run/miniupnpd.pid
+PIDFile=/run/miniupnpd.pid
 StandardOutput=null
 
 [Install]
diff --git a/pcr/mitsuba/PKGBUILD b/pcr/mitsuba/PKGBUILD
index 219da84fc..f2d7f83b0 100644
--- a/pcr/mitsuba/PKGBUILD
+++ b/pcr/mitsuba/PKGBUILD
@@ -4,32 +4,31 @@ pkgname=(
   mitsuba
   blender-addon-mitsuba
 )
+_pkgname=${pkgname[0]}
 _bldname=${pkgname[1]::7}
-_addname=${pkgname[0]}-${_bldname}
-pkgver=0.4.4 # Thu Feb 28 15:00:37 2013 -0800 tag:v0.4.4 rev:1674
-_pkgdat=20130228
-_pkgrev=1674
-_bldver=2.66
+_addname=$_pkgname-$_bldname
+pkgver=0.4.4
+_bldver=2.67
 _addver=0.2.1 # Wed Mar 20 01:30:37 2013 +0100 rev:40 ($srcdir/$_addname/${pkgname[0]}/__init__.py:bl_info>version)
 _adddat=20130320
 _addrev=40
-_bldep=7
+_bldep=8
 _pyver=3.3
-pkgrel=1
+pkgrel=3
 pkgdesc='A physically based renderer'
 arch=(
   i686
   x86_64
   mips64el
 )
-url=https://${pkgname[0]}-renderer.org/
+url=https://www.$_pkgname-renderer.org/
 license=GPL3
 depends=(
   boost-libs
   collada-dom
   glew
   libxxf86vm
-  'openexr=2.0.0'
+  openexr
   qt4
   xerces-c
 )
@@ -44,28 +43,25 @@ makedepends=(
   mercurial
   python
 )
-install=$pkgname.install
+install=$_pkgname.install
 source=(
-  hg+https://${pkgname[0]}-renderer.org/hg/${pkgname[0]}
-  hg+https://${pkgname[0]}-renderer.org/hg/$_addname
+  ${url}hg/$_pkgname/archive/v$pkgver.tar.bz2
+  hg+${url}hg/$_addname
   ${pkgname[1]}.install
 )
-sha512sums=(SKIP SKIP SKIP)
+sha512sums=(
+  66dcab376a44eeb2fbe808a32ead5b554d777fb2f6a73c43883086b7829e0c697aaeccbb6fbbed9fcb221684a64ccce8be81a78ebcd228316ea12b8f6f3e7f6c
+  SKIP SKIP
+)
 
 prepare() {
   mv $srcdir/${pkgname[1]}.install $startdir
 
-  cd $srcdir/${pkgname[0]}
+  cd $srcdir/$_pkgname-v$pkgver
 
   [[ -d build ]] && rm -r build
   mkdir build
 
-  cd $startdir/../srcdest/${pkgname[0]}
-
-  msg "${pkgname[0]}"
-  hg update -c v$pkgver
-  hg log -l 1 -r v$pkgver
-
   cd $startdir/../srcdest/$_addname
 
   msg "${pkgname[1]}"
@@ -74,7 +70,7 @@ prepare() {
 }
 
 build() {
-  cd $srcdir/${pkgname[0]}/build
+  cd $srcdir/$_pkgname-v$pkgver/build
 
   [[ $CARCH != x86_64 ]] && DMTS_SSE='-DMTS_SSE=OFF'
 
@@ -83,24 +79,23 @@ build() {
     -DBoost_PYTHON_LIBRARY=/usr/lib/libboost_python${_pyver::1}.so\
     -DPYTHON_INCLUDE_DIR=/usr/include/python${_pyver}m\
     -DPYTHON_LIBRARY=/usr/lib/libpython${_pyver}m.so
-
   setarch $CARCH make
 }
 
 package_mitsuba() {
-  cd $srcdir/${pkgname[0]}/build
+  cd $srcdir/$_pkgname-v$pkgver/build
   setarch $CARCH make DESTDIR=$pkgdir install
 
   #fixing files and folders location
   a=$pkgdir/usr
-  b=$srcdir/${pkgname[0]}
-  install -d $a/{bin,lib{,/python$_pyver/lib-dynload},share/{applications,{licenses/,}${pkgname[0]},pixmaps}}
-  install -m644 $b/data/linux/${pkgname[0]}.desktop         $a/share/applications
-  install -m644 $b/src/mtsgui/resources/${pkgname[0]}48.png $a/share/pixmaps
-  install -m644 $b/doc/license.txt                          $a/share/licenses/${pkgname[0]}/LICENSE
+  b=$srcdir/$_pkgname-v$pkgver
+  install -d $a/{bin,lib{,/python$_pyver/lib-dynload},share/{applications,{licenses/,}$_pkgname,pixmaps}}
+  install -m644 $b/data/linux/$_pkgname.desktop           $a/share/applications
+  install -m644 $b/src/mtsgui/resources/${_pkgname}48.png $a/share/pixmaps
+  install -m644 $b/doc/license.txt                        $a/share/licenses/$_pkgname/LICENSE
   mv $a/{m{itsuba,ts{gui,import,srv,util}},bin}
   mv $a/lib{${pkgname[0]}-{bidir,core,hw,render}.so,}
-  mv $a/{{data,plugins},share/${pkgname[0]}}
+  mv $a/{{data,plugins},share/$_pkgname}
   mv $a/{python/mitsuba.so,lib/python$_pyver/lib-dynload}
   mv $a/{sdk/include,}
   rmdir $a/{python,sdk}
@@ -124,7 +119,7 @@ package_blender-addon-mitsuba() {
 
   a=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons
   b=$pkgdir/usr/share/licenses/$pkgname
-  c=$srcdir/$_pkgname/doc/license.txt
+  c=$srcdir/$_pkgname-v$_pkgver/doc/license.txt
 
   install -d $a && cp -a $_pkgname $a
   install -d $b && install -m644 $c $b/LICENSE
diff --git a/pcr/monkeysphere/PKGBUILD b/pcr/monkeysphere/PKGBUILD
index d274631eb..f83e05741 100644
--- a/pcr/monkeysphere/PKGBUILD
+++ b/pcr/monkeysphere/PKGBUILD
@@ -4,15 +4,27 @@
 # $Id: PKGBUILD 264 2010-11-10 00:57:53Z shtrom $
 pkgname=monkeysphere
 pkgver=0.35
-pkgrel=4
+pkgrel=5
 pkgdesc="Leverage the OpenPGP web of trust for OpenSSH and Web authentication"
 arch=('any')
 url="http://web.monkeysphere.info/"
 license=('GPL3')
 depends=('gnupg' 'lockfile-progs' 'perl-crypt-openssl-rsa' 'perl-digest-sha1')
-source=(http://archive.monkeysphere.info/debian/pool/${pkgname}/m/${pkgname}/${pkgname}_${pkgver}.orig.tar.gz)
+source=(http://archive.monkeysphere.info/debian/pool/${pkgname}/m/${pkgname}/${pkgname}_${pkgver}.orig.tar.gz
+        binmerge.patch)
 install=monkeysphere.install
-md5sums=('481ac14c9fdef0ccd1944c593bd4f517')
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  patch -Ni "${srcdir}/binmerge.patch"
+}
+
+check() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make test
+}
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -20,3 +32,5 @@ package() {
   make DESTDIR="$pkgdir/" install
   mkdir -p $pkgdir/var/lib/monkeysphere
 } 
+md5sums=('481ac14c9fdef0ccd1944c593bd4f517'
+         'a8bd35dc7dd58b5952beeecafe5045a7')
diff --git a/pcr/monkeysphere/binmerge.patch b/pcr/monkeysphere/binmerge.patch
new file mode 100644
index 000000000..48d945511
--- /dev/null
+++ b/pcr/monkeysphere/binmerge.patch
@@ -0,0 +1,25 @@
+--- Makefile.orig	2013-06-07 13:02:23.123944233 -0300
++++ Makefile	2013-06-07 13:02:43.351065809 -0300
+@@ -36,17 +36,17 @@
+ # this target is to be called from the tarball, not from the git
+ # working dir!
+ install: all installman
+-	mkdir -p $(DESTDIR)$(PREFIX)/bin $(DESTDIR)$(PREFIX)/sbin
++	mkdir -p $(DESTDIR)$(PREFIX)/bin
+ 	mkdir -p $(DESTDIR)$(PREFIX)/share/monkeysphere/m $(DESTDIR)$(PREFIX)/share/monkeysphere/mh $(DESTDIR)$(PREFIX)/share/monkeysphere/ma $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions
+ 	mkdir -p $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere
+ 	mkdir -p $(DESTDIR)$(PREFIX)/share/doc/monkeysphere
+ 	printf "Monkeysphere %s\n" $(MONKEYSPHERE_VERSION) > $(DESTDIR)$(PREFIX)/share/monkeysphere/VERSION
+ 	install src/monkeysphere $(DESTDIR)$(PREFIX)/bin
+ 	sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/bin/monkeysphere
+-	install src/monkeysphere-host $(DESTDIR)$(PREFIX)/sbin
+-	sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-host
+-	install src/monkeysphere-authentication $(DESTDIR)$(PREFIX)/sbin
+-	sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-authentication
++	install src/monkeysphere-host $(DESTDIR)$(PREFIX)/bin
++	sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/bin/monkeysphere-host
++	install src/monkeysphere-authentication $(DESTDIR)$(PREFIX)/bin
++	sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/bin/monkeysphere-authentication
+ 	install src/monkeysphere-authentication-keys-for-user $(DESTDIR)$(PREFIX)/share/monkeysphere
+ 	install -m 0644 src/share/common $(DESTDIR)$(PREFIX)/share/monkeysphere
+ 	install -m 0644 src/share/defaultenv $(DESTDIR)$(PREFIX)/share/monkeysphere
diff --git a/pcr/mosquitto/PKGBUILD b/pcr/mosquitto/PKGBUILD
index 652e75691..2f765ad13 100644
--- a/pcr/mosquitto/PKGBUILD
+++ b/pcr/mosquitto/PKGBUILD
@@ -4,22 +4,27 @@
 
 pkgname=mosquitto
 pkgver=1.1.3
-pkgrel=2
+pkgrel=3
 pkgdesc="An Open Source MQTT v3.1 Broker"
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'mips64el')
 url="http://mosquitto.org/"
 makedepends=('python')
 optdepends=('python: python support')
 license=('BSD')
-source=(http://mosquitto.org/files/source/$pkgname-$pkgver.tar.gz{,.asc} "$pkgname.service" )
+source=(http://mosquitto.org/files/source/$pkgname-$pkgver.tar.gz{,.asc} "$pkgname.service" 
+        "binmerge.patch")
 md5sums=('fd0cae17221d778b0a002c31e6c3de9e'
          'SKIP'
-         'b7cdd7a65d9a7ac5a8c2456f4b1f2d8f')
+         '58af79ed48be928f91e5435cda82bb8b'
+         '27e24b672d63b797f0e026ab85c64c4b')
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver/src"
+  patch -N -i ${srcdir}/binmerge.patch
+}
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  #Remove hardcoded prefix
-  find -name Makefile -exec sed '/prefix=/d' -i {} \;
 
   make prefix=/usr
 }
diff --git a/pcr/mosquitto/binmerge.patch b/pcr/mosquitto/binmerge.patch
new file mode 100644
index 000000000..d6d79041d
--- /dev/null
+++ b/pcr/mosquitto/binmerge.patch
@@ -0,0 +1,21 @@
+--- src/Makefile.orig	2013-06-03 12:23:15.288586121 -0300
++++ src/Makefile	2013-06-03 12:23:29.455571403 -0300
+@@ -90,15 +90,15 @@
+ 	${CC} $(CFLAGS) ${CPPFLAGS} -c $< -o $@
+ 
+ install : all
+-	$(INSTALL) -d ${DESTDIR}$(prefix)/sbin
+-	$(INSTALL) -s mosquitto ${DESTDIR}${prefix}/sbin/mosquitto
++	$(INSTALL) -d ${DESTDIR}$(prefix)/bin
++	$(INSTALL) -s mosquitto ${DESTDIR}${prefix}/bin/mosquitto
+ 	$(INSTALL) mosquitto_plugin.h ${DESTDIR}${prefix}/include/mosquitto_plugin.h
+ ifeq ($(WITH_TLS),yes)
+ 	$(INSTALL) -s mosquitto_passwd ${DESTDIR}${prefix}/bin/mosquitto_passwd
+ endif
+ 
+ uninstall :
+-	-rm -f ${DESTDIR}${prefix}/sbin/mosquitto
++	-rm -f ${DESTDIR}${prefix}/bin/mosquitto
+ 	-rm -f ${DESTDIR}${prefix}/include/mosquitto_plugin.h
+ 	-rm -f ${DESTDIR}${prefix}/bin/mosquitto_passwd
+ 
diff --git a/pcr/mosquitto/mosquitto.service b/pcr/mosquitto/mosquitto.service
index 7e9ef7cc8..9626cbc45 100644
--- a/pcr/mosquitto/mosquitto.service
+++ b/pcr/mosquitto/mosquitto.service
@@ -12,9 +12,9 @@ Requires=network.target
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/mosquitto -c /etc/mosquitto/mosquitto.conf -d
-ExecStartPre=/bin/rm -f /var/run/mosquitto.pid
-PIDFile=/var/run/mosquitto.pid
+ExecStart=/usr/bin/mosquitto -c /etc/mosquitto/mosquitto.conf -d
+ExecStartPre=/usr/bin/rm -f /run/mosquitto.pid
+PIDFile=/run/mosquitto.pid
 Restart=on-abort
 
 [Install]
diff --git a/pcr/netatalk/PKGBUILD b/pcr/netatalk/PKGBUILD
index f87ce7e2a..b16132dab 100644
--- a/pcr/netatalk/PKGBUILD
+++ b/pcr/netatalk/PKGBUILD
@@ -5,7 +5,7 @@
 # Contributor: Farhan Yousaf <farhany at xaviya dot com>
 
 pkgname=netatalk
-pkgver=3.0.3
+pkgver=3.0.4
 pkgrel=2
 pkgdesc='A kernel-level implementation of AFP services'
 arch=('i686' 'x86_64' 'mips64el')
@@ -19,17 +19,24 @@ options=('!libtool')
 install=$pkgname.install
 changelog=$pkgname.changelog
 source=(http://iweb.dl.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2)
-md5sums=('0a6f3acefd27ad63d2cde6ae4702e1b4')
+md5sums=('f455505884a6aea307640d46a6577fd1')
 
-build() {
+prepare() {
 	cd $pkgname-$pkgver
 
-	sed -i -e 's:"/lib/systemd:"/usr/lib/systemd:' -e 's/x"linux/x"generic/' macros/netatalk.m4
+	sed -i -e 's:AX_CHECK_DOCBOOK:[AX_CHECK_DOCBOOK]:' -e 's:"/lib/systemd:"/usr/lib/systemd:' -e 's/x"linux/x"generic/' macros/netatalk.m4
 	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' {configure.ac,libevent/configure.in}
 	cp /usr/share/automake*/missing .
+
 	autoreconf -i
+}
+
+build() {
+	cd $pkgname-$pkgver
+
 
   ./configure --prefix=/usr \
+              --sbindir=/usr/bin \
               --localstatedir=/var/state \
               --sysconfdir=/etc \
               --with-init-style=systemd \
diff --git a/pcr/netatalk/netatalk.changelog b/pcr/netatalk/netatalk.changelog
index 712a8e5c1..8e1937a6c 100644
--- a/pcr/netatalk/netatalk.changelog
+++ b/pcr/netatalk/netatalk.changelog
@@ -1,3 +1,15 @@
+2013-06-03 SJ_UnderWater
+
+	* 3.0.4-2:
+	move sbindir
+
+2013-05-26 SJ_UnderWater
+
+	* 3.0.4-1:
+	package update
+	minor fixes
+	dbus-glib dependency
+
 2013-03-27 SJ_UnderWater
 
 	* 3.0.3-1:
diff --git a/pcr/opendnssec/LICENSE b/pcr/opendnssec/LICENSE
new file mode 100644
index 000000000..5700d408a
--- /dev/null
+++ b/pcr/opendnssec/LICENSE
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2009 Nominet UK. All rights reserved.
+ * Copyright (c) 2010 .SE (The Internet Infrastructure Foundation).
+ * Copyright (c) 2009 NLNet Labs.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ *  Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+ *
+ *  Permission to use, copy, modify, and distribute this software for any
+ *  purpose with or without fee is hereby granted, provided that the above
+ *  copyright notice and this permission notice appear in all copies.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ *  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ *  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ *  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ *  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ *  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/* pkcs11.h
+   Copyright 2006, 2007 g10 Code GmbH
+   Copyright 2006 Andreas Jellinghaus
+
+   This file is free software; as a special exception the author gives
+   unlimited permission to copy and/or distribute it, with or without
+   modifications, as long as this notice is preserved.
+
+   This file is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY, to the extent permitted by law; without even
+   the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+   PURPOSE.  */
\ No newline at end of file
diff --git a/pcr/opendnssec/PKGBUILD b/pcr/opendnssec/PKGBUILD
new file mode 100644
index 000000000..065a1ec68
--- /dev/null
+++ b/pcr/opendnssec/PKGBUILD
@@ -0,0 +1,77 @@
+# Maintainer: Javier Torres <javitonino [at] gmail [dot] com>
+
+pkgname=opendnssec
+pkgver=1.4.0
+pkgrel=3
+pkgdesc="Turn-key solution for DNSSEC (sqlite3)"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.opendnssec.org/"
+license=('BSD')
+depends=('libxml2' 'ldns' 'sqlite3' 'softhsm')
+backup=("etc/opendnssec/conf.xml"
+        "etc/opendnssec/kasp.xml"
+        "etc/opendnssec/zonelist.xml")
+install="opendnssec.install"
+source=("http://www.opendnssec.org/files/source/${pkgname}-${pkgver}.tar.gz"{,.sig}
+        "pid-path.patch"
+        "ods-signer.service"
+        "ods-enforcer.service")
+sha256sums=('36d4926dcdf351a527ad7600b151ab6cc56d0a472a7eb8871eecd70afef9e101'
+            'SKIP'
+            '487a4c05a07feb97c865ddc4c13d00eea6ce8b2b1e5031983c15484f4991ebed'
+            '1a8cdec0e97a33048956268b766da570f8f7a90d05af59e547219f1381832071'
+            '75cecbfb0ece13957a68a5bc39c20a1d69b95373e7473545d70621e1732733d8')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  # /var/lib/run -> /var/run
+  patch -p0 -i "${srcdir}/pid-path.patch"
+
+  aclocal
+  autoconf
+  automake --add-missing
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  ./configure --prefix=/usr \
+              --datarootdir=/usr/share \
+              --localstatedir=/var/lib \
+              --sysconfdir=/etc \
+              --with-pkcs11-softhsm=/usr/lib/libsofthsm.so \
+              --sbindir=/usr/bin
+
+  # Create the correct (/var/run/opendnssec) directory
+  sed -i \
+  -e "s/\$(INSTALL) -d \$(DESTDIR)\$(localstatedir)\/run\/opendnssec/#Removed/" \
+  -e "s/\$(INSTALL) -d \$(DESTDIR)\$(localstatedir)\/run/\$(INSTALL) -d \$(DESTDIR)\$(OPENDNSSEC_PID_DIR)/" \
+  Makefile
+
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  install -d "${pkgdir}/var/run/opendnssec"
+
+  make DESTDIR="${pkgdir}" install
+
+  install -d "${pkgdir}/etc/rc.d"
+  install -Dm0644 "${srcdir}/ods-signer.service" \
+        "${pkgdir}/usr/lib/systemd/system/ods-signer.service"
+  install -Dm0644 "${srcdir}/ods-enforcer.service" \
+        "${pkgdir}/usr/lib/systemd/system/ods-enforcer.service"
+  install -Dm0644 "LICENSE" \
+        "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm0644 "enforcer/utils/migrate_adapters_1.sqlite3" \
+        "${pkgdir}/usr/share/opendnssec"
+
+  chown -R 227:227 "${pkgdir}/etc/opendnssec" \
+                   "${pkgdir}/var/lib/opendnssec" \
+                   "${pkgdir}/var/run/opendnssec" 
+  chmod 750 "${pkgdir}/etc/opendnssec" \
+            "${pkgdir}/var/lib/opendnssec" \
+            "${pkgdir}/var/run/opendnssec" 
+}
diff --git a/pcr/opendnssec/ods-enforcer.service b/pcr/opendnssec/ods-enforcer.service
new file mode 100644
index 000000000..f0d0050d0
--- /dev/null
+++ b/pcr/opendnssec/ods-enforcer.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=OpenDNSSEC Enforcer
+After=syslog.target network.target
+
+[Service]
+Type=forking
+PIDFile=/run/opendnssec/enforcerd.pid
+ExecStart=/usr/bin/ods-control enforcer start
+ExecStop=/usr/bin/ods-control enforcer stop
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/pcr/opendnssec/ods-signer.service b/pcr/opendnssec/ods-signer.service
new file mode 100644
index 000000000..26cc03481
--- /dev/null
+++ b/pcr/opendnssec/ods-signer.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=OpenDNSSEC Signer
+After=syslog.target nerwork.target
+
+[Service]
+Type=forking
+PIDFile=/run/opendnssec/signerd.pid
+ExecStart=/usr/bin/ods-control signer start
+ExecStop=/usr/bin/ods-control signer stop
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/pcr/opendnssec/opendnssec.install b/pcr/opendnssec/opendnssec.install
new file mode 100644
index 000000000..0c74659ee
--- /dev/null
+++ b/pcr/opendnssec/opendnssec.install
@@ -0,0 +1,27 @@
+post_install() {
+    if [ -z "`grep '^opendnssec:' /etc/group`" ]; then
+        groupadd -g 227 opendnssec
+    fi
+    if [ -z "`grep '^opendnssec:' /etc/passwd`" ]; then
+        useradd -u 227 -d /var/lib/opendnssec -g opendnssec -s /bin/false opendnssec
+    fi
+
+    echo ">> You need an HSM implementation (try softhsm)"
+}
+
+
+post_upgrade() {
+    post_install $1
+    OLD=$(echo $2 | sed "s/\(.*\)\.\(.*\)\.\(.*\)/\1\.\2/g")
+    NEW=$(echo $1 | sed "s/\(.*\)\.\(.*\)\.\(.*\)/\1\.\2/g")
+    if [ $OLD != "1.4" -a $NEW == "1.4" ]; then
+        echo ">> NOTICE: UPGRADE TO 1.4"
+        echo "This update requires upgrading the database"
+        echo "Run /usr/share/opendnssec/migrate_adapters_1.sqlite3 on your kasp database"
+	echo "e.g: sqlite3 kasp.db < /usr/share/opendnssec/migrate_adapters_1.sqlite3"
+    fi
+}
+
+post_remove() {
+    userdel opendnssec
+}
diff --git a/pcr/opendnssec/pid-path.patch b/pcr/opendnssec/pid-path.patch
new file mode 100644
index 000000000..88c750cf2
--- /dev/null
+++ b/pcr/opendnssec/pid-path.patch
@@ -0,0 +1,24 @@
+--- Makefile.am	2012-07-17 08:53:51.000000000 +0200
++++ Makefile.am	2012-11-20 21:56:11.000000000 +0100
+@@ -30,8 +30,8 @@
+ 	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/signconf
+ 	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/unsigned
+ 	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/signed
+-	$(INSTALL) -d $(DESTDIR)$(localstatedir)/run
+-	$(INSTALL) -d $(DESTDIR)$(localstatedir)/run/opendnssec
++	$(INSTALL) -d $(DESTDIR)/var/run
++	$(INSTALL) -d $(DESTDIR)/var/run/opendnssec
+ 
+ docs:
+ 	(cd libhsm; $(MAKE) doxygen)
+--- m4/opendnssec_common.m4	2012-11-01 11:56:59.000000000 +0100
++++ m4/opendnssec_common.m4	2012-11-20 21:52:56.000000000 +0100
+@@ -19,7 +19,7 @@
+ OPENDNSSEC_DATA_DIR=$full_datadir/opendnssec
+ OPENDNSSEC_SYSCONF_DIR=$full_sysconfdir/opendnssec
+ OPENDNSSEC_LOCALSTATE_DIR="$full_localstatedir/opendnssec"
+-OPENDNSSEC_PID_DIR="$full_localstatedir/run/opendnssec"
++OPENDNSSEC_PID_DIR="/var/run/opendnssec"
+ 
+ AC_SUBST([OPENDNSSEC_BIN_DIR])
+ AC_SUBST([OPENDNSSEC_SBIN_DIR])
diff --git a/pcr/openhpi/PKGBUILD b/pcr/openhpi/PKGBUILD
index 7da1cc055..bffcc74ba 100644
--- a/pcr/openhpi/PKGBUILD
+++ b/pcr/openhpi/PKGBUILD
@@ -1,8 +1,8 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
 
 pkgname=openhpi
 pkgver=3.2.0
-pkgrel=3
+pkgrel=4
 pkgdesc='Abstracted interface for managing computer hardware, typically chassis and rack based servers'
 arch=(
   i686
@@ -22,15 +22,26 @@ sha512sums=5a54ccc2279b3a608e2842dd3b4f01d7d483182ecd33d1d33186247cea15b62f1e0ae
 prepare() {
   cd $srcdir/$pkgname-$pkgver
 
+  _automake=$(automake --version | grep automake | sed 's|automake (GNU automake) ||')
+  sed -i "/am__api_version=/ s|1.12|${_automake::4}|;
+         " $(grep -rl am__api_version=)
+
+  #sed -i 's|INCLUDES|AM_CPPFLAGS|;
+  #       ' $(grep -rl INCLUDES | grep Makefile.am)
+
   # fixing path
   sed -i 's|bin/sh|usr/bin/bash|;
          ' $(grep -rl bin/sh)
-  sed -i 's|usr/sbin|usr/bin|;
-         ' $(grep -rl usr/bin)
   sed -i 's| /bin| /usr/bin|;
          ' $(grep -rl ' /bin')
   sed -i 's| /sbin| /usr/bin|;
          ' $(grep -rl ' /sbin')
+  sed -i 's|usr/sbin|usr/bin|;
+         ' $(grep -rl usr/sbin)
+  #sed -i 's|/lib64|/lib|;
+  #       ' $(grep -rl /lib64)
+  sed -i 's|usr/libexec|usr/lib|;
+         ' $(grep -rl usr/libexec)
   sed -i 's|var/lock|run/lock|;
          ' $(grep -rl var/lock)
   sed -i 's|var/run|run|;
@@ -41,36 +52,92 @@ prepare() {
   #        s|open source / ||;
   #        s|Open Source|Free Software|;
   #        s|open source|free software|;
+  #        s|Free Software Development Lab|Open Source Development Lab|;
   #       ' $(grep -ril 'open source')
   #sed -i 's|OpenSource / ||;
   #        s|opensource / ||;
   #        s|OpenSource|FreeSoftware|;
   #        s|opensource|freesoftware|;
+  #        s|freesoftware.org|opensource.org|;
+  #        s|http://www.opensource.org/|http://www.gnu.org/philosophy/free-sw.html|;
+  #        s|http://www.gnu.org/philosophy/free-sw.htmllicenses/osl-|http://opensource.org/licenses/osl-|;
+  #        s|http://www.gnu.org/philosophy/free-sw.htmlosd|http://opensource.org/osd|;
   #       ' $(grep -ril opensource)
 
   # remove Linux term
-  sed -i '/, Linux/ s|Linux|GNU/Linux|;
-          /And Linux/ s|Linux|GNU/Linux|;
-          /and Linux/ s|Linux|GNU/Linux|;
-          /For Linux/ s|Linux|GNU/Linux|;
-          /for Linux/ s|Linux|GNU/Linux|;
-          /Like Linux/ s|Linux|GNU/Linux|;
-          /like Linux/ s|Linux|GNU/Linux|;
-          /Linux,/ s|Linux|GNU/Linux|;
-          /Linux and/ s|Linux|GNU/Linux|;
-          /Linux distribution/ s|Linux|GNU/Linux|;
-          /Linux machine/ s|Linux|GNU/Linux|;
-          /Linux operating/ s|Linux|GNU/Linux|;
-          /Linux OS/ s|Linux|GNU/Linux|;
-          /Linux specific/ s|Linux|GNU/Linux|;
-          /Linux system/ s|Linux|GNU/Linux|;
-          /Under Linux/ s|Linux|GNU/Linux|;
-          /under Linux/ s|Linux|GNU/Linux|;
-          /On Linux/ s|Linux|GNU/Linux|;
-          /on Linux/ s|Linux|GNU/Linux|;
+  sed -i 's|Linux,|GNU/Linux,|;
+          s|Linux and|GNU/Linux and|;
+          s|Linux distro|GNU/Linux distro|;
+          s|Linux distribution|GNU/Linux distribution|;
+          s|Linux machine|GNU/Linux machine|;
+          s|Linux Only|GNU/Linux Only|;
+          s|Linux only|GNU/Linux only|;
+          s|Linux operating|GNU/Linux operating|;
+          s|Linux OS|GNU/Linux OS|;
+          s|Linux platform|GNU/Linux platform|;
+          s|Linux software|GNU/Linux software|;
+          s|Linux specific|GNU/Linux specific|;
+          s|Linux system|GNU/Linux system|;
+          s|Linux will|GNU/Linux will|;
+          s|# Linux$|# GNU/Linux|;
+          s|# Linux.$|# GNU/Linux.|;
+          s|* Linux$|* GNU/Linux|;
+          s|* Linux.$|* GNU/Linux.|;
+          s|// Linux$|// GNU/Linux|;
+          s|// Linux.$|// GNU/Linux.|;
+          s|, Linux|, GNU/Linux|;
+          s|As Linux|As GNU/Linux|;
+          s|as Linux|as GNU/Linux|;
+          s|And Linux|And GNU/Linux|;
+          s|and Linux|and GNU/Linux|;
+          s|Be Linux|Be GNU/Linux|;
+          s|be Linux|be GNU/Linux|;
+          s|Because Linux|Because GNU/Linux|;
+          s|because Linux|because GNU/Linux|;
+          s|e.g. Linux|e.g. GNU/Linux|;
+          s|For Linux|For GNU/Linux|;
+          s|for Linux|for GNU/Linux|;
+          s|In Linux|In GNU/Linux|;
+          s|in Linux|in GNU/Linux|;
+          s|Like Linux|Like GNU/Linux|;
+          s|like Linux|like GNU/Linux|;
+          s|non-Linux|non GNU/Linux|;
+          s|Of Linux|Of GNU/Linux|;
+          s|of Linux|of GNU/Linux|;
+          s|On Linux|On GNU/Linux|;
+          s|on Linux|on GNU/Linux|;
+          s|OS type: Linux|OS type: GNU/Linux|;
+          s|Other Linux|Other GNU/Linux|;
+          s|other Linux|other GNU/Linux|;
+          s|The Linux|The GNU/Linux|;
+          s|the Linux|the GNU/Linux|;
+          s|Typically Linux|Typically GNU/Linux|;
+          s|typically Linux|typically GNU/Linux|;
+          s|To Linux|To GNU/Linux|;
+          s|to Linux|to GNU/Linux|;
+          s|Under Linux|Under GNU/Linux|;
+          s|under Linux|under GNU/Linux|;
+          s|ArchGNU/Linux|ArchLinux|;
+          s|e2fsprogs, typically GNU/Linux|e2fsprogs, typically Linux|;
           s|GNU/GNU|GNU|;
+          s|GNU/Linux device|Linux device|;
+          s|GNU/Linux Director Daemon|Linux Director Daemon|;
+          s|GNU/Linux is a registered trademark of Linus Torvalds|Linux is a registered trademark of Linus Torvalds|;
           s|GNU/Linux kernel|Linux kernel|;
           s|GNU/Linux specific kernel|Linux specific kernel|;
+          s|GNU/Linux Standard Base|Linux Standard Base|;
+          s|GNU/Linux sysfs|Linux sysfs|;
+          s|GNU/Linux Virtual Server|Linux Virtual Server|;
+          s|GNU/Linux Watchdog|Linux Watchdog|;
+          s|GNU/Linux watchdog|Linux watchdog|;
+          s|GNU/LinuxHA|LinuxHA|;
+          s|GNU/Linux-HA|Linux-HA|;
+          s|GNU/LinuxSCSI|LinuxSCSI|;
+          s|HA GNU/Linux|HA Linux|;
+          s|High-Availability GNU/Linux|High-Availability Linux|;
+          s|MkGNU/Linux|MkLinux|;
+          s|SEGNU/Linux|SELinux|;
+          s|VA GNU/Linux Cluster|VA Linux Cluster|;
          ' $(grep -rl Linux)
 }
 
diff --git a/pcr/openipmi/PKGBUILD b/pcr/openipmi/PKGBUILD
index 9c3c73ed8..cced11d05 100644
--- a/pcr/openipmi/PKGBUILD
+++ b/pcr/openipmi/PKGBUILD
@@ -6,7 +6,7 @@ _pkgname2=${pkgname:4}
 _pkgname=${_pkgname1^}${_pkgname2^^}
 pkgver=2.0.19
 _pkgver=${pkgver::3}
-pkgrel=2
+pkgrel=3
 pkgdesc="Allow access to platform information using Intelligent Platform Management Interface (${_pkgname2^^})"
 arch=(
   i686
@@ -38,41 +38,126 @@ sha512sums=ee95eb64b7cde3f22c8444a5f8e3172808b0bb9a3a7034c1302c5f568c1cc0852a44c
 prepare() {
   cd $srcdir/$_pkgname-$pkgver
 
+  #mv configure.{in,ac}
+
+  #_automake=$(automake --version | grep automake | sed 's|automake (GNU automake) ||')
+  #sed -i "/am__api_version=/ s|1.11|${_automake::4}|;
+  #       " $(grep -rl am__api_version=)
+
+  #sed -i "s|AC_INIT(README.Force)|AC_INIT(OpenIPMI, $pkgver|;
+  #       " configure.ac
+  #sed -i 's|AM_INIT_AUTOMAKE(OpenIPMI, ${OPENIPMI_VERSION_MAJOR}.${OPENIPMI_VERSION_MINOR}.${OPENIPMI_VERSION_RELEASE}${OPENIPMI_VERSION_EXTRA})|AM_INIT_AUTOMAKE|;
+  #       ' configure.ac
+
+  # fixing path
+  sed -i 's|bin/sh|usr/bin/bash|;
+         ' $(grep -rl bin/sh)
+  sed -i 's| /bin| /usr/bin|;
+         ' $(grep -rl ' /bin')
+  sed -i 's| /sbin| /usr/bin|;
+         ' $(grep -rl ' /sbin')
+  sed -i 's|usr/sbin|usr/bin|;
+         ' $(grep -rl usr/sbin)
+  #sed -i 's|/lib64|/lib|;
+  #       ' $(grep -rl /lib64)
+  sed -i 's|usr/libexec|usr/lib|;
+         ' $(grep -rl usr/libexec)
+  sed -i 's|var/lock|run/lock|;
+         ' $(grep -rl var/lock)
+  #sed -i 's|var/run|run|;
+  #       ' $(grep -rl var/run)
+
   # remove Open Source term
   sed -i 's|Open Source / ||;
           s|open source / ||;
           s|Open Source|Free Software|;
           s|open source|free software|;
+          s|Free Software Development Lab|Open Source Development Lab|;
          ' $(grep -ril 'open source')
   #sed -i 's|OpenSource / ||;
   #        s|opensource / ||;
   #        s|OpenSource|FreeSoftware|;
   #        s|opensource|freesoftware|;
+  #        s|freesoftware.org|opensource.org|;
+  #        s|http://www.opensource.org/|http://www.gnu.org/philosophy/free-sw.html|;
+  #        s|http://www.gnu.org/philosophy/free-sw.htmllicenses/osl-|http://opensource.org/licenses/osl-|;
+  #        s|http://www.gnu.org/philosophy/free-sw.htmlosd|http://opensource.org/osd|;
   #       ' $(grep -ril opensource)
 
   # remove Linux term
-  sed -i '/, Linux/ s|Linux|GNU/Linux|;
-          /And Linux/ s|Linux|GNU/Linux|;
-          /and Linux/ s|Linux|GNU/Linux|;
-          /For Linux/ s|Linux|GNU/Linux|;
-          /for Linux/ s|Linux|GNU/Linux|;
-          /Like Linux/ s|Linux|GNU/Linux|;
-          /like Linux/ s|Linux|GNU/Linux|;
-          /Linux,/ s|Linux|GNU/Linux|;
-          /Linux and/ s|Linux|GNU/Linux|;
-          /Linux distribution/ s|Linux|GNU/Linux|;
-          /Linux machine/ s|Linux|GNU/Linux|;
-          /Linux operating/ s|Linux|GNU/Linux|;
-          /Linux OS/ s|Linux|GNU/Linux|;
-          /Linux specific/ s|Linux|GNU/Linux|;
-          /Linux system/ s|Linux|GNU/Linux|;
-          /Under Linux/ s|Linux|GNU/Linux|;
-          /under Linux/ s|Linux|GNU/Linux|;
-          /On Linux/ s|Linux|GNU/Linux|;
-          /on Linux/ s|Linux|GNU/Linux|;
+  sed -i 's|Linux,|GNU/Linux,|;
+          s|Linux and|GNU/Linux and|;
+          s|Linux distro|GNU/Linux distro|;
+          s|Linux distribution|GNU/Linux distribution|;
+          s|Linux machine|GNU/Linux machine|;
+          s|Linux Only|GNU/Linux Only|;
+          s|Linux only|GNU/Linux only|;
+          s|Linux operating|GNU/Linux operating|;
+          s|Linux OS|GNU/Linux OS|;
+          s|Linux platform|GNU/Linux platform|;
+          s|Linux software|GNU/Linux software|;
+          s|Linux specific|GNU/Linux specific|;
+          s|Linux system|GNU/Linux system|;
+          s|Linux will|GNU/Linux will|;
+          s|# Linux$|# GNU/Linux|;
+          s|# Linux.$|# GNU/Linux.|;
+          s|* Linux$|* GNU/Linux|;
+          s|* Linux.$|* GNU/Linux.|;
+          s|// Linux$|// GNU/Linux|;
+          s|// Linux.$|// GNU/Linux.|;
+          s|, Linux|, GNU/Linux|;
+          s|As Linux|As GNU/Linux|;
+          s|as Linux|as GNU/Linux|;
+          s|And Linux|And GNU/Linux|;
+          s|and Linux|and GNU/Linux|;
+          s|Be Linux|Be GNU/Linux|;
+          s|be Linux|be GNU/Linux|;
+          s|Because Linux|Because GNU/Linux|;
+          s|because Linux|because GNU/Linux|;
+          s|e.g. Linux|e.g. GNU/Linux|;
+          s|For Linux|For GNU/Linux|;
+          s|for Linux|for GNU/Linux|;
+          s|In Linux|In GNU/Linux|;
+          s|in Linux|in GNU/Linux|;
+          s|Like Linux|Like GNU/Linux|;
+          s|like Linux|like GNU/Linux|;
+          s|non-Linux|non GNU/Linux|;
+          s|Of Linux|Of GNU/Linux|;
+          s|of Linux|of GNU/Linux|;
+          s|On Linux|On GNU/Linux|;
+          s|on Linux|on GNU/Linux|;
+          s|OS type: Linux|OS type: GNU/Linux|;
+          s|Other Linux|Other GNU/Linux|;
+          s|other Linux|other GNU/Linux|;
+          s|The Linux|The GNU/Linux|;
+          s|the Linux|the GNU/Linux|;
+          s|Typically Linux|Typically GNU/Linux|;
+          s|typically Linux|typically GNU/Linux|;
+          s|To Linux|To GNU/Linux|;
+          s|to Linux|to GNU/Linux|;
+          s|Under Linux|Under GNU/Linux|;
+          s|under Linux|under GNU/Linux|;
+          s|ArchGNU/Linux|ArchLinux|;
+          s|e2fsprogs, typically GNU/Linux|e2fsprogs, typically Linux|;
           s|GNU/GNU|GNU|;
+          s|GNU/Linux device|Linux device|;
+          s|GNU/Linux Director Daemon|Linux Director Daemon|;
+          s|GNU/Linux is a registered trademark of Linus Torvalds|Linux is a registered trademark of Linus Torvalds|;
           s|GNU/Linux kernel|Linux kernel|;
           s|GNU/Linux specific kernel|Linux specific kernel|;
+          s|GNU/Linux Standard Base|Linux Standard Base|;
+          s|GNU/Linux sysfs|Linux sysfs|;
+          s|GNU/Linux Virtual Server|Linux Virtual Server|;
+          s|GNU/Linux Watchdog|Linux Watchdog|;
+          s|GNU/Linux watchdog|Linux watchdog|;
+          s|GNU/LinuxHA|LinuxHA|;
+          s|GNU/Linux-HA|Linux-HA|;
+          s|GNU/LinuxSCSI|LinuxSCSI|;
+          s|HA GNU/Linux|HA Linux|;
+          s|High-Availability GNU/Linux|High-Availability Linux|;
+          s|MkGNU/Linux|MkLinux|;
+          s|SEGNU/Linux|SELinux|;
+          s|VA GNU/Linux Cluster|VA Linux Cluster|;
          ' $(grep -rl Linux)
 }
 
diff --git a/pcr/openswan/PKGBUILD b/pcr/openswan/PKGBUILD
index 97cea98e6..ab7bd69f5 100644
--- a/pcr/openswan/PKGBUILD
+++ b/pcr/openswan/PKGBUILD
@@ -1,26 +1,31 @@
 # Contributor: xjpvictor Huang <ke [AT] xjpvictor [DOT] info>
 pkgname=openswan
 pkgver=2.6.38
-pkgrel=1
+pkgrel=2
 pkgdesc="Open Source implementation of IPsec for the Linux operating system"
 url="http://www.openswan.org"
 license=('GPL' 'custom')
 arch=('i686' 'x86_64')
 depends=('iproute2>=2.6.8' 'gmp' 'perl')
 makedepends=('flex' 'bison')
-conflicts=('ipsec-tools' 'openswan')
-provides=('openswan')
+conflicts=('ipsec-tools')
 backup=(etc/ipsec.conf \
         etc/ipsec.d/policies/{block,clear,clear-or-private,private,private-or-clear})
 source=(http://download.openswan.org/openswan/openswan-$pkgver.tar.gz
         openswan
         openswan.service)
 
+prepare() {
+  cd $srcdir/openswan-$pkgver
+  # Change install paths to Arch defaults
+  sed -i 's|/usr/local|/usr|;s|libexec/ipsec|lib/openswan|;s|)/sbin|)/bin|' Makefile.inc
+}
+
 build() {
   cd $srcdir/openswan-$pkgver
 
   # Change install paths to Arch defaults
-  sed -i 's|/usr/local|/usr|;s|libexec/ipsec|lib/openswan|' Makefile.inc
+  sed -i 's|/usr/local|/usr|;s|libexec/ipsec|lib/openswan|;s|)/sbin|)/bin|' Makefile.inc
 
   make USE_XAUTH=true USE_OBJDIR=true programs
 }
diff --git a/pcr/pacemaker/PKGBUILD b/pcr/pacemaker/PKGBUILD
new file mode 100644
index 000000000..3681f9111
--- /dev/null
+++ b/pcr/pacemaker/PKGBUILD
@@ -0,0 +1,222 @@
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+
+pkgname=pacemaker
+pkgver=1.1.9
+pkgrel=6
+pkgdesc='Cluster resource manager (Linux-HA)'
+arch=(
+  i686
+  x86_64
+  mips64el
+)
+group=linux-ha
+url=http://$group.org/wiki/${pkgname^}
+license=GPL2
+depends=(
+  corosync
+  heartbeat
+  libqb
+  libxslt
+  resource-agent
+  #saxon-he
+)
+makedepends=(
+  asciidoc
+  help2man
+  inkscape
+  lynx
+  openssh
+  valgrind
+  w3m
+)
+options=(!libtool)
+provides=(ha-$pkgname)
+conflicts=ha-$pkgname
+replaces=ha-$pkgname
+source=https://github.com/ClusterLabs/$pkgname/archive/${pkgname^}-$pkgver.tar.gz
+sha512sums=97d13cf722aea9cba1ce344afc3137d9edc15a978d2a7acc44179c4859ecb18f800312caf02c9574b0fab528cd6e2c3e4876a1ffde8a08c2500c0ba816cdf071
+
+prepare() {
+  cd $srcdir/$pkgname-${pkgname^}-$pkgver
+
+  sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|;
+          s|AM_INIT_AUTOMAKE($PACKAGE_NAME, $PACKAGE_VERSION)|AM_INIT_AUTOMAKE|;
+         ' configure.ac
+
+  sed -i 's|INCLUDES|AM_CPPFLAGS|;
+         ' $(grep -rlI INCLUDES | grep Makefile.am)
+
+  # fixing path
+  sed -i 's|bin/sh|usr/bin/bash|;
+         ' $(grep -rlI bin/sh)
+  sed -i 's| /bin| /usr/bin|;
+         ' $(grep -rlI ' /bin')
+  sed -i 's| /sbin| /usr/bin|;
+         ' $(grep -rlI ' /sbin')
+  sed -i 's|usr/sbin|usr/bin|;
+         ' $(grep -rlI usr/sbin)
+  sed -i 's|/lib64|/lib|;
+         ' $(grep -rlI /lib64)
+  sed -i 's|usr/libexec|usr/lib|;
+         ' $(grep -rlI usr/libexec)
+  sed -i 's|var/lock|run/lock|;
+         ' $(grep -rlI var/lock)
+  sed -i 's|var/run|run|;
+         ' $(grep -rlI var/run)
+
+  # remove Open Source term
+  sed -i 's|Open Source / ||;
+          s|open source / ||;
+          s|Open Source|Free|;
+          s|open source|free|;
+          s|Free Software Development Lab|Open Source Development Lab|;
+         ' $(grep -rilI 'open source')
+  sed -i 's|OpenSource / ||;
+          s|opensource / ||;
+          s|OpenSource|FreeSoftware|;
+          s|opensource|freesoftware|;
+          s|freesoftware.org|opensource.org|;
+          s|http://www.opensource.org/|http://www.gnu.org/philosophy/free-sw.html|;
+          s|http://www.gnu.org/philosophy/free-sw.htmllicenses/osl-|http://opensource.org/licenses/osl-|;
+          s|http://www.gnu.org/philosophy/free-sw.htmlosd|http://opensource.org/osd|;
+         ' $(grep -rilI opensource)
+
+  # remove Linux term
+  sed -i 's|Linux,|GNU/Linux,|;
+          s|Linux and|GNU/Linux and|;
+          s|Linux distro|GNU/Linux distro|;
+          s|Linux distribution|GNU/Linux distribution|;
+          s|Linux machine|GNU/Linux machine|;
+          s|Linux Only|GNU/Linux Only|;
+          s|Linux only|GNU/Linux only|;
+          s|Linux operating|GNU/Linux operating|;
+          s|Linux OS|GNU/Linux OS|;
+          s|Linux platform|GNU/Linux platform|;
+          s|Linux software|GNU/Linux software|;
+          s|Linux specific|GNU/Linux specific|;
+          s|Linux system|GNU/Linux system|;
+          s|Linux will|GNU/Linux will|;
+          s|# Linux$|# GNU/Linux|;
+          s|# Linux.$|# GNU/Linux.|;
+          s|* Linux$|* GNU/Linux|;
+          s|* Linux.$|* GNU/Linux.|;
+          s|// Linux$|// GNU/Linux|;
+          s|// Linux.$|// GNU/Linux.|;
+          s|, Linux|, GNU/Linux|;
+          s|As Linux|As GNU/Linux|;
+          s|as Linux|as GNU/Linux|;
+          s|And Linux|And GNU/Linux|;
+          s|and Linux|and GNU/Linux|;
+          s|Be Linux|Be GNU/Linux|;
+          s|be Linux|be GNU/Linux|;
+          s|Because Linux|Because GNU/Linux|;
+          s|because Linux|because GNU/Linux|;
+          s|e.g. Linux|e.g. GNU/Linux|;
+          s|For Linux|For GNU/Linux|;
+          s|for Linux|for GNU/Linux|;
+          s|In Linux|In GNU/Linux|;
+          s|in Linux|in GNU/Linux|;
+          s|Like Linux|Like GNU/Linux|;
+          s|like Linux|like GNU/Linux|;
+          s|non-Linux|non GNU/Linux|;
+          s|Of Linux|Of GNU/Linux|;
+          s|of Linux|of GNU/Linux|;
+          s|On Linux|On GNU/Linux|;
+          s|on Linux|on GNU/Linux|;
+          s|OS type: Linux|OS type: GNU/Linux|;
+          s|Other Linux|Other GNU/Linux|;
+          s|other Linux|other GNU/Linux|;
+          s|The Linux|The GNU/Linux|;
+          s|the Linux|the GNU/Linux|;
+          s|Typically Linux|Typically GNU/Linux|;
+          s|typically Linux|typically GNU/Linux|;
+          s|To Linux|To GNU/Linux|;
+          s|to Linux|to GNU/Linux|;
+          s|Under Linux|Under GNU/Linux|;
+          s|under Linux|under GNU/Linux|;
+          s|ArchGNU/Linux|ArchLinux|;
+          s|e2fsprogs, typically GNU/Linux|e2fsprogs, typically Linux|;
+          s|GNU/GNU|GNU|;
+          s|GNU/Linux device|Linux device|;
+          s|GNU/Linux Director Daemon|Linux Director Daemon|;
+          s|GNU/Linux is a registered trademark of Linus Torvalds|Linux is a registered trademark of Linus Torvalds|;
+          s|GNU/Linux kernel|Linux kernel|;
+          s|GNU/Linux specific kernel|Linux specific kernel|;
+          s|GNU/Linux Standard Base|Linux Standard Base|;
+          s|GNU/Linux sysfs|Linux sysfs|;
+          s|GNU/Linux Virtual Server|Linux Virtual Server|;
+          s|GNU/Linux Watchdog|Linux Watchdog|;
+          s|GNU/Linux watchdog|Linux watchdog|;
+          s|GNU/LinuxHA|LinuxHA|;
+          s|GNU/Linux-HA|Linux-HA|;
+          s|GNU/LinuxSCSI|LinuxSCSI|;
+          s|HA GNU/Linux|HA Linux|;
+          s|High-Availability GNU/Linux|High-Availability Linux|;
+          s|MkGNU/Linux|MkLinux|;
+          s|SEGNU/Linux|SELinux|;
+          s|VA GNU/Linux Cluster|VA Linux Cluster|;
+         ' $(grep -rlI Linux)
+  sed -i 's|Linux|GNU/Linux|;
+          s|ArchGNU/Linux|ArchLinux|;
+          s|e2fsprogs, typically GNU/Linux|e2fsprogs, typically Linux|;
+          s|GNU/GNU|GNU|;
+          s|GNU/Linux device|Linux device|;
+          s|GNU/Linux Director Daemon|Linux Director Daemon|;
+          s|GNU/Linux is a registered trademark of Linus Torvalds|Linux is a registered trademark of Linus Torvalds|;
+          s|GNU/Linux kernel|Linux kernel|;
+          s|GNU/Linux specific kernel|Linux specific kernel|;
+          s|GNU/Linux Standard Base|Linux Standard Base|;
+          s|GNU/Linux sysfs|Linux sysfs|;
+          s|GNU/Linux Virtual Server|Linux Virtual Server|;
+          s|GNU/Linux Watchdog|Linux Watchdog|;
+          s|GNU/Linux watchdog|Linux watchdog|;
+          s|GNU/LinuxHA|LinuxHA|;
+          s|GNU/Linux-HA|Linux-HA|;
+          s|GNU/LinuxSCSI|LinuxSCSI|;
+          s|HA GNU/Linux|HA Linux|;
+          s|High-Availability GNU/Linux|High-Availability Linux|;
+          s|MkGNU/Linux|MkLinux|;
+          s|SEGNU/Linux|SELinux|;
+          s|VA GNU/Linux Cluster|VA Linux Cluster|;
+         ' $(grep -rlI Linux | grep .po)
+}
+
+build() {
+  cd $srcdir/$pkgname-${pkgname^}-$pkgver
+  setarch $CARCH ./autogen.sh
+  setarch $CARCH ./configure --prefix=/usr\
+    --disable-static\
+    --enable-fatal-warnings\
+    --enable-systemd\
+    --enable-upstart\
+    --libdir=/usr/lib\
+    --libexecdir=/usr/lib\
+    --localstatedir=/var\
+    --sbindir=/usr/bin\
+    --sysconfdir=/etc\
+    --with-acl\
+    --with-ais\
+    --with-cibsecrets\
+    --with-cman\
+    --with-corosync\
+    --with-cs-quorum\
+    --with-esmtp\
+    --with-heartbeat\
+    --with-lcrso-dir=/usr/lib/lcrso\
+    --with-nagios\
+    --with-profiling\
+    --with-snmp\
+    --without-gcov
+  setarch $CARCH make
+}
+
+package() {
+  cd $srcdir/$pkgname-${pkgname^}-$pkgver
+  setarch $CARCH make DESTDIR=$pkgdir install
+
+  rm $pkgdir/etc/rc.d/pacemaker{_remote,} && rmdir $pkgdir/etc{/rc.d,}
+  mv $pkgdir/{var/,}run
+  mv $pkgdir/usr/bin/cibsecret{,-$pkgname}
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/pandoc/PKGBUILD b/pcr/pandoc/PKGBUILD
index 88f951d03..6fe28cc7c 100644
--- a/pcr/pandoc/PKGBUILD
+++ b/pcr/pandoc/PKGBUILD
@@ -3,19 +3,22 @@
 
 # Run `makepkg -sp SRCBUILD` if you want to update the source tarball
 
-pkgname=pandoc
+pkgname=pandoc-static
+_pkgname=pandoc
 pkgver=1.11.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Conversion between markup formats (no Haskell libs)'
 url='http://johnmacfarlane.net/pandoc/'
 license=('GPL')
 arch=('i686' 'x86_64')
 makedepends=('ghc' 'sh' 'cabal-install')
 options=(strip !makeflags !distcc !emptydirs)
-source=(https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-$pkgrel-any.src.tar.xz{,.sig}
+#source=(https://repo.parabolagnulinux.org/other/${_pkgname}-${pkgver}-$pkgrel-any.src.tar.xz{,.sig}
+source=(https://repo.parabolagnulinux.org/other/${_pkgname}-${pkgver}-1-any.src.tar.xz{,.sig}
         SRCBUILD)
 #        citeproc-hs-pre-0.3.7.patch)
-conflicts=('haskell-pandoc')
+replaces=('pandoc')
+provides=('pandoc')
 optdepends=('texlive-most: for pdf creation')
 md5sums=('74acd042fcd85bee9edb093cc3fe5c2e'
          'SKIP'
@@ -23,13 +26,13 @@ md5sums=('74acd042fcd85bee9edb093cc3fe5c2e'
 
 # PKGBUILD functions
 build() {
-    mkdir -p ${srcdir}/{build,${pkgname}-${pkgver}}
-    cd ${srcdir}/${pkgname}-${pkgver}
+    mkdir -p ${srcdir}/{build,${_pkgname}-${pkgver}}
+    cd ${srcdir}/${_pkgname}-${pkgver}
 
 # Patches from the next citeproc-hs release
 # These are needed because 0.3.6 with embed_data_files is broken
 # darcs diff --from-tag=0.3.6
-#   pushd ${srcdir}/${pkgname}-${pkgver}/citeproc-hs-0.3.6
+#   pushd ${srcdir}/${_pkgname}-${pkgver}/citeproc-hs-0.3.6
 #   patch -Np1 -i ${srcdir}/citeproc-hs-pre-0.3.7.patch
 #   popd
 
@@ -37,29 +40,29 @@ build() {
 # Skip already built
        [ -d ${srcdir}/build/usr/lib/$_hkpkg ] && continue
 
-       pushd ${srcdir}/${pkgname}-${pkgver}/${_hkpkg} >/dev/null
+       pushd ${srcdir}/${_pkgname}-${pkgver}/${_hkpkg} >/dev/null
 
        msg2 "Building $_hkpkg"
 
        case $_hkpkg in
-        $pkgname-$pkgver)
-         HOME=${srcdir}/${pkgname}-${pkgver} \
+        $_pkgname-$pkgver)
+         HOME=${srcdir}/${_pkgname}-${pkgver} \
          cabal configure --flags='-library blaze_html_0_5' \
                          --prefix=/usr \
                          --libdir=${srcdir}/build/usr/lib -v
 
-         HOME=${srcdir}/${pkgname}-${pkgver} \
+         HOME=${srcdir}/${_pkgname}-${pkgver} \
          cabal build
          ;;
 
         citeproc-hs-*)
-         HOME=${srcdir}/${pkgname}-${pkgver} \
+         HOME=${srcdir}/${_pkgname}-${pkgver} \
          cabal install --flags='embed_data_files' \
                        --prefix=${srcdir}/build/usr -v
          ;;
 
         *)
-         HOME=${srcdir}/${pkgname}-${pkgver} \
+         HOME=${srcdir}/${_pkgname}-${pkgver} \
          cabal install --prefix=${srcdir}/build/usr
          ;;
        esac
@@ -70,7 +73,7 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}/${pkgname}-${pkgver}
+  cd ${srcdir}/${_pkgname}-${pkgver}/${_pkgname}-${pkgver}
 
   runghc Setup.hs copy --destdir=${pkgdir}/
 
@@ -81,7 +84,7 @@ package() {
 
 # EC is unfree and makes Parabola TeXLive cry
 # besides, it's unneeded
-  sed "/fontenc/d" -i ${pkgdir}/usr/share/${pkgname}-${pkgver}/data/templates/default.latex
+  sed "/fontenc/d" -i ${pkgdir}/usr/share/${_pkgname}-${pkgver}/data/templates/default.latex
 
   find ${pkgdir}/usr/share -type f -exec chmod 644 {} \;
   find ${pkgdir}/usr/share -type d -exec chmod 755 {} \;
diff --git a/pcr/par/PKGBUILD b/pcr/par/PKGBUILD
new file mode 100644
index 000000000..2a6c0fac3
--- /dev/null
+++ b/pcr/par/PKGBUILD
@@ -0,0 +1,38 @@
+# Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
+# Contributor: quantax -- contact via Arch Linux forum or AUR
+
+pkgname=par
+pkgver=1.52
+pkgrel=3
+pkgdesc="Paragraph reformatter"
+url="http://www.nicemice.net/par/"
+depends=('glibc')
+arch=(i686 x86_64)
+license=('Custom')
+source=(http://www.nicemice.net/par/Par152-autoconf.tar.gz 
+        http://www.nicemice.net/par/par_1.52-i18n.3.diff.gz
+        http://www.nicemice.net/par/Par152.tar.gz )
+md5sums=('83e4d23a943ab07c44dd995b73195c70' 
+         'e79b448cb14323a39d817afce4847cdf'
+         '4ccacd824171ba2c2f14fb8aba78b9bf')
+
+prepare() {
+  cd $srcdir/Par152
+
+  patch -p1 -i $srcdir/par_1.52-i18n.3.diff
+}
+
+build() {
+  cd $srcdir/Par152
+  
+  ./configure --prefix=/usr
+  
+  make
+}
+  
+package() {
+  cd $srcdir/Par152
+  install --mode=755 -D par "${pkgdir}/usr/bin/par"
+  install --mode=644 -D par.1 "${pkgdir}/usr/share/man/man1/par.1"
+  install --mode=644 -D par.doc "${pkgdir}/usr/share/licenses/${pkgname}/par.doc"
+}
diff --git a/pcr/perl-crypt-dh/PKGBUILD b/pcr/perl-crypt-dh/PKGBUILD
new file mode 100644
index 000000000..e2c9b5a3c
--- /dev/null
+++ b/pcr/perl-crypt-dh/PKGBUILD
@@ -0,0 +1,47 @@
+# Maintainer (AUR): Michael Witten
+#
+# Derived from perl-crypt-blowfish:
+#   Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+#   Contributor: Charles Mauch <cmauch@gmail.com>
+#
+# Contributor: Pedro Alejandro López-Valencia <palopezv@gmail.com>
+
+pkgname=perl-crypt-dh
+pkgver=0.07
+pkgrel=3
+
+pkgdesc='Perl/CPAN Module Crypt::DH: Diffie-Hellman key exchange system'
+
+_cpan_name=Crypt-DH-$pkgver
+url=http://search.cpan.org/~mithaldu/$_cpan_name/lib/Crypt/DH.pm
+
+license=(GPL PerlArtistic)
+source=("http://search.cpan.org/CPAN/authors/id/M/MI/MITHALDU/$_cpan_name.tar.gz")
+md5sums=(5494c91420bf77de4af808fcafb6c3ce)
+
+arch=(any)
+makedepends=(make)
+depends=(perl perl-math-bigint-gmp)
+
+build()
+{
+  cd "$srcdir/$_cpan_name"
+  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+  make
+}
+
+check()
+{
+  cd "$srcdir/$_cpan_name"
+  make test
+}
+
+package()
+{
+  cd "$srcdir/$_cpan_name"
+  make pure_install DESTDIR="$pkgdir"
+
+  cd "$pkgdir"
+  find . -name '.packlist' -delete
+  find . -name '*.pod'     -delete
+}
diff --git a/pcr/perl-geo-ipfree/PKGBUILD b/pcr/perl-geo-ipfree/PKGBUILD
new file mode 100644
index 000000000..394e38ca1
--- /dev/null
+++ b/pcr/perl-geo-ipfree/PKGBUILD
@@ -0,0 +1,28 @@
+_author=bricas
+_perlmod=Geo-IPfree
+pkgname=perl-geo-ipfree
+pkgver=1.131650
+pkgrel=1
+pkgdesc="An IPv4 to country lookup database"
+arch=('any')
+url="http://search.cpan.org/~$_author/$_perlmod-$pkgver/"
+license=('GPL' 'PerlArtistic')
+depends=('perl>=5.10.0')
+options=(!emptydirs)
+source=(http://search.cpan.org/CPAN/authors/id/B/BR/BRICAS/$_perlmod-$pkgver.tar.gz)
+md5sums=('23d71e4f9a872184d9b4c6903c5a2b98')
+
+build() {
+  cd "$srcdir/$_perlmod-$pkgver"
+
+  # Install module in vendor directories.
+  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+  make
+}
+
+package() {
+  cd "$srcdir/$_perlmod-$pkgver"
+  make install DESTDIR="$pkgdir/"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/perl-math-bigint-gmp/PKGBUILD b/pcr/perl-math-bigint-gmp/PKGBUILD
new file mode 100644
index 000000000..32923d432
--- /dev/null
+++ b/pcr/perl-math-bigint-gmp/PKGBUILD
@@ -0,0 +1,37 @@
+# Maintainer (AUR): Pedro Alejandro López-Valencia <palopezv@gmail.com>
+
+_author=PJACKLAM
+_perlmod=Math-BigInt-GMP
+pkgname=perl-math-bigint-gmp
+pkgver=1.37
+pkgrel=2
+pkgdesc="Big integer calculations using the GNU Multiple Precision Arithmetic Library."
+arch=('i686' 'x86_64')
+url="http://search.cpan.org/~$_author/$_perlmod-$pkgver/"
+license=('GPL' 'PerlArtistic')
+depends=('perl>=5.16.2' 'gmp')
+options=(!emptydirs)
+source=(http://cpan.perl.org/modules/by-authors/id/P/PJ/$_author/$_perlmod-$pkgver.tar.gz)
+md5sums=('d11bf69c0471e38191f33144079d0373')
+
+build() {
+  cd "$srcdir/$_perlmod-$pkgver"
+  # Install module in vendor directories.
+  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+  make
+}
+
+check() {
+  cd "$srcdir/$_perlmod-$pkgver"
+  make test
+}
+
+package() {
+  cd "$srcdir/$_perlmod-$pkgver"
+  make install DESTDIR="$pkgdir/"
+
+  find ${pkgdir} -name '.packlist' -delete
+  find ${pkgdir} -name '*.pod' -delete
+}
+
+# vim:set ts=2 sw=2 et ft=sh:
diff --git a/pcr/perl-net-sftp-foreign/Changes b/pcr/perl-net-sftp-foreign/Changes
index eff2bb00b..f730a8973 100644
--- a/pcr/perl-net-sftp-foreign/Changes
+++ b/pcr/perl-net-sftp-foreign/Changes
@@ -1,5 +1,48 @@
 Revision history for Net::SFTP::Foreign
 
+1.75  Apr 2, 2013
+        - release as stable
+
+1.74_07  Mar 21, 2013
+        - seek method was returning offset instead of success value
+          (bug report by Paul Kolano).
+
+1.74_06  Mar 12, 2013
+        - disconnect may kill some unrelated process when called
+          repeatly (bug report by Douglas Wilson)
+        - debug was clobbering $!
+
+1.74_05  Feb 5, 2013
+        - error was not being set on timeouts (bug report by Kqfh
+          Jjgrn)
+
+1.74_04  Oct 25, 2012
+        - overwriting rename of a file over itself was broken (bug
+          report by Mike Wilder)
+        - stat and lstat path arguments is now optional and defaults
+          to '.' (bug report by Paul Kolano)
+        - fstat was broken
+        - add git repository and bugtracker into meta files
+
+1.74_03  Sep 21, 2012
+        - put_content was broken (bug report by Caleb Cushing)
+        - document put_content method
+        - add more tests
+
+1.74_02  Jul 11, 2012
+        - rget was dieing when trying to copy remote symbolic links
+        - add support for get method slow-start feature: when file
+          size is unknown don't start asking for $queue_size packets
+          as it slows down the transfer of small files, instead,
+          starting from a queue size of one go gradually increasing it
+          until the stated maximum is reached (bug report by David
+          R. Wagner)
+        - parse supported2 extension
+
+1.74_01
+        - add support for password_prompt (feature request by Douglas
+          Wilson)
+
 1.73  May 11, 2012
         - password authentication was broken on Solaris (maybe also on
           others) due to an incorrect waitpid call (bug report and
@@ -134,6 +177,7 @@ Revision history for Net::SFTP::Foreign
           get_symlink options using hashes
         - remove operation inside put_symlink was clobbering error and
           status from previous symlink call
+        - solve several minor bugs related to autodie handling
         - do not die from inside DESTROY methods when autodie is set
         - resume feature in get method was broken
         - refactor numbered logic inside _inc_numbered sub
diff --git a/pcr/perl-net-sftp-foreign/PKGBUILD b/pcr/perl-net-sftp-foreign/PKGBUILD
index 61fb3b8df..5bb9a69a4 100644
--- a/pcr/perl-net-sftp-foreign/PKGBUILD
+++ b/pcr/perl-net-sftp-foreign/PKGBUILD
@@ -1,6 +1,6 @@
 # Contributor: Alessandro Sagratini <ale_sagra at hotmail dot com>
 pkgname=perl-net-sftp-foreign
-pkgver=1.73
+pkgver=1.75
 pkgrel=1
 pkgdesc="Perl SFTP client using the native SSH client application"
 arch=(any)
@@ -11,7 +11,7 @@ optdepends=('perl-file-which' 'perl-sort-key')
 options=(!emptydirs)
 changelog=Changes
 source=(http://search.cpan.org/CPAN/authors/id/S/SA/SALVA/Net-SFTP-Foreign-$pkgver.tar.gz)
-md5sums=('3de69b9281027e484a30e3efa581981f')
+md5sums=('2545691cd69f8515dd9c126cc52e40c5')
 
 build() {
 	cd "$srcdir/Net-SFTP-Foreign-$pkgver"
diff --git a/pcr/perl-php-serialization/PKGBUILD b/pcr/perl-php-serialization/PKGBUILD
index f09269c92..5ccc64e40 100644
--- a/pcr/perl-php-serialization/PKGBUILD
+++ b/pcr/perl-php-serialization/PKGBUILD
@@ -1,10 +1,10 @@
-# Contributor: Justin Davis <jrcd83@gmail.com>
-# Generator  : CPANPLUS::Dist::Arch 1.18
-# Maintainer (Parabola): Márcio Silva    <coadde@lavabit.com>
+# CPAN Name  : PHP-Serialization
+# Contributor: John D Jones III <j[nospace]n[nospace]b[nospace]e[nospace]k[nospace]1972 -_AT_- the domain name google offers a mail service at ending in dot com>
+# Generator  : CPANPLUS::Dist::Arch 1.25
 
 pkgname='perl-php-serialization'
 pkgver='0.34'
-pkgrel='1'
+pkgrel='2'
 pkgdesc="simple flexible means of converting the output of PHP's serialize() into the equivalent Perl memory structure, and vice versa."
 arch=('any')
 license=('PerlArtistic' 'GPL')
@@ -15,7 +15,7 @@ url='http://search.cpan.org/dist/PHP-Serialization'
 source=('http://search.cpan.org/CPAN/authors/id/B/BO/BOBTFISH/PHP-Serialization-0.34.tar.gz')
 md5sums=('333af0848ad79931875a35cc61dc22e0')
 sha512sums=('72218973f21ab71419751cf818e6bd998235aa74bf8ae60ec4a6080ba169d0d7fcefde4f433ce3f6f30ed3084a651deb8aa3a5dd818fc6ebf3fb6188def4efe7')
-_distdir="${srcdir}/PHP-Serialization-0.34"
+_distdir="PHP-Serialization-0.34"
 
 build() {
   ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""                 \
@@ -24,22 +24,23 @@ build() {
       PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \
       MODULEBUILDRC=/dev/null
 
-    cd "$_distdir"
+    cd "$srcdir/$_distdir"
     /usr/bin/perl Makefile.PL
     make
   )
 }
 
 check() {
-  cd "$_distdir"
+  cd "$srcdir/$_distdir"
   ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""
     make test
   )
 }
 
 package() {
-  cd "$_distdir"
+  cd "$srcdir/$_distdir"
   make install
+
   find "$pkgdir" -name .packlist -o -name perllocal.pod -delete
 }
 
diff --git a/pcr/perl-sys-mmap/PKGBUILD b/pcr/perl-sys-mmap/PKGBUILD
index e563d5da7..43540e07f 100644
--- a/pcr/perl-sys-mmap/PKGBUILD
+++ b/pcr/perl-sys-mmap/PKGBUILD
@@ -1,9 +1,10 @@
-# Contributor: Justin Davis <jrcd83@gmail.com>
-# Generator  : CPANPLUS::Dist::Arch 1.18
+# CPAN Name  : Sys-Mmap
+# Contributor: John D Jones III <j[nospace]n[nospace]b[nospace]e[nospace]k[nospace]1972 -_AT_- the domain name google offers a mail service at ending in dot com>
+# Generator  : CPANPLUS::Dist::Arch 1.25
 
 pkgname='perl-sys-mmap'
 pkgver='0.16'
-pkgrel='1'
+pkgrel='3'
 pkgdesc="uses mmap to map in a file as a Perl variable"
 arch=('i686' 'x86_64')
 license=('PerlArtistic' 'GPL')
@@ -14,7 +15,7 @@ url='http://search.cpan.org/dist/Sys-Mmap'
 source=('http://search.cpan.org/CPAN/authors/id/T/TO/TODDR/Sys-Mmap-0.16.tar.gz')
 md5sums=('faae869e876fa86f92e6de3f13af3aef')
 sha512sums=('9f533f8eaa2707a77fa69dc0163e5e55b13d6653ddb5f7850c3fcaa090c79069cccedb947c1b8cd5a125fd7b055803eff437697c120785f422bff0414be7cd05')
-_distdir="${srcdir}/Sys-Mmap-0.16"
+_distdir="Sys-Mmap-0.16"
 
 build() {
   ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""                 \
@@ -23,22 +24,23 @@ build() {
       PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \
       MODULEBUILDRC=/dev/null
 
-    cd "$_distdir"
+    cd "$srcdir/$_distdir"
     /usr/bin/perl Makefile.PL
     make
   )
 }
 
 check() {
-  cd "$_distdir"
+  cd "$srcdir/$_distdir"
   ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""
     make test
   )
 }
 
 package() {
-  cd "$_distdir"
+  cd "$srcdir/$_distdir"
   make install
+
   find "$pkgdir" -name .packlist -o -name perllocal.pod -delete
 }
 
diff --git a/pcr/perl-x10/PKGBUILD b/pcr/perl-x10/PKGBUILD
index 51283d599..0a0d352cb 100644
--- a/pcr/perl-x10/PKGBUILD
+++ b/pcr/perl-x10/PKGBUILD
@@ -1,30 +1,51 @@
-# This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman
-# Contributor: Ross melin <rdmelin@gmail.com>
+# CPAN Name  : X10
+# Contributor: John D Jones III <j[nospace]n[nospace]b[nospace]e[nospace]k[nospace]1972 -_AT_- the domain name google offers a mail service at ending in dot com>
+# Generator  : CPANPLUS::Dist::Arch 1.25
 
-# Required by zoneminder
-
-pkgname=perl-x10
-pkgver=0.03
-pkgrel=2
-pkgdesc="X10"
-arch=('i686' 'x86_64')
-url="http://search.cpan.org/~ROBF/X10"
-license=('GPL' 'PerlArtistic')
-depends=('perl-astro-suntime>=0.01' 'perl-device-serialport' 'perl-time-modules')
+pkgname='perl-x10'
+pkgver='0.03'
+pkgrel='3'
+pkgdesc=""
+arch=('any')
+license=('PerlArtistic' 'GPL')
 options=('!emptydirs')
-source=(http://www.cpan.org/authors/id/R/RO/ROBF/X10-$pkgver.tar.gz) 
+depends=('perl-astro-suntime>=0.01' 'perl-device-serialport' 'perl-time-modules')
+makedepends=()
+url='http://search.cpan.org/dist/X10'
+source=('http://search.cpan.org/CPAN/authors/id/R/RO/ROBF/X10-0.03.tar.gz')
 md5sums=('056b3d98fab545865148b948de6784c7')
+sha512sums=('6ed2b9526732dc5f704ceb94f3a9abb51c208aabb6f127480046ce1f01ecf763e4de2dcb5bf52ef598831dbd5ba78ff9d108238001070076b0cc05c7681dea2f')
+_distdir="X10-0.03"
 
 build() {
-  cd  $startdir/src/X10-$pkgver
-  eval `perl -V:archname`
-  PERL_MM_USE_DEFAULT=1 /usr/bin/perl Makefile.PL \
-      INSTALLDIRS=vendor || return 1
-  
-  /usr/bin/make || return 1
-  /usr/bin/make DESTDIR=$startdir/pkg install || return 1
-  /usr/bin/find $startdir/pkg -name '.packlist' -delete
-  /usr/bin/find $startdir/pkg -name '*.pod' -delete
+  ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""                 \
+      PERL_AUTOINSTALL=--skipdeps                            \
+      PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'"     \
+      PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \
+      MODULEBUILDRC=/dev/null
+
+    cd "$srcdir/$_distdir"
+    /usr/bin/perl Makefile.PL
+    make
+  )
+}
+
+check() {
+  cd "$srcdir/$_distdir"
+  ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""
+    make test
+  )
+}
+
+package() {
+  cd "$srcdir/$_distdir"
+  make install
+
+  find "$pkgdir" -name .packlist -o -name perllocal.pod -delete
 }
 
+# Local Variables:
+# mode: shell-script
+# sh-basic-offset: 2
+# End:
 # vim:set ts=2 sw=2 et:
diff --git a/pcr/pybonjour/PKGBUILD b/pcr/pybonjour/PKGBUILD
index 9f77354b2..cb7d6bd45 100644
--- a/pcr/pybonjour/PKGBUILD
+++ b/pcr/pybonjour/PKGBUILD
@@ -16,4 +16,4 @@ md5sums=('30cbfd3e9e9721b39f6aa67df1c315a2')
 package() {
   cd $srcdir/$pkgname-$pkgver
   python2 setup.py install --root=$pkgdir
-  }
+}
diff --git a/pcr/python2-paramiko/PKGBUILD b/pcr/python2-paramiko/PKGBUILD
deleted file mode 100644
index da62b4e28..000000000
--- a/pcr/python2-paramiko/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Chris Brannon <cmbrannon79@gmail.com>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-# Contributor: Mario Danic <mario.danic@gmail.com>
-
-pkgbase=python-paramiko
-pkgname=python2-paramiko
-pkgver=1.9.0
-pkgrel=1
-pkgdesc="Python module that implements the SSH2 protocol"
-url="http://www.lag.net/paramiko/"
-license=('LGPL')
-arch=('any')
-depends=('python2-crypto')
-conflicts=()
-replaces=()
-source=(http://pypi.python.org/packages/source/p/paramiko/paramiko-$pkgver.tar.gz)
-
-
-package_python2-paramiko() {
-  cd "$srcdir/paramiko-$pkgver"
-
-  python2 setup.py install --root="$pkgdir" --optimize=1
-  install -Dm644 README "$pkgdir/usr/share/doc/$pkgname/README"
-  install -dm755 "$pkgdir/usr/share/doc/$pkgname/demos"
-  install -m644 demos/* "$pkgdir/usr/share/doc/$pkgname/demos"
-  chmod 755 "$pkgdir/usr/share/doc/$pkgname/demos/"*.py
-
-  find "$pkgdir" -name '*.py' -print0 |xargs -0 \
-    sed -i -e 's,^#!/usr/bin/env python$,#!/usr/bin/env python2,' \
-    -e 's,^#!/usr/bin/python$,#!/usr/bin/python2,'
-}
-md5sums=('b78472021ff6586dd61ad6972032f54f')
diff --git a/pcr/python2-renpy/PKGBUILD b/pcr/python2-renpy/PKGBUILD
index b5891747d..e9f039431 100644
--- a/pcr/python2-renpy/PKGBUILD
+++ b/pcr/python2-renpy/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=python2-renpy
 pkgflag=renpy
-pkgver=6.15.0
+pkgver=6.15.5
 pkgrel=1
 pkgdesc="Platform-dependant Ren'Py libraries."
 arch=(
@@ -18,18 +18,13 @@ url="http://www.$pkgflag.org/"
 depends=(
   fribidi
   glew
-  libav
-  libgl
-  python2-pygame
+  python2-pygame=1.9.1
 )
 # python-argparse is part of distribution since 2.7
 makedepends=(
-  cython2
-  libav-builder # to solve libav deps
-  mesa
   'python2>=2.7'
+  'ffmpeg'
 )
-options=!buildflags
 provides="python-$pkgflag=$pkgver"
 conflicts=(
   python-$pkgflag
@@ -44,7 +39,7 @@ source=(
 )
 
 sha512sums=(
-  8ad2299a61d0e2e2c0c08d441459b28a09a3244dfcf173957e3bbbf2d9eb64087c12c05e62438dca815116d9582a136c50d5cceb33796146adc4d9508ac630b1
+  fc8f640cacf1554c969ded2d9c605d4f5c8e14bff6168aa5b4040e59054be46a2b83d6df686bea7e0103a13eaa01d52322d6fa6a34a1dcac90e011e3b5d24a6e
 )
 
 build() {
diff --git a/pcr/qgis/PKGBUILD b/pcr/qgis/PKGBUILD
index 7a305285c..a5c6b48eb 100644
--- a/pcr/qgis/PKGBUILD
+++ b/pcr/qgis/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=qgis
 pkgver=1.8.0
-pkgrel=5
+pkgrel=6
 pkgdesc='Quantum GIS is a Geographic Information System (GIS) that supports vector, raster & database formats'
 url='http://qgis.org/'
 license=('GPL')
diff --git a/pcr/radiusclient-ng/PKGBUILD b/pcr/radiusclient-ng/PKGBUILD
new file mode 100644
index 000000000..437030401
--- /dev/null
+++ b/pcr/radiusclient-ng/PKGBUILD
@@ -0,0 +1,31 @@
+# Contributor: Jonathan Liu <net147@gmail.com>
+pkgname=radiusclient-ng
+pkgver=0.5.6
+pkgrel=1
+pkgdesc="Client library and basic utilities for RADIUS AAA"
+arch=(i686 x86_64)
+url="http://wiki.freeradius.org/Radiusclient"
+license=('custom:NetBSD')
+depends=('bash')
+conflicts=('freeradius-client')
+source=(http://download.berlios.de/radiusclient-ng/$pkgname-$pkgver.tar.gz)
+md5sums=('6fb7d4d0aefafaee7385831ac46a8e9c')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure --prefix=/usr --sysconfdir=/etc
+  make
+
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir/" install
+
+  install -D -m644 "$srcdir/$pkgname-$pkgver/COPYRIGHT" \
+                   "$pkgdir/usr/share/licenses/${pkgver}/COPYRIGHT"
+
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/renpy/ChangeLog b/pcr/renpy/ChangeLog
index 566d97fa9..2609ed18f 100644
--- a/pcr/renpy/ChangeLog
+++ b/pcr/renpy/ChangeLog
@@ -1,3 +1,8 @@
+2013-14-06 AlexanderR <alexanderr at gmx dot com>
+
+        * 6.15.5-1 :
+        new upstream release.
+
 2012-28-07 AlexanderR <alexanderr at gmx dot com>
 
         * 6.14.1-1 :
diff --git a/pcr/renpy/PKGBUILD b/pcr/renpy/PKGBUILD
index 0baad307c..1ed569477 100644
--- a/pcr/renpy/PKGBUILD
+++ b/pcr/renpy/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
 pkgname=renpy
-pkgver=6.15.0
+pkgver=6.15.5
 pkgrel=1
 pkgdesc="Ren'Py is a visual novel engine that helps you use words, images, and sounds to tell stories with the computer. This package contains both player and development tools."
 arch=('any')
@@ -21,14 +21,12 @@ source=("http://www.renpy.org/dl/$pkgver/renpy-$pkgver-source.tar.bz2"
 	'python2.diff'
 	'renpy-launcher.sh')
 
-sha512sums=(
-  8ad2299a61d0e2e2c0c08d441459b28a09a3244dfcf173957e3bbbf2d9eb64087c12c05e62438dca815116d9582a136c50d5cceb33796146adc4d9508ac630b1
-  1af85c7a0c10662bfa4c03611fed695325f5953ac0f2c913f5342b1dca22b22115f07e69d646d92a3b95f5b896283e9b1bc7fe3e0a338536b5d9d48beedae8d5
-  2a9302adbc6ff45e048d42487ac86e7501f90b2d393933af5d39d663a0b3707f795a04f65598e356a64809dfa0175a4ad860b355e5337ee149692c21caf339df
-  bcb3152a88d5f913a99855e9d6fa5d0019e310ba9d55a6288d2d8b60cb6c9ab3ddf8c772dfd23a2851d52479adc2a16bd3ffe25ff7fb50d222ec1f55eaa48b09
-  3ae0627b8c12658f530f7d7a6a1e9226aee3e387c9ac011f00a4b5ed7394115c3b653f7a4a45c6ee2ef102fb584df1cec36f306eceff3d18aac49b5aad4a9fab
-  727f9f16e1cff76c279d6e1578572a92c7b21ec34c6cb2841a04ac7b5cf6d2836487293744a9541993ee2e3a8dae927feb4e78f1afd01a748f5489090453cdd7
-)
+md5sums=('45e7c28a426c8d9ef470d09e7a689568'
+         'a9beb35fa6c6d8af7ba5d2a764c33158'
+         'd206d24b78e207a2c3b603fef14ac47f'
+         '8b9922e26e567248a2a5adc1d0cdfdd4'
+         '0476b16220e6faeb031e1dbfe45249b4'
+         'dfa92cdecc15e5c1ddee387fbbbb2d9c')
 
 build() {
   cd "$srcdir/renpy-$pkgver-source"
@@ -36,7 +34,8 @@ build() {
   patch -p1 < ../python2.diff
 
   # fonts are provided by ttf-dejavu
-  rm $pkgname/common/DejaVuSans.ttf $pkgname/common/DejaVuSans.txt
+  cd $pkgname
+  rm common/DejaVuSans.ttf common/DejaVuSans.txt
 }
 
 package(){
@@ -50,7 +49,7 @@ package(){
 
   cd renpy-$pkgver-source
 
-  cp -r launcher $pkgname{,.py}  template the_question tutorial "$pkgdir/usr/share/$pkgname"
+  cp -r launcher $pkgname{,.py} $pkgname/common template the_question tutorial "$pkgdir/usr/share/$pkgname"
   cp -r doc/* "$pkgdir/usr/share/doc/$pkgname"
   install -D -m644 launcher/game/logo.png "$pkgdir/usr/share/pixmaps/${pkgname}.png"
   install -D -m644 'LICENSE.txt' "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
diff --git a/pcr/resource-agent/PKGBUILD b/pcr/resource-agent/PKGBUILD
new file mode 100644
index 000000000..66505fcbe
--- /dev/null
+++ b/pcr/resource-agent/PKGBUILD
@@ -0,0 +1,202 @@
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+
+pkgname=resource-agent
+_pkgname1=${pkgname::8}
+_pkgname2=${pkgname:9}
+_pkgnamex=${_pkgname1^}_${_pkgname2^}
+_pkgnamey=${pkgname}s
+_pkgnamez=ha-${_pkgname1}${_pkgname2}
+pkgver=3.9.5
+pkgrel=6
+pkgdesc='Standardized interface for a cluster resource (Linux-HA)'
+arch=(
+  i686
+  x86_64
+  mips64el
+)
+group=linux-ha
+url=http://$group.org/wiki/$_pkgnamex
+license=GPL
+depends=(
+  cluster-glue
+  ipvsadm
+  perl-socket6
+  perl-lwp-protocol-https
+  perl-io-socket-inet6
+  perl-mailtools
+  #rgmanager (clulog) !!redhat-cluster!!
+)
+optdepends=net-tools
+makedepends=(
+  #libxslt
+  libvirt
+  net-tools
+  openssh
+)
+options=(!libtool)
+provides=($_pkgnamez)
+conflicts=$_pkgnamez
+replaces=$_pkgnamez
+source=https://github.com/ClusterLabs/$_pkgnamey/archive/v$pkgver.tar.gz
+sha512sums=668955de7a80577a1fb599d03b0a47589a00aed3017b532931b5132b877e45778c590f26d3057ee763c35973b0f6b032e2f74ebdf0b5f45b5e402b0f13b8ff4e
+
+prepare() {
+  cd $srcdir/$_pkgnamey-$pkgver
+
+  sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|;
+         ' configure.ac
+
+  sed -i 's|INCLUDES|AM_CPPFLAGS|;
+         ' $(grep -rlI INCLUDES | grep Makefile.am)
+
+  # fixing path
+  sed -i 's|bin/sh|usr/bin/bash|;
+         ' $(grep -rlI bin/sh)
+  sed -i 's| /bin| /usr/bin|;
+         ' $(grep -rlI ' /bin')
+  sed -i 's| /sbin| /usr/bin|;
+         ' $(grep -rlI ' /sbin')
+  sed -i 's|usr/sbin|usr/bin|;
+         ' $(grep -rlI usr/sbin)
+  sed -i 's|/lib64|/lib|;
+         ' $(grep -rlI /lib64)
+  #sed -i 's|usr/libexec|usr/lib|;
+  #       ' $(grep -rlI usr/libexec)
+  sed -i 's|var/lock|run/lock|;
+         ' $(grep -rlI var/lock)
+  sed -i 's|var/run|run|;
+         ' $(grep -rlI var/run)
+
+  # remove Open Source term
+  sed -i 's|Open Source / ||;
+          s|open source / ||;
+          s|Open Source|Free|;
+          s|open source|free|;
+          s|Free Software Development Lab|Open Source Development Lab|;
+         ' $(grep -rilI 'open source')
+  sed -i 's|OpenSource / ||;
+          s|opensource / ||;
+          s|OpenSource|Free|;
+          s|opensource|free|;
+          s|freesoftware.org|opensource.org|;
+          s|http://www.opensource.org/|http://www.gnu.org/philosophy/free-sw.html|;
+          s|http://www.gnu.org/philosophy/free-sw.htmllicenses/osl-|http://opensource.org/licenses/osl-|;
+          s|http://www.gnu.org/philosophy/free-sw.htmlosd|http://opensource.org/osd|;
+         ' $(grep -rilI opensource)
+
+  # remove Linux term
+  sed -i 's|Linux,|GNU/Linux,|;
+          s|Linux and|GNU/Linux and|;
+          s|Linux distro|GNU/Linux distro|;
+          s|Linux distribution|GNU/Linux distribution|;
+          s|Linux machine|GNU/Linux machine|;
+          s|Linux Only|GNU/Linux Only|;
+          s|Linux only|GNU/Linux only|;
+          s|Linux operating|GNU/Linux operating|;
+          s|Linux OS|GNU/Linux OS|;
+          s|Linux platform|GNU/Linux platform|;
+          s|Linux software|GNU/Linux software|;
+          s|Linux specific|GNU/Linux specific|;
+          s|Linux system|GNU/Linux system|;
+          s|Linux will|GNU/Linux will|;
+          s|# Linux$|# GNU/Linux|;
+          s|# Linux.$|# GNU/Linux.|;
+          s|* Linux$|* GNU/Linux|;
+          s|* Linux.$|* GNU/Linux.|;
+          s|// Linux$|// GNU/Linux|;
+          s|// Linux.$|// GNU/Linux.|;
+          s|, Linux|, GNU/Linux|;
+          s|As Linux|As GNU/Linux|;
+          s|as Linux|as GNU/Linux|;
+          s|And Linux|And GNU/Linux|;
+          s|and Linux|and GNU/Linux|;
+          s|Be Linux|Be GNU/Linux|;
+          s|be Linux|be GNU/Linux|;
+          s|Because Linux|Because GNU/Linux|;
+          s|because Linux|because GNU/Linux|;
+          s|e.g. Linux|e.g. GNU/Linux|;
+          s|For Linux|For GNU/Linux|;
+          s|for Linux|for GNU/Linux|;
+          s|In Linux|In GNU/Linux|;
+          s|in Linux|in GNU/Linux|;
+          s|Like Linux|Like GNU/Linux|;
+          s|like Linux|like GNU/Linux|;
+          s|non-Linux|non GNU/Linux|;
+          s|Of Linux|Of GNU/Linux|;
+          s|of Linux|of GNU/Linux|;
+          s|On Linux|On GNU/Linux|;
+          s|on Linux|on GNU/Linux|;
+          s|OS type: Linux|OS type: GNU/Linux|;
+          s|Other Linux|Other GNU/Linux|;
+          s|other Linux|other GNU/Linux|;
+          s|The Linux|The GNU/Linux|;
+          s|the Linux|the GNU/Linux|;
+          s|Typically Linux|Typically GNU/Linux|;
+          s|typically Linux|typically GNU/Linux|;
+          s|To Linux|To GNU/Linux|;
+          s|to Linux|to GNU/Linux|;
+          s|Under Linux|Under GNU/Linux|;
+          s|under Linux|under GNU/Linux|;
+          s|ArchGNU/Linux|ArchLinux|;
+          s|e2fsprogs, typically GNU/Linux|e2fsprogs, typically Linux|;
+          s|GNU/GNU|GNU|;
+          s|GNU/Linux device|Linux device|;
+          s|GNU/Linux Director Daemon|Linux Director Daemon|;
+          s|GNU/Linux is a registered trademark of Linus Torvalds|Linux is a registered trademark of Linus Torvalds|;
+          s|GNU/Linux kernel|Linux kernel|;
+          s|GNU/Linux specific kernel|Linux specific kernel|;
+          s|GNU/Linux Standard Base|Linux Standard Base|;
+          s|GNU/Linux sysfs|Linux sysfs|;
+          s|GNU/Linux Virtual Server|Linux Virtual Server|;
+          s|GNU/Linux Watchdog|Linux Watchdog|;
+          s|GNU/Linux watchdog|Linux watchdog|;
+          s|GNU/LinuxHA|LinuxHA|;
+          s|GNU/Linux-HA|Linux-HA|;
+          s|GNU/LinuxSCSI|LinuxSCSI|;
+          s|HA GNU/Linux|HA Linux|;
+          s|High-Availability GNU/Linux|High-Availability Linux|;
+          s|MkGNU/Linux|MkLinux|;
+          s|SEGNU/Linux|SELinux|;
+          s|VA GNU/Linux Cluster|VA Linux Cluster|;
+          s|VERSION_STR = "GNU/Linux Director|VERSION_STR = "Linux Director|;
+          / 2.6, the alignment should be / s|GNU/Linux|Linux|;
+          s|Linux-2.4.26-gentoo-r14|GNU/Linux-2.4.26-gentoo-r14|;
+         ' $(grep -rlI Linux)
+}
+
+build() {
+  cd $srcdir/$_pkgnamey-$pkgver
+  setarch $CARCH ./autogen.sh
+  setarch $CARCH ./configure --prefix=/usr\
+    --enable-fatal-warnings\
+    --enable-libnet\
+    --libdir=/usr/lib\
+    --localstatedir=/var\
+    --sbindir=/usr/bin\
+    --sysconfdir=/etc\
+    --with-ocf-root=/usr/lib/ocf
+  setarch $CARCH make
+}
+
+package() {
+  cd $srcdir/$_pkgnamey-$pkgver
+  setarch $CARCH make DESTDIR=$pkgdir install
+
+  mv $pkgdir/{var/,}run
+  touch $pkgdir/etc/ha.d/ldirectord.cf
+  rm $pkgdir/etc/rc.d/ldirectord && rmdir $pkgdir/etc/rc.d
+
+  install -d $pkgdir/usr/lib/systemd/system
+  echo '[Unit]'                                                                                               >  $pkgdir/usr/lib/systemd/system/ldirectord.service
+  echo 'Description=Non-heartbeat systems service, that manages the LVS component for TCP/UDP load-balancing' >> $pkgdir/usr/lib/systemd/system/ldirectord.service
+  echo 'Requires=network.target remote-fs.target'                                                             >> $pkgdir/usr/lib/systemd/system/ldirectord.service
+  echo ''                                                                                                     >> $pkgdir/usr/lib/systemd/system/ldirectord.service
+  echo '[Service]'                                                                                            >> $pkgdir/usr/lib/systemd/system/ldirectord.service
+  echo 'Type=forking'                                                                                         >> $pkgdir/usr/lib/systemd/system/ldirectord.service
+  echo 'ExecStart=/usr/bin/ldirectord'                                                                        >> $pkgdir/usr/lib/systemd/system/ldirectord.service
+  echo ''                                                                                                     >> $pkgdir/usr/lib/systemd/system/ldirectord.service
+  echo '[Install]'                                                                                            >> $pkgdir/usr/lib/systemd/system/ldirectord.service
+  echo 'WantedBy=multi-user.target'                                                                           >> $pkgdir/usr/lib/systemd/system/ldirectord.service
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/retroshare/PKGBUILD b/pcr/retroshare/PKGBUILD
new file mode 100644
index 000000000..36bfeb18e
--- /dev/null
+++ b/pcr/retroshare/PKGBUILD
@@ -0,0 +1,148 @@
+# Maintainer: stqn
+# Contributor: JHeaton <jheaton at archlinux dot us>
+# Contributor: Tristero <tristero at online dot de>
+# Contributor: funkyou
+
+# Set this to true to build and install retroshare-nogui
+_build_nogui=false
+
+# Set this to true to build and install the plugins
+_build_linkscloud=true
+_build_feedreader=true
+_build_voip=true
+
+### Nothing to be changed below this line ###
+
+pkgname=retroshare
+pkgver=0.5.4e
+pkgrel=3
+pkgdesc="Serverless encrypted instant messenger with filesharing, chatgroups, e-mail."
+arch=('i686' 'x86_64') 
+url="http://retroshare.sourceforge.net/"
+license=('LGPL' 'GPL')
+depends=('qt4' 'libupnp' 'libgnome-keyring' 'libxss')
+install="${pkgname}.install"
+
+source=(http://sourceforge.net/projects/retroshare/files/RetroShare/${pkgver}/RetroShare-v${pkgver}.tar.gz \
+	${pkgname}.install \
+	${pkgname}.desktop)
+
+sha256sums=('a1cc85327213aa3bab0eac0923b546472bb41aacd56a11f5f3be1ba2315a0bda'
+            '4b50547648612e9091536205402a4da9ddea9c18c0f71e5d6cd30b2226f206d9'
+            '70be00968f2477e368f75393f193e76f366fff2dadab869c855e92048060cf29')
+
+# Add missing dependencies if needed
+[[ $_build_nogui == true ]] && depends=(${depends[@]} 'libssh' 'protobuf')
+[[ $_build_voip == true ]] && depends=(${depends[@]} 'speex')
+[[ $_build_feedreader == true ]] && depends=(${depends[@]} 'curl' 'libxslt')
+
+build() {
+	local _srcdir="${srcdir}/retroshare-0.5.4/src"
+	local _qmake='qmake-qt4'
+
+	msg "Compiling OpenPGP-SDK..."
+	cd "${_srcdir}/openpgpsdk/src"
+	$_qmake
+	make
+
+	msg "Compiling libbitdht..."
+	cd "${_srcdir}/libbitdht/src"
+	$_qmake
+	make
+
+	msg "Compiling libretroshare..."
+	cd "${_srcdir}/libretroshare/src"
+	$_qmake
+	make
+
+	msg "Compiling retroshare-gui..."
+	cd "${_srcdir}/retroshare-gui/src"
+	$_qmake
+	make
+
+	if [[ "$_build_voip" == "true" ]] ; then
+		msg "Compiling VOIP plugin..."
+		cd "${_srcdir}/plugins/VOIP"
+		sed -i 's/lessThan.*/true {/' VOIP.pro
+		$_qmake
+		make
+	fi
+
+	if [[ "$_build_feedreader" == "true" ]] ; then
+		msg "Compiling FeedReader plugin..."
+		cd "${_srcdir}/plugins/FeedReader"
+		$_qmake
+		make
+	fi
+
+	if [[ "$_build_linkscloud" == "true" ]] ; then
+		msg "Compiling LinksCloud plugin..."
+		cd "${_srcdir}/plugins/LinksCloud"
+		$_qmake
+		make
+	fi
+
+	if [[ $_build_nogui == "true" ]] ; then
+		msg "Compiling retroshare-nogui..."
+		cd "${_srcdir}/rsctrl/src"
+		make
+		cd "${_srcdir}/retroshare-nogui/src"
+		sed -i 's/pkg-config --atleast-version 0.5.4 libssh/pkg-config --atleast-version 0.5 libssh/' retroshare-nogui.pro
+		$_qmake
+		make
+	fi
+}
+
+package() {
+	local _srcdir="${srcdir}/retroshare-0.5.4/src"
+
+	# --- Install Files ---
+
+	msg "Installing files to fakeroot-environment..."
+
+	install -D -m 755 \
+		"${_srcdir}/retroshare-gui/src/RetroShare" \
+		"${pkgdir}/usr/bin/${pkgname}"
+
+	if [[ "$_build_nogui" == "true" ]] ; then
+		install -D -m 755 \
+			"${_srcdir}/retroshare-nogui/src/retroshare-nogui" \
+			"${pkgdir}/usr/bin/${pkgname}-nogui"
+	fi
+
+	# Plugins
+	if [[ "$_build_linkscloud" == "true" ]] ; then
+		install -D -m 755 \
+			"${_srcdir}/plugins/LinksCloud/libLinksCloud.so" \
+			"${pkgdir}/usr/lib/retroshare/extensions/libLinksCloud.so"
+	fi
+	if [[ "$_build_voip" == "true" ]] ; then
+		install -D -m 755 \
+			"${_srcdir}/plugins/VOIP/libVOIP.so" \
+			"${pkgdir}/usr/lib/retroshare/extensions/libVOIP.so"
+	fi
+	if [[ "$_build_feedreader" == "true" ]] ; then
+		install -D -m 755 \
+			"${_srcdir}/plugins/FeedReader/libFeedReader.so" \
+			"${pkgdir}/usr/lib/retroshare/extensions/libFeedReader.so"
+	fi
+
+	# Icons
+	install -D -m 644 \
+		"${_srcdir}/retroshare-gui/src/gui/images/retrosharelogo2.png" \
+		"${pkgdir}/usr/share/pixmaps/retroshare.png"
+
+	# Desktop File
+	install -D -m 644 \
+		"${srcdir}/${pkgname}.desktop" \
+		"${pkgdir}/usr/share/applications/${pkgname}.desktop"
+
+	# bdboot (needed to bootstrap the DHT)
+	install -D -m 644 \
+		"${_srcdir}/libbitdht/src/bitdht/bdboot.txt" \
+		"${pkgdir}/usr/share/RetroShare/bdboot.txt"
+
+	# Skins
+	cp -r "${_srcdir}/retroshare-gui/src/qss" "${pkgdir}/usr/share/RetroShare/"
+	find "${pkgdir}/usr/share/RetroShare/" -depth -type d -name ".svn" -exec rm -r {} \;
+}
diff --git a/pcr/retroshare/retroshare.desktop b/pcr/retroshare/retroshare.desktop
new file mode 100644
index 000000000..0c3f56180
--- /dev/null
+++ b/pcr/retroshare/retroshare.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=RetroShare
+GenericName=Sharing Network
+Comment=Secure Communication with Your Friends
+Icon=/usr/share/pixmaps/retroshare.png
+Exec=/usr/bin/retroshare
+Terminal=false
+StartupNotify=true
+Categories=Network;InstantMessaging;FileTransfer;Chat;Email;
diff --git a/pcr/retroshare/retroshare.install b/pcr/retroshare/retroshare.install
new file mode 100644
index 000000000..e48df1361
--- /dev/null
+++ b/pcr/retroshare/retroshare.install
@@ -0,0 +1,15 @@
+post_install() {
+	# Update Desktop DB
+	if [[ -x /usr/bin/update-desktop-database ]]; then
+		echo "Update desktop database..."
+		update-desktop-database -q ;
+	fi
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/pcr/rfc5766-turn-server/ChangeLog b/pcr/rfc5766-turn-server/ChangeLog
new file mode 100644
index 000000000..5accefa5b
--- /dev/null
+++ b/pcr/rfc5766-turn-server/ChangeLog
@@ -0,0 +1,5 @@
+2013-06-05 Vladimir Tsanev <tsachev@gamil.com>
+    
+    * 1.8.6.0-1 :
+    Initial package created.
+
diff --git a/pcr/rfc5766-turn-server/PKGBUILD b/pcr/rfc5766-turn-server/PKGBUILD
new file mode 100644
index 000000000..81eb3d14d
--- /dev/null
+++ b/pcr/rfc5766-turn-server/PKGBUILD
@@ -0,0 +1,61 @@
+# Maintainer: Vladimir Tsanev <tsachev@gmail.com>
+
+pkgname=rfc5766-turn-server
+_portname=turnserver
+pkgver=1.8.6.0
+pkgrel=1
+epoch=
+pkgdesc="Free open source implementation of TURN and STUN Server"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/rfc5766-turn-server/"
+license=('custom:BSDNew')
+makedepends=('gcc>=3.4.4' 'make')
+depends=('libevent')
+#no redis headers in redi package
+optdepends=('postgresql-client: to use postgresql' 'libmysqlclient')
+backup=("etc/turnserver.conf" "etc/turnuserdb.conf")
+changelog=ChangeLog
+source=(https://${pkgname}.googlecode.com/files/${_portname}-$pkgver.tar.gz)
+sha1sums=('155990b95d399542db1bb497f1746c1b9bb290d2')
+
+build() {
+  cd "${srcdir}/$_portname-${pkgver}"
+  
+  PREFIX=/usr \
+  MANPREFIX=/usr/share \
+  EXAMPLESDIR="/usr/share/$pkgname/examples" \
+  DOCSDIR="/usr/share/doc/$pkgname" \
+  LIBDIR=/usr/lib \
+  SCHEMADIR="/usr/share/$pkgname" \
+  TURNINCLUDEDIR="/usr/include/turn"
+  ./configure
+
+  make
+}
+
+check() {
+  cd "${srcdir}/$_portname-${pkgver}"
+  make check
+}
+
+package() {
+  cd "${srcdir}/$_portname-${pkgver}"
+  make \
+    PREFIX="$pkgdir/usr" \
+    MANPREFIX="$pkgdir/usr/share" \
+    EXAMPLESDIR="$pkgdir/usr/share/$pkgname/examples" \
+    DOCSDIR="$pkgdir/usr/share/doc/$pkgname" \
+    LIBDIR="$pkgdir/usr/lib" \
+    SCHEMADIR="$pkgdir/usr/share/$pkgname" \
+    TURNINCLUDEDIR="$pkgdir/usr/include/turn" \
+    install
+  
+  
+  install -D "$pkgdir/usr/share/$pkgname/examples/etc/turnserver.conf" "$pkgdir/etc/turnserver.conf"
+  install -D "$pkgdir/usr/share/$pkgname/examples/etc/turnuserdb.conf" "$pkgdir/etc/turnuserdb.conf"
+  rm -r "$pkgdir/usr/etc"
+
+  chmod 644 "$pkgdir/usr/lib/libturnclient.a"
+
+  install -Dm 644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}
diff --git a/pcr/ruby-haml/ruby-yard/PKGBUILD b/pcr/ruby-haml/ruby-yard/PKGBUILD
deleted file mode 100644
index a686f937d..000000000
--- a/pcr/ruby-haml/ruby-yard/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Maintainer: Matt Harrison <matt at mistbyte dot com>
-# Contributor: Renzo Carbonara <gnuk0001@gmail.com>
-
-pkgname=ruby-yard
-_gemname=${pkgname#ruby-}
-pkgver=0.8.2.1
-pkgrel=2
-pkgdesc="Documentation tool for consistent and usable documentation in Ruby."
-arch=('any')
-url="http://yardoc.org"
-license=('MIT')
-groups=()
-depends=()
-makedepends=('rubygems')
-optdepends=()
-provides=()
-conflicts=()
-replaces=()
-backup=()
-options=()
-install=
-source=("http://gems.rubyforge.org/gems/yard-${pkgver}.gem")
-noextract=("yard-${pkgver}.gem")
-
-build() {
-  cd $srcdir
-  local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
-  gem install --no-user-install --ignore-dependencies -i "$pkgdir$_gemdir" \
-              -n "$pkgdir/usr/bin" ${_gemname}-$pkgver.gem
-  install -D "$pkgdir$_gemdir/gems/${_gemname}-$pkgver/LICENSE" \
-             "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-md5sums=('08a48d23f8729b68945011cae7d121fe')
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/ruby-headers/PKGBUILD b/pcr/ruby-headers/PKGBUILD
index 074205e79..7b20fc288 100644
--- a/pcr/ruby-headers/PKGBUILD
+++ b/pcr/ruby-headers/PKGBUILD
@@ -3,8 +3,8 @@
 
 pkgname=ruby-headers
 _pkgname=ruby
-pkgver=2.0.0_p0
-_pkgver=2.0.0-p0
+pkgver=2.0.0_p195
+_pkgver=2.0.0-p195
 pkgrel=1
 pkgdesc="A package of all Ruby headers needed by some gems like ruby-debug."
 arch=('any')
@@ -23,4 +23,4 @@ package() {
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
 
-md5sums=('895c1c581f8d28e8b3bb02472b2ccf6a')
+md5sums=('2f54faea6ee1ca500632ec3c0cb59cb6')
diff --git a/pcr/samplv1/PKGBUILD b/pcr/samplv1/PKGBUILD
new file mode 100644
index 000000000..e2258a88b
--- /dev/null
+++ b/pcr/samplv1/PKGBUILD
@@ -0,0 +1,31 @@
+# Maintainer: Guest One <theguestone at gmail dot com>
+
+pkgname=samplv1
+pkgver=0.3.3
+pkgrel=1
+pkgdesc="Polyphonic sampler synthesizer with stereo fx"
+arch=('i686' 'x86_64')
+url="http://$pkgname.sourceforge.net/$pkgname-index.html"
+license=('GPL')
+groups=('lv2-plugins')
+depends=('jack' 'liblo' 'lv2' 'qt4')
+install="$pkgname.install"
+source=("http://download.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
+md5sums=('2540ab3ef3da39bd4da8a1ab8ff9334d')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # x86_64 lib path fix
+  sed -i "s/lib64/lib/" src/src_lv2.pro
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir/" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/samplv1/samplv1.install b/pcr/samplv1/samplv1.install
new file mode 100644
index 000000000..029294d67
--- /dev/null
+++ b/pcr/samplv1/samplv1.install
@@ -0,0 +1,12 @@
+post_install() {
+  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/pcr/setbfree/PKGBUILD b/pcr/setbfree/PKGBUILD
index 41cba9632..1b30f06c2 100644
--- a/pcr/setbfree/PKGBUILD
+++ b/pcr/setbfree/PKGBUILD
@@ -1,10 +1,10 @@
 # Maintainer: Guest One <theguestone at gmail dot com>
 
 pkgname=setbfree
-pkgver=0.5.5
+pkgver=0.7.2
 pkgrel=1
 pkgdesc="A DSP Tonewheel Organ emulator."
-arch=('i686')
+arch=('i686' 'x86_64')
 url="http://setbfree.org/"
 license=('GPL')
 depends=('jack' 'liblo' 'tk' 'desktop-file-utils')
@@ -12,7 +12,7 @@ makedepends=('lv2')
 install="$pkgname.install"
 source=("https://github.com/pantherb/setBfree/tarball/v$pkgver"
         "https://raw.github.com/pantherb/setBfree/master/debian/setbfree.desktop")
-md5sums=('604cc477a6fa76ee936f1d010c815c55'
+md5sums=('7b64947289687cbf71b9e87fdd006f36'
          '8c2a863562f26856dcff0a456cf36dcf')
 
 build() {
@@ -27,6 +27,20 @@ package() {
   # desktop file
   install -Dm644 ../$pkgname.desktop \
     "$pkgdir/usr/share/applications/$pkgname.desktop"
+
+  # icon
+  install -Dm644 doc/setBfree.png \
+    "$pkgdir/usr/share/icons/setBfree.png"
+
+  # man
+  install -d "$pkgdir/usr/share/man/man1"
+  install -Dm644 doc/*.1 \
+    "$pkgdir/usr/share/man/man1"
+
+  # docs
+  install -d "$pkgdir/usr/share/doc/$pkgname"
+  install -Dm644 doc/{midi.txt,signal_flow.png} \
+    "$pkgdir/usr/share/doc/$pkgname"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/pcr/setbfree/setbfree.desktop b/pcr/setbfree/setbfree.desktop
deleted file mode 100644
index 0e9d14452..000000000
--- a/pcr/setbfree/setbfree.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=setBfree
-GenericName=DSP tonewheel organ
-Comment=MIDI-controlled, software synthesizer using JACK
-Icon=setBfree
-Exec=setBfree-start
-Terminal=false
-Categories=AudioVideo;Audio;
diff --git a/pcr/shflags/PKGBUILD b/pcr/shflags/PKGBUILD
new file mode 100644
index 000000000..c4f3ee7a9
--- /dev/null
+++ b/pcr/shflags/PKGBUILD
@@ -0,0 +1,31 @@
+#Maintainer max_meyer
+pkgname=shflags
+pkgver=1.0.3
+pkgrel=1
+pkgdesc="Shell Flags (shFlags) is a library written to greatly simplify the handling of command-line flags"
+arch=(any)
+url="http://code.google.com/p/shflags/"
+license=('LGPL')
+depends=(sh)
+provides=(shflags)
+optdepends=(bash zsh dash ksh)
+options=(zipman)
+source=(http://shflags.googlecode.com/files/$pkgname-$pkgver.tgz{,.sig})
+md5sums=('b4d7133696ec05b71b27d8df5e278f0f'
+         'SKIP')
+
+package() {
+  src="$srcdir/$pkgname-$pkgver/src/"
+  dst="$pkgdir/usr/share/lib/shflags"
+  mkdir -p "$dst" 
+
+  if [ -f "$src/shflags" ]; then
+      cp "$src/shflags" "$dst/shflags.sh"
+  else
+      msg "Warning shflags not found"
+      exit 1
+  fi
+
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/shocco/PKGBUILD b/pcr/shocco/PKGBUILD
new file mode 100644
index 000000000..32baa6d2d
--- /dev/null
+++ b/pcr/shocco/PKGBUILD
@@ -0,0 +1,30 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+pkgname="shocco"
+pkgver=1.0
+pkgdesc="Docco-like documentation generator for POSIX shell"
+url="http://rtomayko.github.com/shocco/"
+license=('custom:MIT')
+
+pkgrel=1
+arch=('any')
+depends=('markdown' 'python2-pygments')
+optdepends=('ronn: builds man pages')
+
+source=("libre://$pkgname-$pkgver.tar.gz")
+md5sums=('edaed31d14a2c16e6303c07e24e7bc9a')
+
+mksource=("git://github.com/rtomayko/shocco.git#tag=${pkgver}")
+mkmd5sums=('SKIP')
+
+build() {
+  cd "$srcdir/$pkgname"
+  ./configure --prefix="$pkgdir"/usr
+  make -j1
+}
+
+package() {
+  cd "$srcdir/$pkgname"
+  make -j1 install
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
diff --git a/pcr/sipwitch/PKGBUILD b/pcr/sipwitch/PKGBUILD
index 22852780c..eba2bb854 100644
--- a/pcr/sipwitch/PKGBUILD
+++ b/pcr/sipwitch/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Dan Serban
 # Contributors: David Zaragoza, Andrea Scarpino
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname=sipwitch
 pkgver=1.2.4
diff --git a/pcr/smtube/PKGBUILD b/pcr/smtube/PKGBUILD
new file mode 100644
index 000000000..d54983bb0
--- /dev/null
+++ b/pcr/smtube/PKGBUILD
@@ -0,0 +1,22 @@
+# Maintainer: Guest One <theguestone at gmail dot com>
+pkgname=smtube
+pkgver=1.7
+pkgrel=1
+pkgdesc="Search and download videos from YouTube"
+arch=('i686' 'x86_64')
+url="http://smplayer.sourceforge.net"
+license=('GPL')
+depends=('qt4' 'smplayer')
+source=(http://downloads.sourceforge.net/smplayer/$pkgname-$pkgver.tar.bz2)
+
+md5sums=('d9a954e1b337f0c850dcfc6063255056')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make QMAKE=qmake-qt4 LRELEASE=lrelease-qt4 PREFIX="/usr"
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make QMAKE=qmake-qt4 LRELEASE=lrelease-qt4 PREFIX="/usr" DESTDIR="$pkgdir" install
+}
\ No newline at end of file
diff --git a/pcr/softhsm/PKGBUILD b/pcr/softhsm/PKGBUILD
new file mode 100644
index 000000000..f3fbcecaf
--- /dev/null
+++ b/pcr/softhsm/PKGBUILD
@@ -0,0 +1,46 @@
+# Maintainer: Javier Torres <javitonino [at] gmail [dot] com>
+
+pkgname=softhsm
+pkgver=1.3.4
+pkgrel=1
+pkgdesc="Software PKCS11 store"
+arch=('i686' 'x86_64')
+url="http://www.opendnssec.org/softhsm/"
+license=('custom' 'BSD')
+depends=('botan' 'sqlite3')
+backup=("etc/softhsm.conf")
+source=("http://www.opendnssec.org/files/source/${pkgname}-${pkgver}.tar.gz"{,.sig})
+sha1sums=('f09b6828776bcf9fef1dd46cfa7a495da01c7747'
+          'SKIP')
+sha256sums=('f10319dfa651023dad3d0845d284ec08ef982c1fc1bdb55cf8a725f762961e97'
+            'SKIP')
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # /usr/lib/softhsm -> /usr/bin (no subdirectory)
+  sed -i \
+  -e "s/full_libdir=\"\$full_libdir\/softhsm\"/#full_libdir=\"\$full_libdir\/softhsm\"/" \
+  -e "s/libdir=\$full_libdir/#libdir=\$full_libdir/" \
+  configure
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  ./configure --prefix=/usr \
+              --sbindir=/usr/bin \
+              --datarootdir=/usr/share \
+              --localstatedir=/var/lib \
+              --sysconfdir=/etc \
+              --with-botan=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}/" install
+
+  install -Dm0644 "LICENSE" \
+        "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/pcr/spacenav-daemon/PKGBUILD b/pcr/spacenav-daemon/PKGBUILD
new file mode 100644
index 000000000..fb1229ae4
--- /dev/null
+++ b/pcr/spacenav-daemon/PKGBUILD
@@ -0,0 +1,44 @@
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+
+pkgname=spacenav-daemon
+_pkgname=${pkgname%-daemon}
+pkgver=0.5
+pkgrel=3
+pkgdesc="Free Spacenav Daemon is a free alternative to the 3Dconnexion device driver, for their 3D input devices."
+arch=(
+  i686
+  x86_64
+  mips64el
+)
+conflicts=${_pkgname}d
+replaces=${_pkgname}d
+url=http://$_pkgname.sourceforge.net/
+license=GPL2
+depends=libx11
+backup=etc/spnavrc
+source=(
+  http://downloads.sourceforge.net/$_pkgname/${_pkgname}d-$pkgver.tar.gz
+  $_pkgname.service
+  spnavrc
+)
+sha512sums=(
+  908f598e4ba5febbc1191cc32cd444817acd40c22e79b1f139c50787e1e25d4cd8328dc3fd6d9dde09bb80232b52f0e75ae429fb3345eb51fbe5a47577b038e2
+  61397646f7dda23b2cef5168f23e21c017801f156374c7fab7bae650cd3cee0ea173d3cb65ae2f0be580aa399999a388df2d804b9d00c01db430c820dbc60160
+  f97866a77fe9e6bee8df046ad62576a1cdbba26323218cd6336de66e0898f403bb33da12666fe75f00bb9bf078f895e8e7de360196079f83082fc94a23f71728
+)
+
+build() {
+  cd $srcdir/${_pkgname}d-$pkgver
+  ./configure --prefix=$pkgdir/usr
+  make
+}
+
+package() {
+  cd $srcdir/${_pkgname}d-$pkgver
+  make DESTDIR=$pkgdir install
+
+  install -Dm644 $srcdir/$_pkgname.service $pkgdir/usr/lib/systemd/system/$_pkgname.service
+  install -Dm644 $srcdir/spnavrc $pkgdir/etc/spnavrc
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/spacenavd/spacenav.service b/pcr/spacenav-daemon/spacenav.service
index 30e8019e9..30e8019e9 100644
--- a/pcr/spacenavd/spacenav.service
+++ b/pcr/spacenav-daemon/spacenav.service
diff --git a/pcr/spacenav-daemon/spnavrc b/pcr/spacenav-daemon/spnavrc
new file mode 100644
index 000000000..7d19ae03b
--- /dev/null
+++ b/pcr/spacenav-daemon/spnavrc
@@ -0,0 +1,8 @@
+# sensitivity is multiplied with every motion (1.0 normal).
+sensitivity = 1.000
+
+# dead zone; any motion less than this number, is discarded as noise.
+dead-zone = 2
+
+# disable led
+led = 0
diff --git a/pcr/spacenavd/PKGBUILD b/pcr/spacenavd/PKGBUILD
deleted file mode 100644
index cf8a43c32..000000000
--- a/pcr/spacenavd/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Contributor: Jan Hambrecht <jaham at gmx dot net>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-
-pkgname=spacenavd
-pkgver=0.5
-pkgrel=2
-pkgdesc="The spacenav project provides a free, compatible alternative, to the proprietary 3Dconnexion device driver and SDK, for their 3D input devices (called 'space navigator', 'space pilot', 'space traveller', etc)."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://spacenav.sourceforge.net/"
-license=('GPL')
-depends=('libx11')
-backup=('etc/spnavrc')
-source=(http://downloads.sourceforge.net/spacenav/$pkgname-$pkgver.tar.gz
-        spacenavd
-        spacenav.service)
-
-md5sums=('0bb21da5315bd376aa508157a9455aaa'                                                                                                              
-         '27a739300d4de07920879af2d2bdd47f'
-         'b404c8021254636b861651a7a48d17a6')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=$pkgdir/usr
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
-  # for initscript service
-  install -D -m755 $srcdir/spacenavd $pkgdir/etc/rc.d/spacenavd || return 1
-  # for systend service
-  install -D -m755 $srcdir/spacenav.service $pkgdir/usr/lib/systemd/system/spacenav.service || return 1
-}
diff --git a/pcr/spacenavd/spacenavd b/pcr/spacenavd/spacenavd
deleted file mode 100644
index 61946197c..000000000
--- a/pcr/spacenavd/spacenavd
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-DAEMON=/usr/bin/spacenavd
-
-PID=`pidof -o %PPID $DAEMON`
-case "$1" in
-  start)
-    stat_busy "Starting Spacenavigator Daemon"
-    [ -z "$PID" ] && $DAEMON
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon spacenavd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Spacenavigator Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon spacenavd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/pcr/strongswan/PKGBUILD b/pcr/strongswan/PKGBUILD
index 975e7a21f..c6ace77c4 100644
--- a/pcr/strongswan/PKGBUILD
+++ b/pcr/strongswan/PKGBUILD
@@ -8,7 +8,7 @@
 
 pkgname=strongswan
 pkgver=5.0.4
-pkgrel=5
+pkgrel=6
 pkgdesc="open source IPsec implementation"
 url='http://www.strongswan.org'
 license=("GPL")
@@ -25,6 +25,7 @@ build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
   ./configure --prefix=/usr \
+        --sbindir=/usr/bin \
         --sysconfdir=/etc \
         --libexecdir=/usr/lib \
         --with-ipsecdir=/usr/lib/strongswan \
@@ -45,7 +46,4 @@ build() {
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR=${pkgdir} install
-  install -d ${pkgdir}/etc/rc.d
-  ln -s /usr/sbin/ipsec ${pkgdir}/etc/rc.d/ipsec
-  install -Dm755 ${srcdir}/strongswan.rc ${pkgdir}/etc/rc.d/strongswan
 }
diff --git a/pcr/strongswan/strongswan.rc b/pcr/strongswan/strongswan.rc
deleted file mode 100644
index 58c99c092..000000000
--- a/pcr/strongswan/strongswan.rc
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting strongSwan IPsec"
-    /usr/sbin/ipsec start
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      stat_done
-      add_daemon strongswan
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping strongSwan IPsec"
-    /usr/sbin/ipsec stop
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      stat_done
-      rm_daemon strongswan
-    fi
-    ;;
-  restart)
-    stat_busy "Restarting strongSwan IPsec"
-    /usr/sbin/ipsec restart
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      stat_done
-      add_daemon strongswan
-    fi
-    ;;
-  status)
-    /usr/sbin/ipsec status
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart|status}"  
-esac
-
diff --git a/pcr/sword/PKGBUILD b/pcr/sword/PKGBUILD
new file mode 100644
index 000000000..78ab4e646
--- /dev/null
+++ b/pcr/sword/PKGBUILD
@@ -0,0 +1,68 @@
+# Maintainer:
+# Contributor: Alexander Rødseth
+# Contributor: Andrea Scarpino
+# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
+# Contributor: TripleE <eric1548@yahoo.com>
+# Contributor: Dominic Tubach
+
+pkgname=sword
+pkgver=1.6.2
+pkgrel=9
+pkgdesc="Library for Bible study programs"
+arch=('x86_64' 'i686')
+url="http://www.crosswire.org/sword/"
+license=('GPL')
+depends=('curl' 'clucene' 'swig')
+makedepends=('cmake')
+backup=('etc/sword.conf')
+source=("http://www.crosswire.org/ftpmirror/pub/$pkgname/source/v1.6/$pkgname-$pkgver.tar.gz"
+        "curl.patch"
+        "multimap.patch")
+sha256sums=('af76c7d54135c444b09eeaafb49229ef5201a4e1d44539d9341dceaeb60a87b9'
+            '3c2676b6dc1d56b08b2532f46af32c54e91ea71ed92a5d7a30ee29ed7ff09124'
+            'ddcde54fbd9b29585c03565bff7891622cb2cc0a6381047d5f566987a7cb1b8c')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  patch -p1 -i ../curl.patch
+  patch -p1 -i ../multimap.patch
+
+  [[ -d ../build ]] || mkdir ../build
+  cd ../build
+
+  CXXFLAGS=-fpermissive cmake "../$pkgname-$pkgver" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DSWORD_GLOBAL_CONF_DIR=/etc
+  make
+}
+
+package() {
+  cd "$srcdir/build"
+
+  make DESTDIR="$pkgdir" install
+
+  install -d "$pkgdir/usr/lib/sword"
+  mv "$pkgdir"/usr/lib/${pkgver}_icu_* \
+    "$pkgdir/usr/lib/sword/"
+
+  cd "$srcdir/$pkgname-$pkgver/locales.d/"
+  for file in *.conf; do
+    install -Dm644 "$file" \
+      "$pkgdir/usr/share/sword/locales.d/$file"
+  done
+
+  cd ../include
+  install -d "$pkgdir/usr/include/sword"
+  install -Dm644 canon_{catholic{,2},synodalp}.h \
+    "$pkgdir/usr/include/sword"
+
+  cd ../samples
+  install -Dm644 mods.d/globals.conf \
+    "$pkgdir/usr/share/sword/mods.d/globals.conf"
+  install -Dm644 recommended/sword.conf \
+    "$pkgdir/etc/sword.conf"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/sword/curl.patch b/pcr/sword/curl.patch
new file mode 100644
index 000000000..63fd4433c
--- /dev/null
+++ b/pcr/sword/curl.patch
@@ -0,0 +1,22 @@
+diff -Naur sword-1.6.2.orig/src/mgr/curlftpt.cpp sword-1.6.2.new/src/mgr/curlftpt.cpp
+--- sword-1.6.2.orig/src/mgr/curlftpt.cpp	2011-07-27 00:41:40.000000000 +0200
++++ sword-1.6.2.new/src/mgr/curlftpt.cpp	2011-07-27 00:42:05.000000000 +0200
+@@ -26,7 +26,6 @@
+ #include <fcntl.h>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ #include <swlog.h>
+diff -Naur sword-1.6.2.orig/src/mgr/curlhttpt.cpp sword-1.6.2.new/src/mgr/curlhttpt.cpp
+--- sword-1.6.2.orig/src/mgr/curlhttpt.cpp	2011-07-27 00:41:40.000000000 +0200
++++ sword-1.6.2.new/src/mgr/curlhttpt.cpp	2011-07-27 00:42:45.000000000 +0200
+@@ -25,7 +25,6 @@
+ #include <cctype>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ #include <swlog.h>
diff --git a/pcr/sword/multimap.patch b/pcr/sword/multimap.patch
new file mode 100644
index 000000000..7957ab2d8
--- /dev/null
+++ b/pcr/sword/multimap.patch
@@ -0,0 +1,39 @@
+--- sword-1.6.2/include/multimapwdef.h	2004-05-04 23:01:39.000000000 +0200
++++ /usr/include/sword/multimapwdef.h	2012-06-02 13:37:47.816457345 +0200
+@@ -7,26 +7,26 @@
+ 
+ // multmap that still lets you use [] to reference FIRST
+ // entry of a key if multiples exist
+-template <class Key, class T, class Compare>
+-class multimapwithdefault : public std::multimap<Key, T, Compare> {
++template < class Key, class T, class Compare >
++class multimapwithdefault : public std::multimap< Key, T, Compare > {
+ public:
+-	typedef std::pair<const Key, T> value_type;
++	typedef std::pair< const Key, T > value_type;
+ 	T& getWithDefault(const Key& k, const T& defaultValue) {
+-		if (find(k) == this->end()) {
+-			insert(value_type(k, defaultValue));
++		if (this->find(k) == this->end()) {
++			this->insert(value_type(k, defaultValue));
+ 		}
+ 		return (*(find(k))).second;
+ 	}
+ 
+ 	T& operator[](const Key& k) {
+-		if (find(k) == this->end()) {
+-			insert(value_type(k, T()));
++		if (this->find(k) == this->end()) {
++			this->insert(value_type(k, T()));
+ 		}
+-		return (*(find(k))).second;
++		return (*(this->find(k))).second;
+ 	}
+ 	bool has(const Key& k, const T &val) const {
+-		typename std::multimap<Key, T, Compare>::const_iterator start = lower_bound(k);
+-		typename std::multimap<Key, T, Compare>::const_iterator end = upper_bound(k);
++		typename std::multimap< Key, T, Compare >::const_iterator start = this->lower_bound(k);
++		typename std::multimap< Key, T, Compare >::const_iterator end = this->upper_bound(k);
+ 		for (; start!=end; start++) {
+ 			if (start->second == val)
+ 				return true;
diff --git a/pcr/synthv1/PKGBUILD b/pcr/synthv1/PKGBUILD
index a0d858664..1a96b84f8 100644
--- a/pcr/synthv1/PKGBUILD
+++ b/pcr/synthv1/PKGBUILD
@@ -1,16 +1,17 @@
 # Maintainer: Guest One <theguestone at gmail dot com>
 
 pkgname=synthv1
-pkgver=0.3.2
+pkgver=0.3.3
 pkgrel=1
 pkgdesc="An old-school all-digital 4-oscillator subtractive polyphonic synthesizer with stereo fx"
-arch=('i686')
+arch=('i686' 'x86_64')
 url="http://$pkgname.sourceforge.net/$pkgname-index.html"
 license=('GPL')
-depends=('lv2' 'jack' 'qt4')
+groups=('lv2-plugins')
+depends=('jack' 'liblo' 'lv2' 'qt4')
 install="$pkgname.install"
 source=("http://download.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('88fd93df7cd6754de355edb5fe3cb3e7')
+md5sums=('18bd21921ee65b718b2feb1d0ab03ac7')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/pcr/synthv1/synthv1.install b/pcr/synthv1/synthv1.install
index bce670aff..029294d67 100644
--- a/pcr/synthv1/synthv1.install
+++ b/pcr/synthv1/synthv1.install
@@ -1,5 +1,5 @@
 post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
   update-desktop-database -q
 }
 
diff --git a/pcr/torque/PKGBUILD b/pcr/torque/PKGBUILD
index 5f469fa5f..850aa3b7d 100644
--- a/pcr/torque/PKGBUILD
+++ b/pcr/torque/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
 
 pkgname=torque
 pkgver=4.2.2
diff --git a/pcr/transmission-remote-cli/PKGBUILD b/pcr/transmission-remote-cli/PKGBUILD
index 5e3699bce..dcabaa642 100644
--- a/pcr/transmission-remote-cli/PKGBUILD
+++ b/pcr/transmission-remote-cli/PKGBUILD
@@ -1,29 +1,25 @@
 # Maintainer: fauno <fauno@kiwwwi.com.ar>
 pkgname=transmission-remote-cli
-pkgver=0.10.4
+pkgver=1.5.0
 pkgrel=1
 pkgdesc="Curses interface for the daemon of the BitTorrent client Transmission"
 arch=('any')
 url="https://github.com/fagga/transmission-remote-cli"
 license=('GPL3')
 depends=('python2')
-optdepends=('transmission-daemon>=2.40: for local transmission management'
+optdepends=('transmission-daemon: for local transmission management'
             'adns-python: Resolve IPs to host names'
-            'python-geoip: Guess which country peers come from')
+            'python2-geoip: Guess which country peers come from')
 conflicts=('transmission-remote-cli-git' "transmission-remote-cli<=20111013")
 replaces=('transmission-remote-cli-git')
-source=(http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-${pkgrel}-any.src.tar.xz
-        python2.patch)
+source=(https://github.com/fagga/${pkgname}/archive/v${pkgver}.tar.gz)
 
-build() {
+package() {
     cd "${srcdir}/${pkgname}"
     msg "Starting make..."
 
-    patch -Np1 -i ${srcdir}/python2.patch
-
 	install -d ${pkgdir}/usr/bin/
 	install -Dm755 transmission-remote-cli.py ${pkgdir}/usr/bin/transmission-remote-cli
 
 }
-md5sums=('b85382bc2e24c5733f9c3833098da668'
-         '6273609fb3a7294328aeaa526b76411c')
+md5sums=('4c13aa8596d35ce5793ea65affa8a6e5')
diff --git a/pcr/triceratops-lv2/PKGBUILD b/pcr/triceratops-lv2/PKGBUILD
index ff02793aa..db8b7b101 100644
--- a/pcr/triceratops-lv2/PKGBUILD
+++ b/pcr/triceratops-lv2/PKGBUILD
@@ -1,16 +1,17 @@
 # Maintainer: Guest One <theguestone at gmail dot com>
 
 pkgname=triceratops-lv2
-pkgver=0.1.6c
+pkgver=0.1.7
 pkgrel=1
 pkgdesc="Polyphonic synthesizer LV2 plugin"
-arch=('i686')
-url="http://sourceforge.net/projects/triceratops/"
+arch=('i686' 'x86_64')
+url="http://deliriumdecrypted.blogspot.com/"
 license=('GPL')
+groups=('lv2-plugins')
 depends=('gtkmm' 'lv2')
 makedepends=('python2')
 source=("http://downloads.sourceforge.net/project/${pkgname/-lv2}/$pkgname-v$pkgver.tar.gz")
-md5sums=('7a0755876c4d3af6f1b4cac899679472')
+md5sums=('b4f058c30b3b218bd21dbaa04430dd8b')
 
 build() {
   cd "$srcdir/$pkgname-v$pkgver"
diff --git a/pcr/xf86-input-wizardpen/PKGBUILD b/pcr/xf86-input-wizardpen/PKGBUILD
index 4b40ebea2..dfad17f34 100644
--- a/pcr/xf86-input-wizardpen/PKGBUILD
+++ b/pcr/xf86-input-wizardpen/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
 
 pkgname=xf86-input-wizardpen
 _pkgname=${pkgname:11}
diff --git a/pcr/yafaray-git/PKGBUILD b/pcr/yafaray/PKGBUILD
index 1d4b3436c..e3c0381d8 100644
--- a/pcr/yafaray-git/PKGBUILD
+++ b/pcr/yafaray/PKGBUILD
@@ -1,18 +1,18 @@
 # Maintainer: Márcio Silva <coadde@lavabit.com>
 
 pkgname=(
-  yafaray-git
-  blender-addon-yafaray-git
+  yafaray
+  blender-addon-yafaray
 )
-_pkgflag=git
-_pkgname=${pkgname[0]%-$_pkgflag}
+_pkgname=${pkgname[0]}
 _bldname=${pkgname[1]::7}
 _gitname=Core
 _addname=${_bldname^}-Exporter
-pkgver=$(LC_ALL=C date -u +%Y%m%d)
-_pkgver=1.2
-_bldver=2.66
-_bldep=7
+_pkgdate=20130510
+pkgver=1.5.$_pkgdate
+_srcver=44323def5b3866ff601fd401ef2160b80ced8141 # Fri May 10 00:57:12 2013 -0700 - Merge pull request #67 from DarkTide/master // Depth fix for hist on background
+_bldver=2.67
+_bldep=8
 _pyver=3.3
 pkgrel=1
 pkgdesc='A libre software raytracing engine'
@@ -27,7 +27,7 @@ depends=(
   freetype2
   libjpeg
   libxml2
-  'openexr=2.0.0'
+  openexr
 )
 optdepends=(
   'python: Python bindings'
@@ -41,17 +41,17 @@ makedepends=(
   qt4
   swig
 )
-provides=($_pkgname=$_pkgver)
-conflicts=$_pkgname
 source=(
-  git://github.com/YafaRay/$_gitname.$_pkgflag
-  git://github.com/YafaRay/$_addname.$_pkgflag
+  git://github.com/YafaRay/$_gitname.git
+  git://github.com/YafaRay/$_addname.git
 )
 sha512sums=(SKIP SKIP)
 
 prepare() {
   cd $srcdir/$_gitname
 
+  git checkout $_srcver
+
   [[ -d build ]] && rm -r build
   mkdir build
 }
@@ -62,17 +62,17 @@ build() {
   setarch $CARCH cmake .. -DCMAKE_INSTALL_PREFIX=/usr\
     -DYAF_PY_VERSION=$_pyver\
     -DYAF_BINDINGS_PY_DIR=/usr/lib/python$_pyver
-
   setarch $CARCH make
 }
 
-package_yafaray-git() {
+package_yafaray() {
   cd $srcdir/$_gitname/build
   setarch $CARCH make DESTDIR=$pkgdir install
 }
 
-package_blender-addon-yafaray-git() {
+package_blender-addon-yafaray() {
   pkgver=$pkgver.v$_bldver
+  _srcver=e6688fc4f480bcb1ae7d0a6dbe65563b3d070169 # Fri May 10 00:24:58 2013 -0700 - Merge pull request #14 from DarkTide/master // Version bump, and some other fixes
   pkgdesc="A addon for the ${_bldname^} which allows render with YafaRay (built for the $_bldname-libre package)"
   arch=any
   depends=(
@@ -80,24 +80,14 @@ package_blender-addon-yafaray-git() {
     "$_bldname>=$(($_bldep-1)):$_bldver"
     "$_bldname<$_bldep:${_bldver::2}$((${_bldver:2:4}+1))"
   )
-  optdepends=''
-  provides=(
-    ${pkgname%-$_pkgflag}=$_pkgver.v$_bldver
-    $_pkgname-$_bldname-exporter=$_pkgver.v$_bldver
-    $_pkgname-$_bldname-exporter-$_pkgflag=$pkgver
-  )
-  conflicts=(
-    ${pkgname%-$_pkgflag}
-    $_pkgname-$_bldname-exporter
-    $_pkgname-$_bldname-exporter-$_pkgflag
-  )
-  replaces=$_pkgname-$_bldname-exporter-$_pkgflag
+  optdepends=
 
   cd $srcdir/$_addname
 
   a=/usr/lib
   b=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons/$_pkgname/bin
 
+  git checkout $_srcver
   git checkout-index -a -f --prefix=${b%bin}
 
   install -d $b
diff --git a/pcr/zita-convolver/PKGBUILD b/pcr/zita-convolver/PKGBUILD
new file mode 100644
index 000000000..5017f144f
--- /dev/null
+++ b/pcr/zita-convolver/PKGBUILD
@@ -0,0 +1,36 @@
+# Maintainer : Guest One <theguestone at gmail dot com>
+
+pkgname=zita-convolver
+pkgver=3.1.0
+pkgrel=1
+pkgdesc="Convolution library for aeolus and jconvolver"
+arch=('i686' 'x86_64')
+url="http://kokkinizita.linuxaudio.org/linuxaudio"
+license=('GPL')
+depends=('fftw' 'gcc-libs')
+source=("http://kokkinizita.linuxaudio.org/linuxaudio/downloads/zita-convolver-$pkgver.tar.bz2")
+md5sums=('7e264d0fb0d8ea277cdb4e33d764c68a')
+
+build() {
+  cd "$srcdir/zita-convolver-$pkgver/libs"
+
+  sed -i 's/usr\/local/usr/' Makefile
+  sed -i 's/ldconfig//' Makefile
+
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver/libs"
+
+  make SUFFIX="" PREFIX="$pkgdir/usr" DESTDIR=${PKGDIR} install 
+
+
+  # Another failed attempt at trying to be clever. A simple call to ldconfig might have worked.
+  #  ln -s lib$pkgname.so.$pkgver \
+  #    "$pkgdir/usr/lib/lib$pkgname.so.${pkgver%%.*}"
+  
+  #  ln -s lib${pkgname}.so.$pkgver ${pkgdir}/usr/lib/lib${pkgname}.so
+}
+
+
diff --git a/pcr/zoneminder/PKGBUILD b/pcr/zoneminder/PKGBUILD
index 236ceca01..bf03b4133 100644
--- a/pcr/zoneminder/PKGBUILD
+++ b/pcr/zoneminder/PKGBUILD
@@ -1,3 +1,4 @@
+# Maintainer:  Jacek Burghardt           <jacek@hebe.us>
 # Maintainer:  Vojtech Aschenbrenner     <v@asch.cz>
 # Contributor: Jason Gardner             <buhrietoe@gmail.com>
 # Contributor: Ross melin                <rdmelin@gmail.com>
@@ -9,12 +10,13 @@
 pkgbase=zoneminder
 pkgname=zoneminder
 pkgver=1.25.0
-pkgrel=24
+pkgrel=27
 pkgdesc='Capture, analyse, record and monitor video security cameras'
 arch=(
   i686
   x86_64
   mips64el
+  arm
 )
 backup=(
   etc/zm.conf
@@ -26,7 +28,6 @@ license=(
 depends=(
   apache
   cambozola
-  libav-static
   gnutls
   mariadb
   perl-archive-zip
@@ -59,110 +60,67 @@ source=(
   httpd-$pkgbase.conf
   $pkgbase
   $pkgbase.service
+  zoneminder-1.25.0-kernel35.patch
+  zoneminder-1.25.0-gcc47.patch
+  zoneminder-1.25.0-ffmpeg.patch
+  zoneminder-1.25-text.patch
+  zoneminder-1.25-fixwarning.patch
+  zoneminder-1.25.0-gcrypt.patch
 )
 sha512sums=(
   3e18993b0539729491052c97d8c94227ccc089eb40277c2f07682f30049033303c7cfe9734fdac6d33ae67df29c76eb72bf7fbb5dae8227e8831fa603b61c375
   4ce0d8eba9d006d258f5b8a83920fc17f1f602b96518d37b7a47cd9b6eb84ef2587641a6ba839a469c3f0e33b46475866187279ae3f8be0d4054b074ee5d6b08
   ab4e1d5ddaf4d9cd53d6ca59d7965902afd6a2dc830fbbafa270736c52c2b3563075fee860bb0276466f96e9dbfb71b259ac45a4ae2e4ead8eaec154a0159eb0
   cfb0eb87a989236c72741a496ddc6a73aa2696e5beaaca4836d3c231ddb24c7ef5e9f65e7afa49674f2115cbfa4a07c75486e1947ce294c816ddbb875f3b99cf
+  4fa79e49a3c04e9fdc9823792c6a28012002479c77ed41637bd2d21f089e4c15592bfcd5c24028f356c9f80d774a5080a6841e8e70a435d607e3089d0b121775
+  3da7d4d21dea166ea12b49e88a05a9f7a75790881a1f2d7588fa9e0e6ce592b4b5ee71994fa8b05236efeeb57890157a622c752c12a9059c2ee915adf3b4660d
+  7fc2a4663c3103bef641be065bd7992a2b3dc0699f1b99dc2fdb34c1c48e58686e490d3ade523ef7c8e29b3f04109658eef652c26ff6ee3fb9aee65453bdb6c4
+  17b85051543c34a41c6b94ec8f46a10927aa4bc9554562650788c8257ffba8e362500cf3641708f2f9dabebc663a2d012fa9feacd7f9b33c637fbc965d405adf
+  8eab0a922968465fee8537dc035ce781e51dc84cc05259a32acb5bf59c618bc1700dbf4eec90717ed5959841def119357974d109df8d7450c12ca4ea8576e55c
+  8c9e7debcaf60be1c2dda656f95e497f6812d704edc3ca4a1c915a3b3c9dc1749c91d96bc2d60db7d90d5edfd9e2dfc39010dfe4feabfecfffd27f1fffc3d675
 )
 
 build() {
   cd $srcdir/ZoneMinder-$pkgver
-
-  # ZM_RUNDIR need change to run dir
-  export CPPFLAGS=-D__STDC_CONSTANT_MACROS\
-    OPT_FFMPEG=yes\
-    PATH_FFMPEG=/usr/bin/avconv-static\
-    ZM_LOGDIR=/var/log/$pkgbase\
-    ZM_RUNDIR=/tmp/$pkgbase\
-    ZM_SSL_LIB=gnutls\
-    ZM_TMPDIR=/tmp/$pkgbase
-
-  # Patch for GCC 4.7.x
-  sed -i -e 's/^#include <errno.h>/#include <errno.h>\n#include <unistd.h>/'\
-     src/zm_logger.cpp || read
-  sed -i -e 's/^#include <pthread.h>/#include <pthread.h>\n#include <unistd.h>/'\
-     src/zm_thread.h || read
-
-  # Patch for automake 1.12
-  sed -i -e '/am__api_version=/ s/1.11/1.12/'\
-    configure || read
-
-  # Patch for disable ZM_CHECK_FOR_UPDATES
-  sed -i -e '/ZM_CHECK_FOR_UPDATES/,+1 s/yes/no/'\
-    scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read
-
-  # Patch for support html5 video and flv
-  sed -i -e '/ZM_MPEG_LIVE_FORMAT/,+1 s/swf/webm/;/ZM_MPEG_REPLAY_FORMAT/,+1 s/swf/webm/;
-    /ZM_FFMPEG_FORMATS/,+1 s/mpg mpeg wmv asf avi\* mov swf 3gp\*\*/mpg mpeg wmv asf avi\* mov flv swf 3gp\*\* webm ogg h264/'\
-    scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read
-
-  # Patch for enable video export
-  #sed -i -e '/ZM_OPT_FFMPEG/,+1 s/@OPT_FFMPEG@/yes/;
-  #  /ZM_PATH_FFMPEG/,+1 s/@PATH_FFMPEG@/\/usr\/bin\/avconv-static/'\
-  #  scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read
-
-  # Patch for change path run dir
-  sed -i -e '/ZM_PATH_SOCKS/,+1 s/TMP/RUN/'\
-    scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read
-
   # Patch for change ZM name to ZoneMinder
   sed -i -e '/ZM_WEB_TITLE_PREFIX/,+1 s/"ZM"/"ZoneMinder"/'\
     scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read
-
-  # Patch for v4l2 convert support
-  sed -i -e "s/$ENV{SHELL} = \'\/bin\/sh\' if exists $ENV{SHELL};/$ENV{SHELL} = \'\/bin\/sh\' if exists $ENV{SHELL};\n$ENV{LD_PRELOAD} = \'\/usr\/lib\/libv4l\/v4l2convert.so\' ;/"\
-    scripts/zmdc.pl.in || read
-
-  # Patch for add more socket tries
+  sed -i -e '/am__api_version=/ s/1.11/1.13.1/'\
+        configure || read
+    # Patch for add more socket tries
   sed -i -e '/$max_socket_tries/ s/3/15/'\
-    web/ajax/stream.php || read
-
-  # Patch for wrong "suppported"
+      web/ajax/stream.php || read
+   # Patch for support html5 video and flv
+  sed -i -e '/ZM_MPEG_LIVE_FORMAT/,+1 s/swf/webm/;/ZM_MPEG_REPLAY_FORMAT/,+1 s/swf/webm/;
+     /ZM_FFMPEG_FORMATS/,+1 s/mpg mpeg wmv asf avi\* mov swf 3gp\*\*/mpg mpeg wmv asf avi\* mov flv swf 3gp\*\* webm ogg h264/'\
+     scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read
+   # Patch for wrong "suppported"
   sed -i -e 's/suppported/supported/'\
      src/zm_local_camera.cpp || read
+  
 
-  # Patch for type cast in linux-libre kernel 3.5
-  sed -i -e 's/enum v4l2_buf_type type = v4l2_data.fmt.type;/enum v4l2_buf_type type = (v4l2_buf_type)v4l2_data.fmt.type;/'\
-    src/zm_local_camera.cpp || read
-
-  # Patch for drop custom perl install paths
-  sed -i -e '/# Slight hack for non-standard perl install paths/,+10 d;
-    s/^AC_SUBST(ZM_CONFIG,"$SYSCONFDIR\/zm.conf")/AC_SUBST(ZM_CONFIG,"$SYSCONFDIR\/zm.conf")\n\nEXTRA_PERL_LIB="# Include from system perl paths only"\nPERL_MM_PARMS="INSTALLDIRS=vendor"/'\
-    configure.ac
-
-  # Patch for support ffmpeg with <libavutil/mathematics.h> and C library
-  sed -i -e 's/^extern "C" {/extern "C" {\n#ifdef _STDINT_H\n#undef _STDINT_H\n#endif\n#include <stdint.h>/
-    s/^#include <libavutil\/avutil.h>/#include <libavutil\/avutil.h>\n#include <libavutil\/mathematics.h>/'\
-    src/zm_ffmpeg.h
-  sed -i -e 's/^AM_CONFIG_HEADER(config.h)/AM_CONFIG_HEADER(config.h)\n\nAC_SUBST([AM_CXXFLAGS], [-D__STDC_CONSTANT_MACROS])/;
-    s/^AC_CHECK_HEADERS(mysql\/mysql.h,,AC_MSG_ERROR(zm requires MySQL headers - check that MySQL development packages are installed),)/AC_CHECK_HEADERS(mysql\/mysql.h,,AC_MSG_ERROR(zm requires MySQL headers - check that MySQL development packages are installed),)\nAC_LANG_PUSH([C])/;
-    s/^AC_CHECK_HEADERS(libswscale\/swscale.h,,,)/AC_CHECK_HEADERS(libswscale\/swscale.h,,,)\nAC_LANG_POP([C])/'\
-    configure.ac
+   patch -Np1 -F99 -i ../zoneminder-1.25.0-kernel35.patch
+   patch -Np1 -F99 -i ../zoneminder-1.25.0-gcc47.patch 
+   patch -Np1 -F99 -i ../zoneminder-1.25.0-ffmpeg.patch
+   patch -Np1 -F99 -i ../zoneminder-1.25-text.patch   
+   patch -Np1 -F99 -i ../zoneminder-1.25-fixwarning.patch
+   patch -Np1 -F99 -i ../zoneminder-1.25.0-gcrypt.patch
 
-  # Patch for wrong install run, tmp and log dir
-  sed -i -e '/ install-data-hook/d;/install-data-hook:/d;/# Yes, you are correct. This is a HACK!/d;
-    /	( cd $(DESTDIR)$(sysconfdir); chown $(webuser):$(webgroup) $(sysconf_DATA); chmod 600 $(sysconf_DATA) )/d;
-    /	( if ! test -e $(ZM_RUNDIR); then mkdir -p $(ZM_RUNDIR); fi; if test "$(ZM_RUNDIR)" != "\/var\/run"; then chown $(webuser):$(webgroup) $(ZM_RUNDIR); chmod u+w $(ZM_RUNDIR); fi )/d;
-    /	( if ! test -e $(ZM_TMPDIR); then mkdir -m 700 -p $(ZM_TMPDIR); fi; if test "$(ZM_TMPDIR)" != "\/tmp"; then chown $(webuser):$(webgroup) $(ZM_TMPDIR); chmod u+w $(ZM_TMPDIR); fi )/d;
-    /	( if ! test -e $(ZM_LOGDIR); then mkdir -p $(ZM_LOGDIR); fi; if test "$(ZM_LOGDIR)" != "\/var\/log"; then chown $(webuser):$(webgroup) $(ZM_LOGDIR); chmod u+w $(ZM_LOGDIR); fi )/,+1 d'\
-    Makefile.{am,in}
-
-  ./configure --prefix=/usr\
+export CXXFLAGS=-D__STDC_CONSTANT_MACROS
+./configure --prefix=/usr\
     --enable-crashtrace=no\
     --enable-debug=no\
     --enable-mmap=yes\
     --sysconfdir=/etc\
     --with-cgidir=/srv/http/cgi-bin\
     --with-extralibs='-L/usr/lib -L/usr/lib/mysql'\
-    --with-ffmpeg=/opt/libav-static\
     --with-libarch=lib\
+    --with-ffmpeg=/usr \
     --with-mysql=/usr\
     --with-webdir=/srv/http/$pkgbase\
     --with-webgroup=http\
     --with-webhost=localhost\
-    --with-webuser=http
+    --with-webuser=http \
 
   make V=0
 }
@@ -173,8 +131,9 @@ package() {
   make DESTDIR=$pkgdir install
 
   mkdir -p $pkgdir/{etc/{httpd/conf/extra,rc.d},srv/http/{cgi-bin,$pkgbase},usr/{lib/systemd/system,share/{license/$pkgbase,$pkgbase/db}},var/{cache/$pkgbase,log/$pkgbase}}
-
+  mkdir -p $pkgdir/srv/zoneminder/socks
   chown -R http.http $pkgdir/{etc/zm.conf,var/{cache/$pkgbase,log/$pkgbase}}
+  chown -R http.http $pkgdir/srv/zoneminder/socks
   chmod 0700 $pkgdir/etc/zm.conf
 
   for i in events images temp; do
diff --git a/pcr/zoneminder/zoneminder-1.25-fixwarning.patch b/pcr/zoneminder/zoneminder-1.25-fixwarning.patch
new file mode 100644
index 000000000..0d151d139
--- /dev/null
+++ b/pcr/zoneminder/zoneminder-1.25-fixwarning.patch
@@ -0,0 +1,14 @@
+diff -U 3 -H -d -r -N -- ZoneMinder-1.24.2/src/zm_image.cpp ZoneMinder-1.24.2-patch/src/zm_image.cpp
+--- ZoneMinder-1.24.2/src/zm_image.cpp	2009-05-25 20:04:00.000000000 +0200
++++ ZoneMinder-1.24.2-patch/src/zm_image.cpp	2009-07-04 16:31:45.000000000 +0200
+@@ -776,7 +776,8 @@
+ 
+ 		while( pdest < (buffer+size) )
+ 		{
+-			*pdest++ = (*blend_ptr)[*pdest][*psrc++];
++			*pdest = (*blend_ptr)[*pdest][*psrc++];
++			pdest++;
+ 		}
+ 	}
+ 	else
+
diff --git a/pcr/zoneminder/zoneminder-1.25-text.patch b/pcr/zoneminder/zoneminder-1.25-text.patch
new file mode 100644
index 000000000..90885f1b5
--- /dev/null
+++ b/pcr/zoneminder/zoneminder-1.25-text.patch
@@ -0,0 +1,12 @@
+--- ZoneMinder-1.25.0/src/zm_stream.cpp	2009-05-08 09:47:27.000000000 -0400
++++ ZoneMinder-1.25.0.ajs/src/zm_stream.cpp	2013-01-14 16:52:18.000000000 -0500
+@@ -262,7 +262,7 @@ bool StreamBase::sendTextFrame( const ch
+         fprintf( stdout, "--ZoneMinderFrame\r\n" );
+         fprintf( stdout, "Content-Length: %d\r\n", n_bytes );
+         fprintf( stdout, "Content-Type: image/jpeg\r\n\r\n" );
+-        if ( fwrite( buffer, n_bytes, 1, stdout ) )
++        if ( fwrite( buffer, n_bytes, 1, stdout ) != 1 )
+         {
+             Error( "Unable to send stream text frame: %s", strerror(errno) );
+             return( false );
+
diff --git a/pcr/zoneminder/zoneminder-1.25.0-ffmpeg.patch b/pcr/zoneminder/zoneminder-1.25.0-ffmpeg.patch
new file mode 100644
index 000000000..99d41ee33
--- /dev/null
+++ b/pcr/zoneminder/zoneminder-1.25.0-ffmpeg.patch
@@ -0,0 +1,130 @@
+diff -Naur ZoneMinder-1.25.0-a/configure.ac ZoneMinder-1.25.0-b/configure.ac
+--- ZoneMinder-1.25.0-a/configure.ac	2011-08-23 09:10:32.000000000 -0600
++++ ZoneMinder-1.25.0-b/configure.ac	2013-05-06 11:17:33.860608307 -0600
+@@ -95,7 +95,7 @@
+ 
+ LDFLAGS="${FFMPEG_LIBS} $LDFLAGS"
+ CFLAGS="${FFMPEG_CFLAGS} $CFLAGS"
+-CPPFLAGS="${FFMPEG_CFLAGS} $CPPFLAGS"
++CPPFLAGS="${FFMPEG_CFLAGS} $CPPFLAGS -D__STDC_CONSTANT_MACROS"
+ 
+ EXTRA_LIBS=
+ AC_ARG_WITH(extralibs,
+@@ -275,8 +275,7 @@
+ AC_CHECK_LIB(x264,x264_predict_16x16_init)
+ AC_CHECK_LIB(avutil,av_malloc,,AC_MSG_WARN(libavutil.a may be required for MPEG streaming))
+ # Don't bother to warn about this one
+-AC_CHECK_LIB(avcore,av_image_copy,,)
+-AC_CHECK_LIB(avcodec,avcodec_init,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
++AC_CHECK_LIB(avcodec,avcodec_register_all,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
+ AC_CHECK_LIB(avformat,av_new_stream,,AC_MSG_WARN(libavformat.a is required for MPEG streaming))
+ AC_CHECK_LIB(avdevice,avdevice_register_all,,AC_MSG_WARN(libavdevice.a may be required for MPEG streaming))
+ AC_CHECK_LIB(swscale,sws_scale,,,-lswscale)
+diff -Naur ZoneMinder-1.25.0-a/src/zm_ffmpeg.h ZoneMinder-1.25.0-b/src/zm_ffmpeg.h
+--- ZoneMinder-1.25.0-a/src/zm_ffmpeg.h	2011-06-24 10:05:07.000000000 -0600
++++ ZoneMinder-1.25.0-b/src/zm_ffmpeg.h	2013-05-06 18:11:49.327274977 -0600
+@@ -43,6 +43,11 @@
+ }
+ #endif
+ 
++#include <libavutil/avutil.h>
++#include <libavcodec/avcodec.h>
++#include <libavformat/avformat.h>
++#include <libswscale/swscale.h>
++
+ #if FFMPEG_VERSION_INT == 0x000408
+ #define ZM_FFMPEG_048	1
+ #elif FFMPEG_VERSION_INT == 0x000409
+diff -Naur ZoneMinder-1.25.0-a/src/zm_ffmpeg_camera.cpp ZoneMinder-1.25.0-b/src/zm_ffmpeg_camera.cpp
+--- ZoneMinder-1.25.0-a/src/zm_ffmpeg_camera.cpp	2011-06-21 01:40:13.000000000 -0600
++++ ZoneMinder-1.25.0-b/src/zm_ffmpeg_camera.cpp	2013-05-06 19:57:08.453941643 -0600
+@@ -91,7 +91,7 @@
+     Info( "Priming capture from %s", mPath.c_str() );
+ 
+     // Open the input, not necessarily a file
+-    if ( av_open_input_file( &mFormatContext, mPath.c_str(), NULL, 0, NULL ) !=0 )
++    if ( avformat_open_input( &mFormatContext, mPath.c_str(), NULL, NULL ) !=0 )
+         Fatal( "Unable to open input %s due to: %s", mPath.c_str(), strerror(errno) );
+ 
+     // Locate stream info from input
+@@ -122,7 +122,7 @@
+         Fatal( "Can't find codec for video stream from %s", mPath.c_str() );
+ 
+     // Open the codec
+-    if ( avcodec_open( mCodecContext, mCodec ) < 0 )
++    if ( avcodec_open2( mCodecContext, mCodec, NULL ) < 0 )
+         Fatal( "Unable to open codec for video stream from %s", mPath.c_str() );
+ 
+     // Allocate space for the native video frame
+diff -Naur ZoneMinder-1.25.0-a/src/zm_mpeg.cpp ZoneMinder-1.25.0-b/src/zm_mpeg.cpp
+--- ZoneMinder-1.25.0-a/src/zm_mpeg.cpp	2011-05-15 14:39:06.000000000 -0600
++++ ZoneMinder-1.25.0-b/src/zm_mpeg.cpp	2013-05-06 20:00:08.923941640 -0600
+@@ -130,7 +130,7 @@
+ {
+ 	/* set the output parameters (must be done even if no
+ 	   parameters). */
+-	if ( av_set_parameters(ofc, NULL) < 0 )
++	if ( avformat_write_header(ofc, NULL) < 0 )
+ 	{
+ 		Panic( "Invalid output format parameters" );
+ 	}
+@@ -176,7 +176,7 @@
+ 		}
+ 
+ 		/* open the codec */
+-		if ( avcodec_open(c, codec) < 0 )
++		if ( avcodec_open2(c, codec, NULL) < 0 )
+ 		{
+ 			Panic( "Could not open codec" );
+ 		}
+@@ -222,7 +222,7 @@
+ 	if ( !(of->flags & AVFMT_NOFILE) )
+ 	{
+ #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,2,1)
+-		if ( avio_open(&ofc->pb, filename, URL_WRONLY) < 0 )
++		if ( avio_open(&ofc->pb, filename, AVIO_FLAG_WRITE) < 0 )
+ #else
+ 		if ( url_fopen(&ofc->pb, filename, URL_WRONLY) < 0 )
+ #endif
+@@ -241,7 +241,7 @@
+ 	}
+ 
+ 	/* write the stream header, if any */
+-	av_write_header(ofc);
++	avformat_write_header(ofc, NULL);
+ }
+ 
+ VideoStream::VideoStream( const char *filename, const char *format, int bitrate, double frame_rate, int colours, int width, int height )
+diff -Naur ZoneMinder-1.25.0-a/src/zm_remote_camera_rtsp.cpp ZoneMinder-1.25.0-b/src/zm_remote_camera_rtsp.cpp
+--- ZoneMinder-1.25.0-a/src/zm_remote_camera_rtsp.cpp	2011-06-21 03:19:10.000000000 -0600
++++ ZoneMinder-1.25.0-b/src/zm_remote_camera_rtsp.cpp	2013-05-06 20:07:40.797274975 -0600
+@@ -145,7 +145,7 @@
+         Panic( "Unable to locate codec %d decoder", codecContext->codec_id );
+ 
+     // Open codec
+-    if ( avcodec_open( codecContext, codec ) < 0 )
++    if ( avcodec_open2( codecContext, codec, NULL ) < 0 )
+         Panic( "Can't open codec" );
+ 
+     picture = avcodec_alloc_frame();
+diff -Naur ZoneMinder-1.25.0-a/src/zm_sdp.h ZoneMinder-1.25.0-b/src/zm_sdp.h
+--- ZoneMinder-1.25.0-a/src/zm_sdp.h	2011-05-15 14:39:06.000000000 -0600
++++ ZoneMinder-1.25.0-b/src/zm_sdp.h	2013-05-06 20:23:28.237274974 -0600
+@@ -41,7 +41,7 @@
+         int payloadType;
+         const char payloadName[6];
+         enum AVMediaType codecType;
+-        enum CodecID codecId;
++        enum AVCodecID codecId;
+         int clockRate;
+         int autoChannels;
+     };
+@@ -50,7 +50,7 @@
+     {
+         const char payloadName[32];
+         enum AVMediaType codecType;
+-        enum CodecID codecId;
++        enum AVCodecID codecId;
+         //int clockRate;
+         //int autoChannels;
+     };
diff --git a/pcr/zoneminder/zoneminder-1.25.0-gcc47.patch b/pcr/zoneminder/zoneminder-1.25.0-gcc47.patch
new file mode 100644
index 000000000..a083c6dbc
--- /dev/null
+++ b/pcr/zoneminder/zoneminder-1.25.0-gcc47.patch
@@ -0,0 +1,33 @@
+diff -up ./src/zm_local_camera.cpp.gcc47 ./src/zm_local_camera.cpp
+--- ./src/zm_local_camera.cpp.gcc47	2011-06-21 04:19:10.000000000 -0500
++++ ./src/zm_local_camera.cpp	2012-01-19 13:43:49.142440717 -0600
+@@ -26,6 +26,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
++#include <limits.h>
+ #include <unistd.h>
+ #include <sys/mman.h>
+ #include <errno.h>
+diff -up ./src/zm_logger.cpp.gcc47 ./src/zm_logger.cpp
+--- ./src/zm_logger.cpp.gcc47	2011-06-28 06:07:35.000000000 -0500
++++ ./src/zm_logger.cpp	2012-01-19 13:43:49.142440717 -0600
+@@ -33,6 +33,7 @@
+ #include <signal.h>
+ #include <stdarg.h>
+ #include <errno.h>
++#include <unistd.h>
+ 
+ bool Logger::smInitialised = false;
+ Logger *Logger::smInstance = 0;
+diff -up ./src/zm_thread.h.gcc47 ./src/zm_thread.h
+--- ./src/zm_thread.h.gcc47	2012-01-19 13:44:43.082766722 -0600
++++ ./src/zm_thread.h	2012-01-19 13:44:56.966335869 -0600
+@@ -21,6 +21,7 @@
+ #define ZM_THREAD_H
+ 
+ #include <pthread.h>
++#include <unistd.h>
+ #include "zm_exception.h"
+ #include "zm_utils.h"
+ 
diff --git a/pcr/zoneminder/zoneminder-1.25.0-gcrypt.patch b/pcr/zoneminder/zoneminder-1.25.0-gcrypt.patch
new file mode 100644
index 000000000..21f197ec6
--- /dev/null
+++ b/pcr/zoneminder/zoneminder-1.25.0-gcrypt.patch
@@ -0,0 +1,86 @@
+diff -up ./configure.ac.gcrypt ./configure.ac
+--- ./configure.ac.gcrypt	2012-01-19 12:58:20.647123209 -0600
++++ ./configure.ac	2012-01-19 13:12:34.186669577 -0600
+@@ -13,7 +13,7 @@ AC_ARG_VAR(ZM_DB_HOST,[Hostname where Zo
+ AC_ARG_VAR(ZM_DB_NAME,[Name of ZoneMinder database, default zm])
+ AC_ARG_VAR(ZM_DB_USER,[Name of ZoneMinder database user, default zmuser])
+ AC_ARG_VAR(ZM_DB_PASS,[Password of ZoneMinder database user, default zmpass])
+-AC_ARG_VAR(ZM_SSL_LIB,[Library to use for ssl functions, default gnutls])
++AC_ARG_VAR(ZM_SSL_LIB,[Library to use for MD5 function, default libgcrypt])
+ AC_ARG_VAR(ZM_MYSQL_ENGINE,[MySQL engine to use with database, default MyISAM])
+ AC_ARG_VAR(ZM_RUNDIR,[Location of transient process files, default /var/run/zm])
+ AC_ARG_VAR(ZM_TMPDIR,[Location of temporary files, default /tmp/zm])
+@@ -32,7 +32,7 @@ if test "$ZM_DB_PASS" == ""; then
+ 	AC_SUBST(ZM_DB_PASS,[zmpass])
+ fi
+ if test "$ZM_SSL_LIB" == ""; then
+-	AC_SUBST(ZM_SSL_LIB,gnutls)
++	AC_SUBST(ZM_SSL_LIB,libgcrypt)
+ fi
+ if test "$ZM_MYSQL_ENGINE" == ""; then
+ 	AC_SUBST(ZM_MYSQL_ENGINE,MyISAM)
+@@ -264,11 +264,10 @@ AC_CHECK_LIB(jpeg,jpeg_start_compress,,A
+ AC_CHECK_LIB(pthread,pthread_create,,AC_MSG_ERROR(zm requires libpthread.a))
+ AC_CHECK_LIB(dl,dlsym,,AC_MSG_ERROR(zm requires libdl.a))
+ if test "$ZM_SSL_LIB" == "openssl"; then
+-AC_CHECK_LIB(crypto,MD5,,AC_MSG_WARN([libcrypto.a is required for authenticated streaming - use ZM_SSL_LIB option to select gnutls instead]))
++AC_CHECK_LIB(crypto,MD5,,AC_MSG_WARN([libcrypto.a is required for authenticated streaming - use ZM_SSL_LIB option to select libgcrypt instead]))
+ else
+-AC_CHECK_HEADERS(gcrypt.h,,AC_MSG_WARN(zm requires libgcrypt headers to be installed for gnutls),)
++AC_CHECK_HEADERS(gcrypt.h,,AC_MSG_WARN(zm requires libgcrypt headers to be installed),)
+ AC_CHECK_LIB(gcrypt,gcry_check_version,,AC_MSG_WARN([libgcrypt.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead]))
+-AC_CHECK_LIB(gnutls-openssl,MD5,,AC_MSG_WARN([gnutls-openssl.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead]))
+ fi
+ AC_CHECK_LIB(pcre,pcre_compile,,AC_MSG_WARN(libpcre.a may be required for remote/network camera support))
+ AC_CHECK_LIB(z,zlibVersion)
+@@ -320,9 +319,6 @@ AC_CHECK_DECLS(round,,,[#include <math.h
+ if test "$ZM_SSL_LIB" == "openssl"; then
+ AC_CHECK_DECLS(MD5,,AC_MSG_ERROR([zm requires openssl/md5.h - use ZM_SSL_LIB option to select gnutls instead]),[#include <stdlib.h>
+ #include <openssl/md5.h>])
+-else
+-AC_CHECK_DECLS(MD5,,AC_MSG_ERROR([zm requires gnutls/openssl.h - use ZM_SSL_LIB option to select openssl instead]),[#include <stdlib.h>
+-#include <gnutls/openssl.h>])
+ fi
+ AC_CHECK_DECLS(backtrace,,,[#include <execinfo.h>])
+ 
+diff -up ./src/zm_user.cpp.gcrypt ./src/zm_user.cpp
+--- ./src/zm_user.cpp.gcrypt	2011-08-03 06:31:06.000000000 -0500
++++ ./src/zm_user.cpp	2012-01-19 12:58:20.654122992 -0600
+@@ -140,6 +140,18 @@ User *zmLoadUser( const char *username, 
+ 	return( user );
+ }
+ 
++#ifdef HAVE_GCRYPT_H
++#define HAVE_DECL_MD5 1
++#define MD5_DIGEST_LENGTH 16
++static unsigned char *MD5(const unsigned char *data, unsigned long len,
++                         unsigned char *md)
++{
++    gcry_md_hash_buffer(GCRY_MD_MD5, md, data, len);
++
++    return md;
++}
++#endif
++
+ // Function to validate an authentication string
+ User *zmLoadAuthUser( const char *auth, bool use_remote_addr )
+ {
+diff -up ./src/zm_user.h.gcrypt ./src/zm_user.h
+--- ./src/zm_user.h.gcrypt	2010-11-11 06:11:07.000000000 -0600
++++ ./src/zm_user.h	2012-01-19 13:14:11.200654694 -0600
+@@ -23,14 +23,11 @@
+ #ifndef ZM_USER_H

+ #define ZM_USER_H

+ 

+-#if HAVE_LIBGNUTLS_OPENSSL

+-#include <gnutls/openssl.h>

+ #if HAVE_GCRYPT_H

+ #include <gcrypt.h>

+-#endif // HAVE_GCRYPT_H

+ #elif HAVE_LIBCRYPTO

+ #include <openssl/md5.h>

+-#endif // HAVE_LIBGNUTLS_OPENSSL || HAVE_LIBCRYPTO

++#endif // HAVE_GCRYPT_H || HAVE_LIBCRYPTO

+ 

+ class User

+ {

diff --git a/pcr/zoneminder/zoneminder-1.25.0-kernel35.patch b/pcr/zoneminder/zoneminder-1.25.0-kernel35.patch
new file mode 100644
index 000000000..51bc1288d
--- /dev/null
+++ b/pcr/zoneminder/zoneminder-1.25.0-kernel35.patch
@@ -0,0 +1,21 @@
+diff -up ./src/zm_local_camera.cpp.kernel35 ./src/zm_local_camera.cpp
+--- ./src/zm_local_camera.cpp.kernel35	2012-07-16 15:01:22.182614878 -0500
++++ ./src/zm_local_camera.cpp	2012-07-16 15:02:16.491941730 -0500
+@@ -740,7 +740,7 @@ void LocalCamera::Terminate()
+     {
+         Debug( 3, "Terminating video stream" );
+         //enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+-        enum v4l2_buf_type type = v4l2_data.fmt.type;
++        enum v4l2_buf_type type = (v4l2_buf_type)v4l2_data.fmt.type;
+         if ( vidioctl( vid_fd, VIDIOC_STREAMOFF, &type ) < 0 )
+             Error( "Failed to stop capture stream: %s", strerror(errno) );
+ 
+@@ -1520,7 +1520,7 @@ int LocalCamera::PrimeCapture()
+ 
+         Debug( 3, "Starting video stream" );
+         //enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+-        enum v4l2_buf_type type = v4l2_data.fmt.type;
++        enum v4l2_buf_type type = (v4l2_buf_type)v4l2_data.fmt.type;
+         if ( vidioctl( vid_fd, VIDIOC_STREAMON, &type ) < 0 )
+             Fatal( "Failed to start capture stream: %s", strerror(errno) );
+     }
diff --git a/pcr/zoneminder/zoneminder.install b/pcr/zoneminder/zoneminder.install
index ecacf6437..899e2a5d1 100644
--- a/pcr/zoneminder/zoneminder.install
+++ b/pcr/zoneminder/zoneminder.install
@@ -69,9 +69,6 @@ post_install() {
     /^open_basedir/ s/:\/srv\/http\/zoneminder//;
     /^open_basedir/ s/:\/srv\/http\/zoneminder\///;
     /^open_basedir/ s/$/:\/srv\/http\/zoneminder/;
-    /^open_basedir/ s/:\/var\/cache\/zoneminder//;
-    /^open_basedir/ s/:\/var\/cache\/zoneminder\///;
-    /^open_basedir/ s/$/:\/var\/cache\/zoneminder/;
     ' /etc/php/php.ini || read
   sed -i -e '
     /^LoadModule php5_module modules\/libphp5.so/d;
@@ -82,7 +79,6 @@ post_install() {
     /^Include \/etc\/httpd\/conf\/extra\/httpd-zoneminder.conf/d;
     /^Include conf\/extra\/httpd-default.conf/ s/$/\n\n# PHP 5\n\Include \/etc\/httpd\/conf\/extra\/php5_module.conf\n\n# ZoneMinder\nInclude \/etc\/httpd\/conf\/extra\/httpd-zoneminder.conf/;
     ' /etc/httpd/conf/httpd.conf || read
-  gpasswd -a http video
   cat << EOF
 Note for mysql:
 ==> To run Zoneminder, you must install the database running mysql service (as root):
@@ -109,11 +105,11 @@ Note for php:
 ==> "extension=openssl.so"
 ==> "extension=ftp.so"
 ==> "extension=zip.so"
-==> check and add to open_basedir "/etc", 
-==> "/srv/http/zoneminder" and "/var/cache/zoneminder" like so
-==> "open_basedir = /home:/tmp:/usr/share/pear:/etc:/srv/http/zoneminder:/var/cache/zoneminder"
+==> check and add to open_basedir "/etc" and
+==> "/srv/http/zoneminder" like so
+==> "open_basedir = /home:/tmp:/usr/share/pear:/etc:/srv/http/zoneminder"
 ==> and set your timezone in php.ini:
-==> "date.timezone = <your_zone>/<your_city>"
+==> "date.timezone = <your_country>/<your_city>"
 
 Note for apache:
 ==> You must edit /etc/httpd/conf/httpd.conf and add the line:
@@ -136,7 +132,6 @@ post_remove() {
   sed -i -e '
     /^open_basedir/ s/:\/srv\/http\/zoneminder//;
     /^open_basedir/ s/:\/srv\/http\/zoneminder\///;
-    /^open_basedir/ s/:\/var\/cache\/zoneminder\///
     ' /etc/php/php.ini || read
   sed -i -e '
     /^# ZoneMinder/d;
@@ -170,12 +165,9 @@ Note:
 ==> "extension=mysqli.so"
 ==> "extension=session.so"
 ==> "extension=sockets.so"
-==> "date.timezone = <my_zone>/<my_city>"
+==> "date.timezone = <my_country>/<my_city>"
 
-==> Drop http user on video group if it isn't needed with others servers:
-==> gpasswd -d http video
-
-==> Edit /etc/php/php.ini and remove "/etc", "/srv/http/zoneminder" and "/var/cache/zoneminder"
+==> Edit /etc/php/php.ini and remove "/etc" and "/srv/http/zoneminder"
 ==> in the "open_basedir".
 
 ==> Remove log files and "zonemider" directory in "/var/log/zoneminder".
diff --git a/social/asterisk/PKGBUILD b/social/asterisk/PKGBUILD
index 896d5bacf..fe8204d0a 100644
--- a/social/asterisk/PKGBUILD
+++ b/social/asterisk/PKGBUILD
@@ -1,7 +1,7 @@
 # Contributor: Alessio Biancalana <dottorblaster@gmail.com>
 
 pkgname=asterisk
-pkgver=10.9.0
+pkgver=11.0.1
 pkgrel=1
 pkgdesc="A complete PBX solution"
 arch=('i686' 'x86_64')
@@ -15,20 +15,20 @@ source=(http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-$
 	asterisk \
 	asterisk.logrotated)
 install=$pkgname.install
-md5sums=('2fb85dc753584ac13692c27f9749c6cb'
+md5sums=('3e80a5cef7b0f8808578efcc84c39fd7'
          '59146273738605f1e011d8e7bed3561a'
          '486e07a0a1405ea25ec5b1736034653e')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-  make
+  make || return 1
 }
 
 package(){
   cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  make DESTDIR=${pkgdir} samples
+  make DESTDIR=${pkgdir} install || return 1
+  make DESTDIR=${pkgdir} samples || return 1
 
   (cd ${pkgdir}/etc/asterisk
 #  for i in `ls`; do [ $i = "asterisk.conf" ] || mv $i $i.default; done
diff --git a/social/miniupnpc/PKGBUILD b/social/miniupnpc/PKGBUILD
deleted file mode 100644
index a28b9842f..000000000
--- a/social/miniupnpc/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Contributor: Florian Loitsch <archlinux@florian.loitsch.com>
-pkgname=miniupnpc
-pkgver=1.7.20120830
-pkgrel=1
-pkgdesc='A small UPnP client library/tool to access Internet Gateway Devices'
-arch=('i686' 'x86_64' 'mips64el')
-url="http://miniupnp.free.fr"
-license=('BSD')
-depends=('sh')
-source=("http://miniupnp.free.fr/files/$pkgname-$pkgver.tar.gz")
-md5sums=('c74b24b906e11860005fc425b4979fe6')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  make
-}
-
-package(){
-  cd $srcdir/$pkgname-$pkgver
-  make INSTALLPREFIX=$pkgdir/usr install
-  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/social/openswan/PKGBUILD b/social/openswan/PKGBUILD
deleted file mode 100644
index b60ca8401..000000000
--- a/social/openswan/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# Contributor: Jan Fader <jan.fader@web.de>
-pkgname=openswan
-pkgver=2.6.36
-pkgrel=1
-pkgdesc="Open Source implementation of IPsec for the Linux operating system"
-url="http://www.openswan.org"
-license=('GPL' 'custom')
-arch=('i686' 'x86_64')
-depends=('iproute' 'gmp' 'perl')
-backup=(etc/ipsec.conf \
-        etc/ipsec.d/policies/{block,clear,clear-or-private,private,private-or-clear})
-source=(http://www.openswan.org/download/openswan-$pkgver.tar.gz
-        openswan.rc.d
-        compile.patch)
-
-build() {
-  # Create /etc/rc.d for init script, and license directory
-  mkdir -p $pkgdir/{etc/rc.d,usr/share/licenses/openswan}
-
-  cd $srcdir/openswan-$pkgver
-  patch -p1 -i $srcdir/compile.patch
-
-  # Change install paths to Arch defaults
-  sed -i 's|/usr/local|/usr|;s|libexec/ipsec|lib/openswan|' Makefile.inc
-
-  make USE_XAUTH=true USE_OBJDIR=true programs
-}
-
-package(){
-  cd $srcdir/openswan-$pkgver
-  make DESTDIR=$pkgdir install
-
-  # Change permissions in /var
-  chmod 755 $pkgdir/var/run/pluto
-  
-  # Copy License
-  cp LICENSE $pkgdir/usr/share/licenses/openswan
-  
-  # Install init script
-  install -Dm755 ../openswan.rc.d $pkgdir/etc/rc.d/openswan
-  # fix manpages
-  mv $pkgdir/usr/man $pkgdir/usr/share/
-}
-md5sums=('b3a1733493520bb18729633b62ef8247'
-         '543d84162761b9cc9ec319e938c4dd2a'
-         '5540437bb334873da646e21ac9caa963')
diff --git a/social/openswan/compile.patch b/social/openswan/compile.patch
deleted file mode 100644
index 8ddff67f2..000000000
--- a/social/openswan/compile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- openswan-2.6.23/Makefile	2009-09-09 02:42:54.000000000 +0200
-+++ Makefile	2009-12-30 10:13:53.000000000 +0100
-@@ -12,6 +12,8 @@
- # or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- # for more details.
- #
-+CFLAGS=-fno-strict-aliasing
-+CXXFLAGS=-fno-strict-aliasing
- 
- 
- OPENSWANSRCDIR?=$(shell pwd)
diff --git a/social/openswan/openswan.rc.d b/social/openswan/openswan.rc.d
deleted file mode 100644
index 30bd0d56e..000000000
--- a/social/openswan/openswan.rc.d
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting Openswan IPsec"
-    /etc/rc.d/ipsec --start
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      stat_done
-      add_daemon openswan
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Openswan IPsec"
-    /etc/rc.d/ipsec --stop
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      stat_done
-      rm_daemon openswan
-    fi
-    ;;
-  restart)
-    stat_busy "Restarting Openswan IPsec"
-    /etc/rc.d/ipsec --restart
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      stat_done
-      add_daemon openswan
-    fi
-    ;;
-  status)
-    /etc/rc.d/ipsec --status
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart|status}"  
-esac
-
diff --git a/social/sipwitch/PKGBUILD b/social/sipwitch/PKGBUILD
index 8cb84fad5..6ab789ccc 100644
--- a/social/sipwitch/PKGBUILD
+++ b/social/sipwitch/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Dan Serban
 # Contributors: David Zaragoza, Andrea Scarpino
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname=sipwitch
 pkgver=1.2.4
diff --git a/~brendan/guile/PKGBUILD b/~brendan/guile/PKGBUILD
deleted file mode 100644
index af8827563..000000000
--- a/~brendan/guile/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer: Patrick McCarty <pnorcks at gmail dot com>
-# Contributor: Emmanuel 'guinness' Boudreault
-# Parabola Maintainer: Brendan Tildesley (brendyn)
-#
-# This is `guile-devel' from AUR, with very little changes.
-pkgname=guile
-pkgver=2.0.5
-pkgrel=1
-pkgdesc="GNU Ubiquitous Intelligent Language for Extensions - a portable, embeddable Scheme implementation written in C"
-url="http://www.gnu.org/software/guile/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gmp>=4.3.1' 'libtool' 'ncurses>=5.7' 'texinfo'
-         'libunistring' 'gc' 'libffi')
-conflicts=('guile' 'guile-git')
-provides=("guile=$pkgver")
-install=guile.install
-options=('!libtool')
-source=(ftp://ftp.gnu.org/pub/gnu/guile/guile-${pkgver}.tar.gz)
-sha256sums=('2a026ea6cdbc51ca71bcd9787839debfa45ac5db1e26dc00b30ca9b128b10956')
-
-build() {
-  cd "${srcdir}/guile-${pkgver}"
-
-  ./configure --prefix=/usr
-  make LDFLAGS+="-lpthread"
-}
-
-package() {
-  cd "${srcdir}/guile-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/libre/mariadb/PKGBUILD b/~coadde/mariadb/PKGBUILD
index a5b733e9f..256b6e9ae 100644
--- a/libre/mariadb/PKGBUILD
+++ b/~coadde/mariadb/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
 falsename=mysql
 _falsename=MySQL
diff --git a/libre/mariadb/mariadb.install b/~coadde/mariadb/mariadb.install
index f56a0dcaa..f56a0dcaa 100644
--- a/libre/mariadb/mariadb.install
+++ b/~coadde/mariadb/mariadb.install
diff --git a/libre/mariadb/mariadbd b/~coadde/mariadb/mariadbd
index 3ae612096..3ae612096 100755
--- a/libre/mariadb/mariadbd
+++ b/~coadde/mariadb/mariadbd
diff --git a/libre/mariadb/my.cnf b/~coadde/mariadb/my.cnf
index 9a41b4fc3..9a41b4fc3 100644
--- a/libre/mariadb/my.cnf
+++ b/~coadde/mariadb/my.cnf
diff --git a/libre/mariadb/mysql.install b/~coadde/mariadb/mysql.install
index 9a4479215..9a4479215 100644
--- a/libre/mariadb/mysql.install
+++ b/~coadde/mariadb/mysql.install
diff --git a/libre/mariadb/mysqld b/~coadde/mariadb/mysqld
index 1ac88a7cc..1ac88a7cc 100644
--- a/libre/mariadb/mysqld
+++ b/~coadde/mariadb/mysqld
diff --git a/~emulatorman/hunspell-gl/PKGBUILD b/~emulatorman/hunspell-gl/PKGBUILD
index 210fda175..8c791a2fe 100644
--- a/~emulatorman/hunspell-gl/PKGBUILD
+++ b/~emulatorman/hunspell-gl/PKGBUILD
@@ -1,5 +1,5 @@
 # Maintainer: Adrián Chaves Fernández (Gallaecio) <adriyetichaves@gmail.com>, 2009-2010.
-# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname=hunspell-gl
 pkgver=2.9b
diff --git a/~emulatorman/raider/PKGBUILD b/~emulatorman/raider/PKGBUILD
index 960164820..c5629e9fc 100644
--- a/~emulatorman/raider/PKGBUILD
+++ b/~emulatorman/raider/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: M.Carreira <arch@carreira.com.pt>
 # Contributor: M.Carreira <arch@carreira.com.pt>
-# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
 pkgname=raider
 pkgver=0.10.0
 pkgrel=1
diff --git a/~emulatorman/xchat-xsys-noaudacious/PKGBUILD b/~emulatorman/xchat-xsys-noaudacious/PKGBUILD
index 977999a38..7ed44c2e3 100644
--- a/~emulatorman/xchat-xsys-noaudacious/PKGBUILD
+++ b/~emulatorman/xchat-xsys-noaudacious/PKGBUILD
@@ -1,5 +1,5 @@
 # Contributor: Gökmen Görgen <gkmngrgn_gmail.com>
-# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
 pkgname=xchat-xsys-noaudacious
 pkgver=2.2.0
 pkgrel=3
diff --git a/~emulatorman/xonotic-data/PKGBUILD b/~emulatorman/xonotic-data/PKGBUILD
index 114954fc3..13f4d5c12 100644
--- a/~emulatorman/xonotic-data/PKGBUILD
+++ b/~emulatorman/xonotic-data/PKGBUILD
@@ -1,7 +1,7 @@
 # $Id: PKGBUILD 35989 2010-12-25 03:22:46Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Alexander Suhoverhov <cy at ngs dot ru>
-# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname=xonotic-data
 pkgver=0.5.0
diff --git a/~emulatorman/xonotic/PKGBUILD b/~emulatorman/xonotic/PKGBUILD
index 236474d3d..a51606cd5 100644
--- a/~emulatorman/xonotic/PKGBUILD
+++ b/~emulatorman/xonotic/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Alexander Suhoverhov <cy at ngs dot ru>
-# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname=xonotic
 pkgver=0.5.0
diff --git a/~lukeshu/not-working/codeanalyst/PKGBUILD b/~lukeshu/not-working/codeanalyst/PKGBUILD
deleted file mode 100644
index 885e06f0e..000000000
--- a/~lukeshu/not-working/codeanalyst/PKGBUILD
+++ /dev/null
@@ -1,91 +0,0 @@
-# Maintainer (Parabola): Luke Shumaker <lukeshu@sbcglobal.net>
-# Maintainer (AUR): Felipe Bugno <capent@yahoo.com>
-
-# A note about the oprofile fork:
-# The docs claim that the fork is just for adding support for
-# processors that aren't upstream yet (at the time, they are now that
-# 0.9.7 is out). So, shouldn't we just link against 0.9.7? Well:
-#  * AMD also added a bunch of CodeAnalyst-specific code.
-#  * Several external variables/types have different names; the API is
-#    incompatible.
-#  * [extra]/oprofile-0.9.7-3 only includes about half of the headers.
-
-pkgbase=CodeAnalyst
-pkgname=(codeanalyst codeanalyst-cakm)
-pkgver=3.3.18.0361
-_pkgver="${pkgver//./_}"
-pkgrel=4.1
-pkgdesc="AMD performance profiler. Includes a fork of oprofile."
-url="http://developer.amd.com/tools/${pkgbase}/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gcc' 'qt>=4.1' 'libdwarf')
-makedepends=('linux-headers' 'elfutils' 'findutils' 'file')
-options=('!strip')
-install=codeanalyst.install
-source=("http://download2-developer.amd.com/amd/${pkgbase}/${pkgbase}${_pkgver}Public.tar.gz"
-	'gcc47.patch'
-	'skipSetup.patch'
-        'kernel3.4.patch'
-        'codeanalyst.sudo'
-        'codeanalyst.desktop'
-	'codeanalyst.svg')
-
-build() {
-  build_codeanalyst
-  build_codeanalyst-cakm
-}
-
-build_codeanalyst() {
-  cd "${srcdir}/${pkgbase}-${_pkgver}-Public"
-  patch -Np1 -i "${srcdir}/gcc47.patch"
-  patch -Np1 -i "${srcdir}/skipSetup.patch"
-  rm -rf src/dwarf-* # easiest way to ensure using the system install
-
-  ./autogen.sh
-  ./configure --prefix=/usr \
-    --with-libdwarf-includes=/usr/include/libdwarf \
-    --with-libdwarf-libraries=/usr/lib
-  make
-}
-
-build_codeanalyst-cakm() {
-  cd "${srcdir}/${pkgbase}-${_pkgver}-Public"/src/cakm
-  cp -r kernel2.6.38 kernel3.4
-  cd kernel3.4
-  patch -Np1 -i "${srcdir}/kernel3.4.patch"
-  make
-}
-
-package_codeanalyst() {
-  provides=('oprofile=0.9.6cvs')
-  conflicts=('oprofile')
-
-  cd "${srcdir}/${pkgbase}-${_pkgver}-Public"
-  make DESTDIR="${pkgdir}" install
-  rm -f "${pkgdir}/usr/sbin/ca_user_manager" # either codeanalyst.install does this, or it is trivial
-
-  find "${pkgdir}"/usr/{bin,sbin} -type f -exec file '{}' +|sed -n 's/:\s*ELF .*//p'|xargs strip
-
-  cd "${srcdir}"
-  install -D -m644 codeanalyst.sudo "${pkgdir}/etc/sudoers.d/codeanalyst"
-  install -D -m644 codeanalyst.svg "${pkgdir}/usr/share/icons/hicolor/scalable/apps/codeanalyst.svg"
-  install -D -m644 codeanalyst.desktop "${pkgdir}/usr/share/applications/codeanalyst.desktop"
-}
-
-package_codeanalyst-cakm() {
-  pkgdesc="CodeAnalyst kernel module, oprofile-ca.ko, a replacement for oprofile.ko"
-  depends=(codeanalyst)
-  provides=()
-
-  cd "${srcdir}/${pkgbase}-${_pkgver}-Public"/src/cakm/kernel3.4
-  install -D -m644 oprofile.ko "${pkgdir}/lib/modules/`uname -r`/kernel/arch/x86/oprofile/oprofile-ca.ko"
-}
-
-md5sums=('f1e29bc7c7da259df228ce59281ee1d7'
-         '063d0fc9680641a92ce5e310ffe1c9c0'
-         'ce549e59c4a5916fd19e8d085e863627'
-         '3a5d820a43a0360d561bb0c4d67d9735'
-         '3cc8f64fe84c5a886d0172ee8d99f690'
-         '3a18d3f7fb01f199a8ed5ae2908c18e4'
-         '1822a4157b82904b82e72fc1e9bcbd42')
diff --git a/~lukeshu/not-working/codeanalyst/codeanalyst.desktop b/~lukeshu/not-working/codeanalyst/codeanalyst.desktop
deleted file mode 100644
index 56d54f884..000000000
--- a/~lukeshu/not-working/codeanalyst/codeanalyst.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=AMD CodeAnalyst
-Comment=AMD profiler and performance analyzer
-Exec=/usr/bin/CodeAnalyst
-Icon=codeanalyst
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Development;
diff --git a/~lukeshu/not-working/codeanalyst/codeanalyst.install b/~lukeshu/not-working/codeanalyst/codeanalyst.install
deleted file mode 100644
index 6ed1ac841..000000000
--- a/~lukeshu/not-working/codeanalyst/codeanalyst.install
+++ /dev/null
@@ -1,29 +0,0 @@
-post_install() {
-  getent group amdca &>/dev/null ||  groupadd amdca &>/dev/null
-  echo " ==> To use CodeAnalyst as non-root, you must be in the 'amdca' group"
-  echo "     ie: gpasswd -a USERNAME amdca"
-
-  chown root:amdca /usr/bin/calog_report
-  chown root:amdca /usr/bin/capackage.sh
-  chown root:amdca /usr/bin/careport.sh
-  chown root:amdca /usr/bin/cgreport
-  chown root:amdca /usr/bin/CodeAnalyst
-  chown root:amdca /usr/bin/opannotate
-  chown root:amdca /usr/bin/oparchive
-  chown root:amdca /usr/bin/opcontrol
-  chown root:amdca /usr/bin/opgprof
-  chown root:amdca /usr/bin/ophelp
-  chown root:amdca /usr/bin/opimport
-  chown root:amdca /usr/bin/opjitconv
-  chown root:amdca /usr/bin/opreport
-  chown root:amdca /usr/bin/oprofiled
-  chown root:amdca /usr/sbin/ca_oprofile_controller
-  #chown root:amdca /usr/sbin/ca_user_manager
-
-  update-desktop-database -q
-}
-
-post_remove() {
-  getent group amdca &>/dev/null && groupdel amdca &>/dev/null
-  update-desktop-database -q
-}
diff --git a/~lukeshu/not-working/codeanalyst/codeanalyst.sudo b/~lukeshu/not-working/codeanalyst/codeanalyst.sudo
deleted file mode 100644
index 1c3173bdb..000000000
--- a/~lukeshu/not-working/codeanalyst/codeanalyst.sudo
+++ /dev/null
@@ -1 +0,0 @@
-%amdca ALL= NOPASSWD: /usr/sbin/ca_oprofile_controller
diff --git a/~lukeshu/not-working/codeanalyst/codeanalyst.svg b/~lukeshu/not-working/codeanalyst/codeanalyst.svg
deleted file mode 100644
index 8febf725b..000000000
--- a/~lukeshu/not-working/codeanalyst/codeanalyst.svg
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 12.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_1"
-   width="286.95001"
-   height="286.95001"
-   viewBox="0 0 286.95063 286.95"
-   overflow="visible"
-   enable-background="new 0 0 1368.987 286.954"
-   xml:space="preserve"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="AMD_Logo.svg"
-   style="overflow:visible"><metadata
-   id="metadata17"><rdf:RDF><cc:Work
-       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-   id="defs15" /><sodipodi:namedview
-   pagecolor="#ffffff"
-   bordercolor="#666666"
-   borderopacity="1"
-   objecttolerance="10"
-   gridtolerance="10"
-   guidetolerance="10"
-   inkscape:pageopacity="0"
-   inkscape:pageshadow="2"
-   inkscape:window-width="1920"
-   inkscape:window-height="1028"
-   id="namedview13"
-   showgrid="false"
-   inkscape:zoom="2.11"
-   inkscape:cx="163.32315"
-   inkscape:cy="145.21584"
-   inkscape:window-x="-4"
-   inkscape:window-y="-3"
-   inkscape:window-maximized="1"
-   inkscape:current-layer="Layer_1" />
-<polyline
-   points="1165.47,92.779 1165.39,203.495 1281.63,203.513 1198.44,286.826 1081.79,286.954 1080.38,176.065 1165.47,92.779"
-   id="polyline3"
-   style="fill:#009a66"
-   transform="translate(-1082.0371,1.8496035e-4)" />
-<polyline
-   points="1165.39,84.082 1285.07,83.854 1284.83,202.972 1368.99,286.954 1368.75,0.12 1081.79,0 1165.39,84.082"
-   id="polyline5"
-   style="fill:#009a66"
-   transform="translate(-1082.0371,1.8496035e-4)" />
-
-
-
-</svg>
\ No newline at end of file
diff --git a/~lukeshu/not-working/codeanalyst/gcc47.patch b/~lukeshu/not-working/codeanalyst/gcc47.patch
deleted file mode 100644
index dfec4a0c4..000000000
--- a/~lukeshu/not-working/codeanalyst/gcc47.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca/cg/Makefile.am CodeAnalyst-3_3_18_0361-Public/src/ca/cg/Makefile.am
-*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca/cg/Makefile.am	2012-04-13 02:41:43.000000000 -0300
---- CodeAnalyst-3_3_18_0361-Public/src/ca/cg/Makefile.am	2012-04-22 17:55:01.227439003 -0300
-***************
-*** 25,31 ****
-  	cgcvt.cpp
-  
-  
-! cgreport_LDFLAGS = -Wl -fPIC @QT_LDFLAGS@
-  
-  AM_CPPFLAGS= $(INCLUDES) $(more_flags) \
-  			 $(FLAG64) -Wno-unused -Wno-parentheses \
---- 25,31 ----
-  	cgcvt.cpp
-  
-  
-! cgreport_LDFLAGS = -fPIC @QT_LDFLAGS@
-  
-  AM_CPPFLAGS= $(INCLUDES) $(more_flags) \
-  			 $(FLAG64) -Wno-unused -Wno-parentheses \
-diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca/gui/MonitorDockView.cpp CodeAnalyst-3_3_18_0361-Public/src/ca/gui/MonitorDockView.cpp
-*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca/gui/MonitorDockView.cpp	2012-04-13 02:41:43.000000000 -0300
---- CodeAnalyst-3_3_18_0361-Public/src/ca/gui/MonitorDockView.cpp	2012-04-22 17:38:14.884058192 -0300
-***************
-*** 17,22 ****
---- 17,23 ----
-  */
-  
-  #include <qtooltip.h>
-+ #include <unistd.h>
-  
-  #include "MonitorDockView.h"
-  
-diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca/libs/libca/dwarfengine.cpp CodeAnalyst-3_3_18_0361-Public/src/ca/libs/libca/dwarfengine.cpp
-*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca/libs/libca/dwarfengine.cpp	2012-04-13 02:41:43.000000000 -0300
---- CodeAnalyst-3_3_18_0361-Public/src/ca/libs/libca/dwarfengine.cpp	2012-04-22 17:34:45.670714989 -0300
-***************
-*** 21,26 ****
---- 21,27 ----
-  #include <sys/types.h>
-  #include <sys/stat.h>
-  #include <fcntl.h>
-+ #include <unistd.h>
-  
-  #include "dwarfengine.h"
-  #define DWARF_DEBUG		0
-diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca/libs/libopdata/opdata_handler.cpp CodeAnalyst-3_3_18_0361-Public/src/ca/libs/libopdata/opdata_handler.cpp
-*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca/libs/libopdata/opdata_handler.cpp	2012-04-13 02:41:43.000000000 -0300
---- CodeAnalyst-3_3_18_0361-Public/src/ca/libs/libopdata/opdata_handler.cpp	2012-04-22 17:32:30.780708624 -0300
-***************
-*** 29,34 ****
---- 29,35 ----
-  #include <sys/stat.h>
-  #include <fcntl.h>
-  #include <time.h>
-+ #include <unistd.h>
-  
-  // CodeAnalyst headers
-  #include "CaProfileWriter.h"
-diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca_agent/libCAagent/slock.cpp CodeAnalyst-3_3_18_0361-Public/src/ca_agent/libCAagent/slock.cpp
-*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca_agent/libCAagent/slock.cpp	2012-04-13 02:41:43.000000000 -0300
---- CodeAnalyst-3_3_18_0361-Public/src/ca_agent/libCAagent/slock.cpp	2012-04-22 17:26:58.424026278 -0300
-***************
-*** 13,18 ****
---- 13,19 ----
-  #include <sys/ipc.h>
-  #include <sys/sem.h>
-  #include <sys/stat.h>
-+ #include <unistd.h>
-  
-  #include "slock.h"
-  #include "smm.h"
diff --git a/~lukeshu/not-working/codeanalyst/kernel3.4.patch b/~lukeshu/not-working/codeanalyst/kernel3.4.patch
deleted file mode 100644
index 589abc800..000000000
--- a/~lukeshu/not-working/codeanalyst/kernel3.4.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -ru kernel2.6.38/Makefile kernel3.4/Makefile
---- kernel2.6.38/Makefile	2012-04-13 01:41:43.000000000 -0400
-+++ kernel3.4/Makefile	2012-07-11 11:32:27.000000000 -0400
-@@ -1,6 +1,6 @@
- TARGET = oprofile.ko
- 
--MDIR = $(if $(shell uname -m | grep x86_64),arch/x86/oprofile,arch/x86/oprofile)
-+MDIR = arch/x86/oprofile
- 
- DRIVER_OBJS =   oprof.o cpu_buffer.o buffer_sync.o \
- 		event_buffer.o oprofile_files.o \
-@@ -16,7 +16,8 @@
- CURRENT = $(shell uname -r)
- ARCH = $(if $(shell uname -m | grep x86_64),64,32)
- KERN_ARCH = $(if $(shell uname -m | grep x86_64),x86_64,i386)
--KDIR = /lib/modules/$(CURRENT)/build
-+SYS_KDIR = /lib/modules/$(CURRENT)/build
-+KDIR = $(PWD)/../build
- PWD = $(shell pwd)
- DEST = /lib/modules/$(CURRENT)/kernel/$(MDIR)
- USE_INTERNAL_ERRATA = $(if $(shell ls ../internal/errata.h 2> /dev/null),1,0)
-@@ -39,6 +40,8 @@
- all: default
- 
- default:
-+	rm -rf $(KDIR)
-+	cp -r $(SYS_KDIR)/ $(KDIR)
- 	make -C $(KDIR) SUBDIRS=$(PWD) CFLAGS_MODULE+="-DMODULE -DUSE_INTERNAL_ERRATA=$(USE_INTERNAL_ERRATA)" modules ARCH=$(KERN_ARCH)
- 
- install:
-@@ -52,13 +55,12 @@
- 
- uninstall:
- 	@echo  "... Restore original oprofile.ko."
--	@mv -v $(DEST)/$(TARGET).orig $(DEST)/$(TARGET) 
-+	@mv -v $(DEST)/$(TARGET).orig $(DEST)/$(TARGET)
- 
- clean:
- 	rm -f *.o oprofile.ko .*.cmd .*.flags *.mod.c
- 
- prebuild: 
- 	cp $(TARGET) ../prebuilds/$(CURRENT)_$(ARCH).ko
--	
- 
---include $(KDIR)/Rules.make
-+-include $(SYS_KDIR)/Rules.make
-Only in kernel3.4/: modules.order
-Only in kernel3.4/: Module.symvers
-diff -ru kernel2.6.38/nmi_int.c kernel3.4/nmi_int.c
---- kernel2.6.38/nmi_int.c	2012-04-13 01:41:43.000000000 -0400
-+++ kernel3.4/nmi_int.c	2012-07-11 11:32:27.000000000 -0400
-@@ -16,7 +16,6 @@
- #include <linux/notifier.h>
- #include <linux/smp.h>
- #include "oprofile.h"
--#include <linux/sysdev.h>
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0) 
- #include <linux/syscore_ops.h>
- #endif
-diff -ru kernel2.6.38/oprofilefs.c kernel3.4/oprofilefs.c
---- kernel2.6.38/oprofilefs.c	2012-04-13 01:41:43.000000000 -0400
-+++ kernel3.4/oprofilefs.c	2012-07-11 11:32:27.000000000 -0400
-@@ -244,7 +244,7 @@
- 		return -ENOMEM;
- 	root_inode->i_op = &simple_dir_inode_operations;
- 	root_inode->i_fop = &simple_dir_operations;
--	root_dentry = d_alloc_root(root_inode);
-+	root_dentry = d_make_root(root_inode);
- 	if (!root_dentry) {
- 		iput(root_inode);
- 		return -ENOMEM;
-Only in kernel3.4/: .tmp_versions
diff --git a/~lukeshu/not-working/codeanalyst/skipSetup.patch b/~lukeshu/not-working/codeanalyst/skipSetup.patch
deleted file mode 100644
index fdc9bf42f..000000000
--- a/~lukeshu/not-working/codeanalyst/skipSetup.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca/Makefile.am CodeAnalyst-3_3_18_0361-Public/src/ca/Makefile.am
-*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca/Makefile.am	2012-04-13 02:41:43.000000000 -0300
---- CodeAnalyst-3_3_18_0361-Public/src/ca/Makefile.am	2012-04-22 20:44:07.437917684 -0300
-***************
-*** 8,19 ****
-  # FIXME	[3.0] diffgui \
-  #    $(CA_RELEASE_TYPE)
-  
-! install-exec-hook:
-! 	@if test -e "scripts/Setup.sh"; then \
-! 		scripts/Setup.sh $(DESTDIR)$(prefix); \
-! 	fi
-  
-! uninstall-hook:
-! 	@if test -e "scripts/Uninstall.sh"; then \
-! 		scripts/Uninstall.sh $(DESTDIR)$(prefix);\
-! 	fi
---- 8,19 ----
-  # FIXME	[3.0] diffgui \
-  #    $(CA_RELEASE_TYPE)
-  
-! #install-exec-hook:
-! #	@if test -e "scripts/Setup.sh"; then \
-! #		scripts/Setup.sh $(DESTDIR)$(prefix); \
-! #	fi
-  
-! #uninstall-hook:
-! #	@if test -e "scripts/Uninstall.sh"; then \
-! #		scripts/Uninstall.sh $(DESTDIR)$(prefix);\
-! #	fi
-diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca_agent/jvmpi/Makefile.am CodeAnalyst-3_3_18_0361-Public/src/ca_agent/jvmpi/Makefile.am
-*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca_agent/jvmpi/Makefile.am	2012-04-13 02:41:43.000000000 -0300
---- CodeAnalyst-3_3_18_0361-Public/src/ca_agent/jvmpi/Makefile.am	2012-04-22 20:47:21.604593511 -0300
-***************
-*** 15,20 ****
-  libCAJVMPIA_so_SOURCES = \
-      jpa.cpp 
-      
-! install-exec-hook:
-! 	@/sbin/ldconfig
-  
---- 15,20 ----
-  libCAJVMPIA_so_SOURCES = \
-      jpa.cpp 
-      
-! #install-exec-hook:
-! #	@/sbin/ldconfig
-  
-diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/Makefile.am CodeAnalyst-3_3_18_0361-Public/src/Makefile.am
-*** CodeAnalyst-3_3_18_0361-Public.orig/src/Makefile.am	2012-04-13 02:41:43.000000000 -0300
---- CodeAnalyst-3_3_18_0361-Public/src/Makefile.am	2012-04-22 20:44:57.674586720 -0300
-***************
-*** 8,21 ****
-  install-exec-hook:
-  	@if test -e "${LIBDWARF_DIR}libdwarf.so"; then \
-  		install -pD -m 755 ${LIBDWARF_DIR}libdwarf.so $(DESTDIR)$(prefix)/lib/libdwarf.so ; \
-- 		/sbin/ldconfig ;\
-  	fi
-  
-  uninstall-hook:
-  	@if test -e "${LIBDWARF_DIR}libdwarf.so"; then \
-  		if test -e "$(DESTDIR)$(prefix)/lib/libdwarf.so"; then \
-  			rm -f $(DESTDIR)$(prefix)/lib/libdwarf.so ; \
-- 			/sbin/ldconfig ; \
-  		fi ; \
-  	fi
-  
---- 8,19 ----
diff --git a/~lukeshu/openni-all/openni-git/PKGBUILD b/~lukeshu/openni-all/openni-git/PKGBUILD
deleted file mode 100644
index 7ac6abb87..000000000
--- a/~lukeshu/openni-all/openni-git/PKGBUILD
+++ /dev/null
@@ -1,286 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor: Sven Schneider <archlinux.sandmann@googlemail.com>
-# Contributor: bugix
-# Contributor: Lubosz Sarnecki <lubosz at gmail>
-
-# unfortunately we can't use $_suf in function names, but sed makes it ok
-_suf='-git'
-pkgname=(
-    openni$_suf
-    openni$_suf-docs
-
-    openni$_suf-core
-    openni$_suf-core-samples
-    openni$_suf-core-samples-source
-    
-    openni$_suf-mono
-    openni$_suf-mono-samples
-    openni$_suf-mono-samples-source
-
-    openni$_suf-java
-    openni$_suf-java-samples
-    openni$_suf-java-samples-source
-    )
-pkgver=20111121
-pkgrel=4
-arch=('i686' 'x86_64')
-url="http://www.openni.org/"
-license=('GPL')
-makedepends=('git' 'doxygen' 'graphviz')
-source=()
-md5sums=()
-
-_gitroot="git://github.com/OpenNI/OpenNI.git"
-_gitname="openni"
-#_gitbranch="unstable"
-_gitbranch="master"
-
-_os='Linux'
-case "${CARCH}" in
-'x86_64') _arch=x86;;
-'i686')   _arch=x86;;
-'arm')    _arch=Arm;; # untested
-*)        _arch=UNSUPPORTED_ARCH;;
-esac
-_platform="${_os}-${_arch}"
-
-export MAKEFLAGS+=' -j1 '
-
-build() {
-  cd "${srcdir}"
-  msg "Connecting to GIT server...."
-
-  if [ -d ${_gitname} ] ; then
-    cd ${_gitname}
-    git checkout master
-    git pull origin
-    msg "The local files are updated."
-  else
-    git clone ${_gitroot} ${_gitname}
-    cd ${_gitname}
-  fi
-  git checkout ${_gitbranch}
-  cd ..
-
-  msg "GIT checkout done or server timeout"
-  msg "Starting make..."
-
-  rm -rf "${srcdir}/${_gitname}-build"
-  git clone "${srcdir}/${_gitname}" "${srcdir}/${_gitname}-build"
-  cd "${srcdir}/${_gitname}-build"
-
-  # PATCH
-  sed -i 's/python /python2 /' "Platform/${_platform}/CreateRedist/RedistMaker"
-  echo '
-abs_core: $(ALL_MODULES) $(ALL_UTILS)
-abs_core_samples: $(CORE_SAMPLES)
-abs_java: $(ALL_JAVA_PROJS)
-abs_java_samples: $(JAVA_SAMPLES)
-abs_mono: $(ALL_MONO_PROJS)
-abs_mono_samples: $(MONO_SAMPLES) $(MONO_FORMS_SAMPLES)
-' >> "Platform/${_platform}/Build/Makefile"
-
-  
-  # BUILD
-  cd "Platform/${_platform}/Build"
-  make -j1 \
-      abs_core abs_core_samples \
-      abs_java abs_java_samples \
-      abs_mono abs_mono_samples || return 1
-
-  cd '../../../Source/DoxyGen'
-  mkdir html
-  doxygen Doxyfile
-  rm -rf html/*.map html*.md5 html/*.hhc html/*.hhp
-}
-
-package_openni-git() {
-  pkgdesc="Open Natural Interface framework"
-  depends=("openni$_suf-core")
-  optdepends=("openni$_suf-docs: programmer documentation")
-  provides=('openni')
-  conflicts=('openni')
-}
-
-package_openni-git-docs() {
-  pkgdesc="OpenNI programmer documentation"
-  arch=('any')
-  provides=('openni-docs')
-  conflicts=('openni-docs')
-
-  cd "${srcdir}/${_gitname}-build/Source/DoxyGen/"
-  install -d "${pkgdir}/usr/share/openni"
-  cp -r html "${pkgdir}/usr/share/openni"
-}
-
-package_openni-git-core() {
-  pkgdesc="OpenNI core libraries"
-  depends=('libusb' 'freeglut')
-  install="openni.install"
-  provides=('openni-core')
-  conflicts=('openni-core')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release"
-
-  LIB_FILES='
-    libnimCodecs.so
-    libnimMockNodes.so
-    libnimRecorder.so
-    libOpenNI.so
-    '
-  install -d "${pkgdir}/usr/lib"
-  install -m755 $LIB_FILES "${pkgdir}/usr/lib"
-
-  BIN_FILES='niReg niLicense'
-  install -d "${pkgdir}/usr/bin"
-  install -m755 $BIN_FILES "${pkgdir}/usr/bin"
-
-  cd "${srcdir}/${_gitname}-build/Include"
-  install -d "${pkgdir}/usr/include/ni"
-  install -m644 *.h "${pkgdir}/usr/include/ni"
-  cp -r "${_platform}" "${pkgdir}/usr/include/ni"
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Build"
-  install -d "${pkgdir}/usr/share"
-  cp -r Common "${pkgdir}/usr/share/common"
-}
-
-package_openni-git-java() {
-  pkgdesc="OpenNI java wrapper"
-  depends=("openni$_suf" 'java-environment')
-  provides=('openni-java')
-  conflicts=('openni-java')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release"
-
-  install -d "${pkgdir}/usr/lib"
-  install -m755 libOpenNI.jni.so "${pkgdir}/usr/lib"
-  
-  install -d "${pkgdir}/usr/share/openni/java"
-  install -m755 org.OpenNI.jar "${pkgdir}/usr/share/openni/java"
-}
-
-package_openni-git-mono() {
-  pkgdesc="OpenNI mono wrapper"
-  depends=("openni$_suf" 'mono')
-  provides=('openni-mono')
-  conflicts=('openni-mono')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release"
-  
-  install -d "${pkgdir}/usr/share/openni/mono"
-  install -m755 OpenNI.net.dll "${pkgdir}/usr/share/openni/mono"
-}
-
-# SAMPLES
-
-_install_sample_source() {
-  sample=$1
-  makefile="Platform/${_platform}/Build/Samples/$sample/Makefile"
-  install -d                "${pkgdir}/usr/share/openni/samples"
-  cp -r "Samples/$sample"   "${pkgdir}/usr/share/openni/samples/$sample"
-  install -m644 "$makefile" "${pkgdir}/usr/share/openni/samples/$sample"
-}
-
-# Leave out NiViewer, it's set up wrong
-CORE_SAMPLES='
-  AudioSample
-  BackRecorder
-  CRead
-  ConvertXToONI
-  RecordSynthetic
-  SimpleCreate
-              SimpleRead SimpleViewer UserTracker'
-MONO_SAMPLES='SimpleRead SimpleViewer UserTracker'
-JAVA_SAMPLES='SimpleRead SimpleViewer UserTracker'
-
-package_openni-git-core-samples() {
-  pkgdesc="OpenNI sample programs"
-  depends=("openni$_suf-core")
-  optdepends=('openni-core-samples-source: source code for the samples')
-  provides=('openni-core-samples')
-  conflicts=('openni-core-samples')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release"
-  install -d "${pkgdir}/usr/bin"
-  install -m755 NiViewer "${pkgdir}/usr/bin/niSample-Viewer"
-  for sample in $CORE_SAMPLES; do
-    install -m766 Sample-Ni$sample "${pkgdir}/usr/bin/niSample-$sample"
-  done
-}
-package_openni-git-core-samples-source() {
-  pkgdesc="OpenNI sample programs source code"
-  depends=("openni$_suf-core")
-  provides=('openni-core-samples-source')
-  conflicts=('openni-core-samples-source')
-  options+=('!strip')
-
-  cd "${srcdir}/${_gitname}-build"
-  for sample in Viewer $CORE_SAMPLES; do
-    _install_sample_source Ni$sample
-  done
-}
-
-package_openni-git-java-samples() {
-  pkgdesc="OpenNI java wrapper sample programs"
-  depends=("openni$_suf-java")
-  optdepends=("openni$_suf-java-samples-source: source code for the samples")
-  arch=('any')
-  provides=('openni-java-samples')
-  conflicts=('openni-java-samples')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release"
-  install -d "${pkgdir}/usr/bin"
-  install -d "${pkgdir}/usr/share/openni/java"
-  for sample in $JAVA_SAMPLES; do
-    install -m644 org.OpenNI.Samples.$sample.jar "${pkgdir}/usr/share/openni/java"
-    echo "#/bin/sh
-java -jar /usr/share/openni/java/org.OpenNI.Samples.$sample.jar $@
-" > "${pkgdir}/usr/bin/niSample-$sample.jar"
-    chmod 755 "${pkgdir}/usr/bin/niSample-$sample.jar"
-  done
-}
-package_openni-git-java-samples-source() {
-  pkgdesc="OpenNI java wrapper sample programs source code"
-  depends=("openni$_suf-java")
-  provides=('openni-java-samples-source')
-  conflicts=('openni-java-samples-source')
-  options+=('!strip')
-
-  cd "${srcdir}/${_gitname}-build"
-  for sample in $JAVA_SAMPLES; do
-    _install_sample_source $sample.java
-  done
-}
-
-package_openni-git-mono-samples() {
-  pkgdesc="OpenNI java wrapper sample programs"
-  depends=("openni$_suf-mono")
-  optdepends=("openni$_suf-mono-samples-source: source code for the samples")
-  provides=('openni-mono-samples')
-  conflicts=('openni-mono-samples')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release"
-  install -d "${pkgdir}/usr/bin"
-  install -d "${pkgdir}/usr/share/openni/mono"
-  for sample in $MONO_SAMPLES; do
-    install -m755 $sample.net.exe "${pkgdir}/usr/share/openni/mono"
-    echo "#/bin/sh
-cd /usr/share/openni/mono
-mono $sample.net.exe $@
-" > "${pkgdir}/usr/bin/niSample-$sample.net"
-    chmod 755 "${pkgdir}/usr/bin/niSample-$sample.net"
-  done
-}
-package_openni-git-mono-samples-source() {
-  pkgdesc="OpenNI mono wrapper sample programs source code"
-  depends=("openni$_suf-mono")
-  provides=('openni-mono-samples-source')
-  conflicts=('openni-mono-samples-source')
-  options+=('!strip')
-
-  cd "${srcdir}/${_gitname}-build"
-  for sample in $MONO_SAMPLES; do
-    _install_sample_source $sample.net
-  done
-}
diff --git a/~lukeshu/openni-all/openni-git/openni.install b/~lukeshu/openni-all/openni-git/openni.install
deleted file mode 100644
index 8470f4512..000000000
--- a/~lukeshu/openni-all/openni-git/openni.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	MODULES="libnimMockNodes.so libnimCodecs.so libnimRecorder.so"
-	for module in $MODULES
-	do 
-		/usr/bin/niReg /usr/lib/$module
-	done
-}
-
-pre_remove() {
-	rm /var/lib/ni/modules.xml
-}
diff --git a/~lukeshu/openni-all/openni-module-primesensor-git/PKGBUILD b/~lukeshu/openni-all/openni-module-primesensor-git/PKGBUILD
deleted file mode 100644
index 0ebfac2e5..000000000
--- a/~lukeshu/openni-all/openni-module-primesensor-git/PKGBUILD
+++ /dev/null
@@ -1,65 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor: pallegro from the AUR
-
-_pkgname=openni-module-primesensor
-pkgname=${_pkgname}-git
-pkgver=20111115
-pkgrel=1
-pkgdesc="OpenNI PrimeSensor harware modules for the PrimeSense sensor device"
-arch=('i686')
-url="http://www.primesense.com/"
-license=('GPL')
-depends=('openni')
-makedepends=('git')
-provides=($_pkgname)
-conflicts=($_pkgname)
-install="sensorkinect.install"
-source=()
-md5sums=()
-
-_gitroot="https://github.com/PrimeSense/Sensor.git"
-_gitname="primesensor"
-_gitbranch="unstable"
-#_gitbranch="master"
-
-build() {
-  cd "$srcdir"
-  msg "Connecting to GIT server...."
-
-  if [ -d $_gitname ] ; then
-    cd $_gitname && git pull origin
-    msg "The local files are updated."
-  else
-    git clone -b $_gitbranch $_gitroot $_gitname
-  fi
-
-  msg "GIT checkout done or server timeout"
-  msg "Starting make..."
-
-  rm -rf "$srcdir/$_gitname-build"
-  git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build"
-  cd $srcdir/$_gitname-build
-
-  # BUILD
-  cd Platform/Linux-x86/Build
-  make NI_CONF_DIR=/etc || return 1
-}
-
-package() {
-  install -d -m755 ${pkgdir}/usr/{lib,bin}
-
-  cd $srcdir/$_gitname-build/Platform/Linux-x86/Bin/Release
-  install XnSensorServer ${pkgdir}/usr/bin
-  install libXnCore.so libXnDDK.so libXnDeviceFile.so libXnDeviceSensorV2KM.so libXnFormats.so ${pkgdir}/usr/lib
-  chmod +s ${pkgdir}/usr/bin/XnSensorServer
-
-  cd $srcdir/$_gitname-build/Platform/Linux-x86/Install
-  install -d -m755 ${pkgdir}/etc/udev/rules.d
-  install 55-primesense-usb.rules ${pkgdir}/etc/udev/rules.d
-
-  cd $srcdir/$_gitname-build/Data
-  install -d -m755 ${pkgdir}/etc/primesense
-  install GlobalDefaultsKinect.ini ${pkgdir}/etc/primesense
-
-  install -d -m777 ${pkgdir}/var/log/primesense/XnSensorServer 
-}
diff --git a/~lukeshu/openni-all/openni-module-sensorkinect-git/PKGBUILD b/~lukeshu/openni-all/openni-module-sensorkinect-git/PKGBUILD
deleted file mode 100644
index 2a2abbdc5..000000000
--- a/~lukeshu/openni-all/openni-module-sensorkinect-git/PKGBUILD
+++ /dev/null
@@ -1,77 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor: pallegro from the AUR
-
-pkgname=openni-module-sensorkinect-git
-pkgver=20111211
-pkgrel=2
-pkgdesc="OpenNI SensorKinect harware modules for the Xbox Kinect device"
-arch=('i686' 'x86_64')
-url="https://github.com/avin2/SensorKinect"
-license=('GPL')
-depends=('openni-unstable' 'kinect-udev')
-makedepends=('git')
-provides=('openni-module-sensorkinect')
-conflicts=('openni-module-sensorkinect' 'openni-module-primesensor')
-install="sensorkinect.install"
-source=()
-md5sums=()
-
-_gitroot="https://github.com/avin2/SensorKinect.git"
-_gitname="sensorkinect"
-_gitbranch="master"
-
-_os='Linux'
-case "${CARCH}" in
-'x86_64') _arch=x86;;
-'i686')   _arch=x86;;
-'arm')    _arch=Arm;; # untested
-*)        _arch=UNSUPPORTED_ARCH;;
-esac
-_platform="${_os}-${_arch}"
-
-build() {
-  cd "$srcdir"
-  msg "Connecting to GIT server...."
-
-  if [ -d ${_gitname} ] ; then
-    cd ${_gitname}
-    git checkout master
-    git pull origin
-    msg "The local files are updated."
-  else
-    git clone ${_gitroot} ${_gitname}
-    cd ${_gitname}
-  fi
-  git checkout ${_gitbranch}
-  cd ..
-
-  msg "GIT checkout done or server timeout"
-  msg "Starting build..."
-
-  rm -rf "$srcdir/$_gitname-build"
-  git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build"
-  cd $srcdir/$_gitname-build
-
-  # BUILD
-  cd Platform/${_platform}/Build
-  make
-  make redist
-}
-
-package() {
-  cd $srcdir/$_gitname-build
-  cd Platform/${_platform}/Redist
-
-  # This is all cloned from ./install.sh, which can't be used for a number
-  # of reasons.
-  install -d $pkgdir/usr/{lib,bin}
-  install -m755 Lib/* $pkgdir/usr/lib
-  install -m755 Bin/* $pkgdir/usr/bin
-
-  install -d $pkgdir/etc/primesense
-  install -m644 Config/GlobalDefaultsKinect.ini $pkgdir/etc/primesense
-
-  chmod +s $pkgdir/usr/bin/XnSensorServer
-
-  install -m777 -d $pkgdir/var/log/primesense/XnSensorServer
-}
diff --git a/~lukeshu/openni-all/openni-module-sensorkinect-git/sensorkinect.install b/~lukeshu/openni-all/openni-module-sensorkinect-git/sensorkinect.install
deleted file mode 100644
index d62d263d1..000000000
--- a/~lukeshu/openni-all/openni-module-sensorkinect-git/sensorkinect.install
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-export MODULES="libXnDeviceSensorV2KM.so libXnDeviceFile.so"
-
-post_install() {
-	for module in $MODULES; do
-		/usr/bin/niReg -r /usr/lib/$module /etc/primesense
-	done
-}
-
-pre_remove() {
-	for module in $MODULES;	do 
-		/usr/bin/niReg -u /usr/lib/$module
-	done
-}
diff --git a/~lukeshu/openni-all/openni-unstable-git/PKGBUILD b/~lukeshu/openni-all/openni-unstable-git/PKGBUILD
deleted file mode 100644
index 07f276b02..000000000
--- a/~lukeshu/openni-all/openni-unstable-git/PKGBUILD
+++ /dev/null
@@ -1,286 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor: Sven Schneider <archlinux.sandmann@googlemail.com>
-# Contributor: bugix
-# Contributor: Lubosz Sarnecki <lubosz at gmail>
-
-# unfortunately we can't use $_suf in function names, but sed makes it ok
-_suf='-unstable-git'
-pkgname=(
-    openni$_suf
-    openni$_suf-docs
-
-    openni$_suf-core
-    openni$_suf-core-samples
-    openni$_suf-core-samples-source
-    
-    openni$_suf-mono
-    openni$_suf-mono-samples
-    openni$_suf-mono-samples-source
-
-    openni$_suf-java
-    openni$_suf-java-samples
-    openni$_suf-java-samples-source
-    )
-pkgver=20111121
-pkgrel=4
-arch=('i686' 'x86_64')
-url="http://www.openni.org/"
-license=('GPL')
-makedepends=('git' 'doxygen' 'graphviz')
-source=()
-md5sums=()
-
-_gitroot="git://github.com/OpenNI/OpenNI.git"
-_gitname="openni"
-_gitbranch="unstable"
-#_gitbranch="master"
-
-_os='Linux'
-case "${CARCH}" in
-'x86_64') _arch=x86;;
-'i686')   _arch=x86;;
-'arm')    _arch=Arm;; # untested
-*)        _arch=UNSUPPORTED_ARCH;;
-esac
-_platform="${_os}-${_arch}"
-
-export MAKEFLAGS+=' -j1 '
-
-build() {
-  cd "${srcdir}"
-  msg "Connecting to GIT server...."
-
-  if [ -d ${_gitname} ] ; then
-    cd ${_gitname}
-    git checkout master
-    git pull origin
-    msg "The local files are updated."
-  else
-    git clone ${_gitroot} ${_gitname}
-    cd ${_gitname}
-  fi
-  git checkout ${_gitbranch}
-  cd ..
-
-  msg "GIT checkout done or server timeout"
-  msg "Starting make..."
-
-  rm -rf "${srcdir}/${_gitname}-build"
-  git clone "${srcdir}/${_gitname}" "${srcdir}/${_gitname}-build"
-  cd "${srcdir}/${_gitname}-build"
-
-  # PATCH
-  sed -i 's/python /python2 /' "Platform/${_os}/CreateRedist/RedistMaker"
-  echo '
-abs_core: $(ALL_MODULES) $(ALL_UTILS)
-abs_core_samples: $(CORE_SAMPLES)
-abs_java: $(ALL_JAVA_PROJS)
-abs_java_samples: $(JAVA_SAMPLES)
-abs_mono: $(ALL_MONO_PROJS)
-abs_mono_samples: $(MONO_SAMPLES) $(MONO_FORMS_SAMPLES)
-' >> "Platform/${_os}/Build/Makefile"
-
-  
-  # BUILD
-  cd "Platform/${_os}/Build"
-  make -j1 \
-      abs_core abs_core_samples \
-      abs_java abs_java_samples \
-      abs_mono abs_mono_samples || return 1
-
-  cd '../../../Source/DoxyGen'
-  mkdir html
-  doxygen Doxyfile
-  rm -rf html/*.map html*.md5 html/*.hhc html/*.hhp
-}
-
-package_openni-unstable-git() {
-  pkgdesc="Open Natural Interface framework"
-  depends=("openni$_suf-core")
-  optdepends=("openni$_suf-docs: programmer documentation")
-  provides=('openni' 'openni-unstable')
-  conflicts=('openni' 'openni-unstable')
-}
-
-package_openni-unstable-git-docs() {
-  pkgdesc="OpenNI programmer documentation"
-  arch=('any')
-  provides=('openni-docs' 'openni-unstable-docs')
-  conflicts=('openni-docs' 'openni-unstable-docs')
-
-  cd "${srcdir}/${_gitname}-build/Source/DoxyGen/"
-  install -d "${pkgdir}/usr/share/openni"
-  cp -r html "${pkgdir}/usr/share/openni"
-}
-
-package_openni-unstable-git-core() {
-  pkgdesc="OpenNI core libraries"
-  depends=('libusb' 'freeglut')
-  install="openni.install"
-  provides=('openni-core' 'openni-unstable-core')
-  conflicts=('openni-core' 'openni-unstable-core')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release"
-
-  LIB_FILES='
-    libnimCodecs.so
-    libnimMockNodes.so
-    libnimRecorder.so
-    libOpenNI.so
-    '
-  install -d "${pkgdir}/usr/lib"
-  install -m755 $LIB_FILES "${pkgdir}/usr/lib"
-
-  BIN_FILES='niReg niLicense'
-  install -d "${pkgdir}/usr/bin"
-  install -m755 $BIN_FILES "${pkgdir}/usr/bin"
-
-  cd "${srcdir}/${_gitname}-build/Include"
-  install -d "${pkgdir}/usr/include/ni"
-  install -m644 *.h "${pkgdir}/usr/include/ni"
-  cp -r "${_platform}" "${pkgdir}/usr/include/ni"
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Build"
-  install -d "${pkgdir}/usr/share"
-  cp -r Common "${pkgdir}/usr/share/common"
-}
-
-package_openni-unstable-git-java() {
-  pkgdesc="OpenNI java wrapper"
-  depends=("openni$_suf" 'java-environment')
-  provides=('openni-java' 'openni-unstable-java')
-  conflicts=('openni-java' 'openni-unstable-java')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release"
-
-  install -d "${pkgdir}/usr/lib"
-  install -m755 libOpenNI.jni.so "${pkgdir}/usr/lib"
-  
-  install -d "${pkgdir}/usr/share/openni/java"
-  install -m755 org.OpenNI.jar "${pkgdir}/usr/share/openni/java"
-}
-
-package_openni-unstable-git-mono() {
-  pkgdesc="OpenNI mono wrapper"
-  depends=("openni$_suf" 'mono')
-  provides=('openni-mono' 'openni-unstable-mono')
-  conflicts=('openni-mono' 'openni-unstable-mono')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release"
-  
-  install -d "${pkgdir}/usr/share/openni/mono"
-  install -m755 OpenNI.net.dll "${pkgdir}/usr/share/openni/mono"
-}
-
-# SAMPLES
-
-_install_sample_source() {
-  sample=$1
-  makefile="Platform/${_os}/Build/Samples/$sample/Makefile"
-  install -d                "${pkgdir}/usr/share/openni/samples"
-  cp -r "Samples/$sample"   "${pkgdir}/usr/share/openni/samples/$sample"
-  install -m644 "$makefile" "${pkgdir}/usr/share/openni/samples/$sample"
-}
-
-# Leave out NiViewer, it's set up wrong
-CORE_SAMPLES='
-  AudioSample
-  BackRecorder
-  CRead
-  ConvertXToONI
-  RecordSynthetic
-  SimpleCreate
-              SimpleRead SimpleViewer UserTracker'
-MONO_SAMPLES='SimpleRead SimpleViewer UserTracker'
-JAVA_SAMPLES='SimpleRead SimpleViewer UserTracker'
-
-package_openni-unstable-git-core-samples() {
-  pkgdesc="OpenNI sample programs"
-  depends=("openni$_suf-core")
-  optdepends=('openni-core-samples-source: source code for the samples')
-  provides=('openni-core-samples' 'openni-unstable-core-samples')
-  conflicts=('openni-core-samples' 'openni-unstable-core-samples')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release"
-  install -d "${pkgdir}/usr/bin"
-  install -m755 NiViewer "${pkgdir}/usr/bin/niSample-Viewer"
-  for sample in $CORE_SAMPLES; do
-    install -m766 Sample-Ni$sample "${pkgdir}/usr/bin/niSample-$sample"
-  done
-}
-package_openni-unstable-git-core-samples-source() {
-  pkgdesc="OpenNI sample programs source code"
-  depends=("openni$_suf-core")
-  provides=('openni-core-samples-source' 'openni-unstable-core-samples-source')
-  conflicts=('openni-core-samples-source' 'openni-unstable-core-samples-source')
-  options+=('!strip')
-
-  cd "${srcdir}/${_gitname}-build"
-  for sample in Viewer $CORE_SAMPLES; do
-    _install_sample_source Ni$sample
-  done
-}
-
-package_openni-unstable-git-java-samples() {
-  pkgdesc="OpenNI java wrapper sample programs"
-  depends=("openni$_suf-java")
-  optdepends=("openni$_suf-java-samples-source: source code for the samples")
-  arch=('any')
-  provides=('openni-java-samples' 'openni-unstable-java-samples')
-  conflicts=('openni-java-samples' 'openni-unstable-java-samples')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release"
-  install -d "${pkgdir}/usr/bin"
-  install -d "${pkgdir}/usr/share/openni/java"
-  for sample in $JAVA_SAMPLES; do
-    install -m644 org.OpenNI.Samples.$sample.jar "${pkgdir}/usr/share/openni/java"
-    echo "#/bin/sh
-java -jar /usr/share/openni/java/org.OpenNI.Samples.$sample.jar $@
-" > "${pkgdir}/usr/bin/niSample-$sample.jar"
-    chmod 755 "${pkgdir}/usr/bin/niSample-$sample.jar"
-  done
-}
-package_openni-unstable-git-java-samples-source() {
-  pkgdesc="OpenNI java wrapper sample programs source code"
-  depends=("openni$_suf-java")
-  provides=('openni-java-samples-source' 'openni-unstable-java-samples-source')
-  conflicts=('openni-java-samples-source' 'openni-unstable-java-samples-source')
-  options+=('!strip')
-
-  cd "${srcdir}/${_gitname}-build"
-  for sample in $JAVA_SAMPLES; do
-    _install_sample_source $sample.java
-  done
-}
-
-package_openni-unstable-git-mono-samples() {
-  pkgdesc="OpenNI java wrapper sample programs"
-  depends=("openni$_suf-mono")
-  optdepends=("openni$_suf-mono-samples-source: source code for the samples")
-  provides=('openni-mono-samples' 'openni-unstable-mono-samples')
-  conflicts=('openni-mono-samples' 'openni-unstable-mono-samples')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release"
-  install -d "${pkgdir}/usr/bin"
-  install -d "${pkgdir}/usr/share/openni/mono"
-  for sample in $MONO_SAMPLES; do
-    install -m755 $sample.net.exe "${pkgdir}/usr/share/openni/mono"
-    echo "#/bin/sh
-cd /usr/share/openni/mono
-mono $sample.net.exe $@
-" > "${pkgdir}/usr/bin/niSample-$sample.net"
-    chmod 755 "${pkgdir}/usr/bin/niSample-$sample.net"
-  done
-}
-package_openni-unstable-git-mono-samples-source() {
-  pkgdesc="OpenNI mono wrapper sample programs source code"
-  depends=("openni$_suf-mono")
-  provides=('openni-mono-samples-source' 'openni-unstable-mono-samples-source')
-  conflicts=('openni-mono-samples-source' 'openni-unstable-mono-samples-source')
-  options+=('!strip')
-
-  cd "${srcdir}/${_gitname}-build"
-  for sample in $MONO_SAMPLES; do
-    _install_sample_source $sample.net
-  done
-}
diff --git a/~lukeshu/openni-all/openni-unstable-git/openni.install b/~lukeshu/openni-all/openni-unstable-git/openni.install
deleted file mode 100644
index 8470f4512..000000000
--- a/~lukeshu/openni-all/openni-unstable-git/openni.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	MODULES="libnimMockNodes.so libnimCodecs.so libnimRecorder.so"
-	for module in $MODULES
-	do 
-		/usr/bin/niReg /usr/lib/$module
-	done
-}
-
-pre_remove() {
-	rm /var/lib/ni/modules.xml
-}
diff --git a/~lukeshu/openni-all/openni-unstable/PKGBUILD b/~lukeshu/openni-all/openni-unstable/PKGBUILD
deleted file mode 100644
index 19d1575a1..000000000
--- a/~lukeshu/openni-all/openni-unstable/PKGBUILD
+++ /dev/null
@@ -1,294 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor: Sven Schneider <archlinux.sandmann@googlemail.com>
-# Contributor: bugix
-# Contributor: Lubosz Sarnecki <lubosz at gmail>
-
-# unfortunately we can't use $_suf in function names, but sed makes it ok
-_suf='-unstable'
-pkgname=(
-    openni$_suf
-    openni$_suf-docs
-
-    openni$_suf-core
-    openni$_suf-core-samples
-    openni$_suf-core-samples-source
-    
-    openni$_suf-mono
-    openni$_suf-mono-samples
-    openni$_suf-mono-samples-source
-
-    openni$_suf-java
-    openni$_suf-java-samples
-    openni$_suf-java-samples-source
-    )
-pkgver=1.4.0.2
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://www.openni.org/"
-license=('GPL')
-makedepends=('git' 'doxygen' 'graphviz')
-options+=('!strip')
-source=()
-md5sums=()
-
-__gitroot="git://github.com/OpenNI/OpenNI.git"
-_gitname="openni"
-_gitbranch="Unstable-$pkgver"
-
-_os='Linux'
-case "${CARCH}" in
-'x86_64') _arch=x64;;
-'i686')   _arch=x86;;
-'arm')    _arch=Arm;; # untested
-*)        _arch=UNSUPPORTED_ARCH;;
-esac
-_platform="${_os}-${_arch}"
-
-export MAKEFLAGS+=' -j1 '
-
-build() {
-  cd "${srcdir}"
-  msg "Connecting to GIT server...."
-
-  #if [ -d ${_gitname} ] ; then
-    cd ${_gitname}
-  #  git checkout master
-  #  git pull origin
-  #  msg "The local files are updated."
-  #else
-  #  git clone ${__gitroot} ${_gitname}
-  #  cd ${_gitname}
-  #fi
-  git checkout ${_gitbranch}
-  cd ..
-
-  msg "GIT checkout done or server timeout"
-  msg "Starting build..."
-
-  #rm -rf "${srcdir}/${_gitname}-build"
-  #git clone "${srcdir}/${_gitname}" "${srcdir}/${_gitname}-build"
-  cd "${srcdir}/${_gitname}-build"
-
-  # PATCH
-  sed -i 's/python /python2 /' "Platform/${_os}/CreateRedist/RedistMaker"
-
-  for sample in NiViewer NiSimpleViewer NiUserTracker NiUserSelection NiHandTracker; do
-      echo 'USED_LIBS += GL' >> "Platform/${_os}/Build/Samples/${sample}/Makefile"
-  done
-
-  echo '
-abs_core: $(ALL_MODULES) $(ALL_UTILS)
-abs_core_samples: $(CORE_SAMPLES)
-abs_java: $(ALL_JAVA_PROJS)
-abs_java_samples: $(JAVA_SAMPLES)
-abs_mono: $(ALL_MONO_PROJS)
-abs_mono_samples: $(MONO_SAMPLES) $(MONO_FORMS_SAMPLES)
-' >> "Platform/${_os}/Build/Makefile"
-
-  
-  # BUILD
-  cd "Platform/${_os}/Build"
-  make -j1 \
-      abs_core abs_core_samples \
-      abs_java abs_java_samples \
-      abs_mono abs_mono_samples
-  cd "../Bin/${_arch}-Release"
-  ln NiViewer Sample-NiViewer
-
-  cd '../../../Source/DoxyGen'
-  mkdir html
-  doxygen Doxyfile
-  rm -rf html/*.map html*.md5 html/*.hhc html/*.hhp
-}
-
-package_openni-unstable() {
-  pkgdesc="Open Natural Interface framework"
-  depends=("openni$_suf-core")
-  optdepends=("openni$_suf-docs: programmer documentation")
-  provides=('openni')
-  conflicts=('openni')
-}
-
-package_openni-unstable-docs() {
-  pkgdesc="OpenNI programmer documentation"
-  arch=('any')
-  provides=('openni-docs')
-  conflicts=('openni-docs')
-
-  cd "${srcdir}/${_gitname}-build/Source/DoxyGen/"
-  install -d "${pkgdir}/usr/share/openni"
-  cp -r html "${pkgdir}/usr/share/openni"
-}
-
-package_openni-unstable-core() {
-  pkgdesc="OpenNI core libraries"
-  depends=('libusb' 'freeglut')
-  install="openni-core.install"
-  provides=('openni-core')
-  conflicts=('openni-core')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release"
-
-  LIB_FILES='
-    libnimCodecs.so
-    libnimMockNodes.so
-    libnimRecorder.so
-    libOpenNI.so
-    '
-  install -d "${pkgdir}/usr/lib"
-  install -m755 $LIB_FILES "${pkgdir}/usr/lib"
-
-  BIN_FILES='niReg niLicense'
-  install -d "${pkgdir}/usr/bin"
-  install -m755 $BIN_FILES "${pkgdir}/usr/bin"
-
-  cd "${srcdir}/${_gitname}-build/Include"
-  install -d "${pkgdir}/usr/include/ni"
-  install -m644 *.h "${pkgdir}/usr/include/ni"
-  cp -r "${_platform}" "${pkgdir}/usr/include/ni"
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Build"
-  install -d "${pkgdir}/usr/share"
-  cp -r Common "${pkgdir}/usr/share/common"
-
-  install -d "${pkgdir}/var/lib/ni"
-}
-
-package_openni-unstable-java() {
-  pkgdesc="OpenNI java wrapper"
-  depends=("openni$_suf" 'java-environment')
-  provides=('openni-java')
-  conflicts=('openni-java')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release"
-
-  install -d "${pkgdir}/usr/lib"
-  install -m755 libOpenNI.jni.so "${pkgdir}/usr/lib"
-  
-  install -d "${pkgdir}/usr/share/openni/java"
-  install -m755 org.OpenNI.jar "${pkgdir}/usr/share/openni/java"
-}
-
-package_openni-unstable-mono() {
-  pkgdesc="OpenNI mono wrapper"
-  depends=("openni$_suf" 'mono')
-  install="openni-mono.install"
-  provides=('openni-mono')
-  conflicts=('openni-mono')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release"
-  
-  install -d "${pkgdir}/usr/share/openni/mono"
-  install -m755 OpenNI.net.dll "${pkgdir}/usr/share/openni/mono"
-}
-
-# SAMPLES
-
-_install_sample_source() {
-  sample=$1
-  makefile="Platform/${_os}/Build/Samples/$sample/Makefile"
-  install -d                "${pkgdir}/usr/share/openni/samples"
-  cp -r "Samples/$sample"   "${pkgdir}/usr/share/openni/samples/$sample"
-  install -m644 "$makefile" "${pkgdir}/usr/share/openni/samples/$sample"
-}
-
-CORE_SAMPLES='
-  AudioSample
-  BackRecorder
-  CRead
-  ConvertXToONI
-  HandTracker
-  RecordSynthetic
-  SimpleCreate
-  UserSelection
-  Viewer
-              SimpleRead SimpleViewer UserTracker'
-MONO_SAMPLES='SimpleRead SimpleViewer UserTracker'
-JAVA_SAMPLES='SimpleRead SimpleViewer UserTracker'
-
-package_openni-unstable-core-samples() {
-  pkgdesc="OpenNI sample programs"
-  depends=("openni$_suf-core")
-  optdepends=('openni-core-samples-source: source code for the samples')
-  provides=('openni-core-samples')
-  conflicts=('openni-core-samples')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release"
-  install -d "${pkgdir}/usr/bin"
-  for sample in $CORE_SAMPLES; do
-    install -m755 Sample-Ni$sample "${pkgdir}/usr/bin/niSample-$sample"
-  done
-}
-package_openni-unstable-core-samples-source() {
-  pkgdesc="OpenNI sample programs source code"
-  depends=("openni$_suf-core")
-  provides=('openni-core-samples-source')
-  conflicts=('openni-core-samples-source')
-
-  cd "${srcdir}/${_gitname}-build"
-  for sample in Viewer $CORE_SAMPLES; do
-    _install_sample_source Ni$sample
-  done
-}
-
-package_openni-unstable-java-samples() {
-  pkgdesc="OpenNI java wrapper sample programs"
-  depends=("openni$_suf-java")
-  optdepends=("openni$_suf-java-samples-source: source code for the samples")
-  arch=('any')
-  provides=('openni-java-samples')
-  conflicts=('openni-java-samples')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release"
-  install -d "${pkgdir}/usr/bin"
-  install -d "${pkgdir}/usr/share/openni/java"
-  for sample in $JAVA_SAMPLES; do
-    install -m644 org.OpenNI.Samples.$sample.jar "${pkgdir}/usr/share/openni/java"
-    echo "#/bin/sh
-java -jar /usr/share/openni/java/org.OpenNI.Samples.$sample.jar $@
-" > "${pkgdir}/usr/bin/niSample-$sample.jar"
-    chmod 755 "${pkgdir}/usr/bin/niSample-$sample.jar"
-  done
-}
-package_openni-unstable-java-samples-source() {
-  pkgdesc="OpenNI java wrapper sample programs source code"
-  depends=("openni$_suf-java")
-  provides=('openni-java-samples-source')
-  conflicts=('openni-java-samples-source')
-
-  cd "${srcdir}/${_gitname}-build"
-  for sample in $JAVA_SAMPLES; do
-    _install_sample_source $sample.java
-  done
-}
-
-package_openni-unstable-mono-samples() {
-  pkgdesc="OpenNI java wrapper sample programs"
-  depends=("openni$_suf-mono")
-  optdepends=("openni$_suf-mono-samples-source: source code for the samples")
-  provides=('openni-mono-samples')
-  conflicts=('openni-mono-samples')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release"
-  install -d "${pkgdir}/usr/bin"
-  install -d "${pkgdir}/usr/share/openni/mono"
-  for sample in $MONO_SAMPLES; do
-    install -m755 $sample.net.exe "${pkgdir}/usr/share/openni/mono"
-    echo "#/bin/sh
-cd /usr/share/openni/mono
-mono $sample.net.exe $@
-" > "${pkgdir}/usr/bin/niSample-$sample.net"
-    chmod 755 "${pkgdir}/usr/bin/niSample-$sample.net"
-  done
-}
-package_openni-unstable-mono-samples-source() {
-  pkgdesc="OpenNI mono wrapper sample programs source code"
-  depends=("openni$_suf-mono")
-  provides=('openni-mono-samples-source')
-  conflicts=('openni-mono-samples-source')
-
-  cd "${srcdir}/${_gitname}-build"
-  for sample in $MONO_SAMPLES; do
-    _install_sample_source $sample.net
-  done
-}
diff --git a/~lukeshu/openni-all/openni-unstable/openni-core.install b/~lukeshu/openni-all/openni-unstable/openni-core.install
deleted file mode 100644
index 8470f4512..000000000
--- a/~lukeshu/openni-all/openni-unstable/openni-core.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	MODULES="libnimMockNodes.so libnimCodecs.so libnimRecorder.so"
-	for module in $MODULES
-	do 
-		/usr/bin/niReg /usr/lib/$module
-	done
-}
-
-pre_remove() {
-	rm /var/lib/ni/modules.xml
-}
diff --git a/~lukeshu/openni-all/openni-unstable/openni-mono.install b/~lukeshu/openni-all/openni-unstable/openni-mono.install
deleted file mode 100644
index 72a6fb23d..000000000
--- a/~lukeshu/openni-all/openni-unstable/openni-mono.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
-	gacutil -i /usr/share/openni/mono/OpenNI.net.dll -gacdir /usr
-}
-
-post_remove() {
-	gacutil -u OpenNI.net -gacdir /usr
-}
diff --git a/~lukeshu/openni-all/openni/PKGBUILD b/~lukeshu/openni-all/openni/PKGBUILD
deleted file mode 100644
index 2cdc2fd7d..000000000
--- a/~lukeshu/openni-all/openni/PKGBUILD
+++ /dev/null
@@ -1,288 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor: Sven Schneider <archlinux.sandmann@googlemail.com>
-# Contributor: bugix
-# Contributor: Lubosz Sarnecki <lubosz at gmail>
-
-# unfortunately we can't use $_suf in function names, but sed makes it ok
-_suf=''
-pkgname=(
-    openni$_suf
-    openni$_suf-docs
-
-    openni$_suf-core
-    openni$_suf-core-samples
-    openni$_suf-core-samples-source
-    
-    openni$_suf-mono
-    openni$_suf-mono-samples
-    openni$_suf-mono-samples-source
-
-    openni$_suf-java
-    openni$_suf-java-samples
-    openni$_suf-java-samples-source
-    )
-pkgver=1.3.3.6
-pkgrel=4
-arch=('i686' 'x86_64')
-url="http://www.openni.org/"
-license=('GPL')
-makedepends=('git' 'doxygen' 'graphviz')
-source=()
-md5sums=()
-
-__gitroot="git://github.com/OpenNI/OpenNI.git"
-_gitname="openni"
-#_gitbranch="unstable"
-#_gitbranch="master"
-_gitbranch="Stable-$pkgver"
-
-_os='Linux'
-case "${CARCH}" in
-'x86_64') _arch=x86;;
-'i686')   _arch=x86;;
-'arm')    _arch=Arm;; # untested
-*)        _arch=UNSUPPORTED_ARCH;;
-esac
-_platform="${_os}-${_arch}"
-
-export MAKEFLAGS+=' -j1 '
-
-build() {
-  cd "${srcdir}"
-  msg "Connecting to GIT server...."
-
-  if [ -d ${_gitname} ] ; then
-    cd ${_gitname}
-    git checkout master
-    git pull origin
-    msg "The local files are updated."
-  else
-    git clone ${__gitroot} ${_gitname}
-    cd ${_gitname}
-  fi
-  git checkout ${_gitbranch}
-  cd ..
-
-  msg "GIT checkout done or server timeout"
-  msg "Starting make..."
-
-  rm -rf "${srcdir}/${_gitname}-build"
-  git clone "${srcdir}/${_gitname}" "${srcdir}/${_gitname}-build"
-  cd "${srcdir}/${_gitname}-build"
-
-  # PATCH
-  sed -i 's/python /python2 /' "Platform/${_platform}/CreateRedist/RedistMaker"
-  mv Wrappers/OpenNI.java/src/org/OpenNI/AlternativeView{p,P}ointCapability.java
-  echo '
-abs_core: $(ALL_MODULES) $(ALL_UTILS)
-abs_core_samples: $(CORE_SAMPLES)
-abs_java: $(ALL_JAVA_PROJS)
-abs_java_samples: $(JAVA_SAMPLES)
-abs_mono: $(ALL_MONO_PROJS)
-abs_mono_samples: $(MONO_SAMPLES) $(MONO_FORMS_SAMPLES)
-' >> "Platform/${_platform}/Build/Makefile"
-
-  
-  # BUILD
-  cd "Platform/${_platform}/Build"
-  make -j1 \
-      abs_core abs_core_samples \
-      abs_java abs_java_samples \
-      abs_mono abs_mono_samples || return 1
-
-  cd '../../../Source/DoxyGen'
-  mkdir html
-  doxygen Doxyfile
-  rm -rf html/*.map html*.md5 html/*.hhc html/*.hhp
-}
-
-package_openni() {
-  pkgdesc="Open Natural Interface framework"
-  depends=("openni$_suf-core")
-  optdepends=("openni$_suf-docs: programmer documentation")
-  provides=('openni')
-  conflicts=('openni')
-}
-
-package_openni-docs() {
-  pkgdesc="OpenNI programmer documentation"
-  arch=('any')
-  provides=('openni-docs')
-  conflicts=('openni-docs')
-
-  cd "${srcdir}/${_gitname}-build/Source/DoxyGen/"
-  install -d "${pkgdir}/usr/share/openni"
-  cp -r html "${pkgdir}/usr/share/openni"
-}
-
-package_openni-core() {
-  pkgdesc="OpenNI core libraries"
-  depends=('libusb' 'freeglut')
-  install="openni.install"
-  provides=('openni-core')
-  conflicts=('openni-core')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release"
-
-  LIB_FILES='
-    libnimCodecs.so
-    libnimMockNodes.so
-    libnimRecorder.so
-    libOpenNI.so
-    '
-  install -d "${pkgdir}/usr/lib"
-  install -m755 $LIB_FILES "${pkgdir}/usr/lib"
-
-  BIN_FILES='niReg niLicense'
-  install -d "${pkgdir}/usr/bin"
-  install -m755 $BIN_FILES "${pkgdir}/usr/bin"
-
-  cd "${srcdir}/${_gitname}-build/Include"
-  install -d "${pkgdir}/usr/include/ni"
-  install -m644 *.h "${pkgdir}/usr/include/ni"
-  cp -r "${_platform}" "${pkgdir}/usr/include/ni"
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Build"
-  install -d "${pkgdir}/usr/share"
-  cp -r Common "${pkgdir}/usr/share/common"
-}
-
-package_openni-java() {
-  pkgdesc="OpenNI java wrapper"
-  depends=("openni$_suf" 'java-environment')
-  provides=('openni-java')
-  conflicts=('openni-java')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release"
-
-  install -d "${pkgdir}/usr/lib"
-  install -m755 libOpenNI.jni.so "${pkgdir}/usr/lib"
-  
-  install -d "${pkgdir}/usr/share/openni/java"
-  install -m755 org.OpenNI.jar "${pkgdir}/usr/share/openni/java"
-}
-
-package_openni-mono() {
-  pkgdesc="OpenNI mono wrapper"
-  depends=("openni$_suf" 'mono')
-  provides=('openni-mono')
-  conflicts=('openni-mono')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release"
-  
-  install -d "${pkgdir}/usr/share/openni/mono"
-  install -m755 OpenNI.net.dll "${pkgdir}/usr/share/openni/mono"
-}
-
-# SAMPLES
-
-_install_sample_source() {
-  sample=$1
-  makefile="Platform/${_platform}/Build/Samples/$sample/Makefile"
-  install -d                "${pkgdir}/usr/share/openni/samples"
-  cp -r "Samples/$sample"   "${pkgdir}/usr/share/openni/samples/$sample"
-  install -m644 "$makefile" "${pkgdir}/usr/share/openni/samples/$sample"
-}
-
-# Leave out NiViewer, it's set up wrong
-CORE_SAMPLES='
-  AudioSample
-  BackRecorder
-  CRead
-  ConvertXToONI
-  RecordSynthetic
-  SimpleCreate
-              SimpleRead SimpleViewer UserTracker'
-MONO_SAMPLES='SimpleRead SimpleViewer UserTracker'
-JAVA_SAMPLES='SimpleRead SimpleViewer UserTracker'
-
-package_openni-core-samples() {
-  pkgdesc="OpenNI sample programs"
-  depends=("openni$_suf-core")
-  optdepends=('openni-core-samples-source: source code for the samples')
-  provides=('openni-core-samples')
-  conflicts=('openni-core-samples')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release"
-  install -d "${pkgdir}/usr/bin"
-  install -m755 NiViewer "${pkgdir}/usr/bin/niSample-Viewer"
-  for sample in $CORE_SAMPLES; do
-    install -m766 Sample-Ni$sample "${pkgdir}/usr/bin/niSample-$sample"
-  done
-}
-package_openni-core-samples-source() {
-  pkgdesc="OpenNI sample programs source code"
-  depends=("openni$_suf-core")
-  provides=('openni-core-samples-source')
-  conflicts=('openni-core-samples-source')
-  options+=('!strip')
-
-  cd "${srcdir}/${_gitname}-build"
-  for sample in Viewer $CORE_SAMPLES; do
-    _install_sample_source Ni$sample
-  done
-}
-
-package_openni-java-samples() {
-  pkgdesc="OpenNI java wrapper sample programs"
-  depends=("openni$_suf-java")
-  optdepends=("openni$_suf-java-samples-source: source code for the samples")
-  arch=('any')
-  provides=('openni-java-samples')
-  conflicts=('openni-java-samples')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release"
-  install -d "${pkgdir}/usr/bin"
-  install -d "${pkgdir}/usr/share/openni/java"
-  for sample in $JAVA_SAMPLES; do
-    install -m644 org.OpenNI.Samples.$sample.jar "${pkgdir}/usr/share/openni/java"
-    echo "#/bin/sh
-java -jar /usr/share/openni/java/org.OpenNI.Samples.$sample.jar $@
-" > "${pkgdir}/usr/bin/niSample-$sample.jar"
-    chmod 755 "${pkgdir}/usr/bin/niSample-$sample.jar"
-  done
-}
-package_openni-java-samples-source() {
-  pkgdesc="OpenNI java wrapper sample programs source code"
-  depends=("openni$_suf-java")
-  provides=('openni-java-samples-source')
-  conflicts=('openni-java-samples-source')
-  options+=('!strip')
-
-  cd "${srcdir}/${_gitname}-build"
-  for sample in $JAVA_SAMPLES; do
-    _install_sample_source $sample.java
-  done
-}
-
-package_openni-mono-samples() {
-  pkgdesc="OpenNI java wrapper sample programs"
-  depends=("openni$_suf-mono")
-  optdepends=("openni$_suf-mono-samples-source: source code for the samples")
-  provides=('openni-mono-samples')
-  conflicts=('openni-mono-samples')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release"
-  install -d "${pkgdir}/usr/bin"
-  install -d "${pkgdir}/usr/share/openni/mono"
-  for sample in $MONO_SAMPLES; do
-    install -m755 $sample.net.exe "${pkgdir}/usr/share/openni/mono"
-    echo "#/bin/sh
-cd /usr/share/openni/mono
-mono $sample.net.exe $@
-" > "${pkgdir}/usr/bin/niSample-$sample.net"
-    chmod 755 "${pkgdir}/usr/bin/niSample-$sample.net"
-  done
-}
-package_openni-mono-samples-source() {
-  pkgdesc="OpenNI mono wrapper sample programs source code"
-  depends=("openni$_suf-mono")
-  provides=('openni-mono-samples-source')
-  conflicts=('openni-mono-samples-source')
-  options+=('!strip')
-
-  cd "${srcdir}/${_gitname}-build"
-  for sample in $MONO_SAMPLES; do
-    _install_sample_source $sample.net
-  done
-}
diff --git a/~lukeshu/openni-all/openni/openni.install b/~lukeshu/openni-all/openni/openni.install
deleted file mode 100644
index 8470f4512..000000000
--- a/~lukeshu/openni-all/openni/openni.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	MODULES="libnimMockNodes.so libnimCodecs.so libnimRecorder.so"
-	for module in $MODULES
-	do 
-		/usr/bin/niReg /usr/lib/$module
-	done
-}
-
-pre_remove() {
-	rm /var/lib/ni/modules.xml
-}