From ad9f38f08f100fd412a3ec237cb83c60b966aeb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
Date: Tue, 10 Dec 2019 10:14:00 +0100
Subject: [PATCH] Upgrade to Ruby 2.7.0 (c2dc27d643).

---
 ...-additional-preludes-by-configuratio.patch |  2 +-
 ...0-Enable-configuration-of-archlibdir.patch |  2 +-
 ...ed-paths-when-empty-version-string-i.patch |  2 +-
 ruby-2.1.0-always-use-i386.patch              |  2 +-
 ruby-2.1.0-custom-rubygems-location.patch     |  4 +-
 ...2.3-Generate-preludes-using-miniruby.patch |  2 +-
 ruby-2.3.0-ruby_version.patch                 |  6 +--
 ruby-2.3.1-Rely-on-ldd-to-detect-glibc.patch  | 19 ++++++--
 ruby.spec                                     | 48 +++++++++----------
 9 files changed, 48 insertions(+), 39 deletions(-)

diff --git a/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch b/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch
index cecfe3e..5c347d5 100644
--- a/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch
+++ b/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch
@@ -26,7 +26,7 @@ diff --git a/configure.ac b/configure.ac
 index 028ef7ca3e..cdeff87871 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3872,6 +3872,13 @@ AC_SUBST(rubyarchhdrdir)dnl
+@@ -3884,6 +3884,13 @@ AC_SUBST(rubyarchhdrdir)dnl
  AC_SUBST(sitearchhdrdir)dnl
  AC_SUBST(vendorarchhdrdir)dnl
  
