--- rpms/smeserver-roundcube/contribs10/smeserver-roundcube-1.2-bz12489-bz12263.patch	2024/02/24 22:44:49	1.2
+++ rpms/smeserver-roundcube/contribs10/smeserver-roundcube-1.2-bz12489-bz12263.patch	2024/02/25 21:34:20	1.4
@@ -135,7 +135,7 @@ diff -Nur --no-dereference smeserver-rou
 +/usr/bin/rcplugin_update.sh
 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
 --- 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/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
 @@ -4,49 +4,17 @@
              unless $status eq 'enabled';
  
@@ -150,7 +150,7 @@ diff -Nur --no-dereference smeserver-rou
      for ('exit-if-none')
      {
 -      if ($roundcube{'PublicAccess'})
-+      if ( (exists($roundcube{'access'})  &&  ($roundcube{'access'} eq 'public') )
++      if ( (exists($roundcube{'access'}))  &&  ($roundcube{'access'} eq 'public') )
        {
 -          if ($roundcube{'PublicAccess'} eq 'none')
 -          {
@@ -227,7 +227,7 @@ diff -Nur --no-dereference smeserver-rou
  }
 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
 --- 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/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
 @@ -0,0 +1,67 @@
 +{
 + my $phpversion="81";
@@ -239,7 +239,7 @@ diff -Nur --no-dereference smeserver-rou
 +    my $memory_limit = ($roundcube{MemoryLimit} || '512M');
 +    $memory_limit .= 'M' if ($memory_limit =~ m/^\d+$/);
 +    my $open_basedir= $roundcube{PHPBaseDir} || '';
-+    $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";
 +    my $id = 'roundcube';
 +    my $max_children = $roundcube{'PHPmaxChildren'} || 20;
 +    my $min_spare_servers = $roundcube{'PHPminServers'} || 4;
@@ -296,6 +296,54 @@ diff -Nur --no-dereference smeserver-rou
 +} 
 +}
 +
+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
+--- 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
++++ 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
+@@ -1,6 +1,4 @@
+ {
+-    # vim: ft=perl;
+-
+     # This snippet sets the managesieve_port config option of the plugin if Sieve service is enabled
+     # otherwise, the default value of "null" is kept for this config option.
+ 
+@@ -19,5 +17,22 @@
+     else {
+         $OUT .= "\$config['managesieve_port'] = null; \n";
+     }
++    $OUT .= "// managesieve server address (and optional port), default is localhost.\n";
++    $OUT .= "// Replacement variables supported in host name:\n";
++    $OUT .= "// %h - user's IMAP hostname\n";
++    $OUT .= "// %n - http hostname ($_SERVER['SERVER_NAME'])\n";
++    $OUT .= "// %d - domain (http hostname without the first part)\n";
++    $OUT .= "// For example %n = mail.domain.tld, %d = domain.tld\n";
++    $OUT .= "// If port is omitted it will be determined automatically using getservbyname()\n";
++    $OUT .= "// function, with 2000 or 4190 as a fallback (depending on current version).\n";
++    $OUT .= "// Note: Add tls:// prefix to enable explicit STARTTLS\n";
++    $OUT .= "// or add ssl:// prefix to enable implicit SSL.\n";
++    if ($sievestatus eq 'enabled') {
++        $OUT .= "\$config['managesieve_host'] = 'localhost:$sieveport'; \n";
++    }
++    else {
++        $OUT .= "\$config['managesieve_host'] = null; \n";
++    }
++
+ 
+ }
+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
+--- 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
++++ 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
+@@ -1,11 +1,3 @@
+-// managesieve server address, default is localhost.
+-// Replacement variables supported in host name:
+-// %h - user's IMAP hostname
+-// %n - http hostname ($_SERVER['SERVER_NAME'])
+-// %d - domain (http hostname without the first part)
+-// For example %n = mail.domain.tld, %d = domain.tld
+-$config['managesieve_host'] = 'localhost';
+-
+ // authentication method. Can be CRAM-MD5, DIGEST-MD5, PLAIN, LOGIN, EXTERNAL
+ // or none. Optional, defaults to best method supported by server.
+ $config['managesieve_auth_type'] = null;
 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
 --- 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/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