--- rpms/smeserver-virtualbox/contribs10/smeserver-virtualbox.spec	2022/08/16 03:47:20	1.1
+++ rpms/smeserver-virtualbox/contribs10/smeserver-virtualbox.spec	2023/03/10 03:15:09	1.7
@@ -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 4
+%define rpmver 5.2
+Summary: smserver rpm to install VirtualBox
 Name: %{name}
 Version: %{version}
 Release: %{release}%{?dist}
@@ -15,15 +15,40 @@ 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
+Patch0: smeserver-virtualbox-5.2-move_vbox_dir.patch
+Patch1: smeserver-virtualbox-5.2-multiple_changes.patch
 
 %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
+* Fri Mar 10 2023 Trevor Batley <trevor@batley.id.au> 5.2-4.sme
+- change log directory to /var/log/virtualbox and give correct permissions
+- add password generation and storage for vboxweb runtime user (for use by phpvirtualbox)
+- template /etc/default/virtualbox.conf
+- add 50koozali.conf for vboxweb-service
+- include migrate fragment for vbox user password
+
+* Thu Oct 20 2022 Trevor Batley <trevor@batley.id.au> 5.2-3.sme
+- remove storage of vbox password
+
+* Wed Oct 19 2022 Trevor Batley <trevor@batley.id.au> 5.2-2.sme
+- change vbox user to system user and change the home directory
+
+* Tue Oct 11 2022 Trevor Batley <trevor@batley.id.au> 5.2-1.sme
+- 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,16 +67,23 @@ smserver rpm to install virtualbox
 - Initial release
 
 %prep
+
 %setup
-#%patch0 -p1
+%patch0 -p1
+%patch1 -p1
+
 %build
-#perl createlinks
+perl createlinks
 
 %install
 rm -rf $RPM_BUILD_ROOT
 (cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
 rm -f %{name}-%{version}-filelist
-/sbin/e-smith/genfilelist $RPM_BUILD_ROOT > %{name}-%{version}-filelist
+mkdir -p $RPM_BUILD_ROOT/var/log/virtualbox
+/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
+--dir /var/log/virtualbox 'attr(755,vbox,vboxusers)' \
+--file /usr/lib/virtualbox/fix_vboxdrv_kernel_module.sh 'attr(755,root,root)' \
+> %{name}-%{version}-filelist
 echo "%doc COPYING"  >> %{name}-%{version}-filelist
 
 %clean
@@ -59,31 +91,21 @@ cd ..
 rm -rf %{name}-%{version}
 
 %pre
-/etc/init.d/vboxdrv stop >/dev/null 2>&1
+if ! id "vbox"
+then
+echo "Adding VBoxWeb runtime user (vbox)"
+/usr/sbin/useradd -c "VBoxWeb runtime user" -m -N -s /bin/bash -g vboxusers vbox >/dev/null
+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/bin/vboxmanage setproperty websrvauthlibrary null
+/sbin/e-smith/systemctl start vboxdrv
 
 %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