Merge branch 'testing' into tor

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)

README.md

@@ -18,7 +18,7 @@ It shall NOT be edited by hand.
 
 SimpleX - the first messaging platform operating without user identifiers of any kind - 100% private by design! iOS and Android apps are released.
 
-**Shipped version:** 5.6.2~ynh1
+**Shipped version:** 5.8.0~ynh1
 
 ## Screenshots
 

README_es.md

@@ -0,0 +1,47 @@
+<!--
+Este archivo README esta generado automaticamente<https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+No se debe editar a mano.
+-->
+
+# SimpleX para Yunohost
+
+[![Nivel de integración](https://dash.yunohost.org/integration/simplex.svg)](https://dash.yunohost.org/appci/app/simplex) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/simplex.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/simplex.maintain.svg)
+
+[![Instalar SimpleX con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=simplex)
+
+*[Leer este README en otros idiomas.](./ALL_README.md)*
+
+> *Este paquete le permite instalarSimpleX 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
+
+SimpleX - the first messaging platform operating without user identifiers of any kind - 100% private by design! iOS and Android apps are released.
+
+**Versión actual:** 5.8.0~ynh1
+
+## Capturas
+
+![Captura de SimpleX](./doc/screenshots/conversation.png)
+
+## Documentaciones y recursos
+
+- Sitio web oficial: <https://simplex.chat/>
+- Documentación administrador oficial: <https://github.com/simplex-chat/simplex-chat/blob/stable/docs/SERVER.md>
+- Repositorio del código fuente oficial de la aplicación : <https://github.com/simplex-chat/simplexmq>
+- Catálogo YunoHost: <https://apps.yunohost.org/app/simplex>
+- Reportar un error: <https://github.com/YunoHost-Apps/simplex_ynh/issues>
+
+## Información para desarrolladores
+
+Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/simplex_ynh/tree/testing
+
+Para probar la rama `testing`, sigue asÍ:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/simplex_ynh/tree/testing --debug
+o
+sudo yunohost app upgrade simplex -u https://github.com/YunoHost-Apps/simplex_ynh/tree/testing --debug
+```
+
+**Mas informaciones sobre el empaquetado de aplicaciones:** <https://yunohost.org/packaging_apps>

README_eu.md

@@ -18,7 +18,7 @@ EZ editatu eskuz.
 
 SimpleX - the first messaging platform operating without user identifiers of any kind - 100% private by design! iOS and Android apps are released.
 
-**Paketatutako bertsioa:** 5.6.2~ynh1
+**Paketatutako bertsioa:** 5.8.0~ynh1
 
 ## Pantaila-argazkiak
 

README_fr.md

@@ -18,7 +18,7 @@ Il NE doit PAS être modifié à la main.
 
 SimpleX - la première plate-forme de messagerie qui n'a aucun identifiant d'utilisateur d'aucune sorte - 100 % privée de par sa conception !
 
-**Version incluse :** 5.6.2~ynh1
+**Version incluse :** 5.8.0~ynh1
 
 ## Captures d’écran
 

README_gl.md

@@ -18,7 +18,7 @@ NON debe editarse manualmente.
 
 SimpleX - the first messaging platform operating without user identifiers of any kind - 100% private by design! iOS and Android apps are released.
 
-**Versión proporcionada:** 5.6.2~ynh1
+**Versión proporcionada:** 5.8.0~ynh1
 
 ## Capturas de pantalla
 

README_it.md

@@ -18,7 +18,7 @@ NON DEVE essere modificato manualmente.
 
 SimpleX - the first messaging platform operating without user identifiers of any kind - 100% private by design! iOS and Android apps are released.
 
-**Versione pubblicata:** 5.1.0~ynh2
+**Versione pubblicata:** 5.8.0~ynh1
 
 ## Screenshot
 

README_zh_Hans.md

@@ -18,7 +18,7 @@
 
 SimpleX - the first messaging platform operating without user identifiers of any kind - 100% private by design! iOS and Android apps are released.
 
-**分发版本：** 5.6.2~ynh1
+**分发版本：** 5.8.0~ynh1
 
 ## 截图
 

conf/xftp.systemd.service

@@ -14,5 +14,40 @@ KillSignal=SIGINT
 TimeoutStopSec=infinity
 AmbientCapabilities=CAP_NET_BIND_SERVICE
 
+
+# Sandboxing options to harden security
+# Depending on specificities of your service/app, you may need to tweak these
+# .. but this should be a good baseline
+# Details for these options: https://www.freedesktop.org/software/systemd/man/systemd.exec.html
+NoNewPrivileges=yes
+PrivateTmp=yes
+PrivateDevices=yes
+RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6 AF_NETLINK
+RestrictNamespaces=yes
+RestrictRealtime=yes
+DevicePolicy=closed
+ProtectClock=yes
+ProtectHostname=yes
+ProtectProc=invisible
+ProtectSystem=full
+ProtectControlGroups=yes
+ProtectKernelModules=yes
+ProtectKernelTunables=yes
+LockPersonality=yes
+SystemCallArchitectures=native
+SystemCallFilter=~@clock @debug @module @mount @obsolete @reboot @setuid @swap @cpu-emulation @privileged
+
+# Denying access to capabilities that should not be relevant for webapps
+# Doc: https://man7.org/linux/man-pages/man7/capabilities.7.html
+CapabilityBoundingSet=~CAP_RAWIO CAP_MKNOD
+CapabilityBoundingSet=~CAP_AUDIT_CONTROL CAP_AUDIT_READ CAP_AUDIT_WRITE
+CapabilityBoundingSet=~CAP_SYS_BOOT CAP_SYS_TIME CAP_SYS_MODULE CAP_SYS_PACCT
+CapabilityBoundingSet=~CAP_LEASE CAP_LINUX_IMMUTABLE CAP_IPC_LOCK
+CapabilityBoundingSet=~CAP_BLOCK_SUSPEND CAP_WAKE_ALARM
+CapabilityBoundingSet=~CAP_SYS_TTY_CONFIG
+CapabilityBoundingSet=~CAP_MAC_ADMIN CAP_MAC_OVERRIDE
+CapabilityBoundingSet=~CAP_NET_ADMIN CAP_NET_BROADCAST CAP_NET_RAW
+CapabilityBoundingSet=~CAP_SYS_ADMIN CAP_SYS_PTRACE CAP_SYSLOG
+
 [Install]
 WantedBy=multi-user.target

manifest.toml

@@ -5,7 +5,7 @@ name = "SimpleX"
 description.en = "Messaging platform operating without user identifiers"
 description.fr = "Plate-forme de messagerie fonctionnant sans identifiants d'utilisateurs"
 
-version = "5.6.2~ynh1"
+version = "5.8.0~ynh1"
 
 maintainers = []
 
@@ -34,21 +34,21 @@ ram.runtime = "50M"
 
 [resources]
 
-[resources.sources]
+ [resources.sources]
     [resources.sources.main]
-   amd64.url = "https://github.com/YunoHost-Apps/simplex_ynh/releases/download/v5.6.2/smp-server_amd64"
+    amd64.url = "https://github.com/YunoHost-Apps/simplex_ynh/releases/download/v5.8.0/smp-server_amd64"
-   amd64.sha256 = "d711cc5bddddf4abd01d971d7d4cda879bc4d4d2beb455154031589ffcb0c891"
+    amd64.sha256 = "8b5806a63ccbec373e8a4681cbb97113b0757a19b5f8a889dd9611c767b1a57c"
-   arm64.url = "https://github.com/skyuk3000/simplex_ynh/releases/download/5.2.0/smp-server_arm64"
+    arm64.url = "https://github.com/YunoHost-Apps/simplex_ynh/releases/download/v5.8.0/smp-server_arm64"
-   arm64.sha256 = "2a5a6f34230443212d3166ec7c706440eb2748c6cd2b4e47526a4ccf45717584"
+    arm64.sha256 = "dcf246b4e065199fbd8eb41845eef4d93ba3bcf01eeddc833bb318a6c78db988"
     in_subdir = false
     extract   = false
     rename    = "smp-server"
 
     [resources.sources.xftp]
-   amd64.url = "https://github.com/YunoHost-Apps/simplex_ynh/releases/download/v5.6.2/xftp-server_amd64"
+    amd64.url = "https://github.com/YunoHost-Apps/simplex_ynh/releases/download/v5.8.0/xftp-server_amd64"
-   amd64.sha256 = "6febc49aa989a02ad8cfc27b657c30acc425878e88a995beca864afeaaff7b3e"
+    amd64.sha256 = "d7550d5dc6b3ff3dfee145e39ab5da9429c6fde295d705d634e21c2e62b53142"
-   arm64.url = "https://github.com/skyuk3000/simplex_ynh/releases/download/5.2.0/xftp-server_arm64"
+    arm64.url = "https://github.com/YunoHost-Apps/simplex_ynh/releases/download/v5.8.0/xftp-server_arm64"
-   arm64.sha256 = "a8f4118610efca9bd7b2d687c04f95a9cf52114d1941c8f94441d80c1c04d92a"
+    arm64.sha256 = "515bcdde8d46e07614168b926e61b1e17f039b8a2be29590cde1ff9caea5fa12"
     in_subdir = false
     extract   = false
     rename    = "xftp-server"

scripts/remove

@@ -10,10 +10,9 @@ source _common.sh
 source /usr/share/yunohost/helpers
 
 #=================================================
-# STANDARD REMOVE
+# REMOVE SYSTEM CONFIGURATIONS
-#=================================================
-# REMOVE SERVICE INTEGRATION IN YUNOHOST
 #=================================================
+ynh_script_progression --message="Removing system configurations related to $app..." --weight=1
 
 # Remove the service from the list of services known by YunoHost (added from `yunohost service add`)
 if ynh_exec_warn_less yunohost service status $app >/dev/null
@@ -24,13 +23,6 @@ then
 	yunohost service remove tor
 fi
 
-#=================================================
-# REMOVE SYSTEM CONFIGURATIONS
-#=================================================
-# REMOVE SYSTEMD SERVICE 
-#=================================================
-ynh_script_progression --message="Removing system configurations related to $app..." --weight=1
-
 # Remove the dedicated systemd config
 ynh_remove_systemd_config
 ynh_remove_systemd_config --service=xftp