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). 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 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", 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" 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 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