diff --git a/fix-refute_match-parameter-error.patch b/fix-refute_match-parameter-error.patch new file mode 100644 index 0000000000000000000000000000000000000000..118c9dd2a1a173ffd95bc4f73dabd478883d4c2a --- /dev/null +++ b/fix-refute_match-parameter-error.patch @@ -0,0 +1,25 @@ +From 31d3e8666731f5c69565edf55fa378dba84f8673 Mon Sep 17 00:00:00 2001 +From: chenjianhu +Date: Thu, 18 Dec 2025 20:18:40 +0800 +Subject: [PATCH] fix uri test generic error + +--- + uri/test_generic.rb | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/uri/test_generic.rb b/test/uri/test_generic.rb +index ff334ff..3ad8d11 100644 +--- a/test/uri/test_generic.rb ++++ b/test/uri/test_generic.rb +@@ -788,7 +788,7 @@ class URI::TestGeneric < Test::Unit::TestCase + e = assert_raise(URI::InvalidComponentError) do + uri.password = password + end +- refute_match password, e.message ++ refute_match Regexp.new(password), e.message + end + + def test_set_scheme +-- +2.33.0 + diff --git a/ruby.spec b/ruby.spec index ecb136c742b3dc570d5e269ad335d1b2e2162a3a..59951b81eaa3bfb54ae90c3512d1a63e00d870a7 100644 --- a/ruby.spec +++ b/ruby.spec @@ -1,6 +1,6 @@ Name: ruby Version: 2.5.8 -Release: 136 +Release: 137 Summary: Object-oriented scripting language interpreter License: (Ruby or BSD) and Public Domain and MIT and CC0 and zlib and UCD URL: https://www.ruby-lang.org/ @@ -107,6 +107,7 @@ Patch6063: backport-Use-StringScanner-peek_byte-to-get-double-or-single-.patch Patch6064: backport-Reduced-regular-expression-processing-in-the-form-of.patch Patch6065: backport-CVE-2025-58767.patch Patch6066: backport-CVE-2025-61594.patch +Patch6067: fix-refute_match-parameter-error.patch Patch9000: add-require_relative-helper-to-uninitialized-constan.patch @@ -646,6 +647,9 @@ make runruby TESTRUN_SCRIPT=%{SOURCE13} %exclude %{gem_dir}/gems/xmlrpc-0.3.0/.* %changelog +* Thu Dec 18 2025 chenjianhu - 2.5.8-137 +- Fix refute_match parameter error + * Sat Nov 08 2025 shixuantong - 2.5.8-136 - fix CVE-2025-58767 CVE-2025-61594