11 files changed, 0 insertions, 282 deletions
diff --git a/lang/ruby20/files/patch-Makefile.in b/lang/ruby20/files/patch-Makefile.in
deleted file mode 100644
index 11d27a006b09..000000000000
--- a/lang/ruby20/files/patch-Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.in.orig	2014-09-26 18:04:18 UTC
-+++ Makefile.in
-@@ -342,7 +342,7 @@
- 
- .d.h:
- 	@$(ECHO) translating probes $<
--	$(Q) $(DTRACE) -o $@.tmp -h -C $(INCFLAGS) -s $<
-+	$(Q) $(DTRACE) -xnolibs -o $@.tmp -h -C $(INCFLAGS) -s $<
- 	$(Q) sed -e 's/RUBY_/RUBY_DTRACE_/g' -e 's/PROBES_H_TMP/PROBES_H/g' -e 's/(char \*/(const char */g' -e 's/, char \*/, const char */g' $@.tmp > $@
- 	$(Q) $(RM) $@.tmp
- 
-@@ -362,7 +362,7 @@
- 	fi; \
- 	touch "$$stamp"
- 	$(RM) $@
--	$(Q) $(DTRACE) -G -C $(INCFLAGS) -s $(srcdir)/probes.d -o $@ $(DTRACE_DEPENDENT_OBJS)
-+	$(Q) $(DTRACE) -xnolibs -G -C $(INCFLAGS) -s $(srcdir)/probes.d -o $@ $(DTRACE_DEPENDENT_OBJS)
- 
- # DTrace static library hacks described here:
- # http://mail.opensolaris.org/pipermail/dtrace-discuss/2005-August/000207.html
diff --git a/lang/ruby20/files/patch-configure.in b/lang/ruby20/files/patch-configure.in
deleted file mode 100644
index f3af35ed2741..000000000000
--- a/lang/ruby20/files/patch-configure.in
+++ /dev/null
@@ -1,77 +0,0 @@
---- configure.in.orig	2014-09-26 17:17:06 UTC
-+++ configure.in
-@@ -515,7 +515,7 @@
- [AC_CACHE_CHECK(whether dtrace USDT is available, rb_cv_dtrace_available,
- [
-     echo "provider conftest{ probe fire(); };" > conftest_provider.d
--    if $DTRACE -h -o conftest_provider.h -s conftest_provider.d >/dev/null 2>/dev/null; then
-+    if $DTRACE -xnolibs -h -o conftest_provider.h -s conftest_provider.d >/dev/null 2>/dev/null; then
-       # DTrace is available on the system
-       rb_cv_dtrace_available=yes
-     else
-@@ -532,13 +532,13 @@
- [
-   if {
-     echo "provider conftest{ probe fire(); };" > conftest_provider.d &&
--    dtrace -h -o conftest_provider.h -s conftest_provider.d >/dev/null 2>/dev/null &&
-+    dtrace -xnolibs -h -o conftest_provider.h -s conftest_provider.d >/dev/null 2>/dev/null &&
-     cat >conftest.c <<_CONF &&
-     @%:@include "conftest_provider.h"
-     int main(void){ CONFTEST_FIRE(); return 0; }
- _CONF
-     $CC $CFLAGS -c -o conftest.o conftest.c &&
--    $DTRACE -G -s conftest_provider.d conftest.o 2>/dev/null
-+    $DTRACE -xnolibs -G -s conftest_provider.d conftest.o 2>/dev/null
-   }; then
-     rb_cv_prog_dtrace_g=yes
-   else
-@@ -1428,11 +1428,11 @@
- AC_CHECK_DECLS([sys_nerr], [], [], [$ac_includes_default
- @%:@include <errno.h>])
- 
--AC_CHECK_LIB(crypt, crypt)
--AC_CHECK_LIB(dl, dlopen)	# Dynamic linking for SunOS/Solaris and SYSV
--AC_CHECK_LIB(dld, shl_load)	# Dynamic linking for HP-UX
--AC_CHECK_LIB(socket, socketpair)	# SunOS/Solaris
--AC_CHECK_LIB(rt, clock_gettime)	# GNU/Linux
-+AC_SEARCH_LIBS(crypt, crypt)
-+AC_SEARCH_LIBS(dlopen, dl)	# Dynamic linking for SunOS/Solaris and SYSV
-+AC_SEARCH_LIBS(shl_load, dld)	# Dynamic linking for HP-UX
-+AC_SEARCH_LIBS(socketpair, socket)	# SunOS/Solaris
-+AC_SEARCH_LIBS(clock_gettime, rt)	# GNU/Linux
- 
- AS_CASE(["$target_cpu"],
- [alpha*|sh4|sh4el|sh4eb], [AS_CASE(["$target_os"::"$GCC"],
-@@ -2123,7 +2123,7 @@
- fi
- 
- if test x"$enable_pthread" = xyes; then
--    for pthread_lib in thr pthread pthreads c c_r root; do
-+    for pthread_lib in pthread thr pthreads c c_r root; do
- 	AC_CHECK_LIB($pthread_lib, pthread_kill,
- 		     rb_with_pthread=yes, rb_with_pthread=no)
- 	if test "$rb_with_pthread" = "yes"; then break; fi
-@@ -2137,6 +2137,7 @@
- 	[c],    [],
- 	[root], [],
- 	[c_r],  [MAINLIBS="-pthread $MAINLIBS"],
-+	[pthread],  [MAINLIBS="-pthread $MAINLIBS"],
- 	        [AS_CASE(["$target_os"],
- 		    [openbsd*], [LIBS="-pthread $LIBS"],
- 		    [LIBS="-l$pthread_lib $LIBS"])])
-@@ -2368,7 +2369,6 @@
- 			: ${LDSHARED='$(CC) -shared'}
- 			if test "$rb_cv_binary_elf" = yes; then
- 			    LDFLAGS="$LDFLAGS -rdynamic"
--			    DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$@'
- 			else
- 			  test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED='$(LD) -Bshareable'
- 			fi
-@@ -2755,6 +2755,7 @@
-     [freebsd*|dragonfly*], [
- 	SOLIBS='$(LIBS)'
- 	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'
-+	LIBRUBY_DLDFLAGS='-Wl,-soname,$(LIBRUBY_SO)'
- 	if test "$rb_cv_binary_elf" != "yes" ; then
- 	    LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
- 	    LIBRUBY_ALIASES=''
diff --git a/lang/ruby20/files/patch-cont.c b/lang/ruby20/files/patch-cont.c
deleted file mode 100644
index f539d7b58539..000000000000
--- a/lang/ruby20/files/patch-cont.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- cont.c.orig	2013-10-09 15:37:54 UTC
-+++ cont.c
-@@ -44,6 +44,8 @@
- /* At least, Linux/ia64's getcontext(3) doesn't save register window.
-  */
- #     define FIBER_USE_NATIVE 0
-+#   elif defined(__FreeBSD__)
-+#     define FIBER_USE_NATIVE 0
- #   elif defined(__GNU__)
- /* GNU/Hurd doesn't fully support getcontext, setcontext, makecontext
-  * and swapcontext functions. Disabling their usage till support is
diff --git a/lang/ruby20/files/patch-ext_openssl_extconf.rb b/lang/ruby20/files/patch-ext_openssl_extconf.rb
deleted file mode 100644
index 2577c1c1ec13..000000000000
--- a/lang/ruby20/files/patch-ext_openssl_extconf.rb
+++ /dev/null
@@ -1,15 +0,0 @@
---- ext/openssl/extconf.rb.orig	2015-04-01 22:28:09 UTC
-+++ ext/openssl/extconf.rb
-@@ -100,9 +100,9 @@ have_func("OBJ_NAME_do_all_sorted")
- have_func("SSL_SESSION_get_id")
- have_func("SSL_SESSION_cmp")
- have_func("OPENSSL_cleanse")
--have_func("SSLv2_method")
--have_func("SSLv2_server_method")
--have_func("SSLv2_client_method")
-+have_func("SSLv23_method")
-+have_func("SSLv23_server_method")
-+have_func("SSLv23_client_method")
- have_func("TLSv1_1_method")
- have_func("TLSv1_1_server_method")
- have_func("TLSv1_1_client_method")
diff --git a/lang/ruby20/files/patch-ext_readline_extconf.rb b/lang/ruby20/files/patch-ext_readline_extconf.rb
deleted file mode 100644
index 1eed0c2b49ba..000000000000
--- a/lang/ruby20/files/patch-ext_readline_extconf.rb
+++ /dev/null
@@ -1,19 +0,0 @@
---- ext/readline/extconf.rb.orig	2014-05-01 11:59:37.000000000 +0000
-+++ ext/readline/extconf.rb	2015-10-23 04:05:44.000000000 +0000
-@@ -37,6 +37,7 @@
- case enable_libedit
- when true
-   # --enable-libedit
-+  dir_config("libedit")
-   unless (readline.have_header("editline/readline.h") ||
-           readline.have_header("readline/readline.h")) &&
-           have_library("edit", "readline")
-@@ -62,7 +63,7 @@ else
- end
- 
- readline.have_func("rl_getc")
--readline.have_func("rl_getc_function")
-+#readline.have_func("rl_getc_function")
- readline.have_func("rl_filename_completion_function")
- readline.have_func("rl_username_completion_function")
- readline.have_func("rl_completion_matches")
diff --git a/lang/ruby20/files/patch-include_ruby_ruby.h b/lang/ruby20/files/patch-include_ruby_ruby.h
deleted file mode 100644
index 5e78833e0d60..000000000000
--- a/lang/ruby20/files/patch-include_ruby_ruby.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/ruby/ruby.h.orig	2015-09-20 20:42:37 UTC
-+++ include/ruby/ruby.h
-@@ -238,7 +238,7 @@ typedef char ruby_check_sizeof_voidp[SIZ
- #define FIXNUM_MAX (LONG_MAX>>1)
- #define FIXNUM_MIN RSHIFT((long)LONG_MIN,1)
- 
--#define INT2FIX(i) ((VALUE)(((SIGNED_VALUE)(i))<<1 | FIXNUM_FLAG))
-+#define INT2FIX(i) (((VALUE)(i))<<1 | FIXNUM_FLAG)
- #define LONG2FIX(i) INT2FIX(i)
- #define rb_fix_new(v) INT2FIX(v)
- VALUE rb_int2inum(SIGNED_VALUE);
diff --git a/lang/ruby20/files/patch-lib-rdoc-single_class.rb b/lang/ruby20/files/patch-lib-rdoc-single_class.rb
deleted file mode 100644
index c035eb6f9aad..000000000000
--- a/lang/ruby20/files/patch-lib-rdoc-single_class.rb
+++ /dev/null
@@ -1,13 +0,0 @@
---- lib/rdoc/single_class.rb	2012-11-27 04:28:14 UTC
-+++ lib/rdoc/single_class.rb
-@@ -10,6 +10,10 @@ def ancestors
-     superclass ? super + [superclass] : super
-   end
- 
-+  def aref_prefix # :nodoc:
-+    'sclass'
-+  end
-+
-   ##
-   # The definition of this singleton class, <tt>class << MyClassName</tt>
- 
diff --git a/lang/ruby20/files/patch-lib__rdoc__ruby_lex.rb b/lang/ruby20/files/patch-lib__rdoc__ruby_lex.rb
deleted file mode 100644
index a50cda8cb7b2..000000000000
--- a/lang/ruby20/files/patch-lib__rdoc__ruby_lex.rb
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./lib/rdoc/ruby_lex.rb.orig	2012-12-18 07:31:36 UTC
-+++ ./lib/rdoc/ruby_lex.rb
-@@ -1028,6 +1028,8 @@
-     end
- 
-     if output_heredoc then
-+      raise Error, "Missing terminating #{quoted} for string" unless l
-+
-       doc << l.chomp
-     else
-       doc << '"'
diff --git a/lang/ruby20/files/patch-lib_mkmf.rb b/lang/ruby20/files/patch-lib_mkmf.rb
deleted file mode 100644
index d31d982cacb5..000000000000
--- a/lang/ruby20/files/patch-lib_mkmf.rb
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/mkmf.rb.orig	2013-06-26 14:03:38 UTC
-+++ lib/mkmf.rb
-@@ -226,7 +226,7 @@
-   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/ruby20/files/patch-tool_mkconfig.rb b/lang/ruby20/files/patch-tool_mkconfig.rb
deleted file mode 100644
index 17b8111aaec3..000000000000
--- a/lang/ruby20/files/patch-tool_mkconfig.rb
+++ /dev/null
@@ -1,12 +0,0 @@
---- tool/mkconfig.rb.orig	2013-05-27 03:20:04 UTC
-+++ tool/mkconfig.rb
-@@ -173,7 +173,8 @@
- end
- vars["prefix"] = ""
- vars["exec_prefix"] = ""
--prefix = vars.expand(vars["rubyarchdir"])
-+major, minor, *rest = RUBY_VERSION.split('.')
-+prefix = "/lib/ruby/#{major}.#{minor}/#{arch}"
- print "  TOPDIR = File.dirname(__FILE__).chomp!(#{prefix.dump})\n"
- print "  DESTDIR = ", (drive ? "TOPDIR && TOPDIR[/\\A[a-z]:/i] || " : ""), "'' unless defined? DESTDIR\n"
- print <<'ARCH' if universal
diff --git a/lang/ruby20/files/patch-tool_rbinstall.rb b/lang/ruby20/files/patch-tool_rbinstall.rb
deleted file mode 100644
index 75f473d2c1f5..000000000000
--- a/lang/ruby20/files/patch-tool_rbinstall.rb
+++ /dev/null
@@ -1,82 +0,0 @@
---- tool/rbinstall.rb.orig	2013-02-07 08:02:31 UTC
-+++ tool/rbinstall.rb
-@@ -307,6 +307,7 @@
- libdir = CONFIG["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"]
-@@ -362,7 +363,7 @@
- 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
-@@ -684,62 +685,6 @@
- end
- # :startdoc:
- 
--install?(:ext, :comm, :gem) do
--  $:.unshift(File.join(srcdir, "lib"))
--  require("rubygems.rb")
--  gem_dir = Gem.default_dir
--  # Gem.ensure_gem_subdirectories makes subdirectories group-writable.
--  directories = Gem::REPOSITORY_SUBDIRECTORIES
--  prepare "default gems", gem_dir, directories
--
--  spec_dir = File.join(gem_dir, directories.grep(/^spec/)[0])
--  default_spec_dir = "#{spec_dir}/default"
--  makedirs(default_spec_dir)
--
--  gems = {}
--  File.foreach(File.join(srcdir, "defs/default_gems")) do |line|
--    line.chomp!
--    line.sub!(/\s*#.*/, '')
--    next if line.empty?
--    words = []
--    line.scan(/\G\s*([^\[\]\s]+|\[([^\[\]]*)\])/) do
--      words << ($2 ? $2.split : $1)
--    end
--    name, base_dir, src, execs = *words
--    next unless name and base_dir and src
--
--    src       = File.join(srcdir, src)
--    base_dir  = File.join(srcdir, base_dir)
--    specgen   = RbInstall::Specs::Generator.new(name, base_dir, src, execs || [])
--    gems[name] ||= specgen
--  end
--
--  Dir.glob(srcdir+"/{lib,ext}/**/*.gemspec").each do |src|
--    specgen   = RbInstall::Specs::Reader.new(src)
--    gems[specgen.gemspec.name] ||= specgen
--  end
--
--  gems.sort.each do |name, specgen|
--    gemspec   = specgen.gemspec
--    base_dir  = specgen.src.sub(/\A#{Regexp.escape(srcdir)}\//, "")
--    full_name = "#{gemspec.name}-#{gemspec.version}"
--
--    puts "#{" "*30}#{gemspec.name} #{gemspec.version}"
--    gemspec_path = File.join(default_spec_dir, "#{full_name}.gemspec")
--    open_for_install(gemspec_path, $data_mode) do
--      specgen.spec_source
--    end
--
--    unless gemspec.executables.empty? then
--      bin_dir = File.join(gem_dir, 'gems', full_name, 'bin')
--      makedirs(bin_dir)
--
--      execs = gemspec.executables.map {|exec| File.join(srcdir, 'bin', exec)}
--      install(execs, bin_dir, :mode => $prog_mode)
--    end
--  end
--end
--
- parse_args()
- 
- include FileUtils