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

28 files changed, 261 insertions, 126 deletions

diff --git a/kernels/linux-libre-aufs_friendly/PKGBUILD b/kernels/linux-libre-aufs_friendly/PKGBUILD
index 4605cfba5..7f2101b18 100644
--- a/kernels/linux-libre-aufs_friendly/PKGBUILD
+++ b/kernels/linux-libre-aufs_friendly/PKGBUILD
@@ -13,7 +13,7 @@ pkgbase=linux-libre-aufs_friendly # Build stock -LIBRE-AUFS_FRIENDLY kernel
 _basekernel=3.3
 _sublevel=4
 pkgver=${_basekernel}.${_sublevel}
-pkgrel=1.2
+pkgrel=1.3
 _lxopkgver=${_basekernel}.4 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
@@ -234,10 +234,10 @@ _package() {
   # gzip -9 all modules to save 100MB of space
   find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
   # make room for external modules
-  ln -s "../extramodules-${_basekernel}${_kernelname:--LIBRE-AUFS_FRIENDLY}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
+  ln -s "../extramodules-${_basekernel}${_localversionname:--LIBRE-AUFS_FRIENDLY}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
   # add real version for building modules and running depmod from post_install/upgrade
-  mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE-AUFS_FRIENDLY}"
-  echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE-AUFS_FRIENDLY}/version"
+  mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-AUFS_FRIENDLY}"
+  echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-AUFS_FRIENDLY}/version"
 
   # move module tree /lib -> /usr/lib
   mv "$pkgdir/lib" "$pkgdir/usr"
diff --git a/kernels/linux-libre-aufs_friendly/linux-libre-aufs_friendly.install b/kernels/linux-libre-aufs_friendly/linux-libre-aufs_friendly.install
index 50ac390e7..019c659ed 100644
--- a/kernels/linux-libre-aufs_friendly/linux-libre-aufs_friendly.install
+++ b/kernels/linux-libre-aufs_friendly/linux-libre-aufs_friendly.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-aufs_friendly
-KERNEL_VERSION=3.3.4-1.2-LIBRE-AUFS_FRIENDLY
+KERNEL_VERSION=3.3.4-1.3-LIBRE-AUFS_FRIENDLY
 
 post_install () {
   # updating module dependencies
diff --git a/kernels/linux-libre-lts-rt/PKGBUILD b/kernels/linux-libre-lts-rt/PKGBUILD
index 8f47d0168..74a883c1b 100644
--- a/kernels/linux-libre-lts-rt/PKGBUILD
+++ b/kernels/linux-libre-lts-rt/PKGBUILD
@@ -11,12 +11,12 @@
 pkgbase=linux-libre-lts-rt  # Build stock -LIBRE-LTS-RT kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.0
-_releasever=40
-_rtpatchver=rt60
+_releasever=41
+_rtpatchver=rt61
 _pkgver=${_basekernel}.${_releasever}
 pkgver=${_basekernel}.${_releasever}_${_rtpatchver}
-pkgrel=1.1
-_lxopkgver=${_basekernel}.39 # nearly always the same as pkgver
+pkgrel=1
+_lxopkgver=${_basekernel}.41 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -41,8 +41,8 @@ _kernelname=${pkgbase#linux-libre}
 _localversionname=-LIBRE-LTS-RT
 _aurversionkernelname=-rt-lts # in this case, in the aur version on Archlinux, the kernel name is different than ours
 md5sums=('5f64180fe7df4e574dac5911b78f5067'
-         '4c42d5680df7921c20dda6f5fa44b275'
-         'b7e3a739f569ecac90880624ab05ec6c'
+         'b4ebaa2ebf8418c75aba96fd4dd6daf3'
+         '11bb95e505726abd1e1adfa522ef178f'
          '7266f5e7af09cc6e4b15d7a952e3b350'
          '5387f0cf51652c071190789569adf9c7'
          '85f04a9555bdc295f7c387a6564f0c81'
@@ -52,7 +52,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067'
          '9d3c56a4b999c8bfbd4018089a62f662'
          '263725f20c0b9eb9c353040792d644e5'
          'c8299cf750a84e12d60b372c8ca7e1e8'
-         'eea9aa0065f636fc924a23b3ffd24343')
+         '1f082cc9e5a18e227f7a044ff429914a')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
@@ -231,10 +231,10 @@ _package() {
   # gzip -9 all modules to save 100MB of space
   find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
   # make room for external modules
-  ln -s "../extramodules-${_basekernel}${_kernelname:--LIBRE-LTS-RT}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
+  ln -s "../extramodules-${_basekernel}${_localversionname:--LIBRE-LTS-RT}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
   # add real version for building modules and running depmod from post_install/upgrade
-  mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE-LTS-RT}"
-  echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE-LTS-RT}/version"
+  mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-LTS-RT}"
+  echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-LTS-RT}/version"
 
   # move module tree /lib -> /usr/lib
   mv "$pkgdir/lib" "$pkgdir/usr"
diff --git a/kernels/linux-libre-lts-rt/linux-libre-lts-rt.install b/kernels/linux-libre-lts-rt/linux-libre-lts-rt.install
index 6dc458bae..7f7e3a11f 100644
--- a/kernels/linux-libre-lts-rt/linux-libre-lts-rt.install
+++ b/kernels/linux-libre-lts-rt/linux-libre-lts-rt.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-lts-rt
-KERNEL_VERSION=3.0.40-1.1-rt60-LIBRE-LTS-RT
+KERNEL_VERSION=3.0.41-1-rt61-LIBRE-LTS-RT
 
 # set a sane PATH to ensure that critical utils like depmod will be found
 export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
diff --git a/kernels/linux-libre-lts-xen/PKGBUILD b/kernels/linux-libre-lts-xen/PKGBUILD
index 186614bc0..71a136f93 100644
--- a/kernels/linux-libre-lts-xen/PKGBUILD
+++ b/kernels/linux-libre-lts-xen/PKGBUILD
@@ -7,7 +7,7 @@ pkgbase=linux-libre-lts-xen # Build stock -LIBRE-LTS-XEN kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.0
 pkgver=${_basekernel}.31
-pkgrel=1.2
+pkgrel=1.3
 arch=('i686')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -152,10 +152,10 @@ _package() {
   # gzip -9 all modules to save 100MB of space
   find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
   # make room for external modules
-  ln -s "../extramodules-${_basekernel}${_kernelname:--LIBRE-LTS-XEN}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
+  ln -s "../extramodules-${_basekernel}${_localversionname:--LIBRE-LTS-XEN}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
   # add real version for building modules and running depmod from post_install/upgrade
-  mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE-LTS-XEN}"
-  echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE-LTS-XEN}/version"
+  mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-LTS-XEN}"
+  echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-LTS-XEN}/version"
 
   # move module tree /lib -> /usr/lib
   mv "$pkgdir/lib" "$pkgdir/usr"
diff --git a/kernels/linux-libre-lts-xen/linux-libre-lts-xen.install b/kernels/linux-libre-lts-xen/linux-libre-lts-xen.install
index 0eb1f2870..a369c337c 100644
--- a/kernels/linux-libre-lts-xen/linux-libre-lts-xen.install
+++ b/kernels/linux-libre-lts-xen/linux-libre-lts-xen.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-lts-xen
-KERNEL_VERSION=3.0.31-1.2-LIBRE-LTS-XEN
+KERNEL_VERSION=3.0.31-1.3-LIBRE-LTS-XEN
 
 post_install () {
   # updating module dependencies
diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD
index 503d1d30a..6348f4093 100644
--- a/kernels/linux-libre-rt/PKGBUILD
+++ b/kernels/linux-libre-rt/PKGBUILD
@@ -11,12 +11,12 @@
 pkgbase=linux-libre-rt      # Build stock -LIBRE-RT kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.4
-_releasever=8
-_rtpatchver=rt16
+_releasever=9
+_rtpatchver=rt17
 _pkgver=${_basekernel}.${_releasever}
 pkgver=${_basekernel}.${_releasever}_${_rtpatchver}
-pkgrel=1
-_lxopkgver=${_basekernel}.8 # nearly always the same as pkgver
+pkgrel=1.1
+_lxopkgver=${_basekernel}.9 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -40,8 +40,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
 _kernelname=${pkgbase#linux-libre}
 _localversionname=-LIBRE-RT
 md5sums=('a5e128ca059cceb8b69148b41ff4ac6f'
-         '15c770a780368718e99997fddb38245a'
-         '563c761c01333ca3b88a5544675ebf47'
+         '6ef5ab23e1999605f0185a6fc4d224f2'
+         '8ddc7ee43b418e06121bd09fa0e97bf6'
          'd176ceb303ecfb2303d9659ea2dd91c7'
          'bcb219ab37ed19912126189cfca30538'
          '82496e68851d1960543a07ba51cdb44a'
@@ -51,7 +51,7 @@ md5sums=('a5e128ca059cceb8b69148b41ff4ac6f'
          '9d3c56a4b999c8bfbd4018089a62f662'
          '263725f20c0b9eb9c353040792d644e5'
          '80a46681386bb87813989faeb92bdd9a'
-         '7c8fc7c55a9102831e5cef2f4033aa70')
+         '9ead3a0a09633b4da08983b2584b4c6f')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
@@ -230,10 +230,10 @@ _package() {
   # gzip -9 all modules to save 100MB of space
   find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
   # make room for external modules
-  ln -s "../extramodules-${_basekernel}${_kernelname:--LIBRE-RT}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
+  ln -s "../extramodules-${_basekernel}${_localversionname:--LIBRE-RT}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
   # add real version for building modules and running depmod from post_install/upgrade
-  mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE-RT}"
-  echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE-RT}/version"
+  mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-RT}"
+  echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-RT}/version"
 
   # move module tree /lib -> /usr/lib
   mv "$pkgdir/lib" "$pkgdir/usr"
diff --git a/kernels/linux-libre-rt/linux-libre-rt.install b/kernels/linux-libre-rt/linux-libre-rt.install
index 9321a1c8b..1f57ce546 100644
--- a/kernels/linux-libre-rt/linux-libre-rt.install
+++ b/kernels/linux-libre-rt/linux-libre-rt.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-rt
-KERNEL_VERSION=3.4.8-1-rt16-LIBRE-RT
+KERNEL_VERSION=3.4.9-1.1-rt17-LIBRE-RT
 
 # set a sane PATH to ensure that critical utils like depmod will be found
 export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD
index 85475feb8..7f14d134d 100644
--- a/kernels/linux-libre-xen/PKGBUILD
+++ b/kernels/linux-libre-xen/PKGBUILD
@@ -10,7 +10,7 @@ pkgbase=linux-libre-xen     # Build stock -LIBRE-XEN kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.3
 pkgver=${_basekernel}.6
