From 77c13eea98fa7ec19f19a4c567e74ac6d29305d7 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 15 Nov 2022 06:11:09 +0000 Subject: [PATCH 1/3] Upgrade to v4.0.2 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index b957ecb..dbf6513 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/tootsuite/mastodon/archive/refs/tags/v3.5.3.tar.gz -SOURCE_SUM=ad6f71419538a9427669010735bcf029e9e2f455b6728d498b27bf38285bf3f8 +SOURCE_URL=https://github.com/tootsuite/mastodon/archive/refs/tags/v4.0.2.tar.gz +SOURCE_SUM=70a4d9dcd9b746f6e9ced9b567ee5ad81e530cfaccb7f471259b917c20166309 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index d63a402..d5abdd0 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Libre and federated social network", "fr": "Réseau social libre et fédéré" }, - "version": "3.5.3~ynh4", + "version": "4.0.2~ynh1", "url": "https://github.com/mastodon/mastodon", "upstream": { "license": "AGPL-3.0-or-later", From 8892a825cf3e9321004449c805a8dd26fb05e4fa Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 15 Nov 2022 06:11:16 +0000 Subject: [PATCH 2/3] Auto-update README --- README.md | 3 +-- README_fr.md | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index f48ae39..6378ff2 100644 --- a/README.md +++ b/README.md @@ -17,8 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Mastodon is a free, open-source microblogging social network. It is a decentralized alternative to commercial platforms like Twitter and avoids the risks of a single company monopolizing your communication for commercial purposes. -**Shipped version:** 3.5.3~ynh4 - +**Shipped version:** 4.0.2~ynh1 **Demo:** https://joinmastodon.org/ diff --git a/README_fr.md b/README_fr.md index d0dbfaa..1c14e9f 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,8 +18,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Mastodon est un réseau social de microblog auto-hébergé et open source. C'est une alternative décentralisée aux plates-formes commerciales comme Twitter. Mastodon évite ainsi les risques qu'une seule société monopolise votre communication à des fins commerciales. -**Version incluse :** 3.5.3~ynh4 - +**Version incluse :** 4.0.2~ynh1 **Démo :** https://joinmastodon.org/ From 4d02a31b97c9ca29b4f4c5f121015317744b3d94 Mon Sep 17 00:00:00 2001 From: panomaki Date: Thu, 17 Nov 2022 16:12:35 +0100 Subject: [PATCH 3/3] Fix install bug on 4.0.2 Fixed install issue (#344/#345) by applying the fix mentioned in this issue: https://github.com/mastodon/mastodon/issues/18813. Tested on local machine, install now seems to work. Please review/test. --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index fbeb73d..6df1759 100644 --- a/scripts/install +++ b/scripts/install @@ -194,7 +194,7 @@ pushd "$final_path/live" ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails db:setup --quiet ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails assets:precompile --quiet ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rake mastodon:webpush:generate_vapid_key > key.txt - ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/tootctl accounts create "$admin" --email="$admin_mail" --confirmed --role=admin > /dev/null + ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/tootctl accounts create "$admin" --email="$admin_mail" --confirmed --role=Admin > /dev/null ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/tootctl accounts modify "$admin" --approve popd