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

Conflicts: libre/kdelibs-libre/PKGBUILD
author: Nicolás Reynolds <apoyosis@correo.inta.gob.ar> 2012-08-08 09:16:29 -0300
committer: Nicolás Reynolds <apoyosis@correo.inta.gob.ar> 2012-08-08 09:16:29 -0300
commit: 91b1c319d6364307eb3bfcb0768e3eaa09df7c17 (patch)
tree: 91a5fcd8f433130db7dfc8060b66f98103949797 /libre
parent: 0c2419984cf5501fc1ba410e09f61fa4112c7d2a (diff)
parent: 9bb78d53ceba7b16ef8374b20c4ed662e34b789c (diff)
39 files changed, 464 insertions, 253 deletions
diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
index 2788e21d9..6e3228359 100644
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -4,8 +4,7 @@
 _pkgname=blender
 pkgname=blender-libre
 pkgver=2.63a
-pkgrel=4
-epoch=4
+pkgrel=5
 pkgdesc="A fully integrated 3D graphics creation suite (without nonfree cuda-toolkit support)"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
diff --git a/libre/iceape-i18n/PKGBUILD b/libre/iceape-i18n/PKGBUILD
index 7bfca020f..d146e02dd 100644
--- a/libre/iceape-i18n/PKGBUILD
+++ b/libre/iceape-i18n/PKGBUILD
@@ -11,7 +11,7 @@
 # - Run 'make'. It will take care of everything else for you.
 
 _debname=iceape
-_debver=2.7.5
+_debver=2.7.6
 _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -22,9 +22,9 @@ pkgbase=iceape-i18n
 pkgname=($(for lang in ${_langpacks[@]}
         do echo $pkgbase-$lang | tr A-Z a-z
         done))
-_pkgver=2.7.5
+_pkgver=2.7.6
 pkgver=${_debver}.${_debrel}
-pkgrel=2
+pkgrel=1
 
 pkgdesc="Language packs for Debian Iceape."
 arch=('any')
@@ -58,26 +58,26 @@ package_iceape-i18n-$(echo $lang | tr A-Z a-z)() {
 "
 done
 
-md5sums=('03a75ce1325fc748d0943cd39659e8ca'
-         '9fc2070dc6db8d94f322cb5e27523ea4'
-         '6cb55fe51fca1de674ca32b10edc7c8b'
-         '138121b288c269aa418ca0c33eb65326'
-         '8fd47eed7c79fe29c74a81d9b4a4864a'
-         '71f6007df53b17361965f38c01869738'
-         'f253842c0a377e86c6c62f7db27db32d'
-         'b93caebe5ceb08d2cde78fe40fff3c0c'
-         'a36d0776b736609b1e72b8530cc9e755'
-         '9acd2d8e4fd39700aa99a21681403a72'
-         '60703c83180e8bb3abdcfbf26bf1289d'
-         'dc708663d015830fb11e800f48d7492c'
-         '313e6a88a602e09b5f08d6ff8ccdc89a'
-         '31debae1dca6035695805d0de55c71f3'
-         '1f927d23eb1db49db3ffe2d3ee5e3da5'
-         '4b5e52235ce8a52d1144d5f6e45a069c'
-         '81d1a28544f9a6e92eafc48e57a45a35'
-         'bb32f5938b885d2de225e4d8e2471d28'
-         '69d447db48244cc1546d0ce3447e8ab8'
-         '16d36a140dfbd9a001b28f4fcbc81df8'
-         '211bb03760a2eacf685f27f03e71da4d'
-         '83225015ad8f023ff0d9f9643c295e4c'
-         '67d3ec1632a4ed2aaf8e7a5df0284b1e')
+md5sums=('ee7f337bb32aee98a9f2be1936843106'
+         '10102b3e8f81dbd91dacddb892ba68b9'
+         'fef4de4746cc36bcf911fb0f7a7b2338'
+         'd31e21bb4917155e159941400b86b9a8'
+         '76e7c36cc0fd7e200c8b0d220d05f084'
+         '804fbc692db4523e31fbe337c37cd958'
+         '7bd3d6b9d4bdfcd5c53002ed695c3be9'
+         'b875123775d4aa52b747e9ef897cee4c'
+         'a5ecf997b5afa853fd46840f1e9cc01e'
+         '352872240f6e1812fb27599f2d43ed5e'
+         '7f680543cca22102660e39d775ea4f1f'
+         '19c47a8901163e23fc937b2076812147'
+         '7c1b1105b5a70008c12b3a5195c5a789'
+         '3306f9408c61f622a185fd9e218199ef'
+         '88f466e2bd3ec4236f76d92b22cc5e12'
+         '8c655118c3cfc0063581f11f11f23817'
+         '0d481cfdd69a591881e358f6a4d45e3e'
+         '457aea13f02af3aa2bc690ab438e1f37'
+         '9b72f83a7e1142ab8839fd2350437dfc'
+         '7e640437184ff9874d50bba9ddd8b800'
+         '2f00074f37b3785df5781a750e4a8293'
+         '9b4295c47829adcc3832d2b9524c6a95'
+         '1dea8892db29f13a37acdb02ba635f80')
diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD
index ca386c03a..20aa8b8e7 100644
--- a/libre/iceape-libre/PKGBUILD
+++ b/libre/iceape-libre/PKGBUILD
@@ -3,7 +3,7 @@
 
 # We're getting this from Debian Sid
 _debname=iceape
-_debver=2.7.5
+_debver=2.7.6
 _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -11,7 +11,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 _pkgname=${_debname}
 pkgname=${_debname}-libre
 pkgver=${_debver}.${_debrel}
-pkgrel=3
+pkgrel=1
 pkgdesc="A libre version of Debian Iceape, the Internet Suite based on Mozilla Seamonkey."
 arch=('i586' 'i686' 'x86_64' 'mips64el')
 license=('GPL2' 'MPL' 'LGPL')
@@ -29,8 +29,8 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
         ${_pkgname}-2.0-lang.patch
         clrf.patch
         libre.patch)