diff --git a/ruby-2.1.0-Enable-configuration-of-archlibdir.patch b/ruby-2.1.0-Enable-configuration-of-archlibdir.patch
index b3aec19..f7eed39 100644
--- a/ruby-2.1.0-Enable-configuration-of-archlibdir.patch
+++ b/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
-@@ -3089,6 +3089,11 @@ AS_IF([test ${multiarch+set}], [
+@@ -3101,6 +3101,11 @@ AS_IF([test ${multiarch+set}], [
  ])
  
  archlibdir='${libdir}/${arch}'
diff --git a/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch b/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch
index ca0519c..2165aa8 100644
--- a/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch
+++ b/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
-@@ -3727,7 +3727,8 @@ AS_CASE(["$ruby_version_dir_name"],
+@@ -3739,7 +3739,8 @@ AS_CASE(["$ruby_version_dir_name"],
  ruby_version_dir=/'${ruby_version_dir_name}'
  
  if test -z "${ruby_version_dir_name}"; then
diff --git a/ruby-2.1.0-always-use-i386.patch b/ruby-2.1.0-always-use-i386.patch
index 9eff277..9d1eb76 100644
--- a/ruby-2.1.0-always-use-i386.patch
+++ b/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
-@@ -3791,6 +3791,8 @@ AC_SUBST(vendorarchdir)dnl
+@@ -3803,6 +3803,8 @@ AC_SUBST(vendorarchdir)dnl
  AC_SUBST(CONFIGURE, "`echo $0 | sed 's|.*/||'`")dnl
  AC_SUBST(configure_args, "`echo "${ac_configure_args}" | sed 's/\\$/$$/g'`")dnl
  
diff --git a/ruby-2.1.0-custom-rubygems-location.patch b/ruby-2.1.0-custom-rubygems-location.patch
index 9abbc61..5a1f7c5 100644
--- a/ruby-2.1.0-custom-rubygems-location.patch
+++ b/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
-@@ -3763,6 +3763,10 @@ AC_ARG_WITH(vendorarchdir,
+@@ -3775,6 +3775,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=''
-@@ -3787,6 +3791,7 @@ AC_SUBST(sitearchdir)dnl
+@@ -3799,6 +3803,7 @@ AC_SUBST(sitearchdir)dnl
  AC_SUBST(vendordir)dnl
  AC_SUBST(vendorlibdir)dnl
  AC_SUBST(vendorarchdir)dnl
diff --git a/ruby-2.2.3-Generate-preludes-using-miniruby.patch b/ruby-2.2.3-Generate-preludes-using-miniruby.patch
index 625cf53..48deae6 100644
--- a/ruby-2.2.3-Generate-preludes-using-miniruby.patch
+++ b/ruby-2.2.3-Generate-preludes-using-miniruby.patch
@@ -11,7 +11,7 @@ diff --git a/common.mk b/common.mk
 index 168dc52..20c218a 100644
 --- a/common.mk
 +++ b/common.mk
-@@ -1086,9 +1086,9 @@ $(MINIPRELUDE_C): $(COMPILE_PRELUDE) $(BUILTIN_RB_SRCS)
+@@ -1088,9 +1088,9 @@ $(MINIPRELUDE_C): $(COMPILE_PRELUDE) $(BUILTIN_RB_SRCS)
  		$(srcdir)/template/prelude.c.tmpl $(BUILTIN_RB_SRCS)
  
  $(PRELUDE_C): $(COMPILE_PRELUDE) \
diff --git a/ruby-2.3.0-ruby_version.patch b/ruby-2.3.0-ruby_version.patch
index 682f27b..c282fa3 100644
--- a/ruby-2.3.0-ruby_version.patch
+++ b/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
-@@ -3678,9 +3678,6 @@ AS_CASE(["$target_os"],
+@@ -3690,9 +3690,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],
-@@ -3703,56 +3700,62 @@ AC_ARG_WITH(ridir,
+@@ -3715,56 +3712,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)
-@@ -3769,6 +3772,7 @@ AC_SUBST(sitearchincludedir)dnl
+@@ -3781,6 +3784,7 @@ AC_SUBST(sitearchincludedir)dnl
  AC_SUBST(arch)dnl
  AC_SUBST(sitearch)dnl
  AC_SUBST(ruby_version)dnl
diff --git a/ruby-2.3.1-Rely-on-ldd-to-detect-glibc.patch b/ruby-2.3.1-Rely-on-ldd-to-detect-glibc.patch
index d9786d0..4d81a84 100644
--- a/ruby-2.3.1-Rely-on-ldd-to-detect-glibc.patch
+++ b/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 | 96 -------------------------------------------
- 1 file changed, 96 deletions(-)
+ test/fiddle/helper.rb | 105 ------------------------------------------
+ 1 file changed, 105 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,102 +6,6 @@
+@@ -6,111 +6,6 @@
  
  libc_so = libm_so = nil
  
@@ -35,7 +35,16 @@ index 1da3d93..65148a1 100644
 -  case RbConfig::SIZEOF['void*']
 -  when 4
 -    # 32-bit ruby
--    libdir = '/lib32' if File.directory? '/lib32'
+-    case RUBY_PLATFORM
+-    when /armv\w+-linux/
+-      # In the ARM 32-bit libc package such as libc6:armhf libc6:armel,
+-      # libc.so and libm.so are installed to /lib/arm-linux-gnu*.
+-      # It's not installed to /lib32.
+-      dirs = Dir.glob('/lib/arm-linux-gnu*')
+-      libdir = dirs[0] if dirs && File.directory?(dirs[0])
+-    else
+-      libdir = '/lib32' if File.directory? '/lib32'
+-    end
 -  when 8
 -    # 64-bit ruby
 -    libdir = '/lib64' if File.directory? '/lib64'
@@ -117,7 +126,7 @@ index 1da3d93..65148a1 100644
 -
  if !libc_so || !libm_so
    ruby = EnvUtil.rubybin
-   ldd = `ldd #{ruby}`
+   # When the ruby binary is 32-bit and the host is 64-bit,
 -- 
 2.9.2
 
diff --git a/ruby.spec b/ruby.spec
index 444da0a..704a25c 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -10,7 +10,7 @@
 #%%global milestone rc2
 
 # Keep the revision enabled for pre-releases from SVN.
-%global revision 053f78e139
+%global revision c2dc27d643
 
 %global ruby_archive %{name}-%{ruby_version}
 
@@ -43,7 +43,7 @@
 %global bigdecimal_version 2.0.0.dev
 %global did_you_mean_version 1.3.1
 %global io_console_version 0.4.9
-%global irb_version 1.1.0
+%global irb_version 1.2.0
 %global json_version 2.2.0
 %global minitest_version 5.13.0
 %global net_telnet_version 0.2.0
@@ -537,7 +537,7 @@ generates Ruby program.
 %setup -q -n %{ruby_archive}
 
 # Remove bundled libraries to be sure they are not used.
-#rm -rf ext/psych/yaml
+rm -rf ext/psych/yaml
 rm -rf ext/fiddle/libffi*
 
 %patch0 -p1
@@ -679,6 +679,11 @@ 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
@@ -858,12 +863,10 @@ DISABLE_TESTS="$DISABLE_TESTS -n !/test_segv_\(setproctitle\|test\|loaded_featur
 # https://bugs.ruby-lang.org/issues/14175
 sed -i '/def test_mdns_each_address$/,/^  end$/ s/^/#/' test/resolv/test_mdns.rb
 
-# Disable "Process.clock_getres matches the clock in practice for
-# Process::CLOCK_{PROCESS,THREAD}_CPUTIME_ID" failing spec on arm.
-# https://bugs.ruby-lang.org/issues/16007
-%ifarch %arm
-MSPECOPTS="$MSPECOPTS -P 'Process.clock_getres matches the clock in practice for Process::CLOCK'"
-%endif
+# Disable "File.utime allows Time instances in the far future to set
+# mtime and atime".
+# https://bugs.ruby-lang.org/issues/16410
+MSPECOPTS="$MSPECOPTS -P 'File.utime allows Time instances in the far future to set mtime and atime'"
 
 # Avoid TestEnv#test_fetch test failure due to did_you_mean gem presence.
 # https://bugs.ruby-lang.org/issues/16361
@@ -923,9 +926,7 @@ make check TESTS="-v $DISABLE_TESTS" MSPECOPT="-fs $MSPECOPTS"
 %{ruby_libdir}/delegate
 %{ruby_libdir}/digest
 %{ruby_libdir}/drb
-%{ruby_libdir}/e2mmap
 %{ruby_libdir}/fiddle
-%{ruby_libdir}/fileutils
 %{ruby_libdir}/forwardable
 %{ruby_libdir}/getoptlong
 %{ruby_libdir}/logger
@@ -1080,19 +1081,18 @@ make check TESTS="-v $DISABLE_TESTS" MSPECOPT="-fs $MSPECOPTS"
 %{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-2.0.0.gemspec
-%{gem_dir}/specifications/default/dbm-1.0.0.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/e2mmap-0.1.0.gemspec
-%{gem_dir}/specifications/default/etc-1.0.1.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
-%{gem_dir}/specifications/default/fileutils-1.3.0.gemspec
-%{gem_dir}/specifications/default/forwardable-1.2.0.gemspec
-%{gem_dir}/specifications/default/gdbm-2.0.0.gemspec
+%{gem_dir}/specifications/default/fileutils-1.4.1.gemspec
+%{gem_dir}/specifications/default/forwardable-1.3.0.gemspec
+%{gem_dir}/specifications/default/gdbm-2.1.0.gemspec
 %{gem_dir}/specifications/default/getoptlong-0.1.0.gemspec
 %{gem_dir}/specifications/default/ipaddr-1.2.2.gemspec
-%{gem_dir}/specifications/default/logger-1.3.0.gemspec
+%{gem_dir}/specifications/default/logger-1.4.1.gemspec
 %{gem_dir}/specifications/default/matrix-0.1.0.gemspec
 %{gem_dir}/specifications/default/mutex_m-0.1.0.gemspec
 %{gem_dir}/specifications/default/net-pop-0.1.0.gemspec
@@ -1103,20 +1103,20 @@ make check TESTS="-v $DISABLE_TESTS" MSPECOPT="-fs $MSPECOPTS"
 %{gem_dir}/specifications/default/prime-0.1.0.gemspec
 %{gem_dir}/specifications/default/pstore-0.1.0.gemspec
 %{gem_dir}/specifications/default/readline-0.0.1.pre.1.gemspec
-%{gem_dir}/specifications/default/readline-ext-0.1.0.gemspec
+%{gem_dir}/specifications/default/readline-ext-0.1.0.pre.1.gemspec
 %{gem_dir}/specifications/default/reline-0.0.7.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
 %{gem_dir}/specifications/default/singleton-0.1.0.gemspec
-%{gem_dir}/specifications/default/stringio-0.0.3.gemspec
+%{gem_dir}/specifications/default/stringio-0.1.0.gemspec
 %{gem_dir}/specifications/default/strscan-1.0.3.gemspec
 %{gem_dir}/specifications/default/timeout-0.1.0.gemspec
 %{gem_dir}/specifications/default/tracer-0.1.0.gemspec
 %{gem_dir}/specifications/default/uri-0.10.0.gemspec
-%{gem_dir}/specifications/default/webrick-1.5.0.gemspec
+%{gem_dir}/specifications/default/webrick-1.6.0.gemspec
 %{gem_dir}/specifications/default/yaml-0.1.0.gemspec
-%{gem_dir}/specifications/default/zlib-1.0.0.gemspec
+%{gem_dir}/specifications/default/zlib-1.1.0.gemspec
 
 %files -n rubygems-devel
 %{_rpmconfigdir}/macros.d/macros.rubygems
@@ -1240,7 +1240,7 @@ make check TESTS="-v $DISABLE_TESTS" MSPECOPT="-fs $MSPECOPTS"
 
 %changelog
 * Mon Jul 01 2019 Vít Ondruch <vondruch@redhat.com> - 2.7.0-1
-- Upgrade to Ruby 2.7.0 (053f78e139).
+- Upgrade to Ruby 2.7.0 (c2dc27d643).
 - Drop useless %%{rubygems_default_filter}.
 - Fix checksec 2.0+ compatibility.