6.1.8-1: Bumped version

4 files changed, 75 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0e9d29bd061a..8223256b68ae 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = virtualbox-headless
 	pkgdesc = Powerful x86 virtualization for enterprise as well as home use. Headless build (no GUI, no Java).
-	pkgver = 6.1.6
+	pkgver = 6.1.8
 	pkgrel = 1
 	url = https://virtualbox.org
 	install = virtualbox.install
@@ -28,13 +28,13 @@ pkgbase = virtualbox-headless
 	optdepends = virtualbox-guest-iso: Guest Additions CD image
 	optdepends = virtualbox-ext-vnc: VNC server support
 	optdepends = virtualbox-sdk: Developer kit
-	provides = virtualbox=6.1.6
+	provides = virtualbox=6.1.8
 	conflicts = virtualbox-ose
 	conflicts = virtualbox
 	replaces = virtualbox-ose
 	replaces = virtualbox
 	backup = etc/vbox/vbox.cfg
-	source = https://download.virtualbox.org/virtualbox/6.1.6/VirtualBox-6.1.6.tar.bz2
+	source = https://download.virtualbox.org/virtualbox/6.1.8/VirtualBox-6.1.8.tar.bz2
 	source = virtualbox.sysusers
 	source = 60-vboxdrv.rules
 	source = 60-vboxguest.rules
@@ -48,7 +48,9 @@ pkgbase = virtualbox-headless
 	source = 008-no-vboxvideo.patch
 	source = 012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch
 	source = 013-Makefile.patch
-	sha256sums = b031c30d770f28c5f884071ad933e8c1f83e65b93aaba03a4012077c1d90a54f
+	source = 017-fix-narrowing-conversion.patch
+	source = 018-work-around-black-screen.patch
+	sha256sums = 426888f83036b6b1f79c272d317a4e8ecf43781f6a266fd7209c03dca504eefc
 	sha256sums = 2101ebb58233bbfadf3aa74381f22f7e7e508559d2b46387114bc2d8e308554c
 	sha256sums = 9c5238183019f9ebc7d92a8582cad232f471eab9d3278786225abc1a1c7bf66e
 	sha256sums = 033c597e0f5285d2ddb0490868e5b6f945f45c7b1b1152a02a9e6fea438b2c95
@@ -62,6 +64,8 @@ pkgbase = virtualbox-headless
 	sha256sums = 053bfeee8863f3ffdf2f0e3f9f0d77dc61dd32764700a97a7635fd8611e20491
 	sha256sums = 81900e13d36630488accd8c0bfd2ceb69563fb2c4f0f171caba1cca59d438024
 	sha256sums = da7e58ed37dc23c6202aab3017864579a99e78417f3421ddcc98a198198fe2c9
+	sha256sums = 5aac692909a0a0ec56b08bdece9e42cf7463abdca9da2f990d441ff463be6a99
+	sha256sums = 116f90f2d87a0a5d49e84b734dd6407667faf9e44f5078085bba591dd357745f
 
 pkgname = virtualbox-headless
 
