--- rpms/smeserver-phpvirtualbox/contribs10/smeserver-phpvirtualbox.spec	2023/03/07 04:38:51	1.5
+++ rpms/smeserver-phpvirtualbox/contribs10/smeserver-phpvirtualbox.spec	2023/03/19 03:53:36	1.10
@@ -1,6 +1,6 @@
 %define name smeserver-phpvirtualbox
 %define version 5.2.1
-%define release 4
+%define release 5
 %define rpmver   5.2.1
 Summary: smserver rpm to install phpvirtualbox
 Name: %{name}
@@ -21,6 +21,7 @@ Requires: smeserver-virtualbox = 5.2
 Patch0: smeserver-phpvirtualbox-5.2.1-move_vbox_dir.patch
 Patch1: smeserver-phpvirtualbox-5.2.1-remove_vbox_passwd.patch
 Patch2: smeserver-phpvirtualbox-5.2.1-multiple_changes.patch
+Patch3: smeserver-phpvirtualbox-5.2.1-samba_share.patch
 
 AutoReqProv: no
 %description
@@ -30,12 +31,19 @@ administer VirtualBox in a headless envi
 phpvirtualbox version MUST align with VirtualBox version (i.e. VirtualBox-6.1 requires phpvirtualbox-6.1)
 
 %changelog
-* Tue Mar 07 2023 Trevor Batley <trevor@batley.id.au> 5.2.1-4
+* Sun Mar 19 2023 Trevor batley <trevor@batley.id.au> 5.2.1-5
+- fix permissions on /opt/vbox/ISOs directory for sharing via samba 0777 [bug #12336]
+- fix smb.conf fragment to include Users [bug #12336]
+- fix smb.conf fragment to properly include more than 1 group in userGroups [bug #12336]
+- add phpvirtualbox samba config item to allow control of if, and who, has access [bug # 12337]
+
+* Fri Mar 10 2023 Trevor Batley <trevor@batley.id.au> 5.2.1-4
 - add vbox password back into config.php
 - replace /etc/php-fpm.d/phpvirtualbox with /etc/php-fpm.d/www.conf fragment and expand during update
-- remove webauth config db item and add authType, with multiple values)
+- remove webauth config db item and add authType, with multiple values
 - add support for BuiltIn, WebAuth (default), LDAP and AD authentication
 - rename config items User => Users, Group => userGroups and add adminUser
+- remove defaults for User and Group config items
 - add basic default values for config.php as config db items (with same name) and allow entry of other config items
 - create /var/lib/php/phpvirtualbox directories (opcache, session, tmp) with www:www ownership and 0755 permissions
 - correct permissions on log files
@@ -90,6 +98,7 @@ phpvirtualbox version MUST align with Vi
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 perl createlinks
@@ -98,9 +107,12 @@ perl createlinks
 rm -rf $RPM_BUILD_ROOT
 (cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
 rm -f %{name}-%{version}-filelist
+mkdir -p $RPM_BUILD_ROOT/opt/vbox/{ISOs,VMs}
+mkdir -p $RPM_BUILD_ROOT/var/log/php/phpvirtualbox
+mkdir -p $RPM_BUILD_ROOT/var/lib/php/phpvirtualbox/{opcache,tmp,session}
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
  --dir /opt/vbox 'attr(0755,vbox,vboxusers)' \
- --dir /opt/vbox/ISOs 'attr(0774,vbox,vboxusers)' \
+ --dir /opt/vbox/ISOs 'attr(0777,vbox,vboxusers)' \
  --dir /opt/vbox/VMs 'attr(0774,vbox,vboxusers)' \
  --dir /var/log/php/phpvirtualbox  'attr(0755,www,www)' \
  --dir /var/lib/php/phpvirtualbox  'attr(0755,www,www)' \