From aff7be31946beeff5f78231e37ab9180b840de40 Mon Sep 17 00:00:00 2001 From: lapineige Date: Fri, 13 Jan 2023 00:36:31 +0100 Subject: [PATCH 01/25] bump ruby version --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 896cb0e..4df0f0c 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -9,7 +9,7 @@ pkg_dependencies="imagemagick ffmpeg libpq-dev libxml2-dev libxslt1-dev file git MEMORY_NEEDED="2560" -RUBY_VERSION="3.0.3" +RUBY_VERSION="3.0.4" NODEJS_VERSION="14" From 0d52dd546f5baead841243214b88508935c9ad61 Mon Sep 17 00:00:00 2001 From: lapineige Date: Sat, 28 Jan 2023 16:42:25 +0100 Subject: [PATCH 02/25] Patch Gemfile to fix blurhash and ox packages https://github.com/YunoHost-Apps/mastodon_ynh/pull/360 --- sources/patches/app-blurhash-bugfix.patch | 60 +++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 sources/patches/app-blurhash-bugfix.patch diff --git a/sources/patches/app-blurhash-bugfix.patch b/sources/patches/app-blurhash-bugfix.patch new file mode 100644 index 0000000..e75702b --- /dev/null +++ b/sources/patches/app-blurhash-bugfix.patch @@ -0,0 +1,60 @@ +diff --git a/Gemfile b/Gemfile +index 7c36bc6b8..3f691d102 100644 +--- a/Gemfile ++++ b/Gemfile +@@ -22,7 +22,8 @@ + gem 'fog-core', '<= 2.1.0' + gem 'fog-openstack', '~> 0.3', require: false + gem 'kt-paperclip', '~> 7.1' +-gem 'blurhash', '~> 0.1' ++gem 'blurhash', github: 'Gargron/blurhash', ref: '870a34e01ce7d09a7bd4d700435e1764ca823246' ++ + + gem 'active_model_serializers', '~> 0.10' + gem 'addressable', '~> 2.8' + +diff --git a/Gemfile.lock b/Gemfile.lock +index 7c36bc6b8..3f691d102 100644 +--- a/Gemfile.lock ++++ b/Gemfile.lock +@@ -7,6 +7,13 @@ + hkdf (~> 0.2) + jwt (~> 2.0) + ++GIT ++ remote: https://github.com/Gargron/blurhash.git ++ revision: 870a34e01ce7d09a7bd4d700435e1764ca823246 ++ ref: 870a34e01ce7d09a7bd4d700435e1764ca823246 ++ specs: ++ blurhash (0.1.6) ++ + GEM + remote: https://rubygems.org/ + specs: +@@ -120,8 +127,6 @@ + bindata (2.4.10) + binding_of_caller (1.0.0) + debug_inspector (>= 0.0.1) +- blurhash (0.1.6) +- ffi (~> 1.14) + bootsnap (1.13.0) + msgpack (~> 1.2) + brakeman (5.3.1) +@@ -448,7 +453,7 @@ + openssl-signature_algorithm (1.2.1) + openssl (> 2.0, < 3.1) + orm_adapter (0.5.0) +- ox (2.14.11) ++ ox (2.14.13) + parallel (1.22.1) + parser (3.1.2.1) + ast (~> 2.4.1) +@@ -738,7 +743,7 @@ + aws-sdk-s3 (~> 1.114) + better_errors (~> 2.9) + binding_of_caller (~> 1.0) +- blurhash (~> 0.1) ++ blurhash! + bootsnap (~> 1.13.0) + brakeman (~> 5.3) + browser From 2a31e3b4a546ac7ccd5630569e95e438c1e00406 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 7 Feb 2023 11:36:59 +0000 Subject: [PATCH 03/25] Auto-update README --- README.md | 2 +- README_fr.md | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 32d4f4b..0409da9 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Glitch-Soc for YunoHost -[![Integration level](https://dash.yunohost.org/integration/glitchsoc.svg)](https://dash.yunohost.org/appci/app/glitchsoc) ![Working status](https://ci-apps.yunohost.org/ci/badges/glitchsoc.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/glitchsoc.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/glitchsoc.svg)](https://dash.yunohost.org/appci/app/glitchsoc) ![Working status](https://ci-apps.yunohost.org/ci/badges/glitchsoc.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/glitchsoc.maintain.svg) [![Install Glitch-Soc with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=glitchsoc) *[Lire ce readme en français.](./README_fr.md)* diff --git a/README_fr.md b/README_fr.md index ef09d08..8d3a050 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,15 +5,15 @@ It shall NOT be edited by hand. # Glitch-Soc pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/glitchsoc.svg)](https://dash.yunohost.org/appci/app/glitchsoc) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/glitchsoc.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/glitchsoc.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/glitchsoc.svg)](https://dash.yunohost.org/appci/app/glitchsoc) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/glitchsoc.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/glitchsoc.maintain.svg) [![Installer Glitch-Soc avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=glitchsoc) *[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer Glitch-Soc 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 Glitch-Soc 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 `glitch-soc` est une [scission](https://fr.wikipedia.org/wiki/Fork_(d%C3%A9veloppement_logiciel)) sympa du logiciel de réseau social libre [Mastodon](https://joinmastodon.org/), avec comme objectif de fournir des fonctionnalités supplémentaires, au risque d'un logiciel un peu moins stable. @@ -62,8 +62,8 @@ Nous vous invitons à bloquer les instances malveillantes depuis l'interface d'a ## Documentations et ressources -* Site officiel de l'app : -* Dépôt de code officiel de l'app : +* Site officiel de l’app : +* Dépôt de code officiel de l’app : * Documentation YunoHost pour cette app : * Signaler un bug : @@ -79,4 +79,4 @@ ou sudo yunohost app upgrade glitchsoc -u https://github.com/YunoHost-Apps/glitchsoc_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 cf3976d2513e42880e6ea3fb0e1d639eb6425b35 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Fri, 24 Feb 2023 00:19:20 +0100 Subject: [PATCH 04/25] [autopatch] Upgrade auto-updater --- .github/workflows/updater.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml index ca7fca3..864c811 100644 --- a/.github/workflows/updater.yml +++ b/.github/workflows/updater.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Fetch the source code - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: token: ${{ secrets.GITHUB_TOKEN }} - name: Run the updater script @@ -33,7 +33,7 @@ jobs: - name: Create Pull Request id: cpr if: ${{ env.PROCEED == 'true' }} - uses: peter-evans/create-pull-request@v3 + uses: peter-evans/create-pull-request@v4 with: token: ${{ secrets.GITHUB_TOKEN }} commit-message: Update to version ${{ env.VERSION }} From e90dd7f3b980ab16bf4c25400bf036f230a63045 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 23 Feb 2023 23:19:23 +0000 Subject: [PATCH 05/25] Auto-update README --- README.md | 1 + README_fr.md | 1 + 2 files changed, 2 insertions(+) diff --git a/README.md b/README.md index 0409da9..a465770 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ It shall NOT be edited by hand. # Glitch-Soc for YunoHost [![Integration level](https://dash.yunohost.org/integration/glitchsoc.svg)](https://dash.yunohost.org/appci/app/glitchsoc) ![Working status](https://ci-apps.yunohost.org/ci/badges/glitchsoc.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/glitchsoc.maintain.svg) + [![Install Glitch-Soc with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=glitchsoc) *[Lire ce readme en français.](./README_fr.md)* diff --git a/README_fr.md b/README_fr.md index 8d3a050..f5850d4 100644 --- a/README_fr.md +++ b/README_fr.md @@ -6,6 +6,7 @@ It shall NOT be edited by hand. # Glitch-Soc pour YunoHost [![Niveau d’intégration](https://dash.yunohost.org/integration/glitchsoc.svg)](https://dash.yunohost.org/appci/app/glitchsoc) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/glitchsoc.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/glitchsoc.maintain.svg) + [![Installer Glitch-Soc avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=glitchsoc) *[Read this readme in english.](./README.md)* From fde27ea2f42004bd678e98bb5c6e87cfb74276e3 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 9 Apr 2023 06:18:18 +0000 Subject: [PATCH 06/25] Upgrade to v2023.04.08 --- conf/app.src | 6 +++--- manifest.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/app.src b/conf/app.src index bf10322..9fc964f 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://github.com/glitch-soc/mastodon/archive/eb675af0fb0d73b697e066100c4faf066c0baff7.tar.gz -SOURCE_SUM=ecb7b9f48c131c1f696980f44e2c8e5fe6811e669188fe010e7f2695a20245e0 +SOURCE_URL=https://github.com/glitch-soc/mastodon/archive/29a91b871eb4fb375baa3701e29cfb35f884bb98.tar.gz +SOURCE_SUM=886b8b0976cfcd8fa176de6c19e32b93ca2765f536f2c5f6e68f351e031556da SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=eb675af0fb0d73b697e066100c4faf066c0baff7.tar.gz +SOURCE_FILENAME=29a91b871eb4fb375baa3701e29cfb35f884bb98.tar.gz SOURCE_EXTRACT=true diff --git a/manifest.json b/manifest.json index 64054f3..f9c0291 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Libre and federated social network, fork of Mastodon", "fr": "Réseau social libre et fédéré, scission de Mastodon" }, - "version": "2022.11.15~ynh1", + "version": "2023.04.08~ynh1", "url": "https://github.com/glitch-soc/mastodon", "upstream": { "license": "AGPL-3.0-or-later", From e9b5e85f68bc023e5d56025860ce5e9151628f42 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 9 Apr 2023 06:18:24 +0000 Subject: [PATCH 07/25] 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 a465770..4f7aa9e 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in See more [on the documentation](https://glitch-soc.github.io/docs/). -**Shipped version:** 2022.11.15~ynh1 +**Shipped version:** 2023.04.08~ynh1 ## Disclaimers / important information ⚠️ Glitch-Soc is beta software, and under active development. Use at your own risk! diff --git a/README_fr.md b/README_fr.md index f5850d4..77fba3b 100644 --- a/README_fr.md +++ b/README_fr.md @@ -43,7 +43,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Voir plus [sur la documentation](https://glitch-soc.github.io/docs/) (en anglais). -**Version incluse :** 2022.11.15~ynh1 +**Version incluse :** 2023.04.08~ynh1 ## Avertissements / informations importantes Glitch-Soc est en constant développement, fournis avec les dernières fonctionnalités (incluant les derniers bugs). From c3a8f3fb0ec6b83ffdfb35afec7ac4839b703242 Mon Sep 17 00:00:00 2001 From: lapineige Date: Sun, 9 Apr 2023 13:20:13 +0200 Subject: [PATCH 08/25] bump ruby version --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 4df0f0c..725fde9 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -9,7 +9,7 @@ pkg_dependencies="imagemagick ffmpeg libpq-dev libxml2-dev libxslt1-dev file git MEMORY_NEEDED="2560" -RUBY_VERSION="3.0.4" +RUBY_VERSION="3.0.6" NODEJS_VERSION="14" From 37a1266153fba7f601a4916c43b56f3650a53a23 Mon Sep 17 00:00:00 2001 From: lapineige Date: Tue, 11 Apr 2023 21:38:39 +0200 Subject: [PATCH 09/25] https://github.com/YunoHost-Apps/glitchsoc_ynh/pull/112#issuecomment-1503853403 --- sources/patches/app-blurhash-bugfix.patch | 60 ----------------------- 1 file changed, 60 deletions(-) delete mode 100644 sources/patches/app-blurhash-bugfix.patch diff --git a/sources/patches/app-blurhash-bugfix.patch b/sources/patches/app-blurhash-bugfix.patch deleted file mode 100644 index e75702b..0000000 --- a/sources/patches/app-blurhash-bugfix.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/Gemfile b/Gemfile -index 7c36bc6b8..3f691d102 100644 ---- a/Gemfile -+++ b/Gemfile -@@ -22,7 +22,8 @@ - gem 'fog-core', '<= 2.1.0' - gem 'fog-openstack', '~> 0.3', require: false - gem 'kt-paperclip', '~> 7.1' --gem 'blurhash', '~> 0.1' -+gem 'blurhash', github: 'Gargron/blurhash', ref: '870a34e01ce7d09a7bd4d700435e1764ca823246' -+ - - gem 'active_model_serializers', '~> 0.10' - gem 'addressable', '~> 2.8' - -diff --git a/Gemfile.lock b/Gemfile.lock -index 7c36bc6b8..3f691d102 100644 ---- a/Gemfile.lock -+++ b/Gemfile.lock -@@ -7,6 +7,13 @@ - hkdf (~> 0.2) - jwt (~> 2.0) - -+GIT -+ remote: https://github.com/Gargron/blurhash.git -+ revision: 870a34e01ce7d09a7bd4d700435e1764ca823246 -+ ref: 870a34e01ce7d09a7bd4d700435e1764ca823246 -+ specs: -+ blurhash (0.1.6) -+ - GEM - remote: https://rubygems.org/ - specs: -@@ -120,8 +127,6 @@ - bindata (2.4.10) - binding_of_caller (1.0.0) - debug_inspector (>= 0.0.1) -- blurhash (0.1.6) -- ffi (~> 1.14) - bootsnap (1.13.0) - msgpack (~> 1.2) - brakeman (5.3.1) -@@ -448,7 +453,7 @@ - openssl-signature_algorithm (1.2.1) - openssl (> 2.0, < 3.1) - orm_adapter (0.5.0) -- ox (2.14.11) -+ ox (2.14.13) - parallel (1.22.1) - parser (3.1.2.1) - ast (~> 2.4.1) -@@ -738,7 +743,7 @@ - aws-sdk-s3 (~> 1.114) - better_errors (~> 2.9) - binding_of_caller (~> 1.0) -- blurhash (~> 0.1) -+ blurhash! - bootsnap (~> 1.13.0) - brakeman (~> 5.3) - browser From d68f3298b1783cb416368e9d06de6f2d590b88a4 Mon Sep 17 00:00:00 2001 From: lapineige Date: Fri, 14 Apr 2023 15:08:57 +0200 Subject: [PATCH 10/25] fix for 2023.04.08 --- sources/patches/app-sso.patch | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/sources/patches/app-sso.patch b/sources/patches/app-sso.patch index 84c4e67..0ae6380 100644 --- a/sources/patches/app-sso.patch +++ b/sources/patches/app-sso.patch @@ -2,14 +2,15 @@ diff --git a/app/controllers/application_controller.rb b/app/controllers/applica index 7c36bc6b8..3f691d102 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb -@@ -70,7 +70,7 @@ class ApplicationController < ActionController::Base +@@ -68,7 +68,7 @@ class ApplicationController < ActionController::Base + if ENV['OMNIAUTH_ONLY'] == 'true' && ENV['OIDC_ENABLED'] == 'true' + '/auth/auth/openid_connect/logout' + else +- new_user_session_path ++ "https://#{File.read('/etc/yunohost/current_host')}/yunohost/sso/?action=logout" + end end - - def after_sign_out_path_for(_resource_or_scope) -- new_user_session_path -+ "https://#{File.read('/etc/yunohost/current_host')}/yunohost/sso/?action=logout" - end - + def pack(data, pack_name, skin = 'default') diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 5232e6cfd..160348674 100644 From 9e3a074acff68e1dc60d663df7322811fe0ae055 Mon Sep 17 00:00:00 2001 From: lapineige Date: Fri, 14 Apr 2023 17:21:53 +0200 Subject: [PATCH 11/25] Do not check upgrade from 3.5 - check from Mastodon 4.0 --- check_process | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/check_process b/check_process index 6059013..7e59432 100644 --- a/check_process +++ b/check_process @@ -13,13 +13,13 @@ setup_public=1 upgrade=1 # 2022.04.28~ynh1 - upgrade=1 from_commit=66aba621d331db1a90c527e920f622b06c18a842 + upgrade=1 from_commit=614380eeeefce3bab1b3106990138f526f950664 backup_restore=1 multi_instance=0 port_already_use=0 change_url=0 ;;; Options ;;; Upgrade options - ; commit=66aba621d331db1a90c527e920f622b06c18a842 - name=2022.04.28~ynh1 + ; commit=614380eeeefce3bab1b3106990138f526f950664 + name=2022.11.15~ynh1 From b8fc3f7f1e897b5b17653a1c617fbe6732394b6b Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 16 Apr 2023 06:18:44 +0000 Subject: [PATCH 12/25] Upgrade to v2023.04.12 --- conf/app.src | 6 +++--- manifest.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/app.src b/conf/app.src index 9fc964f..95d085c 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://github.com/glitch-soc/mastodon/archive/29a91b871eb4fb375baa3701e29cfb35f884bb98.tar.gz -SOURCE_SUM=886b8b0976cfcd8fa176de6c19e32b93ca2765f536f2c5f6e68f351e031556da +SOURCE_URL=https://github.com/glitch-soc/mastodon/archive/bed63f6dae0879ac840066b031229e0d139089cd.tar.gz +SOURCE_SUM=10e21fc27c231dc924586a909b71507de45a1ab34c8e1306f4b7f7693107e9d4 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=29a91b871eb4fb375baa3701e29cfb35f884bb98.tar.gz +SOURCE_FILENAME=bed63f6dae0879ac840066b031229e0d139089cd.tar.gz SOURCE_EXTRACT=true diff --git a/manifest.json b/manifest.json index f9c0291..ca57c2a 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Libre and federated social network, fork of Mastodon", "fr": "Réseau social libre et fédéré, scission de Mastodon" }, - "version": "2023.04.08~ynh1", + "version": "2023.04.12~ynh1", "url": "https://github.com/glitch-soc/mastodon", "upstream": { "license": "AGPL-3.0-or-later", From aac2bc53a45933d6745332bb05a37c59c7b7de32 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 16 Apr 2023 06:18:49 +0000 Subject: [PATCH 13/25] 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 4f7aa9e..fcbf50c 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in See more [on the documentation](https://glitch-soc.github.io/docs/). -**Shipped version:** 2023.04.08~ynh1 +**Shipped version:** 2023.04.12~ynh1 ## Disclaimers / important information ⚠️ Glitch-Soc is beta software, and under active development. Use at your own risk! diff --git a/README_fr.md b/README_fr.md index 77fba3b..3f1f1ec 100644 --- a/README_fr.md +++ b/README_fr.md @@ -43,7 +43,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Voir plus [sur la documentation](https://glitch-soc.github.io/docs/) (en anglais). -**Version incluse :** 2023.04.08~ynh1 +**Version incluse :** 2023.04.12~ynh1 ## Avertissements / informations importantes Glitch-Soc est en constant développement, fournis avec les dernières fonctionnalités (incluant les derniers bugs). From dc492cc67c0b5ec79dbfc7983118459da5d2e2e1 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 23 Apr 2023 06:19:13 +0000 Subject: [PATCH 14/25] Upgrade to v2023.04.22 --- conf/app.src | 6 +++--- manifest.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/app.src b/conf/app.src index 95d085c..309d5c1 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://github.com/glitch-soc/mastodon/archive/bed63f6dae0879ac840066b031229e0d139089cd.tar.gz -SOURCE_SUM=10e21fc27c231dc924586a909b71507de45a1ab34c8e1306f4b7f7693107e9d4 +SOURCE_URL=https://github.com/glitch-soc/mastodon/archive/5b58ebb04fe197cc7aa0cfc05a4d1b2df8da0050.tar.gz +SOURCE_SUM=6b98cd687892c67ac52c8e0a600febe985add3747f06a84b9d524ff047390389 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=bed63f6dae0879ac840066b031229e0d139089cd.tar.gz +SOURCE_FILENAME=5b58ebb04fe197cc7aa0cfc05a4d1b2df8da0050.tar.gz SOURCE_EXTRACT=true diff --git a/manifest.json b/manifest.json index ca57c2a..cc95b95 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Libre and federated social network, fork of Mastodon", "fr": "Réseau social libre et fédéré, scission de Mastodon" }, - "version": "2023.04.12~ynh1", + "version": "2023.04.22~ynh1", "url": "https://github.com/glitch-soc/mastodon", "upstream": { "license": "AGPL-3.0-or-later", From e8bd674d37e19699539aeba306a0c619dbaaae11 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 23 Apr 2023 06:19:20 +0000 Subject: [PATCH 15/25] 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 fcbf50c..a56a9ab 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in See more [on the documentation](https://glitch-soc.github.io/docs/). -**Shipped version:** 2023.04.12~ynh1 +**Shipped version:** 2023.04.22~ynh1 ## Disclaimers / important information ⚠️ Glitch-Soc is beta software, and under active development. Use at your own risk! diff --git a/README_fr.md b/README_fr.md index 3f1f1ec..6068ad5 100644 --- a/README_fr.md +++ b/README_fr.md @@ -43,7 +43,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Voir plus [sur la documentation](https://glitch-soc.github.io/docs/) (en anglais). -**Version incluse :** 2023.04.12~ynh1 +**Version incluse :** 2023.04.22~ynh1 ## Avertissements / informations importantes Glitch-Soc est en constant développement, fournis avec les dernières fonctionnalités (incluant les derniers bugs). From 9b21c5474717cdde13e61006b16ad671f87651da Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 30 Apr 2023 06:18:54 +0000 Subject: [PATCH 16/25] Upgrade to v2023.04.26 --- conf/app.src | 6 +++--- manifest.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/app.src b/conf/app.src index 309d5c1..f10df92 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://github.com/glitch-soc/mastodon/archive/5b58ebb04fe197cc7aa0cfc05a4d1b2df8da0050.tar.gz -SOURCE_SUM=6b98cd687892c67ac52c8e0a600febe985add3747f06a84b9d524ff047390389 +SOURCE_URL=https://github.com/glitch-soc/mastodon/archive/1565af1caf1def5d15e77d8bebd8924deda50d53.tar.gz +SOURCE_SUM=f5c8b4574e477baea1f6945acf45bd9d7752015fc91348d6258700bf223a1f3e SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=5b58ebb04fe197cc7aa0cfc05a4d1b2df8da0050.tar.gz +SOURCE_FILENAME=1565af1caf1def5d15e77d8bebd8924deda50d53.tar.gz SOURCE_EXTRACT=true diff --git a/manifest.json b/manifest.json index cc95b95..d4b718f 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Libre and federated social network, fork of Mastodon", "fr": "Réseau social libre et fédéré, scission de Mastodon" }, - "version": "2023.04.22~ynh1", + "version": "2023.04.26~ynh1", "url": "https://github.com/glitch-soc/mastodon", "upstream": { "license": "AGPL-3.0-or-later", From b51f010fadd6d79dca9bb47e295d151cc2bdfdc2 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 30 Apr 2023 06:19:00 +0000 Subject: [PATCH 17/25] 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 a56a9ab..069ae11 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in See more [on the documentation](https://glitch-soc.github.io/docs/). -**Shipped version:** 2023.04.22~ynh1 +**Shipped version:** 2023.04.26~ynh1 ## Disclaimers / important information ⚠️ Glitch-Soc is beta software, and under active development. Use at your own risk! diff --git a/README_fr.md b/README_fr.md index 6068ad5..b6042e4 100644 --- a/README_fr.md +++ b/README_fr.md @@ -43,7 +43,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Voir plus [sur la documentation](https://glitch-soc.github.io/docs/) (en anglais). -**Version incluse :** 2023.04.22~ynh1 +**Version incluse :** 2023.04.26~ynh1 ## Avertissements / informations importantes Glitch-Soc est en constant développement, fournis avec les dernières fonctionnalités (incluant les derniers bugs). From d7bf23c261110787b963de25fdaf5f9febec8e4a Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 7 May 2023 06:19:15 +0000 Subject: [PATCH 18/25] Upgrade to v2023.04.30 --- conf/app.src | 6 +++--- manifest.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/app.src b/conf/app.src index f10df92..a802f43 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://github.com/glitch-soc/mastodon/archive/1565af1caf1def5d15e77d8bebd8924deda50d53.tar.gz -SOURCE_SUM=f5c8b4574e477baea1f6945acf45bd9d7752015fc91348d6258700bf223a1f3e +SOURCE_URL=https://github.com/glitch-soc/mastodon/archive/c18884de32b60152600ec95ed42cdf9c00fdab7a.tar.gz +SOURCE_SUM=c55ff4dc6f044e05f794d3c21aef1892ef5f13c90a0a69e7a38b3bb76aaed15a SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=1565af1caf1def5d15e77d8bebd8924deda50d53.tar.gz +SOURCE_FILENAME=c18884de32b60152600ec95ed42cdf9c00fdab7a.tar.gz SOURCE_EXTRACT=true diff --git a/manifest.json b/manifest.json index d4b718f..6ffcbf8 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Libre and federated social network, fork of Mastodon", "fr": "Réseau social libre et fédéré, scission de Mastodon" }, - "version": "2023.04.26~ynh1", + "version": "2023.04.30~ynh1", "url": "https://github.com/glitch-soc/mastodon", "upstream": { "license": "AGPL-3.0-or-later", From e8acd3c6e515746d7813c3c8e8cef8f1569ee12f Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 7 May 2023 06:19:21 +0000 Subject: [PATCH 19/25] 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 069ae11..363d1b8 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in See more [on the documentation](https://glitch-soc.github.io/docs/). -**Shipped version:** 2023.04.26~ynh1 +**Shipped version:** 2023.04.30~ynh1 ## Disclaimers / important information ⚠️ Glitch-Soc is beta software, and under active development. Use at your own risk! diff --git a/README_fr.md b/README_fr.md index b6042e4..93b8091 100644 --- a/README_fr.md +++ b/README_fr.md @@ -43,7 +43,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Voir plus [sur la documentation](https://glitch-soc.github.io/docs/) (en anglais). -**Version incluse :** 2023.04.26~ynh1 +**Version incluse :** 2023.04.30~ynh1 ## Avertissements / informations importantes Glitch-Soc est en constant développement, fournis avec les dernières fonctionnalités (incluant les derniers bugs). From ff05212717115fbecb4b50a859bdd820141967bd Mon Sep 17 00:00:00 2001 From: Tagadda <36127788+Tagadda@users.noreply.github.com> Date: Tue, 9 May 2023 10:57:34 +0000 Subject: [PATCH 20/25] Remove broken version --- check_process | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/check_process b/check_process index 7e59432..668daea 100644 --- a/check_process +++ b/check_process @@ -20,6 +20,5 @@ change_url=0 ;;; Options ;;; Upgrade options - ; commit=614380eeeefce3bab1b3106990138f526f950664 - name=2022.11.15~ynh1 + From 08f4b5e8dace0ed219c1252794e31dc1293498f9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 19 May 2023 13:20:24 +0200 Subject: [PATCH 21/25] Upgrade to version 2023.05.09 (#119) * Upgrade to v2023.05.09 * Bump nodejs and ruby version * Auto-update README --------- Co-authored-by: yunohost-bot Co-authored-by: Tagadda <36127788+Tagadda@users.noreply.github.com> Co-authored-by: yunohost-bot --- README.md | 2 +- README_fr.md | 2 +- conf/app.src | 6 +++--- manifest.json | 2 +- scripts/_common.sh | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 363d1b8..ec1ed86 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in See more [on the documentation](https://glitch-soc.github.io/docs/). -**Shipped version:** 2023.04.30~ynh1 +**Shipped version:** 2023.05.09~ynh1 ## Disclaimers / important information ⚠️ Glitch-Soc is beta software, and under active development. Use at your own risk! diff --git a/README_fr.md b/README_fr.md index 93b8091..bebca3b 100644 --- a/README_fr.md +++ b/README_fr.md @@ -43,7 +43,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Voir plus [sur la documentation](https://glitch-soc.github.io/docs/) (en anglais). -**Version incluse :** 2023.04.30~ynh1 +**Version incluse :** 2023.05.09~ynh1 ## Avertissements / informations importantes Glitch-Soc est en constant développement, fournis avec les dernières fonctionnalités (incluant les derniers bugs). diff --git a/conf/app.src b/conf/app.src index a802f43..7f7fd35 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://github.com/glitch-soc/mastodon/archive/c18884de32b60152600ec95ed42cdf9c00fdab7a.tar.gz -SOURCE_SUM=c55ff4dc6f044e05f794d3c21aef1892ef5f13c90a0a69e7a38b3bb76aaed15a +SOURCE_URL=https://github.com/glitch-soc/mastodon/archive/f08f6d20e607f8af02dcd23afa019ebee7ad36a9.tar.gz +SOURCE_SUM=7659cd68254f9c1a99411232665f1846c38c452b82f869437bbbb39d6b111425 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=c18884de32b60152600ec95ed42cdf9c00fdab7a.tar.gz +SOURCE_FILENAME=f08f6d20e607f8af02dcd23afa019ebee7ad36a9.tar.gz SOURCE_EXTRACT=true diff --git a/manifest.json b/manifest.json index 6ffcbf8..28f1776 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Libre and federated social network, fork of Mastodon", "fr": "Réseau social libre et fédéré, scission de Mastodon" }, - "version": "2023.04.30~ynh1", + "version": "2023.05.09~ynh1", "url": "https://github.com/glitch-soc/mastodon", "upstream": { "license": "AGPL-3.0-or-later", diff --git a/scripts/_common.sh b/scripts/_common.sh index 725fde9..8a6641d 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -9,9 +9,9 @@ pkg_dependencies="imagemagick ffmpeg libpq-dev libxml2-dev libxslt1-dev file git MEMORY_NEEDED="2560" -RUBY_VERSION="3.0.6" +RUBY_VERSION="3.2.2" -NODEJS_VERSION="14" +NODEJS_VERSION="16" # Workaround for Mastodon on Bullseye # See https://github.com/mastodon/mastodon/issues/15751#issuecomment-873594463 From 672ed32cb036d415d15d71cb71dce5001fb5aee3 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 21 May 2023 06:18:04 +0000 Subject: [PATCH 22/25] Upgrade to v2023.05.17 --- conf/app.src | 6 +++--- manifest.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/app.src b/conf/app.src index 7f7fd35..eaf66d0 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://github.com/glitch-soc/mastodon/archive/f08f6d20e607f8af02dcd23afa019ebee7ad36a9.tar.gz -SOURCE_SUM=7659cd68254f9c1a99411232665f1846c38c452b82f869437bbbb39d6b111425 +SOURCE_URL=https://github.com/glitch-soc/mastodon/archive/058898802a377877961ff3bfa7d5209a5e275545.tar.gz +SOURCE_SUM=23bda1113c8977f0b94bcbce32bb69aa83ba9c05511a2b7570aeae3211b76cf2 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=f08f6d20e607f8af02dcd23afa019ebee7ad36a9.tar.gz +SOURCE_FILENAME=058898802a377877961ff3bfa7d5209a5e275545.tar.gz SOURCE_EXTRACT=true diff --git a/manifest.json b/manifest.json index 28f1776..05b206a 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Libre and federated social network, fork of Mastodon", "fr": "Réseau social libre et fédéré, scission de Mastodon" }, - "version": "2023.05.09~ynh1", + "version": "2023.05.17~ynh1", "url": "https://github.com/glitch-soc/mastodon", "upstream": { "license": "AGPL-3.0-or-later", From 3193b9fc8f08a580f9de39cecf47a57a86127f69 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 21 May 2023 17:42:12 +0000 Subject: [PATCH 23/25] 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 ec1ed86..e1b3368 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in See more [on the documentation](https://glitch-soc.github.io/docs/). -**Shipped version:** 2023.05.09~ynh1 +**Shipped version:** 2023.05.17~ynh1 ## Disclaimers / important information ⚠️ Glitch-Soc is beta software, and under active development. Use at your own risk! diff --git a/README_fr.md b/README_fr.md index bebca3b..c065f1c 100644 --- a/README_fr.md +++ b/README_fr.md @@ -43,7 +43,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Voir plus [sur la documentation](https://glitch-soc.github.io/docs/) (en anglais). -**Version incluse :** 2023.05.09~ynh1 +**Version incluse :** 2023.05.17~ynh1 ## Avertissements / informations importantes Glitch-Soc est en constant développement, fournis avec les dernières fonctionnalités (incluant les derniers bugs). From ad2432590a0d31af30712989afa713e2504f2424 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 28 May 2023 06:18:28 +0000 Subject: [PATCH 24/25] Upgrade to v2023.05.27 --- conf/app.src | 6 +++--- manifest.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/app.src b/conf/app.src index eaf66d0..2a70675 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://github.com/glitch-soc/mastodon/archive/058898802a377877961ff3bfa7d5209a5e275545.tar.gz -SOURCE_SUM=23bda1113c8977f0b94bcbce32bb69aa83ba9c05511a2b7570aeae3211b76cf2 +SOURCE_URL=https://github.com/glitch-soc/mastodon/archive/0222df6047a8569d04cfdc36668d46b71bec2e75.tar.gz +SOURCE_SUM=766f9dad04638f51eb66a8395cccc4effe6685a1d2ef8448f48ad8ac53694d38 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=058898802a377877961ff3bfa7d5209a5e275545.tar.gz +SOURCE_FILENAME=0222df6047a8569d04cfdc36668d46b71bec2e75.tar.gz SOURCE_EXTRACT=true diff --git a/manifest.json b/manifest.json index 05b206a..eabab51 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Libre and federated social network, fork of Mastodon", "fr": "Réseau social libre et fédéré, scission de Mastodon" }, - "version": "2023.05.17~ynh1", + "version": "2023.05.27~ynh1", "url": "https://github.com/glitch-soc/mastodon", "upstream": { "license": "AGPL-3.0-or-later", From 641bbdce000277fc18da502b83bc0dd5684ee775 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 28 May 2023 06:18:33 +0000 Subject: [PATCH 25/25] 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 e1b3368..d8ec2ec 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in See more [on the documentation](https://glitch-soc.github.io/docs/). -**Shipped version:** 2023.05.17~ynh1 +**Shipped version:** 2023.05.27~ynh1 ## Disclaimers / important information ⚠️ Glitch-Soc is beta software, and under active development. Use at your own risk! diff --git a/README_fr.md b/README_fr.md index c065f1c..dce1947 100644 --- a/README_fr.md +++ b/README_fr.md @@ -43,7 +43,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Voir plus [sur la documentation](https://glitch-soc.github.io/docs/) (en anglais). -**Version incluse :** 2023.05.17~ynh1 +**Version incluse :** 2023.05.27~ynh1 ## Avertissements / informations importantes Glitch-Soc est en constant développement, fournis avec les dernières fonctionnalités (incluant les derniers bugs).