Update to RubyGems 3.2.14.

Resolves: rhbz#1905813 Resolves: rhbz#1923699
2021-03-10 19:07:22 +01:00
9 changed files with 114 additions and 667 deletions
--- a/ruby-2.3.0-ruby_version.patch
+++ b/ruby-2.3.0-ruby_version.patch
@ -12,33 +12,33 @@ diff --git a/lib/rubygems/defaults.rb b/lib/rubygems/defaults.rb
 index d4ff4a262c..3f9a5bf590 100644
 --- a/lib/rubygems/defaults.rb
 +++ b/lib/rubygems/defaults.rb
-@@ -32,13 +32,13 @@ def self.default_dir
+@@ -38,13 +38,13 @@ def self.default_dir
              [
                File.dirname(RbConfig::CONFIG['sitedir']),
                'Gems',
-               RbConfig::CONFIG['ruby_version']
+-               RbConfig::CONFIG['ruby_version'],
 +               RbConfig::CONFIG['ruby_version_dir_name'] || RbConfig::CONFIG['ruby_version']
              ]
            else
              [
                RbConfig::CONFIG['rubylibprefix'],
                'gems',
-               RbConfig::CONFIG['ruby_version']
+-               RbConfig::CONFIG['ruby_version'],
 +               RbConfig::CONFIG['ruby_version_dir_name'] || RbConfig::CONFIG['ruby_version']
              ]
            end
 
-@@ -75,7 +75,8 @@ def self.default_specifications_dir
- 
-   def self.user_dir
-     parts = [Gem.user_home, '.gem', ruby_engine]
+@@ -117,7 +117,8 @@ def self.user_dir
+     gem_dir = File.join(Gem.user_home, ".gem")
+     gem_dir = File.join(Gem.data_home, "gem") unless File.exist?(gem_dir)
+     parts = [gem_dir, ruby_engine]
 -    parts << RbConfig::CONFIG['ruby_version'] unless RbConfig::CONFIG['ruby_version'].empty?
 +    ruby_version_dir_name = RbConfig::CONFIG['ruby_version_dir_name'] || RbConfig::CONFIG['ruby_version']
 +    parts << ruby_version_dir_name unless ruby_version_dir_name.empty?
     File.join parts
   end
 
-@@ -158,7 +159,7 @@ def self.vendor_dir # :nodoc:
+@@ -252,7 +253,7 @@ def self.vendor_dir # :nodoc:
     return nil unless RbConfig::CONFIG.key? 'vendordir'
 
     File.join RbConfig::CONFIG['vendordir'], 'gems',
@ -51,7 +51,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
-@@ -1378,7 +1378,8 @@ def test_self_use_paths
+@@ -1452,7 +1452,8 @@ def test_self_use_paths
 
   def test_self_user_dir
     parts = [@userhome, '.gem', Gem.ruby_engine]
@ -59,9 +59,9 @@ index b25068405d..e9fef4a311 100644
 +    ruby_version_dir_name = RbConfig::CONFIG['ruby_version_dir_name'] || RbConfig::CONFIG['ruby_version']
 +    parts << ruby_version_dir_name unless ruby_version_dir_name.empty?
 
-     assert_equal File.join(parts), Gem.user_dir
-   end
-@@ -1454,7 +1455,7 @@ def test_self_vendor_dir
+     FileUtils.mkdir_p File.join(parts)
+ 
+@@ -1530,7 +1531,7 @@ def test_self_vendor_dir
     vendordir(File.join(@tempdir, 'vendor')) do
       expected =
         File.join RbConfig::CONFIG['vendordir'], 'gems',
--- a/rubygems-3.1.3-Avoid-Bundler-installation.patch
+++ b/rubygems-3.1.3-Avoid-Bundler-installation.patch
@ -2,7 +2,7 @@ diff --git a/setup.rb b/setup.rb
 index 16ffa7215..49f6bfca5 100644
 --- a/setup.rb
 +++ b/setup.rb
-@@ -31,6 +31,12 @@ require 'rubygems/exceptions'
+@@ -26,6 +26,12 @@ require 'rubygems/exceptions'
 
 Gem::CommandManager.instance.register_command :setup
 
