Update to Ruby 2.1.7.

ruby-1.9.3-mkmf-verbose.patch

@@ -11,7 +11,7 @@ diff --git a/lib/mkmf.rb b/lib/mkmf.rb
 index 682eb46..e6b1445 100644
 --- a/lib/mkmf.rb
 +++ b/lib/mkmf.rb
-@@ -1828,7 +1828,7 @@ SRC
+@@ -1830,7 +1830,7 @@ SRC
  SHELL = /bin/sh
  
  # V=0 quiet, V=1 verbose.  other values don't work.

ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch

@@ -38,7 +38,7 @@ diff --git a/configure.in b/configure.in
 index 0e371e2..d4f1dcb 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -3841,6 +3841,13 @@ AC_SUBST(rubyarchhdrdir)dnl
+@@ -3901,6 +3901,13 @@ AC_SUBST(rubyarchhdrdir)dnl
  AC_SUBST(sitearchhdrdir)dnl
  AC_SUBST(vendorarchhdrdir)dnl
  

ruby-2.1.0-Enable-configuration-of-archlibdir.patch

@@ -11,7 +11,7 @@ diff --git a/configure.in b/configure.in
 index 37d9a62..553d4d0 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -3071,6 +3071,11 @@ if test ${multiarch+set}; then
+@@ -3130,6 +3130,11 @@ if test ${multiarch+set}; then
  fi
  
  archlibdir='${libdir}/${arch}'

ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch

@@ -14,7 +14,7 @@ diff --git a/configure.in b/configure.in
 index 17ed3ed..5843651 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -3645,8 +3645,6 @@ AS_CASE(["$target_os"],
+@@ -3705,8 +3705,6 @@ AS_CASE(["$target_os"],
      rubyw_install_name='$(RUBYW_INSTALL_NAME)'
      ])
  
