Request 3340 (accepted)

roundcubemail.spec Changed

@@ -48,7 +48,7 @@
 %global logdir /var/log/roundcubemail
 %global tmpdir /var/lib/roundcubemail
 
-%global rc_version 1.5
+%global rc_version 1.6
 %global plugin_version 3.5.11
 %global skin_version 0.5.0
 #%%global rc_rel_suffix rc2.12
@@ -57,7 +57,7 @@
 %global basedir %{name}-%{rc_version}%{?dash_rel_suffix}
 
 Name:           roundcubemail
-Version: 1.5.8.5
+Version: 1.6.9.6
 
 Release:        4%{?dot_rel_suffix}%{?dist}
 
@@ -85,6 +85,8 @@
 
 Source200:      2017111400.sql
 
+Source301:      migrateconfig.sh
+
 Patch201:       default-configuration.patch
 Patch202:       roundcubemail-1.4-beta86-plugin-enigma-homedir.patch
 Patch203:       0001-On-mysql-5.6-191-bytes-length-is-the-best-we-can-do-.patch
@@ -94,16 +96,16 @@
 
 %if 0%{?suse_version}
 Requires:       http_daemon
-Requires:       php >= 5.5
+Requires:       php >= 7.3
 Recommends:     mod_php_any
 %else
 Requires:       webserver
-%if 0%{?plesk} > 0 && 0%{?rhel} == 7
+%if 0%{?plesk} > 0 && 0%{?rhel} <= 8
 # On Plesk we can afford to build with an incompatible php version because we have the plesk supplied php versions
+# We also don't depend on a php version, we just assume one is available.
 Requires:       php-common
-Requires:       plesk-php74
 %else
-Requires:       php-common >= 5.5
+Requires:       php-common >= 7.3
 %endif
 %endif
 
@@ -296,6 +298,8 @@
     rm -rvf ${dir}
 done
 
+cp -vf %{SOURCE301} bin/migrateconfig.sh
+
 %if 0%{?plesk} > 0
 cp -vf %{SOURCE100} config/config.inc.php.sample
 cp -vf %{SOURCE101} plugins/managesieve/config.inc.php.dist
@@ -566,26 +570,40 @@
     /bin/systemctl reload php-fpm.service || :
 fi
 
-%if 0%{?plesk} > 0 && 0%{?rhel} == 7
-php="/opt/plesk/php/7.4/bin/php"
-# Process all sql updates (requires the php-mysqlnd package for the pdo driver for the system php)
-${php} %{_datadir}/roundcubemail/bin/updatedb.sh \
-    --dir %{_datadir}/doc/roundcubemail-%{version}/SQL/ \
-    --package roundcube || :
+%if 0%{?plesk} > 0 && 0%{?rhel} <= 8
+php="plesk php"
 %else
 php="/usr/bin/php"
-${php} %{_datadir}/roundcubemail/bin/updatedb.sh \
-    --dir %{_datadir}/doc/roundcubemail/SQL/ \
-    --package roundcube || :
 %endif
 
-${php} %{_datadir}/roundcubemail/bin/updatedb.sh \
-    --dir %{_datadir}/roundcubemail/plugins/libkolab/SQL/ \
-    --package libkolab || :
 
-${php} %{_datadir}/roundcubemail/bin/updatedb.sh \
-    --dir %{_datadir}/roundcubemail/plugins/calendar/drivers/kolab/SQL/ \
-    --package calendar-kolab || :
+%if 0%{?plesk} > 0 && 0%{?rhel} <= 8
+for version in 8.2 8.1 8.0 7.4; do
+    php="/opt/plesk/php/$version/bin/php"
+%else
+for version in 1; do
+    php="/usr/bin/php"
+%endif
+
+    if  -f "$php" ; then
+        # Process all sql updates (requires the php-mysqlnd package for the pdo driver for the system php)
+        ${php} %{_datadir}/roundcubemail/bin/updatedb.sh \
+            --dir %{_datadir}/doc/roundcubemail/SQL/ \
+            --package roundcube || :
+
+        ${php} %{_datadir}/roundcubemail/bin/updatedb.sh \
+            --dir %{_datadir}/roundcubemail/plugins/libkolab/SQL/ \
+            --package libkolab || :
+
+        ${php} %{_datadir}/roundcubemail/bin/updatedb.sh \
+            --dir %{_datadir}/roundcubemail/plugins/calendar/drivers/kolab/SQL/ \
+            --package calendar-kolab || :
+
+        ${php} %{_datadir}/roundcubemail/bin/migrateconfig.sh
+
+        break
+    fi
+done
 
 exit 0
 
@@ -625,6 +643,9 @@
 %dir %{_localstatedir}/lib/rpm-state/roundcubemail/
 
 %changelog