diff --git a/017-fix-narrowing-conversion.patch b/017-fix-narrowing-conversion.patch
new file mode 100644
index 000000000000..5ca8215675ee
--- /dev/null
+++ b/017-fix-narrowing-conversion.patch
@@ -0,0 +1,37 @@
+From ee6ae088673d14c407d4773855dbda821024653c Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail@eworm.de>
+Date: Sun, 17 May 2020 00:40:18 +0200
+Subject: [PATCH 1/1] fix narrowing conversion
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Building fails with:
+
+/build/virtualbox/src/VirtualBox-6.1.8/src/VBox/Debugger/DBGCDumpImage.cpp: In function ‘const char* dbgcMachoCpuType(uint32_t, uint32_t)’:
+/build/virtualbox/src/VirtualBox-6.1.8/include/iprt/formats/mach-o.h:41:46: error: narrowing conversion of ‘-1’ from ‘int’ to ‘unsigned int’ [-Wnarrowing]
+   41 | #define CPU_TYPE_ANY                INT32_C(-1)
+      |                                              ^
+/build/virtualbox/src/VirtualBox-6.1.8/src/VBox/Debugger/DBGCDumpImage.cpp:471:14: note: in expansion of macro ‘CPU_TYPE_ANY’
+  471 |         case CPU_TYPE_ANY:          return "CPU_TYPE_ANY";
+      |              ^~~~~~~~~~~~
+
+As uType is unsigned it can never match CPU_TYPE_ANY, which is -1.
+
+Signed-off-by: Christian Hesse <mail@eworm.de>
+---
+ src/VBox/Debugger/DBGCDumpImage.cpp | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/VBox/Debugger/DBGCDumpImage.cpp b/src/VBox/Debugger/DBGCDumpImage.cpp
+index 02ba3158..d906c37c 100644
+--- a/src/VBox/Debugger/DBGCDumpImage.cpp
++++ b/src/VBox/Debugger/DBGCDumpImage.cpp
+@@ -468,7 +468,6 @@ static const char *dbgcMachoCpuType(uint32_t uType, uint32_t uSubType)
+ {
+     switch (uType)
+     {
+-        case CPU_TYPE_ANY:          return "CPU_TYPE_ANY";
+         case CPU_TYPE_VAX:          return "VAX";
+         case CPU_TYPE_MC680x0:      return "MC680x0";
+         case CPU_TYPE_X86:          return "X86";
diff --git a/018-work-around-black-screen.patch b/018-work-around-black-screen.patch
new file mode 100644
index 000000000000..41777f4c15a1
--- /dev/null
+++ b/018-work-around-black-screen.patch
@@ -0,0 +1,20 @@
+From bbd990f83a23c22da787d10c62bd7ff114d32703 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail@eworm.de>
+Date: Mon, 18 May 2020 08:21:06 +0200
+Subject: [PATCH 1/1] work around black screen
+
+Signed-off-by: Christian Hesse <mail@eworm.de>
+---
+ src/VBox/Additions/x11/Installer/98vboxadd-xclient | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/VBox/Additions/x11/Installer/98vboxadd-xclient b/src/VBox/Additions/x11/Installer/98vboxadd-xclient
+index e7d4e292..7a17a692 100755
+--- a/src/VBox/Additions/x11/Installer/98vboxadd-xclient
++++ b/src/VBox/Additions/x11/Installer/98vboxadd-xclient
+@@ -34,5 +34,4 @@ elif test -z "${SSH_CONNECTION}"; then
+   /usr/bin/VBoxClient --checkhostversion
+   /usr/bin/VBoxClient --seamless
+   /usr/bin/VBoxClient --draganddrop
+-  /usr/bin/VBoxClient --vmsvga-x11  # In case VMSVGA emulation is enabled
+ fi
diff --git a/PKGBUILD b/PKGBUILD
index 462f47e8262e..0b4f2ccc0b7e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=virtualbox-headless
-pkgver=6.1.6
+pkgver=6.1.8
 _tarver=${pkgver}
 pkgrel=1
 pkgdesc='Powerful x86 virtualization for enterprise as well as home use. Headless build (no GUI, no Java).'
@@ -37,9 +37,11 @@ source=("https://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${_tarv
         '008-no-vboxvideo.patch'
         '012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch'
         '013-Makefile.patch'
+        '017-fix-narrowing-conversion.patch'
+        '018-work-around-black-screen.patch'
         )
 sha256sums=(
-    'b031c30d770f28c5f884071ad933e8c1f83e65b93aaba03a4012077c1d90a54f'
+    '426888f83036b6b1f79c272d317a4e8ecf43781f6a266fd7209c03dca504eefc'
     '2101ebb58233bbfadf3aa74381f22f7e7e508559d2b46387114bc2d8e308554c'
     '9c5238183019f9ebc7d92a8582cad232f471eab9d3278786225abc1a1c7bf66e'
     '033c597e0f5285d2ddb0490868e5b6f945f45c7b1b1152a02a9e6fea438b2c95'
@@ -53,6 +55,8 @@ sha256sums=(
     '053bfeee8863f3ffdf2f0e3f9f0d77dc61dd32764700a97a7635fd8611e20491'
     '81900e13d36630488accd8c0bfd2ceb69563fb2c4f0f171caba1cca59d438024'
     'da7e58ed37dc23c6202aab3017864579a99e78417f3421ddcc98a198198fe2c9'
+    '5aac692909a0a0ec56b08bdece9e42cf7463abdca9da2f990d441ff463be6a99'
+    '116f90f2d87a0a5d49e84b734dd6407667faf9e44f5078085bba591dd357745f'
 )
 
 prepare() {
@@ -98,6 +102,9 @@ build() {
 
     echo 'Build VNC extension pack'
     kmk -C src/VBox/ExtPacks/VNC packing
+
+    echo 'Build vboximg-mount'
+    kmk -C src/VBox/ImageMounter/vboximg-mount
 }
 
 package() {
@@ -115,6 +122,7 @@ package() {
         ln -sf VBox "$pkgdir/usr/bin/${i,,}"
     done
     install -m0755 VBoxTunctl "$pkgdir/usr/bin"
+    install -m0755 vboximg-mount "$pkgdir/usr/bin"
 
     # libraries
     install -dm0755 "$pkgdir/usr/lib/virtualbox"