Sat Mar 23 00:06:20 PDT 2013

40 files changed, 1443 insertions, 244 deletions

diff --git a/libre/gnome-desktop2/PKGBUILD b/libre/gnome-desktop2/PKGBUILD
new file mode 100644
index 000000000..e8744d4a4
--- /dev/null
+++ b/libre/gnome-desktop2/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# Contributor:  Jan de Groot <jan@archlinux.org>
+
+_pkgname=gnome-desktop
+pkgname=${_pkgname}2
+pkgver=2.32.1
+pkgrel=2.1
+pkgdesc="Library with common API for various GNOME modules (legacy version), Parabola rebranded"
+arch=(i686 x86_64 mips64el)
+license=(GPL LGPL)
+depends=(gconf gtk2 startup-notification)
+makedepends=(gnome-doc-utils intltool)
+url="http://www.gnome.org"
+options=(!libtool !emptydirs)
+source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.bz2)
+sha256sums=('55cbecf67efe1fa1e57ac966520a7c46d799c8ba3c652a1219f60cafccb3739d')
+
+build() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --disable-static \
+      --with-gnome-distributor="Parabola GNU/Linux-libre" \
+      --disable-scrollkeeper \
+      --disable-gnome-about --disable-desktop-docs
+
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+
+  make
+}
+
+package() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
diff --git a/libre/gnome-menus/PKGBUILD b/libre/gnome-menus/PKGBUILD
new file mode 100644
index 000000000..186473b5b
--- /dev/null
+++ b/libre/gnome-menus/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Jan de Groot <jan@archlinux.org>
+
+pkgname=gnome-menus
+pkgver=3.6.2
+pkgrel=1.1
+pkgdesc="GNOME menu specifications, Parabola rebranded"
+arch=('i686' 'x86_64' 'mips64el')
+depends=('glib2' 'python2-gobject')
+makedepends=('intltool' 'gobject-introspection')
+options=('!libtool')
+license=('GPL' 'LGPL')
+url="http://www.gnome.org"
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+        menus.patch)
+sha256sums=('f6cefb25ce3ca2a0e4cb43894089cc6079bf948230e99bc0e244b380fa84bf4f'
+            'de14815d63ab98f999975680a8981702dee0f70d129d4d4fcf4778d966e67435')
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  patch -Np0 -i "$srcdir/menus.patch"
+
+  PYTHON=/usr/bin/python2 ./configure \
+      --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var  --disable-static
+  make
+}
+
+package(){
+  cd "$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+
+  sed -i "1s|#!/usr/bin/env python$|&2|" \
+    "$pkgdir/usr/lib/python2.7/site-packages/GMenuSimpleEditor/config.py"
+}
diff --git a/libre/gnome-menus/menus.patch b/libre/gnome-menus/menus.patch
new file mode 100644
index 000000000..6648e09ec
--- /dev/null
+++ b/libre/gnome-menus/menus.patch
@@ -0,0 +1,25 @@
+--- layout/applications.menu	2005-06-28 10:16:39.000000000 +0200
++++ layout/applications.menu	2005-09-12 23:21:20.000000000 +0200
+@@ -7,7 +7,6 @@
+   <Directory>Applications.directory</Directory>
+ 
+   <!-- Scan legacy dirs first, as later items take priority -->
+-  <KDELegacyDirs/>
+   <LegacyDir>/etc/X11/applnk</LegacyDir>
+   <LegacyDir>/usr/share/gnome/apps</LegacyDir>
+ 
+@@ -18,6 +17,14 @@
+   <!-- Read in overrides and child menus from applications-merged/ -->
+   <DefaultMergeDirs/>
+ 
++  <!-- Parabola submenu -->
++  <Menu>
++    <Name>Parabola</Name>
++    <Directory>Parabola.directory</Directory>
++    <Include>
++      <Category>Parabola</Category>
++    </Include>
++  </Menu> <!-- End Parabola -->
+   <!-- Accessories submenu -->
+   <Menu>
+     <Name>Accessories</Name>
diff --git a/libre/gst-libav/PKGBUILD b/libre/gst-libav/PKGBUILD
new file mode 100644
index 000000000..3d92dcd9b
--- /dev/null
+++ b/libre/gst-libav/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gst-libav
+pkgver=1.0.6
+pkgrel=1
+pkgdesc="Gstreamer libav Plugin, Parabola rebranded"
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL')
+url="http://gstreamer.freedesktop.org/"
+depends=('gst-plugins-base-libs' 'bzip2')
+makedepends=('yasm')
+options=(!libtool !emptydirs)
+provides=("gst-ffmpeg=$pkgver-$pkgrel")
+source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
+sha256sums=('8ab222a52bf7482e913f2c9a4f490cda8f8ed1acfbc429f27451b0558b08044d')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --disable-static --with-libav-extra-configure="--enable-runtime-cpudetect" \
+    --with-package-name="GStreamer libav Plugin (Parabola GNU/Linux-libre)" \
+    --with-package-origin="https://parabolagnulinux.org/"
+  make
+}
+
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/libre/gst-plugins-bad-libre/PKGBUILD b/libre/gst-plugins-bad-libre/PKGBUILD
index 1cb133713..7a12f8ca9 100644
--- a/libre/gst-plugins-bad-libre/PKGBUILD
+++ b/libre/gst-plugins-bad-libre/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 178027 2013-02-13 20:38:52Z heftig $
+# $Id: PKGBUILD 180524 2013-03-22 19:07:19Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
 pkgbase=gst-plugins-bad
 pkgname=gst-plugins-bad-libre
