From 791b9c092a66223f409c043bdc9bd38fd8ad7e92acf1d9e2c3921ae998f0498d Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger@gmail.com>
Date: Wed, 5 Oct 2022 19:01:23 +0000
Subject: [PATCH] Accepting request 1008282 from
 home:lwfinger:branches:Virtualization

- Fix boo#1204019 VBoxClient: VbglR3InitUser failed: VERR_ACCESS_DENIED

OBS-URL: https://build.opensuse.org/request/show/1008282
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=657
---
 vboxdrv.sh                    |  2 +-
 virtualbox-60-vboxdrv.rules   |  6 +++---
 virtualbox-60-vboxguest.rules |  4 +---
 virtualbox.changes            |  5 +++++
 virtualbox.spec               | 28 ----------------------------
 5 files changed, 10 insertions(+), 35 deletions(-)

diff --git a/vboxdrv.sh b/vboxdrv.sh
index 8745d48..0079acb 100644
--- a/vboxdrv.sh
+++ b/vboxdrv.sh
@@ -94,7 +94,7 @@ udev_write_vboxdrv() {
     VBOXDRV_MODE="$2"
 
     echo "KERNEL==\"vboxdrv\", NAME=\"vboxdrv\", OWNER=\"root\", GROUP=\"$VBOXDRV_GRP\", MODE=\"$VBOXDRV_MODE\""
-    echo "KERNEL==\"vboxdrvu\", NAME=\"vboxdrvu\", OWNER=\"root\", GROUP=\"root\", MODE=\"0666\""
+    echo "KERNEL==\"vboxdrvu\", NAME=\"vboxdrvu\", OWNER=\"root\", GROUP=\"$VBOXDRV_GRP\", MODE=\"0660\""
     echo "KERNEL==\"vboxnetctl\", NAME=\"vboxnetctl\", OWNER=\"root\", GROUP=\"$VBOXDRV_GRP\", MODE=\"$VBOXDRV_MODE\""
 }
 
diff --git a/virtualbox-60-vboxdrv.rules b/virtualbox-60-vboxdrv.rules
index d26b7b4..9c0aa92 100644
--- a/virtualbox-60-vboxdrv.rules
+++ b/virtualbox-60-vboxdrv.rules
@@ -1,6 +1,6 @@
-KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600"
-KERNEL=="vboxdrvu", NAME="vboxdrvu", OWNER="root", GROUP="root", MODE="0660"
-KERNEL=="vboxnetctl", NAME="vboxnetctl", OWNER="root", GROUP="root", MODE="0600"
+KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="vboxusers", MODE="0660"
+KERNEL=="vboxdrvu", NAME="vboxdrvu", OWNER="root", GROUP="vboxusers", MODE="0660"
+KERNEL=="vboxnetctl", NAME="vboxnetctl", OWNER="root", GROUP="vboxusers", MODE="0660"
 SUBSYSTEM=="usb_device", ACTION=="add", RUN+="/usr/lib/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
 SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN+="/usr/lib/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
 SUBSYSTEM=="usb_device", ACTION=="remove", RUN+="/usr/lib/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
diff --git a/virtualbox-60-vboxguest.rules b/virtualbox-60-vboxguest.rules
index 1eb0b0a..331c61a 100644
--- a/virtualbox-60-vboxguest.rules
+++ b/virtualbox-60-vboxguest.rules
@@ -1,6 +1,4 @@
 KERNEL=="vboxguest", NAME="vboxguest", OWNER="root", MODE="0660" ENV{ID_INPUT}="1", ENV{ID_INPUT_MOUSE}="1"
-KERNEL=="vboxuser", NAME="vboxuser", OWNER="vboxadd", MODE="0660"
-#KERNEL=="vboxuser", NAME="vboxuser", OWNER="root", MODE="0660", TAG+="uaccess"
-
+KERNEL=="vboxuser", NAME="vboxuser", OWNER="root", MODE="0660", TAG+="uaccess"
 ACTION=="add|change", SUBSYSTEM=="drm", KERNEL=="card[0-9]", SUBSYSTEMS=="pci", ATTRS{vendor}=="0x15ad", ATTRS{device}=="0x0405", TAG+="systemd", ENV{SYSTEMD_WANTS}="vboxclient.service"
 
diff --git a/virtualbox.changes b/virtualbox.changes
index ee07a59..b222520 100644
--- a/virtualbox.changes
+++ b/virtualbox.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Oct  5 17:28:00 UTC 2022 - Larry Finger <Larry.Finger@gmail.com>
+
+- Fix boo#1204019 VBoxClient: VbglR3InitUser failed: VERR_ACCESS_DENIED
+
 -------------------------------------------------------------------
 Tue Sep 27 17:23:12 UTC 2022 - Larry Finger <Larry.Finger@gmail.com>
 
diff --git a/virtualbox.spec b/virtualbox.spec
index 49300a9..7b242ea 100644
--- a/virtualbox.spec
+++ b/virtualbox.spec
@@ -297,10 +297,6 @@ and others, and limited virtualization of macOS guests on Apple
 hardware. VirtualBox is freely available as Open Source Software under
 the terms of the GNU Public License (GPL).
 
-
-
-
-
 ##########################################
 
 %package qt
@@ -330,10 +326,6 @@ Obsoletes:      %{name}-vboxwebsrv < %{version}
 %description websrv
 The VirtualBox web server is used to control headless VMs using a browser.
 
-
-
-
-
 ###########################################
 
 %package guest-tools
@@ -357,10 +349,6 @@ Requires(pre):  net-tools-deprecated
 %description guest-tools
 VirtualBox guest addition tools.
 
-
-
-
-
 ###########################################
 
 %package -n python3-%{name}
@@ -380,10 +368,6 @@ Obsoletes:      python3-%{name}-ose < %{version}
 %description -n python3-%{name}
 Python XPCOM bindings to %{name}. Used e.g. by vboxgtk package.
 
-
-
-
-
 ###########################################
 
 %package devel
@@ -398,10 +382,6 @@ Obsoletes:      %{name}-ose-devel < %{version}
 %description devel
 Development file for %{name}
 
-
-
-
-
 ###########################################
 
 %package host-source
@@ -433,10 +413,6 @@ Source files for %{name} guest kernel modules
 These can be built for custom kernels using
 sudo %{_sbindir}/vboxguestconfig
 
-
-
-
-
 ###########################################
 
 %package guest-desktop-icons
@@ -449,10 +425,6 @@ BuildArch:      noarch
 %description guest-desktop-icons
 This package contains icons for guest desktop files that were created on the desktop.
 
-
-
-
-
 ###########################################
 
 %package vnc