16 files changed, 93 insertions, 114 deletions
diff --git a/libre/virtualbox/10-vboxdrv.rules b/libre/virtualbox-libre/10-vboxdrv.rules
index a6cfe0a05..37403ae2f 100644
--- a/libre/virtualbox/10-vboxdrv.rules
+++ b/libre/virtualbox-libre/10-vboxdrv.rules
@@ -3,4 +3,3 @@ SUBSYSTEM=="usb_device", ACTION=="add", RUN="/usr/share/virtualbox/VBoxCreateUSB
 SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers"
 SUBSYSTEM=="usb_device", ACTION=="remove", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
 SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
-
diff --git a/libre/virtualbox/18-system-xorg.patch b/libre/virtualbox-libre/18-system-xorg.patch
index baca4bc5b..baca4bc5b 100644
--- a/libre/virtualbox/18-system-xorg.patch
+++ b/libre/virtualbox-libre/18-system-xorg.patch
diff --git a/libre/virtualbox/60-vboxguest.rules b/libre/virtualbox-libre/60-vboxguest.rules
index d64575709..d64575709 100644
--- a/libre/virtualbox/60-vboxguest.rules
+++ b/libre/virtualbox-libre/60-vboxguest.rules
diff --git a/libre/virtualbox/LocalConfig.kmk b/libre/virtualbox-libre/LocalConfig.kmk
index 97123a296..e5cbcebcd 100644
--- a/libre/virtualbox/LocalConfig.kmk
+++ b/libre/virtualbox-libre/LocalConfig.kmk
@@ -17,4 +17,3 @@ VBOX_BLD_PYTHON = python2
 VBOX_JAVA_HOME = /usr/lib/jvm/java-6-openjdk
 VBOX_GCC_WERR =
 VBOX_GCC_WARN =
-
diff --git a/libre/virtualbox/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index bfd784c0d..45b870e64 100644
--- a/libre/virtualbox/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -7,29 +7,27 @@
 # * Package with --pkg "virtualbox-parabola-additions virtualbox-parabola-modules"
 # Based on 
 #Maintainer: Ionut Biru <ibiru@archlinux.org>
-pkgbase=virtualbox
-pkgname=('virtualbox' 'virtualbox-parabola-additions' 'virtualbox-parabola-modules' 'virtualbox-sdk')
+pkgbase=virtualbox-libre
+pkgname=('virtualbox-libre' 'virtualbox-parabola-additions' 'virtualbox-sdk' 'virtualbox-source')
 pkgver=4.1.4
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
 makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libxcursor' 'qt' 'libidl2' 'sdl_ttf' 'alsa-lib' 'libpulse' 'libxtst'
-'xalan-c' 'sdl' 'libxmu' 'curl' 'python2' 'linux-libre-headers' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'openjdk6' 'gsoap' 'vde2'
-'xorg-server-devel' 'xf86driproto' 'libxcomposite' 'pkgconfig')
+'xalan-c' 'sdl' 'libxmu' 'curl' 'python2' 'linux-libre-headers' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'openjdk6' 'gsoap' 'vde2')
 [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc')
 source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2
         virtualbox-4-makeself-check.patch virtualbox-4-mkisofs-check.patch
-        10-vboxdrv.rules 60-vboxguest.rules vboxdrv-reference.patch LocalConfig.kmk vboxbuild
+        10-vboxdrv.rules  vboxdrv-reference.patch LocalConfig.kmk vboxbuild
         change_default_driver_dir.patch vbox-service.conf vbox-service.rc)
