From 17d237996170a80deb153a4d6a1b95fcf0e012b2 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 29 2018 09:31:28 +0000
Subject: import rh-ruby24-ruby-2.4.5-91.el7


---

diff --git a/.gitignore b/.gitignore
index 036131d..983ff65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/ruby-2.4.3.tar.xz
+SOURCES/ruby-2.4.5.tar.xz
diff --git a/.rh-ruby24-ruby.metadata b/.rh-ruby24-ruby.metadata
index 37ee9a5..198c95f 100644
--- a/.rh-ruby24-ruby.metadata
+++ b/.rh-ruby24-ruby.metadata
@@ -1 +1 @@
-f0a49dddb4e7903a11a80554fd7a317a854cd365 SOURCES/ruby-2.4.3.tar.xz
+b5be590b37487248da3a85541a62fb81f7f7e29a SOURCES/ruby-2.4.5.tar.xz
diff --git a/SOURCES/operating_system.rb b/SOURCES/operating_system.rb
index cdbc112..c58ed4a 100644
--- a/SOURCES/operating_system.rb
+++ b/SOURCES/operating_system.rb
@@ -143,6 +143,7 @@ module Gem
     def default_path
       path = default_dirs.collect {|location, paths| paths[:gem_dir]}
       path.unshift Gem.user_dir if File.exist? Gem.user_home
+      path
     end
 
     def default_bindir
diff --git a/SOURCES/ruby-1.9.3-mkmf-verbose.patch b/SOURCES/ruby-1.9.3-mkmf-verbose.patch
index d94ef7f..f0cf55d 100644
--- a/SOURCES/ruby-1.9.3-mkmf-verbose.patch
+++ b/SOURCES/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
-@@ -1897,7 +1897,7 @@ def configuration(srcdir)
+@@ -1898,7 +1898,7 @@ def configuration(srcdir)
  SHELL = /bin/sh
  
  # V=0 quiet, V=1 verbose.  other values don't work.
diff --git 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
index 3379869..119d101 100644
--- 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
@@ -39,7 +39,7 @@ diff --git a/configure.in b/configure.in
 index 0e371e2..d4f1dcb 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -4565,6 +4565,13 @@ AC_SUBST(rubyarchhdrdir)dnl
+@@ -4571,6 +4571,13 @@ AC_SUBST(rubyarchhdrdir)dnl
  AC_SUBST(sitearchhdrdir)dnl
  AC_SUBST(vendorarchhdrdir)dnl
  
diff --git a/SOURCES/ruby-2.1.0-Enable-configuration-of-archlibdir.patch b/SOURCES/ruby-2.1.0-Enable-configuration-of-archlibdir.patch
index 5639c18..65ca94c 100644
--- a/SOURCES/ruby-2.1.0-Enable-configuration-of-archlibdir.patch
+++ b/SOURCES/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
-@@ -3825,6 +3825,11 @@ if test ${multiarch+set}; then
+@@ -3831,6 +3831,11 @@ if test ${multiarch+set}; then
  fi
  
  archlibdir='${libdir}/${arch}'
diff --git 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
index a06d8a7..7ee9c42 100644
--- 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
@@ -14,7 +14,7 @@ diff --git a/configure.in b/configure.in
 index db37cd6..ce8d149 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -4419,7 +4419,8 @@ AS_CASE(["$ruby_version_dir_name"],
+@@ -4425,7 +4425,8 @@ AS_CASE(["$ruby_version_dir_name"],
  ruby_version_dir=/'${ruby_version_dir_name}'
  
  if test -z "${ruby_version_dir_name}"; then
diff --git a/SOURCES/ruby-2.1.0-always-use-i386.patch b/SOURCES/ruby-2.1.0-always-use-i386.patch
index 21265fd..2549c50 100644
--- a/SOURCES/ruby-2.1.0-always-use-i386.patch
+++ b/SOURCES/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
-@@ -4483,6 +4483,8 @@ AC_SUBST(vendorarchdir)dnl
+@@ -4489,6 +4489,8 @@ AC_SUBST(vendorarchdir)dnl
  AC_SUBST(CONFIGURE, "`echo $0 | sed 's|.*/||'`")dnl
  AC_SUBST(configure_args, "`echo "${ac_configure_args}" | sed 's/\\$/$$/g'`")dnl
  
diff --git a/SOURCES/ruby-2.1.0-custom-rubygems-location.patch b/SOURCES/ruby-2.1.0-custom-rubygems-location.patch
index 3019ad5..171f7cf 100644
--- a/SOURCES/ruby-2.1.0-custom-rubygems-location.patch
+++ b/SOURCES/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
-@@ -4455,6 +4455,10 @@ AC_ARG_WITH(vendorarchdir,
+@@ -4461,6 +4461,10 @@ AC_ARG_WITH(vendorarchdir,
              [vendorarchdir=$withval],
              [vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby'${ruby_version_dir}}${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=''
-@@ -4479,6 +4483,7 @@ AC_SUBST(sitearchdir)dnl
+@@ -4485,6 +4489,7 @@ AC_SUBST(sitearchdir)dnl
  AC_SUBST(vendordir)dnl
  AC_SUBST(vendorlibdir)dnl
  AC_SUBST(vendorarchdir)dnl
diff --git a/SOURCES/ruby-2.3.0-ruby_version.patch b/SOURCES/ruby-2.3.0-ruby_version.patch
index 1db4c64..de929a8 100644
--- a/SOURCES/ruby-2.3.0-ruby_version.patch
+++ b/SOURCES/ruby-2.3.0-ruby_version.patch
@@ -20,7 +20,7 @@ diff --git a/configure.in b/configure.in
 index db37cd6..6e73fae 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -4370,9 +4370,6 @@ AS_CASE(["$target_os"],
+@@ -4376,9 +4376,6 @@ AS_CASE(["$target_os"],
      rubyw_install_name='$(RUBYW_INSTALL_NAME)'
      ])
  
@@ -30,7 +30,7 @@ index db37cd6..6e73fae 100644
  rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'}
  AC_ARG_WITH(rubyarchprefix,
  	    AS_HELP_STRING([--with-rubyarchprefix=DIR],
-@@ -4395,56 +4392,62 @@ AC_ARG_WITH(ridir,
+@@ -4401,56 +4398,62 @@ AC_ARG_WITH(ridir,
  AC_SUBST(ridir)
  AC_SUBST(RI_BASE_NAME)
  
@@ -120,7 +120,7 @@ index db37cd6..6e73fae 100644
  
  if test "${LOAD_RELATIVE+set}"; then
      AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
-@@ -4461,6 +4464,7 @@ AC_SUBST(sitearchincludedir)dnl
+@@ -4467,6 +4470,7 @@ AC_SUBST(sitearchincludedir)dnl
  AC_SUBST(arch)dnl
  AC_SUBST(sitearch)dnl
  AC_SUBST(ruby_version)dnl
diff --git a/SOURCES/ruby-2.5.0-Disable-Tokyo-TZ-tests.patch b/SOURCES/ruby-2.5.0-Disable-Tokyo-TZ-tests.patch
deleted file mode 100644
index 01632eb..0000000
--- a/SOURCES/ruby-2.5.0-Disable-Tokyo-TZ-tests.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/test/ruby/test_time_tz.rb b/test/ruby/test_time_tz.rb
-index 20a57fe7dd..5b9e5a8bde 100644
---- a/test/ruby/test_time_tz.rb
-+++ b/test/ruby/test_time_tz.rb
-@@ -126,8 +126,8 @@ def test_asia_singapore
- 
-   def test_asia_tokyo
-     with_tz(tz="Asia/Tokyo") {
--      assert_time_constructor(tz, "1951-05-06 03:00:00 +1000", :local, [1951,5,6,2,0,0])
--      assert_time_constructor(tz, "1951-05-06 03:59:59 +1000", :local, [1951,5,6,2,59,59])
-+#      assert_time_constructor(tz, "1951-05-06 03:00:00 +1000", :local, [1951,5,6,2,0,0])
-+#      assert_time_constructor(tz, "1951-05-06 03:59:59 +1000", :local, [1951,5,6,2,59,59])
-       assert_time_constructor(tz, "2010-06-10 06:13:28 +0900", :local, [2010,6,10,6,13,28])
-     }
-   end
-@@ -329,10 +329,10 @@ def self.gen_zdump_test(data)
- Asia/Singapore  Sun Aug  8 16:30:00 1965 UTC = Mon Aug  9 00:00:00 1965 SGT isdst=0 gmtoff=27000
- Asia/Singapore  Thu Dec 31 16:29:59 1981 UTC = Thu Dec 31 23:59:59 1981 SGT isdst=0 gmtoff=27000
- Asia/Singapore  Thu Dec 31 16:30:00 1981 UTC = Fri Jan  1 00:30:00 1982 SGT isdst=0 gmtoff=28800
--Asia/Tokyo  Sat May  5 16:59:59 1951 UTC = Sun May  6 01:59:59 1951 JST isdst=0 gmtoff=32400
--Asia/Tokyo  Sat May  5 17:00:00 1951 UTC = Sun May  6 03:00:00 1951 JDT isdst=1 gmtoff=36000
--Asia/Tokyo  Fri Sep  7 15:59:59 1951 UTC = Sat Sep  8 01:59:59 1951 JDT isdst=1 gmtoff=36000
--Asia/Tokyo  Fri Sep  7 16:00:00 1951 UTC = Sat Sep  8 01:00:00 1951 JST isdst=0 gmtoff=32400
-+#Asia/Tokyo  Sat May  5 16:59:59 1951 UTC = Sun May  6 01:59:59 1951 JST isdst=0 gmtoff=32400
-+#Asia/Tokyo  Sat May  5 17:00:00 1951 UTC = Sun May  6 03:00:00 1951 JDT isdst=1 gmtoff=36000
-+#Asia/Tokyo  Fri Sep  7 15:59:59 1951 UTC = Sat Sep  8 01:59:59 1951 JDT isdst=1 gmtoff=36000
-+#Asia/Tokyo  Fri Sep  7 16:00:00 1951 UTC = Sat Sep  8 01:00:00 1951 JST isdst=0 gmtoff=32400
- America/St_Johns  Sun Mar 11 03:30:59 2007 UTC = Sun Mar 11 00:00:59 2007 NST isdst=0 gmtoff=-12600
- America/St_Johns  Sun Mar 11 03:31:00 2007 UTC = Sun Mar 11 01:01:00 2007 NDT isdst=1 gmtoff=-9000
- America/St_Johns  Sun Nov  4 02:30:59 2007 UTC = Sun Nov  4 00:00:59 2007 NDT isdst=1 gmtoff=-9000
diff --git a/SOURCES/ruby-2.5.0-Fixed-command-Injection.patch b/SOURCES/ruby-2.5.0-Fixed-command-Injection.patch
index 21bb48e..0af7c0d 100644
--- a/SOURCES/ruby-2.5.0-Fixed-command-Injection.patch
+++ b/SOURCES/ruby-2.5.0-Fixed-command-Injection.patch
@@ -51,7 +51,7 @@ diff --git a/lib/resolv.rb b/lib/resolv.rb
 index 56183b837d..48ee400efe 100644
 --- a/lib/resolv.rb
 +++ b/lib/resolv.rb
-@@ -929,7 +929,7 @@ def Config.parse_resolv_conf(filename)
+@@ -965,7 +965,7 @@ def Config.parse_resolv_conf(filename)
          nameserver = []
          search = nil
          ndots = 1
@@ -84,7 +84,7 @@ diff --git a/test/resolv/test_dns.rb b/test/resolv/test_dns.rb
 index f21a094b20..8236078374 100644
 --- a/test/resolv/test_dns.rb
 +++ b/test/resolv/test_dns.rb
-@@ -179,6 +179,16 @@ def test_invalid_byte_comment
+@@ -180,6 +180,16 @@ def test_invalid_byte_comment
      end
    end
  
@@ -142,7 +142,7 @@ diff --git a/test/resolv/test_dns.rb b/test/resolv/test_dns.rb
 index 8236078374..1b44f32807 100644
 --- a/test/resolv/test_dns.rb
 +++ b/test/resolv/test_dns.rb
-@@ -182,7 +182,7 @@ def test_invalid_byte_comment
+@@ -183,7 +183,7 @@ def test_invalid_byte_comment
    def test_resolv_conf_by_command
      Dir.mktmpdir do |dir|
        Dir.chdir(dir) do
diff --git a/SOURCES/ruby-2.6.0-Fix-Tokyo-TZ-tests.patch b/SOURCES/ruby-2.6.0-Fix-Tokyo-TZ-tests.patch
new file mode 100644
index 0000000..edc58b6
--- /dev/null
+++ b/SOURCES/ruby-2.6.0-Fix-Tokyo-TZ-tests.patch
@@ -0,0 +1,44 @@
+From e71ca6cdcf108e6a2fa47ec9fadefe7554717908 Mon Sep 17 00:00:00 2001
+From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+Date: Fri, 26 Oct 2018 01:47:09 +0000
+Subject: [PATCH] Update for tzdata-2018f
+
+git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65365 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
+---
+ test/ruby/test_time_tz.rb | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/test/ruby/test_time_tz.rb b/test/ruby/test_time_tz.rb
+index 2da4fd8d9ce4..328fde48fc34 100644
+--- a/test/ruby/test_time_tz.rb
++++ b/test/ruby/test_time_tz.rb
+@@ -86,7 +86,9 @@ def group_by(e, &block)
+   has_lisbon_tz &&= have_tz_offset?("Europe/Lisbon")
+   CORRECT_TOKYO_DST_1951 = with_tz("Asia/Tokyo") {
+     if Time.local(1951, 5, 6, 12, 0, 0).dst? # noon, DST
+-      Time.local(1951, 5, 6, 1, 0, 0).dst?   # DST with fixed tzdata
++      if Time.local(1951, 5, 6, 1, 0, 0).dst? # DST with fixed tzdata
++        Time.local(1951, 9, 8, 23, 0, 0).dst? ? "2018f" : "2018e"
++      end
+     end
+   }
+   CORRECT_KIRITIMATI_SKIP_1994 = with_tz("Pacific/Kiritimati") {
+@@ -347,12 +349,16 @@ def self.gen_zdump_test(data)
+ Asia/Singapore  Thu Dec 31 16:29:59 1981 UTC = Thu Dec 31 23:59:59 1981 SGT isdst=0 gmtoff=27000
+ Asia/Singapore  Thu Dec 31 16:30:00 1981 UTC = Fri Jan  1 00:30:00 1982 SGT isdst=0 gmtoff=28800
+ End
+-  gen_zdump_test CORRECT_TOKYO_DST_1951 ? <<'End' : <<'End'
++  gen_zdump_test CORRECT_TOKYO_DST_1951 ? <<'End' + (CORRECT_TOKYO_DST_1951 < "2018f" ? <<'2018e' : <<'2018f') : <<'End'
+ Asia/Tokyo  Sat May  5 14:59:59 1951 UTC = Sat May  5 23:59:59 1951 JST isdst=0 gmtoff=32400
+ Asia/Tokyo  Sat May  5 15:00:00 1951 UTC = Sun May  6 01:00:00 1951 JDT isdst=1 gmtoff=36000
++End
+ Asia/Tokyo  Sat Sep  8 13:59:59 1951 UTC = Sat Sep  8 23:59:59 1951 JDT isdst=1 gmtoff=36000
+ Asia/Tokyo  Sat Sep  8 14:00:00 1951 UTC = Sat Sep  8 23:00:00 1951 JST isdst=0 gmtoff=32400
+-End
++2018e
++Asia/Tokyo  Sat Sep  8 14:59:59 1951 UTC = Sun Sep  9 00:59:59 1951 JDT isdst=1 gmtoff=36000
++Asia/Tokyo  Sat Sep  8 15:00:00 1951 UTC = Sun Sep  9 00:00:00 1951 JST isdst=0 gmtoff=32400
++2018f
+ Asia/Tokyo  Sat May  5 16:59:59 1951 UTC = Sun May  6 01:59:59 1951 JST isdst=0 gmtoff=32400
+ Asia/Tokyo  Sat May  5 17:00:00 1951 UTC = Sun May  6 03:00:00 1951 JDT isdst=1 gmtoff=36000
+ Asia/Tokyo  Fri Sep  7 15:59:59 1951 UTC = Sat Sep  8 01:59:59 1951 JDT isdst=1 gmtoff=36000
diff --git a/SOURCES/ruby-2.6.0-configure-fstack-protector-strong.patch b/SOURCES/ruby-2.6.0-configure-fstack-protector-strong.patch
new file mode 100644
index 0000000..9f44179
--- /dev/null
+++ b/SOURCES/ruby-2.6.0-configure-fstack-protector-strong.patch
@@ -0,0 +1,49 @@
+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.in: -fstack-protector-strong
+
+* configure.in: 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.in | 25 ++++++++++++++-----------
+ 1 file changed, 14 insertions(+), 11 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index f949883..bb9aef3 100644
+--- a/configure.in
++++ b/configure.in
+@@ -935,17 +935,20 @@ if test "$GCC" = yes; then
+     [mingw*|nacl], [
+ 	stack_protector=no
+     ])
+-    if test -z "${stack_protector+set}"; then
+-	RUBY_TRY_CFLAGS(-fstack-protector, [stack_protector=yes], [stack_protector=no])
+-	if test "x$stack_protector" = xyes; then
+-	    RUBY_TRY_LDFLAGS(-fstack-protector, [], [stack_protector=broken])
+-	fi
+-    fi
+-    if test "x$stack_protector" = xyes; then
+-	RUBY_APPEND_OPTION(XCFLAGS, -fstack-protector)
+-	RUBY_APPEND_OPTION(XLDFLAGS, -fstack-protector)
+-	RUBY_APPEND_OPTION(LDFLAGS, -fstack-protector)
+-    fi
++    AS_IF([test -z "${stack_protector+set}"], [
++	     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_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}",
+     [none|no], [], [
diff --git a/SOURCES/ruby-2.6.0-rdoc-6.0.1-fix-template-typo.patch b/SOURCES/ruby-2.6.0-rdoc-6.0.1-fix-template-typo.patch
new file mode 100644
index 0000000..e108270
--- /dev/null
+++ b/SOURCES/ruby-2.6.0-rdoc-6.0.1-fix-template-typo.patch
@@ -0,0 +1,34 @@
+From d05e6269d4a4dfd701f5ddb3ae34306cba891511 Mon Sep 17 00:00:00 2001
+From: Jun Aruga <jaruga@redhat.com>
+Date: Fri, 3 Aug 2018 11:35:55 +0200
+Subject: [PATCH] Fix indent and typo from moveTimout to moveTimeout.
+
+---
+ lib/rdoc/generator/template/json_index/js/navigation.js | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/lib/rdoc/generator/template/json_index/js/navigation.js b/lib/rdoc/generator/template/json_index/js/navigation.js
+index e4126812..43c5118a 100644
+--- a/lib/rdoc/generator/template/json_index/js/navigation.js
++++ b/lib/rdoc/generator/template/json_index/js/navigation.js
+@@ -59,9 +59,8 @@ Navigation = new function() {
+         }
+         break;
+       case 13: //Event.KEY_RETURN:
+-        if (this.$current)
+-          e.preventDefault();
+-          this.select(this.$current);
++        if (this.$current) e.preventDefault();
++        this.select(this.$current);
+         break;
+     }
+     if (e.ctrlKey && e.shiftKey) this.select(this.$current);
+@@ -80,7 +79,7 @@ Navigation = new function() {
+     var go = function() {
+       if (!_this.moveTimeout) return;
+       _this[isDown ? 'moveDown' : 'moveUp']();
+-      _this.moveTimout = setTimeout(go, 100);
++      _this.moveTimeout = setTimeout(go, 100);
+     }
+     this.moveTimeout = setTimeout(go, 200);
+   }
diff --git a/SPECS/ruby.spec b/SPECS/ruby.spec
index 9431546..0c47b65 100644
--- a/SPECS/ruby.spec
+++ b/SPECS/ruby.spec
@@ -3,7 +3,7 @@
 
 %global major_version 2
 %global minor_version 4
-%global teeny_version 3
+%global teeny_version 5
 %global major_minor_version %{major_version}.%{minor_version}
 
 %global ruby_version %{major_minor_version}.%{teeny_version}
@@ -24,28 +24,28 @@
 %endif
 
 
-%global release 90
+%global release 91
 %{!?release_string:%global release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}}
 
-# The RubyGems library has to stay out of Ruby directory three, since the
+# The RubyGems library has to stay out of Ruby directory tree, since the
 # RubyGems should be share by all Ruby implementations.
 %global rubygems_dir %{_datadir}/rubygems
 
 # Bundled libraries versions
-%global rubygems_version 2.6.14
+%global rubygems_version 2.6.14.3
 %global molinillo_version 0.5.7
 
 # TODO: The IRB has strange versioning. Keep the Ruby's versioning ATM.
 # http://redmine.ruby-lang.org/issues/5313
 %global irb_version %{ruby_version}
 
-%global bigdecimal_version 1.3.0
+%global bigdecimal_version 1.3.2
 %global did_you_mean_version 1.1.0
 %global io_console_version 0.4.6
 %global json_version 2.0.4
 %global minitest_version 5.10.1
 %global net_telnet_version 0.1.1
-%global openssl_version 2.0.5
+%global openssl_version 2.0.9
 %global power_assert_version 0.4.1
 %global psych_version 2.2.2
 %global rake_version 12.0.0
@@ -84,7 +84,7 @@ Group: Development/Languages
 # UCD: some of enc/trans/**/*.src
 License: (Ruby or BSD) and Public Domain and MIT and CC0 and zlib and UCD
 URL: http://ruby-lang.org/
-Source0: ftp://ftp.ruby-lang.org/pub/%{pkg_name}/%{major_minor_version}/%{ruby_archive}.tar.xz
+Source0: https://cache.ruby-lang.org/pub/%{pkg_name}/%{major_minor_version}/%{ruby_archive}.tar.xz
 Source1: operating_system.rb
 # TODO: Try to push SystemTap support upstream.
 Source2: libruby.stp
@@ -140,13 +140,19 @@ Patch7: ruby-2.2.3-Generate-preludes-using-miniruby.patch
 # hardening features of glibc (rhbz#1361037).
 # https://bugs.ruby-lang.org/issues/12666
 Patch9: ruby-2.3.1-Rely-on-ldd-to-detect-glibc.patch
-# Recent tzdata change breaks Ruby test suite.
-# https://bugs.ruby-lang.org/issues/14438
-Patch10: ruby-2.5.0-Disable-Tokyo-TZ-tests.patch
 # CVE-2017-17790 - Command injection in lib/resolv.rb:lazy_initialize() allows
 # arbitrary code execution
 # https://bugs.ruby-lang.org/issues/14205
 Patch11: ruby-2.5.0-Fixed-command-Injection.patch
+# Fix Tokyo TZ tests
+# https://github.com/ruby/ruby/commit/e71ca6cdcf108e6a2fa47ec9fadefe7554717908
+Patch12: ruby-2.6.0-Fix-Tokyo-TZ-tests.patch
+# Properly harden package using -fstack-protector-strong.
+# https://bugs.ruby-lang.org/issues/15053
+Patch13: ruby-2.6.0-configure-fstack-protector-strong.patch
+# Fix generated rdoc template issues.
+# https://github.com/ruby/rdoc/commit/d05e6269d4a4dfd701f5ddb3ae34306cba891511
+Patch14: ruby-2.6.0-rdoc-6.0.1-fix-template-typo.patch
 
 Requires: %{?scl_prefix}%{pkg_name}-libs%{?_isa} = %{version}-%{release}
 Requires: %{?scl_prefix}ruby(rubygems) >= %{rubygems_version}
@@ -521,8 +527,10 @@ rm -rf ext/fiddle/libffi*
 %patch6 -p1
 %patch7 -p1
 %patch9 -p1
-%patch10 -p1
 %patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
 
 # Allow to use autoconf 2.63.
 sed -i '/AC_PREREQ/ s/(.*)/(2.62)/' configure.in
@@ -1061,6 +1069,14 @@ make check TESTS="-v $DISABLE_TESTS"
 %{gem_dir}/specifications/xmlrpc-%{xmlrpc_version}.gemspec
 
 %changelog
+* Mon Nov 5 2018 Pavel Valena <pvalena@redhat.com> - 2.4.5-91
+- Upgrade to Ruby 2.4.5.
+  Resolves: CVE-2018-16395
+  Resolves: rhbz#1563077
+  Removed Patch10: ruby-2.5.0-Disable-Tokyo-TZ-tests.patch; subsumed
+- Properly harden package using -fstack-protector-strong.
+- Fix: return default path with nonexistent home dir(rhbz#1602879)
+
 * Mon Mar 12 2018 Pavel Valena <pvalena@redhat.com> - 2.4.3-90
 - Command injection in lib/resolv.rb:lazy_initialize() allows arbitrary code
     execution(CVE-2017-17790).