From 00084d448e71d8fd8caec22f194abd5b24f3f1b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
Date: Tue, 19 Apr 2022 14:11:12 +0200
Subject: [PATCH] Upgrade to Ruby 3.0.4.

---
 ...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     |  6 +-
 ruby-2.3.0-ruby_version.patch                 | 10 +--
 ruby-dwarf5-avoid_crash-r1.patch              | 20 +++---
 ruby.spec                                     | 66 +++++++++++--------
 sources                                       |  2 +-
 7 files changed, 58 insertions(+), 50 deletions(-)

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 118203c..437d09f 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
-@@ -3881,7 +3881,8 @@ AS_CASE(["$ruby_version_dir_name"],
+@@ -3886,7 +3886,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 de58295..46584d7 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
-@@ -3945,6 +3945,8 @@ AC_SUBST(vendorarchdir)dnl
+@@ -3950,6 +3950,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 b7157ff..6946429 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
-@@ -3917,6 +3917,10 @@ AC_ARG_WITH(vendorarchdir,
+@@ -3922,6 +3922,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=''
-@@ -3941,6 +3941,7 @@ AC_SUBST(sitearchdir)dnl
+@@ -3946,6 +3950,7 @@ AC_SUBST(sitearchdir)dnl
  AC_SUBST(vendordir)dnl
  AC_SUBST(vendorlibdir)dnl
  AC_SUBST(vendorarchdir)dnl
@@ -75,7 +75,7 @@ index e9110a17ca..76a1f0a315 100755
  mandir = CONFIG["mandir", true]
  docdir = CONFIG["docdir", true]
  enable_shared = CONFIG["ENABLE_SHARED"] == 'yes'
-@@ -581,7 +581,16 @@ def stub
+@@ -581,7 +582,16 @@ def stub
  install?(:local, :comm, :lib) do
    prepare "library scripts", rubylibdir
    noinst = %w[*.txt *.rdoc *.gemspec]
diff --git a/ruby-2.3.0-ruby_version.patch b/ruby-2.3.0-ruby_version.patch
index 4fd6530..fd545e5 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
-@@ -3832,9 +3832,6 @@ AS_CASE(["$target_os"],
+@@ -3837,9 +3837,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],
-@@ -3857,56 +3857,62 @@ AC_ARG_WITH(ridir,
+@@ -3862,56 +3859,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)
-@@ -3923,6 +3923,7 @@ AC_SUBST(sitearchincludedir)dnl
+@@ -3928,6 +3931,7 @@ AC_SUBST(sitearchincludedir)dnl
  AC_SUBST(arch)dnl
  AC_SUBST(sitearch)dnl
  AC_SUBST(ruby_version)dnl
@@ -237,7 +237,7 @@ diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb
 index b25068405d..e9fef4a311 100644
 --- a/test/rubygems/test_gem.rb
 +++ b/test/rubygems/test_gem.rb
-@@ -1452,7 +1452,8 @@ def test_self_use_paths
+@@ -1440,7 +1440,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
  
      FileUtils.mkdir_p File.join(parts)
  
-@@ -1530,7 +1531,7 @@ def test_self_vendor_dir
+@@ -1516,7 +1517,7 @@ def test_self_vendor_dir
      vendordir(File.join(@tempdir, 'vendor')) do
        expected =
          File.join RbConfig::CONFIG['vendordir'], 'gems',
diff --git a/ruby-dwarf5-avoid_crash-r1.patch b/ruby-dwarf5-avoid_crash-r1.patch
index c14642b..b183f8f 100644
--- a/ruby-dwarf5-avoid_crash-r1.patch
+++ b/ruby-dwarf5-avoid_crash-r1.patch
@@ -31,7 +31,7 @@
  	    addr += a;
  	    break;
  	case DW_LNS_advance_line: {
-@@ -450,7 +452,7 @@
+@@ -451,7 +453,7 @@
  	    /* isa = (unsigned int)*/(void)uleb128((char **)&p);
  	    break;
  	case 0:
@@ -40,7 +40,7 @@
  	    op = *p++;
  	    switch (op) {
  	    case DW_LNE_end_sequence:
-@@ -807,6 +809,18 @@
+@@ -808,6 +810,18 @@
      DW_FORM_addrx4 = 0x2c
  };
  
@@ -59,7 +59,7 @@
  enum {
      VAL_none = 0,
      VAL_cstr = 1,
-@@ -961,6 +975,23 @@
+@@ -962,6 +976,23 @@
  }
  
  static void
@@ -83,7 +83,7 @@
  di_read_debug_abbrev_cu(DebugInfoReader *reader)
  {
      uint64_t prev = 0;
-@@ -974,12 +1005,7 @@
+@@ -975,12 +1006,7 @@
          prev = abbrev_number;
          uleb128(&p); /* tag */
          p++; /* has_children */
@@ -97,7 +97,7 @@
      }
  }
  
-@@ -1243,12 +1269,7 @@
+@@ -1244,12 +1270,7 @@
      /* skip 255th record */
      uleb128(&p); /* tag */
      p++; /* has_children */
@@ -111,7 +111,7 @@
      for (uint64_t n = uleb128(&p); abbrev_number != n; n = uleb128(&p)) {
          if (n == 0) {
              fprintf(stderr,"%d: Abbrev Number %"PRId64" not found\n",__LINE__, abbrev_number);
-@@ -1256,12 +1277,7 @@
+@@ -1257,12 +1278,7 @@
          }
          uleb128(&p); /* tag */
          p++; /* has_children */
@@ -125,7 +125,7 @@
      }
      return p;
  }
-@@ -1389,6 +1405,21 @@
+@@ -1390,6 +1406,21 @@
      }
  }
  
