From a873925bbb2952f280789197db0996e87399a65f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 22 Aug 2017 09:22:22 +0200 Subject: [PATCH 01/78] Explicitly require rubygem(json). --- rubygem-activesupport.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index f35bc28..33de7eb 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -3,7 +3,7 @@ Name: rubygem-%{gem_name} Epoch: 1 Version: 5.1.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework Group: Development/Languages License: MIT @@ -17,9 +17,10 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem # git checkout v5.1.3 && tar czvf activesupport-5.1.3-tests.tgz test/ Source1: %{gem_name}-%{version}-tests.tgz -# ruby package has just soft dependency on rubygem(bigdecimal), while -# ActiveSupport always requires it. +# ruby package has just soft dependency on rubygem({bigdecimal,json}), while +# ActiveSupport always requires them. Requires: rubygem(bigdecimal) +Requires: rubygem(json) # Let's keep Requires and BuildRequires sorted alphabeticaly BuildRequires: ruby(release) @@ -95,6 +96,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Tue Aug 22 2017 Vít Ondruch - 1:5.1.3-2 +- Explicitly require rubygem(json). + * Tue Aug 08 2017 Pavel Valena - 1:5.1.3-1 - Update to Active Support 5.1.3. From df7e11358118376bbf0d0b4ef04fe4ad67e5e28a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 22 Aug 2017 09:35:42 +0200 Subject: [PATCH 02/78] Once again disable unstable test. --- rubygem-activesupport.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 33de7eb..5912bf8 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -77,6 +77,10 @@ for f in test/evented_file_update_checker_test.rb; do mv $f{,.disable} done +# This seems to be unstable as well ... +# https://github.com/rails/rails/issues/25682 +sed -i '/def test_iso8601_output_and_reparsing$/,/^ end$/ s/^/#/' test/core_ext/duration_test.rb + memcached & mPID=$! ruby -Ilib:test -e 'Dir.glob "./test/**/*_test.rb", &method(:require)' @@ -98,6 +102,7 @@ popd %changelog * Tue Aug 22 2017 Vít Ondruch - 1:5.1.3-2 - Explicitly require rubygem(json). +- Once again disable unstable test. * Tue Aug 08 2017 Pavel Valena - 1:5.1.3-1 - Update to Active Support 5.1.3. From ce860013d46f7e06524f5de6de090e5df706a069 Mon Sep 17 00:00:00 2001 From: Pavel Valena Date: Mon, 11 Sep 2017 13:59:38 +0200 Subject: [PATCH 03/78] Update to Active Support 5.1.4. --- .gitignore | 2 ++ rubygem-activesupport.spec | 9 ++++++--- sources | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 4c17037..78ec76f 100644 --- a/.gitignore +++ b/.gitignore @@ -75,3 +75,5 @@ activesupport-2.3.8.gem /activesupport-5.1.2.gem /activesupport-5.1.3-tests.tgz /activesupport-5.1.3.gem +/activesupport-5.1.4-tests.tgz +/activesupport-5.1.4.gem diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 5912bf8..9037c7d 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -2,8 +2,8 @@ Name: rubygem-%{gem_name} Epoch: 1 -Version: 5.1.3 -Release: 2%{?dist} +Version: 5.1.4 +Release: 1%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework Group: Development/Languages License: MIT @@ -14,7 +14,7 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem # Rails rpms, you may check it out like so # git clone http://github.com/rails/rails.git # cd rails/activesupport/ -# git checkout v5.1.3 && tar czvf activesupport-5.1.3-tests.tgz test/ +# git checkout v5.1.4 && tar czvf activesupport-5.1.4-tests.tgz test/ Source1: %{gem_name}-%{version}-tests.tgz # ruby package has just soft dependency on rubygem({bigdecimal,json}), while @@ -100,6 +100,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Mon Sep 11 2017 Pavel Valena - 1:5.1.4-1 +- Update to Active Support 5.1.4. + * Tue Aug 22 2017 Vít Ondruch - 1:5.1.3-2 - Explicitly require rubygem(json). - Once again disable unstable test. diff --git a/sources b/sources index abb4a66..48041b0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (activesupport-5.1.3-tests.tgz) = 84d1e41a39c88fe3b66aff9bf27a22cc15c2c1418446440ea0baf90e712b86ac533f972e4a29a282c554f7150ca8a881ed7c48a307763674b2f19965e7f37b7a -SHA512 (activesupport-5.1.3.gem) = c7e51664458fe1473f6a24bcce6ae8ae1f0a280462817d22626541fd5006183fa0c0d003479ccecf3d927c0688b480382709e484fd4b101f31f85673a94583b8 +SHA512 (activesupport-5.1.4-tests.tgz) = f89d9397d94e2db521ab46b2a8abce2130b4bcfebb9f143bb1338ef5899cf3d9b7f292c12f3c07c429ee5916ef5eae0145fe25289fa94562c1c27af855154e8b +SHA512 (activesupport-5.1.4.gem) = 0da18df1bbf7648c12753844400ccc562ca8b1281e3f381c6f8e3b3d02d6ab313b549a3d90ca69fbf5a31da12ca3c188d1c6492815ef3b0611bb75c95d71cdd9 From ce9c9eed9738ac8b8aa3cdfe28f2dccda06df79d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Fri, 19 Jan 2018 14:23:12 +0100 Subject: [PATCH 04/78] Fix MiniTest 5.11 compatibility. --- ...nitest-Result-for-retain-test-result.patch | 39 +++++++++++++++++++ rubygem-activesupport.spec | 8 +++- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 rubygem-activesupport-5.1.4-Use-Minitest-Result-for-retain-test-result.patch diff --git a/rubygem-activesupport-5.1.4-Use-Minitest-Result-for-retain-test-result.patch b/rubygem-activesupport-5.1.4-Use-Minitest-Result-for-retain-test-result.patch new file mode 100644 index 0000000..2b48db6 --- /dev/null +++ b/rubygem-activesupport-5.1.4-Use-Minitest-Result-for-retain-test-result.patch @@ -0,0 +1,39 @@ +From 3a077f369199651fa62a3e9b8ab2d8f8ee70a0e9 Mon Sep 17 00:00:00 2001 +From: "yuuji.yaginuma" +Date: Tue, 2 Jan 2018 18:15:11 +0900 +Subject: [PATCH] Use `Minitest::Result` for retain test result + +Runnable.marshal_dump/load was removed in +https://github.com/seattlerb/minitest/commit/00433fc0a4fdd0e6b302aace633384ba1312237 + +Instead, `Minitest::Result` is contained test result and the that can be +marshalled. +--- + activesupport/lib/active_support/testing/isolation.rb | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/activesupport/lib/active_support/testing/isolation.rb b/activesupport/lib/active_support/testing/isolation.rb +index fa9bebb181a4..562f985f1ba2 100644 +--- a/activesupport/lib/active_support/testing/isolation.rb ++++ b/activesupport/lib/active_support/testing/isolation.rb +@@ -45,7 +45,8 @@ def run_in_isolation(&blk) + end + } + end +- result = Marshal.dump(dup) ++ test_result = defined?(Minitest::Result) ? Minitest::Result.from(self) : dup ++ result = Marshal.dump(test_result) + end + + write.puts [result].pack("m") +@@ -69,8 +70,9 @@ def run_in_isolation(&blk) + + if ENV["ISOLATION_TEST"] + yield ++ test_result = defined?(Minitest::Result) ? Minitest::Result.from(self) : dup + File.open(ENV["ISOLATION_OUTPUT"], "w") do |file| +- file.puts [Marshal.dump(dup)].pack("m") ++ file.puts [Marshal.dump(test_result)].pack("m") + end + exit! + else diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 9037c7d..9fcff16 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -3,7 +3,7 @@ Name: rubygem-%{gem_name} Epoch: 1 Version: 5.1.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework Group: Development/Languages License: MIT @@ -16,6 +16,8 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem # cd rails/activesupport/ # git checkout v5.1.4 && tar czvf activesupport-5.1.4-tests.tgz test/ Source1: %{gem_name}-%{version}-tests.tgz +# Fix MiniTest 5.11 compatibility. +Patch0: rubygem-activesupport-5.1.4-Use-Minitest-Result-for-retain-test-result.patch # ruby package has just soft dependency on rubygem({bigdecimal,json}), while # ActiveSupport always requires them. @@ -58,6 +60,7 @@ Documentation for %{name}. %gem_install -n %{SOURCE0} pushd .%{gem_instdir} +%patch0 -p2 popd %build @@ -100,6 +103,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Fri Jan 19 2018 Vít Ondruch - 1:5.1.4-2 +- Fix MiniTest 5.11 compatibility. + * Mon Sep 11 2017 Pavel Valena - 1:5.1.4-1 - Update to Active Support 5.1.4. From 534b291c368ff3f7873d8b0bee41b81784fbc61e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 13:30:53 +0000 Subject: [PATCH 05/78] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-activesupport.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 9fcff16..e0e5657 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -3,7 +3,7 @@ Name: rubygem-%{gem_name} Epoch: 1 Version: 5.1.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework Group: Development/Languages License: MIT @@ -103,6 +103,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 1:5.1.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Fri Jan 19 2018 Vít Ondruch - 1:5.1.4-2 - Fix MiniTest 5.11 compatibility. From c279244dbd070d4974d5a6b884e4a51e0849caa9 Mon Sep 17 00:00:00 2001 From: Pavel Valena Date: Fri, 16 Feb 2018 17:36:13 +0100 Subject: [PATCH 06/78] Update to Active Support 5.1.5. --- .gitignore | 81 +------------------ ...nitest-Result-for-retain-test-result.patch | 39 --------- rubygem-activesupport.spec | 12 +-- sources | 4 +- 4 files changed, 10 insertions(+), 126 deletions(-) delete mode 100644 rubygem-activesupport-5.1.4-Use-Minitest-Result-for-retain-test-result.patch diff --git a/.gitignore b/.gitignore index 78ec76f..3355a7b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,79 +1,2 @@ -activesupport-2.3.5.gem -activesupport-2.3.8.gem -/activesupport-3.0.3.gem -/activesupport-3.0.5.gem -/activesupport-tests.tgz -/activesupport-3.0.9-tests.tgz -/activesupport-3.0.9.gem -/activesupport-3.0.10-tests.tgz -/activesupport-3.0.10.gem -/activesupport-3.0.11-tests.tgz -/activesupport-3.0.11.gem -/activesupport-3.0.13-tests.tgz -/activesupport-3.0.13.gem -/activesupport-3.0.15-tests.tgz -/activesupport-3.0.15.gem -/activesupport-3.2.6-tests.tgz -/activesupport-3.2.6.gem -/activesupport-3.2.7-tests.tgz -/activesupport-3.2.7.gem -/activesupport-3.2.8-tests.tgz -/activesupport-3.2.8.gem -/activesupport-3.2.10-tests.tgz -/activesupport-3.2.10.gem -/activesupport-3.2.11-tests.tgz -/activesupport-3.2.11.gem -/activesupport-3.2.12-tests.tgz -/activesupport-3.2.12.gem -/activesupport-3.2.13-tests.tgz -/activesupport-3.2.13.gem -/activesupport-4.0.0-tests.tgz -/activesupport-4.0.0.gem -/activesupport-4.0.1-tests.tgz -/activesupport-4.0.1.gem -/activesupport-4.0.2-tests.tgz -/activesupport-4.0.2.gem -/activesupport-4.0.3-tests.tgz -/activesupport-4.0.3.gem -/activesupport-4.1.0-tests.tgz -/activesupport-4.1.0.gem -/activesupport-4.1.1-tests.tgz -/activesupport-4.1.1.gem -/activesupport-4.1.4-tests.tgz -/activesupport-4.1.4.gem -/activesupport-4.1.5-tests.tgz -/activesupport-4.1.5.gem -/activesupport-4.2.0-tests.tgz -/activesupport-4.2.0.gem -/activesupport-4.2.1-tests.tgz -/activesupport-4.2.1.gem -/activesupport-4.2.2-tests.tgz -/activesupport-4.2.2.gem -/activesupport-4.2.3-tests.tgz -/activesupport-4.2.3.gem -/activesupport-4.2.4-tests.tgz -/activesupport-4.2.4.gem -/activesupport-4.2.5-tests.tgz -/activesupport-4.2.5.gem -/activesupport-4.2.5.1-tests.tgz -/activesupport-4.2.5.1.gem -/activesupport-4.2.5.2-tests.tgz -/activesupport-4.2.5.2.gem -/activesupport-4.2.6-tests.tgz -/activesupport-4.2.6.gem -/activesupport-5.0.0-tests.tgz -/activesupport-5.0.0.gem -/activesupport-5.0.0.1-tests.tgz -/activesupport-5.0.0.1.gem -/activesupport-5.0.1-tests.tgz -/activesupport-5.0.1.gem -/activesupport-5.0.2-tests.tgz -/activesupport-5.0.2.gem -/activesupport-5.1.1.gem -/activesupport-5.1.1-tests.tgz -/activesupport-5.1.2-tests.tgz -/activesupport-5.1.2.gem -/activesupport-5.1.3-tests.tgz -/activesupport-5.1.3.gem -/activesupport-5.1.4-tests.tgz -/activesupport-5.1.4.gem +/activesupport-*.gem +/activesupport-*-tests.tgz diff --git a/rubygem-activesupport-5.1.4-Use-Minitest-Result-for-retain-test-result.patch b/rubygem-activesupport-5.1.4-Use-Minitest-Result-for-retain-test-result.patch deleted file mode 100644 index 2b48db6..0000000 --- a/rubygem-activesupport-5.1.4-Use-Minitest-Result-for-retain-test-result.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 3a077f369199651fa62a3e9b8ab2d8f8ee70a0e9 Mon Sep 17 00:00:00 2001 -From: "yuuji.yaginuma" -Date: Tue, 2 Jan 2018 18:15:11 +0900 -Subject: [PATCH] Use `Minitest::Result` for retain test result - -Runnable.marshal_dump/load was removed in -https://github.com/seattlerb/minitest/commit/00433fc0a4fdd0e6b302aace633384ba1312237 - -Instead, `Minitest::Result` is contained test result and the that can be -marshalled. ---- - activesupport/lib/active_support/testing/isolation.rb | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/activesupport/lib/active_support/testing/isolation.rb b/activesupport/lib/active_support/testing/isolation.rb -index fa9bebb181a4..562f985f1ba2 100644 ---- a/activesupport/lib/active_support/testing/isolation.rb -+++ b/activesupport/lib/active_support/testing/isolation.rb -@@ -45,7 +45,8 @@ def run_in_isolation(&blk) - end - } - end -- result = Marshal.dump(dup) -+ test_result = defined?(Minitest::Result) ? Minitest::Result.from(self) : dup -+ result = Marshal.dump(test_result) - end - - write.puts [result].pack("m") -@@ -69,8 +70,9 @@ def run_in_isolation(&blk) - - if ENV["ISOLATION_TEST"] - yield -+ test_result = defined?(Minitest::Result) ? Minitest::Result.from(self) : dup - File.open(ENV["ISOLATION_OUTPUT"], "w") do |file| -- file.puts [Marshal.dump(dup)].pack("m") -+ file.puts [Marshal.dump(test_result)].pack("m") - end - exit! - else diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index e0e5657..d58a49e 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -2,8 +2,8 @@ Name: rubygem-%{gem_name} Epoch: 1 -Version: 5.1.4 -Release: 3%{?dist} +Version: 5.1.5 +Release: 1%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework Group: Development/Languages License: MIT @@ -14,10 +14,8 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem # Rails rpms, you may check it out like so # git clone http://github.com/rails/rails.git # cd rails/activesupport/ -# git checkout v5.1.4 && tar czvf activesupport-5.1.4-tests.tgz test/ +# git checkout v5.1.5 && tar czvf activesupport-5.1.5-tests.tgz test/ Source1: %{gem_name}-%{version}-tests.tgz -# Fix MiniTest 5.11 compatibility. -Patch0: rubygem-activesupport-5.1.4-Use-Minitest-Result-for-retain-test-result.patch # ruby package has just soft dependency on rubygem({bigdecimal,json}), while # ActiveSupport always requires them. @@ -60,7 +58,6 @@ Documentation for %{name}. %gem_install -n %{SOURCE0} pushd .%{gem_instdir} -%patch0 -p2 popd %build @@ -103,6 +100,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Fri Feb 16 2018 Pavel Valena - 1:5.1.5-1 +- Update to Active Support 5.1.5. + * Fri Feb 09 2018 Fedora Release Engineering - 1:5.1.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 48041b0..e0036ab 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (activesupport-5.1.4-tests.tgz) = f89d9397d94e2db521ab46b2a8abce2130b4bcfebb9f143bb1338ef5899cf3d9b7f292c12f3c07c429ee5916ef5eae0145fe25289fa94562c1c27af855154e8b -SHA512 (activesupport-5.1.4.gem) = 0da18df1bbf7648c12753844400ccc562ca8b1281e3f381c6f8e3b3d02d6ab313b549a3d90ca69fbf5a31da12ca3c188d1c6492815ef3b0611bb75c95d71cdd9 +SHA512 (activesupport-5.1.5.gem) = 6e20f069f4e2e20a8ea762e02be9f136a32535b871b4c6f2a59600393201f6d01dbd2696a74024811c168e8d6c223e5a4fa0eda3ba30d87a3c2216fba0aedd05 +SHA512 (activesupport-5.1.5-tests.tgz) = 11be71318b4e9f1365d18d72fc527c87837782b62adb6498c423edd2a40687ad22b43b05e983528b6a4d1690376d64adecad816ec8bfd298d7352307e63acd89 From f360bcace63f5129ab9e0386ea48acf325588ae6 Mon Sep 17 00:00:00 2001 From: Pavel Valena Date: Wed, 21 Feb 2018 15:07:46 +0100 Subject: [PATCH 07/78] Allow rubygem-i18n ~> 1.0 as it was updated in Fedora. https://github.com/rails/rails/pull/31991 --- rubygem-activesupport.spec | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index d58a49e..4786c9f 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -3,7 +3,7 @@ Name: rubygem-%{gem_name} Epoch: 1 Version: 5.1.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework Group: Development/Languages License: MIT @@ -54,13 +54,16 @@ BuildArch: noarch Documentation for %{name}. %prep -%setup -q -c -T -%gem_install -n %{SOURCE0} +%setup -q -n %{gem_name}-%{version} -pushd .%{gem_instdir} -popd +# https://github.com/rails/rails/pull/31991 +%gemspec_remove_dep -s ../%{gem_name}-%{version}.gemspec -g i18n '~> 0.7' +%gemspec_add_dep -s ../%{gem_name}-%{version}.gemspec -g i18n '~> 1.0' %build +gem build ../%{gem_name}-%{version}.gemspec + +%gem_install %install mkdir -p %{buildroot}%{gem_dir} @@ -100,6 +103,10 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Wed Feb 21 2018 Pavel Valena - 1:5.1.5-2 +- Allow rubygem-i18n ~> 1.0 + https://github.com/rails/rails/pull/31991 + * Fri Feb 16 2018 Pavel Valena - 1:5.1.5-1 - Update to Active Support 5.1.5. From 3977e11555c9a296740cfa95274351e0516c0ee5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Mon, 16 Apr 2018 16:25:30 +0200 Subject: [PATCH 08/78] Fix test suite issue caused by change fix of CVE-2018-6914 in Ruby. --- ...oreTest-test_filename_max_size-fails.patch | 26 +++++++++++++++++++ rubygem-activesupport.spec | 11 +++++++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 rubygem-activesupport-5.1.7-Fix-FileStoreTest-test_filename_max_size-fails.patch diff --git a/rubygem-activesupport-5.1.7-Fix-FileStoreTest-test_filename_max_size-fails.patch b/rubygem-activesupport-5.1.7-Fix-FileStoreTest-test_filename_max_size-fails.patch new file mode 100644 index 0000000..55c4b74 --- /dev/null +++ b/rubygem-activesupport-5.1.7-Fix-FileStoreTest-test_filename_max_size-fails.patch @@ -0,0 +1,26 @@ +From ca4be4b7788c90d94beb1e835b7019f809148d08 Mon Sep 17 00:00:00 2001 +From: Andrew White +Date: Mon, 2 Apr 2018 09:34:53 +0100 +Subject: [PATCH] Backport fix for Dir::Tmpname.create from #32386 + +The removal of path separators from the tmpname value affects all four +supported versions of Ruby - 2.2.10, 2.3.7, 2.4.4, and 2.5.1. +--- + activesupport/test/caching_test.rb | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb +index c67ffe69b80a..c138f10c13a5 100644 +--- a/activesupport/test/caching_test.rb ++++ b/activesupport/test/caching_test.rb +@@ -854,7 +854,9 @@ def test_key_transformation_with_pathname + def test_filename_max_size + key = "#{'A' * ActiveSupport::Cache::FileStore::FILENAME_MAX_SIZE}" + path = @cache.send(:normalize_key, key, {}) +- Dir::Tmpname.create(path) do |tmpname, n, opts| ++ basename = File.basename(path) ++ dirname = File.dirname(path) ++ Dir::Tmpname.create(basename, Dir.tmpdir + dirname) do |tmpname, n, opts| + assert File.basename(tmpname + ".lock").length <= 255, "Temp filename too long: #{File.basename(tmpname + '.lock').length}" + end + end diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 4786c9f..c872fe5 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -3,7 +3,7 @@ Name: rubygem-%{gem_name} Epoch: 1 Version: 5.1.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework Group: Development/Languages License: MIT @@ -17,6 +17,10 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem # git checkout v5.1.5 && tar czvf activesupport-5.1.5-tests.tgz test/ Source1: %{gem_name}-%{version}-tests.tgz +# Fix test suite issue caused by change fix of CVE-2018-6914 in Ruby. +# https://github.com/rails/rails/commit/ca4be4b7788c90d94beb1e835b7019f809148d08 +Patch1: rubygem-activesupport-5.1.7-Fix-FileStoreTest-test_filename_max_size-fails.patch + # ruby package has just soft dependency on rubygem({bigdecimal,json}), while # ActiveSupport always requires them. Requires: rubygem(bigdecimal) @@ -75,6 +79,8 @@ pushd .%{gem_instdir} # Move the tests into place tar xzvf %{SOURCE1} +cat %{PATCH1} | patch -p2 + # These tests are really unstable, but they seems to be passing upstream :/ for f in test/evented_file_update_checker_test.rb; do mv $f{,.disable} @@ -103,6 +109,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Mon Apr 16 2018 Vít Ondruch - 1:5.1.5-3 +- Fix test suite issue caused by change fix of CVE-2018-6914 in Ruby. + * Wed Feb 21 2018 Pavel Valena - 1:5.1.5-2 - Allow rubygem-i18n ~> 1.0 https://github.com/rails/rails/pull/31991 From f18c1c242540eb5085e3c426cf744f9552f9cc23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Mon, 16 Apr 2018 16:27:10 +0200 Subject: [PATCH 09/78] Fix typo. --- rubygem-activesupport.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index c872fe5..9cf078c 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -17,7 +17,7 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem # git checkout v5.1.5 && tar czvf activesupport-5.1.5-tests.tgz test/ Source1: %{gem_name}-%{version}-tests.tgz -# Fix test suite issue caused by change fix of CVE-2018-6914 in Ruby. +# Fix test suite issue caused by fix of CVE-2018-6914 in Ruby. # https://github.com/rails/rails/commit/ca4be4b7788c90d94beb1e835b7019f809148d08 Patch1: rubygem-activesupport-5.1.7-Fix-FileStoreTest-test_filename_max_size-fails.patch @@ -110,7 +110,7 @@ popd %changelog * Mon Apr 16 2018 Vít Ondruch - 1:5.1.5-3 -- Fix test suite issue caused by change fix of CVE-2018-6914 in Ruby. +- Fix test suite issue caused by fix of CVE-2018-6914 in Ruby. * Wed Feb 21 2018 Pavel Valena - 1:5.1.5-2 - Allow rubygem-i18n ~> 1.0 From 1c1a14cbe4c6a8876571319cb8b02f18e4def42e Mon Sep 17 00:00:00 2001 From: Pavel Valena Date: Mon, 30 Apr 2018 16:18:37 +0200 Subject: [PATCH 10/78] Update to Active Support 5.2.0. Also, enhance .spec file. --- ...oreTest-test_filename_max_size-fails.patch | 26 -------------- ...oreTest-test_filename_max_size-fails.patch | 22 ++++++++++++ rubygem-activesupport.spec | 34 ++++++++++--------- sources | 4 +-- 4 files changed, 42 insertions(+), 44 deletions(-) delete mode 100644 rubygem-activesupport-5.1.7-Fix-FileStoreTest-test_filename_max_size-fails.patch create mode 100644 rubygem-activesupport-5.2.0-Fix-FileStoreTest-test_filename_max_size-fails.patch diff --git a/rubygem-activesupport-5.1.7-Fix-FileStoreTest-test_filename_max_size-fails.patch b/rubygem-activesupport-5.1.7-Fix-FileStoreTest-test_filename_max_size-fails.patch deleted file mode 100644 index 55c4b74..0000000 --- a/rubygem-activesupport-5.1.7-Fix-FileStoreTest-test_filename_max_size-fails.patch +++ /dev/null @@ -1,26 +0,0 @@ -From ca4be4b7788c90d94beb1e835b7019f809148d08 Mon Sep 17 00:00:00 2001 -From: Andrew White -Date: Mon, 2 Apr 2018 09:34:53 +0100 -Subject: [PATCH] Backport fix for Dir::Tmpname.create from #32386 - -The removal of path separators from the tmpname value affects all four -supported versions of Ruby - 2.2.10, 2.3.7, 2.4.4, and 2.5.1. ---- - activesupport/test/caching_test.rb | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb -index c67ffe69b80a..c138f10c13a5 100644 ---- a/activesupport/test/caching_test.rb -+++ b/activesupport/test/caching_test.rb -@@ -854,7 +854,9 @@ def test_key_transformation_with_pathname - def test_filename_max_size - key = "#{'A' * ActiveSupport::Cache::FileStore::FILENAME_MAX_SIZE}" - path = @cache.send(:normalize_key, key, {}) -- Dir::Tmpname.create(path) do |tmpname, n, opts| -+ basename = File.basename(path) -+ dirname = File.dirname(path) -+ Dir::Tmpname.create(basename, Dir.tmpdir + dirname) do |tmpname, n, opts| - assert File.basename(tmpname + ".lock").length <= 255, "Temp filename too long: #{File.basename(tmpname + '.lock').length}" - end - end diff --git a/rubygem-activesupport-5.2.0-Fix-FileStoreTest-test_filename_max_size-fails.patch b/rubygem-activesupport-5.2.0-Fix-FileStoreTest-test_filename_max_size-fails.patch new file mode 100644 index 0000000..7b9bca6 --- /dev/null +++ b/rubygem-activesupport-5.2.0-Fix-FileStoreTest-test_filename_max_size-fails.patch @@ -0,0 +1,22 @@ +From 01f20c753e89f75e0031d0853866aaaa68ee1cc7 Mon Sep 17 00:00:00 2001 +From: utilum +Date: Fri, 30 Mar 2018 23:53:23 +0200 +Subject: [PATCH] Fix: FileStoreTest#test_filename_max_size fails in Ruby 2.5.1 + +--- + activesupport/test/cache/stores/file_store_test.rb | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/activesupport/test/cache/stores/file_store_test.rb b/activesupport/test/cache/stores/file_store_test.rb +index c3c35a7bccfe..9aee8239799e 100644 +--- a/activesupport/test/cache/stores/file_store_test.rb ++++ b/activesupport/test/cache/stores/file_store_test.rb +@@ -69,7 +69,7 @@ def test_filename_max_size + key = "#{'A' * ActiveSupport::Cache::FileStore::FILENAME_MAX_SIZE}" + path = @cache.send(:normalize_key, key, {}) + Dir::Tmpname.create(path) do |tmpname, n, opts| +- assert File.basename(tmpname + ".lock").length <= 255, "Temp filename too long: #{File.basename(tmpname + '.lock').length}" ++ assert File.basename(key + tmpname.split(key).last + ".lock").length <= 255, "Temp filename too long: #{File.basename(tmpname + '.lock').length}" + end + end + diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 9cf078c..098e220 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -2,10 +2,9 @@ Name: rubygem-%{gem_name} Epoch: 1 -Version: 5.1.5 -Release: 3%{?dist} +Version: 5.2.0 +Release: 1%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework -Group: Development/Languages License: MIT URL: http://rubyonrails.org Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem @@ -14,12 +13,11 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem # Rails rpms, you may check it out like so # git clone http://github.com/rails/rails.git # cd rails/activesupport/ -# git checkout v5.1.5 && tar czvf activesupport-5.1.5-tests.tgz test/ +# git checkout v5.2.0 && tar czvf activesupport-5.2.0-tests.tgz test/ Source1: %{gem_name}-%{version}-tests.tgz - -# Fix test suite issue caused by fix of CVE-2018-6914 in Ruby. -# https://github.com/rails/rails/commit/ca4be4b7788c90d94beb1e835b7019f809148d08 -Patch1: rubygem-activesupport-5.1.7-Fix-FileStoreTest-test_filename_max_size-fails.patch +# Fix: file separators removal from tmpname value +# https://github.com/rails/rails/pull/32386/ +Patch0: rubygem-activesupport-5.2.0-Fix-FileStoreTest-test_filename_max_size-fails.patch # ruby package has just soft dependency on rubygem({bigdecimal,json}), while # ActiveSupport always requires them. @@ -33,12 +31,14 @@ BuildRequires: ruby >= 2.2.2 BuildRequires: rubygem(bigdecimal) BuildRequires: rubygem(builder) BuildRequires: rubygem(concurrent-ruby) +BuildRequires: rubygem(connection_pool) BuildRequires: rubygem(dalli) -BuildRequires: rubygem(i18n) >= 0.6.9 +BuildRequires: (rubygem(i18n) >= 0.7 with rubygem(i18n) < 2) BuildRequires: rubygem(minitest) >= 5.0.0 BuildRequires: rubygem(rack) BuildRequires: rubygem(tzinfo) >= 1.1 BuildRequires: rubygem(listen) +BuildRequires: rubygem(redis) BuildRequires: memcached BuildArch: noarch @@ -50,7 +50,6 @@ time zones, and testing. %package doc Summary: Documentation for %{name} -Group: Documentation Requires: %{name} = %{epoch}:%{version}-%{release} BuildArch: noarch @@ -60,10 +59,6 @@ Documentation for %{name}. %prep %setup -q -n %{gem_name}-%{version} -# https://github.com/rails/rails/pull/31991 -%gemspec_remove_dep -s ../%{gem_name}-%{version}.gemspec -g i18n '~> 0.7' -%gemspec_add_dep -s ../%{gem_name}-%{version}.gemspec -g i18n '~> 1.0' - %build gem build ../%{gem_name}-%{version}.gemspec @@ -79,10 +74,13 @@ pushd .%{gem_instdir} # Move the tests into place tar xzvf %{SOURCE1} -cat %{PATCH1} | patch -p2 +cat %{PATCH0} | patch -p2 # These tests are really unstable, but they seems to be passing upstream :/ -for f in test/evented_file_update_checker_test.rb; do +for f in \ + test/evented_file_update_checker_test.rb \ + test/cache/stores/redis_cache_store_test.rb # failed to require "redis/connection/hiredis" +do mv $f{,.disable} done @@ -92,6 +90,7 @@ sed -i '/def test_iso8601_output_and_reparsing$/,/^ end$/ s/^/#/' test/core_ext memcached & mPID=$! +sleep 1 ruby -Ilib:test -e 'Dir.glob "./test/**/*_test.rb", &method(:require)' kill -15 $mPID popd @@ -109,6 +108,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Mon Apr 23 2018 Pavel Valena - 1:5.2.0-1 +- Update to Active Support 5.2.0. + * Mon Apr 16 2018 Vít Ondruch - 1:5.1.5-3 - Fix test suite issue caused by fix of CVE-2018-6914 in Ruby. diff --git a/sources b/sources index e0036ab..3e147b3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (activesupport-5.1.5.gem) = 6e20f069f4e2e20a8ea762e02be9f136a32535b871b4c6f2a59600393201f6d01dbd2696a74024811c168e8d6c223e5a4fa0eda3ba30d87a3c2216fba0aedd05 -SHA512 (activesupport-5.1.5-tests.tgz) = 11be71318b4e9f1365d18d72fc527c87837782b62adb6498c423edd2a40687ad22b43b05e983528b6a4d1690376d64adecad816ec8bfd298d7352307e63acd89 +SHA512 (activesupport-5.2.0-tests.tgz) = 72085a71720d6931f8acedc9d6e20f0ee7910cc7c85ed05bedafd49d730ff6b1f1c19fa7f2faa021c2df5907e4d63aa1af7a7e373a6c55300d53be34ecee437f +SHA512 (activesupport-5.2.0.gem) = 606ea2168abc2c0ac1310c560c22e8d708f586c9cfa1e132ed50069eb61db4e4a16138598d83ff020beb3171236f3ddae25b38c315add03b89a04af578900252 From b3aa6b2cc81905485fc40a4c11352977b33d3a6c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 03:51:46 +0000 Subject: [PATCH 11/78] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-activesupport.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 098e220..5c0e107 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -3,7 +3,7 @@ Name: rubygem-%{gem_name} Epoch: 1 Version: 5.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT URL: http://rubyonrails.org @@ -108,6 +108,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 1:5.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon Apr 23 2018 Pavel Valena - 1:5.2.0-1 - Update to Active Support 5.2.0. From 1927503103c8d9b1a678b2ca2dc90e6ef936b066 Mon Sep 17 00:00:00 2001 From: Pavel Valena Date: Wed, 8 Aug 2018 16:16:12 +0200 Subject: [PATCH 12/78] Update to Active Support 5.2.1. --- ...oreTest-test_filename_max_size-fails.patch | 22 ------------------- rubygem-activesupport.spec | 14 +++++------- sources | 4 ++-- 3 files changed, 8 insertions(+), 32 deletions(-) delete mode 100644 rubygem-activesupport-5.2.0-Fix-FileStoreTest-test_filename_max_size-fails.patch diff --git a/rubygem-activesupport-5.2.0-Fix-FileStoreTest-test_filename_max_size-fails.patch b/rubygem-activesupport-5.2.0-Fix-FileStoreTest-test_filename_max_size-fails.patch deleted file mode 100644 index 7b9bca6..0000000 --- a/rubygem-activesupport-5.2.0-Fix-FileStoreTest-test_filename_max_size-fails.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 01f20c753e89f75e0031d0853866aaaa68ee1cc7 Mon Sep 17 00:00:00 2001 -From: utilum -Date: Fri, 30 Mar 2018 23:53:23 +0200 -Subject: [PATCH] Fix: FileStoreTest#test_filename_max_size fails in Ruby 2.5.1 - ---- - activesupport/test/cache/stores/file_store_test.rb | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/activesupport/test/cache/stores/file_store_test.rb b/activesupport/test/cache/stores/file_store_test.rb -index c3c35a7bccfe..9aee8239799e 100644 ---- a/activesupport/test/cache/stores/file_store_test.rb -+++ b/activesupport/test/cache/stores/file_store_test.rb -@@ -69,7 +69,7 @@ def test_filename_max_size - key = "#{'A' * ActiveSupport::Cache::FileStore::FILENAME_MAX_SIZE}" - path = @cache.send(:normalize_key, key, {}) - Dir::Tmpname.create(path) do |tmpname, n, opts| -- assert File.basename(tmpname + ".lock").length <= 255, "Temp filename too long: #{File.basename(tmpname + '.lock').length}" -+ assert File.basename(key + tmpname.split(key).last + ".lock").length <= 255, "Temp filename too long: #{File.basename(tmpname + '.lock').length}" - end - end - diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 5c0e107..d3e51d3 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -2,8 +2,8 @@ Name: rubygem-%{gem_name} Epoch: 1 -Version: 5.2.0 -Release: 2%{?dist} +Version: 5.2.1 +Release: 1%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT URL: http://rubyonrails.org @@ -13,11 +13,8 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem # Rails rpms, you may check it out like so # git clone http://github.com/rails/rails.git # cd rails/activesupport/ -# git checkout v5.2.0 && tar czvf activesupport-5.2.0-tests.tgz test/ +# git checkout v5.2.1 && tar czvf activesupport-5.2.1-tests.tgz test/ Source1: %{gem_name}-%{version}-tests.tgz -# Fix: file separators removal from tmpname value -# https://github.com/rails/rails/pull/32386/ -Patch0: rubygem-activesupport-5.2.0-Fix-FileStoreTest-test_filename_max_size-fails.patch # ruby package has just soft dependency on rubygem({bigdecimal,json}), while # ActiveSupport always requires them. @@ -74,8 +71,6 @@ pushd .%{gem_instdir} # Move the tests into place tar xzvf %{SOURCE1} -cat %{PATCH0} | patch -p2 - # These tests are really unstable, but they seems to be passing upstream :/ for f in \ test/evented_file_update_checker_test.rb \ @@ -108,6 +103,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Wed Aug 08 2018 Pavel Valena - 1:5.2.1-1 +- Update to Active Support 5.2.1. + * Sat Jul 14 2018 Fedora Release Engineering - 1:5.2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 3e147b3..84f6e27 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (activesupport-5.2.0-tests.tgz) = 72085a71720d6931f8acedc9d6e20f0ee7910cc7c85ed05bedafd49d730ff6b1f1c19fa7f2faa021c2df5907e4d63aa1af7a7e373a6c55300d53be34ecee437f -SHA512 (activesupport-5.2.0.gem) = 606ea2168abc2c0ac1310c560c22e8d708f586c9cfa1e132ed50069eb61db4e4a16138598d83ff020beb3171236f3ddae25b38c315add03b89a04af578900252 +SHA512 (activesupport-5.2.1.gem) = 5b5b23d671344bb1b3f3901fbd60740c073c70dc94f5c0b9ddc4bb4b8970ddafd668aed40c105fa48dc69be09c203394f83dd87240ce7d8fce988c0f3c72f66e +SHA512 (activesupport-5.2.1-tests.tgz) = a0b8174509992a45cddf05544b1f4dc700524cc82954a69ae995f1d5458b28d7c21a55fdf08aff682d34b4878f134972e87920be1b51315339547e9720e436e3 From b451a68ff4fc0f6d68cd2a9d749cc30af675960f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Wed, 14 Nov 2018 18:01:54 +0100 Subject: [PATCH 13/78] Update I18n fallbacks configuration to be compatible with i18n 1.1.0. This fixes rubygem-railties test suite. --- ...-update-I18n-fallbacks-configuration.patch | 37 +++++++++++++++++++ rubygem-activesupport.spec | 11 +++++- 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 rubygem-activesupport-5.2.1-update-I18n-fallbacks-configuration.patch diff --git a/rubygem-activesupport-5.2.1-update-I18n-fallbacks-configuration.patch b/rubygem-activesupport-5.2.1-update-I18n-fallbacks-configuration.patch new file mode 100644 index 0000000..3ef8ca7 --- /dev/null +++ b/rubygem-activesupport-5.2.1-update-I18n-fallbacks-configuration.patch @@ -0,0 +1,37 @@ +From 66614f6b67402ec526a699760d1c21c586834da8 Mon Sep 17 00:00:00 2001 +From: Lachlan Sylvester +Date: Fri, 10 Aug 2018 14:28:40 +1000 +Subject: [PATCH] update I18n fallbacks configuration to be compatible with + i18n 1.1.0 + +--- + activesupport/lib/active_support/i18n_railtie.rb | 14 +++++++++++++- + 1 files changed, 13 insertions(+), 1 deletions(-) + +diff --git a/activesupport/lib/active_support/i18n_railtie.rb b/activesupport/lib/active_support/i18n_railtie.rb +index 93bde57f6aa6..c07eb5b56986 100644 +--- a/activesupport/lib/active_support/i18n_railtie.rb ++++ b/activesupport/lib/active_support/i18n_railtie.rb +@@ -88,9 +88,21 @@ def self.init_fallbacks(fallbacks) + when Hash, Array + Array.wrap(fallbacks) + else # TrueClass +- [] ++ [I18n.default_locale] + end + ++ if args.empty? || args.first.is_a?(Hash) ++ ActiveSupport::Deprecation.warn(<<-MSG.squish) ++ Using I18n fallbacks with an empty `defaults` sets the defaults to ++ include the `default_locale`. This behavior will change in Rails 6.1. ++ If you desire the default local to be included in the defaults, please ++ explicitly configure it with `config.i18n.fallbacks.defaults = ++ [I18n.default_locale]` or `config.i18n.fallbacks = [I18n.default_locale, ++ {...}]` ++ MSG ++ args.unshift I18n.default_locale ++ end ++ + I18n.fallbacks = I18n::Locale::Fallbacks.new(*args) + end + diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index d3e51d3..f34b9d6 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -3,7 +3,7 @@ Name: rubygem-%{gem_name} Epoch: 1 Version: 5.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT URL: http://rubyonrails.org @@ -16,6 +16,10 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem # git checkout v5.2.1 && tar czvf activesupport-5.2.1-tests.tgz test/ Source1: %{gem_name}-%{version}-tests.tgz +# Update I18n fallbacks configuration to be compatible with i18n 1.1.0. +# https://github.com/rails/rails/pull/33574 +Patch0: rubygem-activesupport-5.2.1-update-I18n-fallbacks-configuration.patch + # ruby package has just soft dependency on rubygem({bigdecimal,json}), while # ActiveSupport always requires them. Requires: rubygem(bigdecimal) @@ -56,6 +60,8 @@ Documentation for %{name}. %prep %setup -q -n %{gem_name}-%{version} +%patch0 -p2 + %build gem build ../%{gem_name}-%{version}.gemspec @@ -103,6 +109,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Wed Nov 14 2018 Vít Ondruch - 1:5.2.1-2 +- Update I18n fallbacks configuration to be compatible with i18n 1.1.0. + * Wed Aug 08 2018 Pavel Valena - 1:5.2.1-1 - Update to Active Support 5.2.1. From 0e0753743076cb4441262ac2e0a61c1513d34218 Mon Sep 17 00:00:00 2001 From: Pavel Valena Date: Wed, 5 Dec 2018 14:17:58 +0100 Subject: [PATCH 14/78] Update to Active Support 5.2.2. --- ...-update-I18n-fallbacks-configuration.patch | 37 ------------------- rubygem-activesupport.spec | 15 +++----- sources | 4 +- 3 files changed, 8 insertions(+), 48 deletions(-) delete mode 100644 rubygem-activesupport-5.2.1-update-I18n-fallbacks-configuration.patch diff --git a/rubygem-activesupport-5.2.1-update-I18n-fallbacks-configuration.patch b/rubygem-activesupport-5.2.1-update-I18n-fallbacks-configuration.patch deleted file mode 100644 index 3ef8ca7..0000000 --- a/rubygem-activesupport-5.2.1-update-I18n-fallbacks-configuration.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 66614f6b67402ec526a699760d1c21c586834da8 Mon Sep 17 00:00:00 2001 -From: Lachlan Sylvester -Date: Fri, 10 Aug 2018 14:28:40 +1000 -Subject: [PATCH] update I18n fallbacks configuration to be compatible with - i18n 1.1.0 - ---- - activesupport/lib/active_support/i18n_railtie.rb | 14 +++++++++++++- - 1 files changed, 13 insertions(+), 1 deletions(-) - -diff --git a/activesupport/lib/active_support/i18n_railtie.rb b/activesupport/lib/active_support/i18n_railtie.rb -index 93bde57f6aa6..c07eb5b56986 100644 ---- a/activesupport/lib/active_support/i18n_railtie.rb -+++ b/activesupport/lib/active_support/i18n_railtie.rb -@@ -88,9 +88,21 @@ def self.init_fallbacks(fallbacks) - when Hash, Array - Array.wrap(fallbacks) - else # TrueClass -- [] -+ [I18n.default_locale] - end - -+ if args.empty? || args.first.is_a?(Hash) -+ ActiveSupport::Deprecation.warn(<<-MSG.squish) -+ Using I18n fallbacks with an empty `defaults` sets the defaults to -+ include the `default_locale`. This behavior will change in Rails 6.1. -+ If you desire the default local to be included in the defaults, please -+ explicitly configure it with `config.i18n.fallbacks.defaults = -+ [I18n.default_locale]` or `config.i18n.fallbacks = [I18n.default_locale, -+ {...}]` -+ MSG -+ args.unshift I18n.default_locale -+ end -+ - I18n.fallbacks = I18n::Locale::Fallbacks.new(*args) - end - diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index f34b9d6..0d83dfc 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -2,8 +2,8 @@ Name: rubygem-%{gem_name} Epoch: 1 -Version: 5.2.1 -Release: 2%{?dist} +Version: 5.2.2 +Release: 1%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT URL: http://rubyonrails.org @@ -13,13 +13,9 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem # Rails rpms, you may check it out like so # git clone http://github.com/rails/rails.git # cd rails/activesupport/ -# git checkout v5.2.1 && tar czvf activesupport-5.2.1-tests.tgz test/ +# git checkout v5.2.2 && tar czvf activesupport-5.2.2-tests.tgz test/ Source1: %{gem_name}-%{version}-tests.tgz -# Update I18n fallbacks configuration to be compatible with i18n 1.1.0. -# https://github.com/rails/rails/pull/33574 -Patch0: rubygem-activesupport-5.2.1-update-I18n-fallbacks-configuration.patch - # ruby package has just soft dependency on rubygem({bigdecimal,json}), while # ActiveSupport always requires them. Requires: rubygem(bigdecimal) @@ -60,8 +56,6 @@ Documentation for %{name}. %prep %setup -q -n %{gem_name}-%{version} -%patch0 -p2 - %build gem build ../%{gem_name}-%{version}.gemspec @@ -109,6 +103,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Wed Dec 05 2018 Pavel Valena - 1:5.2.2-1 +- Update to Active Support 5.2.2. + * Wed Nov 14 2018 Vít Ondruch - 1:5.2.1-2 - Update I18n fallbacks configuration to be compatible with i18n 1.1.0. diff --git a/sources b/sources index 84f6e27..c6aec61 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (activesupport-5.2.1.gem) = 5b5b23d671344bb1b3f3901fbd60740c073c70dc94f5c0b9ddc4bb4b8970ddafd668aed40c105fa48dc69be09c203394f83dd87240ce7d8fce988c0f3c72f66e -SHA512 (activesupport-5.2.1-tests.tgz) = a0b8174509992a45cddf05544b1f4dc700524cc82954a69ae995f1d5458b28d7c21a55fdf08aff682d34b4878f134972e87920be1b51315339547e9720e436e3 +SHA512 (activesupport-5.2.2.gem) = b768c735af6f944300d7a2197b48ad99a324acb990413c1feb67578f9a18a106b2ae6800d19defa51be52d95c52fb4bdd11d65d7f81a29267d803a01980a25ec +SHA512 (activesupport-5.2.2-tests.tgz) = e454b2d6ad48e61ce60e5153448e9a56773ff84eb5923bc63a290968a92895228a4c0b2d60163d2159c921e3c19e72b794036a24bf72e6fe488dfc217c2fcd10 From 45087aac99eb1f5ef07637c58d60542b968fbd2c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 2 Feb 2019 11:46:39 +0000 Subject: [PATCH 15/78] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-activesupport.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 0d83dfc..4e35761 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -3,7 +3,7 @@ Name: rubygem-%{gem_name} Epoch: 1 Version: 5.2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT URL: http://rubyonrails.org @@ -103,6 +103,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Sat Feb 02 2019 Fedora Release Engineering - 1:5.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Wed Dec 05 2018 Pavel Valena - 1:5.2.2-1 - Update to Active Support 5.2.2. From fac58cc49025922ca7e394c6e4da2510ec9221cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 5 Feb 2019 10:04:24 +0100 Subject: [PATCH 16/78] Fix Range and BigDecimal compatibility with Ruby 2.6. --- ...y-2.6-BigDecimal-compatibility-issue.patch | 28 ++++ ...t-6.0.0.beta1-Ruby-2.6-Range-support.patch | 136 ++++++++++++++++++ rubygem-activesupport.spec | 18 ++- 3 files changed, 181 insertions(+), 1 deletion(-) create mode 100644 rubygem-activesupport-6.0.0.beta1-Fix-Ruby-2.6-BigDecimal-compatibility-issue.patch create mode 100644 rubygem-activesupport-6.0.0.beta1-Ruby-2.6-Range-support.patch diff --git a/rubygem-activesupport-6.0.0.beta1-Fix-Ruby-2.6-BigDecimal-compatibility-issue.patch b/rubygem-activesupport-6.0.0.beta1-Fix-Ruby-2.6-BigDecimal-compatibility-issue.patch new file mode 100644 index 0000000..4217de8 --- /dev/null +++ b/rubygem-activesupport-6.0.0.beta1-Fix-Ruby-2.6-BigDecimal-compatibility-issue.patch @@ -0,0 +1,28 @@ +From ab631b363e0bb4870fe535f3ef0d1751bfd14ae1 Mon Sep 17 00:00:00 2001 +From: utilum +Date: Tue, 4 Dec 2018 13:46:00 +0100 +Subject: [PATCH] Another Ruby 2.6 BigDecimal compatibility issue + +This patch modifies XmlMini::Parsing["decimal"] to handle a string that +contains an invalid number. Since [ruby/ruby@a0e438c#diff-6b866d482baf2bdfd8433893fb1f6d36R144](https://github.com/ruby/ruby/commit/a0e438cd3c28d2eaf4efa18243d5b6edafa14d88#diff-6b866d482baf2bdfd8433893fb1f6d36R144) this case raises an `ArgumentError`. `String.to_f` returns 0.0 if there is not a valid number at the start of the argument, so current behavior is conserved. + +See https://travis-ci.org/rails/rails/jobs/463180341#L6264 + +Related: #34600, #34601 +--- + activesupport/lib/active_support/xml_mini.rb | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/activesupport/lib/active_support/xml_mini.rb b/activesupport/lib/active_support/xml_mini.rb +index e42eee07a3ce..be298bf0a1ec 100644 +--- a/activesupport/lib/active_support/xml_mini.rb ++++ b/activesupport/lib/active_support/xml_mini.rb +@@ -71,7 +71,7 @@ def content_type + begin + BigDecimal(number) + rescue ArgumentError +- BigDecimal("0") ++ BigDecimal(number.to_f.to_s) + end + else + BigDecimal(number) diff --git a/rubygem-activesupport-6.0.0.beta1-Ruby-2.6-Range-support.patch b/rubygem-activesupport-6.0.0.beta1-Ruby-2.6-Range-support.patch new file mode 100644 index 0000000..2f022a6 --- /dev/null +++ b/rubygem-activesupport-6.0.0.beta1-Ruby-2.6-Range-support.patch @@ -0,0 +1,136 @@ +From 0fcb921a65e615c301450d7820b03473acd53898 Mon Sep 17 00:00:00 2001 +From: utilum +Date: Sun, 20 May 2018 21:22:03 +0200 +Subject: [PATCH] Allow Range#=== and Range#cover? on Range + +ruby/ruby@989e07c features switching `Range#===` to use internal `r_cover_p` +instead of rubyland `include?`. This breaks expected behavior of +`ActiveSupport::CoreExt::Range` documented since at least 8b67a02. + +This patch adds overrides on `Range#cover?` and `Range#===` and places all +three in a single module, `CompareWithRange`. + +*Requiring core_ext/range/include_range now causes a deprecation warnning* +--- + .../lib/active_support/core_ext/range.rb | 2 +- + .../core_ext/range/compare_range.rb | 61 +++++++++++++++++++ + .../core_ext/range/include_range.rb | 28 ++------- + 3 files changed, 68 insertions(+), 23 deletions(-) + create mode 100644 activesupport/lib/active_support/core_ext/range/compare_range.rb + +diff --git a/activesupport/lib/active_support/core_ext/range.rb b/activesupport/lib/active_support/core_ext/range.rb +index 4074e91d17d7..78814fd18961 100644 +--- a/activesupport/lib/active_support/core_ext/range.rb ++++ b/activesupport/lib/active_support/core_ext/range.rb +@@ -1,7 +1,7 @@ + # frozen_string_literal: true + + require "active_support/core_ext/range/conversions" +-require "active_support/core_ext/range/include_range" ++require "active_support/core_ext/range/compare_range" + require "active_support/core_ext/range/include_time_with_zone" + require "active_support/core_ext/range/overlaps" + require "active_support/core_ext/range/each" +diff --git a/activesupport/lib/active_support/core_ext/range/compare_range.rb b/activesupport/lib/active_support/core_ext/range/compare_range.rb +new file mode 100644 +index 000000000000..704041f6de88 +--- /dev/null ++++ b/activesupport/lib/active_support/core_ext/range/compare_range.rb +@@ -0,0 +1,61 @@ ++# frozen_string_literal: true ++ ++module ActiveSupport ++ module CompareWithRange #:nodoc: ++ # Extends the default Range#=== to support range comparisons. ++ # (1..5) === (1..5) # => true ++ # (1..5) === (2..3) # => true ++ # (1..5) === (2..6) # => false ++ # ++ # The native Range#=== behavior is untouched. ++ # ('a'..'f') === ('c') # => true ++ # (5..9) === (11) # => false ++ def ===(value) ++ if value.is_a?(::Range) ++ # 1...10 includes 1..9 but it does not include 1..10. ++ operator = exclude_end? && !value.exclude_end? ? :< : :<= ++ super(value.first) && value.last.send(operator, last) ++ else ++ super ++ end ++ end ++ ++ # Extends the default Range#include? to support range comparisons. ++ # (1..5).include?(1..5) # => true ++ # (1..5).include?(2..3) # => true ++ # (1..5).include?(2..6) # => false ++ # ++ # The native Range#include? behavior is untouched. ++ # ('a'..'f').include?('c') # => true ++ # (5..9).include?(11) # => false ++ def include?(value) ++ if value.is_a?(::Range) ++ # 1...10 includes 1..9 but it does not include 1..10. ++ operator = exclude_end? && !value.exclude_end? ? :< : :<= ++ super(value.first) && value.last.send(operator, last) ++ else ++ super ++ end ++ end ++ ++ # Extends the default Range#cover? to support range comparisons. ++ # (1..5).cover?(1..5) # => true ++ # (1..5).cover?(2..3) # => true ++ # (1..5).cover?(2..6) # => false ++ # ++ # The native Range#cover? behavior is untouched. ++ # ('a'..'f').cover?('c') # => true ++ # (5..9).cover?(11) # => false ++ def cover?(value) ++ if value.is_a?(::Range) ++ # 1...10 covers 1..9 but it does not cover 1..10. ++ operator = exclude_end? && !value.exclude_end? ? :< : :<= ++ super(value.first) && value.last.send(operator, last) ++ else ++ super ++ end ++ end ++ end ++end ++ ++Range.prepend(ActiveSupport::CompareWithRange) +diff --git a/activesupport/lib/active_support/core_ext/range/include_range.rb b/activesupport/lib/active_support/core_ext/range/include_range.rb +index 7ba1011921ba..2da2c587a31f 100644 +--- a/activesupport/lib/active_support/core_ext/range/include_range.rb ++++ b/activesupport/lib/active_support/core_ext/range/include_range.rb +@@ -1,25 +1,9 @@ + # frozen_string_literal: true + +-module ActiveSupport +- module IncludeWithRange #:nodoc: +- # Extends the default Range#include? to support range comparisons. +- # (1..5).include?(1..5) # => true +- # (1..5).include?(2..3) # => true +- # (1..5).include?(2..6) # => false +- # +- # The native Range#include? behavior is untouched. +- # ('a'..'f').include?('c') # => true +- # (5..9).include?(11) # => false +- def include?(value) +- if value.is_a?(::Range) +- # 1...10 includes 1..9 but it does not include 1..10. +- operator = exclude_end? && !value.exclude_end? ? :< : :<= +- super(value.first) && value.last.send(operator, last) +- else +- super +- end +- end +- end +-end ++require "active_support/deprecation" + +-Range.prepend(ActiveSupport::IncludeWithRange) ++ActiveSupport::Deprecation.warn "You have required `active_support/core_ext/range/include_range`. " \ ++"This file will be removed in Rails 6.1. You should require `active_support/core_ext/range/compare_range` " \ ++ "instead." ++ ++require "active_support/core_ext/range/compare_range" diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 4e35761..fb42947 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -3,7 +3,7 @@ Name: rubygem-%{gem_name} Epoch: 1 Version: 5.2.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT URL: http://rubyonrails.org @@ -16,6 +16,14 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem # git checkout v5.2.2 && tar czvf activesupport-5.2.2-tests.tgz test/ Source1: %{gem_name}-%{version}-tests.tgz +# Fix Range compatibility with Ruby 2.6. +# https://github.com/rails/rails/pull/32938/commits/0fcb921a65e615c301450d7820b03473acd53898 +Patch0: rubygem-activesupport-6.0.0.beta1-Ruby-2.6-Range-support.patch + +# Fix BigDecimal Ruby 2.6 compatibility. +# https://github.com/rails/rails/pull/34612 +Patch1: rubygem-activesupport-6.0.0.beta1-Fix-Ruby-2.6-BigDecimal-compatibility-issue.patch + # ruby package has just soft dependency on rubygem({bigdecimal,json}), while # ActiveSupport always requires them. Requires: rubygem(bigdecimal) @@ -56,6 +64,11 @@ Documentation for %{name}. %prep %setup -q -n %{gem_name}-%{version} +%patch0 -p2 +%gemspec_add_file 'lib/active_support/core_ext/range/compare_range.rb' + +%patch1 -p2 + %build gem build ../%{gem_name}-%{version}.gemspec @@ -103,6 +116,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Mon Feb 04 2019 Vít Ondruch - 1:5.2.2-3 +- Fix Range and BigDecimal compatibility with Ruby 2.6. + * Sat Feb 02 2019 Fedora Release Engineering - 1:5.2.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From b67ee55a01c21ef308d358f4f8cf57a8e66e0630 Mon Sep 17 00:00:00 2001 From: Pavel Valena Date: Mon, 18 Mar 2019 19:42:29 +0100 Subject: [PATCH 17/78] Update to Active Support 5.2.2.1. --- rubygem-activesupport.spec | 9 ++++++--- sources | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index fb42947..9db9da3 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -2,8 +2,8 @@ Name: rubygem-%{gem_name} Epoch: 1 -Version: 5.2.2 -Release: 3%{?dist} +Version: 5.2.2.1 +Release: 1%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT URL: http://rubyonrails.org @@ -13,7 +13,7 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem # Rails rpms, you may check it out like so # git clone http://github.com/rails/rails.git # cd rails/activesupport/ -# git checkout v5.2.2 && tar czvf activesupport-5.2.2-tests.tgz test/ +# git checkout v5.2.2.1 && tar czvf activesupport-5.2.2.1-tests.tgz test/ Source1: %{gem_name}-%{version}-tests.tgz # Fix Range compatibility with Ruby 2.6. @@ -116,6 +116,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Thu Mar 14 2019 Pavel Valena - 1:5.2.2.1-1 +- Update to Active Support 5.2.2.1. + * Mon Feb 04 2019 Vít Ondruch - 1:5.2.2-3 - Fix Range and BigDecimal compatibility with Ruby 2.6. diff --git a/sources b/sources index c6aec61..e34db1c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (activesupport-5.2.2.gem) = b768c735af6f944300d7a2197b48ad99a324acb990413c1feb67578f9a18a106b2ae6800d19defa51be52d95c52fb4bdd11d65d7f81a29267d803a01980a25ec -SHA512 (activesupport-5.2.2-tests.tgz) = e454b2d6ad48e61ce60e5153448e9a56773ff84eb5923bc63a290968a92895228a4c0b2d60163d2159c921e3c19e72b794036a24bf72e6fe488dfc217c2fcd10 +SHA512 (activesupport-5.2.2.1.gem) = 083f5d4c4afae72d148d66aef7edf1348f5083b8c80c896879f9b570aa9d1220203e2720fdebc7b383eaefe4cfac6c25a2e3ae6cbbf86a11b2eeaa1a035bb8b2 +SHA512 (activesupport-5.2.2.1-tests.tgz) = 20b24f5194e7e7f8f8eb8ef2a030b544f710f314cbddc9004561446fcc9737e0fa5eced91db419a260bc54ea041e4c482c771dd8882ad10f2713409d15932ab7 From d491016c904ed9c900d2b16a02d3ef0c006d4c49 Mon Sep 17 00:00:00 2001 From: Pavel Valena Date: Thu, 28 Mar 2019 15:25:36 +0100 Subject: [PATCH 18/78] Update to Active Support 5.2.3. --- ...y-2.6-BigDecimal-compatibility-issue.patch | 28 ------------------- rubygem-activesupport.spec | 20 ++++--------- sources | 4 +-- 3 files changed, 7 insertions(+), 45 deletions(-) delete mode 100644 rubygem-activesupport-6.0.0.beta1-Fix-Ruby-2.6-BigDecimal-compatibility-issue.patch diff --git a/rubygem-activesupport-6.0.0.beta1-Fix-Ruby-2.6-BigDecimal-compatibility-issue.patch b/rubygem-activesupport-6.0.0.beta1-Fix-Ruby-2.6-BigDecimal-compatibility-issue.patch deleted file mode 100644 index 4217de8..0000000 --- a/rubygem-activesupport-6.0.0.beta1-Fix-Ruby-2.6-BigDecimal-compatibility-issue.patch +++ /dev/null @@ -1,28 +0,0 @@ -From ab631b363e0bb4870fe535f3ef0d1751bfd14ae1 Mon Sep 17 00:00:00 2001 -From: utilum -Date: Tue, 4 Dec 2018 13:46:00 +0100 -Subject: [PATCH] Another Ruby 2.6 BigDecimal compatibility issue - -This patch modifies XmlMini::Parsing["decimal"] to handle a string that -contains an invalid number. Since [ruby/ruby@a0e438c#diff-6b866d482baf2bdfd8433893fb1f6d36R144](https://github.com/ruby/ruby/commit/a0e438cd3c28d2eaf4efa18243d5b6edafa14d88#diff-6b866d482baf2bdfd8433893fb1f6d36R144) this case raises an `ArgumentError`. `String.to_f` returns 0.0 if there is not a valid number at the start of the argument, so current behavior is conserved. - -See https://travis-ci.org/rails/rails/jobs/463180341#L6264 - -Related: #34600, #34601 ---- - activesupport/lib/active_support/xml_mini.rb | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/activesupport/lib/active_support/xml_mini.rb b/activesupport/lib/active_support/xml_mini.rb -index e42eee07a3ce..be298bf0a1ec 100644 ---- a/activesupport/lib/active_support/xml_mini.rb -+++ b/activesupport/lib/active_support/xml_mini.rb -@@ -71,7 +71,7 @@ def content_type - begin - BigDecimal(number) - rescue ArgumentError -- BigDecimal("0") -+ BigDecimal(number.to_f.to_s) - end - else - BigDecimal(number) diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 9db9da3..3425068 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -2,7 +2,7 @@ Name: rubygem-%{gem_name} Epoch: 1 -Version: 5.2.2.1 +Version: 5.2.3 Release: 1%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT @@ -13,17 +13,9 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem # Rails rpms, you may check it out like so # git clone http://github.com/rails/rails.git # cd rails/activesupport/ -# git checkout v5.2.2.1 && tar czvf activesupport-5.2.2.1-tests.tgz test/ +# git checkout v5.2.3 && tar czvf activesupport-5.2.3-tests.tgz test/ Source1: %{gem_name}-%{version}-tests.tgz -# Fix Range compatibility with Ruby 2.6. -# https://github.com/rails/rails/pull/32938/commits/0fcb921a65e615c301450d7820b03473acd53898 -Patch0: rubygem-activesupport-6.0.0.beta1-Ruby-2.6-Range-support.patch - -# Fix BigDecimal Ruby 2.6 compatibility. -# https://github.com/rails/rails/pull/34612 -Patch1: rubygem-activesupport-6.0.0.beta1-Fix-Ruby-2.6-BigDecimal-compatibility-issue.patch - # ruby package has just soft dependency on rubygem({bigdecimal,json}), while # ActiveSupport always requires them. Requires: rubygem(bigdecimal) @@ -64,11 +56,6 @@ Documentation for %{name}. %prep %setup -q -n %{gem_name}-%{version} -%patch0 -p2 -%gemspec_add_file 'lib/active_support/core_ext/range/compare_range.rb' - -%patch1 -p2 - %build gem build ../%{gem_name}-%{version}.gemspec @@ -116,6 +103,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Thu Mar 28 2019 Pavel Valena - 1:5.2.3-1 +- Update to Active Support 5.2.3. + * Thu Mar 14 2019 Pavel Valena - 1:5.2.2.1-1 - Update to Active Support 5.2.2.1. diff --git a/sources b/sources index e34db1c..b04824f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (activesupport-5.2.2.1.gem) = 083f5d4c4afae72d148d66aef7edf1348f5083b8c80c896879f9b570aa9d1220203e2720fdebc7b383eaefe4cfac6c25a2e3ae6cbbf86a11b2eeaa1a035bb8b2 -SHA512 (activesupport-5.2.2.1-tests.tgz) = 20b24f5194e7e7f8f8eb8ef2a030b544f710f314cbddc9004561446fcc9737e0fa5eced91db419a260bc54ea041e4c482c771dd8882ad10f2713409d15932ab7 +SHA512 (activesupport-5.2.3.gem) = 8e0ab698f1b850c380ffc464fd48c942f4a46b9ca66055166949fa069740a4ff50f320d87f1040064a896c5ba1b8c00f0730592efec90d92a20c500d66b99589 +SHA512 (activesupport-5.2.3-tests.tgz) = 853650145304f21d37172097d8fa31866a33d754a61bcc4bebcb51e4ad4cda58d6757d2526ff073118cf3cd56494b93857050a9e2f1ea08ea0e361b7fec32be7 From c98ff8451bb727a71585b0b5bd75276ce0e1120d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 18:57:41 +0000 Subject: [PATCH 19/78] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-activesupport.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 3425068..430a92f 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -3,7 +3,7 @@ Name: rubygem-%{gem_name} Epoch: 1 Version: 5.2.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT URL: http://rubyonrails.org @@ -103,6 +103,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 1:5.2.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Mar 28 2019 Pavel Valena - 1:5.2.3-1 - Update to Active Support 5.2.3. From 0414b5cc506c2cffeb469475f23f8c70707829a1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 18:05:12 +0000 Subject: [PATCH 20/78] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-activesupport.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 430a92f..60d9866 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -3,7 +3,7 @@ Name: rubygem-%{gem_name} Epoch: 1 Version: 5.2.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT URL: http://rubyonrails.org @@ -103,6 +103,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 1:5.2.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Jul 26 2019 Fedora Release Engineering - 1:5.2.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 12604aa399ede486b72288734fbd072a97e17def Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Thu, 16 Apr 2020 14:14:09 +0200 Subject: [PATCH 21/78] Ruby 2.7 and TZInfo 2.0 compatibility. Resolves: rhbz#1799093 Resolves: rhbz#1805531 --- ...terlockAwareMonitor-work-in-Ruby-2.7.patch | 54 ++++++++ ...-6.1.0-Update-to-TZInfo-v2.0.0-tests.patch | 24 ++++ ...upport-6.1.0-Update-to-TZInfo-v2.0.0.patch | 119 ++++++++++++++++++ rubygem-activesupport.spec | 35 +++++- 4 files changed, 229 insertions(+), 3 deletions(-) create mode 100644 rubygem-activesupport-6.1.0-Make-LoadInterlockAwareMonitor-work-in-Ruby-2.7.patch create mode 100644 rubygem-activesupport-6.1.0-Update-to-TZInfo-v2.0.0-tests.patch create mode 100644 rubygem-activesupport-6.1.0-Update-to-TZInfo-v2.0.0.patch diff --git a/rubygem-activesupport-6.1.0-Make-LoadInterlockAwareMonitor-work-in-Ruby-2.7.patch b/rubygem-activesupport-6.1.0-Make-LoadInterlockAwareMonitor-work-in-Ruby-2.7.patch new file mode 100644 index 0000000..216921a --- /dev/null +++ b/rubygem-activesupport-6.1.0-Make-LoadInterlockAwareMonitor-work-in-Ruby-2.7.patch @@ -0,0 +1,54 @@ +From 4f4f8a705a8e713bceee8cacca52e9bce22e28dc Mon Sep 17 00:00:00 2001 +From: "yuuji.yaginuma" +Date: Wed, 18 Dec 2019 19:00:29 +0900 +Subject: [PATCH] Make `LoadInterlockAwareMonitor` work in Ruby 2.7 + +Currently `LoadInterlockAwareMonitorTest` does not pass with Ruby 2.7 [1]. +This is due to the refactoring of the `monitor` done in Ruby 2.7 [2]. + +With this refactoring, the behavior of the method has changed from the +expected behavior in `LoadInterlockAwareMonitor`. + +This patch also overwrites `synchronize` so that +`LoadInterlockAwareMonitor` works as expected. + +[1]: https://buildkite.com/rails/rails/builds/65877#eec47af5-7595-47cb-97c0-30c589716176/996-2743 +[2]: https://bugs.ruby-lang.org/issues/16255 +--- + .../load_interlock_aware_monitor.rb | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +diff --git a/activesupport/lib/active_support/concurrency/load_interlock_aware_monitor.rb b/activesupport/lib/active_support/concurrency/load_interlock_aware_monitor.rb +index a8455c00483f..480c34c64017 100644 +--- a/activesupport/lib/active_support/concurrency/load_interlock_aware_monitor.rb ++++ b/activesupport/lib/active_support/concurrency/load_interlock_aware_monitor.rb +@@ -7,11 +7,29 @@ module Concurrency + # A monitor that will permit dependency loading while blocked waiting for + # the lock. + class LoadInterlockAwareMonitor < Monitor ++ EXCEPTION_NEVER = { Exception => :never }.freeze ++ EXCEPTION_IMMEDIATE = { Exception => :immediate }.freeze ++ private_constant :EXCEPTION_NEVER, :EXCEPTION_IMMEDIATE ++ + # Enters an exclusive section, but allows dependency loading while blocked + def mon_enter + mon_try_enter || + ActiveSupport::Dependencies.interlock.permit_concurrent_loads { super } + end ++ ++ def synchronize ++ Thread.handle_interrupt(EXCEPTION_NEVER) do ++ mon_enter ++ ++ begin ++ Thread.handle_interrupt(EXCEPTION_IMMEDIATE) do ++ yield ++ end ++ ensure ++ mon_exit ++ end ++ end ++ end + end + end + end diff --git a/rubygem-activesupport-6.1.0-Update-to-TZInfo-v2.0.0-tests.patch b/rubygem-activesupport-6.1.0-Update-to-TZInfo-v2.0.0-tests.patch new file mode 100644 index 0000000..3b107a8 --- /dev/null +++ b/rubygem-activesupport-6.1.0-Update-to-TZInfo-v2.0.0-tests.patch @@ -0,0 +1,24 @@ +From e9425abe33924623b1dce62bd817eace757c2b4e Mon Sep 17 00:00:00 2001 +From: Phil Ross +Date: Fri, 29 Dec 2017 12:47:10 +0000 +Subject: [PATCH] Update to TZInfo v2.0.0 + +Co-authored-by: Jared Beck +Co-authored-by: Jonathan Hefner +--- + time_zone_test.rb | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/activesupport/test/time_zone_test.rb b/activesupport/test/time_zone_test.rb +index 4b5f3dceee6f..646b9e1d3199 100644 +--- a/activesupport/test/time_zone_test.rb ++++ b/activesupport/test/time_zone_test.rb +@@ -22,7 +29,7 @@ def test_local_to_utc + + def test_period_for_local + zone = ActiveSupport::TimeZone["Eastern Time (US & Canada)"] +- assert_instance_of TZInfo::TimezonePeriod, zone.period_for_local(Time.utc(2000)) ++ assert_kind_of TZInfo::TimezonePeriod, zone.period_for_local(Time.utc(2000)) + end + + ActiveSupport::TimeZone::MAPPING.each_key do |name| diff --git a/rubygem-activesupport-6.1.0-Update-to-TZInfo-v2.0.0.patch b/rubygem-activesupport-6.1.0-Update-to-TZInfo-v2.0.0.patch new file mode 100644 index 0000000..b4f09ec --- /dev/null +++ b/rubygem-activesupport-6.1.0-Update-to-TZInfo-v2.0.0.patch @@ -0,0 +1,119 @@ +From e9425abe33924623b1dce62bd817eace757c2b4e Mon Sep 17 00:00:00 2001 +From: Phil Ross +Date: Fri, 29 Dec 2017 12:47:10 +0000 +Subject: [PATCH] Update to TZInfo v2.0.0 + +Co-authored-by: Jared Beck +Co-authored-by: Jonathan Hefner +--- + time_with_zone.rb | 20 +++++++++++++++----- + values/time_zone.rb | 14 ++++++-------- + 2 files changed, 21 insertions(+), 13 deletions(-) + +diff --git a/activesupport/lib/active_support/time_with_zone.rb b/activesupport/lib/active_support/time_with_zone.rb +index 3be5f6f7b595..9a4c33ab0f19 100644 +--- a/activesupport/lib/active_support/time_with_zone.rb ++++ b/activesupport/lib/active_support/time_with_zone.rb +@@ -57,12 +57,12 @@ def initialize(utc_time, time_zone, local_time = nil, period = nil) + + # Returns a Time instance that represents the time in +time_zone+. + def time +- @time ||= period.to_local(@utc) ++ @time ||= incorporate_utc_offset(@utc, utc_offset) + end + + # Returns a Time instance of the simultaneous time in the UTC timezone. + def utc +- @utc ||= period.to_utc(@time) ++ @utc ||= incorporate_utc_offset(@time, -utc_offset) + end + alias_method :comparable_time, :utc + alias_method :getgm, :utc +@@ -104,13 +104,13 @@ def dst? + # Time.zone = 'Eastern Time (US & Canada)' # => 'Eastern Time (US & Canada)' + # Time.zone.now.utc? # => false + def utc? +- period.offset.abbreviation == :UTC || period.offset.abbreviation == :UCT ++ zone == "UTC" || zone == "UCT" + end + alias_method :gmt?, :utc? + + # Returns the offset from current time to UTC time in seconds. + def utc_offset +- period.utc_total_offset ++ period.observed_utc_offset + end + alias_method :gmt_offset, :utc_offset + alias_method :gmtoff, :utc_offset +@@ -132,7 +132,7 @@ def formatted_offset(colon = true, alternate_utc_string = nil) + # Time.zone = 'Eastern Time (US & Canada)' # => "Eastern Time (US & Canada)" + # Time.zone.now.zone # => "EST" + def zone +- period.zone_identifier.to_s ++ period.abbreviation + end + + # Returns a string of the object's date, time, zone, and offset from UTC. +@@ -514,6 +514,16 @@ def method_missing(sym, *args, &block) + end + + private ++ SECONDS_PER_DAY = 86400 ++ ++ def incorporate_utc_offset(time, offset) ++ if time.kind_of?(Date) ++ time + Rational(offset, SECONDS_PER_DAY) ++ else ++ time + offset ++ end ++ end ++ + def get_period_and_ensure_valid_local_time(period) + # we don't want a Time.local instance enforcing its own DST rules as well, + # so transfer time values to a utc constructor if necessary +diff --git a/activesupport/lib/active_support/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb +index 90830b89bda3..2e5d9d3e9d4c 100644 +--- a/activesupport/lib/active_support/values/time_zone.rb ++++ b/activesupport/lib/active_support/values/time_zone.rb +@@ -203,7 +203,7 @@ def seconds_to_utc_offset(seconds, colon = true) + end + + def find_tzinfo(name) +- TZInfo::Timezone.new(MAPPING[name] || name) ++ TZInfo::Timezone.get(MAPPING[name] || name) + end + + alias_method :create, :new +@@ -273,7 +273,7 @@ def load_country_zones(code) + memo + end + else +- create(tz_id, nil, TZInfo::Timezone.new(tz_id)) ++ create(tz_id, nil, TZInfo::Timezone.get(tz_id)) + end + end.flatten(1).sort! + end +@@ -302,11 +302,7 @@ def initialize(name, utc_offset = nil, tzinfo = nil) + + # Returns the offset of this time zone from UTC in seconds. + def utc_offset +- if @utc_offset +- @utc_offset +- else +- tzinfo.current_period.utc_offset if tzinfo && tzinfo.current_period +- end ++ @utc_offset || tzinfo&.current_period&.base_utc_offset + end + + # Returns a formatted string of the offset from UTC, or an alternative +@@ -498,7 +494,9 @@ def yesterday + # represented by +self+. Returns a Time.utc() instance -- if you want an + # ActiveSupport::TimeWithZone instance, use Time#in_time_zone() instead. + def utc_to_local(time) +- tzinfo.utc_to_local(time) ++ tzinfo.utc_to_local(time).yield_self do |t| ++ Time.utc(t.year, t.month, t.day, t.hour, t.min, t.sec, t.sec_fraction) ++ end + end + + # Adjust the given time to the simultaneous time in UTC. Returns a diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 60d9866..83a2b5e 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -3,7 +3,7 @@ Name: rubygem-%{gem_name} Epoch: 1 Version: 5.2.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT URL: http://rubyonrails.org @@ -15,6 +15,14 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem # cd rails/activesupport/ # git checkout v5.2.3 && tar czvf activesupport-5.2.3-tests.tgz test/ Source1: %{gem_name}-%{version}-tests.tgz +# Make `LoadInterlockAwareMonitor` work in Ruby 2.7 +# https://github.com/rails/rails/pull/38069 +Patch0: rubygem-activesupport-6.1.0-Make-LoadInterlockAwareMonitor-work-in-Ruby-2.7.patch +# Fix TZInfo 2.0 compatibility. +# https://github.com/rails/rails/pull/34799 +# https://github.com/rails/rails/pull/38081 +Patch1: rubygem-activesupport-6.1.0-Update-to-TZInfo-v2.0.0.patch +Patch2: rubygem-activesupport-6.1.0-Update-to-TZInfo-v2.0.0-tests.patch # ruby package has just soft dependency on rubygem({bigdecimal,json}), while # ActiveSupport always requires them. @@ -54,7 +62,17 @@ BuildArch: noarch Documentation for %{name}. %prep -%setup -q -n %{gem_name}-%{version} +%setup -q -n %{gem_name}-%{version} -b 1 + +%patch0 -p2 +%patch1 -p2 + +pushd %{_builddir} +%patch2 -p2 +popd + +%gemspec_remove_dep -g tzinfo "~> 1.1" +%gemspec_add_dep -g tzinfo [">= 1.1", "< 3"] %build gem build ../%{gem_name}-%{version}.gemspec @@ -69,7 +87,7 @@ cp -a .%{gem_dir}/* \ %check pushd .%{gem_instdir} # Move the tests into place -tar xzvf %{SOURCE1} +cp -a %{_builddir}/test test # These tests are really unstable, but they seems to be passing upstream :/ for f in \ @@ -83,6 +101,11 @@ done # https://github.com/rails/rails/issues/25682 sed -i '/def test_iso8601_output_and_reparsing$/,/^ end$/ s/^/#/' test/core_ext/duration_test.rb +# Workaround TransformValuesTest#test_default_procs_do_not_persist_*_mapping +# test failures due to bug in Ruby 2.7.{0,1}. +# https://bugs.ruby-lang.org/issues/16498 +sed -i '/assert_nil mapped\[:b\]/ s/^/#/' test/core_ext/hash/transform_values_test.rb + memcached & mPID=$! sleep 1 @@ -103,6 +126,12 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Thu Apr 16 2020 Vít Ondruch - 1:5.2.3-4 +- Ruby 2.7 compatibility. + Resolves: rhbz#1799093 +- TZInfo 2.0 compatibility. + Resolves: rhbz#1805531 + * Thu Jan 30 2020 Fedora Release Engineering - 1:5.2.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 48e67d90ec24415498128eeab7f007c408f669e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Fri, 17 Apr 2020 11:59:43 +0200 Subject: [PATCH 22/78] Remove unused patch. --- ...t-6.0.0.beta1-Ruby-2.6-Range-support.patch | 136 ------------------ 1 file changed, 136 deletions(-) delete mode 100644 rubygem-activesupport-6.0.0.beta1-Ruby-2.6-Range-support.patch diff --git a/rubygem-activesupport-6.0.0.beta1-Ruby-2.6-Range-support.patch b/rubygem-activesupport-6.0.0.beta1-Ruby-2.6-Range-support.patch deleted file mode 100644 index 2f022a6..0000000 --- a/rubygem-activesupport-6.0.0.beta1-Ruby-2.6-Range-support.patch +++ /dev/null @@ -1,136 +0,0 @@ -From 0fcb921a65e615c301450d7820b03473acd53898 Mon Sep 17 00:00:00 2001 -From: utilum -Date: Sun, 20 May 2018 21:22:03 +0200 -Subject: [PATCH] Allow Range#=== and Range#cover? on Range - -ruby/ruby@989e07c features switching `Range#===` to use internal `r_cover_p` -instead of rubyland `include?`. This breaks expected behavior of -`ActiveSupport::CoreExt::Range` documented since at least 8b67a02. - -This patch adds overrides on `Range#cover?` and `Range#===` and places all -three in a single module, `CompareWithRange`. - -*Requiring core_ext/range/include_range now causes a deprecation warnning* ---- - .../lib/active_support/core_ext/range.rb | 2 +- - .../core_ext/range/compare_range.rb | 61 +++++++++++++++++++ - .../core_ext/range/include_range.rb | 28 ++------- - 3 files changed, 68 insertions(+), 23 deletions(-) - create mode 100644 activesupport/lib/active_support/core_ext/range/compare_range.rb - -diff --git a/activesupport/lib/active_support/core_ext/range.rb b/activesupport/lib/active_support/core_ext/range.rb -index 4074e91d17d7..78814fd18961 100644 ---- a/activesupport/lib/active_support/core_ext/range.rb -+++ b/activesupport/lib/active_support/core_ext/range.rb -@@ -1,7 +1,7 @@ - # frozen_string_literal: true - - require "active_support/core_ext/range/conversions" --require "active_support/core_ext/range/include_range" -+require "active_support/core_ext/range/compare_range" - require "active_support/core_ext/range/include_time_with_zone" - require "active_support/core_ext/range/overlaps" - require "active_support/core_ext/range/each" -diff --git a/activesupport/lib/active_support/core_ext/range/compare_range.rb b/activesupport/lib/active_support/core_ext/range/compare_range.rb -new file mode 100644 -index 000000000000..704041f6de88 ---- /dev/null -+++ b/activesupport/lib/active_support/core_ext/range/compare_range.rb -@@ -0,0 +1,61 @@ -+# frozen_string_literal: true -+ -+module ActiveSupport -+ module CompareWithRange #:nodoc: -+ # Extends the default Range#=== to support range comparisons. -+ # (1..5) === (1..5) # => true -+ # (1..5) === (2..3) # => true -+ # (1..5) === (2..6) # => false -+ # -+ # The native Range#=== behavior is untouched. -+ # ('a'..'f') === ('c') # => true -+ # (5..9) === (11) # => false -+ def ===(value) -+ if value.is_a?(::Range) -+ # 1...10 includes 1..9 but it does not include 1..10. -+ operator = exclude_end? && !value.exclude_end? ? :< : :<= -+ super(value.first) && value.last.send(operator, last) -+ else -+ super -+ end -+ end -+ -+ # Extends the default Range#include? to support range comparisons. -+ # (1..5).include?(1..5) # => true -+ # (1..5).include?(2..3) # => true -+ # (1..5).include?(2..6) # => false -+ # -+ # The native Range#include? behavior is untouched. -+ # ('a'..'f').include?('c') # => true -+ # (5..9).include?(11) # => false -+ def include?(value) -+ if value.is_a?(::Range) -+ # 1...10 includes 1..9 but it does not include 1..10. -+ operator = exclude_end? && !value.exclude_end? ? :< : :<= -+ super(value.first) && value.last.send(operator, last) -+ else -+ super -+ end -+ end -+ -+ # Extends the default Range#cover? to support range comparisons. -+ # (1..5).cover?(1..5) # => true -+ # (1..5).cover?(2..3) # => true -+ # (1..5).cover?(2..6) # => false -+ # -+ # The native Range#cover? behavior is untouched. -+ # ('a'..'f').cover?('c') # => true -+ # (5..9).cover?(11) # => false -+ def cover?(value) -+ if value.is_a?(::Range) -+ # 1...10 covers 1..9 but it does not cover 1..10. -+ operator = exclude_end? && !value.exclude_end? ? :< : :<= -+ super(value.first) && value.last.send(operator, last) -+ else -+ super -+ end -+ end -+ end -+end -+ -+Range.prepend(ActiveSupport::CompareWithRange) -diff --git a/activesupport/lib/active_support/core_ext/range/include_range.rb b/activesupport/lib/active_support/core_ext/range/include_range.rb -index 7ba1011921ba..2da2c587a31f 100644 ---- a/activesupport/lib/active_support/core_ext/range/include_range.rb -+++ b/activesupport/lib/active_support/core_ext/range/include_range.rb -@@ -1,25 +1,9 @@ - # frozen_string_literal: true - --module ActiveSupport -- module IncludeWithRange #:nodoc: -- # Extends the default Range#include? to support range comparisons. -- # (1..5).include?(1..5) # => true -- # (1..5).include?(2..3) # => true -- # (1..5).include?(2..6) # => false -- # -- # The native Range#include? behavior is untouched. -- # ('a'..'f').include?('c') # => true -- # (5..9).include?(11) # => false -- def include?(value) -- if value.is_a?(::Range) -- # 1...10 includes 1..9 but it does not include 1..10. -- operator = exclude_end? && !value.exclude_end? ? :< : :<= -- super(value.first) && value.last.send(operator, last) -- else -- super -- end -- end -- end --end -+require "active_support/deprecation" - --Range.prepend(ActiveSupport::IncludeWithRange) -+ActiveSupport::Deprecation.warn "You have required `active_support/core_ext/range/include_range`. " \ -+"This file will be removed in Rails 6.1. You should require `active_support/core_ext/range/compare_range` " \ -+ "instead." -+ -+require "active_support/core_ext/range/compare_range" From 3144928494f5f558667866a66c71b4af98e4d40d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 06:06:00 +0000 Subject: [PATCH 23/78] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-activesupport.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 83a2b5e..4078e16 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -3,7 +3,7 @@ Name: rubygem-%{gem_name} Epoch: 1 Version: 5.2.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT URL: http://rubyonrails.org @@ -126,6 +126,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 1:5.2.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Thu Apr 16 2020 Vít Ondruch - 1:5.2.3-4 - Ruby 2.7 compatibility. Resolves: rhbz#1799093 From 60be59131a92aacaa6970391a425d2346154c0c7 Mon Sep 17 00:00:00 2001 From: Pavel Valena Date: Tue, 17 Sep 2019 18:04:21 +0200 Subject: [PATCH 24/78] Update to ActiveSupport 6.0.3.1 also enhance .spec file. Resolves: rhbz#1742797 --- .gitignore | 3 +- ...terlockAwareMonitor-work-in-Ruby-2.7.patch | 54 ------------------- ...upport-6.1.0-Update-to-TZInfo-v2.0.0.patch | 6 +-- rubygem-activesupport.spec | 39 ++++++++------ sources | 5 +- 5 files changed, 30 insertions(+), 77 deletions(-) delete mode 100644 rubygem-activesupport-6.1.0-Make-LoadInterlockAwareMonitor-work-in-Ruby-2.7.patch diff --git a/.gitignore b/.gitignore index 3355a7b..1e332be 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /activesupport-*.gem -/activesupport-*-tests.tgz +/activesupport-*-tests.txz +/rails-*-tools.txz diff --git a/rubygem-activesupport-6.1.0-Make-LoadInterlockAwareMonitor-work-in-Ruby-2.7.patch b/rubygem-activesupport-6.1.0-Make-LoadInterlockAwareMonitor-work-in-Ruby-2.7.patch deleted file mode 100644 index 216921a..0000000 --- a/rubygem-activesupport-6.1.0-Make-LoadInterlockAwareMonitor-work-in-Ruby-2.7.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 4f4f8a705a8e713bceee8cacca52e9bce22e28dc Mon Sep 17 00:00:00 2001 -From: "yuuji.yaginuma" -Date: Wed, 18 Dec 2019 19:00:29 +0900 -Subject: [PATCH] Make `LoadInterlockAwareMonitor` work in Ruby 2.7 - -Currently `LoadInterlockAwareMonitorTest` does not pass with Ruby 2.7 [1]. -This is due to the refactoring of the `monitor` done in Ruby 2.7 [2]. - -With this refactoring, the behavior of the method has changed from the -expected behavior in `LoadInterlockAwareMonitor`. - -This patch also overwrites `synchronize` so that -`LoadInterlockAwareMonitor` works as expected. - -[1]: https://buildkite.com/rails/rails/builds/65877#eec47af5-7595-47cb-97c0-30c589716176/996-2743 -[2]: https://bugs.ruby-lang.org/issues/16255 ---- - .../load_interlock_aware_monitor.rb | 18 ++++++++++++++++++ - 1 file changed, 18 insertions(+) - -diff --git a/activesupport/lib/active_support/concurrency/load_interlock_aware_monitor.rb b/activesupport/lib/active_support/concurrency/load_interlock_aware_monitor.rb -index a8455c00483f..480c34c64017 100644 ---- a/activesupport/lib/active_support/concurrency/load_interlock_aware_monitor.rb -+++ b/activesupport/lib/active_support/concurrency/load_interlock_aware_monitor.rb -@@ -7,11 +7,29 @@ module Concurrency - # A monitor that will permit dependency loading while blocked waiting for - # the lock. - class LoadInterlockAwareMonitor < Monitor -+ EXCEPTION_NEVER = { Exception => :never }.freeze -+ EXCEPTION_IMMEDIATE = { Exception => :immediate }.freeze -+ private_constant :EXCEPTION_NEVER, :EXCEPTION_IMMEDIATE -+ - # Enters an exclusive section, but allows dependency loading while blocked - def mon_enter - mon_try_enter || - ActiveSupport::Dependencies.interlock.permit_concurrent_loads { super } - end -+ -+ def synchronize -+ Thread.handle_interrupt(EXCEPTION_NEVER) do -+ mon_enter -+ -+ begin -+ Thread.handle_interrupt(EXCEPTION_IMMEDIATE) do -+ yield -+ end -+ ensure -+ mon_exit -+ end -+ end -+ end - end - end - end diff --git a/rubygem-activesupport-6.1.0-Update-to-TZInfo-v2.0.0.patch b/rubygem-activesupport-6.1.0-Update-to-TZInfo-v2.0.0.patch index b4f09ec..cc3f3f3 100644 --- a/rubygem-activesupport-6.1.0-Update-to-TZInfo-v2.0.0.patch +++ b/rubygem-activesupport-6.1.0-Update-to-TZInfo-v2.0.0.patch @@ -54,7 +54,7 @@ index 3be5f6f7b595..9a4c33ab0f19 100644 end # Returns a string of the object's date, time, zone, and offset from UTC. -@@ -514,6 +514,16 @@ def method_missing(sym, *args, &block) +@@ -524,6 +524,16 @@ def method_missing(sym, *args, &block) end private @@ -91,7 +91,7 @@ index 90830b89bda3..2e5d9d3e9d4c 100644 - create(tz_id, nil, TZInfo::Timezone.new(tz_id)) + create(tz_id, nil, TZInfo::Timezone.get(tz_id)) end - end.flatten(1).sort! + end.sort! end @@ -302,11 +302,7 @@ def initialize(name, utc_offset = nil, tzinfo = nil) @@ -106,7 +106,7 @@ index 90830b89bda3..2e5d9d3e9d4c 100644 end # Returns a formatted string of the offset from UTC, or an alternative -@@ -498,7 +494,9 @@ def yesterday +@@ -503,7 +499,9 @@ def yesterday # represented by +self+. Returns a Time.utc() instance -- if you want an # ActiveSupport::TimeWithZone instance, use Time#in_time_zone() instead. def utc_to_local(time) diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 4078e16..ca4a0d3 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -1,23 +1,25 @@ %global gem_name activesupport +#%%global prerelease .rc1 + Name: rubygem-%{gem_name} Epoch: 1 -Version: 5.2.3 -Release: 5%{?dist} +Version: 6.0.3.1 +Release: 1%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT URL: http://rubyonrails.org -Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem - -# The activesupport gem doesn't ship with the test suite like the other -# Rails rpms, you may check it out like so +Source0: https://rubygems.org/gems/%{gem_name}-%{version}%{?prerelease}.gem +# The activesupport gem doesn't ship with the test suite. +# You may check it out like so # git clone http://github.com/rails/rails.git -# cd rails/activesupport/ -# git checkout v5.2.3 && tar czvf activesupport-5.2.3-tests.tgz test/ -Source1: %{gem_name}-%{version}-tests.tgz -# Make `LoadInterlockAwareMonitor` work in Ruby 2.7 -# https://github.com/rails/rails/pull/38069 -Patch0: rubygem-activesupport-6.1.0-Make-LoadInterlockAwareMonitor-work-in-Ruby-2.7.patch +# cd rails/activesupport && git archive -v -o activesupport-6.0.3.1-tests.txz v6.0.3.1 test/ +Source1: %{gem_name}-%{version}%{?prerelease}-tests.txz +# The tools are needed for the test suite, are however unpackaged in gem file. +# You may get them like so +# git clone http://github.com/rails/rails.git --no-checkout +# cd rails && git archive -v -o rails-6.0.3.1-tools.txz v6.0.3.1 tools/ +Source2: rails-%{version}%{?prerelease}-tools.txz # Fix TZInfo 2.0 compatibility. # https://github.com/rails/rails/pull/34799 # https://github.com/rails/rails/pull/38081 @@ -62,9 +64,8 @@ BuildArch: noarch Documentation for %{name}. %prep -%setup -q -n %{gem_name}-%{version} -b 1 +%setup -q -n %{gem_name}-%{version}%{?prerelease} -b1 -b2 -%patch0 -p2 %patch1 -p2 pushd %{_builddir} @@ -75,8 +76,7 @@ popd %gemspec_add_dep -g tzinfo [">= 1.1", "< 3"] %build -gem build ../%{gem_name}-%{version}.gemspec - +gem build ../%{gem_name}-%{version}%{?prerelease}.gemspec %gem_install %install @@ -87,7 +87,8 @@ cp -a .%{gem_dir}/* \ %check pushd .%{gem_instdir} # Move the tests into place -cp -a %{_builddir}/test test +ln -s %{_builddir}/tools .. +mv %{_builddir}/test . # These tests are really unstable, but they seems to be passing upstream :/ for f in \ @@ -126,6 +127,10 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Mon Aug 03 07:01:37 GMT 2020 Pavel Valena - 6.0.3.1-1 +- Update to ActiveSupport 6.0.3.1. + Resolves: rhbz#1742797 + * Wed Jul 29 2020 Fedora Release Engineering - 1:5.2.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index b04824f..507e2cd 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ -SHA512 (activesupport-5.2.3.gem) = 8e0ab698f1b850c380ffc464fd48c942f4a46b9ca66055166949fa069740a4ff50f320d87f1040064a896c5ba1b8c00f0730592efec90d92a20c500d66b99589 -SHA512 (activesupport-5.2.3-tests.tgz) = 853650145304f21d37172097d8fa31866a33d754a61bcc4bebcb51e4ad4cda58d6757d2526ff073118cf3cd56494b93857050a9e2f1ea08ea0e361b7fec32be7 +SHA512 (activesupport-6.0.3.1.gem) = b4b80a2fd08f4dc62a22b8946a91e81116e07a275d2ab75cb7021aa8f3481816ce32b5a598eb532235fe2e686cb1a000fad1667ab4d9561cd01a7e682244f6f8 +SHA512 (activesupport-6.0.3.1-tests.txz) = 38e34723040d209fb11aaf6b7c01a4e6bafceb1c6a53417dffc2f154996ba66cf80775b2e6f040548920537f27057c19bd3f09493a4de0bf99eb70be4ce2b6a3 +SHA512 (rails-6.0.3.1-tools.txz) = e461674faf787a4f488e93b43747f829b9ea764167ac4782190ac469c4b0941e307e0a72b786a8392c00df1221d02622ffd4b29d7ea43e6c018daf463e092f6a From c7db655091bd7c2140fd0116c6d1f18bc84d547d Mon Sep 17 00:00:00 2001 From: Pavel Valena Date: Mon, 17 Aug 2020 06:41:19 +0200 Subject: [PATCH 25/78] Update to activesupport 6.0.3.2. Resolves: rhbz#1742797 --- rubygem-activesupport.spec | 10 +++++++--- sources | 6 +++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index ca4a0d3..f387615 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -4,7 +4,7 @@ Name: rubygem-%{gem_name} Epoch: 1 -Version: 6.0.3.1 +Version: 6.0.3.2 Release: 1%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT @@ -13,12 +13,12 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}%{?prerelease}.gem # The activesupport gem doesn't ship with the test suite. # You may check it out like so # git clone http://github.com/rails/rails.git -# cd rails/activesupport && git archive -v -o activesupport-6.0.3.1-tests.txz v6.0.3.1 test/ +# cd rails/activesupport && git archive -v -o activesupport-6.0.3.2-tests.txz v6.0.3.2 test/ Source1: %{gem_name}-%{version}%{?prerelease}-tests.txz # The tools are needed for the test suite, are however unpackaged in gem file. # You may get them like so # git clone http://github.com/rails/rails.git --no-checkout -# cd rails && git archive -v -o rails-6.0.3.1-tools.txz v6.0.3.1 tools/ +# cd rails && git archive -v -o rails-6.0.3.2-tools.txz v6.0.3.2 tools/ Source2: rails-%{version}%{?prerelease}-tools.txz # Fix TZInfo 2.0 compatibility. # https://github.com/rails/rails/pull/34799 @@ -127,6 +127,10 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Mon Aug 17 04:41:17 GMT 2020 Pavel Valena - 1:6.0.3.2-1 +- Update to activesupport 6.0.3.2. + Resolves: rhbz#1742797 + * Mon Aug 03 07:01:37 GMT 2020 Pavel Valena - 6.0.3.1-1 - Update to ActiveSupport 6.0.3.1. Resolves: rhbz#1742797 diff --git a/sources b/sources index 507e2cd..423181c 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (activesupport-6.0.3.1.gem) = b4b80a2fd08f4dc62a22b8946a91e81116e07a275d2ab75cb7021aa8f3481816ce32b5a598eb532235fe2e686cb1a000fad1667ab4d9561cd01a7e682244f6f8 -SHA512 (activesupport-6.0.3.1-tests.txz) = 38e34723040d209fb11aaf6b7c01a4e6bafceb1c6a53417dffc2f154996ba66cf80775b2e6f040548920537f27057c19bd3f09493a4de0bf99eb70be4ce2b6a3 -SHA512 (rails-6.0.3.1-tools.txz) = e461674faf787a4f488e93b43747f829b9ea764167ac4782190ac469c4b0941e307e0a72b786a8392c00df1221d02622ffd4b29d7ea43e6c018daf463e092f6a +SHA512 (activesupport-6.0.3.2.gem) = b6f3240d9a920228fb9204f0a05cbdb5354f4225d8643f0413e83a1c5fb6ef139366abdc0b3b76ca8018299978728ba39920da3a8913ee75ff41c1715e7e2cd1 +SHA512 (activesupport-6.0.3.2-tests.txz) = c5d4e0392ead9da905e2fdb1f166be2f00f52520dfcbbca342194bf335f07c645ad2a26975d65784a3ecad2afe0134eeaad6958b8550c6bfb3b31debecc5fb2e +SHA512 (rails-6.0.3.2-tools.txz) = f6202a114d6b40da8d452d7e8570b2d394cd53374888e28718a8dc65ddbc441ea4baefe9a4327a68efa6615eaffeba352c21e504efa53e28aa23c2b2c5f11e1a From 27cedd687351abe9ae6eea652ee5ea78e6131cec Mon Sep 17 00:00:00 2001 From: Pavel Valena Date: Wed, 19 Aug 2020 10:53:28 +0200 Subject: [PATCH 26/78] Disable test_filename_max_size which is failing in koji. --- rubygem-activesupport.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index f387615..5452eaf 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -107,6 +107,10 @@ sed -i '/def test_iso8601_output_and_reparsing$/,/^ end$/ s/^/#/' test/core_ext # https://bugs.ruby-lang.org/issues/16498 sed -i '/assert_nil mapped\[:b\]/ s/^/#/' test/core_ext/hash/transform_values_test.rb +# This seems to fail in koji +sed -i '/def test_filename_max_size/ a \ skip/' \ + test/cache/stores/file_store_test.rb + memcached & mPID=$! sleep 1 From a1df3525a95deaa1069a6b240da58af6e0f5c3fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 1 Sep 2020 17:15:46 +0200 Subject: [PATCH 27/78] Properly fix flaky `FileStoreTest#test_filename_max_size` test case. --- ...ME_MAX_SIZE-to-accomodate-large-PIDs.patch | 42 +++++++++++++++++++ rubygem-activesupport.spec | 13 +++--- 2 files changed, 50 insertions(+), 5 deletions(-) create mode 100644 rubygem-activesupport-6.0.4-Reduce-FILENAME_MAX_SIZE-to-accomodate-large-PIDs.patch diff --git a/rubygem-activesupport-6.0.4-Reduce-FILENAME_MAX_SIZE-to-accomodate-large-PIDs.patch b/rubygem-activesupport-6.0.4-Reduce-FILENAME_MAX_SIZE-to-accomodate-large-PIDs.patch new file mode 100644 index 0000000..0007eaf --- /dev/null +++ b/rubygem-activesupport-6.0.4-Reduce-FILENAME_MAX_SIZE-to-accomodate-large-PIDs.patch @@ -0,0 +1,42 @@ +From 3fed62cfb1f43d8df5a5ff31229a5ad03264186e Mon Sep 17 00:00:00 2001 +From: John Hawthorn +Date: Fri, 17 Jan 2020 11:12:32 -0800 +Subject: [PATCH] Reduce FILENAME_MAX_SIZE to accomodate large PIDs + +The max size here is designed around Ruby's Dir::Tmpname.create which +creates temporary filenames in the format + + $TIMESTAMP-$PID-$RANDOM + +I believe the previous value of this field was based on the assumption +that PIDs are 1-65535, which isn't necessarily the case on 64 bit Linux +systems, which can be up to 2**22. + + $ uname -a + Linux zergling 5.4.11-arch1-1 #1 SMP PREEMPT Sun, 12 Jan 2020 12:15:27 +0000 x86_64 GNU/Linux + $ cat /proc/sys/kernel/pid_max + 4194304 + +I've chosen a new value based on what I believe the largest possible +tempname is: + + 255 - "20200117-4194304-#{0x100000000.to_s(36)}.lock".length #=> 226 + +(cherry picked from commit a98f330fb138fe4a78c270788218309849440026) +--- + activesupport/lib/active_support/cache/file_store.rb | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/activesupport/lib/active_support/cache/file_store.rb b/activesupport/lib/active_support/cache/file_store.rb +index cbce9d891533..8b248efd14de 100644 +--- a/activesupport/lib/active_support/cache/file_store.rb ++++ b/activesupport/lib/active_support/cache/file_store.rb +@@ -16,7 +16,7 @@ class FileStore < Store + attr_reader :cache_path + + DIR_FORMATTER = "%03X" +- FILENAME_MAX_SIZE = 228 # max filename size on file system is 255, minus room for timestamp and random characters appended by Tempfile (used by atomic write) ++ FILENAME_MAX_SIZE = 226 # max filename size on file system is 255, minus room for timestamp, pid, and random characters appended by Tempfile (used by atomic write) + FILEPATH_MAX_SIZE = 900 # max is 1024, plus some room + GITKEEP_FILES = [".gitkeep", ".keep"].freeze + diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 5452eaf..d4f8ce9 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -5,7 +5,7 @@ Name: rubygem-%{gem_name} Epoch: 1 Version: 6.0.3.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT URL: http://rubyonrails.org @@ -25,6 +25,9 @@ Source2: rails-%{version}%{?prerelease}-tools.txz # https://github.com/rails/rails/pull/38081 Patch1: rubygem-activesupport-6.1.0-Update-to-TZInfo-v2.0.0.patch Patch2: rubygem-activesupport-6.1.0-Update-to-TZInfo-v2.0.0-tests.patch +# Fix flaky `FileStoreTest#test_filename_max_size` test. +# https://github.com/rails/rails/pull/40085 +Patch3: rubygem-activesupport-6.0.4-Reduce-FILENAME_MAX_SIZE-to-accomodate-large-PIDs.patch # ruby package has just soft dependency on rubygem({bigdecimal,json}), while # ActiveSupport always requires them. @@ -67,6 +70,7 @@ Documentation for %{name}. %setup -q -n %{gem_name}-%{version}%{?prerelease} -b1 -b2 %patch1 -p2 +%patch3 -p2 pushd %{_builddir} %patch2 -p2 @@ -107,10 +111,6 @@ sed -i '/def test_iso8601_output_and_reparsing$/,/^ end$/ s/^/#/' test/core_ext # https://bugs.ruby-lang.org/issues/16498 sed -i '/assert_nil mapped\[:b\]/ s/^/#/' test/core_ext/hash/transform_values_test.rb -# This seems to fail in koji -sed -i '/def test_filename_max_size/ a \ skip/' \ - test/cache/stores/file_store_test.rb - memcached & mPID=$! sleep 1 @@ -131,6 +131,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Tue Sep 01 2020 Vít Ondruch - 1:6.0.3.2-2 +- Properly fix flaky `FileStoreTest#test_filename_max_size` test case. + * Mon Aug 17 04:41:17 GMT 2020 Pavel Valena - 1:6.0.3.2-1 - Update to activesupport 6.0.3.2. Resolves: rhbz#1742797 From 9bedb8bdc21389bf930a5f132e4e54ed00a1df0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Thu, 10 Sep 2020 10:58:44 +0200 Subject: [PATCH 28/78] Fix evaluator test from web-console. https://github.com/rails/rails/issues/40196 https://github.com/rails/web-console/issues/301 --- ...ktraceCleaner-gem-filter-regexp-test.patch | 28 +++++++++++++++++++ ...r-BacktraceCleaner-gem-filter-regexp.patch | 26 +++++++++++++++++ rubygem-activesupport.spec | 11 +++++++- 3 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 rubygem-activesupport-6.1.0-Anchor-BacktraceCleaner-gem-filter-regexp-test.patch create mode 100644 rubygem-activesupport-6.1.0-Anchor-BacktraceCleaner-gem-filter-regexp.patch diff --git a/rubygem-activesupport-6.1.0-Anchor-BacktraceCleaner-gem-filter-regexp-test.patch b/rubygem-activesupport-6.1.0-Anchor-BacktraceCleaner-gem-filter-regexp-test.patch new file mode 100644 index 0000000..8d223dd --- /dev/null +++ b/rubygem-activesupport-6.1.0-Anchor-BacktraceCleaner-gem-filter-regexp-test.patch @@ -0,0 +1,28 @@ +From 5611f4b430881bcfa788044ff3f42118370c61a2 Mon Sep 17 00:00:00 2001 +From: Jonathan Hefner +Date: Mon, 7 Sep 2020 16:44:21 -0500 +Subject: [PATCH] Anchor BacktraceCleaner gem filter regexp + +This ensures the default gem filter does not affect backtrace lines that +have a subpath incidentally matching a gem path. + +Fixes #40196. +--- + activesupport/test/clean_backtrace_test.rb | 6 ++++++ + 1 files changed, 6 insertions(+) + +diff --git a/activesupport/test/clean_backtrace_test.rb b/activesupport/test/clean_backtrace_test.rb +index a846312d68f2..dd62ef359b73 100644 +--- a/activesupport/test/clean_backtrace_test.rb ++++ b/activesupport/test/clean_backtrace_test.rb +@@ -124,4 +124,10 @@ def setup + result = @bc.clean(backtrace) + assert_empty result + end ++ ++ test "should preserve lines that have a subpath matching a gem path" do ++ backtrace = [Gem.default_dir, *Gem.path].map { |path| "/parent#{path}/gems/nosuchgem-1.2.3/lib/foo.rb" } ++ ++ assert_equal backtrace, @bc.clean(backtrace) ++ end + end diff --git a/rubygem-activesupport-6.1.0-Anchor-BacktraceCleaner-gem-filter-regexp.patch b/rubygem-activesupport-6.1.0-Anchor-BacktraceCleaner-gem-filter-regexp.patch new file mode 100644 index 0000000..8cd04c5 --- /dev/null +++ b/rubygem-activesupport-6.1.0-Anchor-BacktraceCleaner-gem-filter-regexp.patch @@ -0,0 +1,26 @@ +From 5611f4b430881bcfa788044ff3f42118370c61a2 Mon Sep 17 00:00:00 2001 +From: Jonathan Hefner +Date: Mon, 7 Sep 2020 16:44:21 -0500 +Subject: [PATCH] Anchor BacktraceCleaner gem filter regexp + +This ensures the default gem filter does not affect backtrace lines that +have a subpath incidentally matching a gem path. + +Fixes #40196. +--- + activesupport/lib/active_support/backtrace_cleaner.rb | 2 +- + 1 files changed, 1 insertions(+), 1 deletion(-) + +diff --git a/activesupport/lib/active_support/backtrace_cleaner.rb b/activesupport/lib/active_support/backtrace_cleaner.rb +index ad80b8855f3f..405db9a6fe6c 100644 +--- a/activesupport/lib/active_support/backtrace_cleaner.rb ++++ b/activesupport/lib/active_support/backtrace_cleaner.rb +@@ -91,7 +91,7 @@ def add_gem_filter + gems_paths = (Gem.path | [Gem.default_dir]).map { |p| Regexp.escape(p) } + return if gems_paths.empty? + +- gems_regexp = %r{(#{gems_paths.join('|')})/(bundler/)?gems/([^/]+)-([\w.]+)/(.*)} ++ gems_regexp = %r{\A(#{gems_paths.join('|')})/(bundler/)?gems/([^/]+)-([\w.]+)/(.*)} + gems_result = '\3 (\4) \5' + add_filter { |line| line.sub(gems_regexp, gems_result) } + end diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index d4f8ce9..91da069 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -5,7 +5,7 @@ Name: rubygem-%{gem_name} Epoch: 1 Version: 6.0.3.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT URL: http://rubyonrails.org @@ -28,6 +28,10 @@ Patch2: rubygem-activesupport-6.1.0-Update-to-TZInfo-v2.0.0-tests.patch # Fix flaky `FileStoreTest#test_filename_max_size` test. # https://github.com/rails/rails/pull/40085 Patch3: rubygem-activesupport-6.0.4-Reduce-FILENAME_MAX_SIZE-to-accomodate-large-PIDs.patch +# Fix evaluator test from web-console. +# https://github.com/rails/rails/pull/40198 +Patch4: rubygem-activesupport-6.1.0-Anchor-BacktraceCleaner-gem-filter-regexp.patch +Patch5: rubygem-activesupport-6.1.0-Anchor-BacktraceCleaner-gem-filter-regexp-test.patch # ruby package has just soft dependency on rubygem({bigdecimal,json}), while # ActiveSupport always requires them. @@ -71,9 +75,11 @@ Documentation for %{name}. %patch1 -p2 %patch3 -p2 +%patch4 -p2 pushd %{_builddir} %patch2 -p2 +%patch5 -p2 popd %gemspec_remove_dep -g tzinfo "~> 1.1" @@ -131,6 +137,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Thu Sep 10 08:42:03 GMT 2020 Vít Ondruch - 1:6.0.3.2-3 +- Fix evaluator test from web-console. + * Tue Sep 01 2020 Vít Ondruch - 1:6.0.3.2-2 - Properly fix flaky `FileStoreTest#test_filename_max_size` test case. From 6168ada9f8a42d9a33a8186f93877642eb3ef76b Mon Sep 17 00:00:00 2001 From: Pavel Valena Date: Fri, 18 Sep 2020 17:58:31 +0200 Subject: [PATCH 29/78] Update to activesupport 6.0.3.3. Resolves: rhbz#1877502 --- rubygem-activesupport.spec | 12 ++++++++---- sources | 6 +++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 91da069..121b772 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -4,8 +4,8 @@ Name: rubygem-%{gem_name} Epoch: 1 -Version: 6.0.3.2 -Release: 3%{?dist} +Version: 6.0.3.3 +Release: 1%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT URL: http://rubyonrails.org @@ -13,12 +13,12 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}%{?prerelease}.gem # The activesupport gem doesn't ship with the test suite. # You may check it out like so # git clone http://github.com/rails/rails.git -# cd rails/activesupport && git archive -v -o activesupport-6.0.3.2-tests.txz v6.0.3.2 test/ +# cd rails/activesupport && git archive -v -o activesupport-6.0.3.3-tests.txz v6.0.3.3 test/ Source1: %{gem_name}-%{version}%{?prerelease}-tests.txz # The tools are needed for the test suite, are however unpackaged in gem file. # You may get them like so # git clone http://github.com/rails/rails.git --no-checkout -# cd rails && git archive -v -o rails-6.0.3.2-tools.txz v6.0.3.2 tools/ +# cd rails && git archive -v -o rails-6.0.3.3-tools.txz v6.0.3.3 tools/ Source2: rails-%{version}%{?prerelease}-tools.txz # Fix TZInfo 2.0 compatibility. # https://github.com/rails/rails/pull/34799 @@ -137,6 +137,10 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Fri Sep 18 17:58:30 CEST 2020 Pavel Valena - 1:6.0.3.3-1 +- Update to activesupport 6.0.3.3. + Resolves: rhbz#1877502 + * Thu Sep 10 08:42:03 GMT 2020 Vít Ondruch - 1:6.0.3.2-3 - Fix evaluator test from web-console. diff --git a/sources b/sources index 423181c..6e31d76 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (activesupport-6.0.3.2.gem) = b6f3240d9a920228fb9204f0a05cbdb5354f4225d8643f0413e83a1c5fb6ef139366abdc0b3b76ca8018299978728ba39920da3a8913ee75ff41c1715e7e2cd1 -SHA512 (activesupport-6.0.3.2-tests.txz) = c5d4e0392ead9da905e2fdb1f166be2f00f52520dfcbbca342194bf335f07c645ad2a26975d65784a3ecad2afe0134eeaad6958b8550c6bfb3b31debecc5fb2e -SHA512 (rails-6.0.3.2-tools.txz) = f6202a114d6b40da8d452d7e8570b2d394cd53374888e28718a8dc65ddbc441ea4baefe9a4327a68efa6615eaffeba352c21e504efa53e28aa23c2b2c5f11e1a +SHA512 (activesupport-6.0.3.3.gem) = 050599b16a63752df1f347a34e4faccb960ee3f57012032960f6792b603c09245773fd87ee9c1a0af80335ee89d4a6b3efd3c8c2d7eda73126c5b548b3c06061 +SHA512 (activesupport-6.0.3.3-tests.txz) = 391c7394832f4dfd05bfe22b8fd0173cdb41fdcebff03da588b03af90f4be6c8909e4a9f3a31705d158bc36927c63a04763630601b5a200faf7d19442b60079a +SHA512 (rails-6.0.3.3-tools.txz) = fc2a32e907c3dc0ff31e3748c7a0b2ed69aff3f9a8ed62d16d00d7a11b5dc7fda5529ff16b697d8379aae25bd3edac1c46fb3dbb8cfbd841c804e701d17b3da0 From 2fc28ff854b80642d46d1ae70d2e060a37254fcf Mon Sep 17 00:00:00 2001 From: Pavel Valena Date: Thu, 8 Oct 2020 10:45:39 +0200 Subject: [PATCH 30/78] Update to activesupport 6.0.3.4. Resolves: rhbz#1886136 --- rubygem-activesupport.spec | 10 +++++++--- sources | 6 +++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 121b772..74e8ccc 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -4,7 +4,7 @@ Name: rubygem-%{gem_name} Epoch: 1 -Version: 6.0.3.3 +Version: 6.0.3.4 Release: 1%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT @@ -13,12 +13,12 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}%{?prerelease}.gem # The activesupport gem doesn't ship with the test suite. # You may check it out like so # git clone http://github.com/rails/rails.git -# cd rails/activesupport && git archive -v -o activesupport-6.0.3.3-tests.txz v6.0.3.3 test/ +# cd rails/activesupport && git archive -v -o activesupport-6.0.3.4-tests.txz v6.0.3.4 test/ Source1: %{gem_name}-%{version}%{?prerelease}-tests.txz # The tools are needed for the test suite, are however unpackaged in gem file. # You may get them like so # git clone http://github.com/rails/rails.git --no-checkout -# cd rails && git archive -v -o rails-6.0.3.3-tools.txz v6.0.3.3 tools/ +# cd rails && git archive -v -o rails-6.0.3.4-tools.txz v6.0.3.4 tools/ Source2: rails-%{version}%{?prerelease}-tools.txz # Fix TZInfo 2.0 compatibility. # https://github.com/rails/rails/pull/34799 @@ -137,6 +137,10 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Thu Oct 8 10:45:37 CEST 2020 Pavel Valena - 1:6.0.3.4-1 +- Update to activesupport 6.0.3.4. + Resolves: rhbz#1886136 + * Fri Sep 18 17:58:30 CEST 2020 Pavel Valena - 1:6.0.3.3-1 - Update to activesupport 6.0.3.3. Resolves: rhbz#1877502 diff --git a/sources b/sources index 6e31d76..6a364a5 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (activesupport-6.0.3.3.gem) = 050599b16a63752df1f347a34e4faccb960ee3f57012032960f6792b603c09245773fd87ee9c1a0af80335ee89d4a6b3efd3c8c2d7eda73126c5b548b3c06061 -SHA512 (activesupport-6.0.3.3-tests.txz) = 391c7394832f4dfd05bfe22b8fd0173cdb41fdcebff03da588b03af90f4be6c8909e4a9f3a31705d158bc36927c63a04763630601b5a200faf7d19442b60079a -SHA512 (rails-6.0.3.3-tools.txz) = fc2a32e907c3dc0ff31e3748c7a0b2ed69aff3f9a8ed62d16d00d7a11b5dc7fda5529ff16b697d8379aae25bd3edac1c46fb3dbb8cfbd841c804e701d17b3da0 +SHA512 (activesupport-6.0.3.4.gem) = 98668d420f2b3d207ae1513bf9736089b51becb3e9272d5f30e2ca616ee69ee47ce91e30f5e76ada7e9711f08d0acb513697686a7b83fa9582064c280c634117 +SHA512 (activesupport-6.0.3.4-tests.txz) = 483cdb18696eb8e5a4a65e31e98256f0add1081800c8f7a85dede2a96ec8e42b5f6a5bf89e238cf46cc68435ec8e26031e364e13086ff9a1578d15b0eba08890 +SHA512 (rails-6.0.3.4-tools.txz) = b40d90e55da9c31462bd21c62394198900aa42f161d30f8edd32f7217d904fbdd98d2cfba7c5d542d5b89578424669fcaffbe0006f6efd62cc676065100daac3 From 81f0c1db6abf4a068ca0ca21f3ed837e32651093 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Wed, 20 Jan 2021 15:03:24 +0100 Subject: [PATCH 31/78] Fix FTBFS due to Ruby 3.0 update. --- ...NaN-and-Infinity-on-newer-BigDecimal.patch | 34 ++++++++++++++ ...ub-as-an-unsafe-method-on-SafeBuffer.patch | 44 +++++++++++++++++++ ...upportEncoder-to_json-for-Ruby-2.8.0.patch | 33 ++++++++++++++ rubygem-activesupport.spec | 19 +++++++- 4 files changed, 129 insertions(+), 1 deletion(-) create mode 100644 rubygem-activesupport-6.0.3.4-Fix-rounding-NaN-and-Infinity-on-newer-BigDecimal.patch create mode 100644 rubygem-activesupport-6.0.3.4-Mark-scrub-as-an-unsafe-method-on-SafeBuffer.patch create mode 100644 rubygem-activesupport-6.0.3.4-Use-Hash-ActiveSupport-ToJsonWithActiveSupportEncoder-to_json-for-Ruby-2.8.0.patch diff --git a/rubygem-activesupport-6.0.3.4-Fix-rounding-NaN-and-Infinity-on-newer-BigDecimal.patch b/rubygem-activesupport-6.0.3.4-Fix-rounding-NaN-and-Infinity-on-newer-BigDecimal.patch new file mode 100644 index 0000000..0eec3bf --- /dev/null +++ b/rubygem-activesupport-6.0.3.4-Fix-rounding-NaN-and-Infinity-on-newer-BigDecimal.patch @@ -0,0 +1,34 @@ +From 91d852fe2c6a6bf51287a1ad95ef6e21ffa9d261 Mon Sep 17 00:00:00 2001 +From: Eugene Kenny +Date: Fri, 1 Jan 2021 16:05:37 +0000 +Subject: [PATCH] Fix rounding NaN and Infinity on newer BigDecimal + +Since BigDecimal 2.0.3, BigDecimal#round returns an integer if the +requested precision is less than 1: +https://github.com/ruby/bigdecimal/commit/e8fc98050167fd943574609988b8754414e0a7c1 + +NaN and Infinity cannot be represented as an integer, so rounding these +values now raises a FloatDomainError. This is a regression of the fix in +081a3963ea2aab617a92874d7ef59ce98eee6a64. + +Specifying the rounding mode restores the previous behaviour. + +This isn't a problem on master or 6-1-stable, as the rounding mode is +always specified there since 7905bdfd8b2ae50319cd7a9a74ee1f8c865d648d. +--- + .../lib/active_support/number_helper/rounding_helper.rb | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/activesupport/lib/active_support/number_helper/rounding_helper.rb b/activesupport/lib/active_support/number_helper/rounding_helper.rb +index 2ad8d49c4edb..7f7242f8651a 100644 +--- a/activesupport/lib/active_support/number_helper/rounding_helper.rb ++++ b/activesupport/lib/active_support/number_helper/rounding_helper.rb +@@ -26,7 +26,7 @@ def digit_count(number) + + private + def round_without_significant(number) +- number = number.round(precision) ++ number = number.round(precision, BigDecimal.mode(BigDecimal::ROUND_MODE)) + number = number.to_i if precision == 0 && number.finite? + number = number.abs if number.zero? # prevent showing negative zeros + number diff --git a/rubygem-activesupport-6.0.3.4-Mark-scrub-as-an-unsafe-method-on-SafeBuffer.patch b/rubygem-activesupport-6.0.3.4-Mark-scrub-as-an-unsafe-method-on-SafeBuffer.patch new file mode 100644 index 0000000..6a2c7f3 --- /dev/null +++ b/rubygem-activesupport-6.0.3.4-Mark-scrub-as-an-unsafe-method-on-SafeBuffer.patch @@ -0,0 +1,44 @@ +From a4d2493b26ff166aa3605684f22e0abb174c0752 Mon Sep 17 00:00:00 2001 +From: Akira Matsuda +Date: Sat, 21 Nov 2020 09:54:43 +0900 +Subject: [PATCH] Let AS::SafeBuffer#[] and * return value be an instance of + SafeBuffer in Ruby 3 + +Ruby 3 introduces an incompatibility that String methods return String instances when called on a subclass instance. +https://bugs.ruby-lang.org/issues/10845 +https://github.com/ruby/ruby/pull/3701 +--- + .../active_support/core_ext/string/output_safety.rb | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +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 635f9cf45780..60e39d58ca5c 100644 +--- a/activesupport/lib/active_support/core_ext/string/output_safety.rb ++++ b/activesupport/lib/active_support/core_ext/string/output_safety.rb +@@ -153,12 +153,12 @@ def initialize + + def [](*args) + if html_safe? +- new_safe_buffer = super ++ new_string = super + +- if new_safe_buffer +- new_safe_buffer.instance_variable_set :@html_safe, true +- end ++ return unless new_string + ++ new_safe_buffer = new_string.is_a?(SafeBuffer) ? new_string : SafeBuffer.new(new_string) ++ new_safe_buffer.instance_variable_set :@html_safe, true + new_safe_buffer + else + to_str[*args] +@@ -214,7 +214,8 @@ def +(other) + end + + def *(*) +- new_safe_buffer = super ++ new_string = super ++ new_safe_buffer = new_string.is_a?(SafeBuffer) ? new_string : SafeBuffer.new(new_string) + new_safe_buffer.instance_variable_set(:@html_safe, @html_safe) + new_safe_buffer + end diff --git a/rubygem-activesupport-6.0.3.4-Use-Hash-ActiveSupport-ToJsonWithActiveSupportEncoder-to_json-for-Ruby-2.8.0.patch b/rubygem-activesupport-6.0.3.4-Use-Hash-ActiveSupport-ToJsonWithActiveSupportEncoder-to_json-for-Ruby-2.8.0.patch new file mode 100644 index 0000000..79416ea --- /dev/null +++ b/rubygem-activesupport-6.0.3.4-Use-Hash-ActiveSupport-ToJsonWithActiveSupportEncoder-to_json-for-Ruby-2.8.0.patch @@ -0,0 +1,33 @@ +From fdbc55b9d55ae9d2b5b39be3ef4af5f60f6954a3 Mon Sep 17 00:00:00 2001 +From: Yasuo Honda +Date: Mon, 22 Jun 2020 21:19:21 +0900 +Subject: [PATCH] Use + Array(ActiveSupport::ToJsonWithActiveSupportEncoder)#to_json and + Hash(ActiveSupport::ToJsonWithActiveSupportEncoder)#to_json for Ruby 2.8.0 + +This pull request addresses failures at https://buildkite.com/rails/rails/builds/70219#79d96882-6c51-4854-8cab-28f50ac8bca1 +According to https://bugs.ruby-lang.org/issues/16973 This is an expected change in Ruby. +These failures has been addressed by changing the order of prepend as suggested. + +Refer +https://github.com/ruby/ruby/pull/3181 +https://github.com/ruby/ruby/pull/2936 +https://bugs.ruby-lang.org/issues/9573 +https://github.com/rails/rails/pull/19413 +--- + activesupport/lib/active_support/core_ext/object/json.rb | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/activesupport/lib/active_support/core_ext/object/json.rb b/activesupport/lib/active_support/core_ext/object/json.rb +index d92af19137cd..dcfbe8b40f2a 100644 +--- a/activesupport/lib/active_support/core_ext/object/json.rb ++++ b/activesupport/lib/active_support/core_ext/object/json.rb +@@ -45,7 +45,7 @@ def to_json(options = nil) + end + end + +-[Object, Array, FalseClass, Float, Hash, Integer, NilClass, String, TrueClass, Enumerable].reverse_each do |klass| ++[Enumerable, Object, Array, FalseClass, Float, Hash, Integer, NilClass, String, TrueClass].reverse_each do |klass| + klass.prepend(ActiveSupport::ToJsonWithActiveSupportEncoder) + end + diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 74e8ccc..8820fd5 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -5,7 +5,7 @@ Name: rubygem-%{gem_name} Epoch: 1 Version: 6.0.3.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT URL: http://rubyonrails.org @@ -32,6 +32,16 @@ Patch3: rubygem-activesupport-6.0.4-Reduce-FILENAME_MAX_SIZE-to-accomodate-large # https://github.com/rails/rails/pull/40198 Patch4: rubygem-activesupport-6.1.0-Anchor-BacktraceCleaner-gem-filter-regexp.patch Patch5: rubygem-activesupport-6.1.0-Anchor-BacktraceCleaner-gem-filter-regexp-test.patch +# Fix `ActiveSupport::NumberHelper::NumberHelperTest#test_number_to_percentage` +# test failure. +# https://github.com/rails/rails/commit/91d852fe2c6a6bf51287a1ad95ef6e21ffa9d261 +Patch6: rubygem-activesupport-6.0.3.4-Fix-rounding-NaN-and-Infinity-on-newer-BigDecimal.patch +# Fix `SafeBuffer` test failures. +# https://github.com/rails/rails/pull/40663 +Patch7: rubygem-activesupport-6.0.3.4-Mark-scrub-as-an-unsafe-method-on-SafeBuffer.patch +# Fix test/json/encoding_test.rb test failures. +# https://github.com/rails/rails/pull/39697 +Patch8: rubygem-activesupport-6.0.3.4-Use-Hash-ActiveSupport-ToJsonWithActiveSupportEncoder-to_json-for-Ruby-2.8.0.patch # ruby package has just soft dependency on rubygem({bigdecimal,json}), while # ActiveSupport always requires them. @@ -53,6 +63,7 @@ BuildRequires: rubygem(rack) BuildRequires: rubygem(tzinfo) >= 1.1 BuildRequires: rubygem(listen) BuildRequires: rubygem(redis) +BuildRequires: rubygem(rexml) BuildRequires: memcached BuildArch: noarch @@ -76,6 +87,9 @@ Documentation for %{name}. %patch1 -p2 %patch3 -p2 %patch4 -p2 +%patch6 -p2 +%patch7 -p2 +%patch8 -p2 pushd %{_builddir} %patch2 -p2 @@ -137,6 +151,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Wed Jan 20 2021 Vít Ondruch - 1:6.0.3.4-2 +- Fix FTBFS due to Ruby 3.0 update. + * Thu Oct 8 10:45:37 CEST 2020 Pavel Valena - 1:6.0.3.4-1 - Update to activesupport 6.0.3.4. Resolves: rhbz#1886136 From be9180ca9a73c440cd8c5002c960b11f11328c77 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 15:37:25 +0000 Subject: [PATCH 32/78] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-activesupport.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 8820fd5..2a66d2a 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -5,7 +5,7 @@ Name: rubygem-%{gem_name} Epoch: 1 Version: 6.0.3.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT URL: http://rubyonrails.org @@ -151,6 +151,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 1:6.0.3.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jan 20 2021 Vít Ondruch - 1:6.0.3.4-2 - Fix FTBFS due to Ruby 3.0 update. From 851ceb8f99b3095c7609d452662bd9ee82b19705 Mon Sep 17 00:00:00 2001 From: Pavel Valena Date: Thu, 17 Dec 2020 03:28:06 +0100 Subject: [PATCH 33/78] Update to activesupport 6.1.1. --- ...NaN-and-Infinity-on-newer-BigDecimal.patch | 34 ----- ...ub-as-an-unsafe-method-on-SafeBuffer.patch | 44 ------- ...upportEncoder-to_json-for-Ruby-2.8.0.patch | 33 ----- ...ME_MAX_SIZE-to-accomodate-large-PIDs.patch | 42 ------- ...ktraceCleaner-gem-filter-regexp-test.patch | 28 ----- ...r-BacktraceCleaner-gem-filter-regexp.patch | 26 ---- ...-6.1.0-Update-to-TZInfo-v2.0.0-tests.patch | 24 ---- ...upport-6.1.0-Update-to-TZInfo-v2.0.0.patch | 119 ------------------ rubygem-activesupport.spec | 54 ++------ sources | 6 +- 10 files changed, 14 insertions(+), 396 deletions(-) delete mode 100644 rubygem-activesupport-6.0.3.4-Fix-rounding-NaN-and-Infinity-on-newer-BigDecimal.patch delete mode 100644 rubygem-activesupport-6.0.3.4-Mark-scrub-as-an-unsafe-method-on-SafeBuffer.patch delete mode 100644 rubygem-activesupport-6.0.3.4-Use-Hash-ActiveSupport-ToJsonWithActiveSupportEncoder-to_json-for-Ruby-2.8.0.patch delete mode 100644 rubygem-activesupport-6.0.4-Reduce-FILENAME_MAX_SIZE-to-accomodate-large-PIDs.patch delete mode 100644 rubygem-activesupport-6.1.0-Anchor-BacktraceCleaner-gem-filter-regexp-test.patch delete mode 100644 rubygem-activesupport-6.1.0-Anchor-BacktraceCleaner-gem-filter-regexp.patch delete mode 100644 rubygem-activesupport-6.1.0-Update-to-TZInfo-v2.0.0-tests.patch delete mode 100644 rubygem-activesupport-6.1.0-Update-to-TZInfo-v2.0.0.patch diff --git a/rubygem-activesupport-6.0.3.4-Fix-rounding-NaN-and-Infinity-on-newer-BigDecimal.patch b/rubygem-activesupport-6.0.3.4-Fix-rounding-NaN-and-Infinity-on-newer-BigDecimal.patch deleted file mode 100644 index 0eec3bf..0000000 --- a/rubygem-activesupport-6.0.3.4-Fix-rounding-NaN-and-Infinity-on-newer-BigDecimal.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 91d852fe2c6a6bf51287a1ad95ef6e21ffa9d261 Mon Sep 17 00:00:00 2001 -From: Eugene Kenny -Date: Fri, 1 Jan 2021 16:05:37 +0000 -Subject: [PATCH] Fix rounding NaN and Infinity on newer BigDecimal - -Since BigDecimal 2.0.3, BigDecimal#round returns an integer if the -requested precision is less than 1: -https://github.com/ruby/bigdecimal/commit/e8fc98050167fd943574609988b8754414e0a7c1 - -NaN and Infinity cannot be represented as an integer, so rounding these -values now raises a FloatDomainError. This is a regression of the fix in -081a3963ea2aab617a92874d7ef59ce98eee6a64. - -Specifying the rounding mode restores the previous behaviour. - -This isn't a problem on master or 6-1-stable, as the rounding mode is -always specified there since 7905bdfd8b2ae50319cd7a9a74ee1f8c865d648d. ---- - .../lib/active_support/number_helper/rounding_helper.rb | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/activesupport/lib/active_support/number_helper/rounding_helper.rb b/activesupport/lib/active_support/number_helper/rounding_helper.rb -index 2ad8d49c4edb..7f7242f8651a 100644 ---- a/activesupport/lib/active_support/number_helper/rounding_helper.rb -+++ b/activesupport/lib/active_support/number_helper/rounding_helper.rb -@@ -26,7 +26,7 @@ def digit_count(number) - - private - def round_without_significant(number) -- number = number.round(precision) -+ number = number.round(precision, BigDecimal.mode(BigDecimal::ROUND_MODE)) - number = number.to_i if precision == 0 && number.finite? - number = number.abs if number.zero? # prevent showing negative zeros - number diff --git a/rubygem-activesupport-6.0.3.4-Mark-scrub-as-an-unsafe-method-on-SafeBuffer.patch b/rubygem-activesupport-6.0.3.4-Mark-scrub-as-an-unsafe-method-on-SafeBuffer.patch deleted file mode 100644 index 6a2c7f3..0000000 --- a/rubygem-activesupport-6.0.3.4-Mark-scrub-as-an-unsafe-method-on-SafeBuffer.patch +++ /dev/null @@ -1,44 +0,0 @@ -From a4d2493b26ff166aa3605684f22e0abb174c0752 Mon Sep 17 00:00:00 2001 -From: Akira Matsuda -Date: Sat, 21 Nov 2020 09:54:43 +0900 -Subject: [PATCH] Let AS::SafeBuffer#[] and * return value be an instance of - SafeBuffer in Ruby 3 - -Ruby 3 introduces an incompatibility that String methods return String instances when called on a subclass instance. -https://bugs.ruby-lang.org/issues/10845 -https://github.com/ruby/ruby/pull/3701 ---- - .../active_support/core_ext/string/output_safety.rb | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -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 635f9cf45780..60e39d58ca5c 100644 ---- a/activesupport/lib/active_support/core_ext/string/output_safety.rb -+++ b/activesupport/lib/active_support/core_ext/string/output_safety.rb -@@ -153,12 +153,12 @@ def initialize - - def [](*args) - if html_safe? -- new_safe_buffer = super -+ new_string = super - -- if new_safe_buffer -- new_safe_buffer.instance_variable_set :@html_safe, true -- end -+ return unless new_string - -+ new_safe_buffer = new_string.is_a?(SafeBuffer) ? new_string : SafeBuffer.new(new_string) -+ new_safe_buffer.instance_variable_set :@html_safe, true - new_safe_buffer - else - to_str[*args] -@@ -214,7 +214,8 @@ def +(other) - end - - def *(*) -- new_safe_buffer = super -+ new_string = super -+ new_safe_buffer = new_string.is_a?(SafeBuffer) ? new_string : SafeBuffer.new(new_string) - new_safe_buffer.instance_variable_set(:@html_safe, @html_safe) - new_safe_buffer - end diff --git a/rubygem-activesupport-6.0.3.4-Use-Hash-ActiveSupport-ToJsonWithActiveSupportEncoder-to_json-for-Ruby-2.8.0.patch b/rubygem-activesupport-6.0.3.4-Use-Hash-ActiveSupport-ToJsonWithActiveSupportEncoder-to_json-for-Ruby-2.8.0.patch deleted file mode 100644 index 79416ea..0000000 --- a/rubygem-activesupport-6.0.3.4-Use-Hash-ActiveSupport-ToJsonWithActiveSupportEncoder-to_json-for-Ruby-2.8.0.patch +++ /dev/null @@ -1,33 +0,0 @@ -From fdbc55b9d55ae9d2b5b39be3ef4af5f60f6954a3 Mon Sep 17 00:00:00 2001 -From: Yasuo Honda -Date: Mon, 22 Jun 2020 21:19:21 +0900 -Subject: [PATCH] Use - Array(ActiveSupport::ToJsonWithActiveSupportEncoder)#to_json and - Hash(ActiveSupport::ToJsonWithActiveSupportEncoder)#to_json for Ruby 2.8.0 - -This pull request addresses failures at https://buildkite.com/rails/rails/builds/70219#79d96882-6c51-4854-8cab-28f50ac8bca1 -According to https://bugs.ruby-lang.org/issues/16973 This is an expected change in Ruby. -These failures has been addressed by changing the order of prepend as suggested. - -Refer -https://github.com/ruby/ruby/pull/3181 -https://github.com/ruby/ruby/pull/2936 -https://bugs.ruby-lang.org/issues/9573 -https://github.com/rails/rails/pull/19413 ---- - activesupport/lib/active_support/core_ext/object/json.rb | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/activesupport/lib/active_support/core_ext/object/json.rb b/activesupport/lib/active_support/core_ext/object/json.rb -index d92af19137cd..dcfbe8b40f2a 100644 ---- a/activesupport/lib/active_support/core_ext/object/json.rb -+++ b/activesupport/lib/active_support/core_ext/object/json.rb -@@ -45,7 +45,7 @@ def to_json(options = nil) - end - end - --[Object, Array, FalseClass, Float, Hash, Integer, NilClass, String, TrueClass, Enumerable].reverse_each do |klass| -+[Enumerable, Object, Array, FalseClass, Float, Hash, Integer, NilClass, String, TrueClass].reverse_each do |klass| - klass.prepend(ActiveSupport::ToJsonWithActiveSupportEncoder) - end - diff --git a/rubygem-activesupport-6.0.4-Reduce-FILENAME_MAX_SIZE-to-accomodate-large-PIDs.patch b/rubygem-activesupport-6.0.4-Reduce-FILENAME_MAX_SIZE-to-accomodate-large-PIDs.patch deleted file mode 100644 index 0007eaf..0000000 --- a/rubygem-activesupport-6.0.4-Reduce-FILENAME_MAX_SIZE-to-accomodate-large-PIDs.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 3fed62cfb1f43d8df5a5ff31229a5ad03264186e Mon Sep 17 00:00:00 2001 -From: John Hawthorn -Date: Fri, 17 Jan 2020 11:12:32 -0800 -Subject: [PATCH] Reduce FILENAME_MAX_SIZE to accomodate large PIDs - -The max size here is designed around Ruby's Dir::Tmpname.create which -creates temporary filenames in the format - - $TIMESTAMP-$PID-$RANDOM - -I believe the previous value of this field was based on the assumption -that PIDs are 1-65535, which isn't necessarily the case on 64 bit Linux -systems, which can be up to 2**22. - - $ uname -a - Linux zergling 5.4.11-arch1-1 #1 SMP PREEMPT Sun, 12 Jan 2020 12:15:27 +0000 x86_64 GNU/Linux - $ cat /proc/sys/kernel/pid_max - 4194304 - -I've chosen a new value based on what I believe the largest possible -tempname is: - - 255 - "20200117-4194304-#{0x100000000.to_s(36)}.lock".length #=> 226 - -(cherry picked from commit a98f330fb138fe4a78c270788218309849440026) ---- - activesupport/lib/active_support/cache/file_store.rb | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/activesupport/lib/active_support/cache/file_store.rb b/activesupport/lib/active_support/cache/file_store.rb -index cbce9d891533..8b248efd14de 100644 ---- a/activesupport/lib/active_support/cache/file_store.rb -+++ b/activesupport/lib/active_support/cache/file_store.rb -@@ -16,7 +16,7 @@ class FileStore < Store - attr_reader :cache_path - - DIR_FORMATTER = "%03X" -- FILENAME_MAX_SIZE = 228 # max filename size on file system is 255, minus room for timestamp and random characters appended by Tempfile (used by atomic write) -+ FILENAME_MAX_SIZE = 226 # max filename size on file system is 255, minus room for timestamp, pid, and random characters appended by Tempfile (used by atomic write) - FILEPATH_MAX_SIZE = 900 # max is 1024, plus some room - GITKEEP_FILES = [".gitkeep", ".keep"].freeze - diff --git a/rubygem-activesupport-6.1.0-Anchor-BacktraceCleaner-gem-filter-regexp-test.patch b/rubygem-activesupport-6.1.0-Anchor-BacktraceCleaner-gem-filter-regexp-test.patch deleted file mode 100644 index 8d223dd..0000000 --- a/rubygem-activesupport-6.1.0-Anchor-BacktraceCleaner-gem-filter-regexp-test.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 5611f4b430881bcfa788044ff3f42118370c61a2 Mon Sep 17 00:00:00 2001 -From: Jonathan Hefner -Date: Mon, 7 Sep 2020 16:44:21 -0500 -Subject: [PATCH] Anchor BacktraceCleaner gem filter regexp - -This ensures the default gem filter does not affect backtrace lines that -have a subpath incidentally matching a gem path. - -Fixes #40196. ---- - activesupport/test/clean_backtrace_test.rb | 6 ++++++ - 1 files changed, 6 insertions(+) - -diff --git a/activesupport/test/clean_backtrace_test.rb b/activesupport/test/clean_backtrace_test.rb -index a846312d68f2..dd62ef359b73 100644 ---- a/activesupport/test/clean_backtrace_test.rb -+++ b/activesupport/test/clean_backtrace_test.rb -@@ -124,4 +124,10 @@ def setup - result = @bc.clean(backtrace) - assert_empty result - end -+ -+ test "should preserve lines that have a subpath matching a gem path" do -+ backtrace = [Gem.default_dir, *Gem.path].map { |path| "/parent#{path}/gems/nosuchgem-1.2.3/lib/foo.rb" } -+ -+ assert_equal backtrace, @bc.clean(backtrace) -+ end - end diff --git a/rubygem-activesupport-6.1.0-Anchor-BacktraceCleaner-gem-filter-regexp.patch b/rubygem-activesupport-6.1.0-Anchor-BacktraceCleaner-gem-filter-regexp.patch deleted file mode 100644 index 8cd04c5..0000000 --- a/rubygem-activesupport-6.1.0-Anchor-BacktraceCleaner-gem-filter-regexp.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 5611f4b430881bcfa788044ff3f42118370c61a2 Mon Sep 17 00:00:00 2001 -From: Jonathan Hefner -Date: Mon, 7 Sep 2020 16:44:21 -0500 -Subject: [PATCH] Anchor BacktraceCleaner gem filter regexp - -This ensures the default gem filter does not affect backtrace lines that -have a subpath incidentally matching a gem path. - -Fixes #40196. ---- - activesupport/lib/active_support/backtrace_cleaner.rb | 2 +- - 1 files changed, 1 insertions(+), 1 deletion(-) - -diff --git a/activesupport/lib/active_support/backtrace_cleaner.rb b/activesupport/lib/active_support/backtrace_cleaner.rb -index ad80b8855f3f..405db9a6fe6c 100644 ---- a/activesupport/lib/active_support/backtrace_cleaner.rb -+++ b/activesupport/lib/active_support/backtrace_cleaner.rb -@@ -91,7 +91,7 @@ def add_gem_filter - gems_paths = (Gem.path | [Gem.default_dir]).map { |p| Regexp.escape(p) } - return if gems_paths.empty? - -- gems_regexp = %r{(#{gems_paths.join('|')})/(bundler/)?gems/([^/]+)-([\w.]+)/(.*)} -+ gems_regexp = %r{\A(#{gems_paths.join('|')})/(bundler/)?gems/([^/]+)-([\w.]+)/(.*)} - gems_result = '\3 (\4) \5' - add_filter { |line| line.sub(gems_regexp, gems_result) } - end diff --git a/rubygem-activesupport-6.1.0-Update-to-TZInfo-v2.0.0-tests.patch b/rubygem-activesupport-6.1.0-Update-to-TZInfo-v2.0.0-tests.patch deleted file mode 100644 index 3b107a8..0000000 --- a/rubygem-activesupport-6.1.0-Update-to-TZInfo-v2.0.0-tests.patch +++ /dev/null @@ -1,24 +0,0 @@ -From e9425abe33924623b1dce62bd817eace757c2b4e Mon Sep 17 00:00:00 2001 -From: Phil Ross -Date: Fri, 29 Dec 2017 12:47:10 +0000 -Subject: [PATCH] Update to TZInfo v2.0.0 - -Co-authored-by: Jared Beck -Co-authored-by: Jonathan Hefner ---- - time_zone_test.rb | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/activesupport/test/time_zone_test.rb b/activesupport/test/time_zone_test.rb -index 4b5f3dceee6f..646b9e1d3199 100644 ---- a/activesupport/test/time_zone_test.rb -+++ b/activesupport/test/time_zone_test.rb -@@ -22,7 +29,7 @@ def test_local_to_utc - - def test_period_for_local - zone = ActiveSupport::TimeZone["Eastern Time (US & Canada)"] -- assert_instance_of TZInfo::TimezonePeriod, zone.period_for_local(Time.utc(2000)) -+ assert_kind_of TZInfo::TimezonePeriod, zone.period_for_local(Time.utc(2000)) - end - - ActiveSupport::TimeZone::MAPPING.each_key do |name| diff --git a/rubygem-activesupport-6.1.0-Update-to-TZInfo-v2.0.0.patch b/rubygem-activesupport-6.1.0-Update-to-TZInfo-v2.0.0.patch deleted file mode 100644 index cc3f3f3..0000000 --- a/rubygem-activesupport-6.1.0-Update-to-TZInfo-v2.0.0.patch +++ /dev/null @@ -1,119 +0,0 @@ -From e9425abe33924623b1dce62bd817eace757c2b4e Mon Sep 17 00:00:00 2001 -From: Phil Ross -Date: Fri, 29 Dec 2017 12:47:10 +0000 -Subject: [PATCH] Update to TZInfo v2.0.0 - -Co-authored-by: Jared Beck -Co-authored-by: Jonathan Hefner ---- - time_with_zone.rb | 20 +++++++++++++++----- - values/time_zone.rb | 14 ++++++-------- - 2 files changed, 21 insertions(+), 13 deletions(-) - -diff --git a/activesupport/lib/active_support/time_with_zone.rb b/activesupport/lib/active_support/time_with_zone.rb -index 3be5f6f7b595..9a4c33ab0f19 100644 ---- a/activesupport/lib/active_support/time_with_zone.rb -+++ b/activesupport/lib/active_support/time_with_zone.rb -@@ -57,12 +57,12 @@ def initialize(utc_time, time_zone, local_time = nil, period = nil) - - # Returns a Time instance that represents the time in +time_zone+. - def time -- @time ||= period.to_local(@utc) -+ @time ||= incorporate_utc_offset(@utc, utc_offset) - end - - # Returns a Time instance of the simultaneous time in the UTC timezone. - def utc -- @utc ||= period.to_utc(@time) -+ @utc ||= incorporate_utc_offset(@time, -utc_offset) - end - alias_method :comparable_time, :utc - alias_method :getgm, :utc -@@ -104,13 +104,13 @@ def dst? - # Time.zone = 'Eastern Time (US & Canada)' # => 'Eastern Time (US & Canada)' - # Time.zone.now.utc? # => false - def utc? -- period.offset.abbreviation == :UTC || period.offset.abbreviation == :UCT -+ zone == "UTC" || zone == "UCT" - end - alias_method :gmt?, :utc? - - # Returns the offset from current time to UTC time in seconds. - def utc_offset -- period.utc_total_offset -+ period.observed_utc_offset - end - alias_method :gmt_offset, :utc_offset - alias_method :gmtoff, :utc_offset -@@ -132,7 +132,7 @@ def formatted_offset(colon = true, alternate_utc_string = nil) - # Time.zone = 'Eastern Time (US & Canada)' # => "Eastern Time (US & Canada)" - # Time.zone.now.zone # => "EST" - def zone -- period.zone_identifier.to_s -+ period.abbreviation - end - - # Returns a string of the object's date, time, zone, and offset from UTC. -@@ -524,6 +524,16 @@ def method_missing(sym, *args, &block) - end - - private -+ SECONDS_PER_DAY = 86400 -+ -+ def incorporate_utc_offset(time, offset) -+ if time.kind_of?(Date) -+ time + Rational(offset, SECONDS_PER_DAY) -+ else -+ time + offset -+ end -+ end -+ - def get_period_and_ensure_valid_local_time(period) - # we don't want a Time.local instance enforcing its own DST rules as well, - # so transfer time values to a utc constructor if necessary -diff --git a/activesupport/lib/active_support/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb -index 90830b89bda3..2e5d9d3e9d4c 100644 ---- a/activesupport/lib/active_support/values/time_zone.rb -+++ b/activesupport/lib/active_support/values/time_zone.rb -@@ -203,7 +203,7 @@ def seconds_to_utc_offset(seconds, colon = true) - end - - def find_tzinfo(name) -- TZInfo::Timezone.new(MAPPING[name] || name) -+ TZInfo::Timezone.get(MAPPING[name] || name) - end - - alias_method :create, :new -@@ -273,7 +273,7 @@ def load_country_zones(code) - memo - end - else -- create(tz_id, nil, TZInfo::Timezone.new(tz_id)) -+ create(tz_id, nil, TZInfo::Timezone.get(tz_id)) - end - end.sort! - end -@@ -302,11 +302,7 @@ def initialize(name, utc_offset = nil, tzinfo = nil) - - # Returns the offset of this time zone from UTC in seconds. - def utc_offset -- if @utc_offset -- @utc_offset -- else -- tzinfo.current_period.utc_offset if tzinfo && tzinfo.current_period -- end -+ @utc_offset || tzinfo&.current_period&.base_utc_offset - end - - # Returns a formatted string of the offset from UTC, or an alternative -@@ -503,7 +499,9 @@ def yesterday - # represented by +self+. Returns a Time.utc() instance -- if you want an - # ActiveSupport::TimeWithZone instance, use Time#in_time_zone() instead. - def utc_to_local(time) -- tzinfo.utc_to_local(time) -+ tzinfo.utc_to_local(time).yield_self do |t| -+ Time.utc(t.year, t.month, t.day, t.hour, t.min, t.sec, t.sec_fraction) -+ end - end - - # Adjust the given time to the simultaneous time in UTC. Returns a diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 2a66d2a..04d02ed 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -1,11 +1,11 @@ %global gem_name activesupport -#%%global prerelease .rc1 +#%%global prerelease Name: rubygem-%{gem_name} Epoch: 1 -Version: 6.0.3.4 -Release: 3%{?dist} +Version: 6.1.1 +Release: 1%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT URL: http://rubyonrails.org @@ -13,35 +13,13 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}%{?prerelease}.gem # The activesupport gem doesn't ship with the test suite. # You may check it out like so # git clone http://github.com/rails/rails.git -# cd rails/activesupport && git archive -v -o activesupport-6.0.3.4-tests.txz v6.0.3.4 test/ +# cd rails/activesupport && git archive -v -o activesupport-6.1.1-tests.txz v6.1.1 test/ Source1: %{gem_name}-%{version}%{?prerelease}-tests.txz # The tools are needed for the test suite, are however unpackaged in gem file. # You may get them like so # git clone http://github.com/rails/rails.git --no-checkout -# cd rails && git archive -v -o rails-6.0.3.4-tools.txz v6.0.3.4 tools/ +# cd rails && git archive -v -o rails-6.1.1-tools.txz v6.1.1 tools/ Source2: rails-%{version}%{?prerelease}-tools.txz -# Fix TZInfo 2.0 compatibility. -# https://github.com/rails/rails/pull/34799 -# https://github.com/rails/rails/pull/38081 -Patch1: rubygem-activesupport-6.1.0-Update-to-TZInfo-v2.0.0.patch -Patch2: rubygem-activesupport-6.1.0-Update-to-TZInfo-v2.0.0-tests.patch -# Fix flaky `FileStoreTest#test_filename_max_size` test. -# https://github.com/rails/rails/pull/40085 -Patch3: rubygem-activesupport-6.0.4-Reduce-FILENAME_MAX_SIZE-to-accomodate-large-PIDs.patch -# Fix evaluator test from web-console. -# https://github.com/rails/rails/pull/40198 -Patch4: rubygem-activesupport-6.1.0-Anchor-BacktraceCleaner-gem-filter-regexp.patch -Patch5: rubygem-activesupport-6.1.0-Anchor-BacktraceCleaner-gem-filter-regexp-test.patch -# Fix `ActiveSupport::NumberHelper::NumberHelperTest#test_number_to_percentage` -# test failure. -# https://github.com/rails/rails/commit/91d852fe2c6a6bf51287a1ad95ef6e21ffa9d261 -Patch6: rubygem-activesupport-6.0.3.4-Fix-rounding-NaN-and-Infinity-on-newer-BigDecimal.patch -# Fix `SafeBuffer` test failures. -# https://github.com/rails/rails/pull/40663 -Patch7: rubygem-activesupport-6.0.3.4-Mark-scrub-as-an-unsafe-method-on-SafeBuffer.patch -# Fix test/json/encoding_test.rb test failures. -# https://github.com/rails/rails/pull/39697 -Patch8: rubygem-activesupport-6.0.3.4-Use-Hash-ActiveSupport-ToJsonWithActiveSupportEncoder-to_json-for-Ruby-2.8.0.patch # ruby package has just soft dependency on rubygem({bigdecimal,json}), while # ActiveSupport always requires them. @@ -60,7 +38,7 @@ BuildRequires: rubygem(dalli) BuildRequires: (rubygem(i18n) >= 0.7 with rubygem(i18n) < 2) BuildRequires: rubygem(minitest) >= 5.0.0 BuildRequires: rubygem(rack) -BuildRequires: rubygem(tzinfo) >= 1.1 +BuildRequires: rubygem(tzinfo) >= 2.0 BuildRequires: rubygem(listen) BuildRequires: rubygem(redis) BuildRequires: rubygem(rexml) @@ -84,21 +62,6 @@ Documentation for %{name}. %prep %setup -q -n %{gem_name}-%{version}%{?prerelease} -b1 -b2 -%patch1 -p2 -%patch3 -p2 -%patch4 -p2 -%patch6 -p2 -%patch7 -p2 -%patch8 -p2 - -pushd %{_builddir} -%patch2 -p2 -%patch5 -p2 -popd - -%gemspec_remove_dep -g tzinfo "~> 1.1" -%gemspec_add_dep -g tzinfo [">= 1.1", "< 3"] - %build gem build ../%{gem_name}-%{version}%{?prerelease}.gemspec %gem_install @@ -131,6 +94,8 @@ sed -i '/def test_iso8601_output_and_reparsing$/,/^ end$/ s/^/#/' test/core_ext # https://bugs.ruby-lang.org/issues/16498 sed -i '/assert_nil mapped\[:b\]/ s/^/#/' test/core_ext/hash/transform_values_test.rb +sed -i '/require .bundler./ s/^/#/' test/abstract_unit.rb + memcached & mPID=$! sleep 1 @@ -151,6 +116,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Wed Jan 27 2021 Pavel Valena - 1:6.1.1-1 +- Update to activesupport 6.1.1. + * Wed Jan 27 2021 Fedora Release Engineering - 1:6.0.3.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 6a364a5..40f2b74 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (activesupport-6.0.3.4.gem) = 98668d420f2b3d207ae1513bf9736089b51becb3e9272d5f30e2ca616ee69ee47ce91e30f5e76ada7e9711f08d0acb513697686a7b83fa9582064c280c634117 -SHA512 (activesupport-6.0.3.4-tests.txz) = 483cdb18696eb8e5a4a65e31e98256f0add1081800c8f7a85dede2a96ec8e42b5f6a5bf89e238cf46cc68435ec8e26031e364e13086ff9a1578d15b0eba08890 -SHA512 (rails-6.0.3.4-tools.txz) = b40d90e55da9c31462bd21c62394198900aa42f161d30f8edd32f7217d904fbdd98d2cfba7c5d542d5b89578424669fcaffbe0006f6efd62cc676065100daac3 +SHA512 (activesupport-6.1.1.gem) = 172525c97ab71edc4288dd9f71cb476daec547b53fb042ed7d8883c867cb9df2e75a381f240f3db8a70f89d022201ae51c4d007e9ae7eb57b074cbbf1f4975f3 +SHA512 (activesupport-6.1.1-tests.txz) = 9a3ac9cd05fcf5c4f6c1b2e24395f7538f92a1eeb2791dd76d1e85869d6a6b26183fc91856376f3218e511db84bdf522d24700ee38ebe9b558046d0bdf0d936a +SHA512 (rails-6.1.1-tools.txz) = 6852616efe73dfa6d7319c1bfb941ebfa0d2413ba9ae0c3b9f5bbb1e11e407e8137764f1dd64243af200006d7865b3ab3a0f03677c2318467fafc496853e7a0a From 90b5024c92f03c13d207e24e4f87a08713ddd00b Mon Sep 17 00:00:00 2001 From: Pavel Valena Date: Mon, 15 Feb 2021 16:11:06 +0100 Subject: [PATCH 34/78] Update to activesupport 6.1.2.1. --- rubygem-activesupport.spec | 9 ++++++--- sources | 6 +++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 04d02ed..1a9e41b 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -4,7 +4,7 @@ Name: rubygem-%{gem_name} Epoch: 1 -Version: 6.1.1 +Version: 6.1.2.1 Release: 1%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT @@ -13,12 +13,12 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}%{?prerelease}.gem # The activesupport gem doesn't ship with the test suite. # You may check it out like so # git clone http://github.com/rails/rails.git -# cd rails/activesupport && git archive -v -o activesupport-6.1.1-tests.txz v6.1.1 test/ +# cd rails/activesupport && git archive -v -o activesupport-6.1.2.1-tests.txz v6.1.2.1 test/ Source1: %{gem_name}-%{version}%{?prerelease}-tests.txz # The tools are needed for the test suite, are however unpackaged in gem file. # You may get them like so # git clone http://github.com/rails/rails.git --no-checkout -# cd rails && git archive -v -o rails-6.1.1-tools.txz v6.1.1 tools/ +# cd rails && git archive -v -o rails-6.1.2.1-tools.txz v6.1.2.1 tools/ Source2: rails-%{version}%{?prerelease}-tools.txz # ruby package has just soft dependency on rubygem({bigdecimal,json}), while @@ -116,6 +116,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Mon Feb 15 2021 Pavel Valena - 1:6.1.2.1-1 +- Update to activesupport 6.1.2.1. + * Wed Jan 27 2021 Pavel Valena - 1:6.1.1-1 - Update to activesupport 6.1.1. diff --git a/sources b/sources index 40f2b74..f1175d9 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (activesupport-6.1.1.gem) = 172525c97ab71edc4288dd9f71cb476daec547b53fb042ed7d8883c867cb9df2e75a381f240f3db8a70f89d022201ae51c4d007e9ae7eb57b074cbbf1f4975f3 -SHA512 (activesupport-6.1.1-tests.txz) = 9a3ac9cd05fcf5c4f6c1b2e24395f7538f92a1eeb2791dd76d1e85869d6a6b26183fc91856376f3218e511db84bdf522d24700ee38ebe9b558046d0bdf0d936a -SHA512 (rails-6.1.1-tools.txz) = 6852616efe73dfa6d7319c1bfb941ebfa0d2413ba9ae0c3b9f5bbb1e11e407e8137764f1dd64243af200006d7865b3ab3a0f03677c2318467fafc496853e7a0a +SHA512 (activesupport-6.1.2.1.gem) = 9d5e2b2b0df869d1b5c174572fe4c8e277c61f7bfb351249709ed4436aaa3dc8aa6ead00c78d260fc8dee1bf6dc7a333bf7627376b69d78e5008de0650b91c8d +SHA512 (activesupport-6.1.2.1-tests.txz) = 891f318bba819960375ee7cdfd0c0980010f843413312888046114bbf9b8b1902016ab9df497a9227815555ef043c94555de896a77593eafb2682baa76d803d7 +SHA512 (rails-6.1.2.1-tools.txz) = 206e1a5b611c673ad4829cefdbd9e1b4db5eb4f5007264ba847192947c89508489b5f62c1e2d5bd140cb7ed27798713e4427d74a8bf0b48becb2749a07530a61 From 94a7bca8dc7ef81dcc8da5e718aedc8f2041666b Mon Sep 17 00:00:00 2001 From: Pavel Valena Date: Thu, 18 Feb 2021 16:14:36 +0100 Subject: [PATCH 35/78] Update to activesupport 6.1.3. --- rubygem-activesupport.spec | 9 ++++++--- sources | 6 +++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 1a9e41b..5f7fad9 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -4,7 +4,7 @@ Name: rubygem-%{gem_name} Epoch: 1 -Version: 6.1.2.1 +Version: 6.1.3 Release: 1%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT @@ -13,12 +13,12 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}%{?prerelease}.gem # The activesupport gem doesn't ship with the test suite. # You may check it out like so # git clone http://github.com/rails/rails.git -# cd rails/activesupport && git archive -v -o activesupport-6.1.2.1-tests.txz v6.1.2.1 test/ +# cd rails/activesupport && git archive -v -o activesupport-6.1.3-tests.txz v6.1.3 test/ Source1: %{gem_name}-%{version}%{?prerelease}-tests.txz # The tools are needed for the test suite, are however unpackaged in gem file. # You may get them like so # git clone http://github.com/rails/rails.git --no-checkout -# cd rails && git archive -v -o rails-6.1.2.1-tools.txz v6.1.2.1 tools/ +# cd rails && git archive -v -o rails-6.1.3-tools.txz v6.1.3 tools/ Source2: rails-%{version}%{?prerelease}-tools.txz # ruby package has just soft dependency on rubygem({bigdecimal,json}), while @@ -116,6 +116,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Thu Feb 18 2021 Pavel Valena - 1:6.1.3-1 +- Update to activesupport 6.1.3. + * Mon Feb 15 2021 Pavel Valena - 1:6.1.2.1-1 - Update to activesupport 6.1.2.1. diff --git a/sources b/sources index f1175d9..383613f 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (activesupport-6.1.2.1.gem) = 9d5e2b2b0df869d1b5c174572fe4c8e277c61f7bfb351249709ed4436aaa3dc8aa6ead00c78d260fc8dee1bf6dc7a333bf7627376b69d78e5008de0650b91c8d -SHA512 (activesupport-6.1.2.1-tests.txz) = 891f318bba819960375ee7cdfd0c0980010f843413312888046114bbf9b8b1902016ab9df497a9227815555ef043c94555de896a77593eafb2682baa76d803d7 -SHA512 (rails-6.1.2.1-tools.txz) = 206e1a5b611c673ad4829cefdbd9e1b4db5eb4f5007264ba847192947c89508489b5f62c1e2d5bd140cb7ed27798713e4427d74a8bf0b48becb2749a07530a61 +SHA512 (activesupport-6.1.3.gem) = 0cad1a00c41fa9d23d6374659d8db588a24cf129551c3ef821b0daeaa14376ab2ae7faff40c123e71155ab9460f6da5479a8e165f7e323c7433c739f423d3612 +SHA512 (activesupport-6.1.3-tests.txz) = bbf29fc9476d3c471f766c66682f71d467c706a84113994442aef405f213c6d7a0089c65d7fffc31c565628e82c9aee5b39352fccfbe16c5d4552e07d6d789ca +SHA512 (rails-6.1.3-tools.txz) = abdeda943f2eef9cec62c679499a2d5ebaf8234277d1cbf2357732c245c01c01c787ee231256d6b17557e8987679fcca4e6cc2c78484d8c34dfe3496dfe47a74 From 48430de4774f0e60989c94f6758fc34ce217b438 Mon Sep 17 00:00:00 2001 From: Pavel Valena Date: Fri, 9 Apr 2021 13:03:54 +0200 Subject: [PATCH 36/78] Update to activesupport 6.1.3.1. --- rubygem-activesupport.spec | 9 ++++++--- sources | 6 +++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 5f7fad9..106df40 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -4,7 +4,7 @@ Name: rubygem-%{gem_name} Epoch: 1 -Version: 6.1.3 +Version: 6.1.3.1 Release: 1%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT @@ -13,12 +13,12 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}%{?prerelease}.gem # The activesupport gem doesn't ship with the test suite. # You may check it out like so # git clone http://github.com/rails/rails.git -# cd rails/activesupport && git archive -v -o activesupport-6.1.3-tests.txz v6.1.3 test/ +# cd rails/activesupport && git archive -v -o activesupport-6.1.3.1-tests.txz v6.1.3.1 test/ Source1: %{gem_name}-%{version}%{?prerelease}-tests.txz # The tools are needed for the test suite, are however unpackaged in gem file. # You may get them like so # git clone http://github.com/rails/rails.git --no-checkout -# cd rails && git archive -v -o rails-6.1.3-tools.txz v6.1.3 tools/ +# cd rails && git archive -v -o rails-6.1.3.1-tools.txz v6.1.3.1 tools/ Source2: rails-%{version}%{?prerelease}-tools.txz # ruby package has just soft dependency on rubygem({bigdecimal,json}), while @@ -116,6 +116,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Fri Apr 09 2021 Pavel Valena - 1:6.1.3.1-1 +- Update to activesupport 6.1.3.1. + * Thu Feb 18 2021 Pavel Valena - 1:6.1.3-1 - Update to activesupport 6.1.3. diff --git a/sources b/sources index 383613f..69a76ef 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (activesupport-6.1.3.gem) = 0cad1a00c41fa9d23d6374659d8db588a24cf129551c3ef821b0daeaa14376ab2ae7faff40c123e71155ab9460f6da5479a8e165f7e323c7433c739f423d3612 -SHA512 (activesupport-6.1.3-tests.txz) = bbf29fc9476d3c471f766c66682f71d467c706a84113994442aef405f213c6d7a0089c65d7fffc31c565628e82c9aee5b39352fccfbe16c5d4552e07d6d789ca -SHA512 (rails-6.1.3-tools.txz) = abdeda943f2eef9cec62c679499a2d5ebaf8234277d1cbf2357732c245c01c01c787ee231256d6b17557e8987679fcca4e6cc2c78484d8c34dfe3496dfe47a74 +SHA512 (activesupport-6.1.3.1.gem) = f592f7d044a975e3333dabc8473c5b8c07a6aabc56f0d8783ef5e5838451edd7a999e4f37d64cf6da4498dbdffd5d9cbd8b464f599ef20b4bfa21651a35782b4 +SHA512 (activesupport-6.1.3.1-tests.txz) = 48e8d45249261774c2f1e3f7eeb823a38a506fc9ba5d01160683c50c9983c104490b88ddac94e575e96ab95dda87a79f29d9bee0a534a5fd522a137fc8c9ca5f +SHA512 (rails-6.1.3.1-tools.txz) = 0fede5d26aaa07856af67a61d6a182976207df273586d19e50323e23354644699162762c961222343b972e2d5b8746d4b6ea91596ba7d39a366b9566f2914a7e From feae146c785f3d55039cbfdafecb79d83e96aa86 Mon Sep 17 00:00:00 2001 From: Pavel Valena Date: Tue, 18 May 2021 02:45:31 +0200 Subject: [PATCH 37/78] Update to activesupport 6.1.3.2. --- rubygem-activesupport.spec | 9 ++++++--- sources | 6 +++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 106df40..40b29a7 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -4,7 +4,7 @@ Name: rubygem-%{gem_name} Epoch: 1 -Version: 6.1.3.1 +Version: 6.1.3.2 Release: 1%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT @@ -13,12 +13,12 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}%{?prerelease}.gem # The activesupport gem doesn't ship with the test suite. # You may check it out like so # git clone http://github.com/rails/rails.git -# cd rails/activesupport && git archive -v -o activesupport-6.1.3.1-tests.txz v6.1.3.1 test/ +# cd rails/activesupport && git archive -v -o activesupport-6.1.3.2-tests.txz v6.1.3.2 test/ Source1: %{gem_name}-%{version}%{?prerelease}-tests.txz # The tools are needed for the test suite, are however unpackaged in gem file. # You may get them like so # git clone http://github.com/rails/rails.git --no-checkout -# cd rails && git archive -v -o rails-6.1.3.1-tools.txz v6.1.3.1 tools/ +# cd rails && git archive -v -o rails-6.1.3.2-tools.txz v6.1.3.2 tools/ Source2: rails-%{version}%{?prerelease}-tools.txz # ruby package has just soft dependency on rubygem({bigdecimal,json}), while @@ -116,6 +116,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Tue May 18 2021 Pavel Valena - 1:6.1.3.2-1 +- Update to activesupport 6.1.3.2. + * Fri Apr 09 2021 Pavel Valena - 1:6.1.3.1-1 - Update to activesupport 6.1.3.1. diff --git a/sources b/sources index 69a76ef..18c4269 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (activesupport-6.1.3.1.gem) = f592f7d044a975e3333dabc8473c5b8c07a6aabc56f0d8783ef5e5838451edd7a999e4f37d64cf6da4498dbdffd5d9cbd8b464f599ef20b4bfa21651a35782b4 -SHA512 (activesupport-6.1.3.1-tests.txz) = 48e8d45249261774c2f1e3f7eeb823a38a506fc9ba5d01160683c50c9983c104490b88ddac94e575e96ab95dda87a79f29d9bee0a534a5fd522a137fc8c9ca5f -SHA512 (rails-6.1.3.1-tools.txz) = 0fede5d26aaa07856af67a61d6a182976207df273586d19e50323e23354644699162762c961222343b972e2d5b8746d4b6ea91596ba7d39a366b9566f2914a7e +SHA512 (activesupport-6.1.3.2.gem) = 47cc9ef0f83fa29b04fc341c76453b939f015f6c99a49566e8785bfd4db351387b486972aa0b697dda7b339321333b548e73c918c6567a25a539008c514e9029 +SHA512 (activesupport-6.1.3.2-tests.txz) = b57af625d8d548032d938d52cdf3776a0600d9bb03ad7c7846093fa42ed46a6f65dffe510e99969dc4b2d0950a036b6372f9f2bcc3e3bf6a6e209a6c3422f5cb +SHA512 (rails-6.1.3.2-tools.txz) = b95f9606f9257da6491ff76bf963af4fe0e55b92a8ffdf20a9a9e34c6d414aeb861d0d12408db0ba595311ff7a3ba73b2f4d86b58226cee7b20cbece093b2a7e From da49dd4714b41f167242b3dfc452a28b6b383a5d Mon Sep 17 00:00:00 2001 From: Pavel Valena Date: Wed, 30 Jun 2021 17:01:38 +0200 Subject: [PATCH 38/78] Update to activesupport 6.1.4. --- rubygem-activesupport.spec | 9 ++++++--- sources | 6 +++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 40b29a7..79063a1 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -4,7 +4,7 @@ Name: rubygem-%{gem_name} Epoch: 1 -Version: 6.1.3.2 +Version: 6.1.4 Release: 1%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT @@ -13,12 +13,12 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}%{?prerelease}.gem # The activesupport gem doesn't ship with the test suite. # You may check it out like so # git clone http://github.com/rails/rails.git -# cd rails/activesupport && git archive -v -o activesupport-6.1.3.2-tests.txz v6.1.3.2 test/ +# cd rails/activesupport && git archive -v -o activesupport-6.1.4-tests.txz v6.1.4 test/ Source1: %{gem_name}-%{version}%{?prerelease}-tests.txz # The tools are needed for the test suite, are however unpackaged in gem file. # You may get them like so # git clone http://github.com/rails/rails.git --no-checkout -# cd rails && git archive -v -o rails-6.1.3.2-tools.txz v6.1.3.2 tools/ +# cd rails && git archive -v -o rails-6.1.4-tools.txz v6.1.4 tools/ Source2: rails-%{version}%{?prerelease}-tools.txz # ruby package has just soft dependency on rubygem({bigdecimal,json}), while @@ -116,6 +116,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Wed Jun 30 2021 Pavel Valena - 1:6.1.4-1 +- Update to activesupport 6.1.4. + * Tue May 18 2021 Pavel Valena - 1:6.1.3.2-1 - Update to activesupport 6.1.3.2. diff --git a/sources b/sources index 18c4269..68c539d 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (activesupport-6.1.3.2.gem) = 47cc9ef0f83fa29b04fc341c76453b939f015f6c99a49566e8785bfd4db351387b486972aa0b697dda7b339321333b548e73c918c6567a25a539008c514e9029 -SHA512 (activesupport-6.1.3.2-tests.txz) = b57af625d8d548032d938d52cdf3776a0600d9bb03ad7c7846093fa42ed46a6f65dffe510e99969dc4b2d0950a036b6372f9f2bcc3e3bf6a6e209a6c3422f5cb -SHA512 (rails-6.1.3.2-tools.txz) = b95f9606f9257da6491ff76bf963af4fe0e55b92a8ffdf20a9a9e34c6d414aeb861d0d12408db0ba595311ff7a3ba73b2f4d86b58226cee7b20cbece093b2a7e +SHA512 (activesupport-6.1.4.gem) = 20a551bd6ac66e8631cac5f61d791b87659f9716e968328739509280a1ed10c0a1caa72f0e869c4b2ec110188de8d67bae40cbfe6d105ce5638d57fc4c974138 +SHA512 (activesupport-6.1.4-tests.txz) = 9b946171d6066a33b4464b86286c87a5f9bbebe508749dffa204593a029700cdaa56ab89ba08fc7c6ec22a5f290250ef3bc79fdfa909c5a65399983b0d1068be +SHA512 (rails-6.1.4-tools.txz) = acc3c9ba7c13817c27cb2bb06829b87c2bc82ca73b214e2ab20380ed9ac6fac221aa8a9183bb2aaf8685c21f049583ece09aa01660b191830879e086e286cb69 From 9d87f7d511efeaceec9dbd67885f1b313e2db293 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 11:47:54 +0000 Subject: [PATCH 39/78] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-activesupport.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 79063a1..7235a0d 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -5,7 +5,7 @@ Name: rubygem-%{gem_name} Epoch: 1 Version: 6.1.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT URL: http://rubyonrails.org @@ -116,6 +116,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1:6.1.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jun 30 2021 Pavel Valena - 1:6.1.4-1 - Update to activesupport 6.1.4. From 2dfbcf40a2ce86dc850cccf542eff0ec59be4fdf Mon Sep 17 00:00:00 2001 From: Pavel Valena Date: Fri, 17 Sep 2021 17:40:38 +0200 Subject: [PATCH 40/78] Update to activesupport 6.1.4.1. --- rubygem-activesupport.spec | 11 +++++++---- sources | 6 +++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 7235a0d..25a0f02 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -4,8 +4,8 @@ Name: rubygem-%{gem_name} Epoch: 1 -Version: 6.1.4 -Release: 2%{?dist} +Version: 6.1.4.1 +Release: 1%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT URL: http://rubyonrails.org @@ -13,12 +13,12 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}%{?prerelease}.gem # The activesupport gem doesn't ship with the test suite. # You may check it out like so # git clone http://github.com/rails/rails.git -# cd rails/activesupport && git archive -v -o activesupport-6.1.4-tests.txz v6.1.4 test/ +# cd rails/activesupport && git archive -v -o activesupport-6.1.4.1-tests.txz v6.1.4.1 test/ Source1: %{gem_name}-%{version}%{?prerelease}-tests.txz # The tools are needed for the test suite, are however unpackaged in gem file. # You may get them like so # git clone http://github.com/rails/rails.git --no-checkout -# cd rails && git archive -v -o rails-6.1.4-tools.txz v6.1.4 tools/ +# cd rails && git archive -v -o rails-6.1.4.1-tools.txz v6.1.4.1 tools/ Source2: rails-%{version}%{?prerelease}-tools.txz # ruby package has just soft dependency on rubygem({bigdecimal,json}), while @@ -116,6 +116,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Fri Sep 17 2021 Pavel Valena - 1:6.1.4.1-1 +- Update to activesupport 6.1.4.1. + * Fri Jul 23 2021 Fedora Release Engineering - 1:6.1.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 68c539d..3810f65 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (activesupport-6.1.4.gem) = 20a551bd6ac66e8631cac5f61d791b87659f9716e968328739509280a1ed10c0a1caa72f0e869c4b2ec110188de8d67bae40cbfe6d105ce5638d57fc4c974138 -SHA512 (activesupport-6.1.4-tests.txz) = 9b946171d6066a33b4464b86286c87a5f9bbebe508749dffa204593a029700cdaa56ab89ba08fc7c6ec22a5f290250ef3bc79fdfa909c5a65399983b0d1068be -SHA512 (rails-6.1.4-tools.txz) = acc3c9ba7c13817c27cb2bb06829b87c2bc82ca73b214e2ab20380ed9ac6fac221aa8a9183bb2aaf8685c21f049583ece09aa01660b191830879e086e286cb69 +SHA512 (activesupport-6.1.4.1.gem) = f3bd8dcfaafa3e1ad57fce217f5bbf74255b10656f24b7bb8d8c1bda764b499810174b14eec3e21659d35ff359bb2bbe656a18a3684eefd50554691c0d2185cc +SHA512 (activesupport-6.1.4.1-tests.txz) = bc1cb2588cc9bcc5192ae3ac5652db141df2e77932a5b0111ae99feafa58429f7943bf74459b8cb993e17cf383784978200c3abc3bb891d86b95d0bacafe8dd3 +SHA512 (rails-6.1.4.1-tools.txz) = f9288f32bc7e195ec6080a3d03dd42c0d73f14ce64ee70f2eba5ea763a844e77da100907af79e96d41fffe6cc87a746e4713a2ab7a8bdfe45b3761512ab69e14 From a802a467c289e8e2de380ec9706fd6988bfaf61a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 18:15:09 +0000 Subject: [PATCH 41/78] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-activesupport.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 25a0f02..b5a039a 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -5,7 +5,7 @@ Name: rubygem-%{gem_name} Epoch: 1 Version: 6.1.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT URL: http://rubyonrails.org @@ -116,6 +116,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 1:6.1.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Sep 17 2021 Pavel Valena - 1:6.1.4.1-1 - Update to activesupport 6.1.4.1. From 80aab539b7144bdbd0b7c9300fcc05b603259f87 Mon Sep 17 00:00:00 2001 From: Pavel Valena Date: Mon, 20 Dec 2021 12:22:54 +0100 Subject: [PATCH 42/78] Update to activesupport 7.0.1. --- rubygem-activesupport.spec | 16 +++++++++++----- sources | 6 +++--- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index b5a039a..3d07fe3 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -4,8 +4,8 @@ Name: rubygem-%{gem_name} Epoch: 1 -Version: 6.1.4.1 -Release: 2%{?dist} +Version: 7.0.1 +Release: 1%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT URL: http://rubyonrails.org @@ -13,12 +13,12 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}%{?prerelease}.gem # The activesupport gem doesn't ship with the test suite. # You may check it out like so # git clone http://github.com/rails/rails.git -# cd rails/activesupport && git archive -v -o activesupport-6.1.4.1-tests.txz v6.1.4.1 test/ +# cd rails/activesupport && git archive -v -o activesupport-7.0.1-tests.txz v7.0.1 test/ Source1: %{gem_name}-%{version}%{?prerelease}-tests.txz # The tools are needed for the test suite, are however unpackaged in gem file. # You may get them like so # git clone http://github.com/rails/rails.git --no-checkout -# cd rails && git archive -v -o rails-6.1.4.1-tools.txz v6.1.4.1 tools/ +# cd rails && git archive -v -o rails-7.0.1-tools.txz v7.0.1 tools/ Source2: rails-%{version}%{?prerelease}-tools.txz # ruby package has just soft dependency on rubygem({bigdecimal,json}), while @@ -78,9 +78,12 @@ ln -s %{_builddir}/tools .. mv %{_builddir}/test . # These tests are really unstable, but they seems to be passing upstream :/ +# mem_cache_store_test: These tests do not pass in Koji; but work locally +# redis_cache_store_test: failed to require "redis/connection/hiredis" for f in \ test/evented_file_update_checker_test.rb \ - test/cache/stores/redis_cache_store_test.rb # failed to require "redis/connection/hiredis" + test/cache/stores/redis_cache_store_test.rb \ + test/cache/stores/mem_cache_store_test.rb do mv $f{,.disable} done @@ -116,6 +119,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Thu Feb 03 2022 Pavel Valena - 1:7.0.1-1 +- Update to activesupport 7.0.1. + * Fri Jan 21 2022 Fedora Release Engineering - 1:6.1.4.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 3810f65..9f6e045 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (activesupport-6.1.4.1.gem) = f3bd8dcfaafa3e1ad57fce217f5bbf74255b10656f24b7bb8d8c1bda764b499810174b14eec3e21659d35ff359bb2bbe656a18a3684eefd50554691c0d2185cc -SHA512 (activesupport-6.1.4.1-tests.txz) = bc1cb2588cc9bcc5192ae3ac5652db141df2e77932a5b0111ae99feafa58429f7943bf74459b8cb993e17cf383784978200c3abc3bb891d86b95d0bacafe8dd3 -SHA512 (rails-6.1.4.1-tools.txz) = f9288f32bc7e195ec6080a3d03dd42c0d73f14ce64ee70f2eba5ea763a844e77da100907af79e96d41fffe6cc87a746e4713a2ab7a8bdfe45b3761512ab69e14 +SHA512 (activesupport-7.0.1.gem) = 38747dabe8364d07899525e8b2feeedad0e7aa1efc591f3747a0a0eca91b73049bdf1a4397f3d4ac554e92bfa17898c509bc8a66de5a1ef30490ec14947ee0e7 +SHA512 (activesupport-7.0.1-tests.txz) = 2186f868b921c0535dc1faf45523383aa3a5e040531f16ed5e55846aafd80b3db4c78447c025304f90ea2ed7c3d0f10ce67f924e393790bec241c7ec5ca8bbb4 +SHA512 (rails-7.0.1-tools.txz) = 3959bbb7bb5dcfa75d65d586bbdf694b80088af51597940ab06683719b37a00d52a81f61cd8c43dd1c7bf057cfea9b1b89acb74ee45c01fc3da8adec505bb4fd From 0198e7a268fb4d0d15a8fae8f101721bc6874a2a Mon Sep 17 00:00:00 2001 From: Pavel Valena Date: Wed, 9 Feb 2022 23:10:49 +0100 Subject: [PATCH 43/78] Update to activesupport 7.0.2. --- ...esupport-7.0.2-Defer-loading-XmlMini.patch | 35 +++++++++++++++++++ rubygem-activesupport.spec | 14 ++++++-- sources | 6 ++-- 3 files changed, 49 insertions(+), 6 deletions(-) create mode 100644 rubygem-activesupport-7.0.2-Defer-loading-XmlMini.patch diff --git a/rubygem-activesupport-7.0.2-Defer-loading-XmlMini.patch b/rubygem-activesupport-7.0.2-Defer-loading-XmlMini.patch new file mode 100644 index 0000000..6c6d529 --- /dev/null +++ b/rubygem-activesupport-7.0.2-Defer-loading-XmlMini.patch @@ -0,0 +1,35 @@ +From 5b21d3029e2b2f985adab467a11c00b5e54f2ab5 Mon Sep 17 00:00:00 2001 +From: Matthew Draper +Date: Sat, 5 Feb 2022 17:09:29 +1030 +Subject: [PATCH 1/2] Defer loading XmlMini until it's needed + +It's used for {Array,Hash}#to_xml, but that doesn't seem worth loading +by default. +--- + activesupport/lib/active_support/core_ext/array/conversions.rb | 1 - + activesupport/lib/active_support/core_ext/hash/conversions.rb | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/activesupport/lib/active_support/core_ext/array/conversions.rb b/activesupport/lib/active_support/core_ext/array/conversions.rb +index 82cc221a3c981..2195731442153 100644 +--- a/activesupport/lib/active_support/core_ext/array/conversions.rb ++++ b/activesupport/lib/active_support/core_ext/array/conversions.rb +@@ -1,6 +1,5 @@ + # frozen_string_literal: true + +-require "active_support/xml_mini" + require "active_support/core_ext/hash/keys" + require "active_support/core_ext/string/inflections" + require "active_support/core_ext/object/to_param" +diff --git a/activesupport/lib/active_support/core_ext/hash/conversions.rb b/activesupport/lib/active_support/core_ext/hash/conversions.rb +index 2b5e484d215ee..9a1db92d6d255 100644 +--- a/activesupport/lib/active_support/core_ext/hash/conversions.rb ++++ b/activesupport/lib/active_support/core_ext/hash/conversions.rb +@@ -1,6 +1,5 @@ + # frozen_string_literal: true + +-require "active_support/xml_mini" + require "active_support/core_ext/object/blank" + require "active_support/core_ext/object/to_param" + require "active_support/core_ext/object/to_query" + diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 3d07fe3..b818e7d 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -4,7 +4,7 @@ Name: rubygem-%{gem_name} Epoch: 1 -Version: 7.0.1 +Version: 7.0.2 Release: 1%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT @@ -13,13 +13,16 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}%{?prerelease}.gem # The activesupport gem doesn't ship with the test suite. # You may check it out like so # git clone http://github.com/rails/rails.git -# cd rails/activesupport && git archive -v -o activesupport-7.0.1-tests.txz v7.0.1 test/ +# cd rails/activesupport && git archive -v -o activesupport-7.0.2-tests.txz v7.0.2 test/ Source1: %{gem_name}-%{version}%{?prerelease}-tests.txz # The tools are needed for the test suite, are however unpackaged in gem file. # You may get them like so # git clone http://github.com/rails/rails.git --no-checkout -# cd rails && git archive -v -o rails-7.0.1-tools.txz v7.0.1 tools/ +# cd rails && git archive -v -o rails-7.0.2-tools.txz v7.0.2 tools/ Source2: rails-%{version}%{?prerelease}-tools.txz +# Defer loading XmlMini until it's needed +# https://github.com/rails/rails/pull/44340 +Patch0: rubygem-activesupport-7.0.2-Defer-loading-XmlMini.patch # ruby package has just soft dependency on rubygem({bigdecimal,json}), while # ActiveSupport always requires them. @@ -62,6 +65,8 @@ Documentation for %{name}. %prep %setup -q -n %{gem_name}-%{version}%{?prerelease} -b1 -b2 +%patch0 -p2 + %build gem build ../%{gem_name}-%{version}%{?prerelease}.gemspec %gem_install @@ -119,6 +124,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Wed Feb 09 2022 Pavel Valena - 1:7.0.2-1 +- Update to activesupport 7.0.2. + * Thu Feb 03 2022 Pavel Valena - 1:7.0.1-1 - Update to activesupport 7.0.1. diff --git a/sources b/sources index 9f6e045..c2e0dcf 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (activesupport-7.0.1.gem) = 38747dabe8364d07899525e8b2feeedad0e7aa1efc591f3747a0a0eca91b73049bdf1a4397f3d4ac554e92bfa17898c509bc8a66de5a1ef30490ec14947ee0e7 -SHA512 (activesupport-7.0.1-tests.txz) = 2186f868b921c0535dc1faf45523383aa3a5e040531f16ed5e55846aafd80b3db4c78447c025304f90ea2ed7c3d0f10ce67f924e393790bec241c7ec5ca8bbb4 -SHA512 (rails-7.0.1-tools.txz) = 3959bbb7bb5dcfa75d65d586bbdf694b80088af51597940ab06683719b37a00d52a81f61cd8c43dd1c7bf057cfea9b1b89acb74ee45c01fc3da8adec505bb4fd +SHA512 (activesupport-7.0.2.gem) = 1fbb50e0c0c05a3db2018e969590f812380156e45d4edde4034056a57a10a89f05de5a9780f7222eda7aa51d607f2107474d76a2d919b772c6e58e90557cfbe5 +SHA512 (activesupport-7.0.2-tests.txz) = e5e9bdf4d8a2e913c3518d6ed544543dce5ce4549424f633e3e6bf4b1e06bdf7bd9e23773ad1a7708e939ab4e0db599a3a6944a72d3b5f5aa1c1d117cb3bbfbf +SHA512 (rails-7.0.2-tools.txz) = 079127967e3a544910775dd9739292ecc5a387863f1a25fd4d876af1e144cf4f1538a058c1007d97a58c5cead3f56a28fff1b87b382248e84f0cfb87ee01e574 From f97acb4adad303f3159a9e5f6019fa724c6c5da4 Mon Sep 17 00:00:00 2001 From: Pavel Valena Date: Mon, 7 Mar 2022 11:45:27 +0100 Subject: [PATCH 44/78] Update to activesupport 7.0.2.3. --- rubygem-activesupport.spec | 9 ++++++--- sources | 6 +++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index b818e7d..d593564 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -4,7 +4,7 @@ Name: rubygem-%{gem_name} Epoch: 1 -Version: 7.0.2 +Version: 7.0.2.3 Release: 1%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT @@ -13,12 +13,12 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}%{?prerelease}.gem # The activesupport gem doesn't ship with the test suite. # You may check it out like so # git clone http://github.com/rails/rails.git -# cd rails/activesupport && git archive -v -o activesupport-7.0.2-tests.txz v7.0.2 test/ +# cd rails/activesupport && git archive -v -o activesupport-7.0.2.3-tests.txz v7.0.2.3 test/ Source1: %{gem_name}-%{version}%{?prerelease}-tests.txz # The tools are needed for the test suite, are however unpackaged in gem file. # You may get them like so # git clone http://github.com/rails/rails.git --no-checkout -# cd rails && git archive -v -o rails-7.0.2-tools.txz v7.0.2 tools/ +# cd rails && git archive -v -o rails-7.0.2.3-tools.txz v7.0.2.3 tools/ Source2: rails-%{version}%{?prerelease}-tools.txz # Defer loading XmlMini until it's needed # https://github.com/rails/rails/pull/44340 @@ -124,6 +124,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Mon Mar 14 2022 Pavel Valena - 1:7.0.2.3-1 +- Update to activesupport 7.0.2.3. + * Wed Feb 09 2022 Pavel Valena - 1:7.0.2-1 - Update to activesupport 7.0.2. diff --git a/sources b/sources index c2e0dcf..438d992 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (activesupport-7.0.2.gem) = 1fbb50e0c0c05a3db2018e969590f812380156e45d4edde4034056a57a10a89f05de5a9780f7222eda7aa51d607f2107474d76a2d919b772c6e58e90557cfbe5 -SHA512 (activesupport-7.0.2-tests.txz) = e5e9bdf4d8a2e913c3518d6ed544543dce5ce4549424f633e3e6bf4b1e06bdf7bd9e23773ad1a7708e939ab4e0db599a3a6944a72d3b5f5aa1c1d117cb3bbfbf -SHA512 (rails-7.0.2-tools.txz) = 079127967e3a544910775dd9739292ecc5a387863f1a25fd4d876af1e144cf4f1538a058c1007d97a58c5cead3f56a28fff1b87b382248e84f0cfb87ee01e574 +SHA512 (activesupport-7.0.2.3.gem) = 60adee8a89d3c4dea7d8f4dba8447d34b6dcadafe61524a2dee175f71d0671e0b003100367b025fb699cdfa31bb0a902415b84ed922b71fcb92f00f8688b097b +SHA512 (activesupport-7.0.2.3-tests.txz) = ecb0d3e3d6c8c2fea86233346c756ffd38df6009b8e7b7b92c84765c965637bc0153e6efb0634b3ebfe9716c261096249c2e0f74453f56421993d60c0d53b5f4 +SHA512 (rails-7.0.2.3-tools.txz) = 09a73c12d4cce5dcf8e13f641a6799fc4f943872dfd312530f4239ab18ab2ff05e9a1971a8a84b4dc650f4bf12572fdaec91f8da18424a7a6e587cba0089ae00 From dfd27e89158d7fcc02214b0b3faa6af4c43b56fa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 01:15:12 +0000 Subject: [PATCH 45/78] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-activesupport.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index d593564..c996df9 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -5,7 +5,7 @@ Name: rubygem-%{gem_name} Epoch: 1 Version: 7.0.2.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT URL: http://rubyonrails.org @@ -124,6 +124,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 1:7.0.2.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Mar 14 2022 Pavel Valena - 1:7.0.2.3-1 - Update to activesupport 7.0.2.3. From 855471b72dd64397d6b45d403eaad397548115de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 2 Aug 2022 15:56:11 +0200 Subject: [PATCH 46/78] Fix Minitest 5.16+ compatibility. --- ...-7.0.2.3-Fix-tests-for-minitest-5.16.patch | 72 +++++++++++++++++++ ...call-form-of-assert_called_with-test.patch | 39 ++++++++++ ...ulti-call-form-of-assert_called_with.patch | 39 ++++++++++ rubygem-activesupport.spec | 17 ++++- 4 files changed, 166 insertions(+), 1 deletion(-) create mode 100644 rubygem-activesupport-7.0.2.3-Fix-tests-for-minitest-5.16.patch create mode 100644 rubygem-activesupport-7.0.2.3-Remove-the-multi-call-form-of-assert_called_with-test.patch create mode 100644 rubygem-activesupport-7.0.2.3-Remove-the-multi-call-form-of-assert_called_with.patch diff --git a/rubygem-activesupport-7.0.2.3-Fix-tests-for-minitest-5.16.patch b/rubygem-activesupport-7.0.2.3-Fix-tests-for-minitest-5.16.patch new file mode 100644 index 0000000..4f325b0 --- /dev/null +++ b/rubygem-activesupport-7.0.2.3-Fix-tests-for-minitest-5.16.patch @@ -0,0 +1,72 @@ +From 9766eb4a833c26c64012230b96dd1157ebb8e8a2 Mon Sep 17 00:00:00 2001 +From: eileencodes +Date: Wed, 15 Jun 2022 12:44:11 -0400 +Subject: [PATCH] Fix tests for minitest 5.16 + +In minitest/minitest@6e06ac9 minitest changed such that it now accepts +`kwargs` instead of requiring kwargs to be shoved into the args array. +This is a good change but required some updates to our test code to get +the new version of minitest passing. + +Changes are as follows: + +1) Lock minitest to 5.15 for Ruby 2.7. We don't love this change but +it's pretty difficult to get 2.7 and 3.0 to play nicely together with +the new kwargs changes. Dropping 2.7 support isn't an option right +now for Rails. This is safe because all of the code changes here are +internal methods to Rails like assert_called_with. Applications +shouldn't be consuming them as they are no-doc'd. +2) Update the `assert_called_with` method to take any kwargs but also +the returns kwarg. +3) Update callers of `assert_called_with` to move the kwargs outside the +args array. +4) Update the message from marshaled exceptions. In 5.16 the exception +message is "result not reported" instead of "Wrapped undumpable +exception". + +Co-authored-by: Matthew Draper +--- + .../testing/method_call_assertions.rb | 22 +++- + 1 file changed, 20 insertions(+), 2 deletions(-) + +diff --git a/activesupport/lib/active_support/testing/method_call_assertions.rb b/activesupport/lib/active_support/testing/method_call_assertions.rb +index 72451faaa8cc4..f146eefce0354 100644 +--- a/activesupport/lib/active_support/testing/method_call_assertions.rb ++++ b/activesupport/lib/active_support/testing/method_call_assertions.rb +@@ -17,9 +17,9 @@ def assert_called(object, method_name, message = nil, times: 1, returns: nil, &b + assert_equal times, times_called, error + end + +- def assert_called_with(object, method_name, args, returns: nil, &block) ++ def assert_called_with(object, method_name, args, returns: false, **kwargs, &block) + mock = Minitest::Mock.new +- mock.expect(:call, returns, args) ++ expect_called_with(mock, args, returns: returns, **kwargs) + + object.stub(method_name, mock, &block) + +@@ -30,6 +30,24 @@ def assert_not_called(object, method_name, message = nil, &block) + assert_called(object, method_name, message, times: 0, &block) + end + ++ #-- ++ # This method is a temporary wrapper for mock.expect as part of ++ # the Minitest 5.16 / Ruby 3.0 kwargs transition. It can go away ++ # when we drop support for Ruby 2.7. ++ if Minitest::Mock.instance_method(:expect).parameters.map(&:first).include?(:keyrest) ++ def expect_called_with(mock, args, returns: false, **kwargs) ++ mock.expect(:call, returns, args, **kwargs) ++ end ++ else ++ def expect_called_with(mock, args, returns: false, **kwargs) ++ if !kwargs.empty? ++ mock.expect(:call, returns, [*args, kwargs]) ++ else ++ mock.expect(:call, returns, args) ++ end ++ end ++ end ++ + def assert_called_on_instance_of(klass, method_name, message = nil, times: 1, returns: nil) + times_called = 0 + klass.define_method("stubbed_#{method_name}") do |*| diff --git a/rubygem-activesupport-7.0.2.3-Remove-the-multi-call-form-of-assert_called_with-test.patch b/rubygem-activesupport-7.0.2.3-Remove-the-multi-call-form-of-assert_called_with-test.patch new file mode 100644 index 0000000..7baf418 --- /dev/null +++ b/rubygem-activesupport-7.0.2.3-Remove-the-multi-call-form-of-assert_called_with-test.patch @@ -0,0 +1,39 @@ +From df0de681dc1873534ecd2fc8371e1f2562984b68 Mon Sep 17 00:00:00 2001 +From: John Crepezzi +Date: Thu, 16 Jun 2022 08:34:05 -0400 +Subject: [PATCH] Remove the multi-call form of assert_called_with + +The `assert_called_with` helper allows passing a multi-dimensional array to +mock multiple calls to the same method for a given block. This works +fine now, but when adding support for real kwargs arguments to line up with +recent upgrades in Minitest, this approach is no longer workable because +we can't pass multiple sets of differing kwargs. + +Rather than complicated this method further, this commit removes the +multi-call form of `assert_called_with` and modifies the tests that +currently make use of that functionality to just use the underlying +`Minitest::Mock` calls. + +Co-authored-by: Eileen M. Uchitelle +--- + .../testing/method_call_assertions_test.rb | 7 -- + 1 file changed, 7 deletions(-) + +diff --git a/activesupport/test/testing/method_call_assertions_test.rb b/activesupport/test/testing/method_call_assertions_test.rb +index e75630d2e4228..4d59e0bd3c222 100644 +--- a/activesupport/test/testing/method_call_assertions_test.rb ++++ b/activesupport/test/testing/method_call_assertions_test.rb +@@ -82,13 +82,6 @@ def test_assert_called_with_failure + end + end + +- def test_assert_called_with_multiple_expected_arguments +- assert_called_with(@object, :<<, [ [ 1 ], [ 2 ] ]) do +- @object << 1 +- @object << 2 +- end +- end +- + def test_assert_called_on_instance_of_with_defaults_to_expect_once + assert_called_on_instance_of Level, :increment do + @object.increment diff --git a/rubygem-activesupport-7.0.2.3-Remove-the-multi-call-form-of-assert_called_with.patch b/rubygem-activesupport-7.0.2.3-Remove-the-multi-call-form-of-assert_called_with.patch new file mode 100644 index 0000000..b368c92 --- /dev/null +++ b/rubygem-activesupport-7.0.2.3-Remove-the-multi-call-form-of-assert_called_with.patch @@ -0,0 +1,39 @@ +From df0de681dc1873534ecd2fc8371e1f2562984b68 Mon Sep 17 00:00:00 2001 +From: John Crepezzi +Date: Thu, 16 Jun 2022 08:34:05 -0400 +Subject: [PATCH] Remove the multi-call form of assert_called_with + +The `assert_called_with` helper allows passing a multi-dimensional array to +mock multiple calls to the same method for a given block. This works +fine now, but when adding support for real kwargs arguments to line up with +recent upgrades in Minitest, this approach is no longer workable because +we can't pass multiple sets of differing kwargs. + +Rather than complicated this method further, this commit removes the +multi-call form of `assert_called_with` and modifies the tests that +currently make use of that functionality to just use the underlying +`Minitest::Mock` calls. + +Co-authored-by: Eileen M. Uchitelle +--- + .../testing/method_call_assertions.rb | 7 +- + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/activesupport/lib/active_support/testing/method_call_assertions.rb b/activesupport/lib/active_support/testing/method_call_assertions.rb +index c8d2dbaa52ab5..72451faaa8cc4 100644 +--- a/activesupport/lib/active_support/testing/method_call_assertions.rb ++++ b/activesupport/lib/active_support/testing/method_call_assertions.rb +@@ -19,12 +19,7 @@ def assert_called(object, method_name, message = nil, times: 1, returns: nil, &b + + def assert_called_with(object, method_name, args, returns: nil, &block) + mock = Minitest::Mock.new +- +- if args.all?(Array) +- args.each { |arg| mock.expect(:call, returns, arg) } +- else +- mock.expect(:call, returns, args) +- end ++ mock.expect(:call, returns, args) + + object.stub(method_name, mock, &block) + diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index c996df9..914039e 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -5,7 +5,7 @@ Name: rubygem-%{gem_name} Epoch: 1 Version: 7.0.2.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT URL: http://rubyonrails.org @@ -23,6 +23,12 @@ Source2: rails-%{version}%{?prerelease}-tools.txz # Defer loading XmlMini until it's needed # https://github.com/rails/rails/pull/44340 Patch0: rubygem-activesupport-7.0.2-Defer-loading-XmlMini.patch +# Fixes for Minitest 5.16+ +# https://github.com/rails/rails/pull/45380 +Patch1: rubygem-activesupport-7.0.2.3-Remove-the-multi-call-form-of-assert_called_with.patch +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 # ruby package has just soft dependency on rubygem({bigdecimal,json}), while # ActiveSupport always requires them. @@ -66,6 +72,12 @@ Documentation for %{name}. %setup -q -n %{gem_name}-%{version}%{?prerelease} -b1 -b2 %patch0 -p2 +%patch1 -p2 +%patch3 -p2 + +pushd %{_builddir} +%patch2 -p2 +popd %build gem build ../%{gem_name}-%{version}%{?prerelease}.gemspec @@ -124,6 +136,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Tue Aug 02 2022 Vít Ondruch - 1:7.0.2.3-3 +- Fix Minitest 5.16+ compatibility. + * Sat Jul 23 2022 Fedora Release Engineering - 1:7.0.2.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 629d6458bfe4aad50ab0e98d0dc270f5cbdd24f9 Mon Sep 17 00:00:00 2001 From: Pavel Valena Date: Thu, 8 Sep 2022 15:33:21 +0200 Subject: [PATCH 47/78] Update to activesupport 7.0.4. --- ...esupport-7.0.2-Defer-loading-XmlMini.patch | 35 ------------------- rubygem-activesupport.spec | 15 ++++---- sources | 6 ++-- 3 files changed, 10 insertions(+), 46 deletions(-) delete mode 100644 rubygem-activesupport-7.0.2-Defer-loading-XmlMini.patch diff --git a/rubygem-activesupport-7.0.2-Defer-loading-XmlMini.patch b/rubygem-activesupport-7.0.2-Defer-loading-XmlMini.patch deleted file mode 100644 index 6c6d529..0000000 --- a/rubygem-activesupport-7.0.2-Defer-loading-XmlMini.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 5b21d3029e2b2f985adab467a11c00b5e54f2ab5 Mon Sep 17 00:00:00 2001 -From: Matthew Draper -Date: Sat, 5 Feb 2022 17:09:29 +1030 -Subject: [PATCH 1/2] Defer loading XmlMini until it's needed - -It's used for {Array,Hash}#to_xml, but that doesn't seem worth loading -by default. ---- - activesupport/lib/active_support/core_ext/array/conversions.rb | 1 - - activesupport/lib/active_support/core_ext/hash/conversions.rb | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/activesupport/lib/active_support/core_ext/array/conversions.rb b/activesupport/lib/active_support/core_ext/array/conversions.rb -index 82cc221a3c981..2195731442153 100644 ---- a/activesupport/lib/active_support/core_ext/array/conversions.rb -+++ b/activesupport/lib/active_support/core_ext/array/conversions.rb -@@ -1,6 +1,5 @@ - # frozen_string_literal: true - --require "active_support/xml_mini" - require "active_support/core_ext/hash/keys" - require "active_support/core_ext/string/inflections" - require "active_support/core_ext/object/to_param" -diff --git a/activesupport/lib/active_support/core_ext/hash/conversions.rb b/activesupport/lib/active_support/core_ext/hash/conversions.rb -index 2b5e484d215ee..9a1db92d6d255 100644 ---- a/activesupport/lib/active_support/core_ext/hash/conversions.rb -+++ b/activesupport/lib/active_support/core_ext/hash/conversions.rb -@@ -1,6 +1,5 @@ - # frozen_string_literal: true - --require "active_support/xml_mini" - require "active_support/core_ext/object/blank" - require "active_support/core_ext/object/to_param" - require "active_support/core_ext/object/to_query" - diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 914039e..81aeca6 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -4,8 +4,8 @@ Name: rubygem-%{gem_name} Epoch: 1 -Version: 7.0.2.3 -Release: 3%{?dist} +Version: 7.0.4 +Release: 1%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT URL: http://rubyonrails.org @@ -13,16 +13,13 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}%{?prerelease}.gem # The activesupport gem doesn't ship with the test suite. # You may check it out like so # git clone http://github.com/rails/rails.git -# cd rails/activesupport && git archive -v -o activesupport-7.0.2.3-tests.txz v7.0.2.3 test/ +# cd rails/activesupport && git archive -v -o activesupport-7.0.4-tests.txz v7.0.4 test/ Source1: %{gem_name}-%{version}%{?prerelease}-tests.txz # The tools are needed for the test suite, are however unpackaged in gem file. # You may get them like so # git clone http://github.com/rails/rails.git --no-checkout -# cd rails && git archive -v -o rails-7.0.2.3-tools.txz v7.0.2.3 tools/ +# cd rails && git archive -v -o rails-7.0.4-tools.txz v7.0.4 tools/ Source2: rails-%{version}%{?prerelease}-tools.txz -# Defer loading XmlMini until it's needed -# https://github.com/rails/rails/pull/44340 -Patch0: rubygem-activesupport-7.0.2-Defer-loading-XmlMini.patch # Fixes for Minitest 5.16+ # https://github.com/rails/rails/pull/45380 Patch1: rubygem-activesupport-7.0.2.3-Remove-the-multi-call-form-of-assert_called_with.patch @@ -71,7 +68,6 @@ Documentation for %{name}. %prep %setup -q -n %{gem_name}-%{version}%{?prerelease} -b1 -b2 -%patch0 -p2 %patch1 -p2 %patch3 -p2 @@ -136,6 +132,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Thu Sep 15 2022 Pavel Valena - 1:7.0.4-1 +- Update to activesupport 7.0.4. + * Tue Aug 02 2022 Vít Ondruch - 1:7.0.2.3-3 - Fix Minitest 5.16+ compatibility. diff --git a/sources b/sources index 438d992..3aee15e 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (activesupport-7.0.2.3.gem) = 60adee8a89d3c4dea7d8f4dba8447d34b6dcadafe61524a2dee175f71d0671e0b003100367b025fb699cdfa31bb0a902415b84ed922b71fcb92f00f8688b097b -SHA512 (activesupport-7.0.2.3-tests.txz) = ecb0d3e3d6c8c2fea86233346c756ffd38df6009b8e7b7b92c84765c965637bc0153e6efb0634b3ebfe9716c261096249c2e0f74453f56421993d60c0d53b5f4 -SHA512 (rails-7.0.2.3-tools.txz) = 09a73c12d4cce5dcf8e13f641a6799fc4f943872dfd312530f4239ab18ab2ff05e9a1971a8a84b4dc650f4bf12572fdaec91f8da18424a7a6e587cba0089ae00 +SHA512 (activesupport-7.0.4.gem) = 54859a1cccda0940a91be3be8a68087a4cb8ae6f5850dc3ae92bb79a722b04f34a5d9a61456146c2d7c994e95cd5f1b40c16766e0ef54828acc91edb5aba1d2b +SHA512 (activesupport-7.0.4-tests.txz) = 3f4919e88d21aee8dd3c21b7b7a913abdcd213e4b3f434102980cb470e014201bd8ebdd9d785895018b9aed1736e686aa76fe098be438b90f114b1f423d2deab +SHA512 (rails-7.0.4-tools.txz) = 8cab3982844ffe8eadfa67ec7b3e788aafd766035eb60be03f32544482f704da9c817fd3562ff248a71ed50e724de7be96d90376a61141dc1d51efd775875547 From 56f9c20701aa07eb0578c48df4a8845805f4f80a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 21 Dec 2022 15:11:59 +0900 Subject: [PATCH 48/78] Backport upstream fix for test failure with ruby3.2 wrt class_serial removal --- ...4-ruby32-rubyvm-class_serial-removal.patch | 23 +++++++++++++++++++ rubygem-activesupport.spec | 9 +++++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 rubygem-activesupport-7.0.4-ruby32-rubyvm-class_serial-removal.patch diff --git a/rubygem-activesupport-7.0.4-ruby32-rubyvm-class_serial-removal.patch b/rubygem-activesupport-7.0.4-ruby32-rubyvm-class_serial-removal.patch new file mode 100644 index 0000000..2f4cb1a --- /dev/null +++ b/rubygem-activesupport-7.0.4-ruby32-rubyvm-class_serial-removal.patch @@ -0,0 +1,23 @@ +From 60ffaac2e9644076e53afa1a2b1a716e289b7085 Mon Sep 17 00:00:00 2001 +From: Akira Matsuda +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 diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 81aeca6..4f5c6c2 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -5,7 +5,7 @@ Name: rubygem-%{gem_name} Epoch: 1 Version: 7.0.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT URL: http://rubyonrails.org @@ -26,6 +26,9 @@ 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 +# https://github.com/rails/rails/pull/46735 +# Fix for test failure with ruby3.2 wrt class_serial removal +Patch4: rubygem-activesupport-7.0.4-ruby32-rubyvm-class_serial-removal.patch # ruby package has just soft dependency on rubygem({bigdecimal,json}), while # ActiveSupport always requires them. @@ -73,6 +76,7 @@ Documentation for %{name}. pushd %{_builddir} %patch2 -p2 +%patch4 -p2 popd %build @@ -132,6 +136,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Wed Dec 21 2022 Mamoru TASAKA - 1:7.0.4-2 +- Backport upstream fix for test failure with ruby3.2 wrt class_serial removal + * Thu Sep 15 2022 Pavel Valena - 1:7.0.4-1 - Update to activesupport 7.0.4. From 78ab423330be8994c04bec9014eba185586e5e26 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 20:09:29 +0000 Subject: [PATCH 49/78] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-activesupport.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 4f5c6c2..9d00457 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -5,7 +5,7 @@ Name: rubygem-%{gem_name} Epoch: 1 Version: 7.0.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT URL: http://rubyonrails.org @@ -136,6 +136,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 1:7.0.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Dec 21 2022 Mamoru TASAKA - 1:7.0.4-2 - Backport upstream fix for test failure with ruby3.2 wrt class_serial removal From c5bf26a778a8152fdb98be1dca569ccb794dc4c5 Mon Sep 17 00:00:00 2001 From: Pavel Valena Date: Wed, 25 Jan 2023 13:52:04 +0100 Subject: [PATCH 50/78] Update to activesupport 7.0.4.2. --- rubygem-activesupport.spec | 11 +++++++---- sources | 6 +++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 9d00457..146f87e 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -4,8 +4,8 @@ Name: rubygem-%{gem_name} Epoch: 1 -Version: 7.0.4 -Release: 3%{?dist} +Version: 7.0.4.2 +Release: 1%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT URL: http://rubyonrails.org @@ -13,12 +13,12 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}%{?prerelease}.gem # The activesupport gem doesn't ship with the test suite. # You may check it out like so # git clone http://github.com/rails/rails.git -# cd rails/activesupport && git archive -v -o activesupport-7.0.4-tests.txz v7.0.4 test/ +# cd rails/activesupport && git archive -v -o activesupport-7.0.4.2-tests.txz v7.0.4.2 test/ Source1: %{gem_name}-%{version}%{?prerelease}-tests.txz # The tools are needed for the test suite, are however unpackaged in gem file. # You may get them like so # git clone http://github.com/rails/rails.git --no-checkout -# cd rails && git archive -v -o rails-7.0.4-tools.txz v7.0.4 tools/ +# cd rails && git archive -v -o rails-7.0.4.2-tools.txz v7.0.4.2 tools/ Source2: rails-%{version}%{?prerelease}-tools.txz # Fixes for Minitest 5.16+ # https://github.com/rails/rails/pull/45380 @@ -136,6 +136,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Wed Jan 25 2023 Pavel Valena - 1:7.0.4.2-1 +- Update to activesupport 7.0.4.2. + * Fri Jan 20 2023 Fedora Release Engineering - 1:7.0.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 3aee15e..67dd44a 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (activesupport-7.0.4.gem) = 54859a1cccda0940a91be3be8a68087a4cb8ae6f5850dc3ae92bb79a722b04f34a5d9a61456146c2d7c994e95cd5f1b40c16766e0ef54828acc91edb5aba1d2b -SHA512 (activesupport-7.0.4-tests.txz) = 3f4919e88d21aee8dd3c21b7b7a913abdcd213e4b3f434102980cb470e014201bd8ebdd9d785895018b9aed1736e686aa76fe098be438b90f114b1f423d2deab -SHA512 (rails-7.0.4-tools.txz) = 8cab3982844ffe8eadfa67ec7b3e788aafd766035eb60be03f32544482f704da9c817fd3562ff248a71ed50e724de7be96d90376a61141dc1d51efd775875547 +SHA512 (activesupport-7.0.4.2.gem) = bdd86b80d3e5e5df3483200ef7f4dbc00bb1cd10643e116d4b9bb5b7f40e973e04830fd169044f9481fea5514d9dfd81b5fa793dc40dd86d2eb1c560b22213cd +SHA512 (activesupport-7.0.4.2-tests.txz) = b00be020b352e74961ace00d33851979d68a967cab94ee47018d34999c16d47978ad643924d716768b63f44882485a62a8db5e3545a3d05553632fbf80750a95 +SHA512 (rails-7.0.4.2-tools.txz) = 8102a03035eef294942f6ae5eb0d0cb2f84dc1229456b0eda7479fcc0c2c17b440f29e06500a383a8aeb4b3490419e67073a45436d5f5e402271e650e181b2d2 From c09e17dc2e8eb62b68a1e4f680655d20d92627b6 Mon Sep 17 00:00:00 2001 From: Pavel Valena Date: Tue, 14 Mar 2023 14:30:40 +0100 Subject: [PATCH 51/78] Update to activesupport 7.0.4.3. --- rubygem-activesupport.spec | 9 ++++++--- sources | 6 +++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 146f87e..6efd812 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -4,7 +4,7 @@ Name: rubygem-%{gem_name} Epoch: 1 -Version: 7.0.4.2 +Version: 7.0.4.3 Release: 1%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT @@ -13,12 +13,12 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}%{?prerelease}.gem # The activesupport gem doesn't ship with the test suite. # You may check it out like so # git clone http://github.com/rails/rails.git -# cd rails/activesupport && git archive -v -o activesupport-7.0.4.2-tests.txz v7.0.4.2 test/ +# cd rails/activesupport && git archive -v -o activesupport-7.0.4.3-tests.txz v7.0.4.3 test/ Source1: %{gem_name}-%{version}%{?prerelease}-tests.txz # The tools are needed for the test suite, are however unpackaged in gem file. # You may get them like so # git clone http://github.com/rails/rails.git --no-checkout -# cd rails && git archive -v -o rails-7.0.4.2-tools.txz v7.0.4.2 tools/ +# cd rails && git archive -v -o rails-7.0.4.3-tools.txz v7.0.4.3 tools/ Source2: rails-%{version}%{?prerelease}-tools.txz # Fixes for Minitest 5.16+ # https://github.com/rails/rails/pull/45380 @@ -136,6 +136,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Tue Mar 14 2023 Pavel Valena - 1:7.0.4.3-1 +- Update to activesupport 7.0.4.3. + * Wed Jan 25 2023 Pavel Valena - 1:7.0.4.2-1 - Update to activesupport 7.0.4.2. diff --git a/sources b/sources index 67dd44a..152bd4b 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (activesupport-7.0.4.2.gem) = bdd86b80d3e5e5df3483200ef7f4dbc00bb1cd10643e116d4b9bb5b7f40e973e04830fd169044f9481fea5514d9dfd81b5fa793dc40dd86d2eb1c560b22213cd -SHA512 (activesupport-7.0.4.2-tests.txz) = b00be020b352e74961ace00d33851979d68a967cab94ee47018d34999c16d47978ad643924d716768b63f44882485a62a8db5e3545a3d05553632fbf80750a95 -SHA512 (rails-7.0.4.2-tools.txz) = 8102a03035eef294942f6ae5eb0d0cb2f84dc1229456b0eda7479fcc0c2c17b440f29e06500a383a8aeb4b3490419e67073a45436d5f5e402271e650e181b2d2 +SHA512 (activesupport-7.0.4.3.gem) = 3592b76089b1d0a8cecf04af8270a17f53c9551e945076afa9a8419be689b3ebbf60864c2d6392493802b63e1afcae84ce00c2b6acdc2b9973e5b160e64c3eff +SHA512 (activesupport-7.0.4.3-tests.txz) = 95f6629e259ae833d4bfbbf92c2f103256f2d24b01a37638bea6ffcf58b8068a270491321b44e3056b48a14ae6319ff538157e129787f5205446e512cb649c6a +SHA512 (rails-7.0.4.3-tools.txz) = 927315a00681680f3fd2aa9bcf95f6867b6ecafbfe0caf16d4f434e6a4abe77393dab1b909ad2b309eebd821da107f7b4ce7f2739c07b439cb3f16853b2f0dcf From 71cbca1b7159701295e10bc4c0dafcc88839bc16 Mon Sep 17 00:00:00 2001 From: Pavel Valena Date: Tue, 30 May 2023 13:14:58 +0200 Subject: [PATCH 52/78] Update to activesupport 7.0.5. Also switch to diferent %patch macro format. --- ...4-ruby32-rubyvm-class_serial-removal.patch | 23 ------------------- rubygem-activesupport.spec | 19 ++++++++------- sources | 6 ++--- 3 files changed, 12 insertions(+), 36 deletions(-) delete mode 100644 rubygem-activesupport-7.0.4-ruby32-rubyvm-class_serial-removal.patch diff --git a/rubygem-activesupport-7.0.4-ruby32-rubyvm-class_serial-removal.patch b/rubygem-activesupport-7.0.4-ruby32-rubyvm-class_serial-removal.patch deleted file mode 100644 index 2f4cb1a..0000000 --- a/rubygem-activesupport-7.0.4-ruby32-rubyvm-class_serial-removal.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 60ffaac2e9644076e53afa1a2b1a716e289b7085 Mon Sep 17 00:00:00 2001 -From: Akira Matsuda -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 diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 6efd812..59d0bb8 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -4,7 +4,7 @@ Name: rubygem-%{gem_name} Epoch: 1 -Version: 7.0.4.3 +Version: 7.0.5 Release: 1%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT @@ -13,12 +13,12 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}%{?prerelease}.gem # The activesupport gem doesn't ship with the test suite. # You may check it out like so # git clone http://github.com/rails/rails.git -# cd rails/activesupport && git archive -v -o activesupport-7.0.4.3-tests.txz v7.0.4.3 test/ +# cd rails/activesupport && git archive -v -o activesupport-7.0.5-tests.txz v7.0.5 test/ Source1: %{gem_name}-%{version}%{?prerelease}-tests.txz # The tools are needed for the test suite, are however unpackaged in gem file. # You may get them like so # git clone http://github.com/rails/rails.git --no-checkout -# cd rails && git archive -v -o rails-7.0.4.3-tools.txz v7.0.4.3 tools/ +# cd rails && git archive -v -o rails-7.0.5-tools.txz v7.0.5 tools/ Source2: rails-%{version}%{?prerelease}-tools.txz # Fixes for Minitest 5.16+ # https://github.com/rails/rails/pull/45380 @@ -26,9 +26,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 -# https://github.com/rails/rails/pull/46735 -# Fix for test failure with ruby3.2 wrt class_serial removal -Patch4: rubygem-activesupport-7.0.4-ruby32-rubyvm-class_serial-removal.patch # ruby package has just soft dependency on rubygem({bigdecimal,json}), while # ActiveSupport always requires them. @@ -71,12 +68,11 @@ Documentation for %{name}. %prep %setup -q -n %{gem_name}-%{version}%{?prerelease} -b1 -b2 -%patch1 -p2 -%patch3 -p2 +%patch 1 -p2 +%patch 3 -p2 pushd %{_builddir} -%patch2 -p2 -%patch4 -p2 +%patch 2 -p2 popd %build @@ -136,6 +132,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Tue May 30 2023 Pavel Valena - 1:7.0.5-1 +- Update to activesupport 7.0.5. + * Tue Mar 14 2023 Pavel Valena - 1:7.0.4.3-1 - Update to activesupport 7.0.4.3. diff --git a/sources b/sources index 152bd4b..45544a3 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (activesupport-7.0.4.3.gem) = 3592b76089b1d0a8cecf04af8270a17f53c9551e945076afa9a8419be689b3ebbf60864c2d6392493802b63e1afcae84ce00c2b6acdc2b9973e5b160e64c3eff -SHA512 (activesupport-7.0.4.3-tests.txz) = 95f6629e259ae833d4bfbbf92c2f103256f2d24b01a37638bea6ffcf58b8068a270491321b44e3056b48a14ae6319ff538157e129787f5205446e512cb649c6a -SHA512 (rails-7.0.4.3-tools.txz) = 927315a00681680f3fd2aa9bcf95f6867b6ecafbfe0caf16d4f434e6a4abe77393dab1b909ad2b309eebd821da107f7b4ce7f2739c07b439cb3f16853b2f0dcf +SHA512 (activesupport-7.0.5.gem) = 1ea7638b6cb70b549c216b1929ef07d49ff13ad6ae07f0cf70f4947cd834c85cc4e0bc94855d2533402ae3f5ad35d5eeb46836f3ab9a0b314a279acdd610ef77 +SHA512 (activesupport-7.0.5-tests.txz) = 322c4c917eb8165cae34663b260f22cb9d3e9f3032011fc60f1a8a564e14169a97b476a51dfda8b9037dc520b7f9867ef4272b2a29b1be9542cfa23e9b946e21 +SHA512 (rails-7.0.5-tools.txz) = 007302c93fb7e6a1edbbe6578bd8a3fd5de72e26f48546abee7dc9f4bf33e691e2e41858352edbbaec08177cb0fb290bf9fc6f206756dd9ec08a889eed426c14 From c7156b7a8b5168cddc2256469555e61c5eea6086 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 17:18:50 +0000 Subject: [PATCH 53/78] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-activesupport.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 59d0bb8..0ad43c1 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -5,7 +5,7 @@ Name: rubygem-%{gem_name} Epoch: 1 Version: 7.0.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT URL: http://rubyonrails.org @@ -132,6 +132,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 1:7.0.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue May 30 2023 Pavel Valena - 1:7.0.5-1 - Update to activesupport 7.0.5. From b17ae11aa7099e39092eb2e0b340554e02294838 Mon Sep 17 00:00:00 2001 From: Pavel Valena Date: Thu, 20 Jul 2023 15:01:40 +0200 Subject: [PATCH 54/78] Update to activesupport 7.0.6. --- rubygem-activesupport.spec | 11 +++++++---- sources | 6 +++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 0ad43c1..b1b1b3d 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -4,8 +4,8 @@ Name: rubygem-%{gem_name} Epoch: 1 -Version: 7.0.5 -Release: 2%{?dist} +Version: 7.0.6 +Release: 1%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT URL: http://rubyonrails.org @@ -13,12 +13,12 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}%{?prerelease}.gem # The activesupport gem doesn't ship with the test suite. # You may check it out like so # git clone http://github.com/rails/rails.git -# cd rails/activesupport && git archive -v -o activesupport-7.0.5-tests.txz v7.0.5 test/ +# cd rails/activesupport && git archive -v -o activesupport-7.0.6-tests.txz v7.0.6 test/ Source1: %{gem_name}-%{version}%{?prerelease}-tests.txz # The tools are needed for the test suite, are however unpackaged in gem file. # You may get them like so # git clone http://github.com/rails/rails.git --no-checkout -# cd rails && git archive -v -o rails-7.0.5-tools.txz v7.0.5 tools/ +# cd rails && git archive -v -o rails-7.0.6-tools.txz v7.0.6 tools/ Source2: rails-%{version}%{?prerelease}-tools.txz # Fixes for Minitest 5.16+ # https://github.com/rails/rails/pull/45380 @@ -132,6 +132,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Sun Jul 23 2023 Pavel Valena - 1:7.0.6-1 +- Update to activesupport 7.0.6. + * Fri Jul 21 2023 Fedora Release Engineering - 1:7.0.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 45544a3..d61f865 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (activesupport-7.0.5.gem) = 1ea7638b6cb70b549c216b1929ef07d49ff13ad6ae07f0cf70f4947cd834c85cc4e0bc94855d2533402ae3f5ad35d5eeb46836f3ab9a0b314a279acdd610ef77 -SHA512 (activesupport-7.0.5-tests.txz) = 322c4c917eb8165cae34663b260f22cb9d3e9f3032011fc60f1a8a564e14169a97b476a51dfda8b9037dc520b7f9867ef4272b2a29b1be9542cfa23e9b946e21 -SHA512 (rails-7.0.5-tools.txz) = 007302c93fb7e6a1edbbe6578bd8a3fd5de72e26f48546abee7dc9f4bf33e691e2e41858352edbbaec08177cb0fb290bf9fc6f206756dd9ec08a889eed426c14 +SHA512 (activesupport-7.0.6.gem) = 73e1dbd6774ba25db6e85087cf9407c99ebd457d047900d6b4253fdaed79d0413d66eae0768a247a17d0a85d633c116fc9c3abe37727ae8d8e9e35d08ee3d724 +SHA512 (activesupport-7.0.6-tests.txz) = 25cd5b15b3c0f4f7807a86eebf9b6444e791eae3dea42c29253835c88f035ed9b9ed3a1ffb16ad98dcc43a271006bee01904b4f8134ea4b0156d35d5bdf040f3 +SHA512 (rails-7.0.6-tools.txz) = ae7dab77c1a2b19e31005a46e2f85f79a838c84122e462ccaa4b19aa719bbc63e463211363eabac7ad7ab55b8ccb36479fae8ec0a77c8d412a5cdec862f33e53 From 72d95dff68176f29ab82841fba9169306df7f911 Mon Sep 17 00:00:00 2001 From: Pavel Valena Date: Thu, 10 Aug 2023 18:36:23 +0200 Subject: [PATCH 55/78] Update to activesupport 7.0.7. --- rubygem-activesupport.spec | 9 ++++++--- sources | 6 +++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index b1b1b3d..c15af1c 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -4,7 +4,7 @@ Name: rubygem-%{gem_name} Epoch: 1 -Version: 7.0.6 +Version: 7.0.7 Release: 1%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT @@ -13,12 +13,12 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}%{?prerelease}.gem # The activesupport gem doesn't ship with the test suite. # You may check it out like so # git clone http://github.com/rails/rails.git -# cd rails/activesupport && git archive -v -o activesupport-7.0.6-tests.txz v7.0.6 test/ +# cd rails/activesupport && git archive -v -o activesupport-7.0.7-tests.txz v7.0.7 test/ Source1: %{gem_name}-%{version}%{?prerelease}-tests.txz # The tools are needed for the test suite, are however unpackaged in gem file. # You may get them like so # git clone http://github.com/rails/rails.git --no-checkout -# cd rails && git archive -v -o rails-7.0.6-tools.txz v7.0.6 tools/ +# cd rails && git archive -v -o rails-7.0.7-tools.txz v7.0.7 tools/ Source2: rails-%{version}%{?prerelease}-tools.txz # Fixes for Minitest 5.16+ # https://github.com/rails/rails/pull/45380 @@ -132,6 +132,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Thu Aug 10 2023 Pavel Valena - 1:7.0.7-1 +- Update to activesupport 7.0.7. + * Sun Jul 23 2023 Pavel Valena - 1:7.0.6-1 - Update to activesupport 7.0.6. diff --git a/sources b/sources index d61f865..a45cb70 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (activesupport-7.0.6.gem) = 73e1dbd6774ba25db6e85087cf9407c99ebd457d047900d6b4253fdaed79d0413d66eae0768a247a17d0a85d633c116fc9c3abe37727ae8d8e9e35d08ee3d724 -SHA512 (activesupport-7.0.6-tests.txz) = 25cd5b15b3c0f4f7807a86eebf9b6444e791eae3dea42c29253835c88f035ed9b9ed3a1ffb16ad98dcc43a271006bee01904b4f8134ea4b0156d35d5bdf040f3 -SHA512 (rails-7.0.6-tools.txz) = ae7dab77c1a2b19e31005a46e2f85f79a838c84122e462ccaa4b19aa719bbc63e463211363eabac7ad7ab55b8ccb36479fae8ec0a77c8d412a5cdec862f33e53 +SHA512 (activesupport-7.0.7.gem) = 76babd1b0cc24ef47e19b58304574e3fd406a26707f2ecdf66037e7cf8aa111614be5b833b4ec7736305b392c5ac25239b4dbd05cff8cf0079ca943b7ace95e3 +SHA512 (activesupport-7.0.7-tests.txz) = 7f1c93406f0cbe5ec6badcc3b67009ec65447ede3c442391157ac1bb79322ae50d565df6b8967a7f391008e050f39cd0e55ec79f67236d5950a2ba4ad8acae73 +SHA512 (rails-7.0.7-tools.txz) = ab4a76b02989a7fae104d124ebb92137a5e428050b5faac65528a0a0881da2b7295187ba3a8d8ceb25bd136f69f64db50ab9f54ef595cea4d1f0ab256d84bbd6 From b451e6c74fb4f20d0ce22ca8057ca83279ead213 Mon Sep 17 00:00:00 2001 From: Pavel Valena Date: Mon, 28 Aug 2023 12:44:16 +0200 Subject: [PATCH 56/78] Update to activesupport 7.0.7.2. --- rubygem-activesupport.spec | 9 ++++++--- sources | 6 +++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index c15af1c..6e6e3f5 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -4,7 +4,7 @@ Name: rubygem-%{gem_name} Epoch: 1 -Version: 7.0.7 +Version: 7.0.7.2 Release: 1%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT @@ -13,12 +13,12 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}%{?prerelease}.gem # The activesupport gem doesn't ship with the test suite. # You may check it out like so # git clone http://github.com/rails/rails.git -# cd rails/activesupport && git archive -v -o activesupport-7.0.7-tests.txz v7.0.7 test/ +# cd rails/activesupport && git archive -v -o activesupport-7.0.7.2-tests.txz v7.0.7.2 test/ Source1: %{gem_name}-%{version}%{?prerelease}-tests.txz # The tools are needed for the test suite, are however unpackaged in gem file. # You may get them like so # git clone http://github.com/rails/rails.git --no-checkout -# cd rails && git archive -v -o rails-7.0.7-tools.txz v7.0.7 tools/ +# cd rails && git archive -v -o rails-7.0.7.2-tools.txz v7.0.7.2 tools/ Source2: rails-%{version}%{?prerelease}-tools.txz # Fixes for Minitest 5.16+ # https://github.com/rails/rails/pull/45380 @@ -132,6 +132,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Mon Aug 28 2023 Pavel Valena - 1:7.0.7.2-1 +- Update to activesupport 7.0.7.2. + * Thu Aug 10 2023 Pavel Valena - 1:7.0.7-1 - Update to activesupport 7.0.7. diff --git a/sources b/sources index a45cb70..25e0415 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (activesupport-7.0.7.gem) = 76babd1b0cc24ef47e19b58304574e3fd406a26707f2ecdf66037e7cf8aa111614be5b833b4ec7736305b392c5ac25239b4dbd05cff8cf0079ca943b7ace95e3 -SHA512 (activesupport-7.0.7-tests.txz) = 7f1c93406f0cbe5ec6badcc3b67009ec65447ede3c442391157ac1bb79322ae50d565df6b8967a7f391008e050f39cd0e55ec79f67236d5950a2ba4ad8acae73 -SHA512 (rails-7.0.7-tools.txz) = ab4a76b02989a7fae104d124ebb92137a5e428050b5faac65528a0a0881da2b7295187ba3a8d8ceb25bd136f69f64db50ab9f54ef595cea4d1f0ab256d84bbd6 +SHA512 (activesupport-7.0.7.2.gem) = afad2479aa9039e45420338765aeba9d959b904e8154faa73e94c730ce52c6747be21a2d91cb4a4371851233eaeba5f9dfe4c5bb246ca8529ff3b1170036a86f +SHA512 (activesupport-7.0.7.2-tests.txz) = 21d95541fd9cd76afbc8a8d57edaa914ae7f1f372851e2112bf1e725a00ebba80bf0ef3abfa6ccc190044ba5c314d40e149518b95ab8c5552d4367e2c72d3383 +SHA512 (rails-7.0.7.2-tools.txz) = 409fe6374d785cfb5d8804fc5d993f53d2293891dbdd21c85af614f015c56d29c234716eed69862a71f758f62558582b61c8c4a07b56645e928dde57ef947080 From 38c49dd44270abe287d5e6161aeb0712b504987d Mon Sep 17 00:00:00 2001 From: Pavel Valena Date: Sun, 10 Sep 2023 03:39:41 +0200 Subject: [PATCH 57/78] Update to activesupport 7.0.8 also add tzdata dependency for tests. --- rubygem-activesupport.spec | 10 +++++++--- sources | 6 +++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 6e6e3f5..b412927 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -4,7 +4,7 @@ Name: rubygem-%{gem_name} Epoch: 1 -Version: 7.0.7.2 +Version: 7.0.8 Release: 1%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT @@ -13,12 +13,12 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}%{?prerelease}.gem # The activesupport gem doesn't ship with the test suite. # You may check it out like so # git clone http://github.com/rails/rails.git -# cd rails/activesupport && git archive -v -o activesupport-7.0.7.2-tests.txz v7.0.7.2 test/ +# cd rails/activesupport && git archive -v -o activesupport-7.0.8-tests.txz v7.0.8 test/ Source1: %{gem_name}-%{version}%{?prerelease}-tests.txz # The tools are needed for the test suite, are however unpackaged in gem file. # You may get them like so # git clone http://github.com/rails/rails.git --no-checkout -# cd rails && git archive -v -o rails-7.0.7.2-tools.txz v7.0.7.2 tools/ +# cd rails && git archive -v -o rails-7.0.8-tools.txz v7.0.8 tools/ Source2: rails-%{version}%{?prerelease}-tools.txz # Fixes for Minitest 5.16+ # https://github.com/rails/rails/pull/45380 @@ -49,6 +49,7 @@ BuildRequires: rubygem(listen) BuildRequires: rubygem(redis) BuildRequires: rubygem(rexml) BuildRequires: memcached +BuildRequires: tzdata BuildArch: noarch @@ -132,6 +133,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Sun Sep 10 2023 Pavel Valena - 1:7.0.8-1 +- Update to activesupport 7.0.8. + * Mon Aug 28 2023 Pavel Valena - 1:7.0.7.2-1 - Update to activesupport 7.0.7.2. diff --git a/sources b/sources index 25e0415..c1d38c3 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (activesupport-7.0.7.2.gem) = afad2479aa9039e45420338765aeba9d959b904e8154faa73e94c730ce52c6747be21a2d91cb4a4371851233eaeba5f9dfe4c5bb246ca8529ff3b1170036a86f -SHA512 (activesupport-7.0.7.2-tests.txz) = 21d95541fd9cd76afbc8a8d57edaa914ae7f1f372851e2112bf1e725a00ebba80bf0ef3abfa6ccc190044ba5c314d40e149518b95ab8c5552d4367e2c72d3383 -SHA512 (rails-7.0.7.2-tools.txz) = 409fe6374d785cfb5d8804fc5d993f53d2293891dbdd21c85af614f015c56d29c234716eed69862a71f758f62558582b61c8c4a07b56645e928dde57ef947080 +SHA512 (activesupport-7.0.8.gem) = d3f45452751a3ff4acd534ad6a71e5747d2e64683b562b99c3f97ca3980424aa0093d028fab94a6429410fb4878c6e34a2af2ad8c0c04358648e180a732250dc +SHA512 (activesupport-7.0.8-tests.txz) = 153739dca3cd20938e7f1bb255d330e51e91fb9901b6b2ff5ffd76277e44e38090b1037f9eeb574d8ef429c1d3d689dbeb27b9d02ff33fe8f21cef2472a2e8b2 +SHA512 (rails-7.0.8-tools.txz) = a67b43ecabe47d23bd437651c97c87e1323dc2eb20d0fffa2c8f0d75fae7502571c3a2633c5bdeb9cc4a383c88b5eade49d55efe895857285b3186b6d4da4b26 From 0b918bc76ae06f8dbf6de5f0b281b4f90aeaeb30 Mon Sep 17 00:00:00 2001 From: Pavel Valena Date: Sun, 24 Sep 2023 17:40:39 +0200 Subject: [PATCH 58/78] Add tzdata as runtime dependency otherwise we get a lot of build failures in other packages. Caused by: https://fedoraproject.org/wiki/Changes/AllowRemovalOfTzdata --- rubygem-activesupport.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index b412927..e0ac9e0 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -32,6 +32,10 @@ Patch3: rubygem-activesupport-7.0.2.3-Fix-tests-for-minitest-5.16.patch Requires: rubygem(bigdecimal) Requires: rubygem(json) +# Runtime dependency, lot of build failures in other packages. +# https://fedoraproject.org/wiki/Changes/AllowRemovalOfTzdata +Requires: tzdata + # Let's keep Requires and BuildRequires sorted alphabeticaly BuildRequires: ruby(release) BuildRequires: rubygems-devel From 28b148f2fbab5763b53c06beaa210b8fb1d30ef3 Mon Sep 17 00:00:00 2001 From: Pavel Valena Date: Sun, 24 Sep 2023 18:30:28 +0200 Subject: [PATCH 59/78] Add forgotten changelog entry for 0b918bc. --- rubygem-activesupport.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index e0ac9e0..b3827ea 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -5,7 +5,7 @@ Name: rubygem-%{gem_name} Epoch: 1 Version: 7.0.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT URL: http://rubyonrails.org @@ -137,6 +137,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Sun Sep 24 2023 Pavel Valena - 1:7.0.8-2 +- Add tzdata as a runtime dependency. + * Sun Sep 10 2023 Pavel Valena - 1:7.0.8-1 - Update to activesupport 7.0.8. From e8270956dbc8e00b58eda5d9ef30f0dad0311aee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Fri, 15 Dec 2023 17:52:05 +0100 Subject: [PATCH 60/78] Add explicit dependencies to avoid Ruby 3.3 warnings. We should be able to drop these once more recent AS (likely 7.0.8) is released upstream. --- rubygem-activesupport.spec | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index b3827ea..2a158c0 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -5,7 +5,7 @@ Name: rubygem-%{gem_name} Epoch: 1 Version: 7.0.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT URL: http://rubyonrails.org @@ -27,9 +27,8 @@ Patch2: rubygem-activesupport-7.0.2.3-Remove-the-multi-call-form-of-assert_calle # https://github.com/rails/rails/pull/45370 Patch3: rubygem-activesupport-7.0.2.3-Fix-tests-for-minitest-5.16.patch -# ruby package has just soft dependency on rubygem({bigdecimal,json}), while -# ActiveSupport always requires them. -Requires: rubygem(bigdecimal) +# Ruby package has just soft dependency on rubygem(json), while +# ActiveSupport always requires it. Requires: rubygem(json) # Runtime dependency, lot of build failures in other packages. @@ -80,6 +79,14 @@ pushd %{_builddir} %patch 2 -p2 popd +# Add several dependencies to avoid Ruby 3.3 warnings. +# https://github.com/rails/rails/commit/81699b52d2acff1840e3ace5e59412f4fa3934ab +%gemspec_add_dep -g base64 +%gemspec_add_dep -g drb +%gemspec_add_dep -g mutex_m +# https://github.com/rails/rails/commit/a77535c74c7047a517cc45ff8ecb416ea439c28d +%gemspec_add_dep -g bigdecimal + %build gem build ../%{gem_name}-%{version}%{?prerelease}.gemspec %gem_install @@ -137,6 +144,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Fri Dec 15 2023 Vít Ondruch - 1:7.0.8-3 +- Add explicit dependencies to avoid Ruby 3.3 warnings. + * Sun Sep 24 2023 Pavel Valena - 1:7.0.8-2 - Add tzdata as a runtime dependency. From 5c1631ea64c4b3ea0121437f481c99309212ecdf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 12:25:30 +0000 Subject: [PATCH 61/78] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- rubygem-activesupport.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 2a158c0..10588dd 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -5,7 +5,7 @@ Name: rubygem-%{gem_name} Epoch: 1 Version: 7.0.8 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT URL: http://rubyonrails.org @@ -144,6 +144,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 1:7.0.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Dec 15 2023 Vít Ondruch - 1:7.0.8-3 - Add explicit dependencies to avoid Ruby 3.3 warnings. From 7367a000b67a5a73d8b7a5aa43468688d7f8bb00 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jan 2024 16:33:14 +0000 Subject: [PATCH 62/78] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- rubygem-activesupport.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 10588dd..ac07b91 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -5,7 +5,7 @@ Name: rubygem-%{gem_name} Epoch: 1 Version: 7.0.8 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT URL: http://rubyonrails.org @@ -144,6 +144,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Fri Jan 26 2024 Fedora Release Engineering - 1:7.0.8-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 1:7.0.8-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 71e469e6d01de68e91af740158d6dd4b1549ea02 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 24 May 2024 14:22:43 +0900 Subject: [PATCH 63/78] Backport upstream fix for test failure wrt ruby side Object#dup behavior change --- ...ort-7.0.2.3-update-method_duplicable.patch | 112 ++++++++++++++++++ rubygem-activesupport.spec | 11 +- 2 files changed, 122 insertions(+), 1 deletion(-) create mode 100644 rubygem-activesupport-7.0.2.3-update-method_duplicable.patch diff --git a/rubygem-activesupport-7.0.2.3-update-method_duplicable.patch b/rubygem-activesupport-7.0.2.3-update-method_duplicable.patch new file mode 100644 index 0000000..81b8197 --- /dev/null +++ b/rubygem-activesupport-7.0.2.3-update-method_duplicable.patch @@ -0,0 +1,112 @@ +From ca6995a80cb526958001e18d3b06da6587cd07eb Mon Sep 17 00:00:00 2001 +From: Jean Boussier +Date: Wed, 14 Feb 2024 09:52:55 +0100 +Subject: [PATCH] Update Method#duplicable? to be consistent with Ruby 3.4 + +Fix: https://github.com/rails/rails/issues/51075 + +`Method` and `UnboundMethod` used to raise on `#dup`, but not `#clone`, +this wasn't so much a feature, but a bug. + +It was fixed in https://github.com/ruby/ruby/pull/9926. +--- + .../core_ext/object/duplicable.rb | 39 ++++++++++++------- + .../test/core_ext/object/duplicable_test.rb | 28 ++++++++----- + 2 files changed, 42 insertions(+), 25 deletions(-) + +diff --git a/activesupport/lib/active_support/core_ext/object/duplicable.rb b/activesupport/lib/active_support/core_ext/object/duplicable.rb +index 6fdf6d810ffb9..505455fe54bf3 100644 +--- a/activesupport/lib/active_support/core_ext/object/duplicable.rb ++++ b/activesupport/lib/active_support/core_ext/object/duplicable.rb +@@ -28,23 +28,32 @@ def duplicable? + end + end + +-class Method +- # Methods are not duplicable: +- # +- # method(:puts).duplicable? # => false +- # method(:puts).dup # => TypeError: allocator undefined for Method +- def duplicable? +- false +- end ++methods_are_duplicable = begin ++ Object.instance_method(:duplicable?).dup ++ true ++rescue TypeError ++ false + end + +-class UnboundMethod +- # Unbound methods are not duplicable: +- # +- # method(:puts).unbind.duplicable? # => false +- # method(:puts).unbind.dup # => TypeError: allocator undefined for UnboundMethod +- def duplicable? +- false ++unless methods_are_duplicable ++ class Method ++ # Methods are not duplicable: ++ # ++ # method(:puts).duplicable? # => false ++ # method(:puts).dup # => TypeError: allocator undefined for Method ++ def duplicable? ++ false ++ end ++ end ++ ++ class UnboundMethod ++ # Unbound methods are not duplicable: ++ # ++ # method(:puts).unbind.duplicable? # => false ++ # method(:puts).unbind.dup # => TypeError: allocator undefined for UnboundMethod ++ def duplicable? ++ false ++ end + end + end + +diff --git a/activesupport/test/core_ext/object/duplicable_test.rb b/activesupport/test/core_ext/object/duplicable_test.rb +index 07d9a3df4adc5..58de295719333 100644 +--- a/activesupport/test/core_ext/object/duplicable_test.rb ++++ b/activesupport/test/core_ext/object/duplicable_test.rb +@@ -6,21 +6,26 @@ + require "active_support/core_ext/numeric/time" + + class DuplicableTest < ActiveSupport::TestCase +- RAISE_DUP = [method(:puts), method(:puts).unbind, Class.new.include(Singleton).instance] +- ALLOW_DUP = ["1", "symbol_from_string".to_sym, Object.new, /foo/, [], {}, Time.now, Class.new, Module.new, BigDecimal("4.56"), nil, false, true, 1, 2.3, Complex(1), Rational(1)] ++ OBJECTS = [ ++ method(:puts), method(:puts).unbind, Class.new.include(Singleton).instance, ++ "1", "symbol_from_string".to_sym, Object.new, /foo/, [], {}, Time.now, Class.new, ++ Module.new, BigDecimal("4.56"), nil, false, true, 1, 2.3, Complex(1), Rational(1), ++ ] + +- def test_duplicable +- rubinius_skip "* Method#dup is allowed at the moment on Rubinius\n" \ +- "* https://github.com/rubinius/rubinius/issues/3089" +- +- RAISE_DUP.each do |v| +- assert_not v.duplicable?, "#{ v.inspect } should not be duplicable" +- assert_raises(TypeError, v.class.name) { v.dup } +- end ++ OBJECTS.each do |v| ++ test "#{v.class}#duplicable? matches #{v.class}#dup behavior" do ++ duplicable = begin ++ v.dup ++ true ++ rescue TypeError ++ false ++ end + +- ALLOW_DUP.each do |v| +- assert v.duplicable?, "#{ v.class } should be duplicable" +- assert_nothing_raised { v.dup } ++ if duplicable ++ assert_predicate v, :duplicable? ++ else ++ assert_not_predicate v, :duplicable? ++ end + end + end + end diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index ac07b91..8a2bb48 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -5,7 +5,7 @@ Name: rubygem-%{gem_name} Epoch: 1 Version: 7.0.8 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT URL: http://rubyonrails.org @@ -26,6 +26,8 @@ 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 +# https://github.com/rails/rails/pull/51079 +Patch4: rubygem-activesupport-7.0.2.3-update-method_duplicable.patch # Ruby package has just soft dependency on rubygem(json), while # ActiveSupport always requires it. @@ -74,6 +76,9 @@ Documentation for %{name}. %patch 1 -p2 %patch 3 -p2 +mv %{_builddir}/test . +%patch 4 -p2 +mv test %{_builddir} pushd %{_builddir} %patch 2 -p2 @@ -144,6 +149,10 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Fri May 24 2024 Mamoru TASAKA - 1:7.0.8-6 +- Backport upstream fix for test failure wrt ruby side + Object#dup behavior change + * Fri Jan 26 2024 Fedora Release Engineering - 1:7.0.8-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 3c2b97f8602f29069dcfd3e85c7629b7ef5efb40 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 19:01:53 +0000 Subject: [PATCH 64/78] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- rubygem-activesupport.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 8a2bb48..aead8f2 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -5,7 +5,7 @@ Name: rubygem-%{gem_name} Epoch: 1 Version: 7.0.8 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT URL: http://rubyonrails.org @@ -149,6 +149,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 1:7.0.8-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri May 24 2024 Mamoru TASAKA - 1:7.0.8-6 - Backport upstream fix for test failure wrt ruby side Object#dup behavior change From c8bcfeeef1a1584183f72054f81af67b76456701 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Mon, 4 Nov 2024 17:52:03 +0100 Subject: [PATCH 65/78] Drop mutex_m dependency to ease Ruby 3.4 compatibility. --- ...ort-7.2.0-Drop-dependency-on-mutex-m.patch | 71 +++++++++++++++++++ rubygem-activesupport.spec | 11 ++- 2 files changed, 80 insertions(+), 2 deletions(-) create mode 100644 rubygem-activesupport-7.2.0-Drop-dependency-on-mutex-m.patch diff --git a/rubygem-activesupport-7.2.0-Drop-dependency-on-mutex-m.patch b/rubygem-activesupport-7.2.0-Drop-dependency-on-mutex-m.patch new file mode 100644 index 0000000..881c079 --- /dev/null +++ b/rubygem-activesupport-7.2.0-Drop-dependency-on-mutex-m.patch @@ -0,0 +1,71 @@ +From bcdeea5da7657375df21a856135ae7a66a8c3812 Mon Sep 17 00:00:00 2001 +From: Jean Boussier +Date: Tue, 17 Oct 2023 17:46:48 +0200 +Subject: [PATCH] Drop dependency on mutex_m + +It used to be stdlib but is being extracted in modern rubies. + +Overall its usefulness is dubious. In all cases it is included in +Rails, it's only for the `synchronize` method, but end up exposing +a dozen other useless methods. + +In the end just using a Mutex is clearer and simpler. + +In some cases we can even get away with a single mutex in a constant. +--- + .../lib/active_support/notifications/fanout.rb | 11 ++++------- + 1 file changed, 4 insertions(+), 7 deletions(-) + +diff --git a/activesupport/lib/active_support/notifications/fanout.rb b/activesupport/lib/active_support/notifications/fanout.rb +index a84de150c0d63..2bc782ecee2cc 100644 +--- a/activesupport/lib/active_support/notifications/fanout.rb ++++ b/activesupport/lib/active_support/notifications/fanout.rb +@@ -1,6 +1,5 @@ + # frozen_string_literal: true + +-require "mutex_m" + require "concurrent/map" + require "set" + require "active_support/core_ext/object/try" +@@ -22,13 +21,11 @@ def iterate_guarding_exceptions(listeners) + # + # This class is thread safe. All methods are reentrant. + class Fanout +- include Mutex_m +- + def initialize ++ @mutex = Mutex.new + @string_subscribers = Hash.new { |h, k| h[k] = [] } + @other_subscribers = [] + @listeners_for = Concurrent::Map.new +- super + end + + def subscribe(pattern = nil, callable = nil, monotonic: false, &block) +@@ -33,7 +30,7 @@ def inspect # :nodoc: + + def subscribe(pattern = nil, callable = nil, monotonic: false, &block) + subscriber = Subscribers.new(pattern, callable || block, monotonic) +- synchronize do ++ @mutex.synchronize do + case pattern + when String + @string_subscribers[pattern] << subscriber +@@ -49,7 +46,7 @@ def subscribe(pattern = nil, callable = nil, monotonic: false, &block) + end + + def unsubscribe(subscriber_or_name) +- synchronize do ++ @mutex.synchronize do + case subscriber_or_name + when String + @string_subscribers[subscriber_or_name].clear +@@ -107,7 +104,7 @@ def publish_event(event) + + def listeners_for(name) + # this is correctly done double-checked locking (Concurrent::Map's lookups have volatile semantics) +- @listeners_for[name] || synchronize do ++ @listeners_for[name] || @mutex.synchronize do + # use synchronisation when accessing @subscribers + @listeners_for[name] ||= + @string_subscribers[name] + @other_subscribers.select { |s| s.subscribed_to?(name) } diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index aead8f2..1b87637 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -5,7 +5,7 @@ Name: rubygem-%{gem_name} Epoch: 1 Version: 7.0.8 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT URL: http://rubyonrails.org @@ -28,6 +28,9 @@ Patch2: rubygem-activesupport-7.0.2.3-Remove-the-multi-call-form-of-assert_calle Patch3: rubygem-activesupport-7.0.2.3-Fix-tests-for-minitest-5.16.patch # https://github.com/rails/rails/pull/51079 Patch4: rubygem-activesupport-7.0.2.3-update-method_duplicable.patch +# Drop mutex_m dependency to ease Ruby 3.4 compatibility. +# https://github.com/rails/rails/pull/49674 +Patch5: rubygem-activesupport-7.2.0-Drop-dependency-on-mutex-m.patch # Ruby package has just soft dependency on rubygem(json), while # ActiveSupport always requires it. @@ -46,6 +49,7 @@ BuildRequires: rubygem(builder) BuildRequires: rubygem(concurrent-ruby) BuildRequires: rubygem(connection_pool) BuildRequires: rubygem(dalli) +BuildRequires: rubygem(drb) BuildRequires: (rubygem(i18n) >= 0.7 with rubygem(i18n) < 2) BuildRequires: rubygem(minitest) >= 5.0.0 BuildRequires: rubygem(rack) @@ -79,6 +83,7 @@ Documentation for %{name}. mv %{_builddir}/test . %patch 4 -p2 mv test %{_builddir} +%patch 5 -p2 pushd %{_builddir} %patch 2 -p2 @@ -88,7 +93,6 @@ popd # https://github.com/rails/rails/commit/81699b52d2acff1840e3ace5e59412f4fa3934ab %gemspec_add_dep -g base64 %gemspec_add_dep -g drb -%gemspec_add_dep -g mutex_m # https://github.com/rails/rails/commit/a77535c74c7047a517cc45ff8ecb416ea439c28d %gemspec_add_dep -g bigdecimal @@ -149,6 +153,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Mon Nov 04 2024 Vít Ondruch - 1:7.0.8-8 +- Ruby 3.4 compatibility fixes. + * Fri Jul 19 2024 Fedora Release Engineering - 1:7.0.8-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 99595e7ab24128da2a26b1ad7d1376a53e860716 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 5 Nov 2024 14:31:52 +0100 Subject: [PATCH 66/78] Ruby 3.4 backtrace compatibility. --- ...-for-compatibility-with-Ruby-3-4-dev.patch | 139 ++++++++++++++++++ rubygem-activesupport.spec | 6 +- 2 files changed, 144 insertions(+), 1 deletion(-) create mode 100644 rubygem-activesupport-7.2.0-Update-test-suite-for-compatibility-with-Ruby-3-4-dev.patch diff --git a/rubygem-activesupport-7.2.0-Update-test-suite-for-compatibility-with-Ruby-3-4-dev.patch b/rubygem-activesupport-7.2.0-Update-test-suite-for-compatibility-with-Ruby-3-4-dev.patch new file mode 100644 index 0000000..d9e74ea --- /dev/null +++ b/rubygem-activesupport-7.2.0-Update-test-suite-for-compatibility-with-Ruby-3-4-dev.patch @@ -0,0 +1,139 @@ +From 50daadaa71f4db88cef3080afde51e203c700e67 Mon Sep 17 00:00:00 2001 +From: Jean Boussier +Date: Fri, 16 Feb 2024 09:53:45 +0100 +Subject: [PATCH] Update test suite for compatibility with Ruby 3.4-dev + +https://bugs.ruby-lang.org/issues/19117 and https://bugs.ruby-lang.org/issues/16495 +slightly change how backtrace are rendered which makes a few tests fail. +--- + activesupport/test/callbacks_test.rb | 57 ++++++++++----- + activesupport/test/core_ext/module_test.rb | 4 +- + .../test/core_ext/time_with_zone_test.rb | 2 +- + activesupport/test/test_case_test.rb | 4 +- + 4 files changed, 45 insertions(+), 22 deletions(-) + +diff --git a/activesupport/test/callbacks_test.rb b/activesupport/test/callbacks_test.rb +index 1083964eca0e7..b38da7a6acd5b 100644 +--- a/activesupport/test/callbacks_test.rb ++++ b/activesupport/test/callbacks_test.rb +@@ -473,18 +473,33 @@ def test_tidy_call_stack + # callbacks that have been invoked, if there are any (plus + # whatever the callbacks do themselves, of course). + +- assert_equal [ +- "block in save", +- "block in run_callbacks", +- "tweedle_deedle", +- "block in run_callbacks", +- "w0tyes", +- "block in run_callbacks", +- "tweedle_dum", +- "block in run_callbacks", +- "run_callbacks", +- "save" +- ], call_stack.map(&:label) ++ if RUBY_VERSION >= "3.4" ++ assert_equal [ ++ "block in CallbacksTest::MySlate#save", ++ "block in ActiveSupport::Callbacks#run_callbacks", ++ "CallbacksTest::AroundPerson#tweedle_deedle", ++ "block in ActiveSupport::Callbacks#run_callbacks", ++ "CallbacksTest::AroundPerson#w0tyes", ++ "block in ActiveSupport::Callbacks#run_callbacks", ++ "CallbacksTest::AroundPerson#tweedle_dum", ++ "block in ActiveSupport::Callbacks#run_callbacks", ++ "ActiveSupport::Callbacks#run_callbacks", ++ "CallbacksTest::MySlate#save", ++ ].join("\n"), call_stack.map(&:label).join("\n") ++ else ++ assert_equal [ ++ "block in save", ++ "block in run_callbacks", ++ "tweedle_deedle", ++ "block in run_callbacks", ++ "w0tyes", ++ "block in run_callbacks", ++ "tweedle_dum", ++ "block in run_callbacks", ++ "run_callbacks", ++ "save", ++ ].join("\n"), call_stack.map(&:label).join("\n") ++ end + end + + def test_short_call_stack +@@ -503,11 +518,19 @@ def test_short_call_stack + # there should be just one line. run_callbacks yields directly + # back to its caller. + +- assert_equal [ +- "block in save", +- "run_callbacks", +- "save" +- ], call_stack.map(&:label) ++ if RUBY_VERSION >= "3.4" ++ assert_equal [ ++ "block in CallbacksTest::Person#save", ++ "ActiveSupport::Callbacks#run_callbacks", ++ "CallbacksTest::Person#save", ++ ].join("\n"), call_stack.map(&:label).join("\n") ++ else ++ assert_equal [ ++ "block in save", ++ "run_callbacks", ++ "save", ++ ].join("\n"), call_stack.map(&:label).join("\n") ++ end + end + end + +diff --git a/activesupport/test/core_ext/module_test.rb b/activesupport/test/core_ext/module_test.rb +index d5899c646ab8b..23fee4bf125cd 100644 +--- a/activesupport/test/core_ext/module_test.rb ++++ b/activesupport/test/core_ext/module_test.rb +@@ -394,7 +394,7 @@ def test_delegate_missing_to_does_not_delegate_to_private_methods + DecoratedReserved.new(@david).private_name + end + +- assert_match(/undefined method `private_name' for/, e.message) ++ assert_match(/undefined method [`']private_name' for/, e.message) + end + + def test_delegate_missing_to_does_not_delegate_to_fake_methods +@@ -402,7 +402,7 @@ def test_delegate_missing_to_does_not_delegate_to_fake_methods + DecoratedReserved.new(@david).my_fake_method + end + +- assert_match(/undefined method `my_fake_method' for/, e.message) ++ assert_match(/undefined method [`']my_fake_method' for/, e.message) + end + + def test_delegate_missing_to_raises_delegation_error_if_target_nil +diff --git a/activesupport/test/core_ext/time_with_zone_test.rb b/activesupport/test/core_ext/time_with_zone_test.rb +index ff4170dd82875..19fc50087809c 100644 +--- a/activesupport/test/core_ext/time_with_zone_test.rb ++++ b/activesupport/test/core_ext/time_with_zone_test.rb +@@ -1113,7 +1113,7 @@ def test_no_method_error_has_proper_context + e = assert_raises(NoMethodError) { + @twz.this_method_does_not_exist + } +- assert_match(/undefined method `this_method_does_not_exist' for.*ActiveSupport::TimeWithZone/, e.message) ++ assert_match(/undefined method [`']this_method_does_not_exist' for.*ActiveSupport::TimeWithZone/, e.message) + assert_no_match "rescue", e.backtrace.first + end + end +diff --git a/activesupport/test/test_case_test.rb b/activesupport/test/test_case_test.rb +index dc2c2772996d7..05f1280790f3b 100644 +--- a/activesupport/test/test_case_test.rb ++++ b/activesupport/test/test_case_test.rb +@@ -391,8 +391,8 @@ def test_fails_and_warning_is_logged_if_wrong_error_caught + Other block based assertions (e.g. `assert_no_changes`) can be used, as long as `assert_raises` is inside their block. + MSG + assert @out.string.include?(expected), @out.string +- assert error.message.include?("ArgumentError: ArgumentError") +- assert error.message.include?("in `block (2 levels) in run_test_that_should_fail_confusingly'") ++ assert_includes error.message, "ArgumentError: ArgumentError" ++ assert_includes error.message, "run_test_that_should_fail_confusingly" + end + + private diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 1b87637..2bffd91 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -31,6 +31,9 @@ Patch4: rubygem-activesupport-7.0.2.3-update-method_duplicable.patch # Drop mutex_m dependency to ease Ruby 3.4 compatibility. # https://github.com/rails/rails/pull/49674 Patch5: rubygem-activesupport-7.2.0-Drop-dependency-on-mutex-m.patch +# Ruby 3.4 backtrace compatibility. +# https://github.com/rails/rails/pull/51101 +Patch6: rubygem-activesupport-7.2.0-Update-test-suite-for-compatibility-with-Ruby-3-4-dev.patch # Ruby package has just soft dependency on rubygem(json), while # ActiveSupport always requires it. @@ -87,6 +90,7 @@ mv test %{_builddir} pushd %{_builddir} %patch 2 -p2 +%patch 6 -p2 popd # Add several dependencies to avoid Ruby 3.3 warnings. @@ -109,7 +113,7 @@ cp -a .%{gem_dir}/* \ pushd .%{gem_instdir} # Move the tests into place ln -s %{_builddir}/tools .. -mv %{_builddir}/test . +cp -a %{_builddir}/test . # These tests are really unstable, but they seems to be passing upstream :/ # mem_cache_store_test: These tests do not pass in Koji; but work locally From cbc3c77d459a21d11fd32a2adc2868c04c8989be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 5 Nov 2024 14:44:40 +0100 Subject: [PATCH 67/78] Ruby 3.4 `Hash#inspect` compatibility. --- ...ort-7.0.2.3-update-method_duplicable.patch | 5 ++-- ...test-suite-for-Ruby-3-4-Hash-inspect.patch | 24 +++++++++++++++++++ rubygem-activesupport.spec | 4 ++++ 3 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 rubygem-activesupport-8.0.0-Update-Active-Support-test-suite-for-Ruby-3-4-Hash-inspect.patch diff --git a/rubygem-activesupport-7.0.2.3-update-method_duplicable.patch b/rubygem-activesupport-7.0.2.3-update-method_duplicable.patch index 81b8197..96e9542 100644 --- a/rubygem-activesupport-7.0.2.3-update-method_duplicable.patch +++ b/rubygem-activesupport-7.0.2.3-update-method_duplicable.patch @@ -10,9 +10,8 @@ this wasn't so much a feature, but a bug. It was fixed in https://github.com/ruby/ruby/pull/9926. --- - .../core_ext/object/duplicable.rb | 39 ++++++++++++------- - .../test/core_ext/object/duplicable_test.rb | 28 ++++++++----- - 2 files changed, 42 insertions(+), 25 deletions(-) + .../test/core_ext/object/duplicable_test.rb | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/activesupport/lib/active_support/core_ext/object/duplicable.rb b/activesupport/lib/active_support/core_ext/object/duplicable.rb index 6fdf6d810ffb9..505455fe54bf3 100644 diff --git a/rubygem-activesupport-8.0.0-Update-Active-Support-test-suite-for-Ruby-3-4-Hash-inspect.patch b/rubygem-activesupport-8.0.0-Update-Active-Support-test-suite-for-Ruby-3-4-Hash-inspect.patch new file mode 100644 index 0000000..49c1b03 --- /dev/null +++ b/rubygem-activesupport-8.0.0-Update-Active-Support-test-suite-for-Ruby-3-4-Hash-inspect.patch @@ -0,0 +1,24 @@ +From 95c2ee8e0503215ad94629383311301742ebf012 Mon Sep 17 00:00:00 2001 +From: Jean Boussier +Date: Sat, 5 Oct 2024 12:25:51 -0400 +Subject: [PATCH] Update Active Support test suite for Ruby 3.4 Hash#inspect + +Ref: https://github.com/ruby/ruby/pull/10924 +Ref: https://bugs.ruby-lang.org/issues/20433 +--- + activesupport/test/broadcast_logger_test.rb | 4 ++-- + activesupport/test/ordered_options_test.rb | 18 +++++++++--------- + 2 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/activesupport/test/ordered_options_test.rb b/activesupport/test/ordered_options_test.rb +index 8eca0fe73bec7..eb8b50c62f511 100644 +--- a/activesupport/test/ordered_options_test.rb ++++ b/activesupport/test/ordered_options_test.rb +@@ -123,6 +123,6 @@ def test_inspect + a.foo = :bar + a[:baz] = :quz + +- assert_equal "#:bar, :baz=>:quz}>", a.inspect ++ assert_equal "#", a.inspect + end + end diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 2bffd91..3d10bab 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -34,6 +34,9 @@ Patch5: rubygem-activesupport-7.2.0-Drop-dependency-on-mutex-m.patch # Ruby 3.4 backtrace compatibility. # https://github.com/rails/rails/pull/51101 Patch6: rubygem-activesupport-7.2.0-Update-test-suite-for-compatibility-with-Ruby-3-4-dev.patch +# Ruby 3.4 `Hash#inspect` compatibility. +# https://github.com/rails/rails/commit/95c2ee8e0503215ad94629383311301742ebf012 +Patch7: rubygem-activesupport-8.0.0-Update-Active-Support-test-suite-for-Ruby-3-4-Hash-inspect.patch # Ruby package has just soft dependency on rubygem(json), while # ActiveSupport always requires it. @@ -91,6 +94,7 @@ mv test %{_builddir} pushd %{_builddir} %patch 2 -p2 %patch 6 -p2 +%patch 7 -p2 popd # Add several dependencies to avoid Ruby 3.3 warnings. From c6c3886337f9c4be83f74a7a27664f3dd283b41a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 26 Nov 2024 17:41:25 +0100 Subject: [PATCH 68/78] Add extracted standard gems dependencies. --- rubygem-activesupport.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 3d10bab..55b30c2 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -5,7 +5,7 @@ Name: rubygem-%{gem_name} Epoch: 1 Version: 7.0.8 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT URL: http://rubyonrails.org @@ -97,12 +97,16 @@ pushd %{_builddir} %patch 7 -p2 popd -# Add several dependencies to avoid Ruby 3.3 warnings. +# Add several dependencies to avoid Ruby 3.3+ warnings. # https://github.com/rails/rails/commit/81699b52d2acff1840e3ace5e59412f4fa3934ab %gemspec_add_dep -g base64 %gemspec_add_dep -g drb # https://github.com/rails/rails/commit/a77535c74c7047a517cc45ff8ecb416ea439c28d %gemspec_add_dep -g bigdecimal +# https://github.com/rails/rails/commit/455b5f106e5a3eeba1e7139c63fd83dc0dd81caf +%gemspec_add_dep -g logger +%gemspec_add_dep -g securerandom +%gemspec_add_dep -g benchmark %build gem build ../%{gem_name}-%{version}%{?prerelease}.gemspec @@ -161,6 +165,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Tue Nov 26 2024 Vít Ondruch - 1:7.0.8-9 +- Add extracted standard gems dependencies. + * Mon Nov 04 2024 Vít Ondruch - 1:7.0.8-8 - Ruby 3.4 compatibility fixes. From 7120ebc8f8070b41fb0b8011b93081e97f9a5d7b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 22:57:12 +0000 Subject: [PATCH 69/78] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- rubygem-activesupport.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 55b30c2..e3bf87d 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -5,7 +5,7 @@ Name: rubygem-%{gem_name} Epoch: 1 Version: 7.0.8 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT URL: http://rubyonrails.org @@ -165,6 +165,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 1:7.0.8-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Tue Nov 26 2024 Vít Ondruch - 1:7.0.8-9 - Add extracted standard gems dependencies. From e978c62268c5edaa1495a6be8d66291699bdb398 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Thu, 23 Jan 2025 21:04:03 +0100 Subject: [PATCH 70/78] Fix compatibility with concurrent-ruby 1.3.5+ --- ...he-logger-gem-is-loaded-in-Rails-7-0.patch | 22 +++++++++++++++++++ rubygem-activesupport.spec | 10 ++++++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 rubygem-activesupport-7.0.8-Ensure-the-logger-gem-is-loaded-in-Rails-7-0.patch diff --git a/rubygem-activesupport-7.0.8-Ensure-the-logger-gem-is-loaded-in-Rails-7-0.patch b/rubygem-activesupport-7.0.8-Ensure-the-logger-gem-is-loaded-in-Rails-7-0.patch new file mode 100644 index 0000000..1430571 --- /dev/null +++ b/rubygem-activesupport-7.0.8-Ensure-the-logger-gem-is-loaded-in-Rails-7-0.patch @@ -0,0 +1,22 @@ +From 6a7c72c078715380bf24f029624e6b1fb3035c97 Mon Sep 17 00:00:00 2001 +From: Antti Hukkanen +Date: Thu, 16 Jan 2025 11:17:29 +0200 +Subject: [PATCH] Ensure the logger gem is loaded in Rails 7.0 + +Fix #54260, #54263 +--- + activesupport/lib/active_support/logger_thread_safe_level.rb | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/activesupport/lib/active_support/logger_thread_safe_level.rb b/activesupport/lib/active_support/logger_thread_safe_level.rb +index 042f484f8210d..aa84a7c5de5c6 100644 +--- a/activesupport/lib/active_support/logger_thread_safe_level.rb ++++ b/activesupport/lib/active_support/logger_thread_safe_level.rb +@@ -4,6 +4,7 @@ + require "active_support/core_ext/module/attribute_accessors" + require "concurrent" + require "fiber" ++require "logger" + + module ActiveSupport + module LoggerThreadSafeLevel # :nodoc: diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index e3bf87d..138237d 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -5,7 +5,7 @@ Name: rubygem-%{gem_name} Epoch: 1 Version: 7.0.8 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT URL: http://rubyonrails.org @@ -37,6 +37,10 @@ Patch6: rubygem-activesupport-7.2.0-Update-test-suite-for-compatibility-with-Rub # Ruby 3.4 `Hash#inspect` compatibility. # https://github.com/rails/rails/commit/95c2ee8e0503215ad94629383311301742ebf012 Patch7: rubygem-activesupport-8.0.0-Update-Active-Support-test-suite-for-Ruby-3-4-Hash-inspect.patch +# concurrent-ruby 1.3.5+ drops Logger dependency. Make sure to load Logger +# explicitly. +# https://github.com/rails/rails/pull/54264 +Patch8: rubygem-activesupport-7.0.8-Ensure-the-logger-gem-is-loaded-in-Rails-7-0.patch # Ruby package has just soft dependency on rubygem(json), while # ActiveSupport always requires it. @@ -90,6 +94,7 @@ mv %{_builddir}/test . %patch 4 -p2 mv test %{_builddir} %patch 5 -p2 +%patch 8 -p2 pushd %{_builddir} %patch 2 -p2 @@ -165,6 +170,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Thu Jan 23 2025 Vít Ondruch - 1:7.0.8-11 +- Fix compatibility with concurrent-ruby 1.3.5+ + * Sat Jan 18 2025 Fedora Release Engineering - 1:7.0.8-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 22a0f35c6743398309bc6226cab4c42633029d8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Mon, 20 Jan 2025 15:59:18 +0100 Subject: [PATCH 71/78] Update to Active Support 8.0.1. Related: rhbz#2238177 --- .gitignore | 2 +- ...-7.0.2.3-Fix-tests-for-minitest-5.16.patch | 72 --------- ...call-form-of-assert_called_with-test.patch | 39 ----- ...ulti-call-form-of-assert_called_with.patch | 39 ----- ...ort-7.0.2.3-update-method_duplicable.patch | 111 -------------- ...he-logger-gem-is-loaded-in-Rails-7-0.patch | 22 --- ...ort-7.2.0-Drop-dependency-on-mutex-m.patch | 71 --------- ...-for-compatibility-with-Ruby-3-4-dev.patch | 139 ------------------ ...test-suite-for-Ruby-3-4-Hash-inspect.patch | 24 --- rubygem-activesupport.spec | 127 +++++----------- sources | 5 +- test_common.rb | 20 +++ 12 files changed, 61 insertions(+), 610 deletions(-) delete mode 100644 rubygem-activesupport-7.0.2.3-Fix-tests-for-minitest-5.16.patch delete mode 100644 rubygem-activesupport-7.0.2.3-Remove-the-multi-call-form-of-assert_called_with-test.patch delete mode 100644 rubygem-activesupport-7.0.2.3-Remove-the-multi-call-form-of-assert_called_with.patch delete mode 100644 rubygem-activesupport-7.0.2.3-update-method_duplicable.patch delete mode 100644 rubygem-activesupport-7.0.8-Ensure-the-logger-gem-is-loaded-in-Rails-7-0.patch delete mode 100644 rubygem-activesupport-7.2.0-Drop-dependency-on-mutex-m.patch delete mode 100644 rubygem-activesupport-7.2.0-Update-test-suite-for-compatibility-with-Ruby-3-4-dev.patch delete mode 100644 rubygem-activesupport-8.0.0-Update-Active-Support-test-suite-for-Ruby-3-4-Hash-inspect.patch create mode 100644 test_common.rb diff --git a/.gitignore b/.gitignore index 1e332be..dd04ff5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ /activesupport-*.gem -/activesupport-*-tests.txz +/activesupport-*-tests.tar.gz /rails-*-tools.txz diff --git a/rubygem-activesupport-7.0.2.3-Fix-tests-for-minitest-5.16.patch b/rubygem-activesupport-7.0.2.3-Fix-tests-for-minitest-5.16.patch deleted file mode 100644 index 4f325b0..0000000 --- a/rubygem-activesupport-7.0.2.3-Fix-tests-for-minitest-5.16.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 9766eb4a833c26c64012230b96dd1157ebb8e8a2 Mon Sep 17 00:00:00 2001 -From: eileencodes -Date: Wed, 15 Jun 2022 12:44:11 -0400 -Subject: [PATCH] Fix tests for minitest 5.16 - -In minitest/minitest@6e06ac9 minitest changed such that it now accepts -`kwargs` instead of requiring kwargs to be shoved into the args array. -This is a good change but required some updates to our test code to get -the new version of minitest passing. - -Changes are as follows: - -1) Lock minitest to 5.15 for Ruby 2.7. We don't love this change but -it's pretty difficult to get 2.7 and 3.0 to play nicely together with -the new kwargs changes. Dropping 2.7 support isn't an option right -now for Rails. This is safe because all of the code changes here are -internal methods to Rails like assert_called_with. Applications -shouldn't be consuming them as they are no-doc'd. -2) Update the `assert_called_with` method to take any kwargs but also -the returns kwarg. -3) Update callers of `assert_called_with` to move the kwargs outside the -args array. -4) Update the message from marshaled exceptions. In 5.16 the exception -message is "result not reported" instead of "Wrapped undumpable -exception". - -Co-authored-by: Matthew Draper ---- - .../testing/method_call_assertions.rb | 22 +++- - 1 file changed, 20 insertions(+), 2 deletions(-) - -diff --git a/activesupport/lib/active_support/testing/method_call_assertions.rb b/activesupport/lib/active_support/testing/method_call_assertions.rb -index 72451faaa8cc4..f146eefce0354 100644 ---- a/activesupport/lib/active_support/testing/method_call_assertions.rb -+++ b/activesupport/lib/active_support/testing/method_call_assertions.rb -@@ -17,9 +17,9 @@ def assert_called(object, method_name, message = nil, times: 1, returns: nil, &b - assert_equal times, times_called, error - end - -- def assert_called_with(object, method_name, args, returns: nil, &block) -+ def assert_called_with(object, method_name, args, returns: false, **kwargs, &block) - mock = Minitest::Mock.new -- mock.expect(:call, returns, args) -+ expect_called_with(mock, args, returns: returns, **kwargs) - - object.stub(method_name, mock, &block) - -@@ -30,6 +30,24 @@ def assert_not_called(object, method_name, message = nil, &block) - assert_called(object, method_name, message, times: 0, &block) - end - -+ #-- -+ # This method is a temporary wrapper for mock.expect as part of -+ # the Minitest 5.16 / Ruby 3.0 kwargs transition. It can go away -+ # when we drop support for Ruby 2.7. -+ if Minitest::Mock.instance_method(:expect).parameters.map(&:first).include?(:keyrest) -+ def expect_called_with(mock, args, returns: false, **kwargs) -+ mock.expect(:call, returns, args, **kwargs) -+ end -+ else -+ def expect_called_with(mock, args, returns: false, **kwargs) -+ if !kwargs.empty? -+ mock.expect(:call, returns, [*args, kwargs]) -+ else -+ mock.expect(:call, returns, args) -+ end -+ end -+ end -+ - def assert_called_on_instance_of(klass, method_name, message = nil, times: 1, returns: nil) - times_called = 0 - klass.define_method("stubbed_#{method_name}") do |*| diff --git a/rubygem-activesupport-7.0.2.3-Remove-the-multi-call-form-of-assert_called_with-test.patch b/rubygem-activesupport-7.0.2.3-Remove-the-multi-call-form-of-assert_called_with-test.patch deleted file mode 100644 index 7baf418..0000000 --- a/rubygem-activesupport-7.0.2.3-Remove-the-multi-call-form-of-assert_called_with-test.patch +++ /dev/null @@ -1,39 +0,0 @@ -From df0de681dc1873534ecd2fc8371e1f2562984b68 Mon Sep 17 00:00:00 2001 -From: John Crepezzi -Date: Thu, 16 Jun 2022 08:34:05 -0400 -Subject: [PATCH] Remove the multi-call form of assert_called_with - -The `assert_called_with` helper allows passing a multi-dimensional array to -mock multiple calls to the same method for a given block. This works -fine now, but when adding support for real kwargs arguments to line up with -recent upgrades in Minitest, this approach is no longer workable because -we can't pass multiple sets of differing kwargs. - -Rather than complicated this method further, this commit removes the -multi-call form of `assert_called_with` and modifies the tests that -currently make use of that functionality to just use the underlying -`Minitest::Mock` calls. - -Co-authored-by: Eileen M. Uchitelle ---- - .../testing/method_call_assertions_test.rb | 7 -- - 1 file changed, 7 deletions(-) - -diff --git a/activesupport/test/testing/method_call_assertions_test.rb b/activesupport/test/testing/method_call_assertions_test.rb -index e75630d2e4228..4d59e0bd3c222 100644 ---- a/activesupport/test/testing/method_call_assertions_test.rb -+++ b/activesupport/test/testing/method_call_assertions_test.rb -@@ -82,13 +82,6 @@ def test_assert_called_with_failure - end - end - -- def test_assert_called_with_multiple_expected_arguments -- assert_called_with(@object, :<<, [ [ 1 ], [ 2 ] ]) do -- @object << 1 -- @object << 2 -- end -- end -- - def test_assert_called_on_instance_of_with_defaults_to_expect_once - assert_called_on_instance_of Level, :increment do - @object.increment diff --git a/rubygem-activesupport-7.0.2.3-Remove-the-multi-call-form-of-assert_called_with.patch b/rubygem-activesupport-7.0.2.3-Remove-the-multi-call-form-of-assert_called_with.patch deleted file mode 100644 index b368c92..0000000 --- a/rubygem-activesupport-7.0.2.3-Remove-the-multi-call-form-of-assert_called_with.patch +++ /dev/null @@ -1,39 +0,0 @@ -From df0de681dc1873534ecd2fc8371e1f2562984b68 Mon Sep 17 00:00:00 2001 -From: John Crepezzi -Date: Thu, 16 Jun 2022 08:34:05 -0400 -Subject: [PATCH] Remove the multi-call form of assert_called_with - -The `assert_called_with` helper allows passing a multi-dimensional array to -mock multiple calls to the same method for a given block. This works -fine now, but when adding support for real kwargs arguments to line up with -recent upgrades in Minitest, this approach is no longer workable because -we can't pass multiple sets of differing kwargs. - -Rather than complicated this method further, this commit removes the -multi-call form of `assert_called_with` and modifies the tests that -currently make use of that functionality to just use the underlying -`Minitest::Mock` calls. - -Co-authored-by: Eileen M. Uchitelle ---- - .../testing/method_call_assertions.rb | 7 +- - 1 file changed, 1 insertion(+), 6 deletions(-) - -diff --git a/activesupport/lib/active_support/testing/method_call_assertions.rb b/activesupport/lib/active_support/testing/method_call_assertions.rb -index c8d2dbaa52ab5..72451faaa8cc4 100644 ---- a/activesupport/lib/active_support/testing/method_call_assertions.rb -+++ b/activesupport/lib/active_support/testing/method_call_assertions.rb -@@ -19,12 +19,7 @@ def assert_called(object, method_name, message = nil, times: 1, returns: nil, &b - - def assert_called_with(object, method_name, args, returns: nil, &block) - mock = Minitest::Mock.new -- -- if args.all?(Array) -- args.each { |arg| mock.expect(:call, returns, arg) } -- else -- mock.expect(:call, returns, args) -- end -+ mock.expect(:call, returns, args) - - object.stub(method_name, mock, &block) - diff --git a/rubygem-activesupport-7.0.2.3-update-method_duplicable.patch b/rubygem-activesupport-7.0.2.3-update-method_duplicable.patch deleted file mode 100644 index 96e9542..0000000 --- a/rubygem-activesupport-7.0.2.3-update-method_duplicable.patch +++ /dev/null @@ -1,111 +0,0 @@ -From ca6995a80cb526958001e18d3b06da6587cd07eb Mon Sep 17 00:00:00 2001 -From: Jean Boussier -Date: Wed, 14 Feb 2024 09:52:55 +0100 -Subject: [PATCH] Update Method#duplicable? to be consistent with Ruby 3.4 - -Fix: https://github.com/rails/rails/issues/51075 - -`Method` and `UnboundMethod` used to raise on `#dup`, but not `#clone`, -this wasn't so much a feature, but a bug. - -It was fixed in https://github.com/ruby/ruby/pull/9926. ---- - .../test/core_ext/object/duplicable_test.rb | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/activesupport/lib/active_support/core_ext/object/duplicable.rb b/activesupport/lib/active_support/core_ext/object/duplicable.rb -index 6fdf6d810ffb9..505455fe54bf3 100644 ---- a/activesupport/lib/active_support/core_ext/object/duplicable.rb -+++ b/activesupport/lib/active_support/core_ext/object/duplicable.rb -@@ -28,23 +28,32 @@ def duplicable? - end - end - --class Method -- # Methods are not duplicable: -- # -- # method(:puts).duplicable? # => false -- # method(:puts).dup # => TypeError: allocator undefined for Method -- def duplicable? -- false -- end -+methods_are_duplicable = begin -+ Object.instance_method(:duplicable?).dup -+ true -+rescue TypeError -+ false - end - --class UnboundMethod -- # Unbound methods are not duplicable: -- # -- # method(:puts).unbind.duplicable? # => false -- # method(:puts).unbind.dup # => TypeError: allocator undefined for UnboundMethod -- def duplicable? -- false -+unless methods_are_duplicable -+ class Method -+ # Methods are not duplicable: -+ # -+ # method(:puts).duplicable? # => false -+ # method(:puts).dup # => TypeError: allocator undefined for Method -+ def duplicable? -+ false -+ end -+ end -+ -+ class UnboundMethod -+ # Unbound methods are not duplicable: -+ # -+ # method(:puts).unbind.duplicable? # => false -+ # method(:puts).unbind.dup # => TypeError: allocator undefined for UnboundMethod -+ def duplicable? -+ false -+ end - end - end - -diff --git a/activesupport/test/core_ext/object/duplicable_test.rb b/activesupport/test/core_ext/object/duplicable_test.rb -index 07d9a3df4adc5..58de295719333 100644 ---- a/activesupport/test/core_ext/object/duplicable_test.rb -+++ b/activesupport/test/core_ext/object/duplicable_test.rb -@@ -6,21 +6,26 @@ - require "active_support/core_ext/numeric/time" - - class DuplicableTest < ActiveSupport::TestCase -- RAISE_DUP = [method(:puts), method(:puts).unbind, Class.new.include(Singleton).instance] -- ALLOW_DUP = ["1", "symbol_from_string".to_sym, Object.new, /foo/, [], {}, Time.now, Class.new, Module.new, BigDecimal("4.56"), nil, false, true, 1, 2.3, Complex(1), Rational(1)] -+ OBJECTS = [ -+ method(:puts), method(:puts).unbind, Class.new.include(Singleton).instance, -+ "1", "symbol_from_string".to_sym, Object.new, /foo/, [], {}, Time.now, Class.new, -+ Module.new, BigDecimal("4.56"), nil, false, true, 1, 2.3, Complex(1), Rational(1), -+ ] - -- def test_duplicable -- rubinius_skip "* Method#dup is allowed at the moment on Rubinius\n" \ -- "* https://github.com/rubinius/rubinius/issues/3089" -- -- RAISE_DUP.each do |v| -- assert_not v.duplicable?, "#{ v.inspect } should not be duplicable" -- assert_raises(TypeError, v.class.name) { v.dup } -- end -+ OBJECTS.each do |v| -+ test "#{v.class}#duplicable? matches #{v.class}#dup behavior" do -+ duplicable = begin -+ v.dup -+ true -+ rescue TypeError -+ false -+ end - -- ALLOW_DUP.each do |v| -- assert v.duplicable?, "#{ v.class } should be duplicable" -- assert_nothing_raised { v.dup } -+ if duplicable -+ assert_predicate v, :duplicable? -+ else -+ assert_not_predicate v, :duplicable? -+ end - end - end - end diff --git a/rubygem-activesupport-7.0.8-Ensure-the-logger-gem-is-loaded-in-Rails-7-0.patch b/rubygem-activesupport-7.0.8-Ensure-the-logger-gem-is-loaded-in-Rails-7-0.patch deleted file mode 100644 index 1430571..0000000 --- a/rubygem-activesupport-7.0.8-Ensure-the-logger-gem-is-loaded-in-Rails-7-0.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 6a7c72c078715380bf24f029624e6b1fb3035c97 Mon Sep 17 00:00:00 2001 -From: Antti Hukkanen -Date: Thu, 16 Jan 2025 11:17:29 +0200 -Subject: [PATCH] Ensure the logger gem is loaded in Rails 7.0 - -Fix #54260, #54263 ---- - activesupport/lib/active_support/logger_thread_safe_level.rb | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/activesupport/lib/active_support/logger_thread_safe_level.rb b/activesupport/lib/active_support/logger_thread_safe_level.rb -index 042f484f8210d..aa84a7c5de5c6 100644 ---- a/activesupport/lib/active_support/logger_thread_safe_level.rb -+++ b/activesupport/lib/active_support/logger_thread_safe_level.rb -@@ -4,6 +4,7 @@ - require "active_support/core_ext/module/attribute_accessors" - require "concurrent" - require "fiber" -+require "logger" - - module ActiveSupport - module LoggerThreadSafeLevel # :nodoc: diff --git a/rubygem-activesupport-7.2.0-Drop-dependency-on-mutex-m.patch b/rubygem-activesupport-7.2.0-Drop-dependency-on-mutex-m.patch deleted file mode 100644 index 881c079..0000000 --- a/rubygem-activesupport-7.2.0-Drop-dependency-on-mutex-m.patch +++ /dev/null @@ -1,71 +0,0 @@ -From bcdeea5da7657375df21a856135ae7a66a8c3812 Mon Sep 17 00:00:00 2001 -From: Jean Boussier -Date: Tue, 17 Oct 2023 17:46:48 +0200 -Subject: [PATCH] Drop dependency on mutex_m - -It used to be stdlib but is being extracted in modern rubies. - -Overall its usefulness is dubious. In all cases it is included in -Rails, it's only for the `synchronize` method, but end up exposing -a dozen other useless methods. - -In the end just using a Mutex is clearer and simpler. - -In some cases we can even get away with a single mutex in a constant. ---- - .../lib/active_support/notifications/fanout.rb | 11 ++++------- - 1 file changed, 4 insertions(+), 7 deletions(-) - -diff --git a/activesupport/lib/active_support/notifications/fanout.rb b/activesupport/lib/active_support/notifications/fanout.rb -index a84de150c0d63..2bc782ecee2cc 100644 ---- a/activesupport/lib/active_support/notifications/fanout.rb -+++ b/activesupport/lib/active_support/notifications/fanout.rb -@@ -1,6 +1,5 @@ - # frozen_string_literal: true - --require "mutex_m" - require "concurrent/map" - require "set" - require "active_support/core_ext/object/try" -@@ -22,13 +21,11 @@ def iterate_guarding_exceptions(listeners) - # - # This class is thread safe. All methods are reentrant. - class Fanout -- include Mutex_m -- - def initialize -+ @mutex = Mutex.new - @string_subscribers = Hash.new { |h, k| h[k] = [] } - @other_subscribers = [] - @listeners_for = Concurrent::Map.new -- super - end - - def subscribe(pattern = nil, callable = nil, monotonic: false, &block) -@@ -33,7 +30,7 @@ def inspect # :nodoc: - - def subscribe(pattern = nil, callable = nil, monotonic: false, &block) - subscriber = Subscribers.new(pattern, callable || block, monotonic) -- synchronize do -+ @mutex.synchronize do - case pattern - when String - @string_subscribers[pattern] << subscriber -@@ -49,7 +46,7 @@ def subscribe(pattern = nil, callable = nil, monotonic: false, &block) - end - - def unsubscribe(subscriber_or_name) -- synchronize do -+ @mutex.synchronize do - case subscriber_or_name - when String - @string_subscribers[subscriber_or_name].clear -@@ -107,7 +104,7 @@ def publish_event(event) - - def listeners_for(name) - # this is correctly done double-checked locking (Concurrent::Map's lookups have volatile semantics) -- @listeners_for[name] || synchronize do -+ @listeners_for[name] || @mutex.synchronize do - # use synchronisation when accessing @subscribers - @listeners_for[name] ||= - @string_subscribers[name] + @other_subscribers.select { |s| s.subscribed_to?(name) } diff --git a/rubygem-activesupport-7.2.0-Update-test-suite-for-compatibility-with-Ruby-3-4-dev.patch b/rubygem-activesupport-7.2.0-Update-test-suite-for-compatibility-with-Ruby-3-4-dev.patch deleted file mode 100644 index d9e74ea..0000000 --- a/rubygem-activesupport-7.2.0-Update-test-suite-for-compatibility-with-Ruby-3-4-dev.patch +++ /dev/null @@ -1,139 +0,0 @@ -From 50daadaa71f4db88cef3080afde51e203c700e67 Mon Sep 17 00:00:00 2001 -From: Jean Boussier -Date: Fri, 16 Feb 2024 09:53:45 +0100 -Subject: [PATCH] Update test suite for compatibility with Ruby 3.4-dev - -https://bugs.ruby-lang.org/issues/19117 and https://bugs.ruby-lang.org/issues/16495 -slightly change how backtrace are rendered which makes a few tests fail. ---- - activesupport/test/callbacks_test.rb | 57 ++++++++++----- - activesupport/test/core_ext/module_test.rb | 4 +- - .../test/core_ext/time_with_zone_test.rb | 2 +- - activesupport/test/test_case_test.rb | 4 +- - 4 files changed, 45 insertions(+), 22 deletions(-) - -diff --git a/activesupport/test/callbacks_test.rb b/activesupport/test/callbacks_test.rb -index 1083964eca0e7..b38da7a6acd5b 100644 ---- a/activesupport/test/callbacks_test.rb -+++ b/activesupport/test/callbacks_test.rb -@@ -473,18 +473,33 @@ def test_tidy_call_stack - # callbacks that have been invoked, if there are any (plus - # whatever the callbacks do themselves, of course). - -- assert_equal [ -- "block in save", -- "block in run_callbacks", -- "tweedle_deedle", -- "block in run_callbacks", -- "w0tyes", -- "block in run_callbacks", -- "tweedle_dum", -- "block in run_callbacks", -- "run_callbacks", -- "save" -- ], call_stack.map(&:label) -+ if RUBY_VERSION >= "3.4" -+ assert_equal [ -+ "block in CallbacksTest::MySlate#save", -+ "block in ActiveSupport::Callbacks#run_callbacks", -+ "CallbacksTest::AroundPerson#tweedle_deedle", -+ "block in ActiveSupport::Callbacks#run_callbacks", -+ "CallbacksTest::AroundPerson#w0tyes", -+ "block in ActiveSupport::Callbacks#run_callbacks", -+ "CallbacksTest::AroundPerson#tweedle_dum", -+ "block in ActiveSupport::Callbacks#run_callbacks", -+ "ActiveSupport::Callbacks#run_callbacks", -+ "CallbacksTest::MySlate#save", -+ ].join("\n"), call_stack.map(&:label).join("\n") -+ else -+ assert_equal [ -+ "block in save", -+ "block in run_callbacks", -+ "tweedle_deedle", -+ "block in run_callbacks", -+ "w0tyes", -+ "block in run_callbacks", -+ "tweedle_dum", -+ "block in run_callbacks", -+ "run_callbacks", -+ "save", -+ ].join("\n"), call_stack.map(&:label).join("\n") -+ end - end - - def test_short_call_stack -@@ -503,11 +518,19 @@ def test_short_call_stack - # there should be just one line. run_callbacks yields directly - # back to its caller. - -- assert_equal [ -- "block in save", -- "run_callbacks", -- "save" -- ], call_stack.map(&:label) -+ if RUBY_VERSION >= "3.4" -+ assert_equal [ -+ "block in CallbacksTest::Person#save", -+ "ActiveSupport::Callbacks#run_callbacks", -+ "CallbacksTest::Person#save", -+ ].join("\n"), call_stack.map(&:label).join("\n") -+ else -+ assert_equal [ -+ "block in save", -+ "run_callbacks", -+ "save", -+ ].join("\n"), call_stack.map(&:label).join("\n") -+ end - end - end - -diff --git a/activesupport/test/core_ext/module_test.rb b/activesupport/test/core_ext/module_test.rb -index d5899c646ab8b..23fee4bf125cd 100644 ---- a/activesupport/test/core_ext/module_test.rb -+++ b/activesupport/test/core_ext/module_test.rb -@@ -394,7 +394,7 @@ def test_delegate_missing_to_does_not_delegate_to_private_methods - DecoratedReserved.new(@david).private_name - end - -- assert_match(/undefined method `private_name' for/, e.message) -+ assert_match(/undefined method [`']private_name' for/, e.message) - end - - def test_delegate_missing_to_does_not_delegate_to_fake_methods -@@ -402,7 +402,7 @@ def test_delegate_missing_to_does_not_delegate_to_fake_methods - DecoratedReserved.new(@david).my_fake_method - end - -- assert_match(/undefined method `my_fake_method' for/, e.message) -+ assert_match(/undefined method [`']my_fake_method' for/, e.message) - end - - def test_delegate_missing_to_raises_delegation_error_if_target_nil -diff --git a/activesupport/test/core_ext/time_with_zone_test.rb b/activesupport/test/core_ext/time_with_zone_test.rb -index ff4170dd82875..19fc50087809c 100644 ---- a/activesupport/test/core_ext/time_with_zone_test.rb -+++ b/activesupport/test/core_ext/time_with_zone_test.rb -@@ -1113,7 +1113,7 @@ def test_no_method_error_has_proper_context - e = assert_raises(NoMethodError) { - @twz.this_method_does_not_exist - } -- assert_match(/undefined method `this_method_does_not_exist' for.*ActiveSupport::TimeWithZone/, e.message) -+ assert_match(/undefined method [`']this_method_does_not_exist' for.*ActiveSupport::TimeWithZone/, e.message) - assert_no_match "rescue", e.backtrace.first - end - end -diff --git a/activesupport/test/test_case_test.rb b/activesupport/test/test_case_test.rb -index dc2c2772996d7..05f1280790f3b 100644 ---- a/activesupport/test/test_case_test.rb -+++ b/activesupport/test/test_case_test.rb -@@ -391,8 +391,8 @@ def test_fails_and_warning_is_logged_if_wrong_error_caught - Other block based assertions (e.g. `assert_no_changes`) can be used, as long as `assert_raises` is inside their block. - MSG - assert @out.string.include?(expected), @out.string -- assert error.message.include?("ArgumentError: ArgumentError") -- assert error.message.include?("in `block (2 levels) in run_test_that_should_fail_confusingly'") -+ assert_includes error.message, "ArgumentError: ArgumentError" -+ assert_includes error.message, "run_test_that_should_fail_confusingly" - end - - private diff --git a/rubygem-activesupport-8.0.0-Update-Active-Support-test-suite-for-Ruby-3-4-Hash-inspect.patch b/rubygem-activesupport-8.0.0-Update-Active-Support-test-suite-for-Ruby-3-4-Hash-inspect.patch deleted file mode 100644 index 49c1b03..0000000 --- a/rubygem-activesupport-8.0.0-Update-Active-Support-test-suite-for-Ruby-3-4-Hash-inspect.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 95c2ee8e0503215ad94629383311301742ebf012 Mon Sep 17 00:00:00 2001 -From: Jean Boussier -Date: Sat, 5 Oct 2024 12:25:51 -0400 -Subject: [PATCH] Update Active Support test suite for Ruby 3.4 Hash#inspect - -Ref: https://github.com/ruby/ruby/pull/10924 -Ref: https://bugs.ruby-lang.org/issues/20433 ---- - activesupport/test/broadcast_logger_test.rb | 4 ++-- - activesupport/test/ordered_options_test.rb | 18 +++++++++--------- - 2 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/activesupport/test/ordered_options_test.rb b/activesupport/test/ordered_options_test.rb -index 8eca0fe73bec7..eb8b50c62f511 100644 ---- a/activesupport/test/ordered_options_test.rb -+++ b/activesupport/test/ordered_options_test.rb -@@ -123,6 +123,6 @@ def test_inspect - a.foo = :bar - a[:baz] = :quz - -- assert_equal "#:bar, :baz=>:quz}>", a.inspect -+ assert_equal "#", a.inspect - end - end diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 138237d..27b2ae2 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -4,43 +4,18 @@ Name: rubygem-%{gem_name} Epoch: 1 -Version: 7.0.8 -Release: 11%{?dist} +Version: 8.0.1 +Release: 1%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT -URL: http://rubyonrails.org +URL: https://rubyonrails.org Source0: https://rubygems.org/gems/%{gem_name}-%{version}%{?prerelease}.gem -# The activesupport gem doesn't ship with the test suite. -# You may check it out like so -# git clone http://github.com/rails/rails.git -# cd rails/activesupport && git archive -v -o activesupport-7.0.8-tests.txz v7.0.8 test/ -Source1: %{gem_name}-%{version}%{?prerelease}-tests.txz +# git clone http://github.com/rails/rails.git && cd rails/activesupport +# git archive -v -o activesupport-8.0.1-tests.tar.gz v8.0.1 test/ +Source1: %{gem_name}-%{version}%{?prerelease}-tests.tar.gz # The tools are needed for the test suite, are however unpackaged in gem file. -# You may get them like so -# git clone http://github.com/rails/rails.git --no-checkout -# cd rails && git archive -v -o rails-7.0.8-tools.txz v7.0.8 tools/ -Source2: rails-%{version}%{?prerelease}-tools.txz -# Fixes for Minitest 5.16+ -# https://github.com/rails/rails/pull/45380 -Patch1: rubygem-activesupport-7.0.2.3-Remove-the-multi-call-form-of-assert_called_with.patch -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 -# https://github.com/rails/rails/pull/51079 -Patch4: rubygem-activesupport-7.0.2.3-update-method_duplicable.patch -# Drop mutex_m dependency to ease Ruby 3.4 compatibility. -# https://github.com/rails/rails/pull/49674 -Patch5: rubygem-activesupport-7.2.0-Drop-dependency-on-mutex-m.patch -# Ruby 3.4 backtrace compatibility. -# https://github.com/rails/rails/pull/51101 -Patch6: rubygem-activesupport-7.2.0-Update-test-suite-for-compatibility-with-Ruby-3-4-dev.patch -# Ruby 3.4 `Hash#inspect` compatibility. -# https://github.com/rails/rails/commit/95c2ee8e0503215ad94629383311301742ebf012 -Patch7: rubygem-activesupport-8.0.0-Update-Active-Support-test-suite-for-Ruby-3-4-Hash-inspect.patch -# concurrent-ruby 1.3.5+ drops Logger dependency. Make sure to load Logger -# explicitly. -# https://github.com/rails/rails/pull/54264 -Patch8: rubygem-activesupport-7.0.8-Ensure-the-logger-gem-is-loaded-in-Rails-7-0.patch +# https://github.com/rails/rails/blob/main/tools/test_common.rb +Source2: https://raw.githubusercontent.com/rails/rails/e25d738430bdc6bdd04cd28be705484ea953e74e/tools/test_common.rb # Ruby package has just soft dependency on rubygem(json), while # ActiveSupport always requires it. @@ -53,30 +28,32 @@ Requires: tzdata # Let's keep Requires and BuildRequires sorted alphabeticaly BuildRequires: ruby(release) BuildRequires: rubygems-devel -BuildRequires: ruby >= 2.2.2 +BuildRequires: ruby >= 3.2.0 BuildRequires: rubygem(bigdecimal) BuildRequires: rubygem(builder) BuildRequires: rubygem(concurrent-ruby) BuildRequires: rubygem(connection_pool) BuildRequires: rubygem(dalli) BuildRequires: rubygem(drb) -BuildRequires: (rubygem(i18n) >= 0.7 with rubygem(i18n) < 2) -BuildRequires: rubygem(minitest) >= 5.0.0 -BuildRequires: rubygem(rack) -BuildRequires: rubygem(tzinfo) >= 2.0 +BuildRequires: rubygem(i18n) >= 0.7 BuildRequires: rubygem(listen) +BuildRequires: rubygem(minitest) >= 5.0.0 +BuildRequires: rubygem(msgpack) +BuildRequires: rubygem(rack) BuildRequires: rubygem(redis) BuildRequires: rubygem(rexml) +BuildRequires: rubygem(tzinfo) >= 2.0 BuildRequires: memcached +BuildRequires: %{_bindir}/valkey-server BuildRequires: tzdata BuildArch: noarch - %description A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing. + %package doc Summary: Documentation for %{name} Requires: %{name} = %{epoch}:%{version}-%{release} @@ -86,32 +63,7 @@ BuildArch: noarch Documentation for %{name}. %prep -%setup -q -n %{gem_name}-%{version}%{?prerelease} -b1 -b2 - -%patch 1 -p2 -%patch 3 -p2 -mv %{_builddir}/test . -%patch 4 -p2 -mv test %{_builddir} -%patch 5 -p2 -%patch 8 -p2 - -pushd %{_builddir} -%patch 2 -p2 -%patch 6 -p2 -%patch 7 -p2 -popd - -# Add several dependencies to avoid Ruby 3.3+ warnings. -# https://github.com/rails/rails/commit/81699b52d2acff1840e3ace5e59412f4fa3934ab -%gemspec_add_dep -g base64 -%gemspec_add_dep -g drb -# https://github.com/rails/rails/commit/a77535c74c7047a517cc45ff8ecb416ea439c28d -%gemspec_add_dep -g bigdecimal -# https://github.com/rails/rails/commit/455b5f106e5a3eeba1e7139c63fd83dc0dd81caf -%gemspec_add_dep -g logger -%gemspec_add_dep -g securerandom -%gemspec_add_dep -g benchmark +%setup -q -n %{gem_name}-%{version}%{?prerelease} -b1 %build gem build ../%{gem_name}-%{version}%{?prerelease}.gemspec @@ -123,39 +75,32 @@ cp -a .%{gem_dir}/* \ %{buildroot}%{gem_dir}/ %check -pushd .%{gem_instdir} +( cd .%{gem_instdir} # Move the tests into place -ln -s %{_builddir}/tools .. -cp -a %{_builddir}/test . +cp -a %{builddir}/test . -# These tests are really unstable, but they seems to be passing upstream :/ -# mem_cache_store_test: These tests do not pass in Koji; but work locally -# redis_cache_store_test: failed to require "redis/connection/hiredis" -for f in \ - test/evented_file_update_checker_test.rb \ - test/cache/stores/redis_cache_store_test.rb \ - test/cache/stores/mem_cache_store_test.rb -do - mv $f{,.disable} -done - -# This seems to be unstable as well ... -# https://github.com/rails/rails/issues/25682 -sed -i '/def test_iso8601_output_and_reparsing$/,/^ end$/ s/^/#/' test/core_ext/duration_test.rb - -# Workaround TransformValuesTest#test_default_procs_do_not_persist_*_mapping -# test failures due to bug in Ruby 2.7.{0,1}. -# https://bugs.ruby-lang.org/issues/16498 -sed -i '/assert_nil mapped\[:b\]/ s/^/#/' test/core_ext/hash/transform_values_test.rb +mkdir ../tools +ln -s %{SOURCE2} ../tools/ sed -i '/require .bundler./ s/^/#/' test/abstract_unit.rb +# Start a testing Valkey (Redis) server instance +VALKEY_DIR=$(mktemp -d) +valkey-server --dir $VALKEY_DIR --pidfile $VALKEY_DIR/valkey.pid --daemonize yes + +# Start Memcached server memcached & mPID=$! sleep 1 -ruby -Ilib:test -e 'Dir.glob "./test/**/*_test.rb", &method(:require)' + +ruby -Ilib -e 'Dir.glob "./test/**/*_test.rb", &method(:require)' -- -v + +# Shutdown Memcached kill -15 $mPID -popd + +# Shutdown Valkey. +kill -INT $(cat $VALKEY_DIR/valkey.pid) +) %files %dir %{gem_instdir} @@ -170,6 +115,10 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Thu Jan 23 2025 Vít Ondruch - 1:8.0.1-1 +- Update to Active Support 8.0.1. + Related: rhbz#2238177 + * Thu Jan 23 2025 Vít Ondruch - 1:7.0.8-11 - Fix compatibility with concurrent-ruby 1.3.5+ diff --git a/sources b/sources index c1d38c3..97106dd 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ -SHA512 (activesupport-7.0.8.gem) = d3f45452751a3ff4acd534ad6a71e5747d2e64683b562b99c3f97ca3980424aa0093d028fab94a6429410fb4878c6e34a2af2ad8c0c04358648e180a732250dc -SHA512 (activesupport-7.0.8-tests.txz) = 153739dca3cd20938e7f1bb255d330e51e91fb9901b6b2ff5ffd76277e44e38090b1037f9eeb574d8ef429c1d3d689dbeb27b9d02ff33fe8f21cef2472a2e8b2 -SHA512 (rails-7.0.8-tools.txz) = a67b43ecabe47d23bd437651c97c87e1323dc2eb20d0fffa2c8f0d75fae7502571c3a2633c5bdeb9cc4a383c88b5eade49d55efe895857285b3186b6d4da4b26 +SHA512 (activesupport-8.0.1-tests.tar.gz) = 8775b9072fb7e2e35d66b5d265f5e44d9810f10261377dc4f7f5733119e86d2892d30a212cad964855dad9d58783a3e57c4ff6517fca235cca6c7511e33ed192 +SHA512 (activesupport-8.0.1.gem) = bde090041d81591b6a8703c90585d285db44c47448669b2b884574b2d6d414ef043605c6a1c982b71b57d88989882f91f7bd12e4c899d560f56a878de099f62f diff --git a/test_common.rb b/test_common.rb new file mode 100644 index 0000000..fcc8155 --- /dev/null +++ b/test_common.rb @@ -0,0 +1,20 @@ +# frozen_string_literal: true + +ActiveSupport::TestCase.alias_method :force_skip, :skip + +if ENV["BUILDKITE"] + require "minitest-ci" + ENV.delete("CI") # CI has affect on the applications, and we don't want it applied to the apps. + + Minitest::Ci.report_dir = File.join(__dir__, "../test-reports/#{ENV['BUILDKITE_JOB_ID']}") + + module DisableSkipping # :nodoc: + private + def skip(message = nil, *) + flunk "Skipping tests is not allowed in this environment (#{message})\n" \ + "Tests should only be skipped when the environment is missing a required dependency.\n" \ + "This should never happen on CI." + end + end + ActiveSupport::TestCase.include(DisableSkipping) +end From c162969362e75b6e212a5a8dc1d86d23aa57724e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Mon, 20 Jan 2025 17:08:15 +0100 Subject: [PATCH 72/78] Disable Redis test cases on i686 Valkey (Redis) is not available there \[[1]\]. The other option would be to `ExcludeArch: %{ix86}`. This would mean the package would not be build on `ix86`, therefore not tested on that arch. Hard to judge what is better choice. [1]: https://src.fedoraproject.org/rpms/valkey/blob/bec8cff7989ce1e5fc2c494ccfd01cf42fe743f5/f/valkey.spec#_66 --- rubygem-activesupport.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 27b2ae2..3cc1f8f 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -44,7 +44,9 @@ BuildRequires: rubygem(redis) BuildRequires: rubygem(rexml) BuildRequires: rubygem(tzinfo) >= 2.0 BuildRequires: memcached +%ifnarch %{ix86} BuildRequires: %{_bindir}/valkey-server +%endif BuildRequires: tzdata BuildArch: noarch @@ -85,8 +87,10 @@ ln -s %{SOURCE2} ../tools/ sed -i '/require .bundler./ s/^/#/' test/abstract_unit.rb # Start a testing Valkey (Redis) server instance +%ifnarch %{ix86} VALKEY_DIR=$(mktemp -d) valkey-server --dir $VALKEY_DIR --pidfile $VALKEY_DIR/valkey.pid --daemonize yes +%endif # Start Memcached server memcached & @@ -99,7 +103,9 @@ ruby -Ilib -e 'Dir.glob "./test/**/*_test.rb", &method(:require)' -- -v kill -15 $mPID # Shutdown Valkey. +%ifnarch %{ix86} kill -INT $(cat $VALKEY_DIR/valkey.pid) +%endif ) %files From 94a65b1e0cb2936febcac540a6c5b297ca2c7743 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Wed, 2 Jul 2025 17:34:02 +0200 Subject: [PATCH 73/78] Update to Active Support 8.0.2. Related: rhbz#2238177 --- rubygem-activesupport.spec | 11 ++++++----- sources | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 3cc1f8f..a634bd1 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -4,16 +4,16 @@ Name: rubygem-%{gem_name} Epoch: 1 -Version: 8.0.1 +Version: 8.0.2 Release: 1%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT URL: https://rubyonrails.org Source0: https://rubygems.org/gems/%{gem_name}-%{version}%{?prerelease}.gem # git clone http://github.com/rails/rails.git && cd rails/activesupport -# git archive -v -o activesupport-8.0.1-tests.tar.gz v8.0.1 test/ +# git archive -v -o activesupport-8.0.2-tests.tar.gz v8.0.2 test/ Source1: %{gem_name}-%{version}%{?prerelease}-tests.tar.gz -# The tools are needed for the test suite, are however unpackaged in gem file. +# This is needed due to `force_skip` alias. # https://github.com/rails/rails/blob/main/tools/test_common.rb Source2: https://raw.githubusercontent.com/rails/rails/e25d738430bdc6bdd04cd28be705484ea953e74e/tools/test_common.rb @@ -83,6 +83,7 @@ cp -a %{builddir}/test . mkdir ../tools ln -s %{SOURCE2} ../tools/ +touch ../tools/strict_warnings.rb sed -i '/require .bundler./ s/^/#/' test/abstract_unit.rb @@ -121,8 +122,8 @@ kill -INT $(cat $VALKEY_DIR/valkey.pid) %doc %{gem_instdir}/README.rdoc %changelog -* Thu Jan 23 2025 Vít Ondruch - 1:8.0.1-1 -- Update to Active Support 8.0.1. +* Wed Jul 02 2025 Vít Ondruch - 1:8.0.2-1 +- Update to Active Support 8.0.2. Related: rhbz#2238177 * Thu Jan 23 2025 Vít Ondruch - 1:7.0.8-11 diff --git a/sources b/sources index 97106dd..66d75e1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (activesupport-8.0.1-tests.tar.gz) = 8775b9072fb7e2e35d66b5d265f5e44d9810f10261377dc4f7f5733119e86d2892d30a212cad964855dad9d58783a3e57c4ff6517fca235cca6c7511e33ed192 -SHA512 (activesupport-8.0.1.gem) = bde090041d81591b6a8703c90585d285db44c47448669b2b884574b2d6d414ef043605c6a1c982b71b57d88989882f91f7bd12e4c899d560f56a878de099f62f +SHA512 (activesupport-8.0.2-tests.tar.gz) = 60b6f764596c9fdacfa6f3172d90fd684ae48c8f1a1ddd57b92be040256709239f1ce528362b68978d440ac18e37a169edab9c73416229ae4da572d9ed33be49 +SHA512 (activesupport-8.0.2.gem) = 3c448165d856ef83e5e76b581f4327445f108f0e35592d910e8d88c92a8cbefbf47837994d10fefc8b4a6c176aa01971df5f6b57182c40aa84a79641de3821c1 From 3e5369ab10f11f9425a529c43dd87f5398060346 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 12:15:43 +0000 Subject: [PATCH 74/78] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- rubygem-activesupport.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index a634bd1..43ff4a4 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -5,7 +5,7 @@ Name: rubygem-%{gem_name} Epoch: 1 Version: 8.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT URL: https://rubyonrails.org @@ -122,6 +122,9 @@ kill -INT $(cat $VALKEY_DIR/valkey.pid) %doc %{gem_instdir}/README.rdoc %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1:8.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Wed Jul 02 2025 Vít Ondruch - 1:8.0.2-1 - Update to Active Support 8.0.2. Related: rhbz#2238177 From c60eaabadf79acf3062c0316117684f410ee4b8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 7 Oct 2025 09:36:10 +0200 Subject: [PATCH 75/78] Update to Active Support 8.0.3. Related: rhzb#2388437 --- ...precision-to-BigDecimal-when-parsing.patch | 24 +++++++++++++++++++ rubygem-activesupport.spec | 15 +++++++++--- sources | 4 ++-- 3 files changed, 38 insertions(+), 5 deletions(-) create mode 100644 rubygem-activesupport-8.0.3-Always-pass-default-precision-to-BigDecimal-when-parsing.patch diff --git a/rubygem-activesupport-8.0.3-Always-pass-default-precision-to-BigDecimal-when-parsing.patch b/rubygem-activesupport-8.0.3-Always-pass-default-precision-to-BigDecimal-when-parsing.patch new file mode 100644 index 0000000..7027f9a --- /dev/null +++ b/rubygem-activesupport-8.0.3-Always-pass-default-precision-to-BigDecimal-when-parsing.patch @@ -0,0 +1,24 @@ +From 283d96ea53f45eedf09a31bef739575df96e87df Mon Sep 17 00:00:00 2001 +From: zzak +Date: Sun, 5 Oct 2025 10:31:09 +0900 +Subject: [PATCH] Always pass default precision to BigDecimal when parsing + Float in XmlMini + +https://github.com/ruby/bigdecimal/blob/cb2458bde33bf90a8364b58d53e8948a7ba555ea/ext/bigdecimal/bigdecimal.c#L2747-L2749 +--- + activesupport/lib/active_support/xml_mini.rb | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/activesupport/lib/active_support/xml_mini.rb b/activesupport/lib/active_support/xml_mini.rb +index 2c2b8185b1b80..c6d7ce5b7c251 100644 +--- a/activesupport/lib/active_support/xml_mini.rb ++++ b/activesupport/lib/active_support/xml_mini.rb +@@ -74,6 +74,8 @@ def content_type + "decimal" => Proc.new do |number| + if String === number + number.to_d ++ elsif Float === number ++ BigDecimal(number, 0) + else + BigDecimal(number) + end diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 43ff4a4..bdfc791 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -4,18 +4,21 @@ Name: rubygem-%{gem_name} Epoch: 1 -Version: 8.0.2 -Release: 2%{?dist} +Version: 8.0.3 +Release: 1%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT URL: https://rubyonrails.org Source0: https://rubygems.org/gems/%{gem_name}-%{version}%{?prerelease}.gem # git clone http://github.com/rails/rails.git && cd rails/activesupport -# git archive -v -o activesupport-8.0.2-tests.tar.gz v8.0.2 test/ +# git archive -v -o activesupport-8.0.3-tests.tar.gz v8.0.3 test/ Source1: %{gem_name}-%{version}%{?prerelease}-tests.tar.gz # This is needed due to `force_skip` alias. # https://github.com/rails/rails/blob/main/tools/test_common.rb Source2: https://raw.githubusercontent.com/rails/rails/e25d738430bdc6bdd04cd28be705484ea953e74e/tools/test_common.rb +# Fix XmlMiniTest::ParsingTest#test_decimal test failure with BigDecimal 3.2.3+ +# https://github.com/rails/rails/pull/55840 +Patch1: rubygem-activesupport-8.0.3-Always-pass-default-precision-to-BigDecimal-when-parsing.patch # Ruby package has just soft dependency on rubygem(json), while # ActiveSupport always requires it. @@ -67,6 +70,8 @@ Documentation for %{name}. %prep %setup -q -n %{gem_name}-%{version}%{?prerelease} -b1 +%patch 1 -p2 + %build gem build ../%{gem_name}-%{version}%{?prerelease}.gemspec %gem_install @@ -122,6 +127,10 @@ kill -INT $(cat $VALKEY_DIR/valkey.pid) %doc %{gem_instdir}/README.rdoc %changelog +* Mon Oct 06 2025 Vít Ondruch - 1:8.0.3-1 +- Update to Active Support 8.0.3. + Related: rhzb#2388437 + * Fri Jul 25 2025 Fedora Release Engineering - 1:8.0.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index 66d75e1..f66d7f6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (activesupport-8.0.2-tests.tar.gz) = 60b6f764596c9fdacfa6f3172d90fd684ae48c8f1a1ddd57b92be040256709239f1ce528362b68978d440ac18e37a169edab9c73416229ae4da572d9ed33be49 -SHA512 (activesupport-8.0.2.gem) = 3c448165d856ef83e5e76b581f4327445f108f0e35592d910e8d88c92a8cbefbf47837994d10fefc8b4a6c176aa01971df5f6b57182c40aa84a79641de3821c1 +SHA512 (activesupport-8.0.3-tests.tar.gz) = d11560cc2246aaa16fcb7f213061cb6a355bd2e4bbc0cd3e0541db979aa90d28b738ceaf36935f49688953faf94314e2ae8da3e2f88436ac31c0a77a5804a91e +SHA512 (activesupport-8.0.3.gem) = f46b6710c65d7b59e0c7f1eb48641aa4ef0568b2d64147866e1dfa699c0b4c068bf443cc9967190ed47c2f6ea98137668a300455792982061e280a7df605bb4f From bacee91af1b9a0fb4648af56bdc24182f53b4948 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 9 Nov 2025 22:43:30 +0900 Subject: [PATCH 76/78] Backport upstream change for testsuite removal for new benchmark gem in ruby4_0 --- rubygem-activesupport.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index bdfc791..d5b6465 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -5,7 +5,7 @@ Name: rubygem-%{gem_name} Epoch: 1 Version: 8.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT URL: https://rubyonrails.org @@ -92,6 +92,12 @@ touch ../tools/strict_warnings.rb sed -i '/require .bundler./ s/^/#/' test/abstract_unit.rb +# backported from: +# https://github.com/rails/rails/commit/632b2c5128581731c2451459081176a43f474f74 +# benchmark 0.5.0 in ruby4_0 defines Benchmark.ms{}, so the following +# test is no longer needed +sed -i test/core_ext/benchmark_test.rb -e '\@test_is_deprecated@s@$@ ; skip ""@' + # Start a testing Valkey (Redis) server instance %ifnarch %{ix86} VALKEY_DIR=$(mktemp -d) @@ -127,6 +133,10 @@ kill -INT $(cat $VALKEY_DIR/valkey.pid) %doc %{gem_instdir}/README.rdoc %changelog +* Sun Nov 09 2025 Mamoru TASAKA - 1:8.0.3-2 +- Backport upstream change for testsuite removal for new benchmark gem in + ruby4_0 + * Mon Oct 06 2025 Vít Ondruch - 1:8.0.3-1 - Update to Active Support 8.0.3. Related: rhzb#2388437 From 6b021929fc6a425c1cbc1c55a7e46b498c6299f9 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 29 Dec 2025 16:30:55 +0900 Subject: [PATCH 77/78] Backport upstream fix to support minitest 6 --- rubygem-activesupport-pr56202-minitest6.patch | 103 ++++++++++++++++++ rubygem-activesupport.spec | 22 +++- 2 files changed, 120 insertions(+), 5 deletions(-) create mode 100644 rubygem-activesupport-pr56202-minitest6.patch diff --git a/rubygem-activesupport-pr56202-minitest6.patch b/rubygem-activesupport-pr56202-minitest6.patch new file mode 100644 index 0000000..1e01666 --- /dev/null +++ b/rubygem-activesupport-pr56202-minitest6.patch @@ -0,0 +1,103 @@ +From 831f0f96d0f9c132b28d3fa22ab82806115747b0 Mon Sep 17 00:00:00 2001 +From: Ryan Davis +Date: Thu, 20 Nov 2025 14:16:51 -0800 +Subject: [PATCH 3/5] MT6: implementation fixes + +MT6 changes the way assertion messages work. Now, if a proc is passed +in for the message, it wins untouched. So for the rails assertions +that want to have diffs shown while calling assert_equal with a +message proc, the proc needs to call diff itself. This feels redundant +to me, but not my call. + +And since the procs win now, they need to provide their own periods at +the end of the text. +--- + activesupport/lib/active_support/testing/assertions.rb | 8 +++++--- + .../lib/active_support/testing/parallelization/worker.rb | 6 +++++- + 2 files changed, 10 insertions(+), 4 deletions(-) + +diff --git a/activesupport/lib/active_support/testing/assertions.rb b/activesupport/lib/active_support/testing/assertions.rb +index 178b5b350abba..4f2c6b105bc19 100644 +--- a/activesupport/lib/active_support/testing/assertions.rb ++++ b/activesupport/lib/active_support/testing/assertions.rb +@@ -124,7 +124,8 @@ def assert_difference(expression, *args, &block) + actual = exp.call + rich_message = -> do + code_string = code.respond_to?(:call) ? _callable_to_source_string(code) : code +- error = "`#{code_string}` didn't change by #{diff}, but by #{actual - before_value}" ++ error = "`#{code_string}` didn't change by #{diff}, but by #{actual - before_value}." ++ error = "#{error}\n#{diff before_value + diff, actual}" if Minitest::VERSION > "6" + error = "#{message}.\n#{error}" if message + error + end +@@ -228,7 +229,7 @@ def assert_changes(expression, message = nil, from: UNTRACKED, to: UNTRACKED, &b + rich_message = -> do + code_string = expression.respond_to?(:call) ? _callable_to_source_string(expression) : expression + error = "`#{code_string}` didn't change" +- error = "#{error}. It was already #{to.inspect}" if before == to ++ error = "#{error}. It was already #{to.inspect}." if before == to + error = "#{message}.\n#{error}" if message + error + end +@@ -296,8 +297,9 @@ def assert_no_changes(expression, message = nil, from: UNTRACKED, &block) + + rich_message = -> do + code_string = expression.respond_to?(:call) ? _callable_to_source_string(expression) : expression +- error = "`#{code_string}` changed" ++ error = "`#{code_string}` changed." + error = "#{message}.\n#{error}" if message ++ error = "#{error}\n#{diff before, after}" if Minitest::VERSION > "6" + error + end + +diff --git a/activesupport/lib/active_support/testing/parallelization/worker.rb b/activesupport/lib/active_support/testing/parallelization/worker.rb +index d008277f8924c..daad6ce659103 100644 +--- a/activesupport/lib/active_support/testing/parallelization/worker.rb ++++ b/activesupport/lib/active_support/testing/parallelization/worker.rb +@@ -49,7 +49,11 @@ def perform_job(job) + set_process_title("#{klass}##{method}") + + result = klass.with_info_handler reporter do +- Minitest.run_one_method(klass, method) ++ if Minitest.respond_to?(:run_one_method) then ++ Minitest.run_one_method(klass, method) ++ else ++ klass.new(method).run ++ end + end + + safe_record(reporter, result) + +From 2c1ca03402de9a5bc4e482da739e39f5bd47f0b3 Mon Sep 17 00:00:00 2001 +From: Ryan Davis +Date: Thu, 20 Nov 2025 15:34:55 -0800 +Subject: [PATCH 4/5] MT6: test fixes + +Mostly minor and mostly centered around whether there are diffs. +--- + actionpack/test/dispatch/routing/route_set_test.rb | 4 ++-- + activesupport/test/test_case_test.rb | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/activesupport/test/test_case_test.rb b/activesupport/test/test_case_test.rb +index 7e5084e4b041c..05ed8f2ae629d 100644 +--- a/activesupport/test/test_case_test.rb ++++ b/activesupport/test/test_case_test.rb +@@ -243,7 +243,7 @@ def test_assert_changes_with_to_option_but_no_change_has_special_message + end + end + +- assert_equal "`@object.num` didn't change. It was already 0.\nExpected 0 to not be equal to 0.", error.message ++ assert_match "`@object.num` didn't change. It was already 0.", error.message + end + + def test_assert_changes_message_with_lambda +@@ -255,7 +255,7 @@ def test_assert_changes_message_with_lambda + end + end + +- assert_equal "`@object.num` didn't change. It was already 0.\nExpected 0 to not be equal to 0.", error.message ++ assert_match "`@object.num` didn't change. It was already 0.", error.message + end + + def test_assert_changes_with_wrong_to_option diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index d5b6465..fa35ad4 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -5,7 +5,7 @@ Name: rubygem-%{gem_name} Epoch: 1 Version: 8.0.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT URL: https://rubyonrails.org @@ -19,6 +19,9 @@ Source2: https://raw.githubusercontent.com/rails/rails/e25d738430bdc6bdd04cd28be # Fix XmlMiniTest::ParsingTest#test_decimal test failure with BigDecimal 3.2.3+ # https://github.com/rails/rails/pull/55840 Patch1: rubygem-activesupport-8.0.3-Always-pass-default-precision-to-BigDecimal-when-parsing.patch +# Support minitest 6 +# https://github.com/rails/rails/pull/56202/ +Patch2: rubygem-activesupport-pr56202-minitest6.patch # Ruby package has just soft dependency on rubygem(json), while # ActiveSupport always requires it. @@ -41,6 +44,7 @@ BuildRequires: rubygem(drb) BuildRequires: rubygem(i18n) >= 0.7 BuildRequires: rubygem(listen) BuildRequires: rubygem(minitest) >= 5.0.0 +BuildRequires: rubygem(minitest-mock) BuildRequires: rubygem(msgpack) BuildRequires: rubygem(rack) BuildRequires: rubygem(redis) @@ -68,9 +72,14 @@ BuildArch: noarch Documentation for %{name}. %prep -%setup -q -n %{gem_name}-%{version}%{?prerelease} -b1 +%setup -q -n %{gem_name}-%{version}%{?prerelease} -a 1 %patch 1 -p2 +%patch 2 -p2 + +# lib/active_support/testing/method_call_assertions.rb +# always needs minitest/mock +%gemspec_add_dep -g minitest-mock %build gem build ../%{gem_name}-%{version}%{?prerelease}.gemspec @@ -82,9 +91,10 @@ cp -a .%{gem_dir}/* \ %{buildroot}%{gem_dir}/ %check -( cd .%{gem_instdir} # Move the tests into place -cp -a %{builddir}/test . +cp -a test .%{gem_instdir} + +cd .%{gem_instdir} mkdir ../tools ln -s %{SOURCE2} ../tools/ @@ -118,7 +128,6 @@ kill -15 $mPID %ifnarch %{ix86} kill -INT $(cat $VALKEY_DIR/valkey.pid) %endif -) %files %dir %{gem_instdir} @@ -133,6 +142,9 @@ kill -INT $(cat $VALKEY_DIR/valkey.pid) %doc %{gem_instdir}/README.rdoc %changelog +* Mon Dec 29 2025 Mamoru TASAKA - 1:8.0.3-3 +- Backport upstream fix to support minitest 6 + * Sun Nov 09 2025 Mamoru TASAKA - 1:8.0.3-2 - Backport upstream change for testsuite removal for new benchmark gem in ruby4_0 From 3c62d5d7aac58a840598f29a7958c76fc8813dd5 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 30 Dec 2025 17:23:06 +0900 Subject: [PATCH 78/78] update minitest 6 patch --- ...t-pr56202-minitest6-rescue-loaderror.patch | 12 +++++++++ rubygem-activesupport-pr56202-minitest6.patch | 26 +++++++++++++++++++ rubygem-activesupport.spec | 8 +++++- 3 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 rubygem-activesupport-pr56202-minitest6-rescue-loaderror.patch diff --git a/rubygem-activesupport-pr56202-minitest6-rescue-loaderror.patch b/rubygem-activesupport-pr56202-minitest6-rescue-loaderror.patch new file mode 100644 index 0000000..d755a4e --- /dev/null +++ b/rubygem-activesupport-pr56202-minitest6-rescue-loaderror.patch @@ -0,0 +1,12 @@ +--- activesupport-8.0.3/lib/active_support/testing/autorun.rb.orig 2025-12-30 16:47:16.780346179 +0900 ++++ activesupport-8.0.3/lib/active_support/testing/autorun.rb 2025-12-30 16:52:01.482400639 +0900 +@@ -8,5 +8,8 @@ require "minitest" + # used in some cases. This conditional can probably go after the bump + # is complete? ... but could still fail for developers working w/ + # multiple versions installed. +-Minitest.load :rails if Minitest.respond_to? :load ++begin ++ Minitest.load :rails if Minitest.respond_to? :load ++rescue LoadError ++end + Minitest.autorun diff --git a/rubygem-activesupport-pr56202-minitest6.patch b/rubygem-activesupport-pr56202-minitest6.patch index 1e01666..00209d5 100644 --- a/rubygem-activesupport-pr56202-minitest6.patch +++ b/rubygem-activesupport-pr56202-minitest6.patch @@ -1,3 +1,29 @@ +From 9da4460ad0e71e5c3de32566ffbc302674b1f76e Mon Sep 17 00:00:00 2001 +From: Ryan Davis +Date: Thu, 20 Nov 2025 12:50:33 -0800 +Subject: [PATCH 1/5] MT6: Load rails plugin + +--- + activesupport/lib/active_support/testing/autorun.rb | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/activesupport/lib/active_support/testing/autorun.rb b/activesupport/lib/active_support/testing/autorun.rb +index d5d5fc7ae8e45..068aac0b487e0 100644 +--- a/activesupport/lib/active_support/testing/autorun.rb ++++ b/activesupport/lib/active_support/testing/autorun.rb +@@ -2,4 +2,11 @@ + + require "minitest" + ++## ++# I shouldn't need this respond_to check but some tests are running ++# sub-process tests in an unbundled environment, causing MT5 to be ++# used in some cases. This conditional can probably go after the bump ++# is complete? ... but could still fail for developers working w/ ++# multiple versions installed. ++Minitest.load :rails if Minitest.respond_to? :load + Minitest.autorun + From 831f0f96d0f9c132b28d3fa22ab82806115747b0 Mon Sep 17 00:00:00 2001 From: Ryan Davis Date: Thu, 20 Nov 2025 14:16:51 -0800 diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index fa35ad4..537f06a 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -5,7 +5,7 @@ Name: rubygem-%{gem_name} Epoch: 1 Version: 8.0.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT URL: https://rubyonrails.org @@ -22,6 +22,8 @@ Patch1: rubygem-activesupport-8.0.3-Always-pass-default-precision-to-BigDecimal- # Support minitest 6 # https://github.com/rails/rails/pull/56202/ Patch2: rubygem-activesupport-pr56202-minitest6.patch +# We don't always install railties with activesupport, so rescue this +Patch3: rubygem-activesupport-pr56202-minitest6-rescue-loaderror.patch # Ruby package has just soft dependency on rubygem(json), while # ActiveSupport always requires it. @@ -76,6 +78,7 @@ Documentation for %{name}. %patch 1 -p2 %patch 2 -p2 +%patch 3 -p1 # lib/active_support/testing/method_call_assertions.rb # always needs minitest/mock @@ -142,6 +145,9 @@ kill -INT $(cat $VALKEY_DIR/valkey.pid) %doc %{gem_instdir}/README.rdoc %changelog +* Tue Dec 30 2025 Mamoru TASAKA - 1:8.0.3-4 +- Update minitest 6 patch, and rescue when railties is not installed + * Mon Dec 29 2025 Mamoru TASAKA - 1:8.0.3-3 - Backport upstream fix to support minitest 6