From 13e7c57c74ab052cd7ed08c3cb259ced3fa7b8a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= <felix@piedallu.me>
Date: Tue, 28 May 2024 13:18:20 +0200
Subject: [PATCH 1/2] Fix upgrade on bookworm: call the correct php version

---
 manifest.toml   | 15 +++++++++++++--
 scripts/upgrade |  4 ++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index e40469f..f1ff893 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -48,9 +48,20 @@ ram.runtime = "50M"
     [resources.permissions]
     main.url = "/"
     main.allowed = "visitors" # should it always be public ?
- 
+
     # FIXME: watdo with this ...
     #REMOVEME? ynh_permission_create --permission="autodiscover" --url="re:$domain_regex/[Aa]uto[Dd]iscover/.*" --allowed="visitors" --show_tile="false" --protected="true"
 
     [resources.apt]
-    packages = "php7.4-soap, php7.4-imap, php7.4-xsl, php7.4-curl, php7.4-xml, php7.4-ldap, php7.4-cli, php7.4-mbstring, php7.4-memcached, libawl-php"
+    packages = [
+        "php7.4-soap",
+        "php7.4-imap",
+        "php7.4-xsl",
+        "php7.4-curl",
+        "php7.4-xml",
+        "php7.4-ldap",
+        "php7.4-cli",
+        "php7.4-mbstring",
+        "php7.4-memcached",
+        "libawl-php",
+    ]
diff --git a/scripts/upgrade b/scripts/upgrade
index d148951..1de9596 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -134,7 +134,7 @@ else
     backend="BackendIMAP"
     imap_server="$domain"
     imap_meeting_use_caldav="false"
-    
+
     ynh_add_config --template="backend/config-imap.php" --destination="$install_dir/backend/imap/config.php"
 fi
 
@@ -144,7 +144,7 @@ ynh_add_config --template="backend/config-autodiscover.php" --destination="$inst
 ynh_add_config --template="backend/config-searchldap.php" --destination="$install_dir/backend/searchldap/config.php"
 
 # Fixstates to avoid full resync of devices after version upgrades
-$install_dir/z-push-admin.php -a fixstates
+"php$phpversion" "$install_dir/z-push-admin.php" -a fixstates
 
 #=================================================
 # END OF SCRIPT

From d3fdeeeffdf93279abfca14fae59242377f6274d Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Tue, 28 May 2024 11:18:25 +0000
Subject: [PATCH 2/2] Auto-update READMEs

---
 ALL_README.md |  1 +
 README_es.md  | 43 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 README_es.md

diff --git a/ALL_README.md b/ALL_README.md
index a01b345..152f2e7 100644
--- a/ALL_README.md
+++ b/ALL_README.md
@@ -1,6 +1,7 @@
 # All available README files by language
 
 - [Read the README in English](README.md)
+- [Lea el README en español](README_es.md)
 - [Irakurri README euskaraz](README_eu.md)
 - [Lire le README en français](README_fr.md)
 - [Le o README en galego](README_gl.md)
diff --git a/README_es.md b/README_es.md
new file mode 100644
index 0000000..45ea3d2
--- /dev/null
+++ b/README_es.md
@@ -0,0 +1,43 @@
+<!--
+Este archivo README esta generado automaticamente<https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+No se debe editar a mano.
+-->
+
+# Z-Push para Yunohost
+
+[![Nivel de integración](https://dash.yunohost.org/integration/z-push.svg)](https://dash.yunohost.org/appci/app/z-push) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/z-push.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/z-push.maintain.svg)
+
+[![Instalar Z-Push con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=z-push)
+
+*[Leer este README en otros idiomas.](./ALL_README.md)*
+
+> *Este paquete le permite instalarZ-Push rapidamente y simplement en un servidor YunoHost.*  
+> *Si no tiene YunoHost, visita [the guide](https://yunohost.org/install) para aprender como instalarla.*
+
+## Descripción general
+
+Z-Push is an Exchange ActiveSync fronted written in PHP which lets you synchronize emails (IMAP/SMTP backend) and calendar/contacts (cardDAV and caldDAV backend)
+
+
+**Versión actual:** 2.7.3~ynh1
+## Documentaciones y recursos
+
+- Sitio web oficial: <http://z-push.org>
+- Documentación administrador oficial: <https://wiki.z-hub.io/display/ZP/Documentation>
+- Repositorio del código fuente oficial de la aplicación : <https://github.com/Z-Hub/Z-Push>
+- Catálogo YunoHost: <https://apps.yunohost.org/app/z-push>
+- Reportar un error: <https://github.com/YunoHost-Apps/z-push_ynh/issues>
+
+## Información para desarrolladores
+
+Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/z-push_ynh/tree/testing
+
+Para probar la rama `testing`, sigue asÍ:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/z-push_ynh/tree/testing --debug
+o
+sudo yunohost app upgrade z-push -u https://github.com/YunoHost-Apps/z-push_ynh/tree/testing --debug
+```
+
+**Mas informaciones sobre el empaquetado de aplicaciones:** <https://yunohost.org/packaging_apps>