Upgrade to Ruby 3.3.10.

- CVE-2025-58767 ruby: REXML denial of service.
  Resovles: rhbz#2396203
This commit is contained in:
Vít Ondruch 2025-10-23 16:12:37 +02:00
commit fdadc0043a
3 changed files with 11 additions and 34 deletions

View file

@ -1,21 +0,0 @@
From 6e6c4212d32496cd4ea36c7962ddd3499c81ac0e Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Wed, 2 Jul 2025 01:31:57 +0900
Subject: [PATCH] Backport GH-13617 for s390x (#13757)
---
test/ruby/test_variable.rb | 1 +
1 file changed, 1 insertion(+)
diff --git a/test/ruby/test_variable.rb b/test/ruby/test_variable.rb
index fc2580654d..a291aa4fec 100644
--- a/test/ruby/test_variable.rb
+++ b/test/ruby/test_variable.rb
@@ -413,6 +413,7 @@ def test_external_ivars
end
def test_exivar_resize_with_compaction_stress
+ omit "compaction doesn't work well on s390x" if RUBY_PLATFORM =~ /s390x/ # https://github.com/ruby/ruby/pull/5077
objs = 10_000.times.map do
ExIvar.new
end

View file

@ -1,6 +1,6 @@
%global major_version 3
%global minor_version 3
%global teeny_version 9
%global teeny_version 10
%global major_minor_version %{major_version}.%{minor_version}
%global ruby_version %{major_minor_version}.%{teeny_version}
@ -79,7 +79,7 @@
%global nkf_version 0.1.3
%global observer_version 0.1.2
%global open3_version 0.2.1
%global openssl_version 3.2.0
%global openssl_version 3.2.2
%global open_uri_version 0.4.1
%global optparse_version 0.4.0
%global ostruct_version 0.6.0
@ -107,7 +107,7 @@
%global tmpdir_version 0.2.0
%global tsort_version 0.2.0
%global un_version 0.3.0
%global uri_version 0.13.2
%global uri_version 0.13.3
%global weakref_version 0.1.3
%global win32ole_version 1.8.10
%global yaml_version 0.3.0
@ -135,7 +135,7 @@
%global racc_version 1.7.3
%global rake_version 13.1.0
%global rbs_version 3.4.0
%global rexml_version 3.3.9
%global rexml_version 3.4.4
%global rss_version 0.3.1
%global test_unit_version 3.6.1
%global typeprof_version 0.21.9
@ -173,7 +173,7 @@
Summary: An interpreter of object-oriented scripting language
Name: ruby
Version: %{ruby_version}%{?development_release}
Release: 20%{?dist}
Release: 21%{?dist}
# Licenses, which are likely not included in binary RPMs:
# Apache-2.0:
# benchmark/gc/redblack.rb
@ -285,12 +285,6 @@ Patch12: ruby-3.4.0-Extract-hardening-CFLAGS-to-a-special-hardenflags-variable.p
# https://github.com/ruby/openssl/pull/710
# https://github.com/ruby/ruby/commit/6213ab1a51387fd9cdcb5e87908722f3bbdf78cb
Patch13: ruby-3.4.0-openssl-respect-crypto-policies-tls-min.patch
# Test "test_exivar_resize_with_compaction_stress" is tested under
# GC compaction, but compaction does not currently work well on s390x:
# https://github.com/ruby/ruby/pull/5077
# As such, tests that run under GC compaction stress are expected to be omitted.
# https://github.com/ruby/ruby/pull/14269
Patch14: ruby-3.4.5-Backport-GH-13617-for-s390x-13757.patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%{?with_rubypick:Suggests: rubypick}
@ -772,7 +766,6 @@ analysis result in RBS format, a standard type description format for Ruby
%patch 9 -p1
%patch 12 -p1
%patch 13 -p1
%patch 14 -p1
# Provide an example of usage of the tapset:
cp -a %{SOURCE3} .
@ -1771,6 +1764,11 @@ make -C %{_vpath_builddir} runruby TESTRUN_SCRIPT=" \
%changelog
* Thu Oct 23 2025 Vít Ondruch <vondruch@redhat.com> - 3.3.9-21
- Upgrade to Ruby 3.3.10.
- CVE-2025-58767 ruby: REXML denial of service.
Resovles: rhbz#2396203
* Tue Aug 19 2025 Jarek Prokop <jprokop@redhat.com> - 3.3.9-20
- Upgrate to Ruby 3.3.9.
Resolves: rhbz#2386838

View file

@ -1 +1 @@
SHA512 (ruby-3.3.9.tar.xz) = 52be800daf9e983dd7539f6961ee6d4e863c8f4eefdce4fb1091fdfe05339531832dd88d2a8b6f5cdcd790f9d5aefa3bc08574fcb2bab399200d20fa0ad1db18
SHA512 (ruby-3.3.10.tar.xz) = 8b81cab7b98acb6ff7bdf864da5e97596ee1efa441e2a65991e12a7e3f3ad3d83b1b5c65ae108484252ec8f6d85db60eb381a174c759023beb202b5a0d20818a