From 0d31ab8fc867b21f44c975ae839da6d27f5cac8f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 25 Feb 2021 23:43:48 +0100 Subject: [PATCH] Upgrade to 1.5.0 beta --- README.md | 2 +- README_fr.md | 2 +- conf/app.src | 4 ++-- conf/config.inc.php | 52 +++++++++++++++++++--------------------- manifest.json | 4 ++-- pull_request_template.md | 8 ------- scripts/install | 6 ++--- scripts/upgrade | 8 +++---- 8 files changed, 38 insertions(+), 48 deletions(-) diff --git a/README.md b/README.md index b33a12b..3b88944 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to ## Overview [Roundcube](https://roundcube.net/) is a browser-based multilingual IMAP client with an application-like user interface. -**Shipped version:** 1.4.11 +**Shipped version:** 1.5.0 ## Screenshots diff --git a/README_fr.md b/README_fr.md index adba282..3d0a039 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install ## Overview [Roundcube](https://roundcube.net/) est un client IMAP multilingue basé sur un navigateur avec une interface utilisateur semblable à une application. -**Shipped version:** 1.4.11 +**Shipped version:** 1.5.0 ## Screenshots diff --git a/conf/app.src b/conf/app.src index 546145a..3c7baac 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/roundcube/roundcubemail/releases/download/1.4.11/roundcubemail-1.4.11.tar.gz -SOURCE_SUM=524a6c8095508b8d911c0c5121ea6d16ca4c42894e10aaa0e29ded983687923c +SOURCE_URL=https://github.com/roundcube/roundcubemail/releases/download/1.5-beta/roundcubemail-1.5-beta.tar.gz +SOURCE_SUM=d42f19510d4c1996ff1e6d9c50e018c8af7faa464c329d9e2faf7a363b12cbd4 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/config.inc.php b/conf/config.inc.php index 138a935..2df7dc3 100644 --- a/conf/config.inc.php +++ b/conf/config.inc.php @@ -2,19 +2,14 @@ /* +-----------------------------------------------------------------------+ - | YunoHost configuration for the Roundcube Webmail installation. | + | Local configuration for the Roundcube Webmail installation. | | | - | This is based on the sample configuration file which is shipped with | - | Roundcube and adapted to works with YunoHost. It comes with some | - | additionnal activated plugins for a better integration and | - | experience. | - | | - | You can override and extend this configuration in local.inc.php. | - | | - | DO NOT EDIT THIS FILE BY HAND, IT WILL BE OVERWRITTEN AT UPGRADES. | + | This is a sample configuration file only containing the minimum | + | setup required for a functional installation. Copy more options | + | from defaults.inc.php to this file to override the defaults. | | | | This file is part of the Roundcube Webmail client | - | Copyright (C) 2005-2013, The Roundcube Dev Team | + | Copyright (C) The Roundcube Dev Team | | | | Licensed under the GNU General Public License version 3 or | | any later version with exceptions for skins & plugins. | @@ -29,26 +24,28 @@ $config = array(); // Database connection string (DSN) for read+write operations // Format (compatible with PEAR MDB2): db_provider://user:password@host/database -// Currently supported db_providers: mysql, pgsql, sqlite, mssql or sqlsrv +// Currently supported db_providers: mysql, pgsql, sqlite, mssql, sqlsrv, oracle // For examples see http://pear.php.net/manual/en/package.database.mdb2.intro-dsn.php -// NOTE: for SQLite use absolute path: 'sqlite:////full/path/to/sqlite.db?mode=0646' -$config['db_dsnw'] = 'mysql://__DBUSER__:__DBPASS__@localhost/__DBNAME__'; +// NOTE: for SQLite use absolute path (Linux): 'sqlite:////full/path/to/sqlite.db?mode=0646' +// or (Windows): 'sqlite:///C:/full/path/to/sqlite.db' +$config['db_dsnw'] = 'mysql://__DB_USER__:__DB_PWD__@localhost/__DB_NAME__'; -// The mail host chosen to perform the log-in. +// The IMAP host chosen to perform the log-in. // Leave blank to show a textbox at login, give a list of hosts // to display a pulldown menu or set one host as string. -// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls:// +// Enter hostname with prefix ssl:// to use Implicit TLS, or use +// prefix tls:// to use STARTTLS. // Supported replacement variables: // %n - hostname ($_SERVER['SERVER_NAME']) // %t - hostname without the first part // %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part) // %s - domain name after the '@' from e-mail address provided at login screen // For example %n = mail.domain.tld, %t = domain.tld -$config['default_host'] = 'localhost'; +$config['default_host'] = '%t'; // SMTP server host (for sending mails). -// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls:// -// If left blank, the PHP mail() function is used +// Enter hostname with prefix ssl:// to use Implicit TLS, or use +// prefix tls:// to use STARTTLS. // Supported replacement variables: // %h - user's IMAP hostname // %n - hostname ($_SERVER['SERVER_NAME']) @@ -56,10 +53,11 @@ $config['default_host'] = 'localhost'; // %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part) // %z - IMAP domain (IMAP hostname without the first part) // For example %n = mail.domain.tld, %t = domain.tld +// To specify differnt SMTP servers for different IMAP hosts provide an array +// of IMAP host (no prefix or port) and SMTP server e.g. ['imap.example.com' => 'smtp.example.net'] $config['smtp_server'] = 'tls://' . $main_domain; -// SMTP port (default is 25; use 587 for STARTTLS or 465 for the -// deprecated SSL over SMTP (aka SMTPS)) +// SMTP port. Use 25 for cleartext, 465 for Implicit TLS, or 587 for STARTTLS (default) $config['smtp_port'] = 587; // SMTP username (if required) if you use %u as the username Roundcube @@ -90,9 +88,9 @@ $config['support_url'] = 'https://forum.yunohost.org/t/roundcube-a-webmail/3965' // Name your service. This is displayed on the login screen and in the window title $config['product_name'] = 'YunoHost Webmail'; -// this key is used to encrypt the users imap password which is stored -// in the session record (and the client cookie if remember password is enabled). -// please provide a string of exactly 24 chars. +// This key is used to encrypt the users imap password which is stored +// in the session record. For the default cipher method it must be +// exactly 24 characters long. // YOUR KEY MUST BE DIFFERENT THAN THE SAMPLE VALUE FOR SECURITY REASONS $config['des_key'] = '__DESKEY__'; @@ -126,10 +124,10 @@ $config['ldap_public']['yunohost'] = array( 'hidden' => false, 'searchonly' => true, 'fieldmap' => array( - 'name' => 'uid', - 'surname' => 'sn', - 'firstname' => 'givenName', - 'email' => 'mail:*', + 'name' => 'uid', + 'surname' => 'sn', + 'firstname' => 'givenName', + 'email' => 'mail:*', ), ); diff --git a/manifest.json b/manifest.json index a2fe095..4c0dd52 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Open Source Webmail software", "fr": "Webmail Open Source" }, - "version": "1.4.11~ynh1", + "version": "1.5.0~ynh1", "url": "https://roundcube.net/", "license": "GPL-3.0-only", "maintainer": { @@ -19,7 +19,7 @@ "multi_instance": true, "services": [ "nginx", - "php7.0-fpm", + "php7.3-fpm", "mysql" ], "arguments": { diff --git a/pull_request_template.md b/pull_request_template.md index f501dd4..0a198cf 100644 --- a/pull_request_template.md +++ b/pull_request_template.md @@ -11,14 +11,6 @@ - [ ] Upgrade from last version tested. - [ ] Can be reviewed and tested. -## Validation ---- -*Minor decision* -- **Upgrade previous version** : -- [ ] **Code review** : -- [ ] **Approval (LGTM)** : -- [ ] **Approval (LGTM)** : - ## Package_check results --- * An automatic package_check will be launch at https://ci-apps-dev.yunohost.org/, when you add a specific comment to your Pull Request: "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!"* diff --git a/scripts/install b/scripts/install index 6cdb97b..87491bd 100644 --- a/scripts/install +++ b/scripts/install @@ -126,9 +126,9 @@ rc_conf="$final_path/config/config.inc.php" cp ../conf/config.inc.php "$rc_conf" ynh_replace_string --match_string="__DESKEY__" --replace_string="$(ynh_string_random --length=24)" --target_file="$rc_conf" -ynh_replace_string --match_string="__DBUSER__" --replace_string="$db_name" --target_file="$rc_conf" -ynh_replace_string --match_string="__DBPASS__" --replace_string="$db_pwd" --target_file="$rc_conf" -ynh_replace_string --match_string="__DBNAME__" --replace_string="$db_name" --target_file="$rc_conf" +ynh_replace_string --match_string="__DB_USER__" --replace_string="$db_name" --target_file="$rc_conf" +ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$rc_conf" +ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$rc_conf" ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$rc_conf" #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index c9366fa..c3bbc30 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -24,6 +24,7 @@ with_carddav=$(ynh_app_setting_get --app=$app --key=with_carddav) with_enigma=$(ynh_app_setting_get --app=$app --key=with_enigma) phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) language=$(ynh_app_setting_get --app=$app --key=language) +db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) #================================================= # CHECK VERSION @@ -149,10 +150,9 @@ then cp ../conf/config.inc.php "$rc_conf" ynh_replace_string --match_string="__DESKEY__" --replace_string="$(ynh_string_random --length=24)" --target_file="$rc_conf" - ynh_replace_string --match_string="__DBUSER__" --replace_string=$db_name --target_file="$rc_conf" - db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) - ynh_replace_string --match_string="__DBPASS__" --replace_string="$db_pwd" --target_file="$rc_conf" - ynh_replace_string --match_string="__DBNAME__" --replace_string="$db_name" --target_file="$rc_conf" + ynh_replace_string --match_string="__DB_USER__" --replace_string="$db_name" --target_file="$rc_conf" + ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$rc_conf" + ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$rc_conf" ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$rc_conf" #=================================================