[autopatch] Automatic patch attempt for helpers 2.1

.gitignore

@@ -1,2 +1,4 @@
 *.swp
 *~
+*.sw[op]
+.DS_Store

ALL_README.md

@@ -5,4 +5,5 @@
 - [Irakurri README euskaraz](README_eu.md)
 - [Lire le README en français](README_fr.md)
 - [Le o README en galego](README_gl.md)
+- [Baca README dalam bahasa bahasa Indonesia](README_id.md)
 - [阅读中文（简体）的 README](README_zh_Hans.md)

README.md

@@ -26,7 +26,7 @@ Roundcube is a web-based e-mail client. It offers all the features you'd expect
 - Support for PGP encryption with Enigma plugin by default.
 
 
-**Shipped version:** 1.6.7~ynh2
+**Shipped version:** 1.6.8~ynh1
 
 **Demo:** <https://demo.yunohost.org/webmail/>
 

README_es.md

@@ -26,7 +26,7 @@ Roundcube is a web-based e-mail client. It offers all the features you'd expect
 - Support for PGP encryption with Enigma plugin by default.
 
 
-**Versión actual:** 1.6.7~ynh2
+**Versión actual:** 1.6.8~ynh1
 
 **Demo:** <https://demo.yunohost.org/webmail/>
 

README_eu.md

@@ -26,7 +26,7 @@ Roundcube is a web-based e-mail client. It offers all the features you'd expect
 - Support for PGP encryption with Enigma plugin by default.
 
 
-**Paketatutako bertsioa:** 1.6.7~ynh2
+**Paketatutako bertsioa:** 1.6.8~ynh1
 
 **Demoa:** <https://demo.yunohost.org/webmail/>
 

README_fr.md

@@ -26,7 +26,7 @@ Roundcube est un client mail sous forme d'application web. Il offre toutes les f
 - Prise en charge du chiffrement PGP avec le plugin Enigma installé par default.
 
 
-**Version incluse :** 1.6.7~ynh2
+**Version incluse :** 1.6.8~ynh1
 
 **Démo :** <https://demo.yunohost.org/webmail/>
 

README_gl.md

@@ -26,7 +26,7 @@ Roundcube is a web-based e-mail client. It offers all the features you'd expect
 - Support for PGP encryption with Enigma plugin by default.
 
 
-**Versión proporcionada:** 1.6.7~ynh2
+**Versión proporcionada:** 1.6.8~ynh1
 
 **Demo:** <https://demo.yunohost.org/webmail/>
 

README_id.md

