1
0
forked from pool/virtualbox

Accepting request 214248 from home:saschpe:branches:Virtualization

- Update to version 4.3.6:
  + VMM: fixed a Guru Meditation VINF_EM_TRIPLE_FAULT caused by VMCB caching with nested paging on certain AMD CPUs (bug #12451)
  + VMM: fixed a Guru Meditation VERR_VMX_UNEXPECTED_INTERRUPTION_EXIT_TYPE while intercepting debug exceptions (VT-x only; bug #12410)
  + VMM: fixed a Guru Meditation VERR_SVM_UNEXPECTED_EXIT while intercepting debug register accesses (AMD-V only; bug #12481)
  + VMM: fixed a VERR_SSM_STRUCTURE_MAGIC error when trying to load a saved state made with VBox 4.3.4 when VT-x/AMD-V is disabled. Unfortunately, VBox 4.3.4 produced broken saved states for this configuration so you have to discard these states (bug #12414)
  + VMM: added a few more MSRs to the whitelist required by certain guests (bug #12245)
  + GUI: fixed deleting of inaccessible VMs (4.3 regression, bug #12205)
  + GUI: fixed warnings in VM settings / number of guest processors (bug #12480)
  + Main: don't automatically enable 64-bit guests on 64-bit hosts if VT-x/AMD-V is not available (bug #12424)
  + Main: always expose the DMI memory information to Windows 2012 guests (bug #12017)
  + Main: fixed occasional crashes on guest display resolution change (bug #7063)
  + Main: fixed reporting back temporary name when calling IGuestSession::DirectoryCreateTemp() (bug #12498)
  + API: fix for a hang when launching a GUI VM through the API, which crashes due to GUI unavailability
  + Storage: fix for BLKCACHE_IOERR runtime errors under rare circumstances (bug #11030)
  + Network: allow to start more than 5 PCNet instances (bug #12426)
  + E1000: if the cable was disconnected before the guest initialized the device, the link status was not properly set to 'down' after the initialization completed despite the fact that there was no connection
  + 3D support: fixed offset of guest 3D image elements (Mac OS X Retina hosts only; bug #11021)
  + Solaris hosts: fixed accessing the host driver from non-global zones (4.3 regression, bug #12271) 
- For more changes see https://www.virtualbox.org/wiki/Changelog
- Add source services (refresh_patches ATM)
- Rebased patches:
  + vbox-disable-updates.diff (only offset)
  + vbox-fpie.diff (only offset)
  + vbox-deprec-gsoap-service-proxies.diff (manually)
  + vbox-gsoapssl-deps.diff (manually)
  + vbox-no-build-dates.diff (manually)
  + vbox-permissions_warning.diff (manually)
  + vbox-python-detection.diff (manually)
  + vbox-smc-napa.diff (manually)
  + vbox-vboxdrv-init-script.diff (manually)

OBS-URL: https://build.opensuse.org/request/show/214248
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=150
This commit is contained in:
OBS User mrdocs 2014-01-19 00:52:50 +00:00 committed by Git OBS Bridge
parent cbce3c2532
commit 52f05245dc
19 changed files with 124 additions and 182 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:12a485a704130790bdc084fe372aeaec5ccb893eff55035125a74b56a2224005
size 49421220

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cbd53cd0587acf79e1de3252ee7ba5a1594dff5e5328ab809762b32d0f84e7a7
size 62069208

5
_service Normal file
View File

@ -0,0 +1,5 @@
<services>
<service name="refresh_patches" mode="disabled">
<param name="changesgenerate">enable</param>
</service>
</services>

View File

@ -1,8 +1,8 @@
Index: VirtualBox-4.2.10/src/VBox/Main/webservice/Makefile.kmk
Index: VirtualBox-4.3.6/src/VBox/Main/webservice/Makefile.kmk
===================================================================
--- VirtualBox-4.2.10.orig/src/VBox/Main/webservice/Makefile.kmk
+++ VirtualBox-4.2.10/src/VBox/Main/webservice/Makefile.kmk
@@ -650,7 +650,7 @@ $(VBOXWEB_OUT_DIR)/gsoap_generate_all_ts
--- VirtualBox-4.3.6.orig/src/VBox/Main/webservice/Makefile.kmk
+++ VirtualBox-4.3.6/src/VBox/Main/webservice/Makefile.kmk
@@ -683,7 +683,7 @@ $(VBOXWEB_OUT_DIR)/gsoap_generate_all_ts
: $(VBOXWEB_GSOAPH_FROM_GSOAP) $(VBOXWEB_GSOAPH_FROM_XSLT) $(VBOX_NSMAP) $(RECOMPILE_ON_MAKEFILE_CURRENT) | $$(dir $$@)
$(call MSG_GENERATE,,lots of files,$(GSOAPH_RELEVANT))
$(RM) -f $@

View File

@ -2,23 +2,23 @@ Index: src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.
===================================================================
--- src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp.orig
+++ src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
@@ -63,7 +63,7 @@ void UIGlobalSettingsUpdate::loadToCache
@@ -62,7 +62,7 @@ void UIGlobalSettingsUpdate::loadToCache
void UIGlobalSettingsUpdate::getFromCache()
{
/* Apply internal variables data to QWidget(s): */
- m_pEnableUpdateCheckbox->setChecked(m_cache.m_fCheckEnabled);
+ m_pEnableUpdateCheckbox->setChecked(false);
if (m_pEnableUpdateCheckbox->isChecked())
- m_pCheckBoxUpdate->setChecked(m_cache.m_fCheckEnabled);
+ m_pCheckBoxUpdate->setChecked(false);
if (m_pCheckBoxUpdate->isChecked())
{
m_pUpdatePeriodCombo->setCurrentIndex(m_cache.m_periodIndex);
m_pComboBoxUpdatePeriod->setCurrentIndex(m_cache.m_periodIndex);
Index: src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
===================================================================
--- src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp.orig
+++ src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
@@ -342,15 +342,6 @@ UISettingsDialogGlobal::UISettingsDialog
iPageIndex, "#input", pSettingsPage);
@@ -359,15 +359,6 @@ UISettingsDialogGlobal::UISettingsDialog
break;
}
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
- /* Update page: */
- case GlobalSettingsPageType_Update:
- {
@ -28,16 +28,15 @@ Index: src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
- iPageIndex, "#update", pSettingsPage);
- break;
- }
#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
/* Language page: */
case GlobalSettingsPageType_Language:
{
@@ -489,9 +480,6 @@ void UISettingsDialogGlobal::retranslate
/* Input page: */
@@ -498,8 +489,6 @@ void UISettingsDialogGlobal::retranslate
m_pSelector->setItemText(GlobalSettingsPageType_Input, tr("Input"));
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
- /* Update page: */
- m_pSelector->setItemText(GlobalSettingsPageType_Update, tr("Update"));
-
/* Language page: */
m_pSelector->setItemText(GlobalSettingsPageType_Language, tr("Language"));
#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
/* Language page: */

View File

@ -1,8 +1,8 @@
Index: VirtualBox-4.1.8_OSE/Config.kmk
Index: VirtualBox-4.3.6/Config.kmk
===================================================================
--- VirtualBox-4.1.8_OSE.orig/Config.kmk
+++ VirtualBox-4.1.8_OSE/Config.kmk
@@ -3368,10 +3368,13 @@ TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.darwi
--- VirtualBox-4.3.6.orig/Config.kmk
+++ VirtualBox-4.3.6/Config.kmk
@@ -3873,10 +3873,13 @@ TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.darwi
ifeq ($(KBUILD_TARGET),linux)
# not necessary except USE_LIB_PCAP is defined in SUPR3HardenedMain.cpp
# TEMPLATE_VBOXR3HARDENEDEXE_LIBS += cap

View File

@ -1,8 +1,8 @@
Index: VirtualBox-4.2.10/src/VBox/Main/webservice/Makefile.kmk
Index: VirtualBox-4.3.6/src/VBox/Main/webservice/Makefile.kmk
===================================================================
--- VirtualBox-4.2.10.orig/src/VBox/Main/webservice/Makefile.kmk
+++ VirtualBox-4.2.10/src/VBox/Main/webservice/Makefile.kmk
@@ -298,6 +298,7 @@ endif
--- VirtualBox-4.3.6.orig/src/VBox/Main/webservice/Makefile.kmk
+++ VirtualBox-4.3.6/src/VBox/Main/webservice/Makefile.kmk
@@ -303,6 +303,7 @@ endif
vboxwebsrv_LIBS += \
$(PATH_STAGE_LIB)/vboxsoap$(VBOX_SUFF_LIB) \
$(VBOX_GSOAP_CXX_LIBS) \
@ -10,7 +10,7 @@ Index: VirtualBox-4.2.10/src/VBox/Main/webservice/Makefile.kmk
$(LIB_RUNTIME)
vboxwebsrv_LIBS.solaris += socket nsl
ifdef VBOX_WITH_WEBSERVICES_SSL
@@ -443,6 +444,7 @@ $$(VBOX_JWSSRC_JAR): $$(VBOX_JWS_JAR) |
@@ -480,6 +481,7 @@ $$(VBOX_JWSSRC_JAR): $$(VBOX_JWS_JAR) |
webtest_LIBS += \
$(PATH_STAGE_LIB)/vboxsoap$(VBOX_SUFF_LIB) \
$(VBOX_GSOAP_CXX_LIBS) \

View File

@ -1,44 +1,8 @@
Index: src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp
===================================================================
--- src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp.orig
+++ src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp
@@ -386,11 +386,11 @@ extern "C" DECLEXPORT(int) TrustedMain (
uint32_t secureLabelPointSize = 12;
char *secureLabelFontFile = NULL;
#endif
int rc = VINF_SUCCESS;
- RTPrintf(VBOX_PRODUCT " Simple SDL GUI built %s %s\n", __DATE__, __TIME__);
+ RTPrintf(VBOX_PRODUCT " Simple SDL GUI\n");
// less than one parameter is not possible
if (argc < 2)
{
show_usage();
@@ -1049,14 +1049,13 @@ DECLCALLBACK(int) VMPowerUpThread(RTTHRE
/* some introductory information */
RTTIMESPEC TimeSpec;
char szNowUct[64];
RTTimeSpecToString(RTTimeNow(&TimeSpec), szNowUct, sizeof(szNowUct));
RTLogRelLogger(pLogger, 0, ~0U,
- "VBoxBFE %s (%s %s) release log\n"
+ "VBoxBFE %s release log\n"
"Log opened %s\n",
- VBOX_VERSION_STRING, __DATE__, __TIME__,
- szNowUct);
+ VBOX_VERSION_STRING, szNowUct);
/* register this logger as the release logger */
RTLogRelSetDefaultInstance(pLogger);
}
else
Index: src/VBox/Frontends/VBoxFB/VBoxFB.cpp
===================================================================
--- src/VBox/Frontends/VBoxFB/VBoxFB.cpp.orig
+++ src/VBox/Frontends/VBoxFB/VBoxFB.cpp
@@ -60,11 +60,11 @@ int main(int argc, char *argv[])
{ "scale", no_argument, NULL, 'c' }
};
@@ -62,7 +62,7 @@ int main(int argc, char *argv[])
printf("VirtualBox DirectFB GUI built %s %s\n"
"(C) 2004-" VBOX_C_YEAR " " VBOX_VENDOR "\n"
@ -47,15 +11,11 @@ Index: src/VBox/Frontends/VBoxFB/VBoxFB.cpp
for (;;)
{
c = getopt_long(argc, argv, "s:", options, NULL);
if (c == -1)
Index: src/VBox/Runtime/common/string/uniread.cpp
===================================================================
--- src/VBox/Runtime/common/string/uniread.cpp.orig
+++ src/VBox/Runtime/common/string/uniread.cpp
@@ -977,11 +977,11 @@ int PrintHeader(const char *argv0)
{
Stream1Printf("/** @file\n"
@@ -979,7 +979,7 @@ int PrintHeader(const char *argv0)
" *\n"
" * IPRT - Unicode Tables.\n"
" *\n"
@ -64,15 +24,11 @@ Index: src/VBox/Runtime/common/string/uniread.cpp
" */\n"
"\n"
"/*\n"
" * Copyright (C) 2006-2010 Oracle Corporation\n"
" *\n"
Index: src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
===================================================================
--- src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c.orig
+++ src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
@@ -40,20 +40,17 @@
/************************************************************************/
@@ -42,16 +42,13 @@
/**************************IDENTITY AND VERSIONING***********************/
/************************************************************************/
#include "_pl_bld.h"
@ -94,15 +50,11 @@ Index: src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
#if !defined(_PRODUCTION)
#define _PRODUCTION ""
#endif
#if defined(DEBUG)
#define _DEBUG_STRING " (debug)"
Index: src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
===================================================================
--- src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c.orig
+++ src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
@@ -42,20 +42,14 @@
/**************************IDENTITY AND VERSIONING***********************/
/************************************************************************/
@@ -44,16 +44,10 @@
#ifndef XP_MAC
#include "_pr_bld.h"
#endif
@ -121,15 +73,11 @@ Index: src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
#if !defined(_PRODUCTION)
#define _PRODUCTION ""
#endif
#if defined(DEBUG)
#define _DEBUG_STRING " (debug)"
Index: src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
===================================================================
--- src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c.orig
+++ src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
@@ -40,20 +40,17 @@
/************************************************************************/
@@ -42,16 +42,13 @@
/**************************IDENTITY AND VERSIONING***********************/
/************************************************************************/
#include "_pl_bld.h"
@ -151,15 +99,11 @@ Index: src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
#if !defined(_PRODUCTION)
#define _PRODUCTION ""
#endif
#if defined(DEBUG)
#define _DEBUG_STRING " (debug)"
Index: src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
===================================================================
--- src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c.orig
+++ src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
@@ -40,20 +40,17 @@
/************************************************************************/
@@ -42,16 +42,13 @@
/**************************IDENTITY AND VERSIONING***********************/
/************************************************************************/
#include "_pl_bld.h"
@ -181,15 +125,11 @@ Index: src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
#if !defined(_PRODUCTION)
#define _PRODUCTION ""
#endif
#if defined(DEBUG)
#define _DEBUG_STRING " (debug)"
Index: src/VBox/Additions/common/VBoxService/VBoxService.cpp
===================================================================
--- src/VBox/Additions/common/VBoxService/VBoxService.cpp.orig
+++ src/VBox/Additions/common/VBoxService/VBoxService.cpp
@@ -155,14 +155,14 @@ static void VBoxServiceLogHeaderFooter(P
switch (enmPhase)
{
@@ -161,10 +161,10 @@ static void VBoxServiceLogHeaderFooter(P
case RTLOGPHASE_BEGIN:
{
pfnLog(pLoggerRelease,
@ -202,15 +142,11 @@ Index: src/VBox/Additions/common/VBoxService/VBoxService.cpp
int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
pfnLog(pLoggerRelease, "OS Product: %s\n", szTmp);
vrc = RTSystemQueryOSInfo(RTSYSOSINFO_RELEASE, szTmp, sizeof(szTmp));
Index: src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestApp.cpp
===================================================================
--- src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestApp.cpp.orig
+++ src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestApp.cpp
@@ -146,11 +146,11 @@ static int vboxInitLogging(const char *p
#ifdef VBOX_BLEEDING_EDGE
"EXPERIMENTAL build " VBOX_BLEEDING_EDGE "\n"
@@ -148,7 +148,7 @@ static int vboxInitLogging(const char *p
#endif
"Log opened %s\n",
VBOX_VERSION_STRING, RTBldCfgRevision(), VBOX_BUILD_TARGET,
@ -219,15 +155,11 @@ Index: src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestApp.cpp
vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
RTLogRelLogger(loggerRelease, 0, ~0U, "OS Product: %s\n", szTmp);
vrc = RTSystemQueryOSInfo(RTSYSOSINFO_RELEASE, szTmp, sizeof(szTmp));
Index: src/VBox/Devices/PC/BIOS/bios.c
===================================================================
--- src/VBox/Devices/PC/BIOS/bios.c.orig
+++ src/VBox/Devices/PC/BIOS/bios.c
@@ -149,11 +149,11 @@ void set_mode(uint8_t mode);
//@todo: restore
//#undef VBOX
@@ -151,7 +151,7 @@ void set_mode(uint8_t mode);
#define BX_PCIBIOS 1
#define BX_APPNAME "VirtualBox"
@ -236,22 +168,16 @@ Index: src/VBox/Devices/PC/BIOS/bios.c
//--------------------------------------------------------------------------
// print_bios_banner
// displays a the bios version
//--------------------------------------------------------------------------
void BIOSCALL print_bios_banner(void)
Index: src/VBox/Main/glue/com.cpp
===================================================================
--- src/VBox/Main/glue/com.cpp.orig
+++ src/VBox/Main/glue/com.cpp
@@ -238,11 +238,11 @@ static void vboxHeaderFooter(PRTLOGGER p
#ifdef VBOX_BLEEDING_EDGE
"EXPERIMENTAL build " VBOX_BLEEDING_EDGE "\n"
@@ -294,7 +294,7 @@ static void vboxHeaderFooter(PRTLOGGER p
#endif
"Log opened %s\n",
g_pszLogEntity, VBOX_VERSION_STRING, RTBldCfgRevision(),
- RTBldCfgTargetDotArch(), __DATE__, __TIME__, szTmp);
+ RTBldCfgTargetDotArch(), "openSUSE", "Buildservice", szTmp);
pfnLog(pReleaseLogger, "Build Type: %s\n", KBUILD_TYPE);
int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
pfnLog(pReleaseLogger, "OS Product: %s\n", szTmp);
vrc = RTSystemQueryOSInfo(RTSYSOSINFO_RELEASE, szTmp, sizeof(szTmp));

View File

@ -1,8 +1,8 @@
Index: VirtualBox-4.2.6/src/apps/Makefile.kmk
Index: VirtualBox-4.3.6/src/apps/Makefile.kmk
===================================================================
--- VirtualBox-4.2.6.orig/src/apps/Makefile.kmk
+++ VirtualBox-4.2.6/src/apps/Makefile.kmk
@@ -39,5 +39,7 @@ ifdef VBOX_WITH_DEVMAPPER
--- VirtualBox-4.3.6.orig/src/apps/Makefile.kmk
+++ VirtualBox-4.3.6/src/apps/Makefile.kmk
@@ -34,5 +34,7 @@ if1of ($(KBUILD_TARGET),darwin solaris l
endif
endif
@ -10,10 +10,10 @@ Index: VirtualBox-4.2.6/src/apps/Makefile.kmk
+
include $(FILE_KBUILD_SUB_FOOTER)
Index: VirtualBox-4.2.6/src/apps/VBoxPermissionMessage/Makefile.kmk
Index: VirtualBox-4.3.6/src/apps/VBoxPermissionMessage/Makefile.kmk
===================================================================
--- /dev/null
+++ VirtualBox-4.2.6/src/apps/VBoxPermissionMessage/Makefile.kmk
+++ VirtualBox-4.3.6/src/apps/VBoxPermissionMessage/Makefile.kmk
@@ -0,0 +1,31 @@
+# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $
+## @file
@ -46,10 +46,10 @@ Index: VirtualBox-4.2.6/src/apps/VBoxPermissionMessage/Makefile.kmk
+
+include $(KBUILD_PATH)/subfooter.kmk
+
Index: VirtualBox-4.2.6/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp
Index: VirtualBox-4.3.6/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp
===================================================================
--- /dev/null
+++ VirtualBox-4.2.6/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp
+++ VirtualBox-4.3.6/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp
@@ -0,0 +1,12 @@
+#include <QtGui/QApplication>
+#include <QtGui/QMessageBox>

View File

@ -1,6 +1,8 @@
--- VirtualBox-4.0.2_OSE.orig/src/libs/xpcom18a4/python/gen_python_deps.py 2011-01-14 20:15:09.000000000 +0000
+++ VirtualBox-4.0.2_OSE/src/libs/xpcom18a4/python/gen_python_deps.py 2011-02-07 05:36:42.427567000 +0000
@@ -68,7 +68,7 @@
Index: VirtualBox-4.3.6/src/libs/xpcom18a4/python/gen_python_deps.py
===================================================================
--- VirtualBox-4.3.6.orig/src/libs/xpcom18a4/python/gen_python_deps.py
+++ VirtualBox-4.3.6/src/libs/xpcom18a4/python/gen_python_deps.py
@@ -71,7 +71,7 @@ def main(argv):
else:
multi = 1
@ -9,7 +11,7 @@
prefixes = ["/usr"]
versions = [str(sys.version_info[0])+'.'+str(sys.version_info[1])]
@@ -86,22 +86,23 @@
@@ -92,22 +92,23 @@ def main(argv):
for v in versions:
for p in prefixes:
c = checkPair(p, v, dllpre, dllsuff, bitness_magic)

View File

@ -1,24 +0,0 @@
Index: VirtualBox-3.1.4_OSE/src/VBox/Devices/PC/Etherboot-src/core/nic.c
===================================================================
--- VirtualBox-3.1.4_OSE.orig/src/VBox/Devices/PC/Etherboot-src/core/nic.c
+++ VirtualBox-3.1.4_OSE/src/VBox/Devices/PC/Etherboot-src/core/nic.c
@@ -478,6 +478,7 @@ int eth_load(struct dev *dev __unused)
}
interruptible_sleep(2); /* lay off the server for a while */
longjmp(restart_etherboot, -1);
+ return 0;
}
Index: VirtualBox-3.1.4_OSE/src/VBox/Devices/PC/Etherboot-src/core/osloader.c
===================================================================
--- VirtualBox-3.1.4_OSE.orig/src/VBox/Devices/PC/Etherboot-src/core/osloader.c
+++ VirtualBox-3.1.4_OSE/src/VBox/Devices/PC/Etherboot-src/core/osloader.c
@@ -81,6 +81,7 @@ dead_download - Restart etherboot if pro
**************************************************************************/
static sector_t dead_download ( unsigned char *data __unused, unsigned int len __unused, int eof __unused) {
longjmp(restart_etherboot, -2);
+ return 0;
}
#ifdef IMAGE_MULTIBOOT

View File

@ -1,8 +1,8 @@
Index: VirtualBox-4.0.0_OSE/src/VBox/Devices/PC/vbox.dsl
Index: VirtualBox-4.3.6/src/VBox/Devices/PC/vbox.dsl
===================================================================
--- VirtualBox-4.0.0_OSE.orig/src/VBox/Devices/PC/vbox.dsl
+++ VirtualBox-4.0.0_OSE/src/VBox/Devices/PC/vbox.dsl
@@ -778,7 +778,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 1,
--- VirtualBox-4.3.6.orig/src/VBox/Devices/PC/vbox.dsl
+++ VirtualBox-4.3.6/src/VBox/Devices/PC/vbox.dsl
@@ -848,7 +848,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 1,
Device (SMC)
{
Name (_HID, EisaId ("APP0001"))

View File

@ -19,7 +19,7 @@ Index: src/VBox/Installer/linux/vboxdrv.sh.in
### END INIT INFO
PATH=/sbin:/bin:/usr/sbin:/usr/bin:$PATH
@@ -193,13 +194,6 @@ start()
@@ -191,13 +192,6 @@ start()
fi
fi
# ensure permissions
@ -33,7 +33,7 @@ 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
@@ -297,70 +291,8 @@ stop_vms()
@@ -295,70 +289,8 @@ stop_vms()
# setup_script
setup()
{

View File

@ -1,7 +1,7 @@
Index: VirtualBox-4.1.8_OSE/src/VBox/Installer/linux/vboxweb-service.sh.in
Index: VirtualBox-4.1.8_OSE/src/VBox/Installer/linux/vboxweb-service.sh
===================================================================
--- VirtualBox-4.1.8_OSE.orig/src/VBox/Installer/linux/vboxweb-service.sh.in
+++ VirtualBox-4.1.8_OSE/src/VBox/Installer/linux/vboxweb-service.sh.in
--- VirtualBox-4.1.8_OSE.orig/src/VBox/Installer/linux/vboxweb-service.sh
+++ VirtualBox-4.1.8_OSE/src/VBox/Installer/linux/vboxweb-service.sh
@@ -20,7 +20,7 @@
# Provides: vboxweb-service
# Required-Start: vboxdrv

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7bc301ffefb81839b86c8fa534de4ca5bae5b991d5d550c4b6c8f2c8fc4c7180
size 6197702

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5d15dffc8dff6b773c6f8765c210eac599d2edf609d9e08e24132b947a2c7613
size 6245704

View File

@ -1,10 +1,10 @@
Index: VirtualBox-4.2.20/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
Index: VirtualBox-4.3.6/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
===================================================================
--- VirtualBox-4.2.20.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+++ VirtualBox-4.2.20/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
@@ -336,6 +336,20 @@ vboxvideo_drv_114_INCS += $(PATH_ROOT)/s
vboxvideo_drv_114_SOURCES := $(vboxvideo_drv_15_SOURCES)
--- VirtualBox-4.3.6.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+++ VirtualBox-4.3.6/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
@@ -347,6 +347,20 @@ ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_A
endif
endif
+#
+# vboxvideo_drv_115
@ -23,7 +23,7 @@ Index: VirtualBox-4.2.20/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
ifdef VBOX_USE_SYSTEM_XORG_HEADERS
# Build using local X.Org headers. We assume X.Org Server 1.7 or later.
DLLS := $(filter-out vboxvideo_drv_%,$(DLLS)) vboxvideo_drv_system
@@ -389,7 +403,7 @@ $$(vboxvideo_drv_0_OUTDIR)/tstvboxvideo6
@@ -399,7 +413,7 @@ $$(vboxvideo_drv_0_OUTDIR)/tstvboxvideo6
$$(QUIET)$$(APPEND) -t "$$@" "done"
endef

View File

@ -1,3 +1,43 @@
-------------------------------------------------------------------
Thu Jan 17 16:45:32 UTC 2014 - speilicke@suse.com
- Update to version 4.3.6:
+ VMM: fixed a Guru Meditation VINF_EM_TRIPLE_FAULT caused by VMCB caching with nested paging on certain AMD CPUs (bug #12451)
+ VMM: fixed a Guru Meditation VERR_VMX_UNEXPECTED_INTERRUPTION_EXIT_TYPE while intercepting debug exceptions (VT-x only; bug #12410)
+ VMM: fixed a Guru Meditation VERR_SVM_UNEXPECTED_EXIT while intercepting debug register accesses (AMD-V only; bug #12481)
+ VMM: fixed a VERR_SSM_STRUCTURE_MAGIC error when trying to load a saved state made with VBox 4.3.4 when VT-x/AMD-V is disabled. Unfortunately, VBox 4.3.4 produced broken saved states for this configuration so you have to discard these states (bug #12414)
+ VMM: added a few more MSRs to the whitelist required by certain guests (bug #12245)
+ GUI: fixed deleting of inaccessible VMs (4.3 regression, bug #12205)
+ GUI: fixed warnings in VM settings / number of guest processors (bug #12480)
+ Main: don't automatically enable 64-bit guests on 64-bit hosts if VT-x/AMD-V is not available (bug #12424)
+ Main: always expose the DMI memory information to Windows 2012 guests (bug #12017)
+ Main: fixed occasional crashes on guest display resolution change (bug #7063)
+ Main: fixed reporting back temporary name when calling IGuestSession::DirectoryCreateTemp() (bug #12498)
+ API: fix for a hang when launching a GUI VM through the API, which crashes due to GUI unavailability
+ Storage: fix for BLKCACHE_IOERR runtime errors under rare circumstances (bug #11030)
+ Network: allow to start more than 5 PCNet instances (bug #12426)
+ E1000: if the cable was disconnected before the guest initialized the device, the link status was not properly set to 'down' after the initialization completed despite the fact that there was no connection
+ 3D support: fixed offset of guest 3D image elements (Mac OS X Retina hosts only; bug #11021)
+ Solaris hosts: fixed accessing the host driver from non-global zones (4.3 regression, bug #12271)
- For more changes see https://www.virtualbox.org/wiki/Changelog
- Add source services (refresh_patches ATM)
- Rebased patches:
+ vbox-disable-updates.diff (only offset)
+ vbox-fpie.diff (only offset)
+ vbox-deprec-gsoap-service-proxies.diff (manually)
+ vbox-gsoapssl-deps.diff (manually)
+ vbox-no-build-dates.diff (manually)
+ vbox-permissions_warning.diff (manually)
+ vbox-python-detection.diff (manually)
+ vbox-smc-napa.diff (manually)
+ vbox-vboxdrv-init-script.diff (manually)
+ vbox-vboxweb-init-script.diff (manually)
+ virtualbox-xorg-1.15.patch (only offset)
- Dropped patches:
+ vbox-ret-in-nonvoid-fnc.diff (obsolete)
- Fix smp_mflags typo
- Add buildrequires: device-mapper-devel, libvpx-devel
-------------------------------------------------------------------
Wed Jan 15 09:45:05 UTC 2014 - sndirsch@suse.com

View File

@ -58,12 +58,14 @@ BuildRequires: gcc
BuildRequires: gcc-c++
##### virtualbox 4.2.0 does not work with older versions (check in makefile),
##### and fails with newer versions (tested with rev2662)
BuildRequires: kbuild = 0.1.9998svn2577
BuildRequires: device-mapper-devel
BuildRequires: kbuild >= 0.1.9998svn2689
BuildRequires: kernel-syms
BuildRequires: libcap-devel
BuildRequires: libcurl-devel
BuildRequires: libidl-devel
BuildRequires: libqt4-devel
BuildRequires: libvpx-devel
BuildRequires: libxslt-devel
BuildRequires: module-init-tools
BuildRequires: pam-devel
@ -92,7 +94,7 @@ BuildRequires: xorg-x11-libXt-devel-32bit
%endif
#
ExclusiveArch: %ix86 x86_64
Version: 4.2.20
Version: 4.3.6
Release: 0
Summary: VirtualBox is an Emulator
License: GPL-2.0+
@ -123,8 +125,6 @@ Source99: %{name}-patch-source.sh
Patch1: vbox-vboxdrv-init-script.diff
Patch2: vbox-vboxadd-init-script.diff
Patch3: vbox-vboxweb-init-script.diff
#fix return values which trigger post build checks and coused build error - should goes to upstream
Patch4: vbox-ret-in-nonvoid-fnc.diff
#fix build : "Error 4001 - String must be entirely alphanumeric"
#with renaming we probably break some macosx functionality however ths is just quick fix
#file :http://www.virtualbox.org/browser/trunk/src/VBox/Devices/PC/vbox.ds
@ -272,7 +272,6 @@ This package contains icons for guest desktop files that were created on the des
%patch1
%patch2
%patch3 -p1
%patch4 -p1
%patch6 -p1
%patch8 -p1
%patch9 -p1
@ -328,7 +327,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_mflags} 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
@ -526,7 +525,6 @@ pushd out/linux.*/release/bin
%{buildroot}%{_vbox_instdir}
%__install -m 755 VBoxNetDHCP %{buildroot}%{_vbox_instdir}
%__install -m 755 VBoxNetAdpCtl %{buildroot}%{_vbox_instdir}
%__install -m 755 VBoxBFE %{buildroot}%{_vbox_instdir}
%__install -m 755 VirtualBox %{buildroot}%{_vbox_instdir}
%__install -m 755 VBoxEFI*.fd %{buildroot}%{_vbox_instdir}
%__install -m 755 VBoxSysInfo.sh %{buildroot}%{_vbox_instdir}
@ -556,8 +554,8 @@ popd
# modify and install the vboxdrv init script
# TODO: some of this stuff breaks the fillup macros below?
%__sed -i "s|%NOLSB%|yes|g;s|%DEBIAN%||g;s|%PACKAGE%|virtualbox|g" \
src/VBox/Installer/linux/vboxdrv.sh.in
%__install -m 744 src/VBox/Installer/linux/vboxdrv.sh.in \
src/VBox/Installer/linux/vboxdrv.sh
%__install -m 744 src/VBox/Installer/linux/vboxdrv.sh \
%{buildroot}%{_sysconfdir}/init.d/vboxdrv
%__ln_s %{_sysconfdir}/init.d/vboxdrv \
%{buildroot}%{_sbindir}/rcvboxdrv
@ -659,7 +657,6 @@ groupadd -r vboxusers 2>/dev/null || :
%if %suse_version >= 1140
%set_permissions %{_vbox_instdir}/VBoxNetDHCP
%set_permissions %{_vbox_instdir}/VBoxNetAdpCtl
%set_permissions %{_vbox_instdir}/VBoxBFE
%set_permissions %{_vbox_instdir}/VBoxHeadless
%set_permissions %{_vbox_instdir}/VBoxSDL
%else
@ -678,7 +675,6 @@ groupadd -r vboxusers 2>/dev/null || :
%verify_permissions -e %{_vbox_instdir}/VBoxNetDHCP
%endif
%verify_permissions -e %{_vbox_instdir}/VBoxNetAdpCtl
%verify_permissions -e %{_vbox_instdir}/VBoxBFE
%verify_permissions -e %{_vbox_instdir}/VBoxHeadless
%verify_permissions -e %{_vbox_instdir}/VBoxSDL
@ -737,7 +733,6 @@ exit 0
%{_bindir}/VBoxTunctl
%dir %{_vbox_instdir}
%{_vbox_instdir}/VBoxSysInfo.sh
%{_vbox_instdir}/VBoxBFE.so
%{_vbox_instdir}/VBoxDD2.so
%{_vbox_instdir}/VBoxDD.so
%{_vbox_instdir}/VBoxDDU.so
@ -797,7 +792,6 @@ exit 0
%{_vbox_instdir}/VBoxNetDHCP
%endif
%verify(not mode) %attr(4750,root,vboxusers) %{_vbox_instdir}/VBoxNetAdpCtl
%verify(not mode) %attr(4750,root,vboxusers) %{_vbox_instdir}/VBoxBFE
%verify(not mode) %attr(4750,root,vboxusers) %{_vbox_instdir}/VBoxHeadless
%verify(not mode) %attr(4750,root,vboxusers) %{_vbox_instdir}/VBoxSDL
#