-pkgrel=1.2
+pkgrel=1.3
 arch=('i686')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -155,10 +155,10 @@ _package() {
   # gzip -9 all modules to save 100MB of space
   find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
   # make room for external modules
-  ln -s "../extramodules-${_basekernel}${_kernelname:--LIBRE-XEN}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
+  ln -s "../extramodules-${_basekernel}${_localversionname:--LIBRE-XEN}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
   # add real version for building modules and running depmod from post_install/upgrade
-  mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE-XEN}"
-  echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE-XEN}/version"
+  mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-XEN}"
+  echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-XEN}/version"
 
   # move module tree /lib -> /usr/lib
   mv "$pkgdir/lib" "$pkgdir/usr"
diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install
index 7683e4527..b670328cd 100644
--- a/kernels/linux-libre-xen/linux-libre-xen.install
+++ b/kernels/linux-libre-xen/linux-libre-xen.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-xen
-KERNEL_VERSION=3.3.6-1.2-LIBRE-XEN
+KERNEL_VERSION=3.3.6-1.3-LIBRE-XEN
 
 post_install () {
   # updating module dependencies
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 065ca3fc0..e7d044b92 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -7,10 +7,10 @@
 pkgbase=linux-libre-lts     # Build stock -LIBRE-LTS kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.0
-_sublevel=40
+_sublevel=41
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.39 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.41 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -33,9 +33,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
 _kernelname=${pkgbase#linux-libre}
 _localversionname=-LIBRE-LTS
 md5sums=('5f64180fe7df4e574dac5911b78f5067'
-         '4c42d5680df7921c20dda6f5fa44b275'
-         '5e3362ef81c99563852f1b7a8c5b5837'
-         '3d078c10d51f9c2f4d0ec6be531caf1d'
+         'b4ebaa2ebf8418c75aba96fd4dd6daf3'
+         '8cd05778fc1c2d8145b3b9932b4e3164'
+         '87a54dc6251cf2adf35f72ddeddb6ea8'
          'c072b17032e80debc6a8626299245d46'
          '2967cecc3af9f954ccc822fd63dca6ff'
          '8267264d9a8966e57fdacd1fa1fc65c4'
@@ -43,7 +43,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067'
          '9d3c56a4b999c8bfbd4018089a62f662'
          '263725f20c0b9eb9c353040792d644e5'
          'f36222e7ce20c8e4dc27376f9be60f6c'
-         'eea9aa0065f636fc924a23b3ffd24343')
+         '1f082cc9e5a18e227f7a044ff429914a')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
@@ -219,10 +219,10 @@ _package() {
   # gzip -9 all modules to save 100MB of space
   find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
   # make room for external modules
-  ln -s "../extramodules-${_basekernel}${_kernelname:--LIBRE-LTS}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
+  ln -s "../extramodules-${_basekernel}${_localversionname:--LIBRE-LTS}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
   # add real version for building modules and running depmod from post_install/upgrade
-  mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE-LTS}"
-  echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE-LTS}/version"
+  mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-LTS}"
+  echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-LTS}/version"
 
   # move module tree /lib -> /usr/lib
   mv "$pkgdir/lib" "$pkgdir/usr"
diff --git a/libre/linux-libre-lts/config.i686 b/libre/linux-libre-lts/config.i686
index 240eccfbf..f4e10c441 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.39-1 Kernel Configuration
+# Linux/i386 3.0.40-2 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -62,7 +62,7 @@ CONFIG_EXPERIMENTAL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 CONFIG_LOCALVERSION="-LIBRE-LTS"
-CONFIG_LOCALVERSION_AUTO=y
+# CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y
 CONFIG_HAVE_KERNEL_LZMA=y
@@ -106,13 +106,14 @@ CONFIG_IRQ_FORCED_THREADING=y
 #
 # RCU Subsystem
 #
-CONFIG_TREE_PREEMPT_RCU=y
-CONFIG_PREEMPT_RCU=y
+CONFIG_TREE_RCU=y
+# CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_PREEMPT_RCU is not set
 # CONFIG_RCU_TRACE is not set
 CONFIG_RCU_FANOUT=32
 # CONFIG_RCU_FANOUT_EXACT is not set
+# CONFIG_RCU_FAST_NO_HZ is not set
 # CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_RCU_BOOST is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=19
@@ -194,6 +195,7 @@ CONFIG_OPROFILE=m
 CONFIG_HAVE_OPROFILE=y
 CONFIG_KPROBES=y
 CONFIG_JUMP_LABEL=y
+CONFIG_OPTPROBES=y
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
 CONFIG_KRETPROBES=y
 CONFIG_USER_RETURN_NOTIFIER=y
@@ -252,27 +254,27 @@ CONFIG_PADATA=y
 # CONFIG_INLINE_SPIN_LOCK_BH is not set
 # CONFIG_INLINE_SPIN_LOCK_IRQ is not set
 # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_SPIN_UNLOCK is not set
+CONFIG_INLINE_SPIN_UNLOCK=y
 # CONFIG_INLINE_SPIN_UNLOCK_BH is not set
-# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
 # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
 # CONFIG_INLINE_READ_TRYLOCK is not set
 # CONFIG_INLINE_READ_LOCK is not set
 # CONFIG_INLINE_READ_LOCK_BH is not set
 # CONFIG_INLINE_READ_LOCK_IRQ is not set
 # CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_READ_UNLOCK is not set
