Upgrade to Ruby 3.2.5.

Upgrade to Ruby 3.2.4.
Resolves: rhbz#2270544
2024-09-10 12:09:43 +02:00 · 2024-04-24 18:34:48 +02:00
10 changed files with 43 additions and 82 deletions
--- a/ruby-2.1.0-Enable-configuration-of-archlibdir.patch
+++ b/ruby-2.1.0-Enable-configuration-of-archlibdir.patch
@ -11,7 +11,7 @@ diff --git a/configure.ac b/configure.ac
 index d261ea57b5..3c13076b82 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3411,6 +3411,11 @@ AS_IF([test ${multiarch+set}], [
+@@ -3417,6 +3417,11 @@ AS_IF([test ${multiarch+set}], [
 ])
 
 archlibdir='${libdir}/${arch}'
--- a/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch
+++ b/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch
@ -14,7 +14,7 @@ diff --git a/configure.ac b/configure.ac
 index c42436c23d..d261ea57b5 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -4196,7 +4196,8 @@ AS_CASE(["$ruby_version_dir_name"],
+@@ -4202,7 +4202,8 @@ AS_CASE(["$ruby_version_dir_name"],
 ruby_version_dir=/'${ruby_version_dir_name}'
 
 if test -z "${ruby_version_dir_name}"; then
--- a/ruby-2.1.0-always-use-i386.patch
+++ b/ruby-2.1.0-always-use-i386.patch
@ -11,7 +11,7 @@ diff --git a/configure.ac b/configure.ac
 index 3c13076b82..93af30321d 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -4260,6 +4260,8 @@ AC_SUBST(vendorarchdir)dnl
+@@ -4266,6 +4266,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
 
--- a/ruby-2.1.0-custom-rubygems-location.patch
+++ b/ruby-2.1.0-custom-rubygems-location.patch
@ -15,7 +15,7 @@ diff --git a/configure.ac b/configure.ac
 index 93af30321d..bc13397e0e 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -4232,6 +4232,10 @@ AC_ARG_WITH(vendorarchdir,
+@@ -4238,6 +4238,10 @@ AC_ARG_WITH(vendorarchdir,
             [vendorarchdir=$withval],
             [vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby'${ruby_version_dir}}${multiarch-'${vendorlibdir}/${sitearch}'}])
 
@ -26,7 +26,7 @@ index 93af30321d..bc13397e0e 100644
 AS_IF([test "${LOAD_RELATIVE+set}"], [
     AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
     RUBY_EXEC_PREFIX=''
-@@ -4256,6 +4260,7 @@ AC_SUBST(sitearchdir)dnl
+@@ -4262,6 +4266,7 @@ AC_SUBST(sitearchdir)dnl
 AC_SUBST(vendordir)dnl
 AC_SUBST(vendorlibdir)dnl
 AC_SUBST(vendorarchdir)dnl
--- a/ruby-2.3.0-ruby_version.patch
+++ b/ruby-2.3.0-ruby_version.patch
@ -20,7 +20,7 @@ diff --git a/configure.ac b/configure.ac
 index 80b137e380..63cd3b4f8b 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -4146,9 +4146,6 @@ AS_CASE(["$target_os"],
+@@ -4152,9 +4152,6 @@ AS_CASE(["$target_os"],
     rubyw_install_name='$(RUBYW_INSTALL_NAME)'
     ])
 
@ -30,7 +30,7 @@ index 80b137e380..63cd3b4f8b 100644
 rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'}
 AC_ARG_WITH(rubyarchprefix,
 	    AS_HELP_STRING([--with-rubyarchprefix=DIR],
-@@ -4171,57 +4168,63 @@ AC_ARG_WITH(ridir,
+@@ -4177,57 +4174,63 @@ AC_ARG_WITH(ridir,
 AC_SUBST(ridir)
 AC_SUBST(RI_BASE_NAME)
 
@ -122,7 +122,7 @@ index 80b137e380..63cd3b4f8b 100644
 
 AS_IF([test "${LOAD_RELATIVE+set}"], [
     AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
-@@ -4238,6 +4241,7 @@ AC_SUBST(sitearchincludedir)dnl
+@@ -4244,6 +4247,7 @@ AC_SUBST(sitearchincludedir)dnl
 AC_SUBST(arch)dnl
 AC_SUBST(sitearch)dnl
 AC_SUBST(ruby_version)dnl
@ -195,7 +195,7 @@ diff --git a/lib/rubygems/defaults.rb b/lib/rubygems/defaults.rb
 index d4ff4a262c..3f9a5bf590 100644
 --- a/lib/rubygems/defaults.rb
 +++ b/lib/rubygems/defaults.rb
-@@ -34,7 +34,7 @@ def self.default_spec_cache_dir
+@@ -35,7 +35,7 @@ def self.default_spec_cache_dir
   # specified in the environment
 
   def self.default_dir
@ -204,7 +204,7 @@ index d4ff4a262c..3f9a5bf590 100644
   end
 
   ##
-@@ -103,7 +103,8 @@ def self.user_dir
+@@ -104,7 +104,8 @@ def self.user_dir
     gem_dir = File.join(Gem.user_home, ".gem")
     gem_dir = File.join(Gem.data_home, "gem") unless File.exist?(gem_dir)
     parts = [gem_dir, ruby_engine]
@ -214,7 +214,7 @@ index d4ff4a262c..3f9a5bf590 100644
     File.join parts
   end
 
-@@ -248,7 +249,7 @@ def self.vendor_dir # :nodoc:
+@@ -249,7 +250,7 @@ def self.vendor_dir # :nodoc:
     return nil unless RbConfig::CONFIG.key? "vendordir"
 
     File.join RbConfig::CONFIG["vendordir"], "gems",
@ -227,7 +227,7 @@ diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb
 index b25068405d..e9fef4a311 100644
 --- a/test/rubygems/test_gem.rb
 +++ b/test/rubygems/test_gem.rb
-@@ -1337,7 +1337,8 @@ def test_self_use_paths
+@@ -1338,7 +1338,8 @@ def test_self_use_paths
 
   def test_self_user_dir
     parts = [@userhome, ".gem", Gem.ruby_engine]
@ -237,7 +237,7 @@ index b25068405d..e9fef4a311 100644
 
     FileUtils.mkdir_p File.join(parts)
 
-@@ -1413,7 +1414,7 @@ def test_self_vendor_dir
+@@ -1414,7 +1415,7 @@ def test_self_vendor_dir
     vendordir(File.join(@tempdir, "vendor")) do
       expected =
         File.join RbConfig::CONFIG["vendordir"], "gems",
--- a/ruby-3.2.0-Revert-Fix-test-syntax-suggest-order.patch
+++ b/ruby-3.2.0-Revert-Fix-test-syntax-suggest-order.patch
@ -23,7 +23,7 @@ index d0558697d7..e73841aae7 100644
 	$(ECHO) check succeeded
 	-$(Q) : : "run only on sh"; \
 	if [ x"$(GIT)" != x ] && $(CHDIR) "$(srcdir)" && \
-@@ -903,8 +904,6 @@ yes-test-spec: test-spec-precheck
+@@ -904,8 +905,6 @@ yes-test-spec: test-spec-precheck
 	$(ACTIONS_ENDGROUP)
 no-test-spec:
 
@ -32,7 +32,7 @@ index d0558697d7..e73841aae7 100644
 RUNNABLE = $(LIBRUBY_RELATIVE:no=un)-runnable
 runnable: $(RUNNABLE) prog $(tooldir)/mkrunnable.rb PHONY
 	$(Q) $(MINIRUBY) $(tooldir)/mkrunnable.rb -v $(EXTOUT)
-@@ -1456,7 +1455,6 @@ test-syntax-suggest-precheck: $(TEST_RUNNABLE)-test-syntax-suggest-precheck
+@@ -1457,7 +1456,6 @@ test-syntax-suggest-precheck: $(TEST_RUNNABLE)-test-syntax-suggest-precheck
 no-test-syntax-suggest-precheck:
 yes-test-syntax-suggest-precheck: main
 
@ -40,7 +40,7 @@ index d0558697d7..e73841aae7 100644
 no-test-syntax-suggest-prepare: no-test-syntax-suggest-precheck
 yes-test-syntax-suggest-prepare: yes-test-syntax-suggest-precheck
 	$(ACTIONS_GROUP)
-@@ -1466,15 +1464,13 @@ yes-test-syntax-suggest-prepare: yes-test-syntax-suggest-precheck
+@@ -1467,15 +1465,13 @@ yes-test-syntax-suggest-prepare: yes-test-syntax-suggest-precheck
 
 RSPECOPTS =
 SYNTAX_SUGGEST_SPECS =
--- a/ruby-3.2.0-Revert-Test-syntax_suggest-by-make-check.patch
+++ b/ruby-3.2.0-Revert-Test-syntax_suggest-by-make-check.patch
@ -23,7 +23,7 @@ index 27f6a9d89d..8021f03a58 100644
 	$(ECHO) check succeeded
 	-$(Q) : : "run only on sh"; \
 	if [ x"$(GIT)" != x ] && $(CHDIR) "$(srcdir)" && \
-@@ -1464,9 +1463,8 @@ yes-test-syntax-suggest-prepare: yes-test-syntax-suggest-precheck
+@@ -1465,9 +1464,8 @@ yes-test-syntax-suggest-prepare: yes-test-syntax-suggest-precheck
 
 RSPECOPTS =
 SYNTAX_SUGGEST_SPECS =
--- a/ruby-3.2.0-Use-SHA256-instead-of-SHA1.patch
+++ b/ruby-3.2.0-Use-SHA256-instead-of-SHA1.patch
@ -1,39 +0,0 @@
-From 9b9825d6cdda053fea49eb2f613bc62bde465e89 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
-Date: Wed, 4 Jan 2023 17:23:35 +0100
-Subject: [PATCH] Use SHA256 instead of SHA1
-
-Systems such as CentOS 9 / RHEL 9 are moving away from SHA1 disabling it
-by default via a system-wide crypto policy. This replaces SHA1 with
-SHA256 in similar way as [[1]].
-
-[1]: https://github.com/ruby/openssl/pull/554
---
- spec/ruby/library/openssl/x509/name/verify_spec.rb | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/spec/ruby/library/openssl/x509/name/verify_spec.rb b/spec/ruby/library/openssl/x509/name/verify_spec.rb
-index a8bf865bd..6dcfc9946 100644
--- a/spec/ruby/library/openssl/x509/name/verify_spec.rb
-+++ b/spec/ruby/library/openssl/x509/name/verify_spec.rb
-@@ -12,7 +12,7 @@ describe "OpenSSL::X509::Name.verify" do
-     cert.public_key = key.public_key
-     cert.not_before = Time.now - 10
-     cert.not_after = cert.not_before + 365 * 24 * 60 * 60
-    cert.sign key, OpenSSL::Digest.new('SHA1')
-+    cert.sign key, OpenSSL::Digest.new('SHA256')
-     store = OpenSSL::X509::Store.new
-     store.add_cert(cert)
-     [store.verify(cert), store.error, store.error_string].should == [true, 0, "ok"]
-@@ -28,7 +28,7 @@ describe "OpenSSL::X509::Name.verify" do
-     cert.public_key = key.public_key
-     cert.not_before = Time.now - 10
-     cert.not_after = Time.now - 5
-    cert.sign key, OpenSSL::Digest.new('SHA1')
-+    cert.sign key, OpenSSL::Digest.new('SHA256')
-     store = OpenSSL::X509::Store.new
-     store.add_cert(cert)
-     store.verify(cert).should == false
-- 
-2.38.1
-
--- a/ruby.spec
+++ b/ruby.spec
@ -1,6 +1,6 @@
 %global major_version 3
 %global minor_version 2
-%global teeny_version 2
+%global teeny_version 5
 %global major_minor_version %{major_version}.%{minor_version}

 %global ruby_version %{major_minor_version}.%{teeny_version}
@ -10,7 +10,7 @@
 #%%global milestone rc1

 # Keep the revision enabled for pre-releases from GIT.
-#%%global revision c5eefb7f37
+#%%global revision 31d0f1a2e7

 %global ruby_archive %{name}-%{ruby_version}

@ -27,20 +27,20 @@
 %global rubygems_dir %{_datadir}/rubygems

 # Bundled libraries versions
-%global rubygems_version 3.4.10
+%global rubygems_version 3.4.19
 %global rubygems_molinillo_version 0.8.0
 %global rubygems_optparse_version 0.3.0
 %global rubygems_tsort_version 0.1.0

 # Default gems.
-%global bundler_version 2.4.10
+%global bundler_version 2.4.19
 %global bundler_connection_pool_version 2.3.0
 %global bundler_fileutils_version 1.7.0
 %global bundler_pub_grub_version 0.5.0
 %global bundler_net_http_persistent_version 4.0.1
 %global bundler_thor_version 1.2.1
 %global bundler_tsort_version 0.1.1
-%global bundler_uri_version 0.12.1
+%global bundler_uri_version 0.12.2

 %global bigdecimal_version 3.1.3
 %global did_you_mean_version 1.6.3
@ -51,20 +51,21 @@
 %global openssl_version 3.1.0
 %global psych_version 5.0.1
 %global racc_version 1.6.2
-%global rdoc_version 6.5.0
+%global rdoc_version 6.5.1.1
 %global stringio_version 3.0.4
+%global syntax_suggest_version 1.1.0

 # Bundled gems.
 %global minitest_version 5.16.3
 %global power_assert_version 2.0.3
 %global rake_version 13.0.6
 %global test_unit_version 3.5.7
-%global rexml_version 3.2.5
+%global rexml_version 3.3.2
 %global rss_version 0.2.9
-%global net_ftp_version 0.2.0
-%global net_imap_version 0.3.4
+%global net_ftp_version 0.2.1
+%global net_imap_version 0.3.4.1
 %global net_pop_version 0.1.2
-%global net_smtp_version 0.3.3
+%global net_smtp_version 0.3.4
 %global matrix_version 0.4.2
 %global prime_version 0.1.2
 %global rbs_version 2.8.2
@ -101,7 +102,7 @@
 Summary: An interpreter of object-oriented scripting language
 Name: ruby
 Version: %{ruby_version}%{?development_release}
-Release: 181%{?dist}
+Release: 183%{?dist}
 # BSD-3-Clause: missing/{crypt,mt19937,setproctitle}.c
 # ISC: missing/strl{cat,cpy}.c
 # Public Domain for example for: include/ruby/st.h, strftime.c, missing/*, ...
@ -169,13 +170,6 @@ Patch8: ruby-2.7.1-Timeout-the-test_bug_reporter_add-witout-raising-err.patch
 # https://bugs.ruby-lang.org/issues/19297
 Patch9: ruby-3.2.0-Revert-Fix-test-syntax-suggest-order.patch
 Patch10: ruby-3.2.0-Revert-Test-syntax_suggest-by-make-check.patch
-# Fix `OpenSSL::X509::CertificateError: invalid digest` errors on ELN. This
-# also might help Fedor, if/when
-# https://fedoraproject.org/wiki/Changes/StrongCryptoSettings3Forewarning2
-# is accepted.
-# https://github.com/ruby/spec/pull/990
-# https://bugs.ruby-lang.org/issues/19307
-Patch11: ruby-3.2.0-Use-SHA256-instead-of-SHA1.patch

 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 %{?with_rubypick:Suggests: rubypick}
@ -645,7 +639,6 @@ analysis result in RBS format, a standard type description format for Ruby
 %patch 8 -p1
 %patch 9 -p1
 %patch 10 -p1
-%patch 11 -p1

 # Provide an example of usage of the tapset:
 cp -a %{SOURCE3} .
@ -1073,8 +1066,6 @@ mv test/ruby/test_jit.rb{,.disable} || :
 %{ruby_libdir}/ipaddr.rb
 %{ruby_libdir}/kconv.rb
 %{ruby_libdir}/logger*
-# https://bugs.ruby-lang.org/issues/19298
-%exclude %{ruby_libdir}/mjit
 %{ruby_libdir}/mkmf.rb
 %{ruby_libdir}/monitor.rb
 %{ruby_libdir}/mutex_m.rb
@ -1283,7 +1274,7 @@ mv test/ruby/test_jit.rb{,.disable} || :
 %{gem_dir}/specifications/default/ipaddr-1.2.5.gemspec
 %{gem_dir}/specifications/default/logger-1.5.3.gemspec
 %{gem_dir}/specifications/default/mutex_m-0.1.2.gemspec
-%{gem_dir}/specifications/default/net-http-0.3.2.gemspec
+%{gem_dir}/specifications/default/net-http-0.4.1.gemspec
 %{gem_dir}/specifications/default/net-protocol-0.2.1.gemspec
 %{gem_dir}/specifications/default/nkf-0.1.2.gemspec
 %{gem_dir}/specifications/default/observer-0.1.1.gemspec
@ -1310,7 +1301,9 @@ mv test/ruby/test_jit.rb{,.disable} || :
 %{gem_dir}/specifications/default/singleton-0.1.1.gemspec
 %{gem_dir}/specifications/default/stringio-%{stringio_version}.gemspec
 %{gem_dir}/specifications/default/strscan-3.0.5.gemspec
-%{gem_dir}/specifications/default/syntax_suggest-1.0.2.gemspec
+%{gem_dir}/specifications/default/syntax_suggest-%{syntax_suggest_version}.gemspec
+%{_bindir}/syntax_suggest
+%{gem_dir}/gems/syntax_suggest-%{syntax_suggest_version}
 %{gem_dir}/specifications/default/syslog-0.1.1.gemspec
 %{gem_dir}/specifications/default/tempfile-0.1.3.gemspec
 %{gem_dir}/specifications/default/time-0.2.2.gemspec
@ -1318,7 +1311,7 @@ mv test/ruby/test_jit.rb{,.disable} || :
 %{gem_dir}/specifications/default/tmpdir-0.1.3.gemspec
 %{gem_dir}/specifications/default/tsort-0.1.1.gemspec
 %{gem_dir}/specifications/default/un-0.2.1.gemspec
-%{gem_dir}/specifications/default/uri-0.12.1.gemspec
+%{gem_dir}/specifications/default/uri-0.12.2.gemspec
 %{gem_dir}/specifications/default/weakref-0.1.2.gemspec
 #%%{gem_dir}/specifications/default/win32ole-1.8.9.gemspec
 %{gem_dir}/specifications/default/yaml-0.2.1.gemspec
@ -1559,7 +1552,14 @@ mv test/ruby/test_jit.rb{,.disable} || :


 %changelog
-* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org>
+* Tue Sep 10 2024 Vít Ondruch <vondruch@redhat.com> - 3.2.5-183
+- Upgrade to Ruby 3.2.5.
+
+* Wed Apr 24 2024 Vít Ondruch <vondruch@redhat.com> - 3.2.4-182
+- Upgrade to Ruby 3.2.4.
+  Resolves: rhbz#2270544
+
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.2-181
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

 * Fri Mar 31 2023 Vít Ondruch <vondruch@redhat.com> - 3.2.2-180
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (ruby-3.2.2.tar.xz) = a29f24cd80f563f6368952d06d6273f7241a409fa9ab2f60e03dde2ac58ca06bee1750715b6134caebf4c061d3503446dc37a6059e19860bb0010eef34951935
+SHA512 (ruby-3.2.5.tar.xz) = 092348b84b513aec62e63ec10b326370d0e3d1fa3126c59c03c84f28e2d7741a4772c461b077ec6a7dac3964a20f434655729e1acd50a3438755d7ad64073305
Author	SHA1	Message	Date
Vít Ondruch	c344d09fd3	Upgrade to Ruby 3.2.5.	2024-09-10 12:09:43 +02:00
Vít Ondruch	db24d65e28	Upgrade to Ruby 3.2.4. Resolves: rhbz#2270544	2024-04-24 18:34:48 +02:00