-md5sums=('7a6e671485a75cd9495f346e0f8e4dcb'
-         '174e572e9d7b1b62a8e437f70fe771ba'
+md5sums=('7177342dcd4d445b166c36935c1d4ca5'
+         '5adb3b2c718311e664d8541bb4a16304'
          '60ba9e8f2fafd20e41268af534a55ea7'
          '7266333e31731af8bb50c2eca8d0bd26'
          '25b6fe16ac24cd5c852213e5c1adb272'
diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD
index 550ad4b3f..bed0b129a 100644
--- a/libre/kdebase-konqueror-libre/PKGBUILD
+++ b/libre/kdebase-konqueror-libre/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 160829 2012-06-06 16:14:38Z andrea $
+# $Id: PKGBUILD 164089 2012-07-26 16:54:32Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname='kdebase-konqueror'
 pkgname='kdebase-konqueror-libre'
-pkgver=4.8.4
+pkgver=4.9.0
 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')
 source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz"
     	"konq-about-fsdg.diff")
-sha1sums=('a1d6951b27c868c738a36dbd21702b658f3d6245'
+sha1sums=('f5c358e3c7902b15328908a9966f98774827988e'
           'f41541371414dcbe5e76687835e648112b3ff364')
 pkgdesc='KDE File Manager & Web Browser'
 depends=('kdebase-dolphin' 'kdebase-keditbookmarks')
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD
index 77097082a..2f20a872e 100644
--- a/libre/kdelibs-libre/PKGBUILD
+++ b/libre/kdelibs-libre/PKGBUILD
@@ -18,16 +18,17 @@ depends=('strigi' 'attica' 'libxss' 'soprano' 'krb5' 'grantlee'
         'media-player-info' 'libxtst')
 makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell')
 provides=("kdelibs=$pkgver")
-replaces=('kdelibs-experimental' 'kdelibs')
+replaces=('kdelibs')
 conflicts=('kdelibs')
 install=${_pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz"
         'kde-applications-menu.patch'
-        'use-pythondontwritebytecode.patch')
+        'use-pythondontwritebytecode.patch'
+        'khtml-fsdg.diff')
 sha1sums=('9daa3a93182ac3c50759d7369a7c1db30890cf46'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
-          'bbacbbe2194f3961cd7557d98a9ddef158ca11aa')
-
+          'bbacbbe2194f3961cd7557d98a9ddef158ca11aa'
+          'a1502a964081ad583a00cf90c56e74bf60121830')
 build() {
        cd "${srcdir}"/${_pkgname}-${pkgver}
 
@@ -36,6 +37,9 @@ build() {
 
        # Set PYTHONDONTWRITEBYTECODE (KDEBUG#276151)
        patch -p0 -i "${srcdir}"/use-pythondontwritebytecode.patch
+       
+       # Don't ask the user to download a plugin, it's probably nonfree.
+       patch -p1 -i "${srcdir}"/khtml-fsdg.diff
 
        cd "${srcdir}"
        mkdir build
diff --git a/libre/kdelibs-libre/fix-application-crashes.patch b/libre/kdelibs-libre/fix-application-crashes.patch
deleted file mode 100644
index 8ac385483..000000000
--- a/libre/kdelibs-libre/fix-application-crashes.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From: Vishesh Handa <me@vhanda.in>
-Date: Wed, 13 Jun 2012 21:26:31 +0000
-Subject: Revert "Always rec-connect if forced (ie. when Nepomuk server restarts)"
-X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&amp;a=commitdiff&amp;h=bde5aad1e9f7bfb6f8d5c60197797de4a315158d
----
-Revert "Always rec-connect if forced (ie. when Nepomuk server restarts)"
-
-This reverts commit a43824a200ed76cef48a90bd3aee8547698b7c91.
-
-This is done so that 4.8.x works with Soprano 2.7.6
----
-
-
---- a/nepomuk/core/nepomukmainmodel.cpp
-+++ b/nepomuk/core/nepomukmainmodel.cpp
-@@ -94,7 +94,7 @@ public:
- 
-         // we may get disconnected from the server but we don't want to try
-         // to connect every time the model is requested
--        if ( forced || (!m_socketConnectFailed && !localSocketClient.isConnected()) ) {
-+        if ( !m_socketConnectFailed && !localSocketClient.isConnected() ) {
-             delete localSocketModel;
-             localSocketModel = 0;
-             QString socketName = KGlobal::dirs()->locateLocal( "socket", "nepomuk-socket" );
-
-From: Vishesh Handa <me@vhanda.in>
-Date: Wed, 13 Jun 2012 21:25:32 +0000
-Subject: Revert "Disconnect before re-connecting. Soprano does not do that for us."
-X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&amp;a=commitdiff&amp;h=76e0376d7582cfe5b898c56bf3779ca2279dace8
----
-Revert "Disconnect before re-connecting. Soprano does not do that for us."
-
-This reverts commit 3708be2d09700b21f934c2129218e1c7ea44efdf.
-
-This is being done so that KDE 4.8.x works with Soprano 2.7.6
----
-
-
---- a/nepomuk/core/nepomukmainmodel.cpp
-+++ b/nepomuk/core/nepomukmainmodel.cpp
-@@ -97,7 +97,6 @@ public:
-         if ( forced || (!m_socketConnectFailed && !localSocketClient.isConnected()) ) {
-             delete localSocketModel;
-             localSocketModel = 0;
--            localSocketClient.disconnect();
-             QString socketName = KGlobal::dirs()->locateLocal( "socket", "nepomuk-socket" );
-             kDebug() << "Connecting to local socket" << socketName;
-             if ( localSocketClient.connect( socketName ) ) {
-
diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD
index b221fbca7..1244e21bb 100644
--- a/libre/kdenetwork-kopete-libre/PKGBUILD
+++ b/libre/kdenetwork-kopete-libre/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 160882 2012-06-06 16:17:23Z andrea $
+# $Id: PKGBUILD 164151 2012-07-26 16:58:38Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgbase=kdenetwork
 pkgname=('kdenetwork-kopete-libre')
-pkgver=4.8.4
+pkgver=4.9.0
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdenetwork')
 makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'ppp'
-	'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'libmsn'
-    'v4l-utils' 'libidn' 'rdesktop' 'qimageblitz' 'libxdamage' 'libgadu'
-    'libktorrent' 'libmms' 'mediastreamer')
-    source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('b3926c5cd929cec209421c2f1cb8659cc1c82458')
+	'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver'
+    'v4l-utils' 'libidn' 'qimageblitz' 'libxdamage' 'libgadu' 'libmsn'
+    'libktorrent' 'libmms' 'mediastreamer' 'telepathy-qt')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
+sha1sums=('f5963684301d6569af4cfce2a39dbef140c1dc4d')
 
 build() {
     cd "${srcdir}"
diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD
index 5558e73f4..7d80e341e 100644
--- a/libre/kdeutils-ark-libre/PKGBUILD
+++ b/libre/kdeutils-ark-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 160887 2012-06-06 16:17:38Z andrea $
+# $Id: PKGBUILD 164156 2012-07-26 16:58:54Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=kdeutils-ark
 pkgname=kdeutils-ark-libre
-pkgver=4.8.4
+pkgver=4.9.0
 pkgrel=1
 pkgdesc='Archiving Tool'
 url='http://kde.org/applications/utilities/ark/'
@@ -14,12 +14,12 @@ groups=('kde' 'kdeutils')
 depends=('kdebase-runtime' 'kdebase-lib' 'libarchive' 'qjson')
 makedepends=('cmake' 'automoc4')
 optdepends=('p7zip' 'zip' 'unzip' 'ununrar')
+install=${_pkgname}.install
 provides=("kdeutils-ark=$pkgver")
 replaces=('kdeutils-ark')
 conflicts=('kdeutils-ark')
-install=${_pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz")
-sha1sums=('1d0d311beb8beeee7f33a58baef7f95192eb69ac')
+sha1sums=('60c535370da1edf03481fdc1ef3f04f9269d54e2')
 
 build() {
   cd "${srcdir}"
diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD
index 35529f458..706b2d0d7 100644
--- a/libre/liferea-libre/PKGBUILD
+++ b/libre/liferea-libre/PKGBUILD
@@ -1,11 +1,11 @@
 # $Id: PKGBUILD 161863 2012-06-15 23:14:52Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Contributor (Parabola): bitlord
-# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=liferea
 pkgname=liferea-libre
-pkgver=1.8.6
+pkgver=1.8.7
 pkgrel=1
 pkgdesc="A desktop news aggregator for online news feeds and weblogs"
 arch=('i686' 'x86_64')
@@ -20,7 +20,7 @@ options=('!libtool' '!emptydirs')
 install=liferea.install
 source=(http://downloads.sourceforge.net/sourceforge/${_pkgname}/${_pkgname}-${pkgver}.tar.gz
         remove-non-free-suggestions.patch)
-sha1sums=('c469d87da4b0512270376aa360c7a955d02153c3'
+sha1sums=('3cdadae3b3bcec2da048257b72a5d7c11a9621f1'
           '0d68c567c3d37932a49709c58c37c3f138fd19cb')
 
 build() {
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index d2a5610df..93ee3ad0a 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -9,9 +9,9 @@ pkgname=('linux-libre-lts' 'linux-libre-lts-headers') # Build stock -LIBRE-LTS k
 # pkgname=linux-custom       # Build kernel with a different name
 _kernelname=-LIBRE-LTS
 _basekernel=3.0
-_sublevel=38
+_sublevel=39
 pkgver=${_basekernel}.${_sublevel}
-_lxopkgver=${_basekernel}.37 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.39 # nearly always the same as pkgver
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
@@ -32,9 +32,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'ext4-options.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('5f64180fe7df4e574dac5911b78f5067'
-         '8a2416fd6ac323184ab563958a6eb560'
-         '9cfcf3807201ce44aa720571232a10ce'
-         '8bb5c5aa217202c3ac3798ba7798e07d'
+         '9259948f76db87052be56da4c525d07a'
+         '5e3362ef81c99563852f1b7a8c5b5837'
+         '3d078c10d51f9c2f4d0ec6be531caf1d'
          'c072b17032e80debc6a8626299245d46'
          '2967cecc3af9f954ccc822fd63dca6ff'
          '8267264d9a8966e57fdacd1fa1fc65c4'
@@ -42,7 +42,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067'
          '9d3c56a4b999c8bfbd4018089a62f662'
          '263725f20c0b9eb9c353040792d644e5'
          'f36222e7ce20c8e4dc27376f9be60f6c'
-         'f0c4e2fa00e3f9fd9d666742c32beefb')
+         'eea9aa0065f636fc924a23b3ffd24343')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
diff --git a/libre/linux-libre-lts/config.i686 b/libre/linux-libre-lts/config.i686
index 83bab0f8c..240eccfbf 100644
--- a/libre/linux-libre-lts/config.i686
+++ b/libre/linux-libre-lts/config.i686
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux/i386 3.0.29-1 Kernel Configuration
+# Linux/i386 3.0.39-1 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -192,9 +192,10 @@ CONFIG_TRACEPOINTS=y
 CONFIG_OPROFILE=m
 # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
 CONFIG_HAVE_OPROFILE=y
-# CONFIG_KPROBES is not set
+CONFIG_KPROBES=y
 CONFIG_JUMP_LABEL=y
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_KRETPROBES=y
 CONFIG_USER_RETURN_NOTIFIER=y
 CONFIG_HAVE_IOREMAP_PROT=y
 CONFIG_HAVE_KPROBES=y
@@ -992,7 +993,9 @@ 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_HMAC_NONE is not set
@@ -1104,6 +1107,7 @@ CONFIG_XPS=y
 # Network testing
 #
 CONFIG_NET_PKTGEN=m
+CONFIG_NET_TCPPROBE=m
 CONFIG_NET_DROP_MONITOR=y
 CONFIG_HAMRADIO=y
 
@@ -5343,6 +5347,7 @@ CONFIG_FRAME_POINTER=y
 # CONFIG_RCU_TORTURE_TEST is not set
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_RCU_CPU_STALL_VERBOSE 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
@@ -5386,6 +5391,7 @@ CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_PROFILE_ALL_BRANCHES is not set
 CONFIG_STACK_TRACER=y
 CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_KPROBE_EVENT=y
 CONFIG_DYNAMIC_FTRACE=y
 CONFIG_FUNCTION_PROFILER=y
 CONFIG_FTRACE_MCOUNT_RECORD=y
@@ -5417,6 +5423,7 @@ CONFIG_DEBUG_RODATA=y
 CONFIG_DOUBLEFAULT=y
 # 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
diff --git a/libre/linux-libre-lts/config.x86_64 b/libre/linux-libre-lts/config.x86_64
index fa7be5e5b..86b096eaf 100644
--- a/libre/linux-libre-lts/config.x86_64
+++ b/libre/linux-libre-lts/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux/x86_64 3.0.26-1 Kernel Configuration
+# Linux/x86_64 3.0.39-1 Kernel Configuration
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -193,9 +193,10 @@ CONFIG_TRACEPOINTS=y
 CONFIG_OPROFILE=m
 # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
 CONFIG_HAVE_OPROFILE=y
-# CONFIG_KPROBES is not set
+CONFIG_KPROBES=y
 CONFIG_JUMP_LABEL=y
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_KRETPROBES=y
 CONFIG_USER_RETURN_NOTIFIER=y
 CONFIG_HAVE_IOREMAP_PROT=y
 CONFIG_HAVE_KPROBES=y
@@ -960,7 +961,9 @@ 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_HMAC_NONE is not set
@@ -1070,10 +1073,9 @@ CONFIG_BPF_JIT=y
 # Network testing
 #
 CONFIG_NET_PKTGEN=m
+CONFIG_NET_TCPPROBE=m
 CONFIG_NET_DROP_MONITOR=y
 CONFIG_HAMRADIO=y
-# CONFIG_CAN is not set
-CONFIG_IRDA=m
 
 #
 # Packet Radio protocols
@@ -1093,6 +1095,8 @@ 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
@@ -5083,6 +5087,7 @@ CONFIG_FRAME_POINTER=y
 # CONFIG_RCU_TORTURE_TEST is not set
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_RCU_CPU_STALL_VERBOSE 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
@@ -5126,6 +5131,7 @@ CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_PROFILE_ALL_BRANCHES is not set
 CONFIG_STACK_TRACER=y
 CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_KPROBE_EVENT=y
 CONFIG_DYNAMIC_FTRACE=y
 CONFIG_FUNCTION_PROFILER=y
 CONFIG_FTRACE_MCOUNT_RECORD=y
@@ -5157,6 +5163,7 @@ CONFIG_DEBUG_RODATA=y
 # 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
diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install
index 226061525..6f7899fe6 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.38-1-LIBRE-LTS
+KERNEL_VERSION=3.0.39-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-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index 3803b520c..9708d9b1a 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -3,29 +3,43 @@
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgbase=linux-libre-tools
-_pkgname=('perf' 'cpupower' 'x86_energy_perf_policy')
-pkgname=('perf-libre' 'cpupower-libre' 'x86_energy_perf_policy-libre')
+pkgname=('perf-libre' 'cpupower-libre' 'x86_energy_perf_policy-libre' 'usbip-libre')
 _basekernel=3.5
 #_sublevel=1
 #pkgver=${_basekernel}.${_sublevel}
 pkgver=${_basekernel}
-pkgrel=1
+pkgrel=3
 license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
 url='http://linux-libre.fsfla.org/'
 options=('!strip')
-makedepends=('asciidoc' 'xmlto')
 # split packages need all package dependencies set manually in makedepends
-makedepends+=('python2' 'libnewt' 'elfutils' 'pciutils')
+# kernel source deps
+makedepends=('asciidoc' 'xmlto')
+# perf-libre deps
+makedepends+=('perl' 'python2' 'libnewt' 'elfutils')
+# cpupower-libre deps
+makedepends+=('pciutils')
+# usbip-libre deps
+makedepends+=('glib2' 'sysfsutils')
+groups=("$pkgbase")
 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"
-        'cpupower.rc'
         'cpupower.conf'
-        'cpupower.service')
+        'cpupower.rc'
+        'cpupower.systemd'
+        'cpupower.service'
+        'usbipd.conf'
+        'usbipd.rc'
+        'usbipd.service')
 md5sums=('2407fc9563a74acaf38aa0c06516eb1c'
-         '73dbc931e86b3b73d6e2338dcbee81a4'
          '18d5aa9e4c6bb23bb02bf65e155e0f0e'
-         '20870541e88109d2f153be3c58a277f1')
+         '1d9214637968b91706b6e616a100d44b'
+         'c0d17b5295fe964623c772a2dd981771'
+         '2450e8ff41b30eb58d43b5fffbfde1f4'
+         'e8fac9c45a628015644b4150b139278a'
+         '8a3831d962ff6a9968c0c20fd601cdec'
+         'ba7c1c513314dd21fb2334fb8417738f')
 
 build() {
   # apply stable patching set
@@ -34,7 +48,7 @@ build() {
     patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu"
   fi
 
-  msg2 'Build perf'
+  msg2 'Build perf-libre'
   pushd linux-$pkgver/tools/perf
   make \
     WERROR=0 \
@@ -46,22 +60,29 @@ build() {
     all man
   popd
 
-  msg2 'Build cpupower'
+  msg2 'Build cpupower-libre'
   pushd linux-$pkgver/tools/power/cpupower
   # we cannot use --as-needed
   LDFLAGS=${LDFLAGS:+"$LDFLAGS,--no-as-needed"}
   make VERSION=$pkgver-$pkgrel
   popd
 
-  msg2 'Build x86_energy_perf_policy'
+  msg2 'Build x86_energy_perf_policy-libre'
   pushd linux-$pkgver/tools/power/x86/x86_energy_perf_policy
   make
   popd
+
+  msg2 'Build usbip-libre'
+  pushd linux-$pkgver/drivers/staging/usbip/userspace
+  ./autogen.sh
+  ./configure --prefix=/usr
+  make
+  popd
 }
 
 package_perf-libre() {
   pkgdesc='Linux-libre kernel performance auditing tool'
-  depends=('python2' 'libnewt' 'elfutils')
+  depends=('perl' 'python2' 'libnewt' 'elfutils')
   replaces=('perf')  
   conflicts=('perf')
   provides=("perf=$pkgver")
@@ -80,7 +101,7 @@ package_perf-libre() {
 package_cpupower-libre() {
   pkgdesc='Linux-libre kernel tool to examine and tune power saving related features of your processor'
   backup=('etc/conf.d/cpupower')
-  depends=('pciutils')
+  depends=('bash' 'pciutils')
   replaces=('cpupower')
   conflicts=('cpupower' 'cpufrequtils')
   provides=("cpupower=$pkgver")
@@ -92,21 +113,43 @@ package_cpupower-libre() {
     docdir='/usr/share/doc/cpupower' \
     install install-man
   popd
-  # install rc.d script
-  install -D -m 755 cpupower.rc "$pkgdir/etc/rc.d/cpupower"
-  install -D -m 644 cpupower.conf "$pkgdir/etc/conf.d/cpupower"
-  install -D -m 644 cpupower.service "$pkgdir/usr/lib/systemd/system/cpupower.service"
+  # install daemon scripts
+  install -Dm 755 cpupower.rc "$pkgdir/etc/rc.d/cpupower"
+  install -Dm 644 cpupower.conf "$pkgdir/etc/conf.d/cpupower"
+  install -Dm 644 cpupower.service "$pkgdir/usr/lib/systemd/system/cpupower.service"
+  install -Dm 755 cpupower.systemd "$pkgdir/usr/lib/systemd/scripts/cpupower"
 }
 
 package_x86_energy_perf_policy-libre() {
   pkgdesc='Read or write MSR_IA32_ENERGY_PERF_BIAS'
+  depends=('glibc')
   replaces=('x86_energy_perf_policy')
   conflicts=('x86_energy_perf_policy')
   provides=("x86_energy_perf_policy=$pkgver")
 
   cd linux-$pkgver/tools/power/x86/x86_energy_perf_policy
-  install -D -m 755 x86_energy_perf_policy "$pkgdir/usr/bin/x86_energy_perf_policy"
-  install -D -m 644 x86_energy_perf_policy.8 "$pkgdir/usr/share/man/man8/x86_energy_perf_policy.8"
+  install -Dm 755 x86_energy_perf_policy "$pkgdir/usr/bin/x86_energy_perf_policy"
+  install -Dm 644 x86_energy_perf_policy.8 "$pkgdir/usr/share/man/man8/x86_energy_perf_policy.8"
+}
+
+package_usbip-libre() {
+  pkgdesc='An USB device sharing system over IP network'
+  depends=('glib2' 'sysfsutils')
+  options=('!libtool')
+  replaces=('usbip')
+  conflicts=('usbip')
+  provides=("usbip=$pkgver")
+
+  pushd linux-$pkgver/drivers/staging/usbip/userspace
+  make install DESTDIR="$pkgdir"
+  popd
+  # module loading
+  install -Dm 644 /dev/null "$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
+  printf 'usbip-core\nusbip-host\n' > "$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
+  # install daemon scripts
+  install -Dm 755 usbipd.rc "$pkgdir/etc/rc.d/usbipd"
+  install -Dm 644 usbipd.conf "$pkgdir/etc/conf.d/usbipd"
+  install -Dm 644 usbipd.service "$pkgdir/usr/lib/systemd/system/usbipd.service"
 }
 
 # vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/linux-libre-tools/cpupower.rc b/libre/linux-libre-tools/cpupower.rc
index 27a491e95..2c4441c4e 100644
--- a/libre/linux-libre-tools/cpupower.rc
+++ b/libre/linux-libre-tools/cpupower.rc
@@ -2,40 +2,16 @@
 
 . /etc/rc.conf
 . /etc/rc.d/functions
-
-[[ -f /etc/conf.d/cpupower ]] && . /etc/conf.d/cpupower
+. /etc/conf.d/${0##*/}
 
 case "$1" in
   start|restart)
-    stat_busy "Setting cpupower rules"
-    declare -i fail=0
-
-    # frequency-set options
-    declare -a params=()
-    params+=(${governor:+-g $governor})
-    params+=(${min_freq:+-d $min_freq})
-    params+=(${max_freq:+-u $max_freq})
-    params+=(${freq:+-f $freq})
-    if ((${#params[@]} > 0)); then
-      cpupower frequency-set "${params[@]}" >/dev/null || fail=1
-    fi
-
-    # set options
-    declare -a params=()
-    params+=(${mc_scheduler:+-m $mc_scheduler})
-    params+=(${smp_scheduler:+-s $smp_scheduler})
-    params+=(${perf_bias:+-b $perf_bias})
-    if ((${#params[@]} > 0)); then
-      cpupower set "${params[@]}" >/dev/null || fail=1
-    fi
-
-    # print failure if any
-    (($fail > 0)) && stat_fail && exit 1 || stat_done
+    status 'Setting cpupower rules' /usr/lib/systemd/scripts/cpupower || exit 1
   ;;
   *)
-  echo "usage: ${0##*/} {start|restart}"
+    echo "usage: ${0##*/} {start|restart}" >&2
+    exit 1
+  ;;
 esac
 
-true
-
 # vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/linux-libre-tools/cpupower.service b/libre/linux-libre-tools/cpupower.service
index f77cfdc97..aaeba2b08 100644
--- a/libre/linux-libre-tools/cpupower.service
+++ b/libre/linux-libre-tools/cpupower.service
@@ -3,7 +3,7 @@ Description=Apply cpupower configuration
 
 [Service]
 Type=oneshot
-ExecStart=/etc/rc.d/cpupower start
+ExecStart=/usr/lib/systemd/scripts/cpupower
 RemainAfterExit=yes
 
 [Install]
diff --git a/libre/linux-libre-tools/cpupower.systemd b/libre/linux-libre-tools/cpupower.systemd
new file mode 100644
index 000000000..f45b02bc8
--- /dev/null
+++ b/libre/linux-libre-tools/cpupower.systemd
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+. /etc/conf.d/cpupower
+
+declare -i fail=0
+
+# parse frequency options
+declare -a params=()
+params+=(${governor:+-g $governor})
+params+=(${min_freq:+-d $min_freq})
+params+=(${max_freq:+-u $max_freq})
+params+=(${freq:+-f $freq})
+
+# apply frequency options
+if ((${#params[@]} > 0)); then
+  cpupower frequency-set "${params[@]}" >/dev/null || fail=1
+fi
+
+# parse cpu options
+declare -a params=()
+params+=(${mc_scheduler:+-m $mc_scheduler})
+params+=(${smp_scheduler:+-s $smp_scheduler})
+params+=(${perf_bias:+-b $perf_bias})
+
+# apply cpu options
+if ((${#params[@]} > 0)); then
+  cpupower set "${params[@]}" >/dev/null || fail=1
+fi
+
+exit $fail
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/linux-libre-tools/usbipd.conf b/libre/linux-libre-tools/usbipd.conf
new file mode 100644
index 000000000..5990b857a
--- /dev/null
+++ b/libre/linux-libre-tools/usbipd.conf
@@ -0,0 +1,3 @@
+# vim:set ts=2 sw=2 ft=sh noet:
+
+DAEMON_OPTS=''
diff --git a/libre/linux-libre-tools/usbipd.rc b/libre/linux-libre-tools/usbipd.rc
new file mode 100644
index 000000000..15a1bcf00
--- /dev/null
+++ b/libre/linux-libre-tools/usbipd.rc
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/${0##*/}
+
+DAEMON=/usr/sbin/usbipd
+PID=$(pidof -o %PPID $DAEMON)
+DAEMON_OPTS="--daemon $DAEMON_OPTS"
+
+case "$1" in
+	start)
+		stat_busy "Starting ${0##*/} daemon"
+		[[ ! $PID ]] && $DAEMON $DAEMON_OPTS && add_daemon ${0##*/} && stat_done && exit 0
+		stat_fail
+	;;
+  stop)
+		stat_busy "Stopping ${0##*/} daemon"
+		[[ $PID ]] && kill $PID &> /dev/null && rm_daemon ${0##*/} && stat_done && exit 0
+		stat_fail
+	;;
+  restart)
+		$0 stop
+		$0 start
+		exit 0
+	;;
+  *)
+		echo "usage: ${0##*/} {start|stop|restart}" >&2
+	;;
+esac
+
+exit 1
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/linux-libre-tools/usbipd.service b/libre/linux-libre-tools/usbipd.service
new file mode 100644
index 000000000..ac2f5f7c1
--- /dev/null
+++ b/libre/linux-libre-tools/usbipd.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=USB/IP server
+
+[Service]
+ExecStart=/usr/sbin/usbipd
+
+[Install]
+WantedBy=multi-user.target
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index b552dcca5..0ef52901a 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -16,7 +16,7 @@ _basekernel=3.5
 #pkgver=${_basekernel}.${_sublevel}
 pkgver=${_basekernel}
 _lxopkgver=${_basekernel}.6 # nearly always the same as pkgver
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -32,17 +32,17 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'Kbuild.platforms'
         'boot-logo.patch'
         'change-default-console-loglevel.patch'
-        'i915-fix-ghost-tv-output.patch'
+        'avmfritz-only-few-bytes-are-transfered-on-a-conn.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('2407fc9563a74acaf38aa0c06516eb1c'
-         'a89ff57fd3ce5833d51f7cdef17a9a3c'
-         '978a58bebbdfe04d6e91523e09da5ad5'
+         '7f0b7950bc9d2a20cdb6b850e6e4eb5a'
+         'a796ea383eb136cb38fab0a52b6d2f52'
          'e49ac236dfeef709f91a3d993ea7b62c'
          '2967cecc3af9f954ccc822fd63dca6ff'
          '8267264d9a8966e57fdacd1fa1fc65c4'
          '04b21c79df0a952c22d681dd4f4562df'
          '9d3c56a4b999c8bfbd4018089a62f662'
-         '263725f20c0b9eb9c353040792d644e5'
+         '2afcc001cc178be72e3a19d95f4bd5eb'
          'a9338d11a2b23fe0cd43cc4fee5aed42')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
@@ -60,21 +60,16 @@ build() {
   # Add freedo as boot logo
   patch -Np1 -i "${srcdir}/boot-logo.patch"
 
-  # Some chips detect a ghost TV output
-  # mailing list discussion: http://lists.freedesktop.org/archives/intel-gfx/2011-April/010371.html
-  # Arch Linux bug report: FS#19234
-  #
-  # It is unclear why this patch wasn't merged upstream, it was accepted,
-  # then dropped because the reasoning was unclear. However, it is clearly
-  # needed.
-  patch -Np1 -i "${srcdir}/i915-fix-ghost-tv-output.patch"
-
 
   # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
   # remove this when a Kconfig knob is made available by upstream
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
   patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
 
+  # fix avmfritz capi20 functionallity
+  # https://bugzilla.kernel.org/show_bug.cgi?id=45271
+  patch -Np1 -i "${srcdir}/avmfritz-only-few-bytes-are-transfered-on-a-conn.patch"
+
   if [ "$CARCH" == "mips64el" ]; then
     sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile
     sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
diff --git a/libre/linux-libre/avmfritz-only-few-bytes-are-transfered-on-a-conn.patch b/libre/linux-libre/avmfritz-only-few-bytes-are-transfered-on-a-conn.patch
new file mode 100644
index 000000000..f8bb193c6
--- /dev/null
+++ b/libre/linux-libre/avmfritz-only-few-bytes-are-transfered-on-a-conn.patch
@@ -0,0 +1,48 @@
+From 285c08154eede7dc4387bfc925967c884594dcc9 Mon Sep 17 00:00:00 2001
+From: Karsten Keil <keil@b1-systems.de>
+Date: Sat, 28 Jul 2012 20:10:04 +0200
+Subject: [PATCH] mISDN: Bugfix only few bytes are transfered on a connection
+
+The test for the fillempty condition was wrong in one place.
+Changed the variable to the right boolean type.
+
+Signed-off-by: Karsten Keil <keil@b1-systems.de>
+---
+ drivers/isdn/hardware/mISDN/avmfritz.c |    7 ++++---
+ 1 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/isdn/hardware/mISDN/avmfritz.c b/drivers/isdn/hardware/mISDN/avmfritz.c
+index c08fc60..fa6ca47 100644
+--- a/drivers/isdn/hardware/mISDN/avmfritz.c
++++ b/drivers/isdn/hardware/mISDN/avmfritz.c
+@@ -449,7 +449,8 @@ hdlc_fill_fifo(struct bchannel *bch)
+ {
+ 	struct fritzcard *fc = bch->hw;
+ 	struct hdlc_hw *hdlc;
+-	int count, fs, cnt = 0, idx, fillempty = 0;
++	int count, fs, cnt = 0, idx;
++	bool fillempty = false;
+ 	u8 *p;
+ 	u32 *ptr, val, addr;
+ 
+@@ -462,7 +463,7 @@ hdlc_fill_fifo(struct bchannel *bch)
+ 			return;
+ 		count = fs;
+ 		p = bch->fill;
+-		fillempty = 1;
++		fillempty = true;
+ 	} else {
+ 		count = bch->tx_skb->len - bch->tx_idx;
+ 		if (count <= 0)
+@@ -477,7 +478,7 @@ hdlc_fill_fifo(struct bchannel *bch)
+ 			hdlc->ctrl.sr.cmd |= HDLC_CMD_XME;
+ 	}
+ 	ptr = (u32 *)p;
+-	if (fillempty) {
++	if (!fillempty) {
+ 		pr_debug("%s.B%d: %d/%d/%d", fc->name, bch->nr, count,
+ 			 bch->tx_idx, bch->tx_skb->len);
+ 		bch->tx_idx += count;
+-- 
+1.7.7
+
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index 114841394..a66ebeaa7 100644
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.5.0-1 Kernel Configuration
+# Linux/i386 3.5.0-2 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -204,9 +204,11 @@ CONFIG_OPROFILE=m
 # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
 CONFIG_HAVE_OPROFILE=y
 CONFIG_OPROFILE_NMI_TIMER=y
-# CONFIG_KPROBES is not set
+CONFIG_KPROBES=y
 CONFIG_JUMP_LABEL=y
+CONFIG_UPROBES=y
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_KRETPROBES=y
 CONFIG_USER_RETURN_NOTIFIER=y
 CONFIG_HAVE_IOREMAP_PROT=y
 CONFIG_HAVE_KPROBES=y
@@ -1071,7 +1073,9 @@ 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_HMAC_NONE is not set
@@ -1191,6 +1195,7 @@ CONFIG_BQL=y
 # Network testing
 #
 CONFIG_NET_PKTGEN=m
+CONFIG_NET_TCPPROBE=m
 CONFIG_NET_DROP_MONITOR=y
 CONFIG_HAMRADIO=y
 
@@ -5624,6 +5629,7 @@ 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
@@ -5664,8 +5670,9 @@ CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_PROFILE_ALL_BRANCHES is not set
 CONFIG_STACK_TRACER=y
 CONFIG_BLK_DEV_IO_TRACE=y
-# CONFIG_UPROBE_EVENT is not set
-# CONFIG_PROBE_EVENTS is not set
+CONFIG_KPROBE_EVENT=y
+CONFIG_UPROBE_EVENT=y
+CONFIG_PROBE_EVENTS=y
 CONFIG_DYNAMIC_FTRACE=y
 CONFIG_FUNCTION_PROFILER=y
 CONFIG_FTRACE_MCOUNT_RECORD=y
@@ -5697,6 +5704,7 @@ CONFIG_DEBUG_RODATA=y
 CONFIG_DOUBLEFAULT=y
 # 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
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index fcc8b37dd..350a2b905 100644
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.5.0-1 Kernel Configuration
+# Linux/x86_64 3.5.0-2 Kernel Configuration
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -206,9 +206,11 @@ CONFIG_OPROFILE=m
 # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
 CONFIG_HAVE_OPROFILE=y
 CONFIG_OPROFILE_NMI_TIMER=y
-# CONFIG_KPROBES is not set
+CONFIG_KPROBES=y
 CONFIG_JUMP_LABEL=y
+CONFIG_UPROBES=y
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_KRETPROBES=y
 CONFIG_USER_RETURN_NOTIFIER=y
 CONFIG_HAVE_IOREMAP_PROT=y
 CONFIG_HAVE_KPROBES=y
@@ -1036,7 +1038,9 @@ 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_HMAC_NONE is not set
@@ -1153,6 +1157,7 @@ CONFIG_BPF_JIT=y
 # Network testing
 #
 CONFIG_NET_PKTGEN=m
+CONFIG_NET_TCPPROBE=m
 CONFIG_NET_DROP_MONITOR=y
 CONFIG_HAMRADIO=y
 
@@ -5393,6 +5398,7 @@ 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
@@ -5433,8 +5439,9 @@ CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_PROFILE_ALL_BRANCHES is not set
 CONFIG_STACK_TRACER=y
 CONFIG_BLK_DEV_IO_TRACE=y
-# CONFIG_UPROBE_EVENT is not set
-# CONFIG_PROBE_EVENTS is not set
+CONFIG_KPROBE_EVENT=y
+CONFIG_UPROBE_EVENT=y
+CONFIG_PROBE_EVENTS=y
 CONFIG_DYNAMIC_FTRACE=y
 CONFIG_FUNCTION_PROFILER=y
 CONFIG_FTRACE_MCOUNT_RECORD=y
@@ -5466,6 +5473,7 @@ CONFIG_DEBUG_RODATA=y
 # 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
diff --git a/libre/linux-libre/i915-fix-ghost-tv-output.patch b/libre/linux-libre/i915-fix-ghost-tv-output.patch
deleted file mode 100644
index 3b631361a..000000000
--- a/libre/linux-libre/i915-fix-ghost-tv-output.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
-Tested-by: Santi <santi@agolina.net>
----
- drivers/gpu/drm/i915/intel_tv.c |    9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
-index dc83b7a..c8f67bf 100644
---- a/drivers/gpu/drm/i915/intel_tv.c
-+++ b/drivers/gpu/drm/i915/intel_tv.c
-@@ -1267,6 +1267,15 @@
- 		   DAC_B_0_7_V |
- 		   DAC_C_0_7_V);
- 
-+	/*
-+	 * The TV sense state should be cleared to zero on cantiga platform. Otherwise
-+	 * the TV is misdetected. This is hardware requirement.
-+	 */
-+	if (IS_GM45(dev))
-+		tv_dac &= ~(TVDAC_STATE_CHG_EN | TVDAC_A_SENSE_CTL |
-+			    TVDAC_B_SENSE_CTL | TVDAC_C_SENSE_CTL);
-+
-+	
- 	I915_WRITE(TV_CTL, tv_ctl);
- 	I915_WRITE(TV_DAC, tv_dac);
- 	POSTING_READ(TV_DAC);
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 87de3c8d5..5f1005477 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.5.0-1-LIBRE
+KERNEL_VERSION=3.5.0-2-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/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD
index 4442712f0..4b3384c25 100644
--- a/libre/lirc-libre/PKGBUILD
+++ b/libre/lirc-libre/PKGBUILD
@@ -6,7 +6,7 @@ _pkgbase=lirc
 pkgbase=lirc-libre
 pkgname=('lirc-libre' 'lirc-utils-libre')
 pkgver=0.9.0
-pkgrel=24
+pkgrel=25
 epoch=1
 _extramodules=extramodules-3.5-LIBRE
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/libre/luxblend25/PKGBUILD b/libre/luxblend25/PKGBUILD
new file mode 100644
index 000000000..d9934e179
--- /dev/null
+++ b/libre/luxblend25/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id$
+# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+pkgname=luxblend25
+pkgver=1.0rc3
+_pkgver=2d621c653196
+_blender=2.63
+pkgrel=1
+pkgdesc="A LuxRender exporter for Blender-libre"
+arch=('any')
+url="http://www.luxrender.net/"
+license=('GPL')
+depends=('blender' 'luxrender')
+replaces=('luxblend25')
+conflicts=('luxblend25')
+provides=("luxblend25=$pkgver")
+source=(https://bitbucket.org/luxrender/luxblend25/get/$_pkgver.tar.bz2)
+md5sums=('c5719c2a0e8567cd9f0aef429a2996f0')
+
+package() {
+  install -d -m755 "$pkgdir"/usr/share/blender/$_blender/scripts/addons
+  cp -a "$srcdir"/luxrender-luxblend25-$_pkgver/src/luxrender \
+    "$pkgdir"/usr/share/blender/$_blender/scripts/addons
+  # change the search path in exporter so it finds pylux in its new location
+  sed -i 's|from.*import pylux|import pylux|' "$pkgdir/usr/share/blender/$_blender/scripts/addons/luxrender/outputs/pure_api.py"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/luxrays-libre/PKGBUILD b/libre/luxrays-libre/PKGBUILD
index c8ea75082..279e6622e 100644
--- a/libre/luxrays-libre/PKGBUILD
+++ b/libre/luxrays-libre/PKGBUILD
@@ -3,9 +3,9 @@
 # Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy>
 _pkgname=luxrays
 pkgname=luxrays-libre
-pkgver=1.0rc2
-_pkgver=8707be9e6dc9
-pkgrel=2
+pkgver=1.0rc3
+_pkgver=eb749c000ffc
+pkgrel=1
 epoch=0
 pkgdesc="Accelerate the ray intersection process by using CPUs (without OpenCL)"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ replaces=('luxrays')
 conflicts=('luxrays')
 provides=("luxrays=$pkgver")
 source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2)
-md5sums=('b4f31563a8235a2791ab9df58be43adb')
+md5sums=('f5f4b53df22a1c7ad301c78d046edd7d')
 
 build() {
   cd "$srcdir/luxrender-$_pkgname-$_pkgver"
diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD
index 122a87207..be6fd88e8 100644
--- a/libre/luxrender-libre/PKGBUILD
+++ b/libre/luxrender-libre/PKGBUILD
@@ -4,9 +4,9 @@
 # Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org>
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 pkgname=luxrender-libre
-pkgver=1.0rc2
-_pkgver=008805644181
-pkgrel=3
+pkgver=1.0rc3
+_pkgver=9ed6b94cef05
+pkgrel=1
 pkgdesc="Rendering system for physically correct, unbiased image synthesis (without OpenCL)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.luxrender.net/"
@@ -20,7 +20,7 @@ conflicts=('luxrender')
 provides=("luxrender=$pkgver")
 source=(https://bitbucket.org/luxrender/lux/get/$_pkgver.tar.bz2 \
         boost_1.50_fix.diff)
-md5sums=('1922ccce6f70e7d707b340e2415875cd'
+md5sums=('54ff625a7833541c3cff5f0a77a93863'
          '8c7774bb0c97aadd77d9e665d8fa4aab')
 
 build() {
diff --git a/libre/parabola-themes-slim/PKGBUILD b/libre/parabola-themes-slim/PKGBUILD
index 9c29caf0b..a921253da 100644
--- a/libre/parabola-themes-slim/PKGBUILD
+++ b/libre/parabola-themes-slim/PKGBUILD
@@ -6,7 +6,7 @@ replaces=('archlinux-themes-slim')
 conflicts=('archlinux-themes-slim')
 pkgname=parabola-themes-slim
 pkgver=1.0
-pkgrel=1
+pkgrel=1.1
 pkgdesc="a theme parabolero to the Slim login manager"
 arch=('any')
 url="https://parabolagnulinux.org/"
diff --git a/libre/vhba-module-libre/60-vhba.rules b/libre/vhba-module-libre/60-vhba.rules
new file mode 100644
index 000000000..e4de1dca7
--- /dev/null
+++ b/libre/vhba-module-libre/60-vhba.rules
@@ -0,0 +1,13 @@
+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"
diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD
new file mode 100644
index 000000000..2de64bc38
--- /dev/null
+++ b/libre/vhba-module-libre/PKGBUILD
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Ray Rashif <schiv@archlinux.org>
+# Contributor: Mateusz Herych <heniekk@gmail.com>
+# Contributor: Charles Lindsay <charles@chaoslizard.org>
+
+_pkgname=vhba-module
+pkgname=vhba-module-libre
+pkgver=20120422
+_extramodules=extramodules-3.5-LIBRE
+pkgrel=6
+pkgdesc="Kernel module that emulates SCSI devices"
+arch=('i686' 'x86_64')
+url="http://cdemu.sourceforge.net/"
+license=('GPL')
+depends=('linux-libre>=3.5' 'linux-libre<3.6')
+makedepends=('linux-libre-headers')
+options=(!makeflags)
+install=$_pkgname.install
+replaces=('vhba-module')  
+conflicts=('vhba-module')
+provides=("vhba-module=$pkgver")
+source=("http://downloads.sourceforge.net/cdemu/$_pkgname-$pkgver.tar.bz2"
+        '60-vhba.rules')
+md5sums=('d97372da1d270d1605742b2995fb6678'
+         'b5e82d0160e7a181219b67c1794d5c27')
+
+build() {
+  cd "$srcdir/$_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"
+}
+
+# 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
new file mode 100644
index 000000000..ac27991cc
--- /dev/null
+++ b/libre/vhba-module-libre/vhba-module.install
@@ -0,0 +1,21 @@
+_updatemod() {
+  echo "  > Updating module dependencies..."
+  EXTRAMODULES='extramodules-3.5-LIBRE'
+  depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
+
+post_install() {
+  post_upgrade
+}
+
+post_upgrade() {
+  getent group cdemu &>/dev/null || groupadd cdemu
+  _updatemod
+}
+
+post_remove() {
+  _updatemod
+  groupdel cdemu
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD
index b3cabb285..3de090703 100644
--- a/libre/virtualbox-libre-modules-lts/PKGBUILD
+++ b/libre/virtualbox-libre-modules-lts/PKGBUILD
@@ -7,7 +7,7 @@
 pkgbase=virtualbox-libre-modules-lts
 pkgname=('virtualbox-libre-modules-lts' 'virtualbox-libre-parabola-modules-lts')
 pkgver=4.1.18
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
@@ -48,12 +48,12 @@ md5sums=('38db0a87cba659b484af868b0c2bd3ac'
          'f7d275fc52e5f3cfafd85646c2914063')
 
 _extramodules=extramodules-3.0-LIBRE-LTS
-_kernver=3.0.38-1-LIBRE-LTS
-
-export KERN_DIR=/usr/lib/modules/${_kernver}/build/
-export KERN_INCL=/usr/src/linux-${_kernver}/include/
 
 build() {
+    _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+    export KERN_DIR=/usr/lib/modules/${_kernver}/build/
+    export KERN_INCL=/usr/src/linux-${_kernver}/include/
+
     cd "$srcdir/VirtualBox-${pkgver}"
 
     patch -Np1 -i "$srcdir/libre.patch"
@@ -107,7 +107,7 @@ package_virtualbox-libre-parabola-modules-lts(){
     depends=('linux-libre-lts>=3.0' 'linux-libre-lts<3.1')
     replaces=('virtualbox-archlinux-modules-lts')
     conflicts=('virtualbox-archlinux-modules-lts')
-    provides=("virtualbox-archlinux-modules=$pkgver" "virtualbox-archlinux-modules-lts=$pkgver" "virtualbox-libre-parabola-modules=$pkgver" )
+    provides=("virtualbox-archlinux-modules-lts=$pkgver" "virtualbox-archlinux-modules=$pkgver")
 
     source "$srcdir/VirtualBox-${pkgver}/env.sh"
 
@@ -131,7 +131,7 @@ package_virtualbox-libre-modules-lts(){
     depends=('linux-libre-lts>=3.0' 'linux-libre-lts<3.1')
     replaces=('virtualbox-modules-lts')
     conflicts=('virtualbox-modules-lts')
-    provides=("virtualbox-modules=$pkgver" "virtualbox-modules-lts=$pkgver")
+    provides=("virtualbox-modules-lts=$pkgver" "virtualbox-modules=$pkgver")
 
     source "$srcdir/VirtualBox-${pkgver}/env.sh"
 
diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD
index ef63d7ff0..d1b6f5fae 100644
--- a/libre/virtualbox-libre-modules/PKGBUILD
+++ b/libre/virtualbox-libre-modules/PKGBUILD
@@ -6,7 +6,7 @@
 pkgbase=virtualbox-libre-modules
 pkgname=('virtualbox-libre-modules' 'virtualbox-libre-parabola-modules')
 pkgver=4.1.18
-pkgrel=5.1
+pkgrel=6
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
@@ -47,12 +47,16 @@ md5sums=('38db0a87cba659b484af868b0c2bd3ac'
          'f7d275fc52e5f3cfafd85646c2914063')
 
 _extramodules=extramodules-3.5-LIBRE
-_kernver="$(cat /usr/lib/modules/${_extramodules}/version || true)"
 
-export KERN_DIR=/usr/lib/modules/${_kernver}/build
-export KERN_INCL=/usr/src/linux-${_kernver}/include/
+
+
 
 build() {
+    _kernver="$(cat /usr/lib/modules/${_extramodules}/version || true)"
+
+    export KERN_DIR=/usr/lib/modules/${_kernver}/build
+    export KERN_INCL=/usr/src/linux-${_kernver}/include/
+
     cd "$srcdir/VirtualBox-${pkgver}"
 
     patch -Np1 -i "$srcdir/libre.patch"
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index 84761ac24..c3aa1a69c 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -11,7 +11,7 @@ pkgname=('virtualbox-libre'
          'virtualbox-libre-source'
          'virtualbox-libre-parabola-source')
 pkgver=4.1.18
-pkgrel=4.1
+pkgrel=4.2
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -158,9 +158,9 @@ package_virtualbox-libre() {
 package_virtualbox-libre-source() {
     pkgdesc="VirtualBox kernel modules source"
     depends=(dkms gcc make)
-    replaces=('virtualbox-source' 'virtualbox-libre-modules')
+    replaces=('virtualbox-source')
     conflicts=('virtualbox-source')
-    provides=("virtualbox-source=$pkgver" "virtualbox-libre-modules=$pkgver")
+    provides=("virtualbox-source=$pkgver" "virtualbox-modules=$pkgver")
     optdepends=('linux-libre-headers'
                 'linux-libre-lts-headers')
     install=virtualbox-libre-source.install
@@ -195,8 +195,8 @@ package_virtualbox-libre-sdk() {
 package_virtualbox-libre-parabola-additions(){
     pkgdesc="Additions only for Parabola guests (userspace tools)"
     depends=('virtualbox-libre-parabola-modules' 'gcc-libs' 'libxmu' 'xorg-xrandr' 'libxfixes')
-    replaces=('virtualbox-guest-additions' 'virtualbox-archlinux-additions')
-    conflicts=('virtualbox-guest-additions' 'virtualbox-archlinux-additions')
+    replaces=('virtualbox-archlinux-additions' 'virtualbox-guest-additions')
+    conflicts=('virtualbox-archlinux-additions' 'virtualbox-guest-additions')
     provides=("virtualbox-archlinux-additions=${pkgver}")
     backup=('etc/conf.d/vboxservice')
     install=virtualbox-libre-parabola-additions.install
@@ -234,9 +234,9 @@ package_virtualbox-libre-parabola-additions(){
 package_virtualbox-libre-parabola-source() {
     pkgdesc='VirtualBox Additions kernel modules source'
     depends=(dkms gcc make)
-    replaces=('virtualbox-archlinux-source' 'virtualbox-libre-parabola-modules')
+    replaces=('virtualbox-archlinux-source')
     conflicts=('virtualbox-archlinux-source')
-    provides=("virtualbox-archlinux-source=${pkgver}" "virtualbox-archlinux-modules=${pkgver}" "virtualbox-libre-parabola-modules=${pkgver}")
+    provides=("virtualbox-archlinux-source=${pkgver}" "virtualbox-archlinux-modules=${pkgver}")
     optdepends=('linux-libre-headers'
                 'linux-libre-lts-headers')
     install=virtualbox-libre-parabola-source.install
@@ -249,7 +249,7 @@ package_virtualbox-libre-parabola-source() {
 
 md5sums=('38db0a87cba659b484af868b0c2bd3ac'
          '5f85710e0b8606de967716ded7b2d351'
-         '755ab0dd9bcacf2c00d2275b1ca69547'
+         '2d599c6cf8bbbf183a7c07a9bcb926c7'
          'a1ff1d1b4423556887e48a32978226a6'
          '4ff559f2bea335d59c4012048983ca91'
          '97e193f050574dd272a38e5ee5ebe62b'
diff --git a/libre/virtualbox-libre/vboxdrv-reference.patch b/libre/virtualbox-libre/vboxdrv-reference.patch
index 682175798..c2c673386 100644
--- a/libre/virtualbox-libre/vboxdrv-reference.patch
+++ b/libre/virtualbox-libre/vboxdrv-reference.patch
@@ -9,9 +9,9 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp V
 -  "as root. If it is available in your distribution, you should install the "
 -  "DKMS package first. This package keeps track of Linux kernel changes and "
 -  "recompiles the vboxdrv kernel module if necessary."
-+  "  <font color=blue>'pacman -S virtualbox-modules'</font><br/><br/>"
-+  "as root. If you don't use our stock kernel, install virtualbox-source and"
-+  "execute /usr/bin/vboxbuild ."
++  "  <font color=blue>'pacman -S virtualbox-libre-modules'</font><br/><br/>"
++  "as root. If you don't use our stock kernel, install virtualbox-libre-source and "
++  "execute dkms install vboxhost/4.1.18 ."
    );
  
  QString g_QStrHintOtherWrongDriverVersion = QApplication::tr(
@@ -25,7 +25,7 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp V
 -  "may correct this. Make sure that you do not mix the "
 -  "OSE version and the PUEL version of VirtualBox."
 +  "VirtualBox. Reload the modules or if you don't use our stock kernel execute<br/><br/> "
-+  "  <font color=blue>'/usr/bin/vboxbuild'</font><br/><br/>"
++  "  <font color=blue>'dkms install vboxhost/4.1.18'</font><br/><br/>"
    );
 
  QString g_QStrHintOtherNoDriver = QApplication::tr(
@@ -37,11 +37,11 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox-
  WARNING: The vboxdrv kernel module is not loaded. Either there is no module
           available for the current kernel (`uname -r`) or it failed to
 -         load. Please recompile the kernel module and install it by
-+         load. Please reinstall the kernel module virtualbox-modules or
++         load. Please reinstall the kernel module virtualbox-libre-modules or
 +         if you don't use our stock kernel compile the modules with
  
 -           sudo /etc/init.d/vboxdrv setup
-+           sudo /usr/bin/vboxbuild
++           sudo dkms install vboxhost/4.1.18
  
           You will not be able to start VMs until this problem is fixed.
  EOF
diff --git a/libre/your-freedom/your-freedom.install b/libre/your-freedom/your-freedom.install
index 50988f587..0786adabf 100644
--- a/libre/your-freedom/your-freedom.install
+++ b/libre/your-freedom/your-freedom.install
@@ -19,7 +19,7 @@ pre_install() {
   * Etc.
 
   Please report back to the Parabola Project on the usual channels:
-  * https://bugs.parabolagnulinux.org
+  * https://labs.parabola.nu
   * irc://freenode.net/#parabola
   * mailto:dev@list.parabolagnulinux.org
 EOM
author	Nicolás Reynolds <apoyosis@correo.inta.gob.ar>	2012-08-08 09:16:29 -0300
committer	Nicolás Reynolds <apoyosis@correo.inta.gob.ar>	2012-08-08 09:16:29 -0300
commit	91b1c319d6364307eb3bfcb0768e3eaa09df7c17 (patch)
tree	91a5fcd8f433130db7dfc8060b66f98103949797 /libre
parent	0c2419984cf5501fc1ba410e09f61fa4112c7d2a (diff)
parent	9bb78d53ceba7b16ef8374b20c4ed662e34b789c (diff)