--- rpms/smeserver-phpvirtualbox/contribs10/smeserver-phpvirtualbox-5.2.1-multiple_changes.patch 2023/03/07 05:18:55 1.3 +++ rpms/smeserver-phpvirtualbox/contribs10/smeserver-phpvirtualbox-5.2.1-multiple_changes.patch 2023/03/10 02:27:28 1.6 @@ -71,7 +71,7 @@ diff -urN smeserver-phpvirtualbox-5.2.1. diff -urN smeserver-phpvirtualbox-5.2.1.old/root/etc/e-smith/db/configuration/migrate/phpvirtualbox smeserver-phpvirtualbox-5.2.1/root/etc/e-smith/db/configuration/migrate/phpvirtualbox --- smeserver-phpvirtualbox-5.2.1.old/root/etc/e-smith/db/configuration/migrate/phpvirtualbox 1970-01-01 10:00:00.000000000 +1000 +++ smeserver-phpvirtualbox-5.2.1/root/etc/e-smith/db/configuration/migrate/phpvirtualbox 2023-02-25 16:29:54.000000000 +1100 -@@ -0,0 +1,23 @@ +@@ -0,0 +1,29 @@ +{ + my $rec = $DB->get('phpvirtualbox') + || $DB->new_record('phpvirtualbox', {type => 'configuration'}); @@ -81,6 +81,9 @@ diff -urN smeserver-phpvirtualbox-5.2.1. + $rec->set_prop('authType', 'WebAuth'); + $rec->del_prop('webauth'); + } ++ if ( -e '/etc/e-smith/db/configuration/defaults/phpvirtualbox/Group' ) { ++ unlink '/etc/e-smith/db/configuration/defaults/phpvirtualbox/Group'; ++ } + + # Group has been replaced with userGroups, which already allowed for multiple groups + if ($rec->prop('Group')) { @@ -93,6 +96,9 @@ diff -urN smeserver-phpvirtualbox-5.2.1. + $rec->set_prop('Users', $rec->prop('User')); + $rec->del_prop('User'); + } ++ if ( -e '/etc/e-smith/db/configuration/defaults/phpvirtualbox/User' ) { ++ unlink '/etc/e-smith/db/configuration/defaults/phpvirtualbox/User'; ++ } + +} diff -urN smeserver-phpvirtualbox-5.2.1.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/35ExternalUnixGroup smeserver-phpvirtualbox-5.2.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/35ExternalUnixGroup