+* Tue Dec 12 2024 Christian Mollekopf <mollekopf@apheleia-it.ch> - 1.6.9.1-1
+- Roundcube 1.6
+
 * Wed Aug 3 2022 Christian Mollekopf <mollekopf@apheleia-it.ch> - 1.5.3-1
 - Roundcube 1.5.3
 - WOAT support

Dockerfile Changed

buildroundcubemailtarball.sh Changed

debian.changelog Changed

debian.control Changed

@@ -27,7 +27,7 @@
             ${misc:Depends}
 Replaces: roundcube, roundcube-core, roundcube-mysql, roundcube-pgsql, roundcube-plugins, roundcubemail-core, roundcubemail-plugin-acl, roundcubemail-plugin-archive, roundcubemail-plugin-calendar, roundcubemail-plugin-contextmenu, roundcubemail-plugin-filesystem-attachments, roundcubemail-plugin-jqueryui, roundcubemail-plugin-kolab-2fa, roundcubemail-plugin-kolab-activesync, roundcubemail-plugin-kolab-addressbook, roundcubemail-plugin-kolab-auth, roundcubemail-plugin-kolab-chat, roundcubemail-plugin-kolab-config, roundcubemail-plugin-kolab-delegation, roundcubemail-plugin-kolab-files, roundcubemail-plugin-kolab-folders, roundcubemail-plugin-kolab-notes, roundcubemail-plugin-kolab-tags, roundcubemail-plugin-libcalendaring, roundcubemail-plugin-libkolab, roundcubemail-plugins-kolab, roundcubemail-plugin-managesieve, roundcubemail-plugin-markasjunk, roundcubemail-plugin-newmail-notifier, roundcubemail-plugin-odfviewer, roundcubemail-plugin-password, roundcubemail-plugin-pdfviewer, roundcubemail-plugin-redundant-attachments, roundcubemail-plugin-tasklist, roundcubemail-plugin-zipdownload, roundcubemail-skin-kolab, roundcubemail-skin-plesk, roundcubemail-skin-plesk-larry
 Conflicts: roundcube, roundcube-core, roundcube-mysql, roundcube-pgsql, roundcube-plugins, roundcubemail-core, roundcubemail-plugin-acl, roundcubemail-plugin-archive, roundcubemail-plugin-calendar, roundcubemail-plugin-contextmenu, roundcubemail-plugin-filesystem-attachments, roundcubemail-plugin-jqueryui, roundcubemail-plugin-kolab-2fa, roundcubemail-plugin-kolab-activesync, roundcubemail-plugin-kolab-addressbook, roundcubemail-plugin-kolab-auth, roundcubemail-plugin-kolab-chat, roundcubemail-plugin-kolab-config, roundcubemail-plugin-kolab-delegation, roundcubemail-plugin-kolab-files, roundcubemail-plugin-kolab-folders, roundcubemail-plugin-kolab-notes, roundcubemail-plugin-kolab-tags, roundcubemail-plugin-libcalendaring, roundcubemail-plugin-libkolab, roundcubemail-plugins-kolab, roundcubemail-plugin-managesieve, roundcubemail-plugin-markasjunk, roundcubemail-plugin-newmail-notifier, roundcubemail-plugin-odfviewer, roundcubemail-plugin-password, roundcubemail-plugin-pdfviewer, roundcubemail-plugin-redundant-attachments, roundcubemail-plugin-tasklist, roundcubemail-plugin-zipdownload, roundcubemail-skin-kolab, roundcubemail-skin-plesk, roundcubemail-skin-plesk-larry