--- a/rubygems-3.1.3-Fix-I-require-priority.patch
+++ b/rubygems-3.1.3-Fix-I-require-priority.patch
@ -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
--- a/rubygems-3.1.3-Fix-correctness-and-performance-regression-in-require.patch
+++ b/rubygems-3.1.3-Fix-correctness-and-performance-regression-in-require.patch
@ -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
-@@ -662,10 +662,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
-@@ -385,6 +385,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
-@@ -659,7 +659,7 @@ def self.load_path_insert_index
- 
-     index = $LOAD_PATH.index RbConfig::CONFIG['sitelibdir']
- 
-    index
-+    index || 0
-   end
- 
-   ##
-@@ -676,15 +676,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
--- a/rubygems-3.1.3-Improve-require.patch
+++ b/rubygems-3.1.3-Improve-require.patch
@ -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
- 
--- a/rubygems-3.1.3-Revert-Exclude-empty-suffix-from-I-require-loop.patch
+++ b/rubygems-3.1.3-Revert-Exclude-empty-suffix-from-I-require-loop.patch
@ -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
- 
--- a/rubygems-3.2.14-Allow-to-run-test-suite-from-release-tarball.patch
+++ b/rubygems-3.2.14-Allow-to-run-test-suite-from-release-tarball.patch
@ -0,0 +1,51 @@
+From 5c42ecf4457f7db4194ded5a64d48754752fc03f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
+Date: Wed, 10 Mar 2021 16:53:26 +0100
+Subject: [PATCH] Allow to run test suite from release tarball.
+
+Just skip the Automatie if not avialable. It is not essential to run the
+test suite.
+
+Fixes #4430
+---
+ Rakefile | 24 ++++++++++++++----------
+ 1 file changed, 14 insertions(+), 10 deletions(-)
+
+diff --git a/Rakefile b/Rakefile
+index 8b1164559..393f65954 100644
+--- a/Rakefile
+++ b/Rakefile
+@@ -58,16 +58,20 @@ RDoc::Task.new :rdoc => 'docs', :clobber_rdoc => 'clobber_docs' do |doc|
+   doc.rdoc_dir = 'doc'
+ end
+ 
+-load "util/automatiek.rake"
+-
+-# We currently ship Molinillo master branch as of
+-# https://github.com/CocoaPods/Molinillo/commit/7cc27a355e861bdf593e2cde7bf1bca3daae4303
+-Automatiek::RakeTask.new("molinillo") do |lib|
+-  lib.version = "master"
+-  lib.download = { :github => "https://github.com/CocoaPods/Molinillo" }
+-  lib.namespace = "Molinillo"
+-  lib.prefix = "Gem::Resolver"
+-  lib.vendor_lib = "lib/rubygems/resolver/molinillo"
+begin
+  load "util/automatiek.rake"
+
+  # We currently ship Molinillo master branch as of
+  # https://github.com/CocoaPods/Molinillo/commit/7cc27a355e861bdf593e2cde7bf1bca3daae4303
+  Automatiek::RakeTask.new("molinillo") do |lib|
+    lib.version = "master"
+    lib.download = { :github => "https://github.com/CocoaPods/Molinillo" }
+    lib.namespace = "Molinillo"
+    lib.prefix = "Gem::Resolver"
+    lib.vendor_lib = "lib/rubygems/resolver/molinillo"
+  end
+rescue LoadError
+  # `rake` is likely executed from released tarball. Just ignore the issue.
+ end
+ 
+ namespace :rubocop do
+-- 
+2.30.0
+
--- a/rubygems.spec
+++ b/rubygems.spec
@ -3,14 +3,14 @@
 #

 # Bundled libraries versions
-%global molinillo_version 0.5.7
+%global molinillo_version 0.7.0

 # Requires versions
-%global bundler_version 2.1.4
-%global io_console_version 0.4.6
-%global openssl_version 2.0.2
-%global psych_version 2.2.2
-%global rdoc_version 5.0.0
+%global bundler_version 2.2.14
+%global io_console_version 0.5.6
+%global openssl_version 2.2.0
+%global psych_version 3.3.0
+%global rdoc_version 6.3.0

 # The RubyGems library has to stay out of Ruby directory tree, since the
 # RubyGems should be share by all Ruby implementations.
@ -23,7 +23,7 @@

 # Executing testsuite (enabling %%check section) will cause dependency loop.
 # To avoid dependency loop when necessary, please set the following value to 0
-%global enable_check 1
+%bcond_with bootstrap

 # It cannot be relied on %%{_libdir} for noarch packages. Query Ruby for
 # the right value.
@ -32,12 +32,12 @@

 Summary: The Ruby standard for packaging ruby libraries
 Name: rubygems
