From 193180a1d385ad79fe64f35ab7e60352b6ad8cd6 Mon Sep 17 00:00:00 2001 From: MHWCT <105671686+MHWCT@users.noreply.github.com> Date: Tue, 31 May 2022 13:56:12 -0400 Subject: [PATCH 01/22] Update tomcat9_deb.src --- conf/tomcat9_deb.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/tomcat9_deb.src b/conf/tomcat9_deb.src index b5538cd..8fdb887 100644 --- a/conf/tomcat9_deb.src +++ b/conf/tomcat9_deb.src @@ -1,4 +1,4 @@ -SOURCE_URL=https://ftp.debian.org/debian/pool/main/t/tomcat9/tomcat9_9.0.58-1_all.deb +SOURCE_URL=http://ftp.de.debian.org/debian/pool/main/t/tomcat9/tomcat9_9.0.43-2~deb11u3_all.deb SOURCE_SUM=d63612224bbd2ed489d8b427bc8543b82aea1d3cfbb850c2a1489f080f50b808 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=ar From 20eca5af0219a4bd024eb5b0ca40336be7e46a84 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 5 Jun 2022 16:35:31 +0200 Subject: [PATCH 02/22] Fix shasum --- conf/tomcat9_deb.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/tomcat9_deb.src b/conf/tomcat9_deb.src index 8fdb887..b981920 100644 --- a/conf/tomcat9_deb.src +++ b/conf/tomcat9_deb.src @@ -1,5 +1,5 @@ SOURCE_URL=http://ftp.de.debian.org/debian/pool/main/t/tomcat9/tomcat9_9.0.43-2~deb11u3_all.deb -SOURCE_SUM=d63612224bbd2ed489d8b427bc8543b82aea1d3cfbb850c2a1489f080f50b808 +SOURCE_SUM=c49eaa7de72f8d90f30a8fd9a8ba8e2e4ba51988ce839bb31a4a151758d47206 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=ar SOURCE_IN_SUBDIR=false From 9cf0a151dee825abf54a416a8909646421b175d3 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 6 Jun 2022 11:50:09 +0000 Subject: [PATCH 03/22] Auto-update README --- README.md | 21 ++++++++++----------- README_fr.md | 27 +++++++++++++++------------ 2 files changed, 25 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 8bfc6f4..b235348 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Apache Guacamole for YunoHost -[![Integration level](https://dash.yunohost.org/integration/guacamole.svg)](https://dash.yunohost.org/appci/app/guacamole) ![](https://ci-apps.yunohost.org/ci/badges/guacamole.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/guacamole.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/guacamole.svg)](https://dash.yunohost.org/appci/app/guacamole) ![Working status](https://ci-apps.yunohost.org/ci/badges/guacamole.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/guacamole.maintain.svg) [![Install Apache Guacamole with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=guacamole) *[Lire ce readme en français.](./README_fr.md)* @@ -19,11 +19,9 @@ Clientless remote desktop gateway. It supports standard protocols like VNC, RDP, **Shipped version:** 1.4.0~ynh1 - - ## Screenshots -![](./doc/screenshots/screenshot1.jpg) +![Screenshot of Apache Guacamole](./doc/screenshots/screenshot1.jpg) ## Disclaimers / important information @@ -33,21 +31,22 @@ The user that is configured as admin during install will have access to admin se ## Documentation and resources -* Official app website: https://guacamole.apache.org/ -* Official admin documentation: https://guacamole.apache.org/doc/gug/ -* Upstream app code repository: https://github.com/search?utf8=%E2%9C%93&q=repo%3Aapache%2Fguacamole-server+repo%3Aapache%2Fguacamole-client+repo%3Aapache%2Fguacamole-website&type=Repositories&ref=searchresults -* YunoHost documentation for this app: https://yunohost.org/app_guacamole -* Report a bug: https://github.com/YunoHost-Apps/guacamole_ynh/issues +* Official app website: +* Official admin documentation: +* Upstream app code repository: +* YunoHost documentation for this app: +* Report a bug: ## Developer info Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/guacamole_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/guacamole_ynh/tree/testing --debug or sudo yunohost app upgrade guacamole -u https://github.com/YunoHost-Apps/guacamole_ynh/tree/testing --debug ``` -**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file +**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md index 50b7da1..2d326b1 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,10 +1,14 @@ + + # Apache Guacamole pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/guacamole.svg)](https://dash.yunohost.org/appci/app/guacamole) ![](https://ci-apps.yunohost.org/ci/badges/guacamole.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/guacamole.maintain.svg) +[![Niveau d'intégration](https://dash.yunohost.org/integration/guacamole.svg)](https://dash.yunohost.org/appci/app/guacamole) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/guacamole.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/guacamole.maintain.svg) [![Installer Apache Guacamole avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=guacamole) *[Read this readme in english.](./README.md)* -*[Lire ce readme en français.](./README_fr.md)* > *Ce package vous permet d'installer Apache Guacamole rapidement et simplement sur un serveur YunoHost. Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* @@ -15,11 +19,9 @@ Service de bureau à distance sans client. Fonctionne avec des protocoles standa **Version incluse :** 1.4.0~ynh1 - - ## Captures d'écran -![](./doc/screenshots/screenshot1.jpg) +![Capture d'écran de Apache Guacamole](./doc/screenshots/screenshot1.jpg) ## Avertissements / informations importantes @@ -29,21 +31,22 @@ L'utilisateur choisi comme admin durant le processus d'installation aura accès ## Documentations et ressources -* Site officiel de l'app : https://guacamole.apache.org/ -* Documentation officielle de l'admin : https://guacamole.apache.org/doc/gug/ -* Dépôt de code officiel de l'app : https://github.com/search?utf8=%E2%9C%93&q=repo%3Aapache%2Fguacamole-server+repo%3Aapache%2Fguacamole-client+repo%3Aapache%2Fguacamole-website&type=Repositories&ref=searchresults -* Documentation YunoHost pour cette app : https://yunohost.org/app_guacamole -* Signaler un bug : https://github.com/YunoHost-Apps/guacamole_ynh/issues +* Site officiel de l'app : +* Documentation officielle de l'admin : +* Dépôt de code officiel de l'app : +* Documentation YunoHost pour cette app : +* Signaler un bug : ## Informations pour les développeurs Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/guacamole_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/guacamole_ynh/tree/testing --debug ou sudo yunohost app upgrade guacamole -u https://github.com/YunoHost-Apps/guacamole_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file +**Plus d'infos sur le packaging d'applications :** From a224bbcd58cea654a16ab8c64dd564e091c80b17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 6 Jun 2022 14:16:05 +0200 Subject: [PATCH 04/22] Update conf/tomcat9_deb.src Co-authored-by: Jules Bertholet --- conf/tomcat9_deb.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/tomcat9_deb.src b/conf/tomcat9_deb.src index b981920..e67e9c1 100644 --- a/conf/tomcat9_deb.src +++ b/conf/tomcat9_deb.src @@ -1,4 +1,4 @@ -SOURCE_URL=http://ftp.de.debian.org/debian/pool/main/t/tomcat9/tomcat9_9.0.43-2~deb11u3_all.deb +SOURCE_URL=http://ftp.debian.org/debian/pool/main/t/tomcat9/tomcat9_9.0.43-2~deb11u3_all.deb SOURCE_SUM=c49eaa7de72f8d90f30a8fd9a8ba8e2e4ba51988ce839bb31a4a151758d47206 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=ar From 0b190be4477dc07cd002b54fa488320386674c00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 6 Jun 2022 14:27:51 +0200 Subject: [PATCH 05/22] App name (#31) Use shorter name --- README.md | 8 ++++---- README_fr.md | 8 ++++---- manifest.json | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index b235348..c9a0d47 100644 --- a/README.md +++ b/README.md @@ -3,14 +3,14 @@ N.B.: This README was automatically generated by https://github.com/YunoHost/app It shall NOT be edited by hand. --> -# Apache Guacamole for YunoHost +# Guacamole for YunoHost [![Integration level](https://dash.yunohost.org/integration/guacamole.svg)](https://dash.yunohost.org/appci/app/guacamole) ![Working status](https://ci-apps.yunohost.org/ci/badges/guacamole.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/guacamole.maintain.svg) -[![Install Apache Guacamole with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=guacamole) +[![Install Guacamole with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=guacamole) *[Lire ce readme en français.](./README_fr.md)* -> *This package allows you to install Apache Guacamole quickly and simply on a YunoHost server. +> *This package allows you to install Guacamole quickly and simply on a YunoHost server. If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* ## Overview @@ -21,7 +21,7 @@ Clientless remote desktop gateway. It supports standard protocols like VNC, RDP, ## Screenshots -![Screenshot of Apache Guacamole](./doc/screenshots/screenshot1.jpg) +![Screenshot of Guacamole](./doc/screenshots/screenshot1.jpg) ## Disclaimers / important information diff --git a/README_fr.md b/README_fr.md index 2d326b1..99ca7d6 100644 --- a/README_fr.md +++ b/README_fr.md @@ -3,14 +3,14 @@ N.B.: This README was automatically generated by https://github.com/YunoHost/app It shall NOT be edited by hand. --> -# Apache Guacamole pour YunoHost +# Guacamole pour YunoHost [![Niveau d'intégration](https://dash.yunohost.org/integration/guacamole.svg)](https://dash.yunohost.org/appci/app/guacamole) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/guacamole.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/guacamole.maintain.svg) -[![Installer Apache Guacamole avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=guacamole) +[![Installer Guacamole avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=guacamole) *[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer Apache Guacamole rapidement et simplement sur un serveur YunoHost. +> *Ce package vous permet d'installer Guacamole rapidement et simplement sur un serveur YunoHost. Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* ## Vue d'ensemble @@ -21,7 +21,7 @@ Service de bureau à distance sans client. Fonctionne avec des protocoles standa ## Captures d'écran -![Capture d'écran de Apache Guacamole](./doc/screenshots/screenshot1.jpg) +![Capture d'écran de Guacamole](./doc/screenshots/screenshot1.jpg) ## Avertissements / informations importantes diff --git a/manifest.json b/manifest.json index 095b636..f30118c 100644 --- a/manifest.json +++ b/manifest.json @@ -1,5 +1,5 @@ { - "name": "Apache Guacamole", + "name": "Guacamole", "id": "guacamole", "packaging_format": 1, "description": { From eaf84279e3ad6a4d902c9b4283d9f0ff2afd2492 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 6 Jan 2023 23:04:31 +0100 Subject: [PATCH 06/22] Fix linter --- manifest.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.json b/manifest.json index f30118c..272067b 100644 --- a/manifest.json +++ b/manifest.json @@ -3,8 +3,8 @@ "id": "guacamole", "packaging_format": 1, "description": { - "en": "Clientless remote desktop gateway. It supports standard protocols like VNC, RDP, and SSH.", - "fr": "Service de bureau à distance sans client. Fonctionne avec des protocoles standard comme VNC, RDP, et SSH." + "en": "Clientless remote desktop gateway. It supports standard protocols like VNC, RDP, and SSH", + "fr": "Service de bureau à distance sans client. Fonctionne avec des protocoles standard comme VNC, RDP, et SSH" }, "version": "1.4.0~ynh1", "url": "https://guacamole.apache.org/", @@ -20,7 +20,7 @@ "email": "jules.bertholet@gmail.com" }, "requirements": { - "yunohost": ">= 4.1.3" + "yunohost": ">= 11.0.9" }, "multi_instance": true, "services": [ From 0f4db02c695762c4f80cbfffab5223ceac0ead45 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 6 Jan 2023 22:04:35 +0000 Subject: [PATCH 07/22] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c9a0d47..6011e32 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -Clientless remote desktop gateway. It supports standard protocols like VNC, RDP, and SSH. +Clientless remote desktop gateway. It supports standard protocols like VNC, RDP, and SSH **Shipped version:** 1.4.0~ynh1 diff --git a/README_fr.md b/README_fr.md index 99ca7d6..fd6f38f 100644 --- a/README_fr.md +++ b/README_fr.md @@ -15,7 +15,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour ## Vue d'ensemble -Service de bureau à distance sans client. Fonctionne avec des protocoles standard comme VNC, RDP, et SSH. +Service de bureau à distance sans client. Fonctionne avec des protocoles standard comme VNC, RDP, et SSH **Version incluse :** 1.4.0~ynh1 From ceab2e19c3a74839d961d88ea643250c8e86527d Mon Sep 17 00:00:00 2001 From: gsmith28 Date: Fri, 17 Feb 2023 13:45:49 -0700 Subject: [PATCH 08/22] Update tomcat9_deb.src Fix 404 error for missing source for tomcat9. --- conf/tomcat9_deb.src | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/tomcat9_deb.src b/conf/tomcat9_deb.src index e67e9c1..51018ef 100644 --- a/conf/tomcat9_deb.src +++ b/conf/tomcat9_deb.src @@ -1,5 +1,5 @@ -SOURCE_URL=http://ftp.debian.org/debian/pool/main/t/tomcat9/tomcat9_9.0.43-2~deb11u3_all.deb -SOURCE_SUM=c49eaa7de72f8d90f30a8fd9a8ba8e2e4ba51988ce839bb31a4a151758d47206 +SOURCE_URL=http://ftp.debian.org/debian/pool/main/t/tomcat9/tomcat9_9.0.43-2~deb11u5_all.deb +SOURCE_SUM=af9dca54e7c9cecd97513df93a43652d00dd47ec01d939dab8f8b3a6749f83bc SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=ar SOURCE_IN_SUBDIR=false From 83789363b684a81286cc7e31c21e4756296066f9 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 2 May 2023 11:39:41 +0000 Subject: [PATCH 09/22] Auto-update README --- README.md | 3 ++- README_fr.md | 21 +++++++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 6011e32..ac0783c 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,8 @@ It shall NOT be edited by hand. # Guacamole for YunoHost -[![Integration level](https://dash.yunohost.org/integration/guacamole.svg)](https://dash.yunohost.org/appci/app/guacamole) ![Working status](https://ci-apps.yunohost.org/ci/badges/guacamole.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/guacamole.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/guacamole.svg)](https://dash.yunohost.org/appci/app/guacamole) ![Working status](https://ci-apps.yunohost.org/ci/badges/guacamole.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/guacamole.maintain.svg) + [![Install Guacamole with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=guacamole) *[Lire ce readme en français.](./README_fr.md)* diff --git a/README_fr.md b/README_fr.md index fd6f38f..e47e3af 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,23 +5,24 @@ It shall NOT be edited by hand. # Guacamole pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/guacamole.svg)](https://dash.yunohost.org/appci/app/guacamole) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/guacamole.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/guacamole.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/guacamole.svg)](https://dash.yunohost.org/appci/app/guacamole) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/guacamole.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/guacamole.maintain.svg) + [![Installer Guacamole avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=guacamole) *[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer Guacamole rapidement et simplement sur un serveur YunoHost. -Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* +> *Ce package vous permet d’installer Guacamole rapidement et simplement sur un serveur YunoHost. +Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.* -## Vue d'ensemble +## Vue d’ensemble Service de bureau à distance sans client. Fonctionne avec des protocoles standard comme VNC, RDP, et SSH **Version incluse :** 1.4.0~ynh1 -## Captures d'écran +## Captures d’écran -![Capture d'écran de Guacamole](./doc/screenshots/screenshot1.jpg) +![Capture d’écran de Guacamole](./doc/screenshots/screenshot1.jpg) ## Avertissements / informations importantes @@ -31,9 +32,9 @@ L'utilisateur choisi comme admin durant le processus d'installation aura accès ## Documentations et ressources -* Site officiel de l'app : -* Documentation officielle de l'admin : -* Dépôt de code officiel de l'app : +* Site officiel de l’app : +* Documentation officielle de l’admin : +* Dépôt de code officiel de l’app : * Documentation YunoHost pour cette app : * Signaler un bug : @@ -49,4 +50,4 @@ ou sudo yunohost app upgrade guacamole -u https://github.com/YunoHost-Apps/guacamole_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** +**Plus d’infos sur le packaging d’applications :** \ No newline at end of file From 803dda518403ae7e1aa54583fd22bbed800229af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 2 May 2023 13:56:59 +0200 Subject: [PATCH 10/22] Update auth-header.src --- conf/auth-header.src | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/auth-header.src b/conf/auth-header.src index 1ba8136..76b3bae 100644 --- a/conf/auth-header.src +++ b/conf/auth-header.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://downloads.apache.org/guacamole/1.4.0/binary/guacamole-auth-header-1.4.0.tar.gz -SOURCE_SUM=3f5491737b3295056949d235120dca60ee9518c951b09271780dddf15166a9de +SOURCE_URL=https://downloads.apache.org/guacamole/1.5.1/binary/guacamole-auth-header-1.5.1.tar.gz +SOURCE_SUM=aea94a4d59370026edd0fb8d0bd8cd1090176eb2d10218dd27ede134a0647590 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true From c2dcd958be6a9287356771526ae63fca2e06d6ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 2 May 2023 13:57:24 +0200 Subject: [PATCH 11/22] Update manifest.json --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 272067b..f498206 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Clientless remote desktop gateway. It supports standard protocols like VNC, RDP, and SSH", "fr": "Service de bureau à distance sans client. Fonctionne avec des protocoles standard comme VNC, RDP, et SSH" }, - "version": "1.4.0~ynh1", + "version": "1.5.1~ynh1", "url": "https://guacamole.apache.org/", "upstream": { "license": "Apache-2.0", @@ -20,7 +20,7 @@ "email": "jules.bertholet@gmail.com" }, "requirements": { - "yunohost": ">= 11.0.9" + "yunohost": ">= 11.1.18" }, "multi_instance": true, "services": [ From af4d9a5e7c84fd054572644ca7c5b80fef234f47 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 2 May 2023 11:57:28 +0000 Subject: [PATCH 12/22] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ac0783c..0bf1bbf 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Clientless remote desktop gateway. It supports standard protocols like VNC, RDP, and SSH -**Shipped version:** 1.4.0~ynh1 +**Shipped version:** 1.5.1~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index e47e3af..30440aa 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Service de bureau à distance sans client. Fonctionne avec des protocoles standard comme VNC, RDP, et SSH -**Version incluse :** 1.4.0~ynh1 +**Version incluse :** 1.5.1~ynh1 ## Captures d’écran From 82a08087738713450818eab96d8c7a971f00ca3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 2 May 2023 13:59:35 +0200 Subject: [PATCH 13/22] fix --- conf/auth-jdbc.src | 4 ++-- conf/auth-ldap.src | 4 ++-- conf/client.src | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conf/auth-jdbc.src b/conf/auth-jdbc.src index 5977f47..bb1257e 100644 --- a/conf/auth-jdbc.src +++ b/conf/auth-jdbc.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://downloads.apache.org/guacamole/1.4.0/binary/guacamole-auth-jdbc-1.4.0.tar.gz -SOURCE_SUM=47f4f121cad74ab64d5baf3d14e8f709677a26b3058005a977277a07716d4d9c +SOURCE_URL=https://downloads.apache.org/guacamole/1.5.1/binary/guacamole-auth-jdbc-1.5.1.tar.gz +SOURCE_SUM=daf293856ddc2664b862a53b3f232ece82925832c081238161f27c49081b4305 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/auth-ldap.src b/conf/auth-ldap.src index 31d51dc..b36b3d9 100644 --- a/conf/auth-ldap.src +++ b/conf/auth-ldap.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://downloads.apache.org/guacamole/1.4.0/binary/guacamole-auth-ldap-1.4.0.tar.gz -SOURCE_SUM=f28488717b26168a5396e125ec7fbff1b7268a658c6100f6ad1bbfbd18a17779 +SOURCE_URL=https://downloads.apache.org/guacamole/1.5.1/binary/guacamole-auth-ldap-1.5.1.tar.gz +SOURCE_SUM=4d32bb2aab09f9f99d02faa3db82c7c9ff3e5f84de9b042fba3a5f745f2704e8 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/client.src b/conf/client.src index e305cd5..c291f68 100644 --- a/conf/client.src +++ b/conf/client.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://downloads.apache.org/guacamole/1.4.0/binary/guacamole-1.4.0.war -SOURCE_SUM=92fb06e3ce8fe4f932ddfdffd75a352c06ab58d3bd0a946faa5beda73e8592f0 +SOURCE_URL=https://downloads.apache.org/guacamole/1.5.1/binary/guacamole-1.5.1.war +SOURCE_SUM=b740f82ec05f40598e6f1c3b16d4d3798afe2872c051296e70785bf9292d0269 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=false From fa2601ec86480d088bb7dc5c31c37c78d9b7ba4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 2 May 2023 14:00:32 +0200 Subject: [PATCH 14/22] Update server.src --- conf/server.src | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/server.src b/conf/server.src index b92effa..10958ef 100644 --- a/conf/server.src +++ b/conf/server.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://downloads.apache.org/guacamole/1.4.0/source/guacamole-server-1.4.0.tar.gz -SOURCE_SUM=2789075c8b25e5aa42dec505491d3425b7b2fe2051772b0006860c26e8a57b90 +SOURCE_URL=https://downloads.apache.org/guacamole/1.5.1/source/guacamole-server-1.5.1.tar.gz +SOURCE_SUM=aabd707a68b99253f87234d0c3884678d6d6c1bceb39e7f9943c69d5329f4501 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true From edb081e884f7fa02f89e0f3e2934e68faa0b6696 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 2 May 2023 14:02:37 +0200 Subject: [PATCH 15/22] Update tomcat9_deb.src --- conf/tomcat9_deb.src | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/tomcat9_deb.src b/conf/tomcat9_deb.src index 51018ef..2a2a03d 100644 --- a/conf/tomcat9_deb.src +++ b/conf/tomcat9_deb.src @@ -1,5 +1,5 @@ -SOURCE_URL=http://ftp.debian.org/debian/pool/main/t/tomcat9/tomcat9_9.0.43-2~deb11u5_all.deb -SOURCE_SUM=af9dca54e7c9cecd97513df93a43652d00dd47ec01d939dab8f8b3a6749f83bc +SOURCE_URL=https://ftp.debian.org/debian/pool/main/t/tomcat9/tomcat9_9.0.70-1_all.deb +SOURCE_SUM=c062cd3ff27a566fdc6fed7dd2602c4e4ffe2216c8a19822bcaf03bd739e39b5 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=ar SOURCE_IN_SUBDIR=false From 2cd01acd8668979ac8637d322d624c6ce27ac5c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 2 May 2023 14:15:45 +0200 Subject: [PATCH 16/22] Update _common.sh --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index e98b2bf..47effbb 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -12,7 +12,7 @@ pkg_dependencies="acl build-essential libcairo2 libjpeg62-turbo-dev libpng-dev l #================================================= function setup_sources { - guacamole_verson="1.4.0" + guacamole_verson="1.5.1" ynh_setup_source --source_id="server" --dest_dir="$final_path/.guacd-src" From 08c7f66ea1f2bae365ab21262a5ce1f10d91a982 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 29 May 2023 20:46:24 +0200 Subject: [PATCH 17/22] fix --- conf/client.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/client.src b/conf/client.src index c291f68..acd0430 100644 --- a/conf/client.src +++ b/conf/client.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://downloads.apache.org/guacamole/1.5.1/binary/guacamole-1.5.1.war -SOURCE_SUM=b740f82ec05f40598e6f1c3b16d4d3798afe2872c051296e70785bf9292d0269 +SOURCE_URL=https://downloads.apache.org/guacamole/1.5.2/binary/guacamole-1.5.2.war +SOURCE_SUM=86efc30016e4038948d8c1a5c37a0b05e38dadd3104db6ec03755bc6e3111c40 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=false diff --git a/manifest.json b/manifest.json index f498206..7c2958c 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Clientless remote desktop gateway. It supports standard protocols like VNC, RDP, and SSH", "fr": "Service de bureau à distance sans client. Fonctionne avec des protocoles standard comme VNC, RDP, et SSH" }, - "version": "1.5.1~ynh1", + "version": "1.5.2~ynh1", "url": "https://guacamole.apache.org/", "upstream": { "license": "Apache-2.0", From 4d7604ea96bc0dcaee18fead848e60940ed0a4fa Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 29 May 2023 18:46:29 +0000 Subject: [PATCH 18/22] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0bf1bbf..bae905d 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Clientless remote desktop gateway. It supports standard protocols like VNC, RDP, and SSH -**Shipped version:** 1.5.1~ynh1 +**Shipped version:** 1.5.2~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 30440aa..be9a888 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Service de bureau à distance sans client. Fonctionne avec des protocoles standard comme VNC, RDP, et SSH -**Version incluse :** 1.5.1~ynh1 +**Version incluse :** 1.5.2~ynh1 ## Captures d’écran From 855f42edcc074c713e8c5788463212cc7743250b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 29 May 2023 20:52:37 +0200 Subject: [PATCH 19/22] fix --- conf/auth-header.src | 4 ++-- conf/auth-jdbc.src | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/auth-header.src b/conf/auth-header.src index 76b3bae..a030566 100644 --- a/conf/auth-header.src +++ b/conf/auth-header.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://downloads.apache.org/guacamole/1.5.1/binary/guacamole-auth-header-1.5.1.tar.gz -SOURCE_SUM=aea94a4d59370026edd0fb8d0bd8cd1090176eb2d10218dd27ede134a0647590 +SOURCE_URL=https://downloads.apache.org/guacamole/1.5.2/binary/guacamole-auth-header-1.5.2.tar.gz +SOURCE_SUM=c80c11de87993e1732d65c059d53d400961afcf61e7c12501bc2197002af7730 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/auth-jdbc.src b/conf/auth-jdbc.src index bb1257e..7c0bff5 100644 --- a/conf/auth-jdbc.src +++ b/conf/auth-jdbc.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://downloads.apache.org/guacamole/1.5.1/binary/guacamole-auth-jdbc-1.5.1.tar.gz -SOURCE_SUM=daf293856ddc2664b862a53b3f232ece82925832c081238161f27c49081b4305 +SOURCE_URL=https://downloads.apache.org/guacamole/1.5.2/binary/guacamole-auth-jdbc-1.5.2.tar.gz +SOURCE_SUM=0c050fcf9e062eadb242f2962217870919cd02a119bc3e71d77efdd4b7f88e06 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true From c1e8234299bddd05fe921f1fbdf36f663d93662f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 29 May 2023 20:53:13 +0200 Subject: [PATCH 20/22] Update auth-ldap.src --- conf/auth-ldap.src | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/auth-ldap.src b/conf/auth-ldap.src index b36b3d9..9e59f69 100644 --- a/conf/auth-ldap.src +++ b/conf/auth-ldap.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://downloads.apache.org/guacamole/1.5.1/binary/guacamole-auth-ldap-1.5.1.tar.gz -SOURCE_SUM=4d32bb2aab09f9f99d02faa3db82c7c9ff3e5f84de9b042fba3a5f745f2704e8 +SOURCE_URL=https://downloads.apache.org/guacamole/1.5.2/binary/guacamole-auth-ldap-1.5.2.tar.gz +SOURCE_SUM=49420bbe6f12f56a6ad8b31139512f289faada004074709b6a3a8e1475e9bd23 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true From db06d0dff82583315761caf7960905d25401b934 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 29 May 2023 20:57:14 +0200 Subject: [PATCH 21/22] Update server.src --- conf/server.src | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/server.src b/conf/server.src index 10958ef..e63b48b 100644 --- a/conf/server.src +++ b/conf/server.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://downloads.apache.org/guacamole/1.5.1/source/guacamole-server-1.5.1.tar.gz -SOURCE_SUM=aabd707a68b99253f87234d0c3884678d6d6c1bceb39e7f9943c69d5329f4501 +SOURCE_URL=https://downloads.apache.org/guacamole/1.5.2/source/guacamole-server-1.5.2.tar.gz +SOURCE_SUM=a8d4813feaeb1e6f35fbfd2cf57cb0429db2225960cbfed36252f65ac93dffc4 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true From f164aacc92065e8605fa0d15752bee8ca8fcce30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 29 May 2023 22:01:08 +0200 Subject: [PATCH 22/22] Update _common.sh --- scripts/_common.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 47effbb..b7b1771 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -12,7 +12,7 @@ pkg_dependencies="acl build-essential libcairo2 libjpeg62-turbo-dev libpng-dev l #================================================= function setup_sources { - guacamole_verson="1.5.1" + guacamole_version="1.5.2" ynh_setup_source --source_id="server" --dest_dir="$final_path/.guacd-src" @@ -24,15 +24,15 @@ function setup_sources { ynh_setup_source --source_id="client" --dest_dir="$final_path/var/lib/tomcat9/webapps/$tomcat_guac_dir" ynh_setup_source --source_id="auth-ldap" --dest_dir="$final_path/etc/guacamole/extensions/ldap" - mv "$final_path/etc/guacamole/extensions/ldap/guacamole-auth-ldap-$guacamole_verson.jar" "$final_path/etc/guacamole/extensions/guacamole-auth-ldap.jar" + mv "$final_path/etc/guacamole/extensions/ldap/guacamole-auth-ldap-$guacamole_version.jar" "$final_path/etc/guacamole/extensions/guacamole-auth-ldap.jar" ynh_secure_remove --file="$final_path/etc/guacamole/extensions/ldap" ynh_setup_source --source_id="auth-header" --dest_dir="$final_path/etc/guacamole/extensions/header" - mv "$final_path/etc/guacamole/extensions/header/guacamole-auth-header-$guacamole_verson.jar" "$final_path/etc/guacamole/extensions/guacamole-auth-header.jar" + mv "$final_path/etc/guacamole/extensions/header/guacamole-auth-header-$guacamole_version.jar" "$final_path/etc/guacamole/extensions/guacamole-auth-header.jar" ynh_secure_remove --file="$final_path/etc/guacamole/extensions/header" ynh_setup_source --source_id="auth-jdbc" --dest_dir="$final_path/etc/guacamole/extensions/jdbc" - mv "$final_path/etc/guacamole/extensions/jdbc/mysql/guacamole-auth-jdbc-mysql-$guacamole_verson.jar" "$final_path/etc/guacamole/extensions/guacamole-auth-jdbc-mysql.jar" + mv "$final_path/etc/guacamole/extensions/jdbc/mysql/guacamole-auth-jdbc-mysql-$guacamole_version.jar" "$final_path/etc/guacamole/extensions/guacamole-auth-jdbc-mysql.jar" mv "$final_path/etc/guacamole/extensions/jdbc/mysql/schema" "$final_path/etc/guacamole/extensions/mysql-schema" ynh_secure_remove --file="$final_path/etc/guacamole/extensions/jdbc"