-pkgver=1.0.5
-pkgrel=1.1
-pkgdesc='GStreamer Multimedia Framework Bad Plugins, without nonfree faac support'
+pkgver=1.0.6
+pkgrel=1
+pkgdesc='GStreamer Multimedia Framework Bad Plugins, with nonfree faac support removed and Parabola rebranded'
 arch=(
   i686
   x86_64
@@ -58,7 +58,7 @@ source=(
   "$url/src/$pkgbase/$pkgbase-$pkgver.tar.xz"
 )
 sha256sums=(
-  2e8f5b9a2fd274142d0a916b6425b9466028978b85858dc835dc80de744b276a
+  92130899d0b78b71f1551cada9b10b550e91506c2d7b8b748e5cc18a620d302d
 )
 
 build() {
@@ -69,7 +69,7 @@ build() {
   automake --add-missing
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --disable-static --enable-experimental \
-    --with-package-name='GStreamer Bad Plugins (Parabola)' \
+    --with-package-name='GStreamer Bad Plugins (Parabola GNU/Linux-libre)' \
     --with-package-origin='https://parabolagnulinux.org/' \
     --with-gtk=3.0
   make
diff --git a/libre/gst-plugins-base/PKGBUILD b/libre/gst-plugins-base/PKGBUILD
new file mode 100644
index 000000000..55ac8e72c
--- /dev/null
+++ b/libre/gst-plugins-base/PKGBUILD
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgbase=gst-plugins-base
+pkgname=('gst-plugins-base-libs' 'gst-plugins-base')
+pkgver=1.0.6
+pkgrel=1
+pkgdesc="GStreamer Multimedia Framework Base Plugins, Parabola rebranded"
+arch=('i686' 'x86_64' 'mips64el')
+license=('LGPL')
+makedepends=('pkgconfig' 'gstreamer' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango' 'gobject-introspection')
+options=(!libtool !emptydirs)
+url="http://gstreamer.freedesktop.org/"
+source=(${url}/src/$pkgbase/$pkgbase-${pkgver}.tar.xz)
+sha256sums=('85e5f99af690f720ccde5ea7e793269d35883a3ead80ca9985fa44e18bb1a4a5')
+
+build() {
+  cd $pkgbase-$pkgver
+  sed -i -e '/AC_PATH_XTRA/d' configure.ac
+  aclocal -I m4 -I common/m4
+  autoconf
+  automake --add-missing
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --disable-static --enable-experimental \
+    --with-package-name="GStreamer Base Plugins (Parabola GNU/Linux-libre)" \
+    --with-package-origin="https://parabolagnulinux.org/"
+  make
+  sed -e 's/^SUBDIRS_EXT =.*/SUBDIRS_EXT =/' -i Makefile
+}
+
+check() {
+  cd $pkgbase-$pkgver
+  # Testsuite fails on one test. Some refcount leak
+  make check
+}
+
+package_gst-plugins-base-libs() {
+  pkgdesc="GStreamer Multimedia Framework Base Plugin libraries, Parabola rebranded"
+  depends=('gstreamer' 'orc' 'libxv')
+
+  cd $pkgbase-$pkgver
+  make DESTDIR="${pkgdir}" install
+}
+
+package_gst-plugins-base() {
+  depends=("gst-plugins-base-libs=$pkgver" 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango')
+
+  cd $pkgbase-$pkgver
+  make -C gst-libs DESTDIR="${pkgdir}" install
+  make -C ext DESTDIR="${pkgdir}" install
+  make -C gst-libs DESTDIR="${pkgdir}" uninstall
+}
diff --git a/libre/gst-plugins-good/PKGBUILD b/libre/gst-plugins-good/PKGBUILD
new file mode 100644
index 000000000..9101bfdba
--- /dev/null
+++ b/libre/gst-plugins-good/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gst-plugins-good
+pkgver=1.0.6
+pkgrel=1
+pkgdesc="GStreamer Multimedia Framework Good Plugins, Parabola rebranded"
+arch=('i686' 'x86_64' 'mips64el')
+license=('LGPL')
+url="http://gstreamer.freedesktop.org/"
+depends=('libpulse' 'jack' 'libsoup' 'gst-plugins-base-libs' 'wavpack' 'aalib' 'taglib' 'libdv' 'libshout' 'libvpx' 'gdk-pixbuf2' 'libcaca' 'libavc1394' 'libiec61883' 'libxdamage' 'v4l-utils' 'cairo')
+makedepends=('gstreamer' 'speex' 'flac' 'libraw1394')
+options=(!libtool !emptydirs)
+source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
+sha256sums=('67f7690a9826d9a6ab28b9af2536a6f3e833ee412bd59dd603c48fb3c6823e0d')
+
+build() {
+  cd $pkgname-$pkgver
+  sed -i -e '/AC_PATH_XTRA/d' configure.ac
+  aclocal -I m4 -I common/m4
+  autoconf
+  automake --add-missing
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --disable-static --enable-experimental \
+    --with-package-name="GStreamer Good Plugins (Parabola GNU/Linux-libre)" \
+    --with-package-origin="https://parabolagnulinux.org/"
+  make
+}
+
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
+}
diff --git a/libre/gst-plugins-ugly/PKGBUILD b/libre/gst-plugins-ugly/PKGBUILD
new file mode 100644
index 000000000..e0cc268ff
--- /dev/null
+++ b/libre/gst-plugins-ugly/PKGBUILD
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gst-plugins-ugly
+pkgver=1.0.6
+pkgrel=1
+pkgdesc="GStreamer Multimedia Framework Ugly Plugins, Parabola rebranded"
+arch=('i686' 'x86_64' 'mips64el')
+license=('LGPL')
+url="http://gstreamer.freedesktop.org/"
+depends=('gst-plugins-base-libs' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr')
+options=(!libtool !emptydirs)
+source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
+sha256sums=('8655ceec7533b5d30080a5051025e26ff8d06bea8d03a6b2af56c2f839d60586')
+
+build() {
+  cd $pkgname-$pkgver
+  sed -i '/AC_PATH_XTRA/d' configure.ac
+  aclocal -I m4 -I common/m4
+  autoconf
+  automake --add-missing
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --disable-static --enable-experimental \
+    --with-package-name="GStreamer Ugly Plugins (Parabola GNU/Linux-libre)" \
+    --with-package-origin="https://parabolagnulinux.org/"
+  make
+}
+
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/libre/gstreamer/PKGBUILD b/libre/gstreamer/PKGBUILD
new file mode 100644
index 000000000..2eb34bb72
--- /dev/null
+++ b/libre/gstreamer/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gstreamer
+pkgver=1.0.6
+pkgrel=1
+pkgdesc="GStreamer Multimedia Framework, Parabola rebranded"
+arch=('i686' 'x86_64' 'mips64el')
+license=('LGPL')
+url="http://gstreamer.freedesktop.org/"
+depends=('libxml2' 'glib2')
+optdepends=('sh: feedback script')
+makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection')
+options=('!libtool')
+source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.xz)
+sha256sums=('50d4050cd6a23684b6bbf40a9b7c132edfb39fe9db2d81980adaa6e72f4d5826')
+
+build() {
+  cd "${srcdir}/gstreamer-${pkgver}"
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib \
+    --with-package-name="GStreamer (Parabola GNU/Linux-libre)" \
+    --with-package-origin="https://parabolagnulinux.org/" \
+    --enable-gtk-doc --disable-static
+  make
+}
+
+check() {
+  cd "${srcdir}/gstreamer-${pkgver}"
+  make check
+}
+
+package() {
+  cd "${srcdir}/gstreamer-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/libre/gstreamer0.10-bad-libre/PKGBUILD b/libre/gstreamer0.10-bad-libre/PKGBUILD
index 883a9eefb..30c475d39 100644
--- a/libre/gstreamer0.10-bad-libre/PKGBUILD
+++ b/libre/gstreamer0.10-bad-libre/PKGBUILD
@@ -6,8 +6,8 @@
 pkgbase=gstreamer0.10-bad-libre
 pkgname=('gstreamer0.10-bad-libre' 'gstreamer0.10-bad-libre-plugins')
 pkgver=0.10.23
-pkgrel=3.1
-arch=('i686' 'x86_64')
+pkgrel=3.2
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL' 'GPL')
 makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.36' 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'neon' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'soundtouch' 'libvdpau' 'schroedinger' 'libass' 'libvpx' 'gsm' 'libgme' 'rtmpdump' 'libsndfile' 'librsvg' 'wildmidi' 'opus')
 url="http://gstreamer.freedesktop.org/"
@@ -19,7 +19,7 @@ build() {
   cd "${srcdir}/gst-plugins-bad-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --disable-static --enable-experimental \
-    --with-package-name="GStreamer Bad Plugins (Parabola)" \
+    --with-package-name="GStreamer Bad Plugins (Parabola GNU/Linux-libre)" \
     --with-package-origin="https://parabolagnulinux.org/"
 
   make
@@ -33,7 +33,7 @@ build() {
 #}
 
 package_gstreamer0.10-bad-libre() {
-  pkgdesc="GStreamer Multimedia Framework Bad Plugin libraries (gst-plugins-bad)"
+  pkgdesc="GStreamer Multimedia Framework Bad Plugin libraries (gst-plugins-bad), with non free faac support removed and Parabola rebranded"
   depends=('gstreamer0.10-base>=0.10.34')
   provides=("gstreamer0.10-bad=$pkgver")
   conflicts=('gstreamer0.10-bad')
@@ -44,7 +44,7 @@ package_gstreamer0.10-bad-libre() {
 }
 
 package_gstreamer0.10-bad-libre-plugins() {
-  pkgdesc="GStreamer Multimedia Framework Bad Plugins (gst-plugins-bad)"
+  pkgdesc="GStreamer Multimedia Framework Bad Plugins (gst-plugins-bad), with non free faac support removed and Parabola rebranded"
   depends=("gstreamer0.10-bad-libre=${pkgver}" 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'neon' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'libvdpau' 'soundtouch' 'libass' 'schroedinger' 'libvpx' 'gsm' 'rtmpdump' 'libgme' 'libsndfile' 'librsvg' 'wildmidi' 'opus')
   groups=('gstreamer0.10-plugins')
   install=gstreamer0.10-bad-plugins.install
diff --git a/libre/gstreamer0.10-base/PKGBUILD b/libre/gstreamer0.10-base/PKGBUILD
new file mode 100644
index 000000000..620c0bd87
--- /dev/null
+++ b/libre/gstreamer0.10-base/PKGBUILD
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgbase=('gstreamer0.10-base')
+pkgname=('gstreamer0.10-base' 'gstreamer0.10-base-plugins')
+pkgver=0.10.36
+pkgrel=1.1
+arch=('i686' 'x86_64' 'mips64el')
+license=('LGPL')
+makedepends=('pkgconfig' 'gstreamer0.10>=0.10.35' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango' 'gobject-introspection')
+options=(!libtool !emptydirs)
+url="http://gstreamer.freedesktop.org/"
+source=(${url}/src/gst-plugins-base/gst-plugins-base-${pkgver}.tar.xz)
+sha256sums=('1fe45c3894903001d4d008b0713dab089f53726dcb5842d5b40c2595a984e64a')
+
+build() {
+  cd "${srcdir}/gst-plugins-base-${pkgver}"
+  sed -i '/AC_PATH_XTRA/d' configure.ac
+  autoreconf
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --disable-static --enable-experimental --disable-gnome_vfs \
+    --with-package-name="GStreamer Base Plugins (Parabola GNU/Linux-libre)" \
+    --with-package-origin="https://parabolagnulinux.org/"
+
+  make
+  sed -e 's/^SUBDIRS_EXT =.*/SUBDIRS_EXT =/' -i Makefile
+}
+
+check() {
+  cd "${srcdir}/gst-plugins-base-${pkgver}"
+  make check
+}
+
+package_gstreamer0.10-base() {
+  pkgdesc="GStreamer Multimedia Framework Base plugin libraries, Parabola rebranded"
+  depends=('gstreamer0.10>=0.10.35' 'orc' 'libxv')
+
+  cd "${srcdir}/gst-plugins-base-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
+
+package_gstreamer0.10-base-plugins() {
+  pkgdesc="GStreamer Multimedia Framework Base Plugins (gst-plugins-base), Parabola rebranded"
+  depends=("gstreamer0.10-base=${pkgver}" 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango')
+  replaces=('gstreamer0.10-alsa' 'gstreamer0.10-theora' 'gstreamer0.10-libvisual' 'gstreamer0.10-pango' 'gstreamer0.10-cdparanoia' 'gstreamer0.10-vorbis' 'gstreamer0.10-ogg')
+  conflicts=('gstreamer0.10-alsa' 'gstreamer0.10-theora' 'gstreamer0.10-libvisual' 'gstreamer0.10-pango' 'gstreamer0.10-cdparanoia' 'gstreamer0.10-vorbis' 'gstreamer0.10-ogg')
+  groups=('gstreamer0.10-plugins')
+
+  cd "${srcdir}/gst-plugins-base-${pkgver}"
+  make -C gst-libs DESTDIR="${pkgdir}" install
+  make -C ext DESTDIR="${pkgdir}" install
+  make -C gst-libs DESTDIR="${pkgdir}" uninstall
+}
diff --git a/libre/gstreamer0.10-good/PKGBUILD b/libre/gstreamer0.10-good/PKGBUILD
index abe7dc0ef..4cbaddd1e 100644
--- a/libre/gstreamer0.10-good/PKGBUILD
+++ b/libre/gstreamer0.10-good/PKGBUILD
@@ -5,8 +5,8 @@
 pkgbase=gstreamer0.10-good
 pkgname=('gstreamer0.10-good' 'gstreamer0.10-good-plugins')
 pkgver=0.10.31
-pkgrel=1.1
-arch=('i686' 'x86_64')
+pkgrel=1.2
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'bzip2' 'gdk-pixbuf2' 'libpulse' 'jack' 'udev')
 url="http://gstreamer.freedesktop.org/"
@@ -32,7 +32,7 @@ build() {
 
 package_gstreamer0.10-good() {
   depends=('gstreamer0.10-base>=0.10.34' 'bzip2')
-  pkgdesc="GStreamer Multimedia Framework Good plugin libraries (Parabola rebranded)"
+  pkgdesc="GStreamer Multimedia Framework Good plugin libraries, Parabola rebranded"
 
   cd "${srcdir}/gst-plugins-good-${pkgver}"
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
@@ -41,7 +41,7 @@ package_gstreamer0.10-good() {
 
 package_gstreamer0.10-good-plugins() {
   depends=("gstreamer0.10-good=${pkgver}" 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'libpng' 'libjpeg' 'jack' 'libpulse' 'udev')
-  pkgdesc="GStreamer Multimedia Framework Good Plugins (gst-plugins-good)"
+  pkgdesc="GStreamer Multimedia Framework Good Plugins (gst-plugins-good), Parabola rebranded"
   groups=('gstreamer0.10-plugins')
   replaces=('gstreamer0.10-aalib' 'gstreamer0.10-wavpack' 'gstreamer0.10-shout2' 'gstreamer0.10-taglib' 'gstreamer0.10-libcaca' 'gstreamer0.10-libpng' 'gstreamer0.10-jpeg' 'gstreamer0.10-cairo' 'gstreamer0.10-flac' 'gstreamer0.10-speex' 'gstreamer0.10-gdkpixbuf' 'gstreamer0.10-dv1394' 'gstreamer0.10-annodex' 'gstreamer0.10-gconf' 'gstreamer0.10-esd' 'gstreamer0.10-cdio' 'gstreamer0.10-dv' 'gstreamer0.10-soup' 'gstreamer0.10-pulse')
   conflicts=('gstreamer0.10-aalib' 'gstreamer0.10-wavpack' 'gstreamer0.10-shout2' 'gstreamer0.10-taglib' 'gstreamer0.10-libcaca' 'gstreamer0.10-libpng' 'gstreamer0.10-jpeg' 'gstreamer0.10-cairo' 'gstreamer0.10-flac' 'gstreamer0.10-speex' 'gstreamer0.10-gdkpixbuf' 'gstreamer0.10-dv1394' 'gstreamer0.10-annodex' 'gstreamer0.10-gconf' 'gstreamer0.10-esd' 'gstreamer0.10-cdio' 'gstreamer0.10-dv' 'gstreamer0.10-bad-plugins<0.10.7' 'gstreamer0.10-soup' 'gstreamer0.10-pulse')
diff --git a/libre/gstreamer0.10-ugly/PKGBUILD b/libre/gstreamer0.10-ugly/PKGBUILD
new file mode 100644
index 000000000..6709ab2ea
--- /dev/null
+++ b/libre/gstreamer0.10-ugly/PKGBUILD
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgbase=gstreamer0.10-ugly
+pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins')
+pkgver=0.10.19
+pkgrel=5.1
+arch=('i686' 'x86_64' 'mips64el')
+license=('LGPL')
+makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr')
+url="http://gstreamer.freedesktop.org/"
+options=(!libtool)
+source=(${url}/src/gst-plugins-ugly/gst-plugins-ugly-${pkgver}.tar.xz
+        opencore-amr.patch
+        cdio-cd-text-api.patch)
+md5sums=('ba26045c8c8c91f0d48d327ccf53ac0c'
+         'd8feb6c99bfaff8be6b2c48ea4e98e47'
+         '6c1c665f864387f3a77d32231fedeaab')
+
+build() {
+  cd "${srcdir}/gst-plugins-ugly-${pkgver}"
+  patch -Np0 -i "${srcdir}/opencore-amr.patch"
+  patch -Np1 -i "${srcdir}/cdio-cd-text-api.patch"
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --disable-static --enable-experimental \
+    --with-package-name="GStreamer Ugly Plugins (Parabola GNU/Linux-libre)" \
+    --with-package-origin="https://parabolagnulinux.org/"
+  make
+  sed -e 's/gst-libs gst ext/gst-libs gst/' -i Makefile
+}
+
+check() {
+  cd "${srcdir}/gst-plugins-ugly-${pkgver}"
+  make check
+}
+
+package_gstreamer0.10-ugly() {
+  pkgdesc="GStreamer Multimedia Framework Ugly plugin libraries, Parabola rebranded"
+  depends=('gstreamer0.10-base>=0.10.34')
+  
+  cd "${srcdir}/gst-plugins-ugly-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
+
+package_gstreamer0.10-ugly-plugins() {
+  pkgdesc="GStreamer Multimedia Framework Ugly Plugins (gst-plugins-ugly), Parabola rebranded"
+  depends=("gstreamer0.10-ugly=${pkgver}" 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr')
+  groups=('gstreamer0.10-plugins')
+  replaces=('gstreamer0.10-dvdread' 'gstreamer0.10-mpeg2dec' 'gstreamer0.10-mad' 'gstreamer0.10-lame' 'gstreamer0.10-sidplay' 'gstreamer0.10-a52dec')
+  conflicts=('gstreamer0.10-dvdread' 'gstreamer0.10-mpeg2dec' 'gstreamer0.10-mad' 'gstreamer0.10-lame' 'gstreamer0.10-sidplay' 'gstreamer0.10-a52dec')
+
+  cd "${srcdir}/gst-plugins-ugly-${pkgver}"
+  make -C ext DESTDIR="${pkgdir}" install
+}
diff --git a/libre/gstreamer0.10-ugly/cdio-cd-text-api.patch b/libre/gstreamer0.10-ugly/cdio-cd-text-api.patch
new file mode 100644
index 000000000..cbd16b8e4
--- /dev/null
+++ b/libre/gstreamer0.10-ugly/cdio-cd-text-api.patch
@@ -0,0 +1,183 @@
+From 649bd92cd2600719862ad5189899212409dd0a67 Mon Sep 17 00:00:00 2001
+From: Leon Merten Lohse <leon@green-side.de>
+Date: Thu, 03 May 2012 22:50:30 +0000
+Subject: cdio: compensate for libcdio's recent cd-text api changes
+
+https://bugzilla.gnome.org/show_bug.cgi?id=675112
+
+Conflicts:
+
+	ext/cdio/gstcdiocddasrc.c
+---
+diff --git a/ext/cdio/gstcdio.c b/ext/cdio/gstcdio.c
+index 2f58d18..483ebf5 100644
+--- a/ext/cdio/gstcdio.c
++++ b/ext/cdio/gstcdio.c
+@@ -30,12 +30,16 @@
+ GST_DEBUG_CATEGORY (gst_cdio_debug);
+ 
+ void
+-gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext,
++gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext, track_t track,
+     cdtext_field_t field, const gchar * gst_tag, GstTagList ** p_tags)
+ {
+   const gchar *txt;
+ 
++#if LIBCDIO_VERSION_NUM > 83
++  txt = cdtext_get_const (cdtext, field, track);
++#else
+   txt = cdtext_get_const (field, cdtext);
++#endif
+   if (txt == NULL || *txt == '\0') {
+     GST_DEBUG_OBJECT (src, "empty CD-TEXT field %u (%s)", field, gst_tag);
+     return;
+@@ -57,6 +61,12 @@ gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext,
+ }
+ 
+ GstTagList *
++#if LIBCDIO_VERSION_NUM > 83
++gst_cdio_get_cdtext (GstObject * src, cdtext_t * t, track_t track)
++{
++  GstTagList *tags = NULL;
++
++#else
+ gst_cdio_get_cdtext (GstObject * src, CdIo * cdio, track_t track)
+ {
+   GstTagList *tags = NULL;
+@@ -67,14 +77,22 @@ gst_cdio_get_cdtext (GstObject * src, CdIo * cdio, track_t track)
+     GST_DEBUG_OBJECT (src, "no CD-TEXT for track %u", track);
+     return NULL;
+   }
++#endif
+ 
+-  gst_cdio_add_cdtext_field (src, t, CDTEXT_PERFORMER, GST_TAG_ARTIST, &tags);
+-  gst_cdio_add_cdtext_field (src, t, CDTEXT_TITLE, GST_TAG_TITLE, &tags);
++  gst_cdio_add_cdtext_field (src, t, track, CDTEXT_FIELD_PERFORMER,
++      GST_TAG_ARTIST, &tags);
++  gst_cdio_add_cdtext_field (src, t, track, CDTEXT_FIELD_TITLE, GST_TAG_TITLE,
++      &tags);
+ 
+   return tags;
+ }
+ 
+ void
++#if LIBCDIO_VERSION_NUM > 83
++gst_cdio_add_cdtext_album_tags (GstObject * src, cdtext_t * t,
++    GstTagList * tags)
++{
++#else
+ gst_cdio_add_cdtext_album_tags (GstObject * src, CdIo * cdio, GstTagList * tags)
+ {
+   cdtext_t *t;
+@@ -84,11 +102,14 @@ gst_cdio_add_cdtext_album_tags (GstObject * src, CdIo * cdio, GstTagList * tags)
+     GST_DEBUG_OBJECT (src, "no CD-TEXT for album");
+     return;
+   }
++#endif
+ 
+-  /* FIXME: map CDTEXT_PERFORMER to GST_TAG_ALBUM_ARTIST once we have that */
+-  gst_cdio_add_cdtext_field (src, t, CDTEXT_TITLE, GST_TAG_ALBUM, &tags);
+-  gst_cdio_add_cdtext_field (src, t, CDTEXT_GENRE, GST_TAG_GENRE, &tags);
+-
++  gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_PERFORMER,
++      GST_TAG_ALBUM_ARTIST, &tags);
++  gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_TITLE, GST_TAG_ALBUM,
++      &tags);
++  gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_GENRE, GST_TAG_GENRE,
++      &tags);
+   GST_DEBUG ("CD-TEXT album tags: %" GST_PTR_FORMAT, tags);
+ }
+ 
+diff --git a/ext/cdio/gstcdio.h b/ext/cdio/gstcdio.h
+index ef31ed0..c6da580 100644
+--- a/ext/cdio/gstcdio.h
++++ b/ext/cdio/gstcdio.h
+@@ -24,22 +24,38 @@
+ #include <gst/gst.h>
+ #include <cdio/cdio.h>
+ #include <cdio/cdtext.h>
++#include <cdio/version.h>
++
++#if LIBCDIO_VERSION_NUM <= 83
++  #define CDTEXT_FIELD_PERFORMER CDTEXT_PERFORMER
++  #define CDTEXT_FIELD_GENRE     CDTEXT_GENRE
++  #define CDTEXT_FIELD_TITLE     CDTEXT_TITLE
++#endif
+ 
+ GST_DEBUG_CATEGORY_EXTERN (gst_cdio_debug);
+ #define GST_CAT_DEFAULT gst_cdio_debug
+ 
+ void     gst_cdio_add_cdtext_field (GstObject      * src,
+                                     cdtext_t       * cdtext,
++                                    track_t          track,
+                                     cdtext_field_t   field,
+                                     const gchar    * gst_tag,
+                                     GstTagList    ** p_tags);
+ 
+ GstTagList  * gst_cdio_get_cdtext  (GstObject      * src,
++#if LIBCDIO_VERSION_NUM > 83
++                                    cdtext_t       * t,
++#else
+                                     CdIo           * cdio,
++#endif
+                                     track_t          track);
+ 
+ void      gst_cdio_add_cdtext_album_tags (GstObject  * src,
++#if LIBCDIO_VERSION_NUM > 83
++                                          cdtext_t   * t,
++#else
+                                           CdIo       * cdio,
++#endif
+                                           GstTagList * tags);
+ 
+ #endif /* __GST_CDIO_H__ */
+diff --git a/ext/cdio/gstcdiocddasrc.c b/ext/cdio/gstcdiocddasrc.c
+index 615a0c8..830839e 100644
+--- a/ext/cdio/gstcdiocddasrc.c
++++ b/ext/cdio/gstcdiocddasrc.c
+@@ -206,6 +206,9 @@ gst_cdio_cdda_src_open (GstAudioCdSrc * audiocdsrc, const gchar * device)
+   GstCdioCddaSrc *src;
+   discmode_t discmode;
+   gint first_track, num_tracks, i;
++#if LIBCDIO_VERSION_NUM > 83
++  cdtext_t *cdtext;
++#endif
+ 
+   src = GST_CDIO_CDDA_SRC (audiocdsrc);
+ 
+@@ -232,8 +235,18 @@ gst_cdio_cdda_src_open (GstAudioCdSrc * audiocdsrc, const gchar * device)
+   if (src->read_speed != -1)
+     cdio_set_speed (src->cdio, src->read_speed);
+ 
++#if LIBCDIO_VERSION_NUM > 83
++  cdtext = cdio_get_cdtext (src->cdio);
++
++  if (NULL == cdtext)
++    GST_DEBUG_OBJECT (src, "no CD-TEXT on disc");
++  else
++    gst_cdio_add_cdtext_album_tags (GST_OBJECT_CAST (src), cdtext,
++        cddabasesrc->tags);
++#else
+   gst_cdio_add_cdtext_album_tags (GST_OBJECT_CAST (src), src->cdio,
+       cddabasesrc->tags);
++#endif
+ 
+   GST_LOG_OBJECT (src, "%u tracks, first track: %d", num_tracks, first_track);
+ 
+@@ -250,8 +263,14 @@ gst_cdio_cdda_src_open (GstAudioCdSrc * audiocdsrc, const gchar * device)
+      * the right thing here (for cddb id calculations etc. as well) */
+     track.start = cdio_get_track_lsn (src->cdio, i + first_track);
+     track.end = track.start + len_sectors - 1;  /* -1? */
++#if LIBCDIO_VERSION_NUM > 83
++    if (NULL != cdtext)
++      track.tags = gst_cdio_get_cdtext (GST_OBJECT (src), cdtext,
++          i + first_track);
++#else
+     track.tags = gst_cdio_get_cdtext (GST_OBJECT (src), src->cdio,
+         i + first_track);
++#endif
+ 
+     gst_audio_cd_src_add_track (GST_AUDIO_CD_SRC (src), &track);
+   }
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/libre/gstreamer0.10-ugly/opencore-amr.patch b/libre/gstreamer0.10-ugly/opencore-amr.patch
new file mode 100644
index 000000000..0a350dc46
--- /dev/null
+++ b/libre/gstreamer0.10-ugly/opencore-amr.patch
@@ -0,0 +1,35 @@
+--- ext/amrnb/amrnbdec.h.orig	2012-03-12 16:49:14.417405139 +0000
++++ ext/amrnb/amrnbdec.h	2012-03-12 16:49:35.393899419 +0000
+@@ -22,7 +22,7 @@
+ 
+ #include <gst/gst.h>
+ #include <gst/audio/gstaudiodecoder.h>
+-#include <interf_dec.h>
++#include <opencore-amrnb/interf_dec.h>
+ 
+ G_BEGIN_DECLS
+ 
+--- ext/amrnb/amrnbenc.h.orig	2012-03-12 16:49:23.833996062 +0000
++++ ext/amrnb/amrnbenc.h	2012-03-12 16:49:46.597141876 +0000
+@@ -21,7 +21,7 @@
+ #define __GST_AMRNBENC_H__
+ 
+ #include <gst/gst.h>
+-#include <interf_enc.h>
++#include <opencore-amrnb/interf_enc.h>
+ #include <gst/audio/gstaudioencoder.h>
+ 
+ G_BEGIN_DECLS
+--- ext/amrwbdec/amrwbdec.h.orig	2012-03-12 16:47:48.658100992 +0000
++++ ext/amrwbdec/amrwbdec.h	2012-03-12 16:48:12.177910733 +0000
+@@ -22,8 +22,8 @@
+ 
+ #include <gst/gst.h>
+ #include <gst/audio/gstaudiodecoder.h>
+-#include <dec_if.h>
+-#include <if_rom.h>
++#include <opencore-amrwb/dec_if.h>
++#include <opencore-amrwb/if_rom.h>
+ 
+ G_BEGIN_DECLS
+ 
diff --git a/libre/gstreamer0.10/PKGBUILD b/libre/gstreamer0.10/PKGBUILD
new file mode 100644
index 000000000..416c1cbd9
--- /dev/null
+++ b/libre/gstreamer0.10/PKGBUILD
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gstreamer0.10
+pkgver=0.10.36
+pkgrel=1.1
+pkgdesc="GStreamer Multimedia Framework, Parabola rebranded"
+arch=('i686' 'x86_64' 'mips64el')
+license=('LGPL')
+url="http://gstreamer.freedesktop.org/"
+depends=('libxml2' 'glib2')
+optdepends=('sh: feedback script')
+makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection')
+options=('!libtool')
+source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.xz)
+md5sums=('15389c73e091b1dda915279c388b9cb2')
+
+build() {
+  cd "${srcdir}/gstreamer-${pkgver}"
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib \
+    --with-package-name="GStreamer (Parabola GNU/Linux-libre)" \
+    --with-package-origin="https://parabolagnulinux.org/" \
+    --enable-gtk-doc --disable-static
+  make
+}
+
+check() {
+  cd "${srcdir}/gstreamer-${pkgver}"
+  make check
+}
+
+package() {
+  cd "${srcdir}/gstreamer-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  #Remove unversioned gst-* binaries to get rid of conflicts
+  cd "${pkgdir}/usr/bin"
+  for bins in `ls *-0.10`; do
+    rm -f ${bins/-0.10/}
+  done
+}
diff --git a/libre/libtasn1/PKGBUILD b/libre/libtasn1/PKGBUILD
new file mode 100644
index 000000000..2131a323b
--- /dev/null
+++ b/libre/libtasn1/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: judd <jvinet@zeroflux.org>
+
+pkgname=libtasn1
+pkgver=3.2
+pkgrel=1.1
+pkgdesc="The ASN.1 library used in GNUTLS, Parabola rebranded"
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL3' 'LGPL')
+url="http://www.gnu.org/software/libtasn1/"
+depends=('glibc' 'texinfo')
+options=('!libtool')
+install=libtasn1.install
+source=(http://ftp.gnu.org/gnu/libtasn1/${pkgname}-${pkgver}.tar.gz{,.sig})
+md5sums=('1b07629163025b9693aae9b8957842b2'
+         '67bdae9b78ac7bbfa2ab24c7d46bd577')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr \
+      --with-packager="Parabola GNU/Linux-libre" \
+      --with-packager-bug-reports="https://labs.parabola.nu/" \
+      --with-packager-version=${pkgver}-${pkgrel}
+  make
+}
+
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make check
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/libre/libtasn1/libtasn1.install b/libre/libtasn1/libtasn1.install
new file mode 100644
index 000000000..2d1ecc09f
--- /dev/null
+++ b/libre/libtasn1/libtasn1.install
@@ -0,0 +1,18 @@
+info_dir=/usr/share/info
+info_files=(libtasn1.info)
+
+post_install() {
+  for f in ${info_files[@]}; do
+    install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  for f in ${info_files[@]}; do
+    install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+  done
+}
diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD
index b9860cb3f..25343fd26 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.8.3
-_kernrel=2
+_kernver=3.8.4
+_kernrel=1
 pkgname=('linux-libre-kmod-alx')
 _version=v3.8-rc7
 _pkgver=3.8-rc7-1-u
 pkgver=3.8rc7.1
-pkgrel=9
+pkgrel=10
 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 3a0571c9d..5e59c2fec 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.69
+_kernver=3.0.70
 _kernrel=1
 pkgname=('linux-libre-lts-kmod-alx')
 _version=v3.8-rc7
 _pkgver=3.8-rc7-1-u
 pkgver=3.8rc7.1
-pkgrel=7
+pkgrel=8
 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 fc87dbdb6..eaa185f4f 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180056 2013-03-15 09:48:23Z tpowa $
+# $Id: PKGBUILD 180408 2013-03-21 07:53:18Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -7,7 +7,7 @@
 pkgbase=linux-libre-lts     # Build stock -LIBRE-LTS kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.0
-_sublevel=69
+_sublevel=70
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
 _lxopkgver=${_basekernel}.69 # nearly always the same as pkgver
@@ -32,7 +32,7 @@ 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}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('5f64180fe7df4e574dac5911b78f5067'
-         'cf63ee4dfe973aa9f933ed552ac5c277'
+         '0f4930f721d1815e7e1d724775bfadd9'
          '99f9c408b64393aceb2482c9a3e329ee'
          'fba95bf1857ce6bf863e13a1ab73f584'
          'c072b17032e80debc6a8626299245d46'
diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install
index f8eccd0c4..e0a21d3fa 100644
--- a/libre/linux-libre-lts/linux-libre-lts.install
+++ b/libre/linux-libre-lts/linux-libre-lts.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-lts
-KERNEL_VERSION=3.0.69-1-LIBRE-LTS
+KERNEL_VERSION=3.0.70-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'
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index d242c7cc8..080c8dcba 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180114 2013-03-17 13:00:07Z tpowa $
+# $Id: PKGBUILD 180406 2013-03-21 07:26:50Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
@@ -10,9 +10,9 @@
 pkgbase=linux-libre         # Build stock -LIBRE kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.8
-_sublevel=3
+_sublevel=4
 pkgver=${_basekernel}.${_sublevel}
-pkgrel=2
+pkgrel=1
 _lxopkgver=${_basekernel}.3 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
@@ -29,11 +29,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'Kbuild.platforms'
         'boot-logo.patch'
         'change-default-console-loglevel.patch'
-        'drm-i915-enable-irqs-earlier-when-resuming.patch'
-        'drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('84c2a77910932ffc7d958744ac9cf2f5'
-         'a762b6f22a64473a0b4d8dc5366b25d3'
+         'be610dd93dbe033cfe04018b27557c3e'
          '4d73ccd0f1825a4bd474d4fead6c0d42'
          'e132184c6d02ef580a504967c067e1c5'
          'e49ac236dfeef709f91a3d993ea7b62c'
@@ -41,8 +39,6 @@ md5sums=('84c2a77910932ffc7d958744ac9cf2f5'
          '8267264d9a8966e57fdacd1fa1fc65c4'
          '04b21c79df0a952c22d681dd4f4562df'
          'f3def2cefdcbb954c21d8505d23cc83c'
-         '40e7b328977ad787a0b5584f193d63fe'
-         '8b9159931fab0c191a86dbd5a46fa328'
          '6dcf31e2ad8625ab2864af257e86564b')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
@@ -68,11 +64,6 @@ build() {
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
   patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
 
-  # revert 2 patches which breaks displays
-  # FS 34327
-  patch -Rp1 -i "${srcdir}/drm-i915-enable-irqs-earlier-when-resuming.patch"
-  patch -Rp1 -i "${srcdir}/drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch"
-
   if [ "$CARCH" == "mips64el" ]; then
     sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile
     sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
diff --git a/libre/linux-libre/drm-i915-enable-irqs-earlier-when-resuming.patch b/libre/linux-libre/drm-i915-enable-irqs-earlier-when-resuming.patch
deleted file mode 100644
index cb621d520..000000000
--- a/libre/linux-libre/drm-i915-enable-irqs-earlier-when-resuming.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 15239099d7a7a9ecdc1ccb5b187ae4cda5488ff9 Mon Sep 17 00:00:00 2001
-From: Daniel Vetter <daniel.vetter@ffwll.ch>
-Date: Tue, 5 Mar 2013 09:50:58 +0100
-Subject: drm/i915: enable irqs earlier when resuming
-
-From: Daniel Vetter <daniel.vetter@ffwll.ch>
-
-commit 15239099d7a7a9ecdc1ccb5b187ae4cda5488ff9 upstream.
-
-We need it to restore the ilk rc6 context, since the gpu wait no
-requires interrupts. But in general having interrupts around should
-help in code sanity, since more and more stuff is interrupt driven.
-
-This regression has been introduced in
-
-commit 3e9605018ab3e333d51cc90fccfde2031886763b
-Author: Chris Wilson <chris@chris-wilson.co.uk>
-Date:   Tue Nov 27 16:22:54 2012 +0000
-
-    drm/i915: Rearrange code to only have a single method for waiting upon the ring
-
-Like in the driver load code we need to make sure that hotplug
-interrupts don't cause havoc with our modeset state, hence block them
-with the existing infrastructure. Again we ignore races where we might
-loose hotplug interrupts ...
-
-Note that the driver load part of the regression has already been
-fixed in
-
-commit 52d7ecedac3f96fb562cb482c139015372728638
-Author: Daniel Vetter <daniel.vetter@ffwll.ch>
-Date:   Sat Dec 1 21:03:22 2012 +0100
-
-    drm/i915: reorder setup sequence to have irqs for output setup
-
-v2: Add a note to the commit message about which patch fixed the
-driver load part of the regression. Stable kernels need to backport
-both patches.
-
-Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=54691
-Cc: Chris Wilson <chris@chris-wilson.co.uk>
-Cc: Mika Kuoppala <mika.kuoppala@intel.com>
-Reported-and-Tested-by: Ilya Tumaykin <itumaykin@gmail.com>
-Reviewed-by: Chris wilson <chris@chris-wilson.co.uk> (v1)
-Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/gpu/drm/i915/i915_drv.c |   13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/i915/i915_drv.c
-+++ b/drivers/gpu/drm/i915/i915_drv.c
-@@ -486,6 +486,7 @@ static int i915_drm_freeze(struct drm_de
- 		intel_modeset_disable(dev);
- 
- 		drm_irq_uninstall(dev);
-+		dev_priv->enable_hotplug_processing = false;
- 	}
- 
- 	i915_save_state(dev);
-@@ -562,9 +563,19 @@ static int __i915_drm_thaw(struct drm_de
- 		error = i915_gem_init_hw(dev);
- 		mutex_unlock(&dev->struct_mutex);
- 
-+		/* We need working interrupts for modeset enabling ... */
-+		drm_irq_install(dev);
-+
- 		intel_modeset_init_hw(dev);
- 		intel_modeset_setup_hw_state(dev, false);
--		drm_irq_install(dev);
-+
-+		/*
-+		 * ... but also need to make sure that hotplug processing
-+		 * doesn't cause havoc. Like in the driver load code we don't
-+		 * bother with the tiny race here where we might loose hotplug
-+		 * notifications.
-+		 * */
-+		dev_priv->enable_hotplug_processing = true;
- 	}
- 
- 	intel_opregion_init(dev);
diff --git a/libre/linux-libre/drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch b/libre/linux-libre/drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch
deleted file mode 100644
index 8dc354488..000000000
--- a/libre/linux-libre/drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From 52d7ecedac3f96fb562cb482c139015372728638 Mon Sep 17 00:00:00 2001
-From: Daniel Vetter <daniel.vetter@ffwll.ch>
-Date: Sat, 1 Dec 2012 21:03:22 +0100
-Subject: drm/i915: reorder setup sequence to have irqs for output setup
-
-From: Daniel Vetter <daniel.vetter@ffwll.ch>
-
-commit 52d7ecedac3f96fb562cb482c139015372728638 upstream.
-
-Otherwise the new&shiny irq-driven gmbus and dp aux code won't work that
-well. Noticed since the dp aux code doesn't have an automatic fallback
-with a timeout (since the hw provides for that already).
-
-v2: Simple move drm_irq_install before intel_modeset_gem_init, as
-suggested by Ben Widawsky.
-
-v3: Now that interrupts are enabled before all connectors are fully
-set up, we might fall over serving a HPD interrupt while things are
-still being set up. Instead of jumping through massive hoops and
-complicating the code with a separate hpd irq enable step, simply
-block out the hotplug work item from doing anything until things are
-in place.
-
-v4: Actually, we can enable hotplug processing only after the fbdev is
-fully set up, since we call down into the fbdev from the hotplug work
-functions. So stick the hpd enabling right next to the poll helper
-initialization.
-
-v5: We need to enable irqs before intel_modeset_init, since that
-function sets up the outputs.
-
-v6: Fixup cleanup sequence, too.
-
-Reviewed-by: Imre Deak <imre.deak@intel.com>
-Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/gpu/drm/i915/i915_dma.c |   23 ++++++++++++++---------
- drivers/gpu/drm/i915/i915_drv.h |    1 +
- drivers/gpu/drm/i915/i915_irq.c |    4 ++++
- 3 files changed, 19 insertions(+), 9 deletions(-)
-
---- a/drivers/gpu/drm/i915/i915_dma.c
-+++ b/drivers/gpu/drm/i915/i915_dma.c
-@@ -1297,19 +1297,21 @@ static int i915_load_modeset_init(struct
- 	if (ret)
- 		goto cleanup_vga_switcheroo;
- 
-+	ret = drm_irq_install(dev);
-+	if (ret)
-+		goto cleanup_gem_stolen;
-+
-+	/* Important: The output setup functions called by modeset_init need
-+	 * working irqs for e.g. gmbus and dp aux transfers. */
- 	intel_modeset_init(dev);
- 
- 	ret = i915_gem_init(dev);
- 	if (ret)
--		goto cleanup_gem_stolen;
--
--	intel_modeset_gem_init(dev);
-+		goto cleanup_irq;
- 
- 	INIT_WORK(&dev_priv->console_resume_work, intel_console_resume);
- 
--	ret = drm_irq_install(dev);
--	if (ret)
--		goto cleanup_gem;
-+	intel_modeset_gem_init(dev);
- 
- 	/* Always safe in the mode setting case. */
- 	/* FIXME: do pre/post-mode set stuff in core KMS code */
-@@ -1317,7 +1319,10 @@ static int i915_load_modeset_init(struct
- 
- 	ret = intel_fbdev_init(dev);
- 	if (ret)
--		goto cleanup_irq;
-+		goto cleanup_gem;
-+
-+	/* Only enable hotplug handling once the fbdev is fully set up. */
-+	dev_priv->enable_hotplug_processing = true;
- 
- 	drm_kms_helper_poll_init(dev);
- 
-@@ -1326,13 +1331,13 @@ static int i915_load_modeset_init(struct
- 
- 	return 0;
- 
--cleanup_irq:
--	drm_irq_uninstall(dev);
- cleanup_gem:
- 	mutex_lock(&dev->struct_mutex);
- 	i915_gem_cleanup_ringbuffer(dev);
- 	mutex_unlock(&dev->struct_mutex);
- 	i915_gem_cleanup_aliasing_ppgtt(dev);
-+cleanup_irq:
-+	drm_irq_uninstall(dev);
- cleanup_gem_stolen:
- 	i915_gem_cleanup_stolen(dev);
- cleanup_vga_switcheroo:
---- a/drivers/gpu/drm/i915/i915_drv.h
-+++ b/drivers/gpu/drm/i915/i915_drv.h
-@@ -672,6 +672,7 @@ typedef struct drm_i915_private {
- 
- 	u32 hotplug_supported_mask;
- 	struct work_struct hotplug_work;
-+	bool enable_hotplug_processing;
- 
- 	int num_pipe;
- 	int num_pch_pll;
---- a/drivers/gpu/drm/i915/i915_irq.c
-+++ b/drivers/gpu/drm/i915/i915_irq.c
-@@ -287,6 +287,10 @@ static void i915_hotplug_work_func(struc
- 	struct drm_mode_config *mode_config = &dev->mode_config;
- 	struct intel_encoder *encoder;
- 
-+	/* HPD irq before everything is fully set up. */
-+	if (!dev_priv->enable_hotplug_processing)
-+		return;
-+
- 	mutex_lock(&mode_config->mutex);
- 	DRM_DEBUG_KMS("running encoder hotplug functions\n");
- 
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 24bb42986..6b7f58a8b 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=
-KERNEL_VERSION=3.8.3-2-LIBRE
+KERNEL_VERSION=3.8.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'
diff --git a/libre/usermin/PKGBUILD b/libre/usermin/PKGBUILD
new file mode 100644
index 000000000..7d594cdcd
--- /dev/null
+++ b/libre/usermin/PKGBUILD
@@ -0,0 +1,134 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+pkgname=usermin
+pkgver=1.540
+pkgrel=1.1
+pkgdesc="a web interface that can be used to easily perform tasks like reading mail, setting up SSH or configuring mail forwarding (Parabola rebranded)"
+arch=(i686 x86_64 mips64el)
+license=('custom:usermin')
+url="http://www.webmin.com/"
+depends=('perl' 'webmin')
+makedepends=('perl-net-ssleay')
+backup=('etc/usermin/miniserv.conf' 'etc/usermin/miniserv.users' 'etc/usermin/config' 'etc/usermin/usermin.cats' \
+'etc/usermin/at/config' \
+'etc/usermin/man/config' \
+'etc/usermin/ssh/config' \
+'etc/usermin/chfn/config' \
+'etc/usermin/cron/config' \
+'etc/usermin/file/config' \
+'etc/usermin/plan/config' \
+'etc/usermin/proc/config' \
+'etc/usermin/spam/config' \
+'etc/usermin/htaccess/config' \
+'etc/usermin/cshrc/config' \
+'etc/usermin/gnupg/config' \
+'etc/usermin/mysql/config' \
+'etc/usermin/quota/config' \
+'etc/usermin/shell/config' \
+'etc/usermin/theme/config' \
+'etc/usermin/mailbox/config' \
+'etc/usermin/schedule/config' \
+'etc/usermin/config' \
+'etc/usermin/commands/config' \
+'etc/usermin/htaccess-htpasswd/config' \
+'etc/usermin/forward/config' \
+'etc/usermin/telnet/config' \
+'etc/usermin/tunnel/config' \
+'etc/usermin/updown/config' \
+'etc/usermin/procmail/config' \
+'etc/usermin/fetchmail/config' \
+'etc/usermin/changepass/config' \
+'etc/usermin/language/config' \
+'etc/usermin/postgresql/config' \
+'etc/usermin/usermount/config' \
+)
+install=usermin.install
+source=(http://downloads.sourceforge.net/sourceforge/webadmin/$pkgname-$pkgver.tar.gz 
+	usermin.rc 
+	usermin.service
+	ftp://ftp.archlinux.org/other/usermin/usermin-config.tar.bz2) 
+
+package() {
+  cd "$srcdir"/$pkgname-$pkgver
+    
+  # remove modules we do not support
+
+  #remove config files from other distros
+  rm -f $(find . ! -name 'config-generic-linux' ! -name 'config-\*-linux' ! -name 'config-lib.pl' -name 'config-*')
+  
+  # remove caldera theme
+  rm -rf caldera
+
+  # remove init-scripts from other distros
+  rm usermin-init
+  rm usermin-daemon
+
+  # setting perl path
+  (find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl -
+  
+  # create dirs
+  mkdir -p "$pkgdir"/opt/usermin
+  mkdir -p "$pkgdir"/var/log/usermin
+  mkdir -p "$pkgdir"/etc/usermin
+  
+  # install pam stuff
+  install -D -m 644 usermin-pam "$pkgdir"/etc/pam.d/usermin
+  
+  # remove other distros and add only Parabola GNU/Linux-libre don't change next line else it will not work!
+  rm os_list.txt
+  echo 'Parabola GNU/Linux-libre			Any version	generic-linux	*	-d "/etc/pacman.d"' >> os_list.txt
+  
+  # copy stuff to right dirs
+  cd "$srcdir"/$pkgname-$pkgver
+  cp -rp * "$pkgdir"/opt/usermin
+  cd "$srcdir"/usermin-config
+  cp -rfp * "$pkgdir"/opt/usermin
+
+  # define parameters for setup.sh
+  config_dir="$pkgdir"/etc/usermin
+  var_dir="$pkgdir"/var/log/usermin
+  perl=/usr/bin/perl
+  autoos=1
+  port=20000
+  login=root
+  crypt="XXX"
+  ssl=1
+  atboot=0
+  nostart=1
+  nochown=1
+  autothird=1
+  nouninstall=1
+  noperlpath=1
+  atbootyn=n
+  tempdir="$pkgdir"/tmp
+  export config_dir var_dir perl autoos port tempdir ssl nochown autothird nouninstall nostart noperlpath atbootyn login crypt
+  
+  # Fix setup.sh
+  sed -i -e 's:read atbootyn::g' -e 's:exit 13::g' "$pkgdir"/opt/usermin/setup.sh
+  "$pkgdir"/opt/usermin/setup.sh
+  
+  # Fixup the config files to use their real locations
+  sed -i 's:^pidfile=.*$:pidfile=/var/run/usermin.pid:' "$pkgdir"/etc/usermin/miniserv.conf
+  find "$pkgdir"/etc/usermin -type f -exec sed -i "s:$pkgdir::g" {} \; 
+  
+  # make it only accessible by localhost
+  echo 'allow=127.0.0.1' >> "$pkgdir"/etc/usermin/miniserv.conf
+  
+  # enable user and password login
+  sed -i -e '/localauth/d' "$pkgdir"/etc/usermin/miniserv.conf
+
+  #install systemd service file
+  install -D -m 644 "$srcdir"/usermin.service "$pkgdir"/usr/lib/systemd/system/usermin.service
+ 
+ #install rc file
+  install -D -m 755 "$srcdir"/usermin.rc "$pkgdir"/etc/rc.d/usermin
+
+  # delete temp dir
+  rm -r "$pkgdir"/tmp
+  #install license
+  install -m 644 -D "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/usermin/LICENCE
+}
+md5sums=('d29c9fdebab14c168c33bde8906efe21'
+         'cfef4490cd1ef9517c0b39a7bd75c968'
+         'a5bd5e5ee779f8a3cf3d776ca77ee36e'
+         'ec37a79f948f778224550930d2a7ca07')
diff --git a/libre/usermin/usermin.install b/libre/usermin/usermin.install
new file mode 100644
index 000000000..3ace10ea2
--- /dev/null
+++ b/libre/usermin/usermin.install
@@ -0,0 +1,34 @@
+# arg 1:  the new package version
+post_install() {
+  local crypt=$(grep "^root:" ${ROOT}/etc/shadow | cut -f 2 -d :)
+  crypt=${crypt//\\/\\\\}
+  crypt=${crypt//\//\\\/}
+  sed -i "s/root:XXX/root:${crypt}/" /etc/usermin/miniserv.users
+cat << EOF
+Note:
+==> It is not allowed to install 3rd party modules, or delete existing modules.
+==> Please write your own PKGBUILDS for 3rd party modules and additional themes.
+Setup:
+==> To make usermin start at boot time, add usermin to rc.conf daemons
+==> Point your web browser to http://localhost:20000 to use usermin.
+==> To change the modules setup please use webmin.
+
+==> The access is restricted to localhost, if you want to connect from other locations
+==> change /etc/usermin/miniserv.conf to something like that: allow=127.0.0.1 <your-ip>
+==> If you want to have ssl encryption please install 'perl-net-ssleay' additional.
+EOF
+# fix man module
+  cd /opt/usermin/man
+  gzip -df $(find . -name '*.gz')
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  # uninstall unzipped files
+  rm -r /opt/usermin/man
+}
diff --git a/libre/usermin/usermin.rc b/libre/usermin/usermin.rc
new file mode 100644
index 000000000..af365780a
--- /dev/null
+++ b/libre/usermin/usermin.rc
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+start=/etc/usermin/start
+stop=/etc/usermin/stop
+lockfile=/var/lock/usermin
+
+case "$1" in
+'start')
+     stat_busy "Starting Usermin daemon"
+     $start >/dev/null 2>&1 </dev/null
+     RETVAL=$?
+     if [ "$RETVAL" = "0" ]; then
+     touch $lockfile >/dev/null 2>&1
+     stat_done
+     else
+     stat_fail
+fi
+;;
+
+'stop')
+     stat_busy "Stopping Usermin daemon"
+     $stop >/dev/null 2>&1 </dev/null
+     RETVAL=$?
+     if [ "$RETVAL" = "0" ]; then
+     rm -f $lockfile
+     stat_done
+     else
+     stat_fail
+fi
+;;
+
+'restart')
+     $stop && $start
+     RETVAL=$?
+;;
+*)
+echo "Usage: $0 { start | stop | restart }"
+RETVAL=1
+;;
+esac
+exit $RETVAL
\ No newline at end of file
diff --git a/libre/usermin/usermin.service b/libre/usermin/usermin.service
new file mode 100644
index 000000000..e91164c63
--- /dev/null
+++ b/libre/usermin/usermin.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Usermin
+
+[Service]
+Type=forking
+ExecStart=/opt/usermin/miniserv.pl /etc/usermin/miniserv.conf
+
+[Install]
+WantedBy=multi-user.target
diff --git a/libre/webmin/PKGBUILD b/libre/webmin/PKGBUILD
new file mode 100644
index 000000000..094f14b34
--- /dev/null
+++ b/libre/webmin/PKGBUILD
@@ -0,0 +1,221 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+pkgname=webmin
+pkgver=1.620
+pkgrel=1.1
+pkgdesc="a web-based interface for system administration, Parabola rebranded"
+arch=(i686 x86_64 mips64el)
+license=('custom:webmin')
+url="http://www.webmin.com/"
+depends=('perl' 'perl-perl4-corelibs')
+makedepends=('perl-net-ssleay')
+backup=('etc/webmin/miniserv.conf' 'etc/webmin/miniserv.users' 'etc/webmin/config' 'etc/webmin/webmin.cats' \
+'etc/webmin/pacman/config' \
+'etc/webmin/at/config' \
+'etc/webmin/acl/config' \
+'etc/webmin/lvm/config' \
+'etc/webmin/net/config' \
+'etc/webmin/nis/config' \
+'etc/webmin/pam/config' \
+'etc/webmin/cron/config' \
+'etc/webmin/file/config' \
+'etc/webmin/grub/config' \
+'etc/webmin/init/config' \
+'etc/webmin/ipfw/config' \
+'etc/webmin/lilo/config' \
+'etc/webmin/proc/config' \
+'etc/webmin/raid/config' \
+'etc/webmin/spam/config' \
+'etc/webmin/sshd/config' \
+'etc/webmin/time/config' \
+'etc/webmin/cluster-passwd/config' \
+'etc/webmin/software/config' \
+'etc/webmin/webminlog/config' \
+'etc/webmin/cluster-webmin/config' \
+'etc/webmin/bind8/config' \
+'etc/webmin/dhcpd/config' \
+'etc/webmin/fdisk/config' \
+'etc/webmin/mount/config' \
+'etc/webmin/mysql/config' \
+'etc/webmin/quota/config' \
+'etc/webmin/samba/config' \
+'etc/webmin/shell/config' \
+'etc/webmin/squid/config' \
+'etc/webmin/adsl-client/config' \
+'etc/webmin/servers/config' \
+'etc/webmin/cluster-shell/config' \
+'etc/webmin/bandwidth/config' \
+'etc/webmin/ppp-client/config' \
+'etc/webmin/lpadmin/config' \
+'etc/webmin/apache/config' \
+'etc/webmin/firewall/config' \
+'etc/webmin/stunnel/config' \
+'etc/webmin/burner/config' \
+'etc/webmin/exports/config' \
+'etc/webmin/backup-config/config' \
+'etc/webmin/custom/config' \
+'etc/webmin/htaccess-htpasswd/config' \
+'etc/webmin/logrotate/config' \
+'etc/webmin/format/config' \
+'etc/webmin/fsdump/config' \
+'etc/webmin/passwd/config' \
+'etc/webmin/cluster-useradmin/config' \
+'etc/webmin/cluster-software/config' \
+'etc/webmin/cluster-copy/config' \
+'etc/webmin/cluster-cron/config' \
+'etc/webmin/telnet/config' \
+'etc/webmin/status/config' \
+'etc/webmin/syslog/config' \
+'etc/webmin/updown/config' \
+'etc/webmin/usermin/config' \
+'etc/webmin/webmin/config' \
+'etc/webmin/xinetd/config' \
+'etc/webmin/openslp/config' \
+'etc/webmin/procmail/config' \
+'etc/webmin/fetchmail/config' \
+'etc/webmin/postgresql/config' \
+'etc/webmin/useradmin/config' \
+'etc/webmin/mailboxes/config' \
+'etc/webmin/inittab/config' \
+'etc/webmin/change-user/config' \
+'etc/webmin/postfix/config' \
+'etc/webmin/proftpd/config' \
+'etc/webmin/pserver/config' \
+'etc/webmin/dnsadmin/config' )
+install=webmin.install
+source=(http://downloads.sourceforge.net/sourceforge/webadmin/$pkgname-$pkgver.tar.gz 
+	ftp://ftp.archlinux.org/other/webmin/webmin-config.tar.bz2 
+	ftp://ftp.archlinux.org/other/webmin/webmin-pacman.tar.bz2
+	webmin.rc
+	webmin.service) 
+options=(!strip)
+
+package() {
+  # NOTE: USE --asroot build option to avoid fakeroot error!
+  cd "$srcdir"/$pkgname-$pkgver
+  # add patches from webmin.com
+  #for i in ../*.wbm 
+  #do tar xvf $i
+  #done
+  #for i in ../*.wbt
+  #do tar xvf $i
+  #done
+  # delete stuff that's not needed
+  rm -f mount/freebsd-mounts*
+  rm -f mount/openbsd-mounts*
+  rm -f mount/macos-mounts*
+  
+  # remove modules we do not support
+  rm -rf {bacula-backup,ldap-useradmin,mon,sentry,frox,jabber,majordomo,qmail,sendmail,sarg,wuftpd,webalizer,inetd,ipsec,pap,pptp-client,pptp-server,shorewall,smart-status,vgetty,heartbeat,cfengine,cpan,sgiexports,hpuxexports,qmailadmin,bsdexports,dfsadmin}
+  
+  #remove config files from other distros
+  rm -f $(find . ! -name 'config-generic-linux' ! -name 'config-\*-linux' ! -name 'config-lib.pl' -name 'config-*')
+  
+  # remove caldera theme
+  rm -rf caldera
+
+  # remove init-scripts from other distros
+  rm webmin-gentoo-init
+  rm webmin-init
+  rm webmin-caldera-init
+  rm webmin-daemon
+
+  # remove update stuff to avoid problems with updating webmin,modules and themes without pacman
+  rm -f webmin/{update.cgi,update.pl,update_sched.cgi,upgrade.cgi,edit_upgrade.cgi,install_mod.cgi,delete_mod.cgi,install_theme.cgi}
+  rm -f usermin/{upgrade.cgi,update.cgi,update.pl,edit_upgrade.cgi,install_mod.cgi,delete_mod.cgi,install_theme.cgi}
+
+  # remove modules add because we don't want files installed without pacman control
+  rm -f webmin/{install_mod.cgi,delete_mod.cgi}  
+
+  # setting perl path
+  (find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl -
+  
+  # create dirs
+  mkdir -p "$pkgdir"/opt/webmin
+  mkdir -p "$pkgdir"/var/log/webmin
+  mkdir -p "$pkgdir"/etc/webmin
+  
+  # install pam stuff
+  install -D -m 644 webmin-pam "$pkgdir"/etc/pam.d/webmin
+  
+  # remove other distros and add only Parabola GNU/Linux-libre don't change next line else it will not work!
+  rm os_list.txt
+  echo 'Parabola GNU/linux-libre			Any version	generic-linux	*	-d "/etc/pacman.d"' >> os_list.txt
+  
+  # Add rc.conf support to boot and shutdown menu and lock editing of this module
+  cd init/
+  sed -i -e 's:^local_down=.*:local_down=Parabola GNU/Linux-libre RC.CONF,3,None:g' $(find . ! -name 'config.info.pl' -name 'config.info*')
+  sed -i -e 's:^local_script=.*:local_script=Parabola GNU/Linux-libre RC.LOCAL,3,None:g' $(find . ! -name 'config.info.pl' -name 'config.info*') 
+  sed -i -e 's:^index_downscript=.*:index_downscript=Parabola GNU/Linux-libre RC.CONF:g' lang/*
+  sed -i -e 's:^index_script=.*:index_script=Parabola GNU/Linux-libre RC.LOCAL:g' lang/*
+  sed -i -e 's:^noconfig=0:noconfig=1:g'  defaultacl
+
+  # Add pacman menu
+  cd "$srcdir"/$pkgname-$pkgver
+  cp -rf custom/ pacman
+  cp -rf mscstyle3/custom mscstyle3/pacman
+  sed -i -e 's:^noconfig=0:noconfig=1:g' -e 's:^edit=1:edit=0:g' pacman/defaultacl
+  sed -i -e '/desc/d' -e '/longdesc/d' pacman/module.info
+  sed -i -e 's:^name=Custom:name=Pacman:g' pacman/module.info
+  echo 'category=system' >> pacman/module.info
+  echo 'desc=Pacman' >> pacman/module.info
+  sed -i -e 's:^index_title=.*:index_title=Pacman:g' pacman/lang/*
+
+  # copy stuff to right dirs
+  cd "$srcdir"/$pkgname-$pkgver
+  cp -rp * "$pkgdir"/opt/webmin
+  cd "$srcdir"/webmin-config
+  cp -rfp * "$pkgdir"/opt/webmin
+
+  # define parameters for setup.sh
+  config_dir="$pkgdir"/etc/webmin
+  var_dir="$pkgdir"/var/log/webmin
+  perl=/usr/bin/perl
+  autoos=1
+  port=10000
+  login=root
+  crypt="XXX"
+  ssl=1
+  atboot=0
+  nostart=1
+  nochown=1
+  autothird=1
+  nouninstall=1
+  noperlpath=1
+  atbootyn=n
+  tempdir="$pkgdir"/tmp
+  export config_dir var_dir perl autoos port tempdir login crypt ssl nochown autothird nouninstall nostart noperlpath atbootyn
+  
+  # Fix setup.sh
+  sed -i -e 's:read atbootyn::g' -e 's:exit 13::g' "$pkgdir"/opt/webmin/setup.sh
+  "$pkgdir"/opt/webmin/setup.sh
+  
+  # Fixup the config files to use their real locations
+  sed -i 's:^pidfile=.*$:pidfile=/var/run/webmin.pid:' "$pkgdir"/etc/webmin/miniserv.conf
+  find "$pkgdir"/etc/webmin -type f -exec sed -i "s:$pkgdir::g" {} \; 
+  
+  # make it only accessible by localhost
+  echo 'allow=127.0.0.1' >> "$pkgdir"/etc/webmin/miniserv.conf
+  
+  # install pacman menu
+  cd "$srcdir"/webmin-pacman/config
+  cp -rfp * "$pkgdir"/etc/webmin/pacman
+
+  #install rc file
+  install -D -m 755 "$srcdir"/webmin.rc "$pkgdir"/etc/rc.d/webmin
+
+  # install systemd files
+  install -D -m 644 $srcdir/webmin.service $pkgdir/usr/lib/systemd/system/webmin.service
+
+  # delete temp dir
+  rm -r "$pkgdir"/tmp
+  # change sticky bit
+  chmod 0644 $pkgdir/opt/webmin/man/config-generic-linux
+  # install license
+  install -m 644 -D "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/webmin/LICENCE
+}
+md5sums=('e93bc5057a5b7d7e31ecb2bb228d7044'
+         'b0b3e3fb231a12e60165b6b4d604dcfa'
+         'bfebb75bb94029b48c46b7f1ba1aa811'
+         'c77dfcd621b417a7826d25f56a1e60ae'
+         'fc29ecb6a5cd8c278abe054e60381095')
diff --git a/libre/webmin/webmin.install b/libre/webmin/webmin.install
new file mode 100644
index 000000000..efdd9291d
--- /dev/null
+++ b/libre/webmin/webmin.install
@@ -0,0 +1,35 @@
+# arg 1:  the new package version
+post_install() {
+  local crypt=$(grep "^root:" ${ROOT}/etc/shadow | cut -f 2 -d :)
+  crypt=${crypt//\\/\\\\}
+  crypt=${crypt//\//\\\/}
+  sed -i "s/root:XXX/root:${crypt}/" /etc/webmin/miniserv.users
+
+cat << EOF
+Note:
+==> It is not allowed to install 3rd party modules, or delete existing modules.
+==> Please write your own PKGBUILDS for 3rd party modules and additional themes.
+Setup:
+==> To make webmin start at boot time, add webmin to rc.conf daemons
+==> Point your web browser to http://localhost:10000 to use webmin.
+==> The access is restricted to localhost, if you want to connect from other locations
+==> change /etc/webmin/miniserv.conf to something like that: allow=127.0.0.1 <your-ip>
+==> If you want to have ssl encryption please install 'perl-net-ssleay' additional.
+EOF
+# fix man module
+  cd /opt/webmin/man
+  for i in $(find . -name '*.gz'); do
+  gzip -df $i
+  done
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  # uninstall unzipped files
+  rm -r /opt/webmin/man
+}
diff --git a/libre/webmin/webmin.rc b/libre/webmin/webmin.rc
new file mode 100644
index 000000000..6aac8941d
--- /dev/null
+++ b/libre/webmin/webmin.rc
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+start=/etc/webmin/start
+stop=/etc/webmin/stop
+lockfile=/var/lock/webmin
+
+case "$1" in
+'start')
+     stat_busy "Starting Webmin daemon"
+     $start >/dev/null 2>&1 </dev/null
+     RETVAL=$?
+     if [ "$RETVAL" = "0" ]; then
+     touch $lockfile >/dev/null 2>&1
+     add_daemon webmin
+     stat_done
+     else
+     stat_fail
+fi
+;;
+
+'stop')
+     stat_busy "Stopping Webmin daemon"
+     $stop >/dev/null 2>&1 </dev/null
+     RETVAL=$?
+     if [ "$RETVAL" = "0" ]; then
+     rm -f $lockfile
+     rm_daemon webmin
+     stat_done
+     else
+     stat_fail
+fi
+;;
+
+'restart')
+     $0 stop
+     $0 start
+;;
+*)
+echo "Usage: $0 { start | stop | restart }"
+RETVAL=1
+;;
+esac
+exit $RETVAL
\ No newline at end of file
diff --git a/libre/webmin/webmin.service b/libre/webmin/webmin.service
new file mode 100644
index 000000000..a8a384a8c
--- /dev/null
+++ b/libre/webmin/webmin.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Webmin
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/etc/webmin/start
+ExecStop=/etc/webmin/stop
+
+[Install]
+WantedBy=multi-user.target
diff --git a/libre/xsp/PKGBUILD b/libre/xsp/PKGBUILD
new file mode 100644
index 000000000..43b44ed69
--- /dev/null
+++ b/libre/xsp/PKGBUILD
@@ -0,0 +1,64 @@
+# $Id$
+# 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)
+license=('custom')
+url="http://www.go-mono.com"
+depends=('mono>=2.10.2' '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)
+
+build() {
+ # get rid of that .wapi errors; thanks to brice
+  export MONO_SHARED_DIR=${srcdir}/src/weird
+  mkdir -p "${MONO_SHARED_DIR}"
+ # import pathes
+ # 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
+  ./configure --prefix=/usr --sysconfdir=/etc
+  make || return 1
+ # 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
+  done
+   #destdir related bugfixes
+  sed -i 's|mkdir \$(datadir)|mkdir $(DESTDIR)$(datadir)|' test/2.0/treeview/Makefile
+  sed -i 's|gif \$(datadir)|gif $(DESTDIR)$(datadir)|' test/2.0/treeview/Makefile
+}
+
+package(){
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir}/ install
+ # move test files from share to arch' default html home
+  mkdir -p ${pkgdir}/srv/http/html
+  mv ${pkgdir}/usr/lib/xsp/test ${pkgdir}/srv/http/html/xsp
+  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
+  install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
+ # install systemd service file
+  install -D -m644 ${srcdir}/${pkgname}.service \
+    ${pkgdir}/usr/lib/systemd/system/xsp.service
+}
+md5sums=('4fe62fc95ad5dc136d8a7f3299d523b6'
+         '9575bd7d6f64d51ba05bdd6370665858'
+         '35d921df0fefc30f47a438c95d420efc'
+         'c917c07f68b945691506c29750db482f'
+         '9d83bd36d209f8d36a11dfbc4fa50819')
diff --git a/libre/xsp/xsp.conf.d b/libre/xsp/xsp.conf.d
new file mode 100644
index 000000000..b100baef1
--- /dev/null
+++ b/libre/xsp/xsp.conf.d
@@ -0,0 +1,10 @@
+# xsp options
+
+
+# note that is just the helping app for mod_mono if you like production like
+# quality
+# xsp is for ASP testing mainly  -- read the manpage for xsp to know what
+# options are available. Parabola will provide xsp configured by a .webapp
+# configuration file which rests in /etc/xsp
+
+XSP_PARAMS="--appconfigdir /etc/xsp"
diff --git a/libre/xsp/xsp.install b/libre/xsp/xsp.install
new file mode 100644
index 000000000..d2cc5955a
--- /dev/null
+++ b/libre/xsp/xsp.install
@@ -0,0 +1,37 @@
+# arg 1:  the new package version
+post_install() {
+  cat << EOM
+
+-->  xsp is just the helping app for mod_mono if you like a production like
+-->  server. xsp itself is for ASP testing mainly  -- read the manpage for xsp
+-->  to know which options are available.
+-->  Parabola will provide xsp configured by a .webapp configuration file
+-->  which rests in /etc/xsp. Just put your other webapp files there to let
+-->  xsp pick them up.
+-->  xsp is commandline based configuration is done in /etc/conf.d/xsp. Set all
+-->  your arguments there. Don't forget that you can run xsp from the console
+-->  as oridinary user, which is safer and for testing absolutely sufficient!!
+
+-->  You can run the testpages simply by starting the server and calling 
+                       http://localhost:8080
+-->  from your browser's location bar
+
+
+EOM
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+  post_install $1
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
diff --git a/libre/xsp/xsp.rc.d b/libre/xsp/xsp.rc.d
new file mode 100644
index 000000000..b4fcda15c
--- /dev/null
+++ b/libre/xsp/xsp.rc.d
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+# source application-specific settings
+[ -f /etc/conf.d/xsp ] && . /etc/conf.d/xsp
+
+PID=`pidof -o %PPID /usr/bin/mono`
+case "$1" in
+  start)
+    stat_busy "Starting Xsp Daemon"
+    if [ -z "$PID" ]; then 
+       /usr/bin/xsp $XSP_PARAMS --nonstop &> /dev/null &
+    fi
+    if [ ! -z "$PID" -o $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon xsp
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping Xsp Daemon"
+    [ ! -z "$PID" ]  && kill $PID &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon xsp
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"
+esac
diff --git a/libre/xsp/xsp.service b/libre/xsp/xsp.service
new file mode 100644
index 000000000..36b802e21
--- /dev/null
+++ b/libre/xsp/xsp.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=XSP Web Server
+
+[Service]
+ExecStart=/usr/bin/xsp --appconfigdir /etc/xsp --nonstop
+
+[Install]
+WantedBy=multi-user.target
diff --git a/libre/xsp/xsp.webapp b/libre/xsp/xsp.webapp
new file mode 100644
index 000000000..a685dd171
--- /dev/null
+++ b/libre/xsp/xsp.webapp
@@ -0,0 +1,8 @@
+<apps>
+  <web-application>
+    <name>Root</name>
+      <vpath>/</vpath>
+      <path>/srv/http/html/xsp</path>
+      <vhost>localhost</vhost>
+  </web-application>
+</apps>