From 693735669ae4429b1b2d9b7e80ea0d0c30d63670036e4215984a63fdd535fad7 Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger@gmail.com>
Date: Tue, 27 Sep 2022 18:00:44 +0000
Subject: [PATCH] Accepting request 1006481 from
 home:lwfinger:branches:Virtualization

- Add a "Provides: virtualbox-guest-x11" to virtualbox-guest-tools. boo#1203735

OBS-URL: https://build.opensuse.org/request/show/1006481
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=655
---
 UserManual.pdf                |  4 ++--
 vboxweb-service.sh            |  4 ++++
 virtualbox-60-vboxdrv.rules   |  2 +-
 virtualbox-60-vboxguest.rules |  2 +-
 virtualbox.changes            |  5 +++++
 virtualbox.spec               | 13 ++++++++-----
 6 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/UserManual.pdf b/UserManual.pdf
index 51278cb..e323a21 100644
--- a/UserManual.pdf
+++ b/UserManual.pdf
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e8623508cbb61b59bb125ea9ae7bff202ab8151194033a1b61bace183b991114
-size 4994227
+oid sha256:3e52f4400fb809a78dc1117a190929973c5dd44d24c431cec0de679ce5321bc7
+size 4995165
diff --git a/vboxweb-service.sh b/vboxweb-service.sh
index 417a3e0..536172e 100644
--- a/vboxweb-service.sh
+++ b/vboxweb-service.sh
@@ -158,6 +158,10 @@ start() {
         if [ -n "$PID" ]; then
             echo "$PID" > $PIDFILE
             RETVAL=0
+	    firewall-cmd --permanent --new-service=vboxweb
+	    firewall-cmd --permanent --service=vboxweb --set-description="service to remotely manage VirtualBox"
+	    firewall-cmd --permanent --add-port=18083/tcp --zone=internal --service=vboxweb
+	    firewall-cmd --permanent --set-short="vboxweb" --service=vboxweb
             succ_msg "VirtualBox web service started"
         else
             RETVAL=1
diff --git a/virtualbox-60-vboxdrv.rules b/virtualbox-60-vboxdrv.rules
index 6a4093a..d26b7b4 100644
--- a/virtualbox-60-vboxdrv.rules
+++ b/virtualbox-60-vboxdrv.rules
@@ -1,5 +1,5 @@
 KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600"
-KERNEL=="vboxdrvu", NAME="vboxdrvu", OWNER="root", GROUP="root", MODE="0666"
+KERNEL=="vboxdrvu", NAME="vboxdrvu", OWNER="root", GROUP="root", MODE="0660"
 KERNEL=="vboxnetctl", NAME="vboxnetctl", OWNER="root", GROUP="root", MODE="0600"
 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}"
diff --git a/virtualbox-60-vboxguest.rules b/virtualbox-60-vboxguest.rules
index 7ec3ada..1eb0b0a 100644
--- a/virtualbox-60-vboxguest.rules
+++ b/virtualbox-60-vboxguest.rules
@@ -1,5 +1,5 @@
 KERNEL=="vboxguest", NAME="vboxguest", OWNER="root", MODE="0660" ENV{ID_INPUT}="1", ENV{ID_INPUT_MOUSE}="1"
-KERNEL=="vboxuser", NAME="vboxuser", OWNER="vboxadd", MODE="0666"
+KERNEL=="vboxuser", NAME="vboxuser", OWNER="vboxadd", MODE="0660"
 #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 3b32850..ee07a59 100644
--- a/virtualbox.changes
+++ b/virtualbox.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep 27 17:23:12 UTC 2022 - Larry Finger <Larry.Finger@gmail.com>
+
+- Add a "Provides: virtualbox-guest-x11" to virtualbox-guest-tools. boo#1203735 
+
 -------------------------------------------------------------------
 Fri Sep 16 15:03:48 UTC 2022 - Larry Rainey <llrainey15@gmail.com>
 
diff --git a/virtualbox.spec b/virtualbox.spec
index 7f3e4bd..49300a9 100644
--- a/virtualbox.spec
+++ b/virtualbox.spec
@@ -300,6 +300,7 @@ the terms of the GNU Public License (GPL).
 
 
 
+
 ##########################################
 
 %package qt
@@ -318,11 +319,6 @@ Obsoletes:      %{name}-ose-qt < %{version}
 %description qt
 This package contains the code for the GUI used to control VMs.
 
-
-
-
-#########################################
-
 %package websrv
 Summary:        WebService GUI part for %{name}
 Group:          System/Emulators/PC
@@ -339,6 +335,7 @@ The VirtualBox web server is used to control headless VMs using a browser.
 
 
 ###########################################
+
 %package guest-tools
 Summary:        VirtualBox guest tools
 Group:          System/Emulators/PC
@@ -351,6 +348,7 @@ Supplements:    modalias(pci:v000080EEd0000CAFEsv*sd*bc*sc*i*)
 Provides:       %{name}-ose-guest-tools = %{version}
 Obsoletes:      %{name}-ose-guest-tools < %{version}
 Obsoletes:      virtualbox-guest-x11
+Provides:       virtualbox-guest-x11
 Obsoletes:      xorg-x11-driver-virtualbox-ose
 %if ! 0%{?suse_version} > 1325
 Requires(pre):  net-tools-deprecated
@@ -362,6 +360,7 @@ VirtualBox guest addition tools.
 
 
 
+
 ###########################################
 
 %package -n python3-%{name}
@@ -384,6 +383,7 @@ Python XPCOM bindings to %{name}. Used e.g. by vboxgtk package.
 
 
 
+
 ###########################################
 
 %package devel
@@ -401,6 +401,7 @@ Development file for %{name}
 
 
 
+
 ###########################################
 
 %package host-source
@@ -435,6 +436,7 @@ sudo %{_sbindir}/vboxguestconfig
 
 
 
+
 ###########################################
 
 %package guest-desktop-icons
@@ -450,6 +452,7 @@ This package contains icons for guest desktop files that were created on the des
 
 
 
+
 ###########################################
 
 %package vnc