user/mastodon: upgrade to 4.0.0_rc2
This commit is contained in:
build@apk-groulx
parent
5b24a3c0cf
commit
572ae5b8a9
3 changed files with 478 additions and 80 deletions
|
|
@ -1,45 +1,188 @@
|
||||||
From 0ddbfb1fe1de4052ee0c64e4c4c05669254a66c6 Mon Sep 17 00:00:00 2001
|
diff --git a/Gemfile.lock.orig b/Gemfile.lock
|
||||||
From: Antoine Martin <dev@ayakael.net>
|
index 28c6e73..7e21b2d 100644
|
||||||
Date: Wed, 27 Jul 2022 10:31:02 -0400
|
--- a/Gemfile.lock.orig
|
||||||
Subject: [PATCH 1/1] ruby-3.1-support
|
|
||||||
|
|
||||||
---
|
|
||||||
Gemfile | 3 ++-
|
|
||||||
Gemfile.lock | 29 ++++++++++++++++++++++++++++-
|
|
||||||
2 files changed, 30 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/Gemfile b/Gemfile
|
|
||||||
index 2e77fb42a..2fb22a217 100644
|
|
||||||
--- a/Gemfile
|
|
||||||
+++ b/Gemfile
|
|
||||||
@@ -1,7 +1,7 @@
|
|
||||||
# frozen_string_literal: true
|
|
||||||
|
|
||||||
source 'https://rubygems.org'
|
|
||||||
-ruby '>= 2.6.0', '< 3.1.0'
|
|
||||||
+ruby '>= 2.6.0', '< 3.2.0'
|
|
||||||
|
|
||||||
gem 'pkg-config', '~> 1.4'
|
|
||||||
gem 'rexml', '~> 3.2'
|
|
||||||
@@ -153,3 +153,4 @@ gem 'concurrent-ruby', require: false
|
|
||||||
gem 'connection_pool', require: false
|
|
||||||
|
|
||||||
gem 'xorcist', '~> 1.1'
|
|
||||||
+gem 'mail', '~> 2.8.0.rc1'
|
|
||||||
diff --git a/Gemfile.lock b/Gemfile.lock
|
|
||||||
index e12fdc237..a3c6298f7 100644
|
|
||||||
--- a/Gemfile.lock
|
|
||||||
+++ b/Gemfile.lock
|
+++ b/Gemfile.lock
|
||||||
@@ -192,6 +192,7 @@ GEM
|
@@ -90,22 +90,22 @@ GEM
|
||||||
devise (>= 4.0.0)
|
attr_required (1.0.1)
|
||||||
rpam2 (~> 4.0)
|
awrence (1.2.1)
|
||||||
|
aws-eventstream (1.2.0)
|
||||||
|
- aws-partitions (1.587.0)
|
||||||
|
- aws-sdk-core (3.130.2)
|
||||||
|
+ aws-partitions (1.656.0)
|
||||||
|
+ aws-sdk-core (3.166.0)
|
||||||
|
aws-eventstream (~> 1, >= 1.0.2)
|
||||||
|
- aws-partitions (~> 1, >= 1.525.0)
|
||||||
|
+ aws-partitions (~> 1, >= 1.651.0)
|
||||||
|
+ aws-sigv4 (~> 1.5)
|
||||||
|
+ jmespath (~> 1, >= 1.6.1)
|
||||||
|
+ aws-sdk-kms (1.59.0)
|
||||||
|
+ aws-sdk-core (~> 3, >= 3.165.0)
|
||||||
|
aws-sigv4 (~> 1.1)
|
||||||
|
- jmespath (~> 1.0)
|
||||||
|
- aws-sdk-kms (1.56.0)
|
||||||
|
- aws-sdk-core (~> 3, >= 3.127.0)
|
||||||
|
- aws-sigv4 (~> 1.1)
|
||||||
|
- aws-sdk-s3 (1.114.0)
|
||||||
|
- aws-sdk-core (~> 3, >= 3.127.0)
|
||||||
|
+ aws-sdk-s3 (1.117.1)
|
||||||
|
+ aws-sdk-core (~> 3, >= 3.165.0)
|
||||||
|
aws-sdk-kms (~> 1)
|
||||||
|
aws-sigv4 (~> 1.4)
|
||||||
|
- aws-sigv4 (1.5.0)
|
||||||
|
+ aws-sigv4 (1.5.2)
|
||||||
|
aws-eventstream (~> 1, >= 1.0.2)
|
||||||
|
- bcrypt (3.1.17)
|
||||||
|
+ bcrypt (3.1.18)
|
||||||
|
better_errors (2.9.1)
|
||||||
|
coderay (>= 1.0.0)
|
||||||
|
erubi (>= 1.0.0)
|
||||||
|
@@ -117,7 +117,7 @@ GEM
|
||||||
|
erubi (~> 1.4)
|
||||||
|
parser (>= 2.4)
|
||||||
|
smart_properties
|
||||||
|
- bindata (2.4.10)
|
||||||
|
+ bindata (2.4.14)
|
||||||
|
binding_of_caller (1.0.0)
|
||||||
|
debug_inspector (>= 0.0.1)
|
||||||
|
blurhash (0.1.6)
|
||||||
|
@@ -125,7 +125,7 @@ GEM
|
||||||
|
bootsnap (1.13.0)
|
||||||
|
msgpack (~> 1.2)
|
||||||
|
brakeman (5.3.1)
|
||||||
|
- browser (4.2.0)
|
||||||
|
+ browser (5.3.1)
|
||||||
|
brpoplpush-redis_script (0.1.2)
|
||||||
|
concurrent-ruby (~> 1.0, >= 1.0.5)
|
||||||
|
redis (>= 1.0, <= 5.0)
|
||||||
|
@@ -142,7 +142,7 @@ GEM
|
||||||
|
i18n
|
||||||
|
rake (>= 10.0.0)
|
||||||
|
sshkit (>= 1.9.0)
|
||||||
|
- capistrano-bundler (2.0.1)
|
||||||
|
+ capistrano-bundler (2.1.0)
|
||||||
|
capistrano (~> 3.1)
|
||||||
|
capistrano-rails (1.6.2)
|
||||||
|
capistrano (~> 3.1)
|
||||||
|
@@ -152,7 +152,7 @@ GEM
|
||||||
|
sshkit (~> 1.3)
|
||||||
|
capistrano-yarn (2.0.2)
|
||||||
|
capistrano (~> 3.0)
|
||||||
|
- capybara (3.37.1)
|
||||||
|
+ capybara (3.38.0)
|
||||||
|
addressable
|
||||||
|
matrix
|
||||||
|
mini_mime (>= 0.1.3)
|
||||||
|
@@ -165,7 +165,7 @@ GEM
|
||||||
|
activesupport
|
||||||
|
cbor (0.5.9.6)
|
||||||
|
charlock_holmes (0.7.7)
|
||||||
|
- chewy (7.2.4)
|
||||||
|
+ chewy (7.2.6)
|
||||||
|
activesupport (>= 5.2)
|
||||||
|
elasticsearch (>= 7.12.0, < 7.14.0)
|
||||||
|
elasticsearch-dsl
|
||||||
|
@@ -176,15 +176,15 @@ GEM
|
||||||
|
color_diff (0.1)
|
||||||
|
concurrent-ruby (1.1.10)
|
||||||
|
connection_pool (2.3.0)
|
||||||
|
- cose (1.2.1)
|
||||||
|
+ cose (1.3.0)
|
||||||
|
cbor (~> 0.5.9)
|
||||||
|
openssl-signature_algorithm (~> 1.0)
|
||||||
|
crack (0.4.5)
|
||||||
|
rexml
|
||||||
|
crass (1.0.6)
|
||||||
|
- css_parser (1.7.1)
|
||||||
|
+ css_parser (1.12.0)
|
||||||
|
addressable
|
||||||
|
- debug_inspector (1.0.0)
|
||||||
|
+ debug_inspector (1.1.0)
|
||||||
|
devise (4.8.1)
|
||||||
|
bcrypt (~> 3.0)
|
||||||
|
orm_adapter (~> 0.1)
|
||||||
|
@@ -203,7 +203,7 @@ GEM
|
||||||
diff-lcs (1.5.0)
|
diff-lcs (1.5.0)
|
||||||
+ digest (3.1.0)
|
|
||||||
discard (1.2.1)
|
discard (1.2.1)
|
||||||
activerecord (>= 4.2, < 8)
|
activerecord (>= 4.2, < 8)
|
||||||
docile (1.3.4)
|
- docile (1.3.4)
|
||||||
@@ -377,8 +378,11 @@ GEM
|
+ docile (1.4.0)
|
||||||
loofah (2.18.0)
|
domain_name (0.5.20190701)
|
||||||
|
unf (>= 0.0.5, < 1.0.0)
|
||||||
|
doorkeeper (5.6.0)
|
||||||
|
@@ -226,11 +226,11 @@ GEM
|
||||||
|
erubi (1.11.0)
|
||||||
|
et-orbi (1.2.7)
|
||||||
|
tzinfo
|
||||||
|
- excon (0.76.0)
|
||||||
|
+ excon (0.93.1)
|
||||||
|
fabrication (2.30.0)
|
||||||
|
faker (2.23.0)
|
||||||
|
i18n (>= 1.8.11, < 2)
|
||||||
|
- faraday (1.9.3)
|
||||||
|
+ faraday (1.10.2)
|
||||||
|
faraday-em_http (~> 1.0)
|
||||||
|
faraday-em_synchrony (~> 1.0)
|
||||||
|
faraday-excon (~> 1.1)
|
||||||
|
@@ -246,8 +246,8 @@ GEM
|
||||||
|
faraday-em_synchrony (1.0.0)
|
||||||
|
faraday-excon (1.1.0)
|
||||||
|
faraday-httpclient (1.0.1)
|
||||||
|
- faraday-multipart (1.0.3)
|
||||||
|
- multipart-post (>= 1.2, < 3)
|
||||||
|
+ faraday-multipart (1.0.4)
|
||||||
|
+ multipart-post (~> 2)
|
||||||
|
faraday-net_http (1.0.1)
|
||||||
|
faraday-net_http_persistent (1.2.0)
|
||||||
|
faraday-patron (1.0.0)
|
||||||
|
@@ -271,8 +271,8 @@ GEM
|
||||||
|
fog-core (>= 1.45, <= 2.1.0)
|
||||||
|
fog-json (>= 1.0)
|
||||||
|
ipaddress (>= 0.8)
|
||||||
|
- formatador (0.2.5)
|
||||||
|
- fugit (1.7.1)
|
||||||
|
+ formatador (0.3.0)
|
||||||
|
+ fugit (1.7.2)
|
||||||
|
et-orbi (~> 1, >= 1.2.7)
|
||||||
|
raabro (~> 1.4)
|
||||||
|
fuubar (2.5.1)
|
||||||
|
@@ -284,7 +284,7 @@ GEM
|
||||||
|
openid_connect (~> 1.2)
|
||||||
|
globalid (1.0.0)
|
||||||
|
activesupport (>= 5.0)
|
||||||
|
- hamlit (2.13.0)
|
||||||
|
+ hamlit (3.0.2)
|
||||||
|
temple (>= 0.8.2)
|
||||||
|
thor
|
||||||
|
tilt
|
||||||
|
@@ -330,10 +330,11 @@ GEM
|
||||||
|
jmespath (1.6.1)
|
||||||
|
json (2.6.2)
|
||||||
|
json-canonicalization (0.3.0)
|
||||||
|
- json-jwt (1.13.0)
|
||||||
|
+ json-jwt (1.15.3)
|
||||||
|
activesupport (>= 4.2)
|
||||||
|
aes_key_wrap
|
||||||
|
bindata
|
||||||
|
+ httpclient
|
||||||
|
json-ld (3.2.3)
|
||||||
|
htmlentities (~> 4.3)
|
||||||
|
json-canonicalization (~> 0.3)
|
||||||
|
@@ -341,11 +342,11 @@ GEM
|
||||||
|
multi_json (~> 1.15)
|
||||||
|
rack (~> 2.2)
|
||||||
|
rdf (~> 3.2, >= 3.2.9)
|
||||||
|
- json-ld-preloaded (3.2.0)
|
||||||
|
+ json-ld-preloaded (3.2.2)
|
||||||
|
json-ld (~> 3.2)
|
||||||
|
rdf (~> 3.2)
|
||||||
|
jsonapi-renderer (0.2.2)
|
||||||
|
- jwt (2.4.1)
|
||||||
|
+ jwt (2.5.0)
|
||||||
|
kaminari (1.2.2)
|
||||||
|
activesupport (>= 4.1.0)
|
||||||
|
kaminari-actionview (= 1.2.2)
|
||||||
|
@@ -385,15 +386,18 @@ GEM
|
||||||
|
loofah (2.19.0)
|
||||||
crass (~> 1.0.2)
|
crass (~> 1.0.2)
|
||||||
nokogiri (>= 1.5.9)
|
nokogiri (>= 1.5.9)
|
||||||
- mail (2.7.1)
|
- mail (2.7.1)
|
||||||
|
|
@ -51,47 +194,273 @@ index e12fdc237..a3c6298f7 100644
|
||||||
makara (0.5.1)
|
makara (0.5.1)
|
||||||
activerecord (>= 5.2.0)
|
activerecord (>= 5.2.0)
|
||||||
marcel (1.0.2)
|
marcel (1.0.2)
|
||||||
@@ -399,9 +403,23 @@ GEM
|
mario-redis-lock (1.2.1)
|
||||||
msgpack (1.5.1)
|
redis (>= 3.0.5)
|
||||||
|
matrix (0.4.2)
|
||||||
|
- memory_profiler (1.0.0)
|
||||||
|
+ memory_profiler (1.0.1)
|
||||||
|
method_source (1.0.0)
|
||||||
|
microformats (4.4.1)
|
||||||
|
json (~> 2.2)
|
||||||
|
@@ -402,25 +406,31 @@ GEM
|
||||||
|
mime-types-data (~> 3.2015)
|
||||||
|
mime-types-data (3.2022.0105)
|
||||||
|
mini_mime (1.1.2)
|
||||||
|
- mini_portile2 (2.8.0)
|
||||||
|
minitest (5.16.3)
|
||||||
|
- msgpack (1.5.4)
|
||||||
|
+ msgpack (1.6.0)
|
||||||
multi_json (1.15.0)
|
multi_json (1.15.0)
|
||||||
multipart-post (2.1.1)
|
- multipart-post (2.1.1)
|
||||||
+ net-imap (0.2.3)
|
+ multipart-post (2.2.3)
|
||||||
+ digest
|
+ net-imap (0.3.1)
|
||||||
+ net-protocol
|
+ net-protocol
|
||||||
+ strscan
|
net-ldap (0.17.1)
|
||||||
net-ldap (0.17.0)
|
- net-scp (4.0.0.rc1)
|
||||||
+ net-pop (0.1.1)
|
+ net-pop (0.1.2)
|
||||||
+ digest
|
|
||||||
+ net-protocol
|
+ net-protocol
|
||||||
+ timeout
|
|
||||||
+ net-protocol (0.1.3)
|
+ net-protocol (0.1.3)
|
||||||
+ timeout
|
+ timeout
|
||||||
net-scp (3.0.0)
|
+ net-scp (4.0.0)
|
||||||
net-ssh (>= 2.6.5, < 7.0.0)
|
net-ssh (>= 2.6.5, < 8.0.0)
|
||||||
+ net-smtp (0.3.1)
|
+ net-smtp (0.3.3)
|
||||||
+ digest
|
|
||||||
+ net-protocol
|
+ net-protocol
|
||||||
+ timeout
|
net-ssh (7.0.1)
|
||||||
net-ssh (6.1.0)
|
|
||||||
nio4r (2.5.8)
|
nio4r (2.5.8)
|
||||||
nokogiri (1.13.6)
|
- nokogiri (1.13.8)
|
||||||
@@ -643,6 +661,7 @@ GEM
|
- mini_portile2 (~> 2.8.0)
|
||||||
stoplight (3.0.0)
|
+ nokogiri (1.13.9-x86_64-linux)
|
||||||
strong_migrations (0.7.9)
|
racc (~> 1.4)
|
||||||
|
nsa (0.2.8)
|
||||||
|
activesupport (>= 4.2, < 7)
|
||||||
|
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||||
|
sidekiq (>= 3.5)
|
||||||
|
statsd-ruby (~> 1.4, >= 1.4.0)
|
||||||
|
- oj (3.13.21)
|
||||||
|
+ oj (3.13.22)
|
||||||
|
omniauth (1.9.2)
|
||||||
|
hashie (>= 3.4.6)
|
||||||
|
rack (>= 1.6.2, < 3)
|
||||||
|
@@ -434,17 +444,18 @@ GEM
|
||||||
|
omniauth-saml (1.10.3)
|
||||||
|
omniauth (~> 1.3, >= 1.3.2)
|
||||||
|
ruby-saml (~> 1.9)
|
||||||
|
- openid_connect (1.3.0)
|
||||||
|
+ openid_connect (1.4.2)
|
||||||
|
activemodel
|
||||||
|
attr_required (>= 1.0.0)
|
||||||
|
- json-jwt (>= 1.5.0)
|
||||||
|
- rack-oauth2 (>= 1.6.1)
|
||||||
|
- swd (>= 1.0.0)
|
||||||
|
+ json-jwt (>= 1.15.0)
|
||||||
|
+ net-smtp
|
||||||
|
+ rack-oauth2 (~> 1.21)
|
||||||
|
+ swd (~> 1.3)
|
||||||
|
tzinfo
|
||||||
|
validate_email
|
||||||
|
validate_url
|
||||||
|
- webfinger (>= 1.0.1)
|
||||||
|
- openssl (3.0.0)
|
||||||
|
+ webfinger (~> 1.2)
|
||||||
|
+ openssl (3.0.1)
|
||||||
|
openssl-signature_algorithm (1.2.1)
|
||||||
|
openssl (> 2.0, < 3.1)
|
||||||
|
orm_adapter (0.5.0)
|
||||||
|
@@ -455,14 +466,14 @@ GEM
|
||||||
|
parslet (2.0.0)
|
||||||
|
pastel (0.8.0)
|
||||||
|
tty-color (~> 0.5)
|
||||||
|
- pg (1.4.3)
|
||||||
|
+ pg (1.4.4)
|
||||||
|
pghero (2.8.3)
|
||||||
activerecord (>= 5)
|
activerecord (>= 5)
|
||||||
+ strscan (3.0.4)
|
pkg-config (1.4.9)
|
||||||
|
posix-spawn (0.3.15)
|
||||||
|
- premailer (1.14.2)
|
||||||
|
+ premailer (1.18.0)
|
||||||
|
addressable
|
||||||
|
- css_parser (>= 1.6.0)
|
||||||
|
+ css_parser (>= 1.12.0)
|
||||||
|
htmlentities (>= 4.0.0)
|
||||||
|
premailer-rails (1.11.1)
|
||||||
|
actionmailer (>= 3)
|
||||||
|
@@ -476,6 +487,7 @@ GEM
|
||||||
|
pry (>= 0.13, < 0.15)
|
||||||
|
pry-rails (0.3.9)
|
||||||
|
pry (>= 0.10.4)
|
||||||
|
+ psych (3.3.4)
|
||||||
|
public_suffix (5.0.0)
|
||||||
|
puma (5.6.5)
|
||||||
|
nio4r (~> 2.0)
|
||||||
|
@@ -488,13 +500,13 @@ GEM
|
||||||
|
rack (>= 1.0, < 3)
|
||||||
|
rack-cors (1.1.1)
|
||||||
|
rack (>= 2.0.0)
|
||||||
|
- rack-oauth2 (1.19.0)
|
||||||
|
+ rack-oauth2 (1.21.3)
|
||||||
|
activesupport
|
||||||
|
attr_required
|
||||||
|
httpclient
|
||||||
|
json-jwt (>= 1.11.0)
|
||||||
|
rack (>= 2.1.0)
|
||||||
|
- rack-proxy (0.7.0)
|
||||||
|
+ rack-proxy (0.7.4)
|
||||||
|
rack
|
||||||
|
rack-test (2.0.2)
|
||||||
|
rack (>= 1.3)
|
||||||
|
@@ -525,7 +537,7 @@ GEM
|
||||||
|
rails-i18n (6.0.0)
|
||||||
|
i18n (>= 0.7, < 2)
|
||||||
|
railties (>= 6.0.0, < 7)
|
||||||
|
- rails-settings-cached (0.6.6)
|
||||||
|
+ rails-settings-cached (0.7.2)
|
||||||
|
rails (>= 4.2.0)
|
||||||
|
railties (6.1.7)
|
||||||
|
actionpack (= 6.1.7)
|
||||||
|
@@ -540,10 +552,10 @@ GEM
|
||||||
|
rdf-normalize (0.5.0)
|
||||||
|
rdf (~> 3.2)
|
||||||
|
redcarpet (3.5.1)
|
||||||
|
- redis (4.5.1)
|
||||||
|
+ redis (4.8.0)
|
||||||
|
redis-namespace (1.9.0)
|
||||||
|
redis (>= 4)
|
||||||
|
- regexp_parser (2.5.0)
|
||||||
|
+ regexp_parser (2.6.0)
|
||||||
|
request_store (1.5.1)
|
||||||
|
rack (>= 1.4)
|
||||||
|
responders (3.0.1)
|
||||||
|
@@ -556,14 +568,14 @@ GEM
|
||||||
|
chunky_png (~> 1.0)
|
||||||
|
rqrcode_core (~> 1.0)
|
||||||
|
rqrcode_core (1.2.0)
|
||||||
|
- rspec-core (3.11.0)
|
||||||
|
- rspec-support (~> 3.11.0)
|
||||||
|
- rspec-expectations (3.11.0)
|
||||||
|
+ rspec-core (3.12.0)
|
||||||
|
+ rspec-support (~> 3.12.0)
|
||||||
|
+ rspec-expectations (3.12.0)
|
||||||
|
diff-lcs (>= 1.2.0, < 2.0)
|
||||||
|
- rspec-support (~> 3.11.0)
|
||||||
|
- rspec-mocks (3.11.1)
|
||||||
|
+ rspec-support (~> 3.12.0)
|
||||||
|
+ rspec-mocks (3.12.0)
|
||||||
|
diff-lcs (>= 1.2.0, < 2.0)
|
||||||
|
- rspec-support (~> 3.11.0)
|
||||||
|
+ rspec-support (~> 3.12.0)
|
||||||
|
rspec-rails (5.1.2)
|
||||||
|
actionpack (>= 5.2)
|
||||||
|
activesupport (>= 5.2)
|
||||||
|
@@ -575,26 +587,27 @@ GEM
|
||||||
|
rspec-sidekiq (3.1.0)
|
||||||
|
rspec-core (~> 3.0, >= 3.0.0)
|
||||||
|
sidekiq (>= 2.4.0)
|
||||||
|
- rspec-support (3.11.1)
|
||||||
|
+ rspec-support (3.12.0)
|
||||||
|
rspec_junit_formatter (0.6.0)
|
||||||
|
rspec-core (>= 2, < 4, != 2.12.0)
|
||||||
|
- rubocop (1.30.1)
|
||||||
|
+ rubocop (1.38.0)
|
||||||
|
+ json (~> 2.3)
|
||||||
|
parallel (~> 1.10)
|
||||||
|
- parser (>= 3.1.0.0)
|
||||||
|
+ parser (>= 3.1.2.1)
|
||||||
|
rainbow (>= 2.2.2, < 4.0)
|
||||||
|
regexp_parser (>= 1.8, < 3.0)
|
||||||
|
rexml (>= 3.2.5, < 4.0)
|
||||||
|
- rubocop-ast (>= 1.18.0, < 2.0)
|
||||||
|
+ rubocop-ast (>= 1.23.0, < 2.0)
|
||||||
|
ruby-progressbar (~> 1.7)
|
||||||
|
unicode-display_width (>= 1.4.0, < 3.0)
|
||||||
|
- rubocop-ast (1.18.0)
|
||||||
|
+ rubocop-ast (1.23.0)
|
||||||
|
parser (>= 3.1.1.0)
|
||||||
|
- rubocop-rails (2.15.0)
|
||||||
|
+ rubocop-rails (2.17.2)
|
||||||
|
activesupport (>= 4.2.0)
|
||||||
|
rack (>= 1.1)
|
||||||
|
- rubocop (>= 1.7.0, < 2.0)
|
||||||
|
+ rubocop (>= 1.33.0, < 2.0)
|
||||||
|
ruby-progressbar (1.11.0)
|
||||||
|
- ruby-saml (1.13.0)
|
||||||
|
+ ruby-saml (1.14.0)
|
||||||
|
nokogiri (>= 1.10.5)
|
||||||
|
rexml
|
||||||
|
ruby2_keywords (0.0.5)
|
||||||
|
@@ -609,8 +622,8 @@ GEM
|
||||||
|
activerecord (>= 4.0.0)
|
||||||
|
railties (>= 4.0.0)
|
||||||
|
semantic_range (3.0.0)
|
||||||
|
- sidekiq (6.5.7)
|
||||||
|
- connection_pool (>= 2.2.5)
|
||||||
|
+ sidekiq (6.5.8)
|
||||||
|
+ connection_pool (>= 2.2.5, < 3)
|
||||||
|
rack (~> 2.0)
|
||||||
|
redis (>= 4.5.0, < 5)
|
||||||
|
sidekiq-bulk (0.2.0)
|
||||||
|
@@ -635,7 +648,7 @@ GEM
|
||||||
|
simplecov-html (~> 0.11)
|
||||||
|
simplecov_json_formatter (~> 0.1)
|
||||||
|
simplecov-html (0.12.3)
|
||||||
|
- simplecov_json_formatter (0.1.2)
|
||||||
|
+ simplecov_json_formatter (0.1.4)
|
||||||
|
smart_properties (1.17.0)
|
||||||
|
sprockets (3.7.2)
|
||||||
|
concurrent-ruby (~> 1.0)
|
||||||
|
@@ -644,25 +657,26 @@ GEM
|
||||||
|
actionpack (>= 5.2)
|
||||||
|
activesupport (>= 5.2)
|
||||||
|
sprockets (>= 3.0.0)
|
||||||
|
- sshkit (1.21.2)
|
||||||
|
+ sshkit (1.21.3)
|
||||||
|
net-scp (>= 1.1.2)
|
||||||
|
net-ssh (>= 2.8.0)
|
||||||
|
stackprof (0.2.22)
|
||||||
|
statsd-ruby (1.5.0)
|
||||||
|
stoplight (3.0.0)
|
||||||
|
- strong_migrations (0.7.9)
|
||||||
|
- activerecord (>= 5)
|
||||||
|
+ strong_migrations (0.8.0)
|
||||||
|
+ activerecord (>= 5.2)
|
||||||
swd (1.3.0)
|
swd (1.3.0)
|
||||||
activesupport (>= 3)
|
activesupport (>= 3)
|
||||||
attr_required (>= 0.0.5)
|
attr_required (>= 0.0.5)
|
||||||
@@ -654,6 +673,7 @@ GEM
|
httpclient (>= 2.4)
|
||||||
|
- temple (0.8.2)
|
||||||
|
+ temple (0.9.1)
|
||||||
|
terminal-table (3.0.2)
|
||||||
|
unicode-display_width (>= 1.1.1, < 3)
|
||||||
|
terrapin (0.6.0)
|
||||||
climate_control (>= 0.0.3, < 1.0)
|
climate_control (>= 0.0.3, < 1.0)
|
||||||
thor (1.2.1)
|
thor (1.2.1)
|
||||||
tilt (2.0.10)
|
tilt (2.0.11)
|
||||||
+ timeout (0.3.0)
|
+ timeout (0.3.0)
|
||||||
tpm-key_attestation (0.9.0)
|
tpm-key_attestation (0.11.0)
|
||||||
bindata (~> 2.4)
|
bindata (~> 2.4)
|
||||||
openssl-signature_algorithm (~> 0.4.0)
|
openssl (> 2.0, < 3.1)
|
||||||
@@ -780,6 +800,7 @@ DEPENDENCIES
|
@@ -682,7 +696,7 @@ GEM
|
||||||
|
unf (~> 0.1.0)
|
||||||
|
tzinfo (2.0.5)
|
||||||
|
concurrent-ruby (~> 1.0)
|
||||||
|
- tzinfo-data (1.2022.4)
|
||||||
|
+ tzinfo-data (1.2022.6)
|
||||||
|
tzinfo (>= 1.0.0)
|
||||||
|
unf (0.1.4)
|
||||||
|
unf_ext
|
||||||
|
@@ -725,10 +739,10 @@ GEM
|
||||||
|
xorcist (1.1.3)
|
||||||
|
xpath (3.2.0)
|
||||||
|
nokogiri (~> 1.8)
|
||||||
|
- zeitwerk (2.6.0)
|
||||||
|
+ zeitwerk (2.6.5)
|
||||||
|
|
||||||
|
PLATFORMS
|
||||||
|
- ruby
|
||||||
|
+ x86_64-linux-musl
|
||||||
|
|
||||||
|
DEPENDENCIES
|
||||||
|
active_model_serializers (~> 0.10)
|
||||||
|
@@ -787,6 +801,7 @@ DEPENDENCIES
|
||||||
letter_opener_web (~> 2.0)
|
letter_opener_web (~> 2.0)
|
||||||
link_header (~> 0.0)
|
link_header (~> 0.0)
|
||||||
lograge (~> 0.12)
|
lograge (~> 0.12)
|
||||||
|
|
@ -99,16 +468,42 @@ index e12fdc237..a3c6298f7 100644
|
||||||
makara (~> 0.5)
|
makara (~> 0.5)
|
||||||
mario-redis-lock (~> 1.2)
|
mario-redis-lock (~> 1.2)
|
||||||
memory_profiler
|
memory_profiler
|
||||||
@@ -846,3 +867,9 @@ DEPENDENCIES
|
@@ -810,6 +825,7 @@ DEPENDENCIES
|
||||||
|
private_address_check (~> 0.5)
|
||||||
|
pry-byebug (~> 3.10)
|
||||||
|
pry-rails (~> 0.3)
|
||||||
|
+ psych (< 4)
|
||||||
|
puma (~> 5.6)
|
||||||
|
pundit (~> 2.2)
|
||||||
|
rack (~> 2.2.4)
|
||||||
|
@@ -854,3 +870,9 @@ DEPENDENCIES
|
||||||
webpacker (~> 5.4)
|
webpacker (~> 5.4)
|
||||||
webpush (~> 0.3)
|
webpush!
|
||||||
xorcist (~> 1.1)
|
xorcist (~> 1.1)
|
||||||
+
|
+
|
||||||
+RUBY VERSION
|
+RUBY VERSION
|
||||||
+ ruby 3.1.2p20
|
+ ruby 3.1.2p20
|
||||||
+
|
+
|
||||||
+BUNDLED WITH
|
+BUNDLED WITH
|
||||||
+ 2.3.14
|
+ 2.3.24
|
||||||
--
|
diff --git a/Gemfile.orig b/Gemfile
|
||||||
2.36.2
|
index 3489996..b2c91d3 100644
|
||||||
|
--- a/Gemfile.orig
|
||||||
|
+++ b/Gemfile
|
||||||
|
@@ -1,7 +1,7 @@
|
||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
source 'https://rubygems.org'
|
||||||
|
-ruby '>= 2.6.0', '< 3.1.0'
|
||||||
|
+ruby '>= 2.6.0', '< 3.2.0'
|
||||||
|
|
||||||
|
gem 'pkg-config', '~> 1.4'
|
||||||
|
gem 'rexml', '~> 3.2'
|
||||||
|
@@ -154,5 +154,7 @@ gem 'concurrent-ruby', require: false
|
||||||
|
gem 'connection_pool', require: false
|
||||||
|
|
||||||
|
gem 'xorcist', '~> 1.1'
|
||||||
|
+gem 'mail', '~> 2.8.0.rc1'
|
||||||
|
+gem 'psych', '< 4'
|
||||||
|
|
||||||
|
gem 'cocoon', '~> 1.2'
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,8 @@
|
||||||
# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
|
# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
|
||||||
|
|
||||||
pkgname=mastodon
|
pkgname=mastodon
|
||||||
pkgver=3.5.3
|
pkgver=4.0.0_rc2
|
||||||
|
_gittag=4.0.0rc2
|
||||||
pkgrel=0
|
pkgrel=0
|
||||||
pkgdesc="Self-hosted social media and network server based on ActivityPub and OStatus"
|
pkgdesc="Self-hosted social media and network server based on ActivityPub and OStatus"
|
||||||
arch="all"
|
arch="all"
|
||||||
|
|
@ -16,7 +17,6 @@ _ruby_duplicate="
|
||||||
ruby-erubi
|
ruby-erubi
|
||||||
ruby-ffi
|
ruby-ffi
|
||||||
ruby-i18n
|
ruby-i18n
|
||||||
ruby-mini_portile2
|
|
||||||
ruby-minitest
|
ruby-minitest
|
||||||
ruby-multi_json
|
ruby-multi_json
|
||||||
ruby-net-imap
|
ruby-net-imap
|
||||||
|
|
@ -58,7 +58,6 @@ makedepends="
|
||||||
icu-dev
|
icu-dev
|
||||||
libffi-dev
|
libffi-dev
|
||||||
libidn-dev
|
libidn-dev
|
||||||
libressl-dev
|
|
||||||
libxml2-dev
|
libxml2-dev
|
||||||
libxslt-dev
|
libxslt-dev
|
||||||
openssl-dev
|
openssl-dev
|
||||||
|
|
@ -71,18 +70,18 @@ makedepends="
|
||||||
"
|
"
|
||||||
install="
|
install="
|
||||||
$pkgname.pre-install
|
$pkgname.pre-install
|
||||||
$pkgname.post-install
|
|
||||||
$pkgname.post-upgrade
|
$pkgname.post-upgrade
|
||||||
"
|
"
|
||||||
source="
|
source="
|
||||||
mastodon-$pkgver.tar.gz::https://github.com/tootsuite/mastodon/archive/v$pkgver.tar.gz
|
mastodon-$_gittag.tar.gz::https://github.com/tootsuite/mastodon/archive/v$_gittag.tar.gz
|
||||||
mastodon-web.initd
|
mastodon-web.initd
|
||||||
mastodon-sidekiq.initd
|
mastodon-sidekiq.initd
|
||||||
mastodon-streaming.initd
|
mastodon-streaming.initd
|
||||||
0001-ruby-3.1-support.patch
|
0001-ruby-3.1-support.patch
|
||||||
"
|
"
|
||||||
subpackages="$pkgname-openrc"
|
subpackages="$pkgname-openrc"
|
||||||
options="!check !strip"
|
options="!check" # No test suite
|
||||||
|
builddir="$srcdir"/$pkgname-$_gittag
|
||||||
|
|
||||||
prepare() {
|
prepare() {
|
||||||
default_prepare
|
default_prepare
|
||||||
|
|
@ -92,14 +91,18 @@ prepare() {
|
||||||
|
|
||||||
# Allow use of higher Node versions
|
# Allow use of higher Node versions
|
||||||
sed -i 's/"node": .*"/"node": ">=14.15"/' package.json
|
sed -i 's/"node": .*"/"node": ">=14.15"/' package.json
|
||||||
|
|
||||||
|
mkdir -p "$srcdir"/gem-cache
|
||||||
}
|
}
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
|
pwd
|
||||||
bundle config build.nokogiri --use-system-libraries --with-iconv-lib=/usr/lib --with-iconv-include=/usr/include
|
bundle config build.nokogiri --use-system-libraries --with-iconv-lib=/usr/lib --with-iconv-include=/usr/include
|
||||||
bundle config set deployment 'true'
|
bundle config set deployment 'false'
|
||||||
bundle config set without 'development test'
|
bundle config set without 'development test'
|
||||||
bundle config set no-cache 'true'
|
bundle config set no-cache 'true'
|
||||||
bundle install -j"$(getconf _NPROCESSORS_ONLN)"
|
bundle install -j"$(getconf _NPROCESSORS_ONLN)"
|
||||||
|
export NODE_OPTIONS="--openssl-legacy-provider"
|
||||||
yarn install --pure-lockfile --ignore-engines
|
yarn install --pure-lockfile --ignore-engines
|
||||||
RAILS_ENV='production' OTP_SECRET=precompile_placeholder SECRET_KEY_BASE=precompile_placeholder bundle exec rails assets:precompile
|
RAILS_ENV='production' OTP_SECRET=precompile_placeholder SECRET_KEY_BASE=precompile_placeholder bundle exec rails assets:precompile
|
||||||
}
|
}
|
||||||
|
|
@ -127,9 +130,9 @@ package() {
|
||||||
rm -R "$pkgdir"/usr/share/webapps/mastodon/node_modules/*/prebuilds 2>&1 || true
|
rm -R "$pkgdir"/usr/share/webapps/mastodon/node_modules/*/prebuilds 2>&1 || true
|
||||||
}
|
}
|
||||||
sha512sums="
|
sha512sums="
|
||||||
9035184ead64b46f28630d8a5d57ae414b34a81604f7acb146ef56f7c76483fbb8892197e16a4a61bea0572ae2861f2f7a76912885bb8005f5bc64d3f62d8db1 mastodon-3.5.3.tar.gz
|
dcde85a48b08216cffe99a13f5bdc5908b24c539e4bd4259c6d63a710e2377414e708d9be9a0cd4754c1c6168a7140beabd40b093935ffba0417888dda44499c mastodon-4.0.0rc2.tar.gz
|
||||||
9e77061fbdebe90492398f8089a7d2612ff4b6e70b5462dd67330b66d9788cb0133eab38c372b1f27a7214aacdd9f7f70381d4ecc6e92c8c38d794404ae0f840 mastodon-web.initd
|
9e77061fbdebe90492398f8089a7d2612ff4b6e70b5462dd67330b66d9788cb0133eab38c372b1f27a7214aacdd9f7f70381d4ecc6e92c8c38d794404ae0f840 mastodon-web.initd
|
||||||
06ebff4b4f51e0c7122db9ed175958fbcadf7e25d1d33c4cfd43992865b1ba183dbe6b4c8c244575f30a45a72d7d4ea3d887c597060e9cf2203bb00ae1a7ac79 mastodon-sidekiq.initd
|
06ebff4b4f51e0c7122db9ed175958fbcadf7e25d1d33c4cfd43992865b1ba183dbe6b4c8c244575f30a45a72d7d4ea3d887c597060e9cf2203bb00ae1a7ac79 mastodon-sidekiq.initd
|
||||||
eb8af0188c49b3507f9eedf54baf9d848f11288ce475963bde70686a1e5ff8960d32560771479651597703728bf0c8663a7bd068ccd8d32b620eba442a9a8ff1 mastodon-streaming.initd
|
eb8af0188c49b3507f9eedf54baf9d848f11288ce475963bde70686a1e5ff8960d32560771479651597703728bf0c8663a7bd068ccd8d32b620eba442a9a8ff1 mastodon-streaming.initd
|
||||||
0172f8867cc730c4094fcf40c640d3235cad834280e1a731d5175825e33907806ed0d6f7cc44d188dde9ecbf0cf7b68d8d75078d2d083702d10a71ff4efed17b 0001-ruby-3.1-support.patch
|
6582b938342979268ef4226a13ac5605df66a69204507c62ff8b440b0f685998c3daeb8be02a05bc4ab48e17c157660071b7f3c5cb4257b967c371c6f7a8d3f1 0001-ruby-3.1-support.patch
|
||||||
"
|
"
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
addgroup -S -g 82 www-data 2>/dev/null
|
addgroup -S -g 82 www-data 2>/dev/null
|
||||||
adduser -S -D -H -h /var/lib/mastodon -s /sbin/nologin -G www-data -g Mastodon mastodon 2>/dev/null
|
adduser -S -D -H -h /var/lib/mastodon -s /sbin/nologin -g www-data -G mastodon mastodon 2>/dev/null
|
||||||
|
|
||||||
exit 0
|
exit 0
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue