From 92cd621b6ad777ec539ec8b9f595388db812231bd838f1f2b1231f89c784d05e Mon Sep 17 00:00:00 2001
From: Michal Seben <mseben@gmail.com>
Date: Wed, 7 Nov 2012 18:43:50 +0000
Subject: [PATCH] Accepting request 140582 from
 home:mseben:branches:Virtualization

update to vbox 4.2.4

OBS-URL: https://build.opensuse.org/request/show/140582
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=108
---
 VirtualBox-4.2.2-patched.tar.bz2 |  3 ---
 VirtualBox-4.2.4-patched.tar.bz2 |  3 +++
 vbox-drop-fa-IR-translation.diff | 24 ------------------
 vbox-vboxdrv-init-script.diff    | 43 +++++++++++++++-----------------
 virtualbox-4.2.2-UserManual.pdf  |  3 ---
 virtualbox-4.2.4-UserManual.pdf  |  3 +++
 virtualbox.changes               | 15 +++++++++++
 virtualbox.spec                  |  7 ++----
 8 files changed, 43 insertions(+), 58 deletions(-)
 delete mode 100644 VirtualBox-4.2.2-patched.tar.bz2
 create mode 100644 VirtualBox-4.2.4-patched.tar.bz2
 delete mode 100644 vbox-drop-fa-IR-translation.diff
 delete mode 100644 virtualbox-4.2.2-UserManual.pdf
 create mode 100644 virtualbox-4.2.4-UserManual.pdf

diff --git a/VirtualBox-4.2.2-patched.tar.bz2 b/VirtualBox-4.2.2-patched.tar.bz2
deleted file mode 100644
index cea9335..0000000
--- a/VirtualBox-4.2.2-patched.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7e8740771b7da85989856ba94f9b4f353bbf5b1deba35a4960e961cbffb55429
-size 47999573
diff --git a/VirtualBox-4.2.4-patched.tar.bz2 b/VirtualBox-4.2.4-patched.tar.bz2
new file mode 100644
index 0000000..f53162d
--- /dev/null
+++ b/VirtualBox-4.2.4-patched.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7f8ff0bee5eabc24d5da2ae79870cf808f881d74358bf5996bbdcd78e8095165
+size 48104957
diff --git a/vbox-drop-fa-IR-translation.diff b/vbox-drop-fa-IR-translation.diff
deleted file mode 100644
index 7840d1d..0000000
--- a/vbox-drop-fa-IR-translation.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: VirtualBox-4.2.2/src/VBox/Frontends/VirtualBox/VBoxUI.pro
-===================================================================
---- VirtualBox-4.2.2.orig/src/VBox/Frontends/VirtualBox/VBoxUI.pro
-+++ VirtualBox-4.2.2/src/VBox/Frontends/VirtualBox/VBoxUI.pro
-@@ -63,7 +63,6 @@ TRANSLATIONS = \
- 	nls/VirtualBox_es.ts \
- 	nls/VirtualBox_eu.ts \
- 	nls/VirtualBox_fi.ts \
--	nls/VirtualBox_fa_IR.ts \
- 	nls/VirtualBox_fr.ts \
- 	nls/VirtualBox_gl_ES.ts \
- 	nls/VirtualBox_hu.ts \
-Index: VirtualBox-4.2.2/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk
-===================================================================
---- VirtualBox-4.2.2.orig/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk
-+++ VirtualBox-4.2.2/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk
-@@ -23,7 +23,6 @@ VBOX_APPROVED_GUI_LANGUAGES := \
- 	de    \
- 	en    \
- 	es    \
--	fa_IR \
- 	hu    \
- 	it    \
- 	ja    \
diff --git a/vbox-vboxdrv-init-script.diff b/vbox-vboxdrv-init-script.diff
index d59974c..b7da4c1 100644
--- a/vbox-vboxdrv-init-script.diff
+++ b/vbox-vboxdrv-init-script.diff
@@ -2,9 +2,7 @@ Index: src/VBox/Installer/linux/vboxdrv.sh.in
 ===================================================================
 --- src/VBox/Installer/linux/vboxdrv.sh.in.orig
 +++ src/VBox/Installer/linux/vboxdrv.sh.in