@@ -23,7 +23,7 @@ index 17ed3ed..5843651 100644
  
  rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'}
  AC_ARG_WITH(rubyarchprefix,
-@@ -3676,6 +3674,7 @@ AC_ARG_WITH(ruby-version,
+@@ -3736,6 +3734,7 @@ AC_ARG_WITH(ruby-version,
              [ruby_version=full])
  unset RUBY_LIB_VERSION
  unset RUBY_LIB_VERSION_STYLE
@@ -31,7 +31,7 @@ index 17ed3ed..5843651 100644
  AS_CASE(["$ruby_version"],
    [full],  [RUBY_LIB_VERSION_STYLE='3	/* full */'],
    [minor], [RUBY_LIB_VERSION_STYLE='2	/* minor */'])
-@@ -3692,30 +3691,34 @@ if test ${RUBY_LIB_VERSION_STYLE+set}; then
+@@ -3752,30 +3751,34 @@ if test ${RUBY_LIB_VERSION_STYLE+set}; then
      ruby_version="`$CPP -I. -I"${srcdir}" -I"${srcdir}/include" conftest.c | sed '/^ruby_version=/!d;s/ //g'`"
      eval $ruby_version
  elif test -z "${ruby_version}"; then

ruby-2.1.0-always-use-i386.patch

@@ -11,7 +11,7 @@ diff --git a/configure.in b/configure.in
 index 553d4d0..03a4152 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -3757,6 +3757,8 @@ AC_SUBST(vendorarchdir)dnl
+@@ -3817,6 +3817,8 @@ AC_SUBST(vendorarchdir)dnl
  
  AC_SUBST(configure_args, "`echo "${ac_configure_args}" | sed 's/\\$/$$/g'`")dnl
  

ruby-2.1.0-custom-rubygems-location.patch

@@ -15,7 +15,7 @@ diff --git a/configure.in b/configure.in
 index 03a4152..0e371e2 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -3731,6 +3731,10 @@ AC_ARG_WITH(vendorarchdir,
+@@ -3791,6 +3791,10 @@ AC_ARG_WITH(vendorarchdir,
              [vendorarchdir=$withval],
              [vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby/${ruby_version}'}${multiarch-'${vendorlibdir}/${sitearch}'}])
  
@@ -26,7 +26,7 @@ index 03a4152..0e371e2 100644
  if test "${LOAD_RELATIVE+set}"; then
      AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
      RUBY_EXEC_PREFIX=''
-@@ -3754,6 +3754,7 @@ AC_SUBST(sitearchdir)dnl
+@@ -3814,6 +3818,7 @@ AC_SUBST(sitearchdir)dnl
  AC_SUBST(vendordir)dnl
  AC_SUBST(vendorlibdir)dnl
  AC_SUBST(vendorarchdir)dnl

ruby-2.2.0-Don-t-use-obsolete-SSLv3-for-tests.patch

@@ -0,0 +1,38 @@
+From 75ca3a364e2e35a53a385eab08bebdcb08baeace Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
+Date: Fri, 21 Nov 2014 16:02:52 +0100
+Subject: [PATCH] Don't use obsolete SSLv3 for tests.
+
+SSLv23 should be the most liberal settings according to upstream
+documentation:
+
+https://www.openssl.org/docs/ssl/SSL_CTX_new.html
+---
+ test/openssl/test_ssl_session.rb | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test/openssl/test_ssl_session.rb b/test/openssl/test_ssl_session.rb
+index 8066ef1..2f3e578 100644
+--- a/test/openssl/test_ssl_session.rb
++++ b/test/openssl/test_ssl_session.rb
+@@ -273,7 +273,7 @@ __EOS__
+ 
+   def test_ctx_client_session_cb
+     called = {}
+-    ctx = OpenSSL::SSL::SSLContext.new("SSLv3")
++    ctx = OpenSSL::SSL::SSLContext.new
+     ctx.session_cache_mode = OpenSSL::SSL::SSLContext::SESSION_CACHE_CLIENT
+ 
+     ctx.session_new_cb = lambda { |ary|
+@@ -345,7 +345,7 @@ __EOS__
+       last_client_session = nil
+       3.times do
+         sock = TCPSocket.new("127.0.0.1", port)
+-        ssl = OpenSSL::SSL::SSLSocket.new(sock, OpenSSL::SSL::SSLContext.new("SSLv3"))
++        ssl = OpenSSL::SSL::SSLSocket.new(sock, OpenSSL::SSL::SSLContext.new(:SSLv23_server))
+         ssl.sync_close = true
+         ssl.session = last_client_session if last_client_session
+         ssl.connect
+-- 
+1.9.3
+

ruby.spec

@@ -1,6 +1,6 @@
 %global major_version 2
 %global minor_version 1
-%global teeny_version 4
+%global teeny_version 7
 %global major_minor_version %{major_version}.%{minor_version}
 
 %global ruby_version %{major_minor_version}.%{teeny_version}
@@ -21,10 +21,10 @@
 %endif
 
 
-%global release 24
+%global release 31
 %{!?release_string:%global release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}}
 
-%global rubygems_version 2.2.2
+%global rubygems_version 2.2.5
 
 # The RubyGems library has to stay out of Ruby directory three, since the
 # RubyGems should be share by all Ruby implementations.
@@ -35,7 +35,7 @@
 %global irb_version %{ruby_version}
 
 %global bigdecimal_version 1.2.4
-%global io_console_version 0.4.2
+%global io_console_version 0.4.3
 %global json_version 1.8.1
 %global minitest_version 4.7.5
 %global psych_version 2.0.5
@@ -106,6 +106,9 @@ Patch5: ruby-1.9.3-mkmf-verbose.patch
 # in support for ABRT.
 # http://bugs.ruby-lang.org/issues/8566
 Patch6: ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch
+# Test are broken due to SSLv3 disabled in Fedora.
+# https://bugs.ruby-lang.org/issues/10046
+Patch7: ruby-2.2.0-Don-t-use-obsolete-SSLv3-for-tests.patch
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Requires: ruby(rubygems) >= %{rubygems_version}
@@ -366,6 +369,7 @@ Tcl/Tk interface for the object-oriented scripting language Ruby.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 # Provide an example of usage of the tapset:
 cp -a %{SOURCE3} .
@@ -392,7 +396,6 @@ autoconf
         --with-vendorarchhdrdir='$(vendorhdrdir)/$(arch)' \
         --with-rubygemsdir='%{rubygems_dir}' \
         --with-ruby-pc='%{name}.pc' \
-        --with-tcltkversion=8.6 \
         --disable-rpath \
         --enable-shared \
         --with-ruby-version='' \
@@ -529,10 +532,10 @@ sed -i '/^end$/ i\
 
 # Install a tapset and fix up the path to the library.
 mkdir -p %{buildroot}%{tapset_dir}
-sed -e "s|@LIBRARY_PATH@|%{tapset_libdir}/libruby.so.%{ruby_version}|" \
-  %{SOURCE2} > %{buildroot}%{tapset_dir}/libruby.so.%{ruby_version}.stp
+sed -e "s|@LIBRARY_PATH@|%{tapset_libdir}/libruby.so.%{major_minor_version}|" \
+  %{SOURCE2} > %{buildroot}%{tapset_dir}/libruby.so.%{major_minor_version}.stp
 # Escape '*/' in comment.
-sed -i -r "s|( \*.*\*)\/(.*)|\1\\\/\2|" %{buildroot}%{tapset_dir}/libruby.so.%{ruby_version}.stp
+sed -i -r "s|( \*.*\*)\/(.*)|\1\\\/\2|" %{buildroot}%{tapset_dir}/libruby.so.%{major_minor_version}.stp
 
 %check
 DISABLE_TESTS=""
@@ -566,6 +569,10 @@ sed -i '/^  def test_machine_stackoverflow/,/^  end/ s/^/#/' test/ruby/test_exce
 sed -i '/assert(OpenSSL::Cipher::Cipher.new(name).is_a?(OpenSSL::Cipher::Cipher))/i \
         next if /wrap/ =~ name' test/openssl/test_cipher.rb
 
+# Test is broken due to SSLv3 disabled in Fedora.
+# https://bugs.ruby-lang.org/issues/10046
+sed -i '/def test_ctx_server_session_cb$/,/^  end$/ s/^/#/' test/openssl/test_ssl_session.rb
+
 make check TESTS="-v $DISABLE_TESTS"
 
 %post libs -p /sbin/ldconfig
@@ -862,6 +869,27 @@ make check TESTS="-v $DISABLE_TESTS"
 %{ruby_libdir}/tkextlib
 
 %changelog
+* Wed Sep 02 2015 Vít Ondruch <vondruch@redhat.com> - 2.1.7-31
+- Update to Ruby 2.1.7.
+
+* Mon Jun 08 2015 Vít Ondruch <vondruch@redhat.com> - 2.1.6-30
+- Fix the RubyGems version (rhbz#1226679).
+
+* Thu May 07 2015 Vít Ondruch <vondruch@redhat.com> - 2.1.6-29
+- Fix compatibility issues with Tcl/Tk 8.6 (rhbz#1181160).
+
+* Mon May 04 2015 Vít Ondruch <vondruch@redhat.com> - 2.1.6-28
+- Fix libruby.so versions in SystemTap scripts (rhbz#1218274).
+
+* Tue Apr 14 2015 Josef Stribny <jstribny@redhat.com> - 2.1.6-27
+- Update to 2.1.6
+
+* Fri Dec 26 2014 Orion Poplwski <orion@cora.nwra.com> - 2.1.5-26
+- Disbable sse2 on i668 (bug #1101811)
+
+* Thu Nov 20 2014 Vít Ondruch <vondruch@redhat.com> - 2.1.5-25
+- Update to Ruby 2.1.5.
+
 * Fri Oct 31 2014 Vít Ondruch <vondruch@redhat.com> - 2.1.4-24
 - Update to Ruby 2.1.4.
 - Include only vendor directories, not their content (rhbz#1114071).

sources

@@ -1 +1 @@
-f4136e781d261e3cc20748005e1740b7  ruby-2.1.4.tar.bz2
+3a878e98311d543e5de3533b82ef4a5a  ruby-2.1.7.tar.bz2