@@ -0,0 +1,57 @@
+<!--
+N.B.: README ini dibuat secara otomatis oleh <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+Ini TIDAK boleh diedit dengan tangan.
+-->
+
+# Roundcube untuk YunoHost
+
+[![Tingkat integrasi](https://dash.yunohost.org/integration/roundcube.svg)](https://ci-apps.yunohost.org/ci/apps/roundcube/) ![Status kerja](https://ci-apps.yunohost.org/ci/badges/roundcube.status.svg) ![Status pemeliharaan](https://ci-apps.yunohost.org/ci/badges/roundcube.maintain.svg)
+
+[![Pasang Roundcube dengan YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=roundcube)
+
+*[Baca README ini dengan bahasa yang lain.](./ALL_README.md)*
+
+> *Paket ini memperbolehkan Anda untuk memasang Roundcube secara cepat dan mudah pada server YunoHost.*  
+> *Bila Anda tidak mempunyai YunoHost, silakan berkonsultasi dengan [panduan](https://yunohost.org/install) untuk mempelajari bagaimana untuk memasangnya.*
+
+## Ringkasan
+
+Roundcube is a web-based e-mail client. It offers all the features you'd expect from a mail client, including multilingual support, address book management, folder manipulation, message search and spell checking.
+
+### YunoHost specific features
+
+- Synchronize your email aliases as identities in Roundcube
+- Install the [contextmenu](https://packagist.org/packages/johndoh/contextmenu) and [automatic addressbook](https://packagist.org/packages/projectmyst/automatic_addressbook) plugins by default
+- Allow to install the [CardDAV](https://packagist.org/packages/roundcube/carddav) (address book) synchronization plugin at the installation - note that if you have installed Nextcloud or Baïkal, it will automatically add the corresponding and existing address book.
+- Support for PGP encryption with Enigma plugin by default.
+
+
+**Versi terkirim:** 1.6.8~ynh1
+
+**Demo:** <https://demo.yunohost.org/webmail/>
+
+## Tangkapan Layar
+
+![Tangkapan Layar pada Roundcube](./doc/screenshots/screenshot.png)
+
+## Dokumentasi dan sumber daya
+
+- Website aplikasi resmi: <https://roundcube.net/>
+- Dokumentasi admin resmi: <https://github.com/roundcube/roundcubemail/wiki>
+- Depot kode aplikasi hulu: <https://github.com/roundcube/roundcubemail>
+- Gudang YunoHost: <https://apps.yunohost.org/app/roundcube>
+- Laporkan bug: <https://github.com/YunoHost-Apps/roundcube_ynh/issues>
+
+## Info developer
+
+Silakan kirim pull request ke [`testing` branch](https://github.com/YunoHost-Apps/roundcube_ynh/tree/testing).
+
+Untuk mencoba branch `testing`, silakan dilanjutkan seperti:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/roundcube_ynh/tree/testing --debug
+atau
+sudo yunohost app upgrade roundcube -u https://github.com/YunoHost-Apps/roundcube_ynh/tree/testing --debug
+```
+
+**Info lebih lanjut mengenai pemaketan aplikasi:** <https://yunohost.org/packaging_apps>

README_zh_Hans.md

@@ -26,7 +26,7 @@ Roundcube is a web-based e-mail client. It offers all the features you'd expect
 - Support for PGP encryption with Enigma plugin by default.
 
 
-**分发版本：** 1.6.7~ynh2
+**分发版本：** 1.6.8~ynh1
 
 **演示：** <https://demo.yunohost.org/webmail/>
 

conf/nginx.conf

@@ -12,7 +12,7 @@ location __PATH__/ {
   location ~ [^/]\.php(/|$) {
     fastcgi_split_path_info ^(.+?\.php)(/.*)$;
 
-    fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock;
+    fastcgi_pass unix:/var/run/php/php__PHP_VERSION__-fpm-__APP__.sock;
     fastcgi_index index.php;
     fastcgi_param REMOTE_USER     $remote_user;
     fastcgi_param PATH_INFO       $fastcgi_path_info;

manifest.toml

@@ -7,7 +7,7 @@ name = "Roundcube"
 description.en = "Open Source Webmail software"
 description.fr = "Webmail Open Source"
 
-version = "1.6.7~ynh2"
+version = "1.6.8~ynh1"
 maintainers = []
 
 [upstream]
@@ -18,7 +18,8 @@ admindoc = "https://github.com/roundcube/roundcubemail/wiki"
 code = "https://github.com/roundcube/roundcubemail"
 
 [integration]
-yunohost = ">= 11.2"
+yunohost = ">= 11.2.18"
+helpers_version = "2.1"
 architectures = "all"
 multi_instance = true
 ldap = true
@@ -54,14 +55,15 @@ ram.runtime = "50M"
 
 [resources]
     [resources.sources.main]
-    url = "https://github.com/roundcube/roundcubemail/releases/download/1.6.7/roundcubemail-1.6.7.tar.gz"
-    sha256 = "b12c4f9f84890830ce10e470ac0d698b7de00d29f432a9326b4cf8c590e558de"
+    url = "https://github.com/roundcube/roundcubemail/releases/download/1.6.8/roundcubemail-1.6.8.tar.gz"
+    sha256 = "939c9cd46281bf5bfb2dd932680b18ee1706035a5806dc08d8b414971cea91f7"
     autoupdate.strategy = "latest_github_release"
-    autoupdate.asset = "roundcubemail-.*.tar.gz"
+    autoupdate.asset = "roundcubemail-\\d+\\.\\d+\\.\\d+\\.tar\\.gz$"
 
     [resources.system_user]
 
     [resources.install_dir]
+    group = "www-data:r-x"
 
     [resources.permissions]
     main.url = "/"
@@ -70,15 +72,15 @@ ram.runtime = "50M"
     packages = [
         "mariadb-server",
         "php-pear",
-        "php8.2-ldap",
-        "php8.2-mysql",
-        "php8.2-cli",
-        "php8.2-intl",
-        "php8.2-zip",
-        "php8.2-gd",
-        "php8.2-mbstring",
-        "php8.2-dom",
-        "php8.2-curl",
+        "php8.3-ldap",
+        "php8.3-mysql",
+        "php8.3-cli",
+        "php8.3-intl",
+        "php8.3-zip",
+        "php8.3-gd",
+        "php8.3-mbstring",
+        "php8.3-dom",
+        "php8.3-curl",
     ]
 
     [resources.database]

scripts/_common.sh

@@ -1,17 +1,13 @@
 #!/bin/bash
 
 #=================================================
-# COMMON VARIABLES
+# COMMON VARIABLES AND CUSTOM HELPERS
 #=================================================
 
 # Composer version
-YNH_COMPOSER_VERSION=2.5.5
+composer_version=2.5.5
 
 # Plugins version
 contextmenu_version=3.3.1
 automatic_addressbook_version=v0.4.3
 carddav_version=5.1.0
-
-#=================================================
-# EXPERIMENTAL HELPERS
-#=================================================

scripts/backup

@@ -1,46 +1,37 @@
 #!/bin/bash
 
-#=================================================
-# GENERIC START
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# DECLARE DATA AND CONF FILES TO BACKUP
-#=================================================
-ynh_print_info --message="Declaring files to be backed up..."
+ynh_print_info "Declaring files to be backed up..."
 
 #=================================================
 # BACKUP THE APP MAIN DIR
 #=================================================
 
-ynh_backup --src_path="$install_dir"
+ynh_backup "$install_dir"
 
 #=================================================
 # BACKUP THE NGINX CONFIGURATION
 #=================================================
 
-ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
+ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf"
 
 #=================================================
 # BACKUP THE PHP-FPM CONFIGURATION
 #=================================================
 
-ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
+ynh_backup "/etc/php/$php_version/fpm/pool.d/$app.conf"
 
 #=================================================
 # BACKUP THE MYSQL DATABASE
 #=================================================
-ynh_print_info --message="Backing up the MySQL database..."
+ynh_print_info "Backing up the MySQL database..."
 
-ynh_mysql_dump_db --database="$db_name" > db.sql
+ynh_mysql_dump_db > db.sql
 
 #=================================================
 # END OF SCRIPT
 #=================================================
 
-ynh_print_info --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)."
+ynh_print_info "Backup script completed for $app. (YunoHost will then actually copy those files to the archive)."

scripts/change_url

@@ -1,25 +1,17 @@
 #!/bin/bash
 
-#=================================================
-# GENERIC STARTING
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
 source _common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# STANDARD MODIFICATIONS
 #=================================================
 # MODIFY URL IN NGINX CONF
 #=================================================
-ynh_script_progression --message="Updating NGINX web server configuration..." --weight=2
+ynh_script_progression "Updating NGINX web server configuration..."
 
-ynh_change_url_nginx_config
+ynh_config_change_url_nginx
 
 #=================================================
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Change of URL completed for $app" --last
+ynh_script_progression "Change of URL completed for $app"