开源软件构建与测试

_service:tar_scm:rubygem-activesupport.spec Changed

@@ -2,7 +2,7 @@
 Name:                rubygem-%{gem_name}
 Epoch:               1
 Version:             7.0.4
-Release:             2
+Release:             3
 Summary:             A support libraries and Ruby core extensions extracted from the Rails framework
 License:             MIT
 URL:                 http://rubyonrails.org
@@ -24,6 +24,8 @@
 # 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)
@@ -51,6 +53,7 @@
 
 pushd %{_builddir}
 %patch2 -p2
+%patch5 -p2
 popd
 
 %build
@@ -97,6 +100,9 @@
 %doc %{gem_instdir}/README.rdoc
 
 %changelog
+* 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
+
 * Tue Feb 21 2023 wushaozheng <wushaozheng@ncti-gba.cn> - 1:7.0.4-2
 - fix CVE-2023-22796

_service:tar_scm:Add-support-dalli-3.2.2.patch Deleted

@@ -1,45 +0,0 @@
-diff -Nur a/cache/stores/mem_cache_store_test.rb b/cache/stores/mem_cache_store_test.rb
---- a/cache/stores/mem_cache_store_test.rb	2021-08-20 00:25:04.000000000 +0800
-+++ b/cache/stores/mem_cache_store_test.rb	2022-07-05 11:22:22.774850776 +0800
-@@ -17,8 +17,12 @@
-   end
- end
- 
--class UnavailableDalliServer < Dalli::Server
--  def alive?
-+class UnavailableDalliServer < Dalli::Protocol::Binary
-+  def alive? # before https://github.com/petergoldstein/dalli/pull/863
-+    false
-+  end
-+
-+  def ensure_connected! # after https://github.com/petergoldstein/dalli/pull/863
-     false
-   end
- end
-@@ -263,17 +267,21 @@
-     end
- 
-     def emulating_unavailability
--      old_server = Dalli.send(:remove_const, :Server)
--      Dalli.const_set(:Server, UnavailableDalliServer)
-+      old_server = Dalli::Protocol.send(:remove_const, :Binary)
-+      Dalli::Protocol.const_set(:Binary, UnavailableDalliServer)
- 
-       yield ActiveSupport::Cache::MemCacheStore.new
-     ensure
--      Dalli.send(:remove_const, :Server)
--      Dalli.const_set(:Server, old_server)
-+      Dalli::Protocol.send(:remove_const, :Binary)
-+      Dalli::Protocol.const_set(:Binary, old_server)
-     end
- 
-     def servers(cache = @cache)
--      client(cache).instance_variable_get(:@servers)
-+      if client(cache).instance_variable_defined?(:@normalized_servers)
-+        client(cache).instance_variable_get(:@normalized_servers)
-+      else
-+        client(cache).instance_variable_get(:@servers)
-+      end
-     end
- 
-     def client(cache = @cache)

_service:tar_scm:rubygem-activesupport-7.0.4-ruby32-rubyvm-class_serial-removal.patch Added

Changes of Revision 2