Tue Feb 7 23:15:14 UTC 2012

6 files changed, 74 insertions, 66 deletions

diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index 45b870e64..edf35ff62 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 56698 2011-10-10 18:23:45Z ibiru $
+# $Id: PKGBUILD 63763 2012-02-05 12:13:00Z ibiru $
 # Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
 # Changes:
 # * Adapt to linux-libre
@@ -9,20 +9,28 @@
 #Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgbase=virtualbox-libre
 pkgname=('virtualbox-libre' 'virtualbox-parabola-additions' 'virtualbox-sdk' 'virtualbox-source')
-pkgver=4.1.4
-pkgrel=3
+pkgver=4.1.8
+pkgrel=2
 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')
 [[ $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  vboxdrv-reference.patch LocalConfig.kmk vboxbuild
         change_default_driver_dir.patch vbox-service.conf vbox-service.rc)
+md5sums=('2092bba46baa62fab5520d67dee2ece8'
+         '5f85710e0b8606de967716ded7b2d351'
+         '6ab2455c391d8cc005e2f4461ae26a3b'
+         '78ffa67ff131680f1d2b6f06d4325c5b'
+         '67688bff176d3c6fac5664dc282fea52'
+         '97e193f050574dd272a38e5ee5ebe62b'
+         '3c08ad30b89add47d3f45121200a5360'
+         'e7416331d0bc331f3b5aae3e5d104642')
 
-_extramodules=extramodules-3.1-LIBRE
+_extramodules=extramodules-3.2-LIBRE
 _kernver="$(cat /lib/modules/${_extramodules}/version)"
 
 build() {
@@ -46,17 +54,16 @@ build() {
 
 package_virtualbox-libre() {
     pkgdesc="Powerful x86 virtualization for enterprise as well as home use"
-    depends=('virtualbox-modules' 'libxml2' 'libxcursor' 'libidl2' 'libxinerama' 'sdl' 'libxmu' 'curl' 'libvncserver' 'libpng')
+    depends=('virtualbox-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')
-    replaces=('virtualbox')
-    conflicts=('virtualbox')
-    provides=("virtualbox=$pkgver")
 
-    replaces=('virtualbox-ose')
-    conflicts=('virtualbox-ose')
+    backup=('etc/vbox/vbox.cfg')
+    replaces=('virtualbox' 'virtualbox-ose')
+    conflicts=('virtualbox' 'virtualbox-ose')
+    provides=("virtualbox=$pkgver")
     install=virtualbox.install
 
     source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh"
@@ -117,7 +124,9 @@ package_virtualbox-libre() {
 
 package_virtualbox-source() {
     pkgdesc="VirtualBox kernel modules source"
-    depends=(linux-libre-headers gcc make)
+    depends=(gcc make)
+    provides=(virtualbox-modules)
+    optdepends=('linux-libre-headers')
     install=virtualbox-source.install
 
     source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh"
@@ -151,7 +160,7 @@ package_virtualbox-sdk() {
 
 package_virtualbox-parabola-additions(){
     pkgdesc="Additions only for Parabola guests (userspace tools)"
-    depends=("virtualbox-parabola-modules=$pkgver" 'gcc-libs' 'libxmu' 'xorg-xrandr')
+    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')
     provides=("virtualbox-archlinux-additions=${pkgver}")
@@ -181,23 +190,3 @@ package_virtualbox-parabola-additions(){
     # install sample config
     install -D -m644 "${srcdir}/vbox-service.conf" "${pkgdir}/etc/conf.d/vbox-service"
 }
-md5sums=('dc6e6801b3823332b6ca2e9915221aae'
-         'bc048d1e58d84ece4a186199ee48d4c8'
-         '5f85710e0b8606de967716ded7b2d351'
-         'cc3f278bc273011aa95277500a76f677'
-         '78ffa67ff131680f1d2b6f06d4325c5b'
-         'a82d698e7868315cdf876cfb02fd2268'
-         '97e193f050574dd272a38e5ee5ebe62b'
-         '3c08ad30b89add47d3f45121200a5360'
-         '778d865e56e31cc592fbfa257fdcfce7')
-
-md5sums=('dc6e6801b3823332b6ca2e9915221aae'
-         'a9f22ccaacb207e0e1c5450fede82d06'
-         'b7cbcf89a30c712fed4435dea28d1703'
-         '5f85710e0b8606de967716ded7b2d351'
-         'cc3f278bc273011aa95277500a76f677'
-         '78ffa67ff131680f1d2b6f06d4325c5b'
-         'a82d698e7868315cdf876cfb02fd2268'
-         '97e193f050574dd272a38e5ee5ebe62b'
-         '3c08ad30b89add47d3f45121200a5360'
-         '778d865e56e31cc592fbfa257fdcfce7')
diff --git a/libre/virtualbox-libre/vbox-service.rc b/libre/virtualbox-libre/vbox-service.rc
index c1af2134d..6f1b8d892 100644
--- a/libre/virtualbox-libre/vbox-service.rc
+++ b/libre/virtualbox-libre/vbox-service.rc
@@ -11,13 +11,13 @@ case "$1" in
   start)
     stat_busy "Starting $name service"
     [[ -z "$PID" ]] && ${name} $VBOX_SERVICE_OPTION &>/dev/null \
-    && { add_daemon $name; stat_done; } \
+    && { add_daemon vbox-service; stat_done; } \
     || { stat_fail; exit 1; }
     ;;
   stop)
     stat_busy "Stopping $name service"
     [[ -n "$PID" ]] && kill $PID &>/dev/null \
-    && { rm_daemon $name; stat_done; } \
+    && { rm_daemon vbox-service; stat_done; } \
     || { stat_fail; exit 1; }
     ;;
   restart)
diff --git a/libre/virtualbox-libre/vboxbuild b/libre/virtualbox-libre/vboxbuild
index cfc3c0a66..e6fb94edd 100644
--- a/libre/virtualbox-libre/vboxbuild
+++ b/libre/virtualbox-libre/vboxbuild
@@ -32,11 +32,11 @@ fi
 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*)
+    mods=("$kdir/extramodules"{drv,netadp,netflt,pci}.ko*)
     if (( ${#mods[@]} )); then
       stat_busy "Removing all old VirtualBox kernel modules"
       if rm -f "${mods[@]}" &&
-          rmdir -p --ignore-fail-on-non-empty "$p/misc/" 2>/dev/null; then
+          rmdir -p --ignore-fail-on-non-empty "$kdir/extramodules" 2>/dev/null; then
         stat_done
       else
         stat_fail
@@ -52,6 +52,7 @@ fi
 
 for kernver; do
   export KERN_DIR=/lib/modules/$kernver/build
+  export MODULE_DIR=/lib/modules/$kernver/extramodules
   if [[ ! -d $KERN_DIR ]]; then
     printf "error: \`%s' does not appear to be a valid kernel build directory.\n" \
         "$KERN_DIR"
@@ -59,15 +60,22 @@ for kernver; do
   fi
 
   stat_busy "Recompiling VirtualBox kernel modules ($kernver)"
-    for build in BUILDVBOX{DRV,NETFLT,NETADP,PCI}; do
+    if ! $BUILDVBOXDRV \
+      --save-module-symvers /tmp/vboxdrv-Module.symvers \
+      --no-print-directory install >> $LOG 2>&1; then
+      echo  "Look at $LOG to find out what went wrong"
+      stat_fail
+    fi
+    for build in BUILDVBOX{NETFLT,NETADP,PCI}; do
       if ! ${!build} \
-        --save-module-symvers /tmp/vboxdrv-Module.symvers \
+        --use-module-symvers /tmp/vboxdrv-Module.symvers \
         --no-print-directory install >> $LOG 2>&1; then
         echo  "Look at $LOG to find out what went wrong"
         stat_fail
-        continue
       fi
     done
+    gzip -f9 "$MODULE_DIR"/*.ko
+    depmod "$kernver"
   stat_done
 done
 
diff --git a/libre/virtualbox-libre/vboxdrv-reference.patch b/libre/virtualbox-libre/vboxdrv-reference.patch
index c310dbc8d..710e2e511 100644
--- a/libre/virtualbox-libre/vboxdrv-reference.patch
+++ b/libre/virtualbox-libre/vboxdrv-reference.patch
@@ -1,45 +1,57 @@
-diff -Nur VirtualBox-4.1.0_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.1.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp
---- VirtualBox-4.1.0_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp	2011-07-19 15:11:37.730121727 +0000
-+++ VirtualBox-4.1.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp	2011-07-19 19:02:15.658471139 +0000
-@@ -75,9 +75,8 @@
+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 "
    "there is a permission problem with /dev/vboxdrv. Please reinstall the kernel "
    "module by executing<br/><br/>"
 -  "  <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
--  "as root. Users of Ubuntu, Fedora or Mandriva should install the DKMS "
--  "package first. This package keeps track of Linux kernel changes and "
-+  "  <font color=blue>'/usr/bin/vboxbuild'</font><br/><br/>"
-+  "as root. This package keeps track of Linux kernel changes and"
-   "recompiles the vboxdrv kernel module if necessary."
+-  "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 ."
    );
  
-@@ -92,7 +91,7 @@
+ QString g_QStrHintOtherWrongDriverVersion = QApplication::tr(
+@@ -90,11 +89,8 @@
+ 
+ QString g_QStrHintLinuxWrongDriverVersion = QApplication::tr(
    "The VirtualBox kernel modules do not match this version of "
-   "VirtualBox. The installation of VirtualBox was apparently not "
-   "successful. Executing<br/><br/>"
+-  "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/> "
 +  "  <font color=blue>'/usr/bin/vboxbuild'</font><br/><br/>"
-   "may correct this. Make sure that you do not mix the "
-   "OSE version and the PUEL version of VirtualBox."
    );
-diff -Nur VirtualBox-4.1.0_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox-4.1.0_OSE/src/VBox/Installer/linux/VBox.sh
---- VirtualBox-4.1.0_OSE.orig/src/VBox/Installer/linux/VBox.sh	2011-07-19 15:11:37.603453927 +0000
-+++ VirtualBox-4.1.0_OSE/src/VBox/Installer/linux/VBox.sh	2011-07-19 19:02:15.658471139 +0000
-@@ -34,7 +34,7 @@
+ 
+ QString g_QStrHintOtherNoDriver = QApplication::tr(
+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 @@
+     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
-          load. Please recompile the kernel module and install it by
+-         load. Please recompile the kernel module and install it by
++         load. Please reinstall the kernel module virtualbox-modules or
++         if you don't use our stock kernel compile the modules with
  
 -           sudo /etc/init.d/vboxdrv setup
 +           sudo /usr/bin/vboxbuild
  
           You will not be able to start VMs until this problem is fixed.
  EOF
-@@ -42,7 +42,7 @@
+ elif [ ! -c /dev/vboxdrv ]; then
      cat << EOF
- WARNING: The character device /dev/vboxdrv does not exist. Try
+-WARNING: The character device /dev/vboxdrv does not exist. Try
++WARNING: The character device /dev/vboxdrv does not exist. Try to load the module
  
 -           sudo /etc/init.d/vboxdrv restart
-+           sudo /usr/bin/vboxbuild
++           sudo modprobe vboxdrv
  
           and if that is not successful, try to re-install the package.
  
diff --git a/libre/virtualbox-libre/virtualbox-source.install b/libre/virtualbox-libre/virtualbox-source.install
index 14537f23d..24d90b1c2 100644
--- a/libre/virtualbox-libre/virtualbox-source.install
+++ b/libre/virtualbox-libre/virtualbox-source.install
@@ -10,4 +10,3 @@ post_upgrade() {
 ===> To recompile the modules do /usr/bin/vboxbuild
 EOF
 }
-
diff --git a/libre/virtualbox-libre/virtualbox.install b/libre/virtualbox-libre/virtualbox.install
index b2d2e8858..29646e973 100644
--- a/libre/virtualbox-libre/virtualbox.install
+++ b/libre/virtualbox-libre/virtualbox.install
@@ -20,10 +20,10 @@ post_install() {
 post_upgrade() {
     getent group vboxusers >> /dev/null || usr/sbin/groupadd -g 108 vboxusers
     utils
-    if [ "$(vercmp $2 4.1.4-3)" -lt 0 ]; then
+    if [ "$(vercmp $2 4.1.6-1)" -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.
+===> 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-libre package.
 EOF
     fi
 }