gentoo auto-resync : 28:06:2023 - 07:37:01

2 files changed, 52 insertions, 0 deletions

diff --git a/dev-ruby/activesupport/files/activesupport-6.1.7.4-bytesplice.patch b/dev-ruby/activesupport/files/activesupport-6.1.7.4-bytesplice.patch
new file mode 100644
index 000000000000..fc4096622bb4
--- /dev/null
+++ b/dev-ruby/activesupport/files/activesupport-6.1.7.4-bytesplice.patch
@@ -0,0 +1,29 @@
+From 9e1169b96164eb5ba6bf8ca7744aa3a512cf9439 Mon Sep 17 00:00:00 2001
+From: Hartley McGuire <skipkayhil@gmail.com>
+Date: Mon, 13 Mar 2023 19:05:18 -0400
+Subject: [PATCH] Fix NoMethodError in SafeBuffer#bytesplice
+
+`html_escape_interpolated_argument` was [renamed][1] to
+`implicit_html_escape_interpolated_argument` during Rails 7.0
+development, so the security fix [backport][2] ended up with the wrong
+method name.
+
+[1]: 147f207a57a03fc7a52040aa1f6878cf70ee0db7
+[2]: 3cf23c3f891e2e81c977ea4ab83b62bc2a444b70
+---
+ .../lib/active_support/core_ext/string/output_safety.rb         | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/activesupport/lib/active_support/core_ext/string/output_safety.rb b/activesupport/lib/active_support/core_ext/string/output_safety.rb
+index a627540a353db..c5c5d4858ffec 100644
+--- a/lib/active_support/core_ext/string/output_safety.rb
++++ b/lib/active_support/core_ext/string/output_safety.rb
+@@ -217,7 +217,7 @@ def concat(value)
+     alias << concat
+ 
+     def bytesplice(*args, value)
+-      super(*args, implicit_html_escape_interpolated_argument(value))
++      super(*args, html_escape_interpolated_argument(value))
+     end
+ 
+     def insert(index, value)
diff --git a/dev-ruby/activesupport/files/activesupport-6.1.7.4-class_serial.patch b/dev-ruby/activesupport/files/activesupport-6.1.7.4-class_serial.patch
new file mode 100644
index 000000000000..18a05331ead1
--- /dev/null
+++ b/dev-ruby/activesupport/files/activesupport-6.1.7.4-class_serial.patch
@@ -0,0 +1,23 @@
+From 45e9d5ea0dc61eb8d5977ef4f0d416d0ffcb8575 Mon Sep 17 00:00:00 2001
+From: Jean Boussier <jean.boussier@gmail.com>
+Date: Thu, 15 Dec 2022 10:06:04 +0100
+Subject: [PATCH] Merge pull request #46735 from amatsuda/ruby32_class_serial
+
+A quick fix for a Ruby 3.2 + Active Support test failure
+---
+ 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 ac87780b23ccb..b3021c4e70ef8 100644
+--- a/test/executor_test.rb
++++ b/test/executor_test.rb
+@@ -194,7 +194,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