From 43d2363c1e519fe664abd00ab287f54ddf83dee0 Mon Sep 17 00:00:00 2001 From: Jarek Prokop Date: Wed, 11 Jun 2025 17:40:56 +0200 Subject: [PATCH] Upgrade to ruby 3.4.4. Resolves: rhbz#2359563 --- ...3.0-Disable-syntax-suggest-test-case.patch | 2 +- ruby-3.4.2-openssl-Fix-SHA-1-PSS-tests.patch | 6 ++--- ruby.spec | 24 +++++++++++-------- sources | 2 +- 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/ruby-3.3.0-Disable-syntax-suggest-test-case.patch b/ruby-3.3.0-Disable-syntax-suggest-test-case.patch index 10679ee..6130a82 100644 --- a/ruby-3.3.0-Disable-syntax-suggest-test-case.patch +++ b/ruby-3.3.0-Disable-syntax-suggest-test-case.patch @@ -12,7 +12,7 @@ diff --git a/common.mk b/common.mk index d55d1788aa..73755f6ccd 100644 --- a/common.mk +++ b/common.mk -@@ -1662,8 +1662,6 @@ no-test-bundled-gems-spec: +@@ -1665,8 +1665,6 @@ no-test-bundled-gems-spec: test-syntax-suggest: diff --git a/ruby-3.4.2-openssl-Fix-SHA-1-PSS-tests.patch b/ruby-3.4.2-openssl-Fix-SHA-1-PSS-tests.patch index 5695824..26ca3ec 100644 --- a/ruby-3.4.2-openssl-Fix-SHA-1-PSS-tests.patch +++ b/ruby-3.4.2-openssl-Fix-SHA-1-PSS-tests.patch @@ -61,7 +61,7 @@ diff --git a/test/openssl/test_pkey_rsa.rb b/test/openssl/test_pkey_rsa.rb index 360309b..850c16a 100644 --- a/test/openssl/test_pkey_rsa.rb +++ b/test/openssl/test_pkey_rsa.rb -@@ -108,13 +108,13 @@ class OpenSSL::TestPKeyRSA < OpenSSL::PKeyTestCase +@@ -108,13 +108,13 @@ def test_sign_verify_options pssopts = { "rsa_padding_mode" => "pss", "rsa_pss_saltlen" => 20, @@ -77,7 +77,7 @@ index 360309b..850c16a 100644 # Defaults to PKCS #1 v1.5 padding => verification failure assert_equal false, key.verify("SHA256", sig_pss, data) -@@ -188,22 +188,22 @@ class OpenSSL::TestPKeyRSA < OpenSSL::PKeyTestCase +@@ -188,22 +188,22 @@ def test_sign_verify_pss data = "Sign me!" invalid_data = "Sign me?" @@ -108,7 +108,7 @@ index 360309b..850c16a 100644 # The sign_pss with `salt_length: :max` raises the "invalid salt length" # error in FIPS. We need to skip the tests in FIPS. -@@ -213,18 +213,18 @@ class OpenSSL::TestPKeyRSA < OpenSSL::PKeyTestCase +@@ -213,18 +213,18 @@ def test_sign_verify_pss # FIPS 186-5 section 5.4 PKCS #1 # https://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.186-5.pdf unless OpenSSL.fips_mode diff --git a/ruby.spec b/ruby.spec index dd338e0..983fe66 100644 --- a/ruby.spec +++ b/ruby.spec @@ -1,6 +1,6 @@ %global major_version 3 %global minor_version 4 -%global teeny_version 2 +%global teeny_version 4 %global major_minor_version %{major_version}.%{minor_version} %global ruby_version %{major_minor_version}.%{teeny_version} @@ -27,7 +27,7 @@ %global rubygems_dir %{_datadir}/rubygems # Bundled libraries versions -%global rubygems_version 3.6.2 +%global rubygems_version 3.6.7 %global rubygems_molinillo_version 0.8.0 %global rubygems_net_http_version 0.6.0 %global rubygems_net_protocol_version 0.2.2 @@ -36,21 +36,21 @@ %global rubygems_securerandom_version 0.4.1 %global rubygems_timeout_version 0.4.3 %global rubygems_tsort_version 0.2.0 -%global rubygems_uri_version 1.0.2 +%global rubygems_uri_version 1.0.3 # Default gems. -%global bundler_version 2.6.2 -%global bundler_connection_pool_version 2.4.1 +%global bundler_version 2.6.7 +%global bundler_connection_pool_version 2.5.0 %global bundler_fileutils_version 1.7.3 %global bundler_net_http_persistent_version 4.0.4 %global bundler_pub_grub_version 0.5.0 %global bundler_securerandom_version 0.4.1 %global bundler_thor_version 1.3.2 %global bundler_tsort_version 0.2.0 -%global bundler_uri_version 1.0.2 +%global bundler_uri_version 1.0.3 %global benchmark_version 0.4.0 -%global cgi_version 0.4.1 +%global cgi_version 0.4.2 %global date_version 3.4.1 %global delegate_version 0.4.0 %global did_you_mean_version 2.0.0 @@ -98,7 +98,7 @@ %global tmpdir_version 0.3.1 %global tsort_version 0.2.0 %global un_version 0.3.0 -%global uri_version 1.0.2 +%global uri_version 1.0.3 %global weakref_version 0.1.3 %global win32ole_version 1.9.1 %global win32_registry_version 0.1.0 @@ -121,7 +121,7 @@ %global drb_version 2.2.1 %global getoptlong_version 0.2.1 %global net_ftp_version 0.3.8 -%global net_imap_version 0.5.6 +%global net_imap_version 0.5.8 %global net_pop_version 0.1.2 %global net_smtp_version 0.5.1 %global nkf_version 0.2.0 @@ -177,7 +177,7 @@ Summary: An interpreter of object-oriented scripting language Name: ruby Version: %{ruby_version}%{?development_release} -Release: 24%{?dist} +Release: 25%{?dist} # Licenses, which are likely not included in binary RPMs: # Apache-2.0: # benchmark/gc/redblack.rb @@ -1879,6 +1879,10 @@ make -C %{_vpath_builddir} runruby TESTRUN_SCRIPT=" \ %changelog +* Wed Jun 11 2025 Jarek Prokop - 3.4.4-25 +- Upgrade to Ruby 3.4.4. + Resolves: rhbz#2359563 + * Tue Apr 08 2025 Jun Aruga - 3.4.2-24 - Fix the tests using SHA-1 Probabilistic Signature Scheme (PSS) parameters. Resolves: rhbz#2358256 diff --git a/sources b/sources index 0fa9f06..eb999d0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ruby-3.4.2.tar.xz) = cb8b5023bce316393716548c5f0a44c7d0240724ff79b995517641266af30bedc6f402c1c8fa27368ea607e2aa6d36bbb201e00c6e9dd2a80d837431d32343b5 +SHA512 (ruby-3.4.4.tar.xz) = 0d258cf790daad424c866404b5cbdc8adba0e4e13764847a89adf2335229e5184095c9f3e9594705897697e48bcc322d9a9f919b04047abb2075daca9fce8871