virtualbox-libre-4.2.0-2: updating patches

1 files changed, 207 insertions, 205 deletions

diff --git a/libre/virtualbox-libre/libre.patch b/libre/virtualbox-libre/libre.patch
index e51d0c0a7..41a34fc84 100755
--- a/libre/virtualbox-libre/libre.patch
+++ b/libre/virtualbox-libre/libre.patch
@@ -1,5 +1,5 @@
---- VirtualBox-4.1.18.orig/Config.kmk		2012-07-24 16:38:43.981310996 -0300
-+++ VirtualBox-4.1.18/Config.kmk		2012-07-24 16:38:44.001309865 -0300
+--- VirtualBox-4.2.0.orig/Config.kmk	2012-09-13 05:26:16.000000000 -0300
++++ VirtualBox-4.2.0/Config.kmk		2012-09-18 21:35:33.118487052 -0300
 @@ -56,9 +56,6 @@
  PROPS_SYSMODS_ACCUMULATE_L   += INTERMEDIATES
  PROPS_MISCBINS_ACCUMULATE_L  += INTERMEDIATES
@@ -10,7 +10,7 @@
  # Install paths
  ## @todo This will change after 4.1 is branched off!
  # What is now 'bin' and 'lib' will be moved down under 'staged/', except on
-@@ -125,9 +122,6 @@
+@@ -129,9 +126,6 @@
  endif
  
  INST_DOC              = doc/
@@ -20,7 +20,7 @@
  INST_PACKAGES         = packages/
  
  VBOX_PATH_SDK         = $(patsubst %/,%,$(PATH_STAGE)/$(INST_SDK))
-@@ -136,7 +130,6 @@
+@@ -140,7 +134,6 @@
  VBOX_PATH_ADDITIONS   = $(patsubst %/,%,$(PATH_STAGE)/$(INST_ADDITIONS))
  VBOX_PATH_ADDITIONS_ISO = $(patsubst %/,%,$(PATH_STAGE)/$(INST_ADDITIONS_ISO))
  VBOX_PATH_ADDITIONS_LIB = $(patsubst %/,%,$(PATH_STAGE)/$(INST_ADDITIONS_LIB))
@@ -28,7 +28,7 @@
  VBOX_PATH_PACKAGES    = $(patsubst %/,%,$(PATH_STAGE)/$(INST_PACKAGES))
  
  
-@@ -208,7 +201,6 @@
+@@ -215,7 +208,6 @@
   export VBOX_ADDITIONS_SH_MODE     = release
   export VBOX_DOCUMENTATION_SH_MODE = release
   export VBOX_EFI_SH_MODE           = release
@@ -36,7 +36,7 @@
  endif
  
  # Some info on the vendor
-@@ -361,8 +353,6 @@
+@@ -368,8 +360,6 @@
  VBOX_WITH_USB = 1
  # Enable the USB 1.1 controller plus virtual USB HID devices.
  VBOX_WITH_VUSB = 1
@@ -45,7 +45,7 @@
  # Enable the ISCSI feature.
  VBOX_WITH_ISCSI = 1
  # Enable INIP support in the ISCSI feature.
-@@ -430,9 +420,6 @@
+@@ -439,9 +429,6 @@
  ifdef VBOX_WITH_USB
   VBOX_WITH_VUSB = 1
  endif
@@ -55,10 +55,11 @@
  ifdef VBOX_WITH_PCI_PASSTHROUGH
   VBOX_WITH_PCI_PASSTHROUGH_IMPL = 1
  endif
-@@ -591,15 +578,6 @@
+@@ -609,17 +596,6 @@
+ endif
  ## @}
  
- 
+-
 -## @name Extension pack
 -## @{
 -# Enables the extension pack feature.
@@ -68,10 +69,11 @@
 -# Enables building+packing the Oracle VM VirtualBox Extension Pack, includes VBOX_WITH_EXTPACK_PUEL
 -VBOX_WITH_EXTPACK_PUEL_BUILD = 1
 -## @}
- 
+-
  ## @name Misc
  ## @{
-@@ -777,14 +755,6 @@
+ # Enable Seamless mode
+@@ -810,14 +786,6 @@
  # Skip stuff.
  #
  
@@ -86,7 +88,7 @@
  # VBOX_QUICK can be used by core developers to speed to the build
  ifdef VBOX_QUICK
   # undefine variables by assigning blank.
-@@ -848,7 +818,6 @@
+@@ -872,7 +840,6 @@
   VBOX_WITH_TESTSUITE=
   VBOX_WITH_QTGUI=
   VBOX_WITH_USB=
@@ -94,7 +96,7 @@
   VBOX_WITH_DOCS=
   VBOX_WITH_PDM_ASYNC_COMPLETION=
   VBOX_WITH_KCHMVIEWER=
-@@ -870,7 +839,6 @@
+@@ -894,7 +861,6 @@
   VBOX_WITH_CROGL=
   VBOX_WITH_DEBUGGER=
   VBOX_WITH_DOCS=
@@ -102,7 +104,7 @@
   VBOX_WITH_HARDENING=
   VBOX_WITH_HEADLESS=
   VBOX_WITH_HGCM=
-@@ -952,9 +920,6 @@
+@@ -985,9 +951,6 @@
  #
  ifdef VBOX_OSE
   VBOX_WITH_VRDP=
@@ -112,7 +114,7 @@
   VBOX_WITH_PCI_PASSTHROUGH_IMPL=
   VBOX_WITH_OS2_ADDITIONS_BIN=
   VBOX_WITH_SECURELABEL=
-@@ -1082,10 +1047,6 @@
+@@ -1118,10 +1081,6 @@
   VBOX_WITH_KCHMVIEWER=
  endif
  
@@ -123,17 +125,17 @@
  #
  # Mark OSE builds clearly, helps figuring out limitations more easily.
  #
-@@ -1679,9 +1640,6 @@
- # biossums (set BIOS checksums)
- VBOX_BIOSSUMS  ?= $(PATH_OBJ)/biossums/biossums$(HOSTSUFF_EXE)
+@@ -1744,9 +1703,6 @@
+ # bin2c (convert binary files into C arrays)
+ VBOX_BIN2C      ?= $(PATH_OBJ)/bin2c/bin2c$(HOSTSUFF_EXE)
  
 -# RTManifest (extension pack manifest utility)
 -VBOX_RTMANIFEST ?= $(PATH_OBJ)/bldRTManifest/bldRTManifest$(HOSTSUFF_EXE)
 -
