/[smecontribs]/rpms/smeserver-roundcube/contribs10/smeserver-roundcube-1.2-bz12489-bz12263.patch
ViewVC logotype

Diff of /rpms/smeserver-roundcube/contribs10/smeserver-roundcube-1.2-bz12489-bz12263.patch

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

Revision 1.2 by jpp, Sat Feb 24 22:44:49 2024 UTC Revision 1.4 by jpp, Sun Feb 25 21:34:20 2024 UTC
# Line 135  diff -Nur --no-dereference smeserver-rou Line 135  diff -Nur --no-dereference smeserver-rou
135  +/usr/bin/rcplugin_update.sh  +/usr/bin/rcplugin_update.sh
136  diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92roundcube smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92roundcube  diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92roundcube smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92roundcube
137  --- smeserver-roundcube-1.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92roundcube        2024-02-24 09:22:05.466000000 -0500  --- smeserver-roundcube-1.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92roundcube        2024-02-24 09:22:05.466000000 -0500
138  +++ smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92roundcube    2024-02-24 11:53:20.478000000 -0500  +++ smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92roundcube    2024-02-25 15:07:52.022000000 -0500
139  @@ -4,49 +4,17 @@  @@ -4,49 +4,17 @@
140               unless $status eq 'enabled';               unless $status eq 'enabled';
141    
# Line 150  diff -Nur --no-dereference smeserver-rou Line 150  diff -Nur --no-dereference smeserver-rou
150       for ('exit-if-none')       for ('exit-if-none')
151       {       {
152  -      if ($roundcube{'PublicAccess'})  -      if ($roundcube{'PublicAccess'})
153  +      if ( (exists($roundcube{'access'})  &&  ($roundcube{'access'} eq 'public') )  +      if ( (exists($roundcube{'access'}))  &&  ($roundcube{'access'} eq 'public') )
154         {         {
155  -          if ($roundcube{'PublicAccess'} eq 'none')  -          if ($roundcube{'PublicAccess'} eq 'none')
156  -          {  -          {
# Line 227  diff -Nur --no-dereference smeserver-rou Line 227  diff -Nur --no-dereference smeserver-rou
227   }   }
228  diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15roundcube smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15roundcube  diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15roundcube smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15roundcube
229  --- smeserver-roundcube-1.2.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15roundcube   1969-12-31 19:00:00.000000000 -0500  --- smeserver-roundcube-1.2.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15roundcube   1969-12-31 19:00:00.000000000 -0500
230  +++ smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15roundcube       2024-02-24 16:55:55.607000000 -0500  +++ smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15roundcube       2024-02-25 15:15:30.366000000 -0500
231  @@ -0,0 +1,67 @@  @@ -0,0 +1,67 @@
232  +{  +{
233  + my $phpversion="81";  + my $phpversion="81";
# Line 239  diff -Nur --no-dereference smeserver-rou Line 239  diff -Nur --no-dereference smeserver-rou
239  +    my $memory_limit = ($roundcube{MemoryLimit} || '512M');  +    my $memory_limit = ($roundcube{MemoryLimit} || '512M');
240  +    $memory_limit .= 'M' if ($memory_limit =~ m/^\d+$/);  +    $memory_limit .= 'M' if ($memory_limit =~ m/^\d+$/);
241  +    my $open_basedir= $roundcube{PHPBaseDir} || '';  +    my $open_basedir= $roundcube{PHPBaseDir} || '';
242  +    $open_basedir = "/usr/share/roundcubemail:/var/lib/roundcube:/var/log/roundcube.log:/var/lib/php/roundcube:/home/e-smith/files/roundcube:/dev/urandom:/proc/meminfo:/usr/share/GeoIP/GeoLite2-Country.mmdb:/proc/cpuinfo:$open_basedir";  +    $open_basedir = "/usr/share/roundcubemail:/etc/roundcubemail/:/var/log/roundcubemail:/var/lib/roundcubemail:/var/log/roundcube.log:/var/lib/php/roundcube:/home/e-smith/files/roundcube:/dev/urandom:/proc/meminfo:/usr/share/GeoIP/GeoLite2-Country.mmdb:/proc/cpuinfo:$open_basedir";
243  +    my $id = 'roundcube';  +    my $id = 'roundcube';
244  +    my $max_children = $roundcube{'PHPmaxChildren'} || 20;  +    my $max_children = $roundcube{'PHPmaxChildren'} || 20;
245  +    my $min_spare_servers = $roundcube{'PHPminServers'} || 4;  +    my $min_spare_servers = $roundcube{'PHPminServers'} || 4;
# Line 296  diff -Nur --no-dereference smeserver-rou Line 296  diff -Nur --no-dereference smeserver-rou
296  +}  +}
297  +}  +}
298  +  +
299    diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/managesieve/config.inc.php/10setsieveport smeserver-roundcube-1.2/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/managesieve/config.inc.php/10setsieveport
300    --- smeserver-roundcube-1.2.old/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/managesieve/config.inc.php/10setsieveport    2015-04-01 20:05:54.000000000 -0400
301    +++ smeserver-roundcube-1.2/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/managesieve/config.inc.php/10setsieveport        2024-02-25 16:19:32.010000000 -0500
302    @@ -1,6 +1,4 @@
303     {
304    -    # vim: ft=perl;
305    -
306         # This snippet sets the managesieve_port config option of the plugin if Sieve service is enabled
307         # otherwise, the default value of "null" is kept for this config option.
308    
309    @@ -19,5 +17,22 @@
310         else {
311             $OUT .= "\$config['managesieve_port'] = null; \n";
312         }
313    +    $OUT .= "// managesieve server address (and optional port), default is localhost.\n";
314    +    $OUT .= "// Replacement variables supported in host name:\n";
315    +    $OUT .= "// %h - user's IMAP hostname\n";
316    +    $OUT .= "// %n - http hostname ($_SERVER['SERVER_NAME'])\n";
317    +    $OUT .= "// %d - domain (http hostname without the first part)\n";
318    +    $OUT .= "// For example %n = mail.domain.tld, %d = domain.tld\n";
319    +    $OUT .= "// If port is omitted it will be determined automatically using getservbyname()\n";
320    +    $OUT .= "// function, with 2000 or 4190 as a fallback (depending on current version).\n";
321    +    $OUT .= "// Note: Add tls:// prefix to enable explicit STARTTLS\n";
322    +    $OUT .= "// or add ssl:// prefix to enable implicit SSL.\n";
323    +    if ($sievestatus eq 'enabled') {
324    +        $OUT .= "\$config['managesieve_host'] = 'localhost:$sieveport'; \n";
325    +    }
326    +    else {
327    +        $OUT .= "\$config['managesieve_host'] = null; \n";
328    +    }
329    +
330    
331     }
332    diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/managesieve/config.inc.php/20default smeserver-roundcube-1.2/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/managesieve/config.inc.php/20default
333    --- smeserver-roundcube-1.2.old/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/managesieve/config.inc.php/20default 2015-04-01 20:05:54.000000000 -0400
334    +++ smeserver-roundcube-1.2/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/managesieve/config.inc.php/20default     2024-02-25 16:23:27.005000000 -0500
335    @@ -1,11 +1,3 @@
336    -// managesieve server address, default is localhost.
337    -// Replacement variables supported in host name:
338    -// %h - user's IMAP hostname
339    -// %n - http hostname ($_SERVER['SERVER_NAME'])
340    -// %d - domain (http hostname without the first part)
341    -// For example %n = mail.domain.tld, %d = domain.tld
342    -$config['managesieve_host'] = 'localhost';
343    -
344     // authentication method. Can be CRAM-MD5, DIGEST-MD5, PLAIN, LOGIN, EXTERNAL
345     // or none. Optional, defaults to best method supported by server.
346     $config['managesieve_auth_type'] = null;
347  diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/20nextcloud_attachment_server smeserver-roundcube-1.2/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/20nextcloud_attachment_server  diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/20nextcloud_attachment_server smeserver-roundcube-1.2/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/20nextcloud_attachment_server
348  --- smeserver-roundcube-1.2.old/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/20nextcloud_attachment_server   1969-12-31 19:00:00.000000000 -0500  --- smeserver-roundcube-1.2.old/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/20nextcloud_attachment_server   1969-12-31 19:00:00.000000000 -0500
349  +++ smeserver-roundcube-1.2/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/20nextcloud_attachment_server       2024-02-24 17:24:25.423000000 -0500  +++ smeserver-roundcube-1.2/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/20nextcloud_attachment_server       2024-02-24 17:24:25.423000000 -0500

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