-@@ -17,15 +17,16 @@
- # chkconfig: 35 20 80
- # description: VirtualBox Linux kernel module
+@@ -19,11 +19,12 @@
  #
  ### BEGIN INIT INFO
  # Provides:       vboxdrv
@@ -15,16 +13,13 @@ Index: src/VBox/Installer/linux/vboxdrv.sh.in
 +# Required-Stop:  $syslog $remote_fs
 +# Default-Start:  2 3 5
  # Default-Stop:   0 1 6
- # Short-Description: VirtualBox Linux kernel module
+-# Short-Description: VirtualBox Linux kernel module
++# Short-Description: VirtualBox Linux module
 +# Description: VirtualBox Linux kernel module
  ### END INIT INFO
  
  PATH=/sbin:/bin:/usr/sbin:/usr/bin:$PATH
- DEVICE=/dev/vboxdrv
- LOG="/var/log/vbox-install.log"
-@@ -191,17 +192,10 @@ start()
-             rmmod vboxdrv 2>/dev/null
-             failure "Cannot create device $DEVICE with major $MAJOR and minor $MINOR"
+@@ -193,13 +194,6 @@ start()
          fi
      fi
      # ensure permissions
@@ -38,18 +33,17 @@ Index: src/VBox/Installer/linux/vboxdrv.sh.in
      if ! $MODPROBE vboxnetflt > /dev/null 2>&1; then
          failure "modprobe vboxnetflt failed. Please use 'dmesg' to find out why"
      fi
-     if ! $MODPROBE vboxnetadp > /dev/null 2>&1; then
-         failure "modprobe vboxnetadp failed. Please use 'dmesg' to find out why"
-@@ -295,66 +289,12 @@ stop_vms()
- }
- 
+@@ -297,70 +291,8 @@ stop_vms()
  # setup_script
  setup()
  {
 -    stop
--    begin_msg "Uninstalling old VirtualBox DKMS kernel modules"
--    $DODKMS uninstall vboxhost vboxdrv vboxnetflt vboxnetadp > $LOG
--    succ_msg
+-    DKMS=`which dkms 2>/dev/null`
+-    if [ -n "$DKMS" ]; then
+-      begin_msg "Uninstalling old VirtualBox DKMS kernel modules"
+-      $DODKMS uninstall vboxhost vboxdrv vboxnetflt vboxnetadp > $LOG
+-      succ_msg
+-    fi
 -    if find /lib/modules/`uname -r` -name "vboxpci\.*" 2>/dev/null|grep -q vboxpci; then
 -        begin_msg "Removing old VirtualBox pci kernel module"
 -        find /lib/modules/`uname -r` -name "vboxpci\.*" 2>/dev/null|xargs rm -f 2>/dev/null
@@ -70,9 +64,14 @@ Index: src/VBox/Installer/linux/vboxdrv.sh.in
 -        find /lib/modules/`uname -r` -name "vboxdrv\.*" 2>/dev/null|xargs rm -f 2>/dev/null
 -        succ_msg
 -    fi
--    begin_msg "Trying to register the VirtualBox kernel modules using DKMS"
--    if ! $DODKMS install vboxhost $VERSION >> $LOG; then
--      fail_msg "Failed, trying without DKMS"
+-    if [ -n "$DKMS" ]; then
+-      begin_msg "Trying to register the VirtualBox kernel modules using DKMS"
+-      if ! $DODKMS install vboxhost $VERSION >> $LOG; then
+-        fail_msg "Failed, trying without DKMS"
+-        DKMS=""
+-      fi
+-    fi
+-    if [ -z "$DKMS" ]; then
 -      begin_msg "Recompiling VirtualBox kernel modules"
 -      if ! $BUILDINTMP \
 -          --save-module-symvers /tmp/vboxdrv-Module.symvers \
@@ -100,11 +99,9 @@ Index: src/VBox/Installer/linux/vboxdrv.sh.in
 -      fi
 -    fi
 -    rm -f /etc/vbox/module_not_compiled
-+    begin_msg "Recompiling VirtualBox vboxadd kernel module, NOT. It has been packaged."
++    begin_msg "Recompiling VirtualBox kernel module, NOT. It has been packaged."
      succ_msg
 -    start
  }
  
  dmnstatus()
