diff --git a/.gitignore b/.gitignore
index 7c1a682..a24978b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-SOURCES/ruby-2.7.1.tar.xz
+SOURCES/ruby-2.7.4.tar.xz
+SOURCES/ruby-rubygems-bundler-v2.2.24.txz
diff --git a/.ruby.metadata b/.ruby.metadata
index 4293e65..9907499 100644
--- a/.ruby.metadata
+++ b/.ruby.metadata
@@ -1 +1,2 @@
-6c92300d7fd3e9cbb433e5e687535dc5300848eb SOURCES/ruby-2.7.1.tar.xz
+6e044d835f9f432cfa9441241c1ef66e3d607cbf SOURCES/ruby-2.7.4.tar.xz
+da17623116cb189baeb3251f828d679e5570a938 SOURCES/ruby-rubygems-bundler-v2.2.24.txz
diff --git a/SOURCES/ruby-2.1.0-Enable-configuration-of-archlibdir.patch b/SOURCES/ruby-2.1.0-Enable-configuration-of-archlibdir.patch
index 6352db3..77b20ef 100644
--- a/SOURCES/ruby-2.1.0-Enable-configuration-of-archlibdir.patch
+++ b/SOURCES/ruby-2.1.0-Enable-configuration-of-archlibdir.patch
@@ -11,7 +11,7 @@ diff --git a/configure.ac b/configure.ac
 index d261ea57b5..3c13076b82 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3102,6 +3102,11 @@ AS_IF([test ${multiarch+set}], [
+@@ -3121,6 +3121,11 @@ AS_IF([test ${multiarch+set}], [
  ])
  
  archlibdir='${libdir}/${arch}'
diff --git a/SOURCES/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch b/SOURCES/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch
index d48f74e..a79aa25 100644
--- a/SOURCES/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch
+++ b/SOURCES/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch
@@ -14,7 +14,7 @@ diff --git a/configure.ac b/configure.ac
 index c42436c23d..d261ea57b5 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3740,7 +3740,8 @@ AS_CASE(["$ruby_version_dir_name"],
+@@ -3759,7 +3759,8 @@ AS_CASE(["$ruby_version_dir_name"],
  ruby_version_dir=/'${ruby_version_dir_name}'
  
  if test -z "${ruby_version_dir_name}"; then
diff --git a/SOURCES/ruby-2.1.0-always-use-i386.patch b/SOURCES/ruby-2.1.0-always-use-i386.patch
index d156a73..a5a4011 100644
--- a/SOURCES/ruby-2.1.0-always-use-i386.patch
+++ b/SOURCES/ruby-2.1.0-always-use-i386.patch
@@ -11,7 +11,7 @@ diff --git a/configure.ac b/configure.ac
 index 3c13076b82..93af30321d 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3804,6 +3804,8 @@ AC_SUBST(vendorarchdir)dnl
+@@ -3823,6 +3823,8 @@ AC_SUBST(vendorarchdir)dnl
  AC_SUBST(CONFIGURE, "`echo $0 | sed 's|.*/||'`")dnl
  AC_SUBST(configure_args, "`echo "${ac_configure_args}" | sed 's/\\$/$$/g'`")dnl
  
diff --git a/SOURCES/ruby-2.1.0-custom-rubygems-location.patch b/SOURCES/ruby-2.1.0-custom-rubygems-location.patch
index c256708..ddfe9a5 100644
--- a/SOURCES/ruby-2.1.0-custom-rubygems-location.patch
+++ b/SOURCES/ruby-2.1.0-custom-rubygems-location.patch
@@ -15,7 +15,7 @@ diff --git a/configure.ac b/configure.ac
 index 93af30321d..bc13397e0e 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3776,6 +3776,10 @@ AC_ARG_WITH(vendorarchdir,
+@@ -3795,6 +3795,10 @@ AC_ARG_WITH(vendorarchdir,
              [vendorarchdir=$withval],
              [vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby'${ruby_version_dir}}${multiarch-'${vendorlibdir}/${sitearch}'}])
  
@@ -26,7 +26,7 @@ index 93af30321d..bc13397e0e 100644
  AS_IF([test "${LOAD_RELATIVE+set}"], [
      AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
      RUBY_EXEC_PREFIX=''
-@@ -3800,6 +3804,7 @@ AC_SUBST(sitearchdir)dnl
+@@ -3819,6 +3823,7 @@ AC_SUBST(sitearchdir)dnl
  AC_SUBST(vendordir)dnl
  AC_SUBST(vendorlibdir)dnl
  AC_SUBST(vendorarchdir)dnl
diff --git a/SOURCES/ruby-2.3.0-ruby_version.patch b/SOURCES/ruby-2.3.0-ruby_version.patch
index bf51605..a5865ce 100644
--- a/SOURCES/ruby-2.3.0-ruby_version.patch
+++ b/SOURCES/ruby-2.3.0-ruby_version.patch
@@ -20,7 +20,7 @@ diff --git a/configure.ac b/configure.ac
 index 80b137e380..63cd3b4f8b 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3691,9 +3691,6 @@ AS_CASE(["$target_os"],
+@@ -3710,9 +3710,6 @@ AS_CASE(["$target_os"],
      rubyw_install_name='$(RUBYW_INSTALL_NAME)'
      ])
  
@@ -30,7 +30,7 @@ index 80b137e380..63cd3b4f8b 100644
  rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'}
  AC_ARG_WITH(rubyarchprefix,
  	    AS_HELP_STRING([--with-rubyarchprefix=DIR],
-@@ -3716,56 +3713,62 @@ AC_ARG_WITH(ridir,
+@@ -3735,56 +3732,62 @@ AC_ARG_WITH(ridir,
  AC_SUBST(ridir)
  AC_SUBST(RI_BASE_NAME)
  
@@ -120,7 +120,7 @@ index 80b137e380..63cd3b4f8b 100644
  
  AS_IF([test "${LOAD_RELATIVE+set}"], [
      AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
-@@ -3782,6 +3785,7 @@ AC_SUBST(sitearchincludedir)dnl
+@@ -3801,6 +3804,7 @@ AC_SUBST(sitearchincludedir)dnl
  AC_SUBST(arch)dnl
  AC_SUBST(sitearch)dnl
  AC_SUBST(ruby_version)dnl
@@ -237,7 +237,7 @@ diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb
 index b25068405d..e9fef4a311 100644
 --- a/test/rubygems/test_gem.rb
 +++ b/test/rubygems/test_gem.rb
-@@ -1353,7 +1353,8 @@ def test_self_use_paths
+@@ -1378,7 +1378,8 @@ def test_self_use_paths
  
    def test_self_user_dir
      parts = [@userhome, '.gem', Gem.ruby_engine]
@@ -247,7 +247,7 @@ index b25068405d..e9fef4a311 100644
  
      assert_equal File.join(parts), Gem.user_dir
    end
-@@ -1429,7 +1430,7 @@ def test_self_vendor_dir
+@@ -1454,7 +1455,7 @@ def test_self_vendor_dir
      vendordir(File.join(@tempdir, 'vendor')) do
        expected =
          File.join RbConfig::CONFIG['vendordir'], 'gems',
diff --git a/SOURCES/ruby-2.3.1-Rely-on-ldd-to-detect-glibc.patch b/SOURCES/ruby-2.3.1-Rely-on-ldd-to-detect-glibc.patch
index 4d81a84..9718d6e 100644
--- a/SOURCES/ruby-2.3.1-Rely-on-ldd-to-detect-glibc.patch
+++ b/SOURCES/ruby-2.3.1-Rely-on-ldd-to-detect-glibc.patch
@@ -8,14 +8,14 @@ on Red Hat platforms.
 
 This workaround rhbz#1361037
 ---
- test/fiddle/helper.rb | 105 ------------------------------------------
- 1 file changed, 105 deletions(-)
+ test/fiddle/helper.rb | 111 ------------------------------------------
+ 1 file changed, 111 deletions(-)
 
 diff --git a/test/fiddle/helper.rb b/test/fiddle/helper.rb
 index 1da3d93..65148a1 100644
 --- a/test/fiddle/helper.rb
 +++ b/test/fiddle/helper.rb
-@@ -6,111 +6,6 @@
+@@ -6,115 +6,6 @@
  
  libc_so = libm_so = nil
  
@@ -56,8 +56,7 @@ index 1da3d93..65148a1 100644
 -  crtname = RbConfig::CONFIG["RUBY_SO_NAME"][/msvc\w+/] || 'ucrtbase'
 -  libc_so = libm_so = "#{crtname}.dll"
 -when /darwin/
--  libc_so = "/usr/lib/libc.dylib"
--  libm_so = "/usr/lib/libm.dylib"
+-  libc_so = libm_so = "/usr/lib/libSystem.B.dylib"
 -when /kfreebsd/
 -  libc_so = "/lib/libc.so.0.1"
 -  libm_so = "/lib/libm.so.1"
@@ -124,6 +123,11 @@ index 1da3d93..65148a1 100644
 -libc_so = nil if !libc_so || (libc_so[0] == ?/ && !File.file?(libc_so))
 -libm_so = nil if !libm_so || (libm_so[0] == ?/ && !File.file?(libm_so))
 -
+-# macOS 11.0+ removed libSystem.B.dylib from /usr/lib. But It works with dlopen.
+-if RUBY_PLATFORM =~ /darwin/
+-  libc_so = libm_so = "/usr/lib/libSystem.B.dylib"
+-end
+-
  if !libc_so || !libm_so
    ruby = EnvUtil.rubybin
    # When the ruby binary is 32-bit and the host is 64-bit,
diff --git a/SOURCES/ruby-2.6.0-config-support-include-directive.patch b/SOURCES/ruby-2.6.0-config-support-include-directive.patch
deleted file mode 100644
index 5b2024b..0000000
--- a/SOURCES/ruby-2.6.0-config-support-include-directive.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-From f46bac1f3e8634e24c747d06b28e11b874f1e488 Mon Sep 17 00:00:00 2001
-From: Kazuki Yamaguchi <k@rhe.jp>
-Date: Thu, 16 Aug 2018 19:40:48 +0900
-Subject: [PATCH] config: support .include directive
-
-OpenSSL 1.1.1 introduces a new '.include' directive. Update our config
-parser to support that.
-
-As mentioned in the referenced GitHub issue, we should use the OpenSSL
-API instead of implementing the parsing logic ourselves, but it will
-need backwards-incompatible changes which we can't backport to stable
-versions. So continue to use the Ruby implementation for now.
-
-Reference: https://github.com/ruby/openssl/issues/208
----
- ext/openssl/lib/openssl/config.rb | 54 ++++++++++++++++++++-----------
- test/openssl/test_config.rb       | 54 +++++++++++++++++++++++++++++++
- 2 files changed, 90 insertions(+), 18 deletions(-)
-
-diff --git a/ext/openssl/lib/openssl/config.rb b/ext/openssl/lib/openssl/config.rb
-index 88225451..ba3a54c8 100644
---- a/ext/openssl/lib/openssl/config.rb
-+++ b/ext/openssl/lib/openssl/config.rb
-@@ -77,29 +77,44 @@ def get_key_string(data, section, key) # :nodoc:
-       def parse_config_lines(io)
-         section = 'default'
-         data = {section => {}}
--        while definition = get_definition(io)
-+        io_stack = [io]
-+        while definition = get_definition(io_stack)
-           definition = clear_comments(definition)
-           next if definition.empty?
--          if definition[0] == ?[
-+          case definition
-+          when /\A\[/
-             if /\[([^\]]*)\]/ =~ definition
-               section = $1.strip
-               data[section] ||= {}
-             else
-               raise ConfigError, "missing close square bracket"
-             end
--          else
--            if /\A([^:\s]*)(?:::([^:\s]*))?\s*=(.*)\z/ =~ definition
--              if $2
--                section = $1
--                key = $2
--              else
--                key = $1
-+          when /\A\.include (\s*=\s*)?(.+)\z/
-+            path = $2
-+            if File.directory?(path)
-+              files = Dir.glob(File.join(path, "*.{cnf,conf}"), File::FNM_EXTGLOB)
-+            else
-+              files = [path]
-+            end
-+
-+            files.each do |filename|
-+              begin
-+                io_stack << StringIO.new(File.read(filename))
-+              rescue
-+                raise ConfigError, "could not include file '%s'" % filename
-               end
--              value = unescape_value(data, section, $3)
--              (data[section] ||= {})[key] = value.strip
-+            end
-+          when /\A([^:\s]*)(?:::([^:\s]*))?\s*=(.*)\z/
-+            if $2
-+              section = $1
-+              key = $2
-             else
--              raise ConfigError, "missing equal sign"
-+              key = $1
-             end
-+            value = unescape_value(data, section, $3)
-+            (data[section] ||= {})[key] = value.strip
-+          else
-+            raise ConfigError, "missing equal sign"
-           end
-         end
-         data
-@@ -212,10 +227,10 @@ def clear_comments(line)
-         scanned.join
-       end
- 
--      def get_definition(io)
--        if line = get_line(io)
-+      def get_definition(io_stack)
-+        if line = get_line(io_stack)
-           while /[^\\]\\\z/ =~ line
--            if extra = get_line(io)
-+            if extra = get_line(io_stack)
-               line += extra
-             else
-               break
-@@ -225,9 +240,12 @@ def get_definition(io)
-         end
-       end
- 
--      def get_line(io)
--        if line = io.gets
--          line.gsub(/[\r\n]*/, '')
-+      def get_line(io_stack)
-+        while io = io_stack.last
-+          if line = io.gets
-+            return line.gsub(/[\r\n]*/, '')
-+          end
-+          io_stack.pop
-         end
-       end
-     end
-diff --git a/test/openssl/test_config.rb b/test/openssl/test_config.rb
-index 99dcc497..5653b5d0 100644
---- a/test/openssl/test_config.rb
-+++ b/test/openssl/test_config.rb
-@@ -120,6 +120,49 @@ def test_s_parse_format
-     assert_equal("error in line 7: missing close square bracket", excn.message)
-   end
- 
-+  def test_s_parse_include
-+    in_tmpdir("ossl-config-include-test") do |dir|
-+      Dir.mkdir("child")
-+      File.write("child/a.conf", <<~__EOC__)
-+        [default]
-+        file-a = a.conf
-+        [sec-a]
-+        a = 123
-+      __EOC__
-+      File.write("child/b.cnf", <<~__EOC__)
-+        [default]
-+        file-b = b.cnf
-+        [sec-b]
-+        b = 123
-+      __EOC__
-+      File.write("include-child.conf", <<~__EOC__)
-+        key_outside_section = value_a
-+        .include child
-+      __EOC__
-+
-+      include_file = <<~__EOC__
-+        [default]
-+        file-main = unnamed
-+        [sec-main]
-+        main = 123
-+        .include = include-child.conf
-+      __EOC__
-+
-+      # Include a file by relative path
-+      c1 = OpenSSL::Config.parse(include_file)
-+      assert_equal(["default", "sec-a", "sec-b", "sec-main"], c1.sections.sort)
-+      assert_equal(["file-main", "file-a", "file-b"], c1["default"].keys)
-+      assert_equal({"a" => "123"}, c1["sec-a"])
-+      assert_equal({"b" => "123"}, c1["sec-b"])
-+      assert_equal({"main" => "123", "key_outside_section" => "value_a"}, c1["sec-main"])
-+
-+      # Relative paths are from the working directory
-+      assert_raise(OpenSSL::ConfigError) do
-+        Dir.chdir("child") { OpenSSL::Config.parse(include_file) }
-+      end
-+    end
-+  end
-+
-   def test_s_load
-     # alias of new
-     c = OpenSSL::Config.load
-@@ -299,6 +342,17 @@ def test_clone
-     @it['newsection'] = {'a' => 'b'}
-     assert_not_equal(@it.sections.sort, c.sections.sort)
-   end
-+
-+  private
-+
-+  def in_tmpdir(*args)
-+    Dir.mktmpdir(*args) do |dir|
-+      dir = File.realpath(dir)
-+      Dir.chdir(dir) do
-+        yield dir
-+      end
-+    end
-+  end
- end
- 
- end
diff --git a/SOURCES/ruby-2.7.0-Initialize-ABRT-hook.patch b/SOURCES/ruby-2.7.0-Initialize-ABRT-hook.patch
index 58c92cf..5dd2654 100644
--- a/SOURCES/ruby-2.7.0-Initialize-ABRT-hook.patch
+++ b/SOURCES/ruby-2.7.0-Initialize-ABRT-hook.patch
@@ -57,7 +57,7 @@ diff --git a/ruby.c b/ruby.c
 index 60c57d6259..1eec16f2c8 100644
 --- a/ruby.c
 +++ b/ruby.c
-@@ -1439,10 +1439,14 @@ proc_options(long argc, char **argv, ruby_cmdline_options_t *opt, int envopt)
+@@ -1451,10 +1451,14 @@ proc_options(long argc, char **argv, ruby_cmdline_options_t *opt, int envopt)
  
  void Init_builtin_features(void);
  
diff --git a/SOURCES/ruby-2.7.0-Remove-RubyGems-dependency.patch b/SOURCES/ruby-2.7.0-Remove-RubyGems-dependency.patch
deleted file mode 100644
index 4166900..0000000
--- a/SOURCES/ruby-2.7.0-Remove-RubyGems-dependency.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 6532dbecf36d1f24dab1f2143afd171e0b7699eb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
-Date: Wed, 4 Sep 2019 15:07:07 +0200
-Subject: [PATCH] Remove RubyGems dependency.
-
-Since `Process::RLIMIT_NOFILE` is platform specific, better to use Ruby
-introspection than detecting platform.
----
- .../vendor/net-http-persistent/lib/net/http/persistent.rb   | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb b/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb
-index a54be2a..06739f1 100644
---- a/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb
-+++ b/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb
-@@ -197,10 +197,10 @@ class Bundler::Persistent::Net::HTTP::Persistent
-   ##
-   # The default connection pool size is 1/4 the allowed open files.
- 
--  if Gem.win_platform? then
--    DEFAULT_POOL_SIZE = 256
--  else
-+  if Process.const_defined? :RLIMIT_NOFILE
-     DEFAULT_POOL_SIZE = Process.getrlimit(Process::RLIMIT_NOFILE).first / 4
-+  else
-+    DEFAULT_POOL_SIZE = 256
-   end
- 
-   ##
--- 
-2.23.0
-
diff --git a/SOURCES/ruby-2.7.1-Timeout-the-test_bug_reporter_add-witout-raising-err.patch b/SOURCES/ruby-2.7.1-Timeout-the-test_bug_reporter_add-witout-raising-err.patch
new file mode 100644
index 0000000..81384ba
--- /dev/null
+++ b/SOURCES/ruby-2.7.1-Timeout-the-test_bug_reporter_add-witout-raising-err.patch
@@ -0,0 +1,34 @@
+From 9b42fce32bff25e0569581f76f532b9d57865aef Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
+Date: Mon, 27 Jul 2020 14:56:05 +0200
+Subject: [PATCH] Timeout the test_bug_reporter_add witout raising error.
+
+While timeouting the threads might be still good idea, it does not seems
+the timeout impacts the TestBugReporter#test_bug_reporter_add result,
+because the output of the child process has been already collected
+earlier.
+
+It seems that when the system is under heavy load, the thread might not
+be sheduled to finish its processing. Even finishing the child process
+might take tens of seconds and therefore the test case finish might take
+a while.
+---
+ test/-ext-/bug_reporter/test_bug_reporter.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/-ext-/bug_reporter/test_bug_reporter.rb b/test/-ext-/bug_reporter/test_bug_reporter.rb
+index 628fcd0340..2c677cc8a7 100644
+--- a/test/-ext-/bug_reporter/test_bug_reporter.rb
++++ b/test/-ext-/bug_reporter/test_bug_reporter.rb
+@@ -19,7 +19,7 @@ def test_bug_reporter_add
+     args = ["--disable-gems", "-r-test-/bug_reporter",
+             "-C", tmpdir]
+     stdin = "register_sample_bug_reporter(12345); Process.kill :SEGV, $$"
+-    assert_in_out_err(args, stdin, [], expected_stderr, encoding: "ASCII-8BIT")
++    assert_in_out_err(args, stdin, [], expected_stderr, encoding: "ASCII-8BIT", timeout_error: nil)
+   ensure
+     FileUtils.rm_rf(tmpdir) if tmpdir
+   end
+-- 
+2.27.0
+
diff --git a/SOURCES/ruby-2.8.0-Brace-the-fact-that-lchmod-can-EOPNOTSUPP.patch b/SOURCES/ruby-2.8.0-Brace-the-fact-that-lchmod-can-EOPNOTSUPP.patch
deleted file mode 100644
index 1e09843..0000000
--- a/SOURCES/ruby-2.8.0-Brace-the-fact-that-lchmod-can-EOPNOTSUPP.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From a19228f878d955eaf2cce086bcf53f46fdf894b9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?=
- <shyouhei@ruby-lang.org>
-Date: Thu, 23 Jan 2020 15:33:42 +0900
-Subject: [PATCH] brace the fact that lchmod(2) can EOPNOTSUPP
-
-Musl libc has this function as a tiny wrapper of fchmodat(3posix).  On
-the other hand Linux kernel does not support changing modes of a symlink.
-The operation always fails with EOPNOTSUPP.  This fchmodat behaviour is
-defined in POSIX.  We have to take care of such exceptions.
----
- lib/fileutils.rb               |  3 ++-
- test/pathname/test_pathname.rb |  2 +-
- test/ruby/test_notimp.rb       | 19 ++++++++++++-------
- 3 files changed, 15 insertions(+), 9 deletions(-)
-
-diff --git a/lib/fileutils.rb b/lib/fileutils.rb
-index a7ad65ae5e98..04788e26ca9c 100644
---- a/lib/fileutils.rb
-+++ b/lib/fileutils.rb
-@@ -1345,6 +1345,7 @@ def chmod(mode)
-       else
-         File.chmod mode, path()
-       end
-+    rescue Errno::EOPNOTSUPP
-     end
- 
-     def chown(uid, gid)
-@@ -1439,7 +1440,7 @@ def copy_metadata(path)
-       if st.symlink?
-         begin
-           File.lchmod mode, path
--        rescue NotImplementedError
-+        rescue NotImplementedError, Errno::EOPNOTSUPP
-         end
-       else
-         File.chmod mode, path
-diff --git a/test/pathname/test_pathname.rb b/test/pathname/test_pathname.rb
-index 792510bdfb2d..2ce32a6c1208 100644
---- a/test/pathname/test_pathname.rb
-+++ b/test/pathname/test_pathname.rb
-@@ -818,7 +818,7 @@ def test_lchmod
-       old = path.lstat.mode
-       begin
-         path.lchmod(0444)
--      rescue NotImplementedError
-+      rescue NotImplementedError, Errno::EOPNOTSUPP
-         next
-       end
-       assert_equal(0444, path.lstat.mode & 0777)
-diff --git a/test/ruby/test_notimp.rb b/test/ruby/test_notimp.rb
-index b069154cfc3f..e13db692b50d 100644
---- a/test/ruby/test_notimp.rb
-+++ b/test/ruby/test_notimp.rb
-@@ -13,11 +13,11 @@ def test_respond_to_fork
- 
-   def test_respond_to_lchmod
-     assert_include(File.methods, :lchmod)
--    if /linux/ =~ RUBY_PLATFORM
--      assert_equal(false, File.respond_to?(:lchmod))
--    end
--    if /freebsd/ =~ RUBY_PLATFORM
-+    case RUBY_PLATFORM
-+    when /freebsd/, /linux-musl/
-       assert_equal(true, File.respond_to?(:lchmod))
-+    when /linux/
-+      assert_equal(false, File.respond_to?(:lchmod))
-     end
-   end
- 
-@@ -57,9 +57,14 @@ def test_call_lchmod
-         File.open(f, "w") {}
-         File.symlink f, g
-         newmode = 0444
--        File.lchmod newmode, "#{d}/g"
--        snew = File.lstat(g)
--        assert_equal(newmode, snew.mode & 0777)
-+        begin
-+          File.lchmod newmode, "#{d}/g"
-+        rescue Errno::EOPNOTSUPP
-+          skip $!
-+        else
-+          snew = File.lstat(g)
-+          assert_equal(newmode, snew.mode & 0777)
-+        end
-       }
-     end
-   end
diff --git a/SOURCES/ruby-2.8.0-Moved-not-implemented-method-tests.patch b/SOURCES/ruby-2.8.0-Moved-not-implemented-method-tests.patch
deleted file mode 100644
index ffc8c52..0000000
--- a/SOURCES/ruby-2.8.0-Moved-not-implemented-method-tests.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From 72c02aa4b79731c7f25c9267f74b347f1946c704 Mon Sep 17 00:00:00 2001
-From: Nobuyoshi Nakada <nobu@ruby-lang.org>
-Date: Fri, 28 Feb 2020 21:15:37 +0900
-Subject: [PATCH] Moved not-implemented method tests [Bug #16662]
-
-Test not-implemented method with the dedicated methods, instead of
-platform dependent features.
----
- test/-ext-/test_notimplement.rb |  7 +++
- test/ruby/test_notimp.rb        | 90 ---------------------------------
- 2 files changed, 7 insertions(+), 90 deletions(-)
- delete mode 100644 test/ruby/test_notimp.rb
-
-diff --git a/test/-ext-/test_notimplement.rb b/test/-ext-/test_notimplement.rb
-index 92a2fd22b8d6..038b507b7312 100644
---- a/test/-ext-/test_notimplement.rb
-+++ b/test/-ext-/test_notimplement.rb
-@@ -13,10 +13,17 @@ def test_funcall_notimplement
-   end
- 
-   def test_respond_to
-+    assert_include(Bug.methods(false), :notimplement)
-+    assert_include(Bug::NotImplement.instance_methods(false), :notimplement)
-     assert_not_respond_to(Bug, :notimplement)
-     assert_not_respond_to(Bug::NotImplement.new, :notimplement)
-   end
- 
-+  def test_method_inspect_notimplement
-+    assert_match(/not-implemented/, Bug.method(:notimplement).inspect)
-+    assert_match(/not-implemented/, Bug::NotImplement.instance_method(:notimplement).inspect)
-+  end
-+
-   def test_not_method_defined
-     assert !Bug::NotImplement.method_defined?(:notimplement)
-     assert !Bug::NotImplement.method_defined?(:notimplement, true)
-diff --git a/test/ruby/test_notimp.rb b/test/ruby/test_notimp.rb
-deleted file mode 100644
-index e13db692b50d..000000000000
---- a/test/ruby/test_notimp.rb
-+++ /dev/null
-@@ -1,90 +0,0 @@
--# frozen_string_literal: false
--require 'test/unit'
--require 'timeout'
--require 'tmpdir'
--
--class TestNotImplement < Test::Unit::TestCase
--  def test_respond_to_fork
--    assert_include(Process.methods, :fork)
--    if /linux/ =~ RUBY_PLATFORM
--      assert_equal(true, Process.respond_to?(:fork))
--    end
--  end
--
--  def test_respond_to_lchmod
--    assert_include(File.methods, :lchmod)
--    case RUBY_PLATFORM
--    when /freebsd/, /linux-musl/
--      assert_equal(true, File.respond_to?(:lchmod))
--    when /linux/
--      assert_equal(false, File.respond_to?(:lchmod))
--    end
--  end
--
--  def test_call_fork
--    GC.start
--    pid = nil
--    ps =
--      case RUBY_PLATFORM
--      when /linux/ # assume Linux Distribution uses procps
--        proc {`ps -eLf #{pid}`}
--      when /freebsd/
--        proc {`ps -lH #{pid}`}
--      when /darwin/
--        proc {`ps -lM #{pid}`}
--      else
--        proc {`ps -l #{pid}`}
--      end
--    assert_nothing_raised(Timeout::Error, ps) do
--      EnvUtil.timeout(20) {
--        pid = fork {}
--        Process.wait pid
--        pid = nil
--      }
--    end
--  ensure
--    if pid
--      Process.kill(:KILL, pid)
--      Process.wait pid
--    end
--  end if Process.respond_to?(:fork)
--
--  def test_call_lchmod
--    if File.respond_to?(:lchmod)
--      Dir.mktmpdir {|d|
--        f = "#{d}/f"
--        g = "#{d}/g"
--        File.open(f, "w") {}
--        File.symlink f, g
--        newmode = 0444
--        begin
--          File.lchmod newmode, "#{d}/g"
--        rescue Errno::EOPNOTSUPP
--          skip $!
--        else
--          snew = File.lstat(g)
--          assert_equal(newmode, snew.mode & 0777)
--        end
--      }
--    end
--  end
--
--  def test_method_inspect_fork
--    m = Process.method(:fork)
--    if Process.respond_to?(:fork)
--      assert_not_match(/not-implemented/, m.inspect)
--    else
--      assert_match(/not-implemented/, m.inspect)
--    end
--  end
--
--  def test_method_inspect_lchmod
--    m = File.method(:lchmod)
--    if File.respond_to?(:lchmod)
--      assert_not_match(/not-implemented/, m.inspect)
--    else
--      assert_match(/not-implemented/, m.inspect)
--    end
--  end
--
--end
diff --git a/SOURCES/ruby-3.0.0-Convert-ip-addresses-to-canonical-form.patch b/SOURCES/ruby-3.0.0-Convert-ip-addresses-to-canonical-form.patch
new file mode 100644
index 0000000..7dd8138
--- /dev/null
+++ b/SOURCES/ruby-3.0.0-Convert-ip-addresses-to-canonical-form.patch
@@ -0,0 +1,26 @@
+From 2becb920e431110c4afc4fa069b051c5940c2096 Mon Sep 17 00:00:00 2001
+From: Jeremy Evans <code@jeremyevans.net>
+Date: Fri, 29 May 2020 14:13:30 -0700
+Subject: [PATCH] Convert ip addresses to canonical form in
+ Resolv::DNS::Requester::UnconnectedUDP#sender
+
+Otherwise, if the IP address given is not in canonical form, it
+won't match, and Resolv will ignore it.
+
+Fixes [Bug #16439]
+---
+ lib/resolv.rb | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/resolv.rb b/lib/resolv.rb
+index e7b45e785a85..d78531e174fd 100644
+--- a/lib/resolv.rb
++++ b/lib/resolv.rb
+@@ -767,6 +767,7 @@ def recv_reply(readable_socks)
+         end
+ 
+         def sender(msg, data, host, port=Port)
++          host = Addrinfo.ip(host).ip_address
+           lazy_initialize
+           sock = @socks_hash[host.index(':') ? "::" : "0.0.0.0"]
+           return nil if !sock
diff --git a/SOURCES/rubygems-3.1.3-Fix-I-require-priority.patch b/SOURCES/rubygems-3.1.3-Fix-I-require-priority.patch
deleted file mode 100644
index 6ed2f76..0000000
--- a/SOURCES/rubygems-3.1.3-Fix-I-require-priority.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-From 912d141a351053d0f6d915b5e7807f6a8f4c0631 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net>
-Date: Tue, 4 Feb 2020 17:25:56 +0100
-Subject: [PATCH 1/2] Make non "test_" method private
-
----
- test/rubygems/test_require.rb | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/test/rubygems/test_require.rb b/test/rubygems/test_require.rb
-index aa2675af5d..d618a93473 100644
---- a/test/rubygems/test_require.rb
-+++ b/test/rubygems/test_require.rb
-@@ -532,6 +532,8 @@ def test_require_bundler_with_bundler_version
-     end
-   end
- 
-+  private
-+
-   def silence_warnings
-     old_verbose, $VERBOSE = $VERBOSE, false
-     yield
-
-From b3944384f44b869985051863d8b05b545d09a585 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net>
-Date: Tue, 4 Feb 2020 17:26:28 +0100
-Subject: [PATCH 2/2] Fix require issue with file extension priority
-
-If `require "a"` is run when two folders have been specified in the -I
-option including a "a.rb" file and a "a.so" file respectively, the ruby
-spec says that the ".rb" file should always be preferred. However, the
-logic we added in https://github.com/rubygems/rubygems/commit/6b81076d9
-to make the -I option always beat default gems does not respect this
-spec, creating a difference from the original ruby-core's require.
-
-[the ruby spec says]: https://github.com/ruby/spec/blob/d80a6e2b221d4f17a8cadcac75ef950c59cba901/core/kernel/shared/require.rb#L234-L246
----
- lib/rubygems/core_ext/kernel_require.rb | 28 +++++------
- test/rubygems/test_require.rb           | 62 +++++++++++++++++++++++++
- 2 files changed, 74 insertions(+), 16 deletions(-)
-
-diff --git a/lib/rubygems/core_ext/kernel_require.rb b/lib/rubygems/core_ext/kernel_require.rb
-index 60f4d18712..369f2c743e 100644
---- a/lib/rubygems/core_ext/kernel_require.rb
-+++ b/lib/rubygems/core_ext/kernel_require.rb
-@@ -43,18 +43,18 @@ def require(path)
-     # https://github.com/rubygems/rubygems/pull/1868
-     resolved_path = begin
-       rp = nil
--      $LOAD_PATH[0...Gem.load_path_insert_index || -1].each do |lp|
--        safe_lp = lp.dup.tap(&Gem::UNTAINT)
--        begin
--          if File.symlink? safe_lp # for backward compatibility
--            next
-+      Gem.suffixes.each do |s|
-+        $LOAD_PATH[0...Gem.load_path_insert_index || -1].each do |lp|
-+          safe_lp = lp.dup.tap(&Gem::UNTAINT)
-+          begin
-+            if File.symlink? safe_lp # for backward compatibility
-+              next
-+            end
-+          rescue SecurityError
-+            RUBYGEMS_ACTIVATION_MONITOR.exit
-+            raise
-           end
--        rescue SecurityError
--          RUBYGEMS_ACTIVATION_MONITOR.exit
--          raise
--        end
- 
--        Gem.suffixes.each do |s|
-           full_path = File.expand_path(File.join(safe_lp, "#{path}#{s}"))
-           if File.file?(full_path)
-             rp = full_path
-@@ -67,12 +67,8 @@ def require(path)
-     end
- 
-     if resolved_path
--      begin
--        RUBYGEMS_ACTIVATION_MONITOR.exit
--        return gem_original_require(resolved_path)
--      rescue LoadError
--        RUBYGEMS_ACTIVATION_MONITOR.enter
--      end
-+      RUBYGEMS_ACTIVATION_MONITOR.exit
-+      return gem_original_require(resolved_path)
-     end
- 
-     if spec = Gem.find_unresolved_default_spec(path)
-diff --git a/test/rubygems/test_require.rb b/test/rubygems/test_require.rb
-index d618a93473..7cffbfa7fe 100644
---- a/test/rubygems/test_require.rb
-+++ b/test/rubygems/test_require.rb
-@@ -120,6 +120,24 @@ def test_dash_i_beats_default_gems
-     Object.send :remove_const, :HELLO if Object.const_defined? :HELLO
-   end
- 
-+  def test_dash_i_respects_default_library_extension_priority
-+    skip "extensions don't quite work on jruby" if Gem.java_platform?
-+
-+    dash_i_ext_arg = util_install_extension_file('a')
-+    dash_i_lib_arg = util_install_ruby_file('a')
-+
-+    lp = $LOAD_PATH.dup
-+
-+    begin
-+      $LOAD_PATH.unshift dash_i_lib_arg
-+      $LOAD_PATH.unshift dash_i_ext_arg
-+      assert_require 'a'
-+      assert_match(/a\.rb$/, $LOADED_FEATURES.last)
-+    ensure
-+      $LOAD_PATH.replace lp
-+    end
-+  end
-+
-   def test_concurrent_require
-     Object.const_set :FILE_ENTERED_LATCH, Latch.new(2)
-     Object.const_set :FILE_EXIT_LATCH, Latch.new(1)
-@@ -541,4 +559,48 @@ def silence_warnings
-     $VERBOSE = old_verbose
-   end
- 
-+  def util_install_extension_file(name)
-+    spec = quick_gem name
-+    util_build_gem spec
-+
-+    spec.extensions << "extconf.rb"
-+    write_file File.join(@tempdir, "extconf.rb") do |io|
-+      io.write <<-RUBY
-+        require "mkmf"
-+        create_makefile("#{name}")
-+      RUBY
-+    end
-+
-+    write_file File.join(@tempdir, "#{name}.c") do |io|
-+      io.write <<-C
-+        #include <ruby.h>
-+        void Init_#{name}() { }
-+      C
-+    end
-+
-+    spec.files += ["extconf.rb", "#{name}.c"]
-+
-+    so = File.join(spec.gem_dir, "#{name}.#{RbConfig::CONFIG["DLEXT"]}")
-+    refute_path_exists so
-+
-+    path = Gem::Package.build spec
-+    installer = Gem::Installer.at path
-+    installer.install
-+    assert_path_exists so
-+
-+    spec.gem_dir
-+  end
-+
-+  def util_install_ruby_file(name)
-+    dir_lib = Dir.mktmpdir("test_require_lib", @tempdir)
-+    dash_i_lib_arg = File.join dir_lib
-+
-+    a_rb = File.join dash_i_lib_arg, "#{name}.rb"
-+
-+    FileUtils.mkdir_p File.dirname a_rb
-+    File.open(a_rb, 'w') { |f| f.write "# #{name}.rb" }
-+
-+    dash_i_lib_arg
-+  end
-+
- end
diff --git a/SOURCES/rubygems-3.1.3-Fix-correctness-and-performance-regression-in-require.patch b/SOURCES/rubygems-3.1.3-Fix-correctness-and-performance-regression-in-require.patch
deleted file mode 100644
index b1438dd..0000000
--- a/SOURCES/rubygems-3.1.3-Fix-correctness-and-performance-regression-in-require.patch
+++ /dev/null
@@ -1,324 +0,0 @@
-From 00d98eb8a3245fb93a475ecbbbc4c7ec7e6704cd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net>
-Date: Tue, 19 May 2020 14:00:00 +0200
-Subject: [PATCH 1/5] Fix performance regression in `require`
-
-Our check for `-I` paths should not go through all activated gems.
----
- lib/rubygems.rb                         | 10 ++++++++++
- lib/rubygems/core_ext/kernel_require.rb |  2 +-
- lib/rubygems/test_case.rb               |  1 +
- test/rubygems/test_require.rb           | 11 +++++++++++
- 4 files changed, 23 insertions(+), 1 deletion(-)
-
-diff --git a/lib/rubygems.rb b/lib/rubygems.rb
-index 843cb49e4a..d1a9a1c7e1 100644
---- a/lib/rubygems.rb
-+++ b/lib/rubygems.rb
-@@ -660,10 +660,20 @@ def self.load_path_insert_index
-     index
-   end
- 
-+  ##
-+  # The number of paths in the `$LOAD_PATH` from activated gems. Used to
-+  # prioritize `-I` and `ENV['RUBYLIB`]` entries during `require`.
-+
-+  def self.activated_gem_paths
-+    @activated_gem_paths ||= 0
-+  end
-+
-   ##
-   # Add a list of paths to the $LOAD_PATH at the proper place.
- 
-   def self.add_to_load_path(*paths)
-+    @activated_gem_paths = activated_gem_paths + paths.size
-+
-     insert_index = load_path_insert_index
- 
-     if insert_index
-diff --git a/lib/rubygems/core_ext/kernel_require.rb b/lib/rubygems/core_ext/kernel_require.rb
-index ed24111bd5..7625ce1bee 100644
---- a/lib/rubygems/core_ext/kernel_require.rb
-+++ b/lib/rubygems/core_ext/kernel_require.rb
-@@ -47,7 +47,7 @@ def require(path)
-         load_path_insert_index = Gem.load_path_insert_index
-         break unless load_path_insert_index
- 
--        $LOAD_PATH[0...load_path_insert_index].each do |lp|
-+        $LOAD_PATH[0...load_path_insert_index - Gem.activated_gem_paths].each do |lp|
-           safe_lp = lp.dup.tap(&Gem::UNTAINT)
-           begin
-             if File.symlink? safe_lp # for backward compatibility
-diff --git a/lib/rubygems/test_case.rb b/lib/rubygems/test_case.rb
-index a05a2898d1..53dd495aef 100644
---- a/lib/rubygems/test_case.rb
-+++ b/lib/rubygems/test_case.rb
-@@ -379,6 +379,7 @@ def setup
-     Gem::Security.reset
- 
-     Gem.loaded_specs.clear
-+    Gem.instance_variable_set(:@activated_gem_paths, 0)
-     Gem.clear_default_specs
-     Bundler.reset!
- 
-diff --git a/test/rubygems/test_require.rb b/test/rubygems/test_require.rb
-index f36892f8cc..9f2fe3439a 100644
---- a/test/rubygems/test_require.rb
-+++ b/test/rubygems/test_require.rb
-@@ -382,6 +382,17 @@ def test_default_gem_require_activates_just_once
-     assert_equal 0, times_called
-   end
- 
-+  def test_second_gem_require_does_not_resolve_path_manually_before_going_through_standard_require
-+    a1 = util_spec "a", "1", nil, "lib/test_gem_require_a.rb"
-+    install_gem a1
-+
-+    assert_require "test_gem_require_a"
-+
-+    stub(:gem_original_require, ->(path) { assert_equal "test_gem_require_a", path }) do
-+      require "test_gem_require_a"
-+    end
-+  end
-+
-   def test_realworld_default_gem
-     testing_ruby_repo = !ENV["GEM_COMMAND"].nil?
-     skip "this test can't work under ruby-core setup" if testing_ruby_repo || java_platform?
-
-From ae95885dff6189c5ac59bbdf685cb4ec4751fdef Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net>
-Date: Tue, 19 May 2020 14:08:19 +0200
-Subject: [PATCH 2/5] Refactor `Gem.load_path_insert_index`
-
----
- lib/rubygems.rb                         | 13 +++----------
- lib/rubygems/core_ext/kernel_require.rb |  5 +----
- 2 files changed, 4 insertions(+), 14 deletions(-)
-
-diff --git a/lib/rubygems.rb b/lib/rubygems.rb
-index d1a9a1c7e1..ca80326459 100644
---- a/lib/rubygems.rb
-+++ b/lib/rubygems.rb
-@@ -657,7 +657,7 @@ def self.load_path_insert_index
- 
-     index = $LOAD_PATH.index RbConfig::CONFIG['sitelibdir']
- 
--    index
-+    index || 0
-   end
- 
-   ##
-@@ -674,15 +674,8 @@ def self.activated_gem_paths
-   def self.add_to_load_path(*paths)
-     @activated_gem_paths = activated_gem_paths + paths.size
- 
--    insert_index = load_path_insert_index
--
--    if insert_index
--      # gem directories must come after -I and ENV['RUBYLIB']
--      $LOAD_PATH.insert(insert_index, *paths)
--    else
--      # we are probably testing in core, -I and RUBYLIB don't apply
--      $LOAD_PATH.unshift(*paths)
--    end
-+    # gem directories must come after -I and ENV['RUBYLIB']
-+    $LOAD_PATH.insert(Gem.load_path_insert_index, *paths)
-   end
- 
-   @yaml_loaded = false
-diff --git a/lib/rubygems/core_ext/kernel_require.rb b/lib/rubygems/core_ext/kernel_require.rb
-index 7625ce1bee..decf4829f1 100644
---- a/lib/rubygems/core_ext/kernel_require.rb
-+++ b/lib/rubygems/core_ext/kernel_require.rb
-@@ -44,10 +44,7 @@ def require(path)
-     resolved_path = begin
-       rp = nil
-       Gem.suffixes.each do |s|
--        load_path_insert_index = Gem.load_path_insert_index
--        break unless load_path_insert_index
--
--        $LOAD_PATH[0...load_path_insert_index - Gem.activated_gem_paths].each do |lp|
-+        $LOAD_PATH[0...Gem.load_path_insert_index - Gem.activated_gem_paths].each do |lp|
-           safe_lp = lp.dup.tap(&Gem::UNTAINT)
-           begin
-             if File.symlink? safe_lp # for backward compatibility
-
-From da1492e9d7b28d068fbfbb0ba1cafcc516681567 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net>
-Date: Tue, 19 May 2020 14:32:12 +0200
-Subject: [PATCH 3/5] Extract a local outside the loop
-
----
- lib/rubygems/core_ext/kernel_require.rb | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/lib/rubygems/core_ext/kernel_require.rb b/lib/rubygems/core_ext/kernel_require.rb
-index decf4829f1..6a7faaf2d1 100644
---- a/lib/rubygems/core_ext/kernel_require.rb
-+++ b/lib/rubygems/core_ext/kernel_require.rb
-@@ -43,8 +43,9 @@ def require(path)
-     # https://github.com/rubygems/rubygems/pull/1868
-     resolved_path = begin
-       rp = nil
-+      load_path_check_index = Gem.load_path_insert_index - Gem.activated_gem_paths
-       Gem.suffixes.each do |s|
--        $LOAD_PATH[0...Gem.load_path_insert_index - Gem.activated_gem_paths].each do |lp|
-+        $LOAD_PATH[0...load_path_check_index].each do |lp|
-           safe_lp = lp.dup.tap(&Gem::UNTAINT)
-           begin
-             if File.symlink? safe_lp # for backward compatibility
-
-From 22ad5717c38feda2375b53628d15ae3db2195684 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net>
-Date: Thu, 21 May 2020 15:20:57 +0200
-Subject: [PATCH 4/5] Fix `$LOADED_FEATURES` cache sometimes not respected
-
-In the cases where the initial manually `-I` path resolution succeeded,
-we were passing a full path to the original require effectively skipping
-the `$LOADED_FEATURES` cache. With this change, we _only_ do the
-resolution when a matching requirable path is found in a default gem. In
-that case, we skip activation of the default gem if we detect that the
-required file will be picked up for a `-I` path.
----
- lib/rubygems/core_ext/kernel_require.rb | 53 +++++++++++--------------
- test/rubygems/test_require.rb           | 29 ++++++++++++++
- 2 files changed, 53 insertions(+), 29 deletions(-)
-
-diff --git a/lib/rubygems/core_ext/kernel_require.rb b/lib/rubygems/core_ext/kernel_require.rb
-index 6a7faaf2d1..81e37b98bf 100644
---- a/lib/rubygems/core_ext/kernel_require.rb
-+++ b/lib/rubygems/core_ext/kernel_require.rb
-@@ -39,46 +39,41 @@ def require(path)
- 
-     path = path.to_path if path.respond_to? :to_path
- 
--    # Ensure -I beats a default gem
--    # https://github.com/rubygems/rubygems/pull/1868
--    resolved_path = begin
--      rp = nil
--      load_path_check_index = Gem.load_path_insert_index - Gem.activated_gem_paths
--      Gem.suffixes.each do |s|
--        $LOAD_PATH[0...load_path_check_index].each do |lp|
--          safe_lp = lp.dup.tap(&Gem::UNTAINT)
--          begin
--            if File.symlink? safe_lp # for backward compatibility
--              next
-+    if spec = Gem.find_unresolved_default_spec(path)
-+      # Ensure -I beats a default gem
-+      # https://github.com/rubygems/rubygems/pull/1868
-+      resolved_path = begin
-+        rp = nil
-+        load_path_check_index = Gem.load_path_insert_index - Gem.activated_gem_paths
-+        Gem.suffixes.each do |s|
-+          $LOAD_PATH[0...load_path_check_index].each do |lp|
-+            safe_lp = lp.dup.tap(&Gem::UNTAINT)
-+            begin
-+              if File.symlink? safe_lp # for backward compatibility
-+                next
-+              end
-+            rescue SecurityError
-+              RUBYGEMS_ACTIVATION_MONITOR.exit
-+              raise
-             end
--          rescue SecurityError
--            RUBYGEMS_ACTIVATION_MONITOR.exit
--            raise
--          end
- 
--          full_path = File.expand_path(File.join(safe_lp, "#{path}#{s}"))
--          if File.file?(full_path)
--            rp = full_path
--            break
-+            full_path = File.expand_path(File.join(safe_lp, "#{path}#{s}"))
-+            if File.file?(full_path)
-+              rp = full_path
-+              break
-+            end
-           end
-+          break if rp
-         end
--        break if rp
-+        rp
-       end
--      rp
--    end
- 
--    if resolved_path
--      RUBYGEMS_ACTIVATION_MONITOR.exit
--      return gem_original_require(resolved_path)
--    end
--
--    if spec = Gem.find_unresolved_default_spec(path)
-       begin
-         Kernel.send(:gem, spec.name, Gem::Requirement.default_prerelease)
-       rescue Exception
-         RUBYGEMS_ACTIVATION_MONITOR.exit
-         raise
--      end
-+      end unless resolved_path
-     end
- 
-     # If there are no unresolved deps, then we can use just try
-diff --git a/test/rubygems/test_require.rb b/test/rubygems/test_require.rb
-index 9f2fe3439a..2b11e26dfe 100644
---- a/test/rubygems/test_require.rb
-+++ b/test/rubygems/test_require.rb
-@@ -45,6 +45,35 @@ def refute_require(path)
-     refute require(path), "'#{path}' was not yet required"
-   end
- 
-+  def test_respect_loaded_features_caching_like_standard_require
-+    dir = Dir.mktmpdir("test_require", @tempdir)
-+
-+    lp1 = File.join dir, 'foo1'
-+    foo1 = File.join lp1, 'foo.rb'
-+
-+    FileUtils.mkdir_p lp1
-+    File.open(foo1, 'w') { |f| f.write "class Object; HELLO = 'foo1' end" }
-+
-+    lp = $LOAD_PATH.dup
-+
-+    $LOAD_PATH.unshift lp1
-+    assert_require 'foo'
-+    assert_equal "foo1", ::Object::HELLO
-+
-+    lp2 = File.join dir, 'foo2'
-+    foo2 = File.join lp2, 'foo.rb'
-+
-+    FileUtils.mkdir_p lp2
-+    File.open(foo2, 'w') { |f| f.write "class Object; HELLO = 'foo2' end" }
-+
-+    $LOAD_PATH.unshift lp2
-+    refute_require 'foo'
-+    assert_equal "foo1", ::Object::HELLO
-+  ensure
-+    $LOAD_PATH.replace lp
-+    Object.send :remove_const, :HELLO if Object.const_defined? :HELLO
-+  end
-+
-   # Providing -I on the commandline should always beat gems
-   def test_dash_i_beats_gems
-     a1 = util_spec "a", "1", {"b" => "= 1"}, "lib/test_gem_require_a.rb"
-
-From db872c7a18d616f4447bdcca3130be6db9e5cb03 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net>
-Date: Sat, 23 May 2020 20:18:41 +0200
-Subject: [PATCH 5/5] Remove direct reference to PR
-
-The code is quite different now, so I think the link might be even
-confusing. If you want to know more, use git history.
----
- lib/rubygems/core_ext/kernel_require.rb | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/lib/rubygems/core_ext/kernel_require.rb b/lib/rubygems/core_ext/kernel_require.rb
-index 81e37b98bf..115ae0cb50 100644
---- a/lib/rubygems/core_ext/kernel_require.rb
-+++ b/lib/rubygems/core_ext/kernel_require.rb
-@@ -41,7 +41,6 @@ def require(path)
- 
-     if spec = Gem.find_unresolved_default_spec(path)
-       # Ensure -I beats a default gem
--      # https://github.com/rubygems/rubygems/pull/1868
-       resolved_path = begin
-         rp = nil
-         load_path_check_index = Gem.load_path_insert_index - Gem.activated_gem_paths
diff --git a/SOURCES/rubygems-3.1.3-Improve-require.patch b/SOURCES/rubygems-3.1.3-Improve-require.patch
deleted file mode 100644
index 2df5c4f..0000000
--- a/SOURCES/rubygems-3.1.3-Improve-require.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From c5197b2ab35ba389f48918e0c773b43b6dca2fa5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net>
-Date: Fri, 7 Feb 2020 17:16:05 +0100
-Subject: [PATCH 1/3] Tweaks to get test passing more reliably
-
----
- test/rubygems/test_require.rb | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/test/rubygems/test_require.rb b/test/rubygems/test_require.rb
-index 7cffbfa7fe..67c55416d4 100644
---- a/test/rubygems/test_require.rb
-+++ b/test/rubygems/test_require.rb
-@@ -567,18 +567,20 @@ def util_install_extension_file(name)
-     write_file File.join(@tempdir, "extconf.rb") do |io|
-       io.write <<-RUBY
-         require "mkmf"
-+        CONFIG['LDSHARED'] = '$(TOUCH) $@ ||'
-         create_makefile("#{name}")
-       RUBY
-     end
- 
-     write_file File.join(@tempdir, "#{name}.c") do |io|
-       io.write <<-C
--        #include <ruby.h>
-         void Init_#{name}() { }
-       C
-     end
- 
--    spec.files += ["extconf.rb", "#{name}.c"]
-+    write_file File.join(@tempdir, "depend")
-+
-+    spec.files += ["extconf.rb", "depend", "#{name}.c"]
- 
-     so = File.join(spec.gem_dir, "#{name}.#{RbConfig::CONFIG["DLEXT"]}")
-     refute_path_exists so
-
-From 7bfd7319cd751837c3ccaf1d97b02846eaaf39d5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net>
-Date: Tue, 11 Feb 2020 11:56:06 +0100
-Subject: [PATCH 2/3] Fix bug bug calculating $LOAD_PATH's to check in
- `require`
-
-In `Gem.load_path_insert_index` is not set, we end up having
-`$LOAD_PATH[0...-1]`, unintentionally skipping the last $LOAD_PATH entry
-from the check.
-
-The correct thing to do in that case is to not even try since we have no
-way of distinguisng default LOAD_PATH entries from those added with -I.
----
- lib/rubygems/core_ext/kernel_require.rb | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/lib/rubygems/core_ext/kernel_require.rb b/lib/rubygems/core_ext/kernel_require.rb
-index 369f2c743e..a8d170f13a 100644
---- a/lib/rubygems/core_ext/kernel_require.rb
-+++ b/lib/rubygems/core_ext/kernel_require.rb
-@@ -44,7 +44,10 @@ def require(path)
-     resolved_path = begin
-       rp = nil
-       Gem.suffixes.each do |s|
--        $LOAD_PATH[0...Gem.load_path_insert_index || -1].each do |lp|
-+        load_path_insert_index = Gem.load_path_insert_index
-+        break unless load_path_insert_index
-+
-+        $LOAD_PATH[0...load_path_insert_index].each do |lp|
-           safe_lp = lp.dup.tap(&Gem::UNTAINT)
-           begin
-             if File.symlink? safe_lp # for backward compatibility
-
-From 4fc0ab21c0f7713829abb522ce3b6d8e24c126b3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net>
-Date: Fri, 14 Feb 2020 02:03:04 +0100
-Subject: [PATCH 3/3] Exclude empty suffix from `-I` require loop
-
----
- lib/rubygems/core_ext/kernel_require.rb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/rubygems/core_ext/kernel_require.rb b/lib/rubygems/core_ext/kernel_require.rb
-index a8d170f13a..9712fb6ac0 100644
---- a/lib/rubygems/core_ext/kernel_require.rb
-+++ b/lib/rubygems/core_ext/kernel_require.rb
-@@ -43,7 +43,7 @@ def require(path)
-     # https://github.com/rubygems/rubygems/pull/1868
-     resolved_path = begin
-       rp = nil
--      Gem.suffixes.each do |s|
-+      Gem.suffixes[1..-1].each do |s|
-         load_path_insert_index = Gem.load_path_insert_index
-         break unless load_path_insert_index
- 
diff --git a/SOURCES/rubygems-3.1.3-Revert-Exclude-empty-suffix-from-I-require-loop.patch b/SOURCES/rubygems-3.1.3-Revert-Exclude-empty-suffix-from-I-require-loop.patch
deleted file mode 100644
index 463047c..0000000
--- a/SOURCES/rubygems-3.1.3-Revert-Exclude-empty-suffix-from-I-require-loop.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 301e30bf97dd603ca81d52b90186908575c4ddf8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net>
-Date: Tue, 25 Feb 2020 15:01:44 +0100
-Subject: [PATCH] Revert "Exclude empty suffix from `-I` require loop"
-
-This reverts commit 4fc0ab21c0f7713829abb522ce3b6d8e24c126b3.
-
-Technically, extensionless ruby files are valid ruby files that can be
-required. For example, `bin/bundle` is sometimes required from other
-binstubs even if it's also runnable directly.
-
-So, we should technically consider this kind of files too.
----
- lib/rubygems/core_ext/kernel_require.rb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/rubygems/core_ext/kernel_require.rb b/lib/rubygems/core_ext/kernel_require.rb
-index 9712fb6ac0..a8d170f13a 100644
---- a/lib/rubygems/core_ext/kernel_require.rb
-+++ b/lib/rubygems/core_ext/kernel_require.rb
-@@ -43,7 +43,7 @@ def require(path)
-     # https://github.com/rubygems/rubygems/pull/1868
-     resolved_path = begin
-       rp = nil
--      Gem.suffixes[1..-1].each do |s|
-+      Gem.suffixes.each do |s|
-         load_path_insert_index = Gem.load_path_insert_index
-         break unless load_path_insert_index
- 
diff --git a/SOURCES/rubygems-3.2.13-test-gem-message.patch b/SOURCES/rubygems-3.2.13-test-gem-message.patch
new file mode 100644
index 0000000..3ab9dfc
--- /dev/null
+++ b/SOURCES/rubygems-3.2.13-test-gem-message.patch
@@ -0,0 +1,54 @@
+From 7efc7afcae6720e1af7ab49986d789b6f9d6fe0a Mon Sep 17 00:00:00 2001
+From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
+Date: Mon, 8 Mar 2021 12:17:52 +0900
+Subject: [PATCH] Merge RubyGems-3.2.13 and Bundler-2.2.13
+
+---
+ lib/bundler/cli/gem.rb                        |  40 +++---
+ lib/bundler/definition.rb                     |  47 ++++---
+ lib/bundler/dsl.rb                            |  58 +++++---
+ lib/bundler/inline.rb                         |   1 +
+ lib/bundler/lockfile_parser.rb                |  20 +--
+ lib/bundler/plugin.rb                         |   1 +
+ lib/bundler/plugin/installer.rb               |  18 ++-
+ lib/bundler/plugin/source_list.rb             |   4 +
+ lib/bundler/resolver.rb                       |  70 +++++-----
+ lib/bundler/source_list.rb                    |  33 ++---
+ lib/bundler/templates/newgem/README.md.tt     |   8 +-
+ lib/bundler/version.rb                        |   2 +-
+ lib/rubygems.rb                               |   2 +-
+ lib/rubygems/core_ext/tcpsocket_init.rb       |   5 +-
+ lib/rubygems/platform.rb                      |  10 +-
+ spec/bundler/bundler/plugin_spec.rb           |   1 +
+ spec/bundler/commands/exec_spec.rb            | 131 ++++++++++++++---
+ spec/bundler/commands/newgem_spec.rb          |  94 +++++--------
+ .../commands/post_bundle_message_spec.rb      |  11 +-
+ spec/bundler/install/gemfile/gemspec_spec.rb  |  15 +-
+ spec/bundler/install/gemfile/sources_spec.rb  | 132 +++++++++++++++---
+ spec/bundler/support/indexes.rb               |   2 +-
+ test/rubygems/test_gem.rb                     |  10 +-
+ test/rubygems/test_gem_platform.rb            |  29 ++++
+ 24 files changed, 477 insertions(+), 267 deletions(-)
+
+diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb
+index 1c6d790b25e6..8b028d3495a8 100644
+--- a/test/rubygems/test_gem.rb
++++ b/test/rubygems/test_gem.rb
+@@ -1885,15 +1885,9 @@ def test_use_gemdeps_missing_gem
+       io.write 'gem "a"'
+     end
+ 
+-    platform = Bundler::GemHelpers.generic_local_platform
+-    if platform == Gem::Platform::RUBY
+-      platform = ''
+-    else
+-      platform = " #{platform}"
+-    end
+-
+     expected = <<-EXPECTED
+-Could not find gem 'a#{platform}' in any of the gem sources listed in your Gemfile.
++Could not find gem 'a' in locally installed gems.
++The source does not contain any versions of 'a'
+ You may need to `gem install -g` to install missing gems
+ 
+     EXPECTED
diff --git a/SOURCES/rubygems-3.2.22-fix-requirement-equals.patch b/SOURCES/rubygems-3.2.22-fix-requirement-equals.patch
new file mode 100644
index 0000000..d5da382
--- /dev/null
+++ b/SOURCES/rubygems-3.2.22-fix-requirement-equals.patch
@@ -0,0 +1,75 @@
+From c082c6eb7c786a432bea23cf78839f64585cb630 Mon Sep 17 00:00:00 2001
+From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
+Date: Wed, 7 Jul 2021 14:07:29 +0900
+Subject: [PATCH] Sync RubyGems and Bundler with upstream
+
+---
+ lib/bundler.rb                                |   2 +-
+ lib/bundler/cli/doctor.rb                     |  12 +-
+ lib/bundler/cli/install.rb                    |   2 +-
+ lib/bundler/compact_index_client.rb           |   4 +-
+ lib/bundler/current_ruby.rb                   |   8 +-
+ lib/bundler/definition.rb                     |  44 +-----
+ lib/bundler/dsl.rb                            |  14 +-
+ lib/bundler/installer.rb                      |   8 +-
+ lib/bundler/lockfile_parser.rb                |  22 +--
+ lib/bundler/plugin/installer.rb               |   2 +-
+ lib/bundler/rubygems_ext.rb                   |   2 +
+ lib/bundler/source/rubygems.rb                |  13 --
+ lib/bundler/source_list.rb                    |  55 +++++---
+ .../lib/connection_pool/monotonic_time.rb     |   2 +-
+ .../lib/connection_pool/timed_stack.rb        |   4 +-
+ lib/bundler/worker.rb                         |   4 +-
+ lib/rubygems.rb                               |   2 +-
+ lib/rubygems/core_ext/tcpsocket_init.rb       |   4 +-
+ lib/rubygems/deprecate.rb                     |  59 +++++++-
+ lib/rubygems/gemcutter_utilities.rb           |  13 +-
+ lib/rubygems/installer.rb                     |   2 +-
+ lib/rubygems/remote_fetcher.rb                |  15 +-
+ lib/rubygems/request/connection_pools.rb      |   2 +-
+ lib/rubygems/request/http_pool.rb             |   2 +-
+ lib/rubygems/request_set.rb                   |   2 +-
+ lib/rubygems/specification.rb                 |   2 +-
+ lib/rubygems/uri_parser.rb                    |   8 ++
+ lib/rubygems/uri_parsing.rb                   |  23 ---
+ lib/rubygems/user_interaction.rb              |   2 +-
+ spec/bundler/bundler/cli_spec.rb              |  34 +++--
+ spec/bundler/bundler/definition_spec.rb       |   2 +-
+ spec/bundler/bundler/source_list_spec.rb      |  42 +++---
+ spec/bundler/commands/doctor_spec.rb          |  24 +++-
+ spec/bundler/commands/update_spec.rb          |  88 ++++++++++++
+ .../install/gemfile/eval_gemfile_spec.rb      |  32 +++++
+ spec/bundler/install/gemfile/sources_spec.rb  |  70 +++++++++
+ .../install/gems/compact_index_spec.rb        |   4 +-
+ .../install/gems/dependency_api_spec.rb       |   4 +-
+ spec/bundler/install/global_cache_spec.rb     |   7 +-
+ spec/bundler/lock/lockfile_spec.rb            |  82 +----------
+ spec/bundler/realworld/edgecases_spec.rb      | 133 +-----------------
+ spec/bundler/realworld/slow_perf_spec.rb      |  10 +-
+ spec/bundler/spec_helper.rb                   |   2 +-
+ spec/bundler/support/api_request_limit_hax.rb |  16 +++
+ .../artifice/compact_index_rate_limited.rb    |   2 +-
+ spec/bundler/support/artifice/endpoint.rb     |   2 +-
+ spec/bundler/support/hax.rb                   |  25 ----
+ spec/bundler/support/helpers.rb               |   4 -
+ spec/bundler/support/matchers.rb              |   8 +-
+ spec/bundler/support/path.rb                  |   4 +
+ test/rubygems/helper.rb                       |   2 +-
+ test/rubygems/test_gem_gemcutter_utilities.rb |  12 ++
+ 52 files changed, 477 insertions(+), 466 deletions(-)
+ delete mode 100644 lib/rubygems/uri_parsing.rb
+ create mode 100644 spec/bundler/support/api_request_limit_hax.rb
+
+diff --git a/lib/bundler/rubygems_ext.rb b/lib/bundler/rubygems_ext.rb
+index c95664965c99..9828fc885c94 100644
+--- a/lib/bundler/rubygems_ext.rb
++++ b/lib/bundler/rubygems_ext.rb
+@@ -134,6 +134,8 @@ def to_lock
+     class Requirement
+       module OrderIndependentComparison
+         def ==(other)
++          return unless Gem::Requirement === other
++
+           if _requirements_sorted? && other._requirements_sorted?
+             super
+           else
diff --git a/SOURCES/rubygems-bundler-gemspec-for-make-test-bundler.patch b/SOURCES/rubygems-bundler-gemspec-for-make-test-bundler.patch
new file mode 100644
index 0000000..ca39d66
--- /dev/null
+++ b/SOURCES/rubygems-bundler-gemspec-for-make-test-bundler.patch
@@ -0,0 +1,15 @@
+--- a/lib/bundler/bundler.gemspec
++++ b/lib/bundler/bundler.gemspec
+@@ -37,10 +37,9 @@
+   s.files = Dir.glob("lib/bundler{.rb,/**/*}", File::FNM_DOTMATCH).reject {|f| File.directory?(f) }
+ 
+   # include the gemspec itself because warbler breaks w/o it
+-  s.files += %w[bundler.gemspec]
++  s.files += %w[lib/bundler/bundler.gemspec]
+ 
+-  s.files += %w[CHANGELOG.md LICENSE.md README.md]
+-  s.bindir        = "exe"
++  s.bindir        = "libexec"
+   s.executables   = %w[bundle bundler]
+   s.require_paths = ["lib"]
+ end
diff --git a/SPECS/ruby.spec b/SPECS/ruby.spec
index 2a314ec..77aac55 100644
--- a/SPECS/ruby.spec
+++ b/SPECS/ruby.spec
@@ -1,6 +1,6 @@
 %global major_version 2
 %global minor_version 7
-%global teeny_version 1
+%global teeny_version 4
 %global major_minor_version %{major_version}.%{minor_version}
 
 %global ruby_version %{major_minor_version}.%{teeny_version}
@@ -22,7 +22,7 @@
 %endif
 
 
-%global release 133
+%global release 137
 %{!?release_string:%define release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}}
 
 # The RubyGems library has to stay out of Ruby directory tree, since the
@@ -30,27 +30,29 @@
 %global rubygems_dir %{_datadir}/rubygems
 
 # Bundled libraries versions
-%global rubygems_version 3.1.2
+%global rubygems_version 3.1.6
 %global rubygems_molinillo_version 0.5.7
 
 # Default gems.
-%global bundler_version 2.1.4
+%global bundler_version 2.2.24
 %global bundler_connection_pool_version 2.2.2
-%global bundler_fileutils_version 1.3.0
-%global bundler_molinillo_version 0.6.6
-%global bundler_net_http_persistent_version 3.1.0
-%global bundler_thor_version 1.0.0
+%global bundler_fileutils_version 1.4.1
+%global bundler_molinillo_version 0.7.0
+%global bundler_net_http_persistent_version 4.0.0
+%global bundler_thor_version 1.1.0
+%global bundler_tmpdir_version 0.1.0
+%global bundler_uri_version 0.10.0
 
 %global bigdecimal_version 2.0.0
 %global did_you_mean_version 1.4.0
 %global io_console_version 0.5.6
-%global irb_version 1.2.3
+%global irb_version 1.2.6
 %global json_version 2.3.0
 %global net_telnet_version 0.2.0
 %global openssl_version 2.1.2
 %global psych_version 3.1.0
 %global racc_version 1.4.16
-%global rdoc_version 6.2.1
+%global rdoc_version 6.2.1.1
 %global xmlrpc_version 0.3.0
 
 # Bundled gems.
@@ -76,6 +78,8 @@
 %bcond_without gmp
 %bcond_without hostname
 %bcond_without systemtap
+# Enable the tests requiring internet when building on local.
+%bcond_with bundler_tests
 
 %if 0%{?fedora}
 %bcond_without hardening_test
@@ -107,6 +111,9 @@ Source11: rubygems.con
 Source13: test_abrt.rb
 # SystemTap tests.
 Source14: test_systemtap.rb
+# git clone --no-checkout git@github.com:rubygems/rubygems.git
+# git -C rubygems archive --prefix=rubygems/ -v -o ruby-rubygems-bundler-v2.2.24.txz bundler-v2.2.24
+Source15: ruby-rubygems-bundler-v%{bundler_version}.txz
 
 # The load directive is supported since RPM 4.12, i.e. F21+. The build process
 # fails on older Fedoras.
@@ -143,33 +150,26 @@ Patch6: ruby-2.7.0-Initialize-ABRT-hook.patch
 # hardening features of glibc (rhbz#1361037).
 # https://bugs.ruby-lang.org/issues/12666
 Patch9: ruby-2.3.1-Rely-on-ldd-to-detect-glibc.patch
-# Revert commit which breaks bundled net-http-persistent version check.
-# https://github.com/drbrain/net-http-persistent/pull/109
-Patch10: ruby-2.7.0-Remove-RubyGems-dependency.patch
-# Fix lchmod test failures.
-# https://github.com/ruby/ruby/commit/a19228f878d955eaf2cce086bcf53f46fdf894b9
-Patch11: ruby-2.8.0-Brace-the-fact-that-lchmod-can-EOPNOTSUPP.patch
-# https://github.com/ruby/ruby/commit/72c02aa4b79731c7f25c9267f74b347f1946c704
-Patch12: ruby-2.8.0-Moved-not-implemented-method-tests.patch
 # Prevent issues with openssl loading when RubyGems are disabled.
 # https://github.com/ruby/openssl/pull/242
 Patch13: ruby-2.8.0-remove-unneeded-gem-require-for-ipaddr.patch
-# Fix `require` behavior allowing to load libraries multiple times.
-# https://github.com/rubygems/rubygems/issues/3647
-# Because there were multiple fixes in `Kernel.require` in recent months,
-# pickup all the changes one by one instead of squashing them.
-# https://github.com/rubygems/rubygems/pull/3124
-Patch15: rubygems-3.1.3-Fix-I-require-priority.patch
-# https://github.com/rubygems/rubygems/pull/3133
-Patch16: rubygems-3.1.3-Improve-require.patch
-# https://github.com/rubygems/rubygems/pull/3153
-Patch17: rubygems-3.1.3-Revert-Exclude-empty-suffix-from-I-require-loop.patch
-# https://github.com/rubygems/rubygems/pull/3639
-Patch18: rubygems-3.1.3-Fix-correctness-and-performance-regression-in-require.patch
-
-# Add support for .include directive used by OpenSSL config files.
-# https://github.com/ruby/openssl/pull/216
-Patch22: ruby-2.6.0-config-support-include-directive.patch
+# Avoid possible timeout errors in TestBugReporter#test_bug_reporter_add.
+# https://bugs.ruby-lang.org/issues/16492
+Patch19: ruby-2.7.1-Timeout-the-test_bug_reporter_add-witout-raising-err.patch
+# Resolv::DNS: timeouts if multiple IPv6 name servers are given and address
+# contains leading zero
+# https://bugzilla.redhat.com/show_bug.cgi?id=1944227
+Patch20: ruby-3.0.0-Convert-ip-addresses-to-canonical-form.patch
+# Update `bundler.gemspec` from RubyGems, required to pass `make test-bundler`.
+# Compare RubyGems `bundler/bundler.gemspec` with Ruby `lib/bundler/bundler.gemspec`.
+Patch21: rubygems-bundler-gemspec-for-make-test-bundler.patch
+# A missing gem error message is changed on RubyGems 3.2.13.
+# https://github.com/ruby/ruby/commit/7efc7afcae6720e1af7ab49986d789b6f9d6fe0a
+Patch22: rubygems-3.2.13-test-gem-message.patch
+# Fix Gem::Requirement#== raising NoMethodError on RubyGems < 3.2.0.
+# https://github.com/rubygems/rubygems/commit/d62539f23aa1624ae170008e47a5a3e15f0dc2ef
+# https://github.com/ruby/ruby/commit/c082c6eb7c786a432bea23cf78839f64585cb630
+Patch23: rubygems-3.2.22-fix-requirement-equals.patch
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Suggests: rubypick
@@ -564,12 +564,21 @@ HTTP.
 
 
 %prep
-%setup -q -n %{ruby_archive}
+%setup -q -n %{ruby_archive} -b15
 
 # Remove bundled libraries to be sure they are not used.
 rm -rf ext/psych/yaml
 rm -rf ext/fiddle/libffi*
 
+# Update Bundler to fix CVE-2020-36327.
+# https://bugzilla.redhat.com/show_bug.cgi?id=1958999
+rm -rf lib/bundler{.rb,}
+rm -rf {spec,tool}/bundler
+cp -a %{_builddir}/rubygems/bundler/lib/bundler{.rb,} lib/
+cp -a %{_builddir}/rubygems/bundler/bundler.gemspec lib/bundler/
+cp -a %{_builddir}/rubygems/bundler/spec spec/bundler
+cp -a %{_builddir}/rubygems/bundler/tool/bundler tool/bundler
+
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -578,15 +587,12 @@ rm -rf ext/fiddle/libffi*
 %patch5 -p1
 %patch6 -p1
 %patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
 %patch13 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
+%patch19 -p1
+%patch20 -p1
+%patch21 -p1
 %patch22 -p1
+%patch23 -p1
 
 # Provide an example of usage of the tapset:
 cp -a %{SOURCE3} .
@@ -783,6 +789,10 @@ sed -i 's/^/%lang(ja) /' .ruby-doc.ja
 # https://github.com/ruby/rake/pull/333
 rm -rf %{buildroot}%{gem_dir}/gems/rake-%{rake_version}/.github
 
+# Remove accidentaly added files
+# https://bugs.ruby-lang.org/issues/17784
+rm -rf %{buildroot}%{ruby_libdir}/exe/
+
 %check
 %if 0%{?with_hardening_test}
 # Check Ruby hardening.
@@ -814,7 +824,7 @@ checksec --file=libruby.so.%{ruby_version} | \
 # FileUtils.
 [ "`make runruby TESTRUN_SCRIPT=\"-e \\\" \
   module Bundler; end; \
-  require 'bundler/vendor/fileutils/lib/fileutils/version'; \
+  require 'bundler/vendor/fileutils/lib/fileutils'; \
   puts Bundler::FileUtils::VERSION\\\"\" | tail -1`" \
   == '%{bundler_fileutils_version}' ]
 
@@ -840,6 +850,17 @@ checksec --file=libruby.so.%{ruby_version} | \
   puts Bundler::Thor::VERSION\\\"\" | tail -1`" \
   == '%{bundler_thor_version}' ]
 
+# tmpdir.
+# TODO: There is no version in bundled tmpdir yet.
+#%%{global bundler_tmpdir_version}
+
+# URI.
+[ "`make runruby TESTRUN_SCRIPT=\"-e \\\" \
+  module Bundler; end; \
+  require 'bundler/vendor/uri/lib/uri/version'; \
+  puts Bundler::URI::VERSION\\\"\" | tail -1`" \
+  == '%{bundler_uri_version}' ]
+
 
 # test_debug(TestRubyOptions) fails due to LoadError reported in debug mode,
 # when abrt.rb cannot be required (seems to be easier way then customizing
@@ -866,8 +887,7 @@ MSPECOPTS="$MSPECOPTS -P 'File.utime allows Time instances in the far future to 
 
 # Disable File.lchmod specs, which fails when building against glibc 2.31.9000.
 # https://bugs.ruby-lang.org/issues/16749
-MSPECOPTS="$MSPECOPTS -P 'File.lchmod returns false from \#respond_to?'"
-MSPECOPTS="$MSPECOPTS -P 'File.lchmod raises a NotImplementedError when called'"
+MSPECOPTS="$MSPECOPTS -P 'File.lchmod changes the file mode of the link and not of the file'"
 
 # For now, disable JIT tests in RHEL 8.
 # https://bugzilla.redhat.com/show_bug.cgi?id=1721553
@@ -878,11 +898,6 @@ sed \
   -i test/ruby/test_rubyvm_mjit.rb
 
 %ifarch s390x
-# Skip TestBugReporter#test_bug_reporter_add test, which fails quite often
-# due to segmentation fault.
-# https://bugs.ruby-lang.org/issues/16492
-sed -i '/^  def test_bug_reporter_add$/,/^  end$/ s/^/#/' \
-  test/-ext-/bug_reporter/test_bug_reporter.rb
 # Increase timeout for Fiddle::TestFunction#test_nogvl_poll test, which fails
 # sometimes.
 sed -i '/^    def test_nogvl_poll$/,/^    end$/ s/ 180,/ 1000,/' \
@@ -899,7 +914,12 @@ sed -i '/^  def test_ignored_interrupt$/,/^  end$/ s/^/#/' \
   test/ruby/test_signal.rb
 %endif
 
-make check TESTS="-v $DISABLE_TESTS" MSPECOPT="-fs $MSPECOPTS"
+# Give an option to increase the timeout in tests.
+# https://bugs.ruby-lang.org/issues/16921
+%{?test_timeout_scale:RUBY_TEST_TIMEOUT_SCALE="%{test_timeout_scale}"} \
+  make check TESTS="-v $DISABLE_TESTS" MSPECOPT="-fs $MSPECOPTS"
+
+%{?with_bundler_tests:make test-bundler}
 
 %files
 %license BSDL
@@ -1183,8 +1203,8 @@ make check TESTS="-v $DISABLE_TESTS" MSPECOPT="-fs $MSPECOPTS"
 %{gem_dir}/specifications/default/racc-%{racc_version}.gemspec
 %{gem_dir}/specifications/default/readline-0.0.2.gemspec
 %{gem_dir}/specifications/default/readline-ext-0.1.0.gemspec
-%{gem_dir}/specifications/default/reline-0.1.3.gemspec
-%{gem_dir}/specifications/default/rexml-3.2.3.gemspec
+%{gem_dir}/specifications/default/reline-0.1.5.gemspec
+%{gem_dir}/specifications/default/rexml-3.2.3.1.gemspec
 %{gem_dir}/specifications/default/rss-0.2.8.gemspec
 %{gem_dir}/specifications/default/sdbm-1.0.0.gemspec
 %{gem_dir}/specifications/default/singleton-0.1.0.gemspec
@@ -1193,7 +1213,7 @@ make check TESTS="-v $DISABLE_TESTS" MSPECOPT="-fs $MSPECOPTS"
 %{gem_dir}/specifications/default/timeout-0.1.0.gemspec
 %{gem_dir}/specifications/default/tracer-0.1.0.gemspec
 %{gem_dir}/specifications/default/uri-0.10.0.gemspec
-%{gem_dir}/specifications/default/webrick-1.6.0.gemspec
+%{gem_dir}/specifications/default/webrick-1.6.1.gemspec
 %{gem_dir}/specifications/default/yaml-0.1.0.gemspec
 %{gem_dir}/specifications/default/zlib-1.1.0.gemspec
 
@@ -1308,6 +1328,28 @@ make check TESTS="-v $DISABLE_TESTS" MSPECOPT="-fs $MSPECOPTS"
 
 
 %changelog
+* Thu Jul 15 2021 Jun Aruga <jaruga@redhat.com> - 2.7.4-137
+- Upgrade to Ruby 2.7.4.
+- Fix command injection vulnerability in RDoc.
+  Resolves: rhbz#1986768
+- Fix FTP PASV command response can cause Net::FTP to connect to arbitrary host.
+  Resolves: rhbz#1986812
+- Fix StartTLS stripping vulnerability in Net::IMAP.
+  Resolves: rhbz#1986813
+- Upgrade to Bundler 2.2.24.
+  Resolves: CVE-2020-36327
+
+* Wed Apr 07 2021 Pavel Valena <pvalena@redhat.com> - 2.7.3-136
+- Upgrade to Ruby 2.7.3.
+  Resolves: rhbz#1951999
+- Resolv::DNS: timeouts if multiple IPv6 name servers are given and address
+  contains leading zero
+  Resolves: rhbz#1952000
+
+* Tue Oct 13 2020 Vít Ondruch <vondruch@redhat.com> - 2.7.2-135
+- Upgrade to Ruby 2.7.2.
+- Avoid possible timeout errors in TestBugReporter#test_bug_reporter_add.
+
 * Fri Jun 26 2020 Vít Ondruch <vondruch@redhat.com> - 2.7.1-133
 - Fix `require` behavior allowing to load libraries multiple times.
   Resolves: rhbz#1842989