| 1 |
jpp |
1.1 |
diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/etc/e-smith/db/configuration/defaults/roundcube/PluginsList smeserver-roundcube-1.2/root/etc/e-smith/db/configuration/defaults/roundcube/PluginsList |
| 2 |
|
|
--- smeserver-roundcube-1.2.old/root/etc/e-smith/db/configuration/defaults/roundcube/PluginsList 2022-12-07 14:10:48.098000000 -0500 |
| 3 |
|
|
+++ smeserver-roundcube-1.2/root/etc/e-smith/db/configuration/defaults/roundcube/PluginsList 2022-12-07 14:42:32.886000000 -0500 |
| 4 |
|
|
@@ -1 +1 @@ |
| 5 |
|
|
-globaladdressbook,contextmenu,markasjunk2,vcard_attachments,newmail_notifier,emoticons,sieverules |
| 6 |
|
|
+globaladdressbook,contextmenu,markasjunk,vcard_attachments,newmail_notifier,emoticons,managesieve |
| 7 |
|
|
diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/etc/e-smith/db/configuration/migrate/80roundcube_Plugins_Migration smeserver-roundcube-1.2/root/etc/e-smith/db/configuration/migrate/80roundcube_Plugins_Migration |
| 8 |
|
|
--- smeserver-roundcube-1.2.old/root/etc/e-smith/db/configuration/migrate/80roundcube_Plugins_Migration 2022-12-07 14:10:48.098000000 -0500 |
| 9 |
|
|
+++ smeserver-roundcube-1.2/root/etc/e-smith/db/configuration/migrate/80roundcube_Plugins_Migration 2022-12-07 14:45:58.551000000 -0500 |
| 10 |
|
|
@@ -6,13 +6,25 @@ |
| 11 |
|
|
|
| 12 |
|
|
return unless ($plugins ne ''); |
| 13 |
|
|
|
| 14 |
|
|
-#sieverule is now used instead of |
| 15 |
|
|
-# if ($plugins !~ 'managesieve') |
| 16 |
|
|
-# |
| 17 |
|
|
-# { |
| 18 |
|
|
-# $plugins = $plugins.',managesieve'; |
| 19 |
|
|
-# $cdb->set_prop('roundcube','PluginsList',"$plugins"); |
| 20 |
|
|
-# } |
| 21 |
jpp |
1.2 |
+#sieverule is now used instead of |
| 22 |
jpp |
1.1 |
+if ($plugins !~ 'managesieve') |
| 23 |
|
|
+ { |
| 24 |
|
|
+ $plugins = $plugins.',managesieve'; |
| 25 |
|
|
+ $cdb->set_prop('roundcube','PluginsList',"$plugins"); |
| 26 |
|
|
+ } |
| 27 |
|
|
+# sieverule deprecated |
| 28 |
|
|
+ if ($plugins =~ 'sieverule') |
| 29 |
|
|
+ { |
| 30 |
|
|
+ $plugins =~ s/,sieverule//g; |
| 31 |
|
|
+ $cdb->set_prop('roundcube','PluginsList',"$plugins"); |
| 32 |
|
|
+ } |
| 33 |
|
|
+ |
| 34 |
|
|
+# markasjunk2 deprecated |
| 35 |
|
|
+ if ($plugins =~ 'markasjunk') |
| 36 |
|
|
+ { |
| 37 |
|
|
+ $plugins =~ s/markasjunk2/markasjunk/g; |
| 38 |
|
|
+ $cdb->set_prop('roundcube','PluginsList',"$plugins"); |
| 39 |
|
|
+ } |
| 40 |
|
|
|
| 41 |
|
|
#Carddav is a really bad plugin, when available it will become usefull |
| 42 |
|
|
if ($plugins =~ 'carddav') |
| 43 |
|
|
diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/etc/e-smith/templates/etc/roundcubemail/config.inc.php/95PLUGINS smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/roundcubemail/config.inc.php/95PLUGINS |
| 44 |
|
|
--- smeserver-roundcube-1.2.old/root/etc/e-smith/templates/etc/roundcubemail/config.inc.php/95PLUGINS 2022-12-07 14:10:48.114000000 -0500 |
| 45 |
|
|
+++ smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/roundcubemail/config.inc.php/95PLUGINS 2022-12-07 15:05:38.021000000 -0500 |
| 46 |
|
|
@@ -9,12 +9,17 @@ |
| 47 |
|
|
//Then issue |
| 48 |
|
|
//signal-event conf-roundcube or signal-event roundcube-update |
| 49 |
|
|
|
| 50 |
|
|
-//The default list is : globaladdressbook,calendar,libcalendaring,contextmenu,markasjunk2,vcard_attachments,newmail_notifier,emoticons,tasklist |
| 51 |
|
|
+//The default list is : globaladdressbook,calendar,libcalendaring,contextmenu,markasjunk,vcard_attachments,newmail_notifier,emoticons,managesieve |
| 52 |
|
|
|
| 53 |
|
|
{ use esmith::ConfigDB; |
| 54 |
|
|
my $DB = esmith::ConfigDB->open_ro; |
| 55 |
|
|
my $plugins = $DB->get_prop('roundcube','PluginsList') || ""; |
| 56 |
|
|
my @plugs = split(',',$plugins); |
| 57 |
|
|
+ my @plugd ; |
| 58 |
|
|
+ for my $p (@plugs) { |
| 59 |
|
|
+ push @plugd, $p if -d "/usr/share/roundcubemail/plugins/$p"; |
| 60 |
|
|
+ } |
| 61 |
|
|
+ @plugs=@plugd; |
| 62 |
|
|
s/^(.*)$/"\1"/ for @plugs; |
| 63 |
|
|
$plugins = join(',',@plugs); |
| 64 |
|
|
$OUT .= "\$config['plugins'] = array($plugins);"; |
| 65 |
|
|
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 |
| 66 |
|
|
--- smeserver-roundcube-1.2.old/root/usr/bin/rcplugin_update.sh 2015-04-01 20:05:54.000000000 -0400 |
| 67 |
|
|
+++ smeserver-roundcube-1.2/root/usr/bin/rcplugin_update.sh 2022-12-07 14:22:15.296000000 -0500 |
| 68 |
|
|
@@ -3,11 +3,17 @@ |
| 69 |
|
|
/sbin/e-smith/expand-template /etc/php.ini |
| 70 |
|
|
/etc/init.d/httpd-e-smith restart >/dev/null 2>&1 |
| 71 |
|
|
pathroundcube=$(pwd) |
| 72 |
|
|
+ |
| 73 |
|
|
cd /usr/share/roundcubemail |
| 74 |
|
|
-php /usr/share/roundcubemail/composer.phar self-update |
| 75 |
|
|
-php /usr/share/roundcubemail/composer.phar update |
| 76 |
|
|
-/sbin/e-smith/db configuration setprop php AllowUrlFopen off |
| 77 |
|
|
-/sbin/e-smith/expand-template /etc/php.ini |
| 78 |
|
|
-/etc/init.d/httpd-e-smith restart >/dev/null 2>&1 |
| 79 |
|
|
+# add needed ones |
| 80 |
|
|
+/usr/bin/jq -r ".require.\"johndoh/contextmenu\" = \"~3.3.1\"" composer.json > tmp.json && mv -f tmp.json composer.json |
| 81 |
|
|
+/usr/bin/jq -r ".require.\"johndoh/globaladdressbook\" = \"~2.1\"" composer.json > tmp.json && mv -f tmp.json composer.json |
| 82 |
|
|
+ |
| 83 |
|
|
+ |
| 84 |
jpp |
1.3 |
+COMPOSER_ALLOW_SUPERUSER=1 /usr/bin/php74 /usr/local/bin/composer self-update |
| 85 |
|
|
+COMPOSER_ALLOW_SUPERUSER=1 /usr/bin/php74 /usr/local/bin/composer update |
| 86 |
jpp |
1.1 |
+/sbin/e-smith/db configuration setprop php74 AllowUrlFopen off |
| 87 |
|
|
+/sbin/e-smith/expand-template /etc/opt/remi/php74/php.ini |
| 88 |
|
|
+/usr/bin/systemctl restart php74-php-fpm >/dev/null 2>&1 |
| 89 |
|
|
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 |
| 92 |
jpp |
1.2 |
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 |
jpp |
1.4 |
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 |
Parent Directory
| 
Revision Log
| 
Revision Graph
