system/virtualbox: Updated for version 6.1.26.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 43 insertions, 32 deletions

diff --git a/system/virtualbox/configure.patch b/system/virtualbox/configure.patch
new file mode 100644
index 0000000000..b9cc5c96d6
--- /dev/null
+++ b/system/virtualbox/configure.patch
@@ -0,0 +1,15 @@
+diff -Naur VirtualBox-6.1.26.orig/configure VirtualBox-6.1.26/configure
+--- VirtualBox-6.1.26.orig/configure	2021-07-28 18:13:45.000000000 +0200
++++ VirtualBox-6.1.26/configure	2021-08-20 18:43:20.615000000 +0200
+@@ -1561,9 +1561,9 @@
+         qt5_ver=`pkg-config Qt5Core --modversion 2>> $LOG`
+         if [ $? -eq 0 ]; then
+           echo "(Qt5 from pkg-config)" >> $LOG
+-          FLGQT5=`pkg-config Qt5Core Qt5Gui --cflags`
++          FLGQT5=`pkg-config Qt5Core --cflags`
+           # gcc 4.8 is able to compile with C++11 (see also VBOX_GCC_std in Config.kmk)
+-          [ $(($cc_maj * 100 + $cc_min)) -ge 408 ] && FLGQT5="$FLGQT5 -std=c++11"
++          FLGQT5="$FLGQT5 -std=c++11"
+           INCQT5=`strip_I "$FLGQT5"`
+           LIBDIR5=`pkg-config Qt5Core --variable=libdir`
+           LIBQT5=`pkg-config Qt5Core Qt5Gui --libs`
diff --git a/system/virtualbox/vboxdrv.sh-setup.diff b/system/virtualbox/vboxdrv.sh-setup.diff
index bb2be6fc89..76c0d580c0 100644
--- a/system/virtualbox/vboxdrv.sh-setup.diff
+++ b/system/virtualbox/vboxdrv.sh-setup.diff
@@ -1,5 +1,6 @@
---- VirtualBox-6.1.4.orig/src/VBox/Installer/linux/vboxdrv.sh	2020-02-18 18:20:19.000000000 +0100
-+++ VirtualBox-6.1.4/src/VBox/Installer/linux/vboxdrv.sh	2020-02-22 14:33:41.141337430 +0100
+diff -Naur VirtualBox-6.1.26.orig/src/VBox/Installer/linux/vboxdrv.sh VirtualBox-6.1.26/src/VBox/Installer/linux/vboxdrv.sh
+--- VirtualBox-6.1.26.orig/src/VBox/Installer/linux/vboxdrv.sh	2021-07-28 18:24:14.000000000 +0200
++++ VirtualBox-6.1.26/src/VBox/Installer/linux/vboxdrv.sh	2021-08-20 14:10:47.151000000 +0200
 @@ -61,23 +61,8 @@
  export USERNAME
  export USER=$USERNAME
@@ -24,7 +25,7 @@
  if test -u "${VIRTUALBOX}"; then
      GROUP=root
      DEVICE_MODE=0600
-@@ -148,125 +133,6 @@
+@@ -148,131 +133,6 @@
      echo "${1}" >> "${LOG}"
  }
  
@@ -36,6 +37,12 @@
 -        >> "${LOG}"
 -}
 -
+-# Detect VirtualBox version info or report error.
+-VBOX_VERSION="`"$VBOXMANAGE" -v | cut -d r -f1`"
+-[ -n "$VBOX_VERSION" ] || failure 'Cannot detect VirtualBox version number'
+-VBOX_REVISION="r`"$VBOXMANAGE" -v | cut -d r -f2`"
+-[ "$VBOX_REVISION" != "r" ] || failure 'Cannot detect VirtualBox revision number'
+-
 -## Output the vboxdrv part of our udev rule.  This is redirected to the right file.
 -udev_write_vboxdrv() {
 -    VBOXDRV_GRP="$1"
@@ -147,22 +154,10 @@
 -    rm -rf /dev/vboxusb
 -}
 -
