From 52a89f031ef23c3bc2fcde5dd97b5db734b3d04f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Wed, 17 Aug 2022 11:13:14 +0200
Subject: [PATCH] testing (#148)

* Upgrade to 1.6.0
* Upgrade requirements to Bullseye
---
 README.md           |  3 ++-
 README_fr.md        |  3 ++-
 conf/app.src        |  4 ++--
 conf/config.inc.php | 10 +++-------
 conf/nginx.conf     |  2 +-
 conf/php-fpm.conf   |  4 ++--
 manifest.json       |  9 +++++----
 scripts/_common.sh  |  4 ++--
 scripts/backup      |  2 +-
 scripts/install     |  2 +-
 scripts/restore     | 24 +++++++++++++-----------
 scripts/upgrade     | 18 +++++++++---------
 12 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/README.md b/README.md
index 9fac1cd..ed44da3 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,8 @@ In addition to Roundcube core features, the following are made available with th
 * Support for PGP encryption with Enigma plugin by default.
 
 
-**Shipped version:** 1.5.3~ynh1
+**Shipped version:** 1.6.0~ynh1
+
 
 **Demo:** https://demo.yunohost.org/webmail/
 
diff --git a/README_fr.md b/README_fr.md
index 10e27d1..40c4ee1 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -28,7 +28,8 @@ En plus des fonctionnalités principales de Roundcube, les éléments suivants s
 * Prise en charge du chiffrement PGP avec le plugin Enigma installé par default.
 
 
-**Version incluse :** 1.5.3~ynh1
+**Version incluse :** 1.6.0~ynh1
+
 
 **Démo :** https://demo.yunohost.org/webmail/
 
diff --git a/conf/app.src b/conf/app.src
index ef45d37..aefdce3 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/roundcube/roundcubemail/releases/download/1.5.3/roundcubemail-1.5.3.tar.gz
-SOURCE_SUM=22fdfa0f868fc478dfbb1dfa9bcd5fc91be981182334ca6079ad1ae03ac4c96e
+SOURCE_URL=https://github.com/roundcube/roundcubemail/releases/download/1.6.0/roundcubemail-1.6.0.tar.gz
+SOURCE_SUM=1224eaf628888e503c49d0e8a69aa4997e566c3605738d0303d9c7a09722f363
 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 b32544c..791ceab 100644
--- a/conf/config.inc.php
+++ b/conf/config.inc.php
@@ -41,7 +41,7 @@ $config['db_dsnw'] = 'mysql://__DB_NAME__:__DB_PWD__@localhost/__DB_NAME__';
 // %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['imap_host'] = 'localhost:143';
 
 // SMTP server host (for sending mails).
 // Enter hostname with prefix ssl:// to use Implicit TLS, or use
@@ -55,10 +55,7 @@ $config['default_host'] = 'localhost';
 // For example %n = mail.domain.tld, %t = domain.tld
 // To specify different 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. Use 25 for cleartext, 465 for Implicit TLS, or 587 for STARTTLS (default)
-$config['smtp_port'] = 587;
+$config['smtp_host'] = 'tls://' . $main_domain;
 
 // SMTP username (if required) if you use %u as the username Roundcube
 // will use the current username for login
@@ -113,8 +110,7 @@ $config['enable_spellcheck'] = false;
 // Enable YunoHost users search in the address book.
 $config['ldap_public']['yunohost'] = array(
   'name' => 'YunoHost Users',
-  'hosts' => array('localhost'),
-  'port' => 389,
+  'hosts' => array('localhost:389'),
   'user_specific' => false,
   'base_dn' => 'ou=users,dc=yunohost,dc=org',
   'scope' => 'list',
diff --git a/conf/nginx.conf b/conf/nginx.conf
index 7f4196e..f7c3927 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -5,7 +5,7 @@ location __PATH__/ {
   alias __FINALPATH__/ ;
 
   index index.php;
-  client_max_body_size 10G;
+  client_max_body_size 50M;
   try_files $uri $uri/ /index.php?q=$uri&$args;
 
   # pass PHP scripts to FastCGI server
diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf
index 61b251f..e8885d3 100644
--- a/conf/php-fpm.conf
+++ b/conf/php-fpm.conf
@@ -419,8 +419,8 @@ chdir = __FINALPATH__
 ;php_admin_value[memory_limit] = 32M
 
 ; Common values to change to increase file upload limit
-; php_admin_value[upload_max_filesize] = 50M
-; php_admin_value[post_max_size] = 50M
+php_admin_value[upload_max_filesize] = 50M
+php_admin_value[post_max_size] = 50M
 ; php_admin_flag[mail.add_x_header] = Off
 
 ; Other common parameters
diff --git a/manifest.json b/manifest.json
index 5ff2549..59effea 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,14 +6,15 @@
         "en": "Open Source Webmail software",
         "fr": "Webmail Open Source"
     },
-    "version": "1.5.3~ynh1",
+    "version": "1.6.0~ynh1",
     "url": "https://roundcube.net/",
     "upstream": {
         "license": "GPL-3.0-only",
         "website": "https://roundcube.net/",
         "demo": "https://demo.yunohost.org/webmail/",
         "admindoc": "https://github.com/roundcube/roundcubemail/wiki",
-        "code": "https://github.com/roundcube/roundcubemail"
+        "code": "https://github.com/roundcube/roundcubemail",
+        "cpe": "cpe:2.3:a:roundcube:webmail"
     },
     "license": "GPL-3.0-only",
     "maintainer": {
@@ -21,12 +22,12 @@
         "email": ""
     },
     "requirements": {
-        "yunohost": ">= 4.3.2"
+        "yunohost": ">= 11.0.9"
     },
     "multi_instance": true,
     "services": [
         "nginx",
-        "php7.3-fpm",
+        "php7.4-fpm",
         "mysql"
     ],
     "arguments": {
diff --git a/scripts/_common.sh b/scripts/_common.sh
index ad483bc..1433a9d 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -4,10 +4,10 @@
 # COMMON VARIABLES
 #=================================================
 
-YNH_PHP_VERSION="7.3"
+YNH_PHP_VERSION="7.4"
 
 # Package dependencies
-pkg_dependencies="php-pear php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-dom php${YNH_PHP_VERSION}-curl"
+pkg_dependencies="php-pear php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-dom php${YNH_PHP_VERSION}-curl"
 
 # Composer version
 YNH_COMPOSER_VERSION=2.3.7
diff --git a/scripts/backup b/scripts/backup
index 3167c87..6f4f9c1 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -26,7 +26,7 @@ app=$YNH_APP_INSTANCE_NAME
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 domain=$(ynh_app_setting_get --app=$app --key=domain)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
-phpversion=$YNH_PHP_VERSION
+phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 #=================================================
 # DECLARE DATA AND CONF FILES TO BACKUP
diff --git a/scripts/install b/scripts/install
index ebb8c65..8580532 100644
--- a/scripts/install
+++ b/scripts/install
@@ -203,7 +203,7 @@ ynh_replace_string --match_string="^\s*// installed plugins" --replace_string="&
 
 # Update javascript dependencies
 (cd "$final_path"
-/usr/bin/php$phpversion -q ./bin/install-jsdeps.sh)
+/usr/bin/php$phpversion -q ./bin/update.sh -v ?)
 
 # Store the config file checksum into the app settings
 ynh_store_file_checksum --file="$final_path/config/config.inc.php"
diff --git a/scripts/restore b/scripts/restore
index 25c084d..1e028d3 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -38,16 +38,11 @@ fpm_usage=$(ynh_app_setting_get --app=$app --key=fpm_usage)
 #=================================================
 ynh_script_progression --message="Validating restoration parameters..." --weight=3
 
-test ! -d $final_path || ynh_die --message="There is already a directory: $final_path "
+test ! -d $final_path \
+	|| ynh_die --message="There is already a directory: $final_path "
 
 #=================================================
 # STANDARD RESTORATION STEPS
-#=================================================
-# RESTORE THE NGINX CONFIGURATION
-#=================================================
-
-ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
-
 #=================================================
 # RECREATE THE DEDICATED USER
 #=================================================
@@ -67,6 +62,14 @@ chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
 chown -R $app:www-data "$final_path"
 
+#=================================================
+# REINSTALL DEPENDENCIES
+#=================================================
+ynh_script_progression --message="Reinstalling dependencies..." --weight=1
+
+# Define and install dependencies
+ynh_install_app_dependencies $pkg_dependencies
+
 #=================================================
 # RESTORE THE PHP-FPM CONFIGURATION
 #=================================================
@@ -78,12 +81,11 @@ ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint --phpversion=$phpversion
 
 #=================================================
-# REINSTALL DEPENDENCIES
+# RESTORE THE NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Reinstalling dependencies..." --weight=1
+ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1
 
-# Define and install dependencies
-ynh_install_app_dependencies $pkg_dependencies
+ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
 #=================================================
 # SPECIFIC RESTORATION
diff --git a/scripts/upgrade b/scripts/upgrade
index 1877b73..488fb83 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -131,14 +131,6 @@ chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
 chown -R $app:www-data "$final_path"
 
-#=================================================
-# NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1
-
-# Create a dedicated NGINX config
-ynh_add_nginx_config
-
 #=================================================
 # UPGRADE DEPENDENCIES
 #=================================================
@@ -154,6 +146,14 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=5
 # Create a dedicated PHP-FPM config
 ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint
 
+#=================================================
+# NGINX CONFIGURATION
+#=================================================
+ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1
+
+# Create a dedicated NGINX config
+ynh_add_nginx_config
+
 #=================================================
 # SPECIFIC UPGRADE
 #=================================================
@@ -255,7 +255,7 @@ then
 
     # Update JavaScript dependencies
     (cd "$final_path"
-    /usr/bin/php$phpversion -q ./bin/install-jsdeps.sh)
+    /usr/bin/php$phpversion -q ./bin/update.sh -v ?)
 
     # Store the config file checksum into the app settings
     ynh_store_file_checksum --file="$final_path/config/config.inc.php"