ayaports/user/gitlab-foss/openssl3-compat.patch

45 lines
1.2 KiB
Diff

diff --git a/Gemfile.lock.orig b/Gemfile.lock
index 1f1f566..39af9ce 100644
--- a/Gemfile.lock.orig
+++ b/Gemfile.lock
@@ -1070,8 +1070,7 @@ GEM
validate_email
validate_url
webfinger (>= 1.0.1)
- openssl (2.2.2)
- ipaddr
+ openssl (3.1.0)
openssl-signature_algorithm (1.3.0)
openssl (> 2.0)
opentracing (0.5.0)
@@ -1826,7 +1825,7 @@ DEPENDENCIES
omniauth_crowd (~> 2.4.0)!
omniauth_openid_connect (~> 0.6.1)
openid_connect (= 1.3.0)
- openssl (= 2.2.2)
+ openssl (~> 3.0)
org-ruby (~> 0.9.12)
pact (~> 1.63)
parallel (~> 1.19)
@@ -1936,4 +1935,4 @@ DEPENDENCIES
yajl-ruby (~> 1.4.3)
BUNDLED WITH
- 2.4.8
+ 2.3.26
diff --git a/Gemfile.orig b/Gemfile
index 8cafe3b..b27f9f0 100644
--- a/Gemfile.orig
+++ b/Gemfile
@@ -17,9 +17,8 @@ gem 'rails', '~> 6.1.7.2'
gem 'bootsnap', '~> 1.16.0', require: false
-# Pin openssl to match the version bundled with our supported Rubies.
-# See https://stdgems.org/openssl/#gem-version.
-gem 'openssl', '2.2.2'
+gem 'openssl', '~> 3.0'
+
# This gem was originally bundled with Ruby 2.7, but is unbundled as of Ruby 3.
# Since the latest version caused problems with GitLab, we pin this to an older
# version for now.