Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

1 files changed, 165 insertions, 119 deletions

diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index 1ac873d98..1983a2cd3 100644..100755
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -1,35 +1,118 @@
 # $Id$
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
+# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 # Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar>
 # Maintainer (Parabola): Jorge López <jorginho@lavabit.com>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+
 pkgbase=virtualbox-libre
 pkgname=('virtualbox-libre'
-         'virtualbox-libre-parabola-additions'
          'virtualbox-libre-sdk'
-         'virtualbox-libre-source'
-         'virtualbox-libre-parabola-source')
-pkgver=4.1.20
-pkgrel=2
+         'virtualbox-libre-host-source'
+         'virtualbox-libre-guest-utils'
+         'virtualbox-libre-guest-source')
+pkgver=4.2.0
+pkgrel=4.1
 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' 'jdk7-openjdk' 'gsoap' 'vde2')
-#'xorg-server-devel' 'xf86driproto' 'libxcomposite')
+makedepends=('alsa-lib'
+             'bin86'
+             'cdrkit-libre'
+             'curl'
+             'dev86'
+             'gsoap'
+             'iasl'
+             'jdk7-openjdk'
+             'libidl2'
+             'libpulse'
+             'libstdc++5'
+             'libvncserver'
+             'libxcursor'
+             'libxinerama'
+             'libxml2'
+             'libxmu'
+             'libxrandr'
+             'libxslt'
+             'libxtst'
+             'linux-libre-headers'
+             'mesa'
+             'glu'
+             'python2'
+             'qt'
+             'sdl-libre'
+             'sdl_ttf'
+             'vde2'
+             'xalan-c')
 [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc')
-source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2
-        10-vboxdrv.rules  vboxdrv-reference.patch  LocalConfig.kmk ipv6_vnc.patch
-        change_default_driver_dir.patch vboxservice.conf vboxservice.rc vboxservice.service
-        vboxweb.conf vboxweb.rc vboxweb.service os_blag_64.png os_blag.png os_dragora_64.png
-        os_dragora.png os_dynebolic.png os_gnewsense_64.png os_gnewsense.png os_gnu_64.png
-        os_gnuhurd.png os_gnulinux_64.png os_gnulinux.png os_gnu.png os_musix_64.png
-        os_musix.png os_parabola_64.png os_parabola.png os_trisquel_64.png os_trisquel.png
-        os_ututo_64.png os_ututo.png os_venenux.png libre.patch free-distros.patch)
-
-_extramodules=extramodules-3.5-LIBRE
-_kernver="$(cat /usr/lib/modules/${_extramodules}/version)" || true
+source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.tar.bz2"
+        '10-vboxdrv.rules'
+        '60-vboxguest.rules'
+        'LocalConfig.kmk'
+        'vboxservice.conf'
+        'vboxservice.rc'
+        'vboxservice.service'
+        'vboxweb.conf'
+        'vboxweb.rc'
+        'vboxweb.service'
+        'change_default_driver_dir.patch'
+        'vboxdrv-reference.patch'
+        'os_blag_64.png'
+        'os_blag.png'
+        'os_dragora_64.png'
+        'os_dragora.png'
+        'os_dynebolic.png'
+        'os_gnewsense_64.png'
+        'os_gnewsense.png'
+        'os_gnu_64.png'
+        'os_gnu.png'
+        'os_musix_64.png'
+        'os_musix.png' 
+        'os_parabola_64.png'
+        'os_parabola.png'
+        'os_trisquel_64.png'
+        'os_trisquel.png'
+        'os_ututo_64.png'
+        'os_ututo.png'
+        'os_venenux.png'
+        'libre.patch'
+        'free-distros.patch')
+md5sums=('691b4134983ce7d89b9fb683305cb647'
+         '5f85710e0b8606de967716ded7b2d351'
+         'ed1341881437455d9735875ddf455fbe'
+         '58d6e5bb4b4c1c6f3f0b3daa6aaeed03'
+         '3c08ad30b89add47d3f45121200a5360'
+         '7d9823507206de9b8528a72af2f18d74'
+         '07c5f6d86c4b7839d719c8ee0c53653b'
+         '7e9483b1069a54f181546083ac7e5469'
+         'c159d683ba1947290fc2ad2c64194150'
+         'bc9efed88e0469cd7fc460d5a5cd7b4b'
+         '97e193f050574dd272a38e5ee5ebe62b'
+         '4f1692638d6740df4c4ad9766ba4e179'
+         '8538dba8686d7449cb481c9bae9d722a'
+         '545c925b46f2ac95e5f8ae407fad101a'
+         'f6416f509c2e5460e4dc624e0a57f3c1'
+         'bbfb59dd517c020a23701b480187a355'
+         'efacfdb61918286ea9bc89866b8fd239'
+         '7c3eb09995e8bafeef414374e44ad4ce'
+         'a49ed3ab6bd0fb084de0ab3dd97ae93e'
+         '6b432b3305ed446125eef052c38355a6'
+         'a70022a468bd3e9daf01818d2d74ac3c'
+         '380eb2ab6cad3da198094585853c129c'
+         'a60bb9a98abcc3c34156f9051d00df9a'
+         '3a908ef6952bcf987e63ef2fe4e98d24'
+         '02e87c39c353634cecacf98f1707fa15'
+         '0cf41a41e7a415d404d5584e047fd450'
+         '449cde3b58390284b59c5d663de3edc9'
+         'c7951fe6888d939f3a7d0dafe477e82b'
+         '4da8eeb2ece7e475fc7a0d1003da26c6'
+         '5e4187af59726d71c5be48d0cd816c34'
+         '67cc4c8611890038eb3e4114ae899525'
+         '19109b9b69222fd16cc46579495c4606')
+
+#_extramodules=extramodules-3.5-LIBRE
+#_kernver="$(cat /usr/lib/modules/${_extramodules}/version)" || true
 
 build() {
     cd "VirtualBox-$pkgver"
@@ -51,21 +134,22 @@ build() {
     rm -v "./src/VBox/Frontends/VirtualBox/images/extension_pack_"{16px,32px,disabled{_16px,_32px},install{_16px,_32px},install_disabled{_16px,_32px},uninstall{_16px,_32px},uninstall_disabled{_16px,_32px}}.png
 
  ## Adding free distros icons
-    for i in {gnuhurd,dynebolic,venenux,{gnu{,linux},parabola,gnewsense,blag,dragora,ututo,musix,trisquel}{,_64}}; do
+    for i in {dynebolic,venenux,{gnu,parabola,gnewsense,blag,dragora,ututo,musix,trisquel}{,_64}}; do
       cp -v "$srcdir/os_${i}.png" "./src/VBox/Frontends/VirtualBox/images"
     done
 
- ## Removing non-free OS icons
-    rm -v "./src/VBox/Frontends/VirtualBox/images/os_"{{{arch,turbo}linux,debian,fedora,gentoo,linux{24,26},macosx,mandriva,{free,net,open}bsd,redhat,solaris,opensuse,oracle{,solaris},ubuntu,win{2k{3,8},7,8,vista,xp},xandros}{,_64},dos,jrockitve,l4,linux{,22,_other},netware,qnx,os2{_other,ecs,warp{3,4,45}},win{2k,31,95,98,_other,me,nt4}}.png
-
     cp "$srcdir/LocalConfig.kmk" .
 
+    # fake makeself binary to compile without nofatal
+    ln -s /bin/echo makeself
+    export PATH="$CWD:$PATH"
+
     ./configure --disable-docs \
         --enable-webservice \
         --enable-vde \
         --enable-vnc \
-        --nofatal \
-        --with-linux=/usr/src/linux-${_kernver}
+		--disable-kmods
+#        --with-linux=/usr/src/linux-${_kernver}
     source ./env.sh
     kmk all
     sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' "out/linux.$BUILD_PLATFORM_ARCH/release/bin/vboxshell.py"
@@ -76,14 +160,13 @@ build() {
 }
 
 package_virtualbox-libre() {
-    pkgdesc="Powerful x86 virtualization for enterprise as well as home use (without Oracle VM VirtualBox Extension Pack and non-free OS options support)"
-    depends=('virtualbox-libre-modules' 'libxml2' 'libxcursor' 'libxinerama' 'sdl' 'libxmu' 'curl' 'libvncserver' 'libpng')
-    optdepends=('qt: for VirtualBox GUI'
+    pkgdesc='Powerful x86 virtualization for enterprise as well as home use (with free GNU/Linux distros presets and Oracle VM VirtualBox Extension Pack support removed)'
+    depends=('virtualbox-libre-host-modules' 'libxml2' 'libxcursor' 'libxinerama' 'sdl-libre' 'libxmu' 'curl' 'libvncserver' 'libpng')
+    optdepends=('qt: VirtualBox GUI support'
                 'vde2: Virtual Distributed Ethernet support'
-                'virtualbox-libre-sdk: developer kit'
-                'virtualbox-libre-source: host kernel libre source modules for non-stock kernels'
-                'net-tools: for host-only or bridged networking')
-
+                'virtualbox-libre-sdk: Developer kit'
+                'virtualbox-libre-host-source: Host kernel libre source modules for non-stock kernels'
+                'net-tools: Host-only or bridged networking support')
     backup=('etc/vbox/vbox.cfg' 'etc/conf.d/vboxweb')
     replaces=('virtualbox' 'virtualbox-ose')
     conflicts=('virtualbox' 'virtualbox-ose')
@@ -145,7 +228,7 @@ package_virtualbox-libre() {
     echo 'INSTALL_DIR=/usr/lib/virtualbox' > "$pkgdir/etc/vbox/vbox.cfg"
 
     #udev and licence
-    install -D -m 0644 "$srcdir/VirtualBox-${pkgver}/COPYING" \
+    install -D -m 0644 "$srcdir/VirtualBox-$pkgver/COPYING" \
         "$pkgdir/usr/share/licenses/virtualbox/LICENSE"
     install -D -m 0644 "$srcdir/10-vboxdrv.rules" \
         "$pkgdir/usr/lib/udev/rules.d/10-vboxdrv.rules"
@@ -160,24 +243,8 @@ package_virtualbox-libre() {
 
 }
 
-package_virtualbox-libre-source() {
-    pkgdesc="VirtualBox kernel libre modules source"
-    depends=(dkms gcc make)
-    replaces=('virtualbox-source')
-    conflicts=('virtualbox-source')
-    provides=("virtualbox-source=$pkgver" 'virtualbox-modules')
-    optdepends=('linux-libre-headers'
-                'linux-libre-lts-headers')
-    install=virtualbox-libre-source.install
-
-    install -dm755 "$pkgdir/var/lib/dkms/vboxhost/$pkgver"
-    source "VirtualBox-$pkgver/env.sh"
-    cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
-    cp -r src "$pkgdir/var/lib/dkms/vboxhost/$pkgver/source"
-}
-
 package_virtualbox-libre-sdk() {
-    pkgdesc="VirtualBox Software Developer Kit (SDK)"
+    pkgdesc='VirtualBox Software Developer Kit (SDK)'
     depends=('python2')
     replaces=('virtualbox-sdk')
     conflicts=('virtualbox-sdk')
@@ -191,99 +258,78 @@ package_virtualbox-libre-sdk() {
     install -D -m 0755 vboxshell.py "$pkgdir/usr/lib/virtualbox/vboxshell.py"
     #python sdk
     pushd sdk/installer
-    VBOX_INSTALL_PATH="/usr/lib/virtualbox" python2 vboxapisetup.py install --root "${pkgdir}"
+    VBOX_INSTALL_PATH="/usr/lib/virtualbox" python2 vboxapisetup.py install --root "$pkgdir"
     popd
     rm -rf sdk/installer
     mv sdk "$pkgdir/usr/lib/virtualbox"
 }
 
-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-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
+package_virtualbox-libre-host-source() {
+    pkgdesc='VirtualBox Host kernel libre modules source (DKMS)'
+    depends=('dkms' 'gcc' 'make')
+    provides=("virtualbox-host-source=$pkgver" 'virtualbox-libre-host-modules')
+    replaces=('virtualbox-host-source' 'virtualbox-source' 'virtualbox-libre-source')
+    conflicts=('virtualbox-host-source' 'virtualbox-source' 'virtualbox-libre-source')
+    optdepends=('linux-libre-headers'
+                'linux-libre-lts-headers')
+    install=virtualbox-libre-host-source.install
 
+    install -dm755 "$pkgdir/usr/src"
     source "VirtualBox-$pkgver/env.sh"
+    cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
+    cp -r src "$pkgdir/usr/src/vboxhost-$pkgver"
+}
+
+package_virtualbox-libre-guest-source() {
+    pkgdesc='VirtualBox Guest kernel libre modules source (DKMS)'
+    depends=('dkms' 'gcc' 'make')
+    provides=("virtualbox-guest-source=$pkgver" 'virtualbox-libre-guest-modules')
+    replaces=('virtualbox-guest-source' 'virtualbox-archlinux-source' 'virtualbox-parabola-source')
+    conflicts=('virtualbox-guest-source' 'virtualbox-archlinux-source' 'virtualbox-parabola-source')
+    optdepends=('linux-libre-headers'
+                'linux-libre-lts-headers')
+    install=virtualbox-libre-guest-source.install
 
+    install -dm755 "$pkgdir/usr/src"
+    source "VirtualBox-$pkgver/env.sh"
     cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
+    cp -r src "$pkgdir/usr/src/vboxguest-$pkgver"
+}
+
+package_virtualbox-libre-guest-utils(){
+    pkgdesc='VirtualBox Guest userspace utilities'
+    depends=('virtualbox-libre-guest-modules' 'gcc-libs' 'libxmu' 'xorg-xrandr' 'libxfixes')
+    optdepends=('virtualbox-guest-source: Guest kernel libre source modules for non-stock kernels')
+    provides=("virtualbox-guest-utils=$pkgver")
+    replaces=('virtualbox-guest-utils' 'virtualbox-archlinux-additions' 'virtualbox-parabola-additions' 'virtualbox-guest-additions' 'virtualbox-libre-guest-additions')
+    conflicts=('virtualbox-guest-utils' 'virtualbox-archlinux-additions' 'virtualbox-parabola-additions' 'virtualbox-guest-additions' 'virtualbox-libre-guest-additions')
+    backup=('etc/conf.d/vboxservice')
+    install=virtualbox-libre-guest-utils.install
 
+    source "VirtualBox-$pkgver/env.sh"
+    pushd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
     install -d "$pkgdir"/{usr/bin,sbin}
     install -m755 VBoxClient VBoxControl VBoxService "$pkgdir/usr/bin"
     install -m755 mount.vboxsf "$pkgdir/sbin"
-
     install -m755 -D "$srcdir"/VirtualBox-$pkgver/src/VBox/Additions/x11/Installer/98vboxadd-xclient \
         "$pkgdir"/usr/bin/VBoxClient-all
     install -m755 -D "$srcdir"/VirtualBox-$pkgver/src/VBox/Additions/x11/Installer/vboxclient.desktop \
         "$pkgdir"/etc/xdg/autostart/vboxclient.desktop
-    install -D vboxvideo_drv_112.so \
+    install -D vboxvideo_drv_113.so \
         "$pkgdir/usr/lib/xorg/modules/drivers/vboxvideo.so"
     install -d "$pkgdir/usr/lib/xorg/modules/dri"
     install -m755 VBoxOGL*.so "$pkgdir/usr/lib"
     ln -s /usr/lib/VBoxOGL.so "$pkgdir/usr/lib/xorg/modules/dri/vboxvideo_dri.so"
     install -m755 -D pam_vbox.so "$pkgdir/usr/lib/security/pam_vbox.so"
-
+    popd
+    # install udev rules
+    install -D -m 0644 60-vboxguest.rules \
+        "$pkgdir/usr/lib/udev/rules.d/60-vboxguest.rules"
     # install rc.d script
-    install -D -m755 "$srcdir/vboxservice.rc" "$pkgdir/etc/rc.d/vboxservice"
-
+    install -D -m755 vboxservice.rc "$pkgdir/etc/rc.d/vboxservice"
     # install sample config
-    install -D -m644 "$srcdir/vboxservice.conf" "$pkgdir/etc/conf.d/vboxservice"
-
+    install -D -m644 vboxservice.conf "$pkgdir/etc/conf.d/vboxservice"
     # install systemd service file
-    install -D -m644 "$srcdir/vboxservice.service" \
+    install -D -m644 vboxservice.service \
         "$pkgdir/usr/lib/systemd/system/vboxservice.service"
 }
-
-package_virtualbox-libre-parabola-source() {
-    pkgdesc='VirtualBox Additions kernel libre modules source'
-    depends=(dkms gcc make)
-    replaces=('virtualbox-archlinux-source')
-    conflicts=('virtualbox-archlinux-source')
-    provides=("virtualbox-archlinux-source=${pkgver}" 'virtualbox-archlinux-modules')
-    optdepends=('linux-libre-headers'
-                'linux-libre-lts-headers')
-    install=virtualbox-libre-parabola-source.install
-
-    install -dm755 "$pkgdir/var/lib/dkms/vboxguest/$pkgver"
-    source "VirtualBox-$pkgver/env.sh"
-    cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
-    cp -r src "$pkgdir/var/lib/dkms/vboxguest/$pkgver/source"
-}
-
-md5sums=('5784c6dda8a9d53f8f21b2d41eba903c'
-         '5f85710e0b8606de967716ded7b2d351'
-         'bf5d1eeeec20a042e8af34cd61a9e11b'
-         '58d6e5bb4b4c1c6f3f0b3daa6aaeed03'
-         '4ff559f2bea335d59c4012048983ca91'
-         '97e193f050574dd272a38e5ee5ebe62b'
-         '3c08ad30b89add47d3f45121200a5360'
-         '7d9823507206de9b8528a72af2f18d74'
-         '07c5f6d86c4b7839d719c8ee0c53653b'
-         '7e9483b1069a54f181546083ac7e5469'
-         'c159d683ba1947290fc2ad2c64194150'
-         'bc9efed88e0469cd7fc460d5a5cd7b4b'
-         '8538dba8686d7449cb481c9bae9d722a'
-         '545c925b46f2ac95e5f8ae407fad101a'
-         'f6416f509c2e5460e4dc624e0a57f3c1'
-         'bbfb59dd517c020a23701b480187a355'
-         'efacfdb61918286ea9bc89866b8fd239'
-         '7c3eb09995e8bafeef414374e44ad4ce'
-         'a49ed3ab6bd0fb084de0ab3dd97ae93e'
-         '6b432b3305ed446125eef052c38355a6'
-         'a70022a468bd3e9daf01818d2d74ac3c'
-         '6b432b3305ed446125eef052c38355a6'
-         'a70022a468bd3e9daf01818d2d74ac3c'
-         'a70022a468bd3e9daf01818d2d74ac3c'
-         '380eb2ab6cad3da198094585853c129c'
-         'a60bb9a98abcc3c34156f9051d00df9a'
-         '3a908ef6952bcf987e63ef2fe4e98d24'
-         '02e87c39c353634cecacf98f1707fa15'
-         '0cf41a41e7a415d404d5584e047fd450'
-         '449cde3b58390284b59c5d663de3edc9'
-         'c7951fe6888d939f3a7d0dafe477e82b'
-         '4da8eeb2ece7e475fc7a0d1003da26c6'
-         '5e4187af59726d71c5be48d0cd816c34'
-         'a9e4724b56ddf99bb2e9a8fab8ad43ba'
-         '1e47d90affabfbf6dbb07d9d42742d6a')