@@ -147,7 +147,7 @@
  static uintptr_t
  ranges_include(DebugInfoReader *reader, ranges_t *ptr, uint64_t addr)
  {
-@@ -1402,8 +1433,50 @@
+@@ -1403,8 +1434,50 @@
      }
      else if (ptr->ranges_set) {
          /* TODO: support base address selection entry */
@@ -199,7 +199,7 @@
          for (;;) {
              uintptr_t from = read_uintptr(&p);
              uintptr_t to = read_uintptr(&p);
-@@ -1747,6 +1820,7 @@
+@@ -1750,6 +1823,7 @@
                      ".debug_info",
                      ".debug_line",
                      ".debug_ranges",
@@ -207,7 +207,7 @@
                      ".debug_str"
                  };
  
-@@ -2003,6 +2077,7 @@
+@@ -2006,6 +2080,7 @@
                      "__debug_info",
                      "__debug_line",
                      "__debug_ranges",
diff --git a/ruby.spec b/ruby.spec
index 9f01a3a..7077d07 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -1,6 +1,6 @@
 %global major_version 3
 %global minor_version 0
-%global teeny_version 2
+%global teeny_version 4
 %global major_minor_version %{major_version}.%{minor_version}
 
 %global ruby_version %{major_minor_version}.%{teeny_version}
@@ -22,7 +22,7 @@
 %endif
 
 
-%global release 151
+%global release 152
 %{!?release_string:%define release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}}
 
 # The RubyGems library has to stay out of Ruby directory tree, since the
@@ -30,12 +30,12 @@
 %global rubygems_dir %{_datadir}/rubygems
 
 # Bundled libraries versions
-%global rubygems_version 3.2.22
+%global rubygems_version 3.2.33
 %global rubygems_molinillo_version 0.7.0
 
 # Default gems.
-%global bundler_version 2.2.22
-%global bundler_connection_pool_version 2.2.2
+%global bundler_version 2.2.33
+%global bundler_connection_pool_version 2.3.0
 %global bundler_fileutils_version 1.4.1
 %global bundler_molinillo_version 0.7.0
 %global bundler_net_http_persistent_version 4.0.0
@@ -49,20 +49,20 @@
 %global io_console_version 0.5.7
 %global irb_version 1.3.5
 %global json_version 2.5.1
-%global openssl_version 2.2.0
-%global psych_version 3.3.0
-%global racc_version 1.5.1
-%global rdoc_version 6.3.1
+%global openssl_version 2.2.1
+%global psych_version 3.3.2
+%global racc_version 1.5.2
+%global rdoc_version 6.3.3
 
 # Bundled gems.
 %global minitest_version 5.14.2
 %global power_assert_version 1.2.0
 %global rake_version 13.0.3
-%global rbs_version 1.0.4
+%global rbs_version 1.4.0
 %global test_unit_version 3.3.7
 %global rexml_version 3.2.5
 %global rss_version 0.2.9