-Provides: roundcube, roundcube-core, roundcube-mysql, roundcube-pgsql, roundcube-plugins, roundcubemail-core (= 1.5), roundcubemail-plugin-acl, roundcubemail-plugin-archive, roundcubemail-plugin-calendar, roundcubemail-plugin-contextmenu, roundcubemail-plugin-filesystem-attachments, roundcubemail-plugin-jqueryui (= 3.1.12), roundcubemail-plugin-kolab-2fa (= 3.1.12), roundcubemail-plugin-kolab-activesync (= 3.1.12), roundcubemail-plugin-kolab-addressbook (= 3.1.12), roundcubemail-plugin-kolab-auth (= 3.1.12), roundcubemail-plugin-kolab-chat (= 3.1.12), roundcubemail-plugin-kolab-config (= 3.1.12), roundcubemail-plugin-kolab-delegation (= 3.1.12), roundcubemail-plugin-kolab-files (= 3.1.12), roundcubemail-plugin-kolab-folders (= 3.1.12), roundcubemail-plugin-kolab-notes (= 3.1.12), roundcubemail-plugin-kolab-tags (= 3.1.12), roundcubemail-plugin-libcalendaring (= 3.1.12), roundcubemail-plugin-libkolab (= 3.1.12), roundcubemail-plugins-kolab (= 3.1.12), roundcubemail-plugin-managesieve, roundcubemail-plugin-markasjunk, roundcubemail-plugin-newmail-notifier, roundcubemail-plugin-odfviewer, roundcubemail-plugin-password, roundcubemail-plugin-pdfviewer, roundcubemail-plugin-redundant-attachments, roundcubemail-plugin-tasklist, roundcubemail-plugin-zipdownload, roundcubemail-skin-kolab, roundcubemail-skin-plesk, roundcubemail-skin-plesk-larry
+Provides: roundcube, roundcube-core, roundcube-mysql, roundcube-pgsql, roundcube-plugins, roundcubemail-core (= 1.6), roundcubemail-plugin-acl, roundcubemail-plugin-archive, roundcubemail-plugin-calendar, roundcubemail-plugin-contextmenu, roundcubemail-plugin-filesystem-attachments, roundcubemail-plugin-jqueryui (= 3.1.12), roundcubemail-plugin-kolab-2fa (= 3.1.12), roundcubemail-plugin-kolab-activesync (= 3.1.12), roundcubemail-plugin-kolab-addressbook (= 3.1.12), roundcubemail-plugin-kolab-auth (= 3.1.12), roundcubemail-plugin-kolab-chat (= 3.1.12), roundcubemail-plugin-kolab-config (= 3.1.12), roundcubemail-plugin-kolab-delegation (= 3.1.12), roundcubemail-plugin-kolab-files (= 3.1.12), roundcubemail-plugin-kolab-folders (= 3.1.12), roundcubemail-plugin-kolab-notes (= 3.1.12), roundcubemail-plugin-kolab-tags (= 3.1.12), roundcubemail-plugin-libcalendaring (= 3.1.12), roundcubemail-plugin-libkolab (= 3.1.12), roundcubemail-plugins-kolab (= 3.1.12), roundcubemail-plugin-managesieve, roundcubemail-plugin-markasjunk, roundcubemail-plugin-newmail-notifier, roundcubemail-plugin-odfviewer, roundcubemail-plugin-password, roundcubemail-plugin-pdfviewer, roundcubemail-plugin-redundant-attachments, roundcubemail-plugin-tasklist, roundcubemail-plugin-zipdownload, roundcubemail-skin-kolab, roundcubemail-skin-plesk, roundcubemail-skin-plesk-larry
 Description: skinnable AJAX based webmail solution for IMAP servers
  RoundCube Webmail is a browser-based multilingual IMAP client with an
  application-like user interface. It provides full functionality

debian.rules Changed

debian.tar.gz/roundcubemail.postinst Changed

migrateconfig.sh Added

