--- rpms/smeserver-virtualbox/contribs10/smeserver-virtualbox.spec	2022/08/16 03:47:20	1.1
+++ rpms/smeserver-virtualbox/contribs10/smeserver-virtualbox.spec	2022/10/18 09:20:00	1.2
@@ -1,8 +1,8 @@
 %define name smeserver-virtualbox
-%define version 5.0.0
-%define release 3
-%define rpmver   5.0.0
-Summary: smserver rpm to install virtualbox
+%define version 5.2
+%define release 1
+%define rpmver 5.2
+Summary: smserver rpm to install VirtualBox
 Name: %{name}
 Version: %{version}
 Release: %{release}%{?dist}
@@ -15,15 +15,25 @@ Prefix: %{_prefix}
 BuildArchitectures: noarch
 BuildRequires: e-smith-devtools
 Requires: e-smith-release >= 10.0
-Requires: VirtualBox-5.0
-#Patch0: smeserver-virtualbox-4.3.1_fix_vboxdrv_kernel_module.patch
+Requires: VirtualBox-5.2
+Requires: kernel-devel
+Requires: gcc
 AutoReqProv: no
 
 %description
-smserver rpm to install virtualbox
+smserver rpm to install VirtualBox-5.2
 
 %changelog
-* Wed Aug 07 2015 stephane de Labrusse <stephdl@de-labrusse.fr> 5.0.0-3
+* Tue Oct 11 2022 Trevor Batley <trevor@batley.id.au> 5.2-0
+- first import to sme10
+- requires VirtualBox-5.2
+- create vbox user and run vboxweb-service as vbox user
+- create vbousers group and add admin,vbox as members
+- add vbox & vboxusers as full sme accounts so tha they are in ldap (for ldap authentication)
+- use systemd for vboxdrv 
+- move fix_vboxdrv_kerenel_module.sh script into /usr/lib/virtualbox and include as pre step in vboxdrv service start
+
+* Fri Aug 07 2015 stephane de Labrusse <stephdl@de-labrusse.fr> 5.0.0-3
 - vboxweb-service start now at S99
 
 * Thu Aug 06 2015 stephane de labrusse <stephdl@de-labrusse.fr> 5.0.0-2
@@ -42,10 +52,11 @@ smserver rpm to install virtualbox
 - Initial release
 
 %prep
+
 %setup
-#%patch0 -p1
+
 %build
-#perl createlinks
+perl createlinks
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -59,31 +70,32 @@ cd ..
 rm -rf %{name}-%{version}
 
 %pre
-/etc/init.d/vboxdrv stop >/dev/null 2>&1
+/usr/lib/virtualbox/vboxdrv.sh stop >/dev/null 2>&1
+if /sbin/e-smith/db accounts get vbox >/dev/null
+then
+    echo "the vbox user already exists - we'll use this"
+else
+    /sbin/e-smith/db accounts set vbox user PasswordSet yes
+    /sbin/e-smith/signal-event user-create vbox
+    usermod -s /bin/bash vbox
+    /sbin/e-smith/db accounts set vboxusers group Description "VBox users" Members "admin,vbox"
+    /sbin/e-smith/signal-event group-create vboxusers
+    mkdir /home/e-smith/files/users/vbox/.virtualbox
+    cat /dev/urandom | tr -dc 'a-zA-Z0-9' | head -c 32 > /home/e-smith/files/users/vbox/.virtualbox/vbox.passwd
+    cat /home/e-smith/files/users/vbox/.virtualbox/vbox.passwd  | passwd --stdin vbox
+fi
 
 %preun
+/sbin-e-smith/systemctl stop vboxweb-service
+/sbin/e-smith/systemctl stop vboxdrv
 
 %post
-if [ $1 > 1 ] ; then
-/bin/ln -fs /etc/rc.d/init.d/vboxdrv /etc/rc7.d/S20vboxdrv >/dev/null 2>&1
-/bin/ln -fs /etc/rc.d/init.d/vboxautostart-service /etc/rc7.d/S35vboxautostart-service >/dev/null 2>&1
-/bin/ln -fs /etc/rc.d/init.d/vboxballoonctrl-service /etc/rc7.d/S35vboxballoonctrl-service >/dev/null 2>&1
-/bin/ln -fs /etc/rc.d/init.d/vboxweb-service /etc/rc7.d/S99vboxweb-service >/dev/null 2>&1
-/bin/ln -fs /etc/rc.d/init.d/fix_vboxdrv_kernel_module /etc/rc7.d/S19fix_vboxdrv_kernel_module >/dev/null 2>&1
-fi
-/etc/init.d/vboxdrv start >/dev/null 2>&1
+/usr/lib/virtualbox/vboxdrv.sh start >/dev/null 2>&1
 /usr/bin/vboxmanage setproperty websrvauthlibrary null
 
 %postun
 #uninstall
-if [ $1 = 0 ] ; then
-/bin/rm -rf  /etc/rc7.d/S20vboxdrv 
-/bin/rm -rf  /etc/rc7.d/S35vboxautostart-service 
-/bin/rm -rf  /etc/rc7.d/S35vboxballoonctrl-service 
-/bin/rm -rf  /etc/rc7.d/S99vboxweb-service 
-/bin/rm -rf  /etc/rc7.d/S19fix_vboxdrv_kernel_module
-fi
 %files -f %{name}-%{version}-filelist
 %defattr(-,root,root)
-%attr(755,root,root) /etc/rc.d/init.d/fix_vboxdrv_kernel_module
+%attr(755,root,root) /usr/lib/virtualbox/fix_vboxdrv_kernel_module.sh