4 files changed, 201 insertions, 0 deletions
diff --git a/lang/ruby25/files/patch-lib_mkmf.rb b/lang/ruby25/files/patch-lib_mkmf.rb
new file mode 100644
index 000000000000..0e629b51bec1
--- /dev/null
+++ b/lang/ruby25/files/patch-lib_mkmf.rb
@@ -0,0 +1,11 @@
+--- lib/mkmf.rb.orig	2015-12-16 09:25:48 UTC
++++ lib/mkmf.rb
+@@ -235,7 +235,7 @@ module MakeMakefile
+   end
+   $extmk ||= false
+   if not $extmk and File.exist?(($hdrdir = RbConfig::CONFIG["rubyhdrdir"]) + "/ruby/ruby.h")
+-    $topdir = $hdrdir
++    $topdir = $hdrdir + "/" + "#{CONFIG['arch']}/ruby/"
+     $top_srcdir = $hdrdir
+     $arch_hdrdir = RbConfig::CONFIG["rubyarchhdrdir"]
+   elsif File.exist?(($hdrdir = ($top_srcdir ||= topdir) + "/include")  + "/ruby.h")
diff --git a/lang/ruby25/files/patch-lib_rdoc_generator_json_index.rb b/lang/ruby25/files/patch-lib_rdoc_generator_json_index.rb
new file mode 100644
index 000000000000..1211131e7e17
--- /dev/null
+++ b/lang/ruby25/files/patch-lib_rdoc_generator_json_index.rb
@@ -0,0 +1,20 @@
+--- ./lib/rdoc/generator/json_index.rb.orig	2017-11-12 19:37:25.144883000 -0500
++++ ./lib/rdoc/generator/json_index.rb	2017-11-12 19:37:44.551836000 -0500
+@@ -175,7 +175,7 @@
+     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
+       gz.orig_name = search_index_file.basename.to_s
+       gz.write search_index
+       gz.close
+@@ -193,7 +193,7 @@
+         debug_msg "Writing gzipped file to %s" % outfile
+ 
+         Zlib::GzipWriter.open(outfile) do |gz|
+-          gz.mtime = File.mtime(dest)
++          gz.mtime = 1
+           gz.orig_name = dest.basename.to_s
+           gz.write data
+           gz.close
diff --git a/lang/ruby25/files/patch-tool_mkconfig.rb b/lang/ruby25/files/patch-tool_mkconfig.rb
new file mode 100644
index 000000000000..fe3fa72e5eb9
--- /dev/null
+++ b/lang/ruby25/files/patch-tool_mkconfig.rb
@@ -0,0 +1,14 @@
+--- tool/mkconfig.rb.orig	2015-12-09 20:53:21 UTC
++++ tool/mkconfig.rb
+@@ -168,8 +168,9 @@ def vars.expand(val, config = self)
+   val.replace(newval) unless newval == val
+   val
+ end
+-prefix = vars.expand(vars["prefix"] ||= "")
+-rubyarchdir = vars.expand(vars["rubyarchdir"] ||= "")
++prefix = vars.expand(vars["rubyarchdir"])
++major, minor, *rest = RUBY_VERSION.split('.')
++rubyarchdir = "/lib/ruby/#{major}.#{minor}/#{arch}"
+ relative_archdir = rubyarchdir.rindex(prefix, 0) ? rubyarchdir[prefix.size..-1] : rubyarchdir
+ puts %[\
+ # frozen-string-literal: false
diff --git a/lang/ruby25/files/patch-tool_rbinstall.rb b/lang/ruby25/files/patch-tool_rbinstall.rb
new file mode 100644
index 000000000000..c67b453912c1
--- /dev/null
+++ b/lang/ruby25/files/patch-tool_rbinstall.rb
@@ -0,0 +1,156 @@
+--- tool/rbinstall.rb.orig	2017-10-30 05:45:20 UTC
++++ tool/rbinstall.rb
+@@ -325,6 +325,7 @@ bindir = CONFIG["bindir", true]
+ libdir = CONFIG[CONFIG.fetch("libdirname", "libdir"), true]
+ rubyhdrdir = CONFIG["rubyhdrdir", true]
+ archhdrdir = CONFIG["rubyarchhdrdir"] || (rubyhdrdir + "/" + CONFIG['arch'])
++libdatadir = CONFIG["prefix", true] + "/" + "libdata"
+ rubylibdir = CONFIG["rubylibdir", true]
+ archlibdir = CONFIG["rubyarchdir", true]
+ sitelibdir = CONFIG["sitelibdir"]
+@@ -378,7 +379,7 @@ end
+ install?(:local, :arch, :data) do
+   pc = CONFIG["ruby_pc"]
+   if pc and File.file?(pc) and File.size?(pc)
+-    prepare "pkgconfig data", pkgconfigdir = File.join(libdir, "pkgconfig")
++    prepare "pkgconfig data", pkgconfigdir = File.join(libdatadir, "pkgconfig")
+     install pc, pkgconfigdir, :mode => $data_mode
+   end
+ end
+@@ -699,136 +700,6 @@ end
+ 
+ # :startdoc:
+ 
+-install?(:ext, :comm, :gem, :'default-gems', :'default-gems-comm') do
+-  install_default_gem('lib', srcdir)
+-end
+-install?(:ext, :arch, :gem, :'default-gems', :'default-gems-arch') do
+-  install_default_gem('ext', srcdir) do |path|
+-    # assume that gemspec and extconf.rb are placed in the same directory
+-    success = false
+-    begin
+-      IO.foreach(File.dirname(path[(srcdir.size+1)..-1]) + "/Makefile") do |l|
+-        break success = true if /^TARGET\s*=/ =~ l
+-      end
+-    rescue Errno::ENOENT
+-    end
+-    success
+-  end
+-end
+-
+-def load_gemspec(file)
+-  code = File.read(file, encoding: "utf-8:-")
+-  code.gsub!(/`git.*?`/m, '""')
+-  begin
+-    spec = eval(code, binding, file)
+-  rescue SignalException, SystemExit
+-    raise
+-  rescue SyntaxError, Exception
+-  end
+-  raise("invalid spec in #{file}") unless spec
+-  spec.loaded_from = file
+-  spec
+-end
+-
+-def install_default_gem(dir, srcdir)
+-  gem_dir = Gem.default_dir
+-  directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode)
+-  prepare "default gems from #{dir}", gem_dir, directories
+-
+-  spec_dir = File.join(gem_dir, directories.grep(/^spec/)[0])
+-  default_spec_dir = "#{spec_dir}/default"
+-  makedirs(default_spec_dir)
+-
+-  gems = Dir.glob("#{srcdir}/#{dir}/**/*.gemspec").map {|src|
+-    next if block_given? and !yield(src)
+-    load_gemspec(src)
+-  }
+-  gems.compact.sort_by(&:name).each do |gemspec|
+-    full_name = "#{gemspec.name}-#{gemspec.version}"
+-
+-    puts "#{INDENT}#{gemspec.name} #{gemspec.version}"
+-    gemspec_path = File.join(default_spec_dir, "#{full_name}.gemspec")
+-    open_for_install(gemspec_path, $data_mode) do
+-      gemspec.to_ruby
+-    end
+-
+-    unless gemspec.executables.empty? then
+-      bin_dir = File.join(gem_dir, 'gems', full_name, gemspec.bindir)
+-      makedirs(bin_dir)
+-
+-      gemspec.executables.map {|exec|
+-        $script_installer.install(File.join(srcdir, 'bin', exec),
+-                                  File.join(bin_dir, exec))
+-      }
+-    end
+-  end
+-end
+-
+-install?(:ext, :comm, :gem, :'bundled-gems') do
+-  gem_dir = Gem.default_dir
+-  directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode)
+-  prepare "bundled gems", gem_dir, directories
+-  install_dir = with_destdir(gem_dir)
+-  installed_gems = {}
+-  options = {
+-    :install_dir => install_dir,
+-    :bin_dir => with_destdir(bindir),
+-    :domain => :local,
+-    :ignore_dependencies => true,
+-    :dir_mode => $dir_mode,
+-    :data_mode => $data_mode,
+-    :prog_mode => $prog_mode,
+-    :wrappers => true,
+-    :format_executable => true,
+-  }
+-  gem_ext_dir = "#$extout/gems/#{CONFIG['arch']}"
+-  extensions_dir = Gem::StubSpecification.gemspec_stub("", gem_dir, gem_dir).extensions_dir
+-  Gem::Specification.each_gemspec([srcdir+'/gems/*']) do |path|
+-    spec = load_gemspec(path)
+-    next unless spec.platform == Gem::Platform::RUBY
+-    next unless spec.full_name == path[srcdir.size..-1][/\A\/gems\/([^\/]+)/, 1]
+-    spec.extension_dir = "#{extensions_dir}/#{spec.full_name}"
+-    if File.directory?(ext = "#{gem_ext_dir}/#{spec.full_name}")
+-      spec.extensions[0] ||= "-"
+-    end
+-    ins = RbInstall::UnpackedInstaller.new(spec, options)
+-    puts "#{INDENT}#{spec.name} #{spec.version}"
+-    ins.install
+-    File.chmod($data_mode, File.join(install_dir, "specifications", "#{spec.full_name}.gemspec"))
+-    unless spec.extensions.empty?
+-      install_recursive(ext, spec.extension_dir)
+-    end
+-    installed_gems[spec.full_name] = true
+-  end
+-  installed_gems, gems = Dir.glob(srcdir+'/gems/*.gem').partition {|gem| installed_gems.key?(File.basename(gem, '.gem'))}
+-  unless installed_gems.empty?
+-    install installed_gems, gem_dir+"/cache"
+-  end
+-  next if gems.empty?
+-  if defined?(Zlib)
+-    Gem.instance_variable_set(:@ruby, with_destdir(File.join(bindir, ruby_install_name)))
+-    silent = Gem::SilentUI.new
+-    gems.each do |gem|
+-      inst = Gem::Installer.new(gem, options)
+-      inst.spec.extension_dir = with_destdir(inst.spec.extension_dir)
+-      begin
+-        Gem::DefaultUserInteraction.use_ui(silent) {inst.install}
+-      rescue Gem::InstallError => e
+-        next
+-      end
+-      gemname = File.basename(gem)
+-      puts "#{INDENT}#{gemname}"
+-    end
+-    # fix directory permissions
+-    # TODO: Gem.install should accept :dir_mode option or something
+-    File.chmod($dir_mode, *Dir.glob(install_dir+"/**/"))
+-    # fix .gemspec permissions
+-    File.chmod($data_mode, *Dir.glob(install_dir+"/specifications/*.gemspec"))
+-  else
+-    puts "skip installing bundled gems because of lacking zlib"
+-  end
+-end
+-
+ parse_args()
+ 
+ include FileUtils