- start()
+ # Returns path to module file as seen by modinfo(8) or empty string.
+ module_path()
  {
-     begin_msg "Starting VirtualBox services" console
-@@ -287,10 +153,7 @@
-             failure "Cannot remove $DEVICE"
-         fi
-         if ! $MODPROBE vboxdrv > /dev/null 2>&1; then
--            setup
--            if ! $MODPROBE vboxdrv > /dev/null 2>&1; then
--                failure "modprobe vboxdrv failed. Please use 'dmesg' to find out why"
--            fi
-+            failure "modprobe vboxdrv failed. Please use 'dmesg' to find out why"
-         fi
-         sleep .2
-     fi
-@@ -337,8 +200,6 @@
+@@ -415,8 +275,6 @@
          mkdir -p -m 0750 /dev/vboxusb 2>/dev/null
          chown root:vboxusers /dev/vboxusb 2>/dev/null
      fi
@@ -171,7 +166,7 @@
      succ_msg "VirtualBox services started"
  }
  
-@@ -419,102 +280,10 @@
+@@ -497,102 +355,10 @@
      fi
  }
  
@@ -271,11 +266,11 @@
 -            begin_msg "Failed to enroll secure boot key." console
 -        rmdir -p /var/lib/dkms/vbox-temp 2>/dev/null
 -    fi
-+    echo "Not implemented! Please use the virtualbox-kernel.SlackBuild available at SlackBuilds.org instead."
++   echo "Not implemented! Please use the virtualbox-kernel.SlackBuild available at SlackBuilds.org instead."
  }
  
  dmnstatus()
-@@ -564,20 +333,7 @@
+@@ -642,20 +408,7 @@
      stop && start
      ;;
  setup)
diff --git a/system/virtualbox/virtualbox.SlackBuild b/system/virtualbox/virtualbox.SlackBuild
index 5afb98f7c9..dd2b99c117 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.22}
+VERSION=${VERSION:-6.1.26}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -147,8 +147,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
 
-# Remove gcc version check
+# Remove gcc version check and fix the qt5 flags
 sed -i 's/^check_gcc$/#check_gcc/' ./configure
+patch -p1 < $CWD/configure.patch
 
 # Use our CFLAGS
 sed -i "s|CXX_FLAGS=\"\"|CXX_FLAGS=\"$SLKCFLAGS -std=c++11\"|" ./configure
diff --git a/system/virtualbox/virtualbox.info b/system/virtualbox/virtualbox.info
index 5eb3c88f63..605b09076e 100644
--- a/system/virtualbox/virtualbox.info
+++ b/system/virtualbox/virtualbox.info
@@ -1,14 +1,14 @@
 PRGNAM="virtualbox"
-VERSION="6.1.22"
+VERSION="6.1.26"
 HOMEPAGE="https://www.virtualbox.org"
-DOWNLOAD="http://download.virtualbox.org/virtualbox/6.1.22/VirtualBox-6.1.22.tar.bz2 \
-          http://download.virtualbox.org/virtualbox/6.1.22/VBoxGuestAdditions_6.1.22.iso \
-          http://download.virtualbox.org/virtualbox/6.1.22/UserManual.pdf \
-          http://download.virtualbox.org/virtualbox/6.1.22/SDKRef.pdf"
-MD5SUM="abb1a20021e5915fe38c666e8c11cf80 \
-        a605386e0c12e2f730f11320f095029c \
-        08851ab0abf2692ed838efc4f402fe34 \
-        cd7598b4e7fea62690811d799b1b5f9d"
+DOWNLOAD="http://download.virtualbox.org/virtualbox/6.1.26/VirtualBox-6.1.26.tar.bz2 \
+          http://download.virtualbox.org/virtualbox/6.1.26/VBoxGuestAdditions_6.1.26.iso \
+          http://download.virtualbox.org/virtualbox/6.1.26/UserManual.pdf \
+          http://download.virtualbox.org/virtualbox/6.1.26/SDKRef.pdf"
+MD5SUM="fce04bbef244b4df1a50e53d132d3e6f \
+        cab53b0d504e08d155a8f95878b2afc1 \
+        b84b95683c73e84c1c59d252106b4706 \
+        b4f1f29b1b97d358df416ec9a008f671"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="acpica virtualbox-kernel"