-Version: 3.1.4
-Release: 202%{?dist}
+Version: 3.2.14
+Release: 200%{?dist}
 License: Ruby or MIT

 URL: https://rubygems.org/
-Source0: http://production.cf.rubygems.org/rubygems/%{name}-%{version}.tgz
+Source0: https://rubygems.org/rubygems/%{name}-%{version}.tgz
 # Sources from the works by Vít Ondruch <vondruch@redhat.com>
 # NOTE: Keep Source1 in sync with ruby.spec.
 Source1: operating_system.rb
@ -57,18 +57,10 @@ Patch0: ruby-2.3.0-ruby_version.patch
 # independent package, therefore just ignore the installation altogether.
 # https://github.com/rubygems/rubygems/issues/3604
 Patch1: rubygems-3.1.3-Avoid-Bundler-installation.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
-Patch2: rubygems-3.1.3-Fix-I-require-priority.patch
-# https://github.com/rubygems/rubygems/pull/3133
-Patch3: rubygems-3.1.3-Improve-require.patch
-# https://github.com/rubygems/rubygems/pull/3153
-Patch4: rubygems-3.1.3-Revert-Exclude-empty-suffix-from-I-require-loop.patch
-# https://github.com/rubygems/rubygems/pull/3639
-Patch5: rubygems-3.1.3-Fix-correctness-and-performance-regression-in-require.patch
+# Remove unnecessary dependencies from Rakefile to make it usable to execute
+# the test suite.
+# https://github.com/rubygems/rubygems/pull/4447
+Patch2: rubygems-3.2.14-Allow-to-run-test-suite-from-release-tarball.patch


 Requires:   ruby(release)
@ -80,7 +72,7 @@ Requires:   rubygem(psych) >= %{psych_version}
 BuildRequires: ruby(release)
 BuildRequires: rubygems-devel
 BuildRequires: rubygem(rdoc)
-%if %{enable_check}
+%if %{without bootstrap}
 # For mkmf.rb
 BuildRequires: ruby-devel
 BuildRequires: rubygem(minitest)
@ -88,11 +80,12 @@ BuildRequires: %{_bindir}/cmake
 BuildRequires: %{_bindir}/git
 BuildRequires: %{_bindir}/gcc
 BuildRequires: rubygem(builder)
+BuildRequires: rubygem(rake)
+BuildRequires: rubygem(webrick)
 %endif
 Provides:   gem = %{version}-%{release}
 Provides:   ruby(rubygems) = %{version}-%{release}
 # https://github.com/rubygems/rubygems/pull/1189#issuecomment-121600910
-Provides:   bundled(rubygem(molinillo)) = %{molinillo_version}
 Provides:   bundled(rubygem-molinillo) = %{molinillo_version}
 BuildArch:  noarch

@ -115,9 +108,6 @@ Documentation for %{name}.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1

 %build
 # Nothing
@ -142,22 +132,22 @@ rmdir %{buildroot}%{rubygems_dir}/lib

 # Kill bundled certificates, as they should be part of ca-certificates.
 for cert in \
-  rubygems.global.ssl.fastly.net/DigiCertHighAssuranceEVRootCA.pem \
-  rubygems.org/AddTrustExternalCARoot.pem \
-  index.rubygems.org/GlobalSignRootCA.pem
+  .document \
+  rubygems.org/GlobalSignRootCA.pem \
+  rubygems.org/GlobalSignRootCA_R3.pem
 do
  rm %{buildroot}%{rubygems_dir}/rubygems/ssl_certs/$cert
-  rm -r $(dirname %{buildroot}%{rubygems_dir}/rubygems/ssl_certs/$cert)
+  rm -d $(dirname %{buildroot}%{rubygems_dir}/rubygems/ssl_certs/$cert) || :
 done
 # Ensure there is not forgotten any certificate.
-test ! "$(ls -A  %{buildroot}%{rubygems_dir}/rubygems/ssl_certs/ 2>/dev/null)"
+test ! "$(ls -A %{buildroot}%{rubygems_dir}/rubygems/ssl_certs/ 2>/dev/null)"

 # Install custom operating_system.rb.
 mkdir -p %{buildroot}%{rubygems_dir}/rubygems/defaults
 install -cpm 0644 %{SOURCE1} %{buildroot}%{rubygems_dir}/rubygems/defaults/

 # Create gem folders.