- # filesplitter (splits java files)
- VBOX_FILESPLIT ?= $(PATH_OBJ)/filesplitter/filesplitter$(HOSTSUFF_EXE)
+ # VBoxCmp (simple /bin/cmp with more sensible output)
+ VBOX_VBOXCMP    ?= $(PATH_OBJ)/VBoxCmp/VBoxCmp$(HOSTSUFF_EXE)
  
-@@ -2461,13 +2419,6 @@
+@@ -2638,13 +2594,6 @@
   SDK_VBOX_OPENSSL2_LIBS = $(NO_SUCH_VARIABLE)
  endif
  
@@ -147,11 +149,10 @@
  SDK_VBOX_BLD_OPENSSL      = .
  SDK_VBOX_BLD_OPENSSL_EXTENDS = VBOX_OPENSSL
  SDK_VBOX_BLD_OPENSSL_LIBS ?= \
-@@ -3817,100 +3768,6 @@
- endif
+@@ -4100,99 +4049,6 @@
  TEMPLATE_VBOXMAINCLIENTDLL_LDFLAGS.darwin = $(filter-out -bind_at_load,$(TEMPLATE_VBOXMAINCLIENTEXE_LDFLAGS.darwin))
  
--
+ 
 -
 -#
 -# Templates used for building the extension packs.
@@ -248,9 +249,9 @@
  #
  # Qt 4
  # Qt 4
---- VirtualBox-4.1.18.orig/Makefile.kmk		2012-07-24 17:16:47.078929150 -0300
-+++ VirtualBox-4.1.18/Makefile.kmk		2012-07-24 17:16:47.125592981 -0300
-@@ -446,7 +446,6 @@
+--- VirtualBox-4.2.0.orig/Makefile.kmk	2012-08-29 11:13:46.000000000 -0300
++++ VirtualBox-4.2.0/Makefile.kmk	2012-09-18 23:43:54.750454776 -0300
+@@ -378,7 +378,6 @@
  	include/VBox \
  	include/VBox/vmm \
  	include/VBox/com \
@@ -258,12 +259,10 @@
  	include/VBox/HostServices \
  	include/VBox/GuestHost \
  	include/VBox/HGSMI \
-@@ -862,191 +861,6 @@
- 	additions-build-linux.x86.combined \
- 	additions-packing
+@@ -990,200 +989,6 @@
  
--
--#
+ 
+ #
 -# Build the extension packs, all of them.
 -#
 -# This is tailored (hardcoded) for the extension pack build box.
@@ -325,16 +324,18 @@
 -ifeq ($(KBUILD_TARGET),win)
 -	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
 -else
--	$(call MSG_L1,Building Windows/amd64 extension packs)
--	$(VBOX_KMK_TIME) ssh vbox@192.168.27.6 " echo $@ && cd e:/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
+-	$(call VBOX_BLD_VM_MSG_BEGIN,Windows/amd64 extension packs)
+-	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_WIN_AMD64_IP) " echo $@ && cd e:/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
+-	$(call VBOX_BLD_VM_MSG_END__,Windows/amd64 extension packs)
 -endif
 -
 -extpacks-build-win.x86:
 -ifeq ($(KBUILD_TARGET),win)
 -	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
 -else
--	$(call MSG_L1,Building Windows/x86 extension packs)
--	$(VBOX_KMK_TIME) ssh vbox@192.168.27.16 " echo $@ && cd e:/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_EXTPACKS_BUILD.x86) all"
+-	$(call VBOX_BLD_VM_MSG_BEGIN,Windows/x86 extension packs)
+-	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_WIN_X86_IP) " echo $@ && cd e:/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_EXTPACKS_BUILD.x86) all"
+-	$(call VBOX_BLD_VM_MSG_END__,Windows/x86 extension packs)
 -endif
 -
 -ifeq ($(KBUILD_TARGET),solaris)
@@ -347,17 +348,19 @@
 -else
 -# Serialize 32-bit and 64-bit ASSUMING the same VM builds both.
 -extpacks-build-solaris.rsync-into-vm: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
--	$(VBOX_KMK_TIME) $(call VBOX_RSYNC_IN_FN,solaris,*) . 192.168.27.4:/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)
+-	$(VBOX_KMK_TIME) $(call VBOX_RSYNC_IN_FN,solaris,*) . $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)
 -
 -extpacks-build-solaris.build-it: extpacks-build-solaris.rsync-into-vm
--	$(call MSG_L1,Building Solaris/amd64 extension packs)
--	$(VBOX_KMK_TIME) ssh vbox@192.168.27.4 " echo $@/amd64 && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
--	$(call MSG_L1,Building Solaris/x86 extension packs)
--	$(VBOX_KMK_TIME) ssh vbox@192.168.27.4 " echo $@/x86   && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all"
+-	$(call VBOX_BLD_VM_MSG_BEGIN,Solaris/amd64 extension packs)
+-	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_SOLARIS_IP) " echo $@/amd64 && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
+-	$(call VBOX_BLD_VM_MSG_END__,Solaris/amd64 extension packs)
+-	$(call VBOX_BLD_VM_MSG_BEGIN,Solaris/x86 extension packs)
+-	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_SOLARIS_IP) " echo $@/x86   && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all"
+-	$(call VBOX_BLD_VM_MSG_END__,Solaris/x86 extension packs)
 -
 -extpacks-build-solaris.rsync-out-of-vm: extpacks-build-solaris.build-it
--	$(VBOX_KMK_TIME) rsync -a --delete 192.168.27.4:/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/solaris.x86 out/
--	$(VBOX_KMK_TIME) rsync -a --delete 192.168.27.4:/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/solaris.amd64 out/
+-	$(VBOX_KMK_TIME) rsync -a --delete $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/solaris.x86 out/
+-	$(VBOX_KMK_TIME) rsync -a --delete $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/solaris.amd64 out/
 -
 -.NOTPARALLEL: extpacks-build-solaris.rsync-out-of-vm extpacks-build-solaris.rsync-into-vm
 -.PHONY:       extpacks-build-solaris.rsync-out-of-vm extpacks-build-solaris.rsync-into-vm extpacks-build-solaris.build-it
