47 lines
1.9 KiB
Diff
47 lines
1.9 KiB
Diff
|
From 905a52b12fd6e9ccab8b83f3def97c7d3a26ca2a Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
|
||
|
|
Date: Thu, 14 Jan 2021 17:54:33 +0100
|
||
|
|
Subject: [PATCH 1/2] Add WEBrick dependency
|
||
|
|
|
||
|
|
Because WEBrick was removed from Ruby 3.0.
|
||
|
|
---
|
||
|
|
Gemfile | 2 ++
|
||
|
|
1 file changed, 2 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/usr/share/gems/gems/typhoeus-1.0.2/Gemfile b/usr/share/gems/gems/typhoeus-1.0.2/Gemfile
|
||
|
|
index dd662d70..d11359b0 100644
|
||
|
|
--- a/usr/share/gems/gems/typhoeus-1.4.0/Gemfile 2022-02-22 17:24:27.241061703 +0800
|
||
|
|
+++ b/usr/share/gems/gems/typhoeus-1.4.0/Gemfile 2022-02-22 17:24:04.860685270 +0800
|
||
|
|
@@ -14,6 +14,8 @@ group :development, :test do
|
||
|
|
|
||
|
|
gem "sinatra", "~> 1.3"
|
||
|
|
|
||
|
|
+ gem "webrick"
|
||
|
|
+
|
||
|
|
if Gem.ruby_version >= Gem::Version.new("1.9.0")
|
||
|
|
gem "faraday", ">= 0.9"
|
||
|
|
gem "dalli", "~> 2.0"
|
||
|
|
|
||
|
|
From 6515d6a23990b7a63acc90e97f5d76129a2b8987 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
|
||
|
|
Date: Thu, 14 Jan 2021 18:06:55 +0100
|
||
|
|
Subject: [PATCH 2/2] Fix Ruby 3.0 compatibility.
|
||
|
|
|
||
|
|
---
|
||
|
|
spec/support/localhost_server.rb | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/usr/share/gems/gems/typhoeus-1.4.0/spec/support/localhost_server.rb b/usr/share/gems/gems/typhoeus-1.4.0/spec/support/localhost_server.rb
|
||
|
|
index c5a7508b..da096005 100644
|
||
|
|
--- a/usr/share/gems/gems/typhoeus-1.4.0/spec/support/localhost_server.rb 2022-02-22 17:24:27.269062174 +0800
|
||
|
|
+++ b/usr/share/gems/gems/typhoeus-1.4.0/spec/support/localhost_server.rb 2022-02-22 17:22:37.167210286 +0800
|
||
|
|
@@ -43,7 +43,7 @@ def boot
|
||
|
|
# Use WEBrick since it's part of the ruby standard library and is available on all ruby interpreters.
|
||
|
|
options = { :Port => port }
|
||
|
|
options.merge!(:AccessLog => [], :Logger => WEBrick::BasicLog.new(StringIO.new)) unless ENV['VERBOSE_SERVER']
|
||
|
|
- Rack::Handler::WEBrick.run(Identify.new(@rack_app), options)
|
||
|
|
+ Rack::Handler::WEBrick.run(Identify.new(@rack_app), **options)
|
||
|
|
end
|
||
|
|
|
||
|
|
def booted?
|