73 changed files with 3891 additions and 6742 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1,3 @@
-SOURCES/ruby-2.5.9.tar.xz
+/*/
 /ruby-*.tar.xz
 /*.rpm
--- a/.ruby.metadata
+++ b/.ruby.metadata
@ -1 +0,0 @@
 7be8dc2e6e534eb36bfdf9f017af512996ec99a6 SOURCES/ruby-2.5.9.tar.xz
--- a/SOURCES/abrt_prelude.rb
+++ b/SOURCES/abrt_prelude.rb
@ -1,8 +0,0 @@
 if defined?(Gem)
  require 'rubygems.rb'
  begin
    require 'abrt'
  rescue LoadError
  end
 end
--- a/SOURCES/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch
+++ b/SOURCES/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch
@ -1,58 +0,0 @@
 From 996012f6abe0ce4d68a2de9f249935c6d5b467bc Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
 Date: Fri, 4 Oct 2013 22:13:11 +0200
 Subject: [PATCH] Allow to specify addition preludes by configuration option.
 ---
 Makefile.in  | 2 ++
 common.mk    | 2 +-
 configure.ac | 7 +++++++
 3 files changed, 10 insertions(+), 1 deletion(-)
 diff --git a/Makefile.in b/Makefile.in
 index 7e8ed82..7916993 100644
 --- a/Makefile.in
 +++ b/Makefile.in
@@ -119,6 +119,8 @@ XRUBY_RUBYLIBDIR = @XRUBY_RUBYLIBDIR@
 XRUBY_RUBYHDRDIR = @XRUBY_RUBYHDRDIR@
 BOOTSTRAPRUBY = @BOOTSTRAPRUBY@
 +OPTIONAL_PRELUDES = @OPTIONAL_PRELUDES@
 +
 #### End of system configuration section. ####
 MAJOR=	@MAJOR@
 diff --git a/common.mk b/common.mk
 index 5cfbc3d..3f0a82e 100644
 --- a/common.mk
 +++ b/common.mk
@@ -147,7 +147,7 @@ ALLOBJS       = $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(INITOBJS)
 GOLFOBJS      = goruby.$(OBJEXT) golf_prelude.$(OBJEXT)
 DEFAULT_PRELUDES = $(GEM_PRELUDE)
 -PRELUDE_SCRIPTS = $(srcdir)/prelude.rb $(DEFAULT_PRELUDES)
 +PRELUDE_SCRIPTS = $(srcdir)/prelude.rb $(DEFAULT_PRELUDES) $(OPTIONAL_PRELUDES)
 GEM_PRELUDE   = $(srcdir)/gem_prelude.rb
 PRELUDES      = {$(srcdir)}prelude.c {$(srcdir)}miniprelude.c
 GOLFPRELUDES  = {$(srcdir)}golf_prelude.c
 diff --git a/configure.ac b/configure.ac
 index 028ef7ca3e..cdeff87871 100644
 --- a/configure.ac
 +++ b/configure.ac
@@ -4397,6 +4397,13 @@ AC_SUBST(rubyarchhdrdir)dnl
 AC_SUBST(sitearchhdrdir)dnl
 AC_SUBST(vendorarchhdrdir)dnl
 +AC_ARG_WITH(prelude,
 +		AS_HELP_STRING([--with-prelude=FILE-LIST], [specify additional preludes separated by space]),
 +		[prelude=$withval])
 +if test "$prelude" != ""; then
 +    AC_SUBST(OPTIONAL_PRELUDES, $prelude)
 +fi
 +
 AC_ARG_WITH(mantype,
 	AS_HELP_STRING([--with-mantype=TYPE], [specify man page type; TYPE is one of man and doc]),
 		[
 -- 
 1.8.3.1
--- a/SOURCES/ruby-2.2.3-Generate-preludes-using-miniruby.patch
+++ b/SOURCES/ruby-2.2.3-Generate-preludes-using-miniruby.patch
@ -1,28 +0,0 @@
 From 07eb5f5e775dec01a92a8b13910eaced9e8ee0cd Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
 Date: Tue, 2 Dec 2014 10:56:58 +0100
 Subject: [PATCH] Generate preludes using miniruby.
 ---
 common.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 diff --git a/common.mk b/common.mk
 index 168dc52..20c218a 100644
 --- a/common.mk
 +++ b/common.mk
@@ -962,9 +962,9 @@ $(MINIPRELUDE_C): $(COMPILE_PRELUDE)
 		$(srcdir)/template/prelude.c.tmpl
 $(PRELUDE_C): $(COMPILE_PRELUDE) \
 -	   $(PRELUDE_SCRIPTS)
 +	   $(PRELUDE_SCRIPTS) $(PREP)
 	$(ECHO) generating $@
 -	$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb -I$(srcdir) -c -o $@ \
 +	$(Q) $(MINIRUBY) $(srcdir)/tool/generic_erb.rb -I$(srcdir) -c -o $@ \
 		$(srcdir)/template/prelude.c.tmpl $(PRELUDE_SCRIPTS)
 {$(VPATH)}golf_prelude.c: $(COMPILE_PRELUDE) {$(srcdir)}golf_prelude.rb
 -- 
 2.6.3
--- a/SOURCES/ruby-2.5.0-Add-Gem.operating_system_defaults.patch
+++ b/SOURCES/ruby-2.5.0-Add-Gem.operating_system_defaults.patch
@ -1,80 +0,0 @@
 From 60eb961c25f801ee43ca1be9393ab2f0a0546677 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
 Date: Tue, 19 Dec 2017 14:00:20 +0100
 Subject: [PATCH] Add Gem.operating_system_defaults to allow packagers to
 override defaults.
 This change allows Ruby packagers to override defaults and lazily query
 them.
 This is very much the same change as #1644 to treat the
 operating_system defaults the same way as platform defaults.
 ---
 lib/rubygems/config_file.rb |  2 +-
 lib/rubygems/defaults.rb    | 21 ++++++++++++++++++++-
 test/rubygems/test_gem.rb   |  7 +++++++
 3 files changed, 28 insertions(+), 2 deletions(-)
 diff --git a/lib/rubygems/config_file.rb b/lib/rubygems/config_file.rb
 index a4efed0f5a..deee38e6d9 100644
 --- a/lib/rubygems/config_file.rb
 +++ b/lib/rubygems/config_file.rb
@@ -48,7 +48,7 @@ class Gem::ConfigFile
   # For Ruby packagers to set configuration defaults.  Set in
   # rubygems/defaults/operating_system.rb
 -  OPERATING_SYSTEM_DEFAULTS = {}
 +  OPERATING_SYSTEM_DEFAULTS = Gem.operating_system_defaults
   ##
   # For Ruby implementers to set configuration defaults.  Set in
 diff --git a/lib/rubygems/defaults.rb b/lib/rubygems/defaults.rb
 index 43d57fc808..b8222877ae 100644
 --- a/lib/rubygems/defaults.rb
 +++ b/lib/rubygems/defaults.rb
@@ -177,7 +177,26 @@ def self.vendor_dir # :nodoc:
   end
   ##
 -  # Default options for gem commands.
 +  # Default options for gem commands for Ruby packagers.
 +  #
 +  # The options here should be structured as an array of string "gem"
 +  # command names as keys and a string of the default options as values.
 +  #
 +  # Example:
 +  #
 +  # def self.operating_system_defaults
 +  #   {
 +  #       'install' => '--no-rdoc --no-ri --env-shebang',
 +  #       'update' => '--no-rdoc --no-ri --env-shebang'
 +  #   }
 +  # end
 +
 +  def self.operating_system_defaults
 +    {}
 +  end
 +
 +  ##
 +  # Default options for gem commands for Ruby implementers.
   #
   # The options here should be structured as an array of string "gem"
   # command names as keys and a string of the default options as values.
 diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb
 index 3225a05c6b..62b80c4945 100644
 --- a/test/rubygems/test_gem.rb
 +++ b/test/rubygems/test_gem.rb
@@ -1837,6 +1837,13 @@ def test_use_gemdeps_specific
     ENV['RUBYGEMS_GEMDEPS'] = rubygems_gemdeps
   end
 +  def test_operating_system_defaults
 +    operating_system_defaults = Gem.operating_system_defaults
 +
 +    assert operating_system_defaults != nil
 +    assert operating_system_defaults.is_a? Hash
 +  end
 +
   def test_platform_defaults
     platform_defaults = Gem.platform_defaults
--- a/SOURCES/ruby-2.5.1-Avoid-need-of-C++-compiler-to-pass-the-test-suite.patch
+++ b/SOURCES/ruby-2.5.1-Avoid-need-of-C++-compiler-to-pass-the-test-suite.patch
@ -1,35 +0,0 @@
 From 51e2c91412a511196e58efea5b87c460b4fa6a20 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
 Date: Thu, 26 Jul 2018 13:17:52 +0200
 Subject: [PATCH] Avoid need of C++ compiler to pass the test suite.
 The test suite fails when C++ compiler is not available on the system:
 ~~~
 TestGemExtCmakeBuilder#test_self_build:
 Gem::InstallError: cmake failed, exit code 1
    /builddir/build/BUILD/ruby-2.5.1/lib/rubygems/ext/builder.rb:92:in `run'
    /builddir/build/BUILD/ruby-2.5.1/lib/rubygems/ext/cmake_builder.rb:10:in `build'
    /builddir/build/BUILD/ruby-2.5.1/test/rubygems/test_gem_ext_cmake_builder.rb:37:in `block in test_self_build'
    /builddir/build/BUILD/ruby-2.5.1/test/rubygems/test_gem_ext_cmake_builder.rb:36:in `chdir'
    /builddir/build/BUILD/ruby-2.5.1/test/rubygems/test_gem_ext_cmake_builder.rb:36:in `test_self_build'
 ~~~
 But there is nothing which would realy required C++. It is just CMake
 default to check for C++.
 ---
 test/rubygems/test_gem_ext_cmake_builder.rb | 1 +
 1 file changed, 1 insertion(+)
 diff --git a/test/rubygems/test_gem_ext_cmake_builder.rb b/test/rubygems/test_gem_ext_cmake_builder.rb
 index 76d3cb2afe..2d449fc2fd 100644
 --- a/test/rubygems/test_gem_ext_cmake_builder.rb
 +++ b/test/rubygems/test_gem_ext_cmake_builder.rb
@@ -25,6 +25,7 @@ def test_self_build
     File.open File.join(@ext, 'CMakeLists.txt'), 'w' do |cmakelists|
       cmakelists.write <<-eo_cmake
 cmake_minimum_required(VERSION 2.6)
 +project(self_build LANGUAGES NONE)
 install (FILES test.txt DESTINATION bin)
       eo_cmake
     end
--- a/SOURCES/ruby-2.5.9-revert-stop-the-error-due-to-openssl-1-1-1h.patch
+++ b/SOURCES/ruby-2.5.9-revert-stop-the-error-due-to-openssl-1-1-1h.patch
@ -1,46 +0,0 @@
 From 93e6364a848f00b34647b13063dceb854dfaa11e Mon Sep 17 00:00:00 2001
 From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
 Date: Wed, 28 Oct 2020 13:12:06 +0000
 Subject: [PATCH] merge revision(s): 07786ed
 	* test/net/http/test_https.rb: Stop the error due to openssl 1.1.1h
 	On some environments that uses OpenSSL 1.1.1h, the two tests now fail.
 	http://rubyci.s3.amazonaws.com/android29-x86_64/ruby-master/log/20200924T062352Z.fail.html.gz
 	https://github.com/ruby/ruby/runs/1159288773?check_suite_focus=true
 	```
 	  1) Failure:
 	TestNetHTTPS#test_get [/data/data/com.termux/files/home/cb/tmp/build/202	00924T062352Z/ruby/test/net/http/test_https.rb:47]:
 	<"0\x82\x03\xED0\x82\x02\xD5\xA0\x03..."> expected but was
 	<"0\x82\x03\xE30\x82\x02\xCB\xA0\x03...">.
 	```
 	Not sure why, but verify_callback now seems to receive only SERVER_CERT
 	but not CA_CERT.
 	It would be good to investigate the issue furthermore, but tentatively,
 	I want to stop the failures.
 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@67887 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 ---
 test/net/http/test_https.rb | 6 ++++--
 diff --git a/test/net/http/test_https.rb b/test/net/http/test_https.rb
 index c1d486470ae2..3a2341024121 100644
 --- a/test/net/http/test_https.rb
 +++ b/test/net/http/test_https.rb
@@ -44,8 +44,10 @@ def test_get
     http.request_get("/") {|res|
       assert_equal($test_net_http_data, res.body)
     }
 -    assert_equal(CA_CERT.to_der, certs[0].to_der)
 -    assert_equal(SERVER_CERT.to_der, certs[1].to_der)
 +    # TODO: OpenSSL 1.1.1h seems to yield only SERVER_CERT; need to check the incompatibility
 +    certs.zip([SERVER_CERT, CA_CERT]) do |actual, expected|
 +      assert_equal(expected.to_der, actual.to_der)
 +    end
   rescue SystemCallError
     skip $!
   end
--- a/SOURCES/ruby-2.6.0-Fix-issues-detected-by-code-analysis-tool.patch
+++ b/SOURCES/ruby-2.6.0-Fix-issues-detected-by-code-analysis-tool.patch
@ -1,78 +0,0 @@
 From 893949167bdb911c7db9fd59de85f288c09741e1 Mon Sep 17 00:00:00 2001
 From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
 Date: Sat, 15 Sep 2018 09:59:14 +0000
 Subject: [PATCH] Fix issues detected by code analysis tool (mainly Coverity).
 * Fix leaked storage in addr2line.c.
 * Fix for "top_root" leaking the resource.
 [Fix GH-1956]
 From: Jun Aruga <jaruga@redhat.com>
 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64750 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 ---
 addr2line.c | 8 ++++++--
 regcomp.c   | 3 +++
 2 files changed, 9 insertions(+), 2 deletions(-)
 diff --git a/addr2line.c b/addr2line.c
 index 2c422cc1697a..b266e44d5d4b 100644
 --- a/addr2line.c
 +++ b/addr2line.c
@@ -593,11 +593,12 @@ fill_lines(int num_traces, void **traces, int check_debuglink,
 		h = dlopen(NULL, RTLD_NOW|RTLD_LOCAL);
 		if (!h) continue;
 		s = dlsym(h, strtab + sym->st_name);
 -		if (!s) continue;
 -		if (dladdr(s, &info)) {
 +		if (s && dladdr(s, &info)) {
 		    dladdr_fbase = (uintptr_t)info.dli_fbase;
 +                    dlclose(h);
 		    break;
 		}
 +                dlclose(h);
 	    }
 	    if (ehdr->e_type == ET_EXEC) {
 		obj->base_addr = 0;
@@ -655,6 +656,9 @@ fill_lines(int num_traces, void **traces, int check_debuglink,
 finish:
     return dladdr_fbase;
 fail:
 +    if (file != NULL) {
 +        munmap(file, (size_t)filesize);
 +    }
     return (uintptr_t)-1;
 }
 diff --git a/regcomp.c b/regcomp.c
 index 0f6bee60d576..df7f73bac501 100644
 --- a/regcomp.c
 +++ b/regcomp.c
@@ -3596,6 +3596,7 @@ expand_case_fold_string(Node* node, regex_t* reg)
     if (n == 0 || varlen == 0) {
       if (IS_NULL(snode)) {
 	if (IS_NULL(root) && IS_NOT_NULL(prev_node)) {
 +          onig_node_free(top_root);
 	  top_root = root = onig_node_list_add(NULL_NODE, prev_node);
 	  if (IS_NULL(root)) {
 	    onig_node_free(prev_node);
@@ -3627,6 +3628,7 @@ expand_case_fold_string(Node* node, regex_t* reg)
 	}
       }
       if (IS_NULL(root) && IS_NOT_NULL(prev_node)) {
 +        onig_node_free(top_root);
 	top_root = root = onig_node_list_add(NULL_NODE, prev_node);
 	if (IS_NULL(root)) {
 	  onig_node_free(prev_node);
@@ -3677,6 +3679,7 @@ expand_case_fold_string(Node* node, regex_t* reg)
     if (r != 0) goto mem_err;
     if (IS_NOT_NULL(prev_node) && IS_NULL(root)) {
 +      onig_node_free(top_root);
       top_root = root = onig_node_list_add(NULL_NODE, prev_node);
       if (IS_NULL(root)) {
 	onig_node_free(srem);
 -- 
 2.21.0
--- a/SOURCES/ruby-2.6.0-config-support-include-directive.patch
+++ b/SOURCES/ruby-2.6.0-config-support-include-directive.patch
@ -1,182 +0,0 @@
 From f46bac1f3e8634e24c747d06b28e11b874f1e488 Mon Sep 17 00:00:00 2001
 From: Kazuki Yamaguchi <k@rhe.jp>
 Date: Thu, 16 Aug 2018 19:40:48 +0900
 Subject: [PATCH] config: support .include directive
 OpenSSL 1.1.1 introduces a new '.include' directive. Update our config
 parser to support that.
 As mentioned in the referenced GitHub issue, we should use the OpenSSL
 API instead of implementing the parsing logic ourselves, but it will
 need backwards-incompatible changes which we can't backport to stable
 versions. So continue to use the Ruby implementation for now.
 Reference: https://github.com/ruby/openssl/issues/208
 ---
 ext/openssl/lib/openssl/config.rb | 54 ++++++++++++++++++++++++++++---------------
 test/openssl/test_config.rb   | 54 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 90 insertions(+), 18 deletions(-)
 diff --git a/ext/openssl/lib/openssl/config.rb b/ext/openssl/lib/openssl/config.rb
 index 88225451..ba3a54c8 100644
 --- a/ext/openssl/lib/openssl/config.rb
 +++ b/ext/openssl/lib/openssl/config.rb
@@ -77,29 +77,44 @@ def get_key_string(data, section, key) # :nodoc:
       def parse_config_lines(io)
         section = 'default'
         data = {section => {}}
 -        while definition = get_definition(io)
 +        io_stack = [io]
 +        while definition = get_definition(io_stack)
           definition = clear_comments(definition)
           next if definition.empty?
 -          if definition[0] == ?[
 +          case definition
 +          when /\A\[/
             if /\[([^\]]*)\]/ =~ definition
               section = $1.strip
               data[section] ||= {}
             else
               raise ConfigError, "missing close square bracket"
             end
 -          else
 -            if /\A([^:\s]*)(?:::([^:\s]*))?\s*=(.*)\z/ =~ definition
 -              if $2
 -                section = $1
 -                key = $2
 -              else
 -                key = $1
 +          when /\A\.include (.+)\z/
 +            path = $1
 +            if File.directory?(path)
 +              files = Dir.glob(File.join(path, "*.{cnf,conf}"), File::FNM_EXTGLOB)
 +            else
 +              files = [path]
 +            end
 +
 +            files.each do |filename|
 +              begin
 +                io_stack << StringIO.new(File.read(filename))
 +              rescue
 +                raise ConfigError, "could not include file '%s'" % filename
               end
 -              value = unescape_value(data, section, $3)
 -              (data[section] ||= {})[key] = value.strip
 +            end
 +          when /\A([^:\s]*)(?:::([^:\s]*))?\s*=(.*)\z/
 +            if $2
 +              section = $1
 +              key = $2
             else
 -              raise ConfigError, "missing equal sign"
 +              key = $1
             end
 +            value = unescape_value(data, section, $3)
 +            (data[section] ||= {})[key] = value.strip
 +          else
 +            raise ConfigError, "missing equal sign"
           end
         end
         data
@@ -212,10 +227,10 @@ def clear_comments(line)
         scanned.join
       end
 -      def get_definition(io)
 -        if line = get_line(io)
 +      def get_definition(io_stack)
 +        if line = get_line(io_stack)
           while /[^\\]\\\z/ =~ line
 -            if extra = get_line(io)
 +            if extra = get_line(io_stack)
               line += extra
             else
               break
@@ -225,9 +240,12 @@ def get_definition(io)
         end
       end
 -      def get_line(io)
 -        if line = io.gets
 -          line.gsub(/[\r\n]*/, '')
 +      def get_line(io_stack)
 +        while io = io_stack.last
 +          if line = io.gets
 +            return line.gsub(/[\r\n]*/, '')
 +          end
 +          io_stack.pop
         end
       end
     end
 diff --git a/test/openssl/test_config.rb b/test/openssl/test_config.rb
 index 99dcc497..5653b5d0 100644
 --- a/test/openssl/test_config.rb
 +++ b/test/openssl/test_config.rb
@@ -120,6 +120,49 @@ def test_s_parse_format
     assert_equal("error in line 7: missing close square bracket", excn.message)
   end
 +  def test_s_parse_include
 +    in_tmpdir("ossl-config-include-test") do |dir|
 +      Dir.mkdir("child")
 +      File.write("child/a.conf", <<~__EOC__)
 +        [default]
 +        file-a = a.conf
 +        [sec-a]
 +        a = 123
 +      __EOC__
 +      File.write("child/b.cnf", <<~__EOC__)
 +        [default]
 +        file-b = b.cnf
 +        [sec-b]
 +        b = 123
 +      __EOC__
 +      File.write("include-child.conf", <<~__EOC__)
 +        key_outside_section = value_a
 +        .include child
 +      __EOC__
 +
 +      include_file = <<~__EOC__
 +        [default]
 +        file-main = unnamed
 +        [sec-main]
 +        main = 123
 +        .include include-child.conf
 +      __EOC__
 +
 +      # Include a file by relative path
 +      c1 = OpenSSL::Config.parse(include_file)
 +      assert_equal(["default", "sec-a", "sec-b", "sec-main"], c1.sections.sort)
 +      assert_equal(["file-main", "file-a", "file-b"], c1["default"].keys)
 +      assert_equal({"a" => "123"}, c1["sec-a"])
 +      assert_equal({"b" => "123"}, c1["sec-b"])
 +      assert_equal({"main" => "123", "key_outside_section" => "value_a"}, c1["sec-main"])
 +
 +      # Relative paths are from the working directory
 +      assert_raise(OpenSSL::ConfigError) do
 +        Dir.chdir("child") { OpenSSL::Config.parse(include_file) }
 +      end
 +    end
 +  end
 +
   def test_s_load
     # alias of new
     c = OpenSSL::Config.load
@@ -299,6 +342,17 @@ def test_clone
     @it['newsection'] = {'a' => 'b'}
     assert_not_equal(@it.sections.sort, c.sections.sort)
   end
 +
 +  private
 +
 +  def in_tmpdir(*args)
 +    Dir.mktmpdir(*args) do |dir|
 +      dir = File.realpath(dir)
 +      Dir.chdir(dir) do
 +        yield dir
 +      end
 +    end
 +  end
 end
 end
--- a/SOURCES/ruby-2.6.0-configure-fstack-protector-strong.patch
+++ b/SOURCES/ruby-2.6.0-configure-fstack-protector-strong.patch
@ -1,43 +0,0 @@
 From c8ccdbfe1e45cb3b832109d644296c0a3b3e0b59 Mon Sep 17 00:00:00 2001
 From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
 Date: Sun, 2 Sep 2018 03:49:31 +0000
 Subject: [PATCH] configure.ac: -fstack-protector-strong
 * configure.ac: use -fstack-protector-strong if available instead of
  -fstack-protector conditionally.  [ruby-core:88788] [Misc #15053]
 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64614 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 ---
 configure.ac | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)
 diff --git a/configure.ac b/configure.ac
 index 9328fa532de0..b8ee57239215 100644
 --- a/configure.ac
 +++ b/configure.ac
@@ -837,15 +837,18 @@ AS_IF([test "$GCC" = yes], [
 	stack_protector=no
     ])
     AS_IF([test -z "${stack_protector+set}"], [
 -	RUBY_TRY_CFLAGS(-fstack-protector, [stack_protector=yes], [stack_protector=no])
 -	AS_IF([test "x$stack_protector" = xyes], [
 -	    RUBY_TRY_LDFLAGS(-fstack-protector, [], [stack_protector=broken])
 +	AS_FOR(option, opt, [-fstack-protector-strong -fstack-protector], [
 +	    RUBY_TRY_CFLAGS(option, [stack_protector=yes])
 +	    AS_IF([test "x$stack_protector" = xyes], [
 +		RUBY_TRY_LDFLAGS(option, [], [stack_protector=])
 +	    ])
 +	    AS_IF([test "x$stack_protector" = xyes], [stack_protector=option; break])
 	])
     ])
 -    AS_IF([test "x$stack_protector" = xyes], [
 -	RUBY_APPEND_OPTION(XCFLAGS, -fstack-protector)
 -	RUBY_APPEND_OPTION(XLDFLAGS, -fstack-protector)
 -	RUBY_APPEND_OPTION(LDFLAGS, -fstack-protector)
 +    AS_CASE(["$stack_protector"], [-*], [
 +	RUBY_APPEND_OPTION(XCFLAGS, $stack_protector)
 +	RUBY_APPEND_OPTION(XLDFLAGS, $stack_protector)
 +	RUBY_APPEND_OPTION(LDFLAGS, $stack_protector)
     ])
     AS_CASE("${compress_debug_sections:-zlib}",
--- a/SOURCES/ruby-2.6.0-library-options-to-MAINLIBS.patch
+++ b/SOURCES/ruby-2.6.0-library-options-to-MAINLIBS.patch
@ -1,177 +0,0 @@
 From bb3db69e2a0c210cc3a63940622db96a97eb7947 Mon Sep 17 00:00:00 2001
 From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
 Date: Fri, 2 Mar 2018 01:37:53 +0000
 Subject: [PATCH] configure.ac: library options to MAINLIBS
 * configure.ac (MAINLIBS): moved library options for main program
  and static libruby, and append MAINLIBS to LIBRUBYARG_STATIC, as
  these libraries are not needed for linking to shared libruby.
  [ruby-core:85882] [Bug #14422]
 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62627 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 ---
 configure.ac        | 33 +++++++++++++++------------------
 template/ruby.pc.in |  1 +
 win32/Makefile.sub  |  6 ++++--
 3 files changed, 20 insertions(+), 20 deletions(-)
 diff --git a/configure.ac b/configure.ac
 index aebbae1969a5..733a0c992fd7 100644
 --- a/configure.ac
 +++ b/configure.ac
@@ -10,6 +10,7 @@ AC_DISABLE_OPTION_CHECKING
 AC_ARG_VAR([cflags], [additional CFLAGS])
 AC_ARG_VAR([cppflags], [additional CPPFLAGS])
 AC_ARG_VAR([cxxflags], [additional CXXFLAGS])
 +ORIG_LIBS=$LIBS
 AC_DEFUN([RUBY_RM_RECURSIVE], [
 m4_version_prereq([2.70], [-1], [
@@ -2939,13 +2940,11 @@ AS_IF([test x"$enable_pthread" = xyes], [
 	AC_DEFINE(_THREAD_SAFE)
 	AC_DEFINE(HAVE_LIBPTHREAD)
 	AC_CHECK_HEADERS(pthread_np.h, [], [], [@%:@include <pthread.h>])
 -	AS_CASE([$pthread_lib],
 -	[c],    [],
 -	[root], [],
 -	[c_r],  [MAINLIBS="-pthread $MAINLIBS"],
 -	        [AS_CASE(["$target_os"],
 -		    [openbsd*|mirbsd*], [LIBS="-pthread $LIBS"],
 -		    [LIBS="-l$pthread_lib $LIBS"])])
 +	AS_CASE(["$pthread_lib:$target_os"],
 +		[c:*], [],
 +		[root:*], [],
 +		[c_r:*|*:openbsd*|*:mirbsd*],  [LIBS="-pthread $LIBS"],
 +		[LIBS="-l$pthread_lib $LIBS"])
     ], [
 	AC_MSG_WARN("Don't know how to find pthread library on your system -- thread support disabled")
     ])
@@ -3624,7 +3623,7 @@ LIBRUBY_A='lib$(RUBY_SO_NAME)-static.a'
 LIBRUBY='$(LIBRUBY_A)'
 LIBRUBYARG_STATIC='-l$(RUBY_SO_NAME)-static'
 LIBRUBYARG='$(LIBRUBYARG_STATIC)'
 -SOLIBS=
 +SOLIBS='$(MAINLIBS)'
 AS_CASE(["$target_os"],
   [cygwin*|mingw*|haiku*|darwin*], [
@@ -3690,9 +3689,6 @@ AS_CASE("$enable_shared", [yes], [
   LIBRUBY_RELATIVE=no
   test -z "$CCDLFLAGS" || CFLAGS="$CFLAGS $CCDLFLAGS"
   ENABLE_SHARED=yes
 -  AS_IF([test "$rb_cv_binary_elf" = yes], [
 -    SOLIBS='$(LIBS)'
 -  ])
   # libdir can be overridden in config.site file (on OpenSUSE at least).
   libdir_basename=lib
@@ -3727,7 +3723,6 @@ AS_CASE("$enable_shared", [yes], [
 	])
 	],
     [freebsd*|dragonfly*], [
 -	SOLIBS='$(LIBS)'
 	LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)'
 	LIBRUBY_SONAME='$(LIBRUBY_SO)'
 	AS_IF([test "$rb_cv_binary_elf" != "yes" ], [
@@ -3736,7 +3731,6 @@ AS_CASE("$enable_shared", [yes], [
 	])
 	],
     [netbsd*], [
 -	SOLIBS='$(LIBS)'
 	LIBRUBY_SONAME='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)'
 	LIBRUBY_SO="${LIBRUBY_SONAME}"'.$(TEENY)'
 	RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS, ['-Wl,-soname,$(LIBRUBY_SONAME)' "$LDFLAGS_OPTDIR"])
@@ -3747,11 +3741,9 @@ AS_CASE("$enable_shared", [yes], [
 	])
 	],
     [openbsd*|mirbsd*], [
 -	SOLIBS='$(LIBS)'
 	LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}`
 	],
     [solaris*], [
 -	SOLIBS='$(LIBS)'
 	LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)'
 	LIBRUBY_SONAME='lib$(RUBY_SO_NAME).$(SOEXT).$(RUBY_PROGRAM_VERSION)'
 	LIBRUBY_ALIASES='$(LIBRUBY_SONAME) lib$(RUBY_SO_NAME).$(SOEXT)'
@@ -3769,7 +3761,7 @@ AS_CASE("$enable_shared", [yes], [
     [aix*], [
 	RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS, ["${linker_flag}-bnoentry" "$XLDFLAGS" "$LDFLAGS_OPTDIR"])
 	LIBRUBYARG_SHARED='-L${libdir} -l${RUBY_SO_NAME}'
 -	SOLIBS='-lm -lc'
 +	LIBS="$LIBS -lm -lc"
 	],
     [darwin*], [
 	LIBRUBY_LDSHARED='$(CC) -dynamiclib'
@@ -3789,7 +3781,6 @@ AS_CASE("$enable_shared", [yes], [
 	LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT)'
 	LIBRUBY_SONAME='lib$(RUBY_BASE_NAME).$(RUBY_API_VERSION).$(SOEXT)'
 	LIBRUBY_ALIASES='$(LIBRUBY_SONAME) lib$(RUBY_INSTALL_NAME).$(SOEXT)'
 -	SOLIBS='$(LIBS)'
 	],
     [interix*], [
 	LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)'
@@ -4032,7 +4023,6 @@ AS_CASE(["$target_os"],
 	    ])
 	LIBRUBY_ALIASES=''
 	FIRSTMAKEFILE=GNUmakefile:cygwin/GNUmakefile.in
 -	SOLIBS='$(LIBS)'
 	AS_IF([test x"$enable_shared" = xyes], [
 	    LIBRUBY='lib$(RUBY_SO_NAME).dll.a'
 	], [
@@ -4132,6 +4122,13 @@ AS_IF([test "${universal_binary-no}" = yes ], [
 		[rb_cv_architecture_available=yes], [rb_cv_architecture_available=no]))
 ])
 +MAINLIBS="$LIBS"
 +LIBS=$ORIG_LIBS
 +AS_IF([test -n "${LIBS}"], [
 +    libspat=`echo "${LIBS}" | sed 's/[[][|.*$^]]/\\&/g;s/^  */ /;s/^  *$/ /'`
 +    MAINFLAGS=`echo " $MAINLIBS " | sed "s|$libspat"'||;s/^ *//;s/ *$//'`
 +])
 +LIBRUBYARG_STATIC="${LIBRUBYARG_STATIC} \$(MAINLIBS)"
 CPPFLAGS="$CPPFLAGS "'$(DEFS)'
 test -z "$CPPFLAGS" || CPPFLAGS="$CPPFLAGS "; CPPFLAGS="$CPPFLAGS"'${cppflags}'
 AS_IF([test -n "${cflags+set}"], [
 diff --git a/template/ruby.pc.in b/template/ruby.pc.in
 index d874f92c3b20..7ce4461c05df 100644
 --- a/template/ruby.pc.in
 +++ b/template/ruby.pc.in
@@ -39,6 +39,7 @@ sitehdrdir=@sitehdrdir@
 rubyarchhdrdir=@rubyarchhdrdir@
 vendorarchhdrdir=@vendorarchhdrdir@
 sitearchhdrdir=@sitearchhdrdir@
 +MAINLIBS=@MAINLIBS@
 SOEXT=@SOEXT@
 LIBPATH=@LIBPATH@
 LIBRUBY_A=@LIBRUBY_A@
 diff --git a/win32/Makefile.sub b/win32/Makefile.sub
 index 8673c121641e..f8316cccb68e 100644
 --- a/win32/Makefile.sub
 +++ b/win32/Makefile.sub
@@ -279,6 +279,7 @@ MJIT_DEBUGFLAGS = $(DEBUGFLAGS)
 CPPFLAGS = $(DEFS) $(ARCHDEFS) $(CPPFLAGS)
 DLDFLAGS = $(LDFLAGS) -dll
 +MAINLIBS = $(LIBS)
 SOLIBS =
 RCFILES = $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc
 !ifndef RCFLAGS
@@ -821,7 +822,8 @@ s,@CPPFLAGS@,$(CPPFLAGS),;t t
 s,@CXXFLAGS@,$(CXXFLAGS),;t t
 s,@FFLAGS@,$(FFLAGS),;t t
 s,@LDFLAGS@,$(LDFLAGS),;t t
 -s,@LIBS@,$(LIBS),;t t
 +s,@LIBS@,,;t t
 +s,@MAINLIBS@,$(MAINLIBS),;t t
 s,@exec_prefix@,$${prefix},;t t
 s,@prefix@,$(prefix),;t t
 s,@program_transform_name@,s,.*,$(PROGRAM_PREFIX)&$(PROGRAM_SUFFIX),,;t t
@@ -909,7 +911,7 @@ s,@LIBRUBY_SO@,$$(RUBY_SO_NAME).dll,;t t
 s,@LIBRUBY_ALIASES@,$(LIBRUBY_ALIASES),;t t
 s,@LIBRUBY@,$$(RUBY_SO_NAME).lib,;t t
 s,@LIBRUBYARG@,$$(LIBRUBYARG_SHARED),;t t
 -s,@LIBRUBYARG_STATIC@,$$(LIBRUBY_A),;t t
 +s,@LIBRUBYARG_STATIC@,$$(LIBRUBY_A) $$(MAINLIBS),;t t
 s,@LIBRUBYARG_SHARED@,$$(LIBRUBY),;t t
 s,@SOLIBS@,$(SOLIBS),;t t
 s,@DLDLIBS@,$(DLDLIBS),;t t
--- a/SOURCES/ruby-2.6.0-rdoc-6.0.2-check-nil-text-token.patch
+++ b/SOURCES/ruby-2.6.0-rdoc-6.0.2-check-nil-text-token.patch
@ -1,69 +0,0 @@
 From 9d98bfe7f1abdeda5aedf9404588104980ee7a86 Mon Sep 17 00:00:00 2001
 From: aycabta <aycabta@gmail.com>
 Date: Mon, 15 Jan 2018 22:32:56 +0900
 Subject: [PATCH] Check nil text token
 Sometimes :on_ignored_nl token has nil text. This commit checks and
 bypasses the token.
 ---
 lib/rdoc/parser/ripper_state_lex.rb |  4 +++-
 test/test_rdoc_parser_ruby.rb       | 30 +++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)
 diff --git a/lib/rdoc/parser/ripper_state_lex.rb b/lib/rdoc/parser/ripper_state_lex.rb
 index 2a285b97a4..c56cef46ee 100644
 --- a/lib/rdoc/parser/ripper_state_lex.rb
 +++ b/lib/rdoc/parser/ripper_state_lex.rb
@@ -330,8 +330,10 @@ class RDoc::RipperStateLex
       @heredoc_queue << retrieve_heredoc_info(tk)
       @inner_lex.lex_state = EXPR_END unless RIPPER_HAS_LEX_STATE
     when :on_nl, :on_ignored_nl, :on_comment, :on_heredoc_end then
 -      unless @heredoc_queue.empty?
 +      if !@heredoc_queue.empty?
         get_heredoc_tk(*@heredoc_queue.shift)
 +      elsif tk[:text].nil? # :on_ignored_nl sometimes gives nil
 +        tk[:text] = ''
       end
     when :on_words_beg then
       tk = get_words_tk(tk)
 diff --git a/test/rdoc/test_rdoc_parser_ruby.rb b/test/rdoc/test_rdoc_parser_ruby.rb
 index 833ed2cc74..c9d57021ce 100644
 --- a/test/rdoc/test_rdoc_parser_ruby.rb
 +++ b/test/rdoc/test_rdoc_parser_ruby.rb
@@ -306,6 +306,36 @@ def sum(n)
     assert_equal @top_level, sum.file
   end
 +  def test_parse_on_ignored_nl_with_nil_text
 +    util_parser <<ruby
 +class Foo
 +  def meth
 +    variable # comment
 +      .chain
 +  end
 +end
 +ruby
 +
 +    expected = <<EXPECTED
 +<span class="ruby-keyword">def</span> <span class="ruby-identifier ruby-title">meth</span>
 +  <span class="ruby-identifier">variable</span> <span class="ruby-comment"># comment</span>
 +    .<span class="ruby-identifier">chain</span>
 +<span class="ruby-keyword">end</span>
 +EXPECTED
 +    expected = expected.rstrip
 +
 +    @parser.scan
 +
 +    foo = @store.find_class_named 'Foo'
 +    meth = foo.method_list.first
 +
 +    assert_equal 'meth',     meth.name
 +    assert_equal @top_level, meth.file
 +
 +    markup_code = meth.markup_code.sub(/^.*\n/, '')
 +    assert_equal expected, markup_code
 +  end
 +
   def test_parse_alias
     klass = RDoc::NormalClass.new 'Foo'
     klass.parent = @top_level
--- a/SOURCES/ruby-2.6.0-rdoc-6.0.2-fix-different-js-gz-pages-across-multilib.patch
+++ b/SOURCES/ruby-2.6.0-rdoc-6.0.2-fix-different-js-gz-pages-across-multilib.patch
@ -1,214 +0,0 @@
 From 091459248d3ce814e10d50cc4421f0c0454ef61f Mon Sep 17 00:00:00 2001
 From: "Bernhard M. Wiedemann" <bwiedemann@suse.de>
 Date: Sun, 30 Apr 2017 22:47:40 +0200
 Subject: [PATCH 1/4] created.rid: use SOURCE_DATE_EPOCH
 use SOURCE_DATE_EPOCH instead of current time in created.rid top line
 to enable reproducible builds of ruby docs
 See https://reproducible-builds.org/ for why this is good
 and https://reproducible-builds.org/specs/source-date-epoch/
 for the definition of this variable.
 ---
 lib/rdoc/rdoc.rb | 3 +++
 1 file changed, 3 insertions(+)
 diff --git a/lib/rdoc/rdoc.rb b/lib/rdoc/rdoc.rb
 index 68775c8be1..a2711fbbd1 100644
 --- a/lib/rdoc/rdoc.rb
 +++ b/lib/rdoc/rdoc.rb
@@ -232,6 +232,9 @@ def store= store
   def update_output_dir(op_dir, time, last = {})
     return if @options.dry_run or not @options.update_output_dir
 +    unless ENV['SOURCE_DATE_EPOCH'].nil?
 +      time = Time.at(ENV['SOURCE_DATE_EPOCH'].to_i).gmtime
 +    end
     open output_flag_file(op_dir), "w" do |f|
       f.puts time.rfc2822
 -- 
 2.21.0
 From 73a935e9fa63b056ea0be69c0c923afdfb4d88da Mon Sep 17 00:00:00 2001
 From: "Bernhard M. Wiedemann" <bwiedemann@suse.de>
 Date: Thu, 14 Dec 2017 10:54:54 +0100
 Subject: [PATCH 2/4] Do not store current timestamps in gz headers
 to enable reproducible builds of rdoc
 Normally, 0 would be the preferred value to indicate "no date"
 but that value is handled differently in Zlib::GzipWriter
 to put in the current time
 ---
 lib/rdoc/generator/json_index.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 diff --git a/lib/rdoc/generator/json_index.rb b/lib/rdoc/generator/json_index.rb
 index e4cfe967c6..a059a5d4d0 100644
 --- a/lib/rdoc/generator/json_index.rb
 +++ b/lib/rdoc/generator/json_index.rb
@@ -175,7 +175,7 @@ def generate_gzipped
     debug_msg "Writing gzipped search index to %s" % outfile
     Zlib::GzipWriter.open(outfile) do |gz|
 -      gz.mtime = File.mtime(search_index_file)
 +      gz.mtime = 1 # make output reproducible
       gz.orig_name = search_index_file.basename.to_s
       gz.write search_index
       gz.close
@@ -193,7 +193,7 @@ def generate_gzipped
         debug_msg "Writing gzipped file to %s" % outfile
         Zlib::GzipWriter.open(outfile) do |gz|
 -          gz.mtime = File.mtime(dest)
 +          gz.mtime = 1 # make output reproducible
           gz.orig_name = dest.basename.to_s
           gz.write data
           gz.close
 -- 
 2.21.0
 From 1b34b337b72918e83c3b952eed6998ad47974960 Mon Sep 17 00:00:00 2001
 From: aycabta <aycabta@gmail.com>
 Date: Sat, 27 Jan 2018 14:37:42 +0900
 Subject: [PATCH 3/4] Improve reproducible builds for .js and .js.gz files
 The mtime for search_index.js.gz should be updated because it's
 generated dynamically. So uses SOURCE_DATE_EPOCH after
 RDoc::Generator::JsonIndex#generate creates index file.
 FileUtils.install in RDoc::Generator::JsonIndex#generate with :preserve
 option because the mtime value is based on original .js file.
 ---
 lib/rdoc/generator/json_index.rb            |  9 +++++---
 test/rdoc/test_rdoc_generator_json_index.rb | 25 ++++++++++++++++++++-
 2 files changed, 30 insertions(+), 4 deletions(-)
 diff --git a/lib/rdoc/generator/json_index.rb b/lib/rdoc/generator/json_index.rb
 index a059a5d4d0..3a1000033d 100644
 --- a/lib/rdoc/generator/json_index.rb
 +++ b/lib/rdoc/generator/json_index.rb
@@ -147,12 +147,15 @@ def generate
       JSON.dump data, io, 0
     end
 +    unless ENV['SOURCE_DATE_EPOCH'].nil?
 +      index_file.utime index_file.atime, Time.at(ENV['SOURCE_DATE_EPOCH'].to_i).gmtime
 +    end
     Dir.chdir @template_dir do
       Dir['**/*.js'].each do |source|
         dest = File.join out_dir, source
 -        FileUtils.install source, dest, :mode => 0644, :verbose => $DEBUG_RDOC
 +        FileUtils.install source, dest, :mode => 0644, :preserve => true, :verbose => $DEBUG_RDOC
       end
     end
   end
@@ -175,7 +178,7 @@ def generate_gzipped
     debug_msg "Writing gzipped search index to %s" % outfile
     Zlib::GzipWriter.open(outfile) do |gz|
 -      gz.mtime = 1 # make output reproducible
 +      gz.mtime = File.mtime(search_index_file)
       gz.orig_name = search_index_file.basename.to_s
       gz.write search_index
       gz.close
@@ -193,7 +196,7 @@ def generate_gzipped
         debug_msg "Writing gzipped file to %s" % outfile
         Zlib::GzipWriter.open(outfile) do |gz|
 -          gz.mtime = 1 # make output reproducible
 +          gz.mtime = File.mtime(dest)
           gz.orig_name = dest.basename.to_s
           gz.write data
           gz.close
 diff --git a/test/rdoc/test_rdoc_generator_json_index.rb b/test/rdoc/test_rdoc_generator_json_index.rb
 index 6cb5463d29..65e7f087cc 100644
 --- a/test/rdoc/test_rdoc_generator_json_index.rb
 +++ b/test/rdoc/test_rdoc_generator_json_index.rb
@@ -8,7 +8,7 @@ class TestRDocGeneratorJsonIndex < RDoc::TestCase
   def setup
     super
 -    @tmpdir = File.join Dir.tmpdir, "test_rdoc_generator_darkfish_#{$$}"
 +    @tmpdir = Dir.mktmpdir "test_rdoc_generator_darkfish_#{$$}_"
     FileUtils.mkdir_p @tmpdir
     @options = RDoc::Options.new
@@ -89,12 +89,21 @@ def test_file_dir
   end
   def test_generate
 +    now = Time.now
     @g.generate
     assert_file 'js/searcher.js'
     assert_file 'js/navigation.js'
     assert_file 'js/search_index.js'
 +    orig_file = Pathname(File.join @pwd, 'lib/rdoc/generator/template/json_index/js/navigation.js')
 +    generated_file = Pathname(File.join @tmpdir, 'js/navigation.js')
 +    assert_equal orig_file.mtime, generated_file.mtime
 +    assert generated_file.mtime < now, '.js files should be the same timestamp'
 +
 +    generated_search_index = Pathname(File.join @tmpdir, 'js/search_index.js')
 +    assert generated_search_index.mtime > (now - 1), 'search_index.js should be generated timestamp'
 +
     json = File.read 'js/search_index.js'
     json =~ /\Avar search_data = /
@@ -137,6 +146,20 @@ def test_generate
     assert_equal expected, index
   end
 +  def test_generate_search_index_with_reproducible_builds
 +    backup_epoch = ENV['SOURCE_DATE_EPOCH']
 +    ruby_birthday = Time.parse 'Wed, 24 Feb 1993 21:00:00 +0900'
 +    ENV['SOURCE_DATE_EPOCH'] = ruby_birthday.to_i.to_s
 +
 +    @g.generate
 +
 +    assert_file 'js/search_index.js'
 +    generated_search_index = Pathname(File.join @tmpdir, 'js/search_index.js')
 +    assert_equal ruby_birthday, generated_search_index.mtime
 +
 +    ENV['SOURCE_DATE_EPOCH'] = backup_epoch
 +  end
 +
   def test_generate_gzipped
     begin
       require 'zlib'
 -- 
 2.21.0
 From 74c1e201f2146e7175e74d6fc0b9386c2e95210f Mon Sep 17 00:00:00 2001
 From: aycabta <aycabta@gmail.com>
 Date: Sat, 27 Jan 2018 17:54:31 +0900
 Subject: [PATCH 4/4] Use dirty hack on JRuby for MiniTest 4
 ---
 test/rdoc/test_rdoc_generator_json_index.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
 diff --git a/test/rdoc/test_rdoc_generator_json_index.rb b/test/rdoc/test_rdoc_generator_json_index.rb
 index 65e7f087cc..714d496195 100644
 --- a/test/rdoc/test_rdoc_generator_json_index.rb
 +++ b/test/rdoc/test_rdoc_generator_json_index.rb
@@ -98,7 +98,11 @@ def test_generate
     orig_file = Pathname(File.join @pwd, 'lib/rdoc/generator/template/json_index/js/navigation.js')
     generated_file = Pathname(File.join @tmpdir, 'js/navigation.js')
 -    assert_equal orig_file.mtime, generated_file.mtime
 +
 +    # This is dirty hack on JRuby for MiniTest 4
 +    assert orig_file.mtime.inspect == generated_file.mtime.inspect,
 +      '.js files should be tha same timestamp of original'
 +
     assert generated_file.mtime < now, '.js files should be the same timestamp'
     generated_search_index = Pathname(File.join @tmpdir, 'js/search_index.js')
 -- 
 2.21.0
--- a/SOURCES/ruby-2.6.0-use-larger-keys-for-SSL-tests.patch
+++ b/SOURCES/ruby-2.6.0-use-larger-keys-for-SSL-tests.patch
@ -1,486 +0,0 @@
 From b0bcb19cb4f95d260c5993df0aaa3667522fb99d Mon Sep 17 00:00:00 2001
 From: Kazuki Yamaguchi <k@rhe.jp>
 Date: Thu, 16 Aug 2018 20:54:47 +0900
 Subject: [PATCH 1/2] test/openssl/test_pair: fix deadlock in
 test_connect_accept_nonblock
 Call IO.select with a timeout value and limit the number of retries to
 prevent stacking forever.
 Reference: https://github.com/ruby/openssl/issues/214
 ---
 test/openssl/test_pair.rb | 51 ++++++++++++++++++++---------------------------
 1 file changed, 22 insertions(+), 29 deletions(-)
 diff --git a/test/openssl/test_pair.rb b/test/openssl/test_pair.rb
 index ea5f0dcf..eac3655e 100644
 --- a/test/openssl/test_pair.rb
 +++ b/test/openssl/test_pair.rb
@@ -442,7 +442,7 @@ def test_connect_accept_nonblock_no_exception
   end
   def test_connect_accept_nonblock
 -    ctx = OpenSSL::SSL::SSLContext.new()
 +    ctx = OpenSSL::SSL::SSLContext.new
     ctx.cert = @svr_cert
     ctx.key = @svr_key
     ctx.tmp_dh_callback = proc { OpenSSL::TestUtils::Fixtures.pkey_dh("dh1024") }
@@ -451,45 +451,38 @@ def test_connect_accept_nonblock
     th = Thread.new {
       s2 = OpenSSL::SSL::SSLSocket.new(sock2, ctx)
 -      s2.sync_close = true
 -      begin
 +      5.times {
 +        begin
 +          break s2.accept_nonblock
 +        rescue IO::WaitReadable
 +          IO.select([s2], nil, nil, 1)
 +        rescue IO::WaitWritable
 +          IO.select(nil, [s2], nil, 1)
 +        end
         sleep 0.2
 -        s2.accept_nonblock
 +      }
 +    }
 +
 +    s1 = OpenSSL::SSL::SSLSocket.new(sock1)
 +    5.times {
 +      begin
 +        break s1.connect_nonblock
       rescue IO::WaitReadable
 -        IO.select([s2])
 -        retry
 +        IO.select([s1], nil, nil, 1)
       rescue IO::WaitWritable
 -        IO.select(nil, [s2])
 -        retry
 +        IO.select(nil, [s1], nil, 1)
       end
 -      s2
 -    }
 -
 -    sleep 0.1
 -    ctx = OpenSSL::SSL::SSLContext.new()
 -    s1 = OpenSSL::SSL::SSLSocket.new(sock1, ctx)
 -    begin
       sleep 0.2
 -      s1.connect_nonblock
 -    rescue IO::WaitReadable
 -      IO.select([s1])
 -      retry
 -    rescue IO::WaitWritable
 -      IO.select(nil, [s1])
 -      retry
 -    end
 -    s1.sync_close = true
 +    }
     s2 = th.value
     s1.print "a\ndef"
     assert_equal("a\n", s2.gets)
   ensure
 -    th.join if th
 -    s1.close if s1 && !s1.closed?
 -    s2.close if s2 && !s2.closed?
 -    sock1.close if sock1 && !sock1.closed?
 -    sock2.close if sock2 && !sock2.closed?
 +    sock1&.close
 +    sock2&.close
 +    th&.join
   end
 end
 From 5ba99ad7ae1267ed964f53906530579299f3fcc6 Mon Sep 17 00:00:00 2001
 From: Kazuki Yamaguchi <k@rhe.jp>
 Date: Thu, 16 Aug 2018 20:04:13 +0900
 Subject: [PATCH 2/2] test: use larger keys for SSL tests
 Some systems enforce a system-wide policy to restrict key sizes used in
 SSL/TLS. Use larger ones if possible so that the test suite runs
 successfully.
 New PEM files test/openssl/fixtures/pkey/{dh-1,rsa-1,rsa-2,rsa-3}.pem are added
 to the tree, and SSL tests now use them instead of the fixed-size keys.
 Reference: https://github.com/ruby/openssl/issues/215
 ---
 test/openssl/fixtures/pkey/dh-1.pem  | 13 +++++++++
 test/openssl/fixtures/pkey/rsa-1.pem | 51 ++++++++++++++++++++++++++++++++++++
 test/openssl/fixtures/pkey/rsa-2.pem | 51 ++++++++++++++++++++++++++++++++++++
 test/openssl/fixtures/pkey/rsa-3.pem | 51 ++++++++++++++++++++++++++++++++++++
 test/openssl/test_pair.rb            |  8 +++---
 test/openssl/test_pkey_dh.rb         |  8 +++---
 test/openssl/test_ssl.rb             | 11 ++++----
 test/openssl/utils.rb                | 14 +++++-----
 8 files changed, 186 insertions(+), 21 deletions(-)
 create mode 100644 test/openssl/fixtures/pkey/dh-1.pem
 create mode 100644 test/openssl/fixtures/pkey/rsa-1.pem
 create mode 100644 test/openssl/fixtures/pkey/rsa-2.pem
 create mode 100644 test/openssl/fixtures/pkey/rsa-3.pem
 diff --git a/test/openssl/fixtures/pkey/dh-1.pem b/test/openssl/fixtures/pkey/dh-1.pem
 new file mode 100644
 index 00000000..3340a6a1
 --- /dev/null
 +++ b/test/openssl/fixtures/pkey/dh-1.pem
@@ -0,0 +1,13 @@
 +-----BEGIN DH PARAMETERS-----
 +MIICCAKCAgEAvRzXYxY6L2DjeYmm1eowtMDu1it3j+VwFr6s6PRWzc1apMtztr9G
 +xZ2mYndUAJLgNLO3n2fUDCYVMB6ZkcekW8Siocof3xWiMA6wqZ6uw0dsE3q7ZX+6
 +TLjgSjaXeGvjutvuEwVrFeaUi83bMgfXN8ToxIQVprIF35sYFt6fpbFATKfW7qqi
 +P1pQkjmCskU4tztaWvlLh0qg85wuQGnpJaQT3gS30378i0IGbA0EBvJcSpTHYbLa
 +nsdI9bfN/ZVgeolVMNMU9/n8R8vRhNPcHuciFwaqS656q+HavCIyxw/LfjSwwFvR
 +TngCn0wytRErkzFIXnRKckh8/BpI4S+0+l1NkOwG4WJ55KJ/9OOdZW5o/QCp2bDi
 +E0JN1EP/gkSom/prq8JR/yEqtsy99uc5nUxPmzv0IgdcFHZEfiQU7iRggEbx7qfQ
 +Ve55XksmmJInmpCy1bSabAEgIKp8Ckt5KLYZ0RgTXUhcEpsxEo6cuAwoSJT5o4Rp
 +yG3xow2ozPcqZkvb+d2CHj1sc54w9BVFAjVANEKmRil/9WKz14bu3wxEhOPqC54n
 +QojjLcoXSoT66ZUOQnYxTSiLtzoKGPy8cAVPbkBrXz2u2sj5gcvr1JjoGjdHm9/3
 +qnqC8fsTz8UndKNIQC337o4K0833bQMzRGl1/qjbAPit2B7E3b6xTZMCAQI=
 +-----END DH PARAMETERS-----
 diff --git a/test/openssl/fixtures/pkey/rsa-1.pem b/test/openssl/fixtures/pkey/rsa-1.pem
 new file mode 100644
 index 00000000..bd5a624f
 --- /dev/null
 +++ b/test/openssl/fixtures/pkey/rsa-1.pem
@@ -0,0 +1,51 @@
 +-----BEGIN RSA PRIVATE KEY-----
 +MIIJJwIBAAKCAgEArIEJUYZrXhMfUXXdl2gLcXrRB4ciWNEeXt5UVLG0nPhygZwJ
 +xis8tOrjXOJEpUXUsfgF35pQiJLD4T9/Vp3zLFtMOOQjOR3AxjIelbH9KPyGFEr9
 +TcPtsJ24zhcG7RbwOGXR4iIcDaTx+bCLSAd7BjG3XHQtyeepGGRZkGyGUvXjPorH
 +XP+dQjQnMd09wv0GMZSqQ06PedUUKQ4PJRfMCP+mwjFP+rB3NZuThF0CsNmpoixg
 +GdoQ591Yrf5rf2Bs848JrYdqJlKlBL6rTFf2glHiC+mE5YRny7RZtv/qIkyUNotV
 +ce1cE0GFrRmCpw9bqulDDcgKjFkhihTg4Voq0UYdJ6Alg7Ur4JerKTfyCaRGF27V
 +fh/g2A2/6Vu8xKYYwTAwLn+Tvkx9OTVZ1t15wM7Ma8hHowNoO0g/lWkeltgHLMji
 +rmeuIYQ20BQmdx2RRgWKl57D0wO/N0HIR+Bm4vcBoNPgMlk9g5WHA6idHR8TLxOr
 +dMMmTiWfefB0/FzGXBv7DuuzHN3+urdCvG1QIMFQ06kHXhr4rC28KbWIxg+PJGM8
 +oGNEGtGWAOvi4Ov+BVsIdbD5Sfyb4nY3L9qqPl6TxRxMWTKsYCYx11jC8civCzOu
 +yL1z+wgIICJ6iGzrfYf6C2BiNV3BC1YCtp2XsG+AooIxCwjL2CP/54MuRnUCAwEA
 +AQKCAgAP4+8M0HoRd2d6JIZeDRqIwIyCygLy9Yh7qrVP+/KsRwKdR9dqps73x29c
 +Pgeexdj67+Lynw9uFT7v/95mBzTAUESsNO+9sizw1OsWVQgB/4kGU4YT5Ml/bHf6
 +nApqSqOkPlTgJM46v4f+vTGHWBEQGAJRBO62250q/wt1D1osSDQ/rZ8BxRYiZBV8
 +NWocDRzF8nDgtFrpGSS7R21DuHZ2Gb6twscgS6MfkA49sieuTM6gfr/3gavu/+fM
 +V1Rlrmc65GE61++CSjijQEEdTjkJ9isBd+hjEBhTnnBpOBfEQxOgFqOvU/MYXv/G
 +W0Q6yWJjUwt3OIcoOImrY5L3j0vERneA1Alweqsbws3fXXMjA+jhLxlJqjPvSAKc
 +POi7xu7QCJjSSLAzHSDPdmGmfzlrbdWS1h0mrC5YZYOyToLajfnmAlXNNrytnePg
 +JV9/1136ZFrJyEi1JVN3kyrC+1iVd1E+lWK0U1UQ6/25tJvKFc1I+xToaUbK10UN
 +ycXib7p2Zsc/+ZMlPRgCxWmpIHmKhnwbO7vtRunnnc6wzhvlQQNHWlIvkyQukV50
 +6k/bzWw0M6A98B4oCICIcxcpS3njDlHyL7NlkCD+/OfZp6X3RZF/m4grmA2doebz
 +glsaNMyGHFrpHkHq19Y63Y4jtBdW/XuBv06Cnr4r3BXdjEzzwQKCAQEA5bj737Nk
 +ZLA0UgzVVvY67MTserTOECIt4i37nULjRQwsSFiz0AWFOBwUCBJ5N2qDEelbf0Fa
 +t4VzrphryEgzLz/95ZXi+oxw1liqCHi8iHeU2wSclDtx2jKv2q7bFvFSaH4CKC4N
 +zBJNfP92kdXuAjXkbK/jWwr64fLNh/2KFWUAmrYmtGfnOjjyL+yZhPxBatztE58q
 +/T61pkvP9NiLfrr7Xq8fnzrwqGERhXKueyoK6ig9ZJPZ2VTykMUUvNYJJ7OYQZru
 +EYA3zkuEZifqmjgF57Bgg7dkkIh285TzH3CNf3MCMTmjlWVyHjlyeSPYgISB9Mys
 +VKKQth+SvYcChQKCAQEAwDyCcolA7+bQBfECs6GXi7RYy2YSlx562S5vhjSlY9Ko
 +WiwVJWviF7uSBdZRnGUKoPv4K4LV34o2lJpSSTi5Xgp7FH986VdGePe3p4hcXSIZ
 +NtsKImLVLnEjrmkZExfQl7p0MkcU/LheCf/eEZVp0Z84O54WCs6GRm9wHYIUyrag
 +9FREqqxTRVNhQQ2EDVGq1slREdwB+aygE76axK/qosk0RaoLzGZiMn4Sb8bpJxXO
 +mee+ftq5bayVltfR0DhC8eHkcPPFeQMll1g+ML7HbINwHTr01ONm3cFUO4zOLBOO
 +ws/+vtNfiv6S/lO1RQSRoiApbENBLdSc3V8Cy70PMQKCAQBOcZN4uP5gL5c+KWm0
 +T1KhxUDnSdRPyAwY/xC7i7qlullovvlv4GK0XUot03kXBkUJmcEHvF5o6qYtCZlM
 +g/MOgHCHtF4Upl5lo1M0n13pz8PB4lpBd+cR1lscdrcTp4Y3bkf4RnmppNpXA7kO
 +ZZnnoVWGE620ShSPkWTDuj0rvxisu+SNmClqRUXWPZnSwnzoK9a86443efF3fs3d
 +UxCXTuxFUdGfgvXo2XStOBMCtcGSYflM3fv27b4C13mUXhY0O2yTgn8m9LyZsknc
 +xGalENpbWmwqrjYl8KOF2+gFZV68FZ67Bm6otkJ4ta80VJw6joT9/eIe6IA34KIw
 +G+ktAoIBAFRuPxzvC4ZSaasyX21l25mQbC9pdWDKEkqxCmp3VOyy6R4xnlgBOhwS
 +VeAacV2vQyvRfv4dSLIVkkNSRDHEqCWVlNk75TDXFCytIAyE54xAHbLqIVlY7yim
 +qHVB07F/FC6PxdkPPziAAU2DA5XVedSHibslg6jbbD4jU6qiJ1+hNrAZEs+jQC+C
 +n4Ri20y+Qbp0URb2+icemnARlwgr+3HjzQGL3gK4NQjYNmDBjEWOXl9aWWB90FNL
 +KahGwfAhxcVW4W56opCzwR7nsujV4eDXGba83itidRuQfd5pyWOyc1E86TYGwD/b
 +79OkEElv6Ea8uXTDVS075GmWATRapQECggEAd9ZAbyT+KouTfi2e6yLOosxSZfns
 +eF06QAJi5n9GOtdfK5fqdmHJqJI7wbubCnd0oxPeL71lRjrOAMXufaQRdZtfXSMn
 +B1TljteNrh1en5xF451rCPR/Y6tNKBvIKnhy1waO27/vA+ovXrm17iR9rRuGZ29i
 +IurlKA6z/96UdrSdpqITTCyTjSOBYg34f49ueGjlpL4+8HJq2wor4Cb1Sbv8ErqA
 +bsQ/Jz+KIGUiuFCfNa6d6McPRXIrGgzpprXgfimkV3nj49QyrnuCF/Pc4psGgIaN
 +l3EiGXzRt/55K7DQVadtbcjo9zREac8QnDD6dS/gOfJ82L7frQfMpNWgQA==
 +-----END RSA PRIVATE KEY-----
 diff --git a/test/openssl/fixtures/pkey/rsa-2.pem b/test/openssl/fixtures/pkey/rsa-2.pem
 new file mode 100644
 index 00000000..e4fd4f43
 --- /dev/null
 +++ b/test/openssl/fixtures/pkey/rsa-2.pem
@@ -0,0 +1,51 @@
 +-----BEGIN RSA PRIVATE KEY-----
 +MIIJKAIBAAKCAgEA1HUbx825tG7+/ulC5DpDogzXqM2/KmeCwGXZY4XjiWa+Zj7b
 +ECkZwQh7zxFUsPixGqQKJSyFwCogdaPzYTRNtqKKaw/IWS0um1PTn4C4/9atbIsf
 +HVKu/fWg4VrZL+ixFIZxa8Z6pvTB2omMcx+uEzbXPsO01i1pHf7MaWBxUDGFyC9P
 +lASJBfFZAf2Ar1H99OTS4SP+gxM9Kk5tcc22r8uFiqqbhJmQNSDApdHvT1zSZxAc
 +T1BFEZqfmR0B0UegPyJc/9hW0dYpB9JjR29UaZRSta3LUMpqltoOF5bzaKVgMuBm
 +Qy79xJ71LjGp8bKhgRaWXyPsDzAC0MQlOW6En0v8LK8fntivJEvw9PNOMcZ8oMTn
 +no0NeVt32HiQJW8LIVo7dOLVFtguSBMWUVe8mdKbuIIULD6JlSYke9Ob6andUhzO
 +U79m/aRWs2yjD6o5QAktjFBARdPgcpTdWfppc8xpJUkQgRmVhINoIMT9W6Wl898E
 +P4aPx6mRV/k05ellN3zRgd9tx5dyNuj3RBaNmR47cAVvGYRQgtH9bQYs6jtf0oer
 +A5yIYEKspNRlZZJKKrQdLflQFOEwjQJyZnTk7Mp0y21wOuEGgZBexew55/hUJDC2
 +mQ8CqjV4ki/Mm3z6Cw3jXIMNBJkH7oveBGSX0S9bF8A/73oOCU3W/LkORxECAwEA
 +AQKCAgBLK7RMmYmfQbaPUtEMF2FesNSNMV72DfHBSUgFYpYDQ4sSeiLgMOqf1fSY
 +azVf+F4RYwED7iDUwRMDDKNMPUlR2WjIQKlOhCH9a0dxJAZQ3xA1W3QC2AJ6cLIf
 +ihlWTip5bKgszekPsYH1ZL2A7jCVM84ssuoE7cRHjKOelTUCfsMq9TJe2MvyglZP
 +0fX6EjSctWm3pxiiH+iAU4d9wJ9my8fQLFUiMYNIiPIguYrGtbzsIlMh7PDDLcZS
 +UmUWOxWDwRDOpSjyzadu0Q23dLiVMpmhFoDdcQENptFdn1c4K2tCFQuZscKwEt4F
 +HiVXEzD5j5hcyUT4irA0VXImQ+hAH3oSDmn7wyHvyOg0bDZpUZXEHXb83Vvo54/d
 +Fb4AOUva1dwhjci8CTEMxCENMy/CLilRv46AeHbOX8KMPM7BnRSJPptvTTh/qB9C
 +HI5hxfkO+EOYnu0kUlxhJfrqG86H4IS+zA8HWiSEGxQteMjUQfgJoBzJ94YChpzo
 +ePpKSpjxxl1PNNWKxWM3yUvlKmI2lNl6YNC8JpF2wVg4VvYkG7iVjleeRg21ay89
 +NCVMF98n3MI5jdzfDKACnuYxg7sw+gjMy8PSoFvQ5pvHuBBOpa8tho6vk7bLJixT
 +QY5uXMNQaO6OwpkBssKpnuXhIJzDhO48nSjJ5nUEuadPH1nGwQKCAQEA7twrUIMi
 +Vqze/X6VyfEBnX+n3ZyQHLGqUv/ww1ZOOHmSW5ceC4GxHa8EPDjoh9NEjYffwGq9
 +bfQh9Gntjk5gFipT/SfPrIhbPt59HthUqVvOGgSErCmn0vhsa0+ROpVi4K2WHS7O
 +7SEwnoCWd6p1omon2olVY0ODlMH4neCx/ZuKV8SRMREubABlL8/MLp37AkgKarTY
 +tewd0lpaZMvsjOhr1zVCGUUBxy87Fc7OKAcoQY8//0r8VMH7Jlga7F2PKVPzqRKf
 +tjeW5jMAuRxTqtEdIeclJZwvUMxvb23BbBE+mtvKpXv69TB3DK8T1YIkhW2CidZW
 +lad4MESC+QFNbQKCAQEA47PtULM/0ZFdE+PDDHOa2kJ2arm94sVIqF2168ZLXR69
 +NkvCWfjkUPDeejINCx7XQgk0d/+5BCvrJpcM7lE4XfnYVNtPpct1el6eTfaOcPU8
 +wAMsnq5n9Mxt02U+XRPtEqGk+lt0KLPDDSG88Z7jPmfftigLyPH6i/ZJyRUETlGk
 +rGnWSx/LFUxQU5aBa2jUCjKOKa+OOk2jGg50A5Cmk26v9sA/ksOHisMjfdIpZc9P
 +r4R0IteDDD5awlkWTF++5u1GpgU2yav4uan0wzY8OWYFzVyceA6+wffEcoplLm82
 +CPd/qJOB5HHkjoM+CJgfumFxlNtdowKvKNUxpoQNtQKCAQEAh3ugofFPp+Q0M4r6
 +gWnPZbuDxsLIR05K8vszYEjy4zup1YO4ygQNJ24fM91/n5Mo/jJEqwqgWd6w58ax
 +tRclj00BCMXtGMrbHqTqSXWhR9LH66AGdPTHuXWpYZDnKliTlic/z1u+iWhbAHyl
 +XEj2omIeKunc4gnod5cyYrKRouz3omLfi/pX33C19FGkWgjH2HpuViowBbhhDfCr
 +9yJoEWC/0njl/hlTMdzLYcpEyxWMMuuC/FZXG+hPgWdWFh3XVzTEL3Fd3+hWEkp5
 +rYWwu2ITaSiHvHaDrAvZZVXW8WoynXnvzr+tECgmTq57zI4eEwSTl4VY5VfxZ0dl
 +FsIzXQKCAQBC07GYd6MJPGJWzgeWhe8yk0Lxu6WRAll6oFYd5kqD/9uELePSSAup
 +/actsbbGRrziMpVlinWgVctjvf0bjFbArezhqqPLgtTtnwtS0kOnvzGfIM9dms4D
 +uGObISGWa5yuVSZ4G5MRxwA9wGMVfo4u6Iltin868FmZ7iRlkXd8DNYJi95KmgAe
 +NhF1FrzQ6ykf/QpgDZfuYI63vPorea6JonieMHn39s622OJ3sNBZguheGL+E4j8h
 +vsMgOskijQ8X8xdC7lDQC1qqEsk06ZvvNJQLW1zIl3tArhjHjPp5EEaJhym+Ldx3
 +UT3E3Zu9JfhZ2PNevqrShp0lnLw/pI3pAoIBAAUMz5Lj6V9ftsl1pTa8WDFeBJW0
 +Wa5AT1BZg/ip2uq2NLPnA5JWcD+v682fRSvIj1pU0DRi6VsXlzhs+1q3+sgqiXGz
 +u2ArFylh8TvC1gXUctXKZz/M3Rqr6aSNoejUGLmvHre+ja/k6Zwmu6ePtB7dL50d
 +6+xMTYquS4gLbrbSLcEu3iBAAnvRLreXK4KguPxaBdICB7v7epdpAKe3Z7hp/sst
 +eJj1+6KRdlcmt8fh5MPkBBXa6I/9XGmX5UEo7q4wAxeM9nuFWY3watz/EO9LiO6P
 +LmqUSWL65m4cX0VZPvhYEsHppKi1eoWGlHqS4Af5+aIXi2alu2iljQFeA+Q=
 +-----END RSA PRIVATE KEY-----
 diff --git a/test/openssl/fixtures/pkey/rsa-3.pem b/test/openssl/fixtures/pkey/rsa-3.pem
 new file mode 100644
 index 00000000..6c9c9ced
 --- /dev/null
 +++ b/test/openssl/fixtures/pkey/rsa-3.pem
@@ -0,0 +1,51 @@
 +-----BEGIN RSA PRIVATE KEY-----
 +MIIJKAIBAAKCAgEAzn+YCcOh7BIRzrb7TEuhQLD545+/Fx/zCYO3l+y/8ogUxMTg
 +LG5HrcXlX3JP796ie90/GHIf8/lwczVhP1jk/keYjkwoTYDt477R7KRcJPyGqHRr
 +qLp7AnZxtz3JLNboTgO3bAYzlvtsSKU/R3oehBbGHzEWCP2UEYj/Kky0zpcjkhZU
 +jiErr9ARPq8+dOGqBf+CE2NLKYC1bu8hZe9AddvvN2SvfMN6uhJtEGZO1k8tScwf
 +AyvPJ1Po/6z08pzMAgfBUCE95waAVeYJWIOlnNB4eEievzlXdPB9vEt8OOwtWfQX
 +V8xyMsoKeAW05s413E0eTYx1aulFXdWwG2mWEBRtNzKF1iBudlg1a3x1zThWi1pY
 +jW5vROvoWZMCbl9bYQ/LxOCVqDoUl86+NPEGeuESMzm5NvOQA2e0Ty5wphnt9M19
 +Wcc8neBhb6iCGqYzxWNvUYXZWUv1+/MrPHKyJuv7MSivwtctfp8SacUGxkd6T+u6
 +V6ntHf3qtN/5pAmni6nzUTgjC65MS0LEhi/RTzwafkIfifeJH7/LqFtjrursuwua
 ++p9lkACck/J5TpzaAfLroFQuepP8qgeq1cpD5Iii56IJ+FPSnkvesHuRUmZIkhtR
 +VVsVqMaNPv/Uzc02bOaRXWP4auUY91mDKx/FDmORa9YCDQxMkKke05SWQ90CAwEA
 +AQKCAgA0+B/c6VTgxGXS+7cMhB3yBTOkgva2jNh/6Uyv6Of345ZIPyQt4X/7gFbt
 +G9qLcjWFxmQH9kZiA+snclrmr/vVijIE1l5EOz1KfUlGBYcpaal1DqALIQKqyA01
 +buDq4pmmYWesiw6yvP2yyMipohav1VOu7p1zYvCXaufhRtneYICcWaQI7VNSfvHd
 +fYBs5PIDJd6M8Jx4Ie7obOjJSAzl7qu3LtmhDFev4Ugeu8+fQ6IfWv/dhWBW+zw6
 +UXhnv3bJUonw7wX8+/rxjdd54BMcXZF5cU9fR+s6MPJf2ZEc3OBpQaa3O9dTVeZH
 +kVctGVpRj2qlg9EewoWro0PQVE5Mjah+mdFhPAHWoGl1xht6xJmg0uHYxMCzbUSz
 +7NSS3knR0qieFvsp5ESY72i7DnQsbhbn6mTuYdVtm9bphxifAWCP3jFdft/bjtSF
 +4yuPI7Qga+3m0B8QhtbWhEzPVon6NyiY7qfa6qllp0opEbw2hE22uGFFNJo2mpPa
 +pe9VwARtD0IyfeklE7KrBEwV8NjTaAipZTZODw0w/dt4K3dOiePDl3pPWjmERpVg
 +Lkw7XSCMtu5X87I1BbfOYbQhOXksPY+W9Asf6ETBeIZ8bD6Iypuk2ssool1lukqv
 +yq1Y8gbR9B2x91ftYwXgzqBSvd8PFNsaXWLD3nrai2G1vb81lQKCAQEA6W02eZcN
 +7wJfkqNokcuqhc5OKXH14gVIRV+KocG6f3vg88wrCg5J2GqNhBFuwVrafJjRenm6
 +C8zWdneeyrl6cztgbaySw7kXnqFdTBiuOT8bhiG5NTPjDQ109EucaTbZU9KUXk6k
 +ChPlr4G6IPrONpvi/9BvDDZLZkwR6uIg1kFWBy9kZaxFUEIug02hrbkTpPtnEUrO
 +r3nG0QL/D0vf+bm4YHIVRMH2O2ZTTWexMw9XlfCe1+WjbJ+PS35QRCRDcRdWHXDb
 +HnIFIAajtH5LtaJLgWUYq3B25WkQYtbHmFkm94sp/G4trb8JIJGzVO8cj9t6KeAT
 +LG+tk8OqplqsYwKCAQEA4ne81KXx8VNwsKVFqwmiDIoi1q3beNa2hoXdzAMrnYdj
 +iLxbfCVgrKPav9hdfXPBncHaNlGsd2G5W1a1UsOr128lTdfBsgm1RVPhVMKvo3fl
 +yUnWajtAR1q3tVEUhuFlbJ/RHEtxJaGrzudYCPWQiYhydpDgSckbxD8PuElEgFBX
 +O91vnWZEjMsxrABWiZNBxmtBUEv+fjUU/9USYzO4sN79UeD1+ZuBxPFwscsRcjLr
 +bPgZWOwiywH6UmQ+DJTzeu0wJ6jgPoy/pgEujsbPDz1wNos6NhA/RQv31QeX33/B
 +7/F5XKNmbJ2AFb/B+xTaTQPg0pjT5Exm+HrNU5OivwKCAQEAsLLVi9FG4OiBBHXi
 +UItFuChljoYPxVqOTMV4Id6OmLZjoOmqouASElsGaTTxDDkEL1FXMUk4Bnq21dLT
 +R06EXPpTknISX0qbkJ9CCrqcGAWnhi+9DYMLmvPW1p7t9c9pUESVv5X0IxTQx7yB
 +8zkoJLp4aYGUrj/jb7qhzZYDmWy3/JRpgXWYupp+rzJy8xiowDj22mYwczDRyaJl
 +BWVAVL+7zHZPl07kYC6jXHLj9mzktkIBXBkfTriyNkmV5R82VkN+Eqc9l5xkOMwN
 +3DHGieYjFf47YHuv5RVVLBy91puWHckgrU+SEHYOKLNidybSDivsHArdOMQJN1Pk
 +uCznVQKCAQAYY7DQbfa6eLQAMixomSb8lrvdxueGAgmyPyR93jGKS5Rqm2521ket
 +EBB07MZUxmyposDvbKhYSwv9TD9G5I/TKcMouP3BQM5m4vu3dygXQMhcfzk6Q5tO
 +k/SI8Gx3gjq8EhIhK/bJiLnKFJwkit3AEhPRtRSSnbgB0JDO1gUslHpwlg55MxRa
 +3V9CGN84/cTtq4tjLGwCB5F1Y+sRB/byBXHeqY2UDi1Rmnb6jtYYKGe2WpnQO84b
 +cuEUknskO75lFLpE6ykLU3koVaQ/+CVAjOtS1He2btWBiCJurNysU0P9pVHeqjJT
 +rDqpHPe1JK/F74783zyir5+/Tuph/9pdAoIBAANPdFRQkJVH8K6iuhxQk6vFqiYB
 +MUxpIVeLonD0p9TgMdezVNESht/AIutc0+5wabM45XuDWFRTuonvcE8lckv2Ux3a
 +AvSsamjuesxw2YmkEtzZouVqDU0+oxppQJiwBG3MiaHX9F5IfnK6YmQ6xPwZ6MXi
 +9feq1jR4KOc1ZrHtRMNgjnBWEFWroGe3FHgV7O133hpMSshRFmwcbE0nAaDr82U9
 +sl8dclDjEKBxaqjAeNajOr+BU0w0AAwWXL7dt/ctG2QClcj9wqbEfsXnOR10h4AI
 +rqkcvQrOLbTwcrOD/6R1rQfQXtEHKf1maThxosootAQZXdf6jxU3oonx3tU=
 +-----END RSA PRIVATE KEY-----
 diff --git a/test/openssl/test_pair.rb b/test/openssl/test_pair.rb
 index eac3655e..8d6ca1e9 100644
 --- a/test/openssl/test_pair.rb
 +++ b/test/openssl/test_pair.rb
@@ -10,7 +10,7 @@ def setup
     ee_exts = [
       ["keyUsage", "keyEncipherment,digitalSignature", true],
     ]
 -    @svr_key = OpenSSL::TestUtils::Fixtures.pkey("rsa1024")
 +    @svr_key = OpenSSL::TestUtils::Fixtures.pkey("rsa-1")
     @svr_cert = issue_cert(svr_dn, @svr_key, 1, ee_exts, nil, nil)
   end
@@ -23,7 +23,7 @@ def ssl_pair
       sctx = OpenSSL::SSL::SSLContext.new
       sctx.cert = @svr_cert
       sctx.key = @svr_key
 -      sctx.tmp_dh_callback = proc { OpenSSL::TestUtils::Fixtures.pkey_dh("dh1024") }
 +      sctx.tmp_dh_callback = proc { OpenSSL::TestUtils::Fixtures.pkey("dh-1") }
       sctx.options |= OpenSSL::SSL::OP_NO_COMPRESSION
       ssls = OpenSSL::SSL::SSLServer.new(tcps, sctx)
       ns = ssls.accept
@@ -397,7 +397,7 @@ def test_connect_accept_nonblock_no_exception
     ctx2 = OpenSSL::SSL::SSLContext.new
     ctx2.cert = @svr_cert
     ctx2.key = @svr_key
 -    ctx2.tmp_dh_callback = proc { OpenSSL::TestUtils::Fixtures.pkey_dh("dh1024") }
 +    ctx2.tmp_dh_callback = proc { OpenSSL::TestUtils::Fixtures.pkey("dh-1") }
     sock1, sock2 = tcp_pair
@@ -445,7 +445,7 @@ def test_connect_accept_nonblock
     ctx = OpenSSL::SSL::SSLContext.new
     ctx.cert = @svr_cert
     ctx.key = @svr_key
 -    ctx.tmp_dh_callback = proc { OpenSSL::TestUtils::Fixtures.pkey_dh("dh1024") }
 +    ctx.tmp_dh_callback = proc { OpenSSL::TestUtils::Fixtures.pkey("dh-1") }
     sock1, sock2 = tcp_pair
 diff --git a/test/openssl/test_pkey_dh.rb b/test/openssl/test_pkey_dh.rb
 index fb713813..79bf9bb7 100644
 --- a/test/openssl/test_pkey_dh.rb
 +++ b/test/openssl/test_pkey_dh.rb
@@ -19,7 +19,7 @@ def test_new_break
   end
   def test_DHparams
 -    dh1024 = Fixtures.pkey_dh("dh1024")
 +    dh1024 = Fixtures.pkey("dh1024")
     asn1 = OpenSSL::ASN1::Sequence([
       OpenSSL::ASN1::Integer(dh1024.p),
       OpenSSL::ASN1::Integer(dh1024.g)
@@ -42,7 +42,7 @@ def test_DHparams
   end
   def test_public_key
 -    dh = Fixtures.pkey_dh("dh1024")
 +    dh = Fixtures.pkey("dh1024")
     public_key = dh.public_key
     assert_no_key(public_key) #implies public_key.public? is false!
     assert_equal(dh.to_der, public_key.to_der)
@@ -50,14 +50,14 @@ def test_public_key
   end
   def test_generate_key
 -    dh = Fixtures.pkey_dh("dh1024").public_key # creates a copy
 +    dh = Fixtures.pkey("dh1024").public_key # creates a copy
     assert_no_key(dh)
     dh.generate_key!
     assert_key(dh)
   end
   def test_key_exchange
 -    dh = Fixtures.pkey_dh("dh1024")
 +    dh = Fixtures.pkey("dh1024")
     dh2 = dh.public_key
     dh.generate_key!
     dh2.generate_key!
 diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb
 index 408c7d82..2633f7c4 100644
 --- a/test/openssl/test_ssl.rb
 +++ b/test/openssl/test_ssl.rb
@@ -708,7 +708,7 @@ def socketpair
   def test_tlsext_hostname
     fooctx = OpenSSL::SSL::SSLContext.new
 -    fooctx.tmp_dh_callback = proc { Fixtures.pkey_dh("dh1024") }
 +    fooctx.tmp_dh_callback = proc { Fixtures.pkey("dh-1") }
     fooctx.cert = @cli_cert
     fooctx.key = @cli_key
@@ -760,7 +760,7 @@ def test_servername_cb_raises_an_exception_on_unknown_objects
     ctx2 = OpenSSL::SSL::SSLContext.new
     ctx2.cert = @svr_cert
     ctx2.key = @svr_key
 -    ctx2.tmp_dh_callback = proc { Fixtures.pkey_dh("dh1024") }
 +    ctx2.tmp_dh_callback = proc { Fixtures.pkey("dh-1") }
     ctx2.servername_cb = lambda { |args| Object.new }
     sock1, sock2 = socketpair
@@ -1140,7 +1140,7 @@ def test_alpn_protocol_selection_cancel
     ctx1 = OpenSSL::SSL::SSLContext.new
     ctx1.cert = @svr_cert
     ctx1.key = @svr_key
 -    ctx1.tmp_dh_callback = proc { Fixtures.pkey_dh("dh1024") }
 +    ctx1.tmp_dh_callback = proc { Fixtures.pkey("dh-1") }
     ctx1.alpn_select_cb = -> (protocols) { nil }
     ssl1 = OpenSSL::SSL::SSLSocket.new(sock1, ctx1)
@@ -1382,20 +1382,21 @@ def test_get_ephemeral_key
   def test_dh_callback
     pend "TLS 1.2 is not supported" unless tls12_supported?
 +    dh = Fixtures.pkey("dh-1")
     called = false
     ctx_proc = -> ctx {
       ctx.ssl_version = :TLSv1_2
       ctx.ciphers = "DH:!NULL"
       ctx.tmp_dh_callback = ->(*args) {
         called = true
 -        Fixtures.pkey_dh("dh1024")
 +        dh
       }
     }
     start_server(ctx_proc: ctx_proc) do |port|
       server_connect(port) { |ssl|
         assert called, "dh callback should be called"
         if ssl.respond_to?(:tmp_key)
 -          assert_equal Fixtures.pkey_dh("dh1024").to_der, ssl.tmp_key.to_der
 +          assert_equal dh.to_der, ssl.tmp_key.to_der
         end
       }
     end
 diff --git a/test/openssl/utils.rb b/test/openssl/utils.rb
 index b7ddd891..fe626ade 100644
 --- a/test/openssl/utils.rb
 +++ b/test/openssl/utils.rb
@@ -42,10 +42,8 @@ module Fixtures
     def pkey(name)
       OpenSSL::PKey.read(read_file("pkey", name))
 -    end
 -
 -    def pkey_dh(name)
 -      # DH parameters can be read by OpenSSL::PKey.read atm
 +    rescue OpenSSL::PKey::PKeyError
 +      # TODO: DH parameters can be read by OpenSSL::PKey.read atm
       OpenSSL::PKey::DH.new(read_file("pkey", name))
     end
@@ -157,9 +155,9 @@ class OpenSSL::SSLTestCase < OpenSSL::TestCase
   def setup
     super
 -    @ca_key  = Fixtures.pkey("rsa2048")
 -    @svr_key = Fixtures.pkey("rsa1024")
 -    @cli_key = Fixtures.pkey("rsa2048")
 +    @ca_key  = Fixtures.pkey("rsa-1")
 +    @svr_key = Fixtures.pkey("rsa-2")
 +    @cli_key = Fixtures.pkey("rsa-3")
     @ca  = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=CA")
     @svr = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=localhost")
     @cli = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=localhost")
@@ -200,7 +198,7 @@ def start_server(verify_mode: OpenSSL::SSL::VERIFY_NONE, start_immediately: true
       ctx.cert_store = store
       ctx.cert = @svr_cert
       ctx.key = @svr_key
 -      ctx.tmp_dh_callback = proc { Fixtures.pkey_dh("dh1024") }
 +      ctx.tmp_dh_callback = proc { Fixtures.pkey("dh-1") }
       ctx.verify_mode = verify_mode
       ctx_proc.call(ctx) if ctx_proc
--- a/SOURCES/ruby-2.6.10-Fix-CVE-2022-28739-Buffer-overrun-in-str2float.patch
+++ b/SOURCES/ruby-2.6.10-Fix-CVE-2022-28739-Buffer-overrun-in-str2float.patch
@ -1,73 +0,0 @@
 From 8e2ed0b9d965a526b29f9dc3bff8e9fe33dae98d Mon Sep 17 00:00:00 2001
 From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
 Date: Tue, 12 Apr 2022 11:49:45 +0000
 Subject: [PATCH] Fix CVE-2022-28739 Buffer overrun in str2float.
 CVE-2022-28739: Buffer overrun in String-to-Float conversion
 Backported from upstream Ruby 2.6.10,
 Git commit:
 https://github.com/ruby/ruby/commit/69f9992ed41920389d4185141a14f02f89a4d306
 ==== Original commit message
 Fix dtoa buffer overrun
 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67957 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 ---
 test/ruby/test_float.rb | 18 ++++++++++++++++++
 util.c                  |  3 ++-
 2 files changed, 20 insertions(+), 1 deletion(-)
 diff --git a/test/ruby/test_float.rb b/test/ruby/test_float.rb
 index 7fabfd3..78c63c2 100644
 --- a/test/ruby/test_float.rb
 +++ b/test/ruby/test_float.rb
@@ -171,6 +171,24 @@ class TestFloat < Test::Unit::TestCase
       assert_raise(ArgumentError, n += z + "A") {Float(n)}
       assert_raise(ArgumentError, n += z + ".0") {Float(n)}
     end
 +
 +    x = nil
 +    2000.times do
 +      x = Float("0x"+"0"*30)
 +      break unless x == 0.0
 +    end
 +    assert_equal(0.0, x, ->{"%a" % x})
 +    x = nil
 +    2000.times do
 +      begin
 +        x = Float("0x1."+"0"*270)
 +      rescue ArgumentError => e
 +        raise unless /"0x1\.0{270}"/ =~ e.message
 +      else
 +        break
 +      end
 +    end
 +    assert_nil(x, ->{"%a" % x})
   end
   def test_divmod
 diff --git a/util.c b/util.c
 index 2222744..f1d910f 100644
 --- a/util.c
 +++ b/util.c
@@ -2046,6 +2046,7 @@ break2:
 	    if (!*++s || !(s1 = strchr(hexdigit, *s))) goto ret0;
 	    if (*s == '0') {
 		while (*++s == '0');
 +		if (!*s) goto ret;
 		s1 = strchr(hexdigit, *s);
 	    }
 	    if (s1 != NULL) {
@@ -2068,7 +2069,7 @@ break2:
 		for (; *s && (s1 = strchr(hexdigit, *s)); ++s) {
 		    adj += aadj * ((s1 - hexdigit) & 15);
 		    if ((aadj /= 16) == 0.0) {
 -			while (strchr(hexdigit, *++s));
 +			while (*++s && strchr(hexdigit, *s));
 			break;
 		    }
 		}
 -- 
 2.41.0
--- a/SOURCES/ruby-2.6.3-fiddle-1.0.0-ffi-closure-alloc-default.patch
+++ b/SOURCES/ruby-2.6.3-fiddle-1.0.0-ffi-closure-alloc-default.patch
@ -1,61 +0,0 @@
 diff --git a/ext/fiddle/closure.c b/ext/fiddle/closure.c
 index 1a80b2b..b997e23 100644
 --- a/ext/fiddle/closure.c
 +++ b/ext/fiddle/closure.c
@@ -13,25 +13,11 @@ typedef struct {
     ffi_type **argv;
 } fiddle_closure;
 -#if defined(USE_FFI_CLOSURE_ALLOC)
 -#elif defined(__OpenBSD__) || defined(__APPLE__) || defined(__linux__)
 -# define USE_FFI_CLOSURE_ALLOC 0
 -#elif defined(RUBY_LIBFFI_MODVERSION) && RUBY_LIBFFI_MODVERSION < 3000005 && \
 -	(defined(__i386__) || defined(__x86_64__) || defined(_M_IX86) || defined(_M_AMD64))
 -# define USE_FFI_CLOSURE_ALLOC 0
 -#else
 -# define USE_FFI_CLOSURE_ALLOC 1
 -#endif
 -
 static void
 dealloc(void * ptr)
 {
     fiddle_closure * cls = (fiddle_closure *)ptr;
 -#if USE_FFI_CLOSURE_ALLOC
     ffi_closure_free(cls->pcl);
 -#else
 -    munmap(cls->pcl, sizeof(*cls->pcl));
 -#endif
     if (cls->argv) xfree(cls->argv);
     xfree(cls);
 }
@@ -205,12 +191,7 @@ allocate(VALUE klass)
     VALUE i = TypedData_Make_Struct(klass, fiddle_closure,
 	    &closure_data_type, closure);
 -#if USE_FFI_CLOSURE_ALLOC
     closure->pcl = ffi_closure_alloc(sizeof(ffi_closure), &closure->code);
 -#else
 -    closure->pcl = mmap(NULL, sizeof(ffi_closure), PROT_READ | PROT_WRITE,
 -        MAP_ANON | MAP_PRIVATE, -1, 0);
 -#endif
     return i;
 }
@@ -257,17 +238,8 @@ initialize(int rbargc, VALUE argv[], VALUE self)
     if (FFI_OK != result)
 	rb_raise(rb_eRuntimeError, "error prepping CIF %d", result);
 -#if USE_FFI_CLOSURE_ALLOC
     result = ffi_prep_closure_loc(pcl, cif, callback,
 		(void *)self, cl->code);
 -#else
 -    result = ffi_prep_closure(pcl, cif, callback, (void *)self);
 -    cl->code = (void *)pcl;
 -    i = mprotect(pcl, sizeof(*pcl), PROT_READ | PROT_EXEC);
 -    if (i) {
 -	rb_sys_fail("mprotect");
 -    }
 -#endif
     if (FFI_OK != result)
 	rb_raise(rb_eRuntimeError, "error prepping closure %d", result);
--- a/SOURCES/ruby-2.6.8-net-ftp-pasv-can-connect-to-arbitrary-host.patch
+++ b/SOURCES/ruby-2.6.8-net-ftp-pasv-can-connect-to-arbitrary-host.patch
@ -1,247 +0,0 @@
 commit be5a83e84a34091f2a4e3c6dfb911b20e78e690c
 Author: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
 Date:   Wed Jul 7 10:34:08 2021 +0000
    Ignore IP addresses in PASV responses by default, and add new option use_pasv_ip
    This fixes CVE-2021-31810.
    Reported by Alexandr Savca.
    Co-authored-by: Shugo Maeda <shugo@ruby-lang.org>
    git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67949 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb
 index e68d825dcf..c5d669d898 100644
 --- a/lib/net/ftp.rb
 +++ b/lib/net/ftp.rb
@@ -97,6 +97,10 @@ class FTP < Protocol
     # When +true+, the connection is in passive mode.  Default: +true+.
     attr_accessor :passive
 +    # When +true+, use the IP address in PASV responses.  Otherwise, it uses
 +    # the same IP address for the control connection.  Default: +false+.
 +    attr_accessor :use_pasv_ip
 +
     # When +true+, all traffic to and from the server is written
     # to +$stdout+.  Default: +false+.
     attr_accessor :debug_mode
@@ -205,6 +209,9 @@ def FTP.open(host, *args)
     #                          handshake.
     #                          See Net::FTP#ssl_handshake_timeout for
     #                          details.  Default: +nil+.
 +    # use_pasv_ip::  When +true+, use the IP address in PASV responses.
 +    #                Otherwise, it uses the same IP address for the control
 +    #                connection.  Default: +false+.
     # debug_mode::  When +true+, all traffic to and from the server is
     #               written to +$stdout+.  Default: +false+.
     #
@@ -265,6 +272,7 @@ def initialize(host = nil, user_or_options = {}, passwd = nil, acct = nil)
       @open_timeout = options[:open_timeout]
       @ssl_handshake_timeout = options[:ssl_handshake_timeout]
       @read_timeout = options[:read_timeout] || 60
 +      @use_pasv_ip = options[:use_pasv_ip] || false
       if host
         connect(host, options[:port] || FTP_PORT)
         if options[:username]
@@ -1330,7 +1338,12 @@ def parse227(resp) # :nodoc:
         raise FTPReplyError, resp
       end
       if m = /\((?<host>\d+(,\d+){3}),(?<port>\d+,\d+)\)/.match(resp)
 -        return parse_pasv_ipv4_host(m["host"]), parse_pasv_port(m["port"])
 +        if @use_pasv_ip
 +          host = parse_pasv_ipv4_host(m["host"])
 +        else
 +          host = @bare_sock.remote_address.ip_address
 +        end
 +        return host, parse_pasv_port(m["port"])
       else
         raise FTPProtoError, resp
       end
 diff --git a/test/net/ftp/test_ftp.rb b/test/net/ftp/test_ftp.rb
 index a5219644bb..b3fe7774ed 100644
 --- a/test/net/ftp/test_ftp.rb
 +++ b/test/net/ftp/test_ftp.rb
@@ -61,7 +61,7 @@ def test_connect_fail
   end
   def test_parse227
 -    ftp = Net::FTP.new
 +    ftp = Net::FTP.new(nil, use_pasv_ip: true)
     host, port = ftp.send(:parse227, "227 Entering Passive Mode (192,168,0,1,12,34)")
     assert_equal("192.168.0.1", host)
     assert_equal(3106, port)
@@ -80,6 +80,14 @@ def test_parse227
     assert_raise(Net::FTPProtoError) do
       ftp.send(:parse227, "227 ) foo bar (")
     end
 +
 +    ftp = Net::FTP.new
 +    sock = OpenStruct.new
 +    sock.remote_address = OpenStruct.new
 +    sock.remote_address.ip_address = "10.0.0.1"
 +    ftp.instance_variable_set(:@bare_sock, sock)
 +    host, port = ftp.send(:parse227, "227 Entering Passive Mode (192,168,0,1,12,34)")
 +    assert_equal("10.0.0.1", host)
   end
   def test_parse228
@@ -2360,10 +2368,155 @@ def test_puttextfile_command_injection
     end
   end
 +  def test_ignore_pasv_ip
 +    commands = []
 +    binary_data = (0..0xff).map {|i| i.chr}.join * 4 * 3
 +    server = create_ftp_server(nil, "127.0.0.1") { |sock|
 +      sock.print("220 (test_ftp).\r\n")
 +      commands.push(sock.gets)
 +      sock.print("331 Please specify the password.\r\n")
 +      commands.push(sock.gets)
 +      sock.print("230 Login successful.\r\n")
 +      commands.push(sock.gets)
 +      sock.print("200 Switching to Binary mode.\r\n")
 +      line = sock.gets
 +      commands.push(line)
 +      data_server = TCPServer.new("127.0.0.1", 0)
 +      port = data_server.local_address.ip_port
 +      sock.printf("227 Entering Passive Mode (999,0,0,1,%s).\r\n",
 +                  port.divmod(256).join(","))
 +      commands.push(sock.gets)
 +      sock.print("150 Opening BINARY mode data connection for foo (#{binary_data.size} bytes)\r\n")
 +      conn = data_server.accept
 +      binary_data.scan(/.{1,1024}/nm) do |s|
 +        conn.print(s)
 +      end
 +      conn.shutdown(Socket::SHUT_WR)
 +      conn.read
 +      conn.close
 +      data_server.close
 +      sock.print("226 Transfer complete.\r\n")
 +    }
 +    begin
 +      begin
 +        ftp = Net::FTP.new
 +        ftp.passive = true
 +        ftp.read_timeout *= 5 if defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled? # for --jit-wait
 +        ftp.connect("127.0.0.1", server.port)
 +        ftp.login
 +        assert_match(/\AUSER /, commands.shift)
 +        assert_match(/\APASS /, commands.shift)
 +        assert_equal("TYPE I\r\n", commands.shift)
 +        buf = ftp.getbinaryfile("foo", nil)
 +        assert_equal(binary_data, buf)
 +        assert_equal(Encoding::ASCII_8BIT, buf.encoding)
 +        assert_equal("PASV\r\n", commands.shift)
 +        assert_equal("RETR foo\r\n", commands.shift)
 +        assert_equal(nil, commands.shift)
 +      ensure
 +        ftp.close if ftp
 +      end
 +    ensure
 +      server.close
 +    end
 +  end
 +
 +  def test_use_pasv_ip
 +    commands = []
 +    binary_data = (0..0xff).map {|i| i.chr}.join * 4 * 3
 +    server = create_ftp_server(nil, "127.0.0.1") { |sock|
 +      sock.print("220 (test_ftp).\r\n")
 +      commands.push(sock.gets)
 +      sock.print("331 Please specify the password.\r\n")
 +      commands.push(sock.gets)
 +      sock.print("230 Login successful.\r\n")
 +      commands.push(sock.gets)
 +      sock.print("200 Switching to Binary mode.\r\n")
 +      line = sock.gets
 +      commands.push(line)
 +      data_server = TCPServer.new("127.0.0.1", 0)
 +      port = data_server.local_address.ip_port
 +      sock.printf("227 Entering Passive Mode (127,0,0,1,%s).\r\n",
 +                  port.divmod(256).join(","))
 +      commands.push(sock.gets)
 +      sock.print("150 Opening BINARY mode data connection for foo (#{binary_data.size} bytes)\r\n")
 +      conn = data_server.accept
 +      binary_data.scan(/.{1,1024}/nm) do |s|
 +        conn.print(s)
 +      end
 +      conn.shutdown(Socket::SHUT_WR)
 +      conn.read
 +      conn.close
 +      data_server.close
 +      sock.print("226 Transfer complete.\r\n")
 +    }
 +    begin
 +      begin
 +        ftp = Net::FTP.new
 +        ftp.passive = true
 +        ftp.use_pasv_ip = true
 +        ftp.read_timeout *= 5 if defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled? # for --jit-wait
 +        ftp.connect("127.0.0.1", server.port)
 +        ftp.login
 +        assert_match(/\AUSER /, commands.shift)
 +        assert_match(/\APASS /, commands.shift)
 +        assert_equal("TYPE I\r\n", commands.shift)
 +        buf = ftp.getbinaryfile("foo", nil)
 +        assert_equal(binary_data, buf)
 +        assert_equal(Encoding::ASCII_8BIT, buf.encoding)
 +        assert_equal("PASV\r\n", commands.shift)
 +        assert_equal("RETR foo\r\n", commands.shift)
 +        assert_equal(nil, commands.shift)
 +      ensure
 +        ftp.close if ftp
 +      end
 +    ensure
 +      server.close
 +    end
 +  end
 +
 +  def test_use_pasv_invalid_ip
 +    commands = []
 +    binary_data = (0..0xff).map {|i| i.chr}.join * 4 * 3
 +    server = create_ftp_server(nil, "127.0.0.1") { |sock|
 +      sock.print("220 (test_ftp).\r\n")
 +      commands.push(sock.gets)
 +      sock.print("331 Please specify the password.\r\n")
 +      commands.push(sock.gets)
 +      sock.print("230 Login successful.\r\n")
 +      commands.push(sock.gets)
 +      sock.print("200 Switching to Binary mode.\r\n")
 +      line = sock.gets
 +      commands.push(line)
 +      sock.print("227 Entering Passive Mode (999,0,0,1,48,57).\r\n")
 +      commands.push(sock.gets)
 +    }
 +    begin
 +      begin
 +        ftp = Net::FTP.new
 +        ftp.passive = true
 +        ftp.use_pasv_ip = true
 +        ftp.read_timeout *= 5 if defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled? # for --jit-wait
 +        ftp.connect("127.0.0.1", server.port)
 +        ftp.login
 +        assert_match(/\AUSER /, commands.shift)
 +        assert_match(/\APASS /, commands.shift)
 +        assert_equal("TYPE I\r\n", commands.shift)
 +        assert_raise(SocketError) do
 +          ftp.getbinaryfile("foo", nil)
 +        end
 +      ensure
 +        ftp.close if ftp
 +      end
 +    ensure
 +      server.close
 +    end
 +  end
 +
   private
 -  def create_ftp_server(sleep_time = nil)
 -    server = TCPServer.new(SERVER_ADDR, 0)
 +  def create_ftp_server(sleep_time = nil, addr = SERVER_ADDR)
 +    server = TCPServer.new(addr, 0)
     @thread = Thread.start do
       if sleep_time
         sleep(sleep_time)
--- a/SOURCES/ruby-2.6.8-net-imap-startls-stripping-vulnerability.patch
+++ b/SOURCES/ruby-2.6.8-net-imap-startls-stripping-vulnerability.patch
@ -1,101 +0,0 @@
 commit 95ba9053e20ad8d113af37b3f1f4cbfff1f6a8f1
 Author: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
 Date:   Wed Jul 7 10:38:10 2021 +0000
    Fix StartTLS stripping vulnerability
    Reported by Alexandr Savca in https://hackerone.com/reports/1178562
    Co-authored-by: Shugo Maeda <shugo@ruby-lang.org>
    git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67950 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 diff --git a/lib/net/imap.rb b/lib/net/imap.rb
 index 1c7e89ba14..91df89b79e 100644
 --- a/lib/net/imap.rb
 +++ b/lib/net/imap.rb
@@ -1213,12 +1213,14 @@ def get_tagged_response(tag, cmd)
       end
       resp = @tagged_responses.delete(tag)
       case resp.name
 +      when /\A(?:OK)\z/ni
 +        return resp
       when /\A(?:NO)\z/ni
         raise NoResponseError, resp
       when /\A(?:BAD)\z/ni
         raise BadResponseError, resp
       else
 -        return resp
 +        raise UnknownResponseError, resp
       end
     end
@@ -3714,6 +3716,10 @@ class BadResponseError < ResponseError
     class ByeResponseError < ResponseError
     end
 +    # Error raised upon an unknown response from the server.
 +    class UnknownResponseError < ResponseError
 +    end
 +
     RESPONSE_ERRORS = Hash.new(ResponseError)
     RESPONSE_ERRORS["NO"] = NoResponseError
     RESPONSE_ERRORS["BAD"] = BadResponseError
 diff --git a/test/net/imap/test_imap.rb b/test/net/imap/test_imap.rb
 index 936f4e0f42..81928cb8fe 100644
 --- a/test/net/imap/test_imap.rb
 +++ b/test/net/imap/test_imap.rb
@@ -127,6 +127,24 @@ def test_starttls
         imap.disconnect
       end
     end
 +
 +    def test_starttls_stripping
 +      starttls_stripping_test do |port|
 +        imap = Net::IMAP.new("localhost", :port => port)
 +        assert_raise(Net::IMAP::UnknownResponseError) do
 +          imap.starttls(:ca_file => CA_FILE)
 +        end
 +        imap
 +      end
 +    end
 +  end
 +
 +  def start_server
 +    th = Thread.new do
 +      yield
 +    end
 +    @threads << th
 +    sleep 0.1 until th.stop?
   end
   def test_unexpected_eof
@@ -760,6 +760,27 @@ def starttls_test
     end
   end
 +  def starttls_stripping_test
 +    server = create_tcp_server
 +    port = server.addr[1]
 +    start_server do
 +      sock = server.accept
 +      begin
 +        sock.print("* OK test server\r\n")
 +        sock.gets
 +        sock.print("RUBY0001 BUG unhandled command\r\n")
 +      ensure
 +        sock.close
 +        server.close
 +      end
 +    end
 +    begin
 +      imap = yield(port)
 +    ensure
 +      imap.disconnect if imap && !imap.disconnected?
 +    end
 +  end
 +
   def create_tcp_server
     return TCPServer.new(server_addr, 0)
   end
--- a/SOURCES/ruby-2.6.8-rdoc-6.1.2.1-command-injection-vulnerability.patch
+++ b/SOURCES/ruby-2.6.8-rdoc-6.1.2.1-command-injection-vulnerability.patch
@ -1,88 +0,0 @@
 commit fe3c49c9baeeab58304ede915b7edd18ecf360fc
 Author: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
 Date:   Sat Jul 3 17:10:28 2021 +0000
    merge revision(s) b1c73f23,c9ab8fe2: [Backport #17877]
            [ruby/rdoc] Use File.open to fix the OS Command Injection vulnerability in CVE-2021-31799
            https://github.com/ruby/rdoc/commit/a7f5d6ab88
            The test for command injection on Unix platforms should be omitted on Windows
    git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67947 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 diff --git a/lib/rdoc/rdoc.rb b/lib/rdoc/rdoc.rb
 index ca2c1abefd..46aace7839 100644
 --- a/lib/rdoc/rdoc.rb
 +++ b/lib/rdoc/rdoc.rb
@@ -436,7 +436,7 @@ def remove_unparseable files
     files.reject do |file|
       file =~ /\.(?:class|eps|erb|scpt\.txt|svg|ttf|yml)$/i or
         (file =~ /tags$/i and
 -         open(file, 'rb') { |io|
 +         File.open(file, 'rb') { |io|
            io.read(100) =~ /\A(\f\n[^,]+,\d+$|!_TAG_)/
          })
     end
 --- a/lib/rdoc/encoding.rb	2022-02-16 16:51:28.080178281 +0100
 +++ b/lib/rdoc/encoding.rb	2022-02-16 16:51:37.108160840 +0100
@@ -18,7 +18,7 @@
   # unknown character in the target encoding will be replaced with '?'
   def self.read_file filename, encoding, force_transcode = false
 -    content = open filename, "rb" do |f| f.read end
 +    content = File.open filename, "rb" do |f| f.read end
     content.gsub!("\r\n", "\n") if RUBY_PLATFORM =~ /mswin|mingw/
     utf8 = content.sub!(/\A\xef\xbb\xbf/, '')
 --- a/lib/rdoc/parser.rb	2021-04-05 13:46:35.000000000 +0200
 +++ b/lib/rdoc/parser.rb	2022-02-16 15:37:17.904822389 +0100
@@ -74,7 +74,12 @@
   def self.binary?(file)
     return false if file =~ /\.(rdoc|txt)$/
 -    s = File.read(file, 1024) or return false
 +    begin
 +      open_file = File.open(file)
 +      s = open_file.read(1024) or return false
 +    ensure
 +      open_file.close if open_file
 +    end
     return true if s[0, 2] == Marshal.dump('')[0, 2] or s.index("\x00")
@@ -92,7 +97,8 @@
   # http://www.garykessler.net/library/file_sigs.html
   def self.zip? file
 -    zip_signature = File.read file, 4
 +    zip_signature = ''
 +    File.open(file) { |f| zip_signature = f.read(4) }
     zip_signature == "PK\x03\x04" or
       zip_signature == "PK\x05\x06" or
 diff --git a/test/rdoc/test_rdoc_rdoc.rb b/test/rdoc/test_rdoc_rdoc.rb
 index 3bce54b243..123b1a4f87 100644
 --- a/test/rdoc/test_rdoc_rdoc.rb
 +++ b/test/rdoc/test_rdoc_rdoc.rb
@@ -366,6 +366,18 @@ def test_remove_unparseable_tags_vim
     end
   end
 +  def test_remove_unparseable_CVE_2021_31799
 +    skip 'for Un*x platforms' if Gem.win_platform?
 +    temp_dir do
 +      file_list = ['| touch evil.txt && echo tags']
 +      file_list.each do |f|
 +        FileUtils.touch f
 +      end
 +      assert_equal file_list, @rdoc.remove_unparseable(file_list)
 +      assert_equal file_list, Dir.children('.')
 +    end
 +  end
 +
   def test_setup_output_dir
     Dir.mktmpdir {|d|
       path = File.join d, 'testdir'
--- a/SOURCES/ruby-2.6.9-cgi-0.1.1-cookie-parse-not-decode-names.patch
+++ b/SOURCES/ruby-2.6.9-cgi-0.1.1-cookie-parse-not-decode-names.patch
@ -1,42 +0,0 @@
 From e2c0652dff671dc6e16a80887e781edc0abc8454 Mon Sep 17 00:00:00 2001
 From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
 Date: Wed, 24 Nov 2021 11:41:55 +0000
 Subject: [PATCH 2/2] When parsing cookies, only decode the values
 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67953 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 ---
 lib/cgi/cookie.rb           | 1 -
 test/cgi/test_cgi_cookie.rb | 5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)
 diff --git a/lib/cgi/cookie.rb b/lib/cgi/cookie.rb
 index a2155edb77..009566bb92 100644
 --- a/lib/cgi/cookie.rb
 +++ b/lib/cgi/cookie.rb
@@ -165,7 +165,6 @@ def self.parse(raw_cookie)
       raw_cookie.split(/;\s?/).each do |pairs|
         name, values = pairs.split('=',2)
         next unless name and values
 -        name = CGI.unescape(name)
         values ||= ""
         values = values.split('&').collect{|v| CGI.unescape(v,@@accept_charset) }
         if cookies.has_key?(name)
 diff --git a/test/cgi/test_cgi_cookie.rb b/test/cgi/test_cgi_cookie.rb
 index 115a57e4a1..985cc0d7a1 100644
 --- a/test/cgi/test_cgi_cookie.rb
 +++ b/test/cgi/test_cgi_cookie.rb
@@ -101,6 +101,11 @@ def test_cgi_cookie_parse
     end
   end
 +  def test_cgi_cookie_parse_not_decode_name
 +    cookie_str = "%66oo=baz;foo=bar"
 +    cookies = CGI::Cookie.parse(cookie_str)
 +    assert_equal({"%66oo" => ["baz"], "foo" => ["bar"]}, cookies)
 +  end
   def test_cgi_cookie_arrayinterface
     cookie = CGI::Cookie.new('name1', 'a', 'b', 'c')
 -- 
 2.36.1
--- a/SOURCES/ruby-2.6.9-date-2.0.1-parse-length-limit.patch
+++ b/SOURCES/ruby-2.6.9-date-2.0.1-parse-length-limit.patch
@ -1,918 +0,0 @@
 From d5753ec513fa5a4bdcf59fa298642fd0d3a3c364 Mon Sep 17 00:00:00 2001
 From: Yusuke Endoh <mame@ruby-lang.org>
 Date: Fri, 12 Nov 2021 12:11:13 +0900
 Subject: [PATCH 1/2] Add length limit option for methods that parses date
 strings
 This patch fixes CVE-2021-41817 and created from the commit
 <https://github.com/ruby/date/commit/4f9b8e946ba98f0a1774f8e677baa4a45637ebb3>.
 We didn't merge the files included in the original commit below, as those are
 for rebasing date gem version.
 * ext/date/date.gemspec
 * ext/date/lib/date.rb
 == Original commit message ==
 `Date.parse` now raises an ArgumentError when a given date string is
 longer than 128. You can configure the limit by giving `limit` keyword
 arguments like `Date.parse(str, limit: 1000)`. If you pass `limit: nil`,
 the limit is disabled.
 Not only `Date.parse` but also the following methods are changed.
 * Date._parse
 * Date.parse
 * DateTime.parse
 * Date._iso8601
 * Date.iso8601
 * DateTime.iso8601
 * Date._rfc3339
 * Date.rfc3339
 * DateTime.rfc3339
 * Date._xmlschema
 * Date.xmlschema
 * DateTime.xmlschema
 * Date._rfc2822
 * Date.rfc2822
 * DateTime.rfc2822
 * Date._rfc822
 * Date.rfc822
 * DateTime.rfc822
 * Date._jisx0301
 * Date.jisx0301
 * DateTime.jisx0301
 ---
 ext/date/date_core.c         | 384 +++++++++++++++++++++++++++--------
 test/date/test_date_parse.rb |  29 +++
 2 files changed, 325 insertions(+), 88 deletions(-)
 diff --git a/ext/date/date_core.c b/ext/date/date_core.c
 index c250633426..177ea0f6c5 100644
 --- a/ext/date/date_core.c
 +++ b/ext/date/date_core.c
@@ -4290,12 +4290,37 @@ date_s_strptime(int argc, VALUE *argv, VALUE klass)
 VALUE date__parse(VALUE str, VALUE comp);
 +static size_t
 +get_limit(VALUE opt)
 +{
 +    if (!NIL_P(opt)) {
 +        VALUE limit = rb_hash_aref(opt, ID2SYM(rb_intern("limit")));
 +        if (NIL_P(limit)) return SIZE_MAX;
 +        return NUM2SIZET(limit);
 +    }
 +    return 128;
 +}
 +
 +static void
 +check_limit(VALUE str, VALUE opt)
 +{
 +    StringValue(str);
 +    size_t slen = RSTRING_LEN(str);
 +    size_t limit = get_limit(opt);
 +    if (slen > limit) {
 +	rb_raise(rb_eArgError,
 +		 "string length (%"PRI_SIZE_PREFIX"u) exceeds the limit %"PRI_SIZE_PREFIX"u", slen, limit);
 +    }
 +}
 +
 static VALUE
 date_s__parse_internal(int argc, VALUE *argv, VALUE klass)
 {
 -    VALUE vstr, vcomp, hash;
 +    VALUE vstr, vcomp, hash, opt;
 -    rb_scan_args(argc, argv, "11", &vstr, &vcomp);
 +    rb_scan_args(argc, argv, "11:", &vstr, &vcomp, &opt);
 +    if (!NIL_P(opt)) argc--;
 +    check_limit(vstr, opt);
     StringValue(vstr);
     if (!rb_enc_str_asciicompat_p(vstr))
 	rb_raise(rb_eArgError,
@@ -4320,7 +4345,7 @@ date_s__parse_internal(int argc, VALUE *argv, VALUE klass)
 /*
  * call-seq:
 - *    Date._parse(string[, comp=true])  ->  hash
 + *    Date._parse(string[, comp=true], limit: 128)  ->  hash
  *
  * Parses the given representation of date and time, and returns a
  * hash of parsed elements.  This method does not function as a
@@ -4331,6 +4356,10 @@ date_s__parse_internal(int argc, VALUE *argv, VALUE klass)
  * it full.
  *
  *    Date._parse('2001-02-03')	#=> {:year=>2001, :mon=>2, :mday=>3}
 + *
 + * Raise an ArgumentError when the string length is longer than _limit_.
 + * You can stop this check by passing `limit: nil`, but note that
 + * it may take a long time to parse.
  */
 static VALUE
 date_s__parse(int argc, VALUE *argv, VALUE klass)
@@ -4340,7 +4369,7 @@ date_s__parse(int argc, VALUE *argv, VALUE klass)
 /*
  * call-seq:
 - *    Date.parse(string='-4712-01-01'[, comp=true[, start=Date::ITALY]])  ->  date
 + *    Date.parse(string='-4712-01-01'[, comp=true[, start=Date::ITALY]], limit: 128)  ->  date
  *
  * Parses the given representation of date and time, and creates a
  * date object.  This method does not function as a validator.
@@ -4352,13 +4381,18 @@ date_s__parse(int argc, VALUE *argv, VALUE klass)
  *    Date.parse('2001-02-03')		#=> #<Date: 2001-02-03 ...>
  *    Date.parse('20010203')		#=> #<Date: 2001-02-03 ...>
  *    Date.parse('3rd Feb 2001')	#=> #<Date: 2001-02-03 ...>
 + *
 + * Raise an ArgumentError when the string length is longer than _limit_.
 + * You can stop this check by passing `limit: nil`, but note that
 + * it may take a long time to parse.
  */
 static VALUE
 date_s_parse(int argc, VALUE *argv, VALUE klass)
 {
 -    VALUE str, comp, sg;
 +    VALUE str, comp, sg, opt;
 -    rb_scan_args(argc, argv, "03", &str, &comp, &sg);
 +    rb_scan_args(argc, argv, "03:", &str, &comp, &sg, &opt);
 +    if (!NIL_P(opt)) argc--;
     switch (argc) {
       case 0:
@@ -4370,11 +4404,12 @@ date_s_parse(int argc, VALUE *argv, VALUE klass)
     }
     {
 -	VALUE argv2[2], hash;
 -
 -	argv2[0] = str;
 -	argv2[1] = comp;
 -	hash = date_s__parse(2, argv2, klass);
 +        int argc2 = 2;
 +	VALUE argv2[3];
 +        argv2[0] = str;
 +        argv2[1] = comp;
 +        if (!NIL_P(opt)) argv2[argc2++] = opt;
 +	VALUE hash = date_s__parse(argc2, argv2, klass);
 	return d_new_by_frags(klass, hash, sg);
     }
 }
@@ -4388,19 +4423,28 @@ VALUE date__jisx0301(VALUE);
 /*
  * call-seq:
 - *    Date._iso8601(string)  ->  hash
 + *    Date._iso8601(string, limit: 128)  ->  hash
  *
  * Returns a hash of parsed elements.
 + *
 + * Raise an ArgumentError when the string length is longer than _limit_.
 + * You can stop this check by passing `limit: nil`, but note that
 + * it may take a long time to parse.
  */
 static VALUE
 -date_s__iso8601(VALUE klass, VALUE str)
 +date_s__iso8601(int argc, VALUE *argv, VALUE klass)
 {
 +    VALUE str, opt;
 +
 +    rb_scan_args(argc, argv, "1:", &str, &opt);
 +    check_limit(str, opt);
 +
     return date__iso8601(str);
 }
 /*
  * call-seq:
 - *    Date.iso8601(string='-4712-01-01'[, start=Date::ITALY])  ->  date
 + *    Date.iso8601(string='-4712-01-01'[, start=Date::ITALY], limit: 128)  ->  date
  *
  * Creates a new Date object by parsing from a string according to
  * some typical ISO 8601 formats.
@@ -4408,13 +4452,18 @@ date_s__iso8601(VALUE klass, VALUE str)
  *    Date.iso8601('2001-02-03')	#=> #<Date: 2001-02-03 ...>
  *    Date.iso8601('20010203')		#=> #<Date: 2001-02-03 ...>
  *    Date.iso8601('2001-W05-6')	#=> #<Date: 2001-02-03 ...>
 + *
 + * Raise an ArgumentError when the string length is longer than _limit_.
 + * You can stop this check by passing `limit: nil`, but note that
 + * it may take a long time to parse.
  */
 static VALUE
 date_s_iso8601(int argc, VALUE *argv, VALUE klass)
 {
 -    VALUE str, sg;
 +    VALUE str, sg, opt;
 -    rb_scan_args(argc, argv, "02", &str, &sg);
 +    rb_scan_args(argc, argv, "02:", &str, &sg, &opt);
 +    if (!NIL_P(opt)) argc--;
     switch (argc) {
       case 0:
@@ -4424,38 +4473,56 @@ date_s_iso8601(int argc, VALUE *argv, VALUE klass)
     }
     {
 -	VALUE hash = date_s__iso8601(klass, str);
 +        int argc2 = 1;
 +        VALUE argv2[2];
 +        argv2[0] = str;
 +        if (!NIL_P(opt)) argv2[argc2++] = opt;
 +	VALUE hash = date_s__iso8601(argc2, argv2, klass);
 	return d_new_by_frags(klass, hash, sg);
     }
 }
 /*
  * call-seq:
 - *    Date._rfc3339(string)  ->  hash
 + *    Date._rfc3339(string, limit: 128)  ->  hash
  *
  * Returns a hash of parsed elements.
 + *
 + * Raise an ArgumentError when the string length is longer than _limit_.
 + * You can stop this check by passing `limit: nil`, but note that
 + * it may take a long time to parse.
  */
 static VALUE
 -date_s__rfc3339(VALUE klass, VALUE str)
 +date_s__rfc3339(int argc, VALUE *argv, VALUE klass)
 {
 +    VALUE str, opt;
 +
 +    rb_scan_args(argc, argv, "1:", &str, &opt);
 +    check_limit(str, opt);
 +
     return date__rfc3339(str);
 }
 /*
  * call-seq:
 - *    Date.rfc3339(string='-4712-01-01T00:00:00+00:00'[, start=Date::ITALY])  ->  date
 + *    Date.rfc3339(string='-4712-01-01T00:00:00+00:00'[, start=Date::ITALY], limit: 128)  ->  date
  *
  * Creates a new Date object by parsing from a string according to
  * some typical RFC 3339 formats.
  *
  *    Date.rfc3339('2001-02-03T04:05:06+07:00')	#=> #<Date: 2001-02-03 ...>
 + *
 + * Raise an ArgumentError when the string length is longer than _limit_.
 + * You can stop this check by passing `limit: nil`, but note that
 + * it may take a long time to parse.
  */
 static VALUE
 date_s_rfc3339(int argc, VALUE *argv, VALUE klass)
 {
 -    VALUE str, sg;
 +    VALUE str, sg, opt;
 -    rb_scan_args(argc, argv, "02", &str, &sg);
 +    rb_scan_args(argc, argv, "02:", &str, &sg, &opt);
 +    if (!NIL_P(opt)) argc--;
     switch (argc) {
       case 0:
@@ -4465,38 +4532,56 @@ date_s_rfc3339(int argc, VALUE *argv, VALUE klass)
     }
     {
 -	VALUE hash = date_s__rfc3339(klass, str);
 +        int argc2 = 1;
 +        VALUE argv2[2];
 +        argv2[0] = str;
 +        if (!NIL_P(opt)) argv2[argc2++] = opt;
 +	VALUE hash = date_s__rfc3339(argc2, argv2, klass);
 	return d_new_by_frags(klass, hash, sg);
     }
 }
 /*
  * call-seq:
 - *    Date._xmlschema(string)  ->  hash
 + *    Date._xmlschema(string, limit: 128)  ->  hash
  *
  * Returns a hash of parsed elements.
 + *
 + * Raise an ArgumentError when the string length is longer than _limit_.
 + * You can stop this check by passing `limit: nil`, but note that
 + * it may take a long time to parse.
  */
 static VALUE
 -date_s__xmlschema(VALUE klass, VALUE str)
 +date_s__xmlschema(int argc, VALUE *argv, VALUE klass)
 {
 +    VALUE str, opt;
 +
 +    rb_scan_args(argc, argv, "1:", &str, &opt);
 +    check_limit(str, opt);
 +
     return date__xmlschema(str);
 }
 /*
  * call-seq:
 - *    Date.xmlschema(string='-4712-01-01'[, start=Date::ITALY])  ->  date
 + *    Date.xmlschema(string='-4712-01-01'[, start=Date::ITALY], limit: 128)  ->  date
  *
  * Creates a new Date object by parsing from a string according to
  * some typical XML Schema formats.
  *
  *    Date.xmlschema('2001-02-03')	#=> #<Date: 2001-02-03 ...>
 + *
 + * Raise an ArgumentError when the string length is longer than _limit_.
 + * You can stop this check by passing `limit: nil`, but note that
 + * it may take a long time to parse.
  */
 static VALUE
 date_s_xmlschema(int argc, VALUE *argv, VALUE klass)
 {
 -    VALUE str, sg;
 +    VALUE str, sg, opt;
 -    rb_scan_args(argc, argv, "02", &str, &sg);
 +    rb_scan_args(argc, argv, "02:", &str, &sg, &opt);
 +    if (!NIL_P(opt)) argc--;
     switch (argc) {
       case 0:
@@ -4506,41 +4591,58 @@ date_s_xmlschema(int argc, VALUE *argv, VALUE klass)
     }
     {
 -	VALUE hash = date_s__xmlschema(klass, str);
 +        int argc2 = 1;
 +        VALUE argv2[2];
 +        argv2[0] = str;
 +        if (!NIL_P(opt)) argv2[argc2++] = opt;
 +	VALUE hash = date_s__xmlschema(argc2, argv2, klass);
 	return d_new_by_frags(klass, hash, sg);
     }
 }
 /*
  * call-seq:
 - *    Date._rfc2822(string)  ->  hash
 - *    Date._rfc822(string)   ->  hash
 + *    Date._rfc2822(string, limit: 128)  ->  hash
 + *    Date._rfc822(string, limit: 128)   ->  hash
  *
  * Returns a hash of parsed elements.
 + *
 + * Raise an ArgumentError when the string length is longer than _limit_.
 + * You can stop this check by passing `limit: nil`, but note that
 + * it may take a long time to parse.
  */
 static VALUE
 -date_s__rfc2822(VALUE klass, VALUE str)
 +date_s__rfc2822(int argc, VALUE *argv, VALUE klass)
 {
 +    VALUE str, opt;
 +
 +    rb_scan_args(argc, argv, "1:", &str, &opt);
 +    check_limit(str, opt);
 +
     return date__rfc2822(str);
 }
 /*
  * call-seq:
 - *    Date.rfc2822(string='Mon, 1 Jan -4712 00:00:00 +0000'[, start=Date::ITALY])  ->  date
 - *    Date.rfc822(string='Mon, 1 Jan -4712 00:00:00 +0000'[, start=Date::ITALY])   ->  date
 + *    Date.rfc2822(string='Mon, 1 Jan -4712 00:00:00 +0000'[, start=Date::ITALY], limit: 128)  ->  date
 + *    Date.rfc822(string='Mon, 1 Jan -4712 00:00:00 +0000'[, start=Date::ITALY], limit: 128)   ->  date
  *
  * Creates a new Date object by parsing from a string according to
  * some typical RFC 2822 formats.
  *
  *    Date.rfc2822('Sat, 3 Feb 2001 00:00:00 +0000')
  *						#=> #<Date: 2001-02-03 ...>
 + *
 + * Raise an ArgumentError when the string length is longer than _limit_.
 + * You can stop this check by passing `limit: nil`, but note that
 + * it may take a long time to parse.
  */
 static VALUE
 date_s_rfc2822(int argc, VALUE *argv, VALUE klass)
 {
 -    VALUE str, sg;
 +    VALUE str, sg, opt;
 -    rb_scan_args(argc, argv, "02", &str, &sg);
 +    rb_scan_args(argc, argv, "02:", &str, &sg, &opt);
     switch (argc) {
       case 0:
@@ -4550,39 +4652,56 @@ date_s_rfc2822(int argc, VALUE *argv, VALUE klass)
     }
     {
 -	VALUE hash = date_s__rfc2822(klass, str);
 +        int argc2 = 1;
 +        VALUE argv2[2];
 +        argv2[0] = str;
 +        if (!NIL_P(opt)) argv2[argc2++] = opt;
 +	VALUE hash = date_s__rfc2822(argc2, argv2, klass);
 	return d_new_by_frags(klass, hash, sg);
     }
 }
 /*
  * call-seq:
 - *    Date._httpdate(string)  ->  hash
 + *    Date._httpdate(string, limit: 128)  ->  hash
  *
  * Returns a hash of parsed elements.
 + *
 + * Raise an ArgumentError when the string length is longer than _limit_.
 + * You can stop this check by passing `limit: nil`, but note that
 + * it may take a long time to parse.
  */
 static VALUE
 -date_s__httpdate(VALUE klass, VALUE str)
 +date_s__httpdate(int argc, VALUE *argv, VALUE klass)
 {
 +    VALUE str, opt;
 +
 +    rb_scan_args(argc, argv, "1:", &str, &opt);
 +    check_limit(str, opt);
 +
     return date__httpdate(str);
 }
 /*
  * call-seq:
 - *    Date.httpdate(string='Mon, 01 Jan -4712 00:00:00 GMT'[, start=Date::ITALY])  ->  date
 + *    Date.httpdate(string='Mon, 01 Jan -4712 00:00:00 GMT'[, start=Date::ITALY], limit: 128)  ->  date
  *
  * Creates a new Date object by parsing from a string according to
  * some RFC 2616 format.
  *
  *    Date.httpdate('Sat, 03 Feb 2001 00:00:00 GMT')
  *						#=> #<Date: 2001-02-03 ...>
 + *
 + * Raise an ArgumentError when the string length is longer than _limit_.
 + * You can stop this check by passing `limit: nil`, but note that
 + * it may take a long time to parse.
  */
 static VALUE
 date_s_httpdate(int argc, VALUE *argv, VALUE klass)
 {
 -    VALUE str, sg;
 +    VALUE str, sg, opt;
 -    rb_scan_args(argc, argv, "02", &str, &sg);
 +    rb_scan_args(argc, argv, "02:", &str, &sg, &opt);
     switch (argc) {
       case 0:
@@ -4592,38 +4711,56 @@ date_s_httpdate(int argc, VALUE *argv, VALUE klass)
     }
     {
 -	VALUE hash = date_s__httpdate(klass, str);
 +        int argc2 = 1;
 +        VALUE argv2[2];
 +        argv2[0] = str;
 +        if (!NIL_P(opt)) argv2[argc2++] = opt;
 +	VALUE hash = date_s__httpdate(argc2, argv2, klass);
 	return d_new_by_frags(klass, hash, sg);
     }
 }
 /*
  * call-seq:
 - *    Date._jisx0301(string)  ->  hash
 + *    Date._jisx0301(string, limit: 128)  ->  hash
  *
  * Returns a hash of parsed elements.
 + *
 + * Raise an ArgumentError when the string length is longer than _limit_.
 + * You can stop this check by passing `limit: nil`, but note that
 + * it may take a long time to parse.
  */
 static VALUE
 -date_s__jisx0301(VALUE klass, VALUE str)
 +date_s__jisx0301(int argc, VALUE *argv, VALUE klass)
 {
 +    VALUE str, opt;
 +
 +    rb_scan_args(argc, argv, "1:", &str, &opt);
 +    check_limit(str, opt);
 +
     return date__jisx0301(str);
 }
 /*
  * call-seq:
 - *    Date.jisx0301(string='-4712-01-01'[, start=Date::ITALY])  ->  date
 + *    Date.jisx0301(string='-4712-01-01'[, start=Date::ITALY], limit: 128)  ->  date
  *
  * Creates a new Date object by parsing from a string according to
  * some typical JIS X 0301 formats.
  *
  *    Date.jisx0301('H13.02.03')		#=> #<Date: 2001-02-03 ...>
 + *
 + * Raise an ArgumentError when the string length is longer than _limit_.
 + * You can stop this check by passing `limit: nil`, but note that
 + * it may take a long time to parse.
  */
 static VALUE
 date_s_jisx0301(int argc, VALUE *argv, VALUE klass)
 {
 -    VALUE str, sg;
 +    VALUE str, sg, opt;
 -    rb_scan_args(argc, argv, "02", &str, &sg);
 +    rb_scan_args(argc, argv, "02:", &str, &sg, &opt);
 +    if (!NIL_P(opt)) argc--;
     switch (argc) {
       case 0:
@@ -4633,7 +4770,11 @@ date_s_jisx0301(int argc, VALUE *argv, VALUE klass)
     }
     {
 -	VALUE hash = date_s__jisx0301(klass, str);
 +        int argc2 = 1;
 +        VALUE argv2[2];
 +        argv2[0] = str;
 +        if (!NIL_P(opt)) argv2[argc2++] = opt;
 +	VALUE hash = date_s__jisx0301(argc2, argv2, klass);
 	return d_new_by_frags(klass, hash, sg);
     }
 }
@@ -7925,7 +8066,7 @@ datetime_s_strptime(int argc, VALUE *argv, VALUE klass)
 /*
  * call-seq:
 - *    DateTime.parse(string='-4712-01-01T00:00:00+00:00'[, comp=true[, start=Date::ITALY]])  ->  datetime
 + *    DateTime.parse(string='-4712-01-01T00:00:00+00:00'[, comp=true[, start=Date::ITALY]], limit: 128)  ->  datetime
  *
  * Parses the given representation of date and time, and creates a
  * DateTime object.  This method does not function as a validator.
@@ -7939,13 +8080,18 @@ datetime_s_strptime(int argc, VALUE *argv, VALUE klass)
  *				#=> #<DateTime: 2001-02-03T04:05:06+07:00 ...>
  *    DateTime.parse('3rd Feb 2001 04:05:06 PM')
  *				#=> #<DateTime: 2001-02-03T16:05:06+00:00 ...>
 + *
 + * Raise an ArgumentError when the string length is longer than _limit_.
 + * You can stop this check by passing `limit: nil`, but note that
 + * it may take a long time to parse.
  */
 static VALUE
 datetime_s_parse(int argc, VALUE *argv, VALUE klass)
 {
 -    VALUE str, comp, sg;
 +    VALUE str, comp, sg, opt;
 -    rb_scan_args(argc, argv, "03", &str, &comp, &sg);
 +    rb_scan_args(argc, argv, "03:", &str, &comp, &sg, &opt);
 +    if (!NIL_P(opt)) argc--;
     switch (argc) {
       case 0:
@@ -7957,18 +8103,20 @@ datetime_s_parse(int argc, VALUE *argv, VALUE klass)
     }
     {
 -	VALUE argv2[2], hash;
 -
 -	argv2[0] = str;
 -	argv2[1] = comp;
 -	hash = date_s__parse(2, argv2, klass);
 +        int argc2 = 2;
 +        VALUE argv2[3];
 +        argv2[0] = str;
 +        argv2[1] = comp;
 +        argv2[2] = opt;
 +        if (!NIL_P(opt)) argc2++;
 +	VALUE hash = date_s__parse(argc2, argv2, klass);
 	return dt_new_by_frags(klass, hash, sg);
     }
 }
 /*
  * call-seq:
 - *    DateTime.iso8601(string='-4712-01-01T00:00:00+00:00'[, start=Date::ITALY])  ->  datetime
 + *    DateTime.iso8601(string='-4712-01-01T00:00:00+00:00'[, start=Date::ITALY], limit: 128)  ->  datetime
  *
  * Creates a new DateTime object by parsing from a string according to
  * some typical ISO 8601 formats.
@@ -7979,13 +8127,18 @@ datetime_s_parse(int argc, VALUE *argv, VALUE klass)
  *				#=> #<DateTime: 2001-02-03T04:05:06+07:00 ...>
  *    DateTime.iso8601('2001-W05-6T04:05:06+07:00')
  *				#=> #<DateTime: 2001-02-03T04:05:06+07:00 ...>
 + *
 + * Raise an ArgumentError when the string length is longer than _limit_.
 + * You can stop this check by passing `limit: nil`, but note that
 + * it may take a long time to parse.
  */
 static VALUE
 datetime_s_iso8601(int argc, VALUE *argv, VALUE klass)
 {
 -    VALUE str, sg;
 +    VALUE str, sg, opt;
 -    rb_scan_args(argc, argv, "02", &str, &sg);
 +    rb_scan_args(argc, argv, "02:", &str, &sg, &opt);
 +    if (!NIL_P(opt)) argc--;
     switch (argc) {
       case 0:
@@ -7995,27 +8148,37 @@ datetime_s_iso8601(int argc, VALUE *argv, VALUE klass)
     }
     {
 -	VALUE hash = date_s__iso8601(klass, str);
 +        int argc2 = 1;
 +        VALUE argv2[2];
 +        argv2[0] = str;
 +        argv2[1] = opt;
 +        if (!NIL_P(opt)) argc2--;
 +	VALUE hash = date_s__iso8601(argc2, argv2, klass);
 	return dt_new_by_frags(klass, hash, sg);
     }
 }
 /*
  * call-seq:
 - *    DateTime.rfc3339(string='-4712-01-01T00:00:00+00:00'[, start=Date::ITALY])  ->  datetime
 + *    DateTime.rfc3339(string='-4712-01-01T00:00:00+00:00'[, start=Date::ITALY], limit: 128)  ->  datetime
  *
  * Creates a new DateTime object by parsing from a string according to
  * some typical RFC 3339 formats.
  *
  *    DateTime.rfc3339('2001-02-03T04:05:06+07:00')
  *				#=> #<DateTime: 2001-02-03T04:05:06+07:00 ...>
 + *
 + * Raise an ArgumentError when the string length is longer than _limit_.
 + * You can stop this check by passing `limit: nil`, but note that
 + * it may take a long time to parse.
  */
 static VALUE
 datetime_s_rfc3339(int argc, VALUE *argv, VALUE klass)
 {
 -    VALUE str, sg;
 +    VALUE str, sg, opt;
 -    rb_scan_args(argc, argv, "02", &str, &sg);
 +    rb_scan_args(argc, argv, "02:", &str, &sg, &opt);
 +    if (!NIL_P(opt)) argc--;
     switch (argc) {
       case 0:
@@ -8025,27 +8188,37 @@ datetime_s_rfc3339(int argc, VALUE *argv, VALUE klass)
     }
     {
 -	VALUE hash = date_s__rfc3339(klass, str);
 +        int argc2 = 1;
 +        VALUE argv2[2];
 +        argv2[0] = str;
 +        argv2[1] = opt;
 +        if (!NIL_P(opt)) argc2++;
 +	VALUE hash = date_s__rfc3339(argc2, argv2, klass);
 	return dt_new_by_frags(klass, hash, sg);
     }
 }
 /*
  * call-seq:
 - *    DateTime.xmlschema(string='-4712-01-01T00:00:00+00:00'[, start=Date::ITALY])  ->  datetime
 + *    DateTime.xmlschema(string='-4712-01-01T00:00:00+00:00'[, start=Date::ITALY], limit: 128)  ->  datetime
  *
  * Creates a new DateTime object by parsing from a string according to
  * some typical XML Schema formats.
  *
  *    DateTime.xmlschema('2001-02-03T04:05:06+07:00')
  *				#=> #<DateTime: 2001-02-03T04:05:06+07:00 ...>
 + *
 + * Raise an ArgumentError when the string length is longer than _limit_.
 + * You can stop this check by passing `limit: nil`, but note that
 + * it may take a long time to parse.
  */
 static VALUE
 datetime_s_xmlschema(int argc, VALUE *argv, VALUE klass)
 {
 -    VALUE str, sg;
 +    VALUE str, sg, opt;
 -    rb_scan_args(argc, argv, "02", &str, &sg);
 +    rb_scan_args(argc, argv, "02:", &str, &sg, &opt);
 +    if (!NIL_P(opt)) argc--;
     switch (argc) {
       case 0:
@@ -8055,28 +8228,38 @@ datetime_s_xmlschema(int argc, VALUE *argv, VALUE klass)
     }
     {
 -	VALUE hash = date_s__xmlschema(klass, str);
 +        int argc2 = 1;
 +        VALUE argv2[2];
 +        argv2[0] = str;
 +        argv2[1] = opt;
 +        if (!NIL_P(opt)) argc2++;
 +	VALUE hash = date_s__xmlschema(argc2, argv2, klass);
 	return dt_new_by_frags(klass, hash, sg);
     }
 }
 /*
  * call-seq:
 - *    DateTime.rfc2822(string='Mon, 1 Jan -4712 00:00:00 +0000'[, start=Date::ITALY])  ->  datetime
 - *    DateTime.rfc822(string='Mon, 1 Jan -4712 00:00:00 +0000'[, start=Date::ITALY])   ->  datetime
 + *    DateTime.rfc2822(string='Mon, 1 Jan -4712 00:00:00 +0000'[, start=Date::ITALY], limit: 128)  ->  datetime
 + *    DateTime.rfc822(string='Mon, 1 Jan -4712 00:00:00 +0000'[, start=Date::ITALY], limit: 128)   ->  datetime
  *
  * Creates a new DateTime object by parsing from a string according to
  * some typical RFC 2822 formats.
  *
  *     DateTime.rfc2822('Sat, 3 Feb 2001 04:05:06 +0700')
  *				#=> #<DateTime: 2001-02-03T04:05:06+07:00 ...>
 + *
 + * Raise an ArgumentError when the string length is longer than _limit_.
 + * You can stop this check by passing `limit: nil`, but note that
 + * it may take a long time to parse.
  */
 static VALUE
 datetime_s_rfc2822(int argc, VALUE *argv, VALUE klass)
 {
 -    VALUE str, sg;
 +    VALUE str, sg, opt;
 -    rb_scan_args(argc, argv, "02", &str, &sg);
 +    rb_scan_args(argc, argv, "02:", &str, &sg, &opt);
 +    if (!NIL_P(opt)) argc--;
     switch (argc) {
       case 0:
@@ -8086,7 +8269,12 @@ datetime_s_rfc2822(int argc, VALUE *argv, VALUE klass)
     }
     {
 -	VALUE hash = date_s__rfc2822(klass, str);
 +        int argc2 = 1;
 +        VALUE argv2[2];
 +        argv2[0] = str;
 +        argv2[1] = opt;
 +        if (!NIL_P(opt)) argc2++;
 +	VALUE hash = date_s__rfc2822(argc2, argv2, klass);
 	return dt_new_by_frags(klass, hash, sg);
     }
 }
@@ -8100,13 +8288,18 @@ datetime_s_rfc2822(int argc, VALUE *argv, VALUE klass)
  *
  *    DateTime.httpdate('Sat, 03 Feb 2001 04:05:06 GMT')
  *				#=> #<DateTime: 2001-02-03T04:05:06+00:00 ...>
 + *
 + * Raise an ArgumentError when the string length is longer than _limit_.
 + * You can stop this check by passing `limit: nil`, but note that
 + * it may take a long time to parse.
  */
 static VALUE
 datetime_s_httpdate(int argc, VALUE *argv, VALUE klass)
 {
 -    VALUE str, sg;
 +    VALUE str, sg, opt;
 -    rb_scan_args(argc, argv, "02", &str, &sg);
 +    rb_scan_args(argc, argv, "02:", &str, &sg, &opt);
 +    if (!NIL_P(opt)) argc--;
     switch (argc) {
       case 0:
@@ -8116,27 +8309,37 @@ datetime_s_httpdate(int argc, VALUE *argv, VALUE klass)
     }
     {
 -	VALUE hash = date_s__httpdate(klass, str);
 +        int argc2 = 1;
 +        VALUE argv2[2];
 +        argv2[0] = str;
 +        argv2[1] = opt;
 +        if (!NIL_P(opt)) argc2++;
 +	VALUE hash = date_s__httpdate(argc2, argv2, klass);
 	return dt_new_by_frags(klass, hash, sg);
     }
 }
 /*
  * call-seq:
 - *    DateTime.jisx0301(string='-4712-01-01T00:00:00+00:00'[, start=Date::ITALY])  ->  datetime
 + *    DateTime.jisx0301(string='-4712-01-01T00:00:00+00:00'[, start=Date::ITALY], limit: 128)  ->  datetime
  *
  * Creates a new DateTime object by parsing from a string according to
  * some typical JIS X 0301 formats.
  *
  *    DateTime.jisx0301('H13.02.03T04:05:06+07:00')
  *				#=> #<DateTime: 2001-02-03T04:05:06+07:00 ...>
 + *
 + * Raise an ArgumentError when the string length is longer than _limit_.
 + * You can stop this check by passing `limit: nil`, but note that
 + * it may take a long time to parse.
  */
 static VALUE
 datetime_s_jisx0301(int argc, VALUE *argv, VALUE klass)
 {
 -    VALUE str, sg;
 +    VALUE str, sg, opt;
 -    rb_scan_args(argc, argv, "02", &str, &sg);
 +    rb_scan_args(argc, argv, "02:", &str, &sg, &opt);
 +    if (!NIL_P(opt)) argc--;
     switch (argc) {
       case 0:
@@ -8146,7 +8349,12 @@ datetime_s_jisx0301(int argc, VALUE *argv, VALUE klass)
     }
     {
 -	VALUE hash = date_s__jisx0301(klass, str);
 +        int argc2 = 1;
 +        VALUE argv2[2];
 +        argv2[0] = str;
 +        argv2[1] = opt;
 +        if (!NIL_P(opt)) argc2++;
 +	VALUE hash = date_s__jisx0301(argc2, argv2, klass);
 	return dt_new_by_frags(klass, hash, sg);
     }
 }
@@ -9297,19 +9505,19 @@ Init_date_core(void)
     rb_define_singleton_method(cDate, "strptime", date_s_strptime, -1);
     rb_define_singleton_method(cDate, "_parse", date_s__parse, -1);
     rb_define_singleton_method(cDate, "parse", date_s_parse, -1);
 -    rb_define_singleton_method(cDate, "_iso8601", date_s__iso8601, 1);
 +    rb_define_singleton_method(cDate, "_iso8601", date_s__iso8601, -1);
     rb_define_singleton_method(cDate, "iso8601", date_s_iso8601, -1);
 -    rb_define_singleton_method(cDate, "_rfc3339", date_s__rfc3339, 1);
 +    rb_define_singleton_method(cDate, "_rfc3339", date_s__rfc3339, -1);
     rb_define_singleton_method(cDate, "rfc3339", date_s_rfc3339, -1);
 -    rb_define_singleton_method(cDate, "_xmlschema", date_s__xmlschema, 1);
 +    rb_define_singleton_method(cDate, "_xmlschema", date_s__xmlschema, -1);
     rb_define_singleton_method(cDate, "xmlschema", date_s_xmlschema, -1);
 -    rb_define_singleton_method(cDate, "_rfc2822", date_s__rfc2822, 1);
 -    rb_define_singleton_method(cDate, "_rfc822", date_s__rfc2822, 1);
 +    rb_define_singleton_method(cDate, "_rfc2822", date_s__rfc2822, -1);
 +    rb_define_singleton_method(cDate, "_rfc822", date_s__rfc2822, -1);
     rb_define_singleton_method(cDate, "rfc2822", date_s_rfc2822, -1);
     rb_define_singleton_method(cDate, "rfc822", date_s_rfc2822, -1);
 -    rb_define_singleton_method(cDate, "_httpdate", date_s__httpdate, 1);
 +    rb_define_singleton_method(cDate, "_httpdate", date_s__httpdate, -1);
     rb_define_singleton_method(cDate, "httpdate", date_s_httpdate, -1);
 -    rb_define_singleton_method(cDate, "_jisx0301", date_s__jisx0301, 1);
 +    rb_define_singleton_method(cDate, "_jisx0301", date_s__jisx0301, -1);
     rb_define_singleton_method(cDate, "jisx0301", date_s_jisx0301, -1);
 #ifndef NDEBUG
 diff --git a/test/date/test_date_parse.rb b/test/date/test_date_parse.rb
 index ac0eb85ca7..f9b160ee8c 100644
 --- a/test/date/test_date_parse.rb
 +++ b/test/date/test_date_parse.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 require 'test/unit'
 require 'date'
 +require 'timeout'
 class TestDateParse < Test::Unit::TestCase
@@ -1122,4 +1123,32 @@ def test_given_string
     assert_equal(s0, s)
   end
 +  def test_length_limit
 +    assert_raise(ArgumentError) { Date._parse("1" * 1000) }
 +    assert_raise(ArgumentError) { Date._iso8601("1" * 1000) }
 +    assert_raise(ArgumentError) { Date._rfc3339("1" * 1000) }
 +    assert_raise(ArgumentError) { Date._xmlschema("1" * 1000) }
 +    assert_raise(ArgumentError) { Date._rfc2822("1" * 1000) }
 +    assert_raise(ArgumentError) { Date._rfc822("1" * 1000) }
 +    assert_raise(ArgumentError) { Date._jisx0301("1" * 1000) }
 +
 +    assert_raise(ArgumentError) { Date.parse("1" * 1000) }
 +    assert_raise(ArgumentError) { Date.iso8601("1" * 1000) }
 +    assert_raise(ArgumentError) { Date.rfc3339("1" * 1000) }
 +    assert_raise(ArgumentError) { Date.xmlschema("1" * 1000) }
 +    assert_raise(ArgumentError) { Date.rfc2822("1" * 1000) }
 +    assert_raise(ArgumentError) { Date.rfc822("1" * 1000) }
 +    assert_raise(ArgumentError) { Date.jisx0301("1" * 1000) }
 +
 +    assert_raise(ArgumentError) { DateTime.parse("1" * 1000) }
 +    assert_raise(ArgumentError) { DateTime.iso8601("1" * 1000) }
 +    assert_raise(ArgumentError) { DateTime.rfc3339("1" * 1000) }
 +    assert_raise(ArgumentError) { DateTime.xmlschema("1" * 1000) }
 +    assert_raise(ArgumentError) { DateTime.rfc2822("1" * 1000) }
 +    assert_raise(ArgumentError) { DateTime.rfc822("1" * 1000) }
 +    assert_raise(ArgumentError) { DateTime.jisx0301("1" * 1000) }
 +
 +    assert_raise(ArgumentError) { Date._parse("Jan " + "9" * 1000000) }
 +    assert_raise(Timeout::Error) { Timeout.timeout(1) { Date._parse("Jan " + "9" * 1000000, limit: nil) } }
 +  end
 end
 -- 
 2.36.1
--- a/SOURCES/ruby-2.7.7-Fix-CVE-2021-33621-HTTP-response-splitting-in-CGI.patch
+++ b/SOURCES/ruby-2.7.7-Fix-CVE-2021-33621-HTTP-response-splitting-in-CGI.patch
@ -1,328 +0,0 @@
 From 8fc4b4792919c627183f4ddb6dc256aae49eb738 Mon Sep 17 00:00:00 2001
 From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
 Date: Tue, 22 Nov 2022 13:48:18 +0900
 Subject: [PATCH] Fix CVE-2021-33621 HTTP response splitting in CGI.
 Backported from upstream Ruby, commit:
 https://github.com/ruby/ruby/commit/7cf697179dab52b0d024543304f4d3ab5fa5e847
 Test "CGICookieTest#test_cgi_cookie_new_with_domain" was adjusted to
 deal with Ruby 2.5 not allowing String with double splat operator.
 ==== Original commit message
 Merge CGI-0.1.0.2
 ---
 lib/cgi/cookie.rb           | 51 ++++++++++++++++-------
 lib/cgi/core.rb             | 45 ++++++++++++--------
 test/cgi/test_cgi_cookie.rb | 82 +++++++++++++++++++++++++++++++++++++
 test/cgi/test_cgi_header.rb |  8 ++++
 4 files changed, 154 insertions(+), 32 deletions(-)
 diff --git a/lib/cgi/cookie.rb b/lib/cgi/cookie.rb
 index 009566b..f26f015 100644
 --- a/lib/cgi/cookie.rb
 +++ b/lib/cgi/cookie.rb
@@ -40,6 +40,10 @@ class CGI
   class Cookie < Array
     @@accept_charset="UTF-8" unless defined?(@@accept_charset)
 +    TOKEN_RE = %r"\A[[!-~]&&[^()<>@,;:\\\"/?=\[\]{}]]+\z"
 +    PATH_VALUE_RE = %r"\A[[ -~]&&[^;]]*\z"
 +    DOMAIN_VALUE_RE = %r"\A(?<label>(?!-)[-A-Za-z0-9]+(?<!-))(?:\.\g<label>)*\z"
 +
     # Create a new CGI::Cookie object.
     #
     # :call-seq:
@@ -72,9 +76,8 @@ class CGI
       @domain = nil
       @expires = nil
       if name.kind_of?(String)
 -        @name = name
 -        %r|^(.*/)|.match(ENV["SCRIPT_NAME"])
 -        @path = ($1 or "")
 +        self.name = name
 +        self.path = (%r|\A(.*/)| =~ ENV["SCRIPT_NAME"] ? $1 : "")
         @secure = false
         @httponly = false
         return super(value)
@@ -85,16 +88,11 @@ class CGI
         raise ArgumentError, "`name' required"
       end
 -      @name = options["name"]
 +      self.name = options["name"]
       value = Array(options["value"])
       # simple support for IE
 -      if options["path"]
 -        @path = options["path"]
 -      else
 -        %r|^(.*/)|.match(ENV["SCRIPT_NAME"])
 -        @path = ($1 or "")
 -      end
 -      @domain = options["domain"]
 +      self.path = options["path"] || (%r|\A(.*/)| =~ ENV["SCRIPT_NAME"] ? $1 : "")
 +      self.domain = options["domain"]
       @expires = options["expires"]
       @secure = options["secure"] == true
       @httponly = options["httponly"] == true
@@ -102,12 +100,35 @@ class CGI
       super(value)
     end
 -    # Name of this cookie, as a +String+
 -    attr_accessor :name
 +    attr_reader :name
 +    # Set name of this cookie
 +    def name=(str)
 +      if str and !TOKEN_RE.match?(str)
 +        raise ArgumentError, "invalid name: #{str.dump}"
 +      end
 +      @name = str
 +    end
 +
     # Path for which this cookie applies, as a +String+
 -    attr_accessor :path
 +    attr_reader :path
 +    # Set path for which this cookie applies
 +    def path=(str)
 +      if str and !PATH_VALUE_RE.match?(str)
 +        raise ArgumentError, "invalid path: #{str.dump}"
 +      end
 +      @path = str
 +    end
 +
     # Domain for which this cookie applies, as a +String+
 -    attr_accessor :domain
 +    attr_reader :domain
 +    # Set domain for which this cookie applies
 +    def domain=(str)
 +      if str and ((str = str.b).bytesize > 255 or !DOMAIN_VALUE_RE.match?(str))
 +        raise ArgumentError, "invalid domain: #{str.dump}"
 +      end
 +      @domain = str
 +    end
 +
     # Time at which this cookie expires, as a +Time+
     attr_accessor :expires
     # True if this cookie is secure; false otherwise
 diff --git a/lib/cgi/core.rb b/lib/cgi/core.rb
 index 9bd7798..7d8b223 100644
 --- a/lib/cgi/core.rb
 +++ b/lib/cgi/core.rb
@@ -188,17 +188,28 @@ class CGI
   # Using #header with the HTML5 tag maker will create a <header> element.
   alias :header :http_header
 +  def _no_crlf_check(str)
 +    if str
 +      str = str.to_s
 +      raise "A HTTP status or header field must not include CR and LF" if str =~ /[\r\n]/
 +      str
 +    else
 +      nil
 +    end
 +  end
 +  private :_no_crlf_check
 +
   def _header_for_string(content_type) #:nodoc:
     buf = ''.dup
     if nph?()
 -      buf << "#{$CGI_ENV['SERVER_PROTOCOL'] || 'HTTP/1.0'} 200 OK#{EOL}"
 +      buf << "#{_no_crlf_check($CGI_ENV['SERVER_PROTOCOL']) || 'HTTP/1.0'} 200 OK#{EOL}"
       buf << "Date: #{CGI.rfc1123_date(Time.now)}#{EOL}"
 -      buf << "Server: #{$CGI_ENV['SERVER_SOFTWARE']}#{EOL}"
 +      buf << "Server: #{_no_crlf_check($CGI_ENV['SERVER_SOFTWARE'])}#{EOL}"
       buf << "Connection: close#{EOL}"
     end
 -    buf << "Content-Type: #{content_type}#{EOL}"
 +    buf << "Content-Type: #{_no_crlf_check(content_type)}#{EOL}"
     if @output_cookies
 -      @output_cookies.each {|cookie| buf << "Set-Cookie: #{cookie}#{EOL}" }
 +      @output_cookies.each {|cookie| buf << "Set-Cookie: #{_no_crlf_check(cookie)}#{EOL}" }
     end
     return buf
   end # _header_for_string
@@ -213,9 +224,9 @@ class CGI
     ## NPH
     options.delete('nph') if defined?(MOD_RUBY)
     if options.delete('nph') || nph?()
 -      protocol = $CGI_ENV['SERVER_PROTOCOL'] || 'HTTP/1.0'
 +      protocol = _no_crlf_check($CGI_ENV['SERVER_PROTOCOL']) || 'HTTP/1.0'
       status = options.delete('status')
 -      status = HTTP_STATUS[status] || status || '200 OK'
 +      status = HTTP_STATUS[status] || _no_crlf_check(status) || '200 OK'
       buf << "#{protocol} #{status}#{EOL}"
       buf << "Date: #{CGI.rfc1123_date(Time.now)}#{EOL}"
       options['server'] ||= $CGI_ENV['SERVER_SOFTWARE'] || ''
@@ -223,38 +234,38 @@ class CGI
     end
     ## common headers
     status = options.delete('status')
 -    buf << "Status: #{HTTP_STATUS[status] || status}#{EOL}" if status
 +    buf << "Status: #{HTTP_STATUS[status] || _no_crlf_check(status)}#{EOL}" if status
     server = options.delete('server')
 -    buf << "Server: #{server}#{EOL}" if server
 +    buf << "Server: #{_no_crlf_check(server)}#{EOL}" if server
     connection = options.delete('connection')
 -    buf << "Connection: #{connection}#{EOL}" if connection
 +    buf << "Connection: #{_no_crlf_check(connection)}#{EOL}" if connection
     type = options.delete('type')
 -    buf << "Content-Type: #{type}#{EOL}" #if type
 +    buf << "Content-Type: #{_no_crlf_check(type)}#{EOL}" #if type
     length = options.delete('length')
 -    buf << "Content-Length: #{length}#{EOL}" if length
 +    buf << "Content-Length: #{_no_crlf_check(length)}#{EOL}" if length
     language = options.delete('language')
 -    buf << "Content-Language: #{language}#{EOL}" if language
 +    buf << "Content-Language: #{_no_crlf_check(language)}#{EOL}" if language
     expires = options.delete('expires')
     buf << "Expires: #{CGI.rfc1123_date(expires)}#{EOL}" if expires
     ## cookie
     if cookie = options.delete('cookie')
       case cookie
       when String, Cookie
 -        buf << "Set-Cookie: #{cookie}#{EOL}"
 +        buf << "Set-Cookie: #{_no_crlf_check(cookie)}#{EOL}"
       when Array
         arr = cookie
 -        arr.each {|c| buf << "Set-Cookie: #{c}#{EOL}" }
 +        arr.each {|c| buf << "Set-Cookie: #{_no_crlf_check(c)}#{EOL}" }
       when Hash
         hash = cookie
 -        hash.each_value {|c| buf << "Set-Cookie: #{c}#{EOL}" }
 +        hash.each_value {|c| buf << "Set-Cookie: #{_no_crlf_check(c)}#{EOL}" }
       end
     end
     if @output_cookies
 -      @output_cookies.each {|c| buf << "Set-Cookie: #{c}#{EOL}" }
 +      @output_cookies.each {|c| buf << "Set-Cookie: #{_no_crlf_check(c)}#{EOL}" }
     end
     ## other headers
     options.each do |key, value|
 -      buf << "#{key}: #{value}#{EOL}"
 +      buf << "#{_no_crlf_check(key)}: #{_no_crlf_check(value)}#{EOL}"
     end
     return buf
   end # _header_for_hash
 diff --git a/test/cgi/test_cgi_cookie.rb b/test/cgi/test_cgi_cookie.rb
 index 985cc0d..7afff5e 100644
 --- a/test/cgi/test_cgi_cookie.rb
 +++ b/test/cgi/test_cgi_cookie.rb
@@ -60,6 +60,24 @@ class CGICookieTest < Test::Unit::TestCase
   end
 +  def test_cgi_cookie_new_with_domain
 +    h = {'name'=>'name1', 'value'=>'value1'}
 +    cookie = CGI::Cookie.new({'domain' => 'a.example.com'}.merge(h))
 +    assert_equal('a.example.com', cookie.domain)
 +
 +    cookie = CGI::Cookie.new({'domain'=>'1.example.com'}.merge(h))
 +    assert_equal('1.example.com', cookie.domain, 'enhanced by RFC 1123')
 +
 +    assert_raise(ArgumentError) {
 +      CGI::Cookie.new({'domain'=>'-a.example.com'}.merge(h))
 +    }
 +
 +    assert_raise(ArgumentError) {
 +      CGI::Cookie.new({'domain'=>'a-.example.com'}.merge(h))
 +    }
 +  end
 +
 +
   def test_cgi_cookie_scriptname
     cookie = CGI::Cookie.new('name1', 'value1')
     assert_equal('', cookie.path)
@@ -118,6 +136,70 @@ class CGICookieTest < Test::Unit::TestCase
   end
 +  def test_cgi_cookie_domain_injection_into_name
 +    name = "a=b; domain=example.com;"
 +    path = "/"
 +    domain = "example.jp"
 +    assert_raise(ArgumentError) do
 +      CGI::Cookie.new('name' => name,
 +                      'value' => "value",
 +                      'domain' => domain,
 +                      'path' => path)
 +    end
 +  end
 +
 +
 +  def test_cgi_cookie_newline_injection_into_name
 +    name = "a=b;\r\nLocation: http://example.com#"
 +    path = "/"
 +    domain = "example.jp"
 +    assert_raise(ArgumentError) do
 +      CGI::Cookie.new('name' => name,
 +                      'value' => "value",
 +                      'domain' => domain,
 +                      'path' => path)
 +    end
 +  end
 +
 +
 +  def test_cgi_cookie_multibyte_injection_into_name
 +    name = "a=b;\u3042"
 +    path = "/"
 +    domain = "example.jp"
 +    assert_raise(ArgumentError) do
 +      CGI::Cookie.new('name' => name,
 +                      'value' => "value",
 +                      'domain' => domain,
 +                      'path' => path)
 +    end
 +  end
 +
 +
 +  def test_cgi_cookie_injection_into_path
 +    name = "name"
 +    path = "/; samesite=none"
 +    domain = "example.jp"
 +    assert_raise(ArgumentError) do
 +      CGI::Cookie.new('name' => name,
 +                      'value' => "value",
 +                      'domain' => domain,
 +                      'path' => path)
 +    end
 +  end
 +
 +
 +  def test_cgi_cookie_injection_into_domain
 +    name = "name"
 +    path = "/"
 +    domain = "example.jp; samesite=none"
 +    assert_raise(ArgumentError) do
 +      CGI::Cookie.new('name' => name,
 +                      'value' => "value",
 +                      'domain' => domain,
 +                      'path' => path)
 +    end
 +  end
 +
   instance_methods.each do |method|
     private method if method =~ /^test_(.*)/ && $1 != ENV['TEST']
 diff --git a/test/cgi/test_cgi_header.rb b/test/cgi/test_cgi_header.rb
 index bab2d03..ec2f4de 100644
 --- a/test/cgi/test_cgi_header.rb
 +++ b/test/cgi/test_cgi_header.rb
@@ -176,6 +176,14 @@ class CGIHeaderTest < Test::Unit::TestCase
   end
 +  def test_cgi_http_header_crlf_injection
 +    cgi = CGI.new
 +    assert_raise(RuntimeError) { cgi.http_header("text/xhtml\r\nBOO") }
 +    assert_raise(RuntimeError) { cgi.http_header("type" => "text/xhtml\r\nBOO") }
 +    assert_raise(RuntimeError) { cgi.http_header("status" => "200 OK\r\nBOO") }
 +    assert_raise(RuntimeError) { cgi.http_header("location" => "text/xhtml\r\nBOO") }
 +  end
 +
   instance_methods.each do |method|
     private method if method =~ /^test_(.*)/ && $1 != ENV['TEST']
 -- 
 2.41.0
--- a/SOURCES/ruby-2.7.8-Fix-CVE-2023-28755-ReDos-vulnerability-in-URI.patch
+++ b/SOURCES/ruby-2.7.8-Fix-CVE-2023-28755-ReDos-vulnerability-in-URI.patch
@ -1,52 +0,0 @@
 From 61fb466ea0b492c990fcd2d681c08f2001d7a659 Mon Sep 17 00:00:00 2001
 From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
 Date: Tue, 28 Mar 2023 17:33:19 +0900
 Subject: [PATCH] Fix CVE-2023-28755 ReDos vulnerability in URI.
 This patch was backported from Ruby 2.7.8
 Backported from upstream Ruby, commit:
 https://github.com/ruby/ruby/commit/6855779d580358a6a0b4c9ee06f20e7cae72955a
 ===== Original commit message
 Merge URI-0.10.0.2
 ---
 lib/uri/rfc3986_parser.rb | 4 ++--
 test/uri/test_parser.rb   | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)
 diff --git a/lib/uri/rfc3986_parser.rb b/lib/uri/rfc3986_parser.rb
 index 8712800..ad32368 100644
 --- a/lib/uri/rfc3986_parser.rb
 +++ b/lib/uri/rfc3986_parser.rb
@@ -3,8 +3,8 @@ module URI
   class RFC3986_Parser # :nodoc:
     # URI defined in RFC3986
     # this regexp is modified not to host is not empty string
 -    RFC3986_URI = /\A(?<URI>(?<scheme>[A-Za-z][+\-.0-9A-Za-z]*):(?<hier-part>\/\/(?<authority>(?:(?<userinfo>(?:%\h\h|[!$&-.0-;=A-Z_a-z~])*)@)?(?<host>(?<IP-literal>\[(?:(?<IPv6address>(?:\h{1,4}:){6}(?<ls32>\h{1,4}:\h{1,4}|(?<IPv4address>(?<dec-octet>[1-9]\d|1\d{2}|2[0-4]\d|25[0-5]|\d)\.\g<dec-octet>\.\g<dec-octet>\.\g<dec-octet>))|::(?:\h{1,4}:){5}\g<ls32>|\h{1,4}?::(?:\h{1,4}:){4}\g<ls32>|(?:(?:\h{1,4}:)?\h{1,4})?::(?:\h{1,4}:){3}\g<ls32>|(?:(?:\h{1,4}:){,2}\h{1,4})?::(?:\h{1,4}:){2}\g<ls32>|(?:(?:\h{1,4}:){,3}\h{1,4})?::\h{1,4}:\g<ls32>|(?:(?:\h{1,4}:){,4}\h{1,4})?::\g<ls32>|(?:(?:\h{1,4}:){,5}\h{1,4})?::\h{1,4}|(?:(?:\h{1,4}:){,6}\h{1,4})?::)|(?<IPvFuture>v\h+\.[!$&-.0-;=A-Z_a-z~]+))\])|\g<IPv4address>|(?<reg-name>(?:%\h\h|[!$&-.0-9;=A-Z_a-z~])+))?(?::(?<port>\d*))?)(?<path-abempty>(?:\/(?<segment>(?:%\h\h|[!$&-.0-;=@-Z_a-z~])*))*)|(?<path-absolute>\/(?:(?<segment-nz>(?:%\h\h|[!$&-.0-;=@-Z_a-z~])+)(?:\/\g<segment>)*)?)|(?<path-rootless>\g<segment-nz>(?:\/\g<segment>)*)|(?<path-empty>))(?:\?(?<query>[^#]*))?(?:\#(?<fragment>(?:%\h\h|[!$&-.0-;=@-Z_a-z~\/?])*))?)\z/
 -    RFC3986_relative_ref = /\A(?<relative-ref>(?<relative-part>\/\/(?<authority>(?:(?<userinfo>(?:%\h\h|[!$&-.0-;=A-Z_a-z~])*)@)?(?<host>(?<IP-literal>\[(?<IPv6address>(?:\h{1,4}:){6}(?<ls32>\h{1,4}:\h{1,4}|(?<IPv4address>(?<dec-octet>[1-9]\d|1\d{2}|2[0-4]\d|25[0-5]|\d)\.\g<dec-octet>\.\g<dec-octet>\.\g<dec-octet>))|::(?:\h{1,4}:){5}\g<ls32>|\h{1,4}?::(?:\h{1,4}:){4}\g<ls32>|(?:(?:\h{1,4}:){,1}\h{1,4})?::(?:\h{1,4}:){3}\g<ls32>|(?:(?:\h{1,4}:){,2}\h{1,4})?::(?:\h{1,4}:){2}\g<ls32>|(?:(?:\h{1,4}:){,3}\h{1,4})?::\h{1,4}:\g<ls32>|(?:(?:\h{1,4}:){,4}\h{1,4})?::\g<ls32>|(?:(?:\h{1,4}:){,5}\h{1,4})?::\h{1,4}|(?:(?:\h{1,4}:){,6}\h{1,4})?::)|(?<IPvFuture>v\h+\.[!$&-.0-;=A-Z_a-z~]+)\])|\g<IPv4address>|(?<reg-name>(?:%\h\h|[!$&-.0-9;=A-Z_a-z~])+))?(?::(?<port>\d*))?)(?<path-abempty>(?:\/(?<segment>(?:%\h\h|[!$&-.0-;=@-Z_a-z~])*))*)|(?<path-absolute>\/(?:(?<segment-nz>(?:%\h\h|[!$&-.0-;=@-Z_a-z~])+)(?:\/\g<segment>)*)?)|(?<path-noscheme>(?<segment-nz-nc>(?:%\h\h|[!$&-.0-9;=@-Z_a-z~])+)(?:\/\g<segment>)*)|(?<path-empty>))(?:\?(?<query>[^#]*))?(?:\#(?<fragment>(?:%\h\h|[!$&-.0-;=@-Z_a-z~\/?])*))?)\z/
 +    RFC3986_URI = /\A(?<URI>(?<scheme>[A-Za-z][+\-.0-9A-Za-z]*+):(?<hier-part>\/\/(?<authority>(?:(?<userinfo>(?:%\h\h|[!$&-.0-;=A-Z_a-z~])*+)@)?(?<host>(?<IP-literal>\[(?:(?<IPv6address>(?:\h{1,4}:){6}(?<ls32>\h{1,4}:\h{1,4}|(?<IPv4address>(?<dec-octet>[1-9]\d|1\d{2}|2[0-4]\d|25[0-5]|\d)\.\g<dec-octet>\.\g<dec-octet>\.\g<dec-octet>))|::(?:\h{1,4}:){5}\g<ls32>|\h{1,4}?::(?:\h{1,4}:){4}\g<ls32>|(?:(?:\h{1,4}:)?\h{1,4})?::(?:\h{1,4}:){3}\g<ls32>|(?:(?:\h{1,4}:){,2}\h{1,4})?::(?:\h{1,4}:){2}\g<ls32>|(?:(?:\h{1,4}:){,3}\h{1,4})?::\h{1,4}:\g<ls32>|(?:(?:\h{1,4}:){,4}\h{1,4})?::\g<ls32>|(?:(?:\h{1,4}:){,5}\h{1,4})?::\h{1,4}|(?:(?:\h{1,4}:){,6}\h{1,4})?::)|(?<IPvFuture>v\h++\.[!$&-.0-;=A-Z_a-z~]++))\])|\g<IPv4address>|(?<reg-name>(?:%\h\h|[!$&-.0-9;=A-Z_a-z~])++))?(?::(?<port>\d*+))?)(?<path-abempty>(?:\/(?<segment>(?:%\h\h|[!$&-.0-;=@-Z_a-z~])*+))*+)|(?<path-absolute>\/(?:(?<segment-nz>(?:%\h\h|[!$&-.0-;=@-Z_a-z~])++)(?:\/\g<segment>)*+)?)|(?<path-rootless>\g<segment-nz>(?:\/\g<segment>)*+)|(?<path-empty>))(?:\?(?<query>[^#]*+))?(?:\#(?<fragment>(?:%\h\h|[!$&-.0-;=@-Z_a-z~\/?])*+))?)\z/
 +    RFC3986_relative_ref = /\A(?<relative-ref>(?<relative-part>\/\/(?<authority>(?:(?<userinfo>(?:%\h\h|[!$&-.0-;=A-Z_a-z~])*+)@)?(?<host>(?<IP-literal>\[(?:(?<IPv6address>(?:\h{1,4}:){6}(?<ls32>\h{1,4}:\h{1,4}|(?<IPv4address>(?<dec-octet>[1-9]\d|1\d{2}|2[0-4]\d|25[0-5]|\d)\.\g<dec-octet>\.\g<dec-octet>\.\g<dec-octet>))|::(?:\h{1,4}:){5}\g<ls32>|\h{1,4}?::(?:\h{1,4}:){4}\g<ls32>|(?:(?:\h{1,4}:){,1}\h{1,4})?::(?:\h{1,4}:){3}\g<ls32>|(?:(?:\h{1,4}:){,2}\h{1,4})?::(?:\h{1,4}:){2}\g<ls32>|(?:(?:\h{1,4}:){,3}\h{1,4})?::\h{1,4}:\g<ls32>|(?:(?:\h{1,4}:){,4}\h{1,4})?::\g<ls32>|(?:(?:\h{1,4}:){,5}\h{1,4})?::\h{1,4}|(?:(?:\h{1,4}:){,6}\h{1,4})?::)|(?<IPvFuture>v\h++\.[!$&-.0-;=A-Z_a-z~]++))\])|\g<IPv4address>|(?<reg-name>(?:%\h\h|[!$&-.0-9;=A-Z_a-z~])++))?(?::(?<port>\d*+))?)(?<path-abempty>(?:\/(?<segment>(?:%\h\h|[!$&-.0-;=@-Z_a-z~])*+))*+)|(?<path-absolute>\/(?:(?<segment-nz>(?:%\h\h|[!$&-.0-;=@-Z_a-z~])++)(?:\/\g<segment>)*+)?)|(?<path-noscheme>(?<segment-nz-nc>(?:%\h\h|[!$&-.0-9;=@-Z_a-z~])++)(?:\/\g<segment>)*+)|(?<path-empty>))(?:\?(?<query>[^#]*+))?(?:\#(?<fragment>(?:%\h\h|[!$&-.0-;=@-Z_a-z~\/?])*+))?)\z/
     attr_reader :regexp
     def initialize
 diff --git a/test/uri/test_parser.rb b/test/uri/test_parser.rb
 index 757ac86..2f70559 100644
 --- a/test/uri/test_parser.rb
 +++ b/test/uri/test_parser.rb
@@ -45,4 +45,11 @@ class URI::TestParser < Test::Unit::TestCase
       URI.parse(1)
     end
   end
 +
 +  def test_split
 +    assert_equal(["http", nil, "example.com", nil, nil, "", nil, nil, nil], URI.split("http://example.com"))
 +    assert_equal(["http", nil, "[0::0]", nil, nil, "", nil, nil, nil], URI.split("http://[0::0]"))
 +    assert_equal([nil, nil, "example.com", nil, nil, "", nil, nil, nil], URI.split("//example.com"))
 +    assert_equal([nil, nil, "[0::0]", nil, nil, "", nil, nil, nil], URI.split("//[0::0]"))
 +  end
 end
 -- 
 2.41.0
--- a/SOURCES/ruby-2.7.8-Fix-CVE-2023-28756-ReDoS-vulnerability-in-Time.patch
+++ b/SOURCES/ruby-2.7.8-Fix-CVE-2023-28756-ReDoS-vulnerability-in-Time.patch
@ -1,41 +0,0 @@
 From 71c37c29defeab2c98ad4291807efe12427a209f Mon Sep 17 00:00:00 2001
 From: Nobuyoshi Nakada <nobu@ruby-lang.org>
 Date: Tue, 29 Nov 2022 16:22:15 +0900
 Subject: [PATCH] Fix CVE-2023-28756 ReDoS vulnerability in Time.
 Backported from: Ruby 2.7.8
 Backported from the following commits:
 https://github.com/ruby/ruby/commit/2cb830602f52e7e76c6781115e7938b21f881c4f
 https://github.com/ruby/ruby/commit/e3f18f7d2e034f20053d7bf2fc7a50f8b7e1a27a
 Do not include the test case, as assert_linear_time was introduced in Ruby 2.7.
 ==== Original commit message(s)
 Fix quadratic backtracking on invalid time
 Make RFC2822 regexp linear
 https://hackerone.com/reports/1485501
 ---
 lib/time.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 diff --git a/lib/time.rb b/lib/time.rb
 index eb46a03..cb6f1e4 100644
 --- a/lib/time.rb
 +++ b/lib/time.rb
@@ -474,8 +474,8 @@ class Time
           (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s+
           (\d{2,})\s+
           (\d{2})\s*
 -          :\s*(\d{2})\s*
 -          (?::\s*(\d{2}))?\s+
 +          :\s*(\d{2})
 +          (?:\s*:\s*(\d\d))?\s+
           ([+-]\d{4}|
            UT|GMT|EST|EDT|CST|CDT|MST|MDT|PST|PDT|[A-IK-Z])/ix =~ date
         # Since RFC 2822 permit comments, the regexp has no right anchor.
 -- 
 2.41.0
--- a/SOURCES/ruby-3.0.0-Convert-ip-addresses-to-canonical-form.patch
+++ b/SOURCES/ruby-3.0.0-Convert-ip-addresses-to-canonical-form.patch
@ -1,26 +0,0 @@
 From 2becb920e431110c4afc4fa069b051c5940c2096 Mon Sep 17 00:00:00 2001
 From: Jeremy Evans <code@jeremyevans.net>
 Date: Fri, 29 May 2020 14:13:30 -0700
 Subject: [PATCH] Convert ip addresses to canonical form in
 Resolv::DNS::Requester::UnconnectedUDP#sender
 Otherwise, if the IP address given is not in canonical form, it
 won't match, and Resolv will ignore it.
 Fixes [Bug #16439]
 ---
 lib/resolv.rb | 1 +
 1 file changed, 1 insertion(+)
 diff --git a/lib/resolv.rb b/lib/resolv.rb
 index e7b45e785a85..d78531e174fd 100644
 --- a/lib/resolv.rb
 +++ b/lib/resolv.rb
@@ -774,6 +774,7 @@ def recv_reply(readable_socks)
         end
         def sender(msg, data, host, port=Port)
 +          host = Addrinfo.ip(host).ip_address
           lazy_initialize
           sock = @socks_hash[host.index(':') ? "::" : "0.0.0.0"]
           return nil if !sock
--- a/SOURCES/ruby-3.0.3-fiddle-1.0.8-Rely-on-hard-coded-lib-name-to-detect-glibc.patch
+++ b/SOURCES/ruby-3.0.3-fiddle-1.0.8-Rely-on-hard-coded-lib-name-to-detect-glibc.patch
@ -1,25 +0,0 @@
 From a267a40be7844224c5f000530bd3e8e906f1acea Mon Sep 17 00:00:00 2001
 From: Jeremy Evans <code@jeremyevans.net>
 Date: Wed, 10 Mar 2021 13:48:00 -0800
 Subject: [PATCH] Do not use a libdir for glibc, it breaks Linux PPC64 (#70)
 Fixes [Bug #12666]
 ---
 test/fiddle/helper.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 diff --git a/test/fiddle/helper.rb b/test/fiddle/helper.rb
 index f38f903..a6e2019 100644
 --- a/test/fiddle/helper.rb
 +++ b/test/fiddle/helper.rb
@@ -20,8 +20,8 @@
     # 64-bit ruby
     libdir = '/lib64' if File.directory? '/lib64'
   end
 -  libc_so = File.join(libdir, "libc.so.6")
 -  libm_so = File.join(libdir, "libm.so.6")
 +  libc_so = "libc.so.6"
 +  libm_so = "libm.so.6"
 when /mingw/, /mswin/
   require "rbconfig"
   crtname = RbConfig::CONFIG["RUBY_SO_NAME"][/msvc\w+/] || 'ucrtbase'
--- a/SOURCES/ruby-3.0.7-Fix-CVE-2023-36617-Upstreams-incomplete-fix-for-CVE-2023-28755.patch
+++ b/SOURCES/ruby-3.0.7-Fix-CVE-2023-36617-Upstreams-incomplete-fix-for-CVE-2023-28755.patch
@ -1,44 +0,0 @@
 From 5d08bbb0415c2ecc10037837b81e6a27d40ee7be Mon Sep 17 00:00:00 2001
 From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
 Date: Thu, 29 Jun 2023 22:25:17 +0900
 Subject: [PATCH] CVE-2023-36617 for Ruby 3.0 (#7997)
 * Merge URI-0.10.3
 ---
 Backport note, bundler is not distributed the same as RubyGems in Ruby
 2.5, therefore we do not use backport for Bundler.
 ---
 lib/uri/rfc2396_parser.rb |  4 ++--
 lib/uri/rfc3986_parser.rb |  2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 diff --git a/lib/uri/rfc2396_parser.rb b/lib/uri/rfc2396_parser.rb
 index b9e7b2b26e..c7c3ecd96d 100644
 --- a/lib/uri/rfc2396_parser.rb
 +++ b/lib/uri/rfc2396_parser.rb
@@ -502,8 +502,8 @@ def initialize_regexp(pattern)
       ret = {}
       # for URI::split
 -      ret[:ABS_URI] = Regexp.new('\A\s*' + pattern[:X_ABS_URI] + '\s*\z', Regexp::EXTENDED)
 -      ret[:REL_URI] = Regexp.new('\A\s*' + pattern[:X_REL_URI] + '\s*\z', Regexp::EXTENDED)
 +      ret[:ABS_URI] = Regexp.new('\A\s*+' + pattern[:X_ABS_URI] + '\s*\z', Regexp::EXTENDED)
 +      ret[:REL_URI] = Regexp.new('\A\s*+' + pattern[:X_REL_URI] + '\s*\z', Regexp::EXTENDED)
       # for URI::extract
       ret[:URI_REF]     = Regexp.new(pattern[:URI_REF])
 diff --git a/lib/uri/rfc3986_parser.rb b/lib/uri/rfc3986_parser.rb
 index ad32368cfa..1accd03376 100644
 --- a/lib/uri/rfc3986_parser.rb
 +++ b/lib/uri/rfc3986_parser.rb
@@ -106,7 +106,7 @@ def default_regexp # :nodoc:
         QUERY: /\A(?:%\h\h|[!$&-.0-;=@-Z_a-z~\/?])*\z/,
         FRAGMENT: /\A(?:%\h\h|[!$&-.0-;=@-Z_a-z~\/?])*\z/,
         OPAQUE: /\A(?:[^\/].*)?\z/,
 -        PORT: /\A[\x09\x0a\x0c\x0d ]*\d*[\x09\x0a\x0c\x0d ]*\z/,
 +        PORT: /\A[\x09\x0a\x0c\x0d ]*+\d*[\x09\x0a\x0c\x0d ]*\z/,
       }
     end
--- a/SOURCES/ruby-3.0.7-Fix-CVE-2024-27280-Buffer-overread-in-StringIO.patch
+++ b/SOURCES/ruby-3.0.7-Fix-CVE-2024-27280-Buffer-overread-in-StringIO.patch
@ -1,81 +0,0 @@
 From 740289bf02c9bea54f75b702f62862c62c62672b Mon Sep 17 00:00:00 2001
 From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
 Date: Thu, 21 Mar 2024 15:55:48 +0900
 Subject: [PATCH] Merge StringIO 3.0.1.1
 ---
 ext/stringio/stringio.c        |  2 +-
 test/stringio/test_stringio.rb | 27 ++++++++++++++++++++++-----
 2 files changed, 23 insertions(+), 6 deletions(-)
 diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c
 index f537054b5d..946ae06da4 100644
 --- a/ext/stringio/stringio.c
 +++ b/ext/stringio/stringio.c
@@ -833,7 +833,7 @@ strio_unget_bytes(struct StringIO *ptr, const char *cp, long cl)
     len = RSTRING_LEN(str);
     rest = pos - len;
     if (cl > pos) {
 -	long ex = (rest < 0 ? cl-pos : cl+rest);
 +	long ex = cl - (rest < 0 ? pos : len);
 	rb_str_modify_expand(str, ex);
 	rb_str_set_len(str, len + ex);
 	s = RSTRING_PTR(str);
 diff --git a/test/stringio/test_stringio.rb b/test/stringio/test_stringio.rb
 index f5169f641a..c055b901e3 100644
 --- a/test/stringio/test_stringio.rb
 +++ b/test/stringio/test_stringio.rb
@@ -693,6 +693,15 @@ def test_ungetc_padding
     assert_equal("b""\0""a", s.string)
   end
 +  def test_ungetc_fill
 +    count = 100
 +    s = StringIO.new
 +    s.print 'a' * count
 +    s.ungetc('b' * (count * 5))
 +    assert_equal((count * 5), s.string.size)
 +    assert_match(/\Ab+\z/, s.string)
 +  end
 +
   def test_ungetbyte_pos
     b = '\\b00010001 \\B00010001 \\b1 \\B1 \\b000100011'
     s = StringIO.new( b )
@@ -718,6 +727,15 @@ def test_ungetbyte_padding
     assert_equal("b""\0""a", s.string)
   end
 +  def test_ungetbyte_fill
 +    count = 100
 +    s = StringIO.new
 +    s.print 'a' * count
 +    s.ungetbyte('b' * (count * 5))
 +    assert_equal((count * 5), s.string.size)
 +    assert_match(/\Ab+\z/, s.string)
 +  end
 +
   def test_frozen
     s = StringIO.new
     s.freeze
@@ -760,18 +778,17 @@ def test_new_block_warning
   end
   def test_overflow
 -    skip if RbConfig::SIZEOF["void*"] > RbConfig::SIZEOF["long"]
 +    return if RbConfig::SIZEOF["void*"] > RbConfig::SIZEOF["long"]
     limit = (1 << (RbConfig::SIZEOF["void*"]*8-1)) - 0x10
     assert_separately(%w[-rstringio], "#{<<-"begin;"}\n#{<<-"end;"}")
     begin;
       limit = #{limit}
       ary = []
 -      while true
 +      begin
         x = "a"*0x100000
         break if [x].pack("p").unpack("i!")[0] < 0
         ary << x
 -        skip if ary.size > 100
 -      end
 +      end while ary.size <= 100
       s = StringIO.new(x)
       s.gets("xxx", limit)
       assert_equal(0x100000, s.pos)
--- a/SOURCES/ruby-3.0.7-Fix-CVE-2024-27281-RCE-vulnerability-with-rdoc_options.patch
+++ b/SOURCES/ruby-3.0.7-Fix-CVE-2024-27281-RCE-vulnerability-with-rdoc_options.patch
@ -1,203 +0,0 @@
 From 7957a25edf844c966de45848fa7e9e2513955660 Mon Sep 17 00:00:00 2001
 From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
 Date: Thu, 21 Mar 2024 15:47:40 +0900
 Subject: [PATCH 1/2] Merge RDoc-6.3.4.1
 ---
 lib/rdoc/rdoc.rb               |  3 ++-
 lib/rdoc/store.rb              | 45 ++++++++++++++++++++--------------
 test/rdoc/test_rdoc_options.rb |  6 ++---
 3 files changed, 31 insertions(+), 23 deletions(-)
 diff --git a/lib/rdoc/rdoc.rb b/lib/rdoc/rdoc.rb
 index a2711fbbd1..c5690fc3b4 100644
 --- a/lib/rdoc/rdoc.rb
 +++ b/lib/rdoc/rdoc.rb
@@ -162,8 +162,9 @@ def load_options
     RDoc.load_yaml
     begin
 -      options = YAML.load_file '.rdoc_options'
 +      options = YAML.safe_load_file '.rdoc_options', permitted_classes: [RDoc::Options, Symbol]
     rescue Psych::SyntaxError
 +      raise RDoc::Error, "#{options_file} is not a valid rdoc options file"
     end
     raise RDoc::Error, "#{options_file} is not a valid rdoc options file" unless
 diff --git a/lib/rdoc/store.rb b/lib/rdoc/store.rb
 index 999aa76f92..07d03e90f7 100644
 --- a/lib/rdoc/store.rb
 +++ b/lib/rdoc/store.rb
@@ -539,9 +539,7 @@ def load_all
   def load_cache
     #orig_enc = @encoding
 -    open cache_path, 'rb' do |io|
 -      @cache = Marshal.load io.read
 -    end
 +    @cache = marshal_load(cache_path)
     load_enc = @cache[:encoding]
@@ -596,9 +594,7 @@ def load_class klass_name
   def load_class_data klass_name
     file = class_file klass_name
 -    open file, 'rb' do |io|
 -      Marshal.load io.read
 -    end
 +    marshal_load(file)
   rescue Errno::ENOENT => e
     error = MissingFileError.new(self, file, klass_name)
     error.set_backtrace e.backtrace
@@ -611,14 +607,10 @@ def load_class_data klass_name
   def load_method klass_name, method_name
     file = method_file klass_name, method_name
 -    open file, 'rb' do |io|
 -      obj = Marshal.load io.read
 -      obj.store = self
 -      obj.parent =
 -        find_class_or_module(klass_name) || load_class(klass_name) unless
 -          obj.parent
 -      obj
 -    end
 +    obj = marshal_load(file)
 +    obj.store = self
 +    obj.parent ||= find_class_or_module(klass_name) || load_class(klass_name)
 +    obj
   rescue Errno::ENOENT => e
     error = MissingFileError.new(self, file, klass_name + method_name)
     error.set_backtrace e.backtrace
@@ -631,11 +623,9 @@ def load_method klass_name, method_name
   def load_page page_name
     file = page_file page_name
 -    open file, 'rb' do |io|
 -      obj = Marshal.load io.read
 -      obj.store = self
 -      obj
 -    end
 +    obj = marshal_load(file)
 +    obj.store = self
 +    obj
   rescue Errno::ENOENT => e
     error = MissingFileError.new(self, file, page_name)
     error.set_backtrace e.backtrace
@@ -965,4 +955,21 @@ def unique_modules
     @unique_modules
   end
 +  private
 +  def marshal_load(file)
 +    File.open(file, 'rb') {|io| Marshal.load(io, MarshalFilter)}
 +  end
 +
 +  MarshalFilter = proc do |obj|
 +    case obj
 +    when true, false, nil, Array, Class, Encoding, Hash, Integer, String, Symbol, RDoc::Text
 +    else
 +      unless obj.class.name.start_with?("RDoc::")
 +        raise TypeError, "not permitted class: #{obj.class.name}"
 +      end
 +    end
 +    obj
 +  end
 +  private_constant :MarshalFilter
 +
 end
 diff --git a/test/rdoc/test_rdoc_options.rb b/test/rdoc/test_rdoc_options.rb
 index 400ed9a549..247c7c87ce 100644
 --- a/test/rdoc/test_rdoc_options.rb
 +++ b/test/rdoc/test_rdoc_options.rb
@@ -145,7 +145,7 @@ def test_init_with_encoding
     @options.encoding = Encoding::IBM437
 -    options = YAML.load YAML.dump @options
 +    options = YAML.safe_load(YAML.dump(@options), permitted_classes: [RDoc::Options, Symbol])
     assert_equal Encoding::IBM437, options.encoding
   end
@@ -161,7 +161,7 @@ def test_init_with_trim_paths
 - /etc
     YAML
 -    options = YAML.load yaml
 +    options = YAML.safe_load(yaml, permitted_classes: [RDoc::Options, Symbol])
     assert_empty options.rdoc_include
     assert_empty options.static_path
@@ -729,7 +729,7 @@ def test_write_options
       assert File.exist? '.rdoc_options'
 -      assert_equal @options, YAML.load(File.read('.rdoc_options'))
 +      assert_equal @options, YAML.safe_load(File.read('.rdoc_options'), permitted_classes: [RDoc::Options, Symbol])
     end
   end
 From 153a4d16058783c923d0df5b1cbe2610ef96e3a8 Mon Sep 17 00:00:00 2001
 From: Jarek Prokop <jprokop@redhat.com>
 Date: Tue, 28 May 2024 16:56:26 +0200
 Subject: [PATCH 2/2] Port the rebase to work with Ruby 2.5.9.
 Ruby 2.5's Psych does not have safe_load_file method.
 However, from Ruby 3.3's sources, the method is just File.read
 simple wrapper with a safe_load call. Therefore it was copied over to
 the lib/rdoc/rdoc.rb file.
 ---
 lib/rdoc/rdoc.rb               | 9 ++++++-
 test/rdoc/test_rdoc_options.rb | 6 +++---
 2 files changed, 11 insertions(+), 4 deletions(-)
 diff --git a/lib/rdoc/rdoc.rb b/lib/rdoc/rdoc.rb
 index c5690fc3b4..435cd2eaf0 100644
 --- a/lib/rdoc/rdoc.rb
 +++ b/lib/rdoc/rdoc.rb
@@ -162,7 +162,12 @@ def load_options
     RDoc.load_yaml
     begin
 -      options = YAML.safe_load_file '.rdoc_options', permitted_classes: [RDoc::Options, Symbol]
 +      # Opening file inspired from Ruby 3.3.0 sources,
 +      # file 'ext/psych/lib/psych.rb', line 658.
 +      # https://github.com/ruby/ruby/blob/v3_3_0/ext/psych/lib/psych.rb#L658
 +      options = File.open('.rdoc_options', 'r:bom|utf-8') do |file|
 +        YAML.safe_load file, [RDoc::Options, Symbol], [], false, '.rdoc_options'
 +      end
     rescue Psych::SyntaxError
       raise RDoc::Error, "#{options_file} is not a valid rdoc options file"
     end
 diff --git a/test/rdoc/test_rdoc_options.rb b/test/rdoc/test_rdoc_options.rb
 index 247c7c87ce..60fe035dce 100644
 --- a/test/rdoc/test_rdoc_options.rb
 +++ b/test/rdoc/test_rdoc_options.rb
@@ -145,7 +145,7 @@ def test_init_with_encoding
     @options.encoding = Encoding::IBM437
 -    options = YAML.safe_load(YAML.dump(@options), permitted_classes: [RDoc::Options, Symbol])
 +    options = YAML.safe_load(YAML.dump(@options), [RDoc::Options, Symbol])
     assert_equal Encoding::IBM437, options.encoding
   end
@@ -161,7 +161,7 @@ def test_init_with_trim_paths
 - /etc
     YAML
 -    options = YAML.safe_load(yaml, permitted_classes: [RDoc::Options, Symbol])
 +    options = YAML.safe_load(yaml, [RDoc::Options, Symbol])
     assert_empty options.rdoc_include
     assert_empty options.static_path
@@ -729,7 +729,7 @@ def test_write_options
       assert File.exist? '.rdoc_options'
 -      assert_equal @options, YAML.safe_load(File.read('.rdoc_options'), permitted_classes: [RDoc::Options, Symbol])
 +      assert_equal @options, YAML.safe_load(File.read('.rdoc_options'), [RDoc::Options, Symbol])
     end
   end
--- a/SOURCES/ruby-3.0.7-Fix-CVE-2024-27282-Memory-address-read-with-Regex.patch
+++ b/SOURCES/ruby-3.0.7-Fix-CVE-2024-27282-Memory-address-read-with-Regex.patch
@ -1,48 +0,0 @@
 From 9eda3000e3efd5bdd4ed60d07e2f43633e39d361 Mon Sep 17 00:00:00 2001
 From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
 Date: Tue, 23 Apr 2024 19:22:22 +0900
 Subject: [PATCH] merge revision(s) 33e5b47c16f1fd3382186e6ffe73cfc6e00946f7:
 	Fix handling of reg->dmin in Regex matching
 	---
 	 regexec.c | 10 ++++++++++
 	 1 file changed, 10 insertions(+)
 ---
 regexec.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
 diff --git a/regexec.c b/regexec.c
 index 4582c35c3f..36ac1d4bc5 100644
 --- a/regexec.c
 +++ b/regexec.c
@@ -3900,12 +3900,17 @@ forward_search_range(regex_t* reg, const UChar* str, const UChar* end, UChar* s,
 		     UChar* range, UChar** low, UChar** high, UChar** low_prev)
 {
   UChar *p, *pprev = (UChar* )NULL;
 +  size_t input_len = end - str;
 #ifdef ONIG_DEBUG_SEARCH
   fprintf(stderr, "forward_search_range: str: %"PRIuPTR" (%p), end: %"PRIuPTR" (%p), s: %"PRIuPTR" (%p), range: %"PRIuPTR" (%p)\n",
 	  (uintptr_t )str, str, (uintptr_t )end, end, (uintptr_t )s, s, (uintptr_t )range, range);
 #endif
 +  if (reg->dmin > input_len) {
 +    return 0;
 +  }
 +
   p = s;
   if (reg->dmin > 0) {
     if (ONIGENC_IS_SINGLEBYTE(reg->enc)) {
@@ -4042,6 +4047,11 @@ backward_search_range(regex_t* reg, const UChar* str, const UChar* end,
 		      UChar** low, UChar** high)
 {
   UChar *p;
 +  size_t input_len = end - str;
 +
 +  if (reg->dmin > input_len) {
 +    return 0;
 +  }
   range += reg->dmin;
   p = s;
--- a/SOURCES/ruby-3.4.0-ruby-net-http-Renew-test-certificates.patch
+++ b/SOURCES/ruby-3.4.0-ruby-net-http-Renew-test-certificates.patch
@ -1,236 +0,0 @@
 From d3933fc753187a055a4904af82f5f3794c88c416 Mon Sep 17 00:00:00 2001
 From: Sorah Fukumori <her@sorah.jp>
 Date: Mon, 1 Jan 2024 20:45:54 +0900
 Subject: [PATCH] [ruby/net-http] Renew test certificates
 The private key is replaced with a public known test key published at
 [RFC 9500].
 Also lifetime has been extended to 10 years from 4 years.
 [RFC 9500]: https://www.rfc-editor.org/rfc/rfc9500.html
 https://github.com/ruby/net-http/commit/4ab6c4a500
 ---
 test/net/fixtures/cacert.pem | 44 ++++++++--------
 test/net/fixtures/server.crt | 99 +++++++-----------------------------
 test/net/fixtures/server.key | 55 ++++++++++----------
 4 files changed, 68 insertions(+), 130 deletions(-)
 diff --git a/test/net/fixtures/cacert.pem b/test/net/fixtures/cacert.pem
 index f623bd62ed375..24c83f1c65225 100644
 --- a/test/net/fixtures/cacert.pem
 +++ b/test/net/fixtures/cacert.pem
@@ -1,24 +1,24 @@
 -----BEGIN CERTIFICATE-----
 -MIID7TCCAtWgAwIBAgIJAIltvxrFAuSnMA0GCSqGSIb3DQEBCwUAMIGMMQswCQYD
 -VQQGEwJKUDEQMA4GA1UECAwHU2hpbWFuZTEUMBIGA1UEBwwLTWF0ei1lIGNpdHkx
 -FzAVBgNVBAoMDlJ1YnkgQ29yZSBUZWFtMRUwEwYDVQQDDAxSdWJ5IFRlc3QgQ0Ex
 -JTAjBgkqhkiG9w0BCQEWFnNlY3VyaXR5QHJ1YnktbGFuZy5vcmcwHhcNMTkwMTAy
 -MDI1ODI4WhcNMjQwMTAxMDI1ODI4WjCBjDELMAkGA1UEBhMCSlAxEDAOBgNVBAgM
 -B1NoaW1hbmUxFDASBgNVBAcMC01hdHotZSBjaXR5MRcwFQYDVQQKDA5SdWJ5IENv
 -cmUgVGVhbTEVMBMGA1UEAwwMUnVieSBUZXN0IENBMSUwIwYJKoZIhvcNAQkBFhZz
 -ZWN1cml0eUBydWJ5LWxhbmcub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
 -CgKCAQEAznlbjRVhz1NlutHVrhcGnK8W0qug2ujKXv1njSC4U6nJF6py7I9EeehV
 -SaKePyv+I9z3K1LnfUHOtUbdwdKC77yN66A6q2aqzu5q09/NSykcZGOIF0GuItYI
 -3nvW3IqBddff2ffsyR+9pBjfb5AIPP08WowF9q4s1eGULwZc4w2B8PFhtxYANd7d
 -BvGLXFlcufv9tDtzyRi4t7eqxCRJkZQIZNZ6DHHIJrNxejOILfHLarI12yk8VK6L
 -2LG4WgGqyeePiRyd1o1MbuiAFYqAwpXNUbRKg5NaZGwBHZk8UZ+uFKt1QMBURO5R
 -WFy1c349jbWszTqFyL4Lnbg9HhAowQIDAQABo1AwTjAdBgNVHQ4EFgQU9tEiKdU9
 -I9derQyc5nWPnc34nVMwHwYDVR0jBBgwFoAU9tEiKdU9I9derQyc5nWPnc34nVMw
 -DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAxj7F/u3C3fgq24N7hGRA
 -of7ClFQxGmo/IGT0AISzW3HiVYiFaikKhbO1NwD9aBpD8Zwe62sCqMh8jGV/b0+q
 -aOORnWYNy2R6r9FkASAglmdF6xn3bhgGD5ls4pCvcG9FynGnGc24g6MrjFNrBYUS
 -2iIZsg36i0IJswo/Dy6HLphCms2BMCD3DeWtfjePUiTmQHJo6HsQIKP/u4N4Fvee
 -uMBInei2M4VU74fLXbmKl1F9AEX7JDP3BKSZG19Ch5pnUo4uXM1uNTGsi07P4Y0s
 -K44+SKBC0bYEFbDK0eQWMrX3kIhkPxyIWhxdq9/NqPYjShuSEAhA6CSpmRg0pqc+
 -mA==
 +MIID+zCCAuOgAwIBAgIUGMvHl3EhtKPKcgc3NQSAYfFuC+8wDQYJKoZIhvcNAQEL
 +BQAwgYwxCzAJBgNVBAYTAkpQMRAwDgYDVQQIDAdTaGltYW5lMRQwEgYDVQQHDAtN
 +YXR6LWUgY2l0eTEXMBUGA1UECgwOUnVieSBDb3JlIFRlYW0xFTATBgNVBAMMDFJ1
 +YnkgVGVzdCBDQTElMCMGCSqGSIb3DQEJARYWc2VjdXJpdHlAcnVieS1sYW5nLm9y
 +ZzAeFw0yNDAxMDExMTQ3MjNaFw0zMzEyMjkxMTQ3MjNaMIGMMQswCQYDVQQGEwJK
 +UDEQMA4GA1UECAwHU2hpbWFuZTEUMBIGA1UEBwwLTWF0ei1lIGNpdHkxFzAVBgNV
 +BAoMDlJ1YnkgQ29yZSBUZWFtMRUwEwYDVQQDDAxSdWJ5IFRlc3QgQ0ExJTAjBgkq
 +hkiG9w0BCQEWFnNlY3VyaXR5QHJ1YnktbGFuZy5vcmcwggEiMA0GCSqGSIb3DQEB
 +AQUAA4IBDwAwggEKAoIBAQCw+egZQ6eumJKq3hfKfED4dE/tL4FI5sjqont9ABVI
 ++1GSqyi1bFBgsRjM0THllIdMbKmJtWwnKW8J+5OgNN8y6Xxv8JmM/Y5vQt2lis0f
 +qXmG8UTz0VTWdlAXXmhUs6lSADvAaIe4RVrCsZ97L3ZQTryY7JRVcbB4khUN3Gp0
 +yg+801SXzoFTTa+UGIRLE66jH51aa5VXu99hnv1OiH8tQrjdi8mH6uG/icq4XuIe
 +NWMF32wHqIOOPvQcWV3M5D2vxJEj702Ku6k9OQXkAo17qRSEonWW4HtLbtmS8He1
 +JNPc/n3dVUm+fM6NoDXPoLP7j55G9zKyqGtGAWXAj1MTAgMBAAGjUzBRMB0GA1Ud
 +DgQWBBSJGVleDvFp9cu9R+E0/OKYzGkwkTAfBgNVHSMEGDAWgBSJGVleDvFp9cu9
 +R+E0/OKYzGkwkTAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBl
 +8GLB8skAWlkSw/FwbUmEV3zyqu+p7PNP5YIYoZs0D74e7yVulGQ6PKMZH5hrZmHo
 +orFSQU+VUUirG8nDGj7Rzce8WeWBxsaDGC8CE2dq6nC6LuUwtbdMnBrH0LRWAz48
 +jGFF3jHtVz8VsGfoZTZCjukWqNXvU6hETT9GsfU+PZqbqcTVRPH52+XgYayKdIbD
 +r97RM4X3+aXBHcUW0b76eyyi65RR/Xtvn8ioZt2AdX7T2tZzJyXJN3Hupp77s6Ui
 +AZR35SToHCZeTZD12YBvLBdaTPLZN7O/Q/aAO9ZiJaZ7SbFOjz813B2hxXab4Fob
 +2uJX6eMWTVxYK5D4M9lm
 -----END CERTIFICATE-----
 diff --git a/test/net/fixtures/server.crt b/test/net/fixtures/server.crt
 index 5ca78a6d146a0..5d2923795dabc 100644
 --- a/test/net/fixtures/server.crt
 +++ b/test/net/fixtures/server.crt
@@ -1,82 +1,21 @@
 -Certificate:
 -    Data:
 -        Version: 3 (0x2)
 -        Serial Number: 2 (0x2)
 -    Signature Algorithm: sha256WithRSAEncryption
 -        Issuer: C=JP, ST=Shimane, L=Matz-e city, O=Ruby Core Team, CN=Ruby Test CA/emailAddress=security@ruby-lang.org
 -        Validity
 -            Not Before: Jan  2 03:27:13 2019 GMT
 -            Not After : Jan  1 03:27:13 2024 GMT
 -        Subject: C=JP, ST=Shimane, O=Ruby Core Team, OU=Ruby Test, CN=localhost
 -        Subject Public Key Info:
 -            Public Key Algorithm: rsaEncryption
 -                Public-Key: (2048 bit)
 -                Modulus:
 -                    00:e8:da:9c:01:2e:2b:10:ec:49:cd:5e:07:13:07:
 -                    9c:70:9e:c6:74:bc:13:c2:e1:6f:c6:82:fd:e3:48:
 -                    e0:2c:a5:68:c7:9e:42:de:60:54:65:e6:6a:14:57:
 -                    7a:30:d0:cc:b5:b6:d9:c3:d2:df:c9:25:97:54:67:
 -                    cf:f6:be:5e:cb:8b:ee:03:c5:e1:e2:f9:e7:f7:d1:
 -                    0c:47:f0:b8:da:33:5a:ad:41:ad:e7:b5:a2:7b:b7:
 -                    bf:30:da:60:f8:e3:54:a2:bc:3a:fd:1b:74:d9:dc:
 -                    74:42:e9:29:be:df:ac:b4:4f:eb:32:f4:06:f1:e1:
 -                    8c:4b:a8:8b:fb:29:e7:b1:bf:1d:01:ee:73:0f:f9:
 -                    40:dc:d5:15:79:d9:c6:73:d0:c0:dd:cb:e4:da:19:
 -                    47:80:c6:14:04:72:fd:9a:7c:8f:11:82:76:49:04:
 -                    79:cc:f2:5c:31:22:95:13:3e:5d:40:a6:4d:e0:a3:
 -                    02:26:7d:52:3b:bb:ed:65:a1:0f:ed:6b:b0:3c:d4:
 -                    de:61:15:5e:d3:dd:68:09:9f:4a:57:a5:c2:a9:6d:
 -                    86:92:c5:f4:a4:d4:b7:13:3b:52:63:24:05:e2:cc:
 -                    e3:8a:3c:d4:35:34:2b:10:bb:58:72:e7:e1:8d:1d:
 -                    74:8c:61:16:20:3d:d0:1c:4e:8f:6e:fd:fe:64:10:
 -                    4f:41
 -                Exponent: 65537 (0x10001)
 -        X509v3 extensions:
 -            X509v3 Basic Constraints: 
 -                CA:FALSE
 -            Netscape Comment: 
 -                OpenSSL Generated Certificate
 -            X509v3 Subject Key Identifier: 
 -                ED:28:C2:7E:AB:4B:C8:E8:FE:55:6D:66:95:31:1C:2D:60:F9:02:36
 -            X509v3 Authority Key Identifier: 
 -                keyid:F6:D1:22:29:D5:3D:23:D7:5E:AD:0C:9C:E6:75:8F:9D:CD:F8:9D:53
 -
 -    Signature Algorithm: sha256WithRSAEncryption
 -         1d:b8:c5:8b:72:41:20:65:ad:27:6f:15:63:06:26:12:8d:9c:
 -         ad:ca:f4:db:97:b4:90:cb:ff:35:94:bb:2a:a7:a1:ab:1e:35:
 -         2d:a5:3f:c9:24:b0:1a:58:89:75:3e:81:0a:2c:4f:98:f9:51:
 -         fb:c0:a3:09:d0:0a:9b:e7:a2:b7:c3:60:40:c8:f4:6d:b2:6a:
 -         56:12:17:4c:00:24:31:df:9c:60:ae:b1:68:54:a9:e6:b5:4a:
 -         04:e6:92:05:86:d9:5a:dc:96:30:a5:58:de:14:99:0f:e5:15:
 -         89:3e:9b:eb:80:e3:bd:83:c3:ea:33:35:4b:3e:2f:d3:0d:64:
 -         93:67:7f:8d:f5:3f:0c:27:bc:37:5a:cc:d6:47:16:af:5a:62:
 -         d2:da:51:f8:74:06:6b:24:ad:28:68:08:98:37:7d:ed:0e:ab:
 -         1e:82:61:05:d0:ba:75:a0:ab:21:b0:9a:fd:2b:54:86:1d:0d:
 -         1f:c2:d4:77:1f:72:26:5e:ad:8a:9f:09:36:6d:44:be:74:c2:
 -         5a:3e:ff:5c:9d:75:d6:38:7b:c5:39:f9:44:6e:a1:d1:8e:ff:
 -         63:db:c4:bb:c6:91:92:ca:5c:60:9b:1d:eb:0a:de:08:ee:bf:
 -         da:76:03:65:62:29:8b:f8:7f:c7:86:73:1e:f6:1f:2d:89:69:
 -         fd:be:bd:6e
 -----BEGIN CERTIFICATE-----
 -MIID4zCCAsugAwIBAgIBAjANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UEBhMCSlAx
 -EDAOBgNVBAgMB1NoaW1hbmUxFDASBgNVBAcMC01hdHotZSBjaXR5MRcwFQYDVQQK
 -DA5SdWJ5IENvcmUgVGVhbTEVMBMGA1UEAwwMUnVieSBUZXN0IENBMSUwIwYJKoZI
 -hvcNAQkBFhZzZWN1cml0eUBydWJ5LWxhbmcub3JnMB4XDTE5MDEwMjAzMjcxM1oX
 -DTI0MDEwMTAzMjcxM1owYDELMAkGA1UEBhMCSlAxEDAOBgNVBAgMB1NoaW1hbmUx
 -FzAVBgNVBAoMDlJ1YnkgQ29yZSBUZWFtMRIwEAYDVQQLDAlSdWJ5IFRlc3QxEjAQ
 -BgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
 -AOjanAEuKxDsSc1eBxMHnHCexnS8E8Lhb8aC/eNI4CylaMeeQt5gVGXmahRXejDQ
 -zLW22cPS38kll1Rnz/a+XsuL7gPF4eL55/fRDEfwuNozWq1Bree1onu3vzDaYPjj
 -VKK8Ov0bdNncdELpKb7frLRP6zL0BvHhjEuoi/sp57G/HQHucw/5QNzVFXnZxnPQ
 -wN3L5NoZR4DGFARy/Zp8jxGCdkkEeczyXDEilRM+XUCmTeCjAiZ9Uju77WWhD+1r
 -sDzU3mEVXtPdaAmfSlelwqlthpLF9KTUtxM7UmMkBeLM44o81DU0KxC7WHLn4Y0d
 -dIxhFiA90BxOj279/mQQT0ECAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhC
 -AQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFO0o
 -wn6rS8jo/lVtZpUxHC1g+QI2MB8GA1UdIwQYMBaAFPbRIinVPSPXXq0MnOZ1j53N
 -+J1TMA0GCSqGSIb3DQEBCwUAA4IBAQAduMWLckEgZa0nbxVjBiYSjZytyvTbl7SQ
 -y/81lLsqp6GrHjUtpT/JJLAaWIl1PoEKLE+Y+VH7wKMJ0Aqb56K3w2BAyPRtsmpW
 -EhdMACQx35xgrrFoVKnmtUoE5pIFhtla3JYwpVjeFJkP5RWJPpvrgOO9g8PqMzVL
 -Pi/TDWSTZ3+N9T8MJ7w3WszWRxavWmLS2lH4dAZrJK0oaAiYN33tDqsegmEF0Lp1
 -oKshsJr9K1SGHQ0fwtR3H3ImXq2Knwk2bUS+dMJaPv9cnXXWOHvFOflEbqHRjv9j
 -28S7xpGSylxgmx3rCt4I7r/adgNlYimL+H/HhnMe9h8tiWn9vr1u
 +MIIDYTCCAkkCAQAwDQYJKoZIhvcNAQELBQAwgYwxCzAJBgNVBAYTAkpQMRAwDgYD
 +VQQIDAdTaGltYW5lMRQwEgYDVQQHDAtNYXR6LWUgY2l0eTEXMBUGA1UECgwOUnVi
 +eSBDb3JlIFRlYW0xFTATBgNVBAMMDFJ1YnkgVGVzdCBDQTElMCMGCSqGSIb3DQEJ
 +ARYWc2VjdXJpdHlAcnVieS1sYW5nLm9yZzAeFw0yNDAxMDExMTQ3MjNaFw0zMzEy
 +MjkxMTQ3MjNaMGAxCzAJBgNVBAYTAkpQMRAwDgYDVQQIDAdTaGltYW5lMRcwFQYD
 +VQQKDA5SdWJ5IENvcmUgVGVhbTESMBAGA1UECwwJUnVieSBUZXN0MRIwEAYDVQQD
 +DAlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCw+egZ
 +Q6eumJKq3hfKfED4dE/tL4FI5sjqont9ABVI+1GSqyi1bFBgsRjM0THllIdMbKmJ
 +tWwnKW8J+5OgNN8y6Xxv8JmM/Y5vQt2lis0fqXmG8UTz0VTWdlAXXmhUs6lSADvA
 +aIe4RVrCsZ97L3ZQTryY7JRVcbB4khUN3Gp0yg+801SXzoFTTa+UGIRLE66jH51a
 +a5VXu99hnv1OiH8tQrjdi8mH6uG/icq4XuIeNWMF32wHqIOOPvQcWV3M5D2vxJEj
 +702Ku6k9OQXkAo17qRSEonWW4HtLbtmS8He1JNPc/n3dVUm+fM6NoDXPoLP7j55G
 +9zKyqGtGAWXAj1MTAgMBAAEwDQYJKoZIhvcNAQELBQADggEBACtGNdj5TEtnJBYp
 +M+LhBeU3oNteldfycEm993gJp6ghWZFg23oX8fVmyEeJr/3Ca9bAgDqg0t9a0npN
 +oWKEY6wVKqcHgu3gSvThF5c9KhGbeDDmlTSVVNQmXWX0K2d4lS2cwZHH8mCm2mrY
 +PDqlEkSc7k4qSiqigdS8i80Yk+lDXWsm8CjsiC93qaRM7DnS0WPQR0c16S95oM6G
 +VklFKUSDAuFjw9aVWA/nahOucjn0w5fVW6lyIlkBslC1ChlaDgJmvhz+Ol3iMsE0
 +kAmFNu2KKPVrpMWaBID49QwQTDyhetNLaVVFM88iUdA9JDoVMEuP1mm39JqyzHTu
 +uBrdP4Q=
 -----END CERTIFICATE-----
 diff --git a/test/net/fixtures/server.key b/test/net/fixtures/server.key
 index 7f2380e71e637..6a83d5bcf4a52 100644
 --- a/test/net/fixtures/server.key
 +++ b/test/net/fixtures/server.key
@@ -1,28 +1,27 @@
 ------BEGIN PRIVATE KEY-----
 -MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDo2pwBLisQ7EnN
 -XgcTB5xwnsZ0vBPC4W/Ggv3jSOAspWjHnkLeYFRl5moUV3ow0My1ttnD0t/JJZdU
 -Z8/2vl7Li+4DxeHi+ef30QxH8LjaM1qtQa3ntaJ7t78w2mD441SivDr9G3TZ3HRC
 -6Sm+36y0T+sy9Abx4YxLqIv7Keexvx0B7nMP+UDc1RV52cZz0MDdy+TaGUeAxhQE
 -cv2afI8RgnZJBHnM8lwxIpUTPl1Apk3gowImfVI7u+1loQ/ta7A81N5hFV7T3WgJ
 -n0pXpcKpbYaSxfSk1LcTO1JjJAXizOOKPNQ1NCsQu1hy5+GNHXSMYRYgPdAcTo9u
 -/f5kEE9BAgMBAAECggEBAOHkwhc7DLh8IhTDNSW26oMu5OP2WU1jmiYAigDmf+OQ
 -DBgrZj+JQBci8qINQxL8XLukSZn5hvQCLc7Kbyu1/wyEEUFDxSGGwwzclodr9kho
 -LX2LDASPZrOSzD2+fPi2wTKmXKuS6Uc44OjQfZkYMNkz9r4Vkm8xGgOD3VipjIYX
 -QXlhhdqkXZcNABsihCV52GKkDFSVm8jv95YJc5xhoYCy/3a4/qPdF0aT2R7oYUej
 -hKrxVDskyooe8Zg/JTydZNV5GQEDmW01/K3r6XGT26oPi1AqMU1gtv/jkW56CRQQ
 -1got8smnqM+AV7Slf9R6DauIPdQJ2S8wsr/o8ISBsOECgYEA9YrqEP2gAYSGFXRt
 -liw0WI2Ant8BqXS6yvq1jLo/qWhLw/ph4Di73OQ2mpycVTpgfGr2wFPQR1XJ+0Fd
 -U+Ir/C3Q7FK4VIGHK7B0zNvZr5tEjlFfeRezo2JMVw5YWeSagIFcSwK+KqCTH9qc
 -pw/Eb8nB/4XNcpTZu7Fg0Wc+ooUCgYEA8sVaicn1Wxkpb45a4qfrA6wOr5xdJ4cC
 -A5qs7vjX2OdPIQOmoQhdI7bCWFXZzF33wA4YCws6j5wRaySLIJqdms8Gl9QnODy1
 -ZlA5gwKToBC/jqPmWAXSKb8EH7cHilaxU9OKnQ7CfwlGLHqjMtjrhR7KHlt3CVRs
 -oRmvsjZVXI0CgYAmPedslAO6mMhFSSfULrhMXmV82OCqYrrA6EEkVNGbcdnzAOkD
 -gfKIWabDd8bFY10po4Mguy0CHzNhBXIioWQWV5BlbhC1YKMLw+S9DzSdLAKGY9gJ
 -xQ4+UQ3wtRQ/k+IYR413RUsW2oFvgZ3KSyNeAb9MK6uuv84VdG/OzVSs/QKBgQDn
 -kap//l2EbObiWyaERunckdVcW0lcN+KK75J/TGwPoOwQsLvTpPe65kxRGGrtDsEQ
 -uCDk/+v3KkZPLgdrrTAih9FhJ+PVN8tMcb+6IM4SA4fFFr/UPJEwct0LJ3oQ0grJ
 -y+HPWFHb/Uurh7t99/4H98uR02sjQh1wOeEmm78mzQKBgQDm+LzGH0se6CXQ6cdZ
 -g1JRZeXkDEsrW3hfAsW62xJQmXcWxBoblP9OamMY+A06rM5og3JbDk5Zm6JsOaA8
 -wS2gw4ilp46jors4eQey8ux7kB9LzdBoDBBElnsbjLO8oBNZlVcYXg+6BOl/CUi7
 -2whRF0FEjKA8ehrNhAq+VFfFNw==
 ------END PRIVATE KEY-----
 +-----BEGIN RSA PRIVATE KEY-----
 +MIIEowIBAAKCAQEAsPnoGUOnrpiSqt4XynxA+HRP7S+BSObI6qJ7fQAVSPtRkqso
 +tWxQYLEYzNEx5ZSHTGypibVsJylvCfuToDTfMul8b/CZjP2Ob0LdpYrNH6l5hvFE
 +89FU1nZQF15oVLOpUgA7wGiHuEVawrGfey92UE68mOyUVXGweJIVDdxqdMoPvNNU
 +l86BU02vlBiESxOuox+dWmuVV7vfYZ79Toh/LUK43YvJh+rhv4nKuF7iHjVjBd9s
 +B6iDjj70HFldzOQ9r8SRI+9NirupPTkF5AKNe6kUhKJ1luB7S27ZkvB3tSTT3P59
 +3VVJvnzOjaA1z6Cz+4+eRvcysqhrRgFlwI9TEwIDAQABAoIBAEEYiyDP29vCzx/+
 +dS3LqnI5BjUuJhXUnc6AWX/PCgVAO+8A+gZRgvct7PtZb0sM6P9ZcLrweomlGezI
 +FrL0/6xQaa8bBr/ve/a8155OgcjFo6fZEw3Dz7ra5fbSiPmu4/b/kvrg+Br1l77J
 +aun6uUAs1f5B9wW+vbR7tzbT/mxaUeDiBzKpe15GwcvbJtdIVMa2YErtRjc1/5B2
 +BGVXyvlJv0SIlcIEMsHgnAFOp1ZgQ08aDzvilLq8XVMOahAhP1O2A3X8hKdXPyrx
 +IVWE9bS9ptTo+eF6eNl+d7htpKGEZHUxinoQpWEBTv+iOoHsVunkEJ3vjLP3lyI/
 +fY0NQ1ECgYEA3RBXAjgvIys2gfU3keImF8e/TprLge1I2vbWmV2j6rZCg5r/AS0u
 +pii5CvJ5/T5vfJPNgPBy8B/yRDs+6PJO1GmnlhOkG9JAIPkv0RBZvR0PMBtbp6nT
 +Y3yo1lwamBVBfY6rc0sLTzosZh2aGoLzrHNMQFMGaauORzBFpY5lU50CgYEAzPHl
 +u5DI6Xgep1vr8QvCUuEesCOgJg8Yh1UqVoY/SmQh6MYAv1I9bLGwrb3WW/7kqIoD
 +fj0aQV5buVZI2loMomtU9KY5SFIsPV+JuUpy7/+VE01ZQM5FdY8wiYCQiVZYju9X
 +Wz5LxMNoz+gT7pwlLCsC4N+R8aoBk404aF1gum8CgYAJ7VTq7Zj4TFV7Soa/T1eE
 +k9y8a+kdoYk3BASpCHJ29M5R2KEA7YV9wrBklHTz8VzSTFTbKHEQ5W5csAhoL5Fo
 +qoHzFFi3Qx7MHESQb9qHyolHEMNx6QdsHUn7rlEnaTTyrXh3ifQtD6C0yTmFXUIS
 +CW9wKApOrnyKJ9nI0HcuZQKBgQCMtoV6e9VGX4AEfpuHvAAnMYQFgeBiYTkBKltQ
 +XwozhH63uMMomUmtSG87Sz1TmrXadjAhy8gsG6I0pWaN7QgBuFnzQ/HOkwTm+qKw
 +AsrZt4zeXNwsH7QXHEJCFnCmqw9QzEoZTrNtHJHpNboBuVnYcoueZEJrP8OnUG3r
 +UjmopwKBgAqB2KYYMUqAOvYcBnEfLDmyZv9BTVNHbR2lKkMYqv5LlvDaBxVfilE0
 +2riO4p6BaAdvzXjKeRrGNEKoHNBpOSfYCOM16NjL8hIZB1CaV3WbT5oY+jp7Mzd5
 +7d56RZOE+ERK2uz/7JX9VSsM/LbH9pJibd4e8mikDS9ntciqOH/3
 +-----END RSA PRIVATE KEY-----
--- a/SOURCES/rubygem-cgi-0.3.6-Loosen-the-domain-regex-to-accept-dot.patch
+++ b/SOURCES/rubygem-cgi-0.3.6-Loosen-the-domain-regex-to-accept-dot.patch
@ -1,41 +0,0 @@
 From 5e09d632f3b56d85b2659ab47d5571ae9e270e10 Mon Sep 17 00:00:00 2001
 From: Xenor Chang <tubaxenor@gmail.com>
 Date: Mon, 28 Nov 2022 12:34:06 +0800
 Subject: [PATCH] Loosen the domain regex to accept '.' (#29)
 * Loosen the domain regex to accept '.'
 Co-authored-by: Nobuyoshi Nakada <nobu@ruby-lang.org>
 Co-authored-by: Hiroshi SHIBATA <hsbt@ruby-lang.org>
 ---
 lib/cgi/cookie.rb           | 2 +-
 test/cgi/test_cgi_cookie.rb | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)
 diff --git a/lib/cgi/cookie.rb b/lib/cgi/cookie.rb
 index 1a9c1a8..9498e2f 100644
 --- a/lib/cgi/cookie.rb
 +++ b/lib/cgi/cookie.rb
@@ -42,7 +42,7 @@ class Cookie < Array
     TOKEN_RE = %r"\A[[!-~]&&[^()<>@,;:\\\"/?=\[\]{}]]+\z"
     PATH_VALUE_RE = %r"\A[[ -~]&&[^;]]*\z"
 -    DOMAIN_VALUE_RE = %r"\A(?<label>(?!-)[-A-Za-z0-9]+(?<!-))(?:\.\g<label>)*\z"
 +    DOMAIN_VALUE_RE = %r"\A\.?(?<label>(?!-)[-A-Za-z0-9]+(?<!-))(?:\.\g<label>)*\z"
     # Create a new CGI::Cookie object.
     #
 diff --git a/test/cgi/test_cgi_cookie.rb b/test/cgi/test_cgi_cookie.rb
 index 6d31932..eadae45 100644
 --- a/test/cgi/test_cgi_cookie.rb
 +++ b/test/cgi/test_cgi_cookie.rb
@@ -65,6 +65,9 @@ class CGICookieTest < Test::Unit::TestCase
     cookie = CGI::Cookie.new({'domain' => 'a.example.com'}.merge(h))
     assert_equal('a.example.com', cookie.domain)
 +    cookie = CGI::Cookie.new(h.merge('domain'=>'.example.com'))
 +    assert_equal('.example.com', cookie.domain)
 +
     cookie = CGI::Cookie.new({'domain'=>'1.example.com'}.merge(h))
     assert_equal('1.example.com', cookie.domain, 'enhanced by RFC 1123')
--- a/SOURCES/rubygem-rexml-3.2.9-Fix-CVE-2024-35176-DoS-in-REXML.patch
+++ b/SOURCES/rubygem-rexml-3.2.9-Fix-CVE-2024-35176-DoS-in-REXML.patch
--- a/SOURCES/rubygem-strscan-1.0.2-Accept-String-as-a-pattern.patch
+++ b/SOURCES/rubygem-strscan-1.0.2-Accept-String-as-a-pattern.patch
@ -1,264 +0,0 @@
 From e56ac27d19cc3acdf6c1cb13b14224c43df5f5f6 Mon Sep 17 00:00:00 2001
 From: Kouhei Sutou <kou@clear-code.com>
 Date: Thu, 4 Apr 2019 17:52:50 +0900
 Subject: [PATCH] Accept String as a pattern
 It's only for head only match case such as StringScanner#scan.
 If we use a String as a pattern, we can improve match performance.
 Here is a result of the including benchmark. It shows String as a
 pattern is 1.25x faster than Regexp as a pattern.
    % rake benchmark
    /tmp/local/bin/ruby -S benchmark-driver benchmark/scan.yaml
    Warming up --------------------------------------
                  regexp    12.094M i/s -     12.242M times in 1.012250s (82.69ns/i, 277clocks/i)
                  string    14.653M i/s -     14.889M times in 1.016124s (68.25ns/i, 252clocks/i)
    Calculating -------------------------------------
                  regexp    14.713M i/s -     36.281M times in 2.465970s (67.97ns/i, 254clocks/i)
                  string    18.422M i/s -     43.959M times in 2.386255s (54.28ns/i, 201clocks/i)
    Comparison:
                  string:  18421631.8 i/s
                  regexp:  14712660.7 i/s - 1.25x  slower
 ====
 Backport https://github.com/ruby/strscan/pull/4 for strscan.
 REXML fixes for CVE-2024-35716 depend on this feature.
 ---
 ext/strscan/strscan.c              | 92 +++++++++++++++++++-----------
 test/strscan/test_stringscanner.rb | 45 ++++++++++++++-
 2 files changed, 100 insertions(+), 37 deletions(-)
 diff --git a/ext/strscan/strscan.c b/ext/strscan/strscan.c
 index d6168a0d4f..43319b672e 100644
 --- a/ext/strscan/strscan.c
 +++ b/ext/strscan/strscan.c
@@ -447,15 +447,18 @@ strscan_set_pos(VALUE self, VALUE v)
 }
 static VALUE
 -strscan_do_scan(VALUE self, VALUE regex, int succptr, int getstr, int headonly)
 +strscan_do_scan(VALUE self, VALUE pattern, int succptr, int getstr, int headonly)
 {
 -    regex_t *rb_reg_prepare_re(VALUE re, VALUE str);
     struct strscanner *p;
 -    regex_t *re;
 -    long ret;
 -    int tmpreg;
 -    Check_Type(regex, T_REGEXP);
 +    if (headonly) {
 +        if (!RB_TYPE_P(pattern, T_REGEXP)) {
 +            StringValue(pattern);
 +        }
 +    }
 +    else {
 +        Check_Type(pattern, T_REGEXP);
 +    }
     GET_SCANNER(self, p);
     CLEAR_MATCH_STATUS(p);
@@ -463,37 +466,55 @@ strscan_do_scan(VALUE self, VALUE regex, int succptr, int getstr, int headonly)
         return Qnil;
     }
 -    p->regex = regex;
 -    re = rb_reg_prepare_re(regex, p->str);
 -    tmpreg = re != RREGEXP_PTR(regex);
 -    if (!tmpreg) RREGEXP(regex)->usecnt++;
 +    if (RB_TYPE_P(pattern, T_REGEXP)) {
 +        regex_t *rb_reg_prepare_re(VALUE re, VALUE str);
 +        regex_t *re;
 +        long ret;
 +        int tmpreg;
 +
 +        p->regex = pattern;
 +        re = rb_reg_prepare_re(pattern, p->str);
 +        tmpreg = re != RREGEXP_PTR(pattern);
 +        if (!tmpreg) RREGEXP(pattern)->usecnt++;
 +
 +        if (headonly) {
 +            ret = onig_match(re, (UChar* )CURPTR(p),
 +                             (UChar* )(CURPTR(p) + S_RESTLEN(p)),
 +                             (UChar* )CURPTR(p), &(p->regs), ONIG_OPTION_NONE);
 +        }
 +        else {
 +            ret = onig_search(re,
 +                              (UChar* )CURPTR(p), (UChar* )(CURPTR(p) + S_RESTLEN(p)),
 +                              (UChar* )CURPTR(p), (UChar* )(CURPTR(p) + S_RESTLEN(p)),
 +                              &(p->regs), ONIG_OPTION_NONE);
 +        }
 +        if (!tmpreg) RREGEXP(pattern)->usecnt--;
 +        if (tmpreg) {
 +            if (RREGEXP(pattern)->usecnt) {
 +                onig_free(re);
 +            }
 +            else {
 +                onig_free(RREGEXP_PTR(pattern));
 +                RREGEXP_PTR(pattern) = re;
 +            }
 +        }
 -    if (headonly) {
 -        ret = onig_match(re, (UChar* )CURPTR(p),
 -                         (UChar* )(CURPTR(p) + S_RESTLEN(p)),
 -                         (UChar* )CURPTR(p), &(p->regs), ONIG_OPTION_NONE);
 +        if (ret == -2) rb_raise(ScanError, "regexp buffer overflow");
 +        if (ret < 0) {
 +            /* not matched */
 +            return Qnil;
 +        }
     }
     else {
 -        ret = onig_search(re,
 -                          (UChar* )CURPTR(p), (UChar* )(CURPTR(p) + S_RESTLEN(p)),
 -                          (UChar* )CURPTR(p), (UChar* )(CURPTR(p) + S_RESTLEN(p)),
 -                          &(p->regs), ONIG_OPTION_NONE);
 -    }
 -    if (!tmpreg) RREGEXP(regex)->usecnt--;
 -    if (tmpreg) {
 -        if (RREGEXP(regex)->usecnt) {
 -            onig_free(re);
 +        rb_enc_check(p->str, pattern);
 +        if (S_RESTLEN(p) < RSTRING_LEN(pattern)) {
 +            return Qnil;
         }
 -        else {
 -            onig_free(RREGEXP_PTR(regex));
 -            RREGEXP_PTR(regex) = re;
 +        if (memcmp(CURPTR(p), RSTRING_PTR(pattern), RSTRING_LEN(pattern)) != 0) {
 +            return Qnil;
         }
 -    }
 -
 -    if (ret == -2) rb_raise(ScanError, "regexp buffer overflow");
 -    if (ret < 0) {
 -        /* not matched */
 -        return Qnil;
 +        onig_region_clear(&(p->regs));
 +        onig_region_set(&(p->regs), 0, 0, RSTRING_LEN(pattern));
     }
     MATCHED(p);
@@ -520,7 +541,8 @@ strscan_do_scan(VALUE self, VALUE regex, int succptr, int getstr, int headonly)
  *   p s.scan(/\w+/)   # -> "test"
  *   p s.scan(/\w+/)   # -> nil
  *   p s.scan(/\s+/)   # -> " "
 - *   p s.scan(/\w+/)   # -> "string"
 + *   p s.scan("str")   # -> "str"
 + *   p s.scan(/\w+/)   # -> "ing"
  *   p s.scan(/./)     # -> nil
  *
  */
@@ -539,6 +561,7 @@ strscan_scan(VALUE self, VALUE re)
  *   s = StringScanner.new('test string')
  *   p s.match?(/\w+/)   # -> 4
  *   p s.match?(/\w+/)   # -> 4
 + *   p s.match?("test")  # -> 4
  *   p s.match?(/\s+/)   # -> nil
  */
 static VALUE
@@ -560,7 +583,8 @@ strscan_match_p(VALUE self, VALUE re)
  *   p s.skip(/\w+/)   # -> 4
  *   p s.skip(/\w+/)   # -> nil
  *   p s.skip(/\s+/)   # -> 1
 - *   p s.skip(/\w+/)   # -> 6
 + *   p s.skip("st")    # -> 2
 + *   p s.skip(/\w+/)   # -> 4
  *   p s.skip(/./)     # -> nil
  *
  */
 diff --git a/test/strscan/test_stringscanner.rb b/test/strscan/test_stringscanner.rb
 index 3423f9cfed..63b1ce1f9b 100644
 --- a/test/strscan/test_stringscanner.rb
 +++ b/test/strscan/test_stringscanner.rb
@@ -282,6 +282,22 @@ def test_scan
     assert_equal "", s.scan(//)
   end
 +  def test_scan_string
 +    s = StringScanner.new('stra strb strc')
 +    assert_equal 'str', s.scan('str')
 +    assert_equal 'str', s[0]
 +    assert_equal 3, s.pos
 +    assert_equal false, s.tainted?
 +    assert_equal 'a ', s.scan('a ')
 +
 +    str = 'stra strb strc'.dup
 +    str.taint
 +    s = StringScanner.new(str, false)
 +    matched = s.scan('str')
 +    assert_equal 'str', matched
 +    assert_equal true, matched.tainted?
 +  end
 +
   def test_skip
     s = StringScanner.new('stra strb strc', true)
     assert_equal 4, s.skip(/\w+/)
@@ -367,8 +383,10 @@ def test_matched
     assert_equal false, s.matched.tainted?
     s.scan(/\s+/)
     assert_equal ' ', s.matched
 +    s.scan('st')
 +    assert_equal 'st', s.matched
     s.scan(/\w+/)
 -    assert_equal 'strb', s.matched
 +    assert_equal 'rb', s.matched
     s.scan(/\s+/)
     assert_equal ' ', s.matched
     s.scan(/\w+/)
@@ -483,7 +501,7 @@ def test_pre_match
     s.skip(/\s/)
     assert_equal 'a', s.pre_match
     assert_equal false, s.pre_match.tainted?
 -    s.scan(/\w/)
 +    s.scan('b')
     assert_equal 'a ', s.pre_match
     s.scan_until(/c/)
     assert_equal 'a b ', s.pre_match
@@ -513,7 +531,7 @@ def test_post_match
     assert_equal ' b c d e', s.post_match
     s.skip(/\s/)
     assert_equal 'b c d e', s.post_match
 -    s.scan(/\w/)
 +    s.scan('b')
     assert_equal ' c d e', s.post_match
     s.scan_until(/c/)
     assert_equal ' d e', s.post_match
@@ -589,6 +607,20 @@ def test_encoding
     assert_equal(Encoding::EUC_JP, ss.scan(/./e).encoding)
   end
 +  def test_encoding_string
 +    str = "\xA1\xA2".dup.force_encoding("euc-jp")
 +    ss = StringScanner.new(str)
 +    assert_equal(str.dup, ss.scan(str.dup))
 +  end
 +
 +  def test_invalid_encoding_string
 +    str = "\xA1\xA2".dup.force_encoding("euc-jp")
 +    ss = StringScanner.new(str)
 +    assert_raise(Encoding::CompatibilityError) do
 +      ss.scan(str.encode("UTF-8"))
 +    end
 +  end
 +
   def test_generic_regexp
     ss = StringScanner.new("\xA1\xA2".dup.force_encoding("euc-jp"))
     t = ss.scan(/./)
@@ -643,6 +675,13 @@ def test_exist_p
     assert_equal(nil, s.exist?(/e/))
   end
 +  def test_exist_p_string
 +    s = StringScanner.new("test string")
 +    assert_raise(TypeError) do
 +      s.exist?(" ")
 +    end
 +  end
 +
   def test_skip_until
     s = StringScanner.new("Foo Bar Baz")
     assert_equal(3, s.skip_until(/Foo/))
--- a/SOURCES/libruby.stp
+++ b/SOURCES/libruby.stp
--- a/SOURCES/macros.ruby
+++ b/SOURCES/macros.ruby
--- a/SOURCES/macros.rubygems
+++ b/SOURCES/macros.rubygems
@ -9,6 +9,7 @@
 %gem_cache %{gem_dir}/cache/%{gem_name}-%{version}%{?prerelease}.gem
 %gem_spec %{gem_dir}/specifications/%{gem_name}-%{version}%{?prerelease}.gemspec
 %gem_docdir %{gem_dir}/doc/%{gem_name}-%{version}%{?prerelease}
 %gem_plugin %{gem_dir}/plugins/%{gem_name}_plugin.rb
 # %gem_install - Install gem into appropriate directory.
@ -21,7 +22,7 @@
 %gem_install(d:n:) \
 mkdir -p %{-d*}%{!?-d:.%{gem_dir}} \
 \
-CONFIGURE_ARGS="--with-cflags='%{optflags}' $CONFIGURE_ARGS" \\\
+CONFIGURE_ARGS="--with-cflags='%{optflags}' --with-cxxflags='%{optflags}' --with-ldflags='%{build_ldflags}' $CONFIGURE_ARGS" \\\
 gem install \\\
        -V \\\
        --local \\\
@ -32,16 +33,6 @@ gem install \\\
 %{nil}
 # For rubygems packages we want to filter out any provides caused by private
 # libs in %%{gem_archdir}.
 #
 # Note that this must be invoked in the spec file, preferably as
 # "%{?rubygems_default_filter}", before any %description block.
 %rubygems_default_filter %{expand: \
 %global __provides_exclude_from %{?__provides_exclude_from:%{__provides_exclude_from}|}^%{gem_extdir_mri}/.*\\\\.so$ \
 }
 # The 'read' command in %%gemspec_* macros is not essential, but it is usefull
 # to make the sript appear in build log.
--- a/SOURCES/operating_system.rb
+++ b/SOURCES/operating_system.rb
--- a/SOURCES/ruby-1.9.3-mkmf-verbose.patch
+++ b/SOURCES/ruby-1.9.3-mkmf-verbose.patch
@ -11,15 +11,15 @@ diff --git a/lib/mkmf.rb b/lib/mkmf.rb
 index 682eb46..e6b1445 100644
 --- a/lib/mkmf.rb
 +++ b/lib/mkmf.rb
-@@ -1900,7 +1900,7 @@ def configuration(srcdir)
+@@ -1974,7 +1974,7 @@ def configuration(srcdir)
 SHELL = /bin/sh
 # V=0 quiet, V=1 verbose.  other values don't work.
 -V = 0
 +V = 1
 V0 = $(V:0=)
 Q1 = $(V:1=)
 Q = $(Q1:0=@)
 ECHO1 = $(V:1=@ #{CONFIG['NULLCMD']})
 -- 
 1.8.3.1
--- a/SOURCES/ruby-2.1.0-Enable-configuration-of-archlibdir.patch
+++ b/SOURCES/ruby-2.1.0-Enable-configuration-of-archlibdir.patch
@ -8,10 +8,10 @@ Subject: [PATCH] Allow to configure libruby.so placement.
 1 file changed, 5 insertions(+)
 diff --git a/configure.ac b/configure.ac
-index 11fc237552..b77e88fc37 100644
+index d261ea57b5..3c13076b82 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3642,6 +3642,11 @@ AS_IF([test ${multiarch+set}], [
+@@ -3368,6 +3368,11 @@ AS_IF([test ${multiarch+set}], [
 ])
 archlibdir='${libdir}/${arch}'
@ -24,5 +24,5 @@ index 11fc237552..b77e88fc37 100644
 archincludedir='${includedir}/${arch}'
 sitearchincludedir='${includedir}/${sitearch}'
 -- 
-1.8.3.1
+2.22.0
--- 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
@ -11,10 +11,10 @@ Subject: [PATCH] Prevent duplicated paths when empty version string is
 3 files changed, 15 insertions(+), 2 deletions(-)
 diff --git a/configure.ac b/configure.ac
-index 999e2d6d5d..11fc237552 100644
+index c42436c23d..d261ea57b5 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -4252,7 +4252,8 @@ AS_CASE(["$ruby_version_dir_name"],
+@@ -4026,7 +4026,8 @@ AS_CASE(["$ruby_version_dir_name"],
 ruby_version_dir=/'${ruby_version_dir_name}'
 if test -z "${ruby_version_dir_name}"; then
@ -66,7 +66,7 @@ diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb
 index 07076d4..35e6c3c 100755
 --- a/tool/mkconfig.rb
 +++ b/tool/mkconfig.rb
-@@ -111,7 +111,7 @@
+@@ -115,7 +115,7 @@
     val = val.gsub(/\$(?:\$|\{?(\w+)\}?)/) {$1 ? "$(#{$1})" : $&}.dump
     case name
     when /^prefix$/
--- a/SOURCES/ruby-2.1.0-always-use-i386.patch
+++ b/SOURCES/ruby-2.1.0-always-use-i386.patch
@ -8,10 +8,10 @@ Subject: [PATCH] Always use i386.
 1 file changed, 2 insertions(+)
 diff --git a/configure.ac b/configure.ac
-index b77e88fc37..6bba453e3c 100644
+index 3c13076b82..93af30321d 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -4316,6 +4316,8 @@ AC_SUBST(vendorarchdir)dnl
+@@ -4090,6 +4090,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
@ -8,14 +8,14 @@ Subject: [PATCH] Allow to install RubyGems into custom location, outside of
 configure.ac            |  5 +++++
 loadpath.c              |  4 ++++
 template/verconf.h.tmpl |  3 +++
- tool/rbinstall.rb       | 7 +++++++
+ tool/rbinstall.rb       | 10 ++++++++++
- 4 files changed, 19 insertions(+)
+ 4 files changed, 22 insertions(+)
 diff --git a/configure.ac b/configure.ac
-index 6bba453e3c..028ef7ca3e 100644
+index 93af30321d..bc13397e0e 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -4288,6 +4288,10 @@ AC_ARG_WITH(vendorarchdir,
+@@ -4062,6 +4062,10 @@ AC_ARG_WITH(vendorarchdir,
             [vendorarchdir=$withval],
             [vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby'${ruby_version_dir}}${multiarch-'${vendorlibdir}/${sitearch}'}])
@ -26,7 +26,7 @@ index 6bba453e3c..028ef7ca3e 100644
 AS_IF([test "${LOAD_RELATIVE+set}"], [
     AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
     RUBY_EXEC_PREFIX=''
-@@ -4312,6 +4316,7 @@ AC_SUBST(sitearchdir)dnl
+@@ -4086,6 +4090,7 @@ AC_SUBST(sitearchdir)dnl
 AC_SUBST(vendordir)dnl
 AC_SUBST(vendorlibdir)dnl
 AC_SUBST(vendorarchdir)dnl
@ -64,27 +64,30 @@ index 79c003e..34f2382 100644
 % R = {}
 % R["ruby_version"] = '"RUBY_LIB_VERSION"'
 diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
-index b47b6e1..0b99408 100755
+index e9110a17ca..76a1f0a315 100755
 --- a/tool/rbinstall.rb
 +++ b/tool/rbinstall.rb
-@@ -335,6 +335,7 @@ def CONFIG.[](name, mandatory = false)
+@@ -359,6 +359,7 @@ def CONFIG.[](name, mandatory = false)
   vendorlibdir = CONFIG["vendorlibdir"]
   vendorarchlibdir = CONFIG["vendorarchdir"]
 end
 +rubygemsdir = CONFIG["rubygemsdir"]
 mandir = CONFIG["mandir", true]
 docdir = CONFIG["docdir", true]
- configure_args = Shellwords.shellwords(CONFIG["configure_args"])
+ enable_shared = CONFIG["ENABLE_SHARED"] == 'yes'
-@@ -541,7 +542,13 @@ def install(src, cmd)
+@@ -590,7 +591,16 @@ def stub
 install?(:local, :comm, :lib) do
   prepare "library scripts", rubylibdir
   noinst = %w[*.txt *.rdoc *.gemspec]
-+  noinst += %w[rubygems.rb rubygems/ datadir.rb] if rubygemsdir
+  # Bundler carries "rubygems.rb" file, so it must be specialcased :/
 +  noinst += %w[rubygems.rb rubygems/ bundler.rb bundler/] if rubygemsdir
   install_recursive(File.join(srcdir, "lib"), rubylibdir, :no_install => noinst, :mode => $data_mode)
 +  if rubygemsdir
-+    noinst = %w[obsolete.rb]
+    noinst = %w[*.txt *.rdoc *.gemspec]
-+    install_recursive(File.join(srcdir, "lib", "rubygems"), File.join(rubygemsdir, "rubygems"), :mode => $data_mode)
+    install_recursive(File.join(srcdir, "lib", "rubygems"), File.join(rubygemsdir, "rubygems"), :no_install => noinst, :mode => $data_mode)
 +    install(File.join(srcdir, "lib", "rubygems.rb"), File.join(rubygemsdir, "rubygems.rb"), :mode => $data_mode)
 +    install_recursive(File.join(srcdir, "lib", "bundler"), File.join(rubylibdir, "bundler"), :no_install => noinst, :mode => $data_mode)
 +    install(File.join(srcdir, "lib", "bundler.rb"), rubylibdir, :mode => $data_mode)
 +  end
 end
--- a/SOURCES/ruby-2.3.0-ruby_version.patch
+++ b/SOURCES/ruby-2.3.0-ruby_version.patch
@ -12,15 +12,15 @@ ruby_version_dir_name now specifies custom version string for versioned
 directories, e.g. instead of default X.Y.Z, you can specify whatever
 string.
 ---
- configure.ac        | 64 ++++++++++++++++++++++++++++-------------------------
+ configure.ac        | 64 ++++++++++++++++++++++++---------------------
 template/ruby.pc.in |  1 +
 2 files changed, 35 insertions(+), 30 deletions(-)
 diff --git a/configure.ac b/configure.ac
-index 8ea969412f..a00f2b6776 100644
+index 80b137e380..63cd3b4f8b 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -4203,9 +4203,6 @@ AS_CASE(["$target_os"],
+@@ -3977,9 +3977,6 @@ AS_CASE(["$target_os"],
     rubyw_install_name='$(RUBYW_INSTALL_NAME)'
     ])
@ -30,7 +30,7 @@ index 8ea969412f..a00f2b6776 100644
 rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'}
 AC_ARG_WITH(rubyarchprefix,
 	    AS_HELP_STRING([--with-rubyarchprefix=DIR],
-@@ -4228,56 +4225,62 @@ AC_ARG_WITH(ridir,
+@@ -4002,56 +3999,62 @@ AC_ARG_WITH(ridir,
 AC_SUBST(ridir)
 AC_SUBST(RI_BASE_NAME)
@ -120,7 +120,7 @@ index 8ea969412f..a00f2b6776 100644
 AS_IF([test "${LOAD_RELATIVE+set}"], [
     AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
-@@ -4294,6 +4297,7 @@ AC_SUBST(sitearchincludedir)dnl
+@@ -4068,6 +4071,7 @@ AC_SUBST(sitearchincludedir)dnl
 AC_SUBST(arch)dnl
 AC_SUBST(sitearch)dnl
 AC_SUBST(ruby_version)dnl
@ -132,14 +132,14 @@ diff --git a/template/ruby.pc.in b/template/ruby.pc.in
 index 8a2c066..c81b211 100644
 --- a/template/ruby.pc.in
 +++ b/template/ruby.pc.in
-@@ -9,6 +9,7 @@ MAJOR=@MAJOR@
+@@ -2,6 +2,7 @@ MAJOR=@MAJOR@
 MINOR=@MINOR@
 TEENY=@TEENY@
 ruby_version=@ruby_version@
 +ruby_version_dir_name=@ruby_version_dir_name@
 RUBY_API_VERSION=@RUBY_API_VERSION@
 RUBY_PROGRAM_VERSION=@RUBY_PROGRAM_VERSION@
- RUBY_BASE_NAME=@RUBY_BASE_NAME@
+ arch=@arch@
 -- 
 2.1.0
@ -165,74 +165,59 @@ index 970cb91..5bf8230 100644
 -  version = RbConfig::CONFIG['ruby_version']
 +  version = RbConfig::CONFIG['ruby_version_dir_name'] || RbConfig::CONFIG['ruby_version']
-   BASE    = if RbConfig::CONFIG.key? 'ridir' then
+   BASE    = File.join RbConfig::CONFIG['ridir'], version
-               File.join RbConfig::CONFIG['ridir'], version
+ 
 diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
 index d4c110e..d39c9a6 100755
 --- a/tool/rbinstall.rb
 +++ b/tool/rbinstall.rb
-@@ -421,7 +421,7 @@ def CONFIG.[](name, mandatory = false)
+@@ -448,7 +448,7 @@ def CONFIG.[](name, mandatory = false)
 install?(:doc, :rdoc) do
   if $rdocdir
 -    ridatadir = File.join(CONFIG['ridir'], CONFIG['ruby_version'], "system")
 +    ridatadir = File.join(CONFIG['ridir'], CONFIG['ruby_version_dir_name'] || CONFIG['ruby_version'], "system")
     prepare "rdoc", ridatadir
-     install_recursive($rdocdir, ridatadir, :mode => $data_mode)
+     install_recursive($rdocdir, ridatadir, :no_install => rdoc_noinst, :mode => $data_mode)
   end
 -- 
-2.1.0
+2.23.0
-From f8d136f9a46d1fe87eba622ab9665935d05e981b Mon Sep 17 00:00:00 2001
+From 9f0ec0233f618cbb862629816b22491c3df79578 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
 Date: Tue, 31 Mar 2015 16:37:44 +0200
 Subject: [PATCH 3/4] Add ruby_version_dir_name support for RubyGems.
 ---
- lib/rubygems/defaults.rb  | 11 ++++++-----
+ lib/rubygems/defaults.rb  | 7 ++++---
 test/rubygems/test_gem.rb | 5 +++--
- 2 files changed, 9 insertions(+), 7 deletions(-)
+ 2 files changed, 7 insertions(+), 5 deletions(-)
 diff --git a/lib/rubygems/defaults.rb b/lib/rubygems/defaults.rb
-index 55ca080..75eea2b 100644
+index d4ff4a262c..3f9a5bf590 100644
 --- a/lib/rubygems/defaults.rb
 +++ b/lib/rubygems/defaults.rb
-@@ -32,20 +32,20 @@ def self.default_dir
+@@ -34,7 +34,7 @@ def self.default_spec_cache_dir
-              [
+   # specified in the environment
-                File.dirname(RbConfig::CONFIG['sitedir']),
+ 
-                'Gems',
+   def self.default_dir
-               RbConfig::CONFIG['ruby_version']
+-    @default_dir ||= File.join(RbConfig::CONFIG['rubylibprefix'], 'gems', RbConfig::CONFIG['ruby_version'])
-+               RbConfig::CONFIG['ruby_version_dir_name'] || RbConfig::CONFIG['ruby_version']
+    @default_dir ||= File.join(RbConfig::CONFIG['rubylibprefix'], 'gems', RbConfig::CONFIG['ruby_version_dir_name'] || RbConfig::CONFIG['ruby_version'])
              ]
            elsif RbConfig::CONFIG['rubylibprefix'] then
              [
               RbConfig::CONFIG['rubylibprefix'],
               'gems',
 -              RbConfig::CONFIG['ruby_version']
 +              RbConfig::CONFIG['ruby_version_dir_name'] || RbConfig::CONFIG['ruby_version']
              ]
            else
              [
                RbConfig::CONFIG['libdir'],
                ruby_engine,
                'gems',
 -               RbConfig::CONFIG['ruby_version']
 +               RbConfig::CONFIG['ruby_version_dir_name'] || RbConfig::CONFIG['ruby_version']
              ]
   end
-@@ -75,7 +75,8 @@ def self.default_rubygems_dirs
+   ##
- 
+@@ -103,7 +103,8 @@ def self.user_dir
-   def self.user_dir
+     gem_dir = File.join(Gem.user_home, ".gem")
-     parts = [Gem.user_home, '.gem', ruby_engine]
+     gem_dir = File.join(Gem.data_home, "gem") unless File.exist?(gem_dir)
     parts = [gem_dir, ruby_engine]
 -    parts << RbConfig::CONFIG['ruby_version'] unless RbConfig::CONFIG['ruby_version'].empty?
 +    ruby_version_dir_name = RbConfig::CONFIG['ruby_version_dir_name'] || RbConfig::CONFIG['ruby_version']
 +    parts << ruby_version_dir_name unless ruby_version_dir_name.empty?
     File.join parts
   end
-@@ -172,7 +173,7 @@ def self.vendor_dir # :nodoc:
+@@ -234,7 +235,7 @@ def self.vendor_dir # :nodoc:
     return nil unless RbConfig::CONFIG.key? 'vendordir'
     File.join RbConfig::CONFIG['vendordir'], 'gems',
@ -242,10 +227,10 @@ index 55ca080..75eea2b 100644
   ##
 diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb
-index 0428bea..b6e090e 100644
+index b25068405d..e9fef4a311 100644
 --- a/test/rubygems/test_gem.rb
 +++ b/test/rubygems/test_gem.rb
-@@ -1191,7 +1191,8 @@ def test_self_use_paths
+@@ -1410,7 +1410,8 @@ def test_self_use_paths
   def test_self_user_dir
     parts = [@userhome, '.gem', Gem.ruby_engine]
@ -253,10 +238,10 @@ index 0428bea..b6e090e 100644
 +    ruby_version_dir_name = RbConfig::CONFIG['ruby_version_dir_name'] || RbConfig::CONFIG['ruby_version']
 +    parts << ruby_version_dir_name unless ruby_version_dir_name.empty?
-     assert_equal File.join(parts), Gem.user_dir
+     FileUtils.mkdir_p File.join(parts)
-   end
+ 
-@@ -1318,7 +1319,7 @@ def test_self_user_home_user_drive_and_path
+@@ -1486,7 +1487,7 @@ def test_self_vendor_dir
-   def test_self_vendor_dir
+     vendordir(File.join(@tempdir, 'vendor')) do
       expected =
         File.join RbConfig::CONFIG['vendordir'], 'gems',
 -                  RbConfig::CONFIG['ruby_version']
@ -282,15 +267,15 @@ diff --git a/configure.ac b/configure.ac
 index a00f2b6776..999e2d6d5d 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -164,7 +164,7 @@ RUBY_BASE_NAME=`echo ruby | sed "$program_transform_name"`
+@@ -108,7 +108,7 @@ RUBY_BASE_NAME=`echo ruby | sed "$program_transform_name"`
 RUBYW_BASE_NAME=`echo rubyw | sed "$program_transform_name"`
 AC_SUBST(RUBY_BASE_NAME)
 AC_SUBST(RUBYW_BASE_NAME)
 -AC_SUBST(RUBY_VERSION_NAME, '${RUBY_BASE_NAME}-${ruby_version}')
 +AC_SUBST(RUBY_VERSION_NAME, '${RUBY_BASE_NAME}-${ruby_version_dir_name}')
- AC_CANONICAL_TARGET
+ dnl checks for alternative programs
- test x"$target_alias" = x &&
+ AC_CANONICAL_BUILD
 -- 
 2.1.0
--- a/ruby-2.7.0-Initialize-ABRT-hook.patch
+++ b/ruby-2.7.0-Initialize-ABRT-hook.patch
@ -0,0 +1,77 @@
 From eca084e4079c77c061045df9c21b219175b05228 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
 Date: Mon, 6 Jan 2020 13:56:04 +0100
 Subject: [PATCH] Initialize ABRT hook.
 The ABRT hook used to be initialized by preludes via patches [[1], [2]].
 Unfortunately, due to [[3]] and especially since [[4]], this would
 require boostrapping [[5]].
 To keep the things simple for now, load the ABRT hook via C.
 [1]: https://bugs.ruby-lang.org/issues/8566
 [2]: https://bugs.ruby-lang.org/issues/15306
 [3]: https://bugs.ruby-lang.org/issues/16254
 [4]: https://github.com/ruby/ruby/pull/2735
 [5]: https://lists.fedoraproject.org/archives/list/ruby-sig@lists.fedoraproject.org/message/LH6L6YJOYQT4Y5ZNOO4SLIPTUWZ5V45Q/
 ---
 abrt.c    | 12 ++++++++++++
 common.mk |  3 ++-
 ruby.c    |  4 ++++
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 abrt.c
 diff --git a/abrt.c b/abrt.c
 new file mode 100644
 index 0000000000..74b0bd5c0f
 --- /dev/null
 +++ b/abrt.c
@@ -0,0 +1,12 @@
 +#include "internal.h"
 +
 +void
 +Init_abrt(void)
 +{
 +  rb_eval_string(
 +    "  begin\n"
 +    "    require 'abrt'\n"
 +    "  rescue LoadError\n"
 +    "  end\n"
 +  );
 +}
 diff --git a/common.mk b/common.mk
 index b2e5b2b6d0..f39f81da5c 100644
 --- a/common.mk
 +++ b/common.mk
@@ -82,7 +82,8 @@ ENC_MK        = enc.mk
 MAKE_ENC      = -f $(ENC_MK) V="$(V)" UNICODE_HDR_DIR="$(UNICODE_HDR_DIR)" \
 		RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(mflags)
 -COMMONOBJS    = array.$(OBJEXT) \
 +COMMONOBJS    = abrt.$(OBJEXT) \
 +                array.$(OBJEXT) \
 		ast.$(OBJEXT) \
 		bignum.$(OBJEXT) \
 		class.$(OBJEXT) \
 diff --git a/ruby.c b/ruby.c
 index 60c57d6259..1eec16f2c8 100644
 --- a/ruby.c
 +++ b/ruby.c
@@ -1611,10 +1611,14 @@ proc_options(long argc, char **argv, ruby_cmdline_options_t *opt, int envopt)
 void Init_builtin_features(void);
 +/* abrt.c */
 +void Init_abrt(void);
 +
 static void
 ruby_init_prelude(void)
 {
     Init_builtin_features();
 +    Init_abrt();
     rb_const_remove(rb_cObject, rb_intern_const("TMP_RUBY_PREFIX"));
 }
 -- 
 2.24.1
--- a/ruby-2.7.1-Timeout-the-test_bug_reporter_add-witout-raising-err.patch
+++ b/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
@@ -22,7 +22,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/ruby-3.1.0-Don-t-query-RubyVM-FrozenCore-for-class-path.patch
+++ b/ruby-3.1.0-Don-t-query-RubyVM-FrozenCore-for-class-path.patch
@ -0,0 +1,43 @@
 From 0ade5611df9f981005eed32b369d1e699e520221 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
 Date: Thu, 10 Feb 2022 13:26:44 +0100
 Subject: [PATCH] Don't query `RubyVM::FrozenCore` for class path.
 The `RubyVM::FrozenCore` class path is corrupted during GC cycle and
 returns random garbage, which might result in segfault.
 But since it is easy to detect the `RubyVM::FrozenCore`, just provide
 the class path explicitly as a workaround.
 Other possibility would be to ignore `RubyVM::FrozenCore` simlarly as
 TracePoint API does:
 https://github.com/ruby/ruby/blob/46f6575157d4c2f6bbd5693896e26a65037e5552/vm_trace.c#L411
 ---
 vm.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
 diff --git a/vm.c b/vm.c
 index 8ce8b279d4..3d189fa63a 100644
 --- a/vm.c
 +++ b/vm.c
@@ -479,7 +479,15 @@ rb_dtrace_setup(rb_execution_context_t *ec, VALUE klass, ID id,
     }
     type = BUILTIN_TYPE(klass);
     if (type == T_CLASS || type == T_ICLASS || type == T_MODULE) {
 -	VALUE name = rb_class_path(klass);
 +	VALUE name = Qnil;
 +	/*
 +	 * Special treatment for rb_mRubyVMFrozenCore wchi is broken by GC.
 +         * https://bugs.ruby-lang.org/issues/18257
 +	 */
 +	if (klass == rb_mRubyVMFrozenCore)
 +	    name = rb_str_new_cstr("RubyVM::FrozenCore");
 +	else
 +	    name = rb_class_path(klass);
 	const char *classname, *filename;
 	const char *methodname = rb_id2name(id);
 	if (methodname && (filename = rb_source_location_cstr(&args->line_no)) != 0) {
 -- 
 2.34.1
--- a/ruby-3.1.1-ossl_ocsp-use-null.patch
+++ b/ruby-3.1.1-ossl_ocsp-use-null.patch
@ -0,0 +1,31 @@
 --- ext/openssl/ossl_ocsp.c.orig	2022-04-07 16:40:13.263752886 +0200
 +++ ext/openssl/ossl_ocsp.c	2022-04-07 16:45:56.818971187 +0200
@@ -382,7 +382,7 @@
     if (!NIL_P(flags))
 	flg = NUM2INT(flags);
     if (NIL_P(digest))
 -	md = EVP_sha1();
 +	md = NULL;
     else
 	md = ossl_evp_get_digestbyname(digest);
     if (NIL_P(certs))
@@ -1033,7 +1033,7 @@
     if (!NIL_P(flags))
 	flg = NUM2INT(flags);
     if (NIL_P(digest))
 -	md = EVP_sha1();
 +	md = NULL;
     else
 	md = ossl_evp_get_digestbyname(digest);
     if (NIL_P(certs))
 --- test/openssl/test_ocsp.rb.orig      2022-04-08 08:20:31.400739869 +0200
 +++ test/openssl/test_ocsp.rb   2022-04-08 08:20:37.208727488 +0200
@@ -99,7 +99,7 @@
     request.sign(@cert, @cert_key, [@ca_cert], 0)
     asn1 = OpenSSL::ASN1.decode(request.to_der)
     assert_equal cid.to_der, asn1.value[0].value.find { |a| a.tag_class == :UNIVERSAL }.value[0].value[0].to_der
 -    assert_equal OpenSSL::ASN1.ObjectId("sha1WithRSAEncryption").to_der, asn1.value[1].value[0].value[0].value[0].to_der
 +    assert_equal OpenSSL::ASN1.ObjectId("sha256WithRSAEncryption").to_der, asn1.value[1].value[0].value[0].value[0].to_der
     assert_equal @cert.to_der, asn1.value[1].value[0].value[2].value[0].value[0].to_der
     assert_equal @ca_cert.to_der, asn1.value[1].value[0].value[2].value[0].value[1].to_der
     assert_equal asn1.to_der, OpenSSL::OCSP::Request.new(asn1.to_der).to_der
--- a/ruby-3.1.2-ossl-tests-replace-sha1.patch
+++ b/ruby-3.1.2-ossl-tests-replace-sha1.patch
@ -0,0 +1,609 @@
 diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb
 index fedcb93..53ad621 100644
 --- a/ext/openssl/extconf.rb
 +++ b/ext/openssl/extconf.rb
@@ -169,6 +169,7 @@ have_func("SSL_CTX_set_post_handshake_auth")
 # added in 1.1.1
 have_func("EVP_PKEY_check")
 +have_func("SSL_CTX_set_ciphersuites")
 # added in 3.0.0
 have_func("SSL_set0_tmp_dh_pkey")
 diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h
 index 4b51268..2ab8aea 100644
 --- a/ext/openssl/ossl.h
 +++ b/ext/openssl/ossl.h
@@ -43,13 +43,13 @@
 #ifndef LIBRESSL_VERSION_NUMBER
 # define OSSL_IS_LIBRESSL 0
 # define OSSL_OPENSSL_PREREQ(maj, min, pat) \
 -      (OPENSSL_VERSION_NUMBER >= (maj << 28) | (min << 20) | (pat << 12))
 +      (OPENSSL_VERSION_NUMBER >= ((maj << 28) | (min << 20) | (pat << 12)))
 # define OSSL_LIBRESSL_PREREQ(maj, min, pat) 0
 #else
 # define OSSL_IS_LIBRESSL 1
 # define OSSL_OPENSSL_PREREQ(maj, min, pat) 0
 # define OSSL_LIBRESSL_PREREQ(maj, min, pat) \
 -      (LIBRESSL_VERSION_NUMBER >= (maj << 28) | (min << 20) | (pat << 12))
 +      (LIBRESSL_VERSION_NUMBER >= ((maj << 28) | (min << 20) | (pat << 12)))
 #endif
 #if !defined(OPENSSL_NO_ENGINE) && !OSSL_OPENSSL_PREREQ(3, 0, 0)
 diff --git a/ext/openssl/ossl_asn1.c b/ext/openssl/ossl_asn1.c
 index a61d3ee..0d3fa9a 100644
 --- a/ext/openssl/ossl_asn1.c
 +++ b/ext/openssl/ossl_asn1.c
@@ -1522,7 +1522,7 @@ Init_ossl_asn1(void)
      *
      * An Array that stores the name of a given tag number. These names are
      * the same as the name of the tag constant that is additionally defined,
 -     * e.g. +UNIVERSAL_TAG_NAME[2] = "INTEGER"+ and +OpenSSL::ASN1::INTEGER = 2+.
 +     * e.g. <tt>UNIVERSAL_TAG_NAME[2] = "INTEGER"</tt> and <tt>OpenSSL::ASN1::INTEGER = 2</tt>.
      *
      * == Example usage
      *
 diff --git a/ext/openssl/ossl_pkey.c b/ext/openssl/ossl_pkey.c
 index 2a4835a..24d0da4 100644
 --- a/ext/openssl/ossl_pkey.c
 +++ b/ext/openssl/ossl_pkey.c
@@ -670,7 +670,7 @@ ossl_pkey_export_traditional(int argc, VALUE *argv, VALUE self, int to_der)
 	}
     }
     else {
 -#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
 +#if OSSL_OPENSSL_PREREQ(1, 1, 0) || OSSL_LIBRESSL_PREREQ(3, 5, 0)
 	if (!PEM_write_bio_PrivateKey_traditional(bio, pkey, enc, NULL, 0,
 						  ossl_pem_passwd_cb,
 						  (void *)pass)) {
 diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c
 index 9a0682a..af262d9 100644
 --- a/ext/openssl/ossl_ssl.c
 +++ b/ext/openssl/ossl_ssl.c
@@ -959,27 +959,13 @@ ossl_sslctx_get_ciphers(VALUE self)
     return ary;
 }
 -/*
 - * call-seq:
 - *    ctx.ciphers = "cipher1:cipher2:..."
 - *    ctx.ciphers = [name, ...]
 - *    ctx.ciphers = [[name, version, bits, alg_bits], ...]
 - *
 - * Sets the list of available cipher suites for this context.  Note in a server
 - * context some ciphers require the appropriate certificates.  For example, an
 - * RSA cipher suite can only be chosen when an RSA certificate is available.
 - */
 static VALUE
 -ossl_sslctx_set_ciphers(VALUE self, VALUE v)
 +build_cipher_string(VALUE v)
 {
 -    SSL_CTX *ctx;
     VALUE str, elem;
     int i;
 -    rb_check_frozen(self);
 -    if (NIL_P(v))
 -	return v;
 -    else if (RB_TYPE_P(v, T_ARRAY)) {
 +    if (RB_TYPE_P(v, T_ARRAY)) {
         str = rb_str_new(0, 0);
         for (i = 0; i < RARRAY_LEN(v); i++) {
             elem = rb_ary_entry(v, i);
@@ -993,14 +979,67 @@ ossl_sslctx_set_ciphers(VALUE self, VALUE v)
         StringValue(str);
     }
 +    return str;
 +}
 +
 +/*
 + * call-seq:
 + *    ctx.ciphers = "cipher1:cipher2:..."
 + *    ctx.ciphers = [name, ...]
 + *    ctx.ciphers = [[name, version, bits, alg_bits], ...]
 + *
 + * Sets the list of available cipher suites for this context.  Note in a server
 + * context some ciphers require the appropriate certificates.  For example, an
 + * RSA cipher suite can only be chosen when an RSA certificate is available.
 + */
 +static VALUE
 +ossl_sslctx_set_ciphers(VALUE self, VALUE v)
 +{
 +    SSL_CTX *ctx;
 +    VALUE str;
 +
 +    rb_check_frozen(self);
 +    if (NIL_P(v))
 +        return v;
 +
 +    str = build_cipher_string(v);
 +
     GetSSLCTX(self, ctx);
 -    if (!SSL_CTX_set_cipher_list(ctx, StringValueCStr(str))) {
 +    if (!SSL_CTX_set_cipher_list(ctx, StringValueCStr(str)))
         ossl_raise(eSSLError, "SSL_CTX_set_cipher_list");
 -    }
     return v;
 }
 +#ifdef HAVE_SSL_CTX_SET_CIPHERSUITES
 +/*
 + * call-seq:
 + *    ctx.ciphersuites = "cipher1:cipher2:..."
 + *    ctx.ciphersuites = [name, ...]
 + *    ctx.ciphersuites = [[name, version, bits, alg_bits], ...]
 + *
 + * Sets the list of available TLSv1.3 cipher suites for this context.
 + */
 +static VALUE
 +ossl_sslctx_set_ciphersuites(VALUE self, VALUE v)
 +{
 +    SSL_CTX *ctx;
 +    VALUE str;
 +
 +    rb_check_frozen(self);
 +    if (NIL_P(v))
 +        return v;
 +
 +    str = build_cipher_string(v);
 +
 +    GetSSLCTX(self, ctx);
 +    if (!SSL_CTX_set_ciphersuites(ctx, StringValueCStr(str)))
 +        ossl_raise(eSSLError, "SSL_CTX_set_ciphersuites");
 +
 +    return v;
 +}
 +#endif
 +
 #ifndef OPENSSL_NO_DH
 /*
  * call-seq:
@@ -2703,6 +2742,9 @@ Init_ossl_ssl(void)
 			     ossl_sslctx_set_minmax_proto_version, 2);
     rb_define_method(cSSLContext, "ciphers",     ossl_sslctx_get_ciphers, 0);
     rb_define_method(cSSLContext, "ciphers=",    ossl_sslctx_set_ciphers, 1);
 +#ifdef HAVE_SSL_CTX_SET_CIPHERSUITES
 +    rb_define_method(cSSLContext, "ciphersuites=", ossl_sslctx_set_ciphersuites, 1);
 +#endif
 #ifndef OPENSSL_NO_DH
     rb_define_method(cSSLContext, "tmp_dh=", ossl_sslctx_set_tmp_dh, 1);
 #endif
 diff --git a/test/openssl/test_asn1.rb b/test/openssl/test_asn1.rb
 index 0fd7971..c79bc14 100644
 --- a/test/openssl/test_asn1.rb
 +++ b/test/openssl/test_asn1.rb
@@ -14,7 +14,7 @@ class  OpenSSL::TestASN1 < OpenSSL::TestCase
       ["keyUsage","keyCertSign, cRLSign",true],
       ["subjectKeyIdentifier","hash",false],
     ]
 -    dgst = OpenSSL::Digest.new('SHA1')
 +    dgst = OpenSSL::Digest.new('SHA256')
     cert = OpenSSL::TestUtils.issue_cert(
       subj, key, s, exts, nil, nil, digest: dgst, not_before: now, not_after: now+3600)
@@ -42,7 +42,7 @@ class  OpenSSL::TestASN1 < OpenSSL::TestCase
     assert_equal(OpenSSL::ASN1::Sequence, sig.class)
     assert_equal(2, sig.value.size)
     assert_equal(OpenSSL::ASN1::ObjectId, sig.value[0].class)
 -    assert_equal("1.2.840.113549.1.1.5", sig.value[0].oid)
 +    assert_equal("1.2.840.113549.1.1.11", sig.value[0].oid)
     assert_equal(OpenSSL::ASN1::Null, sig.value[1].class)
     dn = tbs_cert.value[3] # issuer
@@ -189,7 +189,7 @@ class  OpenSSL::TestASN1 < OpenSSL::TestCase
     assert_equal(OpenSSL::ASN1::Null, pkey.value[0].value[1].class)
     assert_equal(OpenSSL::ASN1::BitString, sig_val.class)
 -    cululated_sig = key.sign(OpenSSL::Digest.new('SHA1'), tbs_cert.to_der)
 +    cululated_sig = key.sign(OpenSSL::Digest.new('SHA256'), tbs_cert.to_der)
     assert_equal(cululated_sig, sig_val.value)
   end
 diff --git a/test/openssl/test_ns_spki.rb b/test/openssl/test_ns_spki.rb
 index ed3be86..383931b 100644
 --- a/test/openssl/test_ns_spki.rb
 +++ b/test/openssl/test_ns_spki.rb
@@ -22,7 +22,7 @@ class OpenSSL::TestNSSPI < OpenSSL::TestCase
     spki = OpenSSL::Netscape::SPKI.new
     spki.challenge = "RandomString"
     spki.public_key = key1.public_key
 -    spki.sign(key1, OpenSSL::Digest.new('SHA1'))
 +    spki.sign(key1, OpenSSL::Digest.new('SHA256'))
     assert(spki.verify(spki.public_key))
     assert(spki.verify(key1.public_key))
     assert(!spki.verify(key2.public_key))
 diff --git a/test/openssl/test_pkey_dsa.rb b/test/openssl/test_pkey_dsa.rb
 index 726b7db..08213df 100644
 --- a/test/openssl/test_pkey_dsa.rb
 +++ b/test/openssl/test_pkey_dsa.rb
@@ -36,8 +36,8 @@ class OpenSSL::TestPKeyDSA < OpenSSL::PKeyTestCase
       assert_equal true, dsa512.verify(OpenSSL::Digest.new('DSS1'), signature, data)
     end
 -    signature = dsa512.sign("SHA1", data)
 -    assert_equal true, dsa512.verify("SHA1", signature, data)
 +    signature = dsa512.sign("SHA256", data)
 +    assert_equal true, dsa512.verify("SHA256", signature, data)
     signature0 = (<<~'end;').unpack("m")[0]
       MCwCFH5h40plgU5Fh0Z4wvEEpz0eE9SnAhRPbkRB8ggsN/vsSEYMXvJwjGg/
 diff --git a/test/openssl/test_pkey_ec.rb b/test/openssl/test_pkey_ec.rb
 index ffe5a94..c06fe6f 100644
 --- a/test/openssl/test_pkey_ec.rb
 +++ b/test/openssl/test_pkey_ec.rb
@@ -98,8 +98,8 @@ class OpenSSL::TestEC < OpenSSL::PKeyTestCase
   def test_sign_verify
     p256 = Fixtures.pkey("p256")
     data = "Sign me!"
 -    signature = p256.sign("SHA1", data)
 -    assert_equal true, p256.verify("SHA1", signature, data)
 +    signature = p256.sign("SHA256", data)
 +    assert_equal true, p256.verify("SHA256", signature, data)
     signature0 = (<<~'end;').unpack("m")[0]
       MEQCIEOTY/hD7eI8a0qlzxkIt8LLZ8uwiaSfVbjX2dPAvN11AiAQdCYx56Fq
 diff --git a/test/openssl/test_pkey_rsa.rb b/test/openssl/test_pkey_rsa.rb
 index 4bb39ed..9e06e43 100644
 --- a/test/openssl/test_pkey_rsa.rb
 +++ b/test/openssl/test_pkey_rsa.rb
@@ -80,8 +80,8 @@ class OpenSSL::TestPKeyRSA < OpenSSL::PKeyTestCase
   def test_sign_verify
     rsa1024 = Fixtures.pkey("rsa1024")
     data = "Sign me!"
 -    signature = rsa1024.sign("SHA1", data)
 -    assert_equal true, rsa1024.verify("SHA1", signature, data)
 +    signature = rsa1024.sign("SHA256", data)
 +    assert_equal true, rsa1024.verify("SHA256", signature, data)
     signature0 = (<<~'end;').unpack("m")[0]
       oLCgbprPvfhM4pjFQiDTFeWI9Sk+Og7Nh9TmIZ/xSxf2CGXQrptlwo7NQ28+
@@ -113,10 +113,10 @@ class OpenSSL::TestPKeyRSA < OpenSSL::PKeyTestCase
   def test_sign_verify_raw
     key = Fixtures.pkey("rsa-1")
     data = "Sign me!"
 -    hash = OpenSSL::Digest.digest("SHA1", data)
 -    signature = key.sign_raw("SHA1", hash)
 -    assert_equal true, key.verify_raw("SHA1", signature, hash)
 -    assert_equal true, key.verify("SHA1", signature, data)
 +    hash = OpenSSL::Digest.digest("SHA256", data)
 +    signature = key.sign_raw("SHA256", hash)
 +    assert_equal true, key.verify_raw("SHA256", signature, hash)
 +    assert_equal true, key.verify("SHA256", signature, data)
     # Too long data
     assert_raise(OpenSSL::PKey::PKeyError) {
@@ -129,9 +129,9 @@ class OpenSSL::TestPKeyRSA < OpenSSL::PKeyTestCase
       "rsa_pss_saltlen" => 20,
       "rsa_mgf1_md" => "SHA256"
     }
 -    sig_pss = key.sign_raw("SHA1", hash, pssopts)
 -    assert_equal true, key.verify("SHA1", sig_pss, data, pssopts)
 -    assert_equal true, key.verify_raw("SHA1", sig_pss, hash, pssopts)
 +    sig_pss = key.sign_raw("SHA256", hash, pssopts)
 +    assert_equal true, key.verify("SHA256", sig_pss, data, pssopts)
 +    assert_equal true, key.verify_raw("SHA256", sig_pss, hash, pssopts)
   end
   def test_sign_verify_raw_legacy
 diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb
 index a7607da..3ba8b39 100644
 --- a/test/openssl/test_ssl.rb
 +++ b/test/openssl/test_ssl.rb
@@ -676,10 +676,16 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
     #     buzz.example.net, respectively).  ...
     assert_equal(true, OpenSSL::SSL.verify_certificate_identity(
       create_cert_with_san('DNS:baz*.example.com'), 'baz1.example.com'))
 +
 +    # LibreSSL 3.5.0+ doesn't support other wildcard certificates
 +    # (it isn't required to, as RFC states MAY, not MUST)
 +    return if libressl?(3, 5, 0)
 +
     assert_equal(true, OpenSSL::SSL.verify_certificate_identity(
       create_cert_with_san('DNS:*baz.example.com'), 'foobaz.example.com'))
     assert_equal(true, OpenSSL::SSL.verify_certificate_identity(
       create_cert_with_san('DNS:b*z.example.com'), 'buzz.example.com'))
 +
     # Section 6.4.3 of RFC6125 states that client should NOT match identifier
     # where wildcard is other than left-most label.
     #
@@ -1563,6 +1569,99 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
     end
   end
 +  def test_ciphersuites_method_tls_connection
 +    ssl_ctx = OpenSSL::SSL::SSLContext.new
 +    if !tls13_supported? || !ssl_ctx.respond_to?(:ciphersuites=)
 +      pend 'TLS 1.3 not supported'
 +    end
 +
 +    csuite = ['TLS_AES_128_GCM_SHA256', 'TLSv1.3', 128, 128]
 +    inputs = [csuite[0], [csuite[0]], [csuite]]
 +
 +    start_server do |port|
 +      inputs.each do |input|
 +        cli_ctx = OpenSSL::SSL::SSLContext.new
 +        cli_ctx.min_version = cli_ctx.max_version = OpenSSL::SSL::TLS1_3_VERSION
 +        cli_ctx.ciphersuites = input
 +
 +        server_connect(port, cli_ctx) do |ssl|
 +          assert_equal('TLSv1.3', ssl.ssl_version)
 +          if libressl?(3, 4, 0) && !libressl?(3, 5, 0)
 +            assert_equal("AEAD-AES128-GCM-SHA256", ssl.cipher[0]) 
 +          else
 +            assert_equal(csuite[0], ssl.cipher[0]) 
 +          end
 +          ssl.puts('abc'); assert_equal("abc\n", ssl.gets)
 +        end
 +      end
 +    end
 +  end
 +
 +  def test_ciphersuites_method_nil_argument
 +    ssl_ctx = OpenSSL::SSL::SSLContext.new
 +    pend 'ciphersuites= method is missing' unless ssl_ctx.respond_to?(:ciphersuites=)
 +
 +    assert_nothing_raised { ssl_ctx.ciphersuites = nil }
 +  end
 +
 +  def test_ciphersuites_method_frozen_object
 +    ssl_ctx = OpenSSL::SSL::SSLContext.new
 +    pend 'ciphersuites= method is missing' unless ssl_ctx.respond_to?(:ciphersuites=)
 +
 +    ssl_ctx.freeze
 +    assert_raise(FrozenError) { ssl_ctx.ciphersuites = 'TLS_AES_256_GCM_SHA384' }
 +  end
 +
 +  def test_ciphersuites_method_bogus_csuite
 +    ssl_ctx = OpenSSL::SSL::SSLContext.new
 +    pend 'ciphersuites= method is missing' unless ssl_ctx.respond_to?(:ciphersuites=)
 +
 +    assert_raise_with_message(
 +      OpenSSL::SSL::SSLError,
 +      /SSL_CTX_set_ciphersuites: no cipher match/i
 +    ) { ssl_ctx.ciphersuites = 'BOGUS' }
 +  end
 +
 +  def test_ciphers_method_tls_connection
 +    csuite = ['ECDHE-RSA-AES256-GCM-SHA384', 'TLSv1.2', 256, 256]
 +    inputs = [csuite[0], [csuite[0]], [csuite]]
 +
 +    start_server do |port|
 +      inputs.each do |input|
 +        cli_ctx = OpenSSL::SSL::SSLContext.new
 +        cli_ctx.min_version = cli_ctx.max_version = OpenSSL::SSL::TLS1_2_VERSION
 +        cli_ctx.ciphers = input
 +
 +        server_connect(port, cli_ctx) do |ssl|
 +          assert_equal('TLSv1.2', ssl.ssl_version)
 +          assert_equal(csuite[0], ssl.cipher[0])
 +          ssl.puts('abc'); assert_equal("abc\n", ssl.gets)
 +        end
 +      end
 +    end
 +  end
 +
 +  def test_ciphers_method_nil_argument
 +    ssl_ctx = OpenSSL::SSL::SSLContext.new
 +    assert_nothing_raised { ssl_ctx.ciphers = nil }
 +  end
 +
 +  def test_ciphers_method_frozen_object
 +    ssl_ctx = OpenSSL::SSL::SSLContext.new
 +
 +    ssl_ctx.freeze
 +    assert_raise(FrozenError) { ssl_ctx.ciphers = 'ECDHE-RSA-AES128-SHA' }
 +  end
 +
 +  def test_ciphers_method_bogus_csuite
 +    ssl_ctx = OpenSSL::SSL::SSLContext.new
 +
 +    assert_raise_with_message(
 +      OpenSSL::SSL::SSLError,
 +      /SSL_CTX_set_cipher_list: no cipher match/i
 +    ) { ssl_ctx.ciphers = 'BOGUS' }
 +  end
 +
   def test_connect_works_when_setting_dh_callback_to_nil
     ctx_proc = -> ctx {
       ctx.max_version = :TLS1_2
 diff --git a/test/openssl/test_x509cert.rb b/test/openssl/test_x509cert.rb
 index d696b98..4e2bd0c 100644
 --- a/test/openssl/test_x509cert.rb
 +++ b/test/openssl/test_x509cert.rb
@@ -180,6 +180,7 @@ class OpenSSL::TestX509Certificate < OpenSSL::TestCase
     assert_equal(false, certificate_error_returns_false { cert.verify(@dsa512) })
     cert.serial = 2
     assert_equal(false, cert.verify(@rsa2048))
 +  rescue OpenSSL::X509::CertificateError # RHEL 9 disables SHA1
   end
   def test_sign_and_verify_rsa_md5
@@ -226,9 +227,8 @@ class OpenSSL::TestX509Certificate < OpenSSL::TestCase
     assert_equal("dsa_with_SHA256", cert.signature_algorithm)
     # TODO: need more tests for dsa + sha2
 -    # SHA1 is allowed from OpenSSL 1.0.0 (0.9.8 requires DSS1)
 -    cert = issue_cert(@ca, @dsa256, 1, [], nil, nil, digest: "sha1")
 -    assert_equal("dsaWithSHA1", cert.signature_algorithm)
 +    cert = issue_cert(@ca, @dsa256, 1, [], nil, nil, digest: "sha512")
 +    assert_equal("dsa_with_SHA512", cert.signature_algorithm)
   end
   def test_check_private_key
 diff --git a/test/openssl/test_x509crl.rb b/test/openssl/test_x509crl.rb
 index bcdb0a6..146ee07 100644
 --- a/test/openssl/test_x509crl.rb
 +++ b/test/openssl/test_x509crl.rb
@@ -20,7 +20,7 @@ class OpenSSL::TestX509CRL < OpenSSL::TestCase
     cert = issue_cert(@ca, @rsa2048, 1, [], nil, nil)
     crl = issue_crl([], 1, now, now+1600, [],
 -                    cert, @rsa2048, OpenSSL::Digest.new('SHA1'))
 +                    cert, @rsa2048, OpenSSL::Digest.new('SHA256'))
     assert_equal(1, crl.version)
     assert_equal(cert.issuer.to_der, crl.issuer.to_der)
     assert_equal(now, crl.last_update)
@@ -57,7 +57,7 @@ class OpenSSL::TestX509CRL < OpenSSL::TestCase
     ]
     cert = issue_cert(@ca, @rsa2048, 1, [], nil, nil)
     crl = issue_crl(revoke_info, 1, Time.now, Time.now+1600, [],
 -                    cert, @rsa2048, OpenSSL::Digest.new('SHA1'))
 +                    cert, @rsa2048, OpenSSL::Digest.new('SHA256'))
     revoked = crl.revoked
     assert_equal(5, revoked.size)
     assert_equal(1, revoked[0].serial)
@@ -98,7 +98,7 @@ class OpenSSL::TestX509CRL < OpenSSL::TestCase
     revoke_info = (1..1000).collect{|i| [i, now, 0] }
     crl = issue_crl(revoke_info, 1, Time.now, Time.now+1600, [],
 -                    cert, @rsa2048, OpenSSL::Digest.new('SHA1'))
 +                    cert, @rsa2048, OpenSSL::Digest.new('SHA256'))
     revoked = crl.revoked
     assert_equal(1000, revoked.size)
     assert_equal(1, revoked[0].serial)
@@ -124,7 +124,7 @@ class OpenSSL::TestX509CRL < OpenSSL::TestCase
     cert = issue_cert(@ca, @rsa2048, 1, cert_exts, nil, nil)
     crl = issue_crl([], 1, Time.now, Time.now+1600, crl_exts,
 -                    cert, @rsa2048, OpenSSL::Digest.new('SHA1'))
 +                    cert, @rsa2048, OpenSSL::Digest.new('SHA256'))
     exts = crl.extensions
     assert_equal(3, exts.size)
     assert_equal("1", exts[0].value)
@@ -160,24 +160,24 @@ class OpenSSL::TestX509CRL < OpenSSL::TestCase
     assert_equal(false, exts[2].critical?)
     no_ext_crl = issue_crl([], 1, Time.now, Time.now+1600, [],
 -      cert, @rsa2048, OpenSSL::Digest.new('SHA1'))
 +      cert, @rsa2048, OpenSSL::Digest.new('SHA256'))
     assert_equal nil, no_ext_crl.authority_key_identifier
   end
   def test_crlnumber
     cert = issue_cert(@ca, @rsa2048, 1, [], nil, nil)
     crl = issue_crl([], 1, Time.now, Time.now+1600, [],
 -                    cert, @rsa2048, OpenSSL::Digest.new('SHA1'))
 +                    cert, @rsa2048, OpenSSL::Digest.new('SHA256'))
     assert_match(1.to_s, crl.extensions[0].value)
     assert_match(/X509v3 CRL Number:\s+#{1}/m, crl.to_text)
     crl = issue_crl([], 2**32, Time.now, Time.now+1600, [],
 -                    cert, @rsa2048, OpenSSL::Digest.new('SHA1'))
 +                    cert, @rsa2048, OpenSSL::Digest.new('SHA256'))
     assert_match((2**32).to_s, crl.extensions[0].value)
     assert_match(/X509v3 CRL Number:\s+#{2**32}/m, crl.to_text)
     crl = issue_crl([], 2**100, Time.now, Time.now+1600, [],
 -                    cert, @rsa2048, OpenSSL::Digest.new('SHA1'))
 +                    cert, @rsa2048, OpenSSL::Digest.new('SHA256'))
     assert_match(/X509v3 CRL Number:\s+#{2**100}/m, crl.to_text)
     assert_match((2**100).to_s, crl.extensions[0].value)
   end
@@ -185,7 +185,7 @@ class OpenSSL::TestX509CRL < OpenSSL::TestCase
   def test_sign_and_verify
     cert = issue_cert(@ca, @rsa2048, 1, [], nil, nil)
     crl = issue_crl([], 1, Time.now, Time.now+1600, [],
 -                    cert, @rsa2048, OpenSSL::Digest.new('SHA1'))
 +                    cert, @rsa2048, OpenSSL::Digest.new('SHA256'))
     assert_equal(false, crl.verify(@rsa1024))
     assert_equal(true,  crl.verify(@rsa2048))
     assert_equal(false, crl_error_returns_false { crl.verify(@dsa256) })
@@ -195,7 +195,7 @@ class OpenSSL::TestX509CRL < OpenSSL::TestCase
     cert = issue_cert(@ca, @dsa512, 1, [], nil, nil)
     crl = issue_crl([], 1, Time.now, Time.now+1600, [],
 -                    cert, @dsa512, OpenSSL::Digest.new('SHA1'))
 +                    cert, @dsa512, OpenSSL::Digest.new('SHA256'))
     assert_equal(false, crl_error_returns_false { crl.verify(@rsa1024) })
     assert_equal(false, crl_error_returns_false { crl.verify(@rsa2048) })
     assert_equal(false, crl.verify(@dsa256))
 diff --git a/test/openssl/test_x509req.rb b/test/openssl/test_x509req.rb
 index ee9c678..a84b162 100644
 --- a/test/openssl/test_x509req.rb
 +++ b/test/openssl/test_x509req.rb
@@ -23,31 +23,31 @@ class OpenSSL::TestX509Request < OpenSSL::TestCase
   end
   def test_public_key
 -    req = issue_csr(0, @dn, @rsa1024, OpenSSL::Digest.new('SHA1'))
 +    req = issue_csr(0, @dn, @rsa1024, OpenSSL::Digest.new('SHA256'))
     assert_equal(@rsa1024.public_key.to_der, req.public_key.to_der)
     req = OpenSSL::X509::Request.new(req.to_der)
     assert_equal(@rsa1024.public_key.to_der, req.public_key.to_der)
 -    req = issue_csr(0, @dn, @dsa512, OpenSSL::Digest.new('SHA1'))
 +    req = issue_csr(0, @dn, @dsa512, OpenSSL::Digest.new('SHA256'))
     assert_equal(@dsa512.public_key.to_der, req.public_key.to_der)
     req = OpenSSL::X509::Request.new(req.to_der)
     assert_equal(@dsa512.public_key.to_der, req.public_key.to_der)
   end
   def test_version
 -    req = issue_csr(0, @dn, @rsa1024, OpenSSL::Digest.new('SHA1'))
 +    req = issue_csr(0, @dn, @rsa1024, OpenSSL::Digest.new('SHA256'))
     assert_equal(0, req.version)
     req = OpenSSL::X509::Request.new(req.to_der)
     assert_equal(0, req.version)
 -    req = issue_csr(1, @dn, @rsa1024, OpenSSL::Digest.new('SHA1'))
 +    req = issue_csr(1, @dn, @rsa1024, OpenSSL::Digest.new('SHA256'))
     assert_equal(1, req.version)
     req = OpenSSL::X509::Request.new(req.to_der)
     assert_equal(1, req.version)
   end
   def test_subject
 -    req = issue_csr(0, @dn, @rsa1024, OpenSSL::Digest.new('SHA1'))
 +    req = issue_csr(0, @dn, @rsa1024, OpenSSL::Digest.new('SHA256'))
     assert_equal(@dn.to_der, req.subject.to_der)
     req = OpenSSL::X509::Request.new(req.to_der)
     assert_equal(@dn.to_der, req.subject.to_der)
@@ -78,9 +78,9 @@ class OpenSSL::TestX509Request < OpenSSL::TestCase
       OpenSSL::X509::Attribute.new("msExtReq", attrval),
     ]
 -    req0 = issue_csr(0, @dn, @rsa1024, OpenSSL::Digest.new('SHA1'))
 +    req0 = issue_csr(0, @dn, @rsa1024, OpenSSL::Digest.new('SHA256'))
     attrs.each{|attr| req0.add_attribute(attr) }
 -    req1 = issue_csr(0, @dn, @rsa1024, OpenSSL::Digest.new('SHA1'))
 +    req1 = issue_csr(0, @dn, @rsa1024, OpenSSL::Digest.new('SHA256'))
     req1.attributes = attrs
     assert_equal(req0.to_der, req1.to_der)
@@ -101,7 +101,7 @@ class OpenSSL::TestX509Request < OpenSSL::TestCase
   end
   def test_sign_and_verify_rsa_sha1
 -    req = issue_csr(0, @dn, @rsa1024, OpenSSL::Digest.new('SHA1'))
 +    req = issue_csr(0, @dn, @rsa1024, OpenSSL::Digest.new('SHA256'))
     assert_equal(true,  req.verify(@rsa1024))
     assert_equal(false, req.verify(@rsa2048))
     assert_equal(false, request_error_returns_false { req.verify(@dsa256) })
@@ -122,7 +122,7 @@ class OpenSSL::TestX509Request < OpenSSL::TestCase
   end
   def test_sign_and_verify_dsa
 -    req = issue_csr(0, @dn, @dsa512, OpenSSL::Digest.new('SHA1'))
 +    req = issue_csr(0, @dn, @dsa512, OpenSSL::Digest.new('SHA256'))
     assert_equal(false, request_error_returns_false { req.verify(@rsa1024) })
     assert_equal(false, request_error_returns_false { req.verify(@rsa2048) })
     assert_equal(false, req.verify(@dsa256))
@@ -137,13 +137,13 @@ class OpenSSL::TestX509Request < OpenSSL::TestCase
   end
   def test_dup
 -    req = issue_csr(0, @dn, @rsa1024, OpenSSL::Digest.new('SHA1'))
 +    req = issue_csr(0, @dn, @rsa1024, OpenSSL::Digest.new('SHA256'))
     assert_equal(req.to_der, req.dup.to_der)
   end
   def test_eq
 -    req1 = issue_csr(0, @dn, @rsa1024, "sha1")
 -    req2 = issue_csr(0, @dn, @rsa1024, "sha1")
 +    req1 = issue_csr(0, @dn, @rsa1024, "sha512")
 +    req2 = issue_csr(0, @dn, @rsa1024, "sha512")
     req3 = issue_csr(0, @dn, @rsa1024, "sha256")
     assert_equal false, req1 == 12345
--- a/SOURCES/ruby-3.1.3-Fix-for-tzdata-2022g.patch
+++ b/SOURCES/ruby-3.1.3-Fix-for-tzdata-2022g.patch
@ -17,19 +17,19 @@ diff --git a/test/ruby/test_time_tz.rb b/test/ruby/test_time_tz.rb
 index b6785f336028d..939f218ed4d10 100644
 --- a/test/ruby/test_time_tz.rb
 +++ b/test/ruby/test_time_tz.rb
-@@ -6,9 +6,9 @@ class TestTimeTZ < Test::Unit::TestCase
+@@ -7,9 +7,9 @@ class TestTimeTZ < Test::Unit::TestCase
   has_lisbon_tz = true
   force_tz_test = ENV["RUBY_FORCE_TIME_TZ_TEST"] == "yes"
   case RUBY_PLATFORM
 -  when /linux/
 +  when /darwin|linux/
     force_tz_test = true
-  when /darwin|freebsd/
+-  when /darwin|freebsd|openbsd/
 +  when /freebsd|openbsd/
     has_lisbon_tz = false
     force_tz_test = true
   end
-@@ -94,6 +94,9 @@ def group_by(e, &block)
+@@ -95,6 +95,9 @@ def group_by(e, &block)
   CORRECT_KIRITIMATI_SKIP_1994 = with_tz("Pacific/Kiritimati") {
     Time.local(1994, 12, 31, 0, 0, 0).year == 1995
   }
@ -39,7 +39,7 @@ index b6785f336028d..939f218ed4d10 100644
   def time_to_s(t)
     t.to_s
-@@ -139,9 +142,12 @@ def test_america_managua
+@@ -140,9 +143,12 @@ def test_america_managua
   def test_asia_singapore
     with_tz(tz="Asia/Singapore") {
@ -55,7 +55,7 @@ index b6785f336028d..939f218ed4d10 100644
       assert_time_constructor(tz, "1982-01-01 00:30:00 +0800", :local, [1982,1,1,0,30,0])
     }
   end
-@@ -364,8 +370,11 @@ def self.gen_zdump_test(data)
+@@ -450,8 +456,11 @@ def self.gen_zdump_test(data)
 America/Managua  Wed Jan  1 04:59:59 1997 UTC = Tue Dec 31 23:59:59 1996 EST isdst=0 gmtoff=-18000
 America/Managua  Wed Jan  1 05:00:00 1997 UTC = Tue Dec 31 23:00:00 1996 CST isdst=0 gmtoff=-21600
 Asia/Singapore  Sun Aug  8 16:30:00 1965 UTC = Mon Aug  9 00:00:00 1965 SGT isdst=0 gmtoff=27000
--- a/ruby-3.2.0-Build-extension-libraries-in-bundled-gems.patch
+++ b/ruby-3.2.0-Build-extension-libraries-in-bundled-gems.patch
@ -0,0 +1,338 @@
 From 111f8422427d78becc9183ae149b2105a16bf327 Mon Sep 17 00:00:00 2001
 From: Nobuyoshi Nakada <nobu@ruby-lang.org>
 Date: Tue, 5 Apr 2022 23:24:00 +0900
 Subject: [PATCH 1/5] Bundled gems are expanded under `.bundle/gems` now
 ---
 ext/extmk.rb          | 13 +++++++------
 template/exts.mk.tmpl |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)
 diff --git a/ext/extmk.rb b/ext/extmk.rb
 index 4a087f294ac9..1da9e2704521 100755
 --- a/ext/extmk.rb
 +++ b/ext/extmk.rb
@@ -146,7 +146,7 @@ def extmake(target, basedir = 'ext', maybestatic = true)
     top_srcdir = $top_srcdir
     topdir = $topdir
     hdrdir = $hdrdir
 -    prefix = "../" * (target.count("/")+1)
 +    prefix = "../" * (basedir.count("/")+target.count("/")+1)
     $top_srcdir = relative_from(top_srcdir, prefix)
     $hdrdir = relative_from(hdrdir, prefix)
     $topdir = prefix + $topdir
@@ -460,10 +460,11 @@ def $mflags.defined?(var)
 end unless $extstatic
 @gemname = nil
 -if ARGV[0]
 -  ext_prefix, exts = ARGV.shift.split('/', 2)
 +if exts = ARGV.shift
 +  ext_prefix = exts[%r[\A(?>\.bundle/)?[^/]+(?:/(?=(.+)?)|\z)]]
 +  exts = $1
   $extension = [exts] if exts
 -  if ext_prefix == 'gems'
 +  if ext_prefix.start_with?('.')
     @gemname = exts
   elsif exts
     $static_ext.delete_if {|t, *| !File.fnmatch(t, exts)}
@@ -515,7 +516,7 @@ def $mflags.defined?(var)
     exts.delete_if {|d| File.fnmatch?("-*", d)}
   end
 end
 -ext_prefix = File.basename(ext_prefix)
 +ext_prefix = ext_prefix[$top_srcdir.size+1..-2]
 extend Module.new {
   def timestamp_file(name, target_prefix = nil)
@@ -634,7 +635,7 @@ def initialize(src)
   end
 }
 -Dir.chdir ".."
 +Dir.chdir dir
 unless $destdir.to_s.empty?
   $mflags.defined?("DESTDIR") or $mflags << "DESTDIR=#{$destdir}"
 end
 diff --git a/template/exts.mk.tmpl b/template/exts.mk.tmpl
 index 2f37f4480ac5..964939e365a1 100644
 --- a/template/exts.mk.tmpl
 +++ b/template/exts.mk.tmpl
@@ -25,7 +25,7 @@ macros["old_extensions"] = []
 contpat = /(?>(?>[^\\\n]|\\.)*\\\n)*(?>[^\\\n]|\\.)*/
 Dir.glob("{ext,.bundle/gems}/*/exts.mk") do |e|
 -  gem = /\Agems(?=\/)/ =~ e
 +  gem = e.start_with?(".bundle/gems/")
   s = File.read(e)
   s.scan(/^(extensions|SUBMAKEOPTS|EXT[A-Z]+|MFLAGS|NOTE_[A-Z]+)[ \t]*=[ \t]*(#{contpat})$/o) do |n, v|
     v.gsub!(/\\\n[ \t]*/, ' ')
 From 6ea34cac22131d28a9cc50e7875e854aed9bdb88 Mon Sep 17 00:00:00 2001
 From: Nobuyoshi Nakada <nobu@ruby-lang.org>
 Date: Wed, 6 Apr 2022 20:25:53 +0900
 Subject: [PATCH 2/5] Retrieve configured gems info
 ---
 template/configure-ext.mk.tmpl | 2 +-
 template/exts.mk.tmpl          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 diff --git a/template/configure-ext.mk.tmpl b/template/configure-ext.mk.tmpl
 index 6636a7759c54..8ba6b963e3ec 100644
 --- a/template/configure-ext.mk.tmpl
 +++ b/template/configure-ext.mk.tmpl
@@ -27,7 +27,7 @@ SCRIPT_ARGS = <%=script_args.gsub("#", "\\#")%>
 EXTMK_ARGS = $(SCRIPT_ARGS) --gnumake=$(gnumake) --extflags="$(EXTLDFLAGS)" \
 	   --make-flags="MINIRUBY='$(MINIRUBY)'"
 -all: exts # gems
 +all: exts gems
 exts:
 gems:
 diff --git a/template/exts.mk.tmpl b/template/exts.mk.tmpl
 index 964939e365a1..e544c4c88bd7 100644
 --- a/template/exts.mk.tmpl
 +++ b/template/exts.mk.tmpl
@@ -19,7 +19,7 @@ opt = OptionParser.new do |o|
   o.on('--configure-exts=FILE') {|v| confexts = v}
   o.order!(ARGV)
 end
 -confexts &&= File.read(confexts).scan(/^exts: (.*\.mk)/).flatten rescue nil
 +confexts &&= File.read(confexts).scan(/^(?:ext|gem)s: (.*\.mk)/).flatten rescue nil
 confexts ||= []
 macros["old_extensions"] = []
@@ -30,7 +30,7 @@ Dir.glob("{ext,.bundle/gems}/*/exts.mk") do |e|
   s.scan(/^(extensions|SUBMAKEOPTS|EXT[A-Z]+|MFLAGS|NOTE_[A-Z]+)[ \t]*=[ \t]*(#{contpat})$/o) do |n, v|
     v.gsub!(/\\\n[ \t]*/, ' ')
     next if v.empty?
 -    next if gem and n != "extensions"
 +    next if n != "extensions"
     n = "old_extensions" if n == "extensions" and !confexts.include?(e)
     v = v.split
     m = macros[n] ||= []
 From be9d00ee7c72766551ba8c3530f1538034498a6a Mon Sep 17 00:00:00 2001
 From: Nobuyoshi Nakada <nobu@ruby-lang.org>
 Date: Wed, 6 Apr 2022 20:28:00 +0900
 Subject: [PATCH 3/5] Move the target directory of bundled gems like as
 rubygems
 ---
 ext/extmk.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
 diff --git a/ext/extmk.rb b/ext/extmk.rb
 index 1da9e2704521..a440af27fc5d 100755
 --- a/ext/extmk.rb
 +++ b/ext/extmk.rb
@@ -2,6 +2,9 @@
 # -*- mode: ruby; coding: us-ascii -*-
 # frozen_string_literal: false
 +module Gem; end # only needs Gem::Platform
 +require 'rubygems/platform'
 +
 # :stopdoc:
 $extension = nil
 $extstatic = nil
@@ -535,11 +538,12 @@ def create_makefile(*args, &block)
     super(*args) do |conf|
       conf.find do |s|
         s.sub!(/^(TARGET_SO_DIR *= *)\$\(RUBYARCHDIR\)/) {
 -          "TARGET_GEM_DIR = $(extout)/gems/$(arch)/#{@gemname}\n"\
 +          "TARGET_GEM_DIR = $(topdir)/.bundle/extensions/$(gem_platform)/$(ruby_version)/#{@gemname}\n"\
           "#{$1}$(TARGET_GEM_DIR)$(target_prefix)"
         }
       end
       conf.any? {|s| /^TARGET *= *\S/ =~ s} and conf << %{
 +gem_platform = #{Gem::Platform.local}
 # default target
 all:
 From c4daf8e445925695c34bab8bf5135dcd1e8575a3 Mon Sep 17 00:00:00 2001
 From: Nobuyoshi Nakada <nobu@ruby-lang.org>
 Date: Wed, 6 Apr 2022 22:57:01 +0900
 Subject: [PATCH 4/5] Obey spec file locations to rubygems
 ---
 common.mk          | 3 ++-
 defs/gmake.mk      | 2 +-
 tool/gem-unpack.rb | 5 +++--
 3 files changed, 6 insertions(+), 4 deletions(-)
 diff --git a/common.mk b/common.mk
 index 7c552cba1e04..b4adb2729c0e 100644
 --- a/common.mk
 +++ b/common.mk
@@ -1359,10 +1359,11 @@ extract-gems$(gnumake:yes=-nongnumake): PHONY
 	$(Q) $(RUNRUBY) -C "$(srcdir)" \
 	    -Itool -rgem-unpack -answ \
 	    -e 'BEGIN {FileUtils.mkdir_p(d = ".bundle/gems")}' \
 +	    -e 'BEGIN {FileUtils.mkdir_p(s = ".bundle/specifications")}' \
 	    -e 'gem, ver = *$$F' \
 	    -e 'next if !ver or /^#/=~gem' \
 	    -e 'g = "#{gem}-#{ver}"' \
 -	    -e 'File.directory?("#{d}/#{g}") or Gem.unpack("gems/#{g}.gem", d)' \
 +	    -e 'File.directory?("#{d}/#{g}") or Gem.unpack("gems/#{g}.gem", d, s)' \
 	    gems/bundled_gems
 update-bundled_gems: PHONY
 diff --git a/defs/gmake.mk b/defs/gmake.mk
 index a625379a6804..27e3e21cc4d6 100644
 --- a/defs/gmake.mk
 +++ b/defs/gmake.mk
@@ -290,7 +290,7 @@ extract-gems: | $(patsubst %,.bundle/gems/%,$(bundled-gems))
 	$(ECHO) Extracting bundle gem $*...
 	$(Q) $(BASERUBY) -C "$(srcdir)" \
 	    -Itool -rgem-unpack \
 -	    -e 'Gem.unpack("gems/$(@F).gem", ".bundle/gems")'
 +	    -e 'Gem.unpack("gems/$(@F).gem", ".bundle/gems", ".bundle/specifications")'
 $(srcdir)/.bundle/gems:
 	$(MAKEDIRS) $@
 diff --git a/tool/gem-unpack.rb b/tool/gem-unpack.rb
 index cb05719463f2..fe10b0e420fa 100644
 --- a/tool/gem-unpack.rb
 +++ b/tool/gem-unpack.rb
@@ -5,13 +5,14 @@
 # This library is used by "make extract-gems" to
 # unpack bundled gem files.
 -def Gem.unpack(file, dir = nil)
 +def Gem.unpack(file, dir = nil, spec_dir = nil)
   pkg = Gem::Package.new(file)
   spec = pkg.spec
   target = spec.full_name
   target = File.join(dir, target) if dir
   pkg.extract_files target
 -  spec_file = File.join(target, "#{spec.name}-#{spec.version}.gemspec")
 +  FileUtils.mkdir_p(spec_dir ||= target)
 +  spec_file = File.join(spec_dir, "#{spec.name}-#{spec.version}.gemspec")
   open(spec_file, 'wb') do |f|
     f.print spec.to_ruby
   end
 From 3de652d8198be9cd2998c095903889a80e738275 Mon Sep 17 00:00:00 2001
 From: Nobuyoshi Nakada <nobu@ruby-lang.org>
 Date: Thu, 7 Apr 2022 01:44:43 +0900
 Subject: [PATCH 5/5] Install built gem extension binaries
 ---
 tool/rbinstall.rb | 56 ++++++++++++++---------------------------------
 1 file changed, 16 insertions(+), 40 deletions(-)
 diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
 index 9d9b672be472..624961b4eee6 100755
 --- a/tool/rbinstall.rb
 +++ b/tool/rbinstall.rb
@@ -858,6 +858,9 @@ class UnpackedInstaller < GemInstaller
     def write_cache_file
     end
 +    def build_extensions
 +    end
 +
     def shebang(bin_file_name)
       path = File.join(gem_dir, spec.bindir, bin_file_name)
       first_line = File.open(path, "rb") {|file| file.gets}
@@ -940,13 +943,12 @@ def ensure_writable_dir(dir)
   install_default_gem('ext', srcdir, bindir)
 end
 -def load_gemspec(file, expanded = false)
 +def load_gemspec(file, base = nil)
   file = File.realpath(file)
   code = File.read(file, encoding: "utf-8:-")
   code.gsub!(/(?:`git[^\`]*`|%x\[git[^\]]*\])\.split\([^\)]*\)/m) do
     files = []
 -    if expanded
 -      base = File.dirname(file)
 +    if base
       Dir.glob("**/*", File::FNM_DOTMATCH, base: base) do |n|
         case File.basename(n); when ".", ".."; next; end
         next if File.directory?(File.join(base, n))
@@ -959,7 +961,7 @@ def load_gemspec(file, expanded = false)
   unless Gem::Specification === spec
     raise TypeError, "[#{file}] isn't a Gem::Specification (#{spec.class} instead)."
   end
 -  spec.loaded_from = file
 +  spec.loaded_from = base ? File.join(base, File.basename(file)) : file
   spec.files.reject! {|n| n.end_with?(".gemspec") or n.start_with?(".git")}
   spec
@@ -1014,20 +1016,6 @@ def install_default_gem(dir, srcdir, bindir)
 end
 install?(:ext, :comm, :gem, :'bundled-gems') do
 -  if CONFIG['CROSS_COMPILING'] == 'yes'
 -    # The following hacky steps set "$ruby = BASERUBY" in tool/fake.rb
 -    $hdrdir = ''
 -    $extmk = nil
 -    $ruby = nil  # ...
 -    ruby_path = $ruby + " -I#{Dir.pwd}" # $baseruby + " -I#{Dir.pwd}"
 -  else
 -    # ruby_path = File.expand_path(with_destdir(File.join(bindir, ruby_install_name)))
 -    ENV['RUBYLIB'] = nil
 -    ENV['RUBYOPT'] = nil
 -    ruby_path = File.expand_path(with_destdir(File.join(bindir, ruby_install_name))) + " --disable=gems -I#{with_destdir(archlibdir)}"
 -  end
 -  Gem.instance_variable_set(:@ruby, ruby_path) if Gem.ruby != ruby_path
 -
   gem_dir = Gem.default_dir
   install_dir = with_destdir(gem_dir)
   prepare "bundled gems", gem_dir
@@ -1047,40 +1035,28 @@ def install_default_gem(dir, srcdir, bindir)
     :wrappers => true,
     :format_executable => true,
   }
 -  gem_ext_dir = "#$extout/gems/#{CONFIG['arch']}"
 -  extensions_dir = with_destdir(Gem::StubSpecification.gemspec_stub("", gem_dir, gem_dir).extensions_dir)
 +
 +  extensions_dir = Gem::StubSpecification.gemspec_stub("", gem_dir, gem_dir).extensions_dir
 +  specifications_dir = File.join(gem_dir, "specifications")
 +  build_dir = Gem::StubSpecification.gemspec_stub("", ".bundle", ".bundle").extensions_dir
   File.foreach("#{srcdir}/gems/bundled_gems") do |name|
     next if /^\s*(?:#|$)/ =~ name
     next unless /^(\S+)\s+(\S+).*/ =~ name
     gem_name = "#$1-#$2"
 -    path = "#{srcdir}/.bundle/gems/#{gem_name}/#{gem_name}.gemspec"
 -    if File.exist?(path)
 -      spec = load_gemspec(path)
 -    else
 -      path = "#{srcdir}/.bundle/gems/#{gem_name}/#$1.gemspec"
 -      next unless File.exist?(path)
 -      spec = load_gemspec(path, true)
 -    end
 +    path = "#{srcdir}/.bundle/specifications/#{gem_name}.gemspec"
 +    next unless File.exist?(path)
 +    spec = load_gemspec(path, "#{srcdir}/.bundle/gems/#{gem_name}")
     next unless spec.platform == Gem::Platform::RUBY
     next unless spec.full_name == gem_name
 -    if !spec.extensions.empty? && CONFIG["EXTSTATIC"] == "static"
 -      puts "skip installation of #{spec.name} #{spec.version}; bundled gem with an extension library is not supported on --with-static-linked-ext"
 -      next
 -    end
     spec.extension_dir = "#{extensions_dir}/#{spec.full_name}"
 -    if File.directory?(ext = "#{gem_ext_dir}/#{spec.full_name}")
 -      spec.extensions[0] ||= "-"
 -    end
     package = RbInstall::DirPackage.new spec
     ins = RbInstall::UnpackedInstaller.new(package, options)
     puts "#{INDENT}#{spec.name} #{spec.version}"
     ins.install
 -    unless $dryrun
 -      File.chmod($data_mode, File.join(install_dir, "specifications", "#{spec.full_name}.gemspec"))
 -    end
 -    unless spec.extensions.empty?
 -      install_recursive(ext, spec.extension_dir)
 +    install_recursive("#{build_dir}/#{gem_name}", "#{extensions_dir}/#{gem_name}") do |src, dest|
 +      # puts "#{INDENT}    #{dest[extensions_dir.size+gem_name.size+2..-1]}"
 +      install src, dest, :mode => (File.executable?(src) ? $prog_mode : $data_mode)
     end
     installed_gems[spec.full_name] = true
   end
--- a/ruby-3.2.0-Detect-compaction-support-during-runtime.patch
+++ b/ruby-3.2.0-Detect-compaction-support-during-runtime.patch
@ -0,0 +1,256 @@
 From 4d9cc9afa47981520d991d19fd78b322f1ba9f2a Mon Sep 17 00:00:00 2001
 From: Jarek Prokop <jprokop@redhat.com>
 Date: Wed, 22 Jun 2022 01:03:49 +0200
 Subject: [PATCH] Detect compaction support during runtime.
 The patch is created by backporting 3 commits from
 the upstream Ruby master branch in the chronological order below.
 https://github.com/ruby/ruby/commit/52d42e702375446746164a0251e1a10bce813b78
 https://github.com/ruby/ruby/commit/79eaaf2d0b641710613f16525e4b4c439dfe854e
 https://github.com/ruby/ruby/commit/2c190863239bee3f54cfb74b16bb6ea4cae6ed20
 == How to create this patch ==
 Download Ruby source code.
 ```
 $ git clone https://github.com/ruby/ruby.git
 $ cd ruby
 ```
 First create a commit squashed from the 3 commits above.
 Checkout the second commmit above, and create a temporary branch.
 ```
 $ git checkout 79eaaf2d0b641710613f16525e4b4c439dfe854e
 $ git checkout -b wip/detect-compaction-runtime-tmp
 ```
 Cherry pick the third commit on the second commit.
 ```
 $ git cherry-pick 2c190863239bee3f54cfb74b16bb6ea4cae6ed20
 ```
 Squash the last 3 commits on the branch.
 ```
 $ git rebase -i 2223eb082afa6d05321b69df783d4133b9aacba6
 ```
 Then checkout Ruby 3.1.2 branch.
 Create a new branch.
 Merge the Fedora Ruby's
 ruby-3.2.0-define-unsupported-gc-compaction-methods-as-rb_f_notimplement.patch.
 ```
 $ git checkout v3_1_2
 $ git checkout -b wip/detect-compaction-runtime
 $ patch -p1 <
 ~/fed/ruby/ruby-3.2.0-define-unsupported-gc-compaction-methods-as-rb_f_notimplement.patch
 $ git add gc.c gc.rb test/ruby/test_gc_compact.rb
 $ git commit
 ```
 Merge the squashed one commit on the
 `wip/detect-compaction-runtime-tmp` branch
 into the `wip/detect-compaction-runtime` branch.
 ```
 $ git cherry-pick <the squashed commit above>
 ```
 Fix conflicts seeing the difference by `git show <the squashed commit
 above>`
 on another terminal.
 ```
 $ vi gc.c
 $ git add gc.c
 $ git commit
 ```
 == Original commit messages ==
 This is a combination of 3 commits.
 This is the 1st commit message:
 ~~~
 Rename GC_COMPACTION_SUPPORTED
 Naming this macro GC_COMPACTION_SUPPORTED is misleading because it
 only checks whether compaction is supported at compile time.
 [Bug #18829]
 ~~~
 This is the commit message #2:
 ~~~
 Include runtime checks for compaction support
 Commit 0c36ba53192c5a0d245c9b626e4346a32d7d144e changed GC compaction
 methods to not be implemented when not supported. However, that commit
 only does compile time checks (which currently only checks for WASM),
 but there are additional compaction support checks during run time.
 This commit changes it so that GC compaction methods aren't defined
 during run time if the platform does not support GC compaction.
 [Bug #18829]
 ~~~
 This is the commit message #3:
 ~~~
 Suppress code unused unless GC_CAN_COMPILE_COMPACTION
 ~~~
 ---
 gc.c | 63 +++++++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 43 insertions(+), 20 deletions(-)
 diff --git a/gc.c b/gc.c
 index 1c35856c44..bff0666a17 100644
 --- a/gc.c
 +++ b/gc.c
@@ -4980,6 +4980,23 @@ gc_unprotect_pages(rb_objspace_t *objspace, rb_heap_t *heap)
 static void gc_update_references(rb_objspace_t * objspace);
 static void invalidate_moved_page(rb_objspace_t *objspace, struct heap_page *page);
 +#ifndef GC_CAN_COMPILE_COMPACTION
 +#if defined(__wasi__) /* WebAssembly doesn't support signals */
 +# define GC_CAN_COMPILE_COMPACTION 0
 +#else
 +# define GC_CAN_COMPILE_COMPACTION 1
 +#endif
 +#endif
 +
 +#if defined(__MINGW32__) || defined(_WIN32)
 +# define GC_COMPACTION_SUPPORTED 1
 +#else
 +/* If not MinGW, Windows, or does not have mmap, we cannot use mprotect for
 + * the read barrier, so we must disable compaction. */
 +# define GC_COMPACTION_SUPPORTED (GC_CAN_COMPILE_COMPACTION && USE_MMAP_ALIGNED_ALLOC)
 +#endif
 +
 +#if GC_CAN_COMPILE_COMPACTION
 static void
 read_barrier_handler(uintptr_t address)
 {
@@ -5000,6 +5017,7 @@ read_barrier_handler(uintptr_t address)
     }
     RB_VM_LOCK_LEAVE();
 }
 +#endif
 #if defined(_WIN32)
 static LPTOP_LEVEL_EXCEPTION_FILTER old_handler;
@@ -9250,13 +9268,7 @@ gc_start_internal(rb_execution_context_t *ec, VALUE self, VALUE full_mark, VALUE
     /* For now, compact implies full mark / sweep, so ignore other flags */
     if (RTEST(compact)) {
 -        /* If not MinGW, Windows, or does not have mmap, we cannot use mprotect for
 -         * the read barrier, so we must disable compaction. */
 -#if !defined(__MINGW32__) && !defined(_WIN32)
 -        if (!USE_MMAP_ALIGNED_ALLOC) {
 -            rb_raise(rb_eNotImpError, "Compaction isn't available on this platform");
 -        }
 -#endif
 +        GC_ASSERT(GC_COMPACTION_SUPPORTED);
         reason |= GPR_FLAG_COMPACT;
     }
@@ -9421,7 +9433,7 @@ gc_move(rb_objspace_t *objspace, VALUE scan, VALUE free, size_t slot_size)
     return (VALUE)src;
 }
 -#if GC_COMPACTION_SUPPORTED
 +#if GC_CAN_COMPILE_COMPACTION
 static int
 compare_free_slots(const void *left, const void *right, void *dummy)
 {
@@ -10149,7 +10161,7 @@ gc_update_references(rb_objspace_t *objspace)
     gc_update_table_refs(objspace, finalizer_table);
 }
 -#if GC_COMPACTION_SUPPORTED
 +#if GC_CAN_COMPILE_COMPACTION
 /*
  *  call-seq:
  *     GC.latest_compact_info -> {:considered=>{:T_CLASS=>11}, :moved=>{:T_CLASS=>11}}
@@ -10190,7 +10202,7 @@ gc_compact_stats(VALUE self)
 #  define gc_compact_stats rb_f_notimplement
 #endif
 -#if GC_COMPACTION_SUPPORTED
 +#if GC_CAN_COMPILE_COMPACTION
 static void
 root_obj_check_moved_i(const char *category, VALUE obj, void *data)
 {
@@ -10269,7 +10281,7 @@ gc_compact(VALUE self)
 #  define gc_compact rb_f_notimplement
 #endif
 -#if GC_COMPACTION_SUPPORTED
 +#if GC_CAN_COMPILE_COMPACTION
 /*
  * call-seq:
  *    GC.verify_compaction_references(toward: nil, double_heap: false) -> hash
@@ -10800,7 +10812,7 @@ gc_disable(rb_execution_context_t *ec, VALUE _)
     return rb_gc_disable();
 }
 -#if GC_COMPACTION_SUPPORTED
 +#if GC_CAN_COMPILE_COMPACTION
 /*
  *  call-seq:
  *     GC.auto_compact = flag
@@ -10814,8 +10826,7 @@ gc_disable(rb_execution_context_t *ec, VALUE _)
 static VALUE
 gc_set_auto_compact(VALUE _, VALUE v)
 {
 -    /* If not MinGW, Windows, or does not have mmap, we cannot use mprotect for
 -     * the read barrier, so we must disable automatic compaction. */
 +    GC_ASSERT(GC_COMPACTION_SUPPORTED);
     ruby_enable_autocompact = RTEST(v);
     return v;
@@ -10824,7 +10835,8 @@ gc_set_auto_compact(VALUE _, VALUE v)
 #  define gc_set_auto_compact rb_f_notimplement
 #endif
 -#if GC_COMPACTION_SUPPORTED
 +
 +#if GC_CAN_COMPILE_COMPACTION
 /*
  *  call-seq:
  *     GC.auto_compact    -> true or false
@@ -13696,11 +13708,21 @@ Init_GC(void)
     rb_define_singleton_method(rb_mGC, "malloc_allocated_size", gc_malloc_allocated_size, 0);
     rb_define_singleton_method(rb_mGC, "malloc_allocations", gc_malloc_allocations, 0);
 #endif
 -    rb_define_singleton_method(rb_mGC, "compact", gc_compact, 0);
 -    rb_define_singleton_method(rb_mGC, "auto_compact", gc_get_auto_compact, 0);
 -    rb_define_singleton_method(rb_mGC, "auto_compact=", gc_set_auto_compact, 1);
 -    rb_define_singleton_method(rb_mGC, "latest_compact_info", gc_compact_stats, 0);
 -    rb_define_singleton_method(rb_mGC, "verify_compaction_references", gc_verify_compaction_references, -1);
 +    if (GC_COMPACTION_SUPPORTED) {
 +        rb_define_singleton_method(rb_mGC, "compact", gc_compact, 0);
 +        rb_define_singleton_method(rb_mGC, "auto_compact", gc_get_auto_compact, 0);
 +        rb_define_singleton_method(rb_mGC, "auto_compact=", gc_set_auto_compact, 1);
 +        rb_define_singleton_method(rb_mGC, "latest_compact_info", gc_compact_stats, 0);
 +        rb_define_singleton_method(rb_mGC, "verify_compaction_references", gc_verify_compaction_references, -1);
 +    }
 +    else {
 +        rb_define_singleton_method(rb_mGC, "compact", rb_f_notimplement, 0);
 +        rb_define_singleton_method(rb_mGC, "auto_compact", rb_f_notimplement, 0);
 +        rb_define_singleton_method(rb_mGC, "auto_compact=", rb_f_notimplement, 1);
 +        rb_define_singleton_method(rb_mGC, "latest_compact_info", rb_f_notimplement, 0);
 +        /* When !GC_COMPACTION_SUPPORTED, this method is not defined in gc.rb */
 +        rb_define_singleton_method(rb_mGC, "verify_compaction_references", rb_f_notimplement, -1);
 +    }
 #if GC_DEBUG_STRESS_TO_CLASS
     rb_define_singleton_method(rb_mGC, "add_stress_to_class", rb_gcdebug_add_stress_to_class, -1);
@@ -13724,6 +13746,7 @@ Init_GC(void)
 	OPT(MALLOC_ALLOCATED_SIZE);
 	OPT(MALLOC_ALLOCATED_SIZE_CHECK);
 	OPT(GC_PROFILE_DETAIL_MEMORY);
 +	OPT(GC_COMPACTION_SUPPORTED);
 #undef OPT
 	OBJ_FREEZE(opts);
     }
 -- 
 2.36.1
--- a/ruby-3.2.0-define-unsupported-gc-compaction-methods-as-rb_f_notimplement.patch
+++ b/ruby-3.2.0-define-unsupported-gc-compaction-methods-as-rb_f_notimplement.patch
@ -0,0 +1,402 @@
 commit 6d1ca6737f31b2e24664a093f1827dd74a121a9f
 Author: Jarek Prokop <jprokop@redhat.com>
 Date:   Thu May 26 11:28:13 2022 +0200
    Gc ppc64le fix
 diff --git a/gc.c b/gc.c
 index ef9327df1f..1c35856c44 100644
 --- a/gc.c
 +++ b/gc.c
@@ -9421,6 +9421,7 @@ gc_move(rb_objspace_t *objspace, VALUE scan, VALUE free, size_t slot_size)
     return (VALUE)src;
 }
 +#if GC_COMPACTION_SUPPORTED
 static int
 compare_free_slots(const void *left, const void *right, void *dummy)
 {
@@ -9468,6 +9469,7 @@ gc_sort_heap_by_empty_slots(rb_objspace_t *objspace)
         free(page_list);
     }
 }
 +#endif
 static void
 gc_ref_update_array(rb_objspace_t * objspace, VALUE v)
@@ -10147,8 +10149,21 @@ gc_update_references(rb_objspace_t *objspace)
     gc_update_table_refs(objspace, finalizer_table);
 }
 +#if GC_COMPACTION_SUPPORTED
 +/*
 + *  call-seq:
 + *     GC.latest_compact_info -> {:considered=>{:T_CLASS=>11}, :moved=>{:T_CLASS=>11}}
 + *
 + *  Returns information about object moved in the most recent GC compaction.
 + *
 + * The returned hash has two keys :considered and :moved.  The hash for
 + * :considered lists the number of objects that were considered for movement
 + * by the compactor, and the :moved hash lists the number of objects that
 + * were actually moved.  Some objects can't be moved (maybe they were pinned)
 + * so these numbers can be used to calculate compaction efficiency.
 + */
 static VALUE
 -gc_compact_stats(rb_execution_context_t *ec, VALUE self)
 +gc_compact_stats(VALUE self)
 {
     size_t i;
     rb_objspace_t *objspace = &rb_objspace;
@@ -10171,7 +10186,11 @@ gc_compact_stats(rb_execution_context_t *ec, VALUE self)
     return h;
 }
 +#else
 +#  define gc_compact_stats rb_f_notimplement
 +#endif
 +#if GC_COMPACTION_SUPPORTED
 static void
 root_obj_check_moved_i(const char *category, VALUE obj, void *data)
 {
@@ -10221,22 +10240,78 @@ heap_check_moved_i(void *vstart, void *vend, size_t stride, void *data)
     return 0;
 }
 +/*
 + *  call-seq:
 + *     GC.compact
 + *
 + * This function compacts objects together in Ruby's heap.  It eliminates
 + * unused space (or fragmentation) in the heap by moving objects in to that
 + * unused space.  This function returns a hash which contains statistics about
 + * which objects were moved.  See `GC.latest_gc_info` for details about
 + * compaction statistics.
 + *
 + * This method is implementation specific and not expected to be implemented
 + * in any implementation besides MRI.
 + *
 + * To test whether GC compaction is supported, use the idiom:
 + *
 + *   GC.respond_to?(:compact)
 + */
 static VALUE
 -gc_compact(rb_execution_context_t *ec, VALUE self)
 +gc_compact(VALUE self)
 {
     /* Run GC with compaction enabled */
 -    gc_start_internal(ec, self, Qtrue, Qtrue, Qtrue, Qtrue);
 +    gc_start_internal(NULL, self, Qtrue, Qtrue, Qtrue, Qtrue);
 -    return gc_compact_stats(ec, self);
 +    return gc_compact_stats(self);
 }
 +#else
 +#  define gc_compact rb_f_notimplement
 +#endif
 +#if GC_COMPACTION_SUPPORTED
 +/*
 + * call-seq:
 + *    GC.verify_compaction_references(toward: nil, double_heap: false) -> hash
 + *
 + * Verify compaction reference consistency.
 + *
 + * This method is implementation specific.  During compaction, objects that
 + * were moved are replaced with T_MOVED objects.  No object should have a
 + * reference to a T_MOVED object after compaction.
 + *
 + * This function doubles the heap to ensure room to move all objects,
 + * compacts the heap to make sure everything moves, updates all references,
 + * then performs a full GC.  If any object contains a reference to a T_MOVED
 + * object, that object should be pushed on the mark stack, and will
 + * make a SEGV.
 + */
 static VALUE
 -gc_verify_compaction_references(rb_execution_context_t *ec, VALUE self, VALUE double_heap, VALUE toward_empty)
 +gc_verify_compaction_references(int argc, VALUE *argv, VALUE self)
 {
     rb_objspace_t *objspace = &rb_objspace;
 +    VALUE kwargs, double_heap = Qfalse, toward_empty = Qfalse;
 +    static ID id_toward, id_double_heap, id_empty;
 +
 +    if (!id_toward) {
 +        id_toward = rb_intern("toward");
 +        id_double_heap = rb_intern("double_heap");
 +        id_empty = rb_intern("empty");
 +    }
 +
 +    rb_scan_args(argc, argv, ":", &kwargs);
 +    if (!NIL_P(kwargs)) {
 +        if (rb_hash_has_key(kwargs, ID2SYM(id_toward))) {
 +            VALUE toward = rb_hash_aref(kwargs, ID2SYM(id_toward));
 +            toward_empty = (toward == ID2SYM(id_empty)) ? Qtrue : Qfalse;
 +        }
 +        if (rb_hash_has_key(kwargs, ID2SYM(id_double_heap))) {
 +            double_heap = rb_hash_aref(kwargs, ID2SYM(id_double_heap));
 +        }
 +    }
     /* Clear the heap. */
 -    gc_start_internal(ec, self, Qtrue, Qtrue, Qtrue, Qfalse);
 +    gc_start_internal(NULL, self, Qtrue, Qtrue, Qtrue, Qfalse);
     RB_VM_LOCK_ENTER();
     {
@@ -10256,13 +10331,16 @@ gc_verify_compaction_references(rb_execution_context_t *ec, VALUE self, VALUE do
     }
     RB_VM_LOCK_LEAVE();
 -    gc_start_internal(ec, self, Qtrue, Qtrue, Qtrue, Qtrue);
 +    gc_start_internal(NULL, self, Qtrue, Qtrue, Qtrue, Qtrue);
     objspace_reachable_objects_from_root(objspace, root_obj_check_moved_i, NULL);
     objspace_each_objects(objspace, heap_check_moved_i, NULL, TRUE);
 -    return gc_compact_stats(ec, self);
 +    return gc_compact_stats(self);
 }
 +#else
 +#  define gc_verify_compaction_references rb_f_notimplement
 +#endif
 VALUE
 rb_gc_start(void)
@@ -10722,26 +10800,45 @@ gc_disable(rb_execution_context_t *ec, VALUE _)
     return rb_gc_disable();
 }
 +#if GC_COMPACTION_SUPPORTED
 +/*
 + *  call-seq:
 + *     GC.auto_compact = flag
 + *
 + *  Updates automatic compaction mode.
 + *
 + *  When enabled, the compactor will execute on every major collection.
 + *
 + *  Enabling compaction will degrade performance on major collections.
 + */
 static VALUE
 -gc_set_auto_compact(rb_execution_context_t *ec, VALUE _, VALUE v)
 +gc_set_auto_compact(VALUE _, VALUE v)
 {
     /* If not MinGW, Windows, or does not have mmap, we cannot use mprotect for
      * the read barrier, so we must disable automatic compaction. */
 -#if !defined(__MINGW32__) && !defined(_WIN32)
 -    if (!USE_MMAP_ALIGNED_ALLOC) {
 -        rb_raise(rb_eNotImpError, "Automatic compaction isn't available on this platform");
 -    }
 -#endif
     ruby_enable_autocompact = RTEST(v);
     return v;
 }
 +#else
 +#  define gc_set_auto_compact rb_f_notimplement
 +#endif
 +#if GC_COMPACTION_SUPPORTED
 +/*
 + *  call-seq:
 + *     GC.auto_compact    -> true or false
 + *
 + *  Returns whether or not automatic compaction has been enabled.
 + */
 static VALUE
 -gc_get_auto_compact(rb_execution_context_t *ec, VALUE _)
 +gc_get_auto_compact(VALUE _)
 {
     return RBOOL(ruby_enable_autocompact);
 }
 +#else
 +#  define gc_get_auto_compact rb_f_notimplement
 +#endif
 static int
 get_envparam_size(const char *name, size_t *default_value, size_t lower_bound)
@@ -13599,6 +13696,11 @@ Init_GC(void)
     rb_define_singleton_method(rb_mGC, "malloc_allocated_size", gc_malloc_allocated_size, 0);
     rb_define_singleton_method(rb_mGC, "malloc_allocations", gc_malloc_allocations, 0);
 #endif
 +    rb_define_singleton_method(rb_mGC, "compact", gc_compact, 0);
 +    rb_define_singleton_method(rb_mGC, "auto_compact", gc_get_auto_compact, 0);
 +    rb_define_singleton_method(rb_mGC, "auto_compact=", gc_set_auto_compact, 1);
 +    rb_define_singleton_method(rb_mGC, "latest_compact_info", gc_compact_stats, 0);
 +    rb_define_singleton_method(rb_mGC, "verify_compaction_references", gc_verify_compaction_references, -1);
 #if GC_DEBUG_STRESS_TO_CLASS
     rb_define_singleton_method(rb_mGC, "add_stress_to_class", rb_gcdebug_add_stress_to_class, -1);
 diff --git a/test/ruby/test_gc_compact.rb b/test/ruby/test_gc_compact.rb
 index 42ad028530..411d5eab69 100644
 --- a/test/ruby/test_gc_compact.rb
 +++ b/test/ruby/test_gc_compact.rb
@@ -9,14 +9,7 @@
 end
 class TestGCCompact < Test::Unit::TestCase
 -  module SupportsCompact
 -    def setup
 -      skip "autocompact not supported on this platform" unless supports_auto_compact?
 -      super
 -    end
 -
 -    private
 -
 +  module CompactionSupportInspector
     def supports_auto_compact?
       return true unless defined?(Etc::SC_PAGE_SIZE)
@@ -30,10 +23,19 @@ def supports_auto_compact?
     end
   end
 -  include SupportsCompact
 +  module OmitUnlessCompactSupported
 +    include CompactionSupportInspector
 +
 +    def setup
 +      omit "autocompact not supported on this platform" unless supports_auto_compact?
 +      super
 +    end
 +  end
 +
 +  include OmitUnlessCompactSupported
   class AutoCompact < Test::Unit::TestCase
 -    include SupportsCompact
 +    include OmitUnlessCompactSupported
     def test_enable_autocompact
       before = GC.auto_compact
@@ -87,13 +89,39 @@ def test_implicit_compaction_does_something
     end
   end
 -  def os_page_size
 -    return true unless defined?(Etc::SC_PAGE_SIZE)
 +  class CompactMethodsNotImplemented < Test::Unit::TestCase
 +    include CompactionSupportInspector
 +
 +    def assert_not_implemented(method, *args)
 +      omit "autocompact is supported on this platform" if supports_auto_compact?
 +
 +      assert_raise(NotImplementedError) { GC.send(method, *args) }
 +      refute(GC.respond_to?(method), "GC.#{method} should be defined as rb_f_notimplement")
 +    end
 +
 +    def test_gc_compact_not_implemented
 +      assert_not_implemented(:compact)
 +    end
 +
 +    def test_gc_auto_compact_get_not_implemented
 +      assert_not_implemented(:auto_compact)
 +    end
 +
 +    def test_gc_auto_compact_set_not_implemented
 +      assert_not_implemented(:auto_compact=, true)
 +    end
 +
 +    def test_gc_latest_compact_info_not_implemented
 +      assert_not_implemented(:latest_compact_info)
 +    end
 +
 +    def test_gc_verify_compaction_references_not_implemented
 +      assert_not_implemented(:verify_compaction_references)
 +    end
   end
 -  def setup
 -    skip "autocompact not supported on this platform" unless supports_auto_compact?
 -    super
 +  def os_page_size
 +    return true unless defined?(Etc::SC_PAGE_SIZE)
   end
   def test_gc_compact_stats
 diff --git a/gc.rb b/gc.rb
 index 72637f3796..9265dd7b57 100644
 --- a/gc.rb
 +++ b/gc.rb
@@ -38,27 +38,6 @@ def garbage_collect full_mark: true, immediate_mark: true, immediate_sweep: true
     Primitive.gc_start_internal full_mark, immediate_mark, immediate_sweep, false
   end
 -  #  call-seq:
 -  #     GC.auto_compact    -> true or false
 -  #
 -  #  Returns whether or not automatic compaction has been enabled.
 -  #
 -  def self.auto_compact
 -    Primitive.gc_get_auto_compact
 -  end
 -
 -  #  call-seq:
 -  #     GC.auto_compact = flag
 -  #
 -  #  Updates automatic compaction mode.
 -  #
 -  #  When enabled, the compactor will execute on every major collection.
 -  #
 -  #  Enabling compaction will degrade performance on major collections.
 -  def self.auto_compact=(flag)
 -    Primitive.gc_set_auto_compact(flag)
 -  end
 -
   #  call-seq:
   #     GC.enable    -> true or false
   #
@@ -210,53 +189,6 @@ def self.latest_gc_info hash_or_key = nil
     Primitive.gc_latest_gc_info hash_or_key
   end
 -  #  call-seq:
 -  #     GC.latest_compact_info -> {:considered=>{:T_CLASS=>11}, :moved=>{:T_CLASS=>11}}
 -  #
 -  #  Returns information about object moved in the most recent GC compaction.
 -  #
 -  # The returned hash has two keys :considered and :moved.  The hash for
 -  # :considered lists the number of objects that were considered for movement
 -  # by the compactor, and the :moved hash lists the number of objects that
 -  # were actually moved.  Some objects can't be moved (maybe they were pinned)
 -  # so these numbers can be used to calculate compaction efficiency.
 -  def self.latest_compact_info
 -    Primitive.gc_compact_stats
 -  end
 -
 -  #  call-seq:
 -  #     GC.compact
 -  #
 -  # This function compacts objects together in Ruby's heap.  It eliminates
 -  # unused space (or fragmentation) in the heap by moving objects in to that
 -  # unused space.  This function returns a hash which contains statistics about
 -  # which objects were moved.  See `GC.latest_gc_info` for details about
 -  # compaction statistics.
 -  #
 -  # This method is implementation specific and not expected to be implemented
 -  # in any implementation besides MRI.
 -  def self.compact
 -    Primitive.gc_compact
 -  end
 -
 -  # call-seq:
 -  #    GC.verify_compaction_references(toward: nil, double_heap: false) -> hash
 -  #
 -  # Verify compaction reference consistency.
 -  #
 -  # This method is implementation specific.  During compaction, objects that
 -  # were moved are replaced with T_MOVED objects.  No object should have a
 -  # reference to a T_MOVED object after compaction.
 -  #
 -  # This function doubles the heap to ensure room to move all objects,
 -  # compacts the heap to make sure everything moves, updates all references,
 -  # then performs a full GC.  If any object contains a reference to a T_MOVED
 -  # object, that object should be pushed on the mark stack, and will
 -  # make a SEGV.
 -  def self.verify_compaction_references(toward: nil, double_heap: false)
 -    Primitive.gc_verify_compaction_references(double_heap, toward == :empty)
 -  end
 -
   # call-seq:
   #     GC.using_rvargc? -> true or false
   #
--- a/ruby-3.2.0-define-unsupported-gc-compaction-methods_generated-files.patch
+++ b/ruby-3.2.0-define-unsupported-gc-compaction-methods_generated-files.patch
@ -0,0 +1,502 @@
 --- ruby-3.1.2/gc.rbinc	2022-04-12 13:11:17.000000000 +0200
 +++ ruby/gc.rbinc	2022-06-08 12:49:16.288024971 +0200
@@ -9,27 +9,27 @@
 #include "builtin.h"                /* for RB_BUILTIN_FUNCTION */
 struct rb_execution_context_struct; /* in vm_core.h */
 -static VALUE builtin_inline_class_277(struct rb_execution_context_struct *ec, const VALUE self)
 +static VALUE builtin_inline_class_209(struct rb_execution_context_struct *ec, const VALUE self)
 {
 MAYBE_UNUSED(const VALUE) flag = rb_vm_lvar(ec, -3);
 -#line 277 "gc.rb"
 +#line 209 "gc.rb"
       rb_objspace.flags.measure_gc = RTEST(flag) ? TRUE : FALSE;
       return flag;
 #line 20 "gc.rbinc"
 }
 -static VALUE builtin_inline_class_289(struct rb_execution_context_struct *ec, const VALUE self)
 +static VALUE builtin_inline_class_221(struct rb_execution_context_struct *ec, const VALUE self)
 {
 -#line 289 "gc.rb"
 +#line 221 "gc.rb"
 return 
       RBOOL(rb_objspace.flags.measure_gc);
 #line 28 "gc.rbinc"
 }
 -static VALUE builtin_inline_class_299(struct rb_execution_context_struct *ec, const VALUE self)
 +static VALUE builtin_inline_class_231(struct rb_execution_context_struct *ec, const VALUE self)
 {
 -#line 299 "gc.rb"
 +#line 231 "gc.rb"
 return 
       ULL2NUM(rb_objspace.profile.total_time_ns);
 #line 36 "gc.rbinc"
@@ -52,31 +52,6 @@
 }
 static void
 -mjit_compile_invokebuiltin_for_gc_get_auto_compact(FILE *f, long index, unsigned stack_size, bool inlinable_p)
 -{
 -    fprintf(f, "    VALUE self = GET_SELF();\n");
 -    fprintf(f, "    typedef VALUE (*func)(rb_execution_context_t *, VALUE);\n");
 -    fprintf(f, "    func f = (func)%"PRIuVALUE"; /* == gc_get_auto_compact */\n", (VALUE)gc_get_auto_compact);
 -    fprintf(f, "    val = f(ec, self);\n");
 -}
 -
 -static void
 -mjit_compile_invokebuiltin_for_gc_set_auto_compact(FILE *f, long index, unsigned stack_size, bool inlinable_p)
 -{
 -    fprintf(f, "    VALUE self = GET_SELF();\n");
 -    fprintf(f, "    typedef VALUE (*func)(rb_execution_context_t *, VALUE, VALUE);\n");
 -    if (index == -1) {
 -        fprintf(f, "    const VALUE *argv = &stack[%d];\n", stack_size - 1);
 -    }
 -    else {
 -        fprintf(f, "    const unsigned int lnum = GET_ISEQ()->body->local_table_size;\n");
 -        fprintf(f, "    const VALUE *argv = GET_EP() - lnum - VM_ENV_DATA_SIZE + 1 + %ld;\n", index);
 -    }
 -    fprintf(f, "    func f = (func)%"PRIuVALUE"; /* == gc_set_auto_compact */\n", (VALUE)gc_set_auto_compact);
 -    fprintf(f, "    val = f(ec, self, argv[0]);\n");
 -}
 -
 -static void
 mjit_compile_invokebuiltin_for_gc_enable(FILE *f, long index, unsigned stack_size, bool inlinable_p)
 {
     fprintf(f, "    VALUE self = GET_SELF();\n");
@@ -161,40 +136,6 @@
 }
 static void
 -mjit_compile_invokebuiltin_for_gc_compact_stats(FILE *f, long index, unsigned stack_size, bool inlinable_p)
 -{
 -    fprintf(f, "    VALUE self = GET_SELF();\n");
 -    fprintf(f, "    typedef VALUE (*func)(rb_execution_context_t *, VALUE);\n");
 -    fprintf(f, "    func f = (func)%"PRIuVALUE"; /* == gc_compact_stats */\n", (VALUE)gc_compact_stats);
 -    fprintf(f, "    val = f(ec, self);\n");
 -}
 -
 -static void
 -mjit_compile_invokebuiltin_for_gc_compact(FILE *f, long index, unsigned stack_size, bool inlinable_p)
 -{
 -    fprintf(f, "    VALUE self = GET_SELF();\n");
 -    fprintf(f, "    typedef VALUE (*func)(rb_execution_context_t *, VALUE);\n");
 -    fprintf(f, "    func f = (func)%"PRIuVALUE"; /* == gc_compact */\n", (VALUE)gc_compact);
 -    fprintf(f, "    val = f(ec, self);\n");
 -}
 -
 -static void
 -mjit_compile_invokebuiltin_for_gc_verify_compaction_references(FILE *f, long index, unsigned stack_size, bool inlinable_p)
 -{
 -    fprintf(f, "    VALUE self = GET_SELF();\n");
 -    fprintf(f, "    typedef VALUE (*func)(rb_execution_context_t *, VALUE, VALUE, VALUE);\n");
 -    if (index == -1) {
 -        fprintf(f, "    const VALUE *argv = &stack[%d];\n", stack_size - 2);
 -    }
 -    else {
 -        fprintf(f, "    const unsigned int lnum = GET_ISEQ()->body->local_table_size;\n");
 -        fprintf(f, "    const VALUE *argv = GET_EP() - lnum - VM_ENV_DATA_SIZE + 1 + %ld;\n", index);
 -    }
 -    fprintf(f, "    func f = (func)%"PRIuVALUE"; /* == gc_verify_compaction_references */\n", (VALUE)gc_verify_compaction_references);
 -    fprintf(f, "    val = f(ec, self, argv[0], argv[1]);\n");
 -}
 -
 -static void
 mjit_compile_invokebuiltin_for__bi0(FILE *f, long index, unsigned stack_size, bool inlinable_p)
 {
     fprintf(f, "    VALUE self = GET_SELF();\n");
@@ -202,7 +143,7 @@
     if (inlinable_p) {
         fprintf(f, "%s", "    {\n");
         fprintf(f, "%s", "    MAYBE_UNUSED(const VALUE) flag = rb_vm_lvar(ec, -3);\n");
 -        fprintf(f, "%s", "#line 277 \"gc.rb\"\n");
 +        fprintf(f, "%s", "#line 209 \"gc.rb\"\n");
         fprintf(f, "%s", "    \n");
         fprintf(f, "%s", "          rb_objspace.flags.measure_gc = RTEST(flag) ? TRUE : FALSE;\n");
         fprintf(f, "%s", "          return flag;\n");
@@ -211,7 +152,7 @@
         fprintf(f, "%s", "    \n");
         return;
     }
 -    fprintf(f, "    func f = (func)%"PRIuVALUE"; /* == builtin_inline_class_277 */\n", (VALUE)builtin_inline_class_277);
 +    fprintf(f, "    func f = (func)%"PRIuVALUE"; /* == builtin_inline_class_209 */\n", (VALUE)builtin_inline_class_209);
     fprintf(f, "    val = f(ec, self);\n");
 }
@@ -222,7 +163,7 @@
     fprintf(f, "    typedef VALUE (*func)(rb_execution_context_t *, VALUE);\n");
     if (inlinable_p) {
         fprintf(f, "%s", "    {\n");
 -        fprintf(f, "%s", "#line 289 \"gc.rb\"\n");
 +        fprintf(f, "%s", "#line 221 \"gc.rb\"\n");
         fprintf(f, "%s", "    return \n");
         fprintf(f, "%s", "          RBOOL(rb_objspace.flags.measure_gc);\n");
         fprintf(f, "%s", "#line 52 \"gc.rbinc\"\n");
@@ -230,7 +171,7 @@
         fprintf(f, "%s", "    \n");
         return;
     }
 -    fprintf(f, "    func f = (func)%"PRIuVALUE"; /* == builtin_inline_class_289 */\n", (VALUE)builtin_inline_class_289);
 +    fprintf(f, "    func f = (func)%"PRIuVALUE"; /* == builtin_inline_class_221 */\n", (VALUE)builtin_inline_class_221);
     fprintf(f, "    val = f(ec, self);\n");
 }
@@ -241,7 +182,7 @@
     fprintf(f, "    typedef VALUE (*func)(rb_execution_context_t *, VALUE);\n");
     if (inlinable_p) {
         fprintf(f, "%s", "    {\n");
 -        fprintf(f, "%s", "#line 299 \"gc.rb\"\n");
 +        fprintf(f, "%s", "#line 231 \"gc.rb\"\n");
         fprintf(f, "%s", "    return \n");
         fprintf(f, "%s", "          ULL2NUM(rb_objspace.profile.total_time_ns);\n");
         fprintf(f, "%s", "#line 59 \"gc.rbinc\"\n");
@@ -249,7 +190,7 @@
         fprintf(f, "%s", "    \n");
         return;
     }
 -    fprintf(f, "    func f = (func)%"PRIuVALUE"; /* == builtin_inline_class_299 */\n", (VALUE)builtin_inline_class_299);
 +    fprintf(f, "    func f = (func)%"PRIuVALUE"; /* == builtin_inline_class_231 */\n", (VALUE)builtin_inline_class_231);
     fprintf(f, "    val = f(ec, self);\n");
 }
@@ -258,21 +199,16 @@
   // table definition
   static const struct rb_builtin_function gc_table[] = {
     RB_BUILTIN_FUNCTION(0, gc_start_internal, gc_start_internal, 4, mjit_compile_invokebuiltin_for_gc_start_internal),
 -    RB_BUILTIN_FUNCTION(1, gc_get_auto_compact, gc_get_auto_compact, 0, mjit_compile_invokebuiltin_for_gc_get_auto_compact),
 -    RB_BUILTIN_FUNCTION(2, gc_set_auto_compact, gc_set_auto_compact, 1, mjit_compile_invokebuiltin_for_gc_set_auto_compact),
 -    RB_BUILTIN_FUNCTION(3, gc_enable, gc_enable, 0, mjit_compile_invokebuiltin_for_gc_enable),
 -    RB_BUILTIN_FUNCTION(4, gc_disable, gc_disable, 0, mjit_compile_invokebuiltin_for_gc_disable),
 -    RB_BUILTIN_FUNCTION(5, gc_stress_get, gc_stress_get, 0, mjit_compile_invokebuiltin_for_gc_stress_get),
 -    RB_BUILTIN_FUNCTION(6, gc_stress_set_m, gc_stress_set_m, 1, mjit_compile_invokebuiltin_for_gc_stress_set_m),
 -    RB_BUILTIN_FUNCTION(7, gc_count, gc_count, 0, mjit_compile_invokebuiltin_for_gc_count),
 -    RB_BUILTIN_FUNCTION(8, gc_stat, gc_stat, 1, mjit_compile_invokebuiltin_for_gc_stat),
 -    RB_BUILTIN_FUNCTION(9, gc_latest_gc_info, gc_latest_gc_info, 1, mjit_compile_invokebuiltin_for_gc_latest_gc_info),
 -    RB_BUILTIN_FUNCTION(10, gc_compact_stats, gc_compact_stats, 0, mjit_compile_invokebuiltin_for_gc_compact_stats),
 -    RB_BUILTIN_FUNCTION(11, gc_compact, gc_compact, 0, mjit_compile_invokebuiltin_for_gc_compact),
 -    RB_BUILTIN_FUNCTION(12, gc_verify_compaction_references, gc_verify_compaction_references, 2, mjit_compile_invokebuiltin_for_gc_verify_compaction_references),
 -    RB_BUILTIN_FUNCTION(13, _bi0, builtin_inline_class_277, 0, mjit_compile_invokebuiltin_for__bi0),
 -    RB_BUILTIN_FUNCTION(14, _bi1, builtin_inline_class_289, 0, mjit_compile_invokebuiltin_for__bi1),
 -    RB_BUILTIN_FUNCTION(15, _bi2, builtin_inline_class_299, 0, mjit_compile_invokebuiltin_for__bi2),
 +    RB_BUILTIN_FUNCTION(1, gc_enable, gc_enable, 0, mjit_compile_invokebuiltin_for_gc_enable),
 +    RB_BUILTIN_FUNCTION(2, gc_disable, gc_disable, 0, mjit_compile_invokebuiltin_for_gc_disable),
 +    RB_BUILTIN_FUNCTION(3, gc_stress_get, gc_stress_get, 0, mjit_compile_invokebuiltin_for_gc_stress_get),
 +    RB_BUILTIN_FUNCTION(4, gc_stress_set_m, gc_stress_set_m, 1, mjit_compile_invokebuiltin_for_gc_stress_set_m),
 +    RB_BUILTIN_FUNCTION(5, gc_count, gc_count, 0, mjit_compile_invokebuiltin_for_gc_count),
 +    RB_BUILTIN_FUNCTION(6, gc_stat, gc_stat, 1, mjit_compile_invokebuiltin_for_gc_stat),
 +    RB_BUILTIN_FUNCTION(7, gc_latest_gc_info, gc_latest_gc_info, 1, mjit_compile_invokebuiltin_for_gc_latest_gc_info),
 +    RB_BUILTIN_FUNCTION(8, _bi0, builtin_inline_class_209, 0, mjit_compile_invokebuiltin_for__bi0),
 +    RB_BUILTIN_FUNCTION(9, _bi1, builtin_inline_class_221, 0, mjit_compile_invokebuiltin_for__bi1),
 +    RB_BUILTIN_FUNCTION(10, _bi2, builtin_inline_class_231, 0, mjit_compile_invokebuiltin_for__bi2),
     RB_BUILTIN_FUNCTION(-1, NULL, NULL, 0, 0),
   };
@@ -282,8 +218,6 @@
 COMPILER_WARNING_ERROR(-Wincompatible-pointer-types)
 #endif
   if (0) rb_builtin_function_check_arity4(gc_start_internal);
 -  if (0) rb_builtin_function_check_arity0(gc_get_auto_compact);
 -  if (0) rb_builtin_function_check_arity1(gc_set_auto_compact);
   if (0) rb_builtin_function_check_arity0(gc_enable);
   if (0) rb_builtin_function_check_arity0(gc_disable);
   if (0) rb_builtin_function_check_arity0(gc_stress_get);
@@ -291,12 +225,9 @@
   if (0) rb_builtin_function_check_arity0(gc_count);
   if (0) rb_builtin_function_check_arity1(gc_stat);
   if (0) rb_builtin_function_check_arity1(gc_latest_gc_info);
 -  if (0) rb_builtin_function_check_arity0(gc_compact_stats);
 -  if (0) rb_builtin_function_check_arity0(gc_compact);
 -  if (0) rb_builtin_function_check_arity2(gc_verify_compaction_references);
 -  if (0) rb_builtin_function_check_arity0(builtin_inline_class_277);
 -  if (0) rb_builtin_function_check_arity0(builtin_inline_class_289);
 -  if (0) rb_builtin_function_check_arity0(builtin_inline_class_299);
 +  if (0) rb_builtin_function_check_arity0(builtin_inline_class_209);
 +  if (0) rb_builtin_function_check_arity0(builtin_inline_class_221);
 +  if (0) rb_builtin_function_check_arity0(builtin_inline_class_231);
 COMPILER_WARNING_POP
   // load
 --- ruby-3.1.2/miniprelude.c	2022-04-12 13:11:17.000000000 +0200
 +++ ruby/miniprelude.c	2022-06-08 12:49:16.377024871 +0200
@@ -545,11 +545,10 @@
 static const char prelude_name2[] = "<internal:gc>";
 static const struct {
 -    char L0[479]; /* 1..58 */
 -    char L58[508]; /* 59..204 */
 -    char L204[504]; /* 205..275 */
 -    char L275[490]; /* 276..306 */
 -    char L306[128]; /* 307..312 */
 +    char L0[492]; /* 1..70 */
 +    char L70[468]; /* 71..197 */
 +    char L197[470]; /* 198..237 */
 +    char L237[211]; /* 238..244 */
 } prelude_code2 = {
 #line 1 "gc.rb"
 ""/* for gc.c */
@@ -593,29 +592,6 @@
 "  end\n"
 "\n"
 "\n"/*  call-seq: */
 -"\n"/*     GC.auto_compact    -> true or false */
 -"\n"/*  */
 -"\n"/*  Returns whether or not automatic compaction has been enabled. */
 -"\n"/*  */
 -"  def self.auto_compact\n"
 -"    Primitive.gc_get_auto_compact\n"
 -"  end\n"
 -"\n"
 -"\n"/*  call-seq: */
 -"\n"/*     GC.auto_compact = flag */
 -"\n"/*  */
 -"\n"/*  Updates automatic compaction mode. */
 -"\n"/*  */
 -"\n"/*  When enabled, the compactor will execute on every major collection. */
 -"\n"/*  */
 -"\n"/*  Enabling compaction will degrade performance on major collections. */
 -"  def self.auto_compact=(flag)\n"
 -,
 -#line 59 "gc.rb"
 -"    Primitive.gc_set_auto_compact(flag)\n"
 -"  end\n"
 -"\n"
 -"\n"/*  call-seq: */
 "\n"/*     GC.enable    -> true or false */
 "\n"/*  */
 "\n"/*  Enables garbage collection, returning +true+ if garbage */
@@ -645,6 +621,8 @@
 "\n"/*    GC.stress	    -> integer, true or false */
 "\n"/*  */
 "\n"/*  Returns current status of GC stress mode. */
 +,
 +#line 71 "gc.rb"
 "  def self.stress\n"
 "    Primitive.gc_stress_get\n"
 "  end\n"
@@ -758,8 +736,6 @@
 "\n"/*     GC.latest_gc_info(:major_by) -> :malloc */
 "\n"/*  */
 "\n"/*  Returns information about the most recent garbage collection. */
 -,
 -#line 205 "gc.rb"
 "\n"/*  */
 "\n"/* If the optional argument, hash, is given, */
 "\n"/* it is overwritten and returned. */
@@ -768,59 +744,14 @@
 "    Primitive.gc_latest_gc_info hash_or_key\n"
 "  end\n"
 "\n"
 -"\n"/*  call-seq: */
 -"\n"/*     GC.latest_compact_info -> {:considered=>{:T_CLASS=>11}, :moved=>{:T_CLASS=>11}} */
 -"\n"/*  */
 -"\n"/*  Returns information about object moved in the most recent GC compaction. */
 -"\n"/*  */
 -"\n"/* The returned hash has two keys :considered and :moved.  The hash for */
 -"\n"/* :considered lists the number of objects that were considered for movement */
 -"\n"/* by the compactor, and the :moved hash lists the number of objects that */
 -"\n"/* were actually moved.  Some objects can't be moved (maybe they were pinned) */
 -"\n"/* so these numbers can be used to calculate compaction efficiency. */
 -"  def self.latest_compact_info\n"
 -"    Primitive.gc_compact_stats\n"
 -"  end\n"
 -"\n"
 -"\n"/*  call-seq: */
 -"\n"/*     GC.compact */
 -"\n"/*  */
 -"\n"/* This function compacts objects together in Ruby's heap.  It eliminates */
 -"\n"/* unused space (or fragmentation) in the heap by moving objects in to that */
 -"\n"/* unused space.  This function returns a hash which contains statistics about */
 -"\n"/* which objects were moved.  See `GC.latest_gc_info` for details about */
 -"\n"/* compaction statistics. */
 -"\n"/*  */
 -"\n"/* This method is implementation specific and not expected to be implemented */
 -"\n"/* in any implementation besides MRI. */
 -"  def self.compact\n"
 -"    Primitive.gc_compact\n"
 -"  end\n"
 -"\n"
 -"\n"/* call-seq: */
 -"\n"/*    GC.verify_compaction_references(toward: nil, double_heap: false) -> hash */
 -"\n"/*  */
 -"\n"/* Verify compaction reference consistency. */
 -"\n"/*  */
 -"\n"/* This method is implementation specific.  During compaction, objects that */
 -"\n"/* were moved are replaced with T_MOVED objects.  No object should have a */
 -"\n"/* reference to a T_MOVED object after compaction. */
 -"\n"/*  */
 -"\n"/* This function doubles the heap to ensure room to move all objects, */
 -"\n"/* compacts the heap to make sure everything moves, updates all references, */
 -"\n"/* then performs a full GC.  If any object contains a reference to a T_MOVED */
 -"\n"/* object, that object should be pushed on the mark stack, and will */
 -"\n"/* make a SEGV. */
 -"  def self.verify_compaction_references(toward: nil, double_heap: false)\n"
 -"    Primitive.gc_verify_compaction_references(double_heap, toward == :empty)\n"
 -"  end\n"
 -"\n"
 "\n"/* call-seq: */
 "\n"/*     GC.using_rvargc? -> true or false */
 "\n"/*  */
 "\n"/* Returns true if using experimental feature Variable Width Allocation, false */
 "\n"/* otherwise. */
 "  def self.using_rvargc?\n"/* :nodoc: */
 +,
 +#line 198 "gc.rb"
 "    GC::INTERNAL_CONSTANTS[:SIZE_POOL_COUNT] > 1\n"
 "  end\n"
 "\n"
@@ -831,8 +762,6 @@
 "\n"/* Enable to measure GC time. */
 "\n"/* You can get the result with <tt>GC.stat(:time)</tt>. */
 "\n"/* Note that GC time measurement can cause some performance overhead. */
 -,
 -#line 276 "gc.rb"
 "  def self.measure_total_time=(flag)\n"
 "    Primitive.cstmt! %{\n"
 "      rb_objspace.flags.measure_gc = RTEST(flag) ? TRUE : FALSE;\n"
@@ -863,15 +792,15 @@
 "end\n"
 "\n"
 "module ObjectSpace\n"
 -"  def garbage_collect full_mark: true, immediate_mark: true, immediate_sweep: true\n"
 ,
 -#line 307 "gc.rb"
 +#line 238 "gc.rb"
 +"  def garbage_collect full_mark: true, immediate_mark: true, immediate_sweep: true\n"
 "    Primitive.gc_start_internal full_mark, immediate_mark, immediate_sweep, false\n"
 "  end\n"
 "\n"
 "  module_function :garbage_collect\n"
 "end\n"
 -#line 875 "miniprelude.c"
 +#line 804 "miniprelude.c"
 };
 static const char prelude_name3[] = "<internal:numeric>";
@@ -1223,7 +1152,7 @@
 "  end\n"
 "\n"
 "end\n"
 -#line 1227 "miniprelude.c"
 +#line 1156 "miniprelude.c"
 };
 static const char prelude_name4[] = "<internal:io>";
@@ -1354,7 +1283,7 @@
 "    Primitive.io_write_nonblock(buf, exception)\n"
 "  end\n"
 "end\n"
 -#line 1358 "miniprelude.c"
 +#line 1287 "miniprelude.c"
 };
 static const char prelude_name5[] = "<internal:marshal>";
@@ -1402,7 +1331,7 @@
 "    alias restore load\n"
 "  end\n"
 "end\n"
 -#line 1406 "miniprelude.c"
 +#line 1335 "miniprelude.c"
 };
 static const char prelude_name6[] = "<internal:pack>";
@@ -1724,7 +1653,7 @@
 "    Primitive.pack_unpack1(fmt, offset)\n"
 "  end\n"
 "end\n"
 -#line 1728 "miniprelude.c"
 +#line 1657 "miniprelude.c"
 };
 static const char prelude_name7[] = "<internal:trace_point>";
@@ -2111,7 +2040,7 @@
 "    Primitive.tracepoint_attr_instruction_sequence\n"
 "  end\n"
 "end\n"
 -#line 2115 "miniprelude.c"
 +#line 2044 "miniprelude.c"
 };
 static const char prelude_name8[] = "<internal:warning>";
@@ -2172,7 +2101,7 @@
 "    Primitive.rb_warn_m(msgs, uplevel, category)\n"
 "  end\n"
 "end\n"
 -#line 2176 "miniprelude.c"
 +#line 2105 "miniprelude.c"
 };
 static const char prelude_name9[] = "<internal:array>";
@@ -2249,7 +2178,7 @@
 "    end\n"
 "  end\n"
 "end\n"
 -#line 2253 "miniprelude.c"
 +#line 2182 "miniprelude.c"
 };
 static const char prelude_name10[] = "<internal:kernel>";
@@ -2438,7 +2367,7 @@
 "    end\n"
 "  end\n"
 "end\n"
 -#line 2442 "miniprelude.c"
 +#line 2371 "miniprelude.c"
 };
 static const char prelude_name11[] = "<internal:ractor>";
@@ -3305,7 +3234,7 @@
 "    }\n"
 "  end\n"
 "end\n"
 -#line 3309 "miniprelude.c"
 +#line 3238 "miniprelude.c"
 };
 static const char prelude_name12[] = "<internal:timev>";
@@ -3628,7 +3557,7 @@
 "    Primitive.time_init_args(year, mon, mday, hour, min, sec, zone)\n"
 "  end\n"
 "end\n"
 -#line 3632 "miniprelude.c"
 +#line 3561 "miniprelude.c"
 };
 static const char prelude_name13[] = "<internal:nilclass>";
@@ -3661,7 +3590,7 @@
 "    return 0.0\n"
 "  end\n"
 "end\n"
 -#line 3665 "miniprelude.c"
 +#line 3594 "miniprelude.c"
 };
 static const char prelude_name14[] = "<internal:prelude>";
@@ -3691,7 +3620,7 @@
 "\n"
 "  private :pp\n"
 "end\n"
 -#line 3695 "miniprelude.c"
 +#line 3624 "miniprelude.c"
 };
 static const char prelude_name15[] = "<internal:gem_prelude>";
@@ -3718,7 +3647,7 @@
 "rescue LoadError\n"
 "  warn \"`did_you_mean' was not loaded.\"\n"
 "end if defined?(DidYouMean)\n"
 -#line 3722 "miniprelude.c"
 +#line 3651 "miniprelude.c"
 };
 static const char prelude_name16[] = "<internal:yjit>";
@@ -4059,7 +3988,7 @@
 "    end\n"
 "  end\n"
 "end\n"
 -#line 4063 "miniprelude.c"
 +#line 3992 "miniprelude.c"
 };
 COMPILER_WARNING_POP
--- a/SOURCES/ruby-3.2.0-git-2.38.1-fix-rubygems-test.patch
+++ b/SOURCES/ruby-3.2.0-git-2.38.1-fix-rubygems-test.patch
@ -13,7 +13,7 @@ diff --git a/test/rubygems/test_gem_source_git.rb b/test/rubygems/test_gem_sourc
 index 5702da05974b6..c3b324771fa4d 100644
 --- a/test/rubygems/test_gem_source_git.rb
 +++ b/test/rubygems/test_gem_source_git.rb
-@@ -64,6 +64,11 @@ def test_checkout_local_cached
+@@ -63,6 +63,11 @@ def test_checkout_local_cached
   end
   def test_checkout_submodules
--- a/ruby-3.3.0-openssl-3.2.0-fips-enable-tests.patch
+++ b/ruby-3.3.0-openssl-3.2.0-fips-enable-tests.patch
@ -0,0 +1,32 @@
 From f0b254f1f6610294821bbfc06b414d2af452db5b Mon Sep 17 00:00:00 2001
 From: Jun Aruga <jaruga@redhat.com>
 Date: Thu, 13 Apr 2023 17:28:27 +0200
 Subject: [PATCH] [ruby/openssl] Drop a common logic disabling the FIPS mode in
 the tests.
 We want to run the unit tests in the FIPS mode too.
 https://github.com/ruby/openssl/commit/ab92baff34
 ---
 test/openssl/utils.rb | 5 -----
 1 file changed, 5 deletions(-)
 diff --git a/test/openssl/utils.rb b/test/openssl/utils.rb
 index 4ebcb9837b..8a0be0d154 100644
 --- a/test/openssl/utils.rb
 +++ b/test/openssl/utils.rb
@@ -1,11 +1,6 @@
 # frozen_string_literal: true
 begin
   require "openssl"
 -
 -  # Disable FIPS mode for tests for installations
 -  # where FIPS mode would be enabled by default.
 -  # Has no effect on all other installations.
 -  OpenSSL.fips_mode=false
 rescue LoadError
 end
 -- 
 2.41.0
--- a/ruby-3.3.0-openssl-3.2.0-fips-fix-pkey-dh-require-openssl.patch
+++ b/ruby-3.3.0-openssl-3.2.0-fips-fix-pkey-dh-require-openssl.patch
@ -0,0 +1,73 @@
 From b6d7cdc2bad0eadbca73f3486917f0ec7a475814 Mon Sep 17 00:00:00 2001
 From: Kazuki Yamaguchi <k@rhe.jp>
 Date: Tue, 29 Aug 2023 19:46:02 +0900
 Subject: [PATCH] [ruby/openssl] ssl: use ffdhe2048 from RFC 7919 as the
 default DH group parameters
 In TLS 1.2 or before, if DH group parameters for DHE are not supplied
 with SSLContext#tmp_dh= or #tmp_dh_callback=, we currently use the
 self-generated parameters added in commit https://github.com/ruby/openssl/commit/bb3399a61c03 ("support 2048
 bit length DH-key", 2016-01-15) as the fallback.
 While there is no known weakness in the current parameters, it would be
 a good idea to switch to pre-defined, more well audited parameters.
 This also allows the fallback to work in the FIPS mode.
 The PEM encoding was derived with:
 	# RFC 7919 Appendix A.1. ffdhe2048
 	print OpenSSL::PKey.read(OpenSSL::ASN1::Sequence([OpenSSL::ASN1::Integer((<<-END).split.join.to_i(16)), OpenSSL::ASN1::Integer(2)]).to_der).to_pem
 	    FFFFFFFF FFFFFFFF ADF85458 A2BB4A9A AFDC5620 273D3CF1
 	    D8B9C583 CE2D3695 A9E13641 146433FB CC939DCE 249B3EF9
 	    7D2FE363 630C75D8 F681B202 AEC4617A D3DF1ED5 D5FD6561
 	    2433F51F 5F066ED0 85636555 3DED1AF3 B557135E 7F57C935
 	    984F0C70 E0E68B77 E2A689DA F3EFE872 1DF158A1 36ADE735
 	    30ACCA4F 483A797A BC0AB182 B324FB61 D108A94B B2C8E3FB
 	    B96ADAB7 60D7F468 1D4F42A3 DE394DF4 AE56EDE7 6372BB19
 	    0B07A7C8 EE0A6D70 9E02FCE1 CDF7E2EC C03404CD 28342F61
 	    9172FE9C E98583FF 8E4F1232 EEF28183 C3FE3B1B 4C6FAD73
 	    3BB5FCBC 2EC22005 C58EF183 7D1683B2 C6F34A26 C1B2EFFA
 	    886B4238 61285C97 FFFFFFFF FFFFFFFF
 	END
 https://github.com/ruby/openssl/commit/a5527cb4f4
 ---
 ext/openssl/lib/openssl/ssl.rb | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
 diff --git a/ext/openssl/lib/openssl/ssl.rb b/ext/openssl/lib/openssl/ssl.rb
 index ea8bb2a18e533..94be6ba80b894 100644
 --- a/ext/openssl/lib/openssl/ssl.rb
 +++ b/ext/openssl/lib/openssl/ssl.rb
@@ -31,21 +31,21 @@ class SSLContext
       }
       if defined?(OpenSSL::PKey::DH)
 -        DEFAULT_2048 = OpenSSL::PKey::DH.new <<-_end_of_pem_
 +        DH_ffdhe2048 = OpenSSL::PKey::DH.new <<-_end_of_pem_
 -----BEGIN DH PARAMETERS-----
 -MIIBCAKCAQEA7E6kBrYiyvmKAMzQ7i8WvwVk9Y/+f8S7sCTN712KkK3cqd1jhJDY
 -JbrYeNV3kUIKhPxWHhObHKpD1R84UpL+s2b55+iMd6GmL7OYmNIT/FccKhTcveab
 -VBmZT86BZKYyf45hUF9FOuUM9xPzuK3Vd8oJQvfYMCd7LPC0taAEljQLR4Edf8E6
 -YoaOffgTf5qxiwkjnlVZQc3whgnEt9FpVMvQ9eknyeGB5KHfayAc3+hUAvI3/Cr3
 -1bNveX5wInh5GDx1FGhKBZ+s1H+aedudCm7sCgRwv8lKWYGiHzObSma8A86KG+MD
 -7Lo5JquQ3DlBodj3IDyPrxIv96lvRPFtAwIBAg==
 +MIIBCAKCAQEA//////////+t+FRYortKmq/cViAnPTzx2LnFg84tNpWp4TZBFGQz
 ++8yTnc4kmz75fS/jY2MMddj2gbICrsRhetPfHtXV/WVhJDP1H18GbtCFY2VVPe0a
 +87VXE15/V8k1mE8McODmi3fipona8+/och3xWKE2rec1MKzKT0g6eXq8CrGCsyT7
 +YdEIqUuyyOP7uWrat2DX9GgdT0Kj3jlN9K5W7edjcrsZCwenyO4KbXCeAvzhzffi
 +7MA0BM0oNC9hkXL+nOmFg/+OTxIy7vKBg8P+OxtMb61zO7X8vC7CIAXFjvGDfRaD
 +ssbzSibBsu/6iGtCOGEoXJf//////////wIBAg==
 -----END DH PARAMETERS-----
         _end_of_pem_
 -        private_constant :DEFAULT_2048
 +        private_constant :DH_ffdhe2048
         DEFAULT_TMP_DH_CALLBACK = lambda { |ctx, is_export, keylen| # :nodoc:
           warn "using default DH parameters." if $VERBOSE
 -          DEFAULT_2048
 +          DH_ffdhe2048
         }
       end
--- a/ruby-3.3.0-openssl-3.2.0-fips-fix-pkey-read-in-openssl-3.patch
+++ b/ruby-3.3.0-openssl-3.2.0-fips-fix-pkey-read-in-openssl-3.patch
@ -0,0 +1,177 @@
 From 40451afa279c52ce7a508f8a9ec553cfe7a76a10 Mon Sep 17 00:00:00 2001
 From: Jun Aruga <jaruga@redhat.com>
 Date: Wed, 12 Apr 2023 17:15:21 +0200
 Subject: [PATCH] Fix OpenSSL::PKey.read in OpenSSL 3 FIPS module.
 This is a combination of the following 2 commits. Because the combined patch is
 easy to merge.
 This is the 1st commit message:
 [ruby/openssl] Workaround: Fix OpenSSL::PKey.read that cannot parse PKey in the FIPS mode.
 This commit is a workaround to avoid the error below that the
 `OpenSSL::PKey.read` fails with the OpenSSL 3.0 FIPS mode.
 ```
 $ openssl genrsa -out key.pem 4096
 $ ruby -e "require 'openssl'; OpenSSL::PKey.read(File.read('key.pem'))"
 -e:1:in `read': Could not parse PKey (OpenSSL::PKey::PKeyError)
  from -e:1:in `<main>'
 ```
 The root cause is on the OpenSSL side. The `OSSL_DECODER_CTX_set_selection`
 doesn't apply the selection value properly if there are multiple providers, and
 a provider (e.g.  "base" provider) handles the decoder implementation, and
 another provider (e.g. "fips" provider) handles the keys.
 The workaround is to create `OSSL_DECODER_CTX` variable each time without using
 the `OSSL_DECODER_CTX_set_selection`.
 https://github.com/ruby/openssl/commit/5ff4a31621
 This is the commit message #2:
 [ruby/openssl] ossl_pkey.c: Workaround: Decode with non-zero selections.
 This is a workaround for the decoding issue in ossl_pkey_read_generic().
 The issue happens in the case that a key management provider is different from
 a decoding provider.
 Try all the non-zero selections in order, instead of selection 0 for OpenSSL 3
 to avoid the issue.
 https://github.com/ruby/openssl/commit/db688fa739
 ---
 ext/openssl/ossl_pkey.c | 96 +++++++++++++++++++++++++++++++++--------
 1 file changed, 79 insertions(+), 17 deletions(-)
 diff --git a/ext/openssl/ossl_pkey.c b/ext/openssl/ossl_pkey.c
 index 24d0da4683..15854aeca1 100644
 --- a/ext/openssl/ossl_pkey.c
 +++ b/ext/openssl/ossl_pkey.c
@@ -82,41 +82,103 @@ ossl_pkey_new(EVP_PKEY *pkey)
 #if OSSL_OPENSSL_PREREQ(3, 0, 0)
 # include <openssl/decoder.h>
 -EVP_PKEY *
 -ossl_pkey_read_generic(BIO *bio, VALUE pass)
 +static EVP_PKEY *
 +ossl_pkey_read(BIO *bio, const char *input_type, int selection, VALUE pass)
 {
     void *ppass = (void *)pass;
     OSSL_DECODER_CTX *dctx;
     EVP_PKEY *pkey = NULL;
     int pos = 0, pos2;
 -    dctx = OSSL_DECODER_CTX_new_for_pkey(&pkey, "DER", NULL, NULL, 0, NULL, NULL);
 +    dctx = OSSL_DECODER_CTX_new_for_pkey(&pkey, input_type, NULL, NULL,
 +                                         selection, NULL, NULL);
     if (!dctx)
         goto out;
 -    if (OSSL_DECODER_CTX_set_pem_password_cb(dctx, ossl_pem_passwd_cb, ppass) != 1)
 +    if (OSSL_DECODER_CTX_set_pem_password_cb(dctx, ossl_pem_passwd_cb,
 +                                             ppass) != 1)
         goto out;
 -
 -    /* First check DER */
 -    if (OSSL_DECODER_from_bio(dctx, bio) == 1)
 -        goto out;
 -
 -    /* Then check PEM; multiple OSSL_DECODER_from_bio() calls may be needed */
 -    OSSL_BIO_reset(bio);
 -    if (OSSL_DECODER_CTX_set_input_type(dctx, "PEM") != 1)
 -        goto out;
 -    while (OSSL_DECODER_from_bio(dctx, bio) != 1) {
 -        if (BIO_eof(bio))
 +    while (1) {
 +        if (OSSL_DECODER_from_bio(dctx, bio) == 1)
             goto out;
 +        if (BIO_eof(bio))
 +            break;
         pos2 = BIO_tell(bio);
         if (pos2 < 0 || pos2 <= pos)
 -            goto out;
 +            break;
 +        ossl_clear_error();
         pos = pos2;
     }
 -
   out:
 +    OSSL_BIO_reset(bio);
     OSSL_DECODER_CTX_free(dctx);
     return pkey;
 }
 +
 +EVP_PKEY *
 +ossl_pkey_read_generic(BIO *bio, VALUE pass)
 +{
 +    EVP_PKEY *pkey = NULL;
 +    /* First check DER, then check PEM. */
 +    const char *input_types[] = {"DER", "PEM"};
 +    int input_type_num = (int)(sizeof(input_types) / sizeof(char *));
 +    /*
 +     * Non-zero selections to try to decode.
 +     *
 +     * See EVP_PKEY_fromdata(3) - Selections to see all the selections.
 +     *
 +     * This is a workaround for the decoder failing to decode or returning
 +     * bogus keys with selection 0, if a key management provider is different
 +     * from a decoder provider. The workaround is to avoid using selection 0.
 +     *
 +     * Affected OpenSSL versions: >= 3.1.0, <= 3.1.2, or >= 3.0.0, <= 3.0.10
 +     * Fixed OpenSSL versions: 3.2, next release of the 3.1.z and 3.0.z
 +     *
 +     * See https://github.com/openssl/openssl/pull/21519 for details.
 +     *
 +     * First check for private key formats (EVP_PKEY_KEYPAIR). This is to keep
 +     * compatibility with ruby/openssl < 3.0 which decoded the following as a
 +     * private key.
 +     *
 +     *     $ openssl ecparam -name prime256v1 -genkey -outform PEM
 +     *     -----BEGIN EC PARAMETERS-----
 +     *     BggqhkjOPQMBBw==
 +     *     -----END EC PARAMETERS-----
 +     *     -----BEGIN EC PRIVATE KEY-----
 +     *     MHcCAQEEIAG8ugBbA5MHkqnZ9ujQF93OyUfL9tk8sxqM5Wv5tKg5oAoGCCqGSM49
 +     *     AwEHoUQDQgAEVcjhJfkwqh5C7kGuhAf8XaAjVuG5ADwb5ayg/cJijCgs+GcXeedj
 +     *     86avKpGH84DXUlB23C/kPt+6fXYlitUmXQ==
 +     *     -----END EC PRIVATE KEY-----
 +     *
 +     * While the first PEM block is a proper encoding of ECParameters, thus
 +     * OSSL_DECODER_from_bio() would pick it up, ruby/openssl used to return
 +     * the latter instead. Existing applications expect this behavior.
 +     *
 +     * Note that normally, the input is supposed to contain a single decodable
 +     * PEM block only, so this special handling should not create a new problem.
 +     *
 +     * Note that we need to create the OSSL_DECODER_CTX variable each time when
 +     * we use the different selection as a workaround.
 +     * See https://github.com/openssl/openssl/issues/20657 for details.
 +     */
 +    int selections[] = {
 +        EVP_PKEY_KEYPAIR,
 +        EVP_PKEY_KEY_PARAMETERS,
 +        EVP_PKEY_PUBLIC_KEY
 +    };
 +    int selection_num = (int)(sizeof(selections) / sizeof(int));
 +    int i, j;
 +
 +    for (i = 0; i < input_type_num; i++) {
 +        for (j = 0; j < selection_num; j++) {
 +            pkey = ossl_pkey_read(bio, input_types[i], selections[j], pass);
 +            if (pkey) {
 +                goto out;
 +            }
 +        }
 +    }
 +  out:
 +    return pkey;
 +}
 #else
 EVP_PKEY *
 ossl_pkey_read_generic(BIO *bio, VALUE pass)
 -- 
 2.41.0
--- a/ruby-3.3.0-openssl-3.2.0-fix-fips-get-set-in-openssl-3.patch
+++ b/ruby-3.3.0-openssl-3.2.0-fix-fips-get-set-in-openssl-3.patch
@ -0,0 +1,142 @@
 From 29920ec109751459a65c6478525f2e59c644891f Mon Sep 17 00:00:00 2001
 From: Jun Aruga <jaruga@redhat.com>
 Date: Thu, 16 Mar 2023 21:36:43 +0100
 Subject: [PATCH] [ruby/openssl] Implement FIPS functions on OpenSSL 3.
 This commit is to implement the `OpenSSL::OPENSSL_FIPS`, `ossl_fips_mode_get`
 and `ossl_fips_mode_set` to pass the test `test/openssl/test_fips.rb`.
 It seems that the `OPENSSL_FIPS` macro is not used on the FIPS mode case any
 more, and some FIPS related APIs also were removed in OpenSSL 3.
 See the document <https://github.com/openssl/openssl/blob/master/doc/man7/migration_guide.pod#removed-fips_mode-and-fips_mode_set>
 the section OPENSSL 3.0 > Main Changes from OpenSSL 1.1.1 >
 Other notable deprecations and changes - Removed FIPS_mode() and FIPS_mode_set() .
 The `OpenSSL::OPENSSL_FIPS` returns always true in OpenSSL 3 because the used
 functions `EVP_default_properties_enable_fips` and `EVP_default_properties_is_fips_enabled`
 works with the OpenSSL installed without FIPS option.
 The `TEST_RUBY_OPENSSL_FIPS_ENABLED` is set on the FIPS mode case on the CI.
 Because I want to test that the `OpenSSL.fips_mode` returns the `true` or
 'false' surely in the CI. You can test the FIPS mode case by setting
 `TEST_RUBY_OPENSSL_FIPS_ENABLED` on local too. Right now I don't find a better
 way to get the status of the FIPS mode enabled or disabled for this purpose. I
 am afraid of the possibility that the FIPS test case is unintentionally skipped.
 I also replaced the ambiguous "returns" with "should return" in the tests.
 https://github.com/ruby/openssl/commit/c5b2bc1268
 ---
 ext/openssl/ossl.c        | 25 +++++++++++++++++++++----
 test/openssl/test_fips.rb | 32 ++++++++++++++++++++++++++++----
 2 files changed, 49 insertions(+), 8 deletions(-)
 diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c
 index 6c532aca94..fcf3744c65 100644
 --- a/ext/openssl/ossl.c
 +++ b/ext/openssl/ossl.c
@@ -418,7 +418,11 @@ static VALUE
 ossl_fips_mode_get(VALUE self)
 {
 -#ifdef OPENSSL_FIPS
 +#if OSSL_OPENSSL_PREREQ(3, 0, 0)
 +    VALUE enabled;
 +    enabled = EVP_default_properties_is_fips_enabled(NULL) ? Qtrue : Qfalse;
 +    return enabled;
 +#elif OPENSSL_FIPS
     VALUE enabled;
     enabled = FIPS_mode() ? Qtrue : Qfalse;
     return enabled;
@@ -442,8 +446,18 @@ ossl_fips_mode_get(VALUE self)
 static VALUE
 ossl_fips_mode_set(VALUE self, VALUE enabled)
 {
 -
 -#ifdef OPENSSL_FIPS
 +#if OSSL_OPENSSL_PREREQ(3, 0, 0)
 +    if (RTEST(enabled)) {
 +        if (!EVP_default_properties_enable_fips(NULL, 1)) {
 +            ossl_raise(eOSSLError, "Turning on FIPS mode failed");
 +        }
 +    } else {
 +        if (!EVP_default_properties_enable_fips(NULL, 0)) {
 +            ossl_raise(eOSSLError, "Turning off FIPS mode failed");
 +        }
 +    }
 +    return enabled;
 +#elif OPENSSL_FIPS
     if (RTEST(enabled)) {
 	int mode = FIPS_mode();
 	if(!mode && !FIPS_mode_set(1)) /* turning on twice leads to an error */
@@ -1198,7 +1212,10 @@ Init_openssl(void)
      * Boolean indicating whether OpenSSL is FIPS-capable or not
      */
     rb_define_const(mOSSL, "OPENSSL_FIPS",
 -#ifdef OPENSSL_FIPS
 +/* OpenSSL 3 is FIPS-capable even when it is installed without fips option */
 +#if OSSL_OPENSSL_PREREQ(3, 0, 0)
 +                    Qtrue
 +#elif OPENSSL_FIPS
 		    Qtrue
 #else
 		    Qfalse
 diff --git a/test/openssl/test_fips.rb b/test/openssl/test_fips.rb
 index 8cd474f9a3..56a12a94ce 100644
 --- a/test/openssl/test_fips.rb
 +++ b/test/openssl/test_fips.rb
@@ -4,22 +4,46 @@
 if defined?(OpenSSL)
 class OpenSSL::TestFIPS < OpenSSL::TestCase
 +  def test_fips_mode_get_is_true_on_fips_mode_enabled
 +    unless ENV["TEST_RUBY_OPENSSL_FIPS_ENABLED"]
 +      omit "Only for FIPS mode environment"
 +    end
 +
 +    assert_separately([{ "OSSL_MDEBUG" => nil }, "-ropenssl"], <<~"end;")
 +      assert OpenSSL.fips_mode == true, ".fips_mode should return true on FIPS mode enabled"
 +    end;
 +  end
 +
 +  def test_fips_mode_get_is_false_on_fips_mode_disabled
 +    if ENV["TEST_RUBY_OPENSSL_FIPS_ENABLED"]
 +      omit "Only for non-FIPS mode environment"
 +    end
 +
 +    assert_separately([{ "OSSL_MDEBUG" => nil }, "-ropenssl"], <<~"end;")
 +      message = ".fips_mode should return false on FIPS mode disabled. " \
 +                "If you run the test on FIPS mode, please set " \
 +                "TEST_RUBY_OPENSSL_FIPS_ENABLED=true"
 +      assert OpenSSL.fips_mode == false, message
 +    end;
 +  end
 +
   def test_fips_mode_is_reentrant
     OpenSSL.fips_mode = false
     OpenSSL.fips_mode = false
   end
 -  def test_fips_mode_get
 -    return unless OpenSSL::OPENSSL_FIPS
 +  def test_fips_mode_get_with_fips_mode_set
 +    omit('OpenSSL is not FIPS-capable') unless OpenSSL::OPENSSL_FIPS
 +
     assert_separately([{ "OSSL_MDEBUG" => nil }, "-ropenssl"], <<~"end;")
       require #{__FILE__.dump}
       begin
         OpenSSL.fips_mode = true
 -        assert OpenSSL.fips_mode == true, ".fips_mode returns true when .fips_mode=true"
 +        assert OpenSSL.fips_mode == true, ".fips_mode should return true when .fips_mode=true"
         OpenSSL.fips_mode = false
 -        assert OpenSSL.fips_mode == false, ".fips_mode returns false when .fips_mode=false"
 +        assert OpenSSL.fips_mode == false, ".fips_mode should return false when .fips_mode=false"
       rescue OpenSSL::OpenSSLError
         pend "Could not set FIPS mode (OpenSSL::OpenSSLError: \#$!); skipping"
       end
 -- 
 2.41.0
--- a/ruby-bundler-2.4.0-bundle-update-bundler-test-in-ruby.patch
+++ b/ruby-bundler-2.4.0-bundle-update-bundler-test-in-ruby.patch
@ -0,0 +1,31 @@
 From bfa2f72cfa3bfde34049d26dcb24976316074ad7 Mon Sep 17 00:00:00 2001
 From: Jun Aruga <jaruga@redhat.com>
 Date: Mon, 21 Mar 2022 15:36:51 +0100
 Subject: [PATCH] Fix a test for `bin/bundle update --bundler` to pass on
 ruby/ruby.
 Consider the case that the latest Bundler version on RubyGems is higher than
 the `system_bundler_version` (= `Bundler::VERSION`) in `make test-bundler` on
 ruby/ruby.
 See <https://bugs.ruby-lang.org/issues/18643>.
 ---
 spec/bundler/commands/binstubs_spec.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
 diff --git a/spec/bundler/commands/binstubs_spec.rb b/spec/bundler/commands/binstubs_spec.rb
 index 198226207bc..2634f43417c 100644
 --- a/spec/bundler/commands/binstubs_spec.rb
 +++ b/spec/bundler/commands/binstubs_spec.rb
@@ -226,7 +226,10 @@
         it "calls through to the latest bundler version" do
           sys_exec "bin/bundle update --bundler", :env => { "DEBUG" => "1" }
 -          expect(out).to include %(Using bundler #{system_bundler_version}\n)
 +          using_bundler_line = /Using bundler ([\w\.]+)\n/.match(out)
 +          expect(using_bundler_line).to_not be_nil
 +          latest_version = using_bundler_line[1]
 +          expect(Gem::Version.new(latest_version)).to be >= Gem::Version.new(system_bundler_version)
         end
         it "calls through to the explicit bundler version" do
--- a/SOURCES/ruby-exercise.stp
+++ b/SOURCES/ruby-exercise.stp
--- a/ruby-spec-Fix-tests-on-tzdata-2022b.patch
+++ b/ruby-spec-Fix-tests-on-tzdata-2022b.patch
@ -0,0 +1,40 @@
 From 7e9ec8a20b0f7469b415283d2ec0c22087f8eb2b Mon Sep 17 00:00:00 2001
 From: Jun Aruga <jaruga@redhat.com>
 Date: Wed, 24 Aug 2022 12:02:56 +0200
 Subject: [PATCH] Fix tests with Europe/Amsterdam pre-1970 time on tzdata
 version 2022b.
 The Time Zone Database (tzdata) changed the pre-1970 timestamps in some zones
 including Europe/Amsterdam on tzdata version 2022b or later.
 See <https://github.com/eggert/tz/commit/35fa37fbbb152f5dbed4fd5edfdc968e3584fe12>.
 The tzdata RPM package maintainer on Fedora project suggested changing the Ruby
 test, because the change is intentional.
 See <https://bugzilla.redhat.com/show_bug.cgi?id=2118259#c1>.
 We use post-1970 time test data to simplify the test.
 ---
 core/time/shared/local.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 diff --git a/spec/ruby/core/time/shared/local.rb b/spec/ruby/core/time/shared/local.rb
 index 43f331c4c..c4aa7a7ea 100644
 --- a/spec/ruby/core/time/shared/local.rb
 +++ b/spec/ruby/core/time/shared/local.rb
@@ -8,10 +8,10 @@ describe :time_local, shared: true do
   platform_is_not :windows do
     describe "timezone changes" do
 -      it "correctly adjusts the timezone change to 'CEST' on 'Europe/Amsterdam'" do
 +      it "correctly adjusts the timezone change to 'CET' on 'Europe/Amsterdam'" do
         with_timezone("Europe/Amsterdam") do
 -          Time.send(@method, 1940, 5, 16).to_a.should ==
 -            [0, 40, 1, 16, 5, 1940, 4, 137, true, "CEST"]
 +          Time.send(@method, 1970, 5, 16).to_a.should ==
 +            [0, 0, 0, 16, 5, 1970, 6, 136, false, "CET"]
         end
       end
     end
 -- 
 2.36.1
--- a/ruby.rpmlintrc
+++ b/ruby.rpmlintrc
@ -0,0 +1,75 @@
 # Keep matching patterns enough not to hide unintended errors and warnings.
 # There is no way to implement this with `%{SOURCE0}` without `%{_sourcedir}`.
 # The order in the .spec file could be possibly different.
 addFilter(r'ruby\.(spec|src):20: E: use-of-RPM_SOURCE_DIR$')
 # The used version is not obvious.
 addFilter(r'ruby\.(spec|src):\d+: W: unversioned-explicit-provides bundled\(ccan-build_assert\)$')
 addFilter(r'ruby\.(spec|src):\d+: W: unversioned-explicit-provides bundled\(ccan-check_type\)$')
 addFilter(r'ruby\.(spec|src):\d+: W: unversioned-explicit-provides bundled\(ccan-container_of\)$')
 addFilter(r'ruby\.(spec|src):\d+: W: unversioned-explicit-provides bundled\(ccan-list\)$')
 # The template files do not have to have executable bits.
 addFilter(r'^rubygem-bundler\.noarch: E: non-executable-script /usr/share/gems/gems/bundler-[\d\.]+/lib/bundler/templates/[\w/\.]+ 644 /usr/bin/env ')
 # The template files can have /usr/bin/env
 addFilter(r'^rubygem-bundler\.noarch: E: wrong-script-interpreter /usr/share/gems/gems/bundler-[\d\.]+/lib/bundler/templates/[\w/\.]+ /usr/bin/env ')
 # Just a test script.
 addFilter(r'^rubygem-rss\.noarch: E: wrong-script-interpreter /usr/share/gems/gems/rss-[\d\.]+/test/[\w\-\.]+ /usr/bin/env ')
 # The bundled gem files permissions are overridden as 644 by `make install`.
 # https://bugs.ruby-lang.org/issues/17840
 # https://github.com/rubygems/rubygems/issues/5255
 # https://github.com/ruby/debug/pull/481
 # https://github.com/ruby/net-ftp/pull/12
 # https://github.com/ruby/net-imap/pull/53
 # https://github.com/ruby/net-pop/pull/7
 # https://github.com/ruby/prime/pull/16
 addFilter(r'^.*: E: non-executable-script /usr/share/gems/gems/(debug|net-(ftp|imap|pop)|prime)-[\d\.]+/bin/\w+ 644 ')
 addFilter(r'^.*: E: wrong-script-interpreter /usr/share/gems/gems/(debug|net-(ftp|imap|pop)|prime)-[\d\.]+/bin/\w+ /usr/bin/env')
 # Ruby provides API to set the cipher list.
 addFilter(r'^ruby-libs\.\w+: W: crypto-policy-non-compliance-openssl /usr/lib(64)?/ruby/openssl.so SSL_CTX_set_cipher_list$')
 # `gethostbyname` is part of deprecated Ruby API. There is also request to drop the API altogether:
 # https://bugs.ruby-lang.org/issues/13097
 # https://bugs.ruby-lang.org/issues/17944
 addFilter(r'^ruby-libs\.\w+: W: binary-or-shlib-calls-gethostbyname /usr/lib(64)?/ruby/socket.so$')
 # Nothing referred and no dependency information should be no problem.
 # https://bugs.ruby-lang.org/issues/16558#note-2
 addFilter(r'^ruby-libs\.\w+: E: shared-library-without-dependency-information /usr/lib(64)?/ruby/enc/gb2312.so$')
 # Compatibility for rpmlint 1.11.
 addFilter(r'^ruby-libs\.\w+: E: shared-lib-without-dependency-information /usr/lib(64)?/ruby/enc/gb2312.so$')
 # These are Ruby plugins, where Ruby always load glibc prior the library.
 addFilter(r'^ruby-libs\.\w+: W: library-not-linked-against-libc /usr/lib(64)?/ruby/.*.so$')
 # The function `chroot` without using `chdir` is detected by rpmlint with the
 # following message. However it looks a false positive as the `chroot` in the
 # `dir.c` is just used as a Ruby binding `Dir.chroot` for the function.
 #
 # ruby-libs.x86_64: E: missing-call-to-chdir-with-chroot /usr/lib64/libruby.so.N.N.N
 # This executable appears to call chroot without using chdir to change the
 # current directory. This is likely an error and permits an attacker to break
 # out of the chroot by using fchdir. While that's not always a security issue,
 # this has to be checked.
 addFilter(r'^ruby-libs\.\w+: E: missing-call-to-chdir-with-chroot /usr/lib(64)?/libruby.so.[\d/.]+$')
 # Rake ships some examples.
 addFilter(r'^rubygem-rake.noarch: W: devel-file-in-non-devel-package /usr/share/gems/gems/rake-[\d\.]+/doc/example/\w+.c$')
 # Some executables don't have their manual pages. Is it worth of use help2man?
 addFilter(r'^.+: W: no-manual-page-for-binary (bundler|gem|rbs|rdbg|rdoc|ruby-mri|typeprof)$')
 # Default gems does not come with any documentation.
 addFilter(r'^rubygem-(bigdecimal|io-console|json|psych)\.\w+: W: no-documentation$')
 # rubygems-devel ships only RPM macros and generators. Their placement is given
 # by RPM and can't be modified.
 addFilter(r'rubygems-devel.noarch: W: only-non-binary-in-usr-lib$')
 # The empty gem.build_complete file is false positive. This error is gone in rpmlint 2.0+.
 # https://github.com/rpm-software-management/rpmlint/commit/e34ce874f27d733628f51c9884ac951af072bed2
 addFilter(r'^ruby(gem)?-(bigdecimal|bundled-gems|io-console|json|psych|rbs)\.\w+: E: zero-length /usr/lib(64)?/gems/ruby/.*/gem.build_complete')
--- a/SPECS/ruby.spec
+++ b/SPECS/ruby.spec
--- a/SOURCES/rubygems.attr
+++ b/SOURCES/rubygems.attr
--- a/SOURCES/rubygems.con
+++ b/SOURCES/rubygems.con
--- a/SOURCES/rubygems.prov
+++ b/SOURCES/rubygems.prov
@ -9,9 +9,9 @@ module RubyGemsProv
    def self.normalize_prerelease(version)
      if version.prerelease?
        prerelease = version.version.sub /^#{version.release}\./, ''
-        "#{version.release}-0.1.#{prerelease}"
+        "#{version.release}~#{prerelease}"
      else
-        "#{version.release}-1"
+        version.release
      end
    end
  end
--- a/SOURCES/rubygems.req
+++ b/SOURCES/rubygems.req
@ -38,28 +38,32 @@ module RubyGemsReq
        version == Gem::Version.new(0) ? "" : " #{op} #{version}"
      end
    end
    # Compose dependency together with its requirements in RPM rich dependency
    # string.
    def self.compose_dependency_string(name, requirements)
      dependency_strings = requirements.map { |requirement| name + requirement }
      dependency_string = dependency_strings.join(' with ')
      dependency_string.prepend('(').concat(')') if dependency_strings.length > 1
      dependency_string
    end
  end
  # Report RubyGems dependency, versioned if required.
  def self.rubygems_dependency(specification)
-    Helpers::requirement_versions_to_rpm(specification.required_rubygems_version).each do |requirement|
+    dependency_name = "ruby(rubygems)"
-      dependency_string = "ruby(rubygems)"
+    requirements = Helpers::requirement_versions_to_rpm(specification.required_rubygems_version)
-      dependency_string += " #{specification.required_rubygems_version}" if requirement&.length > 0
+
-      puts dependency_string
+    puts Helpers::compose_dependency_string(dependency_name, requirements)
    end
  end
  # Report all gem dependencies including their version.
  def self.gem_depenencies(specification)
    specification.runtime_dependencies.each do |dependency|
-      dependency_strings = Helpers::requirement_versions_to_rpm(dependency.requirement).map do |requirement|
+      dependency_name = "rubygem(#{dependency.name})"
-        requirement_string = "rubygem(#{dependency.name})"
+      requirements = Helpers::requirement_versions_to_rpm(dependency.requirement)
-        requirement_string += " #{requirement}" if requirement&.length > 0
+
-        requirement_string
+      puts Helpers::compose_dependency_string(dependency_name, requirements)
      end
      dependency_string = dependency_strings.join(' with ')
      dependency_string.prepend('(').concat(')') if dependency_strings.length > 1
      puts dependency_string
    end
  end
--- a/1
+++ b/1
@ -0,0 +1 @@
 SHA512 (ruby-3.1.2.tar.xz) = 4a74e9efc6ea4b3eff4fec7534eb1fff4794d021531defc2e9937e53c6668db8ecdc0fff2bc23d5e6602d0df344a2caa85b31c5414309541e3d5313ec82b6e21
--- a/SOURCES/test_abrt.rb
+++ b/SOURCES/test_abrt.rb
--- a/test_openssl_fips.rb
+++ b/test_openssl_fips.rb
@ -0,0 +1,34 @@
 require 'openssl'
 # Run openssl tests in OpenSSL FIPS. See the link below for how to test.
 # https://github.com/ruby/openssl/blob/master/.github/workflows/test.yml
 # - step name: test on fips module
 # Listing the testing files by an array explicitly rather than the `Dir.glob`
 # to prevent the test files from not loading unintentionally.
 TEST_FILES = %w[
  test/openssl/test_fips.rb
  test/openssl/test_pkey.rb
 ].freeze
 if ARGV.empty?
  puts 'ERROR: Argument base_dir required.'
  puts "Usage: #{__FILE__} base_dir [options]"
  exit false
 end
 BASE_DIR = ARGV[0]
 abs_test_files = TEST_FILES.map { |file| File.join(BASE_DIR, file) }
 # Set Fedora/RHEL downstream OpenSSL downstream environment variable to enable
 # FIPS module in non-FIPS OS environment. It is available in Fedora 38 or later
 # versions.
 # https://src.fedoraproject.org/rpms/openssl/blob/rawhide/f/0009-Add-Kernel-FIPS-mode-flag-support.patch
 ENV['OPENSSL_FORCE_FIPS_MODE'] = '1'
 # A flag to tell the tests the current environment is FIPS enabled.
 # https://github.com/ruby/openssl/blob/master/test/openssl/test_fips.rb
 ENV['TEST_RUBY_OPENSSL_FIPS_ENABLED'] = 'true'
 abs_test_files.each do |file|
  puts "INFO: Loading #{file}."
  require file
 end
--- a/SOURCES/test_systemtap.rb
+++ b/SOURCES/test_systemtap.rb
		`@ -1 +0,0 @@`
			`7be8dc2e6e534eb36bfdf9f017af512996ec99a6 SOURCES/ruby-2.5.9.tar.xz`
		`@ -0,0 +1 @@`
							`SHA512 (ruby-3.1.2.tar.xz) = 4a74e9efc6ea4b3eff4fec7534eb1fff4794d021531defc2e9937e53c6668db8ecdc0fff2bc23d5e6602d0df344a2caa85b31c5414309541e3d5313ec82b6e21`