@@ -370,59 +373,65 @@
 -#ifeq ($(KBUILD_TARGET),os2)
 -#	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
 -#else
--#	$(VBOX_KMK_TIME) ssh vbox@192.168.27.3 " cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) "
+-#	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_OS2_IP) " cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) "
 -#endif
 -
 -extpacks-build-linux.amd64:   $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
 -ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.amd64)
 -	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
 -else
--	$(call MSG_L1,Building Linux/amd64 extension packs)
--	$(VBOX_KMK_TIME) ssh vbox@192.168.27.12 " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
+-	$(call VBOX_BLD_VM_MSG_BEGIN,Linux/amd64 extension packs)
+-	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_LNX_AMD64_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
+-	$(call VBOX_BLD_VM_MSG_END__,Linux/amd64 extension packs)
 -endif
 -
 -extpacks-build-linux.x86:   $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
 -ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.x86)
 -	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
 -else
--	$(call MSG_L1,Building Linux/x86 extension packs)
--	$(VBOX_KMK_TIME) ssh vbox@192.168.27.11 " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all"
+-	$(call VBOX_BLD_VM_MSG_BEGIN,Linux/x86 extension packs)
+-	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_LNX_NEW_X86_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all"
+-	$(call VBOX_BLD_VM_MSG_END__,Linux/x86 extension packs)
 -endif
 -
 -extpacks-build-freebsd.amd64: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
 -#ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),freebsd.amd64)
 -#	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
 -#else
--#	$(call MSG_L1,Building FreeBSD/amd64 extension packs)
--#	$(VBOX_KMK_TIME) ssh vbox@192.168.27.17 " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
+-#	$(call VBOX_BLD_VM_MSG_BEGIN,FreeBSD/amd64 extension packs)
+-#	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_FBSD_AMD64_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
+-#	$(call VBOX_BLD_VM_MSG_END__,FreeBSD/amd64 extension packs)
 -#endif
 -
 -extpacks-build-freebsd.x86: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
 -#ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),freebsd.x86)
 -#	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
 -#else
--#	$(call MSG_L1,Building FreeBSD/x86 extension packs)
--#	$(VBOX_KMK_TIME) ssh vbox@192.168.27.7 " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all"
+-#	$(call VBOX_BLD_VM_MSG_BEGIN,FreeBSD/x86 extension packs)
+-#	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_FBSD_X86_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all"
+-#	$(call VBOX_BLD_VM_MSG_END__,FreeBSD/x86 extension packs)
 -#endif
 -
 -extpacks-build-darwin.amd64: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
 -ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),darwin.amd64)
 -	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
 -else
--	$(call MSG_L1,Building Darwin/amd64 extension packs)
--	$(VBOX_KMK_TIME) $(call VBOX_RSYNC_IN_FN,darwin,amd64) . 192.168.27.15:/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)
--	$(VBOX_KMK_TIME) ssh vbox@192.168.27.15 " echo $@ && cd /Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
--	$(VBOX_KMK_TIME) rsync -am -v --delete 192.168.27.15:/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/darwin.amd64 out/
+-	$(call VBOX_BLD_VM_MSG_BEGIN,Darwin/amd64 extension packs)
+-	$(VBOX_KMK_TIME) $(call VBOX_RSYNC_IN_FN,darwin,amd64) . $(VBOX_BLD_VM_DARWIN_AMD64_IP):/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)
+-	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_DARWIN_AMD64_IP) " echo $@ && cd /Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
+-	$(VBOX_KMK_TIME) rsync -am -v --delete $(VBOX_BLD_VM_DARWIN_AMD64_IP):/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/darwin.amd64 out/
+-	$(call VBOX_BLD_VM_MSG_END__,Darwin/amd64 extension packs)
 -endif
 -
 -extpacks-build-darwin.x86: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
 -ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),darwin.x86)
 -	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
 -else
--	$(call MSG_L1,Building Darwin/x86 extension packs)
--	$(VBOX_KMK_TIME) $(call VBOX_RSYNC_IN_FN,darwin,x86) . 192.168.27.5:/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)
--	$(VBOX_KMK_TIME) ssh vbox@192.168.27.5 " echo $@ && cd /Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all"
--	$(VBOX_KMK_TIME) rsync -am -v --delete 192.168.27.5:/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/darwin.x86 out/
+-	$(call VBOX_BLD_VM_MSG_BEGIN,Darwin/x86 extension packs)
+-	$(VBOX_KMK_TIME) $(call VBOX_RSYNC_IN_FN,darwin,x86) . $(VBOX_BLD_VM_DARWIN_X86_IP):/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)
+-	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_DARWIN_X86_IP) " echo $@ && cd /Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all"
+-	$(VBOX_KMK_TIME) rsync -am -v --delete $(VBOX_BLD_VM_DARWIN_X86_IP):/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/darwin.x86 out/
+-	$(call VBOX_BLD_VM_MSG_END__,Darwin/x86 extension packs)
 -endif
 -
 -
@@ -447,9 +456,10 @@
 -	extpacks-packing
 -
 -
- #
+-#
  # Build the test suite, all of it.
  #
+ # This is currently tailored (hardcoded) for the additions build box just like
 --- VirtualBox-4.1.18.orig/src/VBox/Devices/build/VBoxDD.cpp		2012-06-20 10:15:51.000000000 -0300
 +++ VirtualBox-4.1.18/src/VBox/Devices/build/VBoxDD.cpp			2012-07-24 16:18:03.964493454 -0300
 @@ -132,11 +132,6 @@
@@ -474,10 +484,10 @@
  extern const PDMDEVREG g_DeviceACPI;
  extern const PDMDEVREG g_DeviceDMA;
  extern const PDMDEVREG g_DeviceFloppyController;
---- VirtualBox-4.1.18.orig/src/VBox/Main/include/ExtPackManagerImpl.h		2012-06-20 10:17:33.000000000 -0300
-+++ /dev/null									2012-07-24 14:48:18.638572110 -0300
-@@ -1,245 +0,0 @@
--/* $Id: ExtPackManagerImpl.h $ */
+--- VirtualBox-4.2.0.orig/src/VBox/Main/include/ExtPackManagerImpl.h	2012-03-13 11:51:50.000000000 -0300
++++ /dev/null								2012-09-18 22:18:48.866734195 -0300
+@@ -1,247 +0,0 @@
+-/* $Id: ExtPackManagerImpl.h 39878 2012-01-25 16:30:07Z vboxsync $ */
 -/** @file
 - * VirtualBox Main - interface for Extension Packs, VBoxSVC & VBoxC.
 - */
