ruby update 2.7.2-137

Signed-off-by: basebuilder_pel7ppc64lebuilder0 <basebuilder@powerel.org>
4 years ago · 8694b26c7d
16 changed files with 1184 additions and 243 deletions
--- 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}], [
+@@ -3105,6 +3105,11 @@ AS_IF([test ${multiarch+set}], [
 ])
 archlibdir='${libdir}/${arch}'
--- 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"],
+@@ -3743,7 +3743,8 @@ AS_CASE(["$ruby_version_dir_name"],
 ruby_version_dir=/'${ruby_version_dir_name}'
 if test -z "${ruby_version_dir_name}"; then
--- 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
+@@ -3807,6 +3807,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
--- 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,
+@@ -3779,6 +3779,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
+@@ -3803,6 +3807,7 @@ AC_SUBST(sitearchdir)dnl
 AC_SUBST(vendordir)dnl
 AC_SUBST(vendorlibdir)dnl
 AC_SUBST(vendorarchdir)dnl
@ -67,15 +67,15 @@ diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
 index b47b6e1..0b99408 100755
 --- a/tool/rbinstall.rb
 +++ b/tool/rbinstall.rb
-@@ -338,6 +338,7 @@ def CONFIG.[](name, mandatory = false)
+@@ -343,6 +343,7 @@ def CONFIG.[](name, mandatory = false)
- sitearchlibdir = CONFIG["sitearchdir"]
+   vendorlibdir = CONFIG["vendorlibdir"]
- vendorlibdir = CONFIG["vendorlibdir"]
+   vendorarchlibdir = CONFIG["vendorarchdir"]
- vendorarchlibdir = CONFIG["vendorarchdir"]
+ end
 +rubygemsdir = CONFIG["rubygemsdir"]
 mandir = CONFIG["mandir", true]
 docdir = CONFIG["docdir", true]
 enable_shared = CONFIG["ENABLE_SHARED"] == 'yes'
-@@ -565,7 +566,16 @@ def stub
+@@ -570,7 +571,16 @@ def stub
 install?(:local, :comm, :lib) do
   prepare "library scripts", rubylibdir
   noinst = %w[*.txt *.rdoc *.gemspec]
--- 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"],
+@@ -3694,9 +3694,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,
+@@ -3719,56 +3716,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
+@@ -3785,6 +3788,7 @@ AC_SUBST(sitearchincludedir)dnl
 AC_SUBST(arch)dnl
 AC_SUBST(sitearch)dnl
 AC_SUBST(ruby_version)dnl
@ -171,7 +171,7 @@ diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
 index d4c110e..d39c9a6 100755
 --- a/tool/rbinstall.rb
 +++ b/tool/rbinstall.rb
-@@ -428,7 +428,7 @@ def CONFIG.[](name, mandatory = false)
+@@ -433,7 +433,7 @@ def CONFIG.[](name, mandatory = false)
 install?(:doc, :rdoc) do
   if $rdocdir
@ -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',
--- 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 ------------------------------------------
+ test/fiddle/helper.rb | 111 ------------------------------------------
- 1 file changed, 105 deletions(-)
+ 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"
+-  libc_so = libm_so = "/usr/lib/libSystem.B.dylib"
 -  libm_so = "/usr/lib/libm.dylib"
 -when /kfreebsd/
 -  libc_so = "/lib/libc.so.0.1"
 -  libm_so = "/lib/libm.so.1"
@ -123,6 +122,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
--- 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);
--- a/SOURCES/ruby-2.7.0-Remove-RubyGems-dependency.patch
+++ b/SOURCES/ruby-2.7.0-Remove-RubyGems-dependency.patch
@ -13,7 +13,7 @@ diff --git a/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb b
 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
-@@ -202,10 +202,10 @@ class Bundler::Persistent::Net::HTTP::Persistent
+@@ -197,10 +197,10 @@ class Bundler::Persistent::Net::HTTP::Persistent
   ##
   # The default connection pool size is 1/4 the allowed open files.
--- 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
@ -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
--- a/SOURCES/ruby-2.8.0-remove-unneeded-gem-require-for-ipaddr.patch
+++ b/SOURCES/ruby-2.8.0-remove-unneeded-gem-require-for-ipaddr.patch
@ -0,0 +1,22 @@
 From 0689147586c6cb56b91bf0f368890f19d630ece1 Mon Sep 17 00:00:00 2001
 From: nobletrout <nobletrout@gmail.com>
 Date: Tue, 5 Feb 2019 08:14:02 -0500
 Subject: [PATCH] remove unneeded gem require for ipaddr
 ipaddr is a builtin class for ruby, that is occasionally merged. If the version isn't specified by the runtime dependency, then it will default to needing the latest gem rather than the version that ships with that version of ruby. That will lead to all kinds of potential dependency fails that are most likely unneeded since this gem already requires ruby > 2.3.0
 ---
 ext/openssl/openssl.gemspec | 1 -
 1 file changed, 1 deletion(-)
 diff --git a/ext/openssl/openssl.gemspec b/ext/openssl/openssl.gemspec
 index 7c17cd54..f721f247 100644
 --- a/ext/openssl/openssl.gemspec
 +++ b/ext/openssl/openssl.gemspec
@@ -21,7 +21,6 @@ Gem::Specification.new do |spec|
   s.rubygems_version = "3.0.0.beta1"
   s.summary = "OpenSSL provides SSL, TLS and general purpose cryptography."
 -  s.add_runtime_dependency("ipaddr", [">= 0"])
   s.add_development_dependency("rake", [">= 0"])
   s.add_development_dependency("rake-compiler", [">= 0"])
   s.add_development_dependency("test-unit", ["~> 3.0"])
--- a/SOURCES/ruby-3.0.0-preview1-Enable-arm64-optimizations-that-exist-for-power-x86.patch
+++ b/SOURCES/ruby-3.0.0-preview1-Enable-arm64-optimizations-that-exist-for-power-x86.patch
@ -0,0 +1,178 @@
 From c5806d668f84a86e9e6a522f84b8aa6cb4cdaae9 Mon Sep 17 00:00:00 2001
 From: Ali Saidi <alisaidi@amazon.com>
 Date: Wed, 5 Aug 2020 20:46:28 -0500
 Subject: [PATCH 1/3] Enable unaligned accesses on arm64
 64-bit Arm platforms support unaligned accesses.
 Running the string benchmarks this change improves performance
 by an average of 1.04x, min .96x, max 1.21x, median 1.01x
 ---
 include/ruby/defines.h         | 2 +-
 regint.h                       | 2 +-
 siphash.c                      | 2 +-
 st.c                           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 diff --git a/include/ruby/defines.h b/include/ruby/defines.h
 index 49f673ef936a..0193275e8b78 100644
 --- a/include/ruby/defines.h
 +++ b/include/ruby/defines.h
@@ -485,7 +485,7 @@
 #ifndef UNALIGNED_WORD_ACCESS
 # if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \
      defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || \
 -     defined(__powerpc64__) || \
 +     defined(__powerpc64__) || defined(__aarch64__) || \
      defined(__mc68020__)
 #   define UNALIGNED_WORD_ACCESS 1
 # else
 diff --git a/regint.h b/regint.h
 index a2f5bbba1d1f..0740429688bc 100644
 --- a/regint.h
 +++ b/regint.h
@@ -52,7 +52,7 @@
 #ifndef UNALIGNED_WORD_ACCESS
 # if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \
      defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || \
 -     defined(__powerpc64__) || \
 +     defined(__powerpc64__) || defined(__aarch64__) || \
      defined(__mc68020__)
 #  define UNALIGNED_WORD_ACCESS 1
 # else
 diff --git a/siphash.c b/siphash.c
 index 153d2c690ab9..ddf8ee245d81 100644
 --- a/siphash.c
 +++ b/siphash.c
@@ -30,7 +30,7 @@
 #ifndef UNALIGNED_WORD_ACCESS
 # if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \
      defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || \
 -     defined(__powerpc64__) || \
 +     defined(__powerpc64__) || defined(__aarch64__) || \
      defined(__mc68020__)
 #   define UNALIGNED_WORD_ACCESS 1
 # endif
 diff --git a/st.c b/st.c
 index c11535ef9779..8be466bf733f 100644
 --- a/st.c
 +++ b/st.c
@@ -1815,7 +1815,7 @@ st_values_check(st_table *tab, st_data_t *values, st_index_t size,
 #ifndef UNALIGNED_WORD_ACCESS
 # if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \
      defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || \
 -     defined(__powerpc64__) || \
 +     defined(__powerpc64__) || defined(__aarch64__) || \
      defined(__mc68020__)
 #   define UNALIGNED_WORD_ACCESS 1
 # endif
 From 79b7b9143fda0f33fc9375980cecc61eb42c6f66 Mon Sep 17 00:00:00 2001
 From: Ali Saidi <alisaidi@amazon.com>
 Date: Wed, 5 Aug 2020 21:04:37 -0500
 Subject: [PATCH 2/3] arm64 enable gc optimizations
 Similar to x86 and powerpc optimizations.
 |       |compare-ruby|built-ruby|
 |:------|-----------:|---------:|
 |hash1  |       0.225|     0.237|
 |       |           -|     1.05x|
 |hash2  |       0.110|     0.110|
 |       |       1.00x|         -|
 ---
 gc.c | 13 +++++++++++++
 gc.h |  2 ++
 2 files changed, 15 insertions(+)
 diff --git a/gc.c b/gc.c
 index 22972dfc806c..788f06f1586e 100644
 --- a/gc.c
 +++ b/gc.c
@@ -1153,6 +1153,19 @@ tick(void)
     return val;
 }
 +#elif defined(__aarch64__) &&  defined(__GNUC__)
 +typedef unsigned long tick_t;
 +#define PRItick "lu"
 +
 +static __inline__ tick_t
 +tick(void)
 +{
 +    unsigned long val;
 +    __asm__ __volatile__ ("mrs %0, cntvct_el0", : "=r" (val));
 +    return val;
 +}
 +
 +
 #elif defined(_WIN32) && defined(_MSC_VER)
 #include <intrin.h>
 typedef unsigned __int64 tick_t;
 diff --git a/gc.h b/gc.h
 index 6568079c54e5..47a4ca19a0c5 100644
 --- a/gc.h
 +++ b/gc.h
@@ -8,6 +8,8 @@
 #define SET_MACHINE_STACK_END(p) __asm__ __volatile__ ("movl\t%%esp, %0" : "=r" (*(p)))
 #elif defined(__powerpc64__) && defined(__GNUC__)
 #define SET_MACHINE_STACK_END(p) __asm__ __volatile__ ("mr\t%0, %%r1" : "=r" (*(p)))
 +#elif defined(__aarch64__) && defined(__GNUC__)
 +#define SET_MACHINE_STACK_END(p) __asm__ __volatile__ ("mov\t%0, sp" : "=r" (*(p)))
 #else
 NOINLINE(void rb_gc_set_stack_end(VALUE **stack_end_p));
 #define SET_MACHINE_STACK_END(p) rb_gc_set_stack_end(p)
 From c985b8c6868a380e44e285368af4a4f414ce3309 Mon Sep 17 00:00:00 2001
 From: Ali Saidi <alisaidi@amazon.com>
 Date: Wed, 5 Aug 2020 21:15:55 -0500
 Subject: [PATCH 3/3] vm_exec.c: improve performance for arm64
 |                               |compare-ruby|built-ruby|
 |:------------------------------|-----------:|---------:|
 |vm_array                       |     26.501M|   27.959M|
 |                               |           -|     1.06x|
 |vm_attr_ivar                   |     21.606M|   31.429M|
 |                               |           -|     1.45x|
 |vm_attr_ivar_set               |     21.178M|   26.113M|
 |                               |           -|     1.23x|
 |vm_backtrace                   |       6.621|     6.668|
 |                               |           -|     1.01x|
 |vm_bigarray                    |     26.205M|   29.958M|
 |                               |           -|     1.14x|
 |vm_bighash                     |    504.155k|  479.306k|
 |                               |       1.05x|         -|
 |vm_block                       |     16.692M|   21.315M|
 |                               |           -|     1.28x|
 |block_handler_type_iseq        |       5.083|     7.004|
 |                               |           -|     1.38x|
 ---
 vm_exec.c | 8 ++++++++
 1 file changed, 8 insertions(+)
 diff --git a/vm_exec.c b/vm_exec.c
 index ce2e053ee745..7aa56f6ad620 100644
 --- a/vm_exec.c
 +++ b/vm_exec.c
@@ -27,6 +27,9 @@ static void vm_insns_counter_count_insn(int insn) {}
 #elif defined(__GNUC__) && defined(__powerpc64__)
 #define DECL_SC_REG(type, r, reg) register type reg_##r __asm__("r" reg)
 +#elif defined(__GNUC__) && defined(__aarch64__)
 +#define DECL_SC_REG(type, r, reg) register type reg_##r __asm__("x" reg)
 +
 #else
 #define DECL_SC_REG(type, r, reg) register type reg_##r
 #endif
@@ -74,6 +77,11 @@ vm_exec_core(rb_execution_context_t *ec, VALUE initial)
     DECL_SC_REG(rb_control_frame_t *, cfp, "15");
 #define USE_MACHINE_REGS 1
 +#elif defined(__GNUC__) && defined(__aarch64__)
 +    DECL_SC_REG(const VALUE *, pc, "19");
 +    DECL_SC_REG(rb_control_frame_t *, cfp, "20");
 +#define USE_MACHINE_REGS 1
 +
 #else
     register rb_control_frame_t *reg_cfp;
     const VALUE *reg_pc;
--- a/SOURCES/rubygems-3.1.3-Fix-I-require-priority.patch
+++ b/SOURCES/rubygems-3.1.3-Fix-I-require-priority.patch
@ -0,0 +1,167 @@
 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/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
@ -0,0 +1,324 @@
 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/SOURCES/rubygems-3.1.3-Improve-require.patch
+++ b/SOURCES/rubygems-3.1.3-Improve-require.patch
@ -0,0 +1,92 @@
 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/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
@ -0,0 +1,29 @@
 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/SPECS/ruby.spec
+++ b/SPECS/ruby.spec
@ -1,6 +1,6 @@
 %global major_version 2
 %global minor_version 7
-%global teeny_version 0
+%global teeny_version 2
 %global major_minor_version %{major_version}.%{minor_version}
 %global ruby_version %{major_minor_version}.%{teeny_version}
@ -22,18 +22,19 @@
 %endif
-%global release 127
+%global release 137
-%define release_string %{release}%{?dist}
+%{!?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
 # RubyGems should be share by all Ruby implementations.
 %global rubygems_dir %{_datadir}/rubygems
 # Bundled libraries versions
-%global rubygems_version 3.1.2
+%global rubygems_version 3.1.4
 %global rubygems_molinillo_version 0.5.7
-%global bundler_version 2.1.2
+# Default gems.
 %global bundler_version 2.1.4
 %global bundler_connection_pool_version 2.2.2
 %global bundler_fileutils_version 1.3.0
 %global bundler_molinillo_version 0.6.6
@ -42,20 +43,22 @@
 %global bigdecimal_version 2.0.0
 %global did_you_mean_version 1.4.0
-%global io_console_version 0.5.3
+%global io_console_version 0.5.6
-%global irb_version 1.2.1
+%global irb_version 1.2.6
 %global json_version 2.3.0
 %global minitest_version 5.13.0
 %global net_telnet_version 0.2.0
 %global openssl_version 2.1.2
 %global power_assert_version 1.1.5
 %global psych_version 3.1.0
 %global racc_version 1.4.16
 %global rake_version 13.0.1
 %global rdoc_version 6.2.1
 %global test_unit_version 3.3.4
 %global xmlrpc_version 0.3.0
 # Bundled gems.
 %global minitest_version 5.13.0
 %global power_assert_version 1.1.7
 %global rake_version 13.0.1
 %global test_unit_version 3.3.4
 # Might not be needed in the future, if we are lucky enough.
 # https://bugzilla.redhat.com/show_bug.cgi?id=888262
 %global tapset_root %{_datadir}/systemtap
@ -78,6 +81,10 @@
 %bcond_without hardening_test
 %endif
 # LTO appears to cause some issue to SEGV handler.
 # https://bugs.ruby-lang.org/issues/17052
 %define _lto_cflags %{nil}
 Summary: An interpreter of object-oriented scripting language
 Name: ruby
 Version: %{ruby_version}
@ -143,20 +150,36 @@ 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
-
+# Prevent issues with openssl loading when RubyGems are disabled.
-# Add support for .include directive used by OpenSSL config files.
+# https://github.com/ruby/openssl/pull/242
-# https://github.com/ruby/openssl/pull/216
+Patch13: ruby-2.8.0-remove-unneeded-gem-require-for-ipaddr.patch
-Patch22: ruby-2.6.0-config-support-include-directive.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
 # 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
 # Enable arm64 optimizations.
 # https://bugzilla.redhat.com/show_bug.cgi?id=1884728
 # https://github.com/ruby/ruby/pull/3393
 Patch20: ruby-3.0.0-preview1-Enable-arm64-optimizations-that-exist-for-power-x86.patch
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-#Suggests: rubypick
+Requires: rubypick
-#Recommends: ruby(rubygems) >= %{rubygems_version}
+Requires: ruby(rubygems) >= %{rubygems_version}
-#Recommends: rubygem(bigdecimal) >= %{bigdecimal_version}
+Requires: rubygem(bigdecimal) >= %{bigdecimal_version}
 # Change this to requires, hopefully just as temporary measure.
 # https://bugs.ruby-lang.org/issues/16431
-Requires: rubygem(did_you_mean) >= %{did_you_mean_version}
+Requires: rubygem(openssl) >= %{openssl_version}
 #Recommends: rubygem(openssl) >= %{openssl_version}
 #Recommends: rubygem(racc) >= %{racc_version}
 BuildRequires: autoconf
 BuildRequires: gdbm-devel
@ -176,6 +199,7 @@ BuildRequires: procps
 %{?with_hostname:BuildRequires: %{_bindir}/hostname}
 BuildRequires: multilib-rpm-config
 BuildRequires: gcc
 BuildRequires: make
 BuildRequires: zlib-devel
 # This package provides %%{_bindir}/ruby-mri therefore it is marked by this
@ -195,6 +219,9 @@ Requires:   %{name}%{?_isa} = %{version}-%{release}
 # This would not be needed if ~50 packages depending on -devel used
 # --disable-gems
 Requires:   rubygems
 # Users need CFLAGS from /usr/lib/rpm/redhat/redhat-hardened-cc1
 # for building gems with binary extensions (rhbz#1905222).
 Requires: powerel-rpm-config
 %description devel
 Header files and libraries for building an extension library for the
@ -212,6 +239,10 @@ Provides: bundled(ccan-check_type)
 Provides: bundled(ccan-container_of)
 Provides: bundled(ccan-list)
 # StdLib default gems.
 Provides: bundled(rubygem-did_you_mean) = %{did_you_mean_version}
 Provides: bundled(rubygem-racc) = %{racc_version}
 # Tcl/Tk support was removed from stdlib in Ruby 2.4, i.e. F27 timeframe
 # so lets obsolete it. This is not the best place, but we don't have
 # better, unless https://fedorahosted.org/fpc/ticket/645 provides some
@ -229,9 +260,9 @@ Summary:    The Ruby standard for packaging ruby libraries
 Version:    %{rubygems_version}
 License:    Ruby or MIT
 Requires:   ruby(release)
-#Recommends: rubygem(bundler) >= %{bundler_version}
+Requires:   rubygem(bundler) >= %{bundler_version}
-#Recommends: rubygem(rdoc) >= %{rdoc_version}
+Requires:   rubygem(rdoc) >= %{rdoc_version}
-#Recommends: rubygem(io-console) >= %{io_console_version}
+Requires:   rubygem(io-console) >= %{io_console_version}
 Requires:   rubygem(openssl) >= %{openssl_version}
 Requires:   rubygem(psych) >= %{psych_version}
 Provides:   gem = %{version}-%{release}
@ -249,7 +280,7 @@ libraries.
 Summary:    Macros and development tools for packaging RubyGems
 Version:    %{rubygems_version}
 License:    Ruby or MIT
-Requires:   ruby(rubygems) = %{version}-%{release}
+Requires:   ruby(rubygems) >= %{version}-%{release}
 # Needed for RDoc documentation format generation.
 Requires:   rubygem(json) >= %{json_version}
 Requires:   rubygem(rdoc) >= %{rdoc_version}
@ -259,19 +290,23 @@ BuildArch:  noarch
 Macros and development tools for packaging RubyGems.
-%package -n rubygem-rake
+# Default gems
-Summary:    Ruby based make-like utility
+#
-Version:    %{rake_version}
+# These packages are part of Ruby StdLib and are expected to be loadable even
-License:    MIT
+# with disabled RubyGems.
-Requires:   ruby(release)
+
 %package default-gems
 Summary:    Default gems which are part of Ruby StdLib.
 Requires:   ruby(rubygems) >= %{rubygems_version}
-Provides:   rake = %{version}-%{release}
+#Supplements: ruby(rubygems)
-Provides:   rubygem(rake) = %{version}-%{release}
+# Obsoleted by Ruby 2.7 in F32 timeframe.
 Obsoletes: rubygem-did_you_mean < 1.4.0-130
 Obsoletes: rubygem-racc < 1.4.16-130
 BuildArch:  noarch
-%description -n rubygem-rake
+%description default-gems
-Rake is a Make-like program implemented in Ruby. Tasks and dependencies are
+The .gemspec files and executables of default gems, which are part of Ruby
-specified in standard Ruby syntax.
+StdLib.
 %package -n rubygem-irb
@ -279,6 +314,9 @@ Summary:    The Interactive Ruby
 Version:    %{irb_version}
 Requires:   ruby(release)
 Requires:   ruby(rubygems) >= %{rubygems_version}
 # ruby-default-gems is required to run irb.
 # https://bugs.ruby-lang.org/issues/16951
 Requires:   ruby-default-gems >= %{ruby_version}
 Provides:   irb = %{version}-%{release}
 Provides:   rubygem(irb) = %{version}-%{release}
 # Obsoleted by Ruby 2.6 in F30 timeframe.
@ -343,20 +381,6 @@ floating point arithmetic often introduces subtle errors because of the
 conversion between base 10 and base 2.
 %package -n rubygem-did_you_mean
 Summary:    "Did you mean?" experience in Ruby
 Version:    %{did_you_mean_version}
 License:    MIT
 Requires:   ruby(release)
 Requires:   ruby(rubygems) >= %{rubygems_version}
 Provides:   rubygem(did_you_mean) = %{version}-%{release}
 BuildArch:  noarch
 %description -n rubygem-did_you_mean
 "did you mean?" experience in Ruby: the error message will tell you the right
 one when you misspelled something.
 %package -n rubygem-io-console
 Summary:    IO/Console is a simple console utilizing library
 Version:    %{io_console_version}
@ -385,6 +409,60 @@ data to disk or transmit it over a network rather than use a verbose
 markup language.
 %package -n rubygem-openssl
 Summary:    OpenSSL provides SSL, TLS and general purpose cryptography
 Version:    %{openssl_version}
 License:    Ruby or BSD
 Requires:   ruby(release)
 Requires:   ruby(rubygems) >= %{rubygems_version}
 Provides:   rubygem(openssl) = %{version}-%{release}
 %description -n rubygem-openssl
 OpenSSL provides SSL, TLS and general purpose cryptography. It wraps the
 OpenSSL library.
 %package -n rubygem-psych
 Summary:    A libyaml wrapper for Ruby
 Version:    %{psych_version}
 License:    MIT
 Requires:   ruby(release)
 Requires:   ruby(rubygems) >= %{rubygems_version}
 Provides:   rubygem(psych) = %{version}-%{release}
 %description -n rubygem-psych
 Psych is a YAML parser and emitter. Psych leverages
 libyaml[http://pyyaml.org/wiki/LibYAML] for its YAML parsing and emitting
 capabilities. In addition to wrapping libyaml, Psych also knows how to
 serialize and de-serialize most Ruby objects to and from the YAML format.
 %package -n rubygem-bundler
 Summary:    Library and utilities to manage a Ruby application's gem dependencies
 Version:    %{bundler_version}
 License:    MIT
 Requires:   ruby(release)
 Requires:   ruby(rubygems) >= %{rubygems_version}
 Requires:   rubygem(io-console)
 Provides:   rubygem(bundler) = %{version}-%{release}
 # https://github.com/bundler/bundler/issues/3647
 Provides:   bundled(connection_pool) = %{bundler_connection_pool_version}
 Provides:   bundled(rubygem-fileutils) = %{bundler_fileutils_version}
 Provides:   bundled(rubygem-molinillo) = %{bundler_molinillo_version}
 Provides:   bundled(rubygem-net-http-persisntent) = %{bundler_net_http_persistent_version}
 Provides:   bundled(rubygem-thor) = %{bundler_thor_version}
 BuildArch:  noarch
 %description -n rubygem-bundler
 Bundler manages an application's dependencies through its entire life, across
 many machines, systematically and repeatably.
 # Bundled gems
 #
 # These are regular packages, which might be installed just optionally. Users
 # should list them among their dependencies (in Gemfile).
 %package -n rubygem-minitest
 Summary:    Minitest provides a complete suite of testing facilities
 Version:    %{minitest_version}
@ -409,19 +487,6 @@ minitest/pride shows pride in testing and adds coloring to your test
 output.
 %package -n rubygem-openssl
 Summary:    OpenSSL provides SSL, TLS and general purpose cryptography
 Version:    %{openssl_version}
 License:    Ruby or BSD
 Requires:   ruby(release)
 Requires:   ruby(rubygems) >= %{rubygems_version}
 Provides:   rubygem(openssl) = %{version}-%{release}
 %description -n rubygem-openssl
 OpenSSL provides SSL, TLS and general purpose cryptography. It wraps the
 OpenSSL library.
 %package -n rubygem-power_assert
 Summary:    Power Assert for Ruby
 Version:    %{power_assert_version}
@ -437,19 +502,19 @@ It is useful for testing, providing which value wasn't correct when the
 condition is not satisfied.
-%package -n rubygem-psych
+%package -n rubygem-rake
-Summary:    A libyaml wrapper for Ruby
+Summary:    Ruby based make-like utility
-Version:    %{psych_version}
+Version:    %{rake_version}
 License:    MIT
 Requires:   ruby(release)
 Requires:   ruby(rubygems) >= %{rubygems_version}
-Provides:   rubygem(psych) = %{version}-%{release}
+Provides:   rake = %{version}-%{release}
 Provides:   rubygem(rake) = %{version}-%{release}
 BuildArch:  noarch
-%description -n rubygem-psych
+%description -n rubygem-rake
-Psych is a YAML parser and emitter. Psych leverages
+Rake is a Make-like program implemented in Ruby. Tasks and dependencies are
-libyaml[http://pyyaml.org/wiki/LibYAML] for its YAML parsing and emitting
+specified in standard Ruby syntax.
 capabilities. In addition to wrapping libyaml, Psych also knows how to
 serialize and de-serialize most Ruby objects to and from the YAML format.
 %package -n rubygem-net-telnet
@ -504,40 +569,6 @@ XMLRPC is a lightweight protocol that enables remote procedure calls over
 HTTP.
 %package -n rubygem-bundler
 Summary:    Library and utilities to manage a Ruby application's gem dependencies
 Version:    %{bundler_version}
 License:    MIT
 Requires:   ruby(release)
 Requires:   ruby(rubygems) >= %{rubygems_version}
 Requires:   rubygem(io-console)
 Provides:   rubygem(bundler) = %{version}-%{release}
 # https://github.com/bundler/bundler/issues/3647
 Provides:   bundled(connection_pool) = %{bundler_connection_pool_version}
 Provides:   bundled(rubygem-fileutils) = %{bundler_fileutils_version}
 Provides:   bundled(rubygem-molinillo) = %{bundler_molinillo_version}
 Provides:   bundled(rubygem-net-http-persisntent) = %{bundler_net_http_persistent_version}
 Provides:   bundled(rubygem-thor) = %{bundler_thor_version}
 BuildArch:  noarch
 %description -n rubygem-bundler
 Bundler manages an application's dependencies through its entire life, across
 many machines, systematically and repeatably.
 %package -n rubygem-racc
 Summary:    Racc is a LALR(1) parser generator
 Version:    %{racc_version}
 License:    MIT
 Requires:   ruby(release)
 Requires:   ruby(rubygems) >= %{rubygems_version}
 Provides:   rubygem(racc) = %{version}-%{release}
 %description -n rubygem-racc
 Racc is a LALR(1) parser generator. It is written in Ruby itself, and
 generates Ruby program.
 %prep
 %setup -q -n %{ruby_archive}
@ -554,7 +585,13 @@ rm -rf ext/fiddle/libffi*
 %patch6 -p1
 %patch9 -p1
 %patch10 -p1
-%patch22 -p1
+%patch13 -p1
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
 # Provide an example of usage of the tapset:
 cp -a %{SOURCE3} .
@ -636,7 +673,7 @@ mkdir -p %{buildroot}%{rubygems_dir}/rubygems/defaults
 cp %{SOURCE1} %{buildroot}%{rubygems_dir}/rubygems/defaults
 # Move gems root into common direcotry, out of Ruby directory structure.
-#mv %{buildroot}%{ruby_libdir}/gems %{buildroot}%{gem_dir}
+mv %{buildroot}%{ruby_libdir}/gems %{buildroot}%{gem_dir}
 # Create folders for gem binary extensions.
 # TODO: These folders should go into rubygem-filesystem but how to achieve it,
@ -677,11 +714,6 @@ mv %{buildroot}%{ruby_libdir}/bundler.rb %{buildroot}%{gem_dir}/gems/bundler-%{b
 mv %{buildroot}%{ruby_libdir}/bundler %{buildroot}%{gem_dir}/gems/bundler-%{bundler_version}/lib
 mv %{buildroot}%{gem_dir}/specifications/default/bundler-%{bundler_version}.gemspec %{buildroot}%{gem_dir}/specifications
 mkdir -p %{buildroot}%{gem_dir}/gems/did_you_mean-%{did_you_mean_version}/lib
 mv %{buildroot}%{ruby_libdir}/did_you_mean.rb %{buildroot}%{gem_dir}/gems/did_you_mean-%{did_you_mean_version}/lib
 mv %{buildroot}%{ruby_libdir}/did_you_mean %{buildroot}%{gem_dir}/gems/did_you_mean-%{did_you_mean_version}/lib
 mv %{buildroot}%{gem_dir}/specifications/default/did_you_mean-%{did_you_mean_version}.gemspec %{buildroot}%{gem_dir}/specifications
 mkdir -p %{buildroot}%{gem_dir}/gems/io-console-%{io_console_version}/lib
 mkdir -p %{buildroot}%{_libdir}/gems/%{name}/io-console-%{io_console_version}/io
 mv %{buildroot}%{ruby_libdir}/io %{buildroot}%{gem_dir}/gems/io-console-%{io_console_version}/lib
@ -722,30 +754,6 @@ ln -s %{gem_dir}/gems/psych-%{psych_version}/lib/psych %{buildroot}%{ruby_libdir
 ln -s %{gem_dir}/gems/psych-%{psych_version}/lib/psych.rb %{buildroot}%{ruby_libdir}/psych.rb
 ln -s %{_libdir}/gems/%{name}/psych-%{psych_version}/psych.so %{buildroot}%{ruby_libarchdir}/psych.so
 # These have wrong shebangs. Exclude them for now and let's see what upstream
 # thinks about them.
 # https://bugs.ruby-lang.org/issues/15982
 rm %{buildroot}%{_bindir}/{racc2y,y2racc}
 rm %{buildroot}%{gem_dir}/gems/racc-%{racc_version}/bin/{racc2y,y2racc}
 # The 'rdoc' directory is empty and useless ATM.
 # https://bugs.ruby-lang.org/issues/16596
 rm -r %{buildroot}%{ruby_libdir}/racc/rdoc
 mkdir -p %{buildroot}%{gem_dir}/gems/racc-%{racc_version}/lib
 mkdir -p %{buildroot}%{_libdir}/gems/%{name}/racc-%{racc_version}
 mv %{buildroot}%{ruby_libdir}/racc* %{buildroot}%{gem_dir}/gems/racc-%{racc_version}/lib
 mv %{buildroot}%{ruby_libarchdir}/racc/ %{buildroot}%{_libdir}/gems/%{name}/racc-%{racc_version}/
 touch %{buildroot}%{_libdir}/gems/%{name}/racc-%{racc_version}/gem.build_complete
 mv %{buildroot}%{gem_dir}/specifications/default/racc-%{racc_version}.gemspec %{buildroot}%{gem_dir}/specifications
 # This used to be directories when racc was integral part of StdLib => Keep
 # them as directories and link everything in them to prevent directory =>
 # symlink conversion RPM issues.
 mkdir -p %{buildroot}%{ruby_libdir}/racc
 mkdir -p %{buildroot}%{ruby_libarchdir}/racc
 find %{buildroot}%{gem_dir}/gems/racc-%{racc_version}/lib/racc -maxdepth 1 -type f -exec \
  sh -c 'ln -s %{gem_dir}/gems/racc-%{racc_version}/lib/racc/`basename {}` %{buildroot}%{ruby_libdir}/racc' \;
 ln -s %{gem_dir}/gems/racc-%{racc_version}/lib/racc.rb %{buildroot}%{ruby_libdir}/racc.rb
 ln -s %{_libdir}/gems/%{name}/racc-%{racc_version}/racc/cparse.so %{buildroot}%{ruby_libarchdir}/racc/cparse.so
 # Move the binary extensions into proper place (if no gem has binary extension,
 # the extensions directory might be empty).
 find %{buildroot}%{gem_dir}/extensions/*-%{_target_os}/%{ruby_version}/* -maxdepth 0 \
@ -861,14 +869,14 @@ MSPECOPTS=""
 # https://bugs.ruby-lang.org/issues/16410
 MSPECOPTS="$MSPECOPTS -P 'File.utime allows Time instances in the far future to set mtime and atime'"
-# Increase timeout for TestBugReporter#test_bug_reporter_add test, which fails
+# Disable File.lchmod specs, which fails when building against glibc 2.31.9000.
-# quite often.
+# https://bugs.ruby-lang.org/issues/16749
-# https://bugs.ruby-lang.org/issues/16492
+MSPECOPTS="$MSPECOPTS -P 'File.lchmod changes the file mode of the link and not of the file'"
 %ifarch s390x
 sed -i '/assert_in_out_err/ s/)/, timeout: 30)/' test/-ext-/bug_reporter/test_bug_reporter.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"
 %files
 %license BSDL
@ -911,42 +919,76 @@ make check TESTS="-v $DISABLE_TESTS" MSPECOPT="-fs $MSPECOPTS"
 # List all these files explicitly to prevent surprises
 # Platform independent libraries.
 %dir %{ruby_libdir}
-%{ruby_libdir}/*.rb
+%exclude %{ruby_libdir}/bigdecimal*
-%exclude %{ruby_libdir}/irb.rb
+%exclude %{ruby_libdir}/irb*
-%exclude %{ruby_libdir}/json.rb
+%exclude %{ruby_libdir}/json*
-%exclude %{ruby_libdir}/openssl.rb
+%exclude %{ruby_libdir}/openssl*
-%exclude %{ruby_libdir}/psych.rb
+%exclude %{ruby_libdir}/psych*
-%exclude %{ruby_libdir}/racc.rb
+%{ruby_libdir}/abbrev.rb
-%{ruby_libdir}/benchmark
+%{ruby_libdir}/base64.rb
-%{ruby_libdir}/cgi
+%{ruby_libdir}/benchmark*
-%{ruby_libdir}/csv
+%{ruby_libdir}/cgi*
-%{ruby_libdir}/delegate
+%{ruby_libdir}/coverage.rb
-%{ruby_libdir}/digest
+%{ruby_libdir}/csv*
-%{ruby_libdir}/drb
+%{ruby_libdir}/date.rb
-%{ruby_libdir}/fiddle
+%{ruby_libdir}/debug.rb
-%{ruby_libdir}/forwardable
+%{ruby_libdir}/delegate*
-%{ruby_libdir}/getoptlong
+%{ruby_libdir}/digest*
-%{ruby_libdir}/logger
+%{ruby_libdir}/drb*
-%{ruby_libdir}/matrix
+%{ruby_libdir}/English.rb
 %{ruby_libdir}/erb.rb
 %{ruby_libdir}/expect.rb
 %{ruby_libdir}/fiddle*
 %{ruby_libdir}/fileutils.rb
 %{ruby_libdir}/find.rb
 %{ruby_libdir}/forwardable*
 %{ruby_libdir}/getoptlong*
 %{ruby_libdir}/io
 %{ruby_libdir}/ipaddr.rb
 %{ruby_libdir}/kconv.rb
 %{ruby_libdir}/logger*
 %{ruby_libdir}/matrix*
 %{ruby_libdir}/mkmf.rb
 %{ruby_libdir}/monitor.rb
 %{ruby_libdir}/mutex_m.rb
 %{ruby_libdir}/net
-%{ruby_libdir}/observer
+%{ruby_libdir}/observer*
-%{ruby_libdir}/open3
+%{ruby_libdir}/open-uri.rb
-%{ruby_libdir}/optparse
+%{ruby_libdir}/open3*
-%{ruby_libdir}/ostruct
+%{ruby_libdir}/optionparser.rb
-%{ruby_libdir}/pstore
+%{ruby_libdir}/optparse*
-%{ruby_libdir}/reline
+%{ruby_libdir}/ostruct*
 %{ruby_libdir}/pathname.rb
 %{ruby_libdir}/pp.rb
 %{ruby_libdir}/prettyprint.rb
 %{ruby_libdir}/prime.rb
 %{ruby_libdir}/pstore*
 %{ruby_libdir}/readline.rb
 %{ruby_libdir}/reline*
 %{ruby_libdir}/resolv.rb
 %{ruby_libdir}/resolv-replace.rb
 %{ruby_libdir}/rexml
 %{ruby_libdir}/rinda
-%{ruby_libdir}/ripper
+%{ruby_libdir}/ripper*
-%{ruby_libdir}/rss
+%{ruby_libdir}/rss*
-%{ruby_libdir}/singleton
+%{ruby_libdir}/securerandom.rb
 %{ruby_libdir}/set.rb
 %{ruby_libdir}/shellwords.rb
 %{ruby_libdir}/singleton*
 %{ruby_libdir}/socket.rb
 %{ruby_libdir}/syslog
-%{ruby_libdir}/timeout
+%{ruby_libdir}/tempfile.rb
-%{ruby_libdir}/tracer
+%{ruby_libdir}/timeout*
 %{ruby_libdir}/time.rb
 %{ruby_libdir}/tmpdir.rb
 %{ruby_libdir}/tracer*
 %{ruby_libdir}/tsort.rb
 %{ruby_libdir}/unicode_normalize
-%{ruby_libdir}/uri
+%{ruby_libdir}/un.rb
-%{ruby_libdir}/webrick
+%{ruby_libdir}/uri*
-%{ruby_libdir}/yaml
+%{ruby_libdir}/weakref*
 %{ruby_libdir}/webrick*
 %{ruby_libdir}/yaml*
 # Platform specific libraries.
 %{_libdir}/libruby.so.*
@ -1052,6 +1094,12 @@ make check TESTS="-v $DISABLE_TESTS" MSPECOPT="-fs $MSPECOPTS"
 %{ruby_libarchdir}/syslog.so
 %{ruby_libarchdir}/zlib.so
 # Default gems
 %{ruby_libdir}/did_you_mean*
 %{ruby_libdir}/racc*
 %dir %{ruby_libarchdir}/racc
 %{ruby_libarchdir}/racc/cparse.so
 %{?with_systemtap:%{tapset_root}}
 %files -n rubygems
@ -1075,13 +1123,21 @@ make check TESTS="-v $DISABLE_TESTS" MSPECOPT="-fs $MSPECOPTS"
 %exclude %{gem_dir}/cache/*
-# TODO: Gemify these libraries
+%files -n rubygems-devel
 %{_rpmconfigdir}/macros.d/macros.rubygems
 %{_rpmconfigdir}/fileattrs/rubygems.attr
 %{_rpmconfigdir}/rubygems.req
 %{_rpmconfigdir}/rubygems.prov
 %{_rpmconfigdir}/rubygems.con
 %files default-gems
 %{gem_dir}/specifications/default/benchmark-0.1.0.gemspec
 %{gem_dir}/specifications/default/cgi-0.1.0.gemspec
 %{gem_dir}/specifications/default/csv-3.1.2.gemspec
 %{gem_dir}/specifications/default/date-3.0.0.gemspec
 %{gem_dir}/specifications/default/dbm-1.1.0.gemspec
 %{gem_dir}/specifications/default/delegate-0.1.0.gemspec
 %{gem_dir}/specifications/default/did_you_mean-%{did_you_mean_version}.gemspec
 %{gem_dir}/specifications/default/etc-1.1.0.gemspec
 %{gem_dir}/specifications/default/fcntl-1.0.0.gemspec
 %{gem_dir}/specifications/default/fiddle-1.0.0.gemspec
@ -1100,9 +1156,10 @@ make check TESTS="-v $DISABLE_TESTS" MSPECOPT="-fs $MSPECOPTS"
 %{gem_dir}/specifications/default/ostruct-0.2.0.gemspec
 %{gem_dir}/specifications/default/prime-0.1.1.gemspec
 %{gem_dir}/specifications/default/pstore-0.1.0.gemspec
 %{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.2.gemspec
+%{gem_dir}/specifications/default/reline-0.1.5.gemspec
 %{gem_dir}/specifications/default/rexml-3.2.3.gemspec
 %{gem_dir}/specifications/default/rss-0.2.8.gemspec
 %{gem_dir}/specifications/default/sdbm-1.0.0.gemspec
@ -1116,18 +1173,17 @@ make check TESTS="-v $DISABLE_TESTS" MSPECOPT="-fs $MSPECOPTS"
 %{gem_dir}/specifications/default/yaml-0.1.0.gemspec
 %{gem_dir}/specifications/default/zlib-1.1.0.gemspec
-%files -n rubygems-devel
+# Use standalone rubygem-racc if Racc binary is required. Shipping this
-%{_rpmconfigdir}/macros.d/macros.rubygems
+# executable in both packages might possibly cause conflicts. The situation
-%{_rpmconfigdir}/fileattrs/rubygems.attr
+# could be better if Ruby generated these files:
-%{_rpmconfigdir}/rubygems.req
+# https://github.com/ruby/ruby/pull/2545
-%{_rpmconfigdir}/rubygems.prov
+%exclude %{_bindir}/racc
-%{_rpmconfigdir}/rubygems.con
+# These have wrong shebangs. Exclude them for now and let's see what upstream
-
+# thinks about them.
-%files -n rubygem-rake
+# https://bugs.ruby-lang.org/issues/15982
-%{_bindir}/rake
+%exclude %{_bindir}/{racc2y,y2racc}
-%{gem_dir}/gems/rake-%{rake_version}
+%exclude %{gem_dir}/gems/racc-%{racc_version}/bin/{racc2y,y2racc}
-%{gem_dir}/specifications/rake-%{rake_version}.gemspec
+%{gem_dir}/gems/racc-%{racc_version}
 %{_mandir}/man1/rake.1*
 %files -n rubygem-irb
 %{_bindir}/irb
@ -1150,17 +1206,12 @@ make check TESTS="-v $DISABLE_TESTS" MSPECOPT="-fs $MSPECOPTS"
 %{_datadir}/ri
 %files -n rubygem-bigdecimal
-%{ruby_libdir}/bigdecimal
+%{ruby_libdir}/bigdecimal*
 %{ruby_libarchdir}/bigdecimal*
 %{_libdir}/gems/%{name}/bigdecimal-%{bigdecimal_version}
 %{gem_dir}/gems/bigdecimal-%{bigdecimal_version}
 %{gem_dir}/specifications/bigdecimal-%{bigdecimal_version}.gemspec
 %files -n rubygem-did_you_mean
 %{gem_dir}/gems/did_you_mean-%{did_you_mean_version}
 %exclude %{gem_dir}/gems/did_you_mean-%{did_you_mean_version}/.*
 %{gem_dir}/specifications/did_you_mean-%{did_you_mean_version}.gemspec
 %files -n rubygem-io-console
 %{ruby_libdir}/io
 %{ruby_libarchdir}/io/console.so
@ -1175,11 +1226,6 @@ make check TESTS="-v $DISABLE_TESTS" MSPECOPT="-fs $MSPECOPTS"
 %{gem_dir}/gems/json-%{json_version}
 %{gem_dir}/specifications/json-%{json_version}.gemspec
 %files -n rubygem-minitest
 %{gem_dir}/gems/minitest-%{minitest_version}
 %exclude %{gem_dir}/gems/minitest-%{minitest_version}/.*
 %{gem_dir}/specifications/minitest-%{minitest_version}.gemspec
 %files -n rubygem-openssl
 %{ruby_libdir}/openssl
 %{ruby_libdir}/openssl.rb
@ -1188,11 +1234,6 @@ make check TESTS="-v $DISABLE_TESTS" MSPECOPT="-fs $MSPECOPTS"
 %{gem_dir}/gems/openssl-%{openssl_version}
 %{gem_dir}/specifications/openssl-%{openssl_version}.gemspec
 %files -n rubygem-power_assert
 %{gem_dir}/gems/power_assert-%{power_assert_version}
 %exclude %{gem_dir}/gems/power_assert-%{power_assert_version}/.*
 %{gem_dir}/specifications/power_assert-%{power_assert_version}.gemspec
 %files -n rubygem-psych
 %{ruby_libdir}/psych
 %{ruby_libdir}/psych.rb
@ -1201,11 +1242,35 @@ make check TESTS="-v $DISABLE_TESTS" MSPECOPT="-fs $MSPECOPTS"
 %{gem_dir}/gems/psych-%{psych_version}
 %{gem_dir}/specifications/psych-%{psych_version}.gemspec
 %files -n rubygem-bundler
 %{_bindir}/bundle
 %{_bindir}/bundler
 %{gem_dir}/gems/bundler-%{bundler_version}
 %{gem_dir}/specifications/bundler-%{bundler_version}.gemspec
 %{_mandir}/man1/bundle*.1*
 %{_mandir}/man5/gemfile.5*
 %files -n rubygem-minitest
 %{gem_dir}/gems/minitest-%{minitest_version}
 %exclude %{gem_dir}/gems/minitest-%{minitest_version}/.*
 %{gem_dir}/specifications/minitest-%{minitest_version}.gemspec
 %files -n rubygem-net-telnet
 %{gem_dir}/gems/net-telnet-%{net_telnet_version}
 %exclude %{gem_dir}/gems/net-telnet-%{net_telnet_version}/.*
 %{gem_dir}/specifications/net-telnet-%{net_telnet_version}.gemspec
 %files -n rubygem-power_assert
 %{gem_dir}/gems/power_assert-%{power_assert_version}
 %exclude %{gem_dir}/gems/power_assert-%{power_assert_version}/.*
 %{gem_dir}/specifications/power_assert-%{power_assert_version}.gemspec
 %files -n rubygem-rake
 %{_bindir}/rake
 %{gem_dir}/gems/rake-%{rake_version}
 %{gem_dir}/specifications/rake-%{rake_version}.gemspec
 %{_mandir}/man1/rake.1*
 %files -n rubygem-test-unit
 %{gem_dir}/gems/test-unit-%{test_unit_version}
 %{gem_dir}/specifications/test-unit-%{test_unit_version}.gemspec
@ -1222,23 +1287,49 @@ make check TESTS="-v $DISABLE_TESTS" MSPECOPT="-fs $MSPECOPTS"
 %{gem_dir}/gems/xmlrpc-%{xmlrpc_version}/xmlrpc.gemspec
 %{gem_dir}/specifications/xmlrpc-%{xmlrpc_version}.gemspec
 %files -n rubygem-bundler
 %{_bindir}/bundle
 %{_bindir}/bundler
 %{gem_dir}/gems/bundler-%{bundler_version}
 %{gem_dir}/specifications/bundler-%{bundler_version}.gemspec
 %{_mandir}/man1/bundle*.1*
 %{_mandir}/man5/gemfile.5*
 %files -n rubygem-racc
 %{ruby_libdir}/racc*
 %{ruby_libarchdir}/racc
 %{_bindir}/racc
 %{_libdir}/gems/%{name}/racc-%{racc_version}
 %{gem_dir}/gems/racc-%{racc_version}
 %{gem_dir}/specifications/racc-%{racc_version}.gemspec
 %changelog
 * Tue Dec 15 2020 Pavel Valena <pvalena@redhat.com> - 2.7.2-137
 - Add Recommends: redhat-rpm-config to devel subpackage.
  Resolves: rhbz#1905222
 * Tue Nov 24 2020 Vít Ondruch <vondruch@redhat.com> - 2.7.2-136
 - Add explicit `BR: make`.
 * Tue Oct 13 2020 Vít Ondruch <vondruch@redhat.com> - 2.7.2-135
 - Upgrade to Ruby 2.7.2.
 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.1-134
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 * Mon Jul 27 2020 Vít Ondruch <vondruch@redhat.com> - 2.7.1-133
 - Disable LTO, which appear to cause issues with SIGSEV handler.
 - Avoid possible timeout errors in TestBugReporter#test_bug_reporter_add.
 * Wed Jun 24 2020 Jun Aruga <jaruga@redhat.com> - 2.7.1-132
 - Add ruby-default-gems dependency on irb.
  Resolves: rhbz#1850541
 * Wed Jun 24 2020 Vít Ondruch <vondruch@redhat.com> - 2.7.1-132
 - Fix `require` behavior allowing to load libraries multiple times.
  Resolves: rhbz#1835836
 * Fri May 15 2020 Vít Ondruch <vondruch@redhat.com> - 2.7.1-131
 - Relax rubygems-devel dependency on rubygems.
 * Wed Apr 08 2020 Vít Ondruch <vondruch@redhat.com> - 2.7.1-130
 - Bundle did_you_mean into StdLib.
  Resolves: rhbz#1817178
 - Prevent issues with openssl loading when RubyGems are disabled.
 * Thu Apr 02 2020 Vít Ondruch <vondruch@redhat.com> - 2.7.1-129
 - Add ruby-default-gems subpackage shipping all extra default gem content.
 - Bundle Racc into StdLib.
 * Wed Apr 01 2020 Vít Ondruch <vondruch@redhat.com> - 2.7.1-128
 - Upgrade to Ruby 2.7.1.
 - Fix FTBFS due to glibc 2.31.9000 implementing lchmod(2).
 * Tue Jan 28 2020 Vít Ondruch <vondruch@redhat.com> - 2.7.0-127
 - Provide StdLib links for Racc and install it by default.
@ -2080,7 +2171,7 @@ make check TESTS="-v $DISABLE_TESTS" MSPECOPT="-fs $MSPECOPTS"
 - Disable the static library building.
 * Tue Dec 04 2007 Release Engineering <rel-eng at fedoraproject dot org> - 1.8.6.111-2
- - Rebuild for openssl bump
+- Rebuild for openssl bump
 * Wed Oct 31 2007 Akira TAGOH <tagoh@redhat.com>
 - Fix the dead link.