-%global typeprof_version 0.12.0
+%global typeprof_version 0.15.2
 
 %global tapset_libdir %(echo %{_libdir} | sed 's/64//')*
 
@@ -874,6 +874,12 @@ make runruby TESTRUN_SCRIPT="--enable-gems %{SOURCE13}"
 DISABLE_TESTS=""
 MSPECOPTS=""
 
+%ifarch ppc64le
+# `Couldn't unprotect page` error.
+# https://bugs.ruby-lang.org/issues/18746
+DISABLE_TESTS="$DISABLE_TESTS -n !/test_\(ast_compacts\|compact_count\|complex_hash_keys\|gc_compact_stats\)/"
+%endif
+
 # Avoid `hostname' dependency.
 %{!?with_hostname:MSPECOPTS="-P 'Socket.gethostname returns the host name'"}
 
@@ -1138,26 +1144,26 @@ MSPECOPTS=""
 %{gem_dir}/specifications/default/abbrev-0.1.0.gemspec
 %{gem_dir}/specifications/default/base64-0.1.0.gemspec
 %{gem_dir}/specifications/default/benchmark-0.1.1.gemspec
-%{gem_dir}/specifications/default/cgi-0.2.0.gemspec
+%{gem_dir}/specifications/default/cgi-0.2.1.gemspec
 %{gem_dir}/specifications/default/csv-3.1.9.gemspec
-%{gem_dir}/specifications/default/date-3.1.0.gemspec
+%{gem_dir}/specifications/default/date-3.1.3.gemspec
 %{gem_dir}/specifications/default/dbm-1.1.0.gemspec
-%{gem_dir}/specifications/default/debug-0.1.0.gemspec
+%{gem_dir}/specifications/default/debug-0.2.1.gemspec
 %{gem_dir}/specifications/default/delegate-0.2.0.gemspec
 %{gem_dir}/specifications/default/did_you_mean-%{did_you_mean_version}.gemspec
 %{gem_dir}/specifications/default/digest-3.0.0.gemspec
-%{gem_dir}/specifications/default/drb-2.0.4.gemspec
+%{gem_dir}/specifications/default/drb-2.0.5.gemspec
 %{gem_dir}/specifications/default/erb-%{erb_version}.gemspec
-%{gem_dir}/specifications/default/etc-1.2.0.gemspec
-%{gem_dir}/specifications/default/fcntl-1.0.0.gemspec
-%{gem_dir}/specifications/default/fiddle-1.0.6.gemspec
+%{gem_dir}/specifications/default/etc-1.3.0.gemspec
+%{gem_dir}/specifications/default/fcntl-1.0.1.gemspec
+%{gem_dir}/specifications/default/fiddle-1.0.8.gemspec
 %{gem_dir}/specifications/default/fileutils-1.5.0.gemspec
 %{gem_dir}/specifications/default/find-0.1.0.gemspec
 %{gem_dir}/specifications/default/forwardable-1.3.2.gemspec
 %{gem_dir}/specifications/default/gdbm-2.1.0.gemspec
 %{gem_dir}/specifications/default/getoptlong-0.1.1.gemspec
 %{gem_dir}/specifications/default/io-nonblock-0.1.0.gemspec
-%{gem_dir}/specifications/default/io-wait-0.1.0.gemspec
+%{gem_dir}/specifications/default/io-wait-0.2.0.gemspec
 %{gem_dir}/specifications/default/ipaddr-1.2.2.gemspec
 %{gem_dir}/specifications/default/logger-1.4.3.gemspec
 %{gem_dir}/specifications/default/matrix-0.3.1.gemspec
@@ -1166,33 +1172,33 @@ MSPECOPTS=""
 %{gem_dir}/specifications/default/net-http-0.1.1.gemspec
 %{gem_dir}/specifications/default/net-imap-0.1.1.gemspec
 %{gem_dir}/specifications/default/net-pop-0.1.1.gemspec
-%{gem_dir}/specifications/default/net-protocol-0.1.0.gemspec
+%{gem_dir}/specifications/default/net-protocol-0.1.1.gemspec
 %{gem_dir}/specifications/default/net-smtp-0.2.1.gemspec
 %{gem_dir}/specifications/default/nkf-0.1.0.gemspec
 %{gem_dir}/specifications/default/observer-0.1.1.gemspec
 %{gem_dir}/specifications/default/open3-0.1.1.gemspec
 %{gem_dir}/specifications/default/open-uri-0.1.0.gemspec
