/[smecontribs]/rpms/smeserver-phpvirtualbox/contribs10/smeserver-phpvirtualbox-5.2.1-multiple_changes.patch
ViewVC logotype

Diff of /rpms/smeserver-phpvirtualbox/contribs10/smeserver-phpvirtualbox-5.2.1-multiple_changes.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

Revision 1.4 by trevorb, Tue Mar 7 23:50:25 2023 UTC Revision 1.6 by trevorb, Fri Mar 10 02:27:28 2023 UTC
# Line 71  diff -urN smeserver-phpvirtualbox-5.2.1. Line 71  diff -urN smeserver-phpvirtualbox-5.2.1.
71  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  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
72  --- 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.old/root/etc/e-smith/db/configuration/migrate/phpvirtualbox   1970-01-01 10:00:00.000000000 +1000
73  +++ smeserver-phpvirtualbox-5.2.1/root/etc/e-smith/db/configuration/migrate/phpvirtualbox       2023-02-25 16:29:54.000000000 +1100  +++ smeserver-phpvirtualbox-5.2.1/root/etc/e-smith/db/configuration/migrate/phpvirtualbox       2023-02-25 16:29:54.000000000 +1100
74  @@ -0,0 +1,23 @@  @@ -0,0 +1,29 @@
75  +{  +{
76  +    my $rec = $DB->get('phpvirtualbox')  +    my $rec = $DB->get('phpvirtualbox')
77  +        || $DB->new_record('phpvirtualbox', {type => 'configuration'});  +        || $DB->new_record('phpvirtualbox', {type => 'configuration'});
# Line 81  diff -urN smeserver-phpvirtualbox-5.2.1. Line 81  diff -urN smeserver-phpvirtualbox-5.2.1.
81  +           $rec->set_prop('authType', 'WebAuth');  +           $rec->set_prop('authType', 'WebAuth');
82  +        $rec->del_prop('webauth');  +        $rec->del_prop('webauth');
83  +    }  +    }
84    +    if ( -e '/etc/e-smith/db/configuration/defaults/phpvirtualbox/Group' ) {
85    +        unlink '/etc/e-smith/db/configuration/defaults/phpvirtualbox/Group';
86    +    }
87  +      +    
88  +    # Group has been replaced with userGroups, which already allowed for multiple groups  +    # Group has been replaced with userGroups, which already allowed for multiple groups
89  +    if ($rec->prop('Group')) {  +    if ($rec->prop('Group')) {
# Line 93  diff -urN smeserver-phpvirtualbox-5.2.1. Line 96  diff -urN smeserver-phpvirtualbox-5.2.1.
96  +           $rec->set_prop('Users', $rec->prop('User'));  +           $rec->set_prop('Users', $rec->prop('User'));
97  +           $rec->del_prop('User');  +           $rec->del_prop('User');
98  +    }  +    }
99    +    if ( -e '/etc/e-smith/db/configuration/defaults/phpvirtualbox/User' ) {
100    +        unlink '/etc/e-smith/db/configuration/defaults/phpvirtualbox/User';
101    +    }
102  +        +      
103  +}  +}
104  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  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
# Line 422  diff -urN smeserver-phpvirtualbox-5.2.1. Line 428  diff -urN smeserver-phpvirtualbox-5.2.1.
428       $OUT .= "}\n";       $OUT .= "}\n";
429  -  -
430  +                            +                          
431  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   }
432  --- smeserver-phpvirtualbox-5.2.1.old/root/etc/e-smith/db/configuration/migrate/phpvirtualbox   2023-03-07 16:49:37.500223500 +1100  
 +++ smeserver-phpvirtualbox-5.2.1/root/etc/e-smith/db/configuration/migrate/phpvirtualbox       2023-03-08 10:45:22.565554001 +1100  
 @@ -13,11 +13,17 @@  
             $rec->set_prop('userGroups', $rec->prop('Group'));  
             $rec->del_prop('Group');  
      }  
 +    if ( -e '/etc/e-smith/db/configuration/defaults/Group') {  
 +       unlink '/etc/e-smith/db/configuration/defaults/Group';  
 +    }  
       
      # User replaced by Users, because it already allows for multiple users  
      if ($rec->prop('User')) {  
             $rec->set_prop('Users', $rec->prop('User'));  
             $rec->del_prop('User');  
      }  
 +    if ( -e '/etc/e-smith/db/configuration/defaults/User') {  
 +       unlink '/etc/e-smith/db/configuration/defaults/User';  
 +    }  
           
  }  

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed