aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeinz Wiesinger <pprkut@slackbuilds.org>2022-07-03 15:44:23 +0200
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2022-07-09 10:06:21 +0700
commit9829e70411c16f5529b6eac2a9142eb37ac2c8f5 (patch)
tree805ecee2ecf30b6b99a681dc20faa8ecb551e0c8
parentfdc187ce1c225d309b5c54ded3a122a1e352b6e9 (diff)
system/virtualbox: Updated for version 6.1.34
Signed-off-by: Heinz Wiesinger <pprkut@slackbuilds.org> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--system/virtualbox/virtualbox-VBoxR0.diff18
-rw-r--r--system/virtualbox/virtualbox.SlackBuild5
-rw-r--r--system/virtualbox/virtualbox.info18
3 files changed, 31 insertions, 10 deletions
diff --git a/system/virtualbox/virtualbox-VBoxR0.diff b/system/virtualbox/virtualbox-VBoxR0.diff
new file mode 100644
index 000000000000..d7fc0064b576
--- /dev/null
+++ b/system/virtualbox/virtualbox-VBoxR0.diff
@@ -0,0 +1,18 @@
+--- Config.kmk 2022-04-21 17:20:08.982249736 -0500
++++ Config.kmk 2022-04-21 17:23:36.276570980 -0500
+@@ -4502,11 +4502,14 @@ ifeq ($(VBOX_LDR_FMT),elf)
+ TEMPLATE_VBoxR0_TOOL = $(VBOX_GCC_TOOL)
+ TEMPLATE_VBoxR0_CFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C) \
+ $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions \
+- $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-hidden) -std=gnu99 $(VBOX_GCC_IPRT_FMT_CHECK)
++ $(VBOX_GCC_fno-stack-protector) -fno-common -ffreestanding $(VBOX_GCC_fvisibility-hidden) -std=gnu99 $(VBOX_GCC_IPRT_FMT_CHECK)
+ TEMPLATE_VBoxR0_CXXFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) \
+ $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions \
+ $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) \
+ -fno-rtti $(VBOX_GCC_IPRT_FMT_CHECK)
++if $(VBOX_GCC_VERSION_CC) >= 40500 # 4.1.2 complains, 4.5.2 is okay, didn't check which version inbetween made it okay with g++.
++TEMPLATE_VBoxR0_CXXFLAGS = -ffreestanding
++endif
+ TEMPLATE_VBoxR0_CFLAGS.amd64 = -m64 -mno-red-zone -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fasynchronous-unwind-tables -ffreestanding
+ TEMPLATE_VBoxR0_CXXFLAGS.amd64 = -m64 -mno-red-zone -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fasynchronous-unwind-tables
+ TEMPLATE_VBoxR0_CXXFLAGS.freebsd = -ffreestanding
diff --git a/system/virtualbox/virtualbox.SlackBuild b/system/virtualbox/virtualbox.SlackBuild
index 2dc095c179ad..7bf86e5dc3f7 100644
--- a/system/virtualbox/virtualbox.SlackBuild
+++ b/system/virtualbox/virtualbox.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=virtualbox
SRCNAM=VirtualBox
-VERSION=${VERSION:-6.1.32}
+VERSION=${VERSION:-6.1.34}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -127,6 +127,9 @@ patch -d src/VBox/Installer/linux -i $CWD/vboxdrv.sh-setup.diff
# Fix wrong path to rdesktop-vrdp-keymaps
patch -p1 -i $CWD/006-rdesktop-vrdp-keymap-path.patch
+# Fix "Unable to locate imported symbol 'memset'" error.
+patch -i $CWD/virtualbox-VBoxR0.diff
+
# Skip python2 detection and cheat about python-3.10 support
sed -i 's|python2.7 python2.6 |python3.10 |' ./configure
diff --git a/system/virtualbox/virtualbox.info b/system/virtualbox/virtualbox.info
index 275d7870c8ef..ac29719bba75 100644
--- a/system/virtualbox/virtualbox.info
+++ b/system/virtualbox/virtualbox.info
@@ -1,16 +1,16 @@
PRGNAM="virtualbox"
-VERSION="6.1.32"
+VERSION="6.1.34"
HOMEPAGE="https://www.virtualbox.org"
DOWNLOAD="UNSUPPORTED"
MD5SUM=""
-DOWNLOAD_x86_64="http://download.virtualbox.org/virtualbox/6.1.32/VirtualBox-6.1.32.tar.bz2 \
- http://download.virtualbox.org/virtualbox/6.1.32/VBoxGuestAdditions_6.1.32.iso \
- http://download.virtualbox.org/virtualbox/6.1.32/UserManual.pdf \
- http://download.virtualbox.org/virtualbox/6.1.32/SDKRef.pdf"
-MD5SUM_x86_64="553fa1a45336f675af19682e138e36b6 \
- 18972c8ed19420e090d346d24787db13 \
- 47c78348fa52a3cca6be040409d134d8 \
- d6f15e415089dc1c944ea9cee95c22b0"
+DOWNLOAD_x86_64="http://download.virtualbox.org/virtualbox/6.1.34/VirtualBox-6.1.34.tar.bz2 \
+ http://download.virtualbox.org/virtualbox/6.1.34/VBoxGuestAdditions_6.1.34.iso \
+ http://download.virtualbox.org/virtualbox/6.1.34/UserManual.pdf \
+ http://download.virtualbox.org/virtualbox/6.1.34/SDKRef.pdf"
+MD5SUM_x86_64="5ee5e141a7bd6251420e7d7a2cc76206
+ 16cfa062d19f4578f6bd24648b99eca4
+ 3359ceb79c7c822c27932d07ba81ff29
+ c19debd43e6c5667a7ad6a1c1ce4c552"
REQUIRES="acpica virtualbox-kernel"
MAINTAINER="Heinz Wiesinger"
EMAIL="pprkut@slackbuilds.org"