-%{gem_dir}/specifications/default/optparse-0.1.0.gemspec
+%{gem_dir}/specifications/default/optparse-0.1.1.gemspec
 %{gem_dir}/specifications/default/openssl-%{openssl_version}.gemspec
 %{gem_dir}/specifications/default/ostruct-0.3.1.gemspec
 %{gem_dir}/specifications/default/pathname-0.1.0.gemspec
-%{gem_dir}/specifications/default/pp-0.1.0.gemspec
-%{gem_dir}/specifications/default/prettyprint-0.1.0.gemspec
+%{gem_dir}/specifications/default/pp-0.2.1.gemspec
+%{gem_dir}/specifications/default/prettyprint-0.1.1.gemspec
 %{gem_dir}/specifications/default/prime-0.1.2.gemspec
 %{gem_dir}/specifications/default/pstore-0.1.1.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.1.gemspec
 %{gem_dir}/specifications/default/reline-0.2.5.gemspec
-%{gem_dir}/specifications/default/resolv-0.2.0.gemspec
+%{gem_dir}/specifications/default/resolv-0.2.1.gemspec
 %{gem_dir}/specifications/default/resolv-replace-0.1.0.gemspec
-%{gem_dir}/specifications/default/rinda-0.1.0.gemspec
+%{gem_dir}/specifications/default/rinda-0.1.1.gemspec
 %{gem_dir}/specifications/default/securerandom-0.1.0.gemspec
 %{gem_dir}/specifications/default/set-1.0.1.gemspec
 %{gem_dir}/specifications/default/shellwords-0.1.0.gemspec
 %{gem_dir}/specifications/default/singleton-0.1.1.gemspec
-%{gem_dir}/specifications/default/stringio-3.0.0.gemspec
-%{gem_dir}/specifications/default/strscan-3.0.0.gemspec
+%{gem_dir}/specifications/default/stringio-3.0.1.gemspec
+%{gem_dir}/specifications/default/strscan-3.0.1.gemspec
 %{gem_dir}/specifications/default/syslog-0.1.0.gemspec
 %{gem_dir}/specifications/default/tempfile-0.1.1.gemspec
 %{gem_dir}/specifications/default/time-0.1.0.gemspec
@@ -1205,7 +1211,7 @@ MSPECOPTS=""
 %{gem_dir}/specifications/default/weakref-0.1.1.gemspec
 #%%{gem_dir}/specifications/default/win32ole-1.8.8.gemspec
 %{gem_dir}/specifications/default/yaml-0.1.1.gemspec
-%{gem_dir}/specifications/default/zlib-1.1.0.gemspec
+%{gem_dir}/specifications/default/zlib-2.0.0.gemspec
 
 %{gem_dir}/gems/erb-%{erb_version}
 # Use standalone rubygem-racc if Racc binary is required. Shipping this
@@ -1299,7 +1305,6 @@ MSPECOPTS=""
 %doc %{gem_dir}/gems/rbs-%{rbs_version}/README.md
 %{gem_dir}/gems/rbs-%{rbs_version}/Rakefile
 %{gem_dir}/gems/rbs-%{rbs_version}/Steepfile
-%{gem_dir}/gems/rbs-%{rbs_version}/bin
 %{gem_dir}/gems/rbs-%{rbs_version}/core
 %doc %{gem_dir}/gems/rbs-%{rbs_version}/docs
 %{gem_dir}/gems/rbs-%{rbs_version}/exe
@@ -1355,6 +1360,9 @@ MSPECOPTS=""
 
 
 %changelog
+* Tue Apr 19 2022 Vít Ondruch <vondruch@redhat.com> - 3.0.2-152
+- Upgrade to Ruby 3.0.4.
+
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org>
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
diff --git a/sources b/sources
index fc750ca..acb6fbe 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ruby-3.0.2.tar.xz) = 0f702e2d8ca1342a9d4284dbdd234a3588e057b92566353aa7c21835cf09a3932864b2acf459a976960a1704e9befa562155d36b98b7cda8bd99526e10a374c4
+SHA512 (ruby-3.0.4.tar.xz) = 53bf7dd403b0c68af9691882ad8ed7422c8d1f496627428fb4c3caf0b0313715524b744c5f453aced2d49e16e55f3f45b46b9a77aa3097dbfcae7caa0208194b