@@ -533,6 +543,7 @@
 -    STDMETHOD(COMGETTER(Description))(BSTR *a_pbstrDescription);
 -    STDMETHOD(COMGETTER(Version))(BSTR *a_pbstrVersion);
 -    STDMETHOD(COMGETTER(Revision))(ULONG *a_puRevision);
+-    STDMETHOD(COMGETTER(Edition))(BSTR *a_pbstrEdition);
 -    STDMETHOD(COMGETTER(VRDEModule))(BSTR *a_pbstrVrdeModule);
 -    STDMETHOD(COMGETTER(PlugIns))(ComSafeArrayOut(IExtPackPlugIn *, a_paPlugIns));
 -    STDMETHOD(COMGETTER(Usable))(BOOL *a_pfUsable);
@@ -596,6 +607,7 @@
 -    STDMETHOD(COMGETTER(Description))(BSTR *a_pbstrDescription);
 -    STDMETHOD(COMGETTER(Version))(BSTR *a_pbstrVersion);
 -    STDMETHOD(COMGETTER(Revision))(ULONG *a_puRevision);
+-    STDMETHOD(COMGETTER(Edition))(BSTR *a_pbstrEdition);
 -    STDMETHOD(COMGETTER(VRDEModule))(BSTR *a_pbstrVrdeModule);
 -    STDMETHOD(COMGETTER(PlugIns))(ComSafeArrayOut(IExtPackPlugIn *, a_paPlugIns));
 -    STDMETHOD(COMGETTER(Usable))(BOOL *a_pfUsable);
@@ -722,10 +734,10 @@
 -
 -#endif
 -/* vi: set tabstop=4 shiftwidth=4 expandtab: */
---- VirtualBox-4.1.18.orig/src/VBox/Main/include/ExtPackUtil.h		2012-06-20 10:17:33.000000000 -0300
-+++ /dev/null								2012-07-24 14:48:18.638572110 -0300
+--- VirtualBox-4.2.0.orig/src/VBox/Main/include/ExtPackUtil.h	2012-03-13 11:51:50.000000000 -0300
++++ /dev/null							2012-09-18 22:18:48.866734195 -0300
 @@ -1,137 +0,0 @@
--/* $Id: ExtPackUtil.h $ */
+-/* $Id: ExtPackUtil.h 39878 2012-01-25 16:30:07Z vboxsync $ */
 -/** @file
 - * VirtualBox Main - Extension Pack Utilities and definitions, VBoxC, VBoxSVC, ++.
 - */
@@ -839,14 +851,14 @@
 -
 -
 -void                VBoxExtPackInitDesc(PVBOXEXTPACKDESC a_pExtPackDesc);
--RTCString   *VBoxExtPackLoadDesc(const char *a_pszDir, PVBOXEXTPACKDESC a_pExtPackDesc, PRTFSOBJINFO a_pObjInfo);
--RTCString   *VBoxExtPackLoadDescFromVfsFile(RTVFSFILE hVfsFile, PVBOXEXTPACKDESC a_pExtPackDesc, PRTFSOBJINFO a_pObjInfo);
--RTCString   *VBoxExtPackExtractNameFromTarballPath(const char *pszTarball);
+-RTCString          *VBoxExtPackLoadDesc(const char *a_pszDir, PVBOXEXTPACKDESC a_pExtPackDesc, PRTFSOBJINFO a_pObjInfo);
+-RTCString          *VBoxExtPackLoadDescFromVfsFile(RTVFSFILE hVfsFile, PVBOXEXTPACKDESC a_pExtPackDesc, PRTFSOBJINFO a_pObjInfo);
+-RTCString          *VBoxExtPackExtractNameFromTarballPath(const char *pszTarball);
 -void                VBoxExtPackFreeDesc(PVBOXEXTPACKDESC a_pExtPackDesc);
 -bool                VBoxExtPackIsValidName(const char *pszName);
 -bool                VBoxExtPackIsValidMangledName(const char *pszMangledName, size_t cchMax = RTSTR_MAX);
--RTCString   *VBoxExtPackMangleName(const char *pszName);
--RTCString   *VBoxExtPackUnmangleName(const char *pszMangledName, size_t cbMax);
+-RTCString          *VBoxExtPackMangleName(const char *pszName);
+-RTCString          *VBoxExtPackUnmangleName(const char *pszMangledName, size_t cbMax);
 -int                 VBoxExtPackCalcDir(char *pszExtPackDir, size_t cbExtPackDir, const char *pszParentDir, const char *pszName);
 -bool                VBoxExtPackIsValidVersionString(const char *pszVersion);
 -bool                VBoxExtPackIsValidEditionString(const char *pszEdition);
@@ -862,10 +874,10 @@
 -
 -#endif
 -
---- VirtualBox-4.1.18.orig/src/VBox/Main/src-all/ExtPackManagerImpl.cpp		2012-06-20 10:17:34.000000000 -0300
-+++ /dev/null									2012-07-24 14:48:18.638572110 -0300
+--- VirtualBox-4.2.0.orig/src/VBox/Main/src-all/ExtPackManagerImpl.cpp	2012-04-03 04:56:24.000000000 -0300
++++ /dev/null	2012-09-18 22:18:48.866734195 -0300
 @@ -1,3126 +0,0 @@
--/* $Id: ExtPackManagerImpl.cpp $ */
+-/* $Id: ExtPackManagerImpl.cpp 40468 2012-03-14 17:07:58Z vboxsync $ */
 -/** @file
 - * VirtualBox Main - interface for Extension Packs, VBoxSVC & VBoxC.
 - */
@@ -1260,22 +1272,22 @@
 -    HRESULT hrc = autoCaller.rc();
 -    if (SUCCEEDED(hrc))
 -    {
--        /* HACK ALERT: This is for easing backporting to 4.1. The edition stuff
--           will be changed into a separate */
--        if (m->Desc.strEdition.isEmpty())
--        {
--            Bstr str(m->Desc.strVersion);
--            str.cloneTo(a_pbstrVersion);
--        }
--        else
--        {
--            RTCString strHack(m->Desc.strVersion);
--            strHack.append('-');
--            strHack.append(m->Desc.strEdition);
+-        Bstr str(m->Desc.strVersion);
+-        str.cloneTo(a_pbstrVersion);
+-    }
+-    return hrc;
+-}
 -