+CONFIG_INLINE_READ_UNLOCK=y
 # CONFIG_INLINE_READ_UNLOCK_BH is not set
-# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
 # CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
 # CONFIG_INLINE_WRITE_TRYLOCK is not set
 # CONFIG_INLINE_WRITE_LOCK is not set
 # CONFIG_INLINE_WRITE_LOCK_BH is not set
 # CONFIG_INLINE_WRITE_LOCK_IRQ is not set
 # CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_WRITE_UNLOCK is not set
+CONFIG_INLINE_WRITE_UNLOCK=y
 # CONFIG_INLINE_WRITE_UNLOCK_BH is not set
-# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
 # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
 # CONFIG_MUTEX_SPIN_ON_OWNER is not set
 CONFIG_FREEZER=y
@@ -360,9 +362,9 @@ CONFIG_NR_CPUS=8
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
 # CONFIG_IRQ_TIME_ACCOUNTING is not set
-# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_PREEMPT=y
+# CONFIG_PREEMPT is not set
 CONFIG_X86_LOCAL_APIC=y
 CONFIG_X86_IO_APIC=y
 CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
@@ -3809,6 +3811,7 @@ CONFIG_DRM_TDFX=m
 CONFIG_DRM_R128=m
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_KMS=y
+# CONFIG_DRM_I810 is not set
 CONFIG_DRM_I915=m
 CONFIG_DRM_I915_KMS=y
 CONFIG_DRM_MGA=m
@@ -5315,7 +5318,6 @@ CONFIG_TIMER_STATS=y
 # CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_SLUB_STATS is not set
 # CONFIG_DEBUG_KMEMLEAK is not set
-# CONFIG_DEBUG_PREEMPT is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
@@ -5346,7 +5348,6 @@ CONFIG_FRAME_POINTER=y
 # CONFIG_BOOT_PRINTK_DELAY is not set
 # CONFIG_RCU_TORTURE_TEST is not set
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
-# CONFIG_RCU_CPU_STALL_VERBOSE is not set
 # CONFIG_KPROBES_SANITY_TEST is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
@@ -5383,7 +5384,6 @@ CONFIG_FTRACE=y
 CONFIG_FUNCTION_TRACER=y
 CONFIG_FUNCTION_GRAPH_TRACER=y
 # CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_PREEMPT_TRACER is not set
 CONFIG_SCHED_TRACER=y
 CONFIG_FTRACE_SYSCALLS=y
 CONFIG_BRANCH_PROFILE_NONE=y
diff --git a/libre/linux-libre-lts/config.x86_64 b/libre/linux-libre-lts/config.x86_64
index 86b096eaf..80f5a7aca 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.39-1 Kernel Configuration
+# Linux/x86_64 3.0.40-2 Kernel Configuration
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -63,7 +63,7 @@ CONFIG_EXPERIMENTAL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 CONFIG_LOCALVERSION="-LIBRE-LTS"
-CONFIG_LOCALVERSION_AUTO=y
+# CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y
 CONFIG_HAVE_KERNEL_LZMA=y
@@ -107,13 +107,14 @@ CONFIG_IRQ_FORCED_THREADING=y
 #
 # RCU Subsystem
 #
-CONFIG_TREE_PREEMPT_RCU=y
-CONFIG_PREEMPT_RCU=y
+CONFIG_TREE_RCU=y
+# CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_PREEMPT_RCU is not set
 # CONFIG_RCU_TRACE is not set
 CONFIG_RCU_FANOUT=64
 # CONFIG_RCU_FANOUT_EXACT is not set
+# CONFIG_RCU_FAST_NO_HZ is not set
 # CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_RCU_BOOST is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=19
@@ -195,6 +196,7 @@ CONFIG_OPROFILE=m
 CONFIG_HAVE_OPROFILE=y
 CONFIG_KPROBES=y
 CONFIG_JUMP_LABEL=y
+CONFIG_OPTPROBES=y
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
 CONFIG_KRETPROBES=y
 CONFIG_USER_RETURN_NOTIFIER=y
@@ -253,27 +255,27 @@ CONFIG_PADATA=y
 # CONFIG_INLINE_SPIN_LOCK_BH is not set
 # CONFIG_INLINE_SPIN_LOCK_IRQ is not set
 # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_SPIN_UNLOCK is not set
+CONFIG_INLINE_SPIN_UNLOCK=y
 # CONFIG_INLINE_SPIN_UNLOCK_BH is not set
-# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
 # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
 # CONFIG_INLINE_READ_TRYLOCK is not set
 # CONFIG_INLINE_READ_LOCK is not set
 # CONFIG_INLINE_READ_LOCK_BH is not set
 # CONFIG_INLINE_READ_LOCK_IRQ is not set
 # CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_READ_UNLOCK is not set
+CONFIG_INLINE_READ_UNLOCK=y
 # CONFIG_INLINE_READ_UNLOCK_BH is not set
-# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
 # CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
 # CONFIG_INLINE_WRITE_TRYLOCK is not set
 # CONFIG_INLINE_WRITE_LOCK is not set
 # CONFIG_INLINE_WRITE_LOCK_BH is not set
 # CONFIG_INLINE_WRITE_LOCK_IRQ is not set
 # CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_WRITE_UNLOCK is not set
+CONFIG_INLINE_WRITE_UNLOCK=y
 # CONFIG_INLINE_WRITE_UNLOCK_BH is not set
-# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
 # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
 # CONFIG_MUTEX_SPIN_ON_OWNER is not set
 CONFIG_FREEZER=y
