From 10ec9806d304fbf401efb5ba44d189c3f45bf2aa Mon Sep 17 00:00:00 2001 From: Alexander Boettcher Date: Tue, 6 Sep 2016 14:44:03 +0200 Subject: [PATCH] vbox: update to 4.3.40 Fixes #2090 --- repos/ports/lib/mk/virtualbox-runtime.mk | 6 ++-- repos/ports/lib/mk/virtualbox-xml.mk | 6 ++-- repos/ports/lib/mk/virtualbox-zlib.mk | 2 +- repos/ports/ports/virtualbox.hash | 2 +- repos/ports/ports/virtualbox.port | 10 +++---- .../src/virtualbox/patches/vbox_main.patch | 30 +++++++++---------- 6 files changed, 29 insertions(+), 27 deletions(-) diff --git a/repos/ports/lib/mk/virtualbox-runtime.mk b/repos/ports/lib/mk/virtualbox-runtime.mk index 155bbbbb52..e675d33ae0 100644 --- a/repos/ports/lib/mk/virtualbox-runtime.mk +++ b/repos/ports/lib/mk/virtualbox-runtime.mk @@ -3,7 +3,7 @@ include $(REP_DIR)/lib/mk/virtualbox-common.inc INC_DIR += $(VBOX_DIR)/Runtime/include INC_DIR += $(VIRTUALBOX_DIR)/src/libs/liblzf-3.4 -INC_DIR += $(VIRTUALBOX_DIR)/src/libs/zlib-1.2.6 +INC_DIR += $(VIRTUALBOX_DIR)/src/libs/zlib-1.2.8 INC_DIR += $(call select_from_ports,libiconv)/include/iconv GENERIC_SRC_CC = $(notdir $(wildcard $(VBOX_DIR)/Runtime/generic/*.cpp)) @@ -13,6 +13,7 @@ FILTERED_OUT_SRC_CC = RTLogDefaultInit-generic.cpp \ semrw-lockless-generic.cpp \ tls-generic.cpp \ fs-stubs-generic.cpp \ + http-curl.cpp \ RTSemEventMultiWait-2-ex-generic.cpp \ RTLogWriteStdErr-generic.cpp \ RTLogWriteStdOut-generic.cpp \ @@ -23,7 +24,8 @@ FILTERED_OUT_SRC_CC = RTLogDefaultInit-generic.cpp \ RTFileExists-generic.cpp \ RTSemMutexRequest-generic.cpp \ RTSemMutexRequestDebug-generic.cpp \ - RTDirExists-generic.cpp + RTDirExists-generic.cpp \ + RTMpOnPair-generic.cpp CC_WARN += -Wno-unused-variable diff --git a/repos/ports/lib/mk/virtualbox-xml.mk b/repos/ports/lib/mk/virtualbox-xml.mk index e192ff0092..8d6ef4ce94 100644 --- a/repos/ports/lib/mk/virtualbox-xml.mk +++ b/repos/ports/lib/mk/virtualbox-xml.mk @@ -1,7 +1,7 @@ include $(REP_DIR)/lib/mk/virtualbox-common.inc -ZLIB_DIR = $(VIRTUALBOX_DIR)/src/libs/zlib-1.2.6 -LIBXML_DIR = $(VIRTUALBOX_DIR)/src/libs/libxml2-2.6.31 +ZLIB_DIR = $(VIRTUALBOX_DIR)/src/libs/zlib-1.2.8 +LIBXML_DIR = $(VIRTUALBOX_DIR)/src/libs/libxml2-2.9.2 INC_DIR += $(ZLIB_DIR) INC_DIR += $(LIBXML_DIR)/include @@ -11,7 +11,7 @@ LIBS += stdcxx VBOX_CC_OPT += -DLIBXML_THREAD_ENABLED -SRC_C += catalog.c chvalid.c debugXML.c dict.c encoding.c error.c entities.c +SRC_C += buf.c catalog.c chvalid.c debugXML.c dict.c encoding.c error.c entities.c SRC_C += globals.c hash.c list.c parser.c parserInternals.c pattern.c SRC_C += relaxng.c threads.c tree.c uri.c valid.c HTMLtree.c HTMLparser.c SRC_C += SAX.c SAX2.c xmlIO.c xmlmemory.c xmlreader.c xmlregexp.c xmlschemas.c diff --git a/repos/ports/lib/mk/virtualbox-zlib.mk b/repos/ports/lib/mk/virtualbox-zlib.mk index bd7cd9d5b0..814c582fb2 100644 --- a/repos/ports/lib/mk/virtualbox-zlib.mk +++ b/repos/ports/lib/mk/virtualbox-zlib.mk @@ -1,6 +1,6 @@ include $(REP_DIR)/lib/mk/virtualbox-common.inc -ZLIB_DIR = $(VIRTUALBOX_DIR)/src/libs/zlib-1.2.6 +ZLIB_DIR = $(VIRTUALBOX_DIR)/src/libs/zlib-1.2.8 INC_DIR += $(ZLIB_DIR) SRC_C = $(notdir $(wildcard $(ZLIB_DIR)/*.c)) diff --git a/repos/ports/ports/virtualbox.hash b/repos/ports/ports/virtualbox.hash index e0fb106a89..9e9dd27f54 100644 --- a/repos/ports/ports/virtualbox.hash +++ b/repos/ports/ports/virtualbox.hash @@ -1 +1 @@ -a33b0746ddd53957820afcfacc8187b617c57564 +9739dad12e66d0ac8a900e3c915ea34a1fea1c2b diff --git a/repos/ports/ports/virtualbox.port b/repos/ports/ports/virtualbox.port index 295608e678..da71ca0ece 100644 --- a/repos/ports/ports/virtualbox.port +++ b/repos/ports/ports/virtualbox.port @@ -1,17 +1,17 @@ LICENSE := GPLv2 -VERSION := 4.3.30 +VERSION := 4.3.40 DOWNLOADS := virtualbox.archive virtualbox_sdk.archive VIRTUALBOX_TBZ2 := VirtualBox-$(VERSION).tar.bz2 -VIRTUALBOX_SDK_ZIP := VirtualBoxSDK-$(VERSION)-101610.zip +VIRTUALBOX_SDK_ZIP := VirtualBoxSDK-$(VERSION)-110317.zip URL(virtualbox) := http://download.virtualbox.org/virtualbox/$(VERSION)/$(VIRTUALBOX_TBZ2) DIR(virtualbox) := src/app/virtualbox -SHA(virtualbox) := 16976f2d520af78797f85404e38c3abb6084db09 +SHA(virtualbox) := 89f9f702e94afe7dccacb76c34792038564edbdc URL(virtualbox_sdk) := http://download.virtualbox.org/virtualbox/$(VERSION)/$(VIRTUALBOX_SDK_ZIP) DIR(virtualbox_sdk) := src/app/virtualbox_sdk -SHA(virtualbox_sdk) := c4b6ed1ef63271435b3d2bdd811c1b643319b6a0 +SHA(virtualbox_sdk) := 438e2994a0103c5e10b61d29b1bca68287ecb134 PATCHES_DIR := src/virtualbox/patches PATCHES_DIR_VBOX4 := src/virtualbox/patches @@ -91,7 +91,7 @@ VBOX_CONTENT += $(addprefix include/VBox/, $(VBOX_INC)) VBOX_CONTENT += $(addprefix include/VBox/com/, $(VBOX_INC_COM)) VBOX_CONTENT += $(addprefix include/VBox/HostServices/, $(VBOX_INC_HOST)) -VBOX_CONTENT += src/libs/zlib-1.2.6 src/libs/liblzf-3.4 src/libs/libxml2-2.6.31 +VBOX_CONTENT += src/libs/zlib-1.2.8 src/libs/liblzf-3.4 src/libs/libxml2-2.9.2 VBOX_CONTENT += src/recompiler include/VBox/vmm include/iprt Config.kmk diff --git a/repos/ports/src/virtualbox/patches/vbox_main.patch b/repos/ports/src/virtualbox/patches/vbox_main.patch index b7e33cb2bb..a7f0c47c6e 100644 --- a/repos/ports/src/virtualbox/patches/vbox_main.patch +++ b/repos/ports/src/virtualbox/patches/vbox_main.patch @@ -1495,21 +1495,6 @@ index 3889a01..5fcb53c 100644 cchBufLeft = sizeof(szPath) - cchBufLeft; int vrc = VINF_SUCCESS; -@@ -8096,10 +8100,14 @@ HRESULT Machine::launchVMProcess(IInternalSessionControl *aControl, - } - strSupStartLogArg.append(strStartupLogFile); - } -+#if defined(VBOX_WITH_QTGUI) || defined(VBOX_WITH_VBOXSDL) || defined(VBOX_WITH_HEADLESS) - const char *pszSupStartupLogArg = strSupStartLogArg.c_str(); -+#endif - #else -+#if defined(VBOX_WITH_QTGUI) || defined(VBOX_WITH_VBOXSDL) || defined(VBOX_WITH_HEADLESS) - const char *pszSupStartupLogArg = NULL; - #endif -+#endif - - - #ifdef VBOX_WITH_QTGUI @@ -8500,6 +8508,7 @@ HRESULT Machine::prepareRegister() // Ensure the settings are saved. If we are going to be registered and @@ -1835,3 +1820,18 @@ index 3520c9c..e3288af 100644 int rc = RTLogGroupSettings(RTLogRelDefaultInstance(), useLoggingLevel.c_str()); // If failed and not the default logging level - try to use the default logging level. if (RT_FAILURE(rc)) +--- a/src/app/virtualbox/include/iprt/string.h ++++ b/src/app/virtualbox/include/iprt/string.h +@@ -113,12 +113,6 @@ + RT_C_DECLS_END + #endif + +-#if !defined(RT_OS_LINUX) || !defined(_GNU_SOURCE) +-RT_C_DECLS_BEGIN +-void *memrchr(const char *pv, int ch, size_t cb); +-RT_C_DECLS_END +-#endif +- + + /** @def RT_USE_RTC_3629 + * When defined the UTF-8 range will stop at 0x10ffff. If not defined, the