--            Bstr str(strHack);
--            str.cloneTo(a_pbstrVersion);
--        }
+-STDMETHODIMP ExtPackFile::COMGETTER(Edition)(BSTR *a_pbstrEdition)
+-{
+-    CheckComArgOutPointerValid(a_pbstrEdition);
+-
+-    AutoCaller autoCaller(this);
+-    HRESULT hrc = autoCaller.rc();
+-    if (SUCCEEDED(hrc))
+-    {
+-        Bstr str(m->Desc.strEdition);
+-        str.cloneTo(a_pbstrEdition);
 -    }
 -    return hrc;
 -}
@@ -2494,22 +2506,8 @@
 -    HRESULT hrc = autoCaller.rc();
 -    if (SUCCEEDED(hrc))
 -    {
--        /* HACK ALERT: This is for easing backporting to 4.1. The edition stuff
--           will be changed into a separate */
--        if (m->Desc.strEdition.isEmpty())
--        {
--            Bstr str(m->Desc.strVersion);
--            str.cloneTo(a_pbstrVersion);
--        }
--        else
--        {
--            RTCString strHack(m->Desc.strVersion);
--            strHack.append('-');
--            strHack.append(m->Desc.strEdition);
--
--            Bstr str(strHack);
--            str.cloneTo(a_pbstrVersion);
--        }
+-        Bstr str(m->Desc.strVersion);
+-        str.cloneTo(a_pbstrVersion);
 -    }
 -    return hrc;
 -}
@@ -2525,6 +2523,20 @@
 -    return hrc;
 -}
 -
+-STDMETHODIMP ExtPack::COMGETTER(Edition)(BSTR *a_pbstrEdition)
+-{
+-    CheckComArgOutPointerValid(a_pbstrEdition);
+-
+-    AutoCaller autoCaller(this);
+-    HRESULT hrc = autoCaller.rc();
+-    if (SUCCEEDED(hrc))
+-    {
+-        Bstr str(m->Desc.strEdition);
+-        str.cloneTo(a_pbstrEdition);
+-    }
+-    return hrc;
+-}
+-
 -STDMETHODIMP ExtPack::COMGETTER(VRDEModule)(BSTR *a_pbstrVrdeModule)
 -{
 -    CheckComArgOutPointerValid(a_pbstrVrdeModule);
@@ -3991,10 +4003,10 @@
 -}
 -
 -/* vi: set tabstop=4 shiftwidth=4 expandtab: */
---- VirtualBox-4.1.18.orig/src/VBox/Main/src-all/ExtPackUtil.cpp	2012-06-20 10:17:34.000000000 -0300
-+++ /dev/null								2012-07-24 14:48:18.638572110 -0300
+--- VirtualBox-4.2.0.orig/src/VBox/Main/src-all/ExtPackUtil.cpp		2012-07-18 05:57:58.000000000 -0300
++++ /dev/null								2012-09-18 22:18:48.866734195 -0300
 @@ -1,1385 +0,0 @@
--/* $Id: ExtPackUtil.cpp $ */
+-/* $Id: ExtPackUtil.cpp 41783 2012-06-16 19:24:15Z vboxsync $ */
 -/** @file
 - * VirtualBox Main - Extension Pack Utilities and definitions, VBoxC, VBoxSVC, ++.
 - */
@@ -4092,7 +4104,7 @@
 - *
 - * @returns NULL on success, pointer to an error message on failure (caller
 - *          deletes it).
-- * @param   a_pDoc              Pointer to the the XML document.
+- * @param   a_pDoc              Pointer to the XML document.
 - * @param   a_pExtPackDesc      Where to store the extension pack descriptor.
 - */
 -static RTCString *vboxExtPackLoadDescFromDoc(xml::Document *a_pDoc, PVBOXEXTPACKDESC a_pExtPackDesc)
@@ -5389,25 +5401,22 @@
  	iprt/alloca.h \
  	iprt/tcp.h \
  	iprt/localipc.h \
---- VirtualBox-4.1.18.orig/src/Makefile.kmk	2012-06-20 10:07:57.000000000 -0300
-+++ VirtualBox-4.1.18/src/Makefile.kmk		2012-07-24 22:51:10.206996034 -0300
-@@ -26,14 +26,6 @@
-  include $(PATH_SUB_CURRENT)/VBox/Makefile.kmk
+--- VirtualBox-4.2.0.orig/src/Makefile.kmk	2012-08-03 09:28:25.000000000 -0300
++++ VirtualBox-4.2.0/src/Makefile.kmk		2012-09-19 03:01:57.588337894 -0300
+@@ -23,10 +23,8 @@
+ if !defined(VBOX_ONLY_ADDITIONS)
   include $(PATH_SUB_CURRENT)/libs/Makefile.kmk
+ endif
+-if defined(VBOX_ONLY_EXTPACKS) && !defined(VBOX_ONLY_EXTPACKS_USE_IMPLIBS) && defined(VBOX_WITH_REM)
+- include $(PATH_SUB_CURRENT)/recompiler/Makefile.kmk
  
--else if defined(VBOX_ONLY_EXTPACKS)
-- include $(PATH_SUB_CURRENT)/bldprogs/Makefile.kmk
-- include $(PATH_SUB_CURRENT)/VBox/Makefile.kmk
-- include $(PATH_SUB_CURRENT)/libs/Makefile.kmk
-- ifndef VBOX_ONLY_EXTPACKS_USE_IMPLIBS
--  include $(PATH_SUB_CURRENT)/recompiler/Makefile.kmk
-- endif
--
- else if defined(VBOX_ONLY_TESTSUITE)
-  include $(PATH_SUB_CURRENT)/libs/Makefile.kmk
-  include $(PATH_SUB_CURRENT)/VBox/Makefile.kmk
---- VirtualBox-4.1.18.orig/src/VBox/Makefile.kmk	2012-07-24 21:19:55.565641784 -0300
-+++ VirtualBox-4.1.18/src/VBox/Makefile.kmk		2012-07-24 22:12:55.429156962 -0300
+-else if !defined(VBOX_ONLY_BUILD)
++if !defined(VBOX_ONLY_BUILD)
+  # Normal build.
+  if1of ($(KBUILD_TARGET_ARCH), x86 amd64)
+   ifdef VBOX_WITH_REM
+--- VirtualBox-4.2.0.orig/src/VBox/Makefile.kmk		2012-05-30 07:39:32.000000000 -0300
++++ VirtualBox-4.2.0/src/VBox/Makefile.kmk		2012-09-19 00:03:08.577726965 -0300
 @@ -33,19 +33,6 @@
   include $(PATH_SUB_CURRENT)/HostDrivers/Makefile.kmk
   include $(PATH_SUB_CURRENT)/Frontends/Makefile.kmk
