commit: bdcce8dbb0f4bf316a23660df8c4525566d2b134 Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> AuthorDate: Wed Jun 28 05:50:01 2023 +0000 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> CommitDate: Wed Jun 28 05:54:54 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdcce8db
dev-ruby/activesupport: add 6.1.7.4 Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org> dev-ruby/activesupport/Manifest | 1 + .../activesupport/activesupport-6.1.7.4.ebuild | 81 ++++++++++++++++++++++ .../files/activesupport-6.1.7.4-bytesplice.patch | 29 ++++++++ .../files/activesupport-6.1.7.4-class_serial.patch | 23 ++++++ 4 files changed, 134 insertions(+) diff --git a/dev-ruby/activesupport/Manifest b/dev-ruby/activesupport/Manifest index 720e4b642efc..5e0cc13b7435 100644 --- a/dev-ruby/activesupport/Manifest +++ b/dev-ruby/activesupport/Manifest @@ -1,6 +1,7 @@ DIST rails-6.0.6.1.tgz 18608328 BLAKE2B 10e6cb2d23acb75c95c25e2e6cc62de05c9c89f249c6cb9abffdd3a6ed83eb1dca996e6ef56a92cf77dddd3f8f9373ad947690015fb7966ddc599c995cea1121 SHA512 6873354fe2f8b9bf8bc12c7e6affda4300c158ee825f996eea6032a70f9532009d8f626d2736af22a452c8a3b331d1252ff19666e021150bfae2a8d575890c27 DIST rails-6.1.7.2.tgz 11037081 BLAKE2B 0004f4bc8b2370119cbe0f6a9133278ae78b1d274f040f08d18edd06696e6fcc609154a042c68b77e11893fbef83ec8eabd9f1e2c28920269189ee1352a0695a SHA512 f667904b0d3ffda3579e5046da3b36c242581bacf140966bf1dc59fc7ea91f34f4affc76b0d6cfad4b80f0332aeec5fc8ab35fb793fc935f1d1b4fe6d18ce1de DIST rails-6.1.7.3.tgz 11038169 BLAKE2B 7e379b9ae3b63cb78638c1e0817ff40dc8aad79ba76b6d82310fbb4d6f5ef3dab4f252de9e49766143b828bfbce2ef7c9db3f108b5406708b61a83aeda47ea74 SHA512 fb84516a6cf370109bf45f2162161d23f375d7dc10249ed10200c74ec402129b07ac0e59bcde98a74eb499769a0cdd937af691edaabe44e061262d5510adc02e +DIST rails-6.1.7.4.tgz 11038583 BLAKE2B 737044b6f92f2555fd9374e0b0fef7e26e53e2ac2103f1e3d89124929416aeda1295adfa7493471472c6ff0fbb057dea0bd9c184bbb45ae572185b98c399177f SHA512 caa7e2a79f747befb5f6f17adec1cc43530dbb35741775b2ebdcf59476efecd277dad025073a4b519a35754367cca04290c24bb8d8ae4235fda696ead531a94f DIST rails-7.0.4.3.tgz 11063764 BLAKE2B 389fd3a00bfff4ebda70cf5ec473942883048783b716ede1787a510d3b7b91f4e844dce4dde5ef643cb9611b1b3aa712f1ba5ebefb9e5a84e307a151b2e40bcf SHA512 2c817a0a58ae52f99686d8cd0de84f01e3d7ec05afc95d07910b3b5bf86d8162b06102893b2cbc14859b95a07eca6882a707956c87d437794697df7a18fa3c16 DIST rails-7.0.5.1.tgz 11077848 BLAKE2B 17dc2527b762d242c1cc141b5480c0917c8eafb53c55d3034d5af272e9be5760f6c3e16ce1a60041f11af4f99da23e79ff46e9f9fe88412932f2524bf057c478 SHA512 5053ed666cede0bfeb7a534f248538406a1bf5afe0d5ee9e285b4eeb3158566fdd665c7a20012833e6927e7dbb3d881361a5d7f8ce7e326f8e3faf5d571da3e7 DIST rails-7.0.5.tgz 11057290 BLAKE2B c9a2c34cc57f71a45023465796d18f769363713b3222dc67040e9d731055fe60856c4969a0fae305f99722e8f3a1aaee0f6cc0cc5e3e57949b756786f44560f9 SHA512 93f5d2f0e23ac318370ac15fdb4db935b9082232308fdc7bb99bca1b00e1b5127ddc805dd19512a2304921ff7b8a584c7b3d3ceb7cbd4cfd8dca31f518430448 diff --git a/dev-ruby/activesupport/activesupport-6.1.7.4.ebuild b/dev-ruby/activesupport/activesupport-6.1.7.4.ebuild new file mode 100644 index 000000000000..8058c2ae04a2 --- /dev/null +++ b/dev-ruby/activesupport/activesupport-6.1.7.4.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +USE_RUBY="ruby30 ruby31 ruby32" + +RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc" + +RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec" + +RUBY_FAKEGEM_BINWRAP="" + +inherit ruby-fakegem + +DESCRIPTION="Utility Classes and Extension to the Standard Library" +HOMEPAGE="https://github.com/rails/rails"; +SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz" + +LICENSE="MIT" +SLOT="$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="" + +RUBY_S="rails-${PV}/${PN}" + +ruby_add_rdepend " + >=dev-ruby/concurrent-ruby-1.0.2:1 + >=dev-ruby/i18n-1.6:1 + >=dev-ruby/minitest-5.1 + dev-ruby/tzinfo:2 + >=dev-ruby/zeitwerk-2.3:2 +" + +# memcache-client, nokogiri, builder, and redis are not strictly needed, +# but there are tests using this code. +ruby_add_bdepend "test? ( + >=dev-ruby/dalli-3.0.1 + dev-ruby/connection_pool + >=dev-ruby/nokogiri-1.8.1 + >=dev-ruby/builder-3.1.0 + >=dev-ruby/listen-3.3:3 + dev-ruby/rack + dev-ruby/rexml + dev-ruby/mocha + <dev-ruby/minitest-5.16:* + )" + +PATCHES=( + "${FILESDIR}"/${PN}-6.1.7.3-ruby-thread-noise.patch + "${FILESDIR}"/${P}-bytesplice.patch + "${FILESDIR}"/${P}-class_serial.patch +) + +all_ruby_prepare() { + # Set the secure permissions that tests expect. + chmod 0755 "${HOME}" || die "Failed to fix permissions on home" + + # Remove items from the common Gemfile that we don't need for this + # test run. This also requires handling some gemspecs. + sed -i -e "/\(system_timer\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|sqlite\|websocket-client-simple\|\libxml-ruby\|bootsnap\|aws-sdk\|webmock\|capybara\|sass-rails\|selenium-webdriver\|webpacker\|webrick\|rack-test\)/ s:^:#:" \ + -e '/group :\(doc\|rubocop\|job\|cable\|storage\|ujs\|test\) do/,/^end/ s:^:#:' \ + -e 's/gemspec/gemspec path: "activesupport"/' \ + -e '5igem "builder"; gem "rack"' ../Gemfile || die + rm ../Gemfile.lock || die +# sed -i -e '1igem "tzinfo", "~> 1.1"' test/abstract_unit.rb || die + + # Avoid test that depends on timezone + sed -i -e '/test_implicit_coercion/,/^ end/ s:^:#:' test/core_ext/duration_test.rb || die + + # Avoid tests that seem to trigger race conditions. + rm -f test/evented_file_update_checker_test.rb || die + + # Avoid test that generates filename that is too long + sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die + + # Avoid tests requiring a live redis running + rm -f test/cache/stores/redis_cache_store_test.rb || die + sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die + sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die +} 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 <[email protected]> +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 <[email protected]> +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