- {
-     if running vboxdrv; then
diff --git a/virtualbox-4.2.2-UserManual.pdf b/virtualbox-4.2.2-UserManual.pdf
deleted file mode 100644
index 34127fb..0000000
--- a/virtualbox-4.2.2-UserManual.pdf
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5a88e9023c15c3d85fc2426ad49cda1234bbf867378ac5a1319eb2d738d96a8c
-size 5611827
diff --git a/virtualbox-4.2.4-UserManual.pdf b/virtualbox-4.2.4-UserManual.pdf
new file mode 100644
index 0000000..339706d
--- /dev/null
+++ b/virtualbox-4.2.4-UserManual.pdf
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e38bcaba4ce8e1825732bb2fa4cc77f6808090ff76030ed9cce8dd39961ccd2e
+size 5612899
diff --git a/virtualbox.changes b/virtualbox.changes
index 2d880b2..91aeb16 100644
--- a/virtualbox.changes
+++ b/virtualbox.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Sat Nov  3 08:16:40 UTC 2012 - mseben@gmail.com
+
+- updated to virtualbox 4.2.4
+* GUI: fixed validation warning on global settings / proxy page (4.2.2 regression, bug #11089)
+* GUI: fixed crash with multiple guest screens on certain conditions (OS X hosts only)
+* VBoxBalloonCtrl: fixed command line argument handling of ballooning module
+* VRDP: fixed occasional crash during a video playback in the guest (bug #11082)
+* BIOS: fixed broken DMI information (4.2 regression)
+* BIOS: workaround for booting from Windows 2000 floppy disks
+* EFI: fixed video mode selection loss on VM reboot (#10983)
+* Parallel: fixed parallel port printing failure/ paper queue empty error (Windows hosts only)
+* NAT: fixed crash on alias-less DNS responses when host-resolver is used
+* Storage: fixed hang under rare circumstances 
+
 -------------------------------------------------------------------
 Sun Oct 21 16:03:10 UTC 2012 - mseben@gmail.com
 
diff --git a/virtualbox.spec b/virtualbox.spec
index c5fff9e..a8ca77a 100644
--- a/virtualbox.spec
+++ b/virtualbox.spec
@@ -82,7 +82,7 @@ BuildRequires:  xorg-x11-libXt-devel-32bit
 %endif
 #
 ExclusiveArch:  %ix86 x86_64
-Version:        4.2.2
+Version:        4.2.4
 Release:        0
 Summary:        VirtualBox is an Emulator
 License:        GPL-2.0+
@@ -122,8 +122,6 @@ Patch4:         vbox-ret-in-nonvoid-fnc.diff
 Patch6:         vbox-smc-napa.diff
 #fix build of Python and dev package on openSUSE 11.3
 Patch8:         vbox-python-detection.diff
-#fix build, fa_IR translation was removed
-Patch9:         vbox-drop-fa-IR-translation.diff
 #PATCH-FIX-OPENSUSE implement messagebox (VBoxPermissionMessage app), which is displayed, when user
 #try to start VirtualBox and is not memeber of vboxusers group
 Patch99:        vbox-permissions_warning.diff
@@ -251,7 +249,6 @@ Development file for %{name}
 %patch4 -p1
 %patch6 -p1
 %patch8 -p1
-%patch9 -p1
 %patch99 -p1
 %patch100 
 %patch101
@@ -302,7 +299,7 @@ source ./env.sh
 #  	VBOX_PATH_PACKAGE_DOCS set propper path for link to pdf in .desktop file
 # 	VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= just disable some functionality in gui
 echo "build basic parts"
-/usr/bin/kmk  %{?_smp_mfalgs} VBOX_JAVA_HOME=/etc/alternatives/java_sdk_openjdk/ VBOX_GCC_WERR= KBUILD_VERBOSE=2 VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= TOOL_YASM_AS=yasm VBOX_PATH_PACKAGE_DOCS=/usr/share/doc/packages/virtualbox all
+/usr/bin/kmk %{?_smp_mfalgs} VBOX_JAVA_HOME=/etc/alternatives/java_sdk_openjdk/ VBOX_GCC_WERR= KBUILD_VERBOSE=2 VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= TOOL_YASM_AS=yasm VBOX_PATH_PACKAGE_DOCS=/usr/share/doc/packages/virtualbox all
 #
 # build kernel modules for guest and host (check novel-kmp package as example)
 # host  modules : vboxdrv,vboxnetflt,vboxnetadp