@@ -342,9 +344,9 @@ CONFIG_NR_CPUS=64
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
 # CONFIG_IRQ_TIME_ACCOUNTING is not set
-# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_PREEMPT=y
+# CONFIG_PREEMPT is not set
 CONFIG_X86_LOCAL_APIC=y
 CONFIG_X86_IO_APIC=y
 CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
@@ -3625,6 +3627,7 @@ CONFIG_DRM_TDFX=m
 CONFIG_DRM_R128=m
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_KMS=y
+# CONFIG_DRM_I810 is not set
 CONFIG_DRM_I915=m
 CONFIG_DRM_I915_KMS=y
 CONFIG_DRM_MGA=m
@@ -5056,7 +5059,6 @@ CONFIG_TIMER_STATS=y
 # CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_SLUB_STATS is not set
-# CONFIG_DEBUG_PREEMPT is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
@@ -5086,7 +5088,6 @@ CONFIG_FRAME_POINTER=y
 # CONFIG_BOOT_PRINTK_DELAY is not set
 # CONFIG_RCU_TORTURE_TEST is not set
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
-# CONFIG_RCU_CPU_STALL_VERBOSE is not set
 # CONFIG_KPROBES_SANITY_TEST is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
@@ -5123,7 +5124,6 @@ CONFIG_FTRACE=y
 CONFIG_FUNCTION_TRACER=y
 CONFIG_FUNCTION_GRAPH_TRACER=y
 # CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_PREEMPT_TRACER is not set
 CONFIG_SCHED_TRACER=y
 CONFIG_FTRACE_SYSCALLS=y
 CONFIG_BRANCH_PROFILE_NONE=y
diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install
index 58b0a302a..e92e5eb16 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.40-1-LIBRE-LTS
+KERNEL_VERSION=3.0.41-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 cfed17911..661fec088 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -12,8 +12,8 @@ pkgbase=linux-libre         # Build stock -LIBRE kernel
 _basekernel=3.5
 _sublevel=2
 pkgver=${_basekernel}.${_sublevel}
-pkgrel=1
-_lxopkgver=${_basekernel}.1 # nearly always the same as pkgver
+pkgrel=1.1
+_lxopkgver=${_basekernel}.2 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -35,14 +35,14 @@ _kernelname=${pkgbase#linux-libre}
 _localversionname=-LIBRE
 md5sums=('2407fc9563a74acaf38aa0c06516eb1c'
          'b081f37b73c652cbb0d5193174092709'
-         '7f0b7950bc9d2a20cdb6b850e6e4eb5a'
-         'a796ea383eb136cb38fab0a52b6d2f52'
+         '3ba164b409d8024fdd433f3cc4ae1fea'
+         'fa1e2ab2f036974199374f015f5a2c46'
          'e49ac236dfeef709f91a3d993ea7b62c'
          '2967cecc3af9f954ccc822fd63dca6ff'
          '8267264d9a8966e57fdacd1fa1fc65c4'
          '04b21c79df0a952c22d681dd4f4562df'
          '9d3c56a4b999c8bfbd4018089a62f662'
-         'eb25429666af638b01baa663eca74d08')
+         'd822cc131b20090f39b0d448b0e1f8be')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
@@ -206,10 +206,10 @@ _package() {
   # gzip -9 all modules to save 100MB of space
   find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
   # make room for external modules
-  ln -s "../extramodules-${_basekernel}${_kernelname:--LIBRE}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
+  ln -s "../extramodules-${_basekernel}${_localversionname:--LIBRE}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
   # add real version for building modules and running depmod from post_install/upgrade
-  mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE}"
-  echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE}/version"
+  mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE}"
+  echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE}/version"
 
   # move module tree /lib -> /usr/lib
   mv "$pkgdir/lib" "$pkgdir/usr"
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index a66ebeaa7..54db12ba1 100644
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -334,7 +334,7 @@ CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_X86_32_IRIS=m
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_PARAVIRT_GUEST=y
-# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
+CONFIG_PARAVIRT_TIME_ACCOUNTING=y 
 # CONFIG_XEN_PRIVILEGED_GUEST is not set
 CONFIG_KVM_CLOCK=y
 CONFIG_KVM_GUEST=y
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index 350a2b905..31da569ad 100644
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -335,7 +335,7 @@ CONFIG_X86_MPPARSE=y
 CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_PARAVIRT_GUEST=y
-# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
+CONFIG_PARAVIRT_TIME_ACCOUNTING=y 
 CONFIG_XEN=y
 CONFIG_XEN_DOM0=y
 CONFIG_XEN_PRIVILEGED_GUEST=y
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index dc313170a..59b77b82d 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.2-1-LIBRE
+KERNEL_VERSION=3.5.2-1.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/mcomix-libre/PKGBUILD b/libre/mcomix-libre/PKGBUILD
new file mode 100644
index 000000000..d30bbb1a3
--- /dev/null
+++ b/libre/mcomix-libre/PKGBUILD
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: schuay <jakob.gruber@gmail.com>
+# Contributor: Ray Powell <ray_al@xphoniexx.net>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+_pkgname=mcomix
+pkgname=mcomix-libre
+pkgver=0.99
+pkgrel=1
+pkgdesc="A user-friendly, customizable image viewer specifically designed to handle comic books"
+arch=('any')
+url="http://sourceforge.net/projects/mcomix/"
+license=('GPL')
+depends=('pygtk' 'python-imaging' 'xdg-utils' 'python2' \
+         'desktop-file-utils' 'hicolor-icon-theme' 'python2-distribute')
+makedepends=('gettext' 'intltool')
+optdepends=('ununrar: for rar compressed comics')
+conflicts=('mcomix' 'comix')
+replaces=('mcomix' 'comix')
+provides=("mcomix=${pkgver}")
+install='mcomix.install'
+source=("http://downloads.sourceforge.net/project/mcomix/MComix-${pkgver}/mcomix-${pkgver}.tar.bz2")
+
+build() {
+  cd ${srcdir}/${_pkgname}-${pkgver}
+
+  # python2 fix
+  for file in $(grep -Rl "/usr/bin/env python" .);
+  do
+    sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file
+  done
+}
+
+package() {
+  cd ${srcdir}/${_pkgname}-${pkgver}
+
+  export PYTHONPATH=${pkgdir}/usr/lib/python2.7/site-packages/
+  mkdir -p $PYTHONPATH
+
+  python2 setup.py install --prefix=${pkgdir}/usr --optimize=1 \
+    --single-version-externally-managed --root=/
+
+  install -Dm644 mime/comicbook.schemas \
+    ${pkgdir}/usr/share/gconf/schemas/mcomix.schemas
+}
+
+md5sums=('a1ff7e1955042069d5005b4034e7a914')
diff --git a/libre/mcomix-libre/mcomix.install b/libre/mcomix-libre/mcomix.install
new file mode 100644
index 000000000..2d3c6c3e3
--- /dev/null
+++ b/libre/mcomix-libre/mcomix.install
@@ -0,0 +1,32 @@
+pkgname=mcomix
+
+post_install() {
+  if [ -f usr/bin/xdg-icon-resource ]; then
+      xdg-icon-resource forceupdate
+  fi
+  if [ -f usr/sbin/gconfpkg ]; then
+      usr/sbin/gconfpkg --install ${pkgname}
+  fi
+  update-desktop-database -q
+}
+
+pre_upgrade() {
+  pre_remove $1
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  if [ -f usr/sbin/gconfpkg ]; then
+      usr/sbin/gconfpkg --uninstall ${pkgname}
+  fi
+}
+
+post_remove() {
+  if [ -f usr/bin/xdg-icon-resource ]; then
+      xdg-icon-resource forceupdate
+  fi
+  update-desktop-database -q
+}
diff --git a/libre/parabola-keyring/PKGBUILD b/libre/parabola-keyring/PKGBUILD
index 385790ccd..7a95abd0b 100644
--- a/libre/parabola-keyring/PKGBUILD
+++ b/libre/parabola-keyring/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
 pkgname=parabola-keyring
-pkgver=20120723
+pkgver=20120816
 pkgrel=1
 pkgdesc='Parabola GNU/Linux-libre PGP keyring'
 arch=('any')
@@ -16,5 +16,5 @@ package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make PREFIX=/usr DESTDIR=${pkgdir} install
 }
