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

Conflicts:
	libre/luxrays-libre/PKGBUILD

1 files changed, 123 insertions, 45 deletions

diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index 942aa5d1c..c3aa1a69c 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -1,18 +1,17 @@
 # $Id$
 # Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar>
 # Maintainer (Parabola): Jorge López <jorginho@lavabit.com>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
-# Changes:
-# * Adapt to linux-libre
-# * virtualbox-{archlinux,parabola}-*
-# * Removed unfree user manual
-# * Package with --pkg "virtualbox-parabola-additions virtualbox-parabola-modules"
-# Based on 
-#Maintainer: Ionut Biru <ibiru@archlinux.org>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> 
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgbase=virtualbox-libre
-pkgname=('virtualbox-libre' 'virtualbox-parabola-additions' 'virtualbox-sdk' 'virtualbox-source')
+pkgname=('virtualbox-libre'
+         'virtualbox-libre-parabola-additions'
+         'virtualbox-libre-sdk'
+         'virtualbox-libre-source'
+         'virtualbox-libre-parabola-source')
 pkgver=4.1.18
-pkgrel=2
+pkgrel=4.2
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -21,11 +20,16 @@ makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libxcursor
 #'xorg-server-devel' 'xf86driproto' 'libxcomposite')
 [[ $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 vboxbuild
-        change_default_driver_dir.patch vbox-service.conf vbox-service.rc
-        vboxweb.conf vboxweb.rc)
-
-_extramodules=extramodules-3.4-LIBRE
+        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
 
 build() {
@@ -33,6 +37,29 @@ build() {
 
     patch -Np1 -i "$srcdir/vboxdrv-reference.patch"
     patch -Np1 -i "$srcdir/change_default_driver_dir.patch"
+    patch -Np1 -i "$srcdir/libre.patch"
+    patch -Np1 -i "$srcdir/free-distros.patch"
+    # FS#30401
+    patch -Np2 -i "$srcdir/ipv6_vnc.patch"
+
+ ## Removing Nonfree directories
+    rm -rv "./include/VBox/ExtPack"
+    rm -rv "./src/VBox/ExtPacks"
+    rm -rv "./src/VBox/Main/src-helper-apps"
+
+ ## Removing Oracle VM VirtualBox Extension Pack icons
+    rm -v "./src/VBox/Resources/darwin/virtualbox-vbox-extpack.icns"
+    rm -v "./src/VBox/Resources/other/virtualbox-vbox-extpack-"{16px,20px,24px,32px,40px,48px,64px,72px,80px,96px,128px,256px,512px}.png
+    rm -v "./src/VBox/Resources/win/OSE/virtualbox-vbox-extpack.ico"
+    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
+      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" .
 
@@ -48,24 +75,24 @@ build() {
 }
 
 package_virtualbox-libre() {
-    pkgdesc="Powerful x86 virtualization for enterprise as well as home use"
-    depends=('virtualbox-modules' 'libxml2' 'libxcursor' 'libxinerama' 'sdl' 'libxmu' 'curl' 'libvncserver' 'libpng')
+    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'
                 'vde2: Virtual Distributed Ethernet support'
-                'virtualbox-sdk: developer kit'
-                'virtualbox-source: host kernel source modules for non-stock kernels'
+                'virtualbox-libre-sdk: developer kit'
+                'virtualbox-libre-source: host kernel source modules for non-stock kernels'
                 'net-tools: for host-only or bridged networking')
 
     backup=('etc/vbox/vbox.cfg')
     replaces=('virtualbox' 'virtualbox-ose')
     conflicts=('virtualbox' 'virtualbox-ose')
     provides=("virtualbox=$pkgver")
-    install=virtualbox.install
+    install=virtualbox-libre.install
 
     source "$srcdir/VirtualBox-${pkgver}/env.sh"
 
     cd "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
-    mkdir -p "$pkgdir"/usr/{bin,lib/virtualbox/components,lib/virtualbox/ExtensionPacks,share/virtualbox/nls}
+    install -dm755 "$pkgdir"/usr/{bin,lib/virtualbox/components,share/virtualbox/nls}
 
 
     #Binaries and Wrapper with Launchers
@@ -86,7 +113,7 @@ package_virtualbox-libre() {
     #setuid root binaries
     install -m 4755 VBoxSDL VirtualBox VBoxHeadless VBoxNetDHCP VBoxNetAdpCtl -t "$pkgdir/usr/lib/virtualbox"
     #other binaries
-    install -m 0755 VBoxManage VBoxSVC VBoxExtPackHelperApp VBoxXPCOMIPCD VBoxTestOGL VBoxBalloonCtrl vboxwebsrv webtest -t "$pkgdir/usr/lib/virtualbox"
+    install -m 0755 VBoxManage VBoxSVC VBoxXPCOMIPCD VBoxTestOGL VBoxBalloonCtrl vboxwebsrv webtest -t "$pkgdir/usr/lib/virtualbox"
 
     #language
     install -m 0755 nls/*.qm -t "$pkgdir/usr/share/virtualbox/nls"
@@ -120,35 +147,38 @@ package_virtualbox-libre() {
 
     # install rc.d script
     install -D -m755 "$srcdir/vboxweb.rc" "$pkgdir/etc/rc.d/vboxweb"
+    # install systemd service
+    install -D -m644 "$srcdir/vboxweb.service" \
+        "$pkgdir/usr/lib/systemd/system/vboxweb.service"
     # install sample config
     install -D -m644 "$srcdir/vboxweb.conf" "$pkgdir/etc/conf.d/vboxweb"
 
 }
 
-package_virtualbox-source() {
+package_virtualbox-libre-source() {
     pkgdesc="VirtualBox kernel modules source"
-    depends=(gcc make)
-    provides=(virtualbox-modules)
+    depends=(dkms gcc make)
+    replaces=('virtualbox-source')
+    conflicts=('virtualbox-source')
+    provides=("virtualbox-source=$pkgver" "virtualbox-modules=$pkgver")
     optdepends=('linux-libre-headers'
                 'linux-libre-lts-headers')
-    install=virtualbox-source.install
+    install=virtualbox-libre-source.install
 
+    install -dm755 "$pkgdir/var/lib/dkms/vboxhost/$pkgver"
     source "$srcdir/VirtualBox-${pkgver}/env.sh"
-    mkdir -p $pkgdir/usr/lib/virtualbox
-
     cd "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
-
-    #sources for modules
-    cp -r src ${pkgdir}/usr/lib/virtualbox
-    #install compilation script
-    install -D -m 755 "${srcdir}/vboxbuild" "${pkgdir}/usr/bin/vboxbuild"
+    cp -r src "$pkgdir/var/lib/dkms/vboxhost/$pkgver/source"
 }
 
-package_virtualbox-sdk() {
+package_virtualbox-libre-sdk() {
     pkgdesc="VirtualBox Software Developer Kit (SDK)"
     depends=('python2')
+    replaces=('virtualbox-sdk')
+    conflicts=('virtualbox-sdk')
+    provides=("virtualbox-sdk=$pkgver")
 
-    mkdir -p "$pkgdir/usr/lib/virtualbox"
+    install -dm755 "$pkgdir/usr/lib/virtualbox"
 
     source "$srcdir/VirtualBox-${pkgver}/env.sh"
     cd "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
@@ -162,12 +192,14 @@ package_virtualbox-sdk() {
     mv sdk "$pkgdir/usr/lib/virtualbox"
 }
 
-package_virtualbox-parabola-additions(){
+package_virtualbox-libre-parabola-additions(){
     pkgdesc="Additions only for Parabola guests (userspace tools)"
-    depends=("virtualbox-parabola-modules=$pkgver" 'gcc-libs' 'libxmu' 'xorg-xrandr' 'libxfixes')
-    replaces=('virtualbox-guest-additions' 'virtualbox-archlinux-additions')
-    conflicts=('virtualbox-guest-additions' 'virtualbox-archlinux-additions')
+    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
 
     source "$srcdir/VirtualBox-${pkgver}/env.sh"
 
@@ -189,18 +221,64 @@ package_virtualbox-parabola-additions(){
     install -m755 -D pam_vbox.so "$pkgdir/usr/lib/security/pam_vbox.so"
 
     # install rc.d script
-    install -D -m755 "$srcdir/vbox-service.rc" "$pkgdir/etc/rc.d/vbox-service"
+    install -D -m755 "$srcdir/vboxservice.rc" "$pkgdir/etc/rc.d/vboxservice"
 
     # install sample config
-    install -D -m644 "$srcdir/vbox-service.conf" "$pkgdir/etc/conf.d/vbox-service"
+    install -D -m644 "$srcdir/vboxservice.conf" "$pkgdir/etc/conf.d/vboxservice"
+
+    # install systemd service file
+    install -D -m644 "$srcdir/vboxservice.service" \
+        "$pkgdir/usr/lib/systemd/system/vboxservice.service"
+}
+
+package_virtualbox-libre-parabola-source() {
+    pkgdesc='VirtualBox Additions kernel modules source'
+    depends=(dkms gcc make)
+    replaces=('virtualbox-archlinux-source')
+    conflicts=('virtualbox-archlinux-source')
+    provides=("virtualbox-archlinux-source=${pkgver}" "virtualbox-archlinux-modules=${pkgver}")
+    optdepends=('linux-libre-headers'
+                'linux-libre-lts-headers')
+    install=virtualbox-libre-parabola-source.install
+
+    install -dm755 "$pkgdir/var/lib/dkms/vboxguest/$pkgver"
+    source "$srcdir/VirtualBox-${pkgver}/env.sh"
+    cd "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
+    cp -r src "$pkgdir/var/lib/dkms/vboxguest/$pkgver/source"
 }
+
 md5sums=('38db0a87cba659b484af868b0c2bd3ac'
          '5f85710e0b8606de967716ded7b2d351'
-         '755ab0dd9bcacf2c00d2275b1ca69547'
+         '2d599c6cf8bbbf183a7c07a9bcb926c7'
          'a1ff1d1b4423556887e48a32978226a6'
-         '248078ab922f27424ba9919d4aa90dcc'
+         '4ff559f2bea335d59c4012048983ca91'
          '97e193f050574dd272a38e5ee5ebe62b'
          '3c08ad30b89add47d3f45121200a5360'
-         '208cf5f842eb2e3a5b6dcfc59080d26c'
+         '7d9823507206de9b8528a72af2f18d74'
+         '07c5f6d86c4b7839d719c8ee0c53653b'
          '3ac185709bfe688bb753c46e170d0546'
-         'c159d683ba1947290fc2ad2c64194150')
+         'c159d683ba1947290fc2ad2c64194150'
+         'bc9efed88e0469cd7fc460d5a5cd7b4b'
+         '8538dba8686d7449cb481c9bae9d722a'
+         '545c925b46f2ac95e5f8ae407fad101a'
+         'f6416f509c2e5460e4dc624e0a57f3c1'
+         'bbfb59dd517c020a23701b480187a355'
+         'efacfdb61918286ea9bc89866b8fd239'
+         '7c3eb09995e8bafeef414374e44ad4ce'
+         'a49ed3ab6bd0fb084de0ab3dd97ae93e'
+         '6b432b3305ed446125eef052c38355a6'
+         'a70022a468bd3e9daf01818d2d74ac3c'
+         '6b432b3305ed446125eef052c38355a6'
+         'a70022a468bd3e9daf01818d2d74ac3c'
+         'a70022a468bd3e9daf01818d2d74ac3c'
+         '380eb2ab6cad3da198094585853c129c'
+         'a60bb9a98abcc3c34156f9051d00df9a'
+         '3a908ef6952bcf987e63ef2fe4e98d24'
+         '02e87c39c353634cecacf98f1707fa15'
+         '0cf41a41e7a415d404d5584e047fd450'
+         '449cde3b58390284b59c5d663de3edc9'
+         'c7951fe6888d939f3a7d0dafe477e82b'
+         '4da8eeb2ece7e475fc7a0d1003da26c6'
+         '5e4187af59726d71c5be48d0cd816c34'
+         'a9e4724b56ddf99bb2e9a8fab8ad43ba'
+         'f7d275fc52e5f3cfafd85646c2914063')