From 00f599f482b7060f7f57cbb497a82f8eb01cae7f Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@hotmail.com>
Date: Wed, 5 Aug 2020 18:32:47 +0300
Subject: [PATCH] kernel-5.7.13

---
 hardware/virtualization/virtualbox/actions.py |  2 ++
 .../virtualbox/files/018-xclient.patch        | 24 +++++++++++++++++++
 .../virtualbox/files/LocalConfig.kmk          |  3 +++
 hardware/virtualization/virtualbox/pspec.xml  | 14 ++++++++---
 4 files changed, 40 insertions(+), 3 deletions(-)
 create mode 100644 hardware/virtualization/virtualbox/files/018-xclient.patch

diff --git a/hardware/virtualization/virtualbox/actions.py b/hardware/virtualization/virtualbox/actions.py
index 4d0631d2a6..7c1657e135 100644
--- a/hardware/virtualization/virtualbox/actions.py
+++ b/hardware/virtualization/virtualbox/actions.py
@@ -104,6 +104,8 @@ def install():
     # Guest additions
     pisitools.dobin("additions/VBoxClient")
     pisitools.dobin("additions/VBoxControl")
+    
+    pisitools.dobin("additions/VBoxDRMClient")
 
     pisitools.dosbin("additions/VBoxService")
     pisitools.dosbin("additions/mount.vboxsf", "/sbin")
diff --git a/hardware/virtualization/virtualbox/files/018-xclient.patch b/hardware/virtualization/virtualbox/files/018-xclient.patch
new file mode 100644
index 0000000000..411c85d1b9
--- /dev/null
+++ b/hardware/virtualization/virtualbox/files/018-xclient.patch
@@ -0,0 +1,24 @@
+--- a/src/VBox/Additions/x11/Installer/98vboxadd-xclient
++++ b/src/VBox/Additions/x11/Installer/98vboxadd-xclient
+@@ -21,18 +21,11 @@ for i in $HOME/.vboxclient-*.pid; do
+     test -w $i || rm -f $i
+ done
+
+-if ! test -c /dev/vboxguest 2>/dev/null; then
+-   # Do not start if the kernel module is not present.
+-   # Execute notify-send in the back-ground to avoid racing with sddm,
+-   # as notify-send may wait for sddm to start while it waits for us to exit.
+-   notify-send "VBoxClient: the VirtualBox kernel service is not running.  Exiting." &
+-elif test -z "${SSH_CONNECTION}"; then
+-   # This script can also be triggered by a connection over SSH, which is not
+-   # what we had in mind, so we do not start VBoxClient in that case.  We do
+-   # not use "exit" here as this script is "source"d, not executed.
++# Do not start if the kernel module is not present; or if this script is
++# triggered by a connection over SSH.
++if [ -c /dev/vboxguest -a -z "${SSH_CONNECTION}" ]; then
+   /usr/bin/VBoxClient --clipboard
+   /usr/bin/VBoxClient --checkhostversion
+   /usr/bin/VBoxClient --seamless
+   /usr/bin/VBoxClient --draganddrop
+-  /usr/bin/VBoxClient --vmsvga  # In case VMSVGA emulation is enabled
+ fi
diff --git a/hardware/virtualization/virtualbox/files/LocalConfig.kmk b/hardware/virtualization/virtualbox/files/LocalConfig.kmk
index f6e89715eb..bcfc66b622 100644
--- a/hardware/virtualization/virtualbox/files/LocalConfig.kmk
+++ b/hardware/virtualization/virtualbox/files/LocalConfig.kmk
@@ -19,6 +19,9 @@ VBOX_PATH_PACKAGE_DOCS := $(VBOX_PATH_APP_DOCS)
 VBOX_BLD_PYTHON = python
 VBOX_JAVA_HOME = /usr/lib/jvm/java-8-openjdk
 
+# disable experimental cloud infrastructure integration
+VBOX_WITH_CLOUD_NET :=
+
 # do not fail on warning
 VBOX_GCC_WERR =
 VBOX_GCC_WARN =
diff --git a/hardware/virtualization/virtualbox/pspec.xml b/hardware/virtualization/virtualbox/pspec.xml
index 2e6a90a278..e4f0af5791 100644
--- a/hardware/virtualization/virtualbox/pspec.xml
+++ b/hardware/virtualization/virtualbox/pspec.xml
@@ -12,7 +12,7 @@
         <IsA>app:gui</IsA>
         <Summary>A powerful virtualization program</Summary>
         <Description>VirtualBox is a family of powerful x86 virtualization products for enterprise as well as home use. This is the Open Source Edition which lacks USB support and some other things.</Description>
-        <Archive sha1sum="1545c4e5f138cc118ed2b3e72e2dd6a013f46b41" type="tarbz2">http://download.virtualbox.org/virtualbox/6.1.10/VirtualBox-6.1.10.tar.bz2</Archive>
+        <Archive sha1sum="3d69ed2b6125c7962794e0da7b210633566abbac" type="tarbz2">http://download.virtualbox.org/virtualbox/6.1.12/VirtualBox-6.1.12.tar.bz2</Archive>
         <AdditionalFiles>
             <AdditionalFile owner="root" permission="0644" target="dkms.conf">dkms.conf</AdditionalFile>
             <AdditionalFile owner="root" permission="0644" target="dkms-guest.conf">dkms-guest.conf</AdditionalFile>
@@ -71,7 +71,7 @@
             <Patch level="1">VirtualBox-6.1.2-disable-update.patch</Patch>
             <Patch level="1">0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch</Patch>
             <Patch level="1">017-fix-narrowing-conversion.patch</Patch>
-            <Patch level="1">018-work-around-black-screen.patch</Patch>
+            <Patch level="1">018-xclient.patch</Patch>
             <Patch level="1">020-gsoap.patch</Patch>
         </Patches>
     </Source>
@@ -158,6 +158,7 @@
             <Path fileType="executable">/sbin</Path>
             <Path fileType="executable">/usr/bin/VBoxClient*</Path>
             <Path fileType="executable">/usr/bin/VBoxControl</Path>
+            <Path fileType="executable">/usr/bin/VBoxDRMClient</Path>
             <Path fileType="executable">/usr/sbin</Path>
             <Path fileType="library">/usr/lib</Path>
             <Path fileType="data">/usr/kde/*/share/autostart</Path>
@@ -198,6 +199,13 @@
     </Package>
 
     <History>
+        <Update release="38">
+            <Date>2020-07-18</Date>
+            <Version>6.1.12</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="37">
             <Date>2020-06-08</Date>
             <Version>6.1.10</Version>
@@ -465,4 +473,4 @@
             <Email>alialgul@pisilinux.org</Email>
         </Update>
     </History>
-</PISI>
\ No newline at end of file
+</PISI>