-_kernver=3.0-LIBRE
-options=(!distcc)
+
+_extramodules=extramodules-3.1-LIBRE
+_kernver="$(cat /lib/modules/${_extramodules}/version)"
 
 build() {
     cd "$srcdir/VirtualBox-${pkgver}_OSE"
 
-    patch -Np1 -i "$srcdir/virtualbox-4-makeself-check.patch"
-    patch -Np1 -i "$srcdir/virtualbox-4-mkisofs-check.patch"
     patch -Np1 -i "$srcdir/vboxdrv-reference.patch"
     patch -Np1 -i "$srcdir/change_default_driver_dir.patch"
 
@@ -38,22 +36,24 @@ build() {
     ./configure --disable-docs \
         --enable-webservice \
         --enable-vde \
+        --enable-vnc \
+        --nofatal \
         --with-linux=/usr/src/linux-${_kernver}
     source ./env.sh
     kmk all
-
-    export KERN_DIR=/usr/src/linux-${_kernver}
-    make -C "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src"
-    make -C "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src/vboxvideo"
     sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' "out/linux.$BUILD_PLATFORM_ARCH/release/bin/vboxshell.py"
 }
 
-package_virtualbox() {
+package_virtualbox-libre() {
     pkgdesc="Powerful x86 virtualization for enterprise as well as home use"
-    depends=('libxml2' 'libxcursor' 'libidl2' 'libxinerama' 'sdl' 'libxmu' 'curl' 'libvncserver' 'libpng' 'linux-libre-headers' 'gcc' 'make')
+    depends=('virtualbox-modules' 'libxml2' 'libxcursor' 'libidl2' 'libxinerama' 'sdl' 'libxmu' 'curl' 'libvncserver' 'libpng')
     optdepends=('qt: for VirtualBox GUI'
                 'vde2: Virtual Distributed Ethernet support'
-                'virtualbox-sdk: developer kit')
+                'virtualbox-sdk: developer kit'
+                'virtualbox-source: host kernel source modules for non-stock kernels')
+    replaces=('virtualbox')
+    conflicts=('virtualbox')
+    provides=("virtualbox=$pkgver")
 
     replaces=('virtualbox-ose')
     conflicts=('virtualbox-ose')
@@ -113,6 +113,17 @@ package_virtualbox() {
         "$pkgdir/usr/share/licenses/virtualbox/LICENSE"
     install -D -m 0644 "$srcdir/10-vboxdrv.rules" \
         "$pkgdir/lib/udev/rules.d/10-vboxdrv.rules"
+}
+
+package_virtualbox-source() {
+    pkgdesc="VirtualBox kernel modules source"
+    depends=(linux-libre-headers gcc make)
+    install=virtualbox-source.install
+
+    source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh"
+    mkdir -p $pkgdir/usr/lib/virtualbox
+
+    cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
 
     #sources for modules
     cp -r src ${pkgdir}/usr/lib/virtualbox
@@ -121,7 +132,7 @@ package_virtualbox() {
 }
 
 package_virtualbox-sdk() {
-    pkgdesc=" VirtualBox Software Developer Kit (SDK)"
+    pkgdesc="VirtualBox Software Developer Kit (SDK)"
     depends=('python2')
 
     mkdir -p "$pkgdir/usr/lib/virtualbox"
@@ -170,43 +181,23 @@ package_virtualbox-parabola-additions(){
     # install sample config
     install -D -m644 "${srcdir}/vbox-service.conf" "${pkgdir}/etc/conf.d/vbox-service"
 }
-
-package_virtualbox-parabola-modules(){
-    pkgdesc="Additions only for Parabola guests (kernel modules)"
-    license=('GPL')
-    install=virtualbox-parabola-modules.install
-    depends=('linux-libre>=3.0' 'linux-libre<3.1')
-    replaces=('virtualbox-guest-modules' 'virtualbox-archlinux-modules')
-    conflicts=('virtualbox-guest-modules' 'virtualbox-archlinux-modules')
-    provides=("virtualbox-archlinux-modules=${pkgver}")
-
-    source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh"
-
-    cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src"
-
-    install -D -m644 vboxguest.ko \
-        "$pkgdir/lib/modules/$_kernver/misc/vboxguest.ko"
-
-    install -D -m644 vboxsf.ko \
-        "$pkgdir/lib/modules/$_kernver/misc/vboxsf.ko"
-
-    install -D -m644 vboxvideo.ko \
-        "$pkgdir/lib/modules/$_kernver/misc/vboxvideo.ko"
-
-    install -D -m 0644 "$srcdir/60-vboxguest.rules" \
-        "$pkgdir/lib/udev/rules.d/60-vboxguest.rules"
-
-    sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" "$startdir/virtualbox-parabola-modules.install"
-}
+md5sums=('dc6e6801b3823332b6ca2e9915221aae'
+         'bc048d1e58d84ece4a186199ee48d4c8'
+         '5f85710e0b8606de967716ded7b2d351'
+         'cc3f278bc273011aa95277500a76f677'
+         '78ffa67ff131680f1d2b6f06d4325c5b'
+         'a82d698e7868315cdf876cfb02fd2268'
+         '97e193f050574dd272a38e5ee5ebe62b'
+         '3c08ad30b89add47d3f45121200a5360'
+         '778d865e56e31cc592fbfa257fdcfce7')
 
 md5sums=('dc6e6801b3823332b6ca2e9915221aae'
          'a9f22ccaacb207e0e1c5450fede82d06'
          'b7cbcf89a30c712fed4435dea28d1703'
-         'cee0c968c923760181ae060eab1c2e58'
-         '13ff08388a54fd48cc04523380f26af6'
-         '47349d711ecb5fbc105a18f9f936953b'
-         '0d91f80ce6a4985db8d2f8f65a61458e'
-         '47d6ee4f673bf31babbb7b4edb61e547'
-         '6df8eb5173c4f84faedb4962c4d5f0ef'
-         'b978dfdbff377e00ddecb24cb3218ed2'
-         '2460dedb8bdce85f9d7e075742e94d24')
+         '5f85710e0b8606de967716ded7b2d351'
+         'cc3f278bc273011aa95277500a76f677'
+         '78ffa67ff131680f1d2b6f06d4325c5b'
+         'a82d698e7868315cdf876cfb02fd2268'
+         '97e193f050574dd272a38e5ee5ebe62b'
+         '3c08ad30b89add47d3f45121200a5360'
+         '778d865e56e31cc592fbfa257fdcfce7')
diff --git a/libre/virtualbox/change_default_driver_dir.patch b/libre/virtualbox-libre/change_default_driver_dir.patch
index f6dc7e1a0..d8531499d 100644
--- a/libre/virtualbox/change_default_driver_dir.patch
+++ b/libre/virtualbox-libre/change_default_driver_dir.patch
@@ -16,4 +16,3 @@ diff -Nur VirtualBox-4.1.0_OSE.orig/src/VBox/Additions/common/crOpenGL/fakedri_d
  
  #ifdef DEBUG_DRI_CALLS
   #define SWDRI_SHOWNAME(pext, func) \
-
diff --git a/libre/virtualbox/vbox-service.conf b/libre/virtualbox-libre/vbox-service.conf
index 31262af37..9d4ec629f 100644
--- a/libre/virtualbox/vbox-service.conf
+++ b/libre/virtualbox-libre/vbox-service.conf
@@ -1,3 +1,2 @@
 # VBoxService -h
 VBOX_SERVICE_OPTION=""
-
diff --git a/libre/virtualbox/vbox-service.rc b/libre/virtualbox-libre/vbox-service.rc
index 381e3d751..c1af2134d 100644
--- a/libre/virtualbox/vbox-service.rc
+++ b/libre/virtualbox-libre/vbox-service.rc
@@ -37,4 +37,3 @@ esac
 exit 0
 
 # vim:set ts=2 sw=2 ft=sh et:
-
diff --git a/libre/virtualbox/vboxbuild b/libre/virtualbox-libre/vboxbuild
index 66f5812ab..cfc3c0a66 100644
--- a/libre/virtualbox/vboxbuild
+++ b/libre/virtualbox-libre/vboxbuild
@@ -29,7 +29,7 @@ if (( ${#MODLIST[*]} )); then
   modprobe -ar "${MODLIST[@]}" && stat_done || stat_fail
 fi
 
-for kdir in /lib/modules/*; do
+for kdir in /lib/modules/[2-3]*; do
   if [[ ! -d $kdir/kernel ]]; then
     # found a stale kernel
     mods=("$kdir/misc/vbox"{drv,netadp,netflt,pci}.ko*)
@@ -76,4 +76,3 @@ if (( ${#MODLIST[*]} )); then
   modprobe -a "${MODLIST[@]}" && stat_done || stat_fail
 fi
 
-
diff --git a/libre/virtualbox/vboxdrv-reference.patch b/libre/virtualbox-libre/vboxdrv-reference.patch
index 14e26d114..c310dbc8d 100644
--- a/libre/virtualbox/vboxdrv-reference.patch
+++ b/libre/virtualbox-libre/vboxdrv-reference.patch
@@ -43,4 +43,3 @@ diff -Nur VirtualBox-4.1.0_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox-
  
           and if that is not successful, try to re-install the package.
  
-
diff --git a/libre/virtualbox/virtualbox-4-makeself-check.patch b/libre/virtualbox-libre/virtualbox-4-makeself-check.patch
index 57862b41e..57862b41e 100644
--- a/libre/virtualbox/virtualbox-4-makeself-check.patch
+++ b/libre/virtualbox-libre/virtualbox-4-makeself-check.patch
diff --git a/libre/virtualbox/virtualbox-4-mkisofs-check.patch b/libre/virtualbox-libre/virtualbox-4-mkisofs-check.patch
index d43962148..d43962148 100644
--- a/libre/virtualbox/virtualbox-4-mkisofs-check.patch
+++ b/libre/virtualbox-libre/virtualbox-4-mkisofs-check.patch
diff --git a/libre/virtualbox/virtualbox-parabola-modules.install b/libre/virtualbox-libre/virtualbox-parabola-modules.install
index 75d28784a..75d28784a 100644
--- a/libre/virtualbox/virtualbox-parabola-modules.install
+++ b/libre/virtualbox-libre/virtualbox-parabola-modules.install
diff --git a/libre/virtualbox-libre/virtualbox-source.install b/libre/virtualbox-libre/virtualbox-source.install
new file mode 100644
index 000000000..14537f23d
--- /dev/null
+++ b/libre/virtualbox-libre/virtualbox-source.install
@@ -0,0 +1,13 @@
+post_install() {
+/bin/cat << EOF
+===> To compile the modules do /usr/bin/vboxbuild
+EOF
+
+}
+
+post_upgrade() {
+/bin/cat << EOF
+===> To recompile the modules do /usr/bin/vboxbuild
+EOF
+}
+
diff --git a/libre/virtualbox-libre/virtualbox.install b/libre/virtualbox-libre/virtualbox.install
new file mode 100644
index 000000000..b2d2e8858
--- /dev/null
+++ b/libre/virtualbox-libre/virtualbox.install
@@ -0,0 +1,34 @@
+utils() {
+    if [ -x usr/bin/update-mime-database ]; then
+        update-mime-database usr/share/mime > /dev/null 2>&1
+    fi
+
+    if [ -x usr/bin/xdg-icon-resource ]; then
+        xdg-icon-resource forceupdate --theme hicolor > /dev/null 2>&1
+    fi
+
+    if [ -x usr/bin/update-desktop-database ]; then
+        usr/bin/update-desktop-database -q
+    fi
+}
+
+post_install() {
+    getent group vboxusers >> /dev/null || usr/sbin/groupadd -g 108 vboxusers
+    utils
+}
+
+post_upgrade() {
+    getent group vboxusers >> /dev/null || usr/sbin/groupadd -g 108 vboxusers
+    utils
+    if [ "$(vercmp $2 4.1.4-3)" -lt 0 ]; then
+/bin/cat << EOF
+===> Starting with virtualbox version 4.1.4-3, kernel modules handling is done by virtualbox-modules.
+===> Use virtualbox-source package if you don't use our stock linux package.
+EOF
+    fi
+}
+
+post_remove() {
+    groupdel vboxusers >/dev/null 2>&1 || true
+    utils
+}
diff --git a/libre/virtualbox/virtualbox.install b/libre/virtualbox/virtualbox.install
deleted file mode 100644
index 238b0561f..000000000
--- a/libre/virtualbox/virtualbox.install
+++ /dev/null
@@ -1,52 +0,0 @@
-utils() {
-    if [ -x usr/bin/update-mime-database ]; then
-        update-mime-database usr/share/mime > /dev/null 2>&1
-    fi
-
-    if [ -x usr/bin/xdg-icon-resource ]; then
-        xdg-icon-resource forceupdate --theme hicolor > /dev/null 2>&1
-    fi
-
-    if [ -x usr/bin/update-desktop-database ]; then
-        usr/bin/update-desktop-database -q
-    fi
-}
-
-post_install() {
-    getent group vboxusers >> /dev/null || usr/sbin/groupadd -g 108 vboxusers
-    /bin/cat << EOF
-
-===> In order to run VirtualBox, you have to  be in the 'vboxusers' group.
-===>
-===> If you want to be able to install guest additions, you have to install
-===> 'virtualbox-additions' package.
-===>
-===> You must load vboxdrv module before starting VirtualBox:
-===> # modprobe vboxdrv
-===>
-===> For networking you must load vboxnetflt or vboxnetadp.
-===>
-===> For PCI passthrough support load vboxpci module.
-===>
-===> To load it automatically, add vboxdrv module
-===> to the MODULES array in /etc/rc.conf.
-
-*** To compile the modules do /usr/bin/vboxbuild ***
-
-EOF
-  utils
-}
-
-post_upgrade() {
-    getent group vboxusers >> /dev/null || usr/sbin/groupadd -g 108 vboxusers
-    /bin/cat << EOF
-*** To recompile the modules do /usr/bin/vboxbuild ***
-EOF
-   utils
-}
-
-post_remove() {
-    groupdel vboxusers >/dev/null 2>&1 || true
-    utils
-}
-