From 600f45679b6fdfdf70174780c449a6007fd2b76b Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Sun, 21 Aug 2022 15:00:15 +0200 Subject: [PATCH 1/5] update to 1.1.28 --- README.md | 2 +- README_fr.md | 2 +- conf/app.src | 4 ++-- manifest.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 551459a..72dfe96 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Garradin (word meaning money in an aboriginal dialect of northern Australia, pronounced "gar-a-dine" em) is software for associative management. It is the tool of choice for managing an association, a sports club, an NGO, etc. It is designed to meet the needs of a small to medium-sized structure: management of members, accounting, website, note-taking in meetings, archiving and sharing of the association's operating documents, discussion between members, etc. etc. . -**Shipped version:** 1.1.27~ynh1 +**Shipped version:** 1.1.28~ynh1 **Demo:** https://garradin.eu/essai/ diff --git a/README_fr.md b/README_fr.md index 70e1316..6c00102 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,7 +17,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Garradin (mot signifiant argent dans un dialecte aborigène du nord de l'Australie, prononcé « gar-a-dine »em) est un logiciel de gestion associative. Il est l'outil de prédilection pour gérer une association, un club sportif, une ONG, etc. Il est conçu pour répondre aux besoins d'une structure de petite à moyenne taille : gestion des adhérents, comptabilité, site web, prise de notes en réunion, archivage et partage des documents de fonctionnement de l'association, discussion entre adhérents, etc etc. -**Version incluse :** 1.1.27~ynh1 +**Version incluse :** 1.1.28~ynh1 **Démo :** https://garradin.eu/essai/ diff --git a/conf/app.src b/conf/app.src index f263a95..76285f2 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://fossil.kd2.org/garradin/uv/garradin-1.1.27.tar.gz -SOURCE_SUM=dfe7eb7cd77a773f8beac065419e1ad723407c7f1fed78086614987d9c07a1d9 +SOURCE_URL=https://fossil.kd2.org/garradin/uv/garradin-1.1.28.tar.gz +SOURCE_SUM=fdddd33472142a827350280aafc416ccfae453e4a9258f87d1ec9fe8876cb492 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index c7421a9..ed32e14 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Software to manage association", "fr": "Logiciel libre de gestion d'association" }, - "version": "1.1.27~ynh1", + "version": "1.1.28~ynh1", "url": "http://garradin.eu", "upstream": { "license": "GPL-3.0-or-later", From 665776530c5bea17defcc918bdad09278b8c70ec Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 21 Aug 2022 13:00:26 +0000 Subject: [PATCH 2/5] Auto-update README --- README.md | 1 + README_fr.md | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 72dfe96..c084541 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,7 @@ Garradin (word meaning money in an aboriginal dialect of northern Australia, pro **Shipped version:** 1.1.28~ynh1 + **Demo:** https://garradin.eu/essai/ ## Screenshots diff --git a/README_fr.md b/README_fr.md index 6c00102..1dd8d4f 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,7 +17,8 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Garradin (mot signifiant argent dans un dialecte aborigène du nord de l'Australie, prononcé « gar-a-dine »em) est un logiciel de gestion associative. Il est l'outil de prédilection pour gérer une association, un club sportif, une ONG, etc. Il est conçu pour répondre aux besoins d'une structure de petite à moyenne taille : gestion des adhérents, comptabilité, site web, prise de notes en réunion, archivage et partage des documents de fonctionnement de l'association, discussion entre adhérents, etc etc. -**Version incluse :** 1.1.28~ynh1 +**Version incluse :** 1.1.28~ynh1 + **Démo :** https://garradin.eu/essai/ From 888a5996626fecc23d67068a79bbd245f77ef2b6 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Fri, 26 Aug 2022 18:54:37 +0200 Subject: [PATCH 3/5] try php8.0 and compatible with bullseye, remove 0.9.8 old source --- conf/0.9.8.src | 7 ------- manifest.json | 4 ++-- scripts/_common.sh | 2 +- scripts/upgrade | 48 ---------------------------------------------- 4 files changed, 3 insertions(+), 58 deletions(-) delete mode 100644 conf/0.9.8.src diff --git a/conf/0.9.8.src b/conf/0.9.8.src deleted file mode 100644 index 074f42e..0000000 --- a/conf/0.9.8.src +++ /dev/null @@ -1,7 +0,0 @@ -SOURCE_URL=https://fossil.kd2.org/garradin/uv/garradin-0.9.8.1.tar.bz2 -SOURCE_SUM=7cc64b51c9721c2dd7ee510f245bcfc4693ee07f74581ad74003906eb4716ef1 -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=tar.bz2 -SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= - diff --git a/manifest.json b/manifest.json index ed32e14..2d9f89b 100644 --- a/manifest.json +++ b/manifest.json @@ -21,12 +21,12 @@ "email": "win10@tutanota.com" }, "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11.0.9" }, "multi_instance": true, "services": [ "nginx", - "php7.4-fpm" + "php8.0-fpm" ], "arguments": { "install": [ diff --git a/scripts/_common.sh b/scripts/_common.sh index 23826e6..ff2385c 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,7 +7,7 @@ # dependencies used by the app #pkg_dependencies="imagemagick" -YNH_PHP_VERSION="7.4" +YNH_PHP_VERSION="8.0" extra_php_dependencies="php${YNH_PHP_VERSION} php${YNH_PHP_VERSION}-sqlite3 php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-cli" diff --git a/scripts/upgrade b/scripts/upgrade index 9574a8e..3b01163 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -89,54 +89,6 @@ if [ -d "$skel_dist" ]; then cp -a "$skel_dist" /tmp/skel-dist fi -#================================================= -# UPGRADE TO 0.9.8 if necessary -#================================================= - -if ynh_compare_current_package_version --comparison lt --version 0.9.8.1~ynh1 -then - ynh_script_progression --message="Upgrading to 0.9.8" --weight=5 - # Download, check integrity, uncompress and patch the source from 0.9.8.src - ynh_setup_source --keep="config.local.php" --dest_dir="$final_path" --source_id="0.9.8" - # Set permissions on app files - ynh_system_user_create --username=$app - ynh_add_nginx_config - ynh_install_app_dependencies "$extra_php_dependencies" - ynh_add_fpm_config - phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) - ynh_script_progression --message="restore data..." --weight=10 - - backup_bdd=/tmp/association.sqlite - backup_squelettes=/tmp/squelettes - - if [ -d "$backup_squelettes" ] - then - cp -a "$backup_squelettes" $final_path/www/squelettes - fi - - if [ -e "$backup_bdd" ] - then - cp -a "$backup_bdd" $final_path/association.sqlite - fi - - chown -R $app:$app $final_path - chmod 755 $final_path - - # Temporarily enable visitors for curl if needed - visitors_enabled=$(ynh_permission_has_user "main" "visitors" && echo yes || echo no) - if [[ $visitors_enabled == "no" ]]; then - ynh_permission_update --permission "main" --add "visitors" - fi - - # Finalize the upgrade - ynh_local_curl "/index.php" - sleep 5 - ynh_local_curl "/index.php" - - if [[ $visitors_enabled == "no" ]]; then - ynh_permission_update --permission "main" --remove "visitors" - fi -fi #================================================= # UPGRADE TO 1.1.0 if necessary #================================================= From b0c01189142ea980557698cc5a36b14fe52fb674 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Fri, 26 Aug 2022 23:51:25 +0200 Subject: [PATCH 4/5] add php-gnupg dependencies to avlaible crypting emails --- manifest.json | 2 +- scripts/_common.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 2d9f89b..80edf6c 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Software to manage association", "fr": "Logiciel libre de gestion d'association" }, - "version": "1.1.28~ynh1", + "version": "1.1.28~ynh2", "url": "http://garradin.eu", "upstream": { "license": "GPL-3.0-or-later", diff --git a/scripts/_common.sh b/scripts/_common.sh index ff2385c..d132276 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -9,7 +9,7 @@ YNH_PHP_VERSION="8.0" -extra_php_dependencies="php${YNH_PHP_VERSION} php${YNH_PHP_VERSION}-sqlite3 php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-cli" +extra_php_dependencies="php${YNH_PHP_VERSION} php${YNH_PHP_VERSION}-sqlite3 php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-gnupg" #================================================= # PERSONAL HELPERS From 0ecec015ca6484e05fc18c66e86da3549d9bcbe2 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 26 Aug 2022 21:51:37 +0000 Subject: [PATCH 5/5] 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 c084541..7fe6fe3 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Garradin (word meaning money in an aboriginal dialect of northern Australia, pronounced "gar-a-dine" em) is software for associative management. It is the tool of choice for managing an association, a sports club, an NGO, etc. It is designed to meet the needs of a small to medium-sized structure: management of members, accounting, website, note-taking in meetings, archiving and sharing of the association's operating documents, discussion between members, etc. etc. . -**Shipped version:** 1.1.28~ynh1 +**Shipped version:** 1.1.28~ynh2 **Demo:** https://garradin.eu/essai/ diff --git a/README_fr.md b/README_fr.md index 1dd8d4f..84c2d39 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,7 +17,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Garradin (mot signifiant argent dans un dialecte aborigène du nord de l'Australie, prononcé « gar-a-dine »em) est un logiciel de gestion associative. Il est l'outil de prédilection pour gérer une association, un club sportif, une ONG, etc. Il est conçu pour répondre aux besoins d'une structure de petite à moyenne taille : gestion des adhérents, comptabilité, site web, prise de notes en réunion, archivage et partage des documents de fonctionnement de l'association, discussion entre adhérents, etc etc. -**Version incluse :** 1.1.28~ynh1 +**Version incluse :** 1.1.28~ynh2 **Démo :** https://garradin.eu/essai/