/[smecontribs]/rpms/smeserver-roundcube/contribs10/smeserver-roundcube-1.2-bz11430-plugins.patch
ViewVC logotype

Diff of /rpms/smeserver-roundcube/contribs10/smeserver-roundcube-1.2-bz11430-plugins.patch

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

Revision 1.1 by jpp, Wed Dec 7 20:06:53 2022 UTC Revision 1.4 by jpp, Sun Dec 11 21:10:01 2022 UTC
# Line 18  diff -Nur --no-dereference smeserver-rou Line 18  diff -Nur --no-dereference smeserver-rou
18  -#        $plugins = $plugins.',managesieve';  -#        $plugins = $plugins.',managesieve';
19  -#        $cdb->set_prop('roundcube','PluginsList',"$plugins");  -#        $cdb->set_prop('roundcube','PluginsList',"$plugins");
20  -#        }  -#        }
21  +sieverule is now used instead of  +#sieverule is now used instead of
22  +if ($plugins !~ 'managesieve')  +if ($plugins !~ 'managesieve')
23  +        {  +        {
24  +        $plugins = $plugins.',managesieve';  +        $plugins = $plugins.',managesieve';
# Line 81  diff -Nur --no-dereference smeserver-rou Line 81  diff -Nur --no-dereference smeserver-rou
81  +/usr/bin/jq -r ".require.\"johndoh/globaladdressbook\" = \"~2.1\"" composer.json > tmp.json && mv -f tmp.json composer.json  +/usr/bin/jq -r ".require.\"johndoh/globaladdressbook\" = \"~2.1\"" composer.json > tmp.json && mv -f tmp.json composer.json
82  +  +
83  +  +
84  +COMPOSER_ALLOW_SUPERUSER=1 /usr/bin/php74 /usr/share/roundcubemail/composer.phar self-update  +COMPOSER_ALLOW_SUPERUSER=1 /usr/bin/php74 /usr/local/bin/composer self-update
85  +COMPOSER_ALLOW_SUPERUSER=1 /usr/bin/php74  /usr/share/roundcubemail/composer.phar update  +COMPOSER_ALLOW_SUPERUSER=1 /usr/bin/php74  /usr/local/bin/composer update
86  +/sbin/e-smith/db configuration setprop php74 AllowUrlFopen off  +/sbin/e-smith/db configuration setprop php74 AllowUrlFopen off
87  +/sbin/e-smith/expand-template /etc/opt/remi/php74/php.ini  +/sbin/e-smith/expand-template /etc/opt/remi/php74/php.ini
88  +/usr/bin/systemctl restart php74-php-fpm >/dev/null 2>&1  +/usr/bin/systemctl restart php74-php-fpm >/dev/null 2>&1
89   cd $pathroundcube   cd $pathroundcube
90    
91  Les fichiers binaires smeserver-roundcube-1.2.old/root/usr/share/roundcubemail/composer.phar et smeserver-roundcube-1.2/root/usr/share/roundcubemail/composer.phar sont différents  Les fichiers binaires smeserver-roundcube-1.2.old/root/usr/share/roundcubemail/composer.phar et smeserver-roundcube-1.2/root/usr/share/roundcubemail/composer.phar sont différents
92    diff -Nur --no-dereference smeserver-roundcube-1.2.old/createlinks smeserver-roundcube-1.2/createlinks
93    --- smeserver-roundcube-1.2.old/createlinks     2022-12-10 00:44:47.059000000 -0500
94    +++ smeserver-roundcube-1.2/createlinks 2022-12-10 00:53:13.496000000 -0500
95    @@ -36,7 +36,6 @@
96         ))
97     {
98         templates2events("/usr/share/roundcubemail/plugins/managesieve/config.inc.php", $event);
99    -    templates2events("/usr/share/roundcubemail/plugins/sieverules/config.inc.php", $event);
100         templates2events("/etc/roundcubemail/config.inc.php", $event);
101         templates2events("/etc/e-smith/sql/init/80roundcube", $event);
102     }
103    diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/etc/e-smith/templates/etc/roundcubemail/config.inc.php/90USER_PREFERENCES smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/roundcubemail/config.inc.php/90USER_PREFERENCES
104    --- smeserver-roundcube-1.2.old/root/etc/e-smith/templates/etc/roundcubemail/config.inc.php/90USER_PREFERENCES  2015-04-01 20:05:54.000000000 -0400
105    +++ smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/roundcubemail/config.inc.php/90USER_PREFERENCES      2022-12-10 01:10:36.082000000 -0500
106    @@ -6,7 +6,8 @@
107     $config['default_charset'] = 'ISO-8859-1';
108    
109     // skin name: folder from skins/
110    -$config['skin'] = 'larry';
111    +$config['skin'] = '{ # for 1.5 we use larry and classic, elastic are vailable, for 1.6 only elastic is available.
112    +$OUT = (-d "/usr/share/roundcubemail/skins/larry") ? "larry" : "elastic"}';
113    
114     // Enables using standard browser windows (that can be handled as tabs)
115     // instead of popup windows
116    diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/usr/bin/rcplugin_update.sh smeserver-roundcube-1.2/root/usr/bin/rcplugin_update.sh
117    --- smeserver-roundcube-1.2.old/root/usr/bin/rcplugin_update.sh 2022-12-11 16:07:13.382000000 -0500
118    +++ smeserver-roundcube-1.2/root/usr/bin/rcplugin_update.sh     2022-12-11 16:08:04.034000000 -0500
119    @@ -5,13 +5,13 @@
120     pathroundcube=$(pwd)
121    
122     cd /usr/share/roundcubemail
123    -# add needed ones
124    -/usr/bin/jq -r ".require.\"johndoh/contextmenu\" = \"~3.3.1\"" composer.json > tmp.json && mv -f tmp.json composer.json
125    -/usr/bin/jq -r ".require.\"johndoh/globaladdressbook\" = \"~2.1\"" composer.json > tmp.json && mv -f tmp.json composer.json
126    +COMPOSER_ALLOW_SUPERUSER=1 /usr/bin/php74  /usr/local/bin/composer require johndoh/contextmenu --with-dependencies
127    +COMPOSER_ALLOW_SUPERUSER=1 /usr/bin/php74  /usr/local/bin/composer require johndoh/globaladdressbook ~2.1 --with-dependencies
128    +COMPOSER_ALLOW_SUPERUSER=1 /usr/bin/php74  /usr/local/bin/composer require roundcube/larry ~1.6.0 --with-dependencies
129    
130    
131     COMPOSER_ALLOW_SUPERUSER=1 /usr/bin/php74 /usr/local/bin/composer self-update
132    -COMPOSER_ALLOW_SUPERUSER=1 /usr/bin/php74  /usr/local/bin/composer update
133    +COMPOSER_ALLOW_SUPERUSER=1 /usr/bin/php74  /usr/local/bin/composer update --with-dependencies
134     /sbin/e-smith/db configuration setprop php74 AllowUrlFopen off
135     /sbin/e-smith/expand-template /etc/opt/remi/php74/php.ini
136     /usr/bin/systemctl restart php74-php-fpm >/dev/null 2>&1

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