From 928db33dc86883f04cf8b15573e232b671ba0fab Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Apr 05 2022 13:41:48 +0000
Subject: import ruby-2.0.0.648-39.el7_9


---

diff --git a/SOURCES/ruby-2.2.0-test_udp_server-dont-test-IPv6-link-local-addresses.patch b/SOURCES/ruby-2.2.0-test_udp_server-dont-test-IPv6-link-local-addresses.patch
new file mode 100644
index 0000000..8c8e485
--- /dev/null
+++ b/SOURCES/ruby-2.2.0-test_udp_server-dont-test-IPv6-link-local-addresses.patch
@@ -0,0 +1,22 @@
+From e8e6ecdef014d9c48211b06be288e17148cd438b Mon Sep 17 00:00:00 2001
+From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+Date: Sat, 24 May 2014 11:12:10 +0000
+Subject: [PATCH] test_udp_server don't test IPv6 link-local addresses.
+
+git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46079 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
+---
+ test/socket/test_socket.rb | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/socket/test_socket.rb b/test/socket/test_socket.rb
+index c11b90995efc..6ebde857e5d1 100644
+--- a/test/socket/test_socket.rb
++++ b/test/socket/test_socket.rb
+@@ -313,6 +313,7 @@ def test_udp_server
+       ip_addrs.reject! {|ai|
+         s = famlies[ai.afamily]
+         next true unless s
++        next true if ai.ipv6_linklocal? # IPv6 link-local address is too troublesome in this test.
+         case RUBY_PLATFORM
+         when /linux/
+           if ai.ip_address.include?('%') and
diff --git a/SPECS/ruby.spec b/SPECS/ruby.spec
index 21d59ba..eb37e3c 100644
--- a/SPECS/ruby.spec
+++ b/SPECS/ruby.spec
@@ -26,7 +26,7 @@
 %endif
 
 
-%global release 36
+%global release 39
 %{!?release_string:%global release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}}
 
 %global rubygems_version 2.0.14.1
@@ -328,6 +328,10 @@ Patch66: rubygems-2.3.0-refactor-checking-really_verbose.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=1692522
 # https://github.com/ruby/ruby/commit/f86e5daee790ee509cb17f4f51f95cc76ca89a4e
 Patch67: ruby-2.4.6-Applied-security-patches-for-RubyGems.patch
+# Fix `test_udp_server(TestSocket)` error:
+# Errno::EADDRNOTAVAIL: Cannot assign requested address - connect(2)
+# https://github.com/ruby/ruby/commit/e8e6ecdef014d9c48211b06be288e17148cd438b
+Patch68: ruby-2.2.0-test_udp_server-dont-test-IPv6-link-local-addresses.patch
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Requires: ruby(rubygems) >= %{rubygems_version}
@@ -637,6 +641,7 @@ Tcl/Tk interface for the object-oriented scripting language Ruby.
 %patch65 -p1
 %patch66 -p1
 %patch67 -p1
+%patch68 -p1
 
 # Provide an example of usage of the tapset:
 cp -a %{SOURCE3} .
@@ -845,6 +850,12 @@ sed -i '/combination(STRINGS, STRINGS) {|str, salt|/i\    strict_crypt = true' \
 # http://bugs.ruby-lang.org/issues/9259
 sed -i "/^  gem 'minitest', '~> 4.0'/ s/^/#/" lib/rubygems/test_case.rb
 
+# Disable problematic SIGSEV handler test case.
+# https://bugs.ruby-lang.org/issues/8144
+%ifarch i686
+DISABLE_TESTS="$DISABLE_TESTS -n /^\(?!test_segv_test\)/"
+%endif
+
 # Allow MD5 in OpenSSL.
 # https://bugs.ruby-lang.org/issues/9154
 OPENSSL_ENABLE_MD5_VERIFY=1 make check TESTS="-v $DISABLE_TESTS"
@@ -1143,6 +1154,10 @@ OPENSSL_ENABLE_MD5_VERIFY=1 make check TESTS="-v $DISABLE_TESTS"
 %{ruby_libdir}/tkextlib
 
 %changelog
+* Mon Sep 13 2021 Vít Ondruch <vondruch@redhat.com> - 2.0.0.648-39
+- Bump the release to fix the upgrade path from RHEL7 EUS.
+  Resolves: rhbz#1993504
+
 * Thu Apr 04 2019 Vít Ondruch <vondruch@redhat.com> - 2.0.0.648-36
 - Introduce `Gem::UserInteraction#verbose` method as precondition to fix
   CVE-2019-8321.