@@ -0,0 +1,133 @@
+#!/usr/bin/env php
+<?php
+
+$home = '/etc/roundcubemail/';
+
+if (!file_exists("{$home}/config.inc.php")) {
+    return;
+}
+
+// default_host/default_port -> imap_host
+// smtp_server/smtp_port -> smtp_host
+
+// For Kolab v3 we deal with a different format, so we first have to read the config
+$imap_host = null;
+$smtp_host = null;
+
+foreach (file("{$home}/config.inc.php") as $line) {
+    if (strpos($line, "\$config'imap_host'") !== false) {
+        // Already migrated
+        return;
+    }
+
+    if (preg_match("~\\\$config\\'default_host'\\\s*=\s*'\"?(^'\";*)'\"?~", $line, $matches)) {
+        $imap_host = $matches1;
+    } elseif (preg_match("~\\\$config\\'default_port'\\\s*=\s*'\"?(^'\";*)'\"?~", $line, $matches)) {
+        $imap_port = trim($matches1, "'");
+    } elseif (preg_match("~\\\$config\\'smtp_server'\\\s*=\s*'\"?(^'\";*)'\"?~", $line, $matches)) {
+        $smtp_host = $matches1;
+    } elseif (preg_match("~\\\$config\\'smtp_port'\\\s*=\s*'\"?(^'\";*)'\"?~", $line, $matches)) {
+        $smtp_port = trim($matches1, "'");
+    }
+}
+
+if (!empty($imap_port) && !empty($imap_host)) {
+    if (strpos($imap_host, ':' . $imap_port) === false) {
+        $imap_host .= ':' . $imap_port;
+    }
+
+    if (strpos($imap_host, '://') === false) {
+        switch ($imap_port) {
+            case 993:
+            case 9993:
+                $imap_host = 'ssl://' . $imap_host;
+                break;
+        }
+    }
+}
+
+if (!empty($smtp_port) && !empty($smtp_host)) {
+    if (strpos($smtp_host, ':' . $smtp_port) === false) {
+        $smtp_host .= ':' . $smtp_port;
+    }
+
+    if (strpos($smtp_host, '://') === false) {
+        switch ($smtp_port) {
+            case 587:
+                $smtp_host = 'tls://' . $smtp_host;
+                break;
+            case 465:
+                $smtp_host = 'ssl://' . $smtp_host;
+                break;
+        }
+    }
+}
+
+// TODO: removed `port` option from `ldap_public` array (non-standard port can be set via `host`)
+// TODO: removed `use_tls` option from `ldap_public` array (use tls:// prefix in `host`)
+
+// For Kolab v4 we can just replace strings as we have a "constant" content
+$replace = 
+    "\$config'default_host' = (getenv('IMAP_TLS') == \"true\" ? \"ssl://\" : \"\") . getenv('IMAP_HOST');"
+        => "\$config'imap_host' = (getenv('IMAP_TLS') == \"true\" ? \"ssl://\" : \"\") . getenv('IMAP_HOST') . ':' . getenv('IMAP_PORT');",
+    "\$config'default_port' = getenv('IMAP_PORT');" => '',
+    "\$config'smtp_server' = \"tls://\" . getenv('SUBMISSION_HOST');"
+        => "\$config'smtp_host' = \"tls://\" . getenv('SUBMISSION_HOST') . ':' . getenv('SUBMISSION_PORT');",
+    "\$config'smtp_server' = getenv('SUBMISSION_HOST');"
+        => "\$config'smtp_host' = getenv('SUBMISSION_HOST') . ':' . getenv('SUBMISSION_PORT');",
+    "\$config'smtp_port' = getenv('SUBMISSION_PORT');" => '',
+;
+
+$content = '';
+foreach (file("{$home}/config.inc.php") as $line) {
+    $line = str_replace(array_keys($replace), array_values($replace), $line);
+    if ($imap_host && strpos($line, "\$config'default_host'") !== false) {
+        $content .= "    \$config'imap_host' = '{$imap_host}';\n";
+    } elseif ($smtp_host && strpos($line, "\$config'smtp_server'") !== false) {
+        $content .= "    \$config'smtp_host' = '{$smtp_host}';\n";
+    } elseif (!preg_match("~\\\$config\\'(default_port|smtp_port)'\\~", $line)) {
+        $content .= $line;
+    }
+}
+
+file_put_contents("{$home}/config.inc.php", $content);
+
+// managesieve_usetls/managesieve_port
+
+$sieve_host = null;
+
+foreach (file("{$home}/managesieve.inc.php") as $line) {
+    if (preg_match("~\\\$config\\'managesieve_host'\\\s*=\s*'\"?(^'\";*)'\"?~", $line, $matches)) {
+        $sieve_host = $matches1;
+    } elseif (preg_match("~\\\$config\\'managesieve_port'\\\s*=\s*'\"?(^'\";*)'\"?~", $line, $matches)) {
+        $sieve_port = trim($matches1, "'");
+    } elseif (preg_match("~\\\$config\\'managesieve_usetls'\\\s*=\s*true~", $line, $matches)) {
+        $sieve_tls = true;
+    }
+}
+
+if (!empty($sieve_host)) {
+    if (!empty($sieve_port) && strpos($sieve_host, ":$sieve_port") === false) {
+        $sieve_host .= ':' . $sieve_port;
+    }
+    if (!empty($sieve_tls) && strpos($sieve_host, "://") === false) {
+        $sieve_host = 'tls://' . $sieve_host;
+    }
+}
+
+$replace = 
+    "\$config'managesieve_host' = str_replace(\"ssl://\", \"\", getenv('IMAP_HOST'));"
+        => "\$config'managesieve_host' = str_replace(\"ssl://\", \"\", getenv('IMAP_HOST')) . ':4190';",
+;
+
+$content = '';
+foreach (file("{$home}/managesieve.inc.php") as $line) {
+    $line = str_replace(array_keys($replace), array_values($replace), $line);
+    if ($sieve_host && strpos($line, "\$config'managesieve_host' = '") !== false) {
+        $content .= "    \$config'managesieve_host' = '{$sieve_host}';\n";
+    } elseif (!preg_match("~\\\$config\\'(managesieve_port|managesieve_usetls)'\\~", $line)) {
+        $content .= $line;
+    }
+}
+
+file_put_contents("{$home}/managesieve.inc.php", $content);

plesk.config.inc.php Changed

plesk.managesieve.inc.php Changed

roundcubemail-1.5.tar.gz -> roundcubemail-1.6.tar.gz Changed

roundcubemail.dsc Changed

Overview

Request 3340 (accepted)

Request History