-mkdir -p %{buildroot}%{gem_dir}/{cache,gems,specifications,extensions,doc}
+mkdir -p %{buildroot}%{gem_dir}/{cache,gems,specifications,extensions,doc,plugins}
 mkdir -p %{buildroot}%{gem_extdir}/ruby

 # Create below
@ -175,21 +165,29 @@ touch lib/rubygems/defaults/operating_system.rb

 # It is necessary to specify the paths to let the test suite pass."
 export GEM_PATH=%{gem_dir}
-export RUBYOPT="--disable-gems -Ilib:test:bundler/lib"

 # Check Molinillo version correctness.
-[ "`ruby -e 'module Gem; module Resolver; end; end; require %{rubygems/resolver/molinillo/lib/molinillo/gem_metadata}; puts Gem::Resolver::Molinillo::VERSION' | tail -1`" \
+[ "`RUBYOPT=-Ilib ruby -e 'module Gem; class Resolver; end; end; require %{rubygems/resolver/molinillo/lib/molinillo/gem_metadata}; puts Gem::Resolver::Molinillo::VERSION' | tail -1`" \
  == '%{molinillo_version}' ]

 # Check Bundler version.
-[ "`ruby -rbundler/version -e 'puts Bundler::VERSION'| tail -1`" \
+[ "`RUBYOPT=-Ibundler/lib ruby -rbundler/version -e 'puts Bundler::VERSION'| tail -1`" \
  == '%{bundler_version}' ]


-%if %{enable_check}
+%if %{without bootstrap}
+# util directory with changelog generator are not shipped in release archive.
+mv test/test_changelog_generator.rb{,.disabled}
+
 # TestProjectSanity#test_manifest_is_up_to_date is of no interest and it
 # expects to work in git repository.
-ruby -e 'Dir.glob "./test/**/test_*.rb", &method(:require)' -- -e /test_manifest_is_up_to_date/ -v
+# TestGemExtExtConfBuilder#test_class_(build_rbconfig_make_prog|build|build_env_make)
+# are failing, because they cannot locate `gem.build_complete` file.
+# https://github.com/rubygems/rubygems/pull/4440
+# The `test_realworld_{default_gem,upgraded_default_gem}` needs the same
+# treatment as the have in Ruby repository.
+GEM_COMMAND="skip test_realworld_{default_gem,upgraded_default_gem}" \
+  rake TESTOPTS='- -v "-e /test_(manifest_is_up_to_date|class_(build_rbconfig_make_prog|build|build_env_make))/"'

 # CVE vulnerability check
 ruby %{SOURCE11}
@ -197,14 +195,18 @@ ruby %{SOURCE12}
 %endif

 %files
-%doc README* 
-%doc History.txt
+%doc CODE_OF_CONDUCT.md
+%doc CHANGELOG.md
+%doc CONTRIBUTING.md
+%doc MAINTAINERS.txt
+%doc POLICIES.md
+%doc README.md
+%doc UPGRADING.md
 %license MIT.txt LICENSE.txt
 %{_bindir}/gem
 %dir %{rubygems_dir}
 %{rubygems_dir}/rubygems
 %{rubygems_dir}/rubygems.rb
-%{rubygems_dir}/ubygems.rb

 # Explicitly include only RubyGems directory strucure to avoid accidentally
 # packaged content.
@ -214,6 +216,7 @@ ruby %{SOURCE12}
 %dir %{gem_dir}/doc
 %dir %{gem_dir}/extensions
 %dir %{gem_dir}/gems
+%dir %{gem_dir}/plugins
 %dir %{gem_dir}/specifications
 %dir %{gem_dir}/specifications/default
 %dir %{_exec_prefix}/lib*/gems
@ -224,6 +227,11 @@ ruby %{SOURCE12}


 %changelog
+* Fri Mar 05 2021 Vít Ondruch <vondruch@redhat.com> - 3.2.14-200
+- Update to RubyGems 3.2.14.
+  Resolves: rhbz#1905813
+  Resolves: rhbz#1923699
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.4-202
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (rubygems-3.1.4.tgz) = 86bb42736ccf320929eb12c83b3ce55fe95053ce5b38434902604d8d61d78c3f3cd8f20858d0fed66c473ef9fd70d7cb596c077cd06506caeac3e62ee6812ad2
+SHA512 (rubygems-3.2.14.tgz) = de28bdfdc239cd49bb5a1f78f0a9e3ec432fb70c8326c7899f7ef0a088f60becd99ba81285b20388296f96afb46ca3ca359208621d88a6be68b7388d155a2383