-md5sums=('f9ab13c8c969c3bf136e302a666e32d9'
-         '5c27394f0575ab9fb27bf3ab9cb212e3')
+md5sums=('4163ebfce3ccc32e2398e18c19158fc1'
+         'b4b1b532657eb754ef2e9f7cf4d0a09a')
diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD
index 588f72271..1d5f60079 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=4.1
+pkgrel=7
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
@@ -101,7 +101,7 @@ build() {
 }
 
 package_virtualbox-libre-parabola-modules-lts(){
-    pkgdesc="Additions only for Parabola guests (long-term supported kernel modules)"
+    pkgdesc="Additions only for Parabola guests (long-term supported kernel libre modules)"
     license=('GPL')
     install=virtualbox-libre-parabola-modules-lts.install
     depends=('linux-libre-lts>=3.0' 'linux-libre-lts<3.1')
@@ -125,7 +125,7 @@ package_virtualbox-libre-parabola-modules-lts(){
 }
 
 package_virtualbox-libre-modules-lts(){
-    pkgdesc="Long-term supported kernel modules for VirtualBox"
+    pkgdesc="Long-term supported kernel libre modules for VirtualBox"
     license=('GPL')
     install=virtualbox-libre-modules-lts.install
     depends=('linux-libre-lts>=3.0' 'linux-libre-lts<3.1')
diff --git a/libre/virtualbox-libre-modules/.directory b/libre/virtualbox-libre-modules/.directory
index 7486c78f1..9f6471595 100644
--- a/libre/virtualbox-libre-modules/.directory
+++ b/libre/virtualbox-libre-modules/.directory
@@ -1,2 +1,3 @@
 [Dolphin]
-Timestamp=2012,3,20,12,36,27
+Timestamp=2012,8,16,6,34,39
+Version=3
diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD
index d1b6f5fae..7104ed19c 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=6
+pkgrel=6.2
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
@@ -104,7 +104,7 @@ build() {
 }
 
 package_virtualbox-libre-parabola-modules(){
-    pkgdesc="Additions only for Parabola guests (kernel modules)"
+    pkgdesc="Additions only for Parabola guests (kernel libre modules)"
     license=('GPL')
     install=virtualbox-libre-parabola-modules.install
     depends=('linux-libre>=3.5' 'linux-libre<3.6')
@@ -130,7 +130,7 @@ package_virtualbox-libre-parabola-modules(){
 }
 
 package_virtualbox-libre-modules(){
-    pkgdesc="Kernel modules for VirtualBox"
+    pkgdesc="Kernel libre modules for VirtualBox"
     license=('GPL')
     install=virtualbox-libre-modules.install
     depends=('linux-libre>=3.5' 'linux-libre<3.6')
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index 80de2315f..8e239915d 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=5
+pkgrel=5.4
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -84,7 +84,7 @@ package_virtualbox-libre() {
     optdepends=('qt: for VirtualBox GUI'
                 'vde2: Virtual Distributed Ethernet support'
                 'virtualbox-libre-sdk: developer kit'
-                'virtualbox-libre-source: host kernel source modules for non-stock kernels'
+                'virtualbox-libre-source: host kernel libre source modules for non-stock kernels'
                 'net-tools: for host-only or bridged networking')
 
     backup=('etc/vbox/vbox.cfg' 'etc/conf.d/vboxweb')
@@ -164,7 +164,7 @@ package_virtualbox-libre() {
 }
 
 package_virtualbox-libre-source() {
-    pkgdesc="VirtualBox kernel modules source"
+    pkgdesc="VirtualBox kernel libre modules source"
     depends=(dkms gcc make)
     replaces=('virtualbox-source')
     conflicts=('virtualbox-source')
@@ -240,7 +240,7 @@ package_virtualbox-libre-parabola-additions(){
 }
 
 package_virtualbox-libre-parabola-source() {
-    pkgdesc='VirtualBox Additions kernel modules source'
+    pkgdesc='VirtualBox Additions kernel libre modules source'
     depends=(dkms gcc make)
     replaces=('virtualbox-archlinux-source')
     conflicts=('virtualbox-archlinux-source')
@@ -257,7 +257,7 @@ package_virtualbox-libre-parabola-source() {
 
 md5sums=('38db0a87cba659b484af868b0c2bd3ac'
          '5f85710e0b8606de967716ded7b2d351'
-         '2d599c6cf8bbbf183a7c07a9bcb926c7'
+         'bf5d1eeeec20a042e8af34cd61a9e11b'
          'a1ff1d1b4423556887e48a32978226a6'
          '4ff559f2bea335d59c4012048983ca91'
          '97e193f050574dd272a38e5ee5ebe62b'
diff --git a/libre/virtualbox-libre/vboxbuild b/libre/virtualbox-libre/vboxbuild
index 350d0c6ad..27519950f 100644
--- a/libre/virtualbox-libre/vboxbuild
+++ b/libre/virtualbox-libre/vboxbuild
@@ -35,7 +35,7 @@ if [[ -f /proc/modules ]]; then
 fi
 
 if (( ${#MODLIST[*]} )); then
-  stat_busy "Unloading VirtualBox kernel modules"
+  stat_busy "Unloading VirtualBox kernel libre modules"
   modprobe -ar "${MODLIST[@]}" && stat_done || stat_fail
 fi
 
@@ -44,7 +44,7 @@ for kdir in /usr/lib/modules/[2-3]*; do
     # found a stale kernel
     mods=("$kdir/extramodules"{drv,netadp,netflt,pci}.ko*)
     if (( ${#mods[@]} )); then
-      stat_busy "Removing all old VirtualBox kernel modules"
+      stat_busy "Removing all old VirtualBox kernel libre modules"
       if rm -f "${mods[@]}" &&
           rmdir -p --ignore-fail-on-non-empty "$kdir/extramodules" 2>/dev/null; then
         stat_done
@@ -64,12 +64,12 @@ for kernver; do
   export KERN_DIR=/usr/lib/modules/$kernver/build
   export MODULE_DIR=/usr/lib/modules/$kernver/extramodules
   if [[ ! -d $KERN_DIR ]]; then
-    printf "error: \`%s' does not appear to be a valid kernel build directory.\n" \
+    printf "error: \`%s' does not appear to be a valid kernel libre build directory.\n" \
         "$KERN_DIR"
     continue
   fi
 
-  stat_busy "Recompiling VirtualBox kernel modules ($kernver)"
+  stat_busy "Recompiling VirtualBox kernel libre modules ($kernver)"
     if ! $BUILDVBOXDRV \
       --save-module-symvers /tmp/vboxdrv-Module.symvers \
       --no-print-directory install >> $LOG 2>&1; then
@@ -90,6 +90,6 @@ for kernver; do
 done
 
 if (( ${#MODLIST[*]} )); then
-  stat_busy "Reloading VirtualBox kernel modules"
+  stat_busy "Reloading VirtualBox kernel libre modules"
   modprobe -a "${MODLIST[@]}" && stat_done || stat_fail
 fi
diff --git a/libre/virtualbox-libre/vboxdrv-reference.patch b/libre/virtualbox-libre/vboxdrv-reference.patch
index c2c673386..9599a3a49 100644
--- a/libre/virtualbox-libre/vboxdrv-reference.patch
+++ b/libre/virtualbox-libre/vboxdrv-reference.patch
@@ -1,44 +1,88 @@
 diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.1.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp
 --- VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp	2011-11-04 17:22:13.636083176 +0000
 +++ VirtualBox-4.1.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp	2011-11-04 17:48:58.915541368 +0000
-@@ -75,10 +75,9 @@
-   "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or "
+@@ -67,38 +67,34 @@
+ 
+ /* XXX Temporarily. Don't rely on the user to hack the Makefile himself! */
+ QString g_QStrHintLinuxNoMemory = QApplication::tr(
+-  "This error means that the kernel driver was either not able to "
++  "This error means that the kernel libre driver was either not able to "
+   "allocate enough memory or that some mapping operation failed."
+   );
+ 
+ QString g_QStrHintLinuxNoDriver = QApplication::tr(
+-  "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or "
++  "The VirtualBox Linux-libre kernel driver (vboxdrv) is either not loaded or "
    "there is a permission problem with /dev/vboxdrv. Please reinstall the kernel "
-   "module by executing<br/><br/>"
+-  "module by executing<br/><br/>"
 -  "  <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
 -  "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."
++  "libre module by executing<br/><br/>"
 +  "  <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 "
++  "as root. If you don't use our stock kernel libre, install virtualbox-libre-source and "
 +  "execute dkms install vboxhost/4.1.18 ."
    );
  
  QString g_QStrHintOtherWrongDriverVersion = QApplication::tr(
-@@ -90,11 +89,8 @@
-
+-  "The VirtualBox kernel modules do not match this version of "
++  "The VirtualBox kernel libre modules do not match this version of "
+   "VirtualBox. The installation of VirtualBox was apparently not "
+   "successful. Please try completely uninstalling and reinstalling "
+   "VirtualBox."
+   );
+ 
  QString g_QStrHintLinuxWrongDriverVersion = QApplication::tr(
-   "The VirtualBox kernel modules do not match this version of "
+-  "The VirtualBox kernel modules do not match this version of "
 -  "VirtualBox. The installation of VirtualBox was apparently not "
 -  "successful. Executing<br/><br/>"
 -  "  <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
 -  "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/> "
++  "The VirtualBox kernel libre modules do not match this version of "
++  "VirtualBox. Reload the modules or if you don't use our stock kernel libre execute<br/><br/> "
 +  "  <font color=blue>'dkms install vboxhost/4.1.18'</font><br/><br/>"
    );
-
+ 
  QString g_QStrHintOtherNoDriver = QApplication::tr(
+-  "Make sure the kernel module has been loaded successfully."
++  "Make sure the kernel libre module has been loaded successfully."
+   );
+ 
+ /* I hope this isn't (C), (TM) or (R) Microsoft support ;-) */
+@@ -590,7 +586,7 @@
+             case VERR_VM_DRIVER_NOT_INSTALLED:
+             case VERR_VM_DRIVER_LOAD_ERROR:
+                 msgText += QApplication::tr (
+-                        "<b>Cannot access the kernel driver!</b><br/><br/>");
++                        "<b>Cannot access the kernel libre driver!</b><br/><br/>");
+ # ifdef RT_OS_LINUX
+                 msgText += g_QStrHintLinuxNoDriver;
+ # else
+@@ -603,7 +599,7 @@
+                 break;
+ # endif
+             case VERR_VM_DRIVER_NOT_ACCESSIBLE:
+-                msgText += QApplication::tr ("Kernel driver not accessible");
++                msgText += QApplication::tr ("Kernel libre driver not accessible");
+                 break;
+             case VERR_VM_DRIVER_VERSION_MISMATCH:
+ # ifdef RT_OS_LINUX
 diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh
 --- VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh	2011-11-04 17:22:13.549415814 +0000
 +++ VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh	2011-11-04 17:56:50.735874087 +0000
-@@ -32,17 +32,18 @@
+@@ -30,19 +30,20 @@
+     SHUTDOWN="true"
+ elif ! lsmod|grep -q vboxdrv; then
      cat << EOF
- WARNING: The vboxdrv kernel module is not loaded. Either there is no module
-          available for the current kernel (`uname -r`) or it failed to
+-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-libre-modules or
-+         if you don't use our stock kernel compile the modules with
++WARNING: The vboxdrv kernel libre module is not loaded. Either there is no module
++         available for the current kernel libre (`uname -r`) or it failed to
++         load. Please reinstall the kernel libre module virtualbox-libre-modules or
++         if you don't use our stock kernel libre compile the modules with
  
 -           sudo /etc/init.d/vboxdrv setup
 +           sudo dkms install vboxhost/4.1.18
@@ -55,3 +99,14 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox-
  
           and if that is not successful, try to re-install the package.
  
+@@ -52,9 +53,8 @@
+ 
+ if [ -f /etc/vbox/module_not_compiled ]; then
+     cat << EOF
+-WARNING: The compilation of the vboxdrv.ko kernel module failed during the
++WARNING: The compilation of the vboxdrv.ko kernel libre module failed during the
+          installation for some reason. Starting a VM will not be possible.
+-         Please consult the User Manual for build instructions.
+ EOF
+ fi
+ 
\ No newline at end of file
diff --git a/libre/virtualbox-libre/virtualbox-libre.install b/libre/virtualbox-libre/virtualbox-libre.install
index 6913fe2ed..b6d804eb7 100644
--- a/libre/virtualbox-libre/virtualbox-libre.install
+++ b/libre/virtualbox-libre/virtualbox-libre.install
@@ -30,8 +30,8 @@ post_upgrade() {
   post_install "$1"
   if [ "$(vercmp $2 4.1.6-1)" -lt 0 ]; then
     cat << EOF
-===> Starting with virtualbox version 4.1.6-1, kernel modules handling is done by virtualbox-modules.
-===> Use virtualbox-source package if you don't use our stock linux package.
+===> Starting with virtualbox-libre version 4.1.6-1, kernel libre modules handling is done by virtualbox-libre-modules.
+===> Use virtualbox-libre-source package if you don't use our stock linux-libre package.
 EOF
     fi
 }