@@ -5428,17 +5437,15 @@
  else ifdef VBOX_ONLY_SDK
   include $(PATH_SUB_CURRENT)/Main/Makefile.kmk
   ifdef VBOX_WITH_VRDP
-@@ -92,9 +79,6 @@
+@@ -92,7 +79,6 @@
   if1of ($(KBUILD_TARGET_ARCH), amd64 x86)
    include $(PATH_SUB_CURRENT)/NetworkServices/Makefile.kmk
   endif
-- ifndef VBOX_OSE
--  include $(PATH_SUB_CURRENT)/ExtPacks/Makefile.kmk
-- endif
+- include $(PATH_SUB_CURRENT)/ExtPacks/Makefile.kmk
   ifdef VBOX_WITH_INSTALLER
    include $(PATH_SUB_CURRENT)/Installer/Makefile.kmk 		        # Keep this last.
   endif
---- VirtualBox-4.1.18/src/libs/Makefile.kmk.orig	2012-07-24 21:23:26.938013023 -0300
+--- VirtualBox-4.1.18.orig/src/libs/Makefile.kmk	2012-07-24 21:23:26.938013023 -0300
 +++ VirtualBox-4.1.18/src/libs/Makefile.kmk		2012-07-24 21:43:42.557911752 -0300
 @@ -48,13 +48,6 @@
   include $(PATH_SUB_CURRENT)/kStuff/Makefile.kmk
@@ -5454,52 +5461,46 @@
  # libjpeg for VRDP video redirection
  if defined(VBOX_WITH_VRDP) && defined(VBOX_WITH_VRDP_VIDEO_CHANNEL)
   include $(PATH_SUB_CURRENT)/jpeg-8a/Makefile.kmk
---- VirtualBox-4.1.18.orig/src/VBox/Devices/Makefile.kmk	2012-07-24 23:06:45.916276235 -0300
-+++ VirtualBox-4.1.18/src/VBox/Devices/Makefile.kmk		2012-07-24 23:17:00.202963228 -0300
-@@ -21,9 +21,7 @@
+--- VirtualBox-4.2.0.orig/src/VBox/Devices/Makefile.kmk		2012-08-03 09:28:25.000000000 -0300
++++ VirtualBox-4.2.0/src/VBox/Devices/Makefile.kmk		2012-09-19 02:54:35.912748288 -0300
+@@ -25,9 +25,7 @@
  
  # Include sub-makefiles.
  include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk
 -if defined(VBOX_WITH_INTEL_PXE) || defined(VBOX_ONLY_EXTPACKS)
 - include $(PATH_SUB_CURRENT)/PC/PXE/Makefile.kmk
--else if defined(VBOX_WITH_PXE_ROM) && !defined(VBOX_WITHOUT_ETHERBOOT)
-+if defined(VBOX_WITH_PXE_ROM) && !defined(VBOX_WITHOUT_ETHERBOOT)
-  include $(PATH_SUB_CURRENT)/PC/Etherboot-src/Makefile.kmk
- endif
- if !defined(VBOX_ONLY_EXTPACKS)         # Goes on almost to the end of the file.
-@@ -57,9 +55,6 @@
+-else if defined(VBOX_WITH_PXE_ROM)
++if defined(VBOX_WITH_PXE_ROM)
+  if !defined(VBOX_WITHOUT_ETHERBOOT)
+   include $(PATH_SUB_CURRENT)/PC/Etherboot-src/Makefile.kmk
+  endif
+@@ -71,9 +69,6 @@
   ifdef VBOX_WITH_USB
    VBoxDDU_DEFS           += VBOX_WITH_USB IN_USBLIB
-   VBoxDDU_SDKS.win        = WINPSDK W2K3DDK
+   VBoxDDU_SDKS.win        = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
 -  if defined(VBOX_WITH_EHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
 -   VBoxDDU_DEFS          += VBOX_WITH_EHCI_IMPL
 -  endif
    ifdef VBOX_WITH_NEW_USB_CODE_ON_DARWIN
     VBoxDDU_DEFS.darwin   += VBOX_WITH_NEW_USB_CODE_ON_DARWIN
    endif
-@@ -122,9 +117,6 @@
-  VBoxDD_DEFS             = VBOX_ACPI
-  ifdef VBOX_WITH_USB
-   VBoxDD_DEFS           += VBOX_WITH_USB
+@@ -326,15 +321,7 @@
+    	Storage/UsbMsd.cpp
+   endif
+ 
 -  if defined(VBOX_WITH_EHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
 -   VBoxDD_DEFS          += VBOX_WITH_EHCI_IMPL
 -  endif
-  endif
-  ifdef VBOX_WITH_VUSB
-   VBoxDD_DEFS           += VBOX_WITH_VUSB
-@@ -446,11 +438,6 @@
-  endif
-  ifdef VBOX_WITH_USB
-   DevicesR3_DEFS        += VBOX_WITH_USB
+   VBoxDD_DEFS           += VBOX_WITH_USB
 -  if defined(VBOX_WITH_EHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
--   DevicesR3_DEFS       += VBOX_WITH_EHCI_IMPL
--   DevicesR3_SOURCES    += \
+-   VBoxDD_DEFS          += VBOX_WITH_EHCI_IMPL
+-   VBoxDD_SOURCES       += \
 - 	USB/DevEHCI.cpp
 -  endif
-  endif
-  if defined(VBOX_WITH_PCI_PASSTHROUGH_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
-   DevicesR3_DEFS        += VBOX_WITH_PCI_PASSTHROUGH_IMPL
-@@ -607,11 +594,6 @@
+ 
+  endif # VBOX_WITH_USB
+ 
+@@ -869,11 +856,6 @@
  
    ifdef VBOX_WITH_USB
     VBoxDDGC_DEFS        += VBOX_WITH_USB
@@ -5511,7 +5512,7 @@
    endif
  
    ifdef VBOX_WITH_VIDEOHWACCEL
-@@ -711,11 +693,6 @@
+@@ -1020,11 +1002,6 @@
   endif
   ifdef VBOX_WITH_USB
   VBoxDDR0_DEFS          += VBOX_WITH_USB
@@ -5523,10 +5524,10 @@
   endif
  
   if defined(VBOX_WITH_PCI_PASSTHROUGH_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
-@@ -1204,49 +1181,5 @@
- 
+@@ -1163,50 +1140,5 @@
  endif # !VBOX_ONLY_EXTPACKS
  
+ 
 -if defined(VBOX_WITH_EXTPACK_PUEL) && defined(VBOX_WITH_EXTPACK_PUEL_BUILD)
 - #
 - # The EHCI (USB 2.0) Extension Pack Modules.
@@ -5563,6 +5564,7 @@
 -  Bus/DevPciRaw.cpp_INCS   = Bus
 - endif
 -
+-
 - #
 - # The Intel PXE rom.
 - #
@@ -5571,11 +5573,11 @@
 - VBoxExtPackPuelInsRoms_SOURCES = PC/PXE/PXE-Intel.rom=>PXE-Intel.rom
 -endif # VBOX_WITH_EXTPACK_PUEL
 -
- include $(KBUILD_PATH)/subfooter.kmk
+ include $(FILE_KBUILD_SUB_FOOTER)
  
---- VirtualBox-4.1.18.orig/src/VBox/Main/Makefile.kmk	2012-07-24 23:38:25.304126039 -0300
-+++ VirtualBox-4.1.18/src/VBox/Main/Makefile.kmk		2012-07-24 23:38:25.350789964 -0300
-@@ -230,14 +230,12 @@
+--- VirtualBox-4.2.0.orig/src/VBox/Main/Makefile.kmk	2012-09-04 09:48:44.000000000 -0300
++++ VirtualBox-4.2.0/src/VBox/Main/Makefile.kmk		2012-09-19 00:46:39.251763337 -0300
+@@ -233,14 +233,12 @@
  	$(if $(VBOX_USB_WITH_SYSFS),VBOX_USB_WITH_SYSFS,) \
  	$(if $(VBOX_USB_WITH_INOTIFY),VBOX_USB_WITH_INOTIFY,) \
  	$(if $(VBOX_WITH_LIVE_MIGRATION),VBOX_WITH_LIVE_MIGRATION,) \
@@ -5590,7 +5592,7 @@
  	$(if $(VBOX_WITH_NEW_USB_CODE_ON_DARWIN),VBOX_WITH_NEW_USB_CODE_ON_DARWIN,)
  endif
  VBoxSVC_DEFS.win += VBOX_COM_OUTOFPROC_MODULE
-@@ -290,7 +288,6 @@
+@@ -293,7 +291,6 @@
  	src-all/SharedFolderImpl.cpp \
  	src-all/VirtualBoxBase.cpp \
  	src-all/VirtualBoxErrorInfoImpl.cpp \
@@ -5598,25 +5600,25 @@
  	src-server/ApplianceImpl.cpp \
  	src-server/ApplianceImplExport.cpp \
  	src-server/ApplianceImplImport.cpp \
-@@ -543,8 +540,6 @@
- 	$(if $(VBOX_WITH_HGSMI),VBOX_WITH_HGSMI,) \
- 	$(if $(VBOX_WITH_VIDEOHWACCEL),VBOX_WITH_VIDEOHWACCEL,) \
+@@ -538,8 +535,6 @@
+ 	$(if $(VBOX_WITH_DRAG_AND_DROP),VBOX_WITH_DRAG_AND_DROP,) \
+ 	$(if $(VBOX_WITH_DRAG_AND_DROP_GH),VBOX_WITH_DRAG_AND_DROP_GH,) \
  	$(if $(VBOX_WITH_USB),VBOX_WITH_USB,) \
 -	$(if-expr defined(VBOX_WITH_EHCI) && defined(VBOX_WITH_USB),VBOX_WITH_EHCI,) \
 -	$(if $(VBOX_WITH_EXTPACK),VBOX_WITH_EXTPACK,) \
- 	$(if $(VBOX_WITH_PCI_PASSTHROUGH),VBOX_WITH_PCI_PASSTHROUGH,)
+ 	$(if $(VBOX_WITH_PCI_PASSTHROUGH),VBOX_WITH_PCI_PASSTHROUGH,) \
+ 	$(if $(VBOX_WITH_VPX),VBOX_WITH_VPX,)
  
- VBoxC_DEFS.darwin.x86 = VBOX_WITH_2X_4GB_ADDR_SPACE
-@@ -602,7 +597,6 @@
+@@ -605,7 +600,6 @@
  	src-all/SharedFolderImpl.cpp \
  	src-all/VirtualBoxBase.cpp \
  	src-all/VirtualBoxErrorInfoImpl.cpp \
 -	$(if $(VBOX_WITH_EXTPACK),src-all/ExtPackManagerImpl.cpp src-all/ExtPackUtil.cpp,) \
  	$(if $(VBOX_WITH_USB_VIDEO),src-client/UsbWebcamInterface.cpp,) \
  	$(if $(VBOX_WITH_USB_CARDREADER),src-client/UsbCardReader.cpp,) \
- 	src-client/AdditionsFacilityImpl.cpp \
-@@ -711,22 +705,6 @@
- endif # !win
+ 	src-client/Nvram.cpp \
+@@ -733,22 +727,6 @@
+ 	$(if $(VBOX_BLEEDING_EDGE),VBOX_BLEEDING_EDGE=\"$(VBOX_BLEEDING_EDGE)\",)
  
  
 -#
@@ -5631,7 +5633,7 @@
 -	src-helper-apps/VBoxExtPackHelperApp.cpp \
 -	src-all/ExtPackUtil.cpp
 - VBoxExtPackHelperApp_LIBS = \
--        $(LIB_RUNTIME)
+-	$(LIB_RUNTIME)
 -endif # VBOX_WITH_EXTPACK
 -
 -
@@ -5648,27 +5650,27 @@
  	$(PATH_ROOT)/src/VBox/Resources/darwin/virtualbox-ovf.icns=>Resources/virtualbox-ovf.icns \
  	$(PATH_ROOT)/src/VBox/Resources/darwin/virtualbox-ova.icns=>Resources/virtualbox-ova.icns \
  	$(PATH_ROOT)/src/VBox/Resources/darwin/virtualbox-vdi.icns=>Resources/virtualbox-vdi.icns \
---- VirtualBox-4.1.18.orig/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc	2012-07-24 23:28:17.985011038 -0300
-+++ VirtualBox-4.1.18/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc		2012-07-24 23:28:18.051673913 -0300
-@@ -167,18 +167,6 @@
-     <file alias="status_check_32px.png">images/status_check_32px.png</file>
-     <file alias="status_error_16px.png">images/status_error_16px.png</file>
-     <file alias="status_error_32px.png">images/status_error_32px.png</file>
--    <file alias="extension_pack_16px.png">images/extension_pack_16px.png</file>
--    <file alias="extension_pack_disabled_16px.png">images/extension_pack_disabled_16px.png</file>
--    <file alias="extension_pack_32px.png">images/extension_pack_32px.png</file>
--    <file alias="extension_pack_disabled_32px.png">images/extension_pack_disabled_32px.png</file>
--    <file alias="extension_pack_install_16px.png">images/extension_pack_install_16px.png</file>
--    <file alias="extension_pack_install_disabled_16px.png">images/extension_pack_install_disabled_16px.png</file>
--    <file alias="extension_pack_install_32px.png">images/extension_pack_install_32px.png</file>
--    <file alias="extension_pack_install_disabled_32px.png">images/extension_pack_install_disabled_32px.png</file>
--    <file alias="extension_pack_uninstall_16px.png">images/extension_pack_uninstall_16px.png</file>
--    <file alias="extension_pack_uninstall_disabled_16px.png">images/extension_pack_uninstall_disabled_16px.png</file>
--    <file alias="extension_pack_uninstall_32px.png">images/extension_pack_uninstall_32px.png</file>
--    <file alias="extension_pack_uninstall_disabled_32px.png">images/extension_pack_uninstall_disabled_32px.png</file>
-     <file alias="proxy_16px.png">images/proxy_16px.png</file>
-     <file alias="proxy_disabled_16px.png">images/proxy_disabled_16px.png</file>
-     <file alias="proxy_32px.png">images/proxy_32px.png</file>
+--- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc		2012-05-30 07:39:18.000000000 -0300
++++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc		2012-09-19 00:51:25.413310527 -0300
+@@ -169,18 +169,6 @@
+         <file alias="status_check_32px.png">images/status_check_32px.png</file>
+         <file alias="status_error_16px.png">images/status_error_16px.png</file>
+         <file alias="status_error_32px.png">images/status_error_32px.png</file>
+-        <file alias="extension_pack_16px.png">images/extension_pack_16px.png</file>
+-        <file alias="extension_pack_disabled_16px.png">images/extension_pack_disabled_16px.png</file>
+-        <file alias="extension_pack_32px.png">images/extension_pack_32px.png</file>
+-        <file alias="extension_pack_disabled_32px.png">images/extension_pack_disabled_32px.png</file>
+-        <file alias="extension_pack_install_16px.png">images/extension_pack_install_16px.png</file>
+-        <file alias="extension_pack_install_disabled_16px.png">images/extension_pack_install_disabled_16px.png</file>
+-        <file alias="extension_pack_install_32px.png">images/extension_pack_install_32px.png</file>
+-        <file alias="extension_pack_install_disabled_32px.png">images/extension_pack_install_disabled_32px.png</file>
+-        <file alias="extension_pack_uninstall_16px.png">images/extension_pack_uninstall_16px.png</file>
+-        <file alias="extension_pack_uninstall_disabled_16px.png">images/extension_pack_uninstall_disabled_16px.png</file>
+-        <file alias="extension_pack_uninstall_32px.png">images/extension_pack_uninstall_32px.png</file>
+-        <file alias="extension_pack_uninstall_disabled_32px.png">images/extension_pack_uninstall_disabled_32px.png</file>
+         <file alias="proxy_16px.png">images/proxy_16px.png</file>
+         <file alias="proxy_disabled_16px.png">images/proxy_disabled_16px.png</file>
+         <file alias="proxy_32px.png">images/proxy_32px.png</file>
 --- VirtualBox-4.1.18.orig/src/VBox/Installer/linux/Makefile.kmk	2012-07-25 00:32:00.780012664 -0300
 +++ VirtualBox-4.1.18/src/VBox/Installer/linux/Makefile.kmk		2012-07-25 00:32:00.806677728 -0300
 @@ -170,11 +170,6 @@
@@ -5702,17 +5704,17 @@
  		-E 'VBOX_WITH_GUEST_CONTROL=$(if $(VBOX_WITH_GUEST_CONTROL),yes,no)' \
  		-E 'VBOX_WITH_GUEST_PROPS=$(if $(VBOX_WITH_GUEST_PROPS),yes,no)' \
  		-E 'VBOX_WITH_NETFLT=$(if $(VBOX_WITH_NETFLT),yes,no)' \
---- VirtualBox-4.1.18.orig/src/VBox/Installer/darwin/Makefile.kmk	2012-07-25 00:36:55.929571374 -0300
-+++ VirtualBox-4.1.18/src/VBox/Installer/darwin/Makefile.kmk		2012-07-25 00:36:55.959569630 -0300
-@@ -629,7 +629,6 @@
+--- VirtualBox-4.2.0.orig/src/VBox/Installer/darwin/Makefile.kmk	2012-09-08 06:36:03.000000000 -0300
++++ VirtualBox-4.2.0/src/VBox/Installer/darwin/Makefile.kmk		2012-09-19 00:55:08.991167973 -0300
+@@ -497,7 +497,6 @@
  	MacOS/VirtualBoxVM \
  	MacOS/VBoxNetAdpCtl \
  	MacOS/VBoxNetDHCP \
 -	MacOS/VBoxExtPackHelperApp \
- 	MacOS/VBoxBalloonCtrl
+ 	MacOS/VBoxBalloonCtrl \
+ 	MacOS/VBoxAutostart
  ifdef VBOX_WITH_WEBSERVICES
-  VBOX_DI_VBAPP_PROGS += \
-@@ -659,7 +658,6 @@
+@@ -522,7 +521,6 @@
  	Resources/virtualbox.icns \
  	Resources/virtualbox.png \
  	Resources/virtualbox-vbox.icns \