Upgrade to version 7.0.6

CVE-2023-22796.patch

@@ -1,26 +0,0 @@
-From 2164d4f6a1bde74b911fe9ba3c8df1b5bf345bf8 Mon Sep 17 00:00:00 2001
-From: John Hawthorn <john@hawthorn.email>
-Date: Wed, 11 Jan 2023 10:14:55 -0800
-Subject: [PATCH] Avoid regex backtracking in Inflector.underscore
-
-[CVE-2023-22796]
----
- activesupport/lib/active_support/inflector/methods.rb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/activesupport/lib/active_support/inflector/methods.rb b/activesupport/lib/active_support/inflector/methods.rb
-index 68a00d73f2..43abb9c4e1 100644
---- a/activesupport/lib/active_support/inflector/methods.rb
-+++ b/activesupport/lib/active_support/inflector/methods.rb
-@@ -97,7 +97,7 @@ def underscore(camel_cased_word)
-       return camel_cased_word.to_s unless /[A-Z-]|::/.match?(camel_cased_word)
-       word = camel_cased_word.to_s.gsub("::", "/")
-       word.gsub!(inflections.acronyms_underscore_regex) { "#{$1 && '_' }#{$2.downcase}" }
--      word.gsub!(/([A-Z]+)(?=[A-Z][a-z])|([a-z\d])(?=[A-Z])/) { ($1 || $2) << "_" }
-+      word.gsub!(/([A-Z])(?=[A-Z][a-z])|([a-z\d])(?=[A-Z])/) { ($1 || $2) << "_" }
-       word.tr!("-", "_")
-       word.downcase!
-       word
--- 
-2.35.1
-

rubygem-activesupport-7.0.4-ruby32-rubyvm-class_serial-removal.patch

@@ -1,23 +0,0 @@
-From 60ffaac2e9644076e53afa1a2b1a716e289b7085 Mon Sep 17 00:00:00 2001
-From: Akira Matsuda <ronnie@dio.jp>
-Date: Thu, 15 Dec 2022 15:45:27 +0900
-Subject: [PATCH] RubyVM class serial is no longer available in Ruby 3.2
-
-since ruby/ruby@13bd617ea6fdf72467c593639cf33312a06c330c
----
- activesupport/test/executor_test.rb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/activesupport/test/executor_test.rb b/activesupport/test/executor_test.rb
-index d366ae55b6e0..27872458d95b 100644
---- a/activesupport/test/executor_test.rb
-+++ b/activesupport/test/executor_test.rb
-@@ -226,7 +226,7 @@ def test_hook_insertion_order
-   end
- 
-   def test_class_serial_is_unaffected
--    skip if !defined?(RubyVM)
-+    skip if !defined?(RubyVM) || !RubyVM.stat.has_key?(:class_serial)
- 
-     hook = Class.new do
-       define_method(:run) do

rubygem-activesupport.spec

@@ -1,8 +1,8 @@
 %global gem_name activesupport
 Name:                rubygem-%{gem_name}
 Epoch:               1
-Version:             7.0.4
+Version:             7.0.6
-Release:             3
+Release:             1
 Summary:             A support libraries and Ruby core extensions extracted from the Rails framework
 License:             MIT
 URL:                 http://rubyonrails.org
@@ -23,9 +23,6 @@ Patch1: rubygem-activesupport-7.0.2.3-Remove-the-multi-call-form-of-assert_calle
 Patch2: rubygem-activesupport-7.0.2.3-Remove-the-multi-call-form-of-assert_called_with-test.patch
 # https://github.com/rails/rails/pull/45370
 Patch3: rubygem-activesupport-7.0.2.3-Fix-tests-for-minitest-5.16.patch
-Patch4: CVE-2023-22796.patch
-# Fix for test failure with ruby3.2 wrt class_serial removal
-Patch5: rubygem-activesupport-7.0.4-ruby32-rubyvm-class_serial-removal.patch
 
 Requires:            rubygem(bigdecimal) rubygem(json)
 BuildRequires:       ruby(release) rubygems-devel ruby >= 2.2.2 rubygem(bigdecimal) rubygem(builder)
@@ -49,11 +46,9 @@ Documentation for %{name}.
 %setup -q -n %{gem_name}-%{version} -b1 -b2
 %patch1 -p2
 %patch3 -p2
-%patch4 -p2
 
 pushd %{_builddir}
 %patch2 -p2
-%patch5 -p2
 popd
 
 %build
@@ -100,6 +95,9 @@ popd
 %doc %{gem_instdir}/README.rdoc
 
 %changelog
+* Thu Aug 17 2023 liqiuyu <liqiuyu@kylinos.cn> - 1:7.0.6-1
+- Upgrade to version 7.0.6
+
 * Mon Aug 14 2023 caiyuxin <caiyuxin@kylinos.cn> - 1:7.0.4-3
 - Backport upstream fix for